Merge changes from topic "themes" into p9.0

* changes:
  vendor/bliss: [1/2] Move all QSThemes to vendor/themes
  vendor/bliss: [1/2] Move all themes from vendor/bliss
diff --git a/QSthemes/Android.mk b/QSthemes/Android.mk
deleted file mode 100644
index 8338432..0000000
--- a/QSthemes/Android.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-include $(call all-subdir-makefiles)
-
diff --git a/QSthemes/QSTileCircleDualTone/Android.mk b/QSthemes/QSTileCircleDualTone/Android.mk
deleted file mode 100644
index 7c5299e..0000000
--- a/QSthemes/QSTileCircleDualTone/Android.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_PACKAGE_NAME := QSTileCircleDualTone
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
-include $(BUILD_PACKAGE)
-
diff --git a/QSthemes/QSTileCircleDualTone/AndroidManifest.xml b/QSthemes/QSTileCircleDualTone/AndroidManifest.xml
deleted file mode 100644
index 35c787d..0000000
--- a/QSthemes/QSTileCircleDualTone/AndroidManifest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.systemui.qstile.dualtonecircle"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <overlay android:targetPackage="com.android.systemui" android:priority="1"/>
-
-    <application android:label="Circle with Dual Tone" android:hasCode="false" />
-</manifest>
-
diff --git a/QSthemes/QSTileCircleDualTone/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileCircleDualTone/res/drawable/ic_qs_circle.xml
deleted file mode 100644
index 1d3dc5d..0000000
--- a/QSthemes/QSTileCircleDualTone/res/drawable/ic_qs_circle.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-    <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="40dp"
-    android:height="40dp"
-    android:viewportWidth="48.0"
-    android:viewportHeight="48.0">
-    <path
-        android:fillColor="#fff"
-        android:pathData="M24,0.34C10.93,0.34 0.34,10.93 0.34,24h47.33C47.67,10.93 37.07,0.34 24,0.34z"/>
-    <path
-        android:pathData="M24,47.67c13.07,0 23.67,-10.6 23.67,-23.67H0.34C0.34,37.07 10.93,47.67 24,47.67z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.80"/>
-    </vector>
-
diff --git a/QSthemes/QSTileCircleGradient/Android.mk b/QSthemes/QSTileCircleGradient/Android.mk
deleted file mode 100644
index 7a9efaf..0000000
--- a/QSthemes/QSTileCircleGradient/Android.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_PACKAGE_NAME := QSTileCircleGradient
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
-include $(BUILD_PACKAGE)
-
diff --git a/QSthemes/QSTileCircleGradient/AndroidManifest.xml b/QSthemes/QSTileCircleGradient/AndroidManifest.xml
deleted file mode 100644
index 0560a34..0000000
--- a/QSthemes/QSTileCircleGradient/AndroidManifest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.systemui.qstile.circlegradient"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <overlay android:targetPackage="com.android.systemui" android:priority="1"/>
-
-    <application android:label="Circle with Gradient" android:hasCode="false" />
-</manifest>
-
diff --git a/QSthemes/QSTileCircleGradient/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileCircleGradient/res/drawable/ic_qs_circle.xml
deleted file mode 100644
index b20500e..0000000
--- a/QSthemes/QSTileCircleGradient/res/drawable/ic_qs_circle.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval" android:width="40dp" android:height="40dp">
-    <gradient
-        android:type="linear"
-        android:startColor="#ffffffff"
-        android:endColor="#5cffffff"
-        android:angle="45"/>
-</shape>
-
diff --git a/QSthemes/QSTileCircleOutline/Android.mk b/QSthemes/QSTileCircleOutline/Android.mk
deleted file mode 100644
index 18302c2..0000000
--- a/QSthemes/QSTileCircleOutline/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_PACKAGE_NAME := QSTileCircleOutline
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
-include $(BUILD_PACKAGE)
diff --git a/QSthemes/QSTileCircleOutline/AndroidManifest.xml b/QSthemes/QSTileCircleOutline/AndroidManifest.xml
deleted file mode 100644
index 9831ac5..0000000
--- a/QSthemes/QSTileCircleOutline/AndroidManifest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.systemui.qstile.circleoutline"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <overlay android:targetPackage="com.android.systemui" android:priority="1"/>
-
-    <application android:label="Circle Outline" android:hasCode="false" />
-</manifest>
diff --git a/QSthemes/QSTileCircleOutline/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileCircleOutline/res/drawable/ic_qs_circle.xml
deleted file mode 100644
index 3bf3fc2..0000000
--- a/QSthemes/QSTileCircleOutline/res/drawable/ic_qs_circle.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--suppress AndroidUnknownAttribute -->
-<vector xmlns:api24="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
-    android:viewportWidth="48"
-    android:viewportHeight="48"
-    android:width="40dp"
-    android:height="40dp">
-    <path
-        android:pathData="M46.587999 24A22.587999 22.587999 0 0 1 24 46.587999 22.587999 22.587999 0 0 1 1.4120007 24 22.587999 22.587999 0 0 1 24 1.4120007 22.587999 22.587999 0 0 1 46.587999 24Z"
-        android:fillColor="#ffffff"
-        android:fillAlpha="0.25"/>
-    <path
-        android:pathData="M46.368 24A22.368 22.368 0 0 1 24 46.368 22.368 22.368 0 0 1 1.632 24 22.368 22.368 0 0 1 24 1.632 22.368 22.368 0 0 1 46.368 24Z"
-        android:strokeWidth="3"
-        android:strokeMiterLimit="10"
-        android:strokeColor="#ffffff" />
-</vector>
\ No newline at end of file
diff --git a/QSthemes/QSTileCircleOutline/res/values/colors.xml b/QSthemes/QSTileCircleOutline/res/values/colors.xml
deleted file mode 100644
index 2eaae4c..0000000
--- a/QSthemes/QSTileCircleOutline/res/values/colors.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2016 Project Substratum
-
-    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>
-    <!-- QS tiles Active, Inactive and Unavailable tint (Requires config_enable_qs_tile_tinting bool set to true) -->
-    <color name="qs_tiles_active_tint">@*android:color/accent_device_default_light</color>
-    <color name="qs_tiles_inactive_tint">@*android:color/omni_text1</color>
-    <color name="qs_tiles_unavailable_tint">@*android:color/omni_text2</color> <!-- keep in mind that the code adds 0.26 (light) or 0.30 (dark) alpha to this color. -->
-
-    <!-- QS tiles background Active, Disable, and Inactive tint (Requires config_enable_qs_tile_tinting bool set to true) -->
-    <color name="qs_tiles_background_active_tint">@*android:color/accent_device_default_light</color>
-    <color name="qs_tiles_background_disabled_tint">@*android:color/omni_text1</color> <!-- keep in mind that the code adds 0.26 (light) or 0.30 (dark) alpha to this color. -->
-    <color name="qs_tiles_background_inactive_tint">@*android:color/omni_text2</color>
-
-    <!-- QS tiles expand, underline and label colors -->
-    <color name="qs_tiles_expand_tint">@*android:color/omni_text1</color>
-    <color name="qs_tiles_label_color">@*android:color/omni_text1</color>
-    <color name="qs_tiles_secondary_label_color">@*android:color/omni_text2</color>
-    <color name="qs_tiles_underline_color">@*android:color/omni_text1</color>
-
-</resources>
diff --git a/QSthemes/QSTileCircleOutline/res/values/config.xml b/QSthemes/QSTileCircleOutline/res/values/config.xml
deleted file mode 100644
index e23e4b0..0000000
--- a/QSthemes/QSTileCircleOutline/res/values/config.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017-2018 Projekt Substratum
-      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>
-     <!-- Config to enable/diaable qs tile tinting -->
-    <bool name="config_enable_qs_tile_tinting">true</bool>
- </resources>
\ No newline at end of file
diff --git a/QSthemes/QSTileCircleTrim/Android.mk b/QSthemes/QSTileCircleTrim/Android.mk
deleted file mode 100644
index 606d954..0000000
--- a/QSthemes/QSTileCircleTrim/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-CAL_MODULE_TAGS := optional
-
-LOCAL_PACKAGE_NAME := QSTileCircleTrim
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
-
-include $(BUILD_PACKAGE)
diff --git a/QSthemes/QSTileCircleTrim/AndroidManifest.xml b/QSthemes/QSTileCircleTrim/AndroidManifest.xml
deleted file mode 100644
index 3edb12b..0000000
--- a/QSthemes/QSTileCircleTrim/AndroidManifest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.systemui.qstile.circletrim"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <overlay android:targetPackage="com.android.systemui" android:priority="1"/>
-
-    <application android:label="@string/qstile_circle_trim" android:hasCode="false"/>
-</manifest>
diff --git a/QSthemes/QSTileCircleTrim/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileCircleTrim/res/drawable/ic_qs_circle.xml
deleted file mode 100644
index 75aeb4e..0000000
--- a/QSthemes/QSTileCircleTrim/res/drawable/ic_qs_circle.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-     Copyright (C) 2018 AquariOS
-
-     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.
-
-	 General description:
-	 Circle with clean outline/boarder to it
-
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="40dp"
-    android:height="40dp"
-    android:viewportWidth="40"
-    android:viewportHeight="40">
-
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M20,0.5C9.2,0.5,0.5,9.2,0.5,20S9.2,39.5,20,39.5c10.8,0,19.5-8.7,19.5-19.5S30.8,0.5,20,0.5 M20,38.2 C9.9,38.2,1.8,30.1,1.8,20S9.9,1.8,20,1.8c10.1,0,18.2,8.2,18.2,18.2S30.1,38.2,20,38.2" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M20,37.4c-9.6,0-17.4-7.8-17.4-17.4c0-9.6,7.8-17.4,17.4-17.4c9.6,0,17.4,7.8,17.4,17.4 C37.4,29.6,29.6,37.4,20,37.4 M20,2.8C10.5,2.8,2.8,10.5,2.8,20c0,9.5,7.7,17.2,17.2,17.2S37.2,29.5,37.2,20 C37.2,10.5,29.5,2.8,20,2.8" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M20,36.6c-9.1,0-16.6-7.4-16.6-16.6c0-9.1,7.4-16.6,16.6-16.6c9.1,0,16.6,7.4,16.6,16.6 C36.6,29.2,29.1,36.6,20,36.6 M20,3.6C11,3.6,3.6,11,3.6,20S11,36.4,20,36.4c9,0,16.4-7.3,16.4-16.4S29,3.6,20,3.6" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M20,3.4C10.8,3.4,3.4,10.9,3.4,20c0,9.1,7.4,16.6,16.6,16.6c7.6,0,16.6-6,16.6-16.6C36.6,10.9,29.1,3.4,20,3.4" />
-</vector>
diff --git a/QSthemes/QSTileCircleTrim/res/values/strings.xml b/QSthemes/QSTileCircleTrim/res/values/strings.xml
deleted file mode 100644
index 47b0c74..0000000
--- a/QSthemes/QSTileCircleTrim/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="qstile_circle_trim">Circle with trim</string>
-
-</resources>
diff --git a/QSthemes/QSTileCookie/Android.mk b/QSthemes/QSTileCookie/Android.mk
deleted file mode 100644
index a957e55..0000000
--- a/QSthemes/QSTileCookie/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-CAL_MODULE_TAGS := optional
-
-LOCAL_PACKAGE_NAME := QSTileCookie
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
-
-include $(BUILD_PACKAGE)
diff --git a/QSthemes/QSTileCookie/AndroidManifest.xml b/QSthemes/QSTileCookie/AndroidManifest.xml
deleted file mode 100644
index 1dc6e6f..0000000
--- a/QSthemes/QSTileCookie/AndroidManifest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.systemui.qstile.cookie"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <overlay android:targetPackage="com.android.systemui" android:priority="1"/>
-
-    <application android:label="@string/qstile_cookie" android:hasCode="false"/>
-</manifest>
\ No newline at end of file
diff --git a/QSthemes/QSTileCookie/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileCookie/res/drawable/ic_qs_circle.xml
deleted file mode 100644
index 9e1c2ed..0000000
--- a/QSthemes/QSTileCookie/res/drawable/ic_qs_circle.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<!--
-    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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
-    android:height="48dp"
-    android:viewportWidth="48"
-    android:viewportHeight="48">
-
-    <group>
-        <path
-            android:fillColor="#ffffff"
-            android:fillAlpha="0.6"
-            android:pathData="M 24.000000000000004 0 C 37.2548339959 0 48 10.7451660041 48 24.000000000000004 C 48 37.2548339959 37.2548339959 48 24.000000000000004 48 C 10.7451660041 48 0 37.2548339959 0 24.000000000000004 C 0 10.7451660041 10.7451660041 0 24.000000000000004 0 Z" />
-        <path
-            android:fillColor="#ffffff"
-            android:fillAlpha="0.8"
-            android:pathData="M 24.000000000000004 4.8 C 34.6038671968 4.8 43.2 13.3961328032 43.2 24.000000000000004 C 43.2 34.6038671968 34.6038671968 43.2 24.000000000000004 43.2 C 13.3961328032 43.2 4.8 34.6038671968 4.8 24.000000000000004 C 4.8 13.3961328032 13.3961328032 4.8 24.000000000000004 4.8 Z" />
-        <path
-            android:fillColor="#ffffff"
-            android:pathData="M 24.00000000000001 9.6 C 31.9529003976 9.6 38.4 16.0470996024 38.4 24.00000000000001 C 38.4 31.9529003976 31.9529003976 38.4 24.00000000000001 38.4 C 16.0470996024 38.4 9.6 31.9529003976 9.6 24.00000000000001 C 9.6 16.0470996024 16.0470996024 9.6 24.00000000000001 9.6 Z" />
-    </group>
-</vector>
diff --git a/QSthemes/QSTileCookie/res/values/strings.xml b/QSthemes/QSTileCookie/res/values/strings.xml
deleted file mode 100644
index 35423d3..0000000
--- a/QSthemes/QSTileCookie/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="qstile_cookie">Cookie</string>
-
-</resources>
diff --git a/QSthemes/QSTileDefault/Android.mk b/QSthemes/QSTileDefault/Android.mk
deleted file mode 100644
index e6a5952..0000000
--- a/QSthemes/QSTileDefault/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-CAL_MODULE_TAGS := optional
-
-LOCAL_PACKAGE_NAME := QSTileDefault
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
-
-include $(BUILD_PACKAGE)
diff --git a/QSthemes/QSTileDefault/AndroidManifest.xml b/QSthemes/QSTileDefault/AndroidManifest.xml
deleted file mode 100644
index 10586b5..0000000
--- a/QSthemes/QSTileDefault/AndroidManifest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.systemui.qstile.default"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <overlay android:targetPackage="com.android.systemui" android:priority="1"/>
-
-    <application android:label="@string/qstile_default" android:hasCode="false"/>
-</manifest>
diff --git a/QSthemes/QSTileDefault/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileDefault/res/drawable/ic_qs_circle.xml
deleted file mode 100644
index 990cec6..0000000
--- a/QSthemes/QSTileDefault/res/drawable/ic_qs_circle.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-    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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="40dp"
-        android:height="40dp"
-        android:viewportWidth="2.2"
-        android:viewportHeight="2.2">
-
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M.1,1.1
-        c0,.55  .45,1   1,1
-        c.55,0  1,-.45  1,-1
-        c0,-.55 -.45,-1 -1,-1
-        c-.55,0 -1,.45  -1,1"/>
-</vector>
diff --git a/QSthemes/QSTileDefault/res/values/strings.xml b/QSthemes/QSTileDefault/res/values/strings.xml
deleted file mode 100644
index fc44b30..0000000
--- a/QSthemes/QSTileDefault/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="qstile_default">Default</string>
-
-</resources>
diff --git a/QSthemes/QSTileDottedCircle/Android.mk b/QSthemes/QSTileDottedCircle/Android.mk
deleted file mode 100644
index 62bb256..0000000
--- a/QSthemes/QSTileDottedCircle/Android.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_PACKAGE_NAME := QSTileDottedCircle
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
-include $(BUILD_PACKAGE)
-
diff --git a/QSthemes/QSTileDottedCircle/AndroidManifest.xml b/QSthemes/QSTileDottedCircle/AndroidManifest.xml
deleted file mode 100644
index 01d9594..0000000
--- a/QSthemes/QSTileDottedCircle/AndroidManifest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.systemui.qstile.dottedcircle"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <overlay android:targetPackage="com.android.systemui" android:priority="1"/>
-
-    <application android:label="Dotted Circle" android:hasCode="false" />
-</manifest>
-
diff --git a/QSthemes/QSTileDottedCircle/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileDottedCircle/res/drawable/ic_qs_circle.xml
deleted file mode 100644
index 811847d..0000000
--- a/QSthemes/QSTileDottedCircle/res/drawable/ic_qs_circle.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="40dp"
-        android:height="40dp"
-        android:viewportWidth="48.0"
-        android:viewportHeight="48.0">
-    <path
-        android:pathData="M45.65,19.56l1.55,-0.31c0,0 0.18,1.18 0.35,2.35c0.06,1.19 0.12,2.38 0.12,2.38h-1.58c0,0 -0.06,-1.11 -0.11,-2.22C45.81,20.66 45.65,19.56 45.65,19.56z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M43.38,13.37l1.39,-0.76c0,0 0.14,0.26 0.33,0.67c0.19,0.4 0.45,0.94 0.71,1.47c0.2,0.56 0.41,1.12 0.56,1.54c0.15,0.42 0.25,0.7 0.25,0.7l-1.51,0.47c0,0 -0.09,-0.26 -0.23,-0.65c-0.14,-0.39 -0.33,-0.91 -0.52,-1.43c-0.24,-0.5 -0.48,-1 -0.66,-1.38C43.51,13.62 43.38,13.37 43.38,13.37z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M39.38,8.13L40.49,7c0,0 0.23,0.19 0.52,0.53c0.3,0.33 0.7,0.77 1.1,1.21c0.39,0.45 0.72,0.94 1,1.3c0.27,0.36 0.44,0.6 0.44,0.6l-1.31,0.89c0,0 -0.17,-0.22 -0.42,-0.56c-0.26,-0.33 -0.57,-0.79 -0.93,-1.21c-0.37,-0.41 -0.75,-0.82 -1.03,-1.13C39.6,8.31 39.38,8.13 39.38,8.13z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M34.03,4.3l0.72,-1.41c0,0 0.28,0.12 0.66,0.34c0.38,0.23 0.89,0.54 1.4,0.85c0.52,0.29 0.97,0.69 1.34,0.94c0.36,0.27 0.6,0.44 0.6,0.44l-0.99,1.24c0,0 -0.22,-0.17 -0.56,-0.42c-0.34,-0.24 -0.76,-0.61 -1.25,-0.88c-0.47,-0.29 -0.95,-0.58 -1.3,-0.79C34.28,4.4 34.03,4.3 34.03,4.3z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M27.78,2.21l0.27,-1.56c0,0 0.29,0.05 0.73,0.12c0.43,0.11 1.01,0.26 1.59,0.41c0.58,0.13 1.14,0.34 1.56,0.5c0.42,0.15 0.7,0.26 0.7,0.26l-0.58,1.47c0,0 -0.26,-0.09 -0.65,-0.24c-0.39,-0.14 -0.91,-0.35 -1.45,-0.47c-0.54,-0.14 -1.08,-0.28 -1.48,-0.38C28.06,2.26 27.78,2.21 27.78,2.21z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M21.2,2.06l-0.2,-1.57c0,0 0.29,-0.06 0.74,-0.09c0.44,-0.02 1.04,-0.05 1.63,-0.08c0.59,-0.05 1.19,0 1.63,0.02c0.44,0.02 0.74,0.04 0.74,0.04l-0.12,1.58c0,0 -0.28,-0.01 -0.69,-0.04c-0.42,-0.02 -0.97,-0.07 -1.52,-0.02c-0.56,0.03 -1.11,0.06 -1.52,0.08C21.47,2 21.2,2.06 21.2,2.06z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M14.86,3.85l-0.65,-1.44c0,0 0.26,-0.14 0.68,-0.31c0.42,-0.15 0.98,-0.36 1.54,-0.56c0.55,-0.23 1.14,-0.34 1.57,-0.46c0.43,-0.11 0.72,-0.19 0.72,-0.19l0.35,1.54c0,0 -0.27,0.07 -0.67,0.17c-0.4,0.11 -0.95,0.21 -1.46,0.43c-0.52,0.19 -1.04,0.38 -1.43,0.52C15.1,3.71 14.86,3.85 14.86,3.85z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M9.34,7.43L8.29,6.25c0,0 0.22,-0.2 0.55,-0.5c0.35,-0.28 0.83,-0.63 1.3,-0.99c0.47,-0.37 0.98,-0.68 1.36,-0.91c0.38,-0.23 0.64,-0.39 0.64,-0.39l0.79,1.37c0,0 -0.24,0.14 -0.59,0.36c-0.36,0.21 -0.84,0.5 -1.27,0.85c-0.44,0.34 -0.89,0.66 -1.22,0.92C9.54,7.25 9.34,7.43 9.34,7.43z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M5.11,12.48l-1.35,-0.82c0,0 0.59,-1.04 1.34,-1.96c0.35,-0.48 0.71,-0.95 1.03,-1.27c0.3,-0.33 0.5,-0.55 0.5,-0.55l1.16,1.08c0,0 -0.19,0.2 -0.47,0.51c-0.29,0.3 -0.63,0.74 -0.96,1.19C5.66,11.52 5.11,12.48 5.11,12.48z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M2.56,18.55l-1.53,-0.39c0,0 0.07,-0.29 0.19,-0.72c0.09,-0.44 0.31,-0.99 0.51,-1.55c0.37,-1.13 0.92,-2.19 0.92,-2.19l1.42,0.69c0,0 -0.52,0.98 -0.86,2.04c-0.19,0.52 -0.4,1.04 -0.48,1.45C2.63,18.28 2.56,18.55 2.56,18.55z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M1.92,25.11l-1.58,0.08c0,0 -0.01,-0.3 -0.04,-0.74C0.26,24 0.31,23.41 0.34,22.81c0.01,-1.19 0.23,-2.36 0.23,-2.36l1.56,0.23c0,0 -0.21,1.09 -0.22,2.21c-0.02,0.56 -0.08,1.11 -0.03,1.52C1.91,24.83 1.92,25.11 1.92,25.11z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M3.23,31.56l-1.49,0.54c0,0 -0.45,-1.1 -0.7,-2.27c-0.15,-0.58 -0.31,-1.15 -0.36,-1.6c-0.07,-0.44 -0.11,-0.74 -0.11,-0.74l1.56,-0.23c0,0 0.04,0.27 0.1,0.69c0.04,0.42 0.2,0.95 0.33,1.49C2.81,30.53 3.23,31.56 3.23,31.56z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M6.39,37.34l-1.26,0.96c0,0 -0.18,-0.24 -0.44,-0.6c-0.28,-0.35 -0.59,-0.85 -0.9,-1.37c-0.66,-1 -1.14,-2.09 -1.14,-2.09l1.42,-0.69c0,-0 0.45,1.02 1.06,1.95c0.28,0.48 0.57,0.95 0.84,1.27C6.22,37.11 6.39,37.34 6.39,37.34z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M11.1,41.93l-0.92,1.28c0,0 -0.24,-0.18 -0.6,-0.44c-0.36,-0.26 -0.83,-0.62 -1.26,-1.04c-0.44,-0.4 -0.89,-0.79 -1.2,-1.11c-0.3,-0.33 -0.5,-0.55 -0.5,-0.55l1.16,-1.08c0,0 0.19,0.21 0.47,0.51c0.29,0.3 0.71,0.66 1.12,1.03c0.4,0.39 0.84,0.73 1.18,0.97C10.88,41.76 11.1,41.93 11.1,41.93z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M16.97,44.93l-0.5,1.5c0,0 -0.28,-0.1 -0.7,-0.25c-0.42,-0.16 -0.99,-0.33 -1.52,-0.61c-0.54,-0.26 -1.07,-0.52 -1.47,-0.71c-0.39,-0.21 -0.64,-0.38 -0.64,-0.38l0.79,-1.37c0,0 0.23,0.15 0.6,0.35c0.38,0.18 0.88,0.42 1.38,0.66c0.49,0.26 1.03,0.42 1.41,0.57C16.71,44.84 16.97,44.93 16.97,44.93z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M23.46,46.06l-0.04,1.58c0,0 -0.3,-0.01 -0.74,-0.04c-0.44,-0.04 -1.04,-0.02 -1.63,-0.13c-0.59,-0.09 -1.18,-0.18 -1.62,-0.25c-0.22,-0.03 -0.4,-0.08 -0.53,-0.11c-0.13,-0.03 -0.2,-0.05 -0.2,-0.05l0.35,-1.54c0,0 0.07,0.02 0.19,0.05c0.12,0.03 0.28,0.08 0.49,0.1c0.41,0.06 0.96,0.15 1.51,0.23c0.55,0.11 1.11,0.09 1.52,0.13C23.18,46.05 23.46,46.06 23.46,46.06z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M29.99,45.24l0.43,1.52c0,0 -0.29,0.07 -0.72,0.19c-0.43,0.11 -1,0.28 -1.6,0.34c-0.59,0.09 -1.18,0.18 -1.62,0.25c-0.44,0.04 -0.74,0.05 -0.74,0.05l-0.12,-1.58c0,0 0.28,-0 0.69,-0.04c0.41,-0.06 0.96,-0.15 1.51,-0.23c0.55,-0.06 1.09,-0.22 1.49,-0.32S29.99,45.24 29.99,45.24z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M35.99,42.52l0.86,1.33c0,0 -0.25,0.15 -0.63,0.39c-0.39,0.22 -0.88,0.57 -1.42,0.81c-0.54,0.26 -1.07,0.52 -1.47,0.71c-0.41,0.18 -0.69,0.27 -0.69,0.27l-0.58,-1.47c0,0 0.27,-0.08 0.65,-0.25c0.38,-0.18 0.88,-0.42 1.38,-0.66c0.51,-0.22 0.97,-0.54 1.33,-0.75C35.75,42.67 35.99,42.52 35.99,42.52z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M40.93,38.16l1.21,1.02c0,0 -0.2,0.22 -0.5,0.55c-0.31,0.32 -0.68,0.79 -1.12,1.19c-0.44,0.4 -0.88,0.8 -1.21,1.1c-0.32,0.31 -0.57,0.47 -0.57,0.47l-0.99,-1.24c0,0 0.24,-0.15 0.54,-0.44c0.31,-0.28 0.72,-0.65 1.13,-1.03c0.41,-0.38 0.76,-0.81 1.04,-1.11C40.74,38.37 40.93,38.16 40.93,38.16z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M44.37,32.54l1.46,0.61c0,0 -0.51,1.08 -1.03,2.14c-0.31,0.51 -0.62,1.02 -0.85,1.4c-0.23,0.38 -0.4,0.63 -0.4,0.63l-1.31,-0.89c0,0 0.16,-0.23 0.37,-0.59c0.22,-0.35 0.5,-0.83 0.79,-1.3C43.89,33.54 44.37,32.54 44.37,32.54z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M45.98,26.15l1.57,0.15c0,0 -0.03,0.29 -0.1,0.74c-0.07,0.44 -0.16,1.03 -0.25,1.62c-0.29,1.15 -0.58,2.31 -0.58,2.31l-1.51,-0.47c0,0 0.27,-1.08 0.54,-2.15c0.08,-0.55 0.17,-1.1 0.23,-1.51C45.95,26.42 45.98,26.15 45.98,26.15z"
-        android:fillColor="#fff"/>
-</vector>
-
diff --git a/QSthemes/QSTileDottedCircle/res/values/colors.xml b/QSthemes/QSTileDottedCircle/res/values/colors.xml
deleted file mode 100644
index 2eaae4c..0000000
--- a/QSthemes/QSTileDottedCircle/res/values/colors.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2016 Project Substratum
-
-    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>
-    <!-- QS tiles Active, Inactive and Unavailable tint (Requires config_enable_qs_tile_tinting bool set to true) -->
-    <color name="qs_tiles_active_tint">@*android:color/accent_device_default_light</color>
-    <color name="qs_tiles_inactive_tint">@*android:color/omni_text1</color>
-    <color name="qs_tiles_unavailable_tint">@*android:color/omni_text2</color> <!-- keep in mind that the code adds 0.26 (light) or 0.30 (dark) alpha to this color. -->
-
-    <!-- QS tiles background Active, Disable, and Inactive tint (Requires config_enable_qs_tile_tinting bool set to true) -->
-    <color name="qs_tiles_background_active_tint">@*android:color/accent_device_default_light</color>
-    <color name="qs_tiles_background_disabled_tint">@*android:color/omni_text1</color> <!-- keep in mind that the code adds 0.26 (light) or 0.30 (dark) alpha to this color. -->
-    <color name="qs_tiles_background_inactive_tint">@*android:color/omni_text2</color>
-
-    <!-- QS tiles expand, underline and label colors -->
-    <color name="qs_tiles_expand_tint">@*android:color/omni_text1</color>
-    <color name="qs_tiles_label_color">@*android:color/omni_text1</color>
-    <color name="qs_tiles_secondary_label_color">@*android:color/omni_text2</color>
-    <color name="qs_tiles_underline_color">@*android:color/omni_text1</color>
-
-</resources>
diff --git a/QSthemes/QSTileDottedCircle/res/values/config.xml b/QSthemes/QSTileDottedCircle/res/values/config.xml
deleted file mode 100644
index e23e4b0..0000000
--- a/QSthemes/QSTileDottedCircle/res/values/config.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017-2018 Projekt Substratum
-      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>
-     <!-- Config to enable/diaable qs tile tinting -->
-    <bool name="config_enable_qs_tile_tinting">true</bool>
- </resources>
\ No newline at end of file
diff --git a/QSthemes/QSTileDualToneCircle/Android.mk b/QSthemes/QSTileDualToneCircle/Android.mk
deleted file mode 100644
index 8f61dfa..0000000
--- a/QSthemes/QSTileDualToneCircle/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-CAL_MODULE_TAGS := optional
-
-LOCAL_PACKAGE_NAME := QSTileDualToneCircle
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
-
-include $(BUILD_PACKAGE)
diff --git a/QSthemes/QSTileDualToneCircle/AndroidManifest.xml b/QSthemes/QSTileDualToneCircle/AndroidManifest.xml
deleted file mode 100644
index 05fbc6e..0000000
--- a/QSthemes/QSTileDualToneCircle/AndroidManifest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.systemui.qstile.dualtonecircletrim"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <overlay android:targetPackage="com.android.systemui" android:priority="1"/>
-
-    <application android:label="@string/qstile_dual_tone_circle" android:hasCode="false"/>
-</manifest>
diff --git a/QSthemes/QSTileDualToneCircle/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileDualToneCircle/res/drawable/ic_qs_circle.xml
deleted file mode 100644
index 7c16506..0000000
--- a/QSthemes/QSTileDualToneCircle/res/drawable/ic_qs_circle.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-     Copyright (C) 2018 AquariOS
-
-     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.
-
-	 General description:
-	 Dual toned circle with clean outline/boarder
-
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="40dp"
-    android:height="40dp"
-    android:viewportWidth="40"
-    android:viewportHeight="40">
-
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M37.8,20C25.9,20,14,20,2,20C1.9,15.3,4.1,9,10.1,4.9C16,1,23.4,1,29.3,4.7C35.3,8.5,37.9,14.8,37.8,20z" />
-    <path
-        android:fillColor="#ffffff"
-        android:fillAlpha="0.85"
-        android:pathData="M2,20.1c11.9,0,23.8,0,35.8,0c0,2.3-0.4,4.4-1.2,6.6c-1.3,3.3-3.4,5.9-6.3,8c-5.7,4.1-13.3,4.4-19.4,0.8 C4.6,31.8,1.9,25.4,2,20.1z" />
-    <path
-        android:strokeColor="#ffffff"
-        android:strokeWidth="1"
-        android:strokeMiterLimit="10"
-        android:pathData="M 19.9 0.6 C 30.5590956717 0.6 39.2 9.24090432827 39.2 19.9 C 39.2 30.5590956717 30.5590956717 39.2 19.9 39.2 C 9.24090432827 39.2 0.6 30.5590956717 0.6 19.9 C 0.6 9.24090432827 9.24090432827 0.6 19.9 0.6 Z" />
-</vector>
diff --git a/QSthemes/QSTileDualToneCircle/res/values/strings.xml b/QSthemes/QSTileDualToneCircle/res/values/strings.xml
deleted file mode 100644
index c3d0d6b..0000000
--- a/QSthemes/QSTileDualToneCircle/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="qstile_dual_tone_circle">Dual-toned circle</string>
-
-</resources>
diff --git a/QSthemes/QSTileInk/Android.mk b/QSthemes/QSTileInk/Android.mk
deleted file mode 100644
index 3521deb..0000000
--- a/QSthemes/QSTileInk/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_PACKAGE_NAME := QSTileInk
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
-include $(BUILD_PACKAGE)
diff --git a/QSthemes/QSTileInk/AndroidManifest.xml b/QSthemes/QSTileInk/AndroidManifest.xml
deleted file mode 100644
index 7dba4c1..0000000
--- a/QSthemes/QSTileInk/AndroidManifest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.systemui.qstile.ink"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <overlay android:targetPackage="com.android.systemui" android:priority="1"/>
-
-    <application android:label="Ink" android:hasCode="false" />
-</manifest>
diff --git a/QSthemes/QSTileInk/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileInk/res/drawable/ic_qs_circle.xml
deleted file mode 100644
index a84b19f..0000000
--- a/QSthemes/QSTileInk/res/drawable/ic_qs_circle.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="48.0"
-    android:viewportWidth="48.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#fff" android:fillType="evenOdd" android:pathData="M21.19,44.39c-1.38,-0.51 -2.76,-1 -4.12,-1.54c-0.25,-0.1 -0.8,-0.15 -0.63,-0.54c0.17,-0.38 0.56,-0.04 0.83,0.08c2.2,0.96 4.46,1.61 6.9,1.5c1.14,-0.05 2.19,-0.44 3.29,-0.67c2.47,-0.5 4.88,-1.24 7.07,-2.5c1.97,-1.14 3.67,-2.65 5.09,-4.46c1.16,-1.48 2.09,-3.09 3.11,-4.65c1.15,-1.76 1.52,-3.71 1.76,-5.72c0.03,-0.23 0.06,-0.53 0.21,-0.68c0.74,-0.73 0.5,-1.58 0.35,-2.41c-0.15,-0.79 -0.38,-1.55 -0.6,-2.33c-0.3,-1.08 -0.63,-2.16 -0.75,-3.29c-0.04,-0.41 -0.14,-0.79 -0.46,-1.08c-0.3,-0.27 -0.56,-0.58 -0.76,-0.92c-0.15,-0.25 -0.27,-0.45 -0.58,-0.09c-0.31,0.37 -0.49,0.05 -0.49,-0.24c0.01,-0.79 -0.57,-1.31 -0.8,-1.97c-0.49,-1.39 -1.64,-2.26 -2.43,-3.42c-0.24,-0.35 -0.56,-0.66 -0.96,-0.83c-1.62,-0.7 -3.07,-1.72 -4.72,-2.36c-1.9,-0.74 -3.77,-1.52 -5.89,-1.15c-0.25,0.04 -0.54,-0.02 -0.79,-0.09c-1.11,-0.35 -2.16,-0.17 -3.21,0.23c-0.87,0.33 -1.7,0.69 -2.68,0.69c-0.8,0 -1.5,0.55 -2.18,0.95c-1.75,1.04 -3.31,2.33 -4.72,3.8c-1.22,1.27 -2.36,2.62 -3.61,3.85c-0.56,0.56 -0.86,1.3 -1.36,1.78c-1.14,1.1 -1.06,2.69 -1.89,3.88c-0.32,0.45 -0.35,1 -0.39,1.54c-0.02,0.37 -0.02,0.75 0.15,1.1c0.18,0.37 0.17,0.73 -0.03,1.07c-0.58,1.03 -0.14,1.98 0.29,2.89c0.27,0.56 0.49,1.07 0.28,1.67c-0.09,0.25 -0.05,0.47 0.19,0.52c1.03,0.21 0.88,1.09 0.96,1.77c0.06,0.52 0.03,1.27 -0.38,1.5c-0.69,0.38 -1.09,0.64 -0.6,1.43c0.06,0.09 -0.12,0.23 -0.27,0.18c-0.09,-0.03 -0.17,-0.12 -0.25,-0.19c-0.23,-0.24 -0.41,-0.77 -0.7,-0.65c-0.31,0.13 -0.33,0.67 -0.44,1.05c-0.06,0.21 0.06,0.55 -0.28,0.57c-0.32,0.02 -0.35,-0.29 -0.39,-0.52c-0.13,-0.86 -0.99,-0.89 -1.5,-1.13c-0.78,-0.35 -1.16,-0.98 -1.4,-1.61c-0.49,-1.28 -0.99,-2.59 -1.07,-3.99c-0.01,-0.17 -0.13,-0.34 -0.2,-0.52c0,-0.05 0,-0.11 0,-0.16c0.37,-0.72 0.37,-1.49 0.32,-2.27c-0.16,-2.56 0.06,-5.04 1.33,-7.36c0.79,-1.44 1.5,-2.94 1.82,-4.59c0.1,-0.53 0.4,-1.03 0.73,-1.5c1.24,-1.69 2.64,-3.19 4.44,-4.31c1.76,-1.1 3.35,-2.46 5.22,-3.39c3.15,-1.55 6.49,-2.39 10,-2.57c0.5,-0.03 1.02,0.08 1.5,-0.17c1.12,0 2.25,0 3.37,0c0.16,0.12 0.32,0.12 0.48,0c0.11,0 0.21,0 0.32,0c0.34,0.18 0.71,0.23 1.07,0.31c1.59,0.36 3.15,0.71 4.58,1.59c2.12,1.3 3.9,2.98 5.66,4.69c2.77,2.69 4.68,5.9 5.87,9.6c1.47,4.56 1.17,9.05 -0.13,13.56c-0.23,0.79 -0.63,1.52 -0.96,2.28c-0.08,0.19 -0.17,0.47 -0.44,0.27c-0.33,-0.25 -0.42,0 -0.54,0.2c-0.42,0.71 -0.78,1.46 -1.24,2.15c-1.96,2.91 -4.33,5.38 -7.43,7.14c-2.64,1.5 -5.4,2.52 -8.41,2.88c-0.69,0.08 -1.39,0.02 -2.05,0.28c-0.05,0 -0.11,0 -0.16,0c-0.16,-0.11 -0.32,-0.12 -0.48,0c-0.11,0 -0.21,0 -0.32,0c-0.16,-0.12 -0.32,-0.12 -0.48,0c-0.05,0 -0.11,0 -0.16,0c-0.21,-0.14 -0.43,-0.15 -0.64,0c-0.05,0 -0.11,0 -0.16,0c-1.33,-0.26 -2.66,-0.53 -3.99,-0.79c-2.31,-0.46 -4.33,-1.49 -6.08,-3.05c-0.12,-0.11 -0.25,-0.21 -0.34,-0.34c-0.05,-0.08 -0.09,-0.22 -0.06,-0.29c0.08,-0.16 0.23,-0.1 0.34,-0.03c0.34,0.21 0.67,0.45 1,0.66c2.17,1.36 4.51,2.29 7.04,2.72c0.46,0.25 0.96,0.09 1.44,0.16c1.72,0.34 3.43,0.21 5.14,-0.04c0.13,-0.02 0.34,-0.02 0.33,-0.15c-0.02,-0.21 -0.25,-0.13 -0.39,-0.12c-1.03,0.05 -2.07,0.1 -3.1,0.2c-0.66,0.07 -1.33,-0.15 -1.98,0.1C22.17,44.35 21.7,44.15 21.19,44.39zM32.91,43.1c0.11,-0.05 0.21,-0.11 0.32,-0.16c0.03,-0.02 0.06,-0.03 0.1,-0.05c-0.03,0.02 -0.06,0.03 -0.1,0.05c-0.11,0.05 -0.22,0.11 -0.32,0.16c-0.03,0.02 -0.06,0.04 -0.09,0.05C32.85,43.14 32.88,43.12 32.91,43.1zM34.67,42.3c0.03,-0.02 0.06,-0.03 0.1,-0.05c-0.03,0.02 -0.06,0.04 -0.09,0.05c-0.03,0.02 -0.06,0.03 -0.09,0.05C34.61,42.33 34.64,42.31 34.67,42.3zM24.88,1.68c0.11,0 0.21,-0 0.32,-0c0.07,0.02 0.11,0.16 0.21,0.04c-0.07,-0.01 -0.14,-0.03 -0.21,-0.04C25.1,1.6 24.99,1.6 24.88,1.68c-0.11,0 -0.22,0 -0.32,0c-0.11,-0.09 -0.21,-0.08 -0.32,-0c-0.05,0.05 -0.18,-0.05 -0.19,0.09c0.06,-0.03 0.13,-0.06 0.19,-0.09c0.11,-0 0.21,-0 0.32,-0C24.67,1.77 24.78,1.77 24.88,1.68zM13.32,4.57c0.08,-0.01 0.16,-0.01 0.23,-0.04c0.08,-0.03 0.23,-0 0.16,-0.17c-0,-0.01 -0.14,0.03 -0.21,0.06c-0.07,0.04 -0.12,0.1 -0.18,0.14c-0.03,0.02 -0.06,0.03 -0.1,0.05C13.26,4.61 13.29,4.59 13.32,4.57zM27.45,1.84c0.07,0.03 0.14,0.09 0.21,0.1c0.08,0.01 0.19,0.09 0.25,-0.04c-0.08,-0.01 -0.16,-0.03 -0.23,-0.04c-0.08,-0.01 -0.16,-0.01 -0.24,-0.01c-0.05,-0.02 -0.09,-0.05 -0.14,-0.07c-0.31,-0.1 -0.62,-0.09 -0.93,-0.04c-0.01,0 -0.01,0.03 -0.02,0.05c0.28,0.02 0.57,0.03 0.86,0.05C27.3,1.84 27.37,1.84 27.45,1.84zM22.03,1.88c-0.04,-0.19 -0.16,-0.1 -0.23,-0.09c-2.48,0.31 -4.86,0.97 -7.1,2.1c-0.11,0.06 -0.34,0.01 -0.31,0.25c0.13,-0.03 0.26,-0.03 0.38,-0.08c2.25,-0.92 4.56,-1.68 6.96,-2.08C21.83,1.95 21.93,1.91 22.03,1.88zM22.97,1.83c0.09,-0.01 0.25,0 0.28,-0.05C23.3,1.69 23.17,1.7 23.11,1.7c-0.1,0 -0.26,-0.01 -0.29,0.05C22.77,1.84 22.91,1.8 22.97,1.83z"/>
-</vector>
diff --git a/QSthemes/QSTileInk/res/values/colors.xml b/QSthemes/QSTileInk/res/values/colors.xml
deleted file mode 100644
index 2eaae4c..0000000
--- a/QSthemes/QSTileInk/res/values/colors.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2016 Project Substratum
-
-    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>
-    <!-- QS tiles Active, Inactive and Unavailable tint (Requires config_enable_qs_tile_tinting bool set to true) -->
-    <color name="qs_tiles_active_tint">@*android:color/accent_device_default_light</color>
-    <color name="qs_tiles_inactive_tint">@*android:color/omni_text1</color>
-    <color name="qs_tiles_unavailable_tint">@*android:color/omni_text2</color> <!-- keep in mind that the code adds 0.26 (light) or 0.30 (dark) alpha to this color. -->
-
-    <!-- QS tiles background Active, Disable, and Inactive tint (Requires config_enable_qs_tile_tinting bool set to true) -->
-    <color name="qs_tiles_background_active_tint">@*android:color/accent_device_default_light</color>
-    <color name="qs_tiles_background_disabled_tint">@*android:color/omni_text1</color> <!-- keep in mind that the code adds 0.26 (light) or 0.30 (dark) alpha to this color. -->
-    <color name="qs_tiles_background_inactive_tint">@*android:color/omni_text2</color>
-
-    <!-- QS tiles expand, underline and label colors -->
-    <color name="qs_tiles_expand_tint">@*android:color/omni_text1</color>
-    <color name="qs_tiles_label_color">@*android:color/omni_text1</color>
-    <color name="qs_tiles_secondary_label_color">@*android:color/omni_text2</color>
-    <color name="qs_tiles_underline_color">@*android:color/omni_text1</color>
-
-</resources>
diff --git a/QSthemes/QSTileInk/res/values/config.xml b/QSthemes/QSTileInk/res/values/config.xml
deleted file mode 100644
index e23e4b0..0000000
--- a/QSthemes/QSTileInk/res/values/config.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017-2018 Projekt Substratum
-      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>
-     <!-- Config to enable/diaable qs tile tinting -->
-    <bool name="config_enable_qs_tile_tinting">true</bool>
- </resources>
\ No newline at end of file
diff --git a/QSthemes/QSTileInkDrop/Android.mk b/QSthemes/QSTileInkDrop/Android.mk
deleted file mode 100644
index 014d9ab..0000000
--- a/QSthemes/QSTileInkDrop/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_PACKAGE_NAME := QSTileInkdrop
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
-include $(BUILD_PACKAGE)
diff --git a/QSthemes/QSTileInkDrop/AndroidManifest.xml b/QSthemes/QSTileInkDrop/AndroidManifest.xml
deleted file mode 100644
index c2ac853..0000000
--- a/QSthemes/QSTileInkDrop/AndroidManifest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.systemui.qstile.inkdrop"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <overlay android:targetPackage="com.android.systemui" android:priority="1"/>
-
-    <application android:label="Inkdrop" android:hasCode="false" />
-</manifest>
diff --git a/QSthemes/QSTileInkDrop/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileInkDrop/res/drawable/ic_qs_circle.xml
deleted file mode 100644
index 19c0227..0000000
--- a/QSthemes/QSTileInkDrop/res/drawable/ic_qs_circle.xml
+++ /dev/null
@@ -1,431 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="40dp"
-        android:height="40dp"
-        android:viewportWidth="48.0"
-        android:viewportHeight="48.0">
-    <path
-        android:fillColor="#fff"
-        android:pathData="M13.09,13.07c0.18,-0.19 0.27,-0.46 0.54,-0.56c0.15,-0.44 0.61,0.01 0.81,-0.28l-0,0c0.2,-0.22 -0.07,-0.68 0.39,-0.78c0.85,0.03 1.35,-0.51 1.75,-1.15c0.18,-0.28 0.24,-0.59 0.7,-0.56c0.29,0.02 0.27,-0.22 0.09,-0.41c-0.09,-0.09 -0.18,-0.18 -0.24,-0.29c-0.12,-0.6 0.42,-0.68 0.75,-0.89c0.29,-0.19 0.62,-0.05 0.84,0.22c0.25,0.31 0.39,0.23 0.6,-0.08c0.39,-0.59 1.59,-0.76 2.19,-0.33c0.22,0.16 0.44,0.21 0.6,0.01c0.55,-0.68 1.36,-0.57 2.08,-0.74c0.45,-0.11 0.99,-0.06 1.2,-0.63c0.12,-0.01 0.25,-0.03 0.37,-0.04c0.61,0.25 1.18,-0.04 1.76,-0.1c0.32,-0.04 0.67,-0.02 0.96,0.18c0.43,0.16 0.9,0.21 1.21,0.6c0.07,0.09 0.21,0 0.31,-0.04c0.43,-0.24 0.76,-0.22 0.92,0.32c0.04,0.13 0.15,0.21 0.23,0.32c0.07,0.38 0.33,0.59 0.65,0.76c0.15,0.13 0.19,0.33 0.32,0.47c0.31,0.56 0.78,0.88 1.41,1.01c0.85,0.18 0.94,0.39 0.61,1.26c-0.05,0.13 -0.06,0.26 0.03,0.37c0.5,0.31 1.04,0.45 1.63,0.34c0.95,-0.89 2.13,-0.46 3.22,-0.53c0.26,-0.02 0.53,0.01 0.8,0.02c0.21,0.01 0.4,0.06 0.5,0.27c0.55,1.15 0.87,1.31 2.37,1.18c0.1,-0 0.19,-0.01 0.28,0.03c0.6,0.2 1.2,0.1 1.8,0c0.54,-0.09 0.69,0.05 0.69,0.63c-0.04,0.05 -0.09,0.09 -0.15,0.12c-0.71,0.16 -1.28,0.61 -1.95,0.85c-0.14,0.05 -0.28,0.19 -0.27,0.36c0.01,0.25 0.23,0.14 0.37,0.16c0.56,0.08 0.54,0.61 0.71,0.97c0.14,0.3 -0.09,0.54 -0.35,0.72c-0.26,0.18 -0.48,0.39 -0.45,0.85c0.59,-0.46 0.99,-0.19 1.35,0.26c0.14,0.18 0.2,0.39 0.07,0.56c-0.24,0.32 -0.32,0.67 -0.41,1.05c-0.07,0.28 -0.31,0.4 -0.6,0.4c0.29,0.12 0.39,0.32 0.33,0.63c-0.11,0.53 -0.29,1.03 -0.5,1.52c-0.05,0.05 -0.13,0.12 -0.11,0.16c0.35,0.76 0.09,1.58 0.23,2.35c0.06,0.35 -0.59,0.99 -1.07,1.06c-0.42,-0.09 -0.42,-0.09 -0.68,-0.49c0.18,0.2 0.32,0.48 0.15,0.73c-0.63,0.91 -1.02,1.95 -1.71,2.83c-0.51,0.65 -1.2,1.23 -1.39,2.11c-0.02,0.09 -0.06,0.19 -0.14,0.23c-0.67,0.36 -1.21,0.88 -1.78,1.37c-0.36,0.31 -0.68,0.48 -0.53,1c0.09,0.29 -0.05,0.48 -0.29,0.61c-0.5,0.29 -0.96,0.66 -1.51,0.88c-0.35,0.15 -0.69,0.3 -0.85,0.7c-0.08,0.2 -0.31,0.27 -0.51,0.29c-0.66,0.07 -1.3,0.28 -1.96,0.26c-0.15,-0 -0.32,-0.11 -0.37,0.13c-0.14,0.65 -0.64,0.66 -1.15,0.67c-0.32,0.01 -0.62,-0.06 -0.93,-0.13c-0.44,-0.1 -0.78,0.01 -0.97,0.46c-0.14,0.33 -0.34,0.62 -0.75,0.55c-0.45,-0.08 -0.52,-0.42 -0.52,-0.82c0,-0.15 0,-0.32 -0.2,-0.46c-0.2,0.58 -0.86,0.74 -1.13,1.27c-0.05,0.1 -0.15,0.18 -0.26,0.19c-0.78,0.09 -1.44,0.47 -2.1,0.84c-0.27,0.16 -0.62,0.14 -0.88,-0.12c-0.25,-0.25 -0.18,-0.52 -0.03,-0.74c-0.46,0.77 -0.67,0.8 -1.44,0.13c-0.3,-0.26 -0.69,-0.32 -1.07,-0.38c-0.28,-0.05 -0.55,-0.09 -0.65,-0.39c-0.12,-0.33 -0.33,-0.3 -0.59,-0.2c-0.81,0.31 -1,0.24 -1.28,-0.55c-0.08,-0.23 -0.2,-0.26 -0.4,-0.23c-0.22,0.04 -0.42,0.16 -0.64,0.21c-0.31,0.06 -0.59,0.01 -0.76,-0.29c-0.16,-0.29 -0.04,-0.51 0.22,-0.69c0.23,-0.16 0.29,-0.34 0.2,-0.63c-0.2,-0.64 -0.1,-0.78 0.59,-1.02c-0.55,0.06 -1.01,-0.13 -1.41,-0.49c-0.47,-0.41 -0.64,-1.05 -0.42,-1.63c0.15,-0.4 0.32,-0.79 0.49,-1.18c0.09,-0.2 0.09,-0.4 -0.08,-0.56c-0.21,-0.19 -0.41,-0.1 -0.61,0.03c-0.23,0.15 -0.38,0.38 -0.6,0.54c-0.38,0.28 -0.83,0.12 -0.87,-0.3c-0.08,-0.73 0.61,-1.96 1.3,-2.32c-1.37,-0.51 -1.37,-0.51 -1.17,-1.27c-0.07,0.27 -0.15,0.55 -0.51,0.49c-0.28,-0.05 -0.35,-0.27 -0.44,-0.52c-0.32,-0.91 -0.16,-1.75 0.28,-2.56c0.14,-0.25 0.15,-0.45 -0.08,-0.66c-0.29,-0.28 -0.31,-0.62 -0.04,-0.9c0.38,-0.4 0.19,-0.67 -0.11,-0.97c-0.54,-0.53 -0.63,-0.93 -0.24,-1.6c0.13,-0.22 -0,-0.17 -0.09,-0.23c-0.39,-0.27 -0.36,-0.58 -0.08,-0.92c0.14,-0.17 0.31,-0.33 0.42,-0.53c0.21,-0.39 0.28,-0.76 -0.12,-1.09c-0.25,-0.21 -0.38,-0.51 -0.51,-0.79c-0.16,-0.36 -0.27,-0.86 0.11,-1.08c0.51,-0.31 0.68,-0.84 1.04,-1.24c0.15,-0.17 0.18,-0.37 0.21,-0.58C12.82,13.45 12.86,13.21 13.09,13.07z"/>
-    <path
-        android:pathData="M13.09,13.07c0.09,0.37 0.05,0.7 -0.18,1.02c-0.2,0.28 -0.31,0.58 -0.31,0.94c-0.01,0.28 -0.14,0.48 -0.48,0.56c-0.57,0.14 -0.7,0.66 -0.32,1.11c0.07,0.09 0.14,0.19 0.24,0.24c0.92,0.52 0.73,1.2 0.14,1.96c-0.11,0.14 -0.25,0.26 -0.36,0.4c-0.09,0.11 -0.13,0.25 0,0.36c0.11,0.09 0.21,0.01 0.3,-0.06c0.19,-0.15 0.41,-0.44 0.61,-0.14c0.23,0.33 -0.14,0.43 -0.36,0.57c-0.5,0.32 -0.55,1 -0.13,1.44c0.16,0.16 0.32,0.31 0.47,0.48c0.29,0.35 0.7,0.72 -0.14,0.89c-0.16,0.03 -0.28,0.17 -0.25,0.35c0.03,0.19 0.2,0.23 0.36,0.25c0.51,0.05 0.6,0.26 0.25,0.63c-0.86,0.91 -0.81,1.95 -0.44,3.12c0.32,-0.35 0.05,-0.65 0.1,-0.93c0.03,-0.16 0.03,-0.34 0.22,-0.38c0.2,-0.04 0.26,0.14 0.3,0.29c0.05,0.17 0.07,0.35 0.12,0.53c0.06,0.24 -0.26,0.52 -0.02,0.69c0.28,0.21 0.64,0.34 1.01,0.33c0.31,-0.01 0.53,0.07 0.68,0.34c0.11,0.19 0.12,0.39 -0.01,0.57c-0.15,0.22 -0.31,0.09 -0.47,-0.01c-0.29,-0.17 -0.57,-0.1 -0.66,0.2c-0.16,0.6 -0.63,1.09 -0.57,1.79c0.47,-0.05 0.65,-0.53 0.97,-0.79c0.28,-0.22 0.42,-0.49 0.81,-0.17c0.38,0.32 0.73,0.64 0.47,1.19c-0.17,0.36 -0.39,0.7 -0.56,1.07c-0.37,0.82 0.33,1.88 1.21,1.74c0.78,-0.13 0.91,0.32 1.09,0.85c-0.2,0.13 -0.33,-0.03 -0.48,-0.05c-0.24,-0.04 -0.54,-0.15 -0.69,0.09c-0.17,0.27 0.16,0.35 0.3,0.51c0.42,0.46 -0.14,0.57 -0.31,0.81c-0.1,0.14 -0.5,0.09 -0.39,0.35c0.12,0.29 0.42,0.13 0.66,0.06c0.32,-0.1 0.64,-0.2 0.97,-0.29c0.19,-0.05 0.36,-0.02 0.48,0.15c0.13,0.17 0.1,0.34 -0.05,0.48c-0.41,0.38 -0.04,0.47 0.22,0.48c0.5,0.03 0.99,-0.04 1.1,-0.69c0.27,0.12 0.44,0.34 0.39,0.54c-0.13,0.51 0.14,0.56 0.52,0.58c0.38,0.03 0.72,0.25 1.12,0.22c0.15,-0.01 0.26,0.05 0.28,0.22c0.02,0.14 -0.21,0.4 0.12,0.4c0.23,0.01 0.43,-0.16 0.52,-0.38c0.08,-0.18 0.08,-0.39 0.14,-0.59c0.08,-0.3 0.3,-0.3 0.54,-0.22c0.3,0.1 0.29,0.31 0.15,0.53c-0.17,0.28 -0.67,0.55 -0.26,0.89c0.34,0.29 0.7,-0.1 1.02,-0.29c0.25,-0.15 0.45,-0.37 0.77,-0.4c0.46,-0.04 1.08,0.13 0.96,-0.71c0.7,-0.07 0.86,-0.83 1.4,-1.09c0.2,-0.1 0.47,-0.04 0.88,-0.07c-0.5,0.36 -0.43,0.76 -0.38,1.15c0.02,0.18 -0.03,0.4 0.22,0.43c0.22,0.03 0.32,-0.17 0.37,-0.33c0.22,-0.66 0.72,-0.72 1.3,-0.65c0.31,0.04 0.63,0.04 0.94,0.05c0.49,0.01 0.96,-0.01 0.69,-0.74c-0.1,-0.25 0.08,-0.37 0.29,-0.44c0.19,-0.06 0.39,-0.15 0.51,0.12c0.23,0.51 0.52,0.38 0.71,0.01c0.18,-0.33 0.34,-0.28 0.59,-0.13c0.54,0.31 0.77,0.24 0.91,-0.34c0.05,-0.21 0.15,-0.33 0.35,-0.34c0.86,-0.05 1.43,-0.72 2.15,-1.05c0.27,-0.12 0.21,-0.4 0.12,-0.59c-0.28,-0.62 0.17,-0.79 0.57,-0.99c0.04,-0.02 0.12,0 0.13,-0.02c0.44,-0.74 1.55,-0.77 1.83,-1.72c0.25,-0.83 1.02,-1.33 1.4,-2.08c0.33,-0.67 1.1,-1.06 1.15,-1.9c0.01,-0.19 0.16,-0.31 0.31,-0.41c0.17,-0.12 0.35,-0.26 0.25,-0.49c-0.12,-0.28 -0.37,-0.18 -0.59,-0.14c-0.1,0.02 -0.2,0.03 -0.4,0.05c0.28,-0.43 0.68,-0.49 0.99,-0.68c0.17,-0.1 0.29,0.08 0.32,0.24c0.06,0.24 0.16,0.42 0.43,0.44c0.2,0.17 0.24,0.37 0.13,0.6c-0.3,0.63 -0.44,1.31 -0.43,2.01c0,0.81 -0.37,1.36 -1.12,1.67c-0.11,0.04 -0.19,0.12 -0.28,0.19c-0.15,0.1 -0.31,0.19 -0.44,0.31c-0.2,0.19 -0.05,0.44 -0.12,0.66c-0.14,0.21 -0.06,0.52 -0.32,0.67c-0.46,0.07 -0.79,0.32 -1,0.73c-0.17,0.07 -0.33,0.21 -0.53,0.12c-0.2,0.07 -0.33,-0.14 -0.52,-0.17c-0.01,0.19 0.11,0.34 0.08,0.51c-0.06,0.35 0.05,0.74 -0.19,1.06c-0.14,0.2 -0.08,0.5 -0.31,0.67c-0.05,0.03 -0.11,0.05 -0.17,0.06c-0.29,0.08 -0.75,-0.2 -0.83,0.36c-0.12,0.16 -0.28,0.31 -0.21,0.55c-0.13,0.47 -0.44,0.62 -0.9,0.54c-0.08,-0.02 -0.17,-0.12 -0.25,-0.06c-0.54,0.44 -1.35,0.56 -1.74,1.02c-0.54,0.64 -1.26,1 -1.79,1.6c-0.05,0.08 -0.1,0.17 -0.15,0.25c-0.37,0.2 -0.74,0.4 -1.17,0.13c-0.11,-0.07 -0.28,-0.07 -0.39,-0.01c-0.65,0.33 -1.35,0.47 -2.07,0.44l0.01,-0c-0.4,0.72 -1.15,0.67 -1.81,0.83c-0.34,0.19 -0.74,0.19 -1.11,0.31c-0.41,0.14 -0.51,-0.22 -0.56,-0.5c-0.12,0.31 -0.43,0.32 -0.74,0.29c-0.49,-0.05 -0.91,0.07 -1.27,0.43c-0.28,0.28 -0.59,0.28 -0.9,0.02c-0.51,-0.43 -1.07,-0.38 -1.64,-0.16c-0.52,0.2 -1.04,0.4 -1.61,0.4c-0.06,0.02 -0.13,0.03 -0.19,0.03c-0.88,-0.35 -0.88,-0.35 -1.25,0.25c-0.04,0.06 -0.09,0.1 -0.16,0.14c-0.62,0.06 -0.52,-0.34 -0.46,-0.72c0.02,-0.21 0.21,-0.33 0.28,-0.58c-0.55,-0.11 -0.64,0.53 -1.04,0.61c-0.1,0.01 -0.19,-0.02 -0.27,-0.09c-0.04,-0.05 -0.07,-0.1 -0.1,-0.16c0.02,-0.58 -0.3,-0.98 -0.88,-1.07c-0.23,-0.04 -0.44,-0.16 -0.39,-0.37c0.14,-0.67 -0.54,-1.13 -0.42,-1.78c0,-0.03 -0.05,-0.06 -0.09,-0.09c-0.62,0.26 -1.12,-0.25 -1.71,-0.26c-0.35,-0.01 -0.53,-0.51 -0.24,-0.78c0.39,-0.37 -0.03,-0.84 0.28,-1.17c-0.1,0.04 -0.19,0.14 -0.31,0.13c-0.73,-0.18 -0.49,-0.79 -0.57,-1.26c-0.17,-0.35 -0.06,-0.57 0.27,-0.78c0.4,-0.24 0.38,-0.27 0.1,-0.71c0.3,0.44 0.06,0.88 -0.58,0.98c-0.32,0.05 -0.67,0.05 -0.96,-0.19c-0.5,-0.42 -1.09,-0.68 -1.68,-0.94c-0.42,-0.18 -0.47,-0.32 -0.32,-0.85c-0.11,0.15 -0.22,0.29 -0.42,0.31c-0.51,0.05 -0.83,-0.42 -1.37,-0.45c-0.47,-0.02 -0.74,-0.57 -0.77,-1.11c-0.03,-0.53 -0.51,-0.53 -0.86,-0.69c-0.8,-0.33 -1.05,-1.81 -0.52,-2.42c0.1,-0.12 0.22,-0.28 0.36,-0.29c0.91,-0.06 0.83,-0.78 0.9,-1.36c0.05,-0.4 0.2,-0.64 0.54,-0.86c0.49,-0.31 1.06,-0.55 1.28,-1.16c0.21,-0.81 0.51,-1.1 1.06,-1.02c0.22,0.19 0.31,0.05 0.4,-0.14c0.74,-0.08 1.1,-0.63 1.48,-1.17c-0,-0.04 0.01,-0.07 0.04,-0.1c0.07,-0.07 0.15,-0.1 0.24,-0.14c0.25,0.02 0.49,0.04 0.69,-0.15c0.13,-0.07 0.2,-0.17 0.21,-0.31c0.02,-0.35 -0.03,-0.72 0.21,-1.04c0.08,-0.1 -0.07,-0.19 -0.16,-0.25c-0.15,-0.21 -0.57,-0.17 -0.54,-0.55c0.32,-0.23 0.55,-0.52 0.55,-0.94c0.34,-0.32 0.49,-0.61 0.24,-1.14c-0.2,-0.45 -0.49,-1.06 0.05,-1.55c0.43,-0.04 0.62,-0.44 0.92,-0.66c0.3,0 0.48,-0.12 0.39,-0.45C12.32,12.95 12.32,12.95 13.09,13.07z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.85"/>
-    <path
-        android:pathData="M7.15,23.46c-0.61,0.43 -0.88,1.25 -1.7,1.44c-0.19,0.05 -0.29,0.27 -0.04,0.39c0.5,0.23 0.18,0.36 -0.04,0.53c-0.15,0.11 -0.34,0.28 -0.28,0.43c0.3,0.76 -0.5,0.84 -0.67,1.36c-0.28,-0.32 0.19,-0.46 -0.04,-0.71c-0.27,0.12 -0.64,0.23 -0.47,0.61c0.15,0.35 -0.05,0.41 -0.43,0.53c0.5,0.16 0.85,0.26 0.55,0.75c-0.14,0.22 0.08,0.3 0.27,0.33c0.13,0.18 0.07,0.32 -0.08,0.45c-0.18,0.1 -0.48,0.12 -0.45,0.42c0.1,0.83 -0.39,1.26 -1.04,1.6c-0.66,-0.05 -0.74,-0.24 -0.47,-1.1c-0.12,0.2 -0.29,0.28 -0.5,0.31c-0.73,-0.14 -0.82,-0.58 -0.3,-1.4c0.04,-0.05 0.08,-0.09 0.12,-0.14c0.12,-0.16 0.16,-0.34 0.11,-0.55c-0.12,-0.49 0.1,-0.74 0.57,-0.81c0.05,-0.13 0.09,-0.26 0.13,-0.39c0.06,-0.3 0.48,-0.25 0.54,-0.55c-0.03,-0.34 -0.08,-0.67 -0.08,-1.01c-0,-0.22 0.13,-0.42 0.37,-0.29c0.53,0.29 0.47,-0.05 0.4,-0.36c-0.13,-0.62 0.49,-0.58 0.73,-0.87c0.27,-0.32 0.3,0.12 0.46,0.1C5,24.32 5.05,24 5.4,24c0.1,-0.66 0.67,-0.2 0.96,-0.41C6.6,23.39 6.8,23.01 7.15,23.46z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.70"/>
-    <path
-        android:pathData="M25.37,6.6c-0.04,0.59 -0.55,0.72 -0.96,0.88c-0.37,0.15 -0.79,0.21 -1.18,0.22c-0.39,0.01 -0.61,0.19 -0.82,0.48c-0.4,0.55 -0.79,0.55 -1.22,0.03c-0.07,-0.08 -0.14,-0.19 -0.23,-0.22c-0.18,-0.08 -1.33,0.49 -1.41,0.68c-0.13,0.3 -0.29,0.61 -0.63,0.62c-0.31,0.01 -0.3,-0.34 -0.4,-0.55c-0.13,-0.3 -0.31,-0.45 -0.62,-0.22c-0.21,0.16 -0.51,0.2 -0.62,0.49c-0.02,0.49 -0.33,0.51 -0.7,0.42c-0.29,-0.44 -0.81,-0.94 0.28,-0.99c0.4,-0.74 1.35,-0.51 1.85,-1.07c0.14,-0.16 0.33,-0.11 0.51,-0.1c0.21,0.01 0.5,0.01 0.56,-0.15c0.16,-0.47 0.68,-0.42 0.95,-0.75c0.16,-0.2 0.58,-0.71 0.75,0.1c0.05,0.23 0.28,0.39 0.45,0.02c0.06,-0.13 0.17,-0.21 0.32,-0.2c0.36,-0 0.73,-0.39 1.09,0.01c-0,0.05 -0,0.09 -0.01,0.14c-0.14,0.31 -0.19,0.55 0.29,0.43c0.05,-0.05 0.1,-0.1 0.16,-0.15c0.31,-0.25 0.54,0.03 0.79,0.13C24.94,7.12 25.15,6.82 25.37,6.6z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.85"/>
-    <path
-        android:pathData="M42.65,13.19c-0.62,0.4 -1.82,0.2 -2.13,-0.36c-0.11,-0.19 -0.25,-0.15 -0.4,-0.11c-0.17,0.05 -0.34,0.13 -0.52,0.06c-0.19,-0.07 -0.41,-0.16 -0.38,-0.4c0.02,-0.27 0.24,-0.2 0.42,-0.19c0.16,0.01 0.32,0.02 0.41,-0.15c-0.75,-0.39 -2.96,-0.58 -4.28,0.2c-0.15,-0.2 -0.02,-0.3 0.14,-0.39c0.3,-0.72 0.81,-1.08 1.62,-0.96c0.17,0.37 0.99,0.6 1.13,0.29c0.25,-0.56 0.62,-0.45 1.04,-0.37c0.11,0.02 0.22,-0.02 0.33,-0.06c0.21,-0.2 0.48,-0.2 0.74,-0.23c0.52,0.02 0.92,-0.42 1.44,-0.38c0.18,0 0.38,0.01 0.47,0.19c0.17,0.31 0.34,0.49 0.74,0.34c0.23,-0.08 0.46,0.21 0.35,0.34c-0.29,0.34 0,0.75 -0.2,1.08c-0.14,0.09 -0.29,0.13 -0.43,0.19c-0.12,0.02 -0.24,0.01 -0.35,0.03c-0.09,0.02 -0.1,0.09 -0.02,0.03c0.07,-0.05 -0.01,0.13 0.04,0.05C43.06,12.73 42.86,12.96 42.65,13.19z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.85"/>
-    <path
-        android:pathData="M18.22,40.73c0.83,-0.05 1.51,-0.58 2.34,-0.67c0.39,-0.04 0.67,-0.07 0.96,0.22c0.29,0.3 0.61,0.5 1,0.05c0.24,-0.27 0.65,-0.37 1,-0.33c0.54,0.05 0.83,-0.19 1.05,-0.62c0.06,-0.12 0.03,-0.38 0.27,-0.3c0.19,0.06 0.21,0.28 0.19,0.46c-0.03,0.25 -0.44,0.49 -0.14,0.71c0.28,0.2 0.57,-0.13 0.86,-0.22c0.11,-0.03 0.21,-0.08 0.31,-0.12c0.16,0.18 0.41,0.35 0.08,0.6c-0.38,0.24 -0.9,-0.03 -1.27,0.39c-0.17,0.19 -0.33,-0.18 -0.49,-0.29c-0.59,0.57 -1.43,0.64 -2.09,1.06l0.01,0.01c-0.11,0.14 -0.09,0.43 -0.34,0.41c-0.23,-0.02 -0.06,-0.31 -0.21,-0.42l0.01,-0c-0.07,-0.06 -0.16,-0.12 -0.24,-0.1c-0.48,0.13 -0.93,0.04 -1.38,-0.15l0.01,-0.01c-0.29,0.31 -0.6,0.51 -0.95,0.07c-0.09,-0.11 -0.22,-0.15 -0.36,-0.14C18.36,41.38 18.21,41.13 18.22,40.73z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.70"/>
-    <path
-        android:pathData="M9.19,33.98c0.02,0.16 -0,0.3 -0.15,0.4c-0.08,0.08 -0.12,0.22 -0.28,0.14c-0.41,-0.38 -0.47,-0.37 -0.72,0.13c-0.11,0.21 -0.2,0.08 -0.35,0.01c-0.35,-0.15 -0.68,-0.11 -0.69,0.4c-0.35,0.26 -0.49,-0.12 -0.66,-0.27c-0.3,0.18 -0.19,0.69 -0.65,0.63c-0.37,-0.15 -0.71,0.21 -1.08,0.05c-0.08,-0.04 -0.14,-0.1 -0.21,-0.16c-0.81,-0.72 -0.81,-0.72 -0.17,-1.58c0.68,-0.43 1.3,-1.03 2.21,-0.85c0.45,0.09 0.78,-0.27 1.21,-0.31c0.66,-0.06 1.17,0.05 1.44,0.72C9.4,33.48 9.1,33.76 9.19,33.98z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.55"/>
-    <path
-        android:pathData="M40.76,29.79c0.09,-0.16 0.19,-0.29 0.36,-0.38c0.8,-0.45 1.25,-1.57 1,-2.44c-0.09,-0.33 0.1,-0.81 0.4,-1c0.18,-0.12 0.11,-0.32 0.14,-0.49c0.82,-0.44 1.04,-1.14 0.6,-1.92c-0.04,-0.08 -0.12,-0.19 -0.09,-0.23c0.54,-0.85 -0.26,-0.45 -0.76,-0.58c0.39,-0.32 0.66,-0.55 0.93,-0.77c0.16,-0.19 0.26,-0.44 0.54,-0.49c0.14,0.02 0.28,0.11 0.27,0.24c-0.06,0.51 0.28,0.59 0.65,0.66c-0.01,0.25 0.51,0.69 -0.24,0.67c-0.3,0.22 -0.31,0.68 -0.65,0.86c-0.03,0.03 -0.1,0.08 -0.09,0.09c0.44,0.78 -0.38,1.25 -0.45,1.91c-0.33,0.39 -0.33,0.91 -0.54,1.35c-0.28,0.24 -0.33,0.55 -0.22,0.87c0.4,1.18 0.05,1.75 -1.24,1.97C41.07,30.15 40.63,30.57 40.76,29.79z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.85"/>
-    <path
-        android:pathData="M11.47,34.92c0.29,-0.2 0.59,-0.4 0.95,-0.64c0.03,0.37 -0.21,0.5 -0.37,0.65c-0.19,0.18 -0.32,0.37 -0.05,0.54c0.47,0.29 0.21,0.48 -0.06,0.68c-0.15,0.11 -0.45,0.13 -0.34,0.41c0.1,0.28 0.38,0.04 0.52,0.1c0.45,0.21 0.89,0.34 1.38,0.14c0.14,-0.06 0.26,0.03 0.23,0.13c-0.19,0.64 0.03,1.42 -0.64,1.9c-0.08,0.05 -0.17,0.08 -0.26,0.11c-0.36,-0.13 -0.61,0.38 -0.99,0.17c0.24,-0.38 -0.26,-0.47 -0.3,-0.74c0.03,-0.22 -0.17,-0.34 -0.26,-0.51c-0.01,-0.09 -0.01,-0.18 0.03,-0.27l-0,0.01c0.14,-0.24 -0.06,-0.31 -0.2,-0.41c-0.02,-0.06 -0.08,-0.13 -0.06,-0.19c0.21,-0.9 -0.6,-1.04 -1.06,-1.45c-0.06,-0.5 0.39,-0.81 1.02,-0.65C11.16,34.95 11.3,35.11 11.47,34.92z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.55"/>
-    <path
-        android:pathData="M30.91,8.06c-0.18,-0.09 -0.33,-0.2 -0.32,-0.44c0.01,-0.42 -0.24,-0.33 -0.49,-0.23c-0.35,-0.02 -0.32,-0.24 -0.2,-0.45c0.1,-0.17 0.13,-0.32 0.07,-0.5c0.29,-0.22 0.51,-1 0.92,-0.08c0.12,0.26 0.45,-0 0.69,0.1c-0.08,0.31 -0.29,0.53 -0.49,0.79c0.61,0.08 1.21,0.27 1.81,-0c0.09,0.23 0.84,-0.08 0.44,0.55c-0.09,0.05 -0.07,0.1 -0.01,0.16c0.45,-0.03 0.68,0.35 0.98,0.56c0.23,0.16 0.27,0.48 -0.08,0.61c-0.24,0.09 -0.22,0.24 -0.2,0.42c-0.29,0.23 -0.56,-0 -0.7,-0.16c-0.31,-0.34 -0.61,-0.37 -0.99,-0.19c-0.17,0.09 -0.34,0.08 -0.5,-0.05c-0.09,-0.14 -0.18,-0.27 -0.27,-0.41C31.48,8.39 31.21,8.2 30.91,8.06z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.55"/>
-    <path
-        android:pathData="M31.85,9.14c0.4,-0.4 1.02,-0.33 1.44,-0.7c0.14,-0.12 0.31,-0.04 0.4,0.12c0.17,0.31 -0.2,0.28 -0.3,0.45c0.21,0.17 0.43,0.35 0.64,0.53c0.17,0.18 0.42,0.12 0.62,0.19c-0.17,0.41 -0.26,0.81 0.09,1.18c0.31,0.33 -0.16,0.43 -0.18,0.66c-0.01,0.54 -0.59,0.39 -0.81,0.68c-0.19,-0.44 -0.43,-0.88 0.14,-1.24c0.12,-0.07 0.22,-0.19 0.15,-0.33c-0.1,-0.22 -0.33,-0.24 -0.52,-0.23c-0.73,0.02 -1.18,-0.41 -1.61,-0.91C31.82,9.41 31.84,9.27 31.85,9.14z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.85"/>
-    <path
-        android:pathData="M31.73,38.59c0.05,-0.37 0.2,-0.7 0.55,-0.88c0.44,-0.23 0.78,-0.52 0.82,-1.05c0.02,-0.17 0.13,-0.32 0.31,-0.29c1.01,0.17 1.55,-0.54 2.15,-1.13c0.06,-0.06 0.08,-0.16 0.17,-0.33c0.08,0.21 0.11,0.27 0.11,0.32c0,0.22 -0.46,0.44 -0.13,0.6c0.31,0.15 0.39,-0.26 0.47,-0.5c0.14,-0.11 0.27,-0.14 0.41,-0c0.3,0.19 0.33,0.44 0.15,0.71c-0.22,0.33 -0.45,0.06 -0.67,-0.03c-0.14,0.22 -0.08,0.67 -0.56,0.53c-0.14,-0.09 -0.2,-0.34 -0.43,-0.25c-0.25,0.1 -0.03,0.27 -0,0.39c0.08,0.45 -0.51,0.6 -0.56,0.6c-0.75,0.03 -1.21,0.64 -1.85,0.87c0.07,0.49 -0.16,0.57 -0.56,0.43C31.98,38.58 31.85,38.59 31.73,38.59z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.70"/>
-    <path
-        android:pathData="M2.41,33.72c-0.09,-0.1 -0.26,-0.23 -0.24,-0.3c0.15,-0.51 -0.25,-0.61 -0.55,-0.79c-0.1,-0.3 0.08,-0.44 0.31,-0.56c0.34,-0.19 0.69,-0.38 0.97,-0.65c0.23,-0.06 0.4,-0.25 0.63,-0.3c0.17,0.02 0.34,0.03 0.47,0.17c0,0.74 0.51,1.01 1.1,1.26c0.33,0.15 0.42,0.45 0.07,0.74c-0.22,0.18 -0.38,0.44 -0.69,0.49c-0.37,0.29 -0.73,0.43 -1.18,0.09C3.05,33.68 2.67,33.99 2.41,33.72z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.55"/>
-    <path
-        android:pathData="M2.96,31.55c0.03,0.71 -0.58,0.73 -1.02,0.9c-0.12,0.05 -0.25,0.06 -0.33,0.18c-0.32,-0.19 -0.8,-0.08 -0.98,-0.53c0.03,-0.11 0.17,-0.19 0.17,-0.27c-0.05,-0.71 0.41,-0.99 0.95,-1.22c0.45,-0.14 0.39,-0.75 0.86,-0.95c0.09,0.39 -0,0.72 -0.06,1.06c-0.03,0.2 -0.37,0.58 0.15,0.7C2.84,31.35 2.91,31.43 2.96,31.55z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.55"/>
-    <path
-        android:pathData="M27.94,39.39c0.88,-0.23 1.62,-0.89 2.61,-0.8c0.36,0.04 0.62,0.46 1.02,0.25c-0.19,0.18 -0.35,0.38 -0.56,0.52c-0.21,0.14 -0.4,0.67 -0.73,0.08c-0.1,-0.19 -0.35,-0 -0.48,0.08c-0.39,0.26 -0.81,0.16 -1.23,0.2C28.29,39.74 28.32,39.17 27.94,39.39z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.70"/>
-    <path
-        android:pathData="M2.41,33.72c0.38,-0.22 0.77,-0.43 1.23,-0.23c0.06,0.02 0.18,0.02 0.18,0.03c-0.04,0.84 0.43,0.09 0.62,0.2c0.05,0.03 0.07,0.06 0.05,0.09c-0.02,0.03 -0.03,0.05 -0.05,0.05c-0.56,0.73 -0.54,0.78 0.41,1.35c-0.14,0.29 -0.14,0.29 -0.67,0.13c-0.57,0.07 -0.86,-0.29 -1.05,-0.73c-0.13,-0.3 -0.3,-0.48 -0.64,-0.48C1.84,34.11 2.32,33.87 2.41,33.72z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.40"/>
-    <path
-        android:pathData="M17.54,9.14c0.22,0.03 0.4,0.12 0.35,0.39c-0.05,0.3 -0.24,0.51 -0.54,0.5c-0.31,-0.01 -0.44,0.12 -0.5,0.39c-0.25,1.09 -1.16,1.13 -2.01,1.29c-0.14,-0.39 0.21,-0.39 0.4,-0.52c0.24,-0.07 0.44,-0.2 0.56,-0.43c0.03,-0.05 0.03,-0.09 -0,-0.14c0.05,-0.23 -0.12,-0.63 0.39,-0.52c0.1,0.05 0.28,0.09 0.28,-0.03C16.53,9.4 17.14,9.39 17.54,9.14z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.85"/>
-    <path
-        android:pathData="M43.46,11.96c-0.16,-0.54 -0.57,-0.02 -0.89,-0.23c0.32,-0.26 0.84,-0.25 0.97,-0.7c-0.16,-0.14 -0.25,0.04 -0.37,0.06c-0.37,0.07 -0.94,0.48 -0.71,-0.43c0.04,-0.15 -0.08,-0.24 -0.22,-0.3c-0.05,-0.06 -0.06,-0.12 -0.03,-0.19c0.16,-0.19 0.34,-0.21 0.54,-0.07c0.26,0.56 0.55,-0.21 0.82,0.01c0.27,0.05 0.42,0.31 0.68,0.38c0.05,0.18 0.19,0.33 0.14,0.54c-0.14,0.21 -0.17,0.46 -0.28,0.68C43.99,11.98 43.82,12.23 43.46,11.96z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.70"/>
-    <path
-        android:pathData="M29.97,6.44c0.18,-0.04 0.36,-0.09 0.56,-0.14c-0.01,0.46 -0.55,0.63 -0.43,1.08c-0.09,0.18 -0.17,0.37 -0.28,0.53c-0.09,0.14 -0.26,0.19 -0.42,0.15c-0.23,-0.06 -0.1,-0.23 -0.1,-0.38c-0,-0.4 -0.01,-0.83 -0.63,-0.52c-0.2,0.1 -0.43,0.12 -0.69,-0c0.07,-0.26 0.45,-0.19 0.5,-0.45c0.44,-0.15 0.89,-0.23 1.36,-0.14C29.88,6.53 29.92,6.48 29.97,6.44z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.85"/>
-    <path
-        android:pathData="M11.47,34.92c0.05,0.25 -0.07,0.37 -0.28,0.27c-0.29,-0.14 -0.55,0.09 -0.84,-0.01c-0.34,-0.11 -0.34,0.16 -0.36,0.38c-0.35,-0.46 -0.04,-0.59 0.33,-0.71c0.16,-0.05 0.38,-0.14 0.22,-0.37c-0.11,-0.17 -0.32,-0.15 -0.48,-0.07c-0.34,0.17 -0.36,0.18 -0.35,-0.21c0,-0.16 -0.1,-0.23 -0.13,-0.36c-0.05,-0.11 -0.01,-0.2 0.06,-0.28c0.51,-0.32 0.96,-0.05 1.43,0.13C11.25,34.09 10.78,34.7 11.47,34.92z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.55"/>
-    <path
-        android:pathData="M45.22,13.59c0.04,-0 0.09,-0 0.13,-0.01c0.14,-0.45 0.47,-0.81 0.65,-1.24c0.06,-0.03 0.12,-0.02 0.16,0.03c0.24,-0.05 0.48,-0.14 0.71,-0.14c0.2,0 0.48,-0.09 0.6,0.17c0.12,0.25 0,0.46 -0.21,0.63c-0.08,0.07 -0.13,0.18 -0.19,0.28c-0.07,0.17 -0.17,0.3 -0.36,0.33c-0.25,-0.02 -0.5,-0.14 -0.69,0.2c-0.2,0.35 -0.5,0.15 -0.76,0.01C45.21,13.78 45.17,13.7 45.22,13.59z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.70"/>
-    <path
-        android:pathData="M26.13,40.52c-0.03,-0.2 -0.05,-0.4 -0.08,-0.6c0.73,0.14 1.28,-0.31 1.9,-0.54c0.05,0.19 0.12,0.38 0.14,0.57c0.04,0.4 -0.24,0.51 -0.5,0.34c-0.53,-0.37 -0.69,0 -0.92,0.35c-0.1,0.16 -0.21,0.39 -0.44,0.33C26,40.9 26.09,40.69 26.13,40.52z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.55"/>
-    <path
-        android:pathData="M43.46,11.96c0.5,-0.12 0.37,-0.89 0.94,-0.94c0.32,0.28 0.66,0.53 1.08,0.63c0.1,0.43 -0.3,0.36 -0.49,0.49c-0.39,0.03 -0.68,0.31 -1.05,0.39c-0.25,0.05 -0.52,0.16 -0.77,-0.01c-0.13,-0.11 -0.19,-0.24 -0.11,-0.41C43.2,12.06 43.33,12.01 43.46,11.96z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.40"/>
-    <path
-        android:pathData="M9.7,20.99c0.12,0.87 -0.45,1.36 -1.46,1.25c0.14,-0.3 0.28,-0.6 0.25,-0.95l0,-0c0.29,-0.16 0.36,-0.82 0.91,-0.4C9.47,21.02 9.58,21.01 9.7,20.99z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.70"/>
-    <path
-        android:pathData="M40.1,11.03c-0.31,0.1 -0.61,0.32 -0.91,-0.01c-0.11,-0.12 -0.17,-0.06 -0.25,0.06c-0.25,0.38 -1.03,0.5 -1.42,0.28c-0.34,-0.19 -0.03,-0.32 0.01,-0.48c0.4,0.49 0.99,0.44 1.22,-0.14c0.14,-0.34 0.38,-0.45 0.68,-0.54C39.59,10.53 40.15,10.53 40.1,11.03z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.70"/>
-    <path
-        android:pathData="M1.75,30.6C1.66,30.88 0.82,32 0.63,32.1c-0.04,-0.04 -0.07,-0.08 -0.11,-0.13c-0.19,-0.37 -0.02,-0.7 0.14,-1c0.18,-0.34 0.59,-0.56 0.25,-1.06c-0.13,-0.19 0.24,-0.3 0.44,-0.38c0.05,-0.05 0.09,-0.09 0.14,-0.14c0.04,0.18 0,0.34 -0.05,0.52C1.34,30.22 1.46,30.45 1.75,30.6z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.40"/>
-    <path
-        android:pathData="M18.22,40.73c0.5,0.59 1.13,0.85 1.9,0.68c-0,0.34 -0.23,0.48 -0.52,0.55c-0.31,0.14 -0.38,-0.05 -0.43,-0.29c-0.45,-0.38 -0.91,-0.37 -1.37,-0.01c-0.03,-0.01 -0.06,-0.02 -0.09,-0.03c-0.28,-0.24 -0.74,-0.02 -0.98,-0.37c0,-0.05 0,-0.09 0,-0.13C17.14,40.67 17.72,40.84 18.22,40.73L18.22,40.73z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.40"/>
-    <path
-        android:pathData="M12.82,38.95c0.05,-0.04 0.09,-0.08 0.14,-0.11c0.09,-0.06 0.19,-0.12 0.3,-0.15c0.14,-0.03 0.31,-0.02 0.37,0.1c0.33,0.69 1.49,0.49 1.54,1.45c0,0.06 -0.03,0.13 -0.06,0.19c-0.03,0.07 -0.07,0.13 -0.12,0.18c-0.6,0.56 -0.38,-0.41 -0.74,-0.41c-0.15,-0 -0.19,-0.56 -0.61,-0.31c-0.1,0.06 -0.13,-0.09 -0.11,-0.17C13.68,39.1 13.24,39.03 12.82,38.95z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.40"/>
-    <path
-        android:pathData="M14.98,40.61c-0,-0.05 -0,-0.1 -0,-0.15c0.09,-0.08 0.18,-0.07 0.27,-0c0,0.04 0,0.09 0,0.13c0.06,0.07 0.13,0.14 0.2,0.21c0.65,0.61 1.49,0.69 2.3,0.83l0.05,0.04c-0.46,0.14 -0.8,0.38 -1.4,0.33C15.33,41.93 15.13,41.4 14.98,40.61z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.40"/>
-    <path
-        android:pathData="M40.76,29.79c0.07,0.36 0.34,0.31 0.59,0.29c-0.56,0.53 -0.94,1.16 -1.02,1.94c-0.01,0.1 -0.02,0.24 -0.19,0.2c-0.2,-0.05 -0.18,-0.23 -0.2,-0.37c-0.14,-0.15 -0.09,-0.29 0.01,-0.44c0.06,-0.2 0.03,-0.44 0.26,-0.55c0.12,-0.25 -0.04,-0.56 0.13,-0.8C40.49,29.98 40.63,29.89 40.76,29.79z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.40"/>
-    <path
-        android:pathData="M22.27,41.68c0.24,-0.7 0.68,-1.07 1.47,-0.87c0.23,0.06 0.41,-0.14 0.62,-0.19C23.86,41.35 23.16,41.71 22.27,41.68z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.40"/>
-    <path
-        android:pathData="M46.69,13.44c0.13,-0.04 0.26,-0.08 0.39,-0.13c0.28,0.15 0.41,0.32 0.08,0.55c-0.24,0.17 -0.35,0.4 -0.37,0.68c-0.15,0.23 -0.38,0.19 -0.6,0.19c-0.22,-0 -0.48,0.05 -0.59,-0.2c-0.12,-0.26 0.13,-0.38 0.26,-0.55C46.08,13.7 46.27,13.41 46.69,13.44z"
-        android:fillColor="#2E3192"/>
-    <path
-        android:pathData="M5.66,35.33c0.24,-0.12 0.31,-0.32 0.19,-0.55c-0.1,-0.19 -0.24,-0.34 0.05,-0.48c0.19,-0.09 0.33,-0.31 0.59,-0.2c0.25,0.11 0.19,0.29 0.17,0.5c-0.03,0.24 0.04,0.45 0.35,0.46c-0.45,0.14 -0.9,0.29 -1.35,0.43C5.58,35.43 5.58,35.38 5.66,35.33z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.40"/>
-    <path
-        android:pathData="M7.15,23.46c-0.29,-0.1 -0.54,0.04 -0.79,0.13c0.11,-0.31 0.06,-0.64 -0.03,-0.91c-0.09,-0.25 0.13,-0.34 0.15,-0.32c0.51,0.43 0.81,-0.38 1.27,-0.21c0.03,0.01 0.05,0.07 0.07,0.1c0.04,0.04 0.05,0.07 0.04,0.1c-0.02,0.03 -0.03,0.05 -0.05,0.05C7.22,22.52 7.1,22.94 7.15,23.46z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.40"/>
-    <path
-        android:pathData="M29.83,6.58c-0.45,0.05 -0.9,0.09 -1.35,0.14c-0.64,-0.17 -1.29,-0.1 -1.91,0.04c-0.34,0.08 -0.56,-0.09 -0.82,-0.2c0.04,-0.14 0.18,-0.32 0.25,-0.21c0.31,0.49 0.64,0.16 0.95,0.07c0.53,-0.16 1.05,-0.21 1.54,0.12c0.22,0.15 0.42,-0.04 0.63,-0.06C29.36,6.45 29.61,6.43 29.83,6.58z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.70"/>
-    <path
-        android:pathData="M46.69,13.44c-0.35,0.27 -0.68,0.55 -0.95,1.02c0.39,0.03 0.72,0.05 1.06,0.08c0.06,0.13 0.29,0.23 0.07,0.41c-0.03,-0 -0.06,-0 -0.09,-0.01c-0.6,-0.04 -1.24,0.19 -1.77,-0.32c-0.15,-0.14 -0.44,-0.15 -0.41,-0.44c0.03,-0.3 0.29,-0.31 0.51,-0.37c0.09,-0.02 0.17,-0.04 0.25,-0.09c0.22,0.05 0.42,0.09 0.58,-0.15C46.13,13.29 46.4,13.29 46.69,13.44z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.55"/>
-    <path
-        android:pathData="M38.11,32.79c-0.23,-0.04 -0.55,0.01 -0.62,-0.28c-0.08,-0.34 0.27,-0.41 0.47,-0.55c0.05,-0.04 0.11,-0.07 0.17,-0.1c0.18,-0.1 0.39,-0.38 0.57,-0.15c0.24,0.3 -0.18,0.3 -0.3,0.44c-0.08,0.09 0.01,0.16 0.07,0.22c0.07,0.05 0.08,0.11 0.01,0.18C38.49,32.82 38.29,32.79 38.11,32.79z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.70"/>
-    <path
-        android:pathData="M1.34,29.53c-0.09,0.13 -0.27,0.27 -0.25,0.37c0.19,0.81 -0.51,1.36 -0.57,2.08c-0.64,-0.31 -0.1,-0.64 -0.01,-0.95c0.1,-0.34 0.63,-0.52 0.19,-1.06C0.45,29.64 0.86,29.35 1.34,29.53z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.25"/>
-    <path
-        android:pathData="M33.75,12.24c0.27,-0.22 0.54,-0.45 0.81,-0.67c0.14,-0.03 0.37,-0.16 0.42,0.02c0.18,0.63 0.58,0.33 0.93,0.27c-0.05,0.13 -0.09,0.26 -0.14,0.39C35.09,12.45 34.42,12.05 33.75,12.24z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.70"/>
-    <path
-        android:pathData="M44.79,22.37c-0.06,0.01 -0.13,0.03 -0.2,0.04c-0.25,0.02 -0.44,0.42 -0.72,0.17c-0.25,-0.24 0.12,-0.43 0.13,-0.65c0,-0.12 -0.08,-0.24 -0.13,-0.37c0.1,-0.39 0.02,-0.89 0.6,-1c0.03,0.02 0.05,0.05 0.08,0.07c-0.06,0.27 0.05,0.56 -0.12,0.82C44.13,21.91 44.32,22.2 44.79,22.37z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.40"/>
-    <path
-        android:pathData="M5.66,35.33c-0,0.05 -0.01,0.1 -0.01,0.16c-0.35,-0.03 -0.54,0.22 -0.77,0.42c-0.11,0.1 -0.09,0.37 -0.37,0.28c-0.3,-0.09 -0.16,-0.31 -0.19,-0.49c-0.03,-0.13 -0.09,-0.25 -0.14,-0.37c0.22,-0.04 0.45,-0.09 0.67,-0.13C5.12,35.27 5.42,35.1 5.66,35.33z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.25"/>
-    <path
-        android:pathData="M40.1,11.03c-0.41,-0.11 -0.49,-0.51 -0.68,-0.81c0.52,0.25 1,-0.19 1.52,-0.06c0.14,0.25 0.04,0.43 -0.16,0.59C40.55,10.85 40.32,10.94 40.1,11.03z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.55"/>
-    <path
-        android:pathData="M20.11,41.42c0.56,-0.06 1.16,-0.41 1.61,0.25c-0.2,-0.04 -0.31,0.15 -0.47,0.19C20.79,41.96 20.29,42.1 20.11,41.42z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.40"/>
-    <path
-        android:pathData="M36.59,35.33c-0.14,0 -0.27,0 -0.41,0c-0.05,-0.23 0.12,-0.31 0.27,-0.42c0.18,-0.42 0.61,-0.39 0.95,-0.52c0.04,0 0.09,-0 0.13,-0c0.37,0.02 0.15,0.25 0.14,0.41c-0.08,0.24 0.08,0.76 -0.5,0.37C36.95,35.02 36.76,35.18 36.59,35.33z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.40"/>
-    <path
-        android:pathData="M9.98,20.88c-0.08,0 -0.16,0.01 -0.24,0.01c0.04,-0.1 0.08,-0.21 0.13,-0.31c0.2,-0.38 0.89,0.05 0.9,-0.46c0.01,-0.36 -0.17,-0.7 0.23,-0.95c0,-0 -0.05,-0.11 -0.08,-0.17c0.5,0.38 0.17,0.85 0.13,1.27c-0.01,0.16 -0.16,0.31 -0.25,0.47C10.53,20.84 10.24,20.76 9.98,20.88z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.40"/>
-    <path
-        android:pathData="M11.31,37.61c0.01,0.1 0.02,0.19 0.03,0.28c0.11,0.16 0.49,0.06 0.41,0.41c0.09,0.29 0.38,0.25 0.61,0.31c-0.1,0.28 -0.33,0.38 -0.52,0.51c-0.17,-0.07 -0.5,0.11 -0.39,-0.38C11.51,38.41 11.05,38.03 11.31,37.61z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.25"/>
-    <path
-        android:pathData="M44.95,11.97c0.18,-0.1 0.36,-0.21 0.54,-0.32c0.22,-0.16 0.46,-0.09 0.71,-0.06c-0.04,0.26 -0.42,0.51 -0.03,0.78c-0.05,0 -0.1,0 -0.14,0.01c-0.39,0.41 -0.75,0.36 -1.11,-0.05C44.85,12.21 44.86,12.09 44.95,11.97z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.55"/>
-    <path
-        android:pathData="M40.77,10.75c0.05,-0.2 0.1,-0.39 0.16,-0.59c0.36,0.11 0.67,0.11 0.87,-0.3c0.08,-0.16 0.3,-0.36 0.33,0.06c0.13,0.08 0.23,0.17 0.14,0.34c-0,0.03 -0.01,0.06 -0.01,0.09C41.71,10.3 41.3,10.74 40.77,10.75z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.40"/>
-    <path
-        android:pathData="M2.28,27.89c-0.1,0.25 -0.49,0.32 -0.47,0.65c0.26,0.17 0.37,-0.17 0.69,-0.07c-0.33,0.28 -0.62,0.53 -0.91,0.78c0,-0.28 0.02,-0.57 0,-0.86C1.55,27.71 1.58,27.69 2.28,27.89z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.55"/>
-    <path
-        android:pathData="M46.71,17.11c-0.23,0.4 -0.59,-0.06 -0.87,0.17c0.35,0.42 0.3,0.79 -0.23,1.04c-0.03,0.01 -0.06,0.02 -0.09,0.03c-0.06,-0.02 -0.11,-0.06 -0.14,-0.12c0.11,-0.37 0.08,-0.74 0.05,-1.11c0.02,-0.07 0.05,-0.13 0.09,-0.19c0.11,-0.16 0.27,-0.25 0.46,-0.29C46.33,16.62 46.72,16.56 46.71,17.11z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.55"/>
-    <path
-        android:pathData="M46.86,14.96c-0.05,0.46 -0.35,0.81 -0.56,1.19c0.16,0.33 0.01,0.48 -0.31,0.52c-0.27,-0.08 -0.25,-0.31 -0.29,-0.52c0.14,-1 0.37,-1.26 1.1,-1.23C46.82,14.93 46.84,14.95 46.86,14.96z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.70"/>
-    <path
-        android:pathData="M37.66,34.79c-0.05,-0.14 -0.09,-0.27 -0.14,-0.41c0,-0.27 0.11,-0.47 0.4,-0.54C38.51,34.33 38.49,34.4 37.66,34.79z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.40"/>
-    <path
-        android:pathData="M45.9,16.58c0.22,-0.07 0.35,-0.21 0.4,-0.43c0.41,0.21 0.86,0.39 0.41,0.96c-0.22,-0.23 -0.5,-0.3 -0.81,-0.3C45.83,16.74 45.83,16.66 45.9,16.58z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.25"/>
-    <path
-        android:pathData="M17.54,9.14c-0.2,0.48 -0.99,0.42 -0.99,1.12c0,0.11 -0.25,-0.05 -0.35,-0.15c0.44,-0.05 0.22,-0.48 0.38,-0.69c0.23,-0.14 0.47,-0.28 0.7,-0.42C17.36,9.05 17.45,9.09 17.54,9.14z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.55"/>
-    <path
-        android:pathData="M45.22,19.94c0.31,0.33 -0.03,0.63 -0.13,0.87c-0.09,0.22 -0.35,-0.12 -0.54,-0.19l0.02,-0.06c0.03,-0.49 -0.11,-1.07 0.6,-1.24c0.06,0.02 0.11,0.07 0.14,0.13C45.27,19.62 45.33,19.8 45.22,19.94z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.70"/>
-    <path
-        android:pathData="M42.81,27.24c0.03,-0.52 0.29,-1.02 0.02,-1.68c0.27,0.17 0.4,0.25 0.52,0.33C43.32,26.41 43.17,26.87 42.81,27.24z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.25"/>
-    <path
-        android:pathData="M14.43,12.23c-0.16,0.42 -0.58,0.07 -0.81,0.28c-0.07,-0.18 -0.17,-0.36 -0.2,-0.55c-0.02,-0.12 0.07,-0.25 0.24,-0.26c0.16,-0.01 0.28,0.01 0.25,0.2C13.84,12.4 14.2,12.22 14.43,12.23z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.70"/>
-    <path
-        android:pathData="M9.41,20.89c-0.37,-0.02 -0.57,0.35 -0.9,0.4c0.04,-0.15 0.07,-0.3 0.11,-0.45c0.07,-0.25 0.26,-0.34 0.5,-0.37C9.45,20.44 9.27,20.78 9.41,20.89z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.40"/>
-    <path
-        android:pathData="M23.33,6.3c-0.36,-0.14 -0.73,0.05 -1.09,-0.01c0.47,-0.29 1.11,-0.14 1.53,-0.58c0.06,-0.06 0.16,-0.09 0.22,0.02c0.06,0.11 0.04,0.23 -0.06,0.29C23.74,6.13 23.53,6.21 23.33,6.3z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.55"/>
-    <path
-        android:pathData="M33.33,7.95c-0.09,0.23 -0.24,0.41 -0.5,0.56c-0.14,-0.29 -0.08,-0.58 0.06,-0.8c0.13,-0.2 0.31,0.02 0.46,0.08C33.34,7.84 33.34,7.89 33.33,7.95z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.40"/>
-    <path
-        android:pathData="M38.49,32.54c-0,-0.06 -0.01,-0.12 -0.01,-0.18c0.18,-0.05 0.35,-0.09 0.53,-0.14c0.12,-0.25 0.1,-0.79 0.57,-0.25c0.01,0.03 0.02,0.06 0.01,0.1c-0.04,0.18 0.03,0.46 -0.31,0.42c-0.15,0.01 -0.31,-0.01 -0.4,0.16C38.63,33.09 38.6,32.67 38.49,32.54z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.40"/>
-    <path
-        android:pathData="M15.24,11.18c-0.13,0.17 -0.27,0.35 -0.4,0.52c-0.29,0.06 -0.16,0.45 -0.41,0.54c0,-0.13 0.03,-0.27 0,-0.4C14.28,11.09 14.75,11.13 15.24,11.18z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.70"/>
-    <path
-        android:pathData="M2.95,26.94c0.12,0.47 -0.31,0.41 -0.54,0.55c-0.19,-0.2 -0.48,-0.31 -0.68,-0.75C2.19,27.02 2.56,27.29 2.95,26.94z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.55"/>
-    <path
-        android:pathData="M45.49,18.33c0.04,-0 0.09,-0 0.13,-0.01c0.36,0.23 -0.14,0.73 0.28,0.94c-0.17,0.35 -0.43,0.2 -0.68,0.13l-0.01,-0C44.98,18.95 44.98,18.58 45.49,18.33z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.55"/>
-    <path
-        android:pathData="M8.76,34.52c0.09,-0.05 0.19,-0.09 0.28,-0.14c0.03,0.32 0.5,0.27 0.52,0.6C8.81,35.17 8.81,35.17 8.76,34.52z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.25"/>
-    <path
-        android:pathData="M44.27,10.49c-0.55,0.45 -0.7,0.19 -0.68,-0.38C43.98,9.94 44.2,10.07 44.27,10.49z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.25"/>
-    <path
-        android:pathData="M39.58,31.97c-0.27,-0.1 -0.44,0.04 -0.57,0.25c-0.06,-0.72 0.55,-0.64 0.95,-0.81c-0.01,0.15 -0.01,0.29 -0.02,0.44C39.82,31.89 39.7,31.93 39.58,31.97z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.55"/>
-    <path
-        android:pathData="M11.1,37.21c0.24,-0.23 0.52,-0.15 0.86,-0.07c-0.14,0.29 -0.42,0.37 -0.65,0.48C11.23,37.48 10.99,37.43 11.1,37.21z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.40"/>
-    <path
-        android:pathData="M21.72,41.68c0.18,0.27 0.37,0.06 0.56,0.01c0.13,0.25 0.2,0.57 -0.14,0.63C21.63,42.42 21.83,41.92 21.72,41.68z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.25"/>
-    <path
-        android:pathData="M12.14,14.16c-0.19,0.39 -0.3,0.88 -0.92,0.65C11.45,14.48 11.75,14.27 12.14,14.16z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.55"/>
-    <path
-        android:pathData="M43.89,23.9c0.21,-0.29 0.08,-0.84 0.65,-0.86C44.58,23.52 44.36,23.81 43.89,23.9z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.40"/>
-    <path
-        android:pathData="M24.56,6.84c-0.29,0.11 -0.51,-0.16 -0.79,-0.13c0.04,-0.05 0.09,-0.13 0.13,-0.13c0.28,0.01 0.19,-0.47 0.46,-0.38C24.68,6.3 24.41,6.65 24.56,6.84z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.70"/>
-    <path
-        android:pathData="M7.8,22.39c0,-0.05 0.01,-0.1 0.01,-0.15c0.2,-0.03 0.58,-0.47 0.58,-0.67c-0,-0.11 -0.03,-0.22 0.1,-0.27c0.15,0.38 0.09,0.7 -0.25,0.95C8.15,22.45 8.01,22.5 7.8,22.39z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.40"/>
-    <path
-        android:pathData="M32.1,38.58c0.26,-0.04 0.47,-0.16 0.56,-0.43c0.19,0.32 0.22,0.62 -0.19,0.78C32.13,39.08 32.15,38.79 32.1,38.58z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.25"/>
-    <path
-        android:pathData="M9.71,33.71c-0.05,0.05 -0.09,0.09 -0.14,0.14c-0.19,-0.13 -0.31,-0.07 -0.38,0.13c-0.05,-0.18 -0.1,-0.36 -0.15,-0.54c0.01,-0.31 0.19,-0.45 0.47,-0.36C9.81,33.18 9.84,33.43 9.71,33.71z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.55"/>
-    <path
-        android:pathData="M23.62,6.86c-0.23,0.13 -0.51,0.45 -0.71,0.14c-0.15,-0.24 0.2,-0.42 0.42,-0.56C23.35,6.63 23.31,6.86 23.62,6.86z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.70"/>
-    <path
-        android:pathData="M35.51,36.54c0.28,-0.08 0.34,-0.39 0.56,-0.53c-0.09,0.28 0.18,0.51 0.11,0.85C35.94,36.75 35.72,36.65 35.51,36.54z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.40"/>
-    <path
-        android:pathData="M42.26,10.26c-0.05,-0.11 -0.09,-0.23 -0.14,-0.34c0.31,-0.28 0.6,-0.51 0.65,0.17C42.6,10.15 42.43,10.21 42.26,10.26z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.25"/>
-    <path
-        android:pathData="M39.28,32.49c0.1,-0.14 0.2,-0.28 0.31,-0.42c0.25,0.18 0.34,0.44 0.1,0.65C39.51,32.89 39.35,32.71 39.28,32.49z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.25"/>
-    <path
-        android:pathData="M19.17,41.67c0.14,0.1 0.28,0.19 0.43,0.29c-0.12,0.4 -0.45,0.26 -0.72,0.31C18.75,41.95 19.16,41.92 19.17,41.67z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.25"/>
-    <path
-        android:pathData="M10.93,17.51c-0,0.42 0.04,0.87 -0.55,0.94c0,-0.1 0.01,-0.3 0.01,-0.3C10.82,18.14 10.76,17.73 10.93,17.51z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.25"/>
-    <path
-        android:pathData="M5.39,24c-0.15,0.21 -0.32,0.41 -0.55,0.53c0.01,-0.11 0.04,-0.22 0.04,-0.33C4.83,23.54 5.13,23.82 5.39,24z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.25"/>
-    <path
-        android:pathData="M45.22,19.4c0.23,-0.02 0.47,0 0.68,-0.13c0.12,0.1 0.41,0.08 0.34,0.31c-0.06,0.18 -0.26,0.07 -0.4,0c-0.4,-0.2 -0.47,0.14 -0.61,0.37C45.22,19.76 45.22,19.58 45.22,19.4z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.40"/>
-    <path
-        android:pathData="M45.49,18.33c-0.03,0.37 -0.07,0.74 -0.27,1.07c-0.17,0.14 -0.28,0.31 -0.22,0.53c0.09,0.38 -0.14,0.53 -0.43,0.65c-0.44,0.18 -0.31,0.76 -0.69,0.99c-0.18,0.14 -0.36,0.27 -0.55,0.41c0.17,-0.39 0.36,-0.77 0.5,-1.17c0.07,-0.19 0.06,-0.42 -0.12,-0.56c-0.19,-0.15 -0.33,0.02 -0.47,0.13c-0.14,0.1 -0.3,0.28 -0.44,0.03c-0.11,-0.2 0.06,-0.35 0.22,-0.44c0.15,-0.09 0.33,-0.13 0.5,-0.17c0.44,-0.11 0.67,-0.35 0.54,-0.83c-0.11,-0.4 0.03,-0.61 0.55,-0.56c-0.33,-0.47 -0.56,-0.9 -1.1,-0.36c-0.17,0.17 -0.42,0.17 -0.64,0.09c-0.25,-0.08 -0.39,-0.07 -0.18,-0.47c0.28,-0.52 0.62,-0.89 1.09,-1.2c0.17,-0.11 0.17,-0.3 -0.03,-0.36c-0.39,-0.12 -0.3,-0.36 -0.16,-0.62c-0.07,-0.01 -0.11,-0.03 -0.15,-0.02c-0.4,0.06 -1.04,0.39 -1.12,-0.05c-0.07,-0.4 0.49,-0.95 0.95,-1.15c0.62,-0.27 1.26,-0.57 1.97,-0.66c0.04,0.05 0.09,0.09 0.13,0.14c-0.07,0.26 -0.32,0.34 -0.57,0.48c0.25,0.2 0.83,-0.43 0.76,0.35c-0.01,0.14 0.26,0.1 0.41,0.11c0.3,0.03 0.63,-0.06 0.85,0.25c-0.58,0.21 -0.55,0.86 -0.9,1.23c-0.21,0.28 0.14,0.72 -0.27,0.95v-0c-0.27,0.38 -0.15,0.8 -0.14,1.22L45.49,18.33z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.85"/>
-    <path
-        android:pathData="M44.95,12.25c0.36,0.05 0.72,0.09 1.08,0.13c0.61,0.47 0.61,0.52 -0.06,0.83c-0.21,0.1 -0.41,0.25 -0.61,0.37c-0.01,-0.04 -0.02,-0.1 -0.05,-0.12c-0.08,-0.08 -1.75,-0.08 -1.83,-0.02c-0.15,0.1 -0.13,0.48 -0.4,0.36c-0.23,-0.1 -0.13,-0.4 -0.15,-0.61c-0.09,-0.18 -0.01,-0.36 0.13,-0.39C43.7,12.65 44.27,12.29 44.95,12.25z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.85"/>
-    <path
-        android:pathData="M44.95,12.25c-0.34,0.4 -0.76,0.61 -1.29,0.63c-0.28,0.01 -0.53,0.12 -0.73,0.31c-0.09,0 -0.18,0 -0.27,0c-0.03,-0.23 0.19,-0.51 -0.14,-0.68c0.16,-0.3 0.16,-0.3 0.68,-0.14c0.62,0.02 1.13,-0.44 1.75,-0.41C44.95,12.06 44.95,12.16 44.95,12.25z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.70"/>
-    <path
-        android:pathData="M30.91,8.06c0.44,0 0.8,0.1 0.68,0.67C31.31,8.56 31.05,8.37 30.91,8.06z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.85"/>
-    <path
-        android:pathData="M9.71,33.71c-0.14,-0.31 -0.24,-0.71 -0.67,-0.27c-0.8,0.11 -0.8,0.11 -0.52,-0.61c-0.37,0.1 -0.69,0.48 -1.1,0.1c-0.08,-0.07 -0.05,0.41 -0.26,0.54c-0.6,-0.41 -1.46,-0.39 -2.05,0.06c-0.2,0.15 -0.41,0.27 -0.65,0.32c0,-0.05 0,-0.09 -0,-0.13c0.02,-0.01 0.04,-0.02 0.06,-0.03c0.25,-0.22 0.61,-0.36 0.59,-0.78c-0.47,0.07 -0.75,-0.72 -1.31,-0.29c-0.17,0.13 -0.39,0.2 -0.53,-0c-0.15,-0.22 0.05,-0.38 0.2,-0.5c0.23,-0.19 0.47,-0.35 0.46,-0.69c-0.06,-0.44 0.36,-0.49 0.58,-0.7c0.3,-0.29 0.31,-0.54 -0.16,-0.61c-0.52,-0.09 -0.6,-0.3 -0.29,-0.7c0.13,-0.05 0.22,-0.14 0.27,-0.27c0.27,0.11 0.52,0.24 0.77,0.39c0.26,0.15 0.44,0.2 0.29,0.57c-0.19,0.47 0.2,0.71 0.55,0.86c0.4,0.18 0.26,-0.3 0.41,-0.43c0.25,0.06 0.25,0.31 0.36,0.47c0.13,0.19 0.23,0.42 0.5,0.4c0.38,-0.03 0.09,-0.29 0.14,-0.44c0.09,-0.27 0.42,-0.3 0.63,-0.46c0.1,-0.07 0.21,0.01 0.27,0.12c0.1,0.21 0.04,0.38 -0.11,0.55c-0.16,0.18 -0.53,0.34 -0.26,0.65c0.33,0.37 0.54,-0.03 0.77,-0.21c0.07,-0.05 0.14,-0.11 0.25,-0.07C9,31.67 8.86,31.76 8.77,31.85c-0.34,0.36 -0.09,0.44 0.23,0.51c0.29,0.06 0.64,-0.03 0.69,0.45c0.02,0.2 0.26,0.23 0.45,0.16c0.2,-0.07 0.39,-0.31 0.55,0.08c0.04,0.1 0.24,-0.03 0.33,-0.14c0.11,-0.14 0.12,-0.29 -0,-0.43c-0.22,-0.26 -0.4,-0.53 -0.25,-0.99c0.24,0.34 0.46,0.58 0.62,0.86c0.19,0.32 0.8,0.75 -0.17,0.86c-0.28,0.04 -0.21,0.29 -0.14,0.49C10.61,34.04 10.16,33.71 9.71,33.71z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.70"/>
-    <path
-        android:pathData="M15.25,40.46c-0.09,0 -0.18,0 -0.27,0c-0.1,-0.54 -0.35,-0.94 -0.93,-1.05c-0.43,-0.08 -0.61,-0.61 -1.09,-0.58c-0.47,-0.62 -0.02,-0.76 0.55,-0.88c-0.22,-0.2 -0.5,-0.07 -0.65,-0.3c0.13,-0.32 0.81,-0.28 0.63,-0.85c0.35,-0.14 0.39,0.08 0.37,0.33c-0.01,0.2 -0.08,0.4 -0.08,0.6c-0.02,0.4 0.13,0.6 0.56,0.47c0.19,-0.06 0.48,-0.28 0.58,0c0.1,0.28 -0.28,0.27 -0.45,0.39c-0.07,0.05 -0.15,0.09 -0.21,0.16c-0.09,0.1 -0.17,0.22 -0.1,0.36c0.07,0.12 0.2,0.08 0.3,0.05c0.47,-0.16 0.68,0.02 0.67,0.5c0.29,0.07 0.48,-0.37 0.84,-0.12C15.73,39.85 15.49,40.15 15.25,40.46z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.55"/>
-    <path
-        android:pathData="M17.76,41.63c-0.75,0.15 -1.45,0.01 -2.14,-0.29c-0.23,-0.1 -0.26,-0.29 -0.35,-0.46c0.32,-0.29 0.68,-0.48 1.13,-0.36c0.02,0.03 0.05,0.05 0.07,0.08c0.08,0.23 -0.2,0.6 0.27,0.68C17.1,41.32 17.54,41.14 17.76,41.63z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.55"/>
-    <path
-        android:pathData="M15.52,40.59c0.2,-0.21 0.38,-0.44 0.6,-0.61c0.45,-0.35 0.87,-0.39 1.16,0.26c-0.27,0.12 -0.59,0.14 -0.82,0.35l-0,-0C16.15,40.36 15.83,40.82 15.52,40.59z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.55"/>
-    <path
-        android:pathData="M18.22,40.73c-0.47,0.23 -0.98,0.32 -1.48,0.41C17.03,40.28 17.66,40.65 18.22,40.73z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.55"/>
-    <path
-        android:pathData="M18.03,38.25c0.05,-0.13 0.1,-0.25 0.16,-0.37c0.09,-0.17 0.1,-0.4 0.35,-0.43c0.03,-0 0.09,0.04 0.1,0.07c0.05,0.21 -0.04,0.4 -0.17,0.55C18.38,38.19 18.29,38.4 18.03,38.25z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.55"/>
-    <path
-        android:pathData="M37.39,34.39c-0.26,0.28 -0.59,0.43 -0.95,0.52C36.43,34.13 36.94,34.32 37.39,34.39z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.70"/>
-    <path
-        android:pathData="M40.36,30.07c0.21,0.31 0.16,0.58 -0.13,0.8C39.91,30.54 39.94,30.27 40.36,30.07z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.55"/>
-    <path
-        android:pathData="M25.44,38.58c-0.17,-0.01 -0.27,-0.09 -0.27,-0.25c0,-0.15 0.11,-0.24 0.26,-0.24c0.15,-0 0.26,0.08 0.25,0.23C25.67,38.48 25.56,38.55 25.44,38.58z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.55"/>
-    <path
-        android:pathData="M28.73,37.09c0.09,-0.01 0.2,-0.01 0.21,0.1c0.02,0.18 -0.1,0.29 -0.26,0.34c-0.12,0.04 -0.24,0 -0.25,-0.14C28.42,37.21 28.57,37.14 28.73,37.09z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.55"/>
-    <path
-        android:pathData="M9.98,20.88c0.22,-0.38 0.52,-0.23 0.81,-0.13C10.55,20.95 10.32,21.25 9.98,20.88z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.70"/>
-    <path
-        android:pathData="M15.52,40.59c0.31,0.03 0.63,-0.42 0.94,0c-0.4,0.09 -0.8,0.19 -1.2,0.28c-0,-0.1 -0.01,-0.19 -0.01,-0.29C15.34,40.59 15.43,40.59 15.52,40.59z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.40"/>
-    <path
-        android:pathData="M37.2,33.09c-0.04,0.17 -0.16,0.26 -0.32,0.28c-0.1,0.01 -0.17,-0.06 -0.14,-0.16c0.04,-0.16 0.15,-0.27 0.32,-0.29C37.16,32.91 37.21,32.98 37.2,33.09z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.70"/>
-    <path
-        android:pathData="M4.04,29.39c-0.01,0.33 0.12,0.46 0.47,0.45c0.47,-0.01 0.45,0.44 0.52,0.72c0.08,0.33 -0.24,0.28 -0.45,0.31C4.22,31.01 3.85,31.13 3.5,31.28c-0.18,0.09 -0.36,0.18 -0.54,0.27c-0.09,-0.05 -0.18,-0.09 -0.27,-0.14c0.47,-0.35 0.92,-0.68 0.74,-1.42C3.35,29.65 3.72,29.48 4.04,29.39z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.85"/>
-    <path
-        android:pathData="M43.19,12.38c-0.21,0.14 -0.48,-0.04 -0.68,0.14c-0.19,0.01 -0.38,0.03 -0.77,0.05c0.52,-0.29 0.88,-0.47 1.32,-0.45C43.11,12.2 43.15,12.29 43.19,12.38z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.55"/>
-    <path
-        android:pathData="M11.74,38.3c-0.14,-0.14 -0.27,-0.27 -0.41,-0.41c0.09,-0.02 0.17,-0.04 0.26,-0.06c0.2,-0.04 0.45,-0.11 0.51,0.15C12.16,38.22 11.88,38.2 11.74,38.3z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.40"/>
-    <path
-        android:pathData="M3.5,31.28c0.2,-0.41 0.47,-0.75 0.86,-0.98c0.31,0.13 -0.34,0.56 0.22,0.58c-0.17,0.25 -0.44,0.37 -0.67,0.54C3.77,31.37 3.63,31.32 3.5,31.28z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.40"/>
-    <path
-        android:pathData="M45.48,18.32c-0.21,-0.13 -0.32,-0.28 -0.23,-0.56c0.09,-0.26 -0.04,-0.44 -0.32,-0.47c-0.19,-0.02 -0.4,-0.03 -0.29,-0.3c0.08,-0.22 0.3,-0.3 0.5,-0.23c0.18,0.07 0.33,0.22 0.49,0.34C45.67,17.52 45.96,17.96 45.48,18.32z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.70"/>
-    <path
-        android:pathData="M45.63,17.1c0.25,-0.41 0,-0.58 -0.4,-0.67c0.22,-0.22 0.46,-0.21 0.67,-0.28c0,0.14 0.01,0.28 0.01,0.43c0,0.08 0,0.16 0,0.23C45.85,16.95 45.77,17.05 45.63,17.1z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.55"/>
-    <path
-        android:pathData="M15.77,18c-0.02,0.6 0.02,1.19 0.11,1.78c0.37,3.12 4.96,3.31 5,0c0.18,-0.9 0.04,-0.98 -0.41,-0.24c0.59,-0.24 1.29,-0.32 1.91,-0.46c0.89,-0.2 3.1,-1.48 3.93,-0.92c0.2,-1.52 0.4,-3.05 0.6,-4.57c-0.44,0.22 -0.9,0.36 -1.38,0.44c-2.96,0.73 -1.95,4.59 0.67,4.91c1.27,0.16 2.56,0.09 3.84,0.11c1.07,0.01 1.71,-0.65 0.21,-0.65c-1,-0.01 -2,-0.23 -2.98,-0.42c-3.21,-0.6 -6.27,-1.1 -9.54,-0.61c-1.27,0.19 -2.18,1.91 -1.75,3.08c2.55,6.91 9.54,5.15 15.39,5.17c-0.22,-1.64 -0.44,-3.27 -0.67,-4.91c-1.89,0.65 -3.71,1.44 -5.74,1.5c-1.55,0.05 -3.02,0.02 -4.54,0.41c-2.12,0.53 -4.15,1.85 -4.68,4.06c-1.16,4.92 5.62,5.05 8.5,3.66c1.79,-0.87 3.6,-2.19 5.65,-2.35c-0.11,-0.36 0.08,-0.65 0.58,-0.89c-0.4,0.14 -0.89,0.07 -1.3,0.07c-0.89,0 -1.77,-0.07 -2.66,-0.06c-5.34,0.03 -6.11,7.01 -0.31,6.96c1.89,-0.02 3.12,-2.11 2.16,-3.76c-2.64,-4.52 -5.28,-9.04 -7.92,-13.56c-1.63,-2.78 -5.95,-0.27 -4.32,2.52c2.64,4.52 5.28,9.04 7.92,13.56c0.72,-1.25 1.44,-2.51 2.16,-3.76c-0.29,-0.06 -0.57,-0.12 -0.86,-0.17c0.5,0.38 1,0.77 1.49,1.15c-0.1,-0.17 -0.19,-0.34 -0.29,-0.5c0,0.84 0,1.68 0,2.52c-0.66,0.08 -0.67,0.1 -0.04,0.05c0.34,-0.01 0.69,-0 1.03,0.01c0.72,0.02 1.44,0.06 2.17,0.05c1.35,-0 2.9,-0.26 3.92,-1.21c2.36,-2.21 1.18,-6.93 -2.02,-7.72c-3.36,-0.83 -6.59,1.04 -9.46,2.57c-0.49,0.26 -0.96,0.35 -1.52,0.41c-1.13,-0.15 -0.96,0.33 0.52,1.43c0.37,-0.14 0.75,-0.25 1.13,-0.33c1.44,-0.36 3.01,0.04 4.48,-0.22c1.83,-0.32 3.53,-0.95 5.28,-1.56c2.62,-0.9 2.25,-4.9 -0.67,-4.91c-2.66,-0.01 -9.34,1.82 -10.56,-1.5c-0.58,1.02 -1.16,2.05 -1.75,3.08c3.8,-0.56 14.52,4.06 16.69,-0.96c0.94,-2.17 0.7,-4.89 -1.63,-6.16c-2.51,-1.37 -5.2,-0.78 -7.92,-1.12c0.22,1.64 0.44,3.27 0.67,4.91c0.48,-0.08 0.94,-0.23 1.38,-0.44c2.01,-0.82 2.51,-3.28 0.6,-4.57c-2.64,-1.79 -5.77,-0.05 -8.51,0.58c-2.95,0.67 -4.41,2.27 -4.44,5.36c1.67,0 3.33,0 5,0c-0.1,-0.59 -0.14,-1.18 -0.11,-1.78C20.73,14.78 15.73,14.77 15.77,18z"
-        android:fillColor="#fff"/>
-</vector>
diff --git a/QSthemes/QSTileMountain/Android.mk b/QSthemes/QSTileMountain/Android.mk
deleted file mode 100644
index 8561055..0000000
--- a/QSthemes/QSTileMountain/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_PACKAGE_NAME := QSTileMountain
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
-include $(BUILD_PACKAGE)
diff --git a/QSthemes/QSTileMountain/AndroidManifest.xml b/QSthemes/QSTileMountain/AndroidManifest.xml
deleted file mode 100644
index 9549383..0000000
--- a/QSthemes/QSTileMountain/AndroidManifest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.systemui.qstile.mountain"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <overlay android:targetPackage="com.android.systemui" android:priority="1"/>
-
-    <application android:label="Mountain" android:hasCode="false" />
-</manifest>
diff --git a/QSthemes/QSTileMountain/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileMountain/res/drawable/ic_qs_circle.xml
deleted file mode 100644
index 0363516..0000000
--- a/QSthemes/QSTileMountain/res/drawable/ic_qs_circle.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="40dp"
-        android:height="40dp"
-        android:viewportWidth="48.0"
-        android:viewportHeight="48.0">
-    <path
-        android:pathData="M44.27,35.8L36.4,30.73l4,5.54l-6.53,-3.8l2.53,4.09l-6,-3.34l0.67,3.05l-5.07,-2.47l1.53,2.47l-4.8,-2.47l0.67,2.76l-10.27,-5.83l4.93,5.54l-8.53,-4.93l3.93,4.93l-6.7,-3.4l2.17,3.4v0.29l-4.33,-1.96L3.1,35c3.97,7.55 11.86,12.72 20.99,12.72c9.56,0 17.78,-5.67 21.53,-13.83l-6.82,-4.82L44.27,35.8z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.45"/>
-    <path
-        android:pathData="M40.27,26.2l-5.13,1.63l0.67,1.83l-3.73,0.35l-3.53,2.65l-5.8,-0.46l-3.93,-4.38l-6.4,-2.43L11,30.27l-7.27,1.47L2.25,33.22c0.26,0.61 0.55,1.2 0.85,1.78l1.5,-0.4l4.33,1.96v-0.29l-2.17,-3.4l6.7,3.4l-3.93,-4.93l8.53,4.93l-4.93,-5.54l10.27,5.83l-0.67,-2.76l4.8,2.47l-1.53,-2.47l5.07,2.47L30.4,33.22l6,3.34l-2.53,-4.09l6.53,3.8l-4,-5.54l7.87,5.07l-5.47,-6.73l6.82,4.82c0.2,-0.44 0.4,-0.88 0.57,-1.33L40.27,26.2z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.60"/>
-    <path
-        android:pathData="M41.1,24.1l-5.3,-0.7l-4.5,1.4L27.1,22l-5.8,-5.3l-6.5,2.2L1.34,30.73c0.25,0.86 0.57,1.68 0.91,2.49l1.49,-1.49L11,30.27l1.4,-4.87l6.4,2.43l3.93,4.38l5.8,0.46l3.53,-2.65l3.73,-0.35l-0.67,-1.83l5.13,-1.63l5.92,6.36c0.35,-0.89 0.66,-1.81 0.9,-2.75L41.1,24.1z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M24.08,0.28C10.98,0.28 0.36,10.9 0.36,24c0,2.34 0.34,4.59 0.97,6.73L14.8,18.9l6.5,-2.2l5.8,5.3l4.2,2.8l4.5,-1.4l5.3,0.7l5.99,5.71c0.47,-1.86 0.72,-3.81 0.72,-5.81C47.81,10.9 37.19,0.28 24.08,0.28z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.20"/>
-</vector>
diff --git a/QSthemes/QSTileNinja/Android.mk b/QSthemes/QSTileNinja/Android.mk
deleted file mode 100644
index 08a2ffc..0000000
--- a/QSthemes/QSTileNinja/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_PACKAGE_NAME := QSTileNinja
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
-include $(BUILD_PACKAGE)
diff --git a/QSthemes/QSTileNinja/AndroidManifest.xml b/QSthemes/QSTileNinja/AndroidManifest.xml
deleted file mode 100644
index f43459f..0000000
--- a/QSthemes/QSTileNinja/AndroidManifest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.systemui.qstile.ninja"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <overlay android:targetPackage="com.android.systemui" android:priority="1"/>
-
-    <application android:label="Ninja" android:hasCode="false" />
-</manifest>
diff --git a/QSthemes/QSTileNinja/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileNinja/res/drawable/ic_qs_circle.xml
deleted file mode 100644
index 59786d0..0000000
--- a/QSthemes/QSTileNinja/res/drawable/ic_qs_circle.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="48.0"
-    android:viewportWidth="48.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#fff" android:fillAlpha="0.70" android:pathData="M21.47,24c0,-1.36 1.08,-2.46 2.42,-2.52V0.85l-0.17,-0.25l-8.51,13.62L1.55,22.92h0.43l12.73,10l9.19,14.2V26.52C22.55,26.46 21.47,25.36 21.47,24z"/>
-    <path android:fillColor="#fff" android:pathData="M15.02,32.71l-12.59,-9.91l12.99,-8.25l8.32,-13.25l0.15,0.23l0,-1.35l-0.17,-0.26l-8.77,14.04l-14.69,9.33l1.59,0l12.58,9.88l9.47,14.63l0,-1.38z"/>
-    <path android:fillColor="#fff" android:fillAlpha="0.50" android:pathData="M33.09,14.62l-9.19,-13.77v20.63c0.04,-0 0.07,-0.01 0.1,-0.01c1.39,0 2.53,1.13 2.53,2.53S25.4,26.53 24,26.53c-0.04,0 -0.07,-0.01 -0.1,-0.01v20.6L24,47.27l9.68,-15.21l12.56,-9.15L33.09,14.62z"/>
-    <path android:fillColor="#fff" android:pathData="M33.35,14.35l-9.46,-14.17l0,1.35l8.88,13.3l12.81,8.11l-12.12,8.82l-9.47,14.82l-0.1,-0.15l0,1.38l0.11,0.16l9.96,-15.65l12.95,-9.43z"/>
-    <path android:fillColor="#fff" android:pathData="M24,27.28c-1.81,0 -3.28,-1.47 -3.28,-3.28c0,-1.81 1.47,-3.28 3.28,-3.28c1.81,0 3.28,1.47 3.28,3.28C27.28,25.81 25.81,27.28 24,27.28zM24,22.22c-0.98,0 -1.78,0.8 -1.78,1.78c0,0.98 0.8,1.78 1.78,1.78c0.98,0 1.78,-0.8 1.78,-1.78C25.78,23.02 24.98,22.22 24,22.22z"/>
-</vector>
-
diff --git a/QSthemes/QSTileOreo/Android.mk b/QSthemes/QSTileOreo/Android.mk
deleted file mode 100644
index 76669bb..0000000
--- a/QSthemes/QSTileOreo/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-CAL_MODULE_TAGS := optional
-
-LOCAL_PACKAGE_NAME := QSTileOreo
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
-
-include $(BUILD_PACKAGE)
diff --git a/QSthemes/QSTileOreo/AndroidManifest.xml b/QSthemes/QSTileOreo/AndroidManifest.xml
deleted file mode 100644
index ac9fdf9..0000000
--- a/QSthemes/QSTileOreo/AndroidManifest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.systemui.qstile.oreo"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <overlay android:targetPackage="com.android.systemui" android:priority="1"/>
-
-    <application android:label="@string/qstile_oreo" android:hasCode="false"/>
-</manifest>
diff --git a/QSthemes/QSTileOreo/res/drawable/ic_brightness_left.xml b/QSthemes/QSTileOreo/res/drawable/ic_brightness_left.xml
deleted file mode 100644
index 21042ec..0000000
--- a/QSthemes/QSTileOreo/res/drawable/ic_brightness_left.xml
+++ /dev/null
@@ -1,28 +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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="27dp"
-    android:height="36dp"
-    android:viewportWidth="36.0"
-    android:viewportHeight="48.0">
-
-    <path
-        android:fillColor="?android:attr/colorControlNormal"
-        android:pathData="m 18,29.073759 v 0 c 2.802161,0 5.07376,-2.271599 5.07376,-5.073759 0,-2.80216 -2.271599,-5.07376 -5.07376,-5.07376 -2.802161,0 -5.07376,2.2716 -5.07376,5.07376 0,2.80216 2.271599,5.073759 5.07376,5.073759 z m 0,3.382507 v 0 c -4.670268,0 -8.4562669,-3.786 -8.4562669,-8.456266 0,-4.670267 3.7859989,-8.456267 8.4562669,-8.456267 4.670267,0 8.456267,3.786 8.456267,8.456267 0,4.670266 -3.786,8.456266 -8.456267,8.456266 z"
-        android:strokeWidth="1.0" />
-
-</vector>
-
diff --git a/QSthemes/QSTileOreo/res/drawable/ic_brightness_right.xml b/QSthemes/QSTileOreo/res/drawable/ic_brightness_right.xml
deleted file mode 100644
index 5c47bf6..0000000
--- a/QSthemes/QSTileOreo/res/drawable/ic_brightness_right.xml
+++ /dev/null
@@ -1,28 +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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="27dp"
-    android:height="36dp"
-    android:viewportWidth="36.0"
-    android:viewportHeight="48.0">
-
-    <path
-        android:fillColor="?android:attr/colorControlNormal"
-        android:pathData="m 18,31.449538 v 0 c 4.114266,0 7.449538,-3.335272 7.449538,-7.449538 0,-4.114267 -3.335272,-7.449538 -7.449538,-7.449538 -4.114266,0 -7.449538,3.335271 -7.449538,7.449538 0,4.114266 3.335272,7.449538 7.449538,7.449538 z m 0,2.979815 C 12.240027,34.429353 7.570646,29.759973 7.570646,24 7.570646,18.240027 12.240027,13.570646 18,13.570646 c 5.759973,0 10.429354,4.669381 10.429354,10.429354 0,5.759973 -4.669381,10.429353 -10.429354,10.429353 z m 0,-5.95963 c 2.46856,0 4.469723,-2.001163 4.469723,-4.469723 0,-2.46856 -2.001163,-4.469723 -4.469723,-4.469723 -2.46856,0 -4.469723,2.001163 -4.469723,4.469723 0,2.46856 2.001163,4.469723 4.469723,4.469723 z"
-        android:strokeWidth="1.0" />
-
-</vector>
-
diff --git a/QSthemes/QSTileOreo/res/drawable/ic_brightness_thumb.xml b/QSthemes/QSTileOreo/res/drawable/ic_brightness_thumb.xml
deleted file mode 100644
index 8002d84..0000000
--- a/QSthemes/QSTileOreo/res/drawable/ic_brightness_thumb.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2018 Havoc-OS
-
-    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.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:height="15dp"
-        android:width="15dp"
-        android:viewportWidth="42.0"
-        android:viewportHeight="42.0">
-
-    <path
-        android:fillColor="?android:attr/colorControlNormal"
-        android:pathData="M 21 0 C 32.5979797464 0 42 9.40202025355 42 21 C 42 32.5979797464 32.5979797464 42 21 42 C 9.40202025355 42 0 32.5979797464 0 21 C 0 9.40202025355 9.40202025355 0 21 0 Z"
-        android:strokeWidth="1.0" />
-</vector>
diff --git a/QSthemes/QSTileOreo/res/drawable/ic_qs_brightness_auto_off.xml b/QSthemes/QSTileOreo/res/drawable/ic_qs_brightness_auto_off.xml
deleted file mode 100644
index a557f53..0000000
--- a/QSthemes/QSTileOreo/res/drawable/ic_qs_brightness_auto_off.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2018 Havoc-OS
-
-    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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="?android:attr/colorBackground"
-        android:pathData="M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z" />
-    <path
-        android:fillColor="?android:attr/colorControlNormal"
-        android:pathData="M20,8.69 V4h-4.69L12,0.69L8.69,4H4v4.69L0.69,12L4,15.31V20h4.69L12,23.31L15.31,20H20v-4.69L23.31,12L20,8.69z M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z M12,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5s5,-2.24 5,-5S14.76,7 12,7z" />
-</vector>
diff --git a/QSthemes/QSTileOreo/res/drawable/ic_qs_brightness_auto_on.xml b/QSthemes/QSTileOreo/res/drawable/ic_qs_brightness_auto_on.xml
deleted file mode 100644
index 8d3d625..0000000
--- a/QSthemes/QSTileOreo/res/drawable/ic_qs_brightness_auto_on.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2018 Havoc-OS
-
-    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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="?android:attr/colorPrimary"
-        android:pathData="M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z" />
-    <path
-        android:fillColor="?android:attr/colorControlNormal"
-        android:pathData="M11,7l-3.2,9h1.9l0.7,-2h3.2l0.7,2h1.9L13,7H11zM10.85,12.65L12,9l1.15,3.65H10.85z" />
-    <path
-        android:fillColor="?android:attr/colorControlNormal"
-        android:pathData="M20,8.69 V4h-4.69L12,0.69L8.69,4H4v4.69L0.69,12L4,15.31V20h4.69L12,23.31L15.31,20H20v-4.69L23.31,12L20,8.69z M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z" />
-</vector>
diff --git a/QSthemes/QSTileOreo/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileOreo/res/drawable/ic_qs_circle.xml
deleted file mode 100644
index c50e91c..0000000
--- a/QSthemes/QSTileOreo/res/drawable/ic_qs_circle.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2018 Havoc-OS
-
-    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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="40dp"
-    android:height="40dp"
-    android:viewportWidth="40"
-    android:viewportHeight="40">
-
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="" />
-</vector>
diff --git a/QSthemes/QSTileOreo/res/values/colors.xml b/QSthemes/QSTileOreo/res/values/colors.xml
deleted file mode 100644
index 2eaae4c..0000000
--- a/QSthemes/QSTileOreo/res/values/colors.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2016 Project Substratum
-
-    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>
-    <!-- QS tiles Active, Inactive and Unavailable tint (Requires config_enable_qs_tile_tinting bool set to true) -->
-    <color name="qs_tiles_active_tint">@*android:color/accent_device_default_light</color>
-    <color name="qs_tiles_inactive_tint">@*android:color/omni_text1</color>
-    <color name="qs_tiles_unavailable_tint">@*android:color/omni_text2</color> <!-- keep in mind that the code adds 0.26 (light) or 0.30 (dark) alpha to this color. -->
-
-    <!-- QS tiles background Active, Disable, and Inactive tint (Requires config_enable_qs_tile_tinting bool set to true) -->
-    <color name="qs_tiles_background_active_tint">@*android:color/accent_device_default_light</color>
-    <color name="qs_tiles_background_disabled_tint">@*android:color/omni_text1</color> <!-- keep in mind that the code adds 0.26 (light) or 0.30 (dark) alpha to this color. -->
-    <color name="qs_tiles_background_inactive_tint">@*android:color/omni_text2</color>
-
-    <!-- QS tiles expand, underline and label colors -->
-    <color name="qs_tiles_expand_tint">@*android:color/omni_text1</color>
-    <color name="qs_tiles_label_color">@*android:color/omni_text1</color>
-    <color name="qs_tiles_secondary_label_color">@*android:color/omni_text2</color>
-    <color name="qs_tiles_underline_color">@*android:color/omni_text1</color>
-
-</resources>
diff --git a/QSthemes/QSTileOreo/res/values/config.xml b/QSthemes/QSTileOreo/res/values/config.xml
deleted file mode 100644
index e23e4b0..0000000
--- a/QSthemes/QSTileOreo/res/values/config.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017-2018 Projekt Substratum
-      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>
-     <!-- Config to enable/diaable qs tile tinting -->
-    <bool name="config_enable_qs_tile_tinting">true</bool>
- </resources>
\ No newline at end of file
diff --git a/QSthemes/QSTileOreo/res/values/strings.xml b/QSthemes/QSTileOreo/res/values/strings.xml
deleted file mode 100644
index 3581ca2..0000000
--- a/QSthemes/QSTileOreo/res/values/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2018 Havoc-OS
-
-    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="qstile_oreo">Oreo</string>
-
-</resources>
diff --git a/QSthemes/QSTileOreoCircleTrim/Android.mk b/QSthemes/QSTileOreoCircleTrim/Android.mk
deleted file mode 100644
index 66971d6..0000000
--- a/QSthemes/QSTileOreoCircleTrim/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-CAL_MODULE_TAGS := optional
-
-LOCAL_PACKAGE_NAME := QSTileOreoCircleTrim
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
-
-include $(BUILD_PACKAGE)
diff --git a/QSthemes/QSTileOreoCircleTrim/AndroidManifest.xml b/QSthemes/QSTileOreoCircleTrim/AndroidManifest.xml
deleted file mode 100644
index 9f87c3f..0000000
--- a/QSthemes/QSTileOreoCircleTrim/AndroidManifest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.systemui.qstile.oreocircletrim"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <overlay android:targetPackage="com.android.systemui" android:priority="1"/>
-
-    <application android:label="@string/qstile_oreo_circle_trim" android:hasCode="false"/>
-</manifest>
diff --git a/QSthemes/QSTileOreoCircleTrim/res/drawable/ic_brightness_left.xml b/QSthemes/QSTileOreoCircleTrim/res/drawable/ic_brightness_left.xml
deleted file mode 100644
index 21042ec..0000000
--- a/QSthemes/QSTileOreoCircleTrim/res/drawable/ic_brightness_left.xml
+++ /dev/null
@@ -1,28 +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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="27dp"
-    android:height="36dp"
-    android:viewportWidth="36.0"
-    android:viewportHeight="48.0">
-
-    <path
-        android:fillColor="?android:attr/colorControlNormal"
-        android:pathData="m 18,29.073759 v 0 c 2.802161,0 5.07376,-2.271599 5.07376,-5.073759 0,-2.80216 -2.271599,-5.07376 -5.07376,-5.07376 -2.802161,0 -5.07376,2.2716 -5.07376,5.07376 0,2.80216 2.271599,5.073759 5.07376,5.073759 z m 0,3.382507 v 0 c -4.670268,0 -8.4562669,-3.786 -8.4562669,-8.456266 0,-4.670267 3.7859989,-8.456267 8.4562669,-8.456267 4.670267,0 8.456267,3.786 8.456267,8.456267 0,4.670266 -3.786,8.456266 -8.456267,8.456266 z"
-        android:strokeWidth="1.0" />
-
-</vector>
-
diff --git a/QSthemes/QSTileOreoCircleTrim/res/drawable/ic_brightness_right.xml b/QSthemes/QSTileOreoCircleTrim/res/drawable/ic_brightness_right.xml
deleted file mode 100644
index 5c47bf6..0000000
--- a/QSthemes/QSTileOreoCircleTrim/res/drawable/ic_brightness_right.xml
+++ /dev/null
@@ -1,28 +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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="27dp"
-    android:height="36dp"
-    android:viewportWidth="36.0"
-    android:viewportHeight="48.0">
-
-    <path
-        android:fillColor="?android:attr/colorControlNormal"
-        android:pathData="m 18,31.449538 v 0 c 4.114266,0 7.449538,-3.335272 7.449538,-7.449538 0,-4.114267 -3.335272,-7.449538 -7.449538,-7.449538 -4.114266,0 -7.449538,3.335271 -7.449538,7.449538 0,4.114266 3.335272,7.449538 7.449538,7.449538 z m 0,2.979815 C 12.240027,34.429353 7.570646,29.759973 7.570646,24 7.570646,18.240027 12.240027,13.570646 18,13.570646 c 5.759973,0 10.429354,4.669381 10.429354,10.429354 0,5.759973 -4.669381,10.429353 -10.429354,10.429353 z m 0,-5.95963 c 2.46856,0 4.469723,-2.001163 4.469723,-4.469723 0,-2.46856 -2.001163,-4.469723 -4.469723,-4.469723 -2.46856,0 -4.469723,2.001163 -4.469723,4.469723 0,2.46856 2.001163,4.469723 4.469723,4.469723 z"
-        android:strokeWidth="1.0" />
-
-</vector>
-
diff --git a/QSthemes/QSTileOreoCircleTrim/res/drawable/ic_brightness_thumb.xml b/QSthemes/QSTileOreoCircleTrim/res/drawable/ic_brightness_thumb.xml
deleted file mode 100644
index 8002d84..0000000
--- a/QSthemes/QSTileOreoCircleTrim/res/drawable/ic_brightness_thumb.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2018 Havoc-OS
-
-    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.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:height="15dp"
-        android:width="15dp"
-        android:viewportWidth="42.0"
-        android:viewportHeight="42.0">
-
-    <path
-        android:fillColor="?android:attr/colorControlNormal"
-        android:pathData="M 21 0 C 32.5979797464 0 42 9.40202025355 42 21 C 42 32.5979797464 32.5979797464 42 21 42 C 9.40202025355 42 0 32.5979797464 0 21 C 0 9.40202025355 9.40202025355 0 21 0 Z"
-        android:strokeWidth="1.0" />
-</vector>
diff --git a/QSthemes/QSTileOreoCircleTrim/res/drawable/ic_qs_brightness_auto_off.xml b/QSthemes/QSTileOreoCircleTrim/res/drawable/ic_qs_brightness_auto_off.xml
deleted file mode 100644
index a557f53..0000000
--- a/QSthemes/QSTileOreoCircleTrim/res/drawable/ic_qs_brightness_auto_off.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2018 Havoc-OS
-
-    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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="?android:attr/colorBackground"
-        android:pathData="M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z" />
-    <path
-        android:fillColor="?android:attr/colorControlNormal"
-        android:pathData="M20,8.69 V4h-4.69L12,0.69L8.69,4H4v4.69L0.69,12L4,15.31V20h4.69L12,23.31L15.31,20H20v-4.69L23.31,12L20,8.69z M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z M12,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5s5,-2.24 5,-5S14.76,7 12,7z" />
-</vector>
diff --git a/QSthemes/QSTileOreoCircleTrim/res/drawable/ic_qs_brightness_auto_on.xml b/QSthemes/QSTileOreoCircleTrim/res/drawable/ic_qs_brightness_auto_on.xml
deleted file mode 100644
index 8d3d625..0000000
--- a/QSthemes/QSTileOreoCircleTrim/res/drawable/ic_qs_brightness_auto_on.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2018 Havoc-OS
-
-    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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="?android:attr/colorPrimary"
-        android:pathData="M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z" />
-    <path
-        android:fillColor="?android:attr/colorControlNormal"
-        android:pathData="M11,7l-3.2,9h1.9l0.7,-2h3.2l0.7,2h1.9L13,7H11zM10.85,12.65L12,9l1.15,3.65H10.85z" />
-    <path
-        android:fillColor="?android:attr/colorControlNormal"
-        android:pathData="M20,8.69 V4h-4.69L12,0.69L8.69,4H4v4.69L0.69,12L4,15.31V20h4.69L12,23.31L15.31,20H20v-4.69L23.31,12L20,8.69z M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z" />
-</vector>
diff --git a/QSthemes/QSTileOreoCircleTrim/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileOreoCircleTrim/res/drawable/ic_qs_circle.xml
deleted file mode 100644
index de856da..0000000
--- a/QSthemes/QSTileOreoCircleTrim/res/drawable/ic_qs_circle.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2018 Havoc-OS
-
-    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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="40dp"
-    android:height="40dp"
-    android:viewportWidth="40"
-    android:viewportHeight="40">
-
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M20,0.5C9.2,0.5,0.5,9.2,0.5,20S9.2,39.5,20,39.5c10.8,0,19.5-8.7,19.5-19.5S30.8,0.5,20,0.5 M20,38.2 C9.9,38.2,1.8,30.1,1.8,20S9.9,1.8,20,1.8c10.1,0,18.2,8.2,18.2,18.2S30.1,38.2,20,38.2" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M20,37.4c-9.6,0-17.4-7.8-17.4-17.4c0-9.6,7.8-17.4,17.4-17.4c9.6,0,17.4,7.8,17.4,17.4 C37.4,29.6,29.6,37.4,20,37.4 M20,2.8C10.5,2.8,2.8,10.5,2.8,20c0,9.5,7.7,17.2,17.2,17.2S37.2,29.5,37.2,20 C37.2,10.5,29.5,2.8,20,2.8" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M20,36.6c-9.1,0-16.6-7.4-16.6-16.6c0-9.1,7.4-16.6,16.6-16.6c9.1,0,16.6,7.4,16.6,16.6 C36.6,29.2,29.1,36.6,20,36.6 M20,3.6C11,3.6,3.6,11,3.6,20S11,36.4,20,36.4c9,0,16.4-7.3,16.4-16.4S29,3.6,20,3.6" />
-</vector>
diff --git a/QSthemes/QSTileOreoCircleTrim/res/values/colors.xml b/QSthemes/QSTileOreoCircleTrim/res/values/colors.xml
deleted file mode 100644
index 2eaae4c..0000000
--- a/QSthemes/QSTileOreoCircleTrim/res/values/colors.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2016 Project Substratum
-
-    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>
-    <!-- QS tiles Active, Inactive and Unavailable tint (Requires config_enable_qs_tile_tinting bool set to true) -->
-    <color name="qs_tiles_active_tint">@*android:color/accent_device_default_light</color>
-    <color name="qs_tiles_inactive_tint">@*android:color/omni_text1</color>
-    <color name="qs_tiles_unavailable_tint">@*android:color/omni_text2</color> <!-- keep in mind that the code adds 0.26 (light) or 0.30 (dark) alpha to this color. -->
-
-    <!-- QS tiles background Active, Disable, and Inactive tint (Requires config_enable_qs_tile_tinting bool set to true) -->
-    <color name="qs_tiles_background_active_tint">@*android:color/accent_device_default_light</color>
-    <color name="qs_tiles_background_disabled_tint">@*android:color/omni_text1</color> <!-- keep in mind that the code adds 0.26 (light) or 0.30 (dark) alpha to this color. -->
-    <color name="qs_tiles_background_inactive_tint">@*android:color/omni_text2</color>
-
-    <!-- QS tiles expand, underline and label colors -->
-    <color name="qs_tiles_expand_tint">@*android:color/omni_text1</color>
-    <color name="qs_tiles_label_color">@*android:color/omni_text1</color>
-    <color name="qs_tiles_secondary_label_color">@*android:color/omni_text2</color>
-    <color name="qs_tiles_underline_color">@*android:color/omni_text1</color>
-
-</resources>
diff --git a/QSthemes/QSTileOreoCircleTrim/res/values/config.xml b/QSthemes/QSTileOreoCircleTrim/res/values/config.xml
deleted file mode 100644
index e23e4b0..0000000
--- a/QSthemes/QSTileOreoCircleTrim/res/values/config.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017-2018 Projekt Substratum
-      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>
-     <!-- Config to enable/diaable qs tile tinting -->
-    <bool name="config_enable_qs_tile_tinting">true</bool>
- </resources>
\ No newline at end of file
diff --git a/QSthemes/QSTileOreoCircleTrim/res/values/strings.xml b/QSthemes/QSTileOreoCircleTrim/res/values/strings.xml
deleted file mode 100644
index c7606d3..0000000
--- a/QSthemes/QSTileOreoCircleTrim/res/values/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2018 Havoc-OS
-
-    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="qstile_oreo_circle_trim">Oreo (Circle Trim)</string>
-
-</resources>
diff --git a/QSthemes/QSTileOreoSquircleTrim/Android.mk b/QSthemes/QSTileOreoSquircleTrim/Android.mk
deleted file mode 100644
index 300210a..0000000
--- a/QSthemes/QSTileOreoSquircleTrim/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-CAL_MODULE_TAGS := optional
-
-LOCAL_PACKAGE_NAME := QSTileOreoSquircleTrim
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
-
-include $(BUILD_PACKAGE)
diff --git a/QSthemes/QSTileOreoSquircleTrim/AndroidManifest.xml b/QSthemes/QSTileOreoSquircleTrim/AndroidManifest.xml
deleted file mode 100644
index b562de6..0000000
--- a/QSthemes/QSTileOreoSquircleTrim/AndroidManifest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.systemui.qstile.oreosquircletrim"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <overlay android:targetPackage="com.android.systemui" android:priority="1"/>
-
-    <application android:label="@string/qstile_oreo_squircle_trim" android:hasCode="false"/>
-</manifest>
diff --git a/QSthemes/QSTileOreoSquircleTrim/res/drawable/ic_brightness_left.xml b/QSthemes/QSTileOreoSquircleTrim/res/drawable/ic_brightness_left.xml
deleted file mode 100644
index 21042ec..0000000
--- a/QSthemes/QSTileOreoSquircleTrim/res/drawable/ic_brightness_left.xml
+++ /dev/null
@@ -1,28 +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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="27dp"
-    android:height="36dp"
-    android:viewportWidth="36.0"
-    android:viewportHeight="48.0">
-
-    <path
-        android:fillColor="?android:attr/colorControlNormal"
-        android:pathData="m 18,29.073759 v 0 c 2.802161,0 5.07376,-2.271599 5.07376,-5.073759 0,-2.80216 -2.271599,-5.07376 -5.07376,-5.07376 -2.802161,0 -5.07376,2.2716 -5.07376,5.07376 0,2.80216 2.271599,5.073759 5.07376,5.073759 z m 0,3.382507 v 0 c -4.670268,0 -8.4562669,-3.786 -8.4562669,-8.456266 0,-4.670267 3.7859989,-8.456267 8.4562669,-8.456267 4.670267,0 8.456267,3.786 8.456267,8.456267 0,4.670266 -3.786,8.456266 -8.456267,8.456266 z"
-        android:strokeWidth="1.0" />
-
-</vector>
-
diff --git a/QSthemes/QSTileOreoSquircleTrim/res/drawable/ic_brightness_right.xml b/QSthemes/QSTileOreoSquircleTrim/res/drawable/ic_brightness_right.xml
deleted file mode 100644
index 5c47bf6..0000000
--- a/QSthemes/QSTileOreoSquircleTrim/res/drawable/ic_brightness_right.xml
+++ /dev/null
@@ -1,28 +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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="27dp"
-    android:height="36dp"
-    android:viewportWidth="36.0"
-    android:viewportHeight="48.0">
-
-    <path
-        android:fillColor="?android:attr/colorControlNormal"
-        android:pathData="m 18,31.449538 v 0 c 4.114266,0 7.449538,-3.335272 7.449538,-7.449538 0,-4.114267 -3.335272,-7.449538 -7.449538,-7.449538 -4.114266,0 -7.449538,3.335271 -7.449538,7.449538 0,4.114266 3.335272,7.449538 7.449538,7.449538 z m 0,2.979815 C 12.240027,34.429353 7.570646,29.759973 7.570646,24 7.570646,18.240027 12.240027,13.570646 18,13.570646 c 5.759973,0 10.429354,4.669381 10.429354,10.429354 0,5.759973 -4.669381,10.429353 -10.429354,10.429353 z m 0,-5.95963 c 2.46856,0 4.469723,-2.001163 4.469723,-4.469723 0,-2.46856 -2.001163,-4.469723 -4.469723,-4.469723 -2.46856,0 -4.469723,2.001163 -4.469723,4.469723 0,2.46856 2.001163,4.469723 4.469723,4.469723 z"
-        android:strokeWidth="1.0" />
-
-</vector>
-
diff --git a/QSthemes/QSTileOreoSquircleTrim/res/drawable/ic_brightness_thumb.xml b/QSthemes/QSTileOreoSquircleTrim/res/drawable/ic_brightness_thumb.xml
deleted file mode 100644
index 8002d84..0000000
--- a/QSthemes/QSTileOreoSquircleTrim/res/drawable/ic_brightness_thumb.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2018 Havoc-OS
-
-    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.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:height="15dp"
-        android:width="15dp"
-        android:viewportWidth="42.0"
-        android:viewportHeight="42.0">
-
-    <path
-        android:fillColor="?android:attr/colorControlNormal"
-        android:pathData="M 21 0 C 32.5979797464 0 42 9.40202025355 42 21 C 42 32.5979797464 32.5979797464 42 21 42 C 9.40202025355 42 0 32.5979797464 0 21 C 0 9.40202025355 9.40202025355 0 21 0 Z"
-        android:strokeWidth="1.0" />
-</vector>
diff --git a/QSthemes/QSTileOreoSquircleTrim/res/drawable/ic_qs_brightness_auto_off.xml b/QSthemes/QSTileOreoSquircleTrim/res/drawable/ic_qs_brightness_auto_off.xml
deleted file mode 100644
index a557f53..0000000
--- a/QSthemes/QSTileOreoSquircleTrim/res/drawable/ic_qs_brightness_auto_off.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2018 Havoc-OS
-
-    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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="?android:attr/colorBackground"
-        android:pathData="M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z" />
-    <path
-        android:fillColor="?android:attr/colorControlNormal"
-        android:pathData="M20,8.69 V4h-4.69L12,0.69L8.69,4H4v4.69L0.69,12L4,15.31V20h4.69L12,23.31L15.31,20H20v-4.69L23.31,12L20,8.69z M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z M12,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5s5,-2.24 5,-5S14.76,7 12,7z" />
-</vector>
diff --git a/QSthemes/QSTileOreoSquircleTrim/res/drawable/ic_qs_brightness_auto_on.xml b/QSthemes/QSTileOreoSquircleTrim/res/drawable/ic_qs_brightness_auto_on.xml
deleted file mode 100644
index 8d3d625..0000000
--- a/QSthemes/QSTileOreoSquircleTrim/res/drawable/ic_qs_brightness_auto_on.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2018 Havoc-OS
-
-    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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="?android:attr/colorPrimary"
-        android:pathData="M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z" />
-    <path
-        android:fillColor="?android:attr/colorControlNormal"
-        android:pathData="M11,7l-3.2,9h1.9l0.7,-2h3.2l0.7,2h1.9L13,7H11zM10.85,12.65L12,9l1.15,3.65H10.85z" />
-    <path
-        android:fillColor="?android:attr/colorControlNormal"
-        android:pathData="M20,8.69 V4h-4.69L12,0.69L8.69,4H4v4.69L0.69,12L4,15.31V20h4.69L12,23.31L15.31,20H20v-4.69L23.31,12L20,8.69z M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z" />
-</vector>
diff --git a/QSthemes/QSTileOreoSquircleTrim/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileOreoSquircleTrim/res/drawable/ic_qs_circle.xml
deleted file mode 100644
index 379b75f..0000000
--- a/QSthemes/QSTileOreoSquircleTrim/res/drawable/ic_qs_circle.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2018 Havoc-OS
-
-    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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="40dp"
-    android:height="40dp"
-    android:viewportWidth="40"
-    android:viewportHeight="40">
-
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M20,39.1c-2,0-3.9,0-5.9,0c-6.4,0-11.7-4.2-13-10.5c-0.2-0.9-0.3-1.8-0.3-2.7c0-3.9,0-7.9,0-11.8c0-6.3,4.3-11.6,10.5-12.9 c0.9-0.2,1.8-0.3,2.7-0.3c4,0,8,0,12,0c6.4,0,11.7,4.3,13,10.5c0.2,0.9,0.3,1.8,0.3,2.7c0,3.9,0,7.8,0,11.7c0,6.4-4.3,11.6-10.5,13 c-0.9,0.2-1.8,0.3-2.8,0.3C24,39.1,22,39.1,20,39.1z M20,37.9c2,0,3.9,0,5.9,0c0.6,0,1.2,0,1.8-0.1c6.1-0.9,10.4-5.8,10.4-12 c0-3.9,0-7.8,0-11.7c0-0.9-0.1-1.8-0.3-2.7c-1.3-5.6-6-9.4-11.8-9.4c-3.9,0-7.9,0-11.8,0c-0.6,0-1.1,0-1.7,0.1C6.4,3,2,8,2,14.2 c0,3.9,0,7.8,0,11.7c0,0.8,0.1,1.5,0.2,2.3c1.1,5.8,6,9.8,11.9,9.8C16.1,37.9,18.1,37.9,20,37.9z" />
-</vector>
diff --git a/QSthemes/QSTileOreoSquircleTrim/res/values/colors.xml b/QSthemes/QSTileOreoSquircleTrim/res/values/colors.xml
deleted file mode 100644
index 2eaae4c..0000000
--- a/QSthemes/QSTileOreoSquircleTrim/res/values/colors.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2016 Project Substratum
-
-    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>
-    <!-- QS tiles Active, Inactive and Unavailable tint (Requires config_enable_qs_tile_tinting bool set to true) -->
-    <color name="qs_tiles_active_tint">@*android:color/accent_device_default_light</color>
-    <color name="qs_tiles_inactive_tint">@*android:color/omni_text1</color>
-    <color name="qs_tiles_unavailable_tint">@*android:color/omni_text2</color> <!-- keep in mind that the code adds 0.26 (light) or 0.30 (dark) alpha to this color. -->
-
-    <!-- QS tiles background Active, Disable, and Inactive tint (Requires config_enable_qs_tile_tinting bool set to true) -->
-    <color name="qs_tiles_background_active_tint">@*android:color/accent_device_default_light</color>
-    <color name="qs_tiles_background_disabled_tint">@*android:color/omni_text1</color> <!-- keep in mind that the code adds 0.26 (light) or 0.30 (dark) alpha to this color. -->
-    <color name="qs_tiles_background_inactive_tint">@*android:color/omni_text2</color>
-
-    <!-- QS tiles expand, underline and label colors -->
-    <color name="qs_tiles_expand_tint">@*android:color/omni_text1</color>
-    <color name="qs_tiles_label_color">@*android:color/omni_text1</color>
-    <color name="qs_tiles_secondary_label_color">@*android:color/omni_text2</color>
-    <color name="qs_tiles_underline_color">@*android:color/omni_text1</color>
-
-</resources>
diff --git a/QSthemes/QSTileOreoSquircleTrim/res/values/config.xml b/QSthemes/QSTileOreoSquircleTrim/res/values/config.xml
deleted file mode 100644
index e23e4b0..0000000
--- a/QSthemes/QSTileOreoSquircleTrim/res/values/config.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017-2018 Projekt Substratum
-      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>
-     <!-- Config to enable/diaable qs tile tinting -->
-    <bool name="config_enable_qs_tile_tinting">true</bool>
- </resources>
\ No newline at end of file
diff --git a/QSthemes/QSTileOreoSquircleTrim/res/values/strings.xml b/QSthemes/QSTileOreoSquircleTrim/res/values/strings.xml
deleted file mode 100644
index e93f933..0000000
--- a/QSthemes/QSTileOreoSquircleTrim/res/values/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2018 Havoc-OS
-
-    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="qstile_oreo_squircle_trim">Oreo (Squircle Trim)</string>
-
-</resources>
diff --git a/QSthemes/QSTilePokesign/Android.mk b/QSthemes/QSTilePokesign/Android.mk
deleted file mode 100644
index 86c1d4a..0000000
--- a/QSthemes/QSTilePokesign/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_PACKAGE_NAME := QSTilePokesign
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
-include $(BUILD_PACKAGE)
diff --git a/QSthemes/QSTilePokesign/AndroidManifest.xml b/QSthemes/QSTilePokesign/AndroidManifest.xml
deleted file mode 100644
index 79f6a57..0000000
--- a/QSthemes/QSTilePokesign/AndroidManifest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.systemui.qstile.pokesign"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <overlay android:targetPackage="com.android.systemui" android:priority="1"/>
-
-    <application android:label="Pokesign" android:hasCode="false" />
-</manifest>
diff --git a/QSthemes/QSTilePokesign/res/drawable/ic_qs_circle.xml b/QSthemes/QSTilePokesign/res/drawable/ic_qs_circle.xml
deleted file mode 100644
index b5e85fd..0000000
--- a/QSthemes/QSTilePokesign/res/drawable/ic_qs_circle.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="48.0"
-    android:viewportWidth="48.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#fff" android:pathData="M24,0C10.95,0 0.36,10.58 0.36,23.64c0,13.06 10.58,23.64 23.64,23.64c13.05,0 23.64,-10.58 23.64,-23.64C47.64,10.58 37.05,0 24,0zM24,42.64c-10.49,0 -19,-8.51 -19,-19C5,13.14 13.51,4.63 24,4.63c10.49,0 19,8.51 19,19C43,34.13 34.49,42.64 24,42.64z"/>
-    <path android:fillColor="#fff" android:pathData="M23.91,18.65c2.54,0 4.62,1.9 4.95,4.35h9.72C38.24,15.23 31.85,9.03 24,9.03S9.76,15.23 9.42,23h9.54C19.29,20.55 21.37,18.65 23.91,18.65z"/>
-    <path android:fillColor="#fff" android:pathData="M23.91,28.68c-2.3,0 -4.22,-1.56 -4.81,-3.68H9.46C10.15,32.43 16.39,38.25 24,38.25c7.61,0 13.85,-5.82 14.54,-13.25h-9.82C28.13,27.12 26.21,28.68 23.91,28.68z"/>
-</vector>
-
diff --git a/QSthemes/QSTileSquaremedo/Android.mk b/QSthemes/QSTileSquaremedo/Android.mk
deleted file mode 100644
index ef21e6f..0000000
--- a/QSthemes/QSTileSquaremedo/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_PACKAGE_NAME := QSTileSquaremedo
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
-include $(BUILD_PACKAGE)
diff --git a/QSthemes/QSTileSquaremedo/AndroidManifest.xml b/QSthemes/QSTileSquaremedo/AndroidManifest.xml
deleted file mode 100644
index aa42db7..0000000
--- a/QSthemes/QSTileSquaremedo/AndroidManifest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.systemui.qstile.squaremedo"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <overlay android:targetPackage="com.android.systemui" android:priority="1"/>
-
-    <application android:label="Squaremedo" android:hasCode="false" />
-</manifest>
diff --git a/QSthemes/QSTileSquaremedo/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileSquaremedo/res/drawable/ic_qs_circle.xml
deleted file mode 100644
index cd79220..0000000
--- a/QSthemes/QSTileSquaremedo/res/drawable/ic_qs_circle.xml
+++ /dev/null
@@ -1,214 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="40dp"
-        android:height="40dp"
-        android:viewportWidth="48.0"
-        android:viewportHeight="48.0">
-    <path
-        android:pathData="M7.92,31.72l8.35,8.36l1.06,0l-9.42,-9.42z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.50"/>
-    <path
-        android:pathData="M1.26,24l5.91,-5.91l0,-1.06l-6.97,6.97l6.97,6.97l0,-1.06z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.50"/>
-    <path
-        android:pathData="M24,46.74l-5.91,-5.91l-1.06,0l6.97,6.97l6.97,-6.97l-1.06,0z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.50"/>
-    <path
-        android:pathData="M30.66,40.08l1.06,0l8.36,-8.36l0,-1.06z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.50"/>
-    <path
-        android:pathData="M46.74,24l-5.91,5.91l0,1.06l6.97,-6.97l-6.97,-6.97l0,1.06z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.50"/>
-    <path
-        android:pathData="M16.28,7.92l-8.36,8.36l0,1.06l9.42,-9.42z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.50"/>
-    <path
-        android:pathData="M24,1.26l5.91,5.91l1.06,0l-6.97,-6.97l-6.97,6.97l1.06,0z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.50"/>
-    <path
-        android:pathData="M40.08,16.28l-8.36,-8.36l-1.06,0l9.42,9.42z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.50"/>
-    <path
-        android:pathData="M29.27,7.92l1.39,0l-0.75,-0.75l-1.39,0z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.75"/>
-    <path
-        android:pathData="M19.48,7.17l-1.39,0l-0.75,0.75l1.39,0z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.75"/>
-    <path
-        android:pathData="M40.08,29.08l0,1.58l0.75,-0.75l0,-1.58z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.75"/>
-    <path
-        android:pathData="M40.83,19.48l0,-1.39l-0.75,-0.75l0,1.39z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.75"/>
-    <path
-        android:pathData="M40.83,30.97l-0.75,0.75l0,8.36l-8.36,0l-0.75,0.75l9.86,0z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.75"/>
-    <path
-        android:pathData="M40.08,7.92l0,8.36l0.75,0.75l0,-9.86l-9.86,0l0.75,0.75z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.75"/>
-    <path
-        android:pathData="M18.92,40.08l-1.58,0l0.75,0.75l1.58,0z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.75"/>
-    <path
-        android:pathData="M28.33,40.83l1.58,0l0.75,-0.75l-1.58,0z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.75"/>
-    <path
-        android:pathData="M7.92,18.73l0,-1.39l-0.75,0.75l0,1.39z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.75"/>
-    <path
-        android:pathData="M7.92,7.92l8.36,0l0.75,-0.75l-9.86,0l0,9.86l0.75,-0.75z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.75"/>
-    <path
-        android:pathData="M7.92,40.08l0,-8.36l-0.75,-0.75l0,9.86l9.85,0l-0.75,-0.75z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.75"/>
-    <path
-        android:pathData="M7.17,28.33l0,1.58l0.75,0.75l0,-1.58z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.75"/>
-    <path
-        android:pathData="M17.34,40.08l-1.06,0l0.75,0.75l1.06,0z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.75"/>
-    <path
-        android:pathData="M30.66,7.92l1.06,0l-0.75,-0.75l-1.06,0z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.75"/>
-    <path
-        android:pathData="M40.08,17.34l0.75,0.75l0,-1.06l-0.75,-0.75z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.75"/>
-    <path
-        android:pathData="M17.34,7.92l0.75,-0.75l-1.06,0l-0.75,0.75z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.75"/>
-    <path
-        android:pathData="M30.66,40.08l-0.75,0.75l1.06,0l0.75,-0.75z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.75"/>
-    <path
-        android:pathData="M7.92,30.66l-0.75,-0.75l0,1.06l0.75,0.75z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.75"/>
-    <path
-        android:pathData="M40.08,30.66l0,1.06l0.75,-0.75l0,-1.06z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.75"/>
-    <path
-        android:pathData="M7.92,17.34l0,-1.06l-0.75,0.75l0,1.06z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.75"/>
-    <path
-        android:pathData="M7.92,28.65l0,0.43l11,11l0.43,0z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M28.65,40.08l0.43,0l11,-11l0,-0.43z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M24,44.72l-3.9,-3.9l-0.43,0l4.33,4.33l4.33,-4.33l-0.43,0z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M3.28,24l3.9,-3.9l0,-0.63l-4.43,4.43l4.43,4.43l0,-0.43z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M19.35,7.92l-0.63,0l-10.8,10.8l0,0.63z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M44.72,24l-3.9,3.9l0,0.43l4.43,-4.43l-4.43,-4.43l0,0.63z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M40.08,19.35l0,-0.63l-10.8,-10.8l-0.63,0z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M24,3.28l3.9,3.9l0.63,0l-4.52,-4.52l-4.52,4.52l0.63,0z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M28.65,7.92l0.63,0l-0.75,-0.75l-0.63,0z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M40.83,20.1l0,-0.63l-0.75,-0.75l0,0.63z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M20.1,7.17l-0.63,0l-0.75,0.75l0.63,0z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M7.92,19.35l0,-0.63l-0.75,0.75l0,0.63z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M7.17,27.9l0,0.43l0.75,0.75l0,-0.43z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M27.9,40.83l0.43,0l0.75,-0.75l-0.43,0z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M40.83,27.9l-0.75,0.75l0,0.43l0.75,-0.75z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M19.35,40.08l-0.43,0l0.75,0.75l0.43,0z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M3.81,23.9l3.36,-3.37l0,-0.43l-3.9,3.9l3.9,3.9l0,-0.63z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M40.08,19.79l0,-0.43l-11.43,-11.43l-0.43,0z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M24,3.71l3.46,3.46l0.43,0l-3.9,-3.9l-3.9,3.9l0.43,0z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M19.79,7.92l-0.43,0l-11.43,11.43l0,0.43z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M24,44.1l-3.27,-3.27l-0.63,0l3.9,3.9l3.9,-3.9l-0.63,0z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M40.83,20.1l0,0.43l3.37,3.37l-3.37,3.37l0,0.63l3.9,-3.9z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M28.02,40.08l0.63,0l11.43,-11.43l0,-0.63z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M7.92,28.02l0,0.63l11.43,11.43l0.63,0z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M27.27,40.83l0.63,0l0.75,-0.75l-0.63,0z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M19.98,40.08l-0.63,0l0.75,0.75l0.63,0z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M7.17,27.27l0,0.63l0.75,0.75l0,-0.63z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M40.83,20.54l0,-0.43l-0.75,-0.75l0,0.43z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M40.08,28.02l0,0.63l0.75,-0.75l0,-0.63z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M28.21,7.92l0.43,0l-0.75,-0.75l-0.43,0z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M7.92,19.79l0,-0.43l-0.75,0.75l0,0.43z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M20.54,7.17l-0.43,0l-0.75,0.75l0.43,0z"
-        android:fillColor="#fff"/>
-</vector>
diff --git a/QSthemes/QSTileSquaremedo/res/values/colors.xml b/QSthemes/QSTileSquaremedo/res/values/colors.xml
deleted file mode 100644
index 2eaae4c..0000000
--- a/QSthemes/QSTileSquaremedo/res/values/colors.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2016 Project Substratum
-
-    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>
-    <!-- QS tiles Active, Inactive and Unavailable tint (Requires config_enable_qs_tile_tinting bool set to true) -->
-    <color name="qs_tiles_active_tint">@*android:color/accent_device_default_light</color>
-    <color name="qs_tiles_inactive_tint">@*android:color/omni_text1</color>
-    <color name="qs_tiles_unavailable_tint">@*android:color/omni_text2</color> <!-- keep in mind that the code adds 0.26 (light) or 0.30 (dark) alpha to this color. -->
-
-    <!-- QS tiles background Active, Disable, and Inactive tint (Requires config_enable_qs_tile_tinting bool set to true) -->
-    <color name="qs_tiles_background_active_tint">@*android:color/accent_device_default_light</color>
-    <color name="qs_tiles_background_disabled_tint">@*android:color/omni_text1</color> <!-- keep in mind that the code adds 0.26 (light) or 0.30 (dark) alpha to this color. -->
-    <color name="qs_tiles_background_inactive_tint">@*android:color/omni_text2</color>
-
-    <!-- QS tiles expand, underline and label colors -->
-    <color name="qs_tiles_expand_tint">@*android:color/omni_text1</color>
-    <color name="qs_tiles_label_color">@*android:color/omni_text1</color>
-    <color name="qs_tiles_secondary_label_color">@*android:color/omni_text2</color>
-    <color name="qs_tiles_underline_color">@*android:color/omni_text1</color>
-
-</resources>
diff --git a/QSthemes/QSTileSquaremedo/res/values/config.xml b/QSthemes/QSTileSquaremedo/res/values/config.xml
deleted file mode 100644
index e23e4b0..0000000
--- a/QSthemes/QSTileSquaremedo/res/values/config.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017-2018 Projekt Substratum
-      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>
-     <!-- Config to enable/diaable qs tile tinting -->
-    <bool name="config_enable_qs_tile_tinting">true</bool>
- </resources>
\ No newline at end of file
diff --git a/QSthemes/QSTileSquircle/Android.mk b/QSthemes/QSTileSquircle/Android.mk
deleted file mode 100644
index 46511ab..0000000
--- a/QSthemes/QSTileSquircle/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-CAL_MODULE_TAGS := optional
-
-LOCAL_PACKAGE_NAME := QSTileSquircle
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
-
-include $(BUILD_PACKAGE)
diff --git a/QSthemes/QSTileSquircle/AndroidManifest.xml b/QSthemes/QSTileSquircle/AndroidManifest.xml
deleted file mode 100644
index b8d3764..0000000
--- a/QSthemes/QSTileSquircle/AndroidManifest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.systemui.qstile.squircle"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <overlay android:targetPackage="com.android.systemui" android:priority="1"/>
-
-    <application android:label="Squircle" android:hasCode="false"/>
-</manifest>
diff --git a/QSthemes/QSTileSquircle/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileSquircle/res/drawable/ic_qs_circle.xml
deleted file mode 100644
index 3601b48..0000000
--- a/QSthemes/QSTileSquircle/res/drawable/ic_qs_circle.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="40dp"
-    android:height="40dp"
-    android:viewportWidth="100"
-    android:viewportHeight="100">
-
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z" />
-</vector>
diff --git a/QSthemes/QSTileSquircleTrim/Android.mk b/QSthemes/QSTileSquircleTrim/Android.mk
deleted file mode 100644
index 26b2a42..0000000
--- a/QSthemes/QSTileSquircleTrim/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-CAL_MODULE_TAGS := optional
-
-LOCAL_PACKAGE_NAME := QSTileSquircleTrim
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
-
-include $(BUILD_PACKAGE)
diff --git a/QSthemes/QSTileSquircleTrim/AndroidManifest.xml b/QSthemes/QSTileSquircleTrim/AndroidManifest.xml
deleted file mode 100644
index c6b4327..0000000
--- a/QSthemes/QSTileSquircleTrim/AndroidManifest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.systemui.qstile.squircletrim"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <overlay android:targetPackage="com.android.systemui" android:priority="1"/>
-
-    <application android:label="@string/qstile_squircle_trim" android:hasCode="false"/>
-</manifest>
diff --git a/QSthemes/QSTileSquircleTrim/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileSquircleTrim/res/drawable/ic_qs_circle.xml
deleted file mode 100644
index 5ebc1ff..0000000
--- a/QSthemes/QSTileSquircleTrim/res/drawable/ic_qs_circle.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-     Copyright (C) 2018 AquariOS
-
-     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.
-
-	 General description:
-	 Dual tone icon with frame around circle
-
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="40dp"
-    android:height="40dp"
-    android:viewportWidth="40"
-    android:viewportHeight="40">
-
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M20,39.1c-2,0-3.9,0-5.9,0c-6.4,0-11.7-4.2-13-10.5c-0.2-0.9-0.3-1.8-0.3-2.7c0-3.9,0-7.9,0-11.8c0-6.3,4.3-11.6,10.5-12.9 c0.9-0.2,1.8-0.3,2.7-0.3c4,0,8,0,12,0c6.4,0,11.7,4.3,13,10.5c0.2,0.9,0.3,1.8,0.3,2.7c0,3.9,0,7.8,0,11.7c0,6.4-4.3,11.6-10.5,13 c-0.9,0.2-1.8,0.3-2.8,0.3C24,39.1,22,39.1,20,39.1z M20,37.9c2,0,3.9,0,5.9,0c0.6,0,1.2,0,1.8-0.1c6.1-0.9,10.4-5.8,10.4-12 c0-3.9,0-7.8,0-11.7c0-0.9-0.1-1.8-0.3-2.7c-1.3-5.6-6-9.4-11.8-9.4c-3.9,0-7.9,0-11.8,0c-0.6,0-1.1,0-1.7,0.1C6.4,3,2,8,2,14.2 c0,3.9,0,7.8,0,11.7c0,0.8,0.1,1.5,0.2,2.3c1.1,5.8,6,9.8,11.9,9.8C16.1,37.9,18.1,37.9,20,37.9z" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M19.9,3c1.8,0,3.7,0,5.5,0c5,0.1,8.6,2.5,10.7,7c0.6,1.3,0.9,2.7,0.9,4.2c0,3.7,0.1,7.5,0,11.2c-0.1,5-2.5,8.5-7,10.6 c-1.3,0.6-2.8,0.9-4.3,0.9c-3.7,0-7.5,0.1-11.2,0c-5-0.1-8.5-2.5-10.6-7C3.3,28.6,3,27,3,25.4c0-3.7-0.1-7.4,0-11.1 C3.2,9.8,5.4,6.4,9.4,4.3C11.1,3.4,12.9,3,14.7,3C16.5,3,18.2,3,19.9,3z" />
-</vector>
diff --git a/QSthemes/QSTileSquircleTrim/res/values/strings.xml b/QSthemes/QSTileSquircleTrim/res/values/strings.xml
deleted file mode 100644
index 7a6daee..0000000
--- a/QSthemes/QSTileSquircleTrim/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="qstile_squircle_trim">Squircle with trim</string>
-
-</resources>
diff --git a/QSthemes/QSTileTearDrop/Android.mk b/QSthemes/QSTileTearDrop/Android.mk
deleted file mode 100644
index f62c18c..0000000
--- a/QSthemes/QSTileTearDrop/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-CAL_MODULE_TAGS := optional
-
-LOCAL_PACKAGE_NAME := QSTileTeardrop
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
-
-include $(BUILD_PACKAGE)
diff --git a/QSthemes/QSTileTearDrop/AndroidManifest.xml b/QSthemes/QSTileTearDrop/AndroidManifest.xml
deleted file mode 100644
index e7f83f0..0000000
--- a/QSthemes/QSTileTearDrop/AndroidManifest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.systemui.qstile.teardrop"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <overlay android:targetPackage="com.android.systemui" android:priority="1"/>
-
-    <application android:label="TearDrop" android:hasCode="false"/>
-</manifest>
diff --git a/QSthemes/QSTileTearDrop/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileTearDrop/res/drawable/ic_qs_circle.xml
deleted file mode 100644
index b84c998..0000000
--- a/QSthemes/QSTileTearDrop/res/drawable/ic_qs_circle.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="40dp"
-    android:height="40dp"
-    android:viewportWidth="100"
-    android:viewportHeight="100">
-
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M50,0A50,50,0,0 1 100,50 L100,85 A15,15,0,0 1 85,100 L50,100 A50,50,0,0 1 50,0z" />
-</vector>
diff --git a/QSthemes/QSTileWavey/Android.mk b/QSthemes/QSTileWavey/Android.mk
deleted file mode 100644
index 82b30e6..0000000
--- a/QSthemes/QSTileWavey/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_PACKAGE_NAME := QSTileWavey
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
-include $(BUILD_PACKAGE)
diff --git a/QSthemes/QSTileWavey/AndroidManifest.xml b/QSthemes/QSTileWavey/AndroidManifest.xml
deleted file mode 100644
index d649789..0000000
--- a/QSthemes/QSTileWavey/AndroidManifest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.systemui.qstile.wavey"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <overlay android:targetPackage="com.android.systemui" android:priority="1"/>
-
-    <application android:label="Wavey" android:hasCode="false" />
-</manifest>
diff --git a/QSthemes/QSTileWavey/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileWavey/res/drawable/ic_qs_circle.xml
deleted file mode 100644
index ee7c73f..0000000
--- a/QSthemes/QSTileWavey/res/drawable/ic_qs_circle.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--suppress AndroidUnknownAttribute -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="40dp"
-        android:height="40dp"
-        android:viewportWidth="48.0"
-        android:viewportHeight="48.0">
-    <path
-        android:pathData="M19.37,44.11c-2.6,-1 -5.59,-1 -8.52,-0.51c3.76,2.54 8.29,4.02 13.17,4.02c5.97,0 11.41,-2.22 15.56,-5.88C33.66,45.52 26.74,46.93 19.37,44.11z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.25"/>
-    <path
-        android:pathData="M47.1,28.81c-1.97,0.59 -3.98,1.55 -5.77,3.11c-6.64,5.78 -14.97,8.62 -23.95,5.18c-3.84,-1.47 -8.53,-0.79 -12.64,0.48c1.66,2.36 3.73,4.4 6.12,6.01c2.93,-0.49 5.92,-0.48 8.52,0.51c7.37,2.82 14.29,1.41 20.2,-2.37C43.35,38.42 46.05,33.92 47.1,28.81z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.40"/>
-    <path
-        android:pathData="M17.37,37.11c8.99,3.44 17.31,0.6 23.95,-5.18c1.8,-1.56 3.8,-2.53 5.77,-3.11c0.31,-1.54 0.48,-3.13 0.48,-4.76c0,-1.21 -0.09,-2.4 -0.27,-3.56c-2.35,0.53 -4.82,1.55 -6.99,3.43c-6.64,5.78 -14.97,8.62 -23.95,5.18c-4.62,-1.77 -10.46,-0.42 -15.05,1.3c0.73,2.6 1.89,5.02 3.4,7.18C8.84,36.32 13.53,35.64 17.37,37.11z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.55"/>
-    <path
-        android:pathData="M16.37,29.11c8.99,3.44 17.31,0.6 23.95,-5.18c2.17,-1.89 4.64,-2.91 6.99,-3.43c-0.48,-3.14 -1.58,-6.09 -3.17,-8.69c-1.99,0.59 -4.01,1.55 -5.82,3.13c-6.64,5.78 -14.97,8.62 -23.95,5.18c-4.18,-1.6 -9.36,-0.65 -13.71,0.82c-0.14,1.02 -0.21,2.06 -0.21,3.12c0,2.2 0.31,4.33 0.87,6.35C5.91,28.68 11.75,27.34 16.37,29.11z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.70"/>
-    <path
-        android:pathData="M14.37,20.11c8.99,3.44 17.31,0.6 23.95,-5.18c1.81,-1.58 3.83,-2.54 5.82,-3.13c-1.86,-3.05 -4.4,-5.64 -7.4,-7.57c-0.83,0.47 -1.65,1.02 -2.42,1.7c-6.64,5.78 -14.97,8.62 -23.95,5.18c-1.7,-0.65 -3.57,-0.88 -5.48,-0.82c-2.22,3.08 -3.71,6.7 -4.23,10.64C5.01,19.46 10.19,18.51 14.37,20.11z"
-        android:fillColor="#fff"
-        android:fillAlpha="0.85"/>
-    <path
-        android:pathData="M10.37,11.11c8.99,3.44 17.31,0.6 23.95,-5.18c0.77,-0.67 1.59,-1.23 2.42,-1.7c-3.67,-2.36 -8.04,-3.74 -12.73,-3.74c-7.87,0 -14.84,3.87 -19.12,9.8C6.8,10.23 8.67,10.46 10.37,11.11z"
-        android:fillColor="#fff"/>
-</vector>
-
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>