diff --git a/config/bliss_packages.mk b/config/bliss_packages.mk
index 70b7e21..8c77a36 100644
--- a/config/bliss_packages.mk
+++ b/config/bliss_packages.mk
@@ -60,12 +60,10 @@
     ThemePicker \
     BlissUpdater \
     BlissPapers \
-    SettingsIntelligenceGooglePrebuilt \
     Longshot \
     OPScreenRecorder \
     NexusWallpapersStubPrebuilt2019Static \
     GalleryGoPrebuilt \
-    PixelThemesStub2019 \
     AboutBliss \
     BlissStatistics \
     Contacts \
diff --git a/config/permissions/privapp-permissions-lineage-product.xml b/config/permissions/privapp-permissions-lineage-product.xml
index b14cf08..11234fe 100644
--- a/config/permissions/privapp-permissions-lineage-product.xml
+++ b/config/permissions/privapp-permissions-lineage-product.xml
@@ -32,20 +32,4 @@
         <permission name="android.permission.FORCE_STOP_PACKAGES"/>
     </privapp-permissions>
 
-    <privapp-permissions package="com.google.android.apps.nexuslauncher">
-        <permission name="android.permission.BIND_APPWIDGET"/>
-        <permission name="android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS"/>
-        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.intelligence.sense">
-        <permission name="android.permission.CAPTURE_AUDIO_HOTWORD"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.LOCATION_HARDWARE"/>
-        <permission name="android.permission.MANAGE_SOUND_TRIGGER"/>
-        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-    </privapp-permissions>
-
 </permissions>
