vendor: Poor Man themes: Bananasplit

Change-Id: I811d28057a47166d014ca62c1c8f549213de8184
diff --git a/config/packages.mk b/config/packages.mk
index 47b416e..ec1431b 100644
--- a/config/packages.mk
+++ b/config/packages.mk
@@ -51,15 +51,33 @@
 
 # Themes
 PRODUCT_PACKAGES += \
-    PixelTheme \
-    SluttyPinkTheme \
-    DarknessMeisterTheme \
-    SmokedGreenTheme \
-    Bl4ckAndYell0Theme \
-    OmniTheme \
-    FromHellTheme \
-    GboardOmniTheme \
-    ZeroZeroTheme
+    GboardOmniTheme
+
+PRODUCT_PACKAGES += \
+    NotificationsDark \
+    NotificationsLight \
+    NotificationsPrimary
+
+PRODUCT_PACKAGES += \
+    AccentSluttyPink \
+    AccentPixel \
+    AccentGoldenShower \
+    AccentDeepOrange \
+    AccentOmni \
+    AccentWhite \
+    AccentTeal \
+    AccentFromHell \
+    AccentBlueMonday \
+    AccentSmokingGreen
+
+PRODUCT_PACKAGES += \
+    PrimaryAlmostBlack \
+    PrimaryBlack \
+    PrimaryOmni \
+    PrimaryWhite \
+    PrimaryColdWhite \
+    PrimaryWarmWhite \
+    PrimaryDarkBlue
 
 # Textclassifiers
 PRODUCT_PACKAGES += \
diff --git a/google/themes/AccentBlueMonday/Android.mk b/google/themes/AccentBlueMonday/Android.mk
new file mode 100644
index 0000000..0054be7
--- /dev/null
+++ b/google/themes/AccentBlueMonday/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := AccentBlueMonday
+LOCAL_RRO_THEME := AccentBlueMonday
+LOCAL_CERTIFICATE := platform
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+include $(BUILD_RRO_PACKAGE)
diff --git a/google/themes/AccentBlueMonday/AndroidManifest.xml b/google/themes/AccentBlueMonday/AndroidManifest.xml
new file mode 100644
index 0000000..580f5f5
--- /dev/null
+++ b/google/themes/AccentBlueMonday/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.omnirom.theme.accent.bluemonday"
+    platformBuildVersionCode="26"
+    platformBuildVersionName="8.0.0">
+
+    <overlay android:priority="1" android:targetPackage="android" />
+
+
+    <application android:hasCode="false"
+                 android:label="Blue Monday" />
+</manifest>
diff --git a/google/themes/AccentBlueMonday/res/values/colors.xml b/google/themes/AccentBlueMonday/res/values/colors.xml
new file mode 100644
index 0000000..f3ab59c
--- /dev/null
+++ b/google/themes/AccentBlueMonday/res/values/colors.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="omni_color3">#ff78b8ff</color> <!-- ACCENT  LIGHT -->
+    <color name="omni_color4">#ff5fabff</color> <!-- ACCENT  DARK -->
+    <color name="omni_color5">#ffabd3ff</color> <!-- ACCENT -->
+
+    <!-- accents -->
+    <color name="accent_device_default_light">@*android:color/omni_color3</color>
+    <color name="accent_device_default_dark">@*android:color/omni_color4</color>
+    <color name="colorAccent">@*android:color/omni_color5</color>
+
+</resources>
diff --git a/google/themes/AccentDeepOrange/Android.mk b/google/themes/AccentDeepOrange/Android.mk
new file mode 100644
index 0000000..4812013
--- /dev/null
+++ b/google/themes/AccentDeepOrange/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := AccentDeepOrange
+LOCAL_RRO_THEME := AccentDeepOrange
+LOCAL_CERTIFICATE := platform
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+include $(BUILD_RRO_PACKAGE)
diff --git a/google/themes/AccentDeepOrange/AndroidManifest.xml b/google/themes/AccentDeepOrange/AndroidManifest.xml
new file mode 100644
index 0000000..d73810b
--- /dev/null
+++ b/google/themes/AccentDeepOrange/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.omnirom.theme.accent.deeporange"
+    platformBuildVersionCode="26"
+    platformBuildVersionName="8.0.0">
+
+    <overlay android:priority="1" android:targetPackage="android" />
+
+
+    <application android:hasCode="false"
+                 android:label="Mexican Sunset" />
+</manifest>
diff --git a/google/themes/AccentDeepOrange/assets/thumbnail.png b/google/themes/AccentDeepOrange/assets/thumbnail.png
new file mode 100644
index 0000000..9841324
--- /dev/null
+++ b/google/themes/AccentDeepOrange/assets/thumbnail.png
Binary files differ
diff --git a/google/themes/AccentDeepOrange/res/values/colors.xml b/google/themes/AccentDeepOrange/res/values/colors.xml
new file mode 100644
index 0000000..3ee7f58
--- /dev/null
+++ b/google/themes/AccentDeepOrange/res/values/colors.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <color name="omni_color3">#ffff9800</color> <!-- ACCENT  LIGHT -->
+    <color name="omni_color4">#ffff9800</color> <!-- ACCENT  DARK -->
+    <color name="omni_color5">#ffff9800</color> <!-- ACCENT -->
+
+    <!-- accents -->
+    <color name="accent_device_default_light">@*android:color/omni_color3</color>
+    <color name="accent_device_default_dark">@*android:color/omni_color4</color>
+    <color name="colorAccent">@*android:color/omni_color5</color>
+
+</resources>
diff --git a/google/themes/AccentFromHell/Android.mk b/google/themes/AccentFromHell/Android.mk
new file mode 100644
index 0000000..da8412a
--- /dev/null
+++ b/google/themes/AccentFromHell/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := AccentFromHell
+LOCAL_RRO_THEME := AccentFromHell
+LOCAL_CERTIFICATE := platform
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+include $(BUILD_RRO_PACKAGE)
diff --git a/google/themes/AccentFromHell/AndroidManifest.xml b/google/themes/AccentFromHell/AndroidManifest.xml
new file mode 100644
index 0000000..b95df3d
--- /dev/null
+++ b/google/themes/AccentFromHell/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.omnirom.theme.accent.fromhell"
+    platformBuildVersionCode="26"
+    platformBuildVersionName="8.0.0">
+
+    <overlay android:priority="1" android:targetPackage="android" />
+
+
+    <application android:hasCode="false"
+                 android:label="From Hell" />
+</manifest>
diff --git a/google/themes/AccentFromHell/res/values/colors.xml b/google/themes/AccentFromHell/res/values/colors.xml
new file mode 100644
index 0000000..5d9cee4
--- /dev/null
+++ b/google/themes/AccentFromHell/res/values/colors.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="omni_color3">#ffe53935</color> <!-- ACCENT  LIGHT -->
+    <color name="omni_color4">#fff44336</color> <!-- ACCENT  DARK -->
+    <color name="omni_color5">#ffd32f2f</color> <!-- ACCENT -->
+
+    <!-- accents -->
+    <color name="accent_device_default_light">@*android:color/omni_color3</color>
+    <color name="accent_device_default_dark">@*android:color/omni_color4</color>
+    <color name="colorAccent">@*android:color/omni_color5</color>
+
+</resources>
diff --git a/google/themes/AccentGoldenShower/Android.mk b/google/themes/AccentGoldenShower/Android.mk
new file mode 100644
index 0000000..52cbc49
--- /dev/null
+++ b/google/themes/AccentGoldenShower/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := AccentGoldenShower
+LOCAL_RRO_THEME := AccnetGoldenShower
+LOCAL_CERTIFICATE := platform
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+include $(BUILD_RRO_PACKAGE)
diff --git a/google/themes/AccentGoldenShower/AndroidManifest.xml b/google/themes/AccentGoldenShower/AndroidManifest.xml
new file mode 100644
index 0000000..ae06a54
--- /dev/null
+++ b/google/themes/AccentGoldenShower/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.omnirom.theme.accent.goldenshower"
+    platformBuildVersionCode="26"
+    platformBuildVersionName="8.0.0">
+
+    <overlay android:priority="1" android:targetPackage="android" />
+
+
+    <application android:hasCode="false"
+                 android:label="Golden Shower" />
+</manifest>
diff --git a/google/themes/AccentGoldenShower/res/values/colors.xml b/google/themes/AccentGoldenShower/res/values/colors.xml
new file mode 100644
index 0000000..d6ba3bd
--- /dev/null
+++ b/google/themes/AccentGoldenShower/res/values/colors.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="omni_color3">#ffFFFF00</color> <!-- ACCENT  LIGHT -->
+    <color name="omni_color4">#ffFFEA00</color> <!-- ACCENT  DARK -->
+    <color name="omni_color5">#ffFFFF00</color> <!-- ACCENT -->
+
+    <!-- accents -->
+    <color name="accent_device_default_light">@*android:color/omni_color3</color>
+    <color name="accent_device_default_dark">@*android:color/omni_color4</color>
+    <color name="colorAccent">@*android:color/omni_color5</color>
+
+</resources>
diff --git a/google/themes/AccentOmni/Android.mk b/google/themes/AccentOmni/Android.mk
new file mode 100644
index 0000000..059d9c1
--- /dev/null
+++ b/google/themes/AccentOmni/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := AccentOmni
+LOCAL_RRO_THEME := AccentOmni
+LOCAL_CERTIFICATE := platform
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+include $(BUILD_RRO_PACKAGE)
diff --git a/google/themes/AccentOmni/AndroidManifest.xml b/google/themes/AccentOmni/AndroidManifest.xml
new file mode 100644
index 0000000..a0912ce
--- /dev/null
+++ b/google/themes/AccentOmni/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.omnirom.theme.accent.omni"
+    platformBuildVersionCode="26"
+    platformBuildVersionName="8.0.0">
+
+    <overlay android:priority="1" android:targetPackage="android" />
+
+
+    <application android:hasCode="false"
+                 android:label="Omni" />
+</manifest>
diff --git a/google/themes/AccentOmni/res/values/colors.xml b/google/themes/AccentOmni/res/values/colors.xml
new file mode 100644
index 0000000..9534a46
--- /dev/null
+++ b/google/themes/AccentOmni/res/values/colors.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="omni_color3">#ffaacc3e</color> <!-- ACCENT  LIGHT -->
+    <color name="omni_color4">#ff90b324</color> <!-- ACCENT  DARK -->
+    <color name="omni_color5">#ffa1c729</color> <!-- ACCENT -->
+
+    <!-- accents -->
+    <color name="accent_device_default_light">@*android:color/omni_color3</color>
+    <color name="accent_device_default_dark">@*android:color/omni_color4</color>
+    <color name="colorAccent">@*android:color/omni_color5</color>
+
+</resources>
diff --git a/google/themes/AccentPixel/Android.mk b/google/themes/AccentPixel/Android.mk
new file mode 100644
index 0000000..22c521c
--- /dev/null
+++ b/google/themes/AccentPixel/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := AccentPixel
+LOCAL_RRO_THEME := AccentPixel
+LOCAL_CERTIFICATE := platform
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+include $(BUILD_RRO_PACKAGE)
diff --git a/google/themes/AccentPixel/AndroidManifest.xml b/google/themes/AccentPixel/AndroidManifest.xml
new file mode 100644
index 0000000..6c038b3
--- /dev/null
+++ b/google/themes/AccentPixel/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.omnirom.theme.accent.pixel"
+    platformBuildVersionCode="26"
+    platformBuildVersionName="8.0.0">
+
+    <overlay android:priority="1" android:targetPackage="android" />
+
+
+    <application android:hasCode="false"
+                 android:label="Pixel" />
+</manifest>
diff --git a/google/themes/AccentPixel/res/values/colors.xml b/google/themes/AccentPixel/res/values/colors.xml
new file mode 100644
index 0000000..047c6b1
--- /dev/null
+++ b/google/themes/AccentPixel/res/values/colors.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="omni_color3">#ff4285f4</color> <!-- ACCENT  LIGHT -->
+    <color name="omni_color4">#ff5e97f6</color> <!-- ACCENT  DARK -->
+    <color name="omni_color5">#ff3367d6</color> <!-- ACCENT -->
+
+    <!-- accents -->
+    <color name="accent_device_default_light">@*android:color/omni_color3</color>
+    <color name="accent_device_default_dark">@*android:color/omni_color4</color>
+    <color name="colorAccent">@*android:color/omni_color5</color>
+
+</resources>
diff --git a/google/themes/AccentSluttyPink/Android.mk b/google/themes/AccentSluttyPink/Android.mk
new file mode 100644
index 0000000..0930ef7
--- /dev/null
+++ b/google/themes/AccentSluttyPink/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := AccentSluttyPink
+LOCAL_RRO_THEME := AccentSluttyPink
+LOCAL_CERTIFICATE := platform
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+include $(BUILD_RRO_PACKAGE)
diff --git a/google/themes/AccentSluttyPink/AndroidManifest.xml b/google/themes/AccentSluttyPink/AndroidManifest.xml
new file mode 100644
index 0000000..bc3af36
--- /dev/null
+++ b/google/themes/AccentSluttyPink/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.omnirom.theme.accent.sluttypink"
+    platformBuildVersionCode="26"
+    platformBuildVersionName="8.0.0">
+
+    <overlay android:priority="1" android:targetPackage="android" />
+
+
+    <application android:hasCode="false"
+                 android:label="Slutty Pink" />
+</manifest>
diff --git a/google/themes/AccentSluttyPink/res/values/colors.xml b/google/themes/AccentSluttyPink/res/values/colors.xml
new file mode 100644
index 0000000..0d659b3
--- /dev/null
+++ b/google/themes/AccentSluttyPink/res/values/colors.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="omni_color3">#ffff205a</color> <!-- ACCENT  LIGHT -->
+    <color name="omni_color4">#ffff206e</color> <!-- ACCENT  DARK -->
+    <color name="omni_color5">#ffff005a</color> <!-- ACCENT -->
+
+    <!-- accents -->
+    <color name="accent_device_default_light">@*android:color/omni_color3</color>
+    <color name="accent_device_default_dark">@*android:color/omni_color4</color>
+    <color name="colorAccent">@*android:color/omni_color5</color>
+
+</resources>
diff --git a/google/themes/AccentSmokingGreen/Android.mk b/google/themes/AccentSmokingGreen/Android.mk
new file mode 100644
index 0000000..05bfbff
--- /dev/null
+++ b/google/themes/AccentSmokingGreen/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := AccentSmokingGreen
+LOCAL_RRO_THEME := AccentSmokingGreen
+LOCAL_CERTIFICATE := platform
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+include $(BUILD_RRO_PACKAGE)
diff --git a/google/themes/AccentSmokingGreen/AndroidManifest.xml b/google/themes/AccentSmokingGreen/AndroidManifest.xml
new file mode 100644
index 0000000..1ae5a7a
--- /dev/null
+++ b/google/themes/AccentSmokingGreen/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.omnirom.theme.accent.smokinggreen"
+    platformBuildVersionCode="26"
+    platformBuildVersionName="8.0.0">
+
+    <overlay android:priority="1" android:targetPackage="android" />
+
+
+    <application android:hasCode="false"
+                 android:label="Smoking Green" />
+</manifest>
diff --git a/google/themes/AccentSmokingGreen/res/values/colors.xml b/google/themes/AccentSmokingGreen/res/values/colors.xml
new file mode 100644
index 0000000..0d620ae
--- /dev/null
+++ b/google/themes/AccentSmokingGreen/res/values/colors.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="omni_color3">#ff69F0AE</color> <!-- ACCENT  LIGHT -->
+    <color name="omni_color4">#ff00C853</color> <!-- ACCENT  DARK -->
+    <color name="omni_color5">#ff00E676</color> <!-- ACCENT -->
+
+    <!-- accents -->
+    <color name="accent_device_default_light">@*android:color/omni_color3</color>
+    <color name="accent_device_default_dark">@*android:color/omni_color4</color>
+    <color name="colorAccent">@*android:color/omni_color5</color>
+
+</resources>
diff --git a/google/themes/AccentTeal/Android.mk b/google/themes/AccentTeal/Android.mk
new file mode 100644
index 0000000..9a624fb
--- /dev/null
+++ b/google/themes/AccentTeal/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := AccentTeal
+LOCAL_RRO_THEME := AccentTeal
+LOCAL_CERTIFICATE := platform
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+include $(BUILD_RRO_PACKAGE)
diff --git a/google/themes/AccentTeal/AndroidManifest.xml b/google/themes/AccentTeal/AndroidManifest.xml
new file mode 100644
index 0000000..e6f471b
--- /dev/null
+++ b/google/themes/AccentTeal/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.omnirom.theme.accent.teal"
+    platformBuildVersionCode="26"
+    platformBuildVersionName="8.0.0">
+
+    <overlay android:priority="1" android:targetPackage="android" />
+
+
+    <application android:hasCode="false"
+                 android:label="Teal" />
+</manifest>
diff --git a/google/themes/AccentTeal/res/values/colors.xml b/google/themes/AccentTeal/res/values/colors.xml
new file mode 100644
index 0000000..8844130
--- /dev/null
+++ b/google/themes/AccentTeal/res/values/colors.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="omni_color3">#ff1de9b6</color> <!-- ACCENT  LIGHT -->
+    <color name="omni_color4">#ff99796b</color> <!-- ACCENT  DARK -->
+    <color name="omni_color5">#ff00bfa5</color> <!-- ACCENT -->
+
+    <!-- accents -->
+    <color name="accent_device_default_light">@*android:color/omni_color3</color>
+    <color name="accent_device_default_dark">@*android:color/omni_color4</color>
+    <color name="colorAccent">@*android:color/omni_color5</color>
+
+</resources>
diff --git a/google/themes/AccentWhite/Android.mk b/google/themes/AccentWhite/Android.mk
new file mode 100644
index 0000000..e1462c1
--- /dev/null
+++ b/google/themes/AccentWhite/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := AccentWhite
+LOCAL_RRO_THEME := AccentWhite
+LOCAL_CERTIFICATE := platform
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+include $(BUILD_RRO_PACKAGE)
diff --git a/google/themes/AccentWhite/AndroidManifest.xml b/google/themes/AccentWhite/AndroidManifest.xml
new file mode 100644
index 0000000..7f6fc74
--- /dev/null
+++ b/google/themes/AccentWhite/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.omnirom.theme.accent.white"
+    platformBuildVersionCode="26"
+    platformBuildVersionName="8.0.0">
+
+    <overlay android:priority="1" android:targetPackage="android" />
+
+
+    <application android:hasCode="false"
+                 android:label="White" />
+</manifest>
diff --git a/google/themes/AccentWhite/res/values/colors.xml b/google/themes/AccentWhite/res/values/colors.xml
new file mode 100644
index 0000000..55321b2
--- /dev/null
+++ b/google/themes/AccentWhite/res/values/colors.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="omni_color3">#fff9f9f9</color> <!-- ACCENT  LIGHT -->
+    <color name="omni_color4">#ffe0e0e0</color> <!-- ACCENT  DARK -->
+    <color name="omni_color5">#fffefefe</color> <!-- ACCENT -->
+
+    <!-- accents -->
+    <color name="accent_device_default_light">@*android:color/omni_color3</color>
+    <color name="accent_device_default_dark">@*android:color/omni_color4</color>
+    <color name="colorAccent">@*android:color/omni_color5</color>
+
+</resources>
diff --git a/google/themes/Bl4ckAndYell0/res/values/settings.xml b/google/themes/Bl4ckAndYell0/res/values/settings.xml
index 307c64e..2b9e570 100644
--- a/google/themes/Bl4ckAndYell0/res/values/settings.xml
+++ b/google/themes/Bl4ckAndYell0/res/values/settings.xml
@@ -20,7 +20,7 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text3</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
-        <item name="android:colorControlHighlight">@*android:color/omni_color4</item>
+        <item name="android:colorControlHighlight">@*android:color/omni_color7</item>
         <item name="android:colorControlActivated">@*android:color/omni_color5</item>
 
     </style>
