diff --git a/google/themes/Bl4ckAndYell0/Android.mk b/google/themes/Bl4ckAndYell0/Android.mk
deleted file mode 100644
index e10d3f6..0000000
--- a/google/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/google/themes/Bl4ckAndYell0/AndroidManifest.xml b/google/themes/Bl4ckAndYell0/AndroidManifest.xml
deleted file mode 100644
index 67fe744..0000000
--- a/google/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/google/themes/Bl4ckAndYell0/assets/thumbnail.png b/google/themes/Bl4ckAndYell0/assets/thumbnail.png
deleted file mode 100644
index a1f9519..0000000
--- a/google/themes/Bl4ckAndYell0/assets/thumbnail.png
+++ /dev/null
Binary files differ
diff --git a/google/themes/Bl4ckAndYell0/res/color/ripple_material_light.xml b/google/themes/Bl4ckAndYell0/res/color/ripple_material_light.xml
deleted file mode 100644
index 07ce558..0000000
--- a/google/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/google/themes/Bl4ckAndYell0/res/drawable/toast_frame.xml b/google/themes/Bl4ckAndYell0/res/drawable/toast_frame.xml
deleted file mode 100644
index 5738837..0000000
--- a/google/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/google/themes/Bl4ckAndYell0/res/values/colors.xml b/google/themes/Bl4ckAndYell0/res/values/colors.xml
deleted file mode 100644
index fa3e992..0000000
--- a/google/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/google/themes/Bl4ckAndYell0/res/values/config.xml b/google/themes/Bl4ckAndYell0/res/values/config.xml
deleted file mode 100644
index a1802c8..0000000
--- a/google/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/google/themes/Bl4ckAndYell0/res/values/settings.xml b/google/themes/Bl4ckAndYell0/res/values/settings.xml
deleted file mode 100644
index 2b9e570..0000000
--- a/google/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.Material">
-        <item name="android:actionBarTheme">@*android:style/ThemeOverlay.DeviceDefault.ActionBar.Accent</item>
-        <item name="android:popupTheme">@*android:style/ThemeOverlay.DeviceDefault.Popup.Light</item>
-        <item name="android:colorEdgeEffect">@*android:color/omni_color4</item>
-        <item name="android:navigationBarDividerColor">#00000000</item>
-        <item name="android:navigationBarColor">@*android:color/omni_color2</item>
-        <item name="android:windowLightNavigationBar">false</item>
-        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
-        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
-        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
-        <item name="android:colorForeground">@*android:color/omni_text_primary</item>
-
-        <item name="android:colorPrimary">@*android:color/omni_color2</item>
-        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
-        <item name="android:colorSecondary">@*android:color/omni_color1</item>
-        <item name="android:colorAccent">@*android:color/omni_color5</item>
- 
-        <item name="android:textColorHint">@*android:color/omni_color3</item>
-        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text3</item>
-        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
-        <item name="android:colorControlHighlight">@*android:color/omni_color7</item>
-        <item name="android:colorControlActivated">@*android:color/omni_color5</item>
-
-    </style>
-</resources>
diff --git a/google/themes/Bl4ckAndYell0/res/values/styles.xml b/google/themes/Bl4ckAndYell0/res/values/styles.xml
deleted file mode 100644
index 2bfc794..0000000
--- a/google/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/google/themes/Bl4ckAndYell0/res/values/themes.xml b/google/themes/Bl4ckAndYell0/res/values/themes.xml
deleted file mode 100644
index e6f496b..0000000
--- a/google/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/google/themes/DarknessMeister/Android.mk b/google/themes/DarknessMeister/Android.mk
deleted file mode 100644
index 22b5bf3..0000000
--- a/google/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/google/themes/DarknessMeister/AndroidManifest.xml b/google/themes/DarknessMeister/AndroidManifest.xml
deleted file mode 100644
index 6df6222..0000000
--- a/google/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/google/themes/DarknessMeister/assets/thumbnail.png b/google/themes/DarknessMeister/assets/thumbnail.png
deleted file mode 100644
index 2170a69..0000000
--- a/google/themes/DarknessMeister/assets/thumbnail.png
+++ /dev/null
Binary files differ
diff --git a/google/themes/DarknessMeister/res/color/ripple_material_light.xml b/google/themes/DarknessMeister/res/color/ripple_material_light.xml
deleted file mode 100644
index 07ce558..0000000
--- a/google/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/google/themes/DarknessMeister/res/drawable/toast_frame.xml b/google/themes/DarknessMeister/res/drawable/toast_frame.xml
deleted file mode 100644
index 5738837..0000000
--- a/google/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/google/themes/DarknessMeister/res/values/colors.xml b/google/themes/DarknessMeister/res/values/colors.xml
deleted file mode 100644
index 5a41fbd..0000000
--- a/google/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/google/themes/DarknessMeister/res/values/config.xml b/google/themes/DarknessMeister/res/values/config.xml
deleted file mode 100644
index a1802c8..0000000
--- a/google/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/google/themes/DarknessMeister/res/values/settings.xml b/google/themes/DarknessMeister/res/values/settings.xml
deleted file mode 100644
index 8c94cbf..0000000
--- a/google/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.Material">
-        <item name="android:actionBarTheme">@*android:style/ThemeOverlay.DeviceDefault.ActionBar.Accent</item>
-        <item name="android:popupTheme">@*android:style/ThemeOverlay.DeviceDefault.Popup.Light</item>
-        <item name="android:colorEdgeEffect">@*android:color/omni_color4</item>
-        <item name="android:navigationBarDividerColor">#00000000</item>
-        <item name="android:navigationBarColor">@*android:color/omni_color2</item>
-        <item name="android:windowLightNavigationBar">false</item>
-        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
-        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
-        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
-        <item name="android:colorForeground">@*android:color/omni_text_primary</item>
-
-        <item name="android:colorPrimary">@*android:color/omni_color2</item>
-        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
-        <item name="android:colorSecondary">@*android:color/omni_color1</item>
-        <item name="android:colorAccent">@*android:color/omni_color5</item>
- 
-        <item name="android:textColorHint">@*android:color/omni_color3</item>
-        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text3</item>
-        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
-        <item name="android:colorControlHighlight">@*android:color/omni_color1</item>
-        <item name="android:colorControlActivated">@*android:color/omni_color5</item>
-
-    </style>
-</resources>
diff --git a/google/themes/DarknessMeister/res/values/strings.xml b/google/themes/DarknessMeister/res/values/strings.xml
deleted file mode 100644
index bf20dad..0000000
--- a/google/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/google/themes/DarknessMeister/res/values/styles.xml b/google/themes/DarknessMeister/res/values/styles.xml
deleted file mode 100644
index 2bfc794..0000000
--- a/google/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/google/themes/DarknessMeister/res/values/themes.xml b/google/themes/DarknessMeister/res/values/themes.xml
deleted file mode 100644
index e6f496b..0000000
--- a/google/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/google/themes/FromHell/Android.mk b/google/themes/FromHell/Android.mk
deleted file mode 100644
index 0e1c5da..0000000
--- a/google/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/google/themes/FromHell/AndroidManifest.xml b/google/themes/FromHell/AndroidManifest.xml
deleted file mode 100644
index 96a824e..0000000
--- a/google/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/google/themes/FromHell/assets/thumbnail.png b/google/themes/FromHell/assets/thumbnail.png
deleted file mode 100644
index ca02621..0000000
--- a/google/themes/FromHell/assets/thumbnail.png
+++ /dev/null
Binary files differ
diff --git a/google/themes/FromHell/res/color/ripple_material_light.xml b/google/themes/FromHell/res/color/ripple_material_light.xml
deleted file mode 100644
index 07ce558..0000000
--- a/google/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/google/themes/FromHell/res/drawable/toast_frame.xml b/google/themes/FromHell/res/drawable/toast_frame.xml
deleted file mode 100644
index 5738837..0000000
--- a/google/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/google/themes/FromHell/res/values/colors.xml b/google/themes/FromHell/res/values/colors.xml
deleted file mode 100644
index be10849..0000000
--- a/google/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/google/themes/FromHell/res/values/config.xml b/google/themes/FromHell/res/values/config.xml
deleted file mode 100644
index a1802c8..0000000
--- a/google/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/google/themes/FromHell/res/values/settings.xml b/google/themes/FromHell/res/values/settings.xml
deleted file mode 100644
index b8215f4..0000000
--- a/google/themes/FromHell/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.Material">
-        <item name="android:actionBarTheme">@*android:style/ThemeOverlay.DeviceDefault.ActionBar.Accent</item>
-        <item name="android:popupTheme">@*android:style/ThemeOverlay.DeviceDefault.Popup.Light</item>
-        <item name="android:colorEdgeEffect">@*android:color/omni_color4</item>
-        <item name="android:navigationBarDividerColor">#00000000</item>
-        <item name="android:navigationBarColor">@*android:color/omni_color2</item>
-        <item name="android:windowLightNavigationBar">false</item>
-        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
-        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
-        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
-        <item name="android:colorForeground">@*android:color/omni_text_primary</item>
-
-        <item name="android:colorPrimary">@*android:color/omni_color2</item>
-        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
-        <item name="android:colorSecondary">@*android:color/omni_color1</item>
-        <item name="android:colorAccent">@*android:color/omni_color5</item>
- 
-        <item name="android:textColorHint">@*android:color/omni_color3</item>
-        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text3</item>
-        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
-        <item name="android:colorControlHighlight">@*android:color/omni_color7</item>
-        <item name="android:colorControlActivated">@*android:color/omni_color5</item>
-
-    </style>
-</resources>
-
diff --git a/google/themes/FromHell/res/values/styles.xml b/google/themes/FromHell/res/values/styles.xml
deleted file mode 100644
index a379a5c..0000000
--- a/google/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/google/themes/FromHell/res/values/themes.xml b/google/themes/FromHell/res/values/themes.xml
deleted file mode 100644
index 9670076..0000000
--- a/google/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/google/themes/NotificationsDark/res/values/colors.xml b/google/themes/NotificationsDark/res/values/colors.xml
index 0d5db34..ea5e421 100644
--- a/google/themes/NotificationsDark/res/values/colors.xml
+++ b/google/themes/NotificationsDark/res/values/colors.xml
@@ -21,6 +21,7 @@
     <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/google/themes/NotificationsPrimary/res/values/colors.xml b/google/themes/NotificationsPrimary/res/values/colors.xml