diff --git a/overlay/common/frameworks/base/core/res/res/values-night/colors.xml b/overlay/common/frameworks/base/core/res/res/values-night/colors.xml
deleted file mode 100644
index ffadae3..0000000
--- a/overlay/common/frameworks/base/core/res/res/values-night/colors.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2019 crDroid Android 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>
-    <!-- The primary text color if the text is on top of a dark background.
-    This is also affects colorized notifications with dark backgrounds. -->
-    <color name="notification_primary_text_color_dark">#ffe5e5e5</color>
-
-    <!-- The secondary text color if the text is on top of a dark background. -->
-    <color name="notification_secondary_text_color_dark">#b3e5e5e5</color>
-
-    <color name="notification_default_color_dark">#ffe5e5e5</color>
-
-    <!-- The background color of a notification card. -->
-    <color name="notification_material_background_color">@android:color/material_grey_900</color> <!-- material_grey_900 -->
-
-    <color name="primary_material_dark">#ff151618</color> <!-- material_grey_900 -->
-    <color name="primary_material_settings">#ff151618</color> <!-- material_grey_900 -->
-    <color name="primary_dark_material_dark">#ff0f1012</color>
-    <color name="primary_dark_material_settings">#ff1a1b1e</color> <!-- material_grey_850 -->
-    <color name="secondary_material_settings">#ff202126</color> <!-- material_grey_800 -->
-    <color name="tertiary_material_settings">#ff5f6368</color>
-    <color name="quaternary_material_settings">#ffeeeeee</color> <!-- material_grey_200 -->
-
-    <color name="material_grey_900">#ff151618</color>
-    <color name="material_grey_850">#ff1a1b1e</color>
-    <color name="material_grey_800">#ff202126</color>
-    <color name="material_grey_600">#ff3c4043</color>
-    <color name="material_grey_300">#ffdadce0</color>
-    <color name="material_grey_200">#ffeeeeee</color>
-    <color name="material_grey_100">#ffe8eaed</color>
-    <color name="material_grey_50">#fff8f9fa</color>
-</resources>
diff --git a/overlay/common/frameworks/base/core/res/res/values-night/styles.xml b/overlay/common/frameworks/base/core/res/res/values-night/styles.xml
deleted file mode 100644
index 98ce651..0000000
--- a/overlay/common/frameworks/base/core/res/res/values-night/styles.xml
+++ /dev/null
@@ -1,451 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2018-2019 crDroid Android Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-    <style name="Theme.DeviceDefault.QuickSettings" parent="@*android:style/Theme.DeviceDefault">
-        <item name="android:colorPrimary">@*android:color/primary_device_default_dark</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings</item>
-        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
-        <item name="android:colorControlNormal">@*android:color/text_color_primary</item>
-        <item name="android:colorBackgroundFloating">@*android:color/material_grey_900</item>
-        <item name="android:alertDialogTheme">@*android:style/Theme.DeviceDefault.Light.Dialog.Alert</item>
-        <item name="android:textAppearanceButton">@*android:style/TextAppearance.DeviceDefault.Widget.Button</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
-        <item name="android:buttonBarButtonStyle">@*android:style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>
-        <item name="*android:colorProgressBackgroundNormal">@*android:color/config_progress_background_tint</item>
-        <item name="*android:progressBarCornerRadius">@*android:dimen/config_progressBarCornerRadius</item>
-        <item name="android:toolbarStyle">@*android:style/Widget.DeviceDefault.Toolbar</item>
-        <item name="android:panelColorBackground">@*android:color/primary_device_default_dark</item>
-    </style>
-    <style name="Theme.DeviceDefault.QuickSettings.Dialog" parent="@*android:style/Theme.DeviceDefault.Dialog">
-        <item name="android:colorPrimary">@*android:color/primary_device_default_dark</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings</item>
-        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
-        <item name="android:colorControlNormal">@*android:color/text_color_primary</item>
-        <item name="android:colorBackgroundFloating">@*android:color/material_grey_900</item>
-        <item name="android:colorError">@*android:color/error_color_device_default_light</item>
-        <item name="android:alertDialogTheme">@*android:style/Theme.DeviceDefault.Light.Dialog.Alert</item>
-        <item name="*android:colorProgressBackgroundNormal">@*android:color/config_progress_background_tint</item>
-        <item name="*android:progressBarCornerRadius">@*android:dimen/config_progressBarCornerRadius</item>
-        <item name="android:toolbarStyle">@*android:style/Widget.DeviceDefault.Toolbar</item>
-    </style>
-    <style name="Theme.DeviceDefault.Settings" parent="@*android:style/Theme.Material">
-        <item name="android:actionBarStyle">@*android:style/Widget.DeviceDefault.Light.ActionBar.Solid</item>
-        <item name="android:popupTheme">@*android:style/ThemeOverlay.DeviceDefault.Popup.Light</item>
-        <item name="android:colorPrimary">@*android:color/primary_device_default_dark</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
-        <item name="android:colorEdgeEffect">#ffffffff</item>
-        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings</item>
-        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
-        <item name="android:navigationBarColor">@*android:color/primary_device_default_dark</item>
-        <item name="android:textColorPrimaryInverse">@*android:color/background_material_dark</item>
-        <item name="android:colorBackground">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:textAppearanceButton">@*android:style/TextAppearance.DeviceDefault.Widget.Button</item>
-        <item name="android:windowLightStatusBar">false</item>
-        <item name="android:windowLightNavigationBar">false</item>
-        <item name="android:colorError">@*android:color/error_color_device_default_light</item>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:alertDialogTheme">@*android:style/Theme.DeviceDefault.Light.Dialog.Alert</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
-        <item name="android:buttonBarButtonStyle">@*android:style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>
-        <item name="*android:colorProgressBackgroundNormal">@*android:color/config_progress_background_tint</item>
-        <item name="*android:progressBarCornerRadius">@*android:dimen/config_progressBarCornerRadius</item>
-        <item name="android:toolbarStyle">@*android:style/Widget.DeviceDefault.Toolbar</item>
-    </style>
-    <style name="Theme.Material.Settings.BaseDialog" parent="@*android:style/Theme.Material.BaseDialog">
-        <item name="android:colorPrimary">@*android:color/primary_device_default_dark</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
-        <item name="android:colorBackground">@*android:color/primary_dark_device_default_settings</item>
-    </style>
-    <style name="Theme.Material.Settings.CompactMenu" parent="@*android:style/Theme.Material.CompactMenu">
-        <item name="android:colorPrimary">@*android:color/primary_device_default_dark</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
-        <item name="android:colorBackground">@*android:color/primary_dark_device_default_settings</item>
-    </style>
-    <style name="Theme.Material.Settings.Dialog.BaseAlert" parent="@*android:style/Theme.Material.Dialog.BaseAlert">
-        <item name="android:colorPrimary">@*android:color/primary_device_default_dark</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
-        <item name="android:colorBackground">@*android:color/primary_dark_device_default_settings</item>
-    </style>
-    <style name="Theme.Material.Settings.DialogWhenLarge" parent="@*android:style/Theme.Material.DialogWhenLarge">
-        <item name="android:colorPrimary">@*android:color/primary_device_default_dark</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
-        <item name="android:colorBackground">@*android:color/primary_dark_device_default_settings</item>
-    </style>
-    <style name="Theme.Material.Settings.DialogWhenLarge.NoActionBar" parent="@*android:style/Theme.Material.DialogWhenLarge.NoActionBar">
-        <item name="android:colorPrimary">@*android:color/primary_device_default_dark</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
-        <item name="android:colorBackground">@*android:color/primary_dark_device_default_settings</item>
-    </style>
-    <style name="Theme.Material.Settings.Dialog.Presentation" parent="@*android:style/Theme.Material.Dialog.Presentation">
-        <item name="android:colorPrimary">@*android:color/primary_device_default_dark</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
-        <item name="android:colorBackground">@*android:color/primary_dark_device_default_settings</item>
-    </style>
-    <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>
-        <item name="android:textColorPrimary">#ffffffff</item>
-        <item name="android:textColorSecondary">#fff5f5f5</item>
-        <item name="android:textColorTertiary">#b3f5f5f5</item>
-        <item name="android:textColorHint">#ff999999</item>
-        <item name="android:textColorAlertDialogListItem">#ffffffff</item>
-        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
-        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings</item>
-        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
-        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
-        <item name="android:colorBackground">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:alertDialogTheme">@*android:style/Theme.DeviceDefault.Light.Dialog.Alert</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
-        <item name="android:buttonBarButtonStyle">@*android:style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>
-        <item name="android:textAppearance">@*android:style/TextAppearance.DeviceDefault</item>
-        <item name="android:textAppearanceInverse">@*android:style/TextAppearance.DeviceDefault.Inverse</item>
-        <item name="android:textAppearanceButton">@*android:style/TextAppearance.DeviceDefault.Widget.Button</item>
-        <item name="android:colorError">@*android:color/error_color_device_default_light</item>
-        <item name="*android:colorProgressBackgroundNormal">@*android:color/config_progress_background_tint</item>
-        <item name="*android:progressBarCornerRadius">@*android:dimen/config_progressBarCornerRadius</item>
-        <item name="android:toolbarStyle">@*android:style/Widget.DeviceDefault.Toolbar</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>
-        <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>
-        <item name="android:textColorPrimary">#ffffffff</item>
-        <item name="android:textColorSecondary">#fff5f5f5</item>
-        <item name="android:textColorTertiary">#b3f5f5f5</item>
-        <item name="android:textColorHint">#ff999999</item>
-        <item name="android:textColorAlertDialogListItem">#ffffffff</item>
-        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
-        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings</item>
-        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
-        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
-        <item name="android:colorBackground">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorError">@*android:color/error_color_device_default_light</item>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:alertDialogTheme">@*android:style/Theme.DeviceDefault.Light.Dialog.Alert</item>
-        <item name="android:textAppearanceButton">@*android:style/TextAppearance.DeviceDefault.Widget.Button</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
-        <item name="android:buttonBarButtonStyle">@*android:style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>
-        <item name="*android:colorProgressBackgroundNormal">@*android:color/config_progress_background_tint</item>
-        <item name="*android:progressBarCornerRadius">@*android:dimen/config_progressBarCornerRadius</item>
-        <item name="android:toolbarStyle">@*android:style/Widget.DeviceDefault.Toolbar</item>
-    </style>
-    <style name="Theme.DeviceDefault.Light.Dialog.MinWidth" parent="@*android:style/Theme.Material.Dialog.MinWidth">
-        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
-        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings</item>
-        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
-        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
-        <item name="android:textColorPrimary">#ffffffff</item>
-        <item name="android:textColorSecondary">#fff5f5f5</item>
-        <item name="android:textColorTertiary">#b3f5f5f5</item>
-        <item name="android:textColorHint">#ff999999</item>
-        <item name="android:textColorAlertDialogListItem">#ffffffff</item>
-        <item name="android:colorBackground">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:windowTitleStyle">@*android:style/DialogWindowTitle.DeviceDefault</item>
-        <item name="android:windowAnimationStyle">@*android:style/Animation.DeviceDefault.Dialog</item>
-        <item name="android:colorError">@*android:color/error_color_device_default_light</item>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:alertDialogTheme">@*android:style/Theme.DeviceDefault.Light.Dialog.Alert</item>
-        <item name="android:textAppearanceButton">@*android:style/TextAppearance.DeviceDefault.Widget.Button</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
-        <item name="android:buttonBarButtonStyle">@*android:style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>
-        <item name="*android:colorProgressBackgroundNormal">@*android:color/config_progress_background_tint</item>
-        <item name="*android:progressBarCornerRadius">@*android:dimen/config_progressBarCornerRadius</item>
-        <item name="android:toolbarStyle">@*android:style/Widget.DeviceDefault.Toolbar</item>
-    </style>
-    <style name="Theme.DeviceDefault.Light.Dialog.NoActionBar" parent="@*android:style/Theme.Material.Dialog.NoActionBar">
-        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
-        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings</item>
-        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
-        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
-        <item name="android:textColorPrimary">#ffffffff</item>
-        <item name="android:textColorSecondary">#fff5f5f5</item>
-        <item name="android:textColorTertiary">#b3f5f5f5</item>
-        <item name="android:textColorHint">#ff999999</item>
-        <item name="android:textColorAlertDialogListItem">#ffffffff</item>
-        <item name="android:colorBackground">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:windowTitleStyle">@*android:style/DialogWindowTitle.DeviceDefault</item>
-        <item name="android:windowAnimationStyle">@*android:style/Animation.DeviceDefault.Dialog</item>
-        <item name="android:colorError">@*android:color/error_color_device_default_light</item>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:alertDialogTheme">@*android:style/Theme.DeviceDefault.Light.Dialog.Alert</item>
-        <item name="android:textAppearanceButton">@*android:style/TextAppearance.DeviceDefault.Widget.Button</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
-        <item name="android:buttonBarButtonStyle">@*android:style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>
-        <item name="*android:colorProgressBackgroundNormal">@*android:color/config_progress_background_tint</item>
-        <item name="*android:progressBarCornerRadius">@*android:dimen/config_progressBarCornerRadius</item>
-        <item name="android:toolbarStyle">@*android:style/Widget.DeviceDefault.Toolbar</item>
-    </style>
-    <style name="Theme.DeviceDefault.Light.Dialog.NoActionBar.MinWidth" parent="@*android:style/Theme.Material.Dialog.NoActionBar.MinWidth">
-        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
-        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings</item>
-        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
-        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
-        <item name="android:textColorPrimary">#ffffffff</item>
-        <item name="android:textColorSecondary">#fff5f5f5</item>
-        <item name="android:textColorTertiary">#b3f5f5f5</item>
-        <item name="android:textColorHint">#ff999999</item>
-        <item name="android:textColorAlertDialogListItem">#ffffffff</item>
-        <item name="android:colorBackground">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:windowTitleStyle">@*android:style/DialogWindowTitle.DeviceDefault</item>
-        <item name="android:windowAnimationStyle">@*android:style/Animation.DeviceDefault.Dialog</item>
-        <item name="android:colorError">@*android:color/error_color_device_default_light</item>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:alertDialogTheme">@*android:style/Theme.DeviceDefault.Light.Dialog.Alert</item>
-        <item name="android:textAppearanceButton">@*android:style/TextAppearance.DeviceDefault.Widget.Button</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
-        <item name="android:buttonBarButtonStyle">@*android:style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>
-        <item name="*android:colorProgressBackgroundNormal">@*android:color/config_progress_background_tint</item>
-        <item name="*android:progressBarCornerRadius">@*android:dimen/config_progressBarCornerRadius</item>
-        <item name="android:toolbarStyle">@*android:style/Widget.DeviceDefault.Toolbar</item>
-    </style>
-    <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>
-        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
-        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings</item>
-        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
-        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
-        <item name="android:textColorPrimary">#ffffffff</item>
-        <item name="android:textColorSecondary">#fff5f5f5</item>
-        <item name="android:textColorTertiary">#b3f5f5f5</item>
-        <item name="android:textColorHint">#ff999999</item>
-        <item name="android:textColorAlertDialogListItem">#ffffffff</item>
-        <item name="android:colorBackground">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorError">@*android:color/error_color_device_default_light</item>
-    </style>
-    <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>
-        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
-        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings</item>
-        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
-        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
-        <item name="android:textColorPrimary">#ffffffff</item>
-        <item name="android:textColorSecondary">#fff5f5f5</item>
-        <item name="android:textColorTertiary">#b3f5f5f5</item>
-        <item name="android:textColorHint">#ff999999</item>
-        <item name="android:textColorAlertDialogListItem">#ffffffff</item>
-        <item name="android:colorBackground">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorError">@*android:color/error_color_device_default_light</item>
-    </style>
-    <style name="Theme.DeviceDefault.Light.DialogWhenLarge" parent="@*android:style/Theme.Material.DialogWhenLarge">
-        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
-        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings</item>
-        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
-        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
-        <item name="android:textColorPrimary">#ffffffff</item>
-        <item name="android:textColorSecondary">#fff5f5f5</item>
-        <item name="android:textColorTertiary">#b3f5f5f5</item>
-        <item name="android:textColorHint">#ff999999</item>
-        <item name="android:textColorAlertDialogListItem">#ffffffff</item>
-        <item name="android:colorBackground">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:windowTitleStyle">@*android:style/DialogWindowTitle.DeviceDefault</item>
-        <item name="android:windowAnimationStyle">@*android:style/Animation.DeviceDefault.Dialog</item>
-        <item name="android:colorError">@*android:color/error_color_device_default_light</item>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:alertDialogTheme">@*android:style/Theme.DeviceDefault.Light.Dialog.Alert</item>
-        <item name="android:textAppearanceButton">@*android:style/TextAppearance.DeviceDefault.Widget.Button</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
-        <item name="android:buttonBarButtonStyle">@*android:style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>
-        <item name="*android:colorProgressBackgroundNormal">@*android:color/config_progress_background_tint</item>
-        <item name="*android:progressBarCornerRadius">@*android:dimen/config_progressBarCornerRadius</item>
-        <item name="android:toolbarStyle">@*android:style/Widget.DeviceDefault.Toolbar</item>
-    </style>
-    <style name="Theme.DeviceDefault.Light.DialogWhenLarge.NoActionBar" parent="@*android:style/Theme.Material.DialogWhenLarge.NoActionBar">
-        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
-        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings</item>
-        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
-        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
-        <item name="android:textColorPrimary">#ffffffff</item>
-        <item name="android:textColorSecondary">#fff5f5f5</item>
-        <item name="android:textColorTertiary">#b3f5f5f5</item>
-        <item name="android:textColorHint">#ff999999</item>
-        <item name="android:textColorAlertDialogListItem">#ffffffff</item>
-        <item name="android:colorBackground">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:windowTitleStyle">@*android:style/DialogWindowTitle.DeviceDefault</item>
-        <item name="android:windowAnimationStyle">@*android:style/Animation.DeviceDefault.Dialog</item>
-        <item name="android:colorError">@*android:color/error_color_device_default_light</item>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:alertDialogTheme">@*android:style/Theme.DeviceDefault.Light.Dialog.Alert</item>
-        <item name="android:textAppearanceButton">@*android:style/TextAppearance.DeviceDefault.Widget.Button</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
-        <item name="android:buttonBarButtonStyle">@*android:style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>
-        <item name="*android:colorProgressBackgroundNormal">@*android:color/config_progress_background_tint</item>
-        <item name="*android:progressBarCornerRadius">@*android:dimen/config_progressBarCornerRadius</item>
-        <item name="android:toolbarStyle">@*android:style/Widget.DeviceDefault.Toolbar</item>
-    </style>
-    <style name="Theme.DeviceDefault.Light.Dialog.Presentation" parent="@*android:style/Theme.Material.Dialog.Presentation">
-        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
-        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings</item>
-        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
-        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
-        <item name="android:textColorPrimary">#ffffffff</item>
-        <item name="android:textColorSecondary">#fff5f5f5</item>
-        <item name="android:textColorTertiary">#b3f5f5f5</item>
-        <item name="android:textColorHint">#ff999999</item>
-        <item name="android:textColorAlertDialogListItem">#ffffffff</item>
-        <item name="android:colorBackground">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:windowTitleStyle">@*android:style/DialogWindowTitle.DeviceDefault</item>
-        <item name="android:windowAnimationStyle">@*android:style/Animation.DeviceDefault.Dialog</item>
-        <item name="android:colorError">@*android:color/error_color_device_default_light</item>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:alertDialogTheme">@*android:style/Theme.DeviceDefault.Light.Dialog.Alert</item>
-        <item name="android:textAppearanceButton">@*android:style/TextAppearance.DeviceDefault.Widget.Button</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
-        <item name="android:buttonBarButtonStyle">@*android:style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>
-        <item name="*android:colorProgressBackgroundNormal">@*android:color/config_progress_background_tint</item>
-        <item name="*android:progressBarCornerRadius">@*android:dimen/config_progressBarCornerRadius</item>
-        <item name="android:toolbarStyle">@*android:style/Widget.DeviceDefault.Toolbar</item>
-    </style>
-    <style name="Theme.DeviceDefault.Light.NoActionBar" parent="@*android:style/Theme.Material.NoActionBar">
-        <item name="android:colorPrimary">@*android:color/primary_device_default_dark</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
-        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings</item>
-        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
-        <item name="android:textColorPrimaryInverse">@*android:color/background_material_dark</item>
-        <item name="android:colorBackground">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:textColorPrimary">#ffffffff</item>
-        <item name="android:textColorSecondary">#6d6d6d</item>
-        <item name="android:textColorTertiary">#6d6d6d</item>
-        <item name="android:navigationBarColor">@*android:color/primary_device_default_dark</item>
-        <item name="android:colorError">@*android:color/error_color_device_default_light</item>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:alertDialogTheme">@*android:style/Theme.DeviceDefault.Light.Dialog.Alert</item>
-        <item name="android:textAppearanceButton">@*android:style/TextAppearance.DeviceDefault.Widget.Button</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
-        <item name="android:buttonBarButtonStyle">@*android:style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>
-        <item name="*android:colorProgressBackgroundNormal">@*android:color/config_progress_background_tint</item>
-        <item name="*android:progressBarCornerRadius">@*android:dimen/config_progressBarCornerRadius</item>
-        <item name="android:toolbarStyle">@*android:style/Widget.DeviceDefault.Toolbar</item>
-    </style>
-    <style name="Theme.DeviceDefault.Light.Panel" parent="@*android:style/Theme.Material.Panel" >
-        <item name="android:colorPrimary">@*android:color/primary_device_default_dark</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
-        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings</item>
-        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
-        <item name="android:textColorPrimaryInverse">@*android:color/background_material_dark</item>
-        <item name="android:colorBackground">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorError">@*android:color/error_color_device_default_light</item>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:alertDialogTheme">@*android:style/Theme.DeviceDefault.Light.Dialog.Alert</item>
-        <item name="android:textAppearanceButton">@*android:style/TextAppearance.DeviceDefault.Widget.Button</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
-        <item name="android:buttonBarButtonStyle">@*android:style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>
-        <item name="*android:colorProgressBackgroundNormal">@*android:color/config_progress_background_tint</item>
-        <item name="*android:progressBarCornerRadius">@*android:dimen/config_progressBarCornerRadius</item>
-        <item name="android:toolbarStyle">@*android:style/Widget.DeviceDefault.Toolbar</item>
-    </style>
-    <style name="Theme.DeviceDefault.Resolver" parent="@*android:style/Theme.Material">
-        <item name="android:windowBackground">@*android:color/transparent</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:backgroundDimEnabled">true</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowTranslucentStatus">false</item>
-        <item name="android:windowTranslucentNavigation">false</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
-        <item name="android:colorPrimary">@*android:color/primary_device_default_dark</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
-        <item name="android:textColorPrimary">#FFC7C7C7</item>
-        <item name="android:colorBackground">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:alertDialogTheme">@*android:style/Theme.DeviceDefault.Light.Dialog.Alert</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
-        <item name="android:buttonBarButtonStyle">@*android:style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>
-        <item name="android:colorError">@*android:color/error_color_device_default_light</item>
-        <item name="*android:colorProgressBackgroundNormal">@*android:color/config_progress_background_tint</item>
-        <item name="*android:progressBarCornerRadius">@*android:dimen/config_progressBarCornerRadius</item>
-        <item name="android:toolbarStyle">@*android:style/Widget.DeviceDefault.Toolbar</item>
-     </style>
-     <style name="Theme.DeviceDefault.System" parent="@*android:style/Theme.Material">
-        <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>
-        <item name="android:textColorPrimary">#ffffffff</item>
-        <item name="android:textColorSecondary">#fff5f5f5</item>
-        <item name="android:textColorTertiary">#b3f5f5f5</item>
-        <item name="android:textColorHint">#ff999999</item>
-        <item name="android:textColorAlertDialogListItem">#ffffffff</item>
-        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
-        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings</item>
-        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
-        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
-        <item name="android:colorBackground">@*android:color/primary_dark_device_default_settings</item>
-    </style>
-    <style name="Theme.DeviceDefault.Light.DarkActionBar" parent="@*android:style/Theme.Material.Light.DarkActionBar">
-        <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>
-        <item name="android:textColorPrimary">#ffffffff</item>
-        <item name="android:textColorSecondary">#fff5f5f5</item>
-        <item name="android:textColorTertiary">#b3f5f5f5</item>
-        <item name="android:textColorHint">#ff999999</item>
-        <item name="android:textColorAlertDialogListItem">#ffffffff</item>
-        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
-        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings</item>
-        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
-        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
-        <item name="android:colorError">@*android:color/error_color_device_default_light</item>
-        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
-        <item name="android:alertDialogTheme">@*android:style/Theme.DeviceDefault.Light.Dialog.Alert</item>
-        <item name="android:textAppearanceButton">@*android:style/TextAppearance.DeviceDefault.Widget.Button</item>
-        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
-        <item name="android:buttonBarButtonStyle">@*android:style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>
-        <item name="*android:colorProgressBackgroundNormal">@*android:color/config_progress_background_tint</item>
-        <item name="*android:progressBarCornerRadius">@*android:dimen/config_progressBarCornerRadius</item>
-        <item name="android:toolbarStyle">@*android:style/Widget.DeviceDefault.Toolbar</item>
-    </style>
-    <style name="Theme.Dialog.AppError" parent="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert">
-        <item name="android:windowContentTransitions">false</item>
-        <item name="android:windowActivityTransitions">false</item>
-        <item name="android:windowCloseOnTouchOutside">false</item>
-    </style>
-</resources>
diff --git a/overlay/common/frameworks/base/core/res/res/values/colors.xml b/overlay/common/frameworks/base/core/res/res/values/colors.xml
deleted file mode 100644
index 2e58600..0000000
--- a/overlay/common/frameworks/base/core/res/res/values/colors.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2018, The LineageOS Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources>
-    <color name="accent_device_default_700">#1A73E8</color>
-    <color name="accent_device_default_dark">#1A73E8</color>
-    <color name="accent_device_default_light">#1A73E8</color>
-    <color name="material_deep_teal_200">#1A73E8</color>
-    <color name="material_deep_teal_500">#1A73E8</color>
-</resources>
diff --git a/overlay/common/frameworks/base/core/res/res/values/dimens.xml b/overlay/common/frameworks/base/core/res/res/values/dimens.xml
deleted file mode 100644
index fe1baca..0000000
--- a/overlay/common/frameworks/base/core/res/res/values/dimens.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (c) 2006, 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>
-    <dimen name="config_dialogCornerRadius">8.0dip</dimen>
-    <dimen name="config_buttonCornerRadius">4.0dip</dimen>
-    <dimen name="config_progressBarCornerRadius">1000.0dip</dimen>
-</resources>
diff --git a/overlay/common/frameworks/base/packages/SystemUI/res/values-night/colors.xml b/overlay/common/frameworks/base/packages/SystemUI/res/values-night/colors.xml
deleted file mode 100644
index 8e0d6db..0000000
--- a/overlay/common/frameworks/base/packages/SystemUI/res/values-night/colors.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2019 crDroid Android 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>
-    <!-- The color of the material notification background when dimmed -->
-    <color name="notification_material_background_dimmed_color">@*android:color/material_grey_900</color>
-
-    <!-- The color of the dividing line between grouped notifications while . -->
-    <color name="notification_divider_color">#ffe0e0e0</color>
-
-    <!-- The color of the ripples on the untinted notifications -->
-    <color name="notification_ripple_untinted_color">#ffe0e0e0</color>
-
-    <!-- The "inside" of a notification, reached via longpress -->
-    <color name="notification_guts_bg_color">@*android:color/material_grey_900</color>
-
-    <!-- The color of the background in the grid of the Global Actions menu -->
-    <color name="global_actions_grid_background">@*android:color/material_grey_900</color>
-
-    <!-- The color of the background in the separated list of the Global Actions menu -->
-    <color name="global_actions_separated_background">@*android:color/material_grey_850</color>
-
-    <!-- The color of the background in the top part of QSCustomizer -->
-    <color name="qs_customize_background">@*android:color/material_grey_900</color>
-
-    <!-- The color of the background in the bottom part of QSCustomizer -->
-    <color name="qs_customize_decoration">@*android:color/material_grey_850</color>
-
-    <color name="qs_tile_disabled_color">@*android:color/material_grey_600</color>
-</resources>
diff --git a/overlay/common/frameworks/base/packages/SystemUI/res/values-night/styles.xml b/overlay/common/frameworks/base/packages/SystemUI/res/values-night/styles.xml
deleted file mode 100644
index 3e30655..0000000
--- a/overlay/common/frameworks/base/packages/SystemUI/res/values-night/styles.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2018-2019 crDroid Android Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-
-    <style name="qs_base" parent="android:Theme.DeviceDefault">
-        <item name="android:colorPrimary">@*android:color/primary_device_default_dark</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings</item>
-        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
-        <item name="android:colorControlNormal">@*android:color/text_color_primary</item>
-        <item name="android:colorBackgroundFloating">@*android:color/material_grey_900</item>
-        <item name="android:panelColorBackground">@*android:color/primary_device_default_dark</item>
-    </style>
-
-    <style name="global_actions_base" parent="android:Theme.DeviceDefault">
-        <item name="android:colorPrimary">@*android:color/primary_device_default_dark</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings</item>
-        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
-        <item name="android:colorControlNormal">@*android:color/text_color_primary</item>
-        <item name="android:colorBackgroundFloating">@*android:color/material_grey_900</item>
-        <item name="android:panelColorBackground">@*android:color/primary_device_default_dark</item>
-    </style>
-</resources>
diff --git a/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml b/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml
index d2c5c8a..158fa6d 100644
--- a/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -42,9 +42,4 @@
      vibrator is capable of subtle vibrations -->
     <bool name="config_vibrateOnIconAnimation">true</bool>
 