diff --git a/google/themes/DarknessMeister/res/values/settings.xml b/google/themes/DarknessMeister/res/values/settings.xml
index 307c64e..8c94cbf 100644
--- a/google/themes/DarknessMeister/res/values/settings.xml
+++ b/google/themes/DarknessMeister/res/values/settings.xml
@@ -20,7 +20,7 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text3</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
-        <item name="android:colorControlHighlight">@*android:color/omni_color4</item>
+        <item name="android:colorControlHighlight">@*android:color/omni_color1</item>
         <item name="android:colorControlActivated">@*android:color/omni_color5</item>
 
     </style>
diff --git a/google/themes/FromHell/res/values/settings.xml b/google/themes/FromHell/res/values/settings.xml
index 4ee47a2..b8215f4 100644
--- a/google/themes/FromHell/res/values/settings.xml
+++ b/google/themes/FromHell/res/values/settings.xml
@@ -20,7 +20,7 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text3</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
-        <item name="android:colorControlHighlight">@*android:color/omni_color4</item>
+        <item name="android:colorControlHighlight">@*android:color/omni_color7</item>
         <item name="android:colorControlActivated">@*android:color/omni_color5</item>
 
     </style>
diff --git a/google/themes/GboardOmniTheme/Android.mk b/google/themes/GboardOmniTheme/Android.mk
index 13c94ee..5fcb793 100644
--- a/google/themes/GboardOmniTheme/Android.mk
+++ b/google/themes/GboardOmniTheme/Android.mk
@@ -1,11 +1,11 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_MODULE_TAGS := optional
-
 LOCAL_PACKAGE_NAME := GboardOmniTheme
-LOCAL_SDK_VERSION := current
+LOCAL_RRO_THEME := GboardOmniTheme
 LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
-include $(BUILD_PACKAGE)
+include $(BUILD_RRO_PACKAGE)
diff --git a/google/themes/NotificationsDark/Android.mk b/google/themes/NotificationsDark/Android.mk
new file mode 100644
index 0000000..e6b089a
--- /dev/null
+++ b/google/themes/NotificationsDark/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := NotificationsDark
+LOCAL_RRO_THEME := NotificationsDark
+LOCAL_CERTIFICATE := platform
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+include $(BUILD_RRO_PACKAGE)
diff --git a/google/themes/NotificationsDark/AndroidManifest.xml b/google/themes/NotificationsDark/AndroidManifest.xml
new file mode 100644
index 0000000..7d678fe
--- /dev/null
+++ b/google/themes/NotificationsDark/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.omnirom.theme.notification.dark"
+    platformBuildVersionCode="26"
+    platformBuildVersionName="8.0.0">
+
+    <overlay android:priority="3" android:targetPackage="android" />
+
+
+    <application android:hasCode="false"
+                 android:label="Dark" />
+</manifest>
diff --git a/google/themes/NotificationsDark/res/values/colors.xml b/google/themes/NotificationsDark/res/values/colors.xml
new file mode 100644
index 0000000..7801b9b
--- /dev/null
+++ b/google/themes/NotificationsDark/res/values/colors.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>    
+    <!-- Notifications -->
+    <color name="notification_legacy_background_color">#ff29282c</color>
+    <color name="notification_material_background_dimmed_color">#ff05050A</color>
+    <color name="notification_material_background_low_priority_color">#ff121115</color>
+    <color name="notification_divider_color">#ffe0e0e0</color>
+    <color name="notification_shade_background_color">#ff05050A</color>
+    <color name="notification_ripple_untinted_color">#ffe0e0e0</color>
+    <color name="notification_ripple_color_low_priority">#fff9f9f9</color>
+    <color name="notification_ripple_tinted_color">#fffefefe</color>
+    <color name="notification_gear_color">#ffFFFF00</color>
+    <color name="notification_guts_bg_color">#ff29282c</color>
+
+    <color name="notification_material_background_color">#ff29282c</color>
+    <color name="notification_default_color">#FFFFFDE7</color> <!-- Gray 600 -->
+    <color name="notification_action_list">#ff05050A</color>
+    <color name="notification_action_list_dark">#ff121115</color>
+    <color name="notification_primary_text_color_light">#FFFFFDE7</color>
+    <color name="notification_secondary_text_color_light">#B3FFFDE7</color>
+    <color name="notification_progress_background_color">#B3FFFDE7</color>
+    <color name="notification_snooze_text">#FFFFFDE7</color>
+    <color name="notification_text_color1">#FFFFFDE7</color>
+
+    <color name="omni_theme_color">#ff29282c</color>
+</resources>
diff --git a/google/themes/NotificationsDark/res/values/config.xml b/google/themes/NotificationsDark/res/values/config.xml
new file mode 100644
index 0000000..a1802c8
--- /dev/null
+++ b/google/themes/NotificationsDark/res/values/config.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="config_useDarkBgNotificationIconTextTinting">true</bool>
+    <bool name="config_enableNightMode">true</bool>
+</resources>
diff --git a/google/themes/NotificationsLight/Android.mk b/google/themes/NotificationsLight/Android.mk
new file mode 100644
index 0000000..24f3db4
--- /dev/null
+++ b/google/themes/NotificationsLight/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := NotificationsLight
+LOCAL_RRO_THEME := NotificationsLight
+LOCAL_CERTIFICATE := platform
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+include $(BUILD_RRO_PACKAGE)
diff --git a/google/themes/NotificationsLight/AndroidManifest.xml b/google/themes/NotificationsLight/AndroidManifest.xml
new file mode 100644
index 0000000..25de8d3
--- /dev/null
+++ b/google/themes/NotificationsLight/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.omnirom.theme.notification.light"
+    platformBuildVersionCode="26"
+    platformBuildVersionName="8.0.0">
+
+    <overlay android:priority="3" android:targetPackage="android" />
+
+
+    <application android:hasCode="false"
+                 android:label="Light" />
+</manifest>
diff --git a/google/themes/NotificationsLight/res/values/colors.xml b/google/themes/NotificationsLight/res/values/colors.xml
new file mode 100644
index 0000000..c9bf07c
--- /dev/null
+++ b/google/themes/NotificationsLight/res/values/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="omni_theme_color">#ffe9e9e9</color>
+</resources>
diff --git a/google/themes/NotificationsLight/res/values/config.xml b/google/themes/NotificationsLight/res/values/config.xml
new file mode 100644
index 0000000..bc9a085
--- /dev/null
+++ b/google/themes/NotificationsLight/res/values/config.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="config_useDarkBgNotificationIconTextTinting">false</bool>
+    <bool name="config_enableNightMode">false</bool>
+</resources>
diff --git a/google/themes/NotificationsPrimary/Android.mk b/google/themes/NotificationsPrimary/Android.mk
new file mode 100644
index 0000000..d5ce1fe
--- /dev/null
+++ b/google/themes/NotificationsPrimary/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := NotificationsPrimary
+LOCAL_RRO_THEME := NotificationsPrimary
+LOCAL_CERTIFICATE := platform
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+include $(BUILD_RRO_PACKAGE)
diff --git a/google/themes/NotificationsPrimary/AndroidManifest.xml b/google/themes/NotificationsPrimary/AndroidManifest.xml
new file mode 100644
index 0000000..b6db619
--- /dev/null
+++ b/google/themes/NotificationsPrimary/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.omnirom.theme.notification.primary"
+    platformBuildVersionCode="26"
+    platformBuildVersionName="8.0.0">
+
+    <overlay android:priority="3" android:targetPackage="android" />
+
+
+    <application android:hasCode="false"
+                 android:label="Primary" />
+</manifest>
diff --git a/google/themes/NotificationsPrimary/res/values/colors.xml b/google/themes/NotificationsPrimary/res/values/colors.xml
new file mode 100644
index 0000000..fef4ea3
--- /dev/null
+++ b/google/themes/NotificationsPrimary/res/values/colors.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Notifications -->
+    <color name="notification_legacy_background_color">@*android:color/omni_color7</color>
+    <color name="notification_material_background_dimmed_color">@*android:color/omni_color1</color>
+    <color name="notification_material_background_low_priority_color">@*android:color/omni_color2</color>
+    <color name="notification_divider_color">@*android:color/omni_color4</color>
+    <color name="notification_shade_background_color">@*android:color/omni_color1</color>
+    <color name="notification_ripple_untinted_color">@*android:color/omni_color4</color>
+    <color name="notification_ripple_color_low_priority">@*android:color/omni_color3</color>
+    <color name="notification_ripple_tinted_color">@*android:color/omni_color5</color>
+    <color name="notification_gear_color">@*android:color/omni_color6</color>
+    <color name="notification_guts_bg_color">@*android:color/omni_color7</color>
+    
+    <color name="notification_material_background_color">@*android:color/omni_color7</color>
+    <color name="notification_default_color">@*android:color/omni_text1</color> <!-- Gray 600 -->
+    <color name="notification_action_list">@*android:color/omni_color1</color>
+    <color name="notification_action_list_dark">@*android:color/omni_color2</color>
+    <color name="notification_primary_text_color_light">@*android:color/omni_text1</color>
+    <color name="notification_secondary_text_color_light">@*android:color/omni_text2</color>
+    <color name="notification_progress_background_color">@*android:color/omni_text2</color>
+    <color name="notification_snooze_text">@*android:color/omni_text1</color>
+    <color name="notification_text_color1">@*android:color/omni_text1</color>    
+</resources>
diff --git a/google/themes/NotificationsPrimary/res/values/config.xml b/google/themes/NotificationsPrimary/res/values/config.xml
new file mode 100644
index 0000000..a1802c8
--- /dev/null
+++ b/google/themes/NotificationsPrimary/res/values/config.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="config_useDarkBgNotificationIconTextTinting">true</bool>
+    <bool name="config_enableNightMode">true</bool>
+</resources>
diff --git a/google/themes/OmniTheme/res/values/settings.xml b/google/themes/OmniTheme/res/values/settings.xml
index 307c64e..8c94cbf 100644
--- a/google/themes/OmniTheme/res/values/settings.xml
+++ b/google/themes/OmniTheme/res/values/settings.xml
@@ -20,7 +20,7 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text3</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
-        <item name="android:colorControlHighlight">@*android:color/omni_color4</item>
+        <item name="android:colorControlHighlight">@*android:color/omni_color1</item>
         <item name="android:colorControlActivated">@*android:color/omni_color5</item>
 
     </style>
