vendor/bliss: [1/2] Move all themes from vendor/bliss

Signed-off-by: Jackeagle <jackeagle102@gmail.com>
Change-Id: I4824078f0a5517686297459b0da3fef11b2ba6c5
Signed-off-by: Jackeagle <jackeagle102@gmail.com>
diff --git a/themes/AccentBliss/Android.mk b/themes/AccentBliss/Android.mk
deleted file mode 100644
index 47f67c2..0000000
--- a/themes/AccentBliss/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentBliss
-LOCAL_RRO_THEME := AccentBliss
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentBliss/AndroidManifest.xml b/themes/AccentBliss/AndroidManifest.xml
deleted file mode 100644
index 91d4982..0000000
--- a/themes/AccentBliss/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.bliss"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Bliss" />
-</manifest>
diff --git a/themes/AccentBliss/res/values/colors.xml b/themes/AccentBliss/res/values/colors.xml
deleted file mode 100644
index f4a667a..0000000
--- a/themes/AccentBliss/res/values/colors.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#3e93cc</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#247ab3</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#2980c7</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/themes/AccentBlueMonday/Android.mk b/themes/AccentBlueMonday/Android.mk
deleted file mode 100644
index 469a6ca..0000000
--- a/themes/AccentBlueMonday/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentBlueMonday
-LOCAL_RRO_THEME := AccentBlueMonday
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentBlueMonday/AndroidManifest.xml b/themes/AccentBlueMonday/AndroidManifest.xml
deleted file mode 100644
index 580f5f5..0000000
--- a/themes/AccentBlueMonday/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/themes/AccentBlueMonday/res/values/colors.xml b/themes/AccentBlueMonday/res/values/colors.xml
deleted file mode 100644
index f3ab59c..0000000
--- a/themes/AccentBlueMonday/res/values/colors.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/themes/AccentBubblegumPink/Android.mk b/themes/AccentBubblegumPink/Android.mk
deleted file mode 100644
index 82136aa..0000000
--- a/themes/AccentBubblegumPink/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentBubblegumPink
-LOCAL_RRO_THEME := AccentBubblegumPink
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentBubblegumPink/AndroidManifest.xml b/themes/AccentBubblegumPink/AndroidManifest.xml
deleted file mode 100644
index 3961704..0000000
--- a/themes/AccentBubblegumPink/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.bubblegumpink"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Bubblegum Pink" />
-</manifest>
diff --git a/themes/AccentBubblegumPink/res/values/colors.xml b/themes/AccentBubblegumPink/res/values/colors.xml
deleted file mode 100644
index 25d8332..0000000
--- a/themes/AccentBubblegumPink/res/values/colors.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#ffe52c5f</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ffe52c5f</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ffe52c5f</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/themes/AccentBurningRed/Android.mk b/themes/AccentBurningRed/Android.mk
deleted file mode 100644
index b02f030..0000000
--- a/themes/AccentBurningRed/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentBurningRed
-LOCAL_RRO_THEME := AccentBurningRed
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentBurningRed/AndroidManifest.xml b/themes/AccentBurningRed/AndroidManifest.xml
deleted file mode 100644
index fd2d1cd..0000000
--- a/themes/AccentBurningRed/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.burningred"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Burning Red" />
-</manifest>
diff --git a/themes/AccentBurningRed/res/values/colors.xml b/themes/AccentBurningRed/res/values/colors.xml
deleted file mode 100644
index 0c28cda..0000000
--- a/themes/AccentBurningRed/res/values/colors.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#fff21a48</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#fff21a48</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#fff21a48</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/themes/AccentCandyRed/Android.mk b/themes/AccentCandyRed/Android.mk
deleted file mode 100644
index 21b9e5e..0000000
--- a/themes/AccentCandyRed/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentCandyRed
-LOCAL_RRO_THEME := AccentCandyRed
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentCandyRed/AndroidManifest.xml b/themes/AccentCandyRed/AndroidManifest.xml
deleted file mode 100644
index 102f5d0..0000000
--- a/themes/AccentCandyRed/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.candyred"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Candy Red" />
-</manifest>
diff --git a/themes/AccentCandyRed/res/values/colors.xml b/themes/AccentCandyRed/res/values/colors.xml
deleted file mode 100644
index d5fcecb..0000000
--- a/themes/AccentCandyRed/res/values/colors.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#ffff1744</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ffff1744</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ffff1744</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/themes/AccentColdEveningBleu/Android.mk b/themes/AccentColdEveningBleu/Android.mk
deleted file mode 100644
index 572a27f..0000000
--- a/themes/AccentColdEveningBleu/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentColdBleu
-LOCAL_RRO_THEME := AccentColdBleu
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentColdEveningBleu/AndroidManifest.xml b/themes/AccentColdEveningBleu/AndroidManifest.xml
deleted file mode 100644
index cab8648..0000000
--- a/themes/AccentColdEveningBleu/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.coldbleu"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Cold Evening Bleu" />
-</manifest>
diff --git a/themes/AccentColdEveningBleu/res/values/colors.xml b/themes/AccentColdEveningBleu/res/values/colors.xml
deleted file mode 100644
index b4e6bb9..0000000
--- a/themes/AccentColdEveningBleu/res/values/colors.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#ff2e86cd</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ff2e86cd</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ff2e86cd</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/themes/AccentColdSummerYellow/Android.mk b/themes/AccentColdSummerYellow/Android.mk
deleted file mode 100644
index a71be99..0000000
--- a/themes/AccentColdSummerYellow/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentColdYellow
-LOCAL_RRO_THEME := AccentColdYellow
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentColdSummerYellow/AndroidManifest.xml b/themes/AccentColdSummerYellow/AndroidManifest.xml
deleted file mode 100644
index bb9f62f..0000000
--- a/themes/AccentColdSummerYellow/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.coldyellow"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Cold Summer Yellow" />
-</manifest>
diff --git a/themes/AccentColdSummerYellow/res/values/colors.xml b/themes/AccentColdSummerYellow/res/values/colors.xml
deleted file mode 100644
index c6d26e5..0000000
--- a/themes/AccentColdSummerYellow/res/values/colors.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#ffefe3a8</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ffefe3a8</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ffefe3a8</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/themes/AccentDeadRed/Android.mk b/themes/AccentDeadRed/Android.mk
deleted file mode 100644
index c84ac2d..0000000
--- a/themes/AccentDeadRed/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentDeadRed
-LOCAL_RRO_THEME := AccentDeadRed
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentDeadRed/AndroidManifest.xml b/themes/AccentDeadRed/AndroidManifest.xml
deleted file mode 100644
index e720158..0000000
--- a/themes/AccentDeadRed/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.deadred"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Dead Red" />
-</manifest>
diff --git a/themes/AccentDeadRed/res/values/colors.xml b/themes/AccentDeadRed/res/values/colors.xml
deleted file mode 100644
index ba3c018..0000000
--- a/themes/AccentDeadRed/res/values/colors.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#ffff0f0f</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ffc20000</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ffd60000</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/themes/AccentDeepOrange/Android.mk b/themes/AccentDeepOrange/Android.mk
deleted file mode 100644
index a6fc926..0000000
--- a/themes/AccentDeepOrange/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentDeepOrange
-LOCAL_RRO_THEME := AccentDeepOrange
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentDeepOrange/AndroidManifest.xml b/themes/AccentDeepOrange/AndroidManifest.xml
deleted file mode 100644
index d73810b..0000000
--- a/themes/AccentDeepOrange/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/themes/AccentDeepOrange/res/values/colors.xml b/themes/AccentDeepOrange/res/values/colors.xml
deleted file mode 100644
index 3a6d9b7..0000000
--- a/themes/AccentDeepOrange/res/values/colors.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <color name="omni_color3">#ffff9800</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#fff59200</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ffff9c0a</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/themes/AccentDeepPurple/Android.mk b/themes/AccentDeepPurple/Android.mk
deleted file mode 100644
index c49407d..0000000
--- a/themes/AccentDeepPurple/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentDeepPurple
-LOCAL_RRO_THEME := AccentDeepPurple
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentDeepPurple/AndroidManifest.xml b/themes/AccentDeepPurple/AndroidManifest.xml
deleted file mode 100644
index e7bd619..0000000
--- a/themes/AccentDeepPurple/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.deeppurple"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Deep Purple" />
-</manifest>
diff --git a/themes/AccentDeepPurple/res/values/colors.xml b/themes/AccentDeepPurple/res/values/colors.xml
deleted file mode 100644
index b5536f8..0000000
--- a/themes/AccentDeepPurple/res/values/colors.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <color name="omni_color3">#ff8b64ce</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ff532f93</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ff673AB7</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/themes/AccentDiffDayGreen/Android.mk b/themes/AccentDiffDayGreen/Android.mk
deleted file mode 100644
index 5a841fe..0000000
--- a/themes/AccentDiffDayGreen/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentDiffDayGreen
-LOCAL_RRO_THEME := AccentDiffDayGreen
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentDiffDayGreen/AndroidManifest.xml b/themes/AccentDiffDayGreen/AndroidManifest.xml
deleted file mode 100644
index 0ba9e9a..0000000
--- a/themes/AccentDiffDayGreen/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.diffdaygreen"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="A Different Day Green" />
-</manifest>
diff --git a/themes/AccentDiffDayGreen/res/values/colors.xml b/themes/AccentDiffDayGreen/res/values/colors.xml
deleted file mode 100644
index 950f10d..0000000
--- a/themes/AccentDiffDayGreen/res/values/colors.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#ff97f456</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ff97f456</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ff97f456</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/themes/AccentDreamyPurple/Android.mk b/themes/AccentDreamyPurple/Android.mk
deleted file mode 100644
index d41d9a3..0000000
--- a/themes/AccentDreamyPurple/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentDreamyPurple
-LOCAL_RRO_THEME := AccentDreamyPurple
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentDreamyPurple/AndroidManifest.xml b/themes/AccentDreamyPurple/AndroidManifest.xml
deleted file mode 100644
index a6d1afe..0000000
--- a/themes/AccentDreamyPurple/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.dreamypurple"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Dreamy Purple" />
-</manifest>
diff --git a/themes/AccentDreamyPurple/res/values/colors.xml b/themes/AccentDreamyPurple/res/values/colors.xml
deleted file mode 100644
index bb094a6..0000000
--- a/themes/AccentDreamyPurple/res/values/colors.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#ff7278e5</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ff7278e5</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ff7278e5</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/themes/AccentDuskPurple/Android.mk b/themes/AccentDuskPurple/Android.mk
deleted file mode 100644
index bde3684..0000000
--- a/themes/AccentDuskPurple/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentDuskPurple
-LOCAL_RRO_THEME := AccentDuskPurple
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentDuskPurple/AndroidManifest.xml b/themes/AccentDuskPurple/AndroidManifest.xml
deleted file mode 100644
index d4a51ed..0000000
--- a/themes/AccentDuskPurple/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.duskpurple"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Dusk Purple" />
-</manifest>
diff --git a/themes/AccentDuskPurple/res/values/colors.xml b/themes/AccentDuskPurple/res/values/colors.xml
deleted file mode 100644
index d6c8f75..0000000
--- a/themes/AccentDuskPurple/res/values/colors.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#ffb7095a</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ffb7095a</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ffb7095a</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/themes/AccentExtendedGreen/Android.mk b/themes/AccentExtendedGreen/Android.mk
deleted file mode 100644
index 51c753f..0000000
--- a/themes/AccentExtendedGreen/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentExtendedGreen
-LOCAL_RRO_THEME := AccentExtendedGreen
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentExtendedGreen/AndroidManifest.xml b/themes/AccentExtendedGreen/AndroidManifest.xml
deleted file mode 100644
index 4791bcf..0000000
--- a/themes/AccentExtendedGreen/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.extendedgreen"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Extended Green" />
-</manifest>
diff --git a/themes/AccentExtendedGreen/res/values/colors.xml b/themes/AccentExtendedGreen/res/values/colors.xml
deleted file mode 100644
index 4e5d88d..0000000
--- a/themes/AccentExtendedGreen/res/values/colors.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#ff21ef8b</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ff21ef8b</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ff21ef8b</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/themes/AccentFlare/Android.mk b/themes/AccentFlare/Android.mk
deleted file mode 100644
index c06a445..0000000
--- a/themes/AccentFlare/Android.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentFlare
-LOCAL_RRO_THEME := AccentFlare
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
-
diff --git a/themes/AccentFlare/AndroidManifest.xml b/themes/AccentFlare/AndroidManifest.xml
deleted file mode 100644
index 4c874df..0000000
--- a/themes/AccentFlare/AndroidManifest.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.flare"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Flare" />
-</manifest>
-
diff --git a/themes/AccentFlare/res/values/colors.xml b/themes/AccentFlare/res/values/colors.xml
deleted file mode 100644
index 1a61f2a..0000000
--- a/themes/AccentFlare/res/values/colors.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#fff12711</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#fff12711</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#fff12711</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>
-    <color name="gradient_end_light">#fff5af19</color>
-    <color name="gradient_end_dark">#fff5af19</color>
-
-</resources>
-
diff --git a/themes/AccentFootprintPurple/Android.mk b/themes/AccentFootprintPurple/Android.mk
deleted file mode 100644
index 04412ed..0000000
--- a/themes/AccentFootprintPurple/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentFootprintPurple
-LOCAL_RRO_THEME := AccentFootprintPurple
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentFootprintPurple/AndroidManifest.xml b/themes/AccentFootprintPurple/AndroidManifest.xml
deleted file mode 100644
index e63c1d3..0000000
--- a/themes/AccentFootprintPurple/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.footprintpurple"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Footprint Purple" />
-</manifest>
diff --git a/themes/AccentFootprintPurple/res/values/colors.xml b/themes/AccentFootprintPurple/res/values/colors.xml
deleted file mode 100644
index 57cfd14..0000000
--- a/themes/AccentFootprintPurple/res/values/colors.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#ff3c5ae0</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ff3c5ae0</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ff3c5ae0</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/themes/AccentFrenchBleu/Android.mk b/themes/AccentFrenchBleu/Android.mk
deleted file mode 100644
index 85d0ecc..0000000
--- a/themes/AccentFrenchBleu/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentFrenchBleu
-LOCAL_RRO_THEME := AccentFrenchBleu
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentFrenchBleu/AndroidManifest.xml b/themes/AccentFrenchBleu/AndroidManifest.xml
deleted file mode 100644
index 348f6db..0000000
--- a/themes/AccentFrenchBleu/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.frenchbleu"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="French Bleu" />
-</manifest>
diff --git a/themes/AccentFrenchBleu/res/values/colors.xml b/themes/AccentFrenchBleu/res/values/colors.xml
deleted file mode 100644
index 484c89e..0000000
--- a/themes/AccentFrenchBleu/res/values/colors.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#ff2856ff</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ff2856ff</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ff2856ff</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/themes/AccentFromHell/Android.mk b/themes/AccentFromHell/Android.mk
deleted file mode 100644
index 799fd1d..0000000
--- a/themes/AccentFromHell/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentFromHell
-LOCAL_RRO_THEME := AccentFromHell
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentFromHell/AndroidManifest.xml b/themes/AccentFromHell/AndroidManifest.xml
deleted file mode 100644
index b95df3d..0000000
--- a/themes/AccentFromHell/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/themes/AccentFromHell/res/values/colors.xml b/themes/AccentFromHell/res/values/colors.xml
deleted file mode 100644
index 35c56a8..0000000
--- a/themes/AccentFromHell/res/values/colors.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#ffe53935</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ffd32f2f</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#fff44336</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/themes/AccentGoldenShower/Android.mk b/themes/AccentGoldenShower/Android.mk
deleted file mode 100644
index 4865cf5..0000000
--- a/themes/AccentGoldenShower/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentGoldenShower
-LOCAL_RRO_THEME := AccnetGoldenShower
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentGoldenShower/AndroidManifest.xml b/themes/AccentGoldenShower/AndroidManifest.xml
deleted file mode 100644
index ae06a54..0000000
--- a/themes/AccentGoldenShower/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/themes/AccentGoldenShower/res/values/colors.xml b/themes/AccentGoldenShower/res/values/colors.xml
deleted file mode 100644
index aa36ab5..0000000
--- a/themes/AccentGoldenShower/res/values/colors.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#fff1bc23</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ffd8a209</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#fff0b50b</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>
-    <color name="qs_icon_active_color">#ff000000</color>
-
-</resources>
diff --git a/themes/AccentHazedPink/Android.mk b/themes/AccentHazedPink/Android.mk
deleted file mode 100644
index 2658510..0000000
--- a/themes/AccentHazedPink/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentHazedPink
-LOCAL_RRO_THEME := AccentHazedPink
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentHazedPink/AndroidManifest.xml b/themes/AccentHazedPink/AndroidManifest.xml
deleted file mode 100644
index 2f50311..0000000
--- a/themes/AccentHazedPink/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.hazedpink"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Hazed Pink" />
-</manifest>
diff --git a/themes/AccentHazedPink/res/values/colors.xml b/themes/AccentHazedPink/res/values/colors.xml
deleted file mode 100644
index 1a0f5a1..0000000
--- a/themes/AccentHazedPink/res/values/colors.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#ffc83c64</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ffc83c64</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ffc83c64</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/themes/AccentHeirloomBleu/Android.mk b/themes/AccentHeirloomBleu/Android.mk
deleted file mode 100644
index 5252e8e..0000000
--- a/themes/AccentHeirloomBleu/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentHeirloomBleu
-LOCAL_RRO_THEME := AccentHeirloomBleu
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentHeirloomBleu/AndroidManifest.xml b/themes/AccentHeirloomBleu/AndroidManifest.xml
deleted file mode 100644
index 53d5aeb..0000000
--- a/themes/AccentHeirloomBleu/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.heirloombleu"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Heirloom Hydrangea Bleu" />
-</manifest>
diff --git a/themes/AccentHeirloomBleu/res/values/colors.xml b/themes/AccentHeirloomBleu/res/values/colors.xml
deleted file mode 100644
index f82af25..0000000
--- a/themes/AccentHeirloomBleu/res/values/colors.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#ff327ccb</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ff327ccb</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ff327ccb</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/themes/AccentHolillusion/Android.mk b/themes/AccentHolillusion/Android.mk
deleted file mode 100644
index b362c3c..0000000
--- a/themes/AccentHolillusion/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentHolillusion
-LOCAL_RRO_THEME := AccentHolillusion
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentHolillusion/AndroidManifest.xml b/themes/AccentHolillusion/AndroidManifest.xml
deleted file mode 100644
index 41545c4..0000000
--- a/themes/AccentHolillusion/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.holillusion"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Holillusion Cyan" />
-</manifest>
diff --git a/themes/AccentHolillusion/res/values/colors.xml b/themes/AccentHolillusion/res/values/colors.xml
deleted file mode 100644
index f4591be..0000000
--- a/themes/AccentHolillusion/res/values/colors.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#ff0ac8ff</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ff0ac8ff</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ff0ac8ff</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/themes/AccentIllusionsPurple/Android.mk b/themes/AccentIllusionsPurple/Android.mk
deleted file mode 100644
index 215d527..0000000
--- a/themes/AccentIllusionsPurple/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentIllusionsPurple
-LOCAL_RRO_THEME := AccentIllusionsPurple
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentIllusionsPurple/AndroidManifest.xml b/themes/AccentIllusionsPurple/AndroidManifest.xml
deleted file mode 100644
index 028aa2f..0000000
--- a/themes/AccentIllusionsPurple/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.illusionspurple"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Illusions Purple" />
-</manifest>
diff --git a/themes/AccentIllusionsPurple/res/values/colors.xml b/themes/AccentIllusionsPurple/res/values/colors.xml
deleted file mode 100644
index 9564c5b..0000000
--- a/themes/AccentIllusionsPurple/res/values/colors.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#ffa02963</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ffa02963</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ffa02963</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/themes/AccentJadeGreen/Android.mk b/themes/AccentJadeGreen/Android.mk
deleted file mode 100644
index d8e3dfa..0000000
--- a/themes/AccentJadeGreen/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentJadeGreen
-LOCAL_RRO_THEME := AccentJadeGreen
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentJadeGreen/AndroidManifest.xml b/themes/AccentJadeGreen/AndroidManifest.xml
deleted file mode 100644
index 37d3301..0000000
--- a/themes/AccentJadeGreen/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.jadegreen"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Jade Green" />
-</manifest>
diff --git a/themes/AccentJadeGreen/res/values/colors.xml b/themes/AccentJadeGreen/res/values/colors.xml
deleted file mode 100644
index 82b5271..0000000
--- a/themes/AccentJadeGreen/res/values/colors.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#ff9ABC98</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ff9ABC98</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ff9ABC98</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/themes/AccentManiaAmber/Android.mk b/themes/AccentManiaAmber/Android.mk
deleted file mode 100644
index b97aac7..0000000
--- a/themes/AccentManiaAmber/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentManiaAmber
-LOCAL_RRO_THEME := AccentManiaAmber
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentManiaAmber/AndroidManifest.xml b/themes/AccentManiaAmber/AndroidManifest.xml
deleted file mode 100644
index fbf9df7..0000000
--- a/themes/AccentManiaAmber/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.maniaamber"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Mania Amber" />
-</manifest>
diff --git a/themes/AccentManiaAmber/res/values/colors.xml b/themes/AccentManiaAmber/res/values/colors.xml
deleted file mode 100644
index e660aff..0000000
--- a/themes/AccentManiaAmber/res/values/colors.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#fff6ca11</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#fff6ca11</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#fff6ca11</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/themes/AccentMisticBrown/Android.mk b/themes/AccentMisticBrown/Android.mk
deleted file mode 100644
index 9b606c0..0000000
--- a/themes/AccentMisticBrown/Android.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentMisticBrown
-LOCAL_RRO_THEME := AccentMisticBrown
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
-
diff --git a/themes/AccentMisticBrown/AndroidManifest.xml b/themes/AccentMisticBrown/AndroidManifest.xml
deleted file mode 100644
index 276051d..0000000
--- a/themes/AccentMisticBrown/AndroidManifest.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.misticbrown"
-    platformBuildVersionCode="28"
-    platformBuildVersionName="9.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Mistic Brown" />
-</manifest>
-
diff --git a/themes/AccentMisticBrown/res/values/colors.xml b/themes/AccentMisticBrown/res/values/colors.xml
deleted file mode 100644
index d9074d1..0000000
--- a/themes/AccentMisticBrown/res/values/colors.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#ffa37556</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ff856342</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ff996644</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/themes/AccentMoveMint/Android.mk b/themes/AccentMoveMint/Android.mk
deleted file mode 100644
index 29cb824..0000000
--- a/themes/AccentMoveMint/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentMoveMint
-LOCAL_RRO_THEME := AccentMoveMint
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentMoveMint/AndroidManifest.xml b/themes/AccentMoveMint/AndroidManifest.xml
deleted file mode 100644
index 9bdda55..0000000
--- a/themes/AccentMoveMint/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.movemint"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Move Mint" />
-</manifest>
diff --git a/themes/AccentMoveMint/res/values/colors.xml b/themes/AccentMoveMint/res/values/colors.xml
deleted file mode 100644
index 376e0ff..0000000
--- a/themes/AccentMoveMint/res/values/colors.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#ff46ff99</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ff46ff99</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ff46ff99</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/themes/AccentNewHouseOrange/Android.mk b/themes/AccentNewHouseOrange/Android.mk
deleted file mode 100644
index 404e95d..0000000
--- a/themes/AccentNewHouseOrange/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentNewHouseOrange
-LOCAL_RRO_THEME := AccentNewHouseOrange
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentNewHouseOrange/AndroidManifest.xml b/themes/AccentNewHouseOrange/AndroidManifest.xml
deleted file mode 100644
index 7728bfb..0000000
--- a/themes/AccentNewHouseOrange/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.newhouseorang"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="New House Orange" />
-</manifest>
diff --git a/themes/AccentNewHouseOrange/res/values/colors.xml b/themes/AccentNewHouseOrange/res/values/colors.xml
deleted file mode 100644
index c92227c..0000000
--- a/themes/AccentNewHouseOrange/res/values/colors.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#fff25555</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#fff25555</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#fff25555</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/themes/AccentNotImpPurple/Android.mk b/themes/AccentNotImpPurple/Android.mk
deleted file mode 100644
index 8068742..0000000
--- a/themes/AccentNotImpPurple/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentNotImpPurple
-LOCAL_RRO_THEME := AccentNotImpPurple
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentNotImpPurple/AndroidManifest.xml b/themes/AccentNotImpPurple/AndroidManifest.xml
deleted file mode 100644
index 7a56d01..0000000
--- a/themes/AccentNotImpPurple/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.notimppurple"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Not Impressive Purple" />
-</manifest>
diff --git a/themes/AccentNotImpPurple/res/values/colors.xml b/themes/AccentNotImpPurple/res/values/colors.xml
deleted file mode 100644
index 1e85afb..0000000
--- a/themes/AccentNotImpPurple/res/values/colors.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#ff8522ff</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ff8522ff</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ff8522ff</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/themes/AccentObfusBleu/Android.mk b/themes/AccentObfusBleu/Android.mk
deleted file mode 100644
index 2cdb0af..0000000
--- a/themes/AccentObfusBleu/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentObfusBleu
-LOCAL_RRO_THEME := AccentObfusBleu
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentObfusBleu/AndroidManifest.xml b/themes/AccentObfusBleu/AndroidManifest.xml
deleted file mode 100644
index de483da..0000000
--- a/themes/AccentObfusBleu/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.obfusbleu"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Obfuscated Bleu" />
-</manifest>
diff --git a/themes/AccentObfusBleu/res/values/colors.xml b/themes/AccentObfusBleu/res/values/colors.xml
deleted file mode 100644
index 7a5e8f3..0000000
--- a/themes/AccentObfusBleu/res/values/colors.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#ff0042ba</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ff0042ba</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ff0042ba</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/themes/AccentOrangeCoral/Android.mk b/themes/AccentOrangeCoral/Android.mk
deleted file mode 100644
index 326efd6..0000000
--- a/themes/AccentOrangeCoral/Android.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentOrangeCoral
-LOCAL_RRO_THEME := AccentOrangeCoral
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
-
diff --git a/themes/AccentOrangeCoral/AndroidManifest.xml b/themes/AccentOrangeCoral/AndroidManifest.xml
deleted file mode 100644
index 25a1a57..0000000
--- a/themes/AccentOrangeCoral/AndroidManifest.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.orangecoral"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Orange Coral" />
-</manifest>
-
diff --git a/themes/AccentOrangeCoral/res/values/colors.xml b/themes/AccentOrangeCoral/res/values/colors.xml
deleted file mode 100644
index a61ceb5..0000000
--- a/themes/AccentOrangeCoral/res/values/colors.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#ffff9966</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ffff9966</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ffff9966</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>
-    <color name="gradient_end_light">#ffff5e62</color>
-    <color name="gradient_end_dark">#ffff5e62</color>
-
-</resources>
-
diff --git a/themes/AccentPaleBlue/Android.mk b/themes/AccentPaleBlue/Android.mk
deleted file mode 100644
index 499b1a5..0000000
--- a/themes/AccentPaleBlue/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentPaleBlue
-LOCAL_RRO_THEME := AccentPaleBlue
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentPaleBlue/AndroidManifest.xml b/themes/AccentPaleBlue/AndroidManifest.xml
deleted file mode 100644
index 55b83d4..0000000
--- a/themes/AccentPaleBlue/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.paleblue"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Pale Blue" />
-</manifest>
diff --git a/themes/AccentPaleBlue/res/values/colors.xml b/themes/AccentPaleBlue/res/values/colors.xml
deleted file mode 100644
index e647e26..0000000
--- a/themes/AccentPaleBlue/res/values/colors.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#ffa1b6ed</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ffa1b6ed</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ffa1b6ed</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/themes/AccentPaleRed/Android.mk b/themes/AccentPaleRed/Android.mk
deleted file mode 100644
index eedd990..0000000
--- a/themes/AccentPaleRed/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentPaleRed
-LOCAL_RRO_THEME := AccentPaleRed
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentPaleRed/AndroidManifest.xml b/themes/AccentPaleRed/AndroidManifest.xml
deleted file mode 100644
index 5d56935..0000000
--- a/themes/AccentPaleRed/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.palered"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Pale Red" />
-</manifest>
diff --git a/themes/AccentPaleRed/res/values/colors.xml b/themes/AccentPaleRed/res/values/colors.xml
deleted file mode 100644
index 71dd5e2..0000000
--- a/themes/AccentPaleRed/res/values/colors.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#fff05361</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#fff05361</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#fff05361</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/themes/AccentPixel/Android.mk b/themes/AccentPixel/Android.mk
deleted file mode 100644
index c438026..0000000
--- a/themes/AccentPixel/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentPixel
-LOCAL_RRO_THEME := AccentPixel
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentPixel/AndroidManifest.xml b/themes/AccentPixel/AndroidManifest.xml
deleted file mode 100644
index 6c038b3..0000000
--- a/themes/AccentPixel/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/themes/AccentPixel/res/values/colors.xml b/themes/AccentPixel/res/values/colors.xml
deleted file mode 100644
index 91e0ee9..0000000
--- a/themes/AccentPixel/res/values/colors.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#ff4285f4</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ff3367d6</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ff5e97f6</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/themes/AccentPureLust/Android.mk b/themes/AccentPureLust/Android.mk
deleted file mode 100644
index e243a73..0000000
--- a/themes/AccentPureLust/Android.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentPureLust
-LOCAL_RRO_THEME := AccentPureLust
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
-
diff --git a/themes/AccentPureLust/AndroidManifest.xml b/themes/AccentPureLust/AndroidManifest.xml
deleted file mode 100644
index a38e983..0000000
--- a/themes/AccentPureLust/AndroidManifest.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.purelust"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Pure Lust" />
-</manifest>
-
diff --git a/themes/AccentPureLust/res/values/colors.xml b/themes/AccentPureLust/res/values/colors.xml
deleted file mode 100644
index a904b92..0000000
--- a/themes/AccentPureLust/res/values/colors.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#ffdd1818</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ffdd1818</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ffdd1818</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>
-    <color name="gradient_start_light">#ff333333</color>
-    <color name="gradient_start_dark">#ff333333</color>
-    <color name="gradient_end_light">#ffdd1818</color>
-    <color name="gradient_end_dark">#ffdd1818</color>
-
-</resources>
-
diff --git a/themes/AccentQuepal/Android.mk b/themes/AccentQuepal/Android.mk
deleted file mode 100644
index caa4c39..0000000
--- a/themes/AccentQuepal/Android.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentQuepal
-LOCAL_RRO_THEME := AccentQuepal
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
-
diff --git a/themes/AccentQuepal/AndroidManifest.xml b/themes/AccentQuepal/AndroidManifest.xml
deleted file mode 100644
index 8e3b911..0000000
--- a/themes/AccentQuepal/AndroidManifest.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.quepal"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Quepal" />
-</manifest>
-
diff --git a/themes/AccentQuepal/res/values/colors.xml b/themes/AccentQuepal/res/values/colors.xml
deleted file mode 100644
index 0dde7af..0000000
--- a/themes/AccentQuepal/res/values/colors.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#ff11998e</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ff11998e</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ff11998e</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>
-    <color name="gradient_end_light">#ff38ef7d</color>
-    <color name="gradient_end_dark">#ff38ef7d</color>
-
-</resources>
-
diff --git a/themes/AccentRottenOrange/Android.mk b/themes/AccentRottenOrange/Android.mk
deleted file mode 100644
index 9a54e4a..0000000
--- a/themes/AccentRottenOrange/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentRottenOrange
-LOCAL_RRO_THEME := AccentRottenOrange
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentRottenOrange/AndroidManifest.xml b/themes/AccentRottenOrange/AndroidManifest.xml
deleted file mode 100644
index ee1d983..0000000
--- a/themes/AccentRottenOrange/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.rottenorange"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Rotten Orange" />
-</manifest>
diff --git a/themes/AccentRottenOrange/res/values/colors.xml b/themes/AccentRottenOrange/res/values/colors.xml
deleted file mode 100644
index df3db0e..0000000
--- a/themes/AccentRottenOrange/res/values/colors.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <color name="omni_color3">#ffff7a33</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ffdb4d00</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#fff55600</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/themes/AccentSeasideMint/Android.mk b/themes/AccentSeasideMint/Android.mk
deleted file mode 100644
index 99fbe48..0000000
--- a/themes/AccentSeasideMint/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentSeasideMint
-LOCAL_RRO_THEME := AccentSeasideMint
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentSeasideMint/AndroidManifest.xml b/themes/AccentSeasideMint/AndroidManifest.xml
deleted file mode 100644
index 779d4c8..0000000
--- a/themes/AccentSeasideMint/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.seasidemint"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Seaside Mint" />
-</manifest>
diff --git a/themes/AccentSeasideMint/res/values/colors.xml b/themes/AccentSeasideMint/res/values/colors.xml
deleted file mode 100644
index f892e23..0000000
--- a/themes/AccentSeasideMint/res/values/colors.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#ff01c18c</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ff01c18c</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ff01c18c</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/themes/AccentShadesOfGrey/Android.mk b/themes/AccentShadesOfGrey/Android.mk
deleted file mode 100644
index 1bc2f71..0000000
--- a/themes/AccentShadesOfGrey/Android.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentShadesOfGrey
-LOCAL_RRO_THEME := AccentShadesOfGrey
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
-
diff --git a/themes/AccentShadesOfGrey/AndroidManifest.xml b/themes/AccentShadesOfGrey/AndroidManifest.xml
deleted file mode 100644
index 91e45eb..0000000
--- a/themes/AccentShadesOfGrey/AndroidManifest.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.shadesofgrey"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Shades Of Grey" />
-</manifest>
-
diff --git a/themes/AccentShadesOfGrey/res/values/colors.xml b/themes/AccentShadesOfGrey/res/values/colors.xml
deleted file mode 100644
index f068a61..0000000
--- a/themes/AccentShadesOfGrey/res/values/colors.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#ff2c3e50</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ff2c3e50</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ff2c3e50</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>
-    <color name="gradient_start_light">#ffbdc3c7</color>
-    <color name="gradient_end_light">#ff2c3e50</color>
-    <color name="gradient_end_dark">#ff2c3e50</color>
-
-</resources>
-
diff --git a/themes/AccentSincityRed/Android.mk b/themes/AccentSincityRed/Android.mk
deleted file mode 100644
index c109a10..0000000
--- a/themes/AccentSincityRed/Android.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentSincityRed
-LOCAL_RRO_THEME := AccentSincityRed
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
-
diff --git a/themes/AccentSincityRed/AndroidManifest.xml b/themes/AccentSincityRed/AndroidManifest.xml
deleted file mode 100644
index fb07a2d..0000000
--- a/themes/AccentSincityRed/AndroidManifest.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.sincityred"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Sin City Red" />
-</manifest>
-
diff --git a/themes/AccentSincityRed/res/values/colors.xml b/themes/AccentSincityRed/res/values/colors.xml
deleted file mode 100644
index 6f4d31c..0000000
--- a/themes/AccentSincityRed/res/values/colors.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#ffed213a</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ffed213a</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ffed213a</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>
-    <color name="gradient_end_light">#ff93291e</color>
-    <color name="gradient_end_dark">#ff93291e</color>
-
-</resources>
-
diff --git a/themes/AccentSluttyPink/Android.mk b/themes/AccentSluttyPink/Android.mk
deleted file mode 100644
index f5dd363..0000000
--- a/themes/AccentSluttyPink/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentSluttyPink
-LOCAL_RRO_THEME := AccentSluttyPink
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentSluttyPink/AndroidManifest.xml b/themes/AccentSluttyPink/AndroidManifest.xml
deleted file mode 100644
index bc3af36..0000000
--- a/themes/AccentSluttyPink/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/themes/AccentSluttyPink/res/values/colors.xml b/themes/AccentSluttyPink/res/values/colors.xml
deleted file mode 100644
index 0d659b3..0000000
--- a/themes/AccentSluttyPink/res/values/colors.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/themes/AccentSmokingGreen/Android.mk b/themes/AccentSmokingGreen/Android.mk
deleted file mode 100644
index 94c29f2..0000000
--- a/themes/AccentSmokingGreen/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentSmokingGreen
-LOCAL_RRO_THEME := AccentSmokingGreen
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentSmokingGreen/AndroidManifest.xml b/themes/AccentSmokingGreen/AndroidManifest.xml
deleted file mode 100644
index 1ae5a7a..0000000
--- a/themes/AccentSmokingGreen/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/themes/AccentSmokingGreen/res/values/colors.xml b/themes/AccentSmokingGreen/res/values/colors.xml
deleted file mode 100644
index 0d620ae..0000000
--- a/themes/AccentSmokingGreen/res/values/colors.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/themes/AccentSpokedPurple/Android.mk b/themes/AccentSpokedPurple/Android.mk
deleted file mode 100644
index f4d849a..0000000
--- a/themes/AccentSpokedPurple/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentSpookedPurple
-LOCAL_RRO_THEME := AccentSpookedPurple
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentSpokedPurple/AndroidManifest.xml b/themes/AccentSpokedPurple/AndroidManifest.xml
deleted file mode 100644
index 19b724c..0000000
--- a/themes/AccentSpokedPurple/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.spookedpurple"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Spooked Purple" />
-</manifest>
diff --git a/themes/AccentSpokedPurple/res/values/colors.xml b/themes/AccentSpokedPurple/res/values/colors.xml
deleted file mode 100644
index 9871fbc..0000000
--- a/themes/AccentSpokedPurple/res/values/colors.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#ff822b6b</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ff822b6b</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ff822b6b</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/themes/AccentSublime/Android.mk b/themes/AccentSublime/Android.mk
deleted file mode 100644
index 4a23644..0000000
--- a/themes/AccentSublime/Android.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentSublime
-LOCAL_RRO_THEME := AccentSublime
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
-
diff --git a/themes/AccentSublime/AndroidManifest.xml b/themes/AccentSublime/AndroidManifest.xml
deleted file mode 100644
index f94b616..0000000
--- a/themes/AccentSublime/AndroidManifest.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.sublime"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Sublime" />
-</manifest>
-
diff --git a/themes/AccentSublime/res/values/colors.xml b/themes/AccentSublime/res/values/colors.xml
deleted file mode 100644
index 7b5d999..0000000
--- a/themes/AccentSublime/res/values/colors.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#ff3f5efb</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ff3f5efb</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ff3f5efb</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>
-    <color name="gradient_start_light">#fffc466b</color>
-    <color name="gradient_start_dark">#fffc5c7d</color>
-    <color name="gradient_end_light">#ff3f5efb</color>
-    <color name="gradient_end_dark">#ff6a82fb</color>
-
-</resources>
-
diff --git a/themes/AccentTeal/Android.mk b/themes/AccentTeal/Android.mk
deleted file mode 100644
index e5b5e43..0000000
--- a/themes/AccentTeal/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentTeal
-LOCAL_RRO_THEME := AccentTeal
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentTeal/AndroidManifest.xml b/themes/AccentTeal/AndroidManifest.xml
deleted file mode 100644
index e6f471b..0000000
--- a/themes/AccentTeal/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/themes/AccentTeal/res/values/colors.xml b/themes/AccentTeal/res/values/colors.xml
deleted file mode 100644
index afc0c89..0000000
--- a/themes/AccentTeal/res/values/colors.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#ff009688</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ff009688</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ff009688</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/themes/AccentTruFilPink/Android.mk b/themes/AccentTruFilPink/Android.mk
deleted file mode 100644
index 4ac7181..0000000
--- a/themes/AccentTruFilPink/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentTruFilPink
-LOCAL_RRO_THEME := AccentSluttyPink
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentTruFilPink/AndroidManifest.xml b/themes/AccentTruFilPink/AndroidManifest.xml
deleted file mode 100644
index 5669712..0000000
--- a/themes/AccentTruFilPink/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.trufilpink"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="True Feel Pink" />
-</manifest>
diff --git a/themes/AccentTruFilPink/res/values/colors.xml b/themes/AccentTruFilPink/res/values/colors.xml
deleted file mode 100644
index 8899810..0000000
--- a/themes/AccentTruFilPink/res/values/colors.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#ffae2463</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ffae2463</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ffae2463</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/themes/AccentWarmthOrange/Android.mk b/themes/AccentWarmthOrange/Android.mk
deleted file mode 100644
index b120293..0000000
--- a/themes/AccentWarmthOrange/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentWarmthOrange
-LOCAL_RRO_THEME := AccentWarmthOrange
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentWarmthOrange/AndroidManifest.xml b/themes/AccentWarmthOrange/AndroidManifest.xml
deleted file mode 100644
index 61c5718..0000000
--- a/themes/AccentWarmthOrange/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.accent.warmthorange"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Warmth Orange" />
-</manifest>
diff --git a/themes/AccentWarmthOrange/res/values/colors.xml b/themes/AccentWarmthOrange/res/values/colors.xml
deleted file mode 100644
index eb1a90a..0000000
--- a/themes/AccentWarmthOrange/res/values/colors.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#ffff6f20</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ffff6f20</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ffff6f20</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/themes/AccentWhite/Android.mk b/themes/AccentWhite/Android.mk
deleted file mode 100644
index feb74a5..0000000
--- a/themes/AccentWhite/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := AccentWhite
-LOCAL_RRO_THEME := AccentWhite
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/AccentWhite/AndroidManifest.xml b/themes/AccentWhite/AndroidManifest.xml
deleted file mode 100644
index 7f6fc74..0000000
--- a/themes/AccentWhite/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/themes/AccentWhite/res/values/colors.xml b/themes/AccentWhite/res/values/colors.xml
deleted file mode 100644
index 475b922..0000000
--- a/themes/AccentWhite/res/values/colors.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_color3">#ffc0c1c0</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ffa7a8a7</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#FFBABBBA</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>
-    <color name="qs_icon_active_color">#ff000000</color>
-
-</resources>
diff --git a/themes/Amber/Android.mk b/themes/Amber/Android.mk
deleted file mode 100644
index 1f10be0..0000000
--- a/themes/Amber/Android.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_PACKAGE_NAME := AmberTheme
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
-
-include $(BUILD_PACKAGE)
diff --git a/themes/Amber/AndroidManifest.xml b/themes/Amber/AndroidManifest.xml
deleted file mode 100644
index 6eb8262..0000000
--- a/themes/Amber/AndroidManifest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.theme.amber"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-    <application android:hasCode="false"
-                 android:label="Amber" />
-</manifest>
diff --git a/themes/Amber/res/values/colors.xml b/themes/Amber/res/values/colors.xml
deleted file mode 100644
index e3cb93a..0000000
--- a/themes/Amber/res/values/colors.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="user_icon_1">#ffFFE082</color>
-    <color name="user_icon_2">#ffFFD54F</color>
-    <color name="user_icon_3">#ff26a69a</color>
-    <color name="user_icon_4">#ffec407a</color>
-    <color name="user_icon_5">#ff33ac71</color>
-    <color name="user_icon_6">#ff8bc34a</color>
-    <color name="user_icon_7">#ffff9800</color>
-    <color name="user_icon_8">#ffff7043</color>
-    <color name="system_error">#ffea4335</color>
-    <color name="primary_device_default_dark">#ff2d2d2d</color>
-    <color name="primary_device_default_settings">#ff2d2d2d</color>
-    <color name="primary_dark_device_default_dark">#ff242424</color>
-    <color name="primary_dark_device_default_settings">#ff242424</color>
-    <color name="secondary_device_default_settings">#ff3a3a3a</color>
-    <color name="tertiary_device_default_settings">#ff616161</color>
-    <color name="quaternary_device_default_settings">#ff9e9e9e</color>
-    <color name="accent_device_default_700">#ffFFA000</color>
-    <color name="accent_device_default_light">#ffFFC107</color>
-    <color name="accent_device_default_dark">#ffFFD54F</color>
-    <color name="accent_device_default_50">#ffFFF8E1</color>
-</resources>
diff --git a/themes/Android.mk b/themes/Android.mk
deleted file mode 100644
index 20bfbaf..0000000
--- a/themes/Android.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Copyright (C) 2011 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.
-#
-
-# WARNING: Everything listed here will be built on ALL platforms,
-# including x86, the emulator, and the SDK.  Modules must be uniquely
-# named (liblights.panda), and must build everywhere, or limit themselves
-# to only building on ARM if they include assembly. Individual makefiles
-# are responsible for having their own logic, for fine-grained control.
-
-LOCAL_PATH := $(call my-dir)
-
-# if some modules are built directly from this directory (not subdirectories),
-# their rules should be written here.
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/themes/Bl4ckAndYell0/Android.mk b/themes/Bl4ckAndYell0/Android.mk
deleted file mode 100644
index e10d3f6..0000000
--- a/themes/Bl4ckAndYell0/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := Bl4ckAndYell0Theme
-LOCAL_RRO_THEME := Bl4ckAndYell0Theme
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/Bl4ckAndYell0/AndroidManifest.xml b/themes/Bl4ckAndYell0/AndroidManifest.xml
deleted file mode 100644
index 67fe744..0000000
--- a/themes/Bl4ckAndYell0/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.bl4ckandyell0"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Bl4ck And Yell0" />
-</manifest>
diff --git a/themes/Bl4ckAndYell0/assets/thumbnail.png b/themes/Bl4ckAndYell0/assets/thumbnail.png
deleted file mode 100644
index a1f9519..0000000
--- a/themes/Bl4ckAndYell0/assets/thumbnail.png
+++ /dev/null
Binary files differ
diff --git a/themes/Bl4ckAndYell0/res/color/ripple_material_light.xml b/themes/Bl4ckAndYell0/res/color/ripple_material_light.xml
deleted file mode 100644
index 07ce558..0000000
--- a/themes/Bl4ckAndYell0/res/color/ripple_material_light.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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/themes/Bl4ckAndYell0/res/drawable/toast_frame.xml b/themes/Bl4ckAndYell0/res/drawable/toast_frame.xml
deleted file mode 100644
index 5738837..0000000
--- a/themes/Bl4ckAndYell0/res/drawable/toast_frame.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/Bl4ckAndYell0/res/values/colors.xml b/themes/Bl4ckAndYell0/res/values/colors.xml
deleted file mode 100644
index fa3e992..0000000
--- a/themes/Bl4ckAndYell0/res/values/colors.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="user_icon_1">#ffeeeeee</color>
-    <color name="user_icon_2">#ffdddddd</color>
-    <color name="user_icon_3">#ffcccccc</color>
-    <color name="user_icon_4">#ffbbbbbb</color>
-    <color name="system_error">#ffaaaaaa</color>
-
-    <color name="omni_text1">#FFFFFDE7</color> <!-- text primary -->
-    <color name="omni_text2">#B3FFFDE7</color>  <!-- text secondary -->
-    <color name="omni_text3">#FFFFF59D</color>  <!-- text tertiary -->
-    <color name="omni_text4">#deFFF59D</color>  <!-- text with "de" alpha -->
-    <color name="omni_color1">#ff05050A</color> <!-- PRIMARY DARK -->
-    <color name="omni_color2">#ff121115</color> <!-- PRIMARY LIGHT -->
-    <color name="omni_color3">#ffFFFF00</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ffFFEA00</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ffFFFF00</color> <!-- ACCENT -->
-    <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) -->
-    <color name="omni_color900">#ff05050A</color> <!-- PRIMARY DARK -->
-
-
-    <!-- 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>
-
-    <!-- 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>
-
-    <!-- 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="zen_introduction">@*android:color/omni_color1</color>
-
-    <!-- Dialogs -->
-    <color name="background_floating_material_dark">@*android:color/omni_color7</color> <!-- dialogs like sime settins -->
-
-    <!-- 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/themes/Bl4ckAndYell0/res/values/config.xml b/themes/Bl4ckAndYell0/res/values/config.xml
deleted file mode 100644
index a1802c8..0000000
--- a/themes/Bl4ckAndYell0/res/values/config.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="config_useDarkBgNotificationIconTextTinting">true</bool>
-    <bool name="config_enableNightMode">true</bool>
-</resources>
diff --git a/themes/Bl4ckAndYell0/res/values/settings.xml b/themes/Bl4ckAndYell0/res/values/settings.xml
deleted file mode 100644
index 0b1cf0f..0000000
--- a/themes/Bl4ckAndYell0/res/values/settings.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme.DeviceDefault.Settings" parent="@*android:style/Theme.DeviceDefault">
-        <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/themes/Bl4ckAndYell0/res/values/styles.xml b/themes/Bl4ckAndYell0/res/values/styles.xml
deleted file mode 100644
index 2bfc794..0000000
--- a/themes/Bl4ckAndYell0/res/values/styles.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/Bl4ckAndYell0/res/values/themes.xml b/themes/Bl4ckAndYell0/res/values/themes.xml
deleted file mode 100644
index e6f496b..0000000
--- a/themes/Bl4ckAndYell0/res/values/themes.xml
+++ /dev/null
@@ -1,513 +0,0 @@
-<?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_color900</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>
-
-    <!-- Theme for the dialog shown when an app crashes or ANRs. -->
-    <style name="Theme.Dialog.AppError" parent="@*android:style/Theme.Material.Dialog.Alert">
-        <item name="android:windowContentTransitions">false</item>
-        <item name="android:windowActivityTransitions">false</item>
-        <item name="android:windowCloseOnTouchOutside">false</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/themes/BlackBliss/Android.mk b/themes/BlackBliss/Android.mk
deleted file mode 100644
index 70ef42e..0000000
--- a/themes/BlackBliss/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := BlackBlissTheme
-LOCAL_RRO_THEME := BlackBlissTheme
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/BlackBliss/AndroidManifest.xml b/themes/BlackBliss/AndroidManifest.xml
deleted file mode 100644
index b27cd22..0000000
--- a/themes/BlackBliss/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.blackbliss"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Black Bliss" />
-</manifest>
diff --git a/themes/BlackBliss/assets/thumbnail.png b/themes/BlackBliss/assets/thumbnail.png
deleted file mode 100644
index a1f9519..0000000
--- a/themes/BlackBliss/assets/thumbnail.png
+++ /dev/null
Binary files differ
diff --git a/themes/BlackBliss/res/color/ripple_material_light.xml b/themes/BlackBliss/res/color/ripple_material_light.xml
deleted file mode 100644
index 07ce558..0000000
--- a/themes/BlackBliss/res/color/ripple_material_light.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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/themes/BlackBliss/res/drawable/toast_frame.xml b/themes/BlackBliss/res/drawable/toast_frame.xml
deleted file mode 100644
index 5738837..0000000
--- a/themes/BlackBliss/res/drawable/toast_frame.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/BlackBliss/res/values/colors.xml b/themes/BlackBliss/res/values/colors.xml
deleted file mode 100644
index 1aa2a1c..0000000
--- a/themes/BlackBliss/res/values/colors.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="user_icon_1">#ffeeeeee</color>
-    <color name="user_icon_2">#ffdddddd</color>
-    <color name="user_icon_3">#ffcccccc</color>
-    <color name="user_icon_4">#ffbbbbbb</color>
-    <color name="system_error">#ffaaaaaa</color>
-
-    <color name="omni_text1">#FFE8EAF6</color> <!-- text primary -->
-    <color name="omni_text2">#B3E8EAF6</color>  <!-- text secondary -->
-    <color name="omni_text3">#A0E8EAF6</color>  <!-- text tertiary -->
-    <color name="omni_text4">#deE8EAF6</color>  <!-- text with "de" alpha -->
-    <color name="omni_color1">#0a0a0a</color> <!-- PRIMARY DARK -->
-    <color name="omni_color2">#131313</color> <!-- PRIMARY LIGHT -->
-    <color name="omni_color3">#61b5fa</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#0096ff</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#62b0ff</color> <!-- ACCENT -->
-    <color name="omni_color6">#56b3ff</color> <!-- WIFI ICON IN DETAILS -->
-    <color name="omni_color7">#2b2b2b</color> <!-- FLOATING DIALOG COLOR ON VERY DARK THEMES MAKE THIS A BIT LIGHTER -->
-    <color name="omni_color8">#2e2e2e</color> <!-- SPECIAL (CHECK WHERE THIS IS ASSIGNED) -->
-    <color name="omni_color9">#e62b2b2b</color> <!-- TOAST (NEEDS SOME ALPHA) -->
-    <color name="omni_color900">#ff05050A</color> <!-- PRIMARY DARK -->
-
-
-    <!-- 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>
-
-    <!-- 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>
-
-    <!-- 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="zen_introduction">@*android:color/omni_color1</color>
-
-    <!-- Dialogs -->
-    <color name="background_floating_material_dark">@*android:color/omni_color7</color> <!-- dialogs like sime settins -->
-
-    <!-- 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>
-
-    <!-- Gradient Shit -->
-    <color name="gradient_start">@*android:color/gradient_start_dark</color>
-    <color name="gradient_end">@*android:color/gradient_end_dark</color>
-
-</resources>
diff --git a/themes/BlackBliss/res/values/config.xml b/themes/BlackBliss/res/values/config.xml
deleted file mode 100644
index a1802c8..0000000
--- a/themes/BlackBliss/res/values/config.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="config_useDarkBgNotificationIconTextTinting">true</bool>
-    <bool name="config_enableNightMode">true</bool>
-</resources>
diff --git a/themes/BlackBliss/res/values/settings.xml b/themes/BlackBliss/res/values/settings.xml
deleted file mode 100644
index 0b1cf0f..0000000
--- a/themes/BlackBliss/res/values/settings.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme.DeviceDefault.Settings" parent="@*android:style/Theme.DeviceDefault">
-        <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/themes/BlackBliss/res/values/styles.xml b/themes/BlackBliss/res/values/styles.xml
deleted file mode 100644
index 2bfc794..0000000
--- a/themes/BlackBliss/res/values/styles.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/BlackBliss/res/values/themes.xml b/themes/BlackBliss/res/values/themes.xml
deleted file mode 100644
index e6f496b..0000000
--- a/themes/BlackBliss/res/values/themes.xml
+++ /dev/null
@@ -1,513 +0,0 @@
-<?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_color900</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>
-
-    <!-- Theme for the dialog shown when an app crashes or ANRs. -->
-    <style name="Theme.Dialog.AppError" parent="@*android:style/Theme.Material.Dialog.Alert">
-        <item name="android:windowContentTransitions">false</item>
-        <item name="android:windowActivityTransitions">false</item>
-        <item name="android:windowCloseOnTouchOutside">false</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/themes/BlissTheme/Android.mk b/themes/BlissTheme/Android.mk
deleted file mode 100644
index 35de6ee..0000000
--- a/themes/BlissTheme/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := BlissTheme
-LOCAL_RRO_THEME := BlissTheme
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/BlissTheme/AndroidManifest.xml b/themes/BlissTheme/AndroidManifest.xml
deleted file mode 100644
index fbf1989..0000000
--- a/themes/BlissTheme/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.bliss"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Bliss" />
-</manifest>
diff --git a/themes/BlissTheme/assets/thumbnail.png b/themes/BlissTheme/assets/thumbnail.png
deleted file mode 100644
index 03e66f2..0000000
--- a/themes/BlissTheme/assets/thumbnail.png
+++ /dev/null
Binary files differ
diff --git a/themes/BlissTheme/res/color/ripple_material_light.xml b/themes/BlissTheme/res/color/ripple_material_light.xml
deleted file mode 100644
index 07ce558..0000000
--- a/themes/BlissTheme/res/color/ripple_material_light.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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/themes/BlissTheme/res/drawable/toast_frame.xml b/themes/BlissTheme/res/drawable/toast_frame.xml
deleted file mode 100644
index 5738837..0000000
--- a/themes/BlissTheme/res/drawable/toast_frame.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/BlissTheme/res/values/colors.xml b/themes/BlissTheme/res/values/colors.xml
deleted file mode 100644
index d5a11fb..0000000
--- a/themes/BlissTheme/res/values/colors.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="user_icon_1">#36ddff</color>
-    <color name="user_icon_2">#4cd5ff</color>
-    <color name="user_icon_3">#62d8ff</color>
-    <color name="user_icon_4">#62d5ff</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 with "de" alpha -->
-    <color name="omni_color1">#ff191919</color> <!-- PRIMARY DARK -->
-    <color name="omni_color2">#ff2d2d2d</color> <!-- PRIMARY LIGHT -->
-    <color name="omni_color3">#3e93cc</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#247ab3</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#2980c7</color> <!-- ACCENT -->
-    <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">#2983c7</color> <!-- SPECIAL (CHECK WHERE THIS IS ASSIGNED) -->
-    <color name="omni_color9">#e6393939</color> <!-- TOAST (NEEDS SOME ALPHA) -->
-    <color name="omni_color900">#ff191919</color> <!-- PRIMARY DARK -->
-
-    <!-- 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>
-
-    <!-- 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>
-
-    <!-- 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="zen_introduction">@*android:color/omni_color1</color>
-
-    <!-- Dialogs -->
-    <color name="background_floating_material_dark">@*android:color/omni_color7</color> <!-- dialogs like sime settins -->
-
-    <!-- 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>
-
-    <!-- Gradient Shit -->
-    <color name="gradient_start">@*android:color/gradient_start_dark</color>
-    <color name="gradient_end">@*android:color/gradient_end_dark</color>
-
-</resources>
diff --git a/themes/BlissTheme/res/values/config.xml b/themes/BlissTheme/res/values/config.xml
deleted file mode 100644
index a1802c8..0000000
--- a/themes/BlissTheme/res/values/config.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="config_useDarkBgNotificationIconTextTinting">true</bool>
-    <bool name="config_enableNightMode">true</bool>
-</resources>
diff --git a/themes/BlissTheme/res/values/settings.xml b/themes/BlissTheme/res/values/settings.xml
deleted file mode 100644
index cc5cee3..0000000
--- a/themes/BlissTheme/res/values/settings.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme.DeviceDefault.Settings" parent="@*android:style/Theme.DeviceDefault">
-        <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/themes/BlissTheme/res/values/strings.xml b/themes/BlissTheme/res/values/strings.xml
deleted file mode 100644
index bf20dad..0000000
--- a/themes/BlissTheme/res/values/strings.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/BlissTheme/res/values/styles.xml b/themes/BlissTheme/res/values/styles.xml
deleted file mode 100644
index 2bfc794..0000000
--- a/themes/BlissTheme/res/values/styles.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/BlissTheme/res/values/themes.xml b/themes/BlissTheme/res/values/themes.xml
deleted file mode 100644
index e6f496b..0000000
--- a/themes/BlissTheme/res/values/themes.xml
+++ /dev/null
@@ -1,513 +0,0 @@
-<?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_color900</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>
-
-    <!-- Theme for the dialog shown when an app crashes or ANRs. -->
-    <style name="Theme.Dialog.AppError" parent="@*android:style/Theme.Material.Dialog.Alert">
-        <item name="android:windowContentTransitions">false</item>
-        <item name="android:windowActivityTransitions">false</item>
-        <item name="android:windowCloseOnTouchOutside">false</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/themes/DarkBliss/Android.mk b/themes/DarkBliss/Android.mk
deleted file mode 100644
index 46c7b5f..0000000
--- a/themes/DarkBliss/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := DarkBlissTheme
-LOCAL_RRO_THEME := DarkBlissTheme
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/DarkBliss/AndroidManifest.xml b/themes/DarkBliss/AndroidManifest.xml
deleted file mode 100644
index 0a1f289..0000000
--- a/themes/DarkBliss/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.darkbliss"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Dark Bliss" />
-</manifest>
diff --git a/themes/DarkBliss/assets/thumbnail.png b/themes/DarkBliss/assets/thumbnail.png
deleted file mode 100644
index 2170a69..0000000
--- a/themes/DarkBliss/assets/thumbnail.png
+++ /dev/null
Binary files differ
diff --git a/themes/DarkBliss/res/color/ripple_material_light.xml b/themes/DarkBliss/res/color/ripple_material_light.xml
deleted file mode 100644
index 07ce558..0000000
--- a/themes/DarkBliss/res/color/ripple_material_light.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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/themes/DarkBliss/res/drawable/toast_frame.xml b/themes/DarkBliss/res/drawable/toast_frame.xml
deleted file mode 100644
index 5738837..0000000
--- a/themes/DarkBliss/res/drawable/toast_frame.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/DarkBliss/res/values/colors.xml b/themes/DarkBliss/res/values/colors.xml
deleted file mode 100644
index 0f225b4..0000000
--- a/themes/DarkBliss/res/values/colors.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="user_icon_1">#ffeeeeee</color>
-    <color name="user_icon_2">#ffdddddd</color>
-    <color name="user_icon_3">#ffcccccc</color>
-    <color name="user_icon_4">#ffbbbbbb</color>
-    <color name="system_error">#ffaaaaaa</color>
-
-    <color name="omni_text1">#FFE8EAF6</color> <!-- text primary -->
-    <color name="omni_text2">#B3E8EAF6</color>  <!-- text secondary -->
-    <color name="omni_text3">#A0E8EAF6</color>  <!-- text tertiary -->
-    <color name="omni_text4">#deE8EAF6</color>  <!-- text with "de" alpha -->
-    <color name="omni_color1">#181818</color> <!-- PRIMARY DARK -->
-    <color name="omni_color2">#2d2d2d</color> <!-- PRIMARY LIGHT -->
-    <color name="omni_color3">#33a9f7</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#49a7f4</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#73bcfc</color> <!-- ACCENT -->
-    <color name="omni_color6">#b3e8eaf6</color> <!-- WIFI ICON IN DETAILS -->
-    <color name="omni_color7">#2d2d2d</color> <!-- FLOATING DIALOG COLOR ON VERY DARK THEMES MAKE THIS A BIT LIGHTER -->
-    <color name="omni_color8">#81abff</color> <!-- SPECIAL (CHECK WHERE THIS IS ASSIGNED) -->
-    <color name="omni_color9">#e6262626</color> <!-- TOAST (NEEDS SOME ALPHA) -->
-    <color name="omni_color900">#151515</color> <!-- PRIMARY DARK -->
-
-    <!-- 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>
-
-    <!-- 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>
-
-    <!-- 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="zen_introduction">@*android:color/omni_color1</color>
-
-    <!-- Dialogs -->
-    <color name="background_floating_material_dark">@*android:color/omni_color7</color> <!-- dialogs like sime settins -->
-
-    <!-- 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>
-
-    <!-- Gradient Shit -->
-    <color name="gradient_start">@*android:color/gradient_start_dark</color>
-    <color name="gradient_end">@*android:color/gradient_end_dark</color>
-
-</resources>
diff --git a/themes/DarkBliss/res/values/config.xml b/themes/DarkBliss/res/values/config.xml
deleted file mode 100644
index a1802c8..0000000
--- a/themes/DarkBliss/res/values/config.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="config_useDarkBgNotificationIconTextTinting">true</bool>
-    <bool name="config_enableNightMode">true</bool>
-</resources>
diff --git a/themes/DarkBliss/res/values/settings.xml b/themes/DarkBliss/res/values/settings.xml
deleted file mode 100644
index cc5cee3..0000000
--- a/themes/DarkBliss/res/values/settings.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme.DeviceDefault.Settings" parent="@*android:style/Theme.DeviceDefault">
-        <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/themes/DarkBliss/res/values/strings.xml b/themes/DarkBliss/res/values/strings.xml
deleted file mode 100644
index bf20dad..0000000
--- a/themes/DarkBliss/res/values/strings.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/DarkBliss/res/values/styles.xml b/themes/DarkBliss/res/values/styles.xml
deleted file mode 100644
index 2bfc794..0000000
--- a/themes/DarkBliss/res/values/styles.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/DarkBliss/res/values/themes.xml b/themes/DarkBliss/res/values/themes.xml
deleted file mode 100644
index e6f496b..0000000
--- a/themes/DarkBliss/res/values/themes.xml
+++ /dev/null
@@ -1,513 +0,0 @@
-<?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_color900</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>
-
-    <!-- Theme for the dialog shown when an app crashes or ANRs. -->
-    <style name="Theme.Dialog.AppError" parent="@*android:style/Theme.Material.Dialog.Alert">
-        <item name="android:windowContentTransitions">false</item>
-        <item name="android:windowActivityTransitions">false</item>
-        <item name="android:windowCloseOnTouchOutside">false</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/themes/DarknessMeister/Android.mk b/themes/DarknessMeister/Android.mk
deleted file mode 100644
index 22b5bf3..0000000
--- a/themes/DarknessMeister/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := DarknessMeisterTheme
-LOCAL_RRO_THEME := DarknessMeisterTheme
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/DarknessMeister/AndroidManifest.xml b/themes/DarknessMeister/AndroidManifest.xml
deleted file mode 100644
index 6df6222..0000000
--- a/themes/DarknessMeister/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.darknessmeister"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Darkness Meister" />
-</manifest>
diff --git a/themes/DarknessMeister/assets/thumbnail.png b/themes/DarknessMeister/assets/thumbnail.png
deleted file mode 100644
index 2170a69..0000000
--- a/themes/DarknessMeister/assets/thumbnail.png
+++ /dev/null
Binary files differ
diff --git a/themes/DarknessMeister/res/color/ripple_material_light.xml b/themes/DarknessMeister/res/color/ripple_material_light.xml
deleted file mode 100644
index 07ce558..0000000
--- a/themes/DarknessMeister/res/color/ripple_material_light.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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/themes/DarknessMeister/res/drawable/toast_frame.xml b/themes/DarknessMeister/res/drawable/toast_frame.xml
deleted file mode 100644
index 5738837..0000000
--- a/themes/DarknessMeister/res/drawable/toast_frame.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/DarknessMeister/res/values/colors.xml b/themes/DarknessMeister/res/values/colors.xml
deleted file mode 100644
index 5a41fbd..0000000
--- a/themes/DarknessMeister/res/values/colors.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="user_icon_1">#ffeeeeee</color>
-    <color name="user_icon_2">#ffdddddd</color>
-    <color name="user_icon_3">#ffcccccc</color>
-    <color name="user_icon_4">#ffbbbbbb</color>
-    <color name="system_error">#ffaaaaaa</color>
-
-    <color name="omni_text1">#FFE8EAF6</color> <!-- text primary -->
-    <color name="omni_text2">#B3E8EAF6</color>  <!-- text secondary -->
-    <color name="omni_text3">#A0E8EAF6</color>  <!-- text tertiary -->
-    <color name="omni_text4">#deE8EAF6</color>  <!-- text with "de" alpha -->
-    <color name="omni_color1">#ff111519</color> <!-- PRIMARY DARK -->
-    <color name="omni_color2">#ff222a33</color> <!-- PRIMARY LIGHT -->
-    <color name="omni_color3">#ff78b8ff</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ff5fabff</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ffabd3ff</color> <!-- ACCENT -->
-    <color name="omni_color6">#b3e8eaf6</color> <!-- WIFI ICON IN DETAILS -->
-    <color name="omni_color7">#ff383f47</color> <!-- FLOATING DIALOG COLOR ON VERY DARK THEMES MAKE THIS A BIT LIGHTER -->
-    <color name="omni_color8">#ffadabff</color> <!-- SPECIAL (CHECK WHERE THIS IS ASSIGNED) -->
-    <color name="omni_color9">#e6383f47</color> <!-- TOAST (NEEDS SOME ALPHA) -->
-    <color name="omni_color900">#ff111519</color> <!-- PRIMARY DARK -->
-
-    <!-- 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>
-
-    <!-- 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>
-
-    <!-- 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="zen_introduction">@*android:color/omni_color1</color>
-
-    <!-- Dialogs -->
-    <color name="background_floating_material_dark">@*android:color/omni_color7</color> <!-- dialogs like sime settins -->
-
-    <!-- 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/themes/DarknessMeister/res/values/config.xml b/themes/DarknessMeister/res/values/config.xml
deleted file mode 100644
index a1802c8..0000000
--- a/themes/DarknessMeister/res/values/config.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="config_useDarkBgNotificationIconTextTinting">true</bool>
-    <bool name="config_enableNightMode">true</bool>
-</resources>
diff --git a/themes/DarknessMeister/res/values/settings.xml b/themes/DarknessMeister/res/values/settings.xml
deleted file mode 100644
index cc5cee3..0000000
--- a/themes/DarknessMeister/res/values/settings.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme.DeviceDefault.Settings" parent="@*android:style/Theme.DeviceDefault">
-        <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/themes/DarknessMeister/res/values/strings.xml b/themes/DarknessMeister/res/values/strings.xml
deleted file mode 100644
index bf20dad..0000000
--- a/themes/DarknessMeister/res/values/strings.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/DarknessMeister/res/values/styles.xml b/themes/DarknessMeister/res/values/styles.xml
deleted file mode 100644
index 2bfc794..0000000
--- a/themes/DarknessMeister/res/values/styles.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/DarknessMeister/res/values/themes.xml b/themes/DarknessMeister/res/values/themes.xml
deleted file mode 100644
index e6f496b..0000000
--- a/themes/DarknessMeister/res/values/themes.xml
+++ /dev/null
@@ -1,513 +0,0 @@
-<?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_color900</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>
-
-    <!-- Theme for the dialog shown when an app crashes or ANRs. -->
-    <style name="Theme.Dialog.AppError" parent="@*android:style/Theme.Material.Dialog.Alert">
-        <item name="android:windowContentTransitions">false</item>
-        <item name="android:windowActivityTransitions">false</item>
-        <item name="android:windowCloseOnTouchOutside">false</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/themes/DialerTheme/Android.mk b/themes/DialerTheme/Android.mk
deleted file mode 100644
index f351426..0000000
--- a/themes/DialerTheme/Android.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := DialerTheme
-LOCAL_RRO_THEME := DialerTheme
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_USE_AAPT2 := true
-LOCAL_AAPT_FLAGS += \
-        --auto-add-overlay \
-
-RES_DIRS := $(call all-subdir-named-dirs,res,.)
-LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(RES_DIRS))
- 
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/DialerTheme/AndroidManifest.xml b/themes/DialerTheme/AndroidManifest.xml
deleted file mode 100644
index 0b46971..0000000
--- a/themes/DialerTheme/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.app.dialertheme"
-    platformBuildVersionCode="28"
-    platformBuildVersionName="9.0.0">
-
-    <overlay android:priority="2" android:targetPackage="com.android.dialer" />
-
-
-    <application android:hasCode="false"
-                 android:label="Dialer Theme" />
-</manifest>
diff --git a/themes/DialerTheme/assets/thumbnail.png b/themes/DialerTheme/assets/thumbnail.png
deleted file mode 100644
index 9841324..0000000
--- a/themes/DialerTheme/assets/thumbnail.png
+++ /dev/null
Binary files differ
diff --git a/themes/DialerTheme/java/com/android/contacts/common/res/values/colors.xml b/themes/DialerTheme/java/com/android/contacts/common/res/values/colors.xml
deleted file mode 100644
index eff136c..0000000
--- a/themes/DialerTheme/java/com/android/contacts/common/res/values/colors.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<!--
-  ~ Copyright (C) 2012 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>
-  <!-- Color of ripples used for views with dark backgrounds -->
-  <color name="dialer_ripple_material_dark">#a0ffffff</color>
-
-  <!-- Color of ripples used for views with light backgrounds -->
-  <color name="dialer_ripple_material_light">#30ffffff</color>
-
-  <!-- Divider color for header separator -->
-  <color name="primary_text_color">@*android:color/omni_text1</color>
-
-  <color name="secondary_text_color">@*android:color/omni_text2</color>
-
-  <!-- Text color for section header. -->
-  <color name="section_header_text_color">@*android:color/omni_color3</color>
-
-  <!-- Color of the theme of the People app -->
-  <color name="people_app_theme_color">@*android:color/omni_color4</color>
-
-  <!-- Darker versions of letter_tile_colors, two shades darker. These colors are used
-      for settings secondary activity colors. -->
-  <array name="letter_tile_colors_dark">
-    <item>#C53929</item>
-    <item>#C2185B</item>
-    <item>#7B1FA2</item>
-    <item>#512DA8</item>
-    <item>#303F9F</item>
-    <item>#3367D6</item>
-    <item>#0277BD</item>
-    <item>#006064</item>
-    <item>#00796B</item>
-    <item>#0B8043</item>
-    <item>#33691E</item>
-    <item>#E65100</item>
-    <item>#E64A19</item>
-    <item>#424242</item>
-  </array>
-
-  <color name="tab_ripple_color">#ffffff</color>
-  <color name="tab_selected_underline_color">#ffffff</color>
-  <color name="tab_unread_count_background_color">@*android:color/omni_color2</color>
-
-  <!-- Color of action bar text. Ensure this stays in sync with packages/Telephony
-  phone_settings_actionbar_text_color-->
-  <color name="actionbar_text_color">#ffffff</color>
-  <color name="actionbar_unselected_text_color">#a6f5f5f5</color>
-
-  <!-- Text color of the search box text as entered by user  -->
-  <color name="searchbox_text_color">@*android:color/omni_text1</color>
-  <!-- Background color of the search box -->
-  <color name="searchbox_background_color">@*android:color/omni_color2</color>
-
-  <color name="searchbox_hint_text_color">@*android:color/omni_text3</color>
-  <color name="searchbox_icon_tint">@*android:color/omni_text1</color>
-
-  <color name="search_shortcut_icon_color">@*android:color/omni_text1</color>
-
-  <!-- Color of the background of the contact detail and editor pages -->
-  <color name="background_primary">@*android:color/omni_color2</color>
-  <color name="contact_all_list_background_color">@*android:color/omni_color1</color>
-
-  <!-- Text color used for character counter when the max limit has been exceeded -->
-  <color name="call_subject_limit_exceeded">#d1041c</color>
-
-  <!-- Tint color for the call subject history icon. -->
-  <color name="call_subject_history_icon">#ffffff</color>
-
-  <!-- Divider line on the call subject dialog. -->
-  <color name="call_subject_divider">#d8d8d8</color>
-
-  <!-- Text color for the SEND & CALL button on the call subject dialog. -->
-  <color name="call_subject_button">#00c853</color>
-
-  <!-- Background color for the call subject history view. -->
-  <color name="call_subject_history_background">@*android:color/omni_color1</color>
-</resources>
diff --git a/themes/DialerTheme/java/com/android/dialer/app/res/values/color.xml b/themes/DialerTheme/java/com/android/dialer/app/res/values/color.xml
deleted file mode 100644
index 41ab928..0000000
--- a/themes/DialerTheme/java/com/android/dialer/app/res/values/color.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<!--
-  ~ Copyright (C) 2012 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>
-  <color name="setting_disabled_color">@*android:color/omni_color2</color>
-  <color name="setting_background_color">@*android:color/omni_color1</color>
-
-  <!-- 54% black -->
-  <color name="call_log_icon_tint">@*android:color/omni_text2</color>
-  <!-- 87% black -->
-  <color name="call_log_primary_color">@*android:color/omni_text1</color>
-  <!-- 54% black -->
-  <color name="call_log_detail_color">@*android:color/omni_text2</color>
-  <!-- 87% black -->
-  <color name="call_log_voicemail_transcript_color">@*android:color/omni_text1</color>
-  <!-- 54% black -->
-  <color name="call_log_voicemail_transcript_branding_color">@*android:color/omni_text2</color>
-  <!-- 70% black -->
-  <color name="call_log_action_color">@*android:color/omni_text1</color>
-  <!-- 54% black -->
-  <color name="call_log_day_group_heading_color">@*android:color/omni_text2</color>
-  <!-- 87% black-->
-  <color name="call_log_unread_text_color">@*android:color/omni_text1</color>
-
-  <color name="voicemail_icon_disabled_tint">@*android:color/omni_text2</color>
-
-  <!-- Background color for search results and call details -->
-  <color name="background_dialer_results">@*android:color/omni_color1</color>
-
-  <color name="call_log_action_divider">@*android:color/omni_color7</color>
-  <color name="divider_line_color">#D8D8D8</color>
-
-  <!--  Colors for blocked numbers list -->
-  <color name="blocked_number_primary_text_color">@*android:color/omni_text1</color>
-  <color name="blocked_number_secondary_text_color">@*android:color/omni_text2</color>
-  <color name="blocked_number_icon_tint">#616161</color>
-  <color name="blocked_number_background">#FFFFFF</color>
-  <color name="blocked_number_block_color">#F44336</color>
-  <color name="blocked_number_disabled_emergency_background_color">#E0E0E0</color>
-  <color name="add_blocked_number_icon_color">#bdbdbd</color>
-
-  <color name="voicemail_donation_promo_positive_button_text_color">#FF2A56C6</color>
-  <color name="voicemail_donation_promo_negative_button_text_color">#FF757575</color>
-
-  <color name="settings_text_color_primary">@*android:color/omni_text1</color>
-  <color name="settings_text_color_secondary">@*android:color/omni_text2</color>
-</resources>
diff --git a/themes/DialerTheme/java/com/android/dialer/app/res/values/style.xml b/themes/DialerTheme/java/com/android/dialer/app/res/values/style.xml
deleted file mode 100644
index 9208b86..0000000
--- a/themes/DialerTheme/java/com/android/dialer/app/res/values/style.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2012 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>
-
-</resources>
diff --git a/themes/DialerTheme/java/com/android/dialer/dialpadview/res/values/colors.xml b/themes/DialerTheme/java/com/android/dialer/dialpadview/res/values/colors.xml
deleted file mode 100644
index da66af9..0000000
--- a/themes/DialerTheme/java/com/android/dialer/dialpadview/res/values/colors.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-  ~ Copyright (C) 2012 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>
-  <!-- Colors for the dialpad -->
-  <color name="background_dialpad">@*android:color/omni_color2</color>
-  <color name="dialpad_secondary_text_color">@*android:color/omni_text2</color>
-  <color name="dialpad_digits_text_color">#fff</color>
-  <color name="dialpad_icon_tint">#89ffffff</color>
-  <color name="dialpad_voicemail_tint">#919191</color>
-</resources>
-
diff --git a/themes/DialerTheme/java/com/android/dialer/theme/res/values/colors.xml b/themes/DialerTheme/java/com/android/dialer/theme/res/values/colors.xml
deleted file mode 100644
index bb7c8cd..0000000
--- a/themes/DialerTheme/java/com/android/dialer/theme/res/values/colors.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<!--
-  ~ Copyright (C) 2012 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>
-  <color name="dialer_theme_color">@*android:color/omni_color4</color>
-  <color name="dialer_theme_color_dark">@*android:color/omni_color5</color>
-
-  <color name="dialer_snackbar_action_text_color">@*android:color/omni_color8</color>
-  <color name="dialer_theme_color_20pct">@*android:color/omni_color3</color>
-
-<!--  <color name="dialpad_fab_green">@*android:color/omni_color5</color> -->
-
-  <color name="dialer_secondary_color">@*android:color/omni_color4</color>
-
-  <!-- Primary text color in the Phone app -->
-  <color name="dialer_primary_text_color">@*android:color/omni_text1</color>
-  <color name="dialer_primary_text_color_white">@*android:color/omni_text1</color>
-  <color name="dialer_edit_text_hint_color">@*android:color/omni_text2</color>
-
-  <!-- Secondary text color in the Phone app -->
-  <color name="dialer_secondary_text_color">@*android:color/omni_text2</color>
-  <!-- 38% opacity -->
-  <color name="dialer_secondary_text_color_hiden">@*android:color/omni_text3</color>
-
-  <!-- Color of the theme of the Dialer app -->
-  <color name="dialtacts_theme_color">@*android:color/omni_color2</color>
-
-  <!-- Background color of new dialer activity -->
-  <color name="background_dialer_light">@*android:color/omni_color1</color>
-  <!-- White background for dialer -->
-  <color name="background_dialer_white">@*android:color/omni_color1</color>
-  <color name="background_dialer_call_log_list_item">@*android:color/omni_color2</color>
-
-  <!-- Colors for the notification actions -->
-  <color name="notification_action_accept">#097138</color>
-  <color name="notification_action_dismiss">#A52714</color>
-  <color name="notification_action_answer_video">#097138</color>
-
-  <!-- Background color of action bars -->
-  <color name="actionbar_background_color">@*android:color/omni_color2</color>
-
-  <!-- Background color of title bars in recents -->
-  <color name="titlebar_in_recents_background_color">@*android:color/omni_color4</color>
-
-  <color name="blue_grey_100">@*android:color/omni_color1</color>
-
-  <!-- 54% opacity -->
-  <color name="icon_color_grey">@*android:color/omni_color9</color>
-
-  <!-- Color for bubble -->
-  <color name="dialer_end_call_button_color">#BD2A2A</color>
-
-  <color name="omni_subheader">@*android:color/omni_text2</color>
-  <color name="omni_secondary_text">@*android:color/omni_text2</color>
-  <color name="omni_primary_text">@*android:color/omni_text1</color>
-  <color name="popup_background_color">@*android:color/omni_color7</color>
-  <color name="popup_header_color">@*android:color/omni_text1</color>
-</resources>
-
diff --git a/themes/DialerTheme/java/com/android/dialer/theme/res/values/strings.xml b/themes/DialerTheme/java/com/android/dialer/theme/res/values/strings.xml
deleted file mode 100644
index 7b67f0a..0000000
--- a/themes/DialerTheme/java/com/android/dialer/theme/res/values/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
-  ~ Copyright (C) 2016 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="omni_true">false</string>
-</resources>
-
diff --git a/themes/DialerTheme/java/com/android/dialer/theme/res/values/styles.xml b/themes/DialerTheme/java/com/android/dialer/theme/res/values/styles.xml
deleted file mode 100644
index 6f57ea1..0000000
--- a/themes/DialerTheme/java/com/android/dialer/theme/res/values/styles.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-  ~ Copyright (C) 2012 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>
-  <style name="AlertDialogTheme" parent="@*android:style/Theme.Material.Dialog">
-    <item name="android:colorAccent">@*android:color/omni_color4</item>
-  </style>
-
-</resources>
-
diff --git a/themes/DocumentsUITheme/Android.mk b/themes/DocumentsUITheme/Android.mk
deleted file mode 100644
index 7fb9fb4..0000000
--- a/themes/DocumentsUITheme/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := DocumentsUITheme
-LOCAL_RRO_THEME := DocumentsUITheme
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/DocumentsUITheme/AndroidManifest.xml b/themes/DocumentsUITheme/AndroidManifest.xml
deleted file mode 100644
index 5e7b2f9..0000000
--- a/themes/DocumentsUITheme/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.app.documentsuitheme"
-    platformBuildVersionCode="28"
-    platformBuildVersionName="9.0.0">
-
-    <overlay android:priority="2" android:targetPackage="com.android.documentsui" />
-
-
-    <application android:hasCode="false"
-                 android:label="DocumentsUI Theme" />
-</manifest>
diff --git a/themes/DocumentsUITheme/assets/thumbnail.png b/themes/DocumentsUITheme/assets/thumbnail.png
deleted file mode 100644
index 9841324..0000000
--- a/themes/DocumentsUITheme/assets/thumbnail.png
+++ /dev/null
Binary files differ
diff --git a/themes/DocumentsUITheme/res/color/ripple_material_light.xml b/themes/DocumentsUITheme/res/color/ripple_material_light.xml
deleted file mode 100644
index 07ce558..0000000
--- a/themes/DocumentsUITheme/res/color/ripple_material_light.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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/themes/DocumentsUITheme/res/drawable/toast_frame.xml b/themes/DocumentsUITheme/res/drawable/toast_frame.xml
deleted file mode 100644
index 5738837..0000000
--- a/themes/DocumentsUITheme/res/drawable/toast_frame.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/DocumentsUITheme/res/values/colors.xml b/themes/DocumentsUITheme/res/values/colors.xml
deleted file mode 100644
index 6c3c592..0000000
--- a/themes/DocumentsUITheme/res/values/colors.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 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>
-    <color name="window_background">@*android:color/omni_color1</color>
-    <color name="drawer_background">@*android:color/omni_color1</color>
-    <color name="drawer_border">@*android:color/omni_color2</color>
-    <color name="directory_background">@*android:color/omni_color1</color>
-    <color name="menu_search_background">@android:color/transparent</color>
-
-    <color name="primary_dark">@*android:color/omni_color1</color>
-    <color name="primary">@*android:color/omni_color2</color>
-    <color name="accent">@*android:color/omni_color5</color>
-    <color name="accent_dark">@*android:color/omni_color4</color>
-
-    <color name="text_cursor">@*android:color/omni_text1</color>
-    <color name="text_handle">@*android:color/omni_color4</color>
-    <color name="text_highlight">@*android:color/omni_color5</color>
-    <color name="text_secondary">@*android:color/omni_text2</color>
-
-    <color name="band_select_background">#880000ff</color>
-    <color name="band_select_border">#440000ff</color>
-
-    <color name="root_title_color">@*android:color/omni_text2</color>
-    <color name="root_activated_color">@*android:color/omni_text1</color>
-    <color name="root_details_color">@*android:color/omni_text3</color>
-    <color name="root_focus_color">@*android:color/omni_color7</color>
-
-    <color name="item_hover_color">@*android:color/omni_color7</color>
-
-    <color name="sort_widget_text_color">@*android:color/omni_color5</color>
-
-    <color name="root_icon_color">@*android:color/omni_color4</color>
-    <item name="root_icon_disabled_alpha" format="float" type="dimen">@*android:dimen/disabled_alpha_material_light</item>
-    <color name="doc_icon_color">@*android:color/omni_color6</color>
-    <color name="tool_bar_color">@*android:color/omni_color2</color>
-    <color name="item_doc_title">@*android:color/omni_text1</color>
-    <color name="item_doc_title_disabled">@*android:color/omni_text2</color>
-    <color name="item_doc_details">@*android:color/omni_text3</color>
-    <color name="item_doc_background">@*android:color/omni_color7</color>
-    <color name="item_doc_background_disabled">@*android:color/omni_color1</color>
-    <color name="item_breadcrumb_background_hovered">@*android:color/omni_color3</color>
-    <color name="item_doc_droppable_background">@*android:color/omni_color7</color>
-    <color name="item_doc_not_droppable_background">@*android:color/omni_color1</color>
-    <color name="item_grid_tint">@*android:color/omni_color8</color>
-
-    <color name="item_drag_shadow_background">@*android:color/omni_color7</color>
-    <color name="item_drag_shadow_container_background">@*android:color/transparent</color>
-
-    <color name="downloads_icon_background">#ff4688f2</color>
-    <color name="app_icon_background">#ff4688f2</color>
-    <color name="shortcut_foreground">#ff3367d6</color>
-    <color name="shortcut_background">#fff5f5f5</color>
-
-    <color name="dialog_title">@*android:color/omni_text1</color>
-
-    <color name="scroll_thumb_pressed">#ff8c8c8c</color>
-    <color name="scroll_thumb">#ffbebebe</color>
-    <color name="scroll_track">#fff0f0f0</color>
-
-    <color name="inspector_value">@*android:color/omni_text1</color>
-    <color name="inspector_link">@*android:color/omni_text3</color>
-    <color name="inspector_section_title">@*android:color/omni_text1</color>
-    <color name="inspector_section_divider">@*android:color/omni_color1</color>
-    <color name="inspector_title_background">@*android:color/omni_color7</color>
-</resources>
diff --git a/themes/DocumentsUITheme/res/values/styles.xml b/themes/DocumentsUITheme/res/values/styles.xml
deleted file mode 100644
index 785efc4..0000000
--- a/themes/DocumentsUITheme/res/values/styles.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 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:android="http://schemas.android.com/apk/res/android" >
-
-    <style name="ActionBarPopupTheme" parent="@*android:style/ThemeOverlay.Material" />
-</resources>
diff --git a/themes/Fonts/Android.mk b/themes/Fonts/Android.mk
deleted file mode 100644
index 7d45e81..0000000
--- a/themes/Fonts/Android.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_PACKAGE_NAME := BlissFonts
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
-
-include $(BUILD_PACKAGE)
diff --git a/themes/Fonts/AndroidManifest.xml b/themes/Fonts/AndroidManifest.xml
deleted file mode 100644
index d819ed8..0000000
--- a/themes/Fonts/AndroidManifest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.blissroms.fonts">
-
-    <application android:label="@string/app_name"
-        android:icon="@mipmap/ic_launcher"
-        android:hasCode="false"/>
-
-</manifest>
diff --git a/themes/Fonts/assets/fonts/Alpaca.zip b/themes/Fonts/assets/fonts/Alpaca.zip
deleted file mode 100644
index 107ae3a..0000000
--- a/themes/Fonts/assets/fonts/Alpaca.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Amarante.zip b/themes/Fonts/assets/fonts/Amarante.zip
deleted file mode 100644
index 3ac26b4..0000000
--- a/themes/Fonts/assets/fonts/Amarante.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Anaheim.zip b/themes/Fonts/assets/fonts/Anaheim.zip
deleted file mode 100644
index 87666c9..0000000
--- a/themes/Fonts/assets/fonts/Anaheim.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Anita.zip b/themes/Fonts/assets/fonts/Anita.zip
deleted file mode 100644
index 53e2dad..0000000
--- a/themes/Fonts/assets/fonts/Anita.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Aovel_Rounded.zip b/themes/Fonts/assets/fonts/Aovel_Rounded.zip
deleted file mode 100644
index 68d01e4..0000000
--- a/themes/Fonts/assets/fonts/Aovel_Rounded.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Arkitech.zip b/themes/Fonts/assets/fonts/Arkitech.zip
deleted file mode 100644
index 7ce4495..0000000
--- a/themes/Fonts/assets/fonts/Arkitech.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Asap.zip b/themes/Fonts/assets/fonts/Asap.zip
deleted file mode 100644
index b614f89..0000000
--- a/themes/Fonts/assets/fonts/Asap.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Assassin.zip b/themes/Fonts/assets/fonts/Assassin.zip
deleted file mode 100644
index 5ed6ba8..0000000
--- a/themes/Fonts/assets/fonts/Assassin.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Atma.zip b/themes/Fonts/assets/fonts/Atma.zip
deleted file mode 100644
index be9714b..0000000
--- a/themes/Fonts/assets/fonts/Atma.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Audiowide.zip b/themes/Fonts/assets/fonts/Audiowide.zip
deleted file mode 100644
index a4e1456..0000000
--- a/themes/Fonts/assets/fonts/Audiowide.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Bariol.zip b/themes/Fonts/assets/fonts/Bariol.zip
deleted file mode 100644
index 4e27690..0000000
--- a/themes/Fonts/assets/fonts/Bariol.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Barlow.zip b/themes/Fonts/assets/fonts/Barlow.zip
deleted file mode 100644
index c878665..0000000
--- a/themes/Fonts/assets/fonts/Barlow.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Bauhaus.zip b/themes/Fonts/assets/fonts/Bauhaus.zip
deleted file mode 100644
index 3adac75..0000000
--- a/themes/Fonts/assets/fonts/Bauhaus.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Big_River_Script.zip b/themes/Fonts/assets/fonts/Big_River_Script.zip
deleted file mode 100644
index 6c7114d..0000000
--- a/themes/Fonts/assets/fonts/Big_River_Script.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Cabo_Rounded.zip b/themes/Fonts/assets/fonts/Cabo_Rounded.zip
deleted file mode 100644
index f5d6d4d..0000000
--- a/themes/Fonts/assets/fonts/Cabo_Rounded.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Cagliostro.zip b/themes/Fonts/assets/fonts/Cagliostro.zip
deleted file mode 100644
index dc0a7c8..0000000
--- a/themes/Fonts/assets/fonts/Cagliostro.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Calibri.zip b/themes/Fonts/assets/fonts/Calibri.zip
deleted file mode 100644
index 836ff65..0000000
--- a/themes/Fonts/assets/fonts/Calibri.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Caviar_Dreams.zip b/themes/Fonts/assets/fonts/Caviar_Dreams.zip
deleted file mode 100644
index bdf81b2..0000000
--- a/themes/Fonts/assets/fonts/Caviar_Dreams.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Chinacat.zip b/themes/Fonts/assets/fonts/Chinacat.zip
deleted file mode 100644
index 5e44e9a..0000000
--- a/themes/Fonts/assets/fonts/Chinacat.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Chococooky.zip b/themes/Fonts/assets/fonts/Chococooky.zip
deleted file mode 100644
index 0016d74..0000000
--- a/themes/Fonts/assets/fonts/Chococooky.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Chromia.zip b/themes/Fonts/assets/fonts/Chromia.zip
deleted file mode 100644
index 155d363..0000000
--- a/themes/Fonts/assets/fonts/Chromia.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Clear_Sans.zip b/themes/Fonts/assets/fonts/Clear_Sans.zip
deleted file mode 100644
index dedfc40..0000000
--- a/themes/Fonts/assets/fonts/Clear_Sans.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Cocon.zip b/themes/Fonts/assets/fonts/Cocon.zip
deleted file mode 100644
index e20db30..0000000
--- a/themes/Fonts/assets/fonts/Cocon.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Comfortaa.zip b/themes/Fonts/assets/fonts/Comfortaa.zip
deleted file mode 100644
index ac1690f..0000000
--- a/themes/Fonts/assets/fonts/Comfortaa.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Comic_Sans.zip b/themes/Fonts/assets/fonts/Comic_Sans.zip
deleted file mode 100644
index 7363db0..0000000
--- a/themes/Fonts/assets/fonts/Comic_Sans.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Comicneuesansid.zip b/themes/Fonts/assets/fonts/Comicneuesansid.zip
deleted file mode 100644
index 3712937..0000000
--- a/themes/Fonts/assets/fonts/Comicneuesansid.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Cooljazz.zip b/themes/Fonts/assets/fonts/Cooljazz.zip
deleted file mode 100644
index 376a343..0000000
--- a/themes/Fonts/assets/fonts/Cooljazz.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Coolstory.zip b/themes/Fonts/assets/fonts/Coolstory.zip
deleted file mode 100644
index c8e38c7..0000000
--- a/themes/Fonts/assets/fonts/Coolstory.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Digital.zip b/themes/Fonts/assets/fonts/Digital.zip
deleted file mode 100644
index df228d6..0000000
--- a/themes/Fonts/assets/fonts/Digital.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Dosis.zip b/themes/Fonts/assets/fonts/Dosis.zip
deleted file mode 100644
index 12f1f7e..0000000
--- a/themes/Fonts/assets/fonts/Dosis.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Exo2.zip b/themes/Fonts/assets/fonts/Exo2.zip
deleted file mode 100644
index 9e2a955..0000000
--- a/themes/Fonts/assets/fonts/Exo2.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Fasterisq.zip b/themes/Fonts/assets/fonts/Fasterisq.zip
deleted file mode 100644
index ff93655..0000000
--- a/themes/Fonts/assets/fonts/Fasterisq.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Fearytale.zip b/themes/Fonts/assets/fonts/Fearytale.zip
deleted file mode 100644
index 24efdeb..0000000
--- a/themes/Fonts/assets/fonts/Fearytale.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Fifa2018.zip b/themes/Fonts/assets/fonts/Fifa2018.zip
deleted file mode 100644
index 512b271..0000000
--- a/themes/Fonts/assets/fonts/Fifa2018.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Filth_Of_Icarus.zip b/themes/Fonts/assets/fonts/Filth_Of_Icarus.zip
deleted file mode 100644
index 71b8ec1..0000000
--- a/themes/Fonts/assets/fonts/Filth_Of_Icarus.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Fira_Sans.zip b/themes/Fonts/assets/fonts/Fira_Sans.zip
deleted file mode 100644
index da0739b..0000000
--- a/themes/Fonts/assets/fonts/Fira_Sans.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/FoxAndCat.zip b/themes/Fonts/assets/fonts/FoxAndCat.zip
deleted file mode 100644
index 726da56..0000000
--- a/themes/Fonts/assets/fonts/FoxAndCat.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Gafata.zip b/themes/Fonts/assets/fonts/Gafata.zip
deleted file mode 100644
index 3c5686f..0000000
--- a/themes/Fonts/assets/fonts/Gafata.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/GinoraSans.zip b/themes/Fonts/assets/fonts/GinoraSans.zip
deleted file mode 100644
index 8ac4740..0000000
--- a/themes/Fonts/assets/fonts/GinoraSans.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Google_Sans.zip b/themes/Fonts/assets/fonts/Google_Sans.zip
deleted file mode 100644
index 6cfd9fa..0000000
--- a/themes/Fonts/assets/fonts/Google_Sans.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Gotham_Nights.zip b/themes/Fonts/assets/fonts/Gotham_Nights.zip
deleted file mode 100644
index 0989524..0000000
--- a/themes/Fonts/assets/fonts/Gotham_Nights.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/HYCoffee.zip b/themes/Fonts/assets/fonts/HYCoffee.zip
deleted file mode 100644
index 14af966..0000000
--- a/themes/Fonts/assets/fonts/HYCoffee.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/HappyTime.zip b/themes/Fonts/assets/fonts/HappyTime.zip
deleted file mode 100644
index 5c05bc8..0000000
--- a/themes/Fonts/assets/fonts/HappyTime.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Helvetica_Neue.zip b/themes/Fonts/assets/fonts/Helvetica_Neue.zip
deleted file mode 100644
index accc4c4..0000000
--- a/themes/Fonts/assets/fonts/Helvetica_Neue.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/IDroid.zip b/themes/Fonts/assets/fonts/IDroid.zip
deleted file mode 100644
index 681936c..0000000
--- a/themes/Fonts/assets/fonts/IDroid.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/I_Hate_Comic_Sans.zip b/themes/Fonts/assets/fonts/I_Hate_Comic_Sans.zip
deleted file mode 100644
index 7e73523..0000000
--- a/themes/Fonts/assets/fonts/I_Hate_Comic_Sans.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Imaki.zip b/themes/Fonts/assets/fonts/Imaki.zip
deleted file mode 100644
index c260655..0000000
--- a/themes/Fonts/assets/fonts/Imaki.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Inkferno.zip b/themes/Fonts/assets/fonts/Inkferno.zip
deleted file mode 100644
index 42ef930..0000000
--- a/themes/Fonts/assets/fonts/Inkferno.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Kenyan_Coffee.zip b/themes/Fonts/assets/fonts/Kenyan_Coffee.zip
deleted file mode 100644
index b5ba144..0000000
--- a/themes/Fonts/assets/fonts/Kenyan_Coffee.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Kg_Miss_Kindergarten.zip b/themes/Fonts/assets/fonts/Kg_Miss_Kindergarten.zip
deleted file mode 100644
index 3a96c70..0000000
--- a/themes/Fonts/assets/fonts/Kg_Miss_Kindergarten.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/LG_Smart_Gothic.zip b/themes/Fonts/assets/fonts/LG_Smart_Gothic.zip
deleted file mode 100644
index 7f78184..0000000
--- a/themes/Fonts/assets/fonts/LG_Smart_Gothic.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Liberation_Serif.zip b/themes/Fonts/assets/fonts/Liberation_Serif.zip
deleted file mode 100644
index 8cb8e56..0000000
--- a/themes/Fonts/assets/fonts/Liberation_Serif.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/LifeIsABeach.zip b/themes/Fonts/assets/fonts/LifeIsABeach.zip
deleted file mode 100644
index 62b9f0c..0000000
--- a/themes/Fonts/assets/fonts/LifeIsABeach.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Lovelyn.zip b/themes/Fonts/assets/fonts/Lovelyn.zip
deleted file mode 100644
index bf71587..0000000
--- a/themes/Fonts/assets/fonts/Lovelyn.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Malgun_Gothic.zip b/themes/Fonts/assets/fonts/Malgun_Gothic.zip
deleted file mode 100644
index 008ba85..0000000
--- a/themes/Fonts/assets/fonts/Malgun_Gothic.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/ModernSerif.zip b/themes/Fonts/assets/fonts/ModernSerif.zip
deleted file mode 100644
index e9a5143..0000000
--- a/themes/Fonts/assets/fonts/ModernSerif.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/MontsterratAlt.zip b/themes/Fonts/assets/fonts/MontsterratAlt.zip
deleted file mode 100644
index a8414b1..0000000
--- a/themes/Fonts/assets/fonts/MontsterratAlt.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Museo300.zip b/themes/Fonts/assets/fonts/Museo300.zip
deleted file mode 100644
index 8bf4239..0000000
--- a/themes/Fonts/assets/fonts/Museo300.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/NK57.zip b/themes/Fonts/assets/fonts/NK57.zip
deleted file mode 100644
index 2dadc63..0000000
--- a/themes/Fonts/assets/fonts/NK57.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Noir.zip b/themes/Fonts/assets/fonts/Noir.zip
deleted file mode 100644
index a539d9f..0000000
--- a/themes/Fonts/assets/fonts/Noir.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Nokia_Pure.zip b/themes/Fonts/assets/fonts/Nokia_Pure.zip
deleted file mode 100644
index 9835ae6..0000000
--- a/themes/Fonts/assets/fonts/Nokia_Pure.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Noteworthy.zip b/themes/Fonts/assets/fonts/Noteworthy.zip
deleted file mode 100644
index 9dd5e0f..0000000
--- a/themes/Fonts/assets/fonts/Noteworthy.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Nunito.zip b/themes/Fonts/assets/fonts/Nunito.zip
deleted file mode 100644
index 9ed3c65..0000000
--- a/themes/Fonts/assets/fonts/Nunito.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Ohd5.zip b/themes/Fonts/assets/fonts/Ohd5.zip
deleted file mode 100644
index f8abdfe..0000000
--- a/themes/Fonts/assets/fonts/Ohd5.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/OpenSans_Lite.zip b/themes/Fonts/assets/fonts/OpenSans_Lite.zip
deleted file mode 100644
index 2e26f45..0000000
--- a/themes/Fonts/assets/fonts/OpenSans_Lite.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Orion.zip b/themes/Fonts/assets/fonts/Orion.zip
deleted file mode 100644
index ff5f3e8..0000000
--- a/themes/Fonts/assets/fonts/Orion.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Oswald.zip b/themes/Fonts/assets/fonts/Oswald.zip
deleted file mode 100644
index bc3f5ab..0000000
--- a/themes/Fonts/assets/fonts/Oswald.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Poppins.zip b/themes/Fonts/assets/fonts/Poppins.zip
deleted file mode 100644
index c7f7fed..0000000
--- a/themes/Fonts/assets/fonts/Poppins.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Product_Sans.zip b/themes/Fonts/assets/fonts/Product_Sans.zip
deleted file mode 100644
index adac1ab..0000000
--- a/themes/Fonts/assets/fonts/Product_Sans.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Qontra.zip b/themes/Fonts/assets/fonts/Qontra.zip
deleted file mode 100644
index e6d3b4f..0000000
--- a/themes/Fonts/assets/fonts/Qontra.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Quick.zip b/themes/Fonts/assets/fonts/Quick.zip
deleted file mode 100644
index a4104e0..0000000
--- a/themes/Fonts/assets/fonts/Quick.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Quicksand.zip b/themes/Fonts/assets/fonts/Quicksand.zip
deleted file mode 100644
index b5cb4b4..0000000
--- a/themes/Fonts/assets/fonts/Quicksand.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Raleway.zip b/themes/Fonts/assets/fonts/Raleway.zip
deleted file mode 100644
index 14f2ee3..0000000
--- a/themes/Fonts/assets/fonts/Raleway.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Roboto.zip b/themes/Fonts/assets/fonts/Roboto.zip
deleted file mode 100644
index b2f2a0e..0000000
--- a/themes/Fonts/assets/fonts/Roboto.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Rosemary.zip b/themes/Fonts/assets/fonts/Rosemary.zip
deleted file mode 100644
index cf7fcfa..0000000
--- a/themes/Fonts/assets/fonts/Rosemary.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Rosemary_Roman.zip b/themes/Fonts/assets/fonts/Rosemary_Roman.zip
deleted file mode 100644
index 75c0764..0000000
--- a/themes/Fonts/assets/fonts/Rosemary_Roman.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Rounded_Elegance.zip b/themes/Fonts/assets/fonts/Rounded_Elegance.zip
deleted file mode 100644
index bf3b22b..0000000
--- a/themes/Fonts/assets/fonts/Rounded_Elegance.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Rubik.zip b/themes/Fonts/assets/fonts/Rubik.zip
deleted file mode 100644
index 4cfb408..0000000
--- a/themes/Fonts/assets/fonts/Rubik.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/SAO_Regular.zip b/themes/Fonts/assets/fonts/SAO_Regular.zip
deleted file mode 100644
index 7fd8e39..0000000
--- a/themes/Fonts/assets/fonts/SAO_Regular.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Samarkan.zip b/themes/Fonts/assets/fonts/Samarkan.zip
deleted file mode 100644
index 8af5607..0000000
--- a/themes/Fonts/assets/fonts/Samarkan.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/SamsungOne.zip b/themes/Fonts/assets/fonts/SamsungOne.zip
deleted file mode 100644
index a65e206..0000000
--- a/themes/Fonts/assets/fonts/SamsungOne.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Samsung_Bold.zip b/themes/Fonts/assets/fonts/Samsung_Bold.zip
deleted file mode 100644
index 1cd0421..0000000
--- a/themes/Fonts/assets/fonts/Samsung_Bold.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Samsung_Reguler.zip b/themes/Fonts/assets/fonts/Samsung_Reguler.zip
deleted file mode 100644
index c142ef5..0000000
--- a/themes/Fonts/assets/fonts/Samsung_Reguler.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/San_Francisco_Pro.zip b/themes/Fonts/assets/fonts/San_Francisco_Pro.zip
deleted file mode 100644
index 68c9718..0000000
--- a/themes/Fonts/assets/fonts/San_Francisco_Pro.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Sertig.zip b/themes/Fonts/assets/fonts/Sertig.zip
deleted file mode 100644
index 9e26218..0000000
--- a/themes/Fonts/assets/fonts/Sertig.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/SlateFromOnePlus.zip b/themes/Fonts/assets/fonts/SlateFromOnePlus.zip
deleted file mode 100644
index 4d0fd74..0000000
--- a/themes/Fonts/assets/fonts/SlateFromOnePlus.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Sony_Sketch.zip b/themes/Fonts/assets/fonts/Sony_Sketch.zip
deleted file mode 100644
index 221e7e6..0000000
--- a/themes/Fonts/assets/fonts/Sony_Sketch.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Storopia.zip b/themes/Fonts/assets/fonts/Storopia.zip
deleted file mode 100644
index 42ec056..0000000
--- a/themes/Fonts/assets/fonts/Storopia.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Techno_At_Dusk.zip b/themes/Fonts/assets/fonts/Techno_At_Dusk.zip
deleted file mode 100644
index 001bd71..0000000
--- a/themes/Fonts/assets/fonts/Techno_At_Dusk.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Timeless.zip b/themes/Fonts/assets/fonts/Timeless.zip
deleted file mode 100644
index 1a63ba5..0000000
--- a/themes/Fonts/assets/fonts/Timeless.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Titillium_Web.zip b/themes/Fonts/assets/fonts/Titillium_Web.zip
deleted file mode 100644
index 77d2572..0000000
--- a/themes/Fonts/assets/fonts/Titillium_Web.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Transformers.zip b/themes/Fonts/assets/fonts/Transformers.zip
deleted file mode 100644
index a37a015..0000000
--- a/themes/Fonts/assets/fonts/Transformers.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Typography.zip b/themes/Fonts/assets/fonts/Typography.zip
deleted file mode 100644
index 6ba7fbf..0000000
--- a/themes/Fonts/assets/fonts/Typography.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Ubuntu.zip b/themes/Fonts/assets/fonts/Ubuntu.zip
deleted file mode 100644
index 7ccfb08..0000000
--- a/themes/Fonts/assets/fonts/Ubuntu.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Ubuntu_Regular.zip b/themes/Fonts/assets/fonts/Ubuntu_Regular.zip
deleted file mode 100644
index a1dc6fa..0000000
--- a/themes/Fonts/assets/fonts/Ubuntu_Regular.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Unicorn.zip b/themes/Fonts/assets/fonts/Unicorn.zip
deleted file mode 100644
index 06f275f..0000000
--- a/themes/Fonts/assets/fonts/Unicorn.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Valentine_Love.zip b/themes/Fonts/assets/fonts/Valentine_Love.zip
deleted file mode 100644
index 85cca61..0000000
--- a/themes/Fonts/assets/fonts/Valentine_Love.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Voces.zip b/themes/Fonts/assets/fonts/Voces.zip
deleted file mode 100644
index 9dd2c4c..0000000
--- a/themes/Fonts/assets/fonts/Voces.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Walkway.zip b/themes/Fonts/assets/fonts/Walkway.zip
deleted file mode 100644
index 4e32559..0000000
--- a/themes/Fonts/assets/fonts/Walkway.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Xolonium.zip b/themes/Fonts/assets/fonts/Xolonium.zip
deleted file mode 100644
index 32f5971..0000000
--- a/themes/Fonts/assets/fonts/Xolonium.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Xperia.zip b/themes/Fonts/assets/fonts/Xperia.zip
deleted file mode 100644
index 2aaed70..0000000
--- a/themes/Fonts/assets/fonts/Xperia.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/Xperia_Z3.zip b/themes/Fonts/assets/fonts/Xperia_Z3.zip
deleted file mode 100644
index 3d375e1..0000000
--- a/themes/Fonts/assets/fonts/Xperia_Z3.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/banshee.zip b/themes/Fonts/assets/fonts/banshee.zip
deleted file mode 100644
index 9d8ecfa..0000000
--- a/themes/Fonts/assets/fonts/banshee.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/batman.zip b/themes/Fonts/assets/fonts/batman.zip
deleted file mode 100644
index 72e3aab..0000000
--- a/themes/Fonts/assets/fonts/batman.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/fifawelcome.zip b/themes/Fonts/assets/fonts/fifawelcome.zip
deleted file mode 100644
index c7e584c..0000000
--- a/themes/Fonts/assets/fonts/fifawelcome.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/love.zip b/themes/Fonts/assets/fonts/love.zip
deleted file mode 100644
index fc4b15f..0000000
--- a/themes/Fonts/assets/fonts/love.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/screwd.zip b/themes/Fonts/assets/fonts/screwd.zip
deleted file mode 100644
index 5218468..0000000
--- a/themes/Fonts/assets/fonts/screwd.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/assets/fonts/squared.zip b/themes/Fonts/assets/fonts/squared.zip
deleted file mode 100644
index 01fcf7b..0000000
--- a/themes/Fonts/assets/fonts/squared.zip
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/res/mipmap-hdpi/ic_launcher.png b/themes/Fonts/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index 102d6d3..0000000
--- a/themes/Fonts/res/mipmap-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/res/mipmap-mdpi/ic_launcher.png b/themes/Fonts/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index 24802c2..0000000
--- a/themes/Fonts/res/mipmap-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/res/mipmap-xhdpi/ic_launcher.png b/themes/Fonts/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index dd7bdd9..0000000
--- a/themes/Fonts/res/mipmap-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/res/mipmap-xxhdpi/ic_launcher.png b/themes/Fonts/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index bcf7e2f..0000000
--- a/themes/Fonts/res/mipmap-xxhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/res/mipmap-xxxhdpi/ic_launcher.png b/themes/Fonts/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index 3bbe220..0000000
--- a/themes/Fonts/res/mipmap-xxxhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/themes/Fonts/res/values/bools.xml b/themes/Fonts/res/values/bools.xml
deleted file mode 100644
index e098a06..0000000
--- a/themes/Fonts/res/values/bools.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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>
-
-    <bool name="custom_rom_font_provider">true</bool>
-
-</resources>
diff --git a/themes/Fonts/res/values/strings.xml b/themes/Fonts/res/values/strings.xml
deleted file mode 100644
index 06a14ad..0000000
--- a/themes/Fonts/res/values/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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="app_name">Bliss Fonts</string>
-
-</resources>
diff --git a/themes/FromHell/Android.mk b/themes/FromHell/Android.mk
deleted file mode 100644
index 0e1c5da..0000000
--- a/themes/FromHell/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := FromHellTheme
-LOCAL_RRO_THEME := FromHellTheme
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/FromHell/AndroidManifest.xml b/themes/FromHell/AndroidManifest.xml
deleted file mode 100644
index 96a824e..0000000
--- a/themes/FromHell/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.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/themes/FromHell/assets/thumbnail.png b/themes/FromHell/assets/thumbnail.png
deleted file mode 100644
index ca02621..0000000
--- a/themes/FromHell/assets/thumbnail.png
+++ /dev/null
Binary files differ
diff --git a/themes/FromHell/res/color/ripple_material_light.xml b/themes/FromHell/res/color/ripple_material_light.xml
deleted file mode 100644
index 07ce558..0000000
--- a/themes/FromHell/res/color/ripple_material_light.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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/themes/FromHell/res/drawable/toast_frame.xml b/themes/FromHell/res/drawable/toast_frame.xml
deleted file mode 100644
index 5738837..0000000
--- a/themes/FromHell/res/drawable/toast_frame.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/FromHell/res/values/colors.xml b/themes/FromHell/res/values/colors.xml
deleted file mode 100644
index be10849..0000000
--- a/themes/FromHell/res/values/colors.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="user_icon_1">#fff44336</color>
-    <color name="user_icon_2">#ff5c6bc0</color>
-    <color name="user_icon_3">#ff26a69a</color>
-    <color name="user_icon_4">#ffec407a</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">#ffec4f4f</color>  <!-- text tertiary -->
-    <color name="omni_text4">#deec4f4f</color>  <!-- text with "de" alpha -->
-    <color name="omni_color1">#ff05050A</color> <!-- PRIMARY DARK -->
-    <color name="omni_color2">#ff121115</color> <!-- PRIMARY LIGHT -->
-    <color name="omni_color3">#ffe53935</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#fff44336</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ffd32f2f</color> <!-- ACCENT -->
-    <color name="omni_color6">#ffe53935</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) -->
-    <color name="omni_color900">#ff05050A</color> <!-- PRIMARY DARK -->
-
-
-    <!-- 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>
-
-    <!-- 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>
-
-    <!-- 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="zen_introduction">@*android:color/omni_color1</color>
-
-    <!-- Dialogs -->
-    <color name="background_floating_material_dark">@*android:color/omni_color7</color> <!-- dialogs like sime settins -->
-
-    <!-- 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_dark_color">@*android:color/omni_color2</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/themes/FromHell/res/values/config.xml b/themes/FromHell/res/values/config.xml
deleted file mode 100644
index a1802c8..0000000
--- a/themes/FromHell/res/values/config.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="config_useDarkBgNotificationIconTextTinting">true</bool>
-    <bool name="config_enableNightMode">true</bool>
-</resources>
diff --git a/themes/FromHell/res/values/settings.xml b/themes/FromHell/res/values/settings.xml
deleted file mode 100644
index 674587a..0000000
--- a/themes/FromHell/res/values/settings.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme.DeviceDefault.Settings" parent="@*android:style/Theme.DeviceDefault">
-        <item name="android:windowShowWallpaper">true</item>
-        <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/themes/FromHell/res/values/styles.xml b/themes/FromHell/res/values/styles.xml
deleted file mode 100644
index a379a5c..0000000
--- a/themes/FromHell/res/values/styles.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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/themes/FromHell/res/values/themes.xml b/themes/FromHell/res/values/themes.xml
deleted file mode 100644
index 9670076..0000000
--- a/themes/FromHell/res/values/themes.xml
+++ /dev/null
@@ -1,514 +0,0 @@
-<?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_color900</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>
-
-    <!-- Theme for the dialog shown when an app crashes or ANRs. -->
-    <style name="Theme.Dialog.AppError" parent="@*android:style/Theme.Material.Dialog.Alert">
-        <item name="android:windowContentTransitions">false</item>
-        <item name="android:windowActivityTransitions">false</item>
-        <item name="android:windowCloseOnTouchOutside">false</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/themes/GboardDarkTheme/Android.mk b/themes/GboardDarkTheme/Android.mk
deleted file mode 100644
index 3c7783e..0000000
--- a/themes/GboardDarkTheme/Android.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_PACKAGE_NAME := GBoardDarkTheme
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
-
-include $(BUILD_PACKAGE)
diff --git a/themes/GboardDarkTheme/AndroidManifest.xml b/themes/GboardDarkTheme/AndroidManifest.xml
deleted file mode 100644
index b139d81..0000000
--- a/themes/GboardDarkTheme/AndroidManifest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.gboard.theme.dark"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <overlay android:targetPackage="com.google.android.inputmethod.latin" android:priority="1"/>
-
-    <application android:label="@string/gboard_overlay_dark" android:hasCode="false"/>
-</manifest>
diff --git a/themes/GboardDarkTheme/res/values-v21/colors.xml b/themes/GboardDarkTheme/res/values-v21/colors.xml
deleted file mode 100644
index 51b56ec..0000000
--- a/themes/GboardDarkTheme/res/values-v21/colors.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <color name="language_picker_text_color">@android:color/white</color>
-
-</resources>
diff --git a/themes/GboardDarkTheme/res/values/colors.xml b/themes/GboardDarkTheme/res/values/colors.xml
deleted file mode 100644
index 8ffde03..0000000
--- a/themes/GboardDarkTheme/res/values/colors.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <color name="language_picker_radio_button_tint">@*android:color/accent_device_default_light</color>
-
-</resources>
diff --git a/themes/GboardDarkTheme/res/values/strings.xml b/themes/GboardDarkTheme/res/values/strings.xml
deleted file mode 100644
index f540f40..0000000
--- a/themes/GboardDarkTheme/res/values/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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="gboard_overlay_dark">Dark</string>
-
-</resources>
diff --git a/themes/GboardOmniTheme/Android.mk b/themes/GboardOmniTheme/Android.mk
deleted file mode 100644
index 8555645..0000000
--- a/themes/GboardOmniTheme/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := GboardOmniTheme
-LOCAL_RRO_THEME := GboardOmniTheme
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/GboardOmniTheme/AndroidManifest.xml b/themes/GboardOmniTheme/AndroidManifest.xml
deleted file mode 100644
index 3c59f97..0000000
--- a/themes/GboardOmniTheme/AndroidManifest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.gboard.theme.omni"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <overlay android:targetPackage="com.google.android.inputmethod.latin" android:priority="1"/>
-
-    <application android:label="@string/gboard_overlay_dark" android:hasCode="false"/>
-</manifest>
diff --git a/themes/GboardOmniTheme/res/values-v21/colors.xml b/themes/GboardOmniTheme/res/values-v21/colors.xml
deleted file mode 100644
index 4f7d4cb..0000000
--- a/themes/GboardOmniTheme/res/values-v21/colors.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <color name="language_picker_text_color">@*android:color/omni_text1</color>
-
-</resources>
diff --git a/themes/GboardOmniTheme/res/values/colors.xml b/themes/GboardOmniTheme/res/values/colors.xml
deleted file mode 100644
index 6a3fa4f..0000000
--- a/themes/GboardOmniTheme/res/values/colors.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <color name="language_picker_radio_button_tint">@*android:color/omni_color5</color>
-
-</resources>
diff --git a/themes/GboardOmniTheme/res/values/strings.xml b/themes/GboardOmniTheme/res/values/strings.xml
deleted file mode 100644
index f540f40..0000000
--- a/themes/GboardOmniTheme/res/values/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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="gboard_overlay_dark">Dark</string>
-
-</resources>
diff --git a/themes/NotificationsBlack/Android.mk b/themes/NotificationsBlack/Android.mk
deleted file mode 100644
index 0b48d1b..0000000
--- a/themes/NotificationsBlack/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := NotificationsBlack
-LOCAL_RRO_THEME := NotificationsBlack
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/NotificationsBlack/AndroidManifest.xml b/themes/NotificationsBlack/AndroidManifest.xml
deleted file mode 100644
index 7efbb80..0000000
--- a/themes/NotificationsBlack/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.notification.black"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="3" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Black" />
-</manifest>
diff --git a/themes/NotificationsBlack/res/values/colors.xml b/themes/NotificationsBlack/res/values/colors.xml
deleted file mode 100644
index 0c7b1a1..0000000
--- a/themes/NotificationsBlack/res/values/colors.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Notifications -->
-    <color name="notification_legacy_background_color">#151515</color>
-    <color name="notification_material_background_dimmed_color">#0a0a0a</color>
-    <color name="notification_material_background_low_priority_color">#0d0d0d</color>
-    <color name="notification_divider_color">#ffe0e0e0</color>
-    <color name="notification_shade_background_color">#0a0a0a</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">#ffFFFFFF</color>
-    <color name="notification_guts_bg_color">#0a0a0a</color>
-
-    <color name="notification_material_background_color">#131313</color>
-    <color name="notification_default_color">#FFFFFDE7</color> <!-- Gray 600 -->
-    <color name="notification_action_list">#080808</color>
-    <color name="notification_action_list_dark">#121212</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">#101010</color>
-</resources>
diff --git a/themes/NotificationsBlack/res/values/config.xml b/themes/NotificationsBlack/res/values/config.xml
deleted file mode 100644
index 210f6cf..0000000
--- a/themes/NotificationsBlack/res/values/config.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="config_useDarkBgNotificationTinting_override">true</bool>
-    <bool name="config_notificationTinting_override">true</bool>
-</resources>
diff --git a/themes/NotificationsDark/Android.mk b/themes/NotificationsDark/Android.mk
deleted file mode 100644
index 0882b35..0000000
--- a/themes/NotificationsDark/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := NotificationsDark
-LOCAL_RRO_THEME := NotificationsDark
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/NotificationsDark/AndroidManifest.xml b/themes/NotificationsDark/AndroidManifest.xml
deleted file mode 100644
index 7d678fe..0000000
--- a/themes/NotificationsDark/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/themes/NotificationsDark/res/values/colors.xml b/themes/NotificationsDark/res/values/colors.xml
deleted file mode 100644
index ea5e421..0000000
--- a/themes/NotificationsDark/res/values/colors.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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">#ffFFFFFF</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="notification_default_color_dark">#a0FFFDE7</color>
-
-    <color name="omni_theme_color">#ff29282c</color>
-</resources>
diff --git a/themes/NotificationsDark/res/values/config.xml b/themes/NotificationsDark/res/values/config.xml
deleted file mode 100644
index 210f6cf..0000000
--- a/themes/NotificationsDark/res/values/config.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="config_useDarkBgNotificationTinting_override">true</bool>
-    <bool name="config_notificationTinting_override">true</bool>
-</resources>
diff --git a/themes/NotificationsLight/Android.mk b/themes/NotificationsLight/Android.mk
deleted file mode 100644
index 7923bde..0000000
--- a/themes/NotificationsLight/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := NotificationsLight
-LOCAL_RRO_THEME := NotificationsLight
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/NotificationsLight/AndroidManifest.xml b/themes/NotificationsLight/AndroidManifest.xml
deleted file mode 100644
index 25de8d3..0000000
--- a/themes/NotificationsLight/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/themes/NotificationsLight/res/values/colors.xml b/themes/NotificationsLight/res/values/colors.xml
deleted file mode 100644
index c9bf07c..0000000
--- a/themes/NotificationsLight/res/values/colors.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_theme_color">#ffe9e9e9</color>
-</resources>
diff --git a/themes/NotificationsLight/res/values/config.xml b/themes/NotificationsLight/res/values/config.xml
deleted file mode 100644
index 1be70e2..0000000
--- a/themes/NotificationsLight/res/values/config.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="config_useDarkBgNotificationTinting_override">false</bool>
-    <bool name="config_notificationTinting_override">true</bool>
-</resources>
diff --git a/themes/NotificationsPrimary/Android.mk b/themes/NotificationsPrimary/Android.mk
deleted file mode 100644
index 1a80347..0000000
--- a/themes/NotificationsPrimary/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := NotificationsPrimary
-LOCAL_RRO_THEME := NotificationsPrimary
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/NotificationsPrimary/AndroidManifest.xml b/themes/NotificationsPrimary/AndroidManifest.xml
deleted file mode 100644
index b6db619..0000000
--- a/themes/NotificationsPrimary/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/themes/NotificationsPrimary/res/values/colors.xml b/themes/NotificationsPrimary/res/values/colors.xml
deleted file mode 100644
index 6d32cf3..0000000
--- a/themes/NotificationsPrimary/res/values/colors.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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>
-    <color name="notification_default_color_dark">@*android:color/omni_text3</color>
-</resources>
diff --git a/themes/OmniTheme/Android.mk b/themes/OmniTheme/Android.mk
deleted file mode 100644
index 518f2d9..0000000
--- a/themes/OmniTheme/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := OmniTheme
-LOCAL_RRO_THEME := OmniTheme
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/OmniTheme/AndroidManifest.xml b/themes/OmniTheme/AndroidManifest.xml
deleted file mode 100644
index 7345cf5..0000000
--- a/themes/OmniTheme/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.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/themes/OmniTheme/assets/thumbnail.png b/themes/OmniTheme/assets/thumbnail.png
deleted file mode 100644
index 03e66f2..0000000
--- a/themes/OmniTheme/assets/thumbnail.png
+++ /dev/null
Binary files differ
diff --git a/themes/OmniTheme/res/color/ripple_material_light.xml b/themes/OmniTheme/res/color/ripple_material_light.xml
deleted file mode 100644
index 07ce558..0000000
--- a/themes/OmniTheme/res/color/ripple_material_light.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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/themes/OmniTheme/res/drawable/toast_frame.xml b/themes/OmniTheme/res/drawable/toast_frame.xml
deleted file mode 100644
index 5738837..0000000
--- a/themes/OmniTheme/res/drawable/toast_frame.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/OmniTheme/res/values/colors.xml b/themes/OmniTheme/res/values/colors.xml
deleted file mode 100644
index ae9dbd0..0000000
--- a/themes/OmniTheme/res/values/colors.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <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 with "de" alpha -->
-    <color name="omni_color1">#ff191919</color> <!-- PRIMARY DARK -->
-    <color name="omni_color2">#ff2d2d2d</color> <!-- PRIMARY LIGHT -->
-    <color name="omni_color3">#ffaacc3e</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ff90b324</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ffa1c729</color> <!-- ACCENT -->
-    <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) -->
-    <color name="omni_color900">#ff191919</color> <!-- PRIMARY DARK -->
-
-    <!-- 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>
-
-    <!-- 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>
-
-    <!-- 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="zen_introduction">@*android:color/omni_color1</color>
-
-    <!-- Dialogs -->
-    <color name="background_floating_material_dark">@*android:color/omni_color7</color> <!-- dialogs like sime settins -->
-
-    <!-- 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/themes/OmniTheme/res/values/config.xml b/themes/OmniTheme/res/values/config.xml
deleted file mode 100644
index a1802c8..0000000
--- a/themes/OmniTheme/res/values/config.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="config_useDarkBgNotificationIconTextTinting">true</bool>
-    <bool name="config_enableNightMode">true</bool>
-</resources>
diff --git a/themes/OmniTheme/res/values/settings.xml b/themes/OmniTheme/res/values/settings.xml
deleted file mode 100644
index cc5cee3..0000000
--- a/themes/OmniTheme/res/values/settings.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme.DeviceDefault.Settings" parent="@*android:style/Theme.DeviceDefault">
-        <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/themes/OmniTheme/res/values/strings.xml b/themes/OmniTheme/res/values/strings.xml
deleted file mode 100644
index bf20dad..0000000
--- a/themes/OmniTheme/res/values/strings.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/OmniTheme/res/values/styles.xml b/themes/OmniTheme/res/values/styles.xml
deleted file mode 100644
index 2bfc794..0000000
--- a/themes/OmniTheme/res/values/styles.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/OmniTheme/res/values/themes.xml b/themes/OmniTheme/res/values/themes.xml
deleted file mode 100644
index e6f496b..0000000
--- a/themes/OmniTheme/res/values/themes.xml
+++ /dev/null
@@ -1,513 +0,0 @@
-<?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_color900</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>
-
-    <!-- Theme for the dialog shown when an app crashes or ANRs. -->
-    <style name="Theme.Dialog.AppError" parent="@*android:style/Theme.Material.Dialog.Alert">
-        <item name="android:windowContentTransitions">false</item>
-        <item name="android:windowActivityTransitions">false</item>
-        <item name="android:windowCloseOnTouchOutside">false</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/themes/Pixel/Android.mk b/themes/Pixel/Android.mk
deleted file mode 100644
index b9a1a5a..0000000
--- a/themes/Pixel/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := PixelTheme
-LOCAL_RRO_THEME := PixelTheme
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/Pixel/AndroidManifest.xml b/themes/Pixel/AndroidManifest.xml
deleted file mode 100644
index c4b21f9..0000000
--- a/themes/Pixel/AndroidManifest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.theme.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/themes/Pixel/res/values/colors.xml b/themes/Pixel/res/values/colors.xml
deleted file mode 100644
index a562edf..0000000
--- a/themes/Pixel/res/values/colors.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="user_icon_1">#ff5e97f6</color>
-    <color name="user_icon_2">#ff5c6bc0</color>
-    <color name="user_icon_3">#ff26a69a</color>
-    <color name="user_icon_4">#ffec407a</color>
-    <color name="user_icon_5">#ff33ac71</color>
-    <color name="user_icon_6">#ff8bc34a</color>
-    <color name="user_icon_7">#ffff9800</color>
-    <color name="user_icon_8">#ffff7043</color>
-    <color name="system_error">#ffea4335</color>
-    <color name="primary_device_default_dark">#ff2d2d2d</color>
-    <color name="primary_device_default_settings">#ff2d2d2d</color>
-    <color name="primary_dark_device_default_dark">#ff242424</color>
-    <color name="primary_dark_device_default_settings">#ff242424</color>
-    <color name="secondary_device_default_settings">#ff3a3a3a</color>
-    <color name="tertiary_device_default_settings">#ff616161</color>
-    <color name="quaternary_device_default_settings">#ff9e9e9e</color>
-    <color name="accent_device_default_700">#ff3367d6</color>
-    <color name="accent_device_default_light">#ff4285f4</color>
-    <color name="accent_device_default_dark">#ff5e97f6</color>
-    <color name="accent_device_default_50">#ffe8f0fe</color>
-</resources>
diff --git a/themes/PrimaryAlmostBlack/Android.mk b/themes/PrimaryAlmostBlack/Android.mk
deleted file mode 100644
index b4b158a..0000000
--- a/themes/PrimaryAlmostBlack/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := PrimaryAlmostBlack
-LOCAL_RRO_THEME := PrimaryAlmostBlack
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/PrimaryAlmostBlack/AndroidManifest.xml b/themes/PrimaryAlmostBlack/AndroidManifest.xml
deleted file mode 100644
index d23ad65..0000000
--- a/themes/PrimaryAlmostBlack/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/themes/PrimaryAlmostBlack/res/color/ripple_material_light.xml b/themes/PrimaryAlmostBlack/res/color/ripple_material_light.xml
deleted file mode 100644
index 07ce558..0000000
--- a/themes/PrimaryAlmostBlack/res/color/ripple_material_light.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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/themes/PrimaryAlmostBlack/res/drawable/toast_frame.xml b/themes/PrimaryAlmostBlack/res/drawable/toast_frame.xml
deleted file mode 100644
index 5738837..0000000
--- a/themes/PrimaryAlmostBlack/res/drawable/toast_frame.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/PrimaryAlmostBlack/res/values/colors.xml b/themes/PrimaryAlmostBlack/res/values/colors.xml
deleted file mode 100644
index 6b7b8a4..0000000
--- a/themes/PrimaryAlmostBlack/res/values/colors.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?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">#B3FFFDE7</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_color9">#e629282c</color> <!-- TOAST (NEEDS SOME ALPHA) -->
-    <color name="omni_color900">#ff05050A</color> <!-- PRIMARY DARK -->
-
-    <!-- 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="zen_introduction">@*android:color/omni_color1</color>
-
-    <!-- Dialogs -->
-    <color name="background_floating_material_dark">@*android:color/omni_color7</color> <!-- dialogs like sime settins -->
-
-    <!-- Gradient Shit -->
-    <color name="gradient_start">@*android:color/gradient_start_dark</color>
-    <color name="gradient_end">@*android:color/gradient_end_dark</color>
-
-</resources>
diff --git a/themes/PrimaryAlmostBlack/res/values/config.xml b/themes/PrimaryAlmostBlack/res/values/config.xml
deleted file mode 100644
index a1802c8..0000000
--- a/themes/PrimaryAlmostBlack/res/values/config.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="config_useDarkBgNotificationIconTextTinting">true</bool>
-    <bool name="config_enableNightMode">true</bool>
-</resources>
diff --git a/themes/PrimaryAlmostBlack/res/values/settings.xml b/themes/PrimaryAlmostBlack/res/values/settings.xml
deleted file mode 100644
index 81e4a68..0000000
--- a/themes/PrimaryAlmostBlack/res/values/settings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme.DeviceDefault.Settings" parent="@*android:style/Theme.DeviceDefault">
-        <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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
-    </style>
-</resources>
diff --git a/themes/PrimaryAlmostBlack/res/values/strings.xml b/themes/PrimaryAlmostBlack/res/values/strings.xml
deleted file mode 100644
index bf20dad..0000000
--- a/themes/PrimaryAlmostBlack/res/values/strings.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/PrimaryAlmostBlack/res/values/styles.xml b/themes/PrimaryAlmostBlack/res/values/styles.xml
deleted file mode 100644
index 2bfc794..0000000
--- a/themes/PrimaryAlmostBlack/res/values/styles.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/PrimaryAlmostBlack/res/values/themes.xml b/themes/PrimaryAlmostBlack/res/values/themes.xml
deleted file mode 100644
index 4dc2324..0000000
--- a/themes/PrimaryAlmostBlack/res/values/themes.xml
+++ /dev/null
@@ -1,554 +0,0 @@
-<?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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
--->
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
-    </style>
-
-    <style name="qs_base" parent="@*android:style/Theme.DeviceDefault">
-        <item name="android:colorBackgroundFloating">@*android:color/omni_color900</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-
-    <!-- Theme for the dialog shown when an app crashes or ANRs. -->
-    <style name="Theme.Dialog.AppError" parent="@*android:style/Theme.Material.Dialog.Alert">
-        <item name="android:windowContentTransitions">false</item>
-        <item name="android:windowActivityTransitions">false</item>
-        <item name="android:windowCloseOnTouchOutside">false</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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/themes/PrimaryBlack/Android.mk b/themes/PrimaryBlack/Android.mk
deleted file mode 100644
index f260903..0000000
--- a/themes/PrimaryBlack/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := PrimaryBlack
-LOCAL_RRO_THEME := PrimaryBlack
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/PrimaryBlack/AndroidManifest.xml b/themes/PrimaryBlack/AndroidManifest.xml
deleted file mode 100644
index efe4136..0000000
--- a/themes/PrimaryBlack/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/themes/PrimaryBlack/res/color/ripple_material_light.xml b/themes/PrimaryBlack/res/color/ripple_material_light.xml
deleted file mode 100644
index 07ce558..0000000
--- a/themes/PrimaryBlack/res/color/ripple_material_light.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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/themes/PrimaryBlack/res/drawable/toast_frame.xml b/themes/PrimaryBlack/res/drawable/toast_frame.xml
deleted file mode 100644
index 5738837..0000000
--- a/themes/PrimaryBlack/res/drawable/toast_frame.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/PrimaryBlack/res/values/colors.xml b/themes/PrimaryBlack/res/values/colors.xml
deleted file mode 100644
index 962e95a..0000000
--- a/themes/PrimaryBlack/res/values/colors.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?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">#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_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="zen_introduction">@*android:color/omni_color1</color>
-
-    <!-- Dialogs -->
-    <color name="background_floating_material_dark">@*android:color/omni_color7</color> <!-- dialogs like sime settins -->
-
-    <!-- Gradient Shit -->
-    <color name="gradient_start">@*android:color/gradient_start_dark</color>
-    <color name="gradient_end">@*android:color/gradient_end_dark</color>
-
-</resources>
diff --git a/themes/PrimaryBlack/res/values/config.xml b/themes/PrimaryBlack/res/values/config.xml
deleted file mode 100644
index a1802c8..0000000
--- a/themes/PrimaryBlack/res/values/config.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="config_useDarkBgNotificationIconTextTinting">true</bool>
-    <bool name="config_enableNightMode">true</bool>
-</resources>
diff --git a/themes/PrimaryBlack/res/values/settings.xml b/themes/PrimaryBlack/res/values/settings.xml
deleted file mode 100644
index 81e4a68..0000000
--- a/themes/PrimaryBlack/res/values/settings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme.DeviceDefault.Settings" parent="@*android:style/Theme.DeviceDefault">
-        <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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
-    </style>
-</resources>
diff --git a/themes/PrimaryBlack/res/values/strings.xml b/themes/PrimaryBlack/res/values/strings.xml
deleted file mode 100644
index bf20dad..0000000
--- a/themes/PrimaryBlack/res/values/strings.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/PrimaryBlack/res/values/styles.xml b/themes/PrimaryBlack/res/values/styles.xml
deleted file mode 100644
index 2bfc794..0000000
--- a/themes/PrimaryBlack/res/values/styles.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/PrimaryBlack/res/values/themes.xml b/themes/PrimaryBlack/res/values/themes.xml
deleted file mode 100644
index 4dc2324..0000000
--- a/themes/PrimaryBlack/res/values/themes.xml
+++ /dev/null
@@ -1,554 +0,0 @@
-<?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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
--->
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
-    </style>
-
-    <style name="qs_base" parent="@*android:style/Theme.DeviceDefault">
-        <item name="android:colorBackgroundFloating">@*android:color/omni_color900</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-
-    <!-- Theme for the dialog shown when an app crashes or ANRs. -->
-    <style name="Theme.Dialog.AppError" parent="@*android:style/Theme.Material.Dialog.Alert">
-        <item name="android:windowContentTransitions">false</item>
-        <item name="android:windowActivityTransitions">false</item>
-        <item name="android:windowCloseOnTouchOutside">false</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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/themes/PrimaryBliss/Android.mk b/themes/PrimaryBliss/Android.mk
deleted file mode 100644
index ed271e4..0000000
--- a/themes/PrimaryBliss/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := PrimaryBliss
-LOCAL_RRO_THEME := PrimaryBliss
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/PrimaryBliss/AndroidManifest.xml b/themes/PrimaryBliss/AndroidManifest.xml
deleted file mode 100644
index 1d8f4ec..0000000
--- a/themes/PrimaryBliss/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.primary.bliss"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="2" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Bliss" />
-</manifest>
diff --git a/themes/PrimaryBliss/res/color/ripple_material_light.xml b/themes/PrimaryBliss/res/color/ripple_material_light.xml
deleted file mode 100644
index 07ce558..0000000
--- a/themes/PrimaryBliss/res/color/ripple_material_light.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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/themes/PrimaryBliss/res/drawable/toast_frame.xml b/themes/PrimaryBliss/res/drawable/toast_frame.xml
deleted file mode 100644
index 5738837..0000000
--- a/themes/PrimaryBliss/res/drawable/toast_frame.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/PrimaryBliss/res/values/colors.xml b/themes/PrimaryBliss/res/values/colors.xml
deleted file mode 100644
index 3628e65..0000000
--- a/themes/PrimaryBliss/res/values/colors.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?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">#FFE8EAF6</color> <!-- text primary -->
-    <color name="omni_text2">#B3E8EAF6</color>  <!-- text secondary -->
-    <color name="omni_text3">#A0E8EAF6</color>  <!-- text tertiary -->
-    <color name="omni_text4">#deE8EAF6</color>  <!-- text with "de" alpha -->
-    <color name="omni_color1">#181818</color> <!-- PRIMARY DARK -->
-    <color name="omni_color2">#2d2d2d</color> <!-- PRIMARY LIGHT -->
-    <color name="omni_color6">#b3e8eaf6</color> <!-- WIFI ICON IN DETAILS -->
-    <color name="omni_color7">#2d2d2d</color> <!-- FLOATING DIALOG COLOR ON VERY DARK THEMES MAKE THIS A BIT LIGHTER -->
-    <color name="omni_color8">#81abff</color> <!-- SPECIAL (CHECK WHERE THIS IS ASSIGNED) -->
-    <color name="omni_color9">#e6262626</color> <!-- TOAST (NEEDS SOME ALPHA) -->
-    <color name="omni_color900">#151515</color> <!-- PRIMARY DARK -->
-
-    <!-- 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="zen_introduction">@*android:color/omni_color1</color>
-
-    <!-- Dialogs -->
-    <color name="background_floating_material_dark">@*android:color/omni_color7</color> <!-- dialogs like sime settins -->
-
-    <!-- Gradient Shit -->
-    <color name="gradient_start">@*android:color/gradient_start_dark</color>
-    <color name="gradient_end">@*android:color/gradient_end_dark</color>
-
-</resources>
diff --git a/themes/PrimaryBliss/res/values/config.xml b/themes/PrimaryBliss/res/values/config.xml
deleted file mode 100644
index a1802c8..0000000
--- a/themes/PrimaryBliss/res/values/config.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="config_useDarkBgNotificationIconTextTinting">true</bool>
-    <bool name="config_enableNightMode">true</bool>
-</resources>
diff --git a/themes/PrimaryBliss/res/values/settings.xml b/themes/PrimaryBliss/res/values/settings.xml
deleted file mode 100644
index d9c80c3..0000000
--- a/themes/PrimaryBliss/res/values/settings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme.DeviceDefault.Settings" parent="@*android:style/Theme.DeviceDefault">
-        <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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
-    </style>
-</resources>
diff --git a/themes/PrimaryBliss/res/values/strings.xml b/themes/PrimaryBliss/res/values/strings.xml
deleted file mode 100644
index bf20dad..0000000
--- a/themes/PrimaryBliss/res/values/strings.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/PrimaryBliss/res/values/styles.xml b/themes/PrimaryBliss/res/values/styles.xml
deleted file mode 100644
index 2bfc794..0000000
--- a/themes/PrimaryBliss/res/values/styles.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/PrimaryBliss/res/values/themes.xml b/themes/PrimaryBliss/res/values/themes.xml
deleted file mode 100644
index 4dc2324..0000000
--- a/themes/PrimaryBliss/res/values/themes.xml
+++ /dev/null
@@ -1,554 +0,0 @@
-<?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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
--->
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
-    </style>
-
-    <style name="qs_base" parent="@*android:style/Theme.DeviceDefault">
-        <item name="android:colorBackgroundFloating">@*android:color/omni_color900</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-
-    <!-- Theme for the dialog shown when an app crashes or ANRs. -->
-    <style name="Theme.Dialog.AppError" parent="@*android:style/Theme.Material.Dialog.Alert">
-        <item name="android:windowContentTransitions">false</item>
-        <item name="android:windowActivityTransitions">false</item>
-        <item name="android:windowCloseOnTouchOutside">false</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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/themes/PrimaryBlissClear/Android.mk b/themes/PrimaryBlissClear/Android.mk
deleted file mode 100644
index 0608c5b..0000000
--- a/themes/PrimaryBlissClear/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := PrimaryBlissClear
-LOCAL_RRO_THEME := PrimaryBlissClear
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
-
-
diff --git a/themes/PrimaryBlissClear/AndroidManifest.xml b/themes/PrimaryBlissClear/AndroidManifest.xml
deleted file mode 100644
index aa77526..0000000
--- a/themes/PrimaryBlissClear/AndroidManifest.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.primary.clearbliss"
-    platformBuildVersionCode="28"
-    platformBuildVersionName="9.0.0">
-
-    <overlay android:priority="2" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Clear Bliss" />
-</manifest>
-
-
diff --git a/themes/PrimaryBlissClear/res/color/ripple_material_light.xml b/themes/PrimaryBlissClear/res/color/ripple_material_light.xml
deleted file mode 100644
index c836684..0000000
--- a/themes/PrimaryBlissClear/res/color/ripple_material_light.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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/themes/PrimaryBlissClear/res/drawable/toast_frame.xml b/themes/PrimaryBlissClear/res/drawable/toast_frame.xml
deleted file mode 100644
index f3d5c81..0000000
--- a/themes/PrimaryBlissClear/res/drawable/toast_frame.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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/themes/PrimaryBlissClear/res/values/colors.xml b/themes/PrimaryBlissClear/res/values/colors.xml
deleted file mode 100644
index ce59a7f..0000000
--- a/themes/PrimaryBlissClear/res/values/colors.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="omni_theme_color">@color/omni_color1</color>
-    <color name="system_error">#99ff4120</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 with "de" alpha -->
-
-    <color name="omni_color1">#99000000</color> <!-- PRIMARY DARK -->
-    <color name="omni_color2">#99000000</color> <!-- PRIMARY LIGHT -->
-    <color name="omni_color6">#b3fefefe</color> <!-- WIFI ICON IN DETAILS -->
-    <color name="omni_color7">#99000000</color> <!-- FLOATING DIALOG COLOR ON VERY DARK THEMES MAKE THIS A BIT LIGHTER -->
-    <color name="omni_color9">#99000000</color> <!-- TOAST (NEEDS SOME ALPHA) -->
-    <color name="omni_color900">#99000000</color> <!-- PRIMARY DARK -->
-
-    <!-- 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="zen_introduction">@*android:color/omni_color1</color>
-
-    <!-- Dialogs -->
-    <color name="background_floating_material_dark">@*android:color/omni_color7</color> <!-- dialogs like sime settins -->
-
-    <!-- Gradient Shit -->
-    <color name="gradient_start">@*android:color/gradient_start_dark</color>
-    <color name="gradient_end">@*android:color/gradient_end_dark</color>
-
-</resources>
-
-
-
-
diff --git a/themes/PrimaryBlissClear/res/values/config.xml b/themes/PrimaryBlissClear/res/values/config.xml
deleted file mode 100644
index 00d1e9d..0000000
--- a/themes/PrimaryBlissClear/res/values/config.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="config_useDarkBgNotificationIconTextTinting">true</bool>
-    <bool name="config_enableNightMode">true</bool>
-</resources>
-
-
diff --git a/themes/PrimaryBlissClear/res/values/settings.xml b/themes/PrimaryBlissClear/res/values/settings.xml
deleted file mode 100644
index a408252..0000000
--- a/themes/PrimaryBlissClear/res/values/settings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme.DeviceDefault.Settings" parent="@*android:style/Theme.DeviceDefault">
-        <item name="android:windowShowWallpaper">true</item>
-        <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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
-    </style>
-</resources>
-
-
-
diff --git a/themes/PrimaryBlissClear/res/values/strings.xml b/themes/PrimaryBlissClear/res/values/strings.xml
deleted file mode 100644
index e41dd1b..0000000
--- a/themes/PrimaryBlissClear/res/values/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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/themes/PrimaryBlissClear/res/values/styles.xml b/themes/PrimaryBlissClear/res/values/styles.xml
deleted file mode 100644
index 273d028..0000000
--- a/themes/PrimaryBlissClear/res/values/styles.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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/themes/PrimaryBlissClear/res/values/themes.xml b/themes/PrimaryBlissClear/res/values/themes.xml
deleted file mode 100644
index d7dd1a2..0000000
--- a/themes/PrimaryBlissClear/res/values/themes.xml
+++ /dev/null
@@ -1,556 +0,0 @@
-<?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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
--->
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
-    </style>
-
-    <style name="qs_base" parent="@*android:style/Theme.DeviceDefault">
-        <item name="android:colorBackgroundFloating">@*android:color/omni_color900</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-
-    <!-- Theme for the dialog shown when an app crashes or ANRs. -->
-    <style name="Theme.Dialog.AppError" parent="@*android:style/Theme.Material.Dialog.Alert">
-        <item name="android:windowContentTransitions">false</item>
-        <item name="android:windowActivityTransitions">false</item>
-        <item name="android:windowCloseOnTouchOutside">false</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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/themes/PrimaryColdWhite/Android.mk b/themes/PrimaryColdWhite/Android.mk
deleted file mode 100644
index 2077d6c..0000000
--- a/themes/PrimaryColdWhite/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := PrimaryColdWhite
-LOCAL_RRO_THEME := PrimaryColdWhite
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/PrimaryColdWhite/AndroidManifest.xml b/themes/PrimaryColdWhite/AndroidManifest.xml
deleted file mode 100644
index ccbd480..0000000
--- a/themes/PrimaryColdWhite/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/themes/PrimaryColdWhite/res/color/ripple_material_light.xml b/themes/PrimaryColdWhite/res/color/ripple_material_light.xml
deleted file mode 100644
index 07ce558..0000000
--- a/themes/PrimaryColdWhite/res/color/ripple_material_light.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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/themes/PrimaryColdWhite/res/drawable/toast_frame.xml b/themes/PrimaryColdWhite/res/drawable/toast_frame.xml
deleted file mode 100644
index 5738837..0000000
--- a/themes/PrimaryColdWhite/res/drawable/toast_frame.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/PrimaryColdWhite/res/values/colors.xml b/themes/PrimaryColdWhite/res/values/colors.xml
deleted file mode 100644
index cb05074..0000000
--- a/themes/PrimaryColdWhite/res/values/colors.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?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">#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_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>
-
-    <!-- Gradient Shit -->
-    <color name="gradient_start">@*android:color/gradient_start_dark</color>
-    <color name="gradient_end">@*android:color/gradient_end_dark</color>
-
-</resources>
diff --git a/themes/PrimaryColdWhite/res/values/config.xml b/themes/PrimaryColdWhite/res/values/config.xml
deleted file mode 100644
index bc9a085..0000000
--- a/themes/PrimaryColdWhite/res/values/config.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="config_useDarkBgNotificationIconTextTinting">false</bool>
-    <bool name="config_enableNightMode">false</bool>
-</resources>
diff --git a/themes/PrimaryColdWhite/res/values/settings.xml b/themes/PrimaryColdWhite/res/values/settings.xml
deleted file mode 100644
index 7f7d0d2..0000000
--- a/themes/PrimaryColdWhite/res/values/settings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme.DeviceDefault.Settings" parent="@*android:style/Theme.DeviceDefault">
-        <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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
-    </style>
-</resources>
diff --git a/themes/PrimaryColdWhite/res/values/themes.xml b/themes/PrimaryColdWhite/res/values/themes.xml
deleted file mode 100644
index 19362fc..0000000
--- a/themes/PrimaryColdWhite/res/values/themes.xml
+++ /dev/null
@@ -1,478 +0,0 @@
-<?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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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/themes/PrimaryDarkBlue/Android.mk b/themes/PrimaryDarkBlue/Android.mk
deleted file mode 100644
index ff5a276..0000000
--- a/themes/PrimaryDarkBlue/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := PrimaryDarkBlue
-LOCAL_RRO_THEME := PrimaryDarkBlue
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/PrimaryDarkBlue/AndroidManifest.xml b/themes/PrimaryDarkBlue/AndroidManifest.xml
deleted file mode 100644
index 9946e76..0000000
--- a/themes/PrimaryDarkBlue/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/themes/PrimaryDarkBlue/res/color/ripple_material_light.xml b/themes/PrimaryDarkBlue/res/color/ripple_material_light.xml
deleted file mode 100644
index 07ce558..0000000
--- a/themes/PrimaryDarkBlue/res/color/ripple_material_light.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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/themes/PrimaryDarkBlue/res/drawable/toast_frame.xml b/themes/PrimaryDarkBlue/res/drawable/toast_frame.xml
deleted file mode 100644
index 5738837..0000000
--- a/themes/PrimaryDarkBlue/res/drawable/toast_frame.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/PrimaryDarkBlue/res/values/colors.xml b/themes/PrimaryDarkBlue/res/values/colors.xml
deleted file mode 100644
index 744c8d6..0000000
--- a/themes/PrimaryDarkBlue/res/values/colors.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?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">#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_color9">#e6182a33</color> <!-- TOAST (NEEDS SOME ALPHA) -->
-    <color name="omni_color900">#ff0d2029</color> <!-- PRIMARY DARK -->
-
-    <!-- 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="zen_introduction">@*android:color/omni_color1</color>
-
-    <!-- Dialogs -->
-    <color name="background_floating_material_dark">@*android:color/omni_color7</color> <!-- dialogs like sime settins -->
-
-    <!-- Gradient Shit -->
-    <color name="gradient_start">@*android:color/gradient_start_dark</color>
-    <color name="gradient_end">@*android:color/gradient_end_dark</color>
-
-</resources>
diff --git a/themes/PrimaryDarkBlue/res/values/config.xml b/themes/PrimaryDarkBlue/res/values/config.xml
deleted file mode 100644
index a1802c8..0000000
--- a/themes/PrimaryDarkBlue/res/values/config.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="config_useDarkBgNotificationIconTextTinting">true</bool>
-    <bool name="config_enableNightMode">true</bool>
-</resources>
diff --git a/themes/PrimaryDarkBlue/res/values/settings.xml b/themes/PrimaryDarkBlue/res/values/settings.xml
deleted file mode 100644
index d9c80c3..0000000
--- a/themes/PrimaryDarkBlue/res/values/settings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme.DeviceDefault.Settings" parent="@*android:style/Theme.DeviceDefault">
-        <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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
-    </style>
-</resources>
diff --git a/themes/PrimaryDarkBlue/res/values/strings.xml b/themes/PrimaryDarkBlue/res/values/strings.xml
deleted file mode 100644
index bf20dad..0000000
--- a/themes/PrimaryDarkBlue/res/values/strings.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/PrimaryDarkBlue/res/values/styles.xml b/themes/PrimaryDarkBlue/res/values/styles.xml
deleted file mode 100644
index 2bfc794..0000000
--- a/themes/PrimaryDarkBlue/res/values/styles.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/PrimaryDarkBlue/res/values/themes.xml b/themes/PrimaryDarkBlue/res/values/themes.xml
deleted file mode 100644
index 4dc2324..0000000
--- a/themes/PrimaryDarkBlue/res/values/themes.xml
+++ /dev/null
@@ -1,554 +0,0 @@
-<?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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
--->
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
-    </style>
-
-    <style name="qs_base" parent="@*android:style/Theme.DeviceDefault">
-        <item name="android:colorBackgroundFloating">@*android:color/omni_color900</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-
-    <!-- Theme for the dialog shown when an app crashes or ANRs. -->
-    <style name="Theme.Dialog.AppError" parent="@*android:style/Theme.Material.Dialog.Alert">
-        <item name="android:windowContentTransitions">false</item>
-        <item name="android:windowActivityTransitions">false</item>
-        <item name="android:windowCloseOnTouchOutside">false</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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/themes/PrimaryEyeSoother/Android.mk b/themes/PrimaryEyeSoother/Android.mk
deleted file mode 100644
index a406a48..0000000
--- a/themes/PrimaryEyeSoother/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := PrimaryEyeSoother
-LOCAL_RRO_THEME := PrimaryEyeSoother
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
-
-
diff --git a/themes/PrimaryEyeSoother/AndroidManifest.xml b/themes/PrimaryEyeSoother/AndroidManifest.xml
deleted file mode 100644
index e574165..0000000
--- a/themes/PrimaryEyeSoother/AndroidManifest.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.primary.eyesoother"
-    platformBuildVersionCode="28"
-    platformBuildVersionName="9.0.0">
-
-    <overlay android:priority="2" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Eye Soother" />
-</manifest>
-
-
diff --git a/themes/PrimaryEyeSoother/res/color/ripple_material_light.xml b/themes/PrimaryEyeSoother/res/color/ripple_material_light.xml
deleted file mode 100644
index 07ce558..0000000
--- a/themes/PrimaryEyeSoother/res/color/ripple_material_light.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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/themes/PrimaryEyeSoother/res/drawable/toast_frame.xml b/themes/PrimaryEyeSoother/res/drawable/toast_frame.xml
deleted file mode 100644
index f3d5c81..0000000
--- a/themes/PrimaryEyeSoother/res/drawable/toast_frame.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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/themes/PrimaryEyeSoother/res/values/colors.xml b/themes/PrimaryEyeSoother/res/values/colors.xml
deleted file mode 100644
index 6532b07..0000000
--- a/themes/PrimaryEyeSoother/res/values/colors.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?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">#FF283E28</color> <!-- PRIMARY DARK -->
-    <color name="omni_color2">#FF283E28</color> <!-- PRIMARY LIGHT -->
-    <color name="omni_color6">#FFFFFDE7</color> <!-- WIFI ICON IN DETAILS -->
-    <color name="omni_color7">#FF283E28</color> <!-- FLOATING DIALOG COLOR ON VERY DARK THEMES MAKE THIS A BIT LIGHTER -->
-    <color name="omni_color9">#E6283E28</color> <!-- TOAST (NEEDS SOME ALPHA) -->
-    <color name="omni_color900">#FF283E28</color> <!-- PRIMARY DARK -->
-
-    <!-- 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="zen_introduction">@*android:color/omni_color1</color>
-
-    <!-- Dialogs -->
-    <color name="background_floating_material_dark">@*android:color/omni_color7</color> <!-- dialogs like sime settins -->
-
-    <!-- Gradient Shit -->
-    <color name="gradient_start">@*android:color/gradient_start_dark</color>
-    <color name="gradient_end">@*android:color/gradient_end_dark</color>
-
-</resources>
-
-
-
-
diff --git a/themes/PrimaryEyeSoother/res/values/config.xml b/themes/PrimaryEyeSoother/res/values/config.xml
deleted file mode 100644
index 00d1e9d..0000000
--- a/themes/PrimaryEyeSoother/res/values/config.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="config_useDarkBgNotificationIconTextTinting">true</bool>
-    <bool name="config_enableNightMode">true</bool>
-</resources>
-
-
diff --git a/themes/PrimaryEyeSoother/res/values/settings.xml b/themes/PrimaryEyeSoother/res/values/settings.xml
deleted file mode 100644
index 89e6896..0000000
--- a/themes/PrimaryEyeSoother/res/values/settings.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme.DeviceDefault.Settings" parent="@*android:style/Theme.DeviceDefault">
-        <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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
-    </style>
-</resources>
-
-
-
diff --git a/themes/PrimaryEyeSoother/res/values/strings.xml b/themes/PrimaryEyeSoother/res/values/strings.xml
deleted file mode 100644
index e41dd1b..0000000
--- a/themes/PrimaryEyeSoother/res/values/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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/themes/PrimaryEyeSoother/res/values/styles.xml b/themes/PrimaryEyeSoother/res/values/styles.xml
deleted file mode 100644
index 273d028..0000000
--- a/themes/PrimaryEyeSoother/res/values/styles.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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/themes/PrimaryEyeSoother/res/values/themes.xml b/themes/PrimaryEyeSoother/res/values/themes.xml
deleted file mode 100644
index d7dd1a2..0000000
--- a/themes/PrimaryEyeSoother/res/values/themes.xml
+++ /dev/null
@@ -1,556 +0,0 @@
-<?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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
--->
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
-    </style>
-
-    <style name="qs_base" parent="@*android:style/Theme.DeviceDefault">
-        <item name="android:colorBackgroundFloating">@*android:color/omni_color900</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-
-    <!-- Theme for the dialog shown when an app crashes or ANRs. -->
-    <style name="Theme.Dialog.AppError" parent="@*android:style/Theme.Material.Dialog.Alert">
-        <item name="android:windowContentTransitions">false</item>
-        <item name="android:windowActivityTransitions">false</item>
-        <item name="android:windowCloseOnTouchOutside">false</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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/themes/PrimaryWarmWhite/Android.mk b/themes/PrimaryWarmWhite/Android.mk
deleted file mode 100644
index da7ca6d..0000000
--- a/themes/PrimaryWarmWhite/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := PrimaryWarmWhite
-LOCAL_RRO_THEME := PrimaryWarmWhite
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/PrimaryWarmWhite/AndroidManifest.xml b/themes/PrimaryWarmWhite/AndroidManifest.xml
deleted file mode 100644
index 0a99384..0000000
--- a/themes/PrimaryWarmWhite/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/themes/PrimaryWarmWhite/res/color/ripple_material_light.xml b/themes/PrimaryWarmWhite/res/color/ripple_material_light.xml
deleted file mode 100644
index 07ce558..0000000
--- a/themes/PrimaryWarmWhite/res/color/ripple_material_light.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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/themes/PrimaryWarmWhite/res/drawable/toast_frame.xml b/themes/PrimaryWarmWhite/res/drawable/toast_frame.xml
deleted file mode 100644
index 5738837..0000000
--- a/themes/PrimaryWarmWhite/res/drawable/toast_frame.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/PrimaryWarmWhite/res/values/colors.xml b/themes/PrimaryWarmWhite/res/values/colors.xml
deleted file mode 100644
index 7601e65..0000000
--- a/themes/PrimaryWarmWhite/res/values/colors.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?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">#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_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 -->
-
-    <!-- Gradient Shit -->
-    <color name="gradient_start">@*android:color/gradient_start_dark</color>
-    <color name="gradient_end">@*android:color/gradient_end_dark</color>
-
-</resources>
diff --git a/themes/PrimaryWarmWhite/res/values/config.xml b/themes/PrimaryWarmWhite/res/values/config.xml
deleted file mode 100644
index bc9a085..0000000
--- a/themes/PrimaryWarmWhite/res/values/config.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="config_useDarkBgNotificationIconTextTinting">false</bool>
-    <bool name="config_enableNightMode">false</bool>
-</resources>
diff --git a/themes/PrimaryWarmWhite/res/values/settings.xml b/themes/PrimaryWarmWhite/res/values/settings.xml
deleted file mode 100644
index 8a3e6dc..0000000
--- a/themes/PrimaryWarmWhite/res/values/settings.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme.DeviceDefault.Settings" parent="@*android:style/Theme.DeviceDefault">
-        <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/themes/PrimaryWarmWhite/res/values/themes.xml b/themes/PrimaryWarmWhite/res/values/themes.xml
deleted file mode 100644
index e914ee2..0000000
--- a/themes/PrimaryWarmWhite/res/values/themes.xml
+++ /dev/null
@@ -1,445 +0,0 @@
-<?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/themes/PrimaryWhite/Android.mk b/themes/PrimaryWhite/Android.mk
deleted file mode 100644
index fac17ff..0000000
--- a/themes/PrimaryWhite/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := PrimaryWhite
-LOCAL_RRO_THEME := PrimaryWhite
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/PrimaryWhite/AndroidManifest.xml b/themes/PrimaryWhite/AndroidManifest.xml
deleted file mode 100644
index 0a75cb2..0000000
--- a/themes/PrimaryWhite/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/themes/PrimaryWhite/res/color/ripple_material_light.xml b/themes/PrimaryWhite/res/color/ripple_material_light.xml
deleted file mode 100644
index 07ce558..0000000
--- a/themes/PrimaryWhite/res/color/ripple_material_light.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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/themes/PrimaryWhite/res/drawable/toast_frame.xml b/themes/PrimaryWhite/res/drawable/toast_frame.xml
deleted file mode 100644
index 5738837..0000000
--- a/themes/PrimaryWhite/res/drawable/toast_frame.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/PrimaryWhite/res/values/colors.xml b/themes/PrimaryWhite/res/values/colors.xml
deleted file mode 100644
index 648f6dc..0000000
--- a/themes/PrimaryWhite/res/values/colors.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?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">#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_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 -->
-
-    <!-- Gradient Shit -->
-    <color name="gradient_start">@*android:color/gradient_start_dark</color>
-    <color name="gradient_end">@*android:color/gradient_end_dark</color>
-
-</resources>
diff --git a/themes/PrimaryWhite/res/values/config.xml b/themes/PrimaryWhite/res/values/config.xml
deleted file mode 100644
index bc9a085..0000000
--- a/themes/PrimaryWhite/res/values/config.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="config_useDarkBgNotificationIconTextTinting">false</bool>
-    <bool name="config_enableNightMode">false</bool>
-</resources>
diff --git a/themes/PrimaryWhite/res/values/settings.xml b/themes/PrimaryWhite/res/values/settings.xml
deleted file mode 100644
index 7f7d0d2..0000000
--- a/themes/PrimaryWhite/res/values/settings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme.DeviceDefault.Settings" parent="@*android:style/Theme.DeviceDefault">
-        <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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
-    </style>
-</resources>
diff --git a/themes/PrimaryWhite/res/values/themes.xml b/themes/PrimaryWhite/res/values/themes.xml
deleted file mode 100644
index 19362fc..0000000
--- a/themes/PrimaryWhite/res/values/themes.xml
+++ /dev/null
@@ -1,478 +0,0 @@
-<?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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</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/themes/SluttyPink/Android.mk b/themes/SluttyPink/Android.mk
deleted file mode 100644
index 31977a3..0000000
--- a/themes/SluttyPink/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := SluttyPinkTheme
-LOCAL_RRO_THEME := SluttyPinkTheme
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/SluttyPink/AndroidManifest.xml b/themes/SluttyPink/AndroidManifest.xml
deleted file mode 100644
index 9fb9105..0000000
--- a/themes/SluttyPink/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.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/themes/SluttyPink/assets/thumbnail.png b/themes/SluttyPink/assets/thumbnail.png
deleted file mode 100644
index 9841324..0000000
--- a/themes/SluttyPink/assets/thumbnail.png
+++ /dev/null
Binary files differ
diff --git a/themes/SluttyPink/res/color/ripple_material_light.xml b/themes/SluttyPink/res/color/ripple_material_light.xml
deleted file mode 100644
index 07ce558..0000000
--- a/themes/SluttyPink/res/color/ripple_material_light.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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/themes/SluttyPink/res/drawable/toast_frame.xml b/themes/SluttyPink/res/drawable/toast_frame.xml
deleted file mode 100644
index 5738837..0000000
--- a/themes/SluttyPink/res/drawable/toast_frame.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/SluttyPink/res/values/colors.xml b/themes/SluttyPink/res/values/colors.xml
deleted file mode 100644
index 91019c5..0000000
--- a/themes/SluttyPink/res/values/colors.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <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 with "de" alpha -->
-    <color name="omni_color1">#ff0d2029</color> <!-- PRIMARY DARK -->
-    <color name="omni_color2">#ff182a33</color> <!-- PRIMARY LIGHT -->
-    <color name="omni_color3">#ffff205a</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ffff206e</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ffff005a</color> <!-- ACCENT -->
-    <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) -->
-    <color name="omni_color900">#ff0d2029</color> <!-- PRIMARY DARK -->
-
-    <!-- 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>
-
-    <!-- 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>
-
-    <!-- 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="zen_introduction">@*android:color/omni_color1</color>
-
-    <!-- Dialogs -->
-    <color name="background_floating_material_dark">@*android:color/omni_color7</color> <!-- dialogs like sime settins -->
-
-    <!-- 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/themes/SluttyPink/res/values/config.xml b/themes/SluttyPink/res/values/config.xml
deleted file mode 100644
index a1802c8..0000000
--- a/themes/SluttyPink/res/values/config.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="config_useDarkBgNotificationIconTextTinting">true</bool>
-    <bool name="config_enableNightMode">true</bool>
-</resources>
diff --git a/themes/SluttyPink/res/values/settings.xml b/themes/SluttyPink/res/values/settings.xml
deleted file mode 100644
index cc5cee3..0000000
--- a/themes/SluttyPink/res/values/settings.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme.DeviceDefault.Settings" parent="@*android:style/Theme.DeviceDefault">
-        <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/themes/SluttyPink/res/values/strings.xml b/themes/SluttyPink/res/values/strings.xml
deleted file mode 100644
index bf20dad..0000000
--- a/themes/SluttyPink/res/values/strings.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/SluttyPink/res/values/styles.xml b/themes/SluttyPink/res/values/styles.xml
deleted file mode 100644
index 2bfc794..0000000
--- a/themes/SluttyPink/res/values/styles.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/SluttyPink/res/values/themes.xml b/themes/SluttyPink/res/values/themes.xml
deleted file mode 100644
index e6f496b..0000000
--- a/themes/SluttyPink/res/values/themes.xml
+++ /dev/null
@@ -1,513 +0,0 @@
-<?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_color900</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>
-
-    <!-- Theme for the dialog shown when an app crashes or ANRs. -->
-    <style name="Theme.Dialog.AppError" parent="@*android:style/Theme.Material.Dialog.Alert">
-        <item name="android:windowContentTransitions">false</item>
-        <item name="android:windowActivityTransitions">false</item>
-        <item name="android:windowCloseOnTouchOutside">false</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/themes/SmokedGreen/Android.mk b/themes/SmokedGreen/Android.mk
deleted file mode 100644
index bdf8f5c..0000000
--- a/themes/SmokedGreen/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := SmokedGreenTheme
-LOCAL_RRO_THEME := SmokedGreenTheme
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/SmokedGreen/AndroidManifest.xml b/themes/SmokedGreen/AndroidManifest.xml
deleted file mode 100644
index 7ba3c74..0000000
--- a/themes/SmokedGreen/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.smokedgreen"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Smoked Green" />
-</manifest>
diff --git a/themes/SmokedGreen/assets/thumbnail.png b/themes/SmokedGreen/assets/thumbnail.png
deleted file mode 100644
index 497b6c5..0000000
--- a/themes/SmokedGreen/assets/thumbnail.png
+++ /dev/null
Binary files differ
diff --git a/themes/SmokedGreen/res/color/ripple_material_light.xml b/themes/SmokedGreen/res/color/ripple_material_light.xml
deleted file mode 100644
index 07ce558..0000000
--- a/themes/SmokedGreen/res/color/ripple_material_light.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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/themes/SmokedGreen/res/drawable/toast_frame.xml b/themes/SmokedGreen/res/drawable/toast_frame.xml
deleted file mode 100644
index 5738837..0000000
--- a/themes/SmokedGreen/res/drawable/toast_frame.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/SmokedGreen/res/values/colors.xml b/themes/SmokedGreen/res/values/colors.xml
deleted file mode 100644
index 285f520..0000000
--- a/themes/SmokedGreen/res/values/colors.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="user_icon_1">#ffeeeeee</color>
-    <color name="user_icon_2">#ffdddddd</color>
-    <color name="user_icon_3">#ffcccccc</color>
-    <color name="user_icon_4">#ffbbbbbb</color>
-    <color name="system_error">#ffaaaaaa</color>
-
-    <color name="omni_text1">#FFE8F5E9</color> <!-- text primary -->
-    <color name="omni_text2">#B3E8F5E9</color>  <!-- text secondary -->
-    <color name="omni_text3">#A0E8F5E9</color>  <!-- text tertiary -->
-    <color name="omni_text4">#deE8F5E9</color>  <!-- text with "de" alpha -->
-    <color name="omni_color1">#ff141814</color> <!-- PRIMARY DARK -->
-    <color name="omni_color2">#ff333c33</color> <!-- PRIMARY LIGHT -->
-    <color name="omni_color3">#ff69F0AE</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ff00C853</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#ff00E676</color> <!-- ACCENT -->
-    <color name="omni_color6">#a0E8F5E9</color> <!-- WIFI ICON IN DETAILS -->
-    <color name="omni_color7">#ff474f47</color> <!-- FLOATING DIALOG COLOR ON VERY DARK THEMES MAKE THIS A BIT LIGHTER -->
-    <color name="omni_color8">#ff4CAF50</color> <!-- SPECIAL (CHECK WHERE THIS IS ASSIGNED) -->
-    <color name="omni_color9">#e6474f47</color> <!-- TOAST (NEEDS SOME ALPHA) -->
-    <color name="omni_color900">#ff141814</color> <!-- PRIMARY DARK -->
-
-    <!-- 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>
-
-    <!-- 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>
-
-    <!-- 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="zen_introduction">@*android:color/omni_color1</color>
-
-    <!-- Dialogs -->
-    <color name="background_floating_material_dark">@*android:color/omni_color7</color> <!-- dialogs like sime settins -->
-
-    <!-- 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/themes/SmokedGreen/res/values/config.xml b/themes/SmokedGreen/res/values/config.xml
deleted file mode 100644
index a1802c8..0000000
--- a/themes/SmokedGreen/res/values/config.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="config_useDarkBgNotificationIconTextTinting">true</bool>
-    <bool name="config_enableNightMode">true</bool>
-</resources>
diff --git a/themes/SmokedGreen/res/values/settings.xml b/themes/SmokedGreen/res/values/settings.xml
deleted file mode 100644
index cc5cee3..0000000
--- a/themes/SmokedGreen/res/values/settings.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme.DeviceDefault.Settings" parent="@*android:style/Theme.DeviceDefault">
-        <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/themes/SmokedGreen/res/values/strings.xml b/themes/SmokedGreen/res/values/strings.xml
deleted file mode 100644
index bf20dad..0000000
--- a/themes/SmokedGreen/res/values/strings.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/SmokedGreen/res/values/styles.xml b/themes/SmokedGreen/res/values/styles.xml
deleted file mode 100644
index 2bfc794..0000000
--- a/themes/SmokedGreen/res/values/styles.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/SmokedGreen/res/values/themes.xml b/themes/SmokedGreen/res/values/themes.xml
deleted file mode 100644
index e6f496b..0000000
--- a/themes/SmokedGreen/res/values/themes.xml
+++ /dev/null
@@ -1,513 +0,0 @@
-<?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_color900</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>
-
-    <!-- Theme for the dialog shown when an app crashes or ANRs. -->
-    <style name="Theme.Dialog.AppError" parent="@*android:style/Theme.Material.Dialog.Alert">
-        <item name="android:windowContentTransitions">false</item>
-        <item name="android:windowActivityTransitions">false</item>
-        <item name="android:windowCloseOnTouchOutside">false</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/themes/Stock/Android.mk b/themes/Stock/Android.mk
deleted file mode 100755
index 70322d8..0000000
--- a/themes/Stock/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_PACKAGE_NAME := Stock
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
-
-include $(BUILD_PACKAGE)
-
diff --git a/themes/Stock/AndroidManifest.xml b/themes/Stock/AndroidManifest.xml
deleted file mode 100644
index 1a8a18d..0000000
--- a/themes/Stock/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.theme.stock"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-    <application android:hasCode="false"
-                 android:label="Stock" />
-</manifest>
-
diff --git a/themes/Stock/res/values/colors.xml b/themes/Stock/res/values/colors.xml
deleted file mode 100755
index a078444..0000000
--- a/themes/Stock/res/values/colors.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="user_icon_1">#ff00bcd4</color>
-    <color name="user_icon_2">#ff3f51b5</color>
-    <color name="user_icon_3">#ff4285f4</color>
-    <color name="user_icon_4">#ffe91e63</color>
-    <color name="user_icon_5">#ff0f9d58</color>
-    <color name="user_icon_6">#ff8bc34a</color>
-    <color name="user_icon_7">#ffff9800</color>
-    <color name="user_icon_8">#ffff5722</color>
-    <color name="system_error">#ffea4335</color>
-    <color name="primary_device_default_dark">#ff212121</color>
-    <color name="primary_device_default_settings">#ff263238</color>
-    <color name="primary_dark_device_default_dark">#ff000000</color>
-    <color name="primary_dark_device_default_settings">#ff212121</color>
-    <color name="secondary_device_default_settings">#ff37474f</color>
-    <color name="tertiary_device_default_settings">#ff455a64</color>
-    <color name="quaternary_device_default_settings">#ffb0bec5</color>
-    <color name="accent_device_default_700">#ff00796b</color>
-    <color name="accent_device_default_light">#ff009688</color>
-    <color name="accent_device_default_dark">#ff80cbc4</color>
-    <color name="accent_device_default_50">#ffe0f2f1</color>
-</resources>
diff --git a/themes/TelecommTheme/Android.mk b/themes/TelecommTheme/Android.mk
deleted file mode 100644
index 24336a5..0000000
--- a/themes/TelecommTheme/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := TelecommTheme
-LOCAL_RRO_THEME := TelecommTheme
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/TelecommTheme/AndroidManifest.xml b/themes/TelecommTheme/AndroidManifest.xml
deleted file mode 100644
index c4d88cb..0000000
--- a/themes/TelecommTheme/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.app.telecommtheme"
-    platformBuildVersionCode="28"
-    platformBuildVersionName="9.0.0">
-
-    <overlay android:priority="2" android:targetPackage="com.android.server.telecom" />
-
-
-    <application android:hasCode="false"
-                 android:label="Telecomm Theme" />
-</manifest>
diff --git a/themes/TelecommTheme/assets/thumbnail.png b/themes/TelecommTheme/assets/thumbnail.png
deleted file mode 100644
index 9841324..0000000
--- a/themes/TelecommTheme/assets/thumbnail.png
+++ /dev/null
Binary files differ
diff --git a/themes/TelecommTheme/res/values/colors.xml b/themes/TelecommTheme/res/values/colors.xml
deleted file mode 100644
index 9b729b3..0000000
--- a/themes/TelecommTheme/res/values/colors.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
-  ~ Copyright (C) 2014 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>
-    <color name="theme_color">@*android:color/omni_color4</color>
-
-    <color name="dialer_settings_actionbar_text_color">#ffffff</color>
-    <color name="dialer_settings_actionbar_background_color">@*android:color/omni_color1</color>
-    <color name="dialer_settings_color_dark">@*android:color/omni_color2</color>
-
-    <color name="blocked_numbers_divider_color">#e5e5e5</color>
-    <color name="blocked_numbers_butter_bar_color">#f5f5f5</color>
-    <color name="blocked_numbers_title_text_color">#baffffff</color>
-    <color name="blocked_numbers_secondary_text_color">#89ffffff</color>
-
-    <color name="notification_action_answer">#097138</color>
-    <color name="notification_action_decline">#A52714</color>
-</resources>
-
diff --git a/themes/TelecommTheme/res/values/styles.xml b/themes/TelecommTheme/res/values/styles.xml
deleted file mode 100644
index b408e54..0000000
--- a/themes/TelecommTheme/res/values/styles.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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>
-    <style name="Theme.Telecomm.Transparent" parent="@*android:style/Theme.Material">
-    </style>
-
-    <style name="Theme.Telecom.DialerSettings" parent="@*android:style/Theme.Material">
-    </style>
-
-    <style name="Theme.Telecom.BlockedNumbers" parent="@*android:style/Theme.Material">
-    </style>
-
-</resources>
diff --git a/themes/ZeroZero/Android.mk b/themes/ZeroZero/Android.mk
deleted file mode 100644
index 7daac2e..0000000
--- a/themes/ZeroZero/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := ZeroZeroTheme
-LOCAL_RRO_THEME := ZeroZeroTheme
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/ZeroZero/AndroidManifest.xml b/themes/ZeroZero/AndroidManifest.xml
deleted file mode 100644
index c68d157..0000000
--- a/themes/ZeroZero/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.omnirom.theme.zerozero"
-    platformBuildVersionCode="26"
-    platformBuildVersionName="8.0.0">
-
-    <overlay android:priority="1" android:targetPackage="android" />
-
-
-    <application android:hasCode="false"
-                 android:label="Zero Zero" />
-</manifest>
diff --git a/themes/ZeroZero/assets/thumbnail.png b/themes/ZeroZero/assets/thumbnail.png
deleted file mode 100644
index cdfaf31..0000000
--- a/themes/ZeroZero/assets/thumbnail.png
+++ /dev/null
Binary files differ
diff --git a/themes/ZeroZero/res/color/ripple_material_light.xml b/themes/ZeroZero/res/color/ripple_material_light.xml
deleted file mode 100644
index 07ce558..0000000
--- a/themes/ZeroZero/res/color/ripple_material_light.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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/themes/ZeroZero/res/drawable/toast_frame.xml b/themes/ZeroZero/res/drawable/toast_frame.xml
deleted file mode 100644
index 5738837..0000000
--- a/themes/ZeroZero/res/drawable/toast_frame.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/ZeroZero/res/values/colors.xml b/themes/ZeroZero/res/values/colors.xml
deleted file mode 100644
index d7a5f4a..0000000
--- a/themes/ZeroZero/res/values/colors.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="user_icon_1">#ffe5e5e5</color>
-    <color name="user_icon_2">#ffe5e5e5</color>
-    <color name="user_icon_3">#ffe5e5e5</color>
-    <color name="user_icon_4">#ffe5e5e5</color>
-    <color name="system_error">#ffdf1515</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 with "de" alpha -->
-    <color name="omni_color1">#ff000000</color> <!-- PRIMARY DARK -->
-    <color name="omni_color2">#ff050505</color> <!-- PRIMARY LIGHT -->
-    <color name="omni_color3">#fff9f9f9</color> <!-- ACCENT  LIGHT -->
-    <color name="omni_color4">#ffe0e0e0</color> <!-- ACCENT  DARK -->
-    <color name="omni_color5">#fffefefe</color> <!-- ACCENT -->
-    <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) -->
-    <color name="omni_color900">#ff000000</color> <!-- PRIMARY DARK -->
-
-    <!-- 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>
-
-    <!-- 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>
-
-    <!-- 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="zen_introduction">@*android:color/omni_color1</color>
-    <color name="qs_icon_active_color">#ff000000</color>
-
-    <!-- Dialogs -->
-    <color name="background_floating_material_dark">@*android:color/omni_color7</color> <!-- dialogs like sime settins -->
-
-    <!-- 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/themes/ZeroZero/res/values/config.xml b/themes/ZeroZero/res/values/config.xml
deleted file mode 100644
index a1802c8..0000000
--- a/themes/ZeroZero/res/values/config.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="config_useDarkBgNotificationIconTextTinting">true</bool>
-    <bool name="config_enableNightMode">true</bool>
-</resources>
diff --git a/themes/ZeroZero/res/values/settings.xml b/themes/ZeroZero/res/values/settings.xml
deleted file mode 100644
index 0b1cf0f..0000000
--- a/themes/ZeroZero/res/values/settings.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme.DeviceDefault.Settings" parent="@*android:style/Theme.DeviceDefault">
-        <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/themes/ZeroZero/res/values/strings.xml b/themes/ZeroZero/res/values/strings.xml
deleted file mode 100644
index bf20dad..0000000
--- a/themes/ZeroZero/res/values/strings.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/ZeroZero/res/values/styles.xml b/themes/ZeroZero/res/values/styles.xml
deleted file mode 100644
index 2bfc794..0000000
--- a/themes/ZeroZero/res/values/styles.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/themes/ZeroZero/res/values/themes.xml b/themes/ZeroZero/res/values/themes.xml
deleted file mode 100644
index e6f496b..0000000
--- a/themes/ZeroZero/res/values/themes.xml
+++ /dev/null
@@ -1,513 +0,0 @@
-<?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_color900</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>
-
-    <!-- Theme for the dialog shown when an app crashes or ANRs. -->
-    <style name="Theme.Dialog.AppError" parent="@*android:style/Theme.Material.Dialog.Alert">
-        <item name="android:windowContentTransitions">false</item>
-        <item name="android:windowActivityTransitions">false</item>
-        <item name="android:windowCloseOnTouchOutside">false</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>