-    <!-- Launcher package name for overlaying icons. -->
-    <string name="launcher_overlayable_package">com.google.android.apps.nexuslauncher</string>
-
-    <string name="themepicker_overlayable_package">com.google.android.apps.wallpaper</string>
-
 </resources>
diff --git a/overlay/common/packages/apps/Settings/res/values/config.xml b/overlay/common/packages/apps/Settings/res/values/config.xml
index ab74b9e..2c5b7fe 100644
--- a/overlay/common/packages/apps/Settings/res/values/config.xml
+++ b/overlay/common/packages/apps/Settings/res/values/config.xml
@@ -33,21 +33,6 @@
 
     <bool name="config_show_avatar_in_homepage">true</bool>
 
-    <!-- Fully-qualified class name for the styles & wallpaper picker activity. -->
-    <string name="config_styles_and_wallpaper_picker_class">com.android.customization.picker.CustomizationPickerActivity</string>
-
-    <!-- Settings intelligence package name -->
-    <string name="config_settingsintelligence_log_action">com.google.android.settings.intelligence.contextualcards.CARD_INTERACTION_RECEIVER</string>
-
-    <!-- Settings intelligence interaction log intent action -->
-    <string name="config_settingsintelligence_package_name">com.google.android.settings.intelligence</string>
-
-    <!--
-        Whether or not the homepage should be powered by legacy suggestion (versus contextual cards)
-        Default to true as not all devices support contextual cards.
-    -->
-    <bool name="config_use_legacy_suggestion">false</bool>
-
     <!--Whether help links are defined. -->
     <bool name="config_has_help">true</bool>
 