diff --git a/google/themes/PrimaryAlmostBlack/Android.mk b/google/themes/PrimaryAlmostBlack/Android.mk
new file mode 100644
index 0000000..a036964
--- /dev/null
+++ b/google/themes/PrimaryAlmostBlack/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := PrimaryAlmostBlack
+LOCAL_RRO_THEME := PrimaryAlmostBlack
+LOCAL_CERTIFICATE := platform
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+include $(BUILD_RRO_PACKAGE)
diff --git a/google/themes/PrimaryAlmostBlack/AndroidManifest.xml b/google/themes/PrimaryAlmostBlack/AndroidManifest.xml
new file mode 100644
index 0000000..d23ad65
--- /dev/null
+++ b/google/themes/PrimaryAlmostBlack/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.omnirom.theme.primary.almostblack"
+    platformBuildVersionCode="26"
+    platformBuildVersionName="8.0.0">
+
+    <overlay android:priority="2" android:targetPackage="android" />
+
+
+    <application android:hasCode="false"
+                 android:label="Pitch Black" />
+</manifest>
diff --git a/google/themes/PrimaryAlmostBlack/res/color/ripple_material_light.xml b/google/themes/PrimaryAlmostBlack/res/color/ripple_material_light.xml
new file mode 100644
index 0000000..07ce558
--- /dev/null
+++ b/google/themes/PrimaryAlmostBlack/res/color/ripple_material_light.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:alpha="@*android:dimen/highlight_alpha_material_light"
+          android:color="@*android:color/omni_color5" />
+</selector>
diff --git a/google/themes/PrimaryAlmostBlack/res/drawable/toast_frame.xml b/google/themes/PrimaryAlmostBlack/res/drawable/toast_frame.xml
new file mode 100644
index 0000000..5738837
--- /dev/null
+++ b/google/themes/PrimaryAlmostBlack/res/drawable/toast_frame.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2017, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <!-- background is material_grey_200 with .9 alpha -->
+    <solid android:color="@*android:color/omni_color9" />
+    <corners android:radius="22dp" />
+</shape>
+
diff --git a/google/themes/PrimaryAlmostBlack/res/values/colors.xml b/google/themes/PrimaryAlmostBlack/res/values/colors.xml
new file mode 100644
index 0000000..150dff6
--- /dev/null
+++ b/google/themes/PrimaryAlmostBlack/res/values/colors.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="omni_theme_color">@color/omni_color1</color>
+    <color name="system_error">#ffff4120</color>
+
+    <color name="omni_text1">#FFFFFDE7</color> <!-- text primary -->
+    <color name="omni_text2">#B3FFFDE7</color>  <!-- text secondary -->
+    <color name="omni_text3">#a0FFFDE7</color>  <!-- text tertiary -->
+    <color name="omni_text4">#deFFFDE7</color>  <!-- text tertiary -->
+    <color name="omni_color1">#ff05050A</color> <!-- PRIMARY DARK -->
+    <color name="omni_color2">#ff121115</color> <!-- PRIMARY LIGHT -->
+    <color name="omni_color6">#ffFFFF00</color> <!-- WIFI ICON IN DETAILS -->
+    <color name="omni_color7">#ff29282c</color> <!-- FLOATING DIALOG COLOR ON VERY DARK THEMES MAKE THIS A BIT LIGHTER -->
+    <color name="omni_color8">#ff29282c</color> <!-- SPECIAL (CHECK WHERE THIS IS ASSIGNED) -->
+    <color name="omni_color9">#e629282c</color> <!-- TOAST (NEEDS SOME ALPHA) -->
+
+    <!-- PRIMARY LIGHT -->
+    <color name="primary_dark_device_default_settings">@*android:color/omni_color2</color> <!-- Main BG settings -->
+    <color name="background_material_dark">@*android:color/omni_color2</color> <!-- some kind of overlay of the main bg -->
+    <color name="primary_dark_device_default_light">@*android:color/omni_color2</color>
+    <color name="secondary_device_default_settings">@*android:color/omni_color2</color> <!-- Edit Quick Settings bottom parent of secondary_material_settings -->
+    <color name="condition_card_background">@*android:color/omni_color2</color>
+
+    <!-- PRIMARY_DARK -->
+    <color name="primary_dark_material_settings_light">@*android:color/omni_color1</color> <!-- settings statusbar -->
+
+    <color name="suggestion_condition_background">@*android:color/omni_color1</color>
+    <color name="secondary_device_default_settings_light">@*android:color/omni_color1</color>  <!-- settings entity, ie battery top view background -->
+    <color name="primary_device_default_settings">@*android:color/omni_color1</color> <!-- QS -->
+
+    <color name="dialog_background_material">@*android:color/omni_color1</color>
+
+    <!-- specials -->
+    <color name="btn_colored_text_material">@*android:color/omni_color2</color><!-- example: Uninstall button in app manager -->
+    <color name="global_wifi_details_icon_color">@*android:color/omni_color6</color> <!-- settings/wifi/details iconsy -->
+
+    <color name="chooser_service_row_background_color">@*android:color/omni_color1</color> <!-- resolver -->
+<!--    <color name="primary_text_inverse_when_activated_material">#a0989898</color> --><!-- very rare -->
+    <color name="primary_text_disable_only_material_dark">@*android:color/omni_text3</color> <!-- display/font or bt details -->
+
+
+    <!-- qs -->
+    <color name="material_grey_900">@*android:color/omni_color1</color>  <!-- find a better way to do this -->
+    <color name="zen_introduction">@*android:color/omni_color1</color>
+
+    <!-- Dialogs -->
+    <color name="background_floating_material_dark">@*android:color/omni_color7</color> <!-- dialogs like sime settins -->
+
+</resources>
diff --git a/google/themes/PrimaryAlmostBlack/res/values/config.xml b/google/themes/PrimaryAlmostBlack/res/values/config.xml
new file mode 100644
index 0000000..a1802c8
--- /dev/null
+++ b/google/themes/PrimaryAlmostBlack/res/values/config.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="config_useDarkBgNotificationIconTextTinting">true</bool>
+    <bool name="config_enableNightMode">true</bool>
+</resources>
diff --git a/google/themes/PrimaryAlmostBlack/res/values/settings.xml b/google/themes/PrimaryAlmostBlack/res/values/settings.xml
new file mode 100644
index 0000000..2b9e570
--- /dev/null
+++ b/google/themes/PrimaryAlmostBlack/res/values/settings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.DeviceDefault.Settings" parent="@*android:style/Theme.Material">
+        <item name="android:actionBarTheme">@*android:style/ThemeOverlay.DeviceDefault.ActionBar.Accent</item>
+        <item name="android:popupTheme">@*android:style/ThemeOverlay.DeviceDefault.Popup.Light</item>
+        <item name="android:colorEdgeEffect">@*android:color/omni_color4</item>
+        <item name="android:navigationBarDividerColor">#00000000</item>
+        <item name="android:navigationBarColor">@*android:color/omni_color2</item>
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorForeground">@*android:color/omni_text_primary</item>
+
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+ 
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text3</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:colorControlHighlight">@*android:color/omni_color7</item>
+        <item name="android:colorControlActivated">@*android:color/omni_color5</item>
+
+    </style>
+</resources>
diff --git a/google/themes/PrimaryAlmostBlack/res/values/strings.xml b/google/themes/PrimaryAlmostBlack/res/values/strings.xml
new file mode 100644
index 0000000..bf20dad
--- /dev/null
+++ b/google/themes/PrimaryAlmostBlack/res/values/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2017, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <string name="@*android:sysui_overlay_dark">Dark</string>
+
+</resources>
+
diff --git a/google/themes/PrimaryAlmostBlack/res/values/styles.xml b/google/themes/PrimaryAlmostBlack/res/values/styles.xml
new file mode 100644
index 0000000..2bfc794
--- /dev/null
+++ b/google/themes/PrimaryAlmostBlack/res/values/styles.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="TextAppearance.Material.Widget.DropDownItem" parent="@*android:style/TextAppearance.Material.Menu.Inverse" />
+    <style name="Widget.Material.DropDownItem.Spinner" parent="@*android:style/Theme.Material" >
+        <item name="android:paddingStart">8dp</item>
+        <item name="android:paddingEnd">8dp</item>
+        <item name="android:paddingTop">8dp</item>
+        <item name="android:colorBackgroundFloating">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+
+    </style>
+
+</resources>
diff --git a/google/themes/PrimaryAlmostBlack/res/values/themes.xml b/google/themes/PrimaryAlmostBlack/res/values/themes.xml
new file mode 100644
index 0000000..bdd4d9c
--- /dev/null
+++ b/google/themes/PrimaryAlmostBlack/res/values/themes.xml
@@ -0,0 +1,494 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Variant of the DeviceDefault (light) theme that has a solid (opaque) action bar with an
+    inverse color profile. -->
+    <style name="Theme.DeviceDefault.Light.DarkActionBar" parent="@*android:style/Theme.Material.Light.DarkActionBar">
+	<!-- Color palette -->
+	<item name="android:colorPrimary">@*android:color/omni_color2</item>
+	<item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+	<item name="android:colorSecondary">@*android:color/omni_color1</item>
+	<item name="android:colorAccent">@*android:color/omni_color5</item>
+
+	<item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+	<item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+	<item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+	<item name="android:textColorHint">@*android:color/omni_color3</item>
+	<item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+
+    </style>
+    <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar -->
+    <style name="Theme.DeviceDefault.Light.NoActionBar" parent="@*android:style/Theme.Material.NoActionBar">
+	<!-- package installer acitivity example -->
+        <item name="android:colorBackground">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar and no status bar.
+	 This theme sets {@link android.R.attr#windowFullscreen} to true.  -->
+    <style name="Theme.DeviceDefault.Light.NoActionBar.Fullscreen" parent="@*android:style/Theme.Material.NoActionBar.Fullscreen">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar and no status bar
+    and extending in to overscan region.  This theme
+    sets {@link android.R.attr#windowFullscreen} and {@link android.R.attr#windowOverscan}
+    to true. -->
+    <style name="Theme.DeviceDefault.Light.NoActionBar.Overscan" parent="@*android:style/Theme.Material.NoActionBar.Overscan">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Light} that has no title bar and translucent
+	 system decor.  This theme sets {@link android.R.attr#windowTranslucentStatus} and
+	 {@link android.R.attr#windowTranslucentNavigation} to true. -->
+    <style name="Theme.DeviceDefault.Light.NoActionBar.TranslucentDecor" parent="@*android:style/Theme.Material.NoActionBar.TranslucentDecor">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- DeviceDefault light theme for dialog windows and activities. This changes the window to be
+    floating (not fill the entire screen), and puts a frame around its contents. You can set this
+    theme on an activity if you would like to make an activity that looks like a Dialog.-->
+    <style name="Theme.DeviceDefault.Light.Dialog" parent="@*android:style/Theme.Material.Dialog">
+	<item name="android:windowTitleStyle">@*android:style/DialogWindowTitle.DeviceDefault</item>
+	<item name="android:windowAnimationStyle">@*android:style/Animation.DeviceDefault.Dialog</item>
+
+	<item name="android:buttonBarStyle">@*android:style/DeviceDefault.ButtonBar.AlertDialog</item>
+	<item name="android:borderlessButtonStyle">@*android:style/Widget.DeviceDefault.Button.Borderless.Small</item>
+
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} that has a nice minimum width for a
+    regular dialog. -->
+    <style name="Theme.DeviceDefault.Light.Dialog.MinWidth" parent="@*android:style/Theme.Material.Dialog.MinWidth">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+
+    </style>
+
+     <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} without an action bar -->
+    <style name="Theme.DeviceDefault.Light.Dialog.NoActionBar" parent="@*android:style/Theme.Material.Dialog.NoActionBar">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog_NoActionBar} that has a nice minimum
+    width for a regular dialog. -->
+    <style name="Theme.DeviceDefault.Light.Dialog.NoActionBar.MinWidth" parent="@*android:style/Theme.Material.Dialog.NoActionBar.MinWidth">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of Theme.DeviceDefault.Dialog that has a fixed size. -->
+    <style name="Theme.DeviceDefault.Light.Dialog.FixedSize" parent="@*android:style/Theme.Material" >
+	<item name="*android:windowFixedWidthMajor">@*android:dimen/dialog_fixed_width_major</item>
+	<item name="*android:windowFixedWidthMinor">@*android:dimen/dialog_fixed_width_minor</item>
+	<item name="*android:windowFixedHeightMajor">@*android:dimen/dialog_fixed_height_major</item>
+	<item name="*android:windowFixedHeightMinor">@*android:dimen/dialog_fixed_height_minor</item>
+
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of Theme.DeviceDefault.Dialog.NoActionBar that has a fixed size. -->
+    <style name="Theme.DeviceDefault.Light.Dialog.NoActionBar.FixedSize" parent="@*android:style/Theme.Material" >
+	<item name="*android:windowFixedWidthMajor">@*android:dimen/dialog_fixed_width_major</item>
+	<item name="*android:windowFixedWidthMinor">@*android:dimen/dialog_fixed_width_minor</item>
+	<item name="*android:windowFixedHeightMajor">@*android:dimen/dialog_fixed_height_major</item>
+	<item name="*android:windowFixedHeightMinor">@*android:dimen/dialog_fixed_height_minor</item>
+
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+
+    </style>
+
+    <!-- DeviceDefault light theme for a window that will be displayed either full-screen on smaller
+    screens (small, normal) or as a dialog on larger screens (large, xlarge). -->
+    <style name="Theme.DeviceDefault.Light.DialogWhenLarge" parent="@*android:style/Theme.Material.DialogWhenLarge">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- DeviceDefault light theme for a window without an action bar that will be displayed either
+    full-screen on smaller screens (small, normal) or as a dialog on larger screens (large,
+    xlarge). -->
+    <style name="Theme.DeviceDefault.Light.DialogWhenLarge.NoActionBar" parent="@*android:style/Theme.Material.DialogWhenLarge.NoActionBar">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- DeviceDefault light theme for a presentation window on a secondary display. -->
+    <style name="Theme.DeviceDefault.Light.Dialog.Presentation" parent="@*android:style/Theme.Material.Dialog.Presentation">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- DeviceDefault light theme for panel windows. This removes all extraneous window
+    decorations, so you basically have an empty rectangle in which to place your content. It makes
+    the window floating, with a transparent background, and turns off dimming behind the window. -->
+    <style name="Theme.DeviceDefault.Light.Panel" parent="@*android:style/Theme.Material.Panel">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Light.Dialog.Alert" parent="@*android:style/Theme.Material.Dialog.Alert">
+	<item name="android:windowTitleStyle">@*android:style/DialogWindowTitle.DeviceDefault</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Light.SearchBar" parent="@*android:style/Theme.Material.SearchBar">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Light.Voice" parent="@*android:style/Theme.Material.Voice">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.QuickSettings" parent="@*android:style/Theme.DeviceDefault">
+        <item name="android:colorBackgroundFloating">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+<!--
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+-->
+    </style>
+
+    <style name="qs_base" parent="@*android:style/Theme.DeviceDefault">
+        <item name="android:colorBackgroundFloating">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.QuickSettings.Dialog" parent="@*android:style/Theme.DeviceDefault.Dialog">
+        <item name="android:colorBackgroundFloating">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Settings_Dark} with no action bar -->
+    <style name="Theme.DeviceDefault.Settings.Dark.NoActionBar" parent="@*android:style/Theme.Material.NoActionBar">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Settings.Dialog" parent="@*android:style/Theme.Material.Settings.Dialog">
+        <item name="android:colorBackground">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Settings.DialogWhenLarge" parent="@*android:style/Theme.Material.Settings.DialogWhenLarge">
+        <item name="android:colorBackground">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Settings.Dialog.Alert" parent="@*android:style/Theme.Material.Settings.Dialog.Alert">
+	<!-- darkobas -->
+	<item name="android:colorBackgroundFloating">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Settings.Dialog.NoActionBar" parent="@*android:style/Theme.DeviceDefault.Dialog.NoActionBar"/>
+
+    <!-- Theme used for the intent picker activity. -->
+    <style name="Theme.DeviceDefault.Resolver" parent="@*android:style/Theme.Material">
+	<item name="android:windowEnterTransition">@empty</item>
+	<item name="android:windowExitTransition">@empty</item>
+	<item name="android:windowIsTranslucent">true</item>
+	<item name="android:windowNoTitle">true</item>
+	<item name="android:windowBackground">@*android:color/transparent</item>
+	<item name="android:backgroundDimEnabled">true</item>
+	<item name="android:statusBarColor">@*android:color/transparent</item>
+	<item name="android:windowContentOverlay">@null</item>
+	<item name="android:colorControlActivated">?*android:attr/colorControlHighlight</item>
+	<item name="android:listPreferredItemPaddingStart">?*android:attr/dialogPreferredPadding</item>
+	<item name="android:listPreferredItemPaddingEnd">?*android:attr/dialogPreferredPadding</item>
+
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- @hide Theme overlay that inherits from material actionbar,  and use accent color for
+             primary text -->
+    <style name="ThemeOverlay.DeviceDefault.ActionBar.Accent" parent="@*android:style/ThemeOverlay.Material.ActionBar">
+        <item name="android:textColorPrimary">@*android:color/btn_colored_borderless_text_material</item>
+    </style>
+
+    <!-- @hide Theme overlay for a light popup in action bar -->
+    <style name="ThemeOverlay.DeviceDefault.Popup.Light" parent="@*android:style/ThemeOverlay.Material" />
+
+    <style name="ThemeOverlay.DeviceDefault.Accent"  parent="@*android:style/Theme.Material" >
+        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
+    </style>
+
+    <style name="ThemeOverlay.DeviceDefault.Accent.Light" parent="@*android:style/Theme.Material" >
+        <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+    </style>
+
+    <style name="ThemeOverlay.DeviceDefault.Dark.ActionBar.Accent" parent="*android:style/ThemeOverlay.Material.Dark.ActionBar">
+        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
+    </style>
+
+    <style name="Widget.DeviceDefault.Light.CheckedTextView" parent="*android:style/Widget.Material.CheckedTextView" />
+
+    <style name="Widget.DeviceDefault.Light.EditText" parent="*android:style/Widget.Material.EditText" />
+</resources>
diff --git a/google/themes/PrimaryBlack/Android.mk b/google/themes/PrimaryBlack/Android.mk
new file mode 100644
index 0000000..9ea3767
--- /dev/null
+++ b/google/themes/PrimaryBlack/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := PrimaryBlack
+LOCAL_RRO_THEME := PrimaryBlack
+LOCAL_CERTIFICATE := platform
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+include $(BUILD_RRO_PACKAGE)
diff --git a/google/themes/PrimaryBlack/AndroidManifest.xml b/google/themes/PrimaryBlack/AndroidManifest.xml
new file mode 100644
index 0000000..efe4136
--- /dev/null
+++ b/google/themes/PrimaryBlack/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.omnirom.theme.primary.black"
+    platformBuildVersionCode="26"
+    platformBuildVersionName="8.0.0">
+
+    <overlay android:priority="2" android:targetPackage="android" />
+
+
+    <application android:hasCode="false"
+                 android:label="Black" />
+</manifest>
diff --git a/google/themes/PrimaryBlack/res/color/ripple_material_light.xml b/google/themes/PrimaryBlack/res/color/ripple_material_light.xml
new file mode 100644
index 0000000..07ce558
--- /dev/null
+++ b/google/themes/PrimaryBlack/res/color/ripple_material_light.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:alpha="@*android:dimen/highlight_alpha_material_light"
+          android:color="@*android:color/omni_color5" />
+</selector>
diff --git a/google/themes/PrimaryBlack/res/drawable/toast_frame.xml b/google/themes/PrimaryBlack/res/drawable/toast_frame.xml
new file mode 100644
index 0000000..5738837
--- /dev/null
+++ b/google/themes/PrimaryBlack/res/drawable/toast_frame.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2017, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <!-- background is material_grey_200 with .9 alpha -->
+    <solid android:color="@*android:color/omni_color9" />
+    <corners android:radius="22dp" />
+</shape>
+
diff --git a/google/themes/PrimaryBlack/res/values/colors.xml b/google/themes/PrimaryBlack/res/values/colors.xml
new file mode 100644
index 0000000..343a402
--- /dev/null
+++ b/google/themes/PrimaryBlack/res/values/colors.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="omni_theme_color">@color/omni_color1</color>
+    <color name="user_icon_1">#ffff367c</color>
+    <color name="user_icon_2">#ffff4c8b</color>
+    <color name="user_icon_3">#ffff6299</color>
+    <color name="user_icon_4">#ffff6299</color>
+    <color name="system_error">#ffff4120</color>
+
+    <color name="omni_text1">#ffe5e5e5</color> <!-- text primary -->
+    <color name="omni_text2">#b3e5e5e5</color>  <!-- text secondary -->
+    <color name="omni_text3">#a0e5e5e5</color>  <!-- text tertiary -->
+    <color name="omni_text4">#dee5e5e5</color>  <!-- text tertiary -->
+    <color name="omni_color1">#ff000000</color> <!-- PRIMARY DARK -->
+    <color name="omni_color2">#ff050505</color> <!-- PRIMARY LIGHT -->
+    <color name="omni_color6">#b3e5e5e5</color> <!-- WIFI ICON IN DETAILS -->
+    <color name="omni_color7">#ff101010</color> <!-- FLOATING DIALOG COLOR ON VERY DARK THEMES MAKE THIS A BIT LIGHTER -->
+    <color name="omni_color8">#ff23aaaf</color> <!-- SPECIAL (CHECK WHERE THIS IS ASSIGNED) -->
+    <color name="omni_color9">#e6101010</color> <!-- TOAST (NEEDS SOME ALPHA) -->
+
+    <!-- PRIMARY LIGHT -->
+    <color name="primary_dark_device_default_settings">@*android:color/omni_color2</color> <!-- Main BG settings -->
+    <color name="background_material_dark">@*android:color/omni_color2</color> <!-- some kind of overlay of the main bg -->
+    <color name="primary_dark_device_default_light">@*android:color/omni_color2</color>
+    <color name="secondary_device_default_settings">@*android:color/omni_color2</color> <!-- Edit Quick Settings bottom parent of secondary_material_settings -->
+    <color name="condition_card_background">@*android:color/omni_color2</color>
+
+    <!-- PRIMARY_DARK -->
+    <color name="primary_dark_material_settings_light">@*android:color/omni_color1</color> <!-- settings statusbar -->
+
+    <color name="suggestion_condition_background">@*android:color/omni_color1</color>
+    <color name="secondary_device_default_settings_light">@*android:color/omni_color1</color>  <!-- settings entity, ie battery top view background -->
+    <color name="primary_device_default_settings">@*android:color/omni_color1</color> <!-- QS -->
+
+    <color name="dialog_background_material">@*android:color/omni_color1</color>
+
+    <!-- specials -->
+    <color name="btn_colored_text_material">@*android:color/omni_color2</color><!-- example: Uninstall button in app manager -->
+    <color name="global_wifi_details_icon_color">@*android:color/omni_color6</color> <!-- settings/wifi/details iconsy -->
+
+    <color name="chooser_service_row_background_color">@*android:color/omni_color1</color> <!-- resolver -->
+<!--    <color name="primary_text_inverse_when_activated_material">#a0989898</color> --><!-- very rare -->
+    <color name="primary_text_disable_only_material_dark">@*android:color/omni_text3</color> <!-- display/font or bt details -->
+
+
+    <!-- qs -->
+    <color name="material_grey_900">@*android:color/omni_color1</color>  <!-- find a better way to do this -->
+    <color name="zen_introduction">@*android:color/omni_color1</color>
+
+    <!-- Dialogs -->
+    <color name="background_floating_material_dark">@*android:color/omni_color7</color> <!-- dialogs like sime settins -->
+
+</resources>
diff --git a/google/themes/PrimaryBlack/res/values/config.xml b/google/themes/PrimaryBlack/res/values/config.xml
new file mode 100644
index 0000000..a1802c8
--- /dev/null
+++ b/google/themes/PrimaryBlack/res/values/config.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="config_useDarkBgNotificationIconTextTinting">true</bool>
+    <bool name="config_enableNightMode">true</bool>
+</resources>
diff --git a/google/themes/PrimaryBlack/res/values/settings.xml b/google/themes/PrimaryBlack/res/values/settings.xml
new file mode 100644
index 0000000..2b9e570
--- /dev/null
+++ b/google/themes/PrimaryBlack/res/values/settings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.DeviceDefault.Settings" parent="@*android:style/Theme.Material">
+        <item name="android:actionBarTheme">@*android:style/ThemeOverlay.DeviceDefault.ActionBar.Accent</item>
+        <item name="android:popupTheme">@*android:style/ThemeOverlay.DeviceDefault.Popup.Light</item>
+        <item name="android:colorEdgeEffect">@*android:color/omni_color4</item>
+        <item name="android:navigationBarDividerColor">#00000000</item>
+        <item name="android:navigationBarColor">@*android:color/omni_color2</item>
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorForeground">@*android:color/omni_text_primary</item>
+
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+ 
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text3</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:colorControlHighlight">@*android:color/omni_color7</item>
+        <item name="android:colorControlActivated">@*android:color/omni_color5</item>
+
+    </style>
+</resources>
diff --git a/google/themes/PrimaryBlack/res/values/strings.xml b/google/themes/PrimaryBlack/res/values/strings.xml
new file mode 100644
index 0000000..bf20dad
--- /dev/null
+++ b/google/themes/PrimaryBlack/res/values/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2017, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <string name="@*android:sysui_overlay_dark">Dark</string>
+
+</resources>
+
diff --git a/google/themes/PrimaryBlack/res/values/styles.xml b/google/themes/PrimaryBlack/res/values/styles.xml
new file mode 100644
index 0000000..2bfc794
--- /dev/null
+++ b/google/themes/PrimaryBlack/res/values/styles.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="TextAppearance.Material.Widget.DropDownItem" parent="@*android:style/TextAppearance.Material.Menu.Inverse" />
+    <style name="Widget.Material.DropDownItem.Spinner" parent="@*android:style/Theme.Material" >
+        <item name="android:paddingStart">8dp</item>
+        <item name="android:paddingEnd">8dp</item>
+        <item name="android:paddingTop">8dp</item>
+        <item name="android:colorBackgroundFloating">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+
+    </style>
+
+</resources>
diff --git a/google/themes/PrimaryBlack/res/values/themes.xml b/google/themes/PrimaryBlack/res/values/themes.xml
new file mode 100644
index 0000000..bdd4d9c
--- /dev/null
+++ b/google/themes/PrimaryBlack/res/values/themes.xml
@@ -0,0 +1,494 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Variant of the DeviceDefault (light) theme that has a solid (opaque) action bar with an
+    inverse color profile. -->
+    <style name="Theme.DeviceDefault.Light.DarkActionBar" parent="@*android:style/Theme.Material.Light.DarkActionBar">
+	<!-- Color palette -->
+	<item name="android:colorPrimary">@*android:color/omni_color2</item>
+	<item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+	<item name="android:colorSecondary">@*android:color/omni_color1</item>
+	<item name="android:colorAccent">@*android:color/omni_color5</item>
+
+	<item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+	<item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+	<item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+	<item name="android:textColorHint">@*android:color/omni_color3</item>
+	<item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+
+    </style>
+    <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar -->
+    <style name="Theme.DeviceDefault.Light.NoActionBar" parent="@*android:style/Theme.Material.NoActionBar">
+	<!-- package installer acitivity example -->
+        <item name="android:colorBackground">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar and no status bar.
+	 This theme sets {@link android.R.attr#windowFullscreen} to true.  -->
+    <style name="Theme.DeviceDefault.Light.NoActionBar.Fullscreen" parent="@*android:style/Theme.Material.NoActionBar.Fullscreen">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar and no status bar
+    and extending in to overscan region.  This theme
+    sets {@link android.R.attr#windowFullscreen} and {@link android.R.attr#windowOverscan}
+    to true. -->
+    <style name="Theme.DeviceDefault.Light.NoActionBar.Overscan" parent="@*android:style/Theme.Material.NoActionBar.Overscan">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Light} that has no title bar and translucent
+	 system decor.  This theme sets {@link android.R.attr#windowTranslucentStatus} and
+	 {@link android.R.attr#windowTranslucentNavigation} to true. -->
+    <style name="Theme.DeviceDefault.Light.NoActionBar.TranslucentDecor" parent="@*android:style/Theme.Material.NoActionBar.TranslucentDecor">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- DeviceDefault light theme for dialog windows and activities. This changes the window to be
+    floating (not fill the entire screen), and puts a frame around its contents. You can set this
+    theme on an activity if you would like to make an activity that looks like a Dialog.-->
+    <style name="Theme.DeviceDefault.Light.Dialog" parent="@*android:style/Theme.Material.Dialog">
+	<item name="android:windowTitleStyle">@*android:style/DialogWindowTitle.DeviceDefault</item>
+	<item name="android:windowAnimationStyle">@*android:style/Animation.DeviceDefault.Dialog</item>
+
+	<item name="android:buttonBarStyle">@*android:style/DeviceDefault.ButtonBar.AlertDialog</item>
+	<item name="android:borderlessButtonStyle">@*android:style/Widget.DeviceDefault.Button.Borderless.Small</item>
+
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} that has a nice minimum width for a
+    regular dialog. -->
+    <style name="Theme.DeviceDefault.Light.Dialog.MinWidth" parent="@*android:style/Theme.Material.Dialog.MinWidth">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+
+    </style>
+
+     <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} without an action bar -->
+    <style name="Theme.DeviceDefault.Light.Dialog.NoActionBar" parent="@*android:style/Theme.Material.Dialog.NoActionBar">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog_NoActionBar} that has a nice minimum
+    width for a regular dialog. -->
+    <style name="Theme.DeviceDefault.Light.Dialog.NoActionBar.MinWidth" parent="@*android:style/Theme.Material.Dialog.NoActionBar.MinWidth">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of Theme.DeviceDefault.Dialog that has a fixed size. -->
+    <style name="Theme.DeviceDefault.Light.Dialog.FixedSize" parent="@*android:style/Theme.Material" >
+	<item name="*android:windowFixedWidthMajor">@*android:dimen/dialog_fixed_width_major</item>
+	<item name="*android:windowFixedWidthMinor">@*android:dimen/dialog_fixed_width_minor</item>
+	<item name="*android:windowFixedHeightMajor">@*android:dimen/dialog_fixed_height_major</item>
+	<item name="*android:windowFixedHeightMinor">@*android:dimen/dialog_fixed_height_minor</item>
+
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of Theme.DeviceDefault.Dialog.NoActionBar that has a fixed size. -->
+    <style name="Theme.DeviceDefault.Light.Dialog.NoActionBar.FixedSize" parent="@*android:style/Theme.Material" >
+	<item name="*android:windowFixedWidthMajor">@*android:dimen/dialog_fixed_width_major</item>
+	<item name="*android:windowFixedWidthMinor">@*android:dimen/dialog_fixed_width_minor</item>
+	<item name="*android:windowFixedHeightMajor">@*android:dimen/dialog_fixed_height_major</item>
+	<item name="*android:windowFixedHeightMinor">@*android:dimen/dialog_fixed_height_minor</item>
+
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+
+    </style>
+
+    <!-- DeviceDefault light theme for a window that will be displayed either full-screen on smaller
+    screens (small, normal) or as a dialog on larger screens (large, xlarge). -->
+    <style name="Theme.DeviceDefault.Light.DialogWhenLarge" parent="@*android:style/Theme.Material.DialogWhenLarge">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- DeviceDefault light theme for a window without an action bar that will be displayed either
+    full-screen on smaller screens (small, normal) or as a dialog on larger screens (large,
+    xlarge). -->
+    <style name="Theme.DeviceDefault.Light.DialogWhenLarge.NoActionBar" parent="@*android:style/Theme.Material.DialogWhenLarge.NoActionBar">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- DeviceDefault light theme for a presentation window on a secondary display. -->
+    <style name="Theme.DeviceDefault.Light.Dialog.Presentation" parent="@*android:style/Theme.Material.Dialog.Presentation">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- DeviceDefault light theme for panel windows. This removes all extraneous window
+    decorations, so you basically have an empty rectangle in which to place your content. It makes
+    the window floating, with a transparent background, and turns off dimming behind the window. -->
+    <style name="Theme.DeviceDefault.Light.Panel" parent="@*android:style/Theme.Material.Panel">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Light.Dialog.Alert" parent="@*android:style/Theme.Material.Dialog.Alert">
+	<item name="android:windowTitleStyle">@*android:style/DialogWindowTitle.DeviceDefault</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Light.SearchBar" parent="@*android:style/Theme.Material.SearchBar">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Light.Voice" parent="@*android:style/Theme.Material.Voice">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.QuickSettings" parent="@*android:style/Theme.DeviceDefault">
+        <item name="android:colorBackgroundFloating">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+<!--
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+-->
+    </style>
+
+    <style name="qs_base" parent="@*android:style/Theme.DeviceDefault">
+        <item name="android:colorBackgroundFloating">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.QuickSettings.Dialog" parent="@*android:style/Theme.DeviceDefault.Dialog">
+        <item name="android:colorBackgroundFloating">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Settings_Dark} with no action bar -->
+    <style name="Theme.DeviceDefault.Settings.Dark.NoActionBar" parent="@*android:style/Theme.Material.NoActionBar">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Settings.Dialog" parent="@*android:style/Theme.Material.Settings.Dialog">
+        <item name="android:colorBackground">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Settings.DialogWhenLarge" parent="@*android:style/Theme.Material.Settings.DialogWhenLarge">
+        <item name="android:colorBackground">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Settings.Dialog.Alert" parent="@*android:style/Theme.Material.Settings.Dialog.Alert">
+	<!-- darkobas -->
+	<item name="android:colorBackgroundFloating">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Settings.Dialog.NoActionBar" parent="@*android:style/Theme.DeviceDefault.Dialog.NoActionBar"/>
+
+    <!-- Theme used for the intent picker activity. -->
+    <style name="Theme.DeviceDefault.Resolver" parent="@*android:style/Theme.Material">
+	<item name="android:windowEnterTransition">@empty</item>
+	<item name="android:windowExitTransition">@empty</item>
+	<item name="android:windowIsTranslucent">true</item>
+	<item name="android:windowNoTitle">true</item>
+	<item name="android:windowBackground">@*android:color/transparent</item>
+	<item name="android:backgroundDimEnabled">true</item>
+	<item name="android:statusBarColor">@*android:color/transparent</item>
+	<item name="android:windowContentOverlay">@null</item>
+	<item name="android:colorControlActivated">?*android:attr/colorControlHighlight</item>
+	<item name="android:listPreferredItemPaddingStart">?*android:attr/dialogPreferredPadding</item>
+	<item name="android:listPreferredItemPaddingEnd">?*android:attr/dialogPreferredPadding</item>
+
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- @hide Theme overlay that inherits from material actionbar,  and use accent color for
+             primary text -->
+    <style name="ThemeOverlay.DeviceDefault.ActionBar.Accent" parent="@*android:style/ThemeOverlay.Material.ActionBar">
+        <item name="android:textColorPrimary">@*android:color/btn_colored_borderless_text_material</item>
+    </style>
+
+    <!-- @hide Theme overlay for a light popup in action bar -->
+    <style name="ThemeOverlay.DeviceDefault.Popup.Light" parent="@*android:style/ThemeOverlay.Material" />
+
+    <style name="ThemeOverlay.DeviceDefault.Accent"  parent="@*android:style/Theme.Material" >
+        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
+    </style>
+
+    <style name="ThemeOverlay.DeviceDefault.Accent.Light" parent="@*android:style/Theme.Material" >
+        <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+    </style>
+
+    <style name="ThemeOverlay.DeviceDefault.Dark.ActionBar.Accent" parent="*android:style/ThemeOverlay.Material.Dark.ActionBar">
+        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
+    </style>
+
+    <style name="Widget.DeviceDefault.Light.CheckedTextView" parent="*android:style/Widget.Material.CheckedTextView" />
+
+    <style name="Widget.DeviceDefault.Light.EditText" parent="*android:style/Widget.Material.EditText" />
+</resources>
diff --git a/google/themes/PrimaryColdWhite/Android.mk b/google/themes/PrimaryColdWhite/Android.mk
new file mode 100644
index 0000000..9ac1a8d
--- /dev/null
+++ b/google/themes/PrimaryColdWhite/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := PrimaryColdWhite
+LOCAL_RRO_THEME := PrimaryColdWhite
+LOCAL_CERTIFICATE := platform
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+include $(BUILD_RRO_PACKAGE)
diff --git a/google/themes/PrimaryColdWhite/AndroidManifest.xml b/google/themes/PrimaryColdWhite/AndroidManifest.xml
new file mode 100644
index 0000000..ccbd480
--- /dev/null
+++ b/google/themes/PrimaryColdWhite/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.omnirom.theme.primary.coldwhite"
+    platformBuildVersionCode="26"
+    platformBuildVersionName="8.0.0">
+
+    <overlay android:priority="2" android:targetPackage="android" />
+
+
+    <application android:hasCode="false"
+                 android:label="ColdWhite" />
+</manifest>
diff --git a/google/themes/PrimaryColdWhite/res/color/ripple_material_light.xml b/google/themes/PrimaryColdWhite/res/color/ripple_material_light.xml
new file mode 100644
index 0000000..07ce558
--- /dev/null
+++ b/google/themes/PrimaryColdWhite/res/color/ripple_material_light.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:alpha="@*android:dimen/highlight_alpha_material_light"
+          android:color="@*android:color/omni_color5" />
+</selector>
diff --git a/google/themes/PrimaryColdWhite/res/drawable/toast_frame.xml b/google/themes/PrimaryColdWhite/res/drawable/toast_frame.xml
new file mode 100644
index 0000000..5738837
--- /dev/null
+++ b/google/themes/PrimaryColdWhite/res/drawable/toast_frame.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2017, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <!-- background is material_grey_200 with .9 alpha -->
+    <solid android:color="@*android:color/omni_color9" />
+    <corners android:radius="22dp" />
+</shape>
+
diff --git a/google/themes/PrimaryColdWhite/res/values/colors.xml b/google/themes/PrimaryColdWhite/res/values/colors.xml
new file mode 100644
index 0000000..0cd539d
--- /dev/null
+++ b/google/themes/PrimaryColdWhite/res/values/colors.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="omni_theme_color">@color/omni_color1</color>
+    <color name="user_icon_1">#ffff367c</color>
+    <color name="user_icon_2">#ffff4c8b</color>
+    <color name="user_icon_3">#ffff6299</color>
+    <color name="user_icon_4">#ffff6299</color>
+    <color name="system_error">#ffff4120</color>
+
+    <color name="omni_text1">#ff252525</color> <!-- text primary -->
+    <color name="omni_text2">#b3252525</color>  <!-- text secondary -->
+    <color name="omni_text3">#b3252525</color>  <!-- text tertiary -->
+    <color name="omni_text4">#de252525</color>  <!-- text toast -->
+    <color name="omni_color1">#ffe0e5e5</color> <!-- PRIMARY DARK -->
+    <color name="omni_color2">#fff9ffff</color> <!-- PRIMARY LIGHT -->
+    <color name="omni_color6">#b3050505</color> <!-- WIFI ICON IN DETAILS -->
+    <color name="omni_color7">#fff9ffff</color> <!-- FLOATING DIALOG COLOR ON VERY DARK THEMES MAKE THIS A BIT LIGHTER -->
+    <color name="omni_color8">#fff9fcff</color> <!-- SPECIAL (CHECK WHERE THIS IS ASSIGNED) -->
+    <color name="omni_color9">#e6f7fcff</color> <!-- TOAST (NEEDS SOME ALPHA) -->
+
+    <!-- PRIMARY LIGHT -->
+    <color name="condition_card_background">@*android:color/omni_color2</color>
+    <color name="primary_device_default_settings_light">@*android:color/omni_color2</color>
+    <color name="secondary_material_settings_light">@*android:color/omni_color2</color>
+
+    <!-- PRIMARY_DARK -->
+    <color name="primary_dark_material_settings_light">@*android:color/omni_color1</color> <!-- settings statusbar -->
+    <color name="primary_dark_device_default_settings_light">@*android:color/omni_color1</color>
+    <color name="primary_material_settings_light">@*android:color/omni_color1</color>
+
+    <color name="suggestion_condition_background">@*android:color/omni_color1</color>
+    <color name="secondary_device_default_settings_light">@*android:color/omni_color1</color>  <!-- settings entity, ie battery top view background -->
+    <color name="primary_device_default_settings">@*android:color/omni_color1</color> <!-- QS -->
+
+    <color name="dialog_background_material">@*android:color/omni_color1</color>
+
+    <!-- specials -->
+    <color name="btn_colored_text_material">@*android:color/omni_color2</color><!-- example: Uninstall button in app manager -->
+    <color name="global_wifi_details_icon_color">@*android:color/omni_color6</color> <!-- settings/wifi/details iconsy -->
+
+    <color name="chooser_service_row_background_color">@*android:color/omni_color1</color> <!-- resolver -->
+<!--    <color name="primary_text_inverse_when_activated_material">#a0989898</color> --><!-- very rare -->
+    <color name="primary_text_disable_only_material_dark">@*android:color/omni_text3</color> <!-- display/font or bt details -->
+
+    <!-- Dialogs -->
+    <color name="background_floating_material_dark">@*android:color/omni_color7</color> <!-- dialogs like sime settins -->
+
+    <color name="zen_introduction">@*android:color/omni_color1</color>
+
+</resources>
diff --git a/google/themes/PrimaryColdWhite/res/values/config.xml b/google/themes/PrimaryColdWhite/res/values/config.xml
new file mode 100644
index 0000000..bc9a085
--- /dev/null
+++ b/google/themes/PrimaryColdWhite/res/values/config.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="config_useDarkBgNotificationIconTextTinting">false</bool>
+    <bool name="config_enableNightMode">false</bool>
+</resources>
diff --git a/google/themes/PrimaryColdWhite/res/values/settings.xml b/google/themes/PrimaryColdWhite/res/values/settings.xml
new file mode 100644
index 0000000..098e5da
--- /dev/null
+++ b/google/themes/PrimaryColdWhite/res/values/settings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.DeviceDefault.Settings" parent="@*android:style/Theme.Material.Settings">
+        <item name="android:actionBarTheme">@*android:style/ThemeOverlay.DeviceDefault.ActionBar.Accent</item>
+        <item name="android:popupTheme">@*android:style/ThemeOverlay.DeviceDefault.Popup.Light</item>
+        <item name="android:colorEdgeEffect">@*android:color/omni_color4</item>
+        <item name="android:navigationBarDividerColor">#1f000000</item>
+        <item name="android:navigationBarColor">@*android:color/omni_color2</item>
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorForeground">@*android:color/omni_color1</item>
+        <item name="android:colorBackground">@*android:color/omni_color2</item>
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+ 
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text3</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:colorControlHighlight">@*android:color/omni_color1</item>
+        <item name="android:colorControlActivated">@*android:color/omni_color5</item>
+
+    </style>
+</resources>
diff --git a/google/themes/PrimaryColdWhite/res/values/themes.xml b/google/themes/PrimaryColdWhite/res/values/themes.xml
new file mode 100644
index 0000000..e914ee2
--- /dev/null
+++ b/google/themes/PrimaryColdWhite/res/values/themes.xml
@@ -0,0 +1,445 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Variant of the DeviceDefault (light) theme that has a solid (opaque) action bar with an
+    inverse color profile. -->
+    <style name="Theme.DeviceDefault.Light.DarkActionBar" parent="@*android:style/Theme.Material.Light.DarkActionBar">
+	<!-- Color palette -->
+	<item name="android:colorPrimary">@*android:color/omni_color2</item>
+	<item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+	<item name="android:colorSecondary">@*android:color/omni_color1</item>
+	<item name="android:colorAccent">@*android:color/omni_color5</item>
+
+	<item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+	<item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+	<item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+	<item name="android:textColorHint">@*android:color/omni_color3</item>
+	<item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+
+    </style>
+    <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar -->
+    <style name="Theme.DeviceDefault.Light.NoActionBar" parent="@*android:style/Theme.Material.NoActionBar">
+	<!-- package installer acitivity example -->
+        <item name="android:colorBackground">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar and no status bar.
+	 This theme sets {@link android.R.attr#windowFullscreen} to true.  -->
+    <style name="Theme.DeviceDefault.Light.NoActionBar.Fullscreen" parent="@*android:style/Theme.Material.NoActionBar.Fullscreen">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar and no status bar
+    and extending in to overscan region.  This theme
+    sets {@link android.R.attr#windowFullscreen} and {@link android.R.attr#windowOverscan}
+    to true. -->
+    <style name="Theme.DeviceDefault.Light.NoActionBar.Overscan" parent="@*android:style/Theme.Material.NoActionBar.Overscan">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Light} that has no title bar and translucent
+	 system decor.  This theme sets {@link android.R.attr#windowTranslucentStatus} and
+	 {@link android.R.attr#windowTranslucentNavigation} to true. -->
+    <style name="Theme.DeviceDefault.Light.NoActionBar.TranslucentDecor" parent="@*android:style/Theme.Material.NoActionBar.TranslucentDecor">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- DeviceDefault light theme for dialog windows and activities. This changes the window to be
+    floating (not fill the entire screen), and puts a frame around its contents. You can set this
+    theme on an activity if you would like to make an activity that looks like a Dialog.-->
+    <style name="Theme.DeviceDefault.Light.Dialog" parent="@*android:style/Theme.Material.Dialog">
+	<item name="android:windowTitleStyle">@*android:style/DialogWindowTitle.DeviceDefault</item>
+	<item name="android:windowAnimationStyle">@*android:style/Animation.DeviceDefault.Dialog</item>
+
+	<item name="android:buttonBarStyle">@*android:style/DeviceDefault.ButtonBar.AlertDialog</item>
+	<item name="android:borderlessButtonStyle">@*android:style/Widget.DeviceDefault.Button.Borderless.Small</item>
+
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} that has a nice minimum width for a
+    regular dialog. -->
+    <style name="Theme.DeviceDefault.Light.Dialog.MinWidth" parent="@*android:style/Theme.Material.Dialog.MinWidth">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+
+    </style>
+
+     <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} without an action bar -->
+    <style name="Theme.DeviceDefault.Light.Dialog.NoActionBar" parent="@*android:style/Theme.Material.Dialog.NoActionBar">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog_NoActionBar} that has a nice minimum
+    width for a regular dialog. -->
+    <style name="Theme.DeviceDefault.Light.Dialog.NoActionBar.MinWidth" parent="@*android:style/Theme.Material.Dialog.NoActionBar.MinWidth">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of Theme.DeviceDefault.Dialog that has a fixed size. -->
+    <style name="Theme.DeviceDefault.Light.Dialog.FixedSize" parent="@*android:style/Theme.Material" >
+	<item name="*android:windowFixedWidthMajor">@*android:dimen/dialog_fixed_width_major</item>
+	<item name="*android:windowFixedWidthMinor">@*android:dimen/dialog_fixed_width_minor</item>
+	<item name="*android:windowFixedHeightMajor">@*android:dimen/dialog_fixed_height_major</item>
+	<item name="*android:windowFixedHeightMinor">@*android:dimen/dialog_fixed_height_minor</item>
+
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of Theme.DeviceDefault.Dialog.NoActionBar that has a fixed size. -->
+    <style name="Theme.DeviceDefault.Light.Dialog.NoActionBar.FixedSize" parent="@*android:style/Theme.Material" >
+	<item name="*android:windowFixedWidthMajor">@*android:dimen/dialog_fixed_width_major</item>
+	<item name="*android:windowFixedWidthMinor">@*android:dimen/dialog_fixed_width_minor</item>
+	<item name="*android:windowFixedHeightMajor">@*android:dimen/dialog_fixed_height_major</item>
+	<item name="*android:windowFixedHeightMinor">@*android:dimen/dialog_fixed_height_minor</item>
+
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+
+    </style>
+
+    <!-- DeviceDefault light theme for a window that will be displayed either full-screen on smaller
+    screens (small, normal) or as a dialog on larger screens (large, xlarge). -->
+    <style name="Theme.DeviceDefault.Light.DialogWhenLarge" parent="@*android:style/Theme.Material.DialogWhenLarge">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- DeviceDefault light theme for a window without an action bar that will be displayed either
+    full-screen on smaller screens (small, normal) or as a dialog on larger screens (large,
+    xlarge). -->
+    <style name="Theme.DeviceDefault.Light.DialogWhenLarge.NoActionBar" parent="@*android:style/Theme.Material.DialogWhenLarge.NoActionBar">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- DeviceDefault light theme for a presentation window on a secondary display. -->
+    <style name="Theme.DeviceDefault.Light.Dialog.Presentation" parent="@*android:style/Theme.Material.Dialog.Presentation">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- DeviceDefault light theme for panel windows. This removes all extraneous window
+    decorations, so you basically have an empty rectangle in which to place your content. It makes
+    the window floating, with a transparent background, and turns off dimming behind the window. -->
+    <style name="Theme.DeviceDefault.Light.Panel" parent="@*android:style/Theme.Material.Panel">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Light.Dialog.Alert" parent="@*android:style/Theme.Material.Dialog.Alert">
+	<item name="android:windowTitleStyle">@*android:style/DialogWindowTitle.DeviceDefault</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Light.SearchBar" parent="@*android:style/Theme.Material.SearchBar">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Light.Voice" parent="@*android:style/Theme.Material.Voice">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Settings_Dark} with no action bar -->
+    <style name="Theme.DeviceDefault.Settings.Dark.NoActionBar" parent="@*android:style/Theme.Material.NoActionBar">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Settings.Dialog" parent="@*android:style/Theme.Material.Settings.Dialog">
+        <item name="android:colorBackground">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Settings.DialogWhenLarge" parent="@*android:style/Theme.Material.Settings.DialogWhenLarge">
+        <item name="android:colorBackground">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Settings.Dialog.Alert" parent="@*android:style/Theme.Material.Settings.Dialog.Alert">
+	<!-- darkobas -->
+	<item name="android:colorBackgroundFloating">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Settings.Dialog.NoActionBar" parent="@*android:style/Theme.DeviceDefault.Dialog.NoActionBar"/>
+
+    <!-- Theme used for the intent picker activity. -->
+    <style name="Theme.DeviceDefault.Resolver" parent="@*android:style/Theme.Material">
+	<item name="android:windowEnterTransition">@empty</item>
+	<item name="android:windowExitTransition">@empty</item>
+	<item name="android:windowIsTranslucent">true</item>
+	<item name="android:windowNoTitle">true</item>
+	<item name="android:windowBackground">@*android:color/transparent</item>
+	<item name="android:backgroundDimEnabled">true</item>
+	<item name="android:statusBarColor">@*android:color/transparent</item>
+	<item name="android:windowContentOverlay">@null</item>
+	<item name="android:colorControlActivated">?*android:attr/colorControlHighlight</item>
+	<item name="android:listPreferredItemPaddingStart">?*android:attr/dialogPreferredPadding</item>
+	<item name="android:listPreferredItemPaddingEnd">?*android:attr/dialogPreferredPadding</item>
+
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- @hide Theme overlay that inherits from material actionbar,  and use accent color for
+             primary text -->
+    <style name="ThemeOverlay.DeviceDefault.ActionBar.Accent" parent="@*android:style/ThemeOverlay.Material.ActionBar">
+        <item name="android:textColorPrimary">@*android:color/btn_colored_borderless_text_material</item>
+    </style>
+
+    <!-- @hide Theme overlay for a light popup in action bar -->
+    <style name="ThemeOverlay.DeviceDefault.Popup.Light" parent="@*android:style/ThemeOverlay.Material" />
+
+    <style name="ThemeOverlay.DeviceDefault.Accent"  parent="@*android:style/Theme.Material" >
+        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
+    </style>
+
+    <style name="ThemeOverlay.DeviceDefault.Accent.Light" parent="@*android:style/Theme.Material" >
+        <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+    </style>
+
+    <style name="ThemeOverlay.DeviceDefault.Dark.ActionBar.Accent" parent="*android:style/ThemeOverlay.Material.Dark.ActionBar">
+        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
+    </style>
+
+    <style name="Widget.DeviceDefault.Light.CheckedTextView" parent="*android:style/Widget.Material.CheckedTextView" />
+
+    <style name="Widget.DeviceDefault.Light.EditText" parent="*android:style/Widget.Material.EditText" />
+</resources>
diff --git a/google/themes/PrimaryDarkBlue/Android.mk b/google/themes/PrimaryDarkBlue/Android.mk
new file mode 100644
index 0000000..6642c36
--- /dev/null
+++ b/google/themes/PrimaryDarkBlue/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := PrimaryDarkBlue
+LOCAL_RRO_THEME := PrimaryDarkBlue
+LOCAL_CERTIFICATE := platform
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+include $(BUILD_RRO_PACKAGE)
diff --git a/google/themes/PrimaryDarkBlue/AndroidManifest.xml b/google/themes/PrimaryDarkBlue/AndroidManifest.xml
new file mode 100644
index 0000000..9946e76
--- /dev/null
+++ b/google/themes/PrimaryDarkBlue/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.omnirom.theme.primary.darkblue"
+    platformBuildVersionCode="26"
+    platformBuildVersionName="8.0.0">
+
+    <overlay android:priority="2" android:targetPackage="android" />
+
+
+    <application android:hasCode="false"
+                 android:label="Dark Blue" />
+</manifest>
diff --git a/google/themes/PrimaryDarkBlue/res/color/ripple_material_light.xml b/google/themes/PrimaryDarkBlue/res/color/ripple_material_light.xml
new file mode 100644
index 0000000..07ce558
--- /dev/null
+++ b/google/themes/PrimaryDarkBlue/res/color/ripple_material_light.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:alpha="@*android:dimen/highlight_alpha_material_light"
+          android:color="@*android:color/omni_color5" />
+</selector>
diff --git a/google/themes/PrimaryDarkBlue/res/drawable/toast_frame.xml b/google/themes/PrimaryDarkBlue/res/drawable/toast_frame.xml
new file mode 100644
index 0000000..5738837
--- /dev/null
+++ b/google/themes/PrimaryDarkBlue/res/drawable/toast_frame.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2017, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <!-- background is material_grey_200 with .9 alpha -->
+    <solid android:color="@*android:color/omni_color9" />
+    <corners android:radius="22dp" />
+</shape>
+
diff --git a/google/themes/PrimaryDarkBlue/res/values/colors.xml b/google/themes/PrimaryDarkBlue/res/values/colors.xml
new file mode 100644
index 0000000..6e7546a
--- /dev/null
+++ b/google/themes/PrimaryDarkBlue/res/values/colors.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="omni_theme_color">@color/omni_color1</color>
+    <color name="user_icon_1">#ffff367c</color>
+    <color name="user_icon_2">#ffff4c8b</color>
+    <color name="user_icon_3">#ffff6299</color>
+    <color name="user_icon_4">#ffff6299</color>
+    <color name="system_error">#ffff4120</color>
+
+    <color name="omni_text1">#fffefefe</color> <!-- text primary -->
+    <color name="omni_text2">#b3fefefe</color>  <!-- text secondary -->
+    <color name="omni_text3">#a0fefefe</color>  <!-- text tertiary -->
+    <color name="omni_text4">#defefefe</color>  <!-- text tertiary -->
+    <color name="omni_color1">#ff0d2029</color> <!-- PRIMARY DARK -->
+    <color name="omni_color2">#ff182a33</color> <!-- PRIMARY LIGHT -->
+    <color name="omni_color6">#b3fefefe</color> <!-- WIFI ICON IN DETAILS -->
+    <color name="omni_color7">#ff182a33</color> <!-- FLOATING DIALOG COLOR ON VERY DARK THEMES MAKE THIS A BIT LIGHTER -->
+    <color name="omni_color8">#ff00ffc5</color> <!-- SPECIAL (CHECK WHERE THIS IS ASSIGNED) -->
+    <color name="omni_color9">#e6182a33</color> <!-- TOAST (NEEDS SOME ALPHA) -->
+
+    <!-- PRIMARY LIGHT -->
+    <color name="primary_dark_device_default_settings">@*android:color/omni_color2</color> <!-- Main BG settings -->
+    <color name="background_material_dark">@*android:color/omni_color2</color> <!-- some kind of overlay of the main bg -->
+    <color name="primary_dark_device_default_light">@*android:color/omni_color2</color>
+    <color name="secondary_device_default_settings">@*android:color/omni_color2</color> <!-- Edit Quick Settings bottom parent of secondary_material_settings -->
+    <color name="condition_card_background">@*android:color/omni_color2</color>
+
+    <!-- PRIMARY_DARK -->
+    <color name="primary_dark_material_settings_light">@*android:color/omni_color1</color> <!-- settings statusbar -->
+
+    <color name="suggestion_condition_background">@*android:color/omni_color1</color>
+    <color name="secondary_device_default_settings_light">@*android:color/omni_color1</color>  <!-- settings entity, ie battery top view background -->
+    <color name="primary_device_default_settings">@*android:color/omni_color1</color> <!-- QS -->
+
+    <color name="dialog_background_material">@*android:color/omni_color1</color>
+
+    <!-- specials -->
+    <color name="btn_colored_text_material">@*android:color/omni_color2</color><!-- example: Uninstall button in app manager -->
+    <color name="global_wifi_details_icon_color">@*android:color/omni_color6</color> <!-- settings/wifi/details iconsy -->
+
+    <color name="chooser_service_row_background_color">@*android:color/omni_color1</color> <!-- resolver -->
+<!--    <color name="primary_text_inverse_when_activated_material">#a0989898</color> --><!-- very rare -->
+    <color name="primary_text_disable_only_material_dark">@*android:color/omni_text3</color> <!-- display/font or bt details -->
+
+
+    <!-- qs -->
+    <color name="material_grey_900">@*android:color/omni_color1</color>  <!-- find a better way to do this -->
+    <color name="zen_introduction">@*android:color/omni_color1</color>
+
+    <!-- Dialogs -->
+    <color name="background_floating_material_dark">@*android:color/omni_color7</color> <!-- dialogs like sime settins -->
+
+</resources>
diff --git a/google/themes/PrimaryDarkBlue/res/values/config.xml b/google/themes/PrimaryDarkBlue/res/values/config.xml
new file mode 100644
index 0000000..a1802c8
--- /dev/null
+++ b/google/themes/PrimaryDarkBlue/res/values/config.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="config_useDarkBgNotificationIconTextTinting">true</bool>
+    <bool name="config_enableNightMode">true</bool>
+</resources>
diff --git a/google/themes/PrimaryDarkBlue/res/values/settings.xml b/google/themes/PrimaryDarkBlue/res/values/settings.xml
new file mode 100644
index 0000000..8c94cbf
--- /dev/null
+++ b/google/themes/PrimaryDarkBlue/res/values/settings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.DeviceDefault.Settings" parent="@*android:style/Theme.Material">
+        <item name="android:actionBarTheme">@*android:style/ThemeOverlay.DeviceDefault.ActionBar.Accent</item>
+        <item name="android:popupTheme">@*android:style/ThemeOverlay.DeviceDefault.Popup.Light</item>
+        <item name="android:colorEdgeEffect">@*android:color/omni_color4</item>
+        <item name="android:navigationBarDividerColor">#00000000</item>
+        <item name="android:navigationBarColor">@*android:color/omni_color2</item>
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorForeground">@*android:color/omni_text_primary</item>
+
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+ 
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text3</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:colorControlHighlight">@*android:color/omni_color1</item>
+        <item name="android:colorControlActivated">@*android:color/omni_color5</item>
+
+    </style>
+</resources>
diff --git a/google/themes/PrimaryDarkBlue/res/values/strings.xml b/google/themes/PrimaryDarkBlue/res/values/strings.xml
new file mode 100644
index 0000000..bf20dad
--- /dev/null
+++ b/google/themes/PrimaryDarkBlue/res/values/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2017, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <string name="@*android:sysui_overlay_dark">Dark</string>
+
+</resources>
+
diff --git a/google/themes/PrimaryDarkBlue/res/values/styles.xml b/google/themes/PrimaryDarkBlue/res/values/styles.xml
new file mode 100644
index 0000000..2bfc794
--- /dev/null
+++ b/google/themes/PrimaryDarkBlue/res/values/styles.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="TextAppearance.Material.Widget.DropDownItem" parent="@*android:style/TextAppearance.Material.Menu.Inverse" />
+    <style name="Widget.Material.DropDownItem.Spinner" parent="@*android:style/Theme.Material" >
+        <item name="android:paddingStart">8dp</item>
+        <item name="android:paddingEnd">8dp</item>
+        <item name="android:paddingTop">8dp</item>
+        <item name="android:colorBackgroundFloating">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+
+    </style>
+
+</resources>
diff --git a/google/themes/PrimaryDarkBlue/res/values/themes.xml b/google/themes/PrimaryDarkBlue/res/values/themes.xml
new file mode 100644
index 0000000..bdd4d9c
--- /dev/null
+++ b/google/themes/PrimaryDarkBlue/res/values/themes.xml
@@ -0,0 +1,494 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Variant of the DeviceDefault (light) theme that has a solid (opaque) action bar with an
+    inverse color profile. -->
+    <style name="Theme.DeviceDefault.Light.DarkActionBar" parent="@*android:style/Theme.Material.Light.DarkActionBar">
+	<!-- Color palette -->
+	<item name="android:colorPrimary">@*android:color/omni_color2</item>
+	<item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+	<item name="android:colorSecondary">@*android:color/omni_color1</item>
+	<item name="android:colorAccent">@*android:color/omni_color5</item>
+
+	<item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+	<item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+	<item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+	<item name="android:textColorHint">@*android:color/omni_color3</item>
+	<item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+
+    </style>
+    <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar -->
+    <style name="Theme.DeviceDefault.Light.NoActionBar" parent="@*android:style/Theme.Material.NoActionBar">
+	<!-- package installer acitivity example -->
+        <item name="android:colorBackground">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar and no status bar.
+	 This theme sets {@link android.R.attr#windowFullscreen} to true.  -->
+    <style name="Theme.DeviceDefault.Light.NoActionBar.Fullscreen" parent="@*android:style/Theme.Material.NoActionBar.Fullscreen">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar and no status bar
+    and extending in to overscan region.  This theme
+    sets {@link android.R.attr#windowFullscreen} and {@link android.R.attr#windowOverscan}
+    to true. -->
+    <style name="Theme.DeviceDefault.Light.NoActionBar.Overscan" parent="@*android:style/Theme.Material.NoActionBar.Overscan">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Light} that has no title bar and translucent
+	 system decor.  This theme sets {@link android.R.attr#windowTranslucentStatus} and
+	 {@link android.R.attr#windowTranslucentNavigation} to true. -->
+    <style name="Theme.DeviceDefault.Light.NoActionBar.TranslucentDecor" parent="@*android:style/Theme.Material.NoActionBar.TranslucentDecor">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- DeviceDefault light theme for dialog windows and activities. This changes the window to be
+    floating (not fill the entire screen), and puts a frame around its contents. You can set this
+    theme on an activity if you would like to make an activity that looks like a Dialog.-->
+    <style name="Theme.DeviceDefault.Light.Dialog" parent="@*android:style/Theme.Material.Dialog">
+	<item name="android:windowTitleStyle">@*android:style/DialogWindowTitle.DeviceDefault</item>
+	<item name="android:windowAnimationStyle">@*android:style/Animation.DeviceDefault.Dialog</item>
+
+	<item name="android:buttonBarStyle">@*android:style/DeviceDefault.ButtonBar.AlertDialog</item>
+	<item name="android:borderlessButtonStyle">@*android:style/Widget.DeviceDefault.Button.Borderless.Small</item>
+
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} that has a nice minimum width for a
+    regular dialog. -->
+    <style name="Theme.DeviceDefault.Light.Dialog.MinWidth" parent="@*android:style/Theme.Material.Dialog.MinWidth">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+
+    </style>
+
+     <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} without an action bar -->
+    <style name="Theme.DeviceDefault.Light.Dialog.NoActionBar" parent="@*android:style/Theme.Material.Dialog.NoActionBar">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog_NoActionBar} that has a nice minimum
+    width for a regular dialog. -->
+    <style name="Theme.DeviceDefault.Light.Dialog.NoActionBar.MinWidth" parent="@*android:style/Theme.Material.Dialog.NoActionBar.MinWidth">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of Theme.DeviceDefault.Dialog that has a fixed size. -->
+    <style name="Theme.DeviceDefault.Light.Dialog.FixedSize" parent="@*android:style/Theme.Material" >
+	<item name="*android:windowFixedWidthMajor">@*android:dimen/dialog_fixed_width_major</item>
+	<item name="*android:windowFixedWidthMinor">@*android:dimen/dialog_fixed_width_minor</item>
+	<item name="*android:windowFixedHeightMajor">@*android:dimen/dialog_fixed_height_major</item>
+	<item name="*android:windowFixedHeightMinor">@*android:dimen/dialog_fixed_height_minor</item>
+
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of Theme.DeviceDefault.Dialog.NoActionBar that has a fixed size. -->
+    <style name="Theme.DeviceDefault.Light.Dialog.NoActionBar.FixedSize" parent="@*android:style/Theme.Material" >
+	<item name="*android:windowFixedWidthMajor">@*android:dimen/dialog_fixed_width_major</item>
+	<item name="*android:windowFixedWidthMinor">@*android:dimen/dialog_fixed_width_minor</item>
+	<item name="*android:windowFixedHeightMajor">@*android:dimen/dialog_fixed_height_major</item>
+	<item name="*android:windowFixedHeightMinor">@*android:dimen/dialog_fixed_height_minor</item>
+
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+
+    </style>
+
+    <!-- DeviceDefault light theme for a window that will be displayed either full-screen on smaller
+    screens (small, normal) or as a dialog on larger screens (large, xlarge). -->
+    <style name="Theme.DeviceDefault.Light.DialogWhenLarge" parent="@*android:style/Theme.Material.DialogWhenLarge">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- DeviceDefault light theme for a window without an action bar that will be displayed either
+    full-screen on smaller screens (small, normal) or as a dialog on larger screens (large,
+    xlarge). -->
+    <style name="Theme.DeviceDefault.Light.DialogWhenLarge.NoActionBar" parent="@*android:style/Theme.Material.DialogWhenLarge.NoActionBar">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- DeviceDefault light theme for a presentation window on a secondary display. -->
+    <style name="Theme.DeviceDefault.Light.Dialog.Presentation" parent="@*android:style/Theme.Material.Dialog.Presentation">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- DeviceDefault light theme for panel windows. This removes all extraneous window
+    decorations, so you basically have an empty rectangle in which to place your content. It makes
+    the window floating, with a transparent background, and turns off dimming behind the window. -->
+    <style name="Theme.DeviceDefault.Light.Panel" parent="@*android:style/Theme.Material.Panel">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Light.Dialog.Alert" parent="@*android:style/Theme.Material.Dialog.Alert">
+	<item name="android:windowTitleStyle">@*android:style/DialogWindowTitle.DeviceDefault</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Light.SearchBar" parent="@*android:style/Theme.Material.SearchBar">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Light.Voice" parent="@*android:style/Theme.Material.Voice">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.QuickSettings" parent="@*android:style/Theme.DeviceDefault">
+        <item name="android:colorBackgroundFloating">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+<!--
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+-->
+    </style>
+
+    <style name="qs_base" parent="@*android:style/Theme.DeviceDefault">
+        <item name="android:colorBackgroundFloating">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.QuickSettings.Dialog" parent="@*android:style/Theme.DeviceDefault.Dialog">
+        <item name="android:colorBackgroundFloating">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Settings_Dark} with no action bar -->
+    <style name="Theme.DeviceDefault.Settings.Dark.NoActionBar" parent="@*android:style/Theme.Material.NoActionBar">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Settings.Dialog" parent="@*android:style/Theme.Material.Settings.Dialog">
+        <item name="android:colorBackground">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Settings.DialogWhenLarge" parent="@*android:style/Theme.Material.Settings.DialogWhenLarge">
+        <item name="android:colorBackground">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Settings.Dialog.Alert" parent="@*android:style/Theme.Material.Settings.Dialog.Alert">
+	<!-- darkobas -->
+	<item name="android:colorBackgroundFloating">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Settings.Dialog.NoActionBar" parent="@*android:style/Theme.DeviceDefault.Dialog.NoActionBar"/>
+
+    <!-- Theme used for the intent picker activity. -->
+    <style name="Theme.DeviceDefault.Resolver" parent="@*android:style/Theme.Material">
+	<item name="android:windowEnterTransition">@empty</item>
+	<item name="android:windowExitTransition">@empty</item>
+	<item name="android:windowIsTranslucent">true</item>
+	<item name="android:windowNoTitle">true</item>
+	<item name="android:windowBackground">@*android:color/transparent</item>
+	<item name="android:backgroundDimEnabled">true</item>
+	<item name="android:statusBarColor">@*android:color/transparent</item>
+	<item name="android:windowContentOverlay">@null</item>
+	<item name="android:colorControlActivated">?*android:attr/colorControlHighlight</item>
+	<item name="android:listPreferredItemPaddingStart">?*android:attr/dialogPreferredPadding</item>
+	<item name="android:listPreferredItemPaddingEnd">?*android:attr/dialogPreferredPadding</item>
+
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- @hide Theme overlay that inherits from material actionbar,  and use accent color for
+             primary text -->
+    <style name="ThemeOverlay.DeviceDefault.ActionBar.Accent" parent="@*android:style/ThemeOverlay.Material.ActionBar">
+        <item name="android:textColorPrimary">@*android:color/btn_colored_borderless_text_material</item>
+    </style>
+
+    <!-- @hide Theme overlay for a light popup in action bar -->
+    <style name="ThemeOverlay.DeviceDefault.Popup.Light" parent="@*android:style/ThemeOverlay.Material" />
+
+    <style name="ThemeOverlay.DeviceDefault.Accent"  parent="@*android:style/Theme.Material" >
+        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
+    </style>
+
+    <style name="ThemeOverlay.DeviceDefault.Accent.Light" parent="@*android:style/Theme.Material" >
+        <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+    </style>
+
+    <style name="ThemeOverlay.DeviceDefault.Dark.ActionBar.Accent" parent="*android:style/ThemeOverlay.Material.Dark.ActionBar">
+        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
+    </style>
+
+    <style name="Widget.DeviceDefault.Light.CheckedTextView" parent="*android:style/Widget.Material.CheckedTextView" />
+
+    <style name="Widget.DeviceDefault.Light.EditText" parent="*android:style/Widget.Material.EditText" />
+</resources>
diff --git a/google/themes/PrimaryOmni/Android.mk b/google/themes/PrimaryOmni/Android.mk
new file mode 100644
index 0000000..4ebf813
--- /dev/null
+++ b/google/themes/PrimaryOmni/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := PrimaryOmni
+LOCAL_RRO_THEME := PrimaryOmni
+LOCAL_CERTIFICATE := platform
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+include $(BUILD_RRO_PACKAGE)
diff --git a/google/themes/PrimaryOmni/AndroidManifest.xml b/google/themes/PrimaryOmni/AndroidManifest.xml
new file mode 100644
index 0000000..3ff77d4
--- /dev/null
+++ b/google/themes/PrimaryOmni/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.omnirom.theme.primary.omni"
+    platformBuildVersionCode="26"
+    platformBuildVersionName="8.0.0">
+
+    <overlay android:priority="2" android:targetPackage="android" />
+
+
+    <application android:hasCode="false"
+                 android:label="Omni" />
+</manifest>
diff --git a/google/themes/PrimaryOmni/res/color/ripple_material_light.xml b/google/themes/PrimaryOmni/res/color/ripple_material_light.xml
new file mode 100644
index 0000000..07ce558
--- /dev/null
+++ b/google/themes/PrimaryOmni/res/color/ripple_material_light.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:alpha="@*android:dimen/highlight_alpha_material_light"
+          android:color="@*android:color/omni_color5" />
+</selector>
diff --git a/google/themes/PrimaryOmni/res/drawable/toast_frame.xml b/google/themes/PrimaryOmni/res/drawable/toast_frame.xml
new file mode 100644
index 0000000..5738837
--- /dev/null
+++ b/google/themes/PrimaryOmni/res/drawable/toast_frame.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2017, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <!-- background is material_grey_200 with .9 alpha -->
+    <solid android:color="@*android:color/omni_color9" />
+    <corners android:radius="22dp" />
+</shape>
+
diff --git a/google/themes/PrimaryOmni/res/values/colors.xml b/google/themes/PrimaryOmni/res/values/colors.xml
new file mode 100644
index 0000000..7b3b4dc
--- /dev/null
+++ b/google/themes/PrimaryOmni/res/values/colors.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="omni_theme_color">@color/omni_color1</color>
+    <color name="user_icon_1">#ffff367c</color>
+    <color name="user_icon_2">#ffff4c8b</color>
+    <color name="user_icon_3">#ffff6299</color>
+    <color name="user_icon_4">#ffff6299</color>
+    <color name="system_error">#ffff4120</color>
+
+    <color name="omni_text1">#fffefefe</color> <!-- text primary -->
+    <color name="omni_text2">#b3fefefe</color>  <!-- text secondary -->
+    <color name="omni_text3">#a0fefefe</color>  <!-- text tertiary -->
+    <color name="omni_text4">#defefefe</color>  <!-- text toast -->
+    <color name="omni_color1">#ff191919</color> <!-- PRIMARY DARK -->
+    <color name="omni_color2">#ff2d2d2d</color> <!-- PRIMARY LIGHT -->
+    <color name="omni_color6">#b3fefefe</color> <!-- WIFI ICON IN DETAILS -->
+    <color name="omni_color7">#ff393939</color> <!-- FLOATING DIALOG COLOR ON VERY DARK THEMES MAKE THIS A BIT LIGHTER -->
+    <color name="omni_color8">#ff52c729</color> <!-- SPECIAL (CHECK WHERE THIS IS ASSIGNED) -->
+    <color name="omni_color9">#e6393939</color> <!-- TOAST (NEEDS SOME ALPHA) -->
+
+    <!-- PRIMARY LIGHT -->
+    <color name="primary_dark_device_default_settings">@*android:color/omni_color2</color> <!-- Main BG settings -->
+    <color name="background_material_dark">@*android:color/omni_color2</color> <!-- some kind of overlay of the main bg -->
+    <color name="primary_dark_device_default_light">@*android:color/omni_color2</color>
+    <color name="secondary_device_default_settings">@*android:color/omni_color2</color> <!-- Edit Quick Settings bottom parent of secondary_material_settings -->
+    <color name="condition_card_background">@*android:color/omni_color2</color>
+
+    <!-- PRIMARY_DARK -->
+    <color name="primary_dark_material_settings_light">@*android:color/omni_color1</color> <!-- settings statusbar -->
+
+    <color name="suggestion_condition_background">@*android:color/omni_color1</color>
+    <color name="secondary_device_default_settings_light">@*android:color/omni_color1</color>  <!-- settings entity, ie battery top view background -->
+    <color name="primary_device_default_settings">@*android:color/omni_color1</color> <!-- QS -->
+
+    <color name="dialog_background_material">@*android:color/omni_color1</color>
+
+    <!-- specials -->
+    <color name="btn_colored_text_material">@*android:color/omni_color2</color><!-- example: Uninstall button in app manager -->
+    <color name="global_wifi_details_icon_color">@*android:color/omni_color6</color> <!-- settings/wifi/details iconsy -->
+
+    <color name="chooser_service_row_background_color">@*android:color/omni_color1</color> <!-- resolver -->
+<!--    <color name="primary_text_inverse_when_activated_material">#a0989898</color> --><!-- very rare -->
+    <color name="primary_text_disable_only_material_dark">@*android:color/omni_text3</color> <!-- display/font or bt details -->
+
+
+    <!-- qs -->
+    <color name="material_grey_900">@*android:color/omni_color1</color>  <!-- find a better way to do this -->
+    <color name="zen_introduction">@*android:color/omni_color1</color>
+
+    <!-- Dialogs -->
+    <color name="background_floating_material_dark">@*android:color/omni_color7</color> <!-- dialogs like sime settins -->
+
+</resources>
diff --git a/google/themes/PrimaryOmni/res/values/config.xml b/google/themes/PrimaryOmni/res/values/config.xml
new file mode 100644
index 0000000..a1802c8
--- /dev/null
+++ b/google/themes/PrimaryOmni/res/values/config.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="config_useDarkBgNotificationIconTextTinting">true</bool>
+    <bool name="config_enableNightMode">true</bool>
+</resources>
diff --git a/google/themes/PrimaryOmni/res/values/settings.xml b/google/themes/PrimaryOmni/res/values/settings.xml
new file mode 100644
index 0000000..8c94cbf
--- /dev/null
+++ b/google/themes/PrimaryOmni/res/values/settings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.DeviceDefault.Settings" parent="@*android:style/Theme.Material">
+        <item name="android:actionBarTheme">@*android:style/ThemeOverlay.DeviceDefault.ActionBar.Accent</item>
+        <item name="android:popupTheme">@*android:style/ThemeOverlay.DeviceDefault.Popup.Light</item>
+        <item name="android:colorEdgeEffect">@*android:color/omni_color4</item>
+        <item name="android:navigationBarDividerColor">#00000000</item>
+        <item name="android:navigationBarColor">@*android:color/omni_color2</item>
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorForeground">@*android:color/omni_text_primary</item>
+
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+ 
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text3</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:colorControlHighlight">@*android:color/omni_color1</item>
+        <item name="android:colorControlActivated">@*android:color/omni_color5</item>
+
+    </style>
+</resources>
diff --git a/google/themes/PrimaryOmni/res/values/strings.xml b/google/themes/PrimaryOmni/res/values/strings.xml
new file mode 100644
index 0000000..bf20dad
--- /dev/null
+++ b/google/themes/PrimaryOmni/res/values/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2017, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <string name="@*android:sysui_overlay_dark">Dark</string>
+
+</resources>
+
diff --git a/google/themes/PrimaryOmni/res/values/styles.xml b/google/themes/PrimaryOmni/res/values/styles.xml
new file mode 100644
index 0000000..2bfc794
--- /dev/null
+++ b/google/themes/PrimaryOmni/res/values/styles.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="TextAppearance.Material.Widget.DropDownItem" parent="@*android:style/TextAppearance.Material.Menu.Inverse" />
+    <style name="Widget.Material.DropDownItem.Spinner" parent="@*android:style/Theme.Material" >
+        <item name="android:paddingStart">8dp</item>
+        <item name="android:paddingEnd">8dp</item>
+        <item name="android:paddingTop">8dp</item>
+        <item name="android:colorBackgroundFloating">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+
+    </style>
+
+</resources>
diff --git a/google/themes/PrimaryOmni/res/values/themes.xml b/google/themes/PrimaryOmni/res/values/themes.xml
new file mode 100644
index 0000000..bdd4d9c
--- /dev/null
+++ b/google/themes/PrimaryOmni/res/values/themes.xml
@@ -0,0 +1,494 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Variant of the DeviceDefault (light) theme that has a solid (opaque) action bar with an
+    inverse color profile. -->
+    <style name="Theme.DeviceDefault.Light.DarkActionBar" parent="@*android:style/Theme.Material.Light.DarkActionBar">
+	<!-- Color palette -->
+	<item name="android:colorPrimary">@*android:color/omni_color2</item>
+	<item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+	<item name="android:colorSecondary">@*android:color/omni_color1</item>
+	<item name="android:colorAccent">@*android:color/omni_color5</item>
+
+	<item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+	<item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+	<item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+	<item name="android:textColorHint">@*android:color/omni_color3</item>
+	<item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+
+    </style>
+    <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar -->
+    <style name="Theme.DeviceDefault.Light.NoActionBar" parent="@*android:style/Theme.Material.NoActionBar">
+	<!-- package installer acitivity example -->
+        <item name="android:colorBackground">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar and no status bar.
+	 This theme sets {@link android.R.attr#windowFullscreen} to true.  -->
+    <style name="Theme.DeviceDefault.Light.NoActionBar.Fullscreen" parent="@*android:style/Theme.Material.NoActionBar.Fullscreen">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar and no status bar
+    and extending in to overscan region.  This theme
+    sets {@link android.R.attr#windowFullscreen} and {@link android.R.attr#windowOverscan}
+    to true. -->
+    <style name="Theme.DeviceDefault.Light.NoActionBar.Overscan" parent="@*android:style/Theme.Material.NoActionBar.Overscan">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Light} that has no title bar and translucent
+	 system decor.  This theme sets {@link android.R.attr#windowTranslucentStatus} and
+	 {@link android.R.attr#windowTranslucentNavigation} to true. -->
+    <style name="Theme.DeviceDefault.Light.NoActionBar.TranslucentDecor" parent="@*android:style/Theme.Material.NoActionBar.TranslucentDecor">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- DeviceDefault light theme for dialog windows and activities. This changes the window to be
+    floating (not fill the entire screen), and puts a frame around its contents. You can set this
+    theme on an activity if you would like to make an activity that looks like a Dialog.-->
+    <style name="Theme.DeviceDefault.Light.Dialog" parent="@*android:style/Theme.Material.Dialog">
+	<item name="android:windowTitleStyle">@*android:style/DialogWindowTitle.DeviceDefault</item>
+	<item name="android:windowAnimationStyle">@*android:style/Animation.DeviceDefault.Dialog</item>
+
+	<item name="android:buttonBarStyle">@*android:style/DeviceDefault.ButtonBar.AlertDialog</item>
+	<item name="android:borderlessButtonStyle">@*android:style/Widget.DeviceDefault.Button.Borderless.Small</item>
+
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} that has a nice minimum width for a
+    regular dialog. -->
+    <style name="Theme.DeviceDefault.Light.Dialog.MinWidth" parent="@*android:style/Theme.Material.Dialog.MinWidth">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+
+    </style>
+
+     <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} without an action bar -->
+    <style name="Theme.DeviceDefault.Light.Dialog.NoActionBar" parent="@*android:style/Theme.Material.Dialog.NoActionBar">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog_NoActionBar} that has a nice minimum
+    width for a regular dialog. -->
+    <style name="Theme.DeviceDefault.Light.Dialog.NoActionBar.MinWidth" parent="@*android:style/Theme.Material.Dialog.NoActionBar.MinWidth">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of Theme.DeviceDefault.Dialog that has a fixed size. -->
+    <style name="Theme.DeviceDefault.Light.Dialog.FixedSize" parent="@*android:style/Theme.Material" >
+	<item name="*android:windowFixedWidthMajor">@*android:dimen/dialog_fixed_width_major</item>
+	<item name="*android:windowFixedWidthMinor">@*android:dimen/dialog_fixed_width_minor</item>
+	<item name="*android:windowFixedHeightMajor">@*android:dimen/dialog_fixed_height_major</item>
+	<item name="*android:windowFixedHeightMinor">@*android:dimen/dialog_fixed_height_minor</item>
+
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of Theme.DeviceDefault.Dialog.NoActionBar that has a fixed size. -->
+    <style name="Theme.DeviceDefault.Light.Dialog.NoActionBar.FixedSize" parent="@*android:style/Theme.Material" >
+	<item name="*android:windowFixedWidthMajor">@*android:dimen/dialog_fixed_width_major</item>
+	<item name="*android:windowFixedWidthMinor">@*android:dimen/dialog_fixed_width_minor</item>
+	<item name="*android:windowFixedHeightMajor">@*android:dimen/dialog_fixed_height_major</item>
+	<item name="*android:windowFixedHeightMinor">@*android:dimen/dialog_fixed_height_minor</item>
+
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+
+    </style>
+
+    <!-- DeviceDefault light theme for a window that will be displayed either full-screen on smaller
+    screens (small, normal) or as a dialog on larger screens (large, xlarge). -->
+    <style name="Theme.DeviceDefault.Light.DialogWhenLarge" parent="@*android:style/Theme.Material.DialogWhenLarge">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- DeviceDefault light theme for a window without an action bar that will be displayed either
+    full-screen on smaller screens (small, normal) or as a dialog on larger screens (large,
+    xlarge). -->
+    <style name="Theme.DeviceDefault.Light.DialogWhenLarge.NoActionBar" parent="@*android:style/Theme.Material.DialogWhenLarge.NoActionBar">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- DeviceDefault light theme for a presentation window on a secondary display. -->
+    <style name="Theme.DeviceDefault.Light.Dialog.Presentation" parent="@*android:style/Theme.Material.Dialog.Presentation">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- DeviceDefault light theme for panel windows. This removes all extraneous window
+    decorations, so you basically have an empty rectangle in which to place your content. It makes
+    the window floating, with a transparent background, and turns off dimming behind the window. -->
+    <style name="Theme.DeviceDefault.Light.Panel" parent="@*android:style/Theme.Material.Panel">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Light.Dialog.Alert" parent="@*android:style/Theme.Material.Dialog.Alert">
+	<item name="android:windowTitleStyle">@*android:style/DialogWindowTitle.DeviceDefault</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Light.SearchBar" parent="@*android:style/Theme.Material.SearchBar">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Light.Voice" parent="@*android:style/Theme.Material.Voice">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.QuickSettings" parent="@*android:style/Theme.DeviceDefault">
+        <item name="android:colorBackgroundFloating">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+<!--
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+-->
+    </style>
+
+    <style name="qs_base" parent="@*android:style/Theme.DeviceDefault">
+        <item name="android:colorBackgroundFloating">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.QuickSettings.Dialog" parent="@*android:style/Theme.DeviceDefault.Dialog">
+        <item name="android:colorBackgroundFloating">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Settings_Dark} with no action bar -->
+    <style name="Theme.DeviceDefault.Settings.Dark.NoActionBar" parent="@*android:style/Theme.Material.NoActionBar">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Settings.Dialog" parent="@*android:style/Theme.Material.Settings.Dialog">
+        <item name="android:colorBackground">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Settings.DialogWhenLarge" parent="@*android:style/Theme.Material.Settings.DialogWhenLarge">
+        <item name="android:colorBackground">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Settings.Dialog.Alert" parent="@*android:style/Theme.Material.Settings.Dialog.Alert">
+	<!-- darkobas -->
+	<item name="android:colorBackgroundFloating">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Settings.Dialog.NoActionBar" parent="@*android:style/Theme.DeviceDefault.Dialog.NoActionBar"/>
+
+    <!-- Theme used for the intent picker activity. -->
+    <style name="Theme.DeviceDefault.Resolver" parent="@*android:style/Theme.Material">
+	<item name="android:windowEnterTransition">@empty</item>
+	<item name="android:windowExitTransition">@empty</item>
+	<item name="android:windowIsTranslucent">true</item>
+	<item name="android:windowNoTitle">true</item>
+	<item name="android:windowBackground">@*android:color/transparent</item>
+	<item name="android:backgroundDimEnabled">true</item>
+	<item name="android:statusBarColor">@*android:color/transparent</item>
+	<item name="android:windowContentOverlay">@null</item>
+	<item name="android:colorControlActivated">?*android:attr/colorControlHighlight</item>
+	<item name="android:listPreferredItemPaddingStart">?*android:attr/dialogPreferredPadding</item>
+	<item name="android:listPreferredItemPaddingEnd">?*android:attr/dialogPreferredPadding</item>
+
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- @hide Theme overlay that inherits from material actionbar,  and use accent color for
+             primary text -->
+    <style name="ThemeOverlay.DeviceDefault.ActionBar.Accent" parent="@*android:style/ThemeOverlay.Material.ActionBar">
+        <item name="android:textColorPrimary">@*android:color/btn_colored_borderless_text_material</item>
+    </style>
+
+    <!-- @hide Theme overlay for a light popup in action bar -->
+    <style name="ThemeOverlay.DeviceDefault.Popup.Light" parent="@*android:style/ThemeOverlay.Material" />
+
+    <style name="ThemeOverlay.DeviceDefault.Accent"  parent="@*android:style/Theme.Material" >
+        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
+    </style>
+
+    <style name="ThemeOverlay.DeviceDefault.Accent.Light" parent="@*android:style/Theme.Material" >
+        <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+    </style>
+
+    <style name="ThemeOverlay.DeviceDefault.Dark.ActionBar.Accent" parent="*android:style/ThemeOverlay.Material.Dark.ActionBar">
+        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
+    </style>
+
+    <style name="Widget.DeviceDefault.Light.CheckedTextView" parent="*android:style/Widget.Material.CheckedTextView" />
+
+    <style name="Widget.DeviceDefault.Light.EditText" parent="*android:style/Widget.Material.EditText" />
+</resources>
diff --git a/google/themes/PrimaryWarmWhite/Android.mk b/google/themes/PrimaryWarmWhite/Android.mk
new file mode 100644
index 0000000..39b0fa7
--- /dev/null
+++ b/google/themes/PrimaryWarmWhite/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := PrimaryWarmWhite
+LOCAL_RRO_THEME := PrimaryWarmWhite
+LOCAL_CERTIFICATE := platform
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+include $(BUILD_RRO_PACKAGE)
diff --git a/google/themes/PrimaryWarmWhite/AndroidManifest.xml b/google/themes/PrimaryWarmWhite/AndroidManifest.xml
new file mode 100644
index 0000000..0a99384
--- /dev/null
+++ b/google/themes/PrimaryWarmWhite/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.omnirom.theme.primary.warmwhite"
+    platformBuildVersionCode="26"
+    platformBuildVersionName="8.0.0">
+
+    <overlay android:priority="2" android:targetPackage="android" />
+
+
+    <application android:hasCode="false"
+                 android:label="WarmWhite" />
+</manifest>
diff --git a/google/themes/PrimaryWarmWhite/res/color/ripple_material_light.xml b/google/themes/PrimaryWarmWhite/res/color/ripple_material_light.xml
new file mode 100644
index 0000000..07ce558
--- /dev/null
+++ b/google/themes/PrimaryWarmWhite/res/color/ripple_material_light.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:alpha="@*android:dimen/highlight_alpha_material_light"
+          android:color="@*android:color/omni_color5" />
+</selector>
diff --git a/google/themes/PrimaryWarmWhite/res/drawable/toast_frame.xml b/google/themes/PrimaryWarmWhite/res/drawable/toast_frame.xml
new file mode 100644
index 0000000..5738837
--- /dev/null
+++ b/google/themes/PrimaryWarmWhite/res/drawable/toast_frame.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2017, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <!-- background is material_grey_200 with .9 alpha -->
+    <solid android:color="@*android:color/omni_color9" />
+    <corners android:radius="22dp" />
+</shape>
+
diff --git a/google/themes/PrimaryWarmWhite/res/values/colors.xml b/google/themes/PrimaryWarmWhite/res/values/colors.xml
new file mode 100644
index 0000000..807648f
--- /dev/null
+++ b/google/themes/PrimaryWarmWhite/res/values/colors.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="omni_theme_color">@color/omni_color1</color>
+    <color name="user_icon_1">#ffff367c</color>
+    <color name="user_icon_2">#ffff4c8b</color>
+    <color name="user_icon_3">#ffff6299</color>
+    <color name="user_icon_4">#ffff6299</color>
+    <color name="system_error">#ffff4120</color>
+
+    <color name="omni_text1">#ff252525</color> <!-- text primary -->
+    <color name="omni_text2">#b3252525</color>  <!-- text secondary -->
+    <color name="omni_text3">#b3252525</color>  <!-- text tertiary -->
+    <color name="omni_text4">#de252525</color>  <!-- text toast -->
+    <color name="omni_color1">#ffe5e5c7</color> <!-- PRIMARY DARK -->
+    <color name="omni_color2">#ffFFFFDE</color> <!-- PRIMARY LIGHT -->
+    <color name="omni_color6">#b3050505</color> <!-- WIFI ICON IN DETAILS -->
+    <color name="omni_color7">#ffe9e9e9</color> <!-- FLOATING DIALOG COLOR ON VERY DARK THEMES MAKE THIS A BIT LIGHTER -->
+    <color name="omni_color8">#ffffffeb</color> <!-- SPECIAL (CHECK WHERE THIS IS ASSIGNED) -->
+    <color name="omni_color9">#e6ffffeb</color> <!-- TOAST (NEEDS SOME ALPHA) -->
+
+    <!-- PRIMARY LIGHT -->
+    <color name="condition_card_background">@*android:color/omni_color2</color>
+    <color name="primary_device_default_settings_light">@*android:color/omni_color2</color>
+    <color name="secondary_material_settings_light">@*android:color/omni_color2</color>
+
+    <!-- PRIMARY_DARK -->
+    <color name="primary_dark_material_settings_light">@*android:color/omni_color1</color> <!-- settings statusbar -->
+    <color name="primary_dark_device_default_settings_light">@*android:color/omni_color1</color>
+    <color name="primary_material_settings_light">@*android:color/omni_color1</color>
+
+    <color name="suggestion_condition_background">@*android:color/omni_color1</color>
+    <color name="secondary_device_default_settings_light">@*android:color/omni_color1</color>  <!-- settings entity, ie battery top view background -->
+    <color name="primary_device_default_settings">@*android:color/omni_color1</color> <!-- QS -->
+
+    <color name="dialog_background_material">@*android:color/omni_color1</color>
+
+    <!-- specials -->
+    <color name="btn_colored_text_material">@*android:color/omni_color2</color><!-- example: Uninstall button in app manager -->
+    <color name="global_wifi_details_icon_color">@*android:color/omni_color6</color> <!-- settings/wifi/details iconsy -->
+
+    <color name="chooser_service_row_background_color">@*android:color/omni_color1</color> <!-- resolver -->
+<!--    <color name="primary_text_inverse_when_activated_material">#a0989898</color> --><!-- very rare -->
+    <color name="primary_text_disable_only_material_dark">@*android:color/omni_text3</color> <!-- display/font or bt details -->
+
+    <color name="zen_introduction">@*android:color/omni_color1</color>
+
+    <!-- Dialogs -->
+    <color name="background_floating_material_dark">@*android:color/omni_color7</color> <!-- dialogs like sime settins -->
+
+</resources>
diff --git a/google/themes/PrimaryWarmWhite/res/values/config.xml b/google/themes/PrimaryWarmWhite/res/values/config.xml
new file mode 100644
index 0000000..bc9a085
--- /dev/null
+++ b/google/themes/PrimaryWarmWhite/res/values/config.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="config_useDarkBgNotificationIconTextTinting">false</bool>
+    <bool name="config_enableNightMode">false</bool>
+</resources>
diff --git a/google/themes/PrimaryWarmWhite/res/values/settings.xml b/google/themes/PrimaryWarmWhite/res/values/settings.xml
new file mode 100644
index 0000000..098e5da
--- /dev/null
+++ b/google/themes/PrimaryWarmWhite/res/values/settings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.DeviceDefault.Settings" parent="@*android:style/Theme.Material.Settings">
+        <item name="android:actionBarTheme">@*android:style/ThemeOverlay.DeviceDefault.ActionBar.Accent</item>
+        <item name="android:popupTheme">@*android:style/ThemeOverlay.DeviceDefault.Popup.Light</item>
+        <item name="android:colorEdgeEffect">@*android:color/omni_color4</item>
+        <item name="android:navigationBarDividerColor">#1f000000</item>
+        <item name="android:navigationBarColor">@*android:color/omni_color2</item>
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorForeground">@*android:color/omni_color1</item>
+        <item name="android:colorBackground">@*android:color/omni_color2</item>
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+ 
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text3</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:colorControlHighlight">@*android:color/omni_color1</item>
+        <item name="android:colorControlActivated">@*android:color/omni_color5</item>
+
+    </style>
+</resources>
diff --git a/google/themes/PrimaryWarmWhite/res/values/themes.xml b/google/themes/PrimaryWarmWhite/res/values/themes.xml
new file mode 100644
index 0000000..e914ee2
--- /dev/null
+++ b/google/themes/PrimaryWarmWhite/res/values/themes.xml
@@ -0,0 +1,445 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Variant of the DeviceDefault (light) theme that has a solid (opaque) action bar with an
+    inverse color profile. -->
+    <style name="Theme.DeviceDefault.Light.DarkActionBar" parent="@*android:style/Theme.Material.Light.DarkActionBar">
+	<!-- Color palette -->
+	<item name="android:colorPrimary">@*android:color/omni_color2</item>
+	<item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+	<item name="android:colorSecondary">@*android:color/omni_color1</item>
+	<item name="android:colorAccent">@*android:color/omni_color5</item>
+
+	<item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+	<item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+	<item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+	<item name="android:textColorHint">@*android:color/omni_color3</item>
+	<item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+
+    </style>
+    <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar -->
+    <style name="Theme.DeviceDefault.Light.NoActionBar" parent="@*android:style/Theme.Material.NoActionBar">
+	<!-- package installer acitivity example -->
+        <item name="android:colorBackground">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar and no status bar.
+	 This theme sets {@link android.R.attr#windowFullscreen} to true.  -->
+    <style name="Theme.DeviceDefault.Light.NoActionBar.Fullscreen" parent="@*android:style/Theme.Material.NoActionBar.Fullscreen">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar and no status bar
+    and extending in to overscan region.  This theme
+    sets {@link android.R.attr#windowFullscreen} and {@link android.R.attr#windowOverscan}
+    to true. -->
+    <style name="Theme.DeviceDefault.Light.NoActionBar.Overscan" parent="@*android:style/Theme.Material.NoActionBar.Overscan">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Light} that has no title bar and translucent
+	 system decor.  This theme sets {@link android.R.attr#windowTranslucentStatus} and
+	 {@link android.R.attr#windowTranslucentNavigation} to true. -->
+    <style name="Theme.DeviceDefault.Light.NoActionBar.TranslucentDecor" parent="@*android:style/Theme.Material.NoActionBar.TranslucentDecor">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- DeviceDefault light theme for dialog windows and activities. This changes the window to be
+    floating (not fill the entire screen), and puts a frame around its contents. You can set this
+    theme on an activity if you would like to make an activity that looks like a Dialog.-->
+    <style name="Theme.DeviceDefault.Light.Dialog" parent="@*android:style/Theme.Material.Dialog">
+	<item name="android:windowTitleStyle">@*android:style/DialogWindowTitle.DeviceDefault</item>
+	<item name="android:windowAnimationStyle">@*android:style/Animation.DeviceDefault.Dialog</item>
+
+	<item name="android:buttonBarStyle">@*android:style/DeviceDefault.ButtonBar.AlertDialog</item>
+	<item name="android:borderlessButtonStyle">@*android:style/Widget.DeviceDefault.Button.Borderless.Small</item>
+
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} that has a nice minimum width for a
+    regular dialog. -->
+    <style name="Theme.DeviceDefault.Light.Dialog.MinWidth" parent="@*android:style/Theme.Material.Dialog.MinWidth">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+
+    </style>
+
+     <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} without an action bar -->
+    <style name="Theme.DeviceDefault.Light.Dialog.NoActionBar" parent="@*android:style/Theme.Material.Dialog.NoActionBar">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog_NoActionBar} that has a nice minimum
+    width for a regular dialog. -->
+    <style name="Theme.DeviceDefault.Light.Dialog.NoActionBar.MinWidth" parent="@*android:style/Theme.Material.Dialog.NoActionBar.MinWidth">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of Theme.DeviceDefault.Dialog that has a fixed size. -->
+    <style name="Theme.DeviceDefault.Light.Dialog.FixedSize" parent="@*android:style/Theme.Material" >
+	<item name="*android:windowFixedWidthMajor">@*android:dimen/dialog_fixed_width_major</item>
+	<item name="*android:windowFixedWidthMinor">@*android:dimen/dialog_fixed_width_minor</item>
+	<item name="*android:windowFixedHeightMajor">@*android:dimen/dialog_fixed_height_major</item>
+	<item name="*android:windowFixedHeightMinor">@*android:dimen/dialog_fixed_height_minor</item>
+
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of Theme.DeviceDefault.Dialog.NoActionBar that has a fixed size. -->
+    <style name="Theme.DeviceDefault.Light.Dialog.NoActionBar.FixedSize" parent="@*android:style/Theme.Material" >
+	<item name="*android:windowFixedWidthMajor">@*android:dimen/dialog_fixed_width_major</item>
+	<item name="*android:windowFixedWidthMinor">@*android:dimen/dialog_fixed_width_minor</item>
+	<item name="*android:windowFixedHeightMajor">@*android:dimen/dialog_fixed_height_major</item>
+	<item name="*android:windowFixedHeightMinor">@*android:dimen/dialog_fixed_height_minor</item>
+
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+
+    </style>
+
+    <!-- DeviceDefault light theme for a window that will be displayed either full-screen on smaller
+    screens (small, normal) or as a dialog on larger screens (large, xlarge). -->
+    <style name="Theme.DeviceDefault.Light.DialogWhenLarge" parent="@*android:style/Theme.Material.DialogWhenLarge">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- DeviceDefault light theme for a window without an action bar that will be displayed either
+    full-screen on smaller screens (small, normal) or as a dialog on larger screens (large,
+    xlarge). -->
+    <style name="Theme.DeviceDefault.Light.DialogWhenLarge.NoActionBar" parent="@*android:style/Theme.Material.DialogWhenLarge.NoActionBar">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- DeviceDefault light theme for a presentation window on a secondary display. -->
+    <style name="Theme.DeviceDefault.Light.Dialog.Presentation" parent="@*android:style/Theme.Material.Dialog.Presentation">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- DeviceDefault light theme for panel windows. This removes all extraneous window
+    decorations, so you basically have an empty rectangle in which to place your content. It makes
+    the window floating, with a transparent background, and turns off dimming behind the window. -->
+    <style name="Theme.DeviceDefault.Light.Panel" parent="@*android:style/Theme.Material.Panel">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Light.Dialog.Alert" parent="@*android:style/Theme.Material.Dialog.Alert">
+	<item name="android:windowTitleStyle">@*android:style/DialogWindowTitle.DeviceDefault</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Light.SearchBar" parent="@*android:style/Theme.Material.SearchBar">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Light.Voice" parent="@*android:style/Theme.Material.Voice">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Settings_Dark} with no action bar -->
+    <style name="Theme.DeviceDefault.Settings.Dark.NoActionBar" parent="@*android:style/Theme.Material.NoActionBar">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Settings.Dialog" parent="@*android:style/Theme.Material.Settings.Dialog">
+        <item name="android:colorBackground">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Settings.DialogWhenLarge" parent="@*android:style/Theme.Material.Settings.DialogWhenLarge">
+        <item name="android:colorBackground">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Settings.Dialog.Alert" parent="@*android:style/Theme.Material.Settings.Dialog.Alert">
+	<!-- darkobas -->
+	<item name="android:colorBackgroundFloating">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Settings.Dialog.NoActionBar" parent="@*android:style/Theme.DeviceDefault.Dialog.NoActionBar"/>
+
+    <!-- Theme used for the intent picker activity. -->
+    <style name="Theme.DeviceDefault.Resolver" parent="@*android:style/Theme.Material">
+	<item name="android:windowEnterTransition">@empty</item>
+	<item name="android:windowExitTransition">@empty</item>
+	<item name="android:windowIsTranslucent">true</item>
+	<item name="android:windowNoTitle">true</item>
+	<item name="android:windowBackground">@*android:color/transparent</item>
+	<item name="android:backgroundDimEnabled">true</item>
+	<item name="android:statusBarColor">@*android:color/transparent</item>
+	<item name="android:windowContentOverlay">@null</item>
+	<item name="android:colorControlActivated">?*android:attr/colorControlHighlight</item>
+	<item name="android:listPreferredItemPaddingStart">?*android:attr/dialogPreferredPadding</item>
+	<item name="android:listPreferredItemPaddingEnd">?*android:attr/dialogPreferredPadding</item>
+
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- @hide Theme overlay that inherits from material actionbar,  and use accent color for
+             primary text -->
+    <style name="ThemeOverlay.DeviceDefault.ActionBar.Accent" parent="@*android:style/ThemeOverlay.Material.ActionBar">
+        <item name="android:textColorPrimary">@*android:color/btn_colored_borderless_text_material</item>
+    </style>
+
+    <!-- @hide Theme overlay for a light popup in action bar -->
+    <style name="ThemeOverlay.DeviceDefault.Popup.Light" parent="@*android:style/ThemeOverlay.Material" />
+
+    <style name="ThemeOverlay.DeviceDefault.Accent"  parent="@*android:style/Theme.Material" >
+        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
+    </style>
+
+    <style name="ThemeOverlay.DeviceDefault.Accent.Light" parent="@*android:style/Theme.Material" >
+        <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+    </style>
+
+    <style name="ThemeOverlay.DeviceDefault.Dark.ActionBar.Accent" parent="*android:style/ThemeOverlay.Material.Dark.ActionBar">
+        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
+    </style>
+
+    <style name="Widget.DeviceDefault.Light.CheckedTextView" parent="*android:style/Widget.Material.CheckedTextView" />
+
+    <style name="Widget.DeviceDefault.Light.EditText" parent="*android:style/Widget.Material.EditText" />
+</resources>
diff --git a/google/themes/PrimaryWhite/Android.mk b/google/themes/PrimaryWhite/Android.mk
new file mode 100644
index 0000000..0b46670
--- /dev/null
+++ b/google/themes/PrimaryWhite/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := PrimaryWhite
+LOCAL_RRO_THEME := PrimaryWhite
+LOCAL_CERTIFICATE := platform
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+include $(BUILD_RRO_PACKAGE)
diff --git a/google/themes/PrimaryWhite/AndroidManifest.xml b/google/themes/PrimaryWhite/AndroidManifest.xml
new file mode 100644
index 0000000..0a75cb2
--- /dev/null
+++ b/google/themes/PrimaryWhite/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.omnirom.theme.primary.white"
+    platformBuildVersionCode="26"
+    platformBuildVersionName="8.0.0">
+
+    <overlay android:priority="2" android:targetPackage="android" />
+
+
+    <application android:hasCode="false"
+                 android:label="White" />
+</manifest>
diff --git a/google/themes/PrimaryWhite/res/color/ripple_material_light.xml b/google/themes/PrimaryWhite/res/color/ripple_material_light.xml
new file mode 100644
index 0000000..07ce558
--- /dev/null
+++ b/google/themes/PrimaryWhite/res/color/ripple_material_light.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:alpha="@*android:dimen/highlight_alpha_material_light"
+          android:color="@*android:color/omni_color5" />
+</selector>
diff --git a/google/themes/PrimaryWhite/res/drawable/toast_frame.xml b/google/themes/PrimaryWhite/res/drawable/toast_frame.xml
new file mode 100644
index 0000000..5738837
--- /dev/null
+++ b/google/themes/PrimaryWhite/res/drawable/toast_frame.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2017, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <!-- background is material_grey_200 with .9 alpha -->
+    <solid android:color="@*android:color/omni_color9" />
+    <corners android:radius="22dp" />
+</shape>
+
diff --git a/google/themes/PrimaryWhite/res/values/colors.xml b/google/themes/PrimaryWhite/res/values/colors.xml
new file mode 100644
index 0000000..454e076
--- /dev/null
+++ b/google/themes/PrimaryWhite/res/values/colors.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="omni_theme_color">@color/omni_color1</color>
+    <color name="user_icon_1">#ffff367c</color>
+    <color name="user_icon_2">#ffff4c8b</color>
+    <color name="user_icon_3">#ffff6299</color>
+    <color name="user_icon_4">#ffff6299</color>
+    <color name="system_error">#ffff4120</color>
+
+    <color name="omni_text1">#ff252525</color> <!-- text primary -->
+    <color name="omni_text2">#b3252525</color>  <!-- text secondary -->
+    <color name="omni_text3">#b3252525</color>  <!-- text tertiary -->
+    <color name="omni_text4">#de252525</color>  <!-- text toast -->
+    <color name="omni_color1">#ffe9e9e9</color> <!-- PRIMARY DARK -->
+    <color name="omni_color2">#fff5f5f5</color> <!-- PRIMARY LIGHT -->
+    <color name="omni_color6">#b3050505</color> <!-- WIFI ICON IN DETAILS -->
+    <color name="omni_color7">#ffe9e9e9</color> <!-- FLOATING DIALOG COLOR ON VERY DARK THEMES MAKE THIS A BIT LIGHTER -->
+    <color name="omni_color8">#ffefefef</color> <!-- SPECIAL (CHECK WHERE THIS IS ASSIGNED) -->
+    <color name="omni_color9">#e6eeeeee</color> <!-- TOAST (NEEDS SOME ALPHA) -->
+
+    <!-- PRIMARY LIGHT -->
+    <color name="condition_card_background">@*android:color/omni_color2</color>
+    <color name="primary_device_default_settings_light">@*android:color/omni_color2</color>
+    <color name="secondary_material_settings_light">@*android:color/omni_color2</color>
+
+    <!-- PRIMARY_DARK -->
+    <color name="primary_dark_material_settings_light">@*android:color/omni_color1</color> <!-- settings statusbar -->
+    <color name="primary_dark_device_default_settings_light">@*android:color/omni_color1</color>
+    <color name="primary_material_settings_light">@*android:color/omni_color1</color>
+
+    <color name="suggestion_condition_background">@*android:color/omni_color1</color>
+    <color name="secondary_device_default_settings_light">@*android:color/omni_color1</color>  <!-- settings entity, ie battery top view background -->
+    <color name="primary_device_default_settings">@*android:color/omni_color1</color> <!-- QS -->
+
+    <color name="dialog_background_material">@*android:color/omni_color1</color>
+
+    <!-- specials -->
+    <color name="btn_colored_text_material">@*android:color/omni_color2</color><!-- example: Uninstall button in app manager -->
+    <color name="global_wifi_details_icon_color">@*android:color/omni_color6</color> <!-- settings/wifi/details iconsy -->
+
+    <color name="chooser_service_row_background_color">@*android:color/omni_color1</color> <!-- resolver -->
+<!--    <color name="primary_text_inverse_when_activated_material">#a0989898</color> --><!-- very rare -->
+    <color name="primary_text_disable_only_material_dark">@*android:color/omni_text3</color> <!-- display/font or bt details -->
+
+    <color name="zen_introduction">@*android:color/omni_color1</color>
+
+    <!-- Dialogs -->
+    <color name="background_floating_material_dark">@*android:color/omni_color7</color> <!-- dialogs like sime settins -->
+
+</resources>
diff --git a/google/themes/PrimaryWhite/res/values/config.xml b/google/themes/PrimaryWhite/res/values/config.xml
new file mode 100644
index 0000000..bc9a085
--- /dev/null
+++ b/google/themes/PrimaryWhite/res/values/config.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="config_useDarkBgNotificationIconTextTinting">false</bool>
+    <bool name="config_enableNightMode">false</bool>
+</resources>
diff --git a/google/themes/PrimaryWhite/res/values/settings.xml b/google/themes/PrimaryWhite/res/values/settings.xml
new file mode 100644
index 0000000..098e5da
--- /dev/null
+++ b/google/themes/PrimaryWhite/res/values/settings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.DeviceDefault.Settings" parent="@*android:style/Theme.Material.Settings">
+        <item name="android:actionBarTheme">@*android:style/ThemeOverlay.DeviceDefault.ActionBar.Accent</item>
+        <item name="android:popupTheme">@*android:style/ThemeOverlay.DeviceDefault.Popup.Light</item>
+        <item name="android:colorEdgeEffect">@*android:color/omni_color4</item>
+        <item name="android:navigationBarDividerColor">#1f000000</item>
+        <item name="android:navigationBarColor">@*android:color/omni_color2</item>
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorForeground">@*android:color/omni_color1</item>
+        <item name="android:colorBackground">@*android:color/omni_color2</item>
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+ 
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text3</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:colorControlHighlight">@*android:color/omni_color1</item>
+        <item name="android:colorControlActivated">@*android:color/omni_color5</item>
+
+    </style>
+</resources>
diff --git a/google/themes/PrimaryWhite/res/values/themes.xml b/google/themes/PrimaryWhite/res/values/themes.xml
new file mode 100644
index 0000000..e914ee2
--- /dev/null
+++ b/google/themes/PrimaryWhite/res/values/themes.xml
@@ -0,0 +1,445 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Variant of the DeviceDefault (light) theme that has a solid (opaque) action bar with an
+    inverse color profile. -->
+    <style name="Theme.DeviceDefault.Light.DarkActionBar" parent="@*android:style/Theme.Material.Light.DarkActionBar">
+	<!-- Color palette -->
+	<item name="android:colorPrimary">@*android:color/omni_color2</item>
+	<item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+	<item name="android:colorSecondary">@*android:color/omni_color1</item>
+	<item name="android:colorAccent">@*android:color/omni_color5</item>
+
+	<item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+	<item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+	<item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+	<item name="android:textColorHint">@*android:color/omni_color3</item>
+	<item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+
+    </style>
+    <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar -->
+    <style name="Theme.DeviceDefault.Light.NoActionBar" parent="@*android:style/Theme.Material.NoActionBar">
+	<!-- package installer acitivity example -->
+        <item name="android:colorBackground">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar and no status bar.
+	 This theme sets {@link android.R.attr#windowFullscreen} to true.  -->
+    <style name="Theme.DeviceDefault.Light.NoActionBar.Fullscreen" parent="@*android:style/Theme.Material.NoActionBar.Fullscreen">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar and no status bar
+    and extending in to overscan region.  This theme
+    sets {@link android.R.attr#windowFullscreen} and {@link android.R.attr#windowOverscan}
+    to true. -->
+    <style name="Theme.DeviceDefault.Light.NoActionBar.Overscan" parent="@*android:style/Theme.Material.NoActionBar.Overscan">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Light} that has no title bar and translucent
+	 system decor.  This theme sets {@link android.R.attr#windowTranslucentStatus} and
+	 {@link android.R.attr#windowTranslucentNavigation} to true. -->
+    <style name="Theme.DeviceDefault.Light.NoActionBar.TranslucentDecor" parent="@*android:style/Theme.Material.NoActionBar.TranslucentDecor">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- DeviceDefault light theme for dialog windows and activities. This changes the window to be
+    floating (not fill the entire screen), and puts a frame around its contents. You can set this
+    theme on an activity if you would like to make an activity that looks like a Dialog.-->
+    <style name="Theme.DeviceDefault.Light.Dialog" parent="@*android:style/Theme.Material.Dialog">
+	<item name="android:windowTitleStyle">@*android:style/DialogWindowTitle.DeviceDefault</item>
+	<item name="android:windowAnimationStyle">@*android:style/Animation.DeviceDefault.Dialog</item>
+
+	<item name="android:buttonBarStyle">@*android:style/DeviceDefault.ButtonBar.AlertDialog</item>
+	<item name="android:borderlessButtonStyle">@*android:style/Widget.DeviceDefault.Button.Borderless.Small</item>
+
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} that has a nice minimum width for a
+    regular dialog. -->
+    <style name="Theme.DeviceDefault.Light.Dialog.MinWidth" parent="@*android:style/Theme.Material.Dialog.MinWidth">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+
+    </style>
+
+     <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} without an action bar -->
+    <style name="Theme.DeviceDefault.Light.Dialog.NoActionBar" parent="@*android:style/Theme.Material.Dialog.NoActionBar">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog_NoActionBar} that has a nice minimum
+    width for a regular dialog. -->
+    <style name="Theme.DeviceDefault.Light.Dialog.NoActionBar.MinWidth" parent="@*android:style/Theme.Material.Dialog.NoActionBar.MinWidth">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of Theme.DeviceDefault.Dialog that has a fixed size. -->
+    <style name="Theme.DeviceDefault.Light.Dialog.FixedSize" parent="@*android:style/Theme.Material" >
+	<item name="*android:windowFixedWidthMajor">@*android:dimen/dialog_fixed_width_major</item>
+	<item name="*android:windowFixedWidthMinor">@*android:dimen/dialog_fixed_width_minor</item>
+	<item name="*android:windowFixedHeightMajor">@*android:dimen/dialog_fixed_height_major</item>
+	<item name="*android:windowFixedHeightMinor">@*android:dimen/dialog_fixed_height_minor</item>
+
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of Theme.DeviceDefault.Dialog.NoActionBar that has a fixed size. -->
+    <style name="Theme.DeviceDefault.Light.Dialog.NoActionBar.FixedSize" parent="@*android:style/Theme.Material" >
+	<item name="*android:windowFixedWidthMajor">@*android:dimen/dialog_fixed_width_major</item>
+	<item name="*android:windowFixedWidthMinor">@*android:dimen/dialog_fixed_width_minor</item>
+	<item name="*android:windowFixedHeightMajor">@*android:dimen/dialog_fixed_height_major</item>
+	<item name="*android:windowFixedHeightMinor">@*android:dimen/dialog_fixed_height_minor</item>
+
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+
+    </style>
+
+    <!-- DeviceDefault light theme for a window that will be displayed either full-screen on smaller
+    screens (small, normal) or as a dialog on larger screens (large, xlarge). -->
+    <style name="Theme.DeviceDefault.Light.DialogWhenLarge" parent="@*android:style/Theme.Material.DialogWhenLarge">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- DeviceDefault light theme for a window without an action bar that will be displayed either
+    full-screen on smaller screens (small, normal) or as a dialog on larger screens (large,
+    xlarge). -->
+    <style name="Theme.DeviceDefault.Light.DialogWhenLarge.NoActionBar" parent="@*android:style/Theme.Material.DialogWhenLarge.NoActionBar">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- DeviceDefault light theme for a presentation window on a secondary display. -->
+    <style name="Theme.DeviceDefault.Light.Dialog.Presentation" parent="@*android:style/Theme.Material.Dialog.Presentation">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- DeviceDefault light theme for panel windows. This removes all extraneous window
+    decorations, so you basically have an empty rectangle in which to place your content. It makes
+    the window floating, with a transparent background, and turns off dimming behind the window. -->
+    <style name="Theme.DeviceDefault.Light.Panel" parent="@*android:style/Theme.Material.Panel">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Light.Dialog.Alert" parent="@*android:style/Theme.Material.Dialog.Alert">
+	<item name="android:windowTitleStyle">@*android:style/DialogWindowTitle.DeviceDefault</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Light.SearchBar" parent="@*android:style/Theme.Material.SearchBar">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Light.Voice" parent="@*android:style/Theme.Material.Voice">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- Variant of {@link #Theme_DeviceDefault_Settings_Dark} with no action bar -->
+    <style name="Theme.DeviceDefault.Settings.Dark.NoActionBar" parent="@*android:style/Theme.Material.NoActionBar">
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Settings.Dialog" parent="@*android:style/Theme.Material.Settings.Dialog">
+        <item name="android:colorBackground">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Settings.DialogWhenLarge" parent="@*android:style/Theme.Material.Settings.DialogWhenLarge">
+        <item name="android:colorBackground">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Settings.Dialog.Alert" parent="@*android:style/Theme.Material.Settings.Dialog.Alert">
+	<!-- darkobas -->
+	<item name="android:colorBackgroundFloating">@*android:color/omni_color7</item>
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Settings.Dialog.NoActionBar" parent="@*android:style/Theme.DeviceDefault.Dialog.NoActionBar"/>
+
+    <!-- Theme used for the intent picker activity. -->
+    <style name="Theme.DeviceDefault.Resolver" parent="@*android:style/Theme.Material">
+	<item name="android:windowEnterTransition">@empty</item>
+	<item name="android:windowExitTransition">@empty</item>
+	<item name="android:windowIsTranslucent">true</item>
+	<item name="android:windowNoTitle">true</item>
+	<item name="android:windowBackground">@*android:color/transparent</item>
+	<item name="android:backgroundDimEnabled">true</item>
+	<item name="android:statusBarColor">@*android:color/transparent</item>
+	<item name="android:windowContentOverlay">@null</item>
+	<item name="android:colorControlActivated">?*android:attr/colorControlHighlight</item>
+	<item name="android:listPreferredItemPaddingStart">?*android:attr/dialogPreferredPadding</item>
+	<item name="android:listPreferredItemPaddingEnd">?*android:attr/dialogPreferredPadding</item>
+
+        <!-- Color palette -->
+        <item name="android:colorPrimary">@*android:color/omni_color2</item>
+        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+        <item name="android:colorSecondary">@*android:color/omni_color1</item>
+        <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+        <item name="android:textColorHint">@*android:color/omni_color3</item>
+        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+    </style>
+
+    <!-- @hide Theme overlay that inherits from material actionbar,  and use accent color for
+             primary text -->
+    <style name="ThemeOverlay.DeviceDefault.ActionBar.Accent" parent="@*android:style/ThemeOverlay.Material.ActionBar">
+        <item name="android:textColorPrimary">@*android:color/btn_colored_borderless_text_material</item>
+    </style>
+
+    <!-- @hide Theme overlay for a light popup in action bar -->
+    <style name="ThemeOverlay.DeviceDefault.Popup.Light" parent="@*android:style/ThemeOverlay.Material" />
+
+    <style name="ThemeOverlay.DeviceDefault.Accent"  parent="@*android:style/Theme.Material" >
+        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
+    </style>
+
+    <style name="ThemeOverlay.DeviceDefault.Accent.Light" parent="@*android:style/Theme.Material" >
+        <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+    </style>
+
+    <style name="ThemeOverlay.DeviceDefault.Dark.ActionBar.Accent" parent="*android:style/ThemeOverlay.Material.Dark.ActionBar">
+        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
+    </style>
+
+    <style name="Widget.DeviceDefault.Light.CheckedTextView" parent="*android:style/Widget.Material.CheckedTextView" />
+
+    <style name="Widget.DeviceDefault.Light.EditText" parent="*android:style/Widget.Material.EditText" />
+</resources>
diff --git a/google/themes/SluttyPink/res/values/settings.xml b/google/themes/SluttyPink/res/values/settings.xml
index 307c64e..8c94cbf 100644
--- a/google/themes/SluttyPink/res/values/settings.xml
+++ b/google/themes/SluttyPink/res/values/settings.xml
@@ -20,7 +20,7 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text3</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
-        <item name="android:colorControlHighlight">@*android:color/omni_color4</item>
+        <item name="android:colorControlHighlight">@*android:color/omni_color1</item>
         <item name="android:colorControlActivated">@*android:color/omni_color5</item>
 
     </style>
diff --git a/google/themes/SmokedGreen/res/values/settings.xml b/google/themes/SmokedGreen/res/values/settings.xml
index 307c64e..8c94cbf 100644
--- a/google/themes/SmokedGreen/res/values/settings.xml
+++ b/google/themes/SmokedGreen/res/values/settings.xml
@@ -20,7 +20,7 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text3</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
-        <item name="android:colorControlHighlight">@*android:color/omni_color4</item>
+        <item name="android:colorControlHighlight">@*android:color/omni_color1</item>
         <item name="android:colorControlActivated">@*android:color/omni_color5</item>
 
     </style>
diff --git a/google/themes/ZeroZero/res/values/settings.xml b/google/themes/ZeroZero/res/values/settings.xml
index 307c64e..2b9e570 100644
--- a/google/themes/ZeroZero/res/values/settings.xml
+++ b/google/themes/ZeroZero/res/values/settings.xml
@@ -20,7 +20,7 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text3</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
-        <item name="android:colorControlHighlight">@*android:color/omni_color4</item>
+        <item name="android:colorControlHighlight">@*android:color/omni_color7</item>
         <item name="android:colorControlActivated">@*android:color/omni_color5</item>
 
     </style>