index fef4ea3..6d32cf3 100644
--- a/google/themes/NotificationsPrimary/res/values/colors.xml
+++ b/google/themes/NotificationsPrimary/res/values/colors.xml
@@ -11,7 +11,7 @@
     <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>
@@ -20,5 +20,6 @@
     <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_text_color1">@*android:color/omni_text1</color>
+    <color name="notification_default_color_dark">@*android:color/omni_text3</color>
 </resources>
diff --git a/google/themes/OmniTheme/Android.mk b/google/themes/OmniTheme/Android.mk
deleted file mode 100644
index 518f2d9..0000000
--- a/google/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/google/themes/OmniTheme/AndroidManifest.xml b/google/themes/OmniTheme/AndroidManifest.xml
deleted file mode 100644
index 7345cf5..0000000
--- a/google/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/google/themes/OmniTheme/assets/thumbnail.png b/google/themes/OmniTheme/assets/thumbnail.png
deleted file mode 100644
index 03e66f2..0000000
--- a/google/themes/OmniTheme/assets/thumbnail.png
+++ /dev/null
Binary files differ
diff --git a/google/themes/OmniTheme/res/color/ripple_material_light.xml b/google/themes/OmniTheme/res/color/ripple_material_light.xml
deleted file mode 100644
index 07ce558..0000000
--- a/google/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/google/themes/OmniTheme/res/drawable/toast_frame.xml b/google/themes/OmniTheme/res/drawable/toast_frame.xml
deleted file mode 100644
index 5738837..0000000
--- a/google/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/google/themes/OmniTheme/res/values/colors.xml b/google/themes/OmniTheme/res/values/colors.xml
deleted file mode 100644
index ae9dbd0..0000000
--- a/google/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/google/themes/OmniTheme/res/values/config.xml b/google/themes/OmniTheme/res/values/config.xml
deleted file mode 100644
index a1802c8..0000000
--- a/google/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/google/themes/OmniTheme/res/values/settings.xml b/google/themes/OmniTheme/res/values/settings.xml
deleted file mode 100644
index 8c94cbf..0000000
--- a/google/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.Material">
-        <item name="android:actionBarTheme">@*android:style/ThemeOverlay.DeviceDefault.ActionBar.Accent</item>
-        <item name="android:popupTheme">@*android:style/ThemeOverlay.DeviceDefault.Popup.Light</item>
-        <item name="android:colorEdgeEffect">@*android:color/omni_color4</item>
-        <item name="android:navigationBarDividerColor">#00000000</item>
-        <item name="android:navigationBarColor">@*android:color/omni_color2</item>
-        <item name="android:windowLightNavigationBar">false</item>
-        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
-        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
-        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
-        <item name="android:colorForeground">@*android:color/omni_text_primary</item>
-
-        <item name="android:colorPrimary">@*android:color/omni_color2</item>
-        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
-        <item name="android:colorSecondary">@*android:color/omni_color1</item>
-        <item name="android:colorAccent">@*android:color/omni_color5</item>
- 
-        <item name="android:textColorHint">@*android:color/omni_color3</item>
-        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text3</item>
-        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
-        <item name="android:colorControlHighlight">@*android:color/omni_color1</item>
-        <item name="android:colorControlActivated">@*android:color/omni_color5</item>
-
-    </style>
-</resources>
diff --git a/google/themes/OmniTheme/res/values/strings.xml b/google/themes/OmniTheme/res/values/strings.xml
deleted file mode 100644
index bf20dad..0000000
--- a/google/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/google/themes/OmniTheme/res/values/styles.xml b/google/themes/OmniTheme/res/values/styles.xml
deleted file mode 100644
index 2bfc794..0000000
--- a/google/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/google/themes/OmniTheme/res/values/themes.xml b/google/themes/OmniTheme/res/values/themes.xml
deleted file mode 100644
index e6f496b..0000000
--- a/google/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/google/themes/Pixel/Android.mk b/google/themes/Pixel/Android.mk
deleted file mode 100644
index b9a1a5a..0000000
--- a/google/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/google/themes/Pixel/AndroidManifest.xml b/google/themes/Pixel/AndroidManifest.xml
deleted file mode 100644
index c4b21f9..0000000
--- a/google/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/google/themes/Pixel/res/values/colors.xml b/google/themes/Pixel/res/values/colors.xml
deleted file mode 100644
index a562edf..0000000
--- a/google/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/google/themes/SluttyPink/Android.mk b/google/themes/SluttyPink/Android.mk
deleted file mode 100644
index 31977a3..0000000
--- a/google/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/google/themes/SluttyPink/AndroidManifest.xml b/google/themes/SluttyPink/AndroidManifest.xml
deleted file mode 100644
index 9fb9105..0000000
--- a/google/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/google/themes/SluttyPink/assets/thumbnail.png b/google/themes/SluttyPink/assets/thumbnail.png
deleted file mode 100644
index 9841324..0000000
--- a/google/themes/SluttyPink/assets/thumbnail.png
+++ /dev/null
Binary files differ
diff --git a/google/themes/SluttyPink/res/color/ripple_material_light.xml b/google/themes/SluttyPink/res/color/ripple_material_light.xml
deleted file mode 100644
index 07ce558..0000000
--- a/google/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/google/themes/SluttyPink/res/drawable/toast_frame.xml b/google/themes/SluttyPink/res/drawable/toast_frame.xml
deleted file mode 100644
index 5738837..0000000
--- a/google/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/google/themes/SluttyPink/res/values/colors.xml b/google/themes/SluttyPink/res/values/colors.xml
deleted file mode 100644
index 91019c5..0000000
--- a/google/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/google/themes/SluttyPink/res/values/config.xml b/google/themes/SluttyPink/res/values/config.xml
deleted file mode 100644
index a1802c8..0000000
--- a/google/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/google/themes/SluttyPink/res/values/settings.xml b/google/themes/SluttyPink/res/values/settings.xml
deleted file mode 100644
index 8c94cbf..0000000
--- a/google/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.Material">
-        <item name="android:actionBarTheme">@*android:style/ThemeOverlay.DeviceDefault.ActionBar.Accent</item>
-        <item name="android:popupTheme">@*android:style/ThemeOverlay.DeviceDefault.Popup.Light</item>
-        <item name="android:colorEdgeEffect">@*android:color/omni_color4</item>
-        <item name="android:navigationBarDividerColor">#00000000</item>
-        <item name="android:navigationBarColor">@*android:color/omni_color2</item>
-        <item name="android:windowLightNavigationBar">false</item>
-        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
-        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
-        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
-        <item name="android:colorForeground">@*android:color/omni_text_primary</item>
-
-        <item name="android:colorPrimary">@*android:color/omni_color2</item>
-        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
-        <item name="android:colorSecondary">@*android:color/omni_color1</item>
-        <item name="android:colorAccent">@*android:color/omni_color5</item>
- 
-        <item name="android:textColorHint">@*android:color/omni_color3</item>
-        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text3</item>
-        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
-        <item name="android:colorControlHighlight">@*android:color/omni_color1</item>
-        <item name="android:colorControlActivated">@*android:color/omni_color5</item>
-
-    </style>
-</resources>
diff --git a/google/themes/SluttyPink/res/values/strings.xml b/google/themes/SluttyPink/res/values/strings.xml
deleted file mode 100644
index bf20dad..0000000
--- a/google/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/google/themes/SluttyPink/res/values/styles.xml b/google/themes/SluttyPink/res/values/styles.xml
deleted file mode 100644
index 2bfc794..0000000
--- a/google/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/google/themes/SluttyPink/res/values/themes.xml b/google/themes/SluttyPink/res/values/themes.xml
deleted file mode 100644
index e6f496b..0000000
--- a/google/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/google/themes/SmokedGreen/Android.mk b/google/themes/SmokedGreen/Android.mk
deleted file mode 100644
index bdf8f5c..0000000
--- a/google/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/google/themes/SmokedGreen/AndroidManifest.xml b/google/themes/SmokedGreen/AndroidManifest.xml
deleted file mode 100644
index 7ba3c74..0000000
--- a/google/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/google/themes/SmokedGreen/assets/thumbnail.png b/google/themes/SmokedGreen/assets/thumbnail.png
deleted file mode 100644
index 497b6c5..0000000
--- a/google/themes/SmokedGreen/assets/thumbnail.png
+++ /dev/null
Binary files differ
diff --git a/google/themes/SmokedGreen/res/color/ripple_material_light.xml b/google/themes/SmokedGreen/res/color/ripple_material_light.xml
deleted file mode 100644
index 07ce558..0000000
--- a/google/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/google/themes/SmokedGreen/res/drawable/toast_frame.xml b/google/themes/SmokedGreen/res/drawable/toast_frame.xml
deleted file mode 100644
index 5738837..0000000
--- a/google/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/google/themes/SmokedGreen/res/values/colors.xml b/google/themes/SmokedGreen/res/values/colors.xml
deleted file mode 100644
index 285f520..0000000
--- a/google/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/google/themes/SmokedGreen/res/values/config.xml b/google/themes/SmokedGreen/res/values/config.xml
deleted file mode 100644
index a1802c8..0000000
--- a/google/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/google/themes/SmokedGreen/res/values/settings.xml b/google/themes/SmokedGreen/res/values/settings.xml
deleted file mode 100644
index 8c94cbf..0000000
--- a/google/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.Material">
-        <item name="android:actionBarTheme">@*android:style/ThemeOverlay.DeviceDefault.ActionBar.Accent</item>
-        <item name="android:popupTheme">@*android:style/ThemeOverlay.DeviceDefault.Popup.Light</item>
-        <item name="android:colorEdgeEffect">@*android:color/omni_color4</item>
-        <item name="android:navigationBarDividerColor">#00000000</item>
-        <item name="android:navigationBarColor">@*android:color/omni_color2</item>
-        <item name="android:windowLightNavigationBar">false</item>
-        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
-        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
-        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
-        <item name="android:colorForeground">@*android:color/omni_text_primary</item>
-
-        <item name="android:colorPrimary">@*android:color/omni_color2</item>
-        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
-        <item name="android:colorSecondary">@*android:color/omni_color1</item>
-        <item name="android:colorAccent">@*android:color/omni_color5</item>
- 
-        <item name="android:textColorHint">@*android:color/omni_color3</item>
-        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text3</item>
-        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
-        <item name="android:colorControlHighlight">@*android:color/omni_color1</item>
-        <item name="android:colorControlActivated">@*android:color/omni_color5</item>
-
-    </style>
-</resources>
diff --git a/google/themes/SmokedGreen/res/values/strings.xml b/google/themes/SmokedGreen/res/values/strings.xml
deleted file mode 100644
index bf20dad..0000000
--- a/google/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/google/themes/SmokedGreen/res/values/styles.xml b/google/themes/SmokedGreen/res/values/styles.xml
deleted file mode 100644
index 2bfc794..0000000
--- a/google/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/google/themes/SmokedGreen/res/values/themes.xml b/google/themes/SmokedGreen/res/values/themes.xml
deleted file mode 100644
index e6f496b..0000000
--- a/google/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/google/themes/ZeroZero/Android.mk b/google/themes/ZeroZero/Android.mk
deleted file mode 100644
index 7daac2e..0000000
--- a/google/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/google/themes/ZeroZero/AndroidManifest.xml b/google/themes/ZeroZero/AndroidManifest.xml
deleted file mode 100644
index c68d157..0000000
--- a/google/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/google/themes/ZeroZero/assets/thumbnail.png b/google/themes/ZeroZero/assets/thumbnail.png
deleted file mode 100644
index cdfaf31..0000000
--- a/google/themes/ZeroZero/assets/thumbnail.png
+++ /dev/null
Binary files differ
diff --git a/google/themes/ZeroZero/res/color/ripple_material_light.xml b/google/themes/ZeroZero/res/color/ripple_material_light.xml
deleted file mode 100644
index 07ce558..0000000
--- a/google/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/google/themes/ZeroZero/res/drawable/toast_frame.xml b/google/themes/ZeroZero/res/drawable/toast_frame.xml
deleted file mode 100644
index 5738837..0000000
--- a/google/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/google/themes/ZeroZero/res/values/colors.xml b/google/themes/ZeroZero/res/values/colors.xml
deleted file mode 100644
index d62e1a1..0000000
--- a/google/themes/ZeroZero/res/values/colors.xml
+++ /dev/null
@@ -1,82 +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>
-
-    <!-- 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/google/themes/ZeroZero/res/values/config.xml b/google/themes/ZeroZero/res/values/config.xml
deleted file mode 100644
index a1802c8..0000000
--- a/google/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/google/themes/ZeroZero/res/values/settings.xml b/google/themes/ZeroZero/res/values/settings.xml
deleted file mode 100644
index 2b9e570..0000000
--- a/google/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.Material">
-        <item name="android:actionBarTheme">@*android:style/ThemeOverlay.DeviceDefault.ActionBar.Accent</item>
-        <item name="android:popupTheme">@*android:style/ThemeOverlay.DeviceDefault.Popup.Light</item>
-        <item name="android:colorEdgeEffect">@*android:color/omni_color4</item>
-        <item name="android:navigationBarDividerColor">#00000000</item>
-        <item name="android:navigationBarColor">@*android:color/omni_color2</item>
-        <item name="android:windowLightNavigationBar">false</item>
-        <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
-        <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
-        <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
-        <item name="android:colorForeground">@*android:color/omni_text_primary</item>
-
-        <item name="android:colorPrimary">@*android:color/omni_color2</item>
-        <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
-        <item name="android:colorSecondary">@*android:color/omni_color1</item>
-        <item name="android:colorAccent">@*android:color/omni_color5</item>
- 
-        <item name="android:textColorHint">@*android:color/omni_color3</item>
-        <item name="android:textColorAlertDialogListItem">@*android:color/omni_text3</item>
-        <item name="android:colorControlNormal">@*android:color/omni_color4</item>
-        <item name="android:colorControlHighlight">@*android:color/omni_color7</item>
-        <item name="android:colorControlActivated">@*android:color/omni_color5</item>
-
-    </style>
-</resources>
diff --git a/google/themes/ZeroZero/res/values/strings.xml b/google/themes/ZeroZero/res/values/strings.xml
deleted file mode 100644
index bf20dad..0000000
--- a/google/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/google/themes/ZeroZero/res/values/styles.xml b/google/themes/ZeroZero/res/values/styles.xml
deleted file mode 100644
index 2bfc794..0000000
--- a/google/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/google/themes/ZeroZero/res/values/themes.xml b/google/themes/ZeroZero/res/values/themes.xml
deleted file mode 100644
index e6f496b..0000000
--- a/google/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>