diff --git a/overlay/common/packages/apps/ThemePicker/res/values/override.xml b/overlay/common/packages/apps/ThemePicker/res/values/override.xml
index bf252e9..122cc64 100644
--- a/overlay/common/packages/apps/ThemePicker/res/values/override.xml
+++ b/overlay/common/packages/apps/ThemePicker/res/values/override.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 
-     Copyright (C) 2019 Havoc-OS
+     Copyright (C) 2018 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.
@@ -16,7 +16,22 @@
      limitations under the License.
 -->
 <resources>
+    <string name="themes_stub_package" translatable="false">com.bliss.customization</string>
 
-    <string name="themes_stub_package" translatable="false">com.google.android.apps.customization.pixel</string>
-
+    <!-- List of packages whose icons are used to preview the icon shape for a theme. These are
+        typically GMS apps so they should be available in GMS devices. -->
+    <array name="icon_shape_preview_packages">
+        <item>com.google.android.gm</item>
+        <item>com.google.android.googlequicksearchbox</item>
+        <item>com.google.android.apps.photos</item>
+        <item>com.google.android.apps.docs</item>
+        <item>com.google.android.youtube</item>
+        <item>com.android.vending</item>
+        <item>com.android.settings</item>
+        <item>com.android.deskclock</item>
+        <item>com.android.messaging</item>
+        <item>com.android.contacts</item>
+        <item>com.android.dialer</item>
+        <item>com.android.email</item>
+    </array>
 </resources>
diff --git a/prebuilt/common/Android.mk b/prebuilt/common/Android.mk
index e7dd22e..3c30825 100644
--- a/prebuilt/common/Android.mk
+++ b/prebuilt/common/Android.mk
@@ -72,17 +72,6 @@
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := PixelThemesStub2019
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := app/$(LOCAL_MODULE).apk
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_DEX_PREOPT := false
-LOCAL_PRODUCT_MODULE := true
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
 LOCAL_MODULE := OPScreenRecorder
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := priv-app/$(LOCAL_MODULE).apk
@@ -107,19 +96,6 @@
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := SettingsIntelligenceGooglePrebuilt
-LOCAL_OVERRIDES_PACKAGES := SettingsIntelligence
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := priv-app/$(LOCAL_MODULE).apk
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_CLASS := APPS
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_DEX_PREOPT := false
-LOCAL_PRODUCT_MODULE := true
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
 LOCAL_MODULE := BlissStatistics
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := app/$(LOCAL_MODULE).apk
diff --git a/prebuilt/common/app/PixelThemesStub2019.apk b/prebuilt/common/app/PixelThemesStub2019.apk
deleted file mode 100644
index 72b5762..0000000
--- a/prebuilt/common/app/PixelThemesStub2019.apk
+++ /dev/null
Binary files differ
diff --git a/prebuilt/common/priv-app/SettingsIntelligenceGooglePrebuilt.apk b/prebuilt/common/priv-app/SettingsIntelligenceGooglePrebuilt.apk
deleted file mode 100644
index b31daa7..0000000
--- a/prebuilt/common/priv-app/SettingsIntelligenceGooglePrebuilt.apk
+++ /dev/null
Binary files differ