From e6308bab522cbf0e894a8e079a52c9d81ac5e139 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C6=B0ng=20Phan?= <phandinhhungvp2001@gmail.com>
Date: Sat, 26 Sep 2020 12:29:26 +0700
Subject: [PATCH] Cherish:Intitial for Android 11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
---
 res/values-ru/cherish_strings.xml             | 596 --------------
 res/values-uk/cherish_about.xml               |  44 --
 res/values-uk/cherish_strings.xml             | 396 ----------
 res/values-uk/dslv_strings.xml                |  40 -
 res/values-vi/cherish_strings.xml             | 721 -----------------
 res/values/cherish_arrays.xml                 | 735 ------------------
 res/values/cherish_strings.xml                | 712 -----------------
 res/xml/audio_panel.xml                       |  57 --
 res/xml/battery_bar.xml                       |  75 --
 res/xml/battery_light_settings.xml            |  50 --
 res/xml/cherish_settings.xml                  |   4 +-
 res/xml/cherish_settings_animations.xml       |  85 --
 res/xml/cherish_settings_button.xml           |   8 +-
 res/xml/cherish_settings_clock.xml            | 106 ---
 res/xml/cherish_settings_fod_picker.xml       |  29 -
 res/xml/cherish_settings_gaming_mode.xml      |  73 --
 res/xml/cherish_settings_lockscreen.xml       |  96 ---
 res/xml/cherish_settings_misc.xml             |  72 --
 res/xml/cherish_settings_notifications.xml    |  76 --
 res/xml/cherish_settings_power.xml            |  61 --
 res/xml/cherish_settings_pulse.xml            | 145 ----
 res/xml/cherish_settings_quicksettings.xml    | 224 +-----
 res/xml/cherish_settings_recents.xml          |  20 +-
 res/xml/cherish_settings_statusbar.xml        | 154 +---
 res/xml/cherish_settings_theme.xml            | 129 ---
 res/xml/cherish_settings_volume.xml           |   2 +-
 res/xml/custom_carrier_label.xml              |  31 -
 res/xml/edgepulse_settings.xml                | 137 ----
 res/xml/heads_up_settings.xml                 |  53 --
 res/xml/qs_header.xml                         |  66 --
 res/xml/slim_recent_app_sidebar.xml           |  23 -
 res/xml/slim_recent_app_sidebar_style.xml     |  58 --
 res/xml/slim_recents.xml                      | 150 ----
 res/xml/slim_recents_blacklist.xml            |  27 -
 .../fragments/AnimationsSettings.java         | 231 ------
 .../fragments/AudioPanelSettings.java         |  61 --
 .../fragments/BatteryLightSettings.java       |  88 +--
 .../settings/fragments/ClockSettings.java     | 303 --------
 .../fragments/CustomCarrierLabel.java         | 163 ----
 .../cherish/settings/fragments/EdgePulse.java | 132 ----
 .../fragments/FODIconPickerFragment.java      |  49 --
 .../settings/fragments/GamingMode.java        | 342 --------
 .../fragments/GamingModeReceiver.java         |  51 --
 .../cherish/settings/fragments/HeadsUp.java   | 411 ----------
 .../IncallFeedbackPreferenceController.java   |  41 -
 .../fragments/LockScreenSettings.java         |  33 +-
 .../settings/fragments/MiscSettings.java      |  12 +-
 .../fragments/NotificationSettings.java       |  61 +-
 .../settings/fragments/PulseSettings.java     | 252 ------
 .../cherish/settings/fragments/QsHeader.java  | 227 ------
 .../settings/fragments/QuickSettings.java     | 112 +--
 .../settings/fragments/RecentsSettings.java   |  82 +-
 .../fragments/SlimRecentAppSidebar.java       |  38 -
 .../fragments/SlimRecentAppSidebarStyle.java  | 106 ---
 .../settings/fragments/SlimRecents.java       | 392 ----------
 .../fragments/SlimRecentsBlacklist.java       | 294 -------
 .../settings/fragments/StatusBarSettings.java | 127 ---
 .../settings/fragments/ThemeSettings.java     | 398 +---------
 .../preferences/fragments/BatteryBar.java     | 259 ------
 59 files changed, 20 insertions(+), 9500 deletions(-)
 delete mode 100644 res/values-ru/cherish_strings.xml
 delete mode 100644 res/values-uk/cherish_about.xml
 delete mode 100644 res/values-uk/cherish_strings.xml
 delete mode 100644 res/values-uk/dslv_strings.xml
 delete mode 100644 res/values-vi/cherish_strings.xml
 delete mode 100644 res/xml/audio_panel.xml
 delete mode 100644 res/xml/battery_bar.xml
 delete mode 100644 res/xml/cherish_settings_clock.xml
 delete mode 100644 res/xml/cherish_settings_fod_picker.xml
 delete mode 100644 res/xml/cherish_settings_gaming_mode.xml
 delete mode 100644 res/xml/cherish_settings_pulse.xml
 delete mode 100644 res/xml/custom_carrier_label.xml
 delete mode 100644 res/xml/edgepulse_settings.xml
 delete mode 100644 res/xml/heads_up_settings.xml
 delete mode 100644 res/xml/qs_header.xml
 delete mode 100644 res/xml/slim_recent_app_sidebar.xml
 delete mode 100644 res/xml/slim_recent_app_sidebar_style.xml
 delete mode 100644 res/xml/slim_recents.xml
 delete mode 100644 res/xml/slim_recents_blacklist.xml
 delete mode 100644 src/com/cherish/settings/fragments/AudioPanelSettings.java
 delete mode 100644 src/com/cherish/settings/fragments/ClockSettings.java
 delete mode 100644 src/com/cherish/settings/fragments/CustomCarrierLabel.java
 delete mode 100644 src/com/cherish/settings/fragments/EdgePulse.java
 delete mode 100644 src/com/cherish/settings/fragments/FODIconPickerFragment.java
 delete mode 100644 src/com/cherish/settings/fragments/GamingMode.java
 delete mode 100644 src/com/cherish/settings/fragments/GamingModeReceiver.java
 delete mode 100644 src/com/cherish/settings/fragments/HeadsUp.java
 delete mode 100644 src/com/cherish/settings/fragments/IncallFeedbackPreferenceController.java
 delete mode 100644 src/com/cherish/settings/fragments/PulseSettings.java
 delete mode 100644 src/com/cherish/settings/fragments/QsHeader.java
 delete mode 100644 src/com/cherish/settings/fragments/SlimRecentAppSidebar.java
 delete mode 100644 src/com/cherish/settings/fragments/SlimRecentAppSidebarStyle.java
 delete mode 100644 src/com/cherish/settings/fragments/SlimRecents.java
 delete mode 100644 src/com/cherish/settings/fragments/SlimRecentsBlacklist.java
 delete mode 100644 src/com/cherish/settings/preferences/fragments/BatteryBar.java

diff --git a/res/values-ru/cherish_strings.xml b/res/values-ru/cherish_strings.xml
deleted file mode 100644
index f7b7478..0000000
--- a/res/values-ru/cherish_strings.xml
+++ /dev/null
@@ -1,596 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 CherishOS
-     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">
-    <!-- App Title -->
-    <string name="cherish_settings_title">Любимые настройки </string>
-    <!-- Categories -->
-    <string name="button_title">Кнопки</string>
-    <string name="button_summary">Аппаратные кнопки, Панель навигации</string>
-    <string name="gestures_title">Жесты</string>
-    <string name="gestures_summary">Открытие камеры, свайп для скриншота</string>
-    <string name="lockscreen_title">Экран блокировки</string>
-    <string name="lockscreen_summary">Визуализатор музыки, анимация зарядки, стиль часов</string>
-    <string name="misc_title">Прочее</string>
-    <string name="misc_summary">Режим игры, управление громкостью</string>
-    <string name="animations_title">Анимации</string>
-    <string name="animations_summary">Системные анимации</string>
-    <string name="powermenu_title">Меню кнопки питания</string>
-    <string name="powermenu_summary">Расширенный перезапуск, непрозрачность меню питания</string>
-    <string name="theme_title">Темы</string>
-    <string name="theme_summary">Системная тема, округленная, переключить тему</string>
-    <string name="quicksettings_title">Быстрые настройки</string>
-    <string name="quicksettings_summary">Расположение плитки, яркость миуи, размытие</string>
-    <string name="recents_title">Недавние приложения</string>
-    <string name="recents_summary">Недавние приложения в стиле Slim</string>
-    <string name="statusbar_title">Строка состояния</string>
-    <string name="statusbar_summary">Часы, логотип, значки в строке состояния</string>
-    <string name="volume_title">Качель регулировки громкости</string>
-    <string name="volume_summary">Качель регулировки громкости</string>
-    <string name="notifications_title">Уведомления</string>
-    <string name="notifications_summary">Индикатор батареи, заголовок уведомлений</string>
-    <string name="about_summary">Подробнее о Crowdin</string>
-    <string name="device_part_title">Возможности устройства</string>
-    <string name="qs_category">Категория QS</string>
-    <!-- General strings -->
-    <string name="ok">OK</string>
-    <string name="reset">Сбросить</string>
-    <string name="cancel">Отменить</string>
-    <string name="save">Сохранить</string>
-    <!-- Color Picker -->
-    <string name="dialog_color_picker">Выбор цвета</string>
-    <string name="press_color_to_apply">Нажмите на оттенок ниже, чтобы применить его</string>
-    <string name="arrow_right">→</string>
-    <string name="arrow_down">↓</string>
-    <string name="hex">Hex:</string>
-    <string name="hex_hint">#ff000000</string>
-    <string name="set">Набор</string>
-    <string name="color_default">По умолчанию</string>
-    <!-- Lockscreen battery info indicator  -->
-    <string name="lockscreen_battery_info_title">Информация о зарядке на экране блокировки</string>
-    <string name="lockscreen_battery_info_summary">Показывать напряжение, ток зарядки и температуру аккумулятора на экране блокировки во время зарядки</string>
-    <!-- QS category -->
-    <string name="enable_clear_all_button">Заменить надпись \"Очистить все\" на красивую кнопку</string>
-    <string name="enable_clear_all_button_summary">Показывать кнопку вместо текста для очистки всех уведомлений в быстрых настройках</string>
-    <string name="qs_bg_use_new_tint">Цвета плиток быстрых настроек</string>
-    <string name="qs_bg_use_new_tint_summary">Использовать цвет акцента для плиток быстрых настроек и фона</string>
-    <string name="qs_blur_alpha_title">Размытие</string>
-    <string name="qs_blur_alpha_summary">Установить прозрачность размытия</string>
-    <string name="blur_quicksettings">Размытие за быстрыми настройками (бета)</string>
-    <string name="blur_quicksettings_subtitle">Затемненный фон за быстрыми настройками</string>
-    <string name="qs_blur_intensity_title">Интенсивность размытия</string>
-    <string name="qs_blur_intensity_summary">Установить интенсивность/радиус размытия</string>
-    <string name="unit_percent">\u0025</string>
-    <!-- In-call feedback -->
-    <string name="incall_feeedback_vibrate_title">Вибрация для индикации статуса вызова</string>
-    <!-- Lock screen cover art -->
-    <string name="lockscreen_media_art_title">Отображать обложки мультимедиа</string>
-    <string name="lockscreen_media_blur_title">Уровень размытия обложки</string>
-    <!-- QS settings -->
-    <string name="qs_title">Быстрые настройки</string>
-    <string name="qs_rows_portrait_title">Строки (портрет)</string>
-    <string name="qs_rows_landscape_title">Строки (ландшафт)</string>
-    <string name="qs_columns_portrait_title">Колонки (портрет)</string>
-    <string name="qs_columns_landscape_title">Колонки (ландшафт)</string>
-    <!-- QS title visibility -->
-    <string name="qs_tile_title_visibility_title">Названия плиток</string>
-    <string name="qs_tile_title_visibility_summary">Включить для отображения заголовка плиток</string>
-    <!-- QS tiles haptic feedback -->
-    <string name="qs_vibrate_title">Вибрировать при касании</string>
-    <string name="qs_vibrate_summary">Вибрировать при нажатии на плитки быстрых настроек</string>
-    <string name="qs_brightness_position_bottom_title">Ползунок яркости внизу</string>
-    <string name="qs_brightness_position_bottom_summary">Показывает слайдер яркости внизу быстрых настроек</string>
-    <string name="enable_oneui">OneUI</string>
-    <string name="enable_oneui_summary">Показать пробел над настройками панели действий для более легкого использования с одной стороны\nВНИМАНИЕ: перезапустите настройки, чтобы увидеть эффект</string>
-    <!-- Lockscreen clock style -->
-    <string name="lockscreen_clock_title">Стиль часов</string>
-    <string name="lockscreen_clock_dialog_title">Выберите стиль часов</string>
-    <string name="lockscreen_clock_hide">Скрыть</string>
-    <string name="lockscreen_clock_default">Обычный</string>
-    <string name="lockscreen_clock_default_bold">Обычный (жирный)</string>
-    <string name="lockscreen_clock_default_accent">Обычный (цветовой акцент)</string>
-    <string name="lockscreen_clock_default_accent_min">Обычный (цветные минуты)</string>
-    <string name="lockscreen_clock_default_accent_hour">Обычный (цветные часы)</string>
-    <string name="lockscreen_clock_sammy">Вертикальный</string>
-    <string name="lockscreen_clock_sammy_bold">Вертикальный (жирный)</string>
-    <string name="lockscreen_clock_sammy_accent_hour">Вертикальный (цветные часы)</string>
-    <string name="lockscreen_clock_sammy_accent_min">Вертикальный (цветные минуты)</string>
-    <!-- Lockscreen Date styles -->
-    <string name="lockscreen_date_title">Стиль даты</string>
-    <string name="lockscreen_date_selection_title">Стиль даты</string>
-    <string name="lockscreen_date_dialog_title">Выберите стиль даты</string>
-    <string name="lockscreen_date_selection_default">Обычный</string>
-    <string name="lockscreen_date_selection_str_box">Полупрозрачный</string>
-    <string name="lockscreen_date_selection_str_round">Полупрозрачный (скругленный)</string>
-    <string name="lockscreen_date_selection_qbeta_style">Пузырь</string>
-    <string name="lockscreen_date_selection_str_accent">Скруглённый, простой и с акцентом</string>
-    <string name="lockscreen_date_selection_str_accent_transparent">Скругленный, прозрачный и с акцентом</string>
-    <string name="lockscreen_date_selection_str_gradient">Градиент</string>
-    <string name="lockscreen_date_selection_str_border_accent">Темный с акцентом границ</string>
-    <string name="lockscreen_date_selection_str_border_gradient">Тёмный с градиентными границами</string>
-    <!-- Status bar - icons -->
-    <string name="status_bar_icons_title">Значки строки состояния</string>
-    <string name="status_bar_system_icons_title">Системные значки</string>
-    <string name="status_bar_system_icons_summary">Управление отображением значков в строке состояния</string>
-    <!-- Statusbar Clock -->
-    <string name="statusbar_items_title">Элементы строки состояния</string>
-    <string name="clock_category_title">Часы</string>
-    <string name="date_category_title">Дата</string>
-    <string name="status_bar_clock_title">Часы и дата</string>
-    <string name="status_bar_clock_summary">Настройка отображения часов и даты в строке состояния</string>
-    <string name="status_bar_clock_style_title">Расположение часов</string>
-    <string name="status_bar_clock_style_right">Справа</string>
-    <string name="status_bar_clock_style_center">По центру</string>
-    <string name="status_bar_clock_style_left">Слева</string>
-    <string name="status_bar_am_pm_title">Стиль AM/PM</string>
-    <string name="status_bar_am_pm_info">24-часовой формат времени включен</string>
-    <string name="status_bar_am_pm_normal">Нормальный</string>
-    <string name="status_bar_am_pm_small">Маленький</string>
-    <string name="status_bar_am_pm_hidden">Скрывать</string>
-    <string name="clock_seconds_display">Отображать секунды</string>
-    <string name="clock_seconds_display_summary">Отображать секунды в часах строки состояния</string>
-    <string name="clock_date_display">Дата</string>
-    <string name="clock_date_display_summary">Отображать дату перед часами</string>
-    <string name="clock_date_display_none">Скрывать</string>
-    <string name="clock_date_display_small">Маленький</string>
-    <string name="clock_date_display_normal">Нормальный</string>
-    <string name="clock_date_style">Стиль даты</string>
-    <string name="clock_date_style_normal">Нормальный</string>
-    <string name="clock_date_style_lowercase">Нижний регистр</string>
-    <string name="clock_date_style_uppercase">Прописной</string>
-    <string name="clock_date_format_custom">Пользовательский Java-формат</string>
-    <string name="clock_date_format">Формат даты</string>
-    <string name="clock_date_format_summary">%1$s</string>
-    <string name="clock_date_string_edittext_title">Должен быть в формате даты, например, ММ/дд/гг</string>
-    <string name="clock_date_string_edittext_summary">Введите строку</string>
-    <string name="clock_date_right">Справа от часов</string>
-    <string name="clock_date_left">Слева от часов</string>
-    <string name="clock_date_position">Расположение даты</string>
-    <string name="status_bar_clock_auto_hide_title">Скрывать часы автоматически</string>
-    <string name="status_bar_clock_auto_hide_summary">Скрывать и показывать часы через регулярные промежутки времени</string>
-    <string name="status_bar_clock_auto_hide_hdur_title">Скрывать длительность</string>
-    <string name="status_bar_clock_auto_hide_sdur_title">Отображать длительность</string>
-    <!-- Charging animation -->
-    <string name="lockscreen_charging_animation_title">Анимация заряда батареи</string>
-    <string name="lockscreen_charging_animation_summary">Показывать анимацию при подключении зарядного устройства</string>
-    <string name="lockscreen_charging_animation_off">Выключена</string>
-    <string name="lockscreen_charging_animation_flash">Вспышка</string>
-    <string name="lockscreen_charging_animation_battery">Батарея</string>
-    <string name="lockscreen_charging_animation_drop">Капля</string>
-    <string name="lockscreen_charging_animation_explosion">Взрыв</string>
-    <string name="lockscreen_charging_animation_water">Вода</string>
-    <string name="lockscreen_charging_animation_split">Разделить загрузку</string>
-    <string name="lockscreen_charging_animation_yellow">Желтая анимация</string>
-    <string name="lockscreen_charging_animation_covid">Ковид19</string>
-    <string name="lockscreen_charging_animation_wash">Мойте руки</string>
-    <string name="lockscreen_charging_animation_wear">Наденьте вашу маску</string>
-    <string name="lockscreen_charging_animation_loading">Loading</string>
-    <!-- Battery Styles -->
-    <string name="battery_style_category_title">Уровень заряда батареи</string>
-    <string name="battery_percent_title">Процент заряда батареи</string>
-    <!-- Status bar - Battery -->
-    <string name="status_bar_battery_style_title">Стиль значка батареи</string>
-    <string name="status_bar_battery_style_q">Вертикальный значок (по умолчанию)</string>
-    <string name="status_bar_battery_style_dotted_circle">Круг (пунктирный)</string>
-    <string name="status_bar_battery_style_circle">Круг</string>
-    <string name="status_bar_battery_style_text">Текст</string>
-    <string name="status_bar_battery_style_hidden">Не показывать значок батареи</string>
-    <string name="status_bar_battery_style_big_circle">Большой круг</string>
-    <string name="status_bar_battery_style_filled_circle">Круг (сплошной)</string>
-    <!-- Status bar - Battery percentage -->
-    <string name="status_bar_battery_percentage_title">Процент использования батареи</string>
-    <string name="status_bar_battery_percentage_default">Скрыт (по умолчанию)</string>
-    <string name="status_bar_battery_percentage_text_inside">Внутри значка</string>
-    <string name="status_bar_battery_percentage_text_next">Рядом со значком</string>
-    <string name="status_bar_battery_text_charging_title">Процент использования батареи при зарядке</string>
-    <string name="status_bar_battery_text_charging_summary">Всегда отображать процент использования батареи при зарядке</string>
-    <!-- Battery mode -->
-    <string name="battery_percentage_title">Процент использования батареи</string>
-    <string name="battery_percentage_off">Выключен</string>
-    <string name="battery_percentage_next">Включен</string>
-    <string name="battery_percentage_inside">Включен (внутри значка)</string>
-    <string name="battery_percentage_estimate">Включено (оценка уровня заряда)</string>
-    <!-- Network traffic -->
-    <string name="traffic_title">Индикация трафика</string>
-    <string name="traffic_title_summary">Настройка индикатора сетевого трафика</string>
-    <string name="network_traffic_title">Сетевой траффик</string>
-    <string name="network_traffic_type">Выберите тип сетевой активности</string>
-    <string name="show_network_traffic_up">Исходящий</string>
-    <string name="show_network_traffic_down">Входящий</string>
-    <string name="show_network_traffic_all">Исходящий и входящий</string>
-    <string name="network_traffic_state_title">Показывать индикатор сетевого трафика в строке состояния</string>
-    <string name="network_traffic_autohide_threshold_title">Порог отображения сетевой активности (КБ/с)</string>
-    <string name="network_traffic_hidearrow">Скрывать стрелки</string>
-    <string name="network_traffic_hidearrow_summary">Скрывать стрелки индикатора сетевого трафика</string>
-    <!-- 4G icon -->
-    <string name="statusbar_items_category">Значки</string>
-    <string name="show_fourg_icon_title">Значок 4G</string>
-    <string name="show_fourg_icon_summary">Заменить значок LTE на 4G</string>
-    <!-- Show VoLTE icon on statusbar -->
-    <string name="volte_icon_title">Значок VoLTE</string>
-    <string name="volte_icon_summary">Отображать значок VoLTE (необходимо перезапустить интерфейс, чтобы изменения вступили в силу)</string>
-    <!-- VoLTE icon styles -->
-    <string name="volte_icon_style_title">Выбрать значок VoLTE</string>
-    <string name="volte_icon_vo">Значок по умолчанию</string>
-    <string name="volte_icon_volte">Значок VoLTE</string>
-    <string name="volte_icon_oos">Значок VoLTE в стиле OOS</string>
-    <string name="volte_icon_hd">Значок HD</string>
-    <string name="volte_icon_miui">Значок VoLTE в стиле Miui</string>
-    <string name="volte_icon_asus">Значок VoLTE в стиле Asus</string>
-    <string name="volte_icon_emui">EMUI</string>
-    <!-- Lock screen visualizer -->
-    <string name="visualizer_title">Визуализация спектра музыки</string>
-    <string name="lockscreen_visualizer_title">Визуализатор музыки</string>
-    <!-- Fingerprint authentication vibration -->
-    <string name="fprint_sucess_vib_title">Вибрация при авторизации отпечатком</string>
-    <string name="fprint_sucess_vib_summary">Вибрировать при успешном распозновании отпечатка пальца</string>
-    <!-- Advanced restart options -->
-    <string name="advanced_reboot_title">Расширенная перезагрузка</string>
-    <string name="advanced_reboot_summary">Когда устройство разблокировано, в меню питания доступны опции перезагрузки в режим восстановления и в загрузчик</string>
-    <!-- Battery light -->
-    <string name="battery_light_settings">Индикация зарядки батареи</string>
-    <string name="battery_light_enable">Включить</string>
-    <string name="battery_light_allow_on_dnd_title">Индикация батареи в режиме \"Не беспокоить\"</string>
-    <string name="battery_light_low_blinking_title">Индикация при низком заряде батареи</string>
-    <string name="battery_light_cat">Цвет индикации при зарядке</string>
-    <string name="battery_light_low_color">Низкий заряд батареи</string>
-    <string name="battery_light_medium_color">Средний заряд батареи</string>
-    <string name="battery_light_full_color">Почти полный заряд батареи</string>
-    <string name="battery_light_reallyfull_color">Полный заряд батареи (100)</string>
-    <!-- Old MobileType Toggle -->
-    <string name="use_old_mobiletype_title">Использовать старый стиль индикации мобильной сети</string>
-    <string name="use_old_mobiletype_summary">Объединить значки уровня сигнала и типа сети</string>
-    <!-- Themes -->
-    <string name="theme_type_title">Системная тема</string>
-    <string name="theme_type_summary">Выберите тему</string>
-    <string name="theme_type_light">Светлая</string>
-    <string name="theme_type_pitch_black">Тёмный Google</string>
-    <string name="theme_type_solarized_dark">Соляризованная темная</string>
-    <string name="theme_type_baked_green">Зелёная</string>
-    <string name="theme_type_choco_x">Choco X</string>
-    <string name="theme_type_du_pitchblack">Тёмно-чёрный</string>
-    <string name="theme_type_dark_grey">Тёмно-серый</string>
-    <string name="theme_type_material_ocean">Материал Океан</string>
-    <string name="theme_type_clear_spring">Очистить источник</string>
-    <!-- Power menu and dialogs opacity -->
-    <string name="lockscreen_secure_power_title">Защитить меню питания</string>
-    <string name="lockscreen_secure_power_menu_title">Защитить меню питания</string>
-    <string name="lockscreen_secure_power_menu_summary">Разрешить действия в меню питания только после идентификации</string>
-    <string name="power_menu_emergency_title">Экстренный вызов</string>
-    <string name="panel_porn_title">Прозрачность меню питания/перезагрузки</string>
-    <string name="power_menu_transparency">Прозрачность меню кнопки питания</string>
-    <string name="power_menu_dialog_dim">Затемнение фона</string>
-    <!-- Rounded corners -->
-    <string name="corners_category_title">Скруглённые углы</string>
-    <string name="corners_category_summary">Регулировка закругленных углов и отступы</string>
-    <string name="corners_title">Разрешить настраиваемые закругленные углы</string>
-    <string name="corner_radius">Радиус скругления углов</string>
-    <string name="content_padding">Отступ углов</string>
-    <string name="status_bar_padding">Дополнительные отступы в строке состояния</string>
-    <string name="corner_fwvals">Используйте базовые значения</string>
-    <string name="corner_fwvals_summary">Полезно, если устройство имеет закруглённые углы</string>
-    <!-- Adaptive Playback -->
-    <string name="media_title">Медиа</string>
-    <string name="adaptive_playback_title">Адаптивное воспроизведение</string>
-    <string name="adaptive_playback_summary">Приостанавливать воспроизведение при выключенном звуке и возобновлять его, увеличивая громкость в пределах таймаута</string>
-    <string name="adaptive_playback_timeout_title">Таймаут воспроизведения</string>
-    <string name="adaptive_playback_timeout_30_secs">30 сек.</string>
-    <string name="adaptive_playback_timeout_1_min">1 мин.</string>
-    <string name="adaptive_playback_timeout_2_min">2 мин.</string>
-    <string name="adaptive_playback_timeout_5_min">5 мин.</string>
-    <string name="adaptive_playback_timeout_10_min">10 мин.</string>
-    <!-- Custom carrier label and position -->
-    <string name="label_title">Логотип</string>
-    <string name="carrier_label_settings_title">Логотип оператора</string>
-    <string name="carrier_label_settings_summary">Настройки отображения оператора</string>
-    <string name="custom_carrier_label_title">Пользовательский логотип</string>
-    <string name="custom_carrier_label_explain">Введите свое название. Оставьте пустым, чтобы использовать текущее имя сети</string>
-    <string name="custom_carrier_label_notset">Пользовательская метка  не установлена</string>
-    <string name="show_carrier_title">Имя оператора</string>
-    <string name="show_carrier_disabled">Выключен</string>
-    <string name="show_carrier_keyguard">Экран блокировки</string>
-    <string name="show_carrier_statusbar">Строка состояния</string>
-    <string name="show_carrier_enabled">Оба</string>
-    <!-- Power menu on secure lockscreen -->
-    <string name="lockscreen_enable_power_menu_title">Меню кнопки питания</string>
-    <string name="lockscreen_enable_power_menu_summary">Отображать меню кнопки питания на защищенном экране блокировки</string>
-    <!-- Slim recents -->
-    <string name="alternative_recents_category">Альтернативная панель недавних</string>
-    <string name="alternative_recents_swipe_up_enabled_warning_summary">При использовании свайпа вверх по кнопке \"Домой\" для открытия недавних поддерживается только стоковое отображение недавних приложений</string>
-    <string name="slim_recents_title">Миниатюры</string>
-    <string name="slim_recents_summary">Включите, чтобы использовать другие экраны меню недавних</string>
-    <string name="slim_recents_fragment_title">Настройки меню недавних приложений от Slim</string>
-    <string name="slim_recents_fragment_summary">Дополнительные настройки для Slim</string>
-    <string name="recents_max_apps_title">Максимум запущенных приложений</string>
-    <string name="recent_panel_scale_title">Размер</string>
-    <string name="recent_panel_expanded_mode_title">Расширенный режим</string>
-    <string name="recent_panel_expanded_mode_summary">Расширенный предпросмотр недавних приложений</string>
-    <string name="recent_panel_expanded_mode_auto">Автоматически (по умолчанию)</string>
-    <string name="recent_panel_expanded_mode_always">Всегда</string>
-    <string name="recent_panel_expanded_mode_never">Никогда</string>
-    <string name="recent_panel_expanded_mode_disabled">Выключен</string>
-    <string name="recent_panel_bg_color_title">Цвет фона панели</string>
-    <string name="recent_card_bg_color_title">Цвет фона карточки</string>
-    <string name="slim_recents_mem_display_long_click_clear_title">Долгое нажатие в панели памяти</string>
-    <string name="slim_recents_mem_display_long_click_clear_summary">Очищать недавние приложения при длительном нажатии на панель памяти</string>
-    <string name="slim_icon_pack_title">Набор значков</string>
-    <string name="slim_icon_pack_summary">Применить свой набор значков для приложений в панели</string>
-    <string name="no_iconpacks_summary">Наборы значков не установлены</string>
-    <string name="dialog_pick_iconpack_title">Выбрать набор значков</string>
-    <string name="default_iconpack_title">Стандартные иконки</string>
-    <string name="slim_recents_corner_radius_title">Радиус закругления карточки</string>
-    <!-- ATTENTION: RTL languages need to replace left with right -->
-    <string name="recent_panel_lefty_mode_title">Показать слева</string>
-    <string name="recent_panel_lefty_mode_summary">Показать панель недавних приложений с левого края</string>
-    <string name="slim_blacklist_apps_cat_title">Чёрный список</string>
-    <string name="slim_blacklist_apps_title">Чёрный список приложений</string>
-    <string name="slim_blacklist_apps_summary">Приложения не будут отображаться в панели</string>
-    <string name="slim_blacklist_add_apps_title">Добавить приложение</string>
-    <string name="slim_blacklist_add_apps_summary">Нажмите здесь, чтобы добавить новое приложение; нажмите на добавленное приложение, чтобы удалить его</string>
-    <!-- Slim Recent App Sidebar  -->
-    <string name="recent_app_sidebar_cat_title">Боковая панель приложений</string>
-    <string name="recent_app_sidebar_title">Боковая панель недавних приложений</string>
-    <string name="recent_app_sidebar_summary">Отображать значки приложений с другого края</string>
-    <string name="recent_app_sidebar_picker_title">Быстрые клавиши на боковой панели</string>
-    <string name="recent_app_sidebar_picker_summary">Выберите приложения для отображения на боковой панели</string>
-    <string name="recent_app_sidebar_style_title">Вид боковой панели</string>
-    <string name="recent_app_sidebar_style_summary">Изменить вид боковой панели</string>
-    <string name="recent_app_sidebar_hide_labels_title">Скрывать подписи значков</string>
-    <string name="recent_app_sidebar_label_color_title">Цвет метки</string>
-    <string name="recent_app_sidebar_bg_color_title">Цвет фона</string>
-    <string name="recent_app_sidebar_scale_title">Размер</string>
-    <string name="recent_app_sidebar_open_simultaneously_title">Открывать одновременно с недавними</string>
-    <string name="recent_app_sidebar_open_simultaneously_summary">Уменьшить подлагивание открытия недавних, отключив это</string>
-    <string name="default_auto_string">По умолчанию (на основе приложения)</string>
-    <!-- Slim recents membar -->
-    <string name="default_string">По умолчанию</string>
-    <string name="profile_choose_app">Выбор приложения</string>
-    <string name="dialog_delete_title">Удалить</string>
-    <string name="dialog_delete_message">Удалить выбранный элемент?</string>
-    <string name="slim_recents_mem_display_category_title">Панель ОЗУ</string>
-    <string name="slim_recents_mem_display_title">Показывать использование ОЗУ</string>
-    <string name="slim_recents_mem_display_summary">Показать полосу использования ОЗУ</string>
-    <string name="slim_recents_mem_display_color">Цвет шкалы</string>
-    <string name="slim_recents_mem_display_text_color">Цвет полосы памяти</string>
-    <string name="slim_recents_enter_exit_animation_title">Анимация</string>
-    <string name="slim_recents_enter_exit_animation_translate">Перевести</string>
-    <string name="slim_recents_enter_exit_animation_fade">Затухание</string>
-    <!-- R Notification headers -->
-    <string name="notification_headers_title">Показывать заголовки уведомлений</string>
-    <string name="notification_headers_summary">Показывать ли заголовки уведомлений R (Требуется перезапуск SystemUI)</string>
-    <!-- AOKP custom system animations -->
-    <string name="system_animation_title">Система</string>
-    <string name="activity_open_title">Анимация открытия активности</string>
-    <string name="activity_close_title">Анимация закрытия действия</string>
-    <string name="task_open_title">Открытие задачи</string>
-    <string name="task_open_behind_title">Анимация открытия фоновой задачи</string>
-    <string name="task_close_title">Анимация закрытия задачи</string>
-    <string name="task_move_to_front_title">Анимация перемещения вперед</string>
-    <string name="task_move_to_back_title">Анимация движения назад</string>
-    <string name="wallpaper_open_title">Анимация открытия обоев</string>
-    <string name="wallpaper_close_title">Закрытие обоев</string>
-    <string name="wallpaper_intra_open_title">Внутр. анимация открытия обоев</string>
-    <string name="wallpaper_intra_close_title">Обои внутри анимации закрытия</string>
-    <string name="animation_duration_title">Длительность анимации</string>
-    <string name="title_animation_no_override">Предотвращение переопределения приложения</string>
-    <string name="summary_animation_no_override">Предотвратить переопределение переходов в приложениях</string>
-    <string name="animation_duration_default">По умолчанию</string>
-    <!-- Wake on charge -->
-    <string name="wake_when_plugged_or_unplugged_title">Пробуждать во время зарядки</string>
-    <string name="wake_when_plugged_or_unplugged_summary">Разбудить устройство при подключении/отключении зарядного устройства</string>
-    <!-- Quick Settings -->
-    <string name="lockscreen_qs_disabled_title">Отключить быстрые настройки на экране блокировки</string>
-    <string name="lockscreen_qs_disabled_summary">Запретить выдвигать панель на защищенном экране блокировки</string>
-    <!-- Quick pull down-->
-    <string name="quick_pulldown_title">Быстрый доступ</string>
-    <string name="quick_pulldown_summary">Движение %1$s открывает переключатели</string>
-    <string name="quick_pulldown_summary_always">Всегда показывать быстрые настройки при вытягивании строки состояния</string>
-    <string name="quick_pulldown_off">Выключено</string>
-    <string name="quick_pulldown_left">Слева</string>
-    <string name="quick_pulldown_right">Справа</string>
-    <string name="quick_pulldown_always">Всегда</string>
-    <!-- Headset ringtone audio focus -->
-    <string name="ringtone_focus_mode_title">При подключённой гарнитуре, входящий вызов воспроизводить через</string>
-    <string name="ringtone_focus_mode_dynamic">Только гарнитура при активной музыке</string>
-    <string name="ringtone_focus_mode_stock">Динамик и гарнитуру</string>
-    <!-- Force expanded notifications -->
-    <string name="force_expanded_notifications_title">Принудительно разворачивать уведомления</string>
-    <string name="force_expanded_notifications_summary">Доступно для приложений поддерживающих расширенные уведомления</string>
-    <!-- Switch styles -->
-    <string name="switch_style_title">Стиль переключателей настроек</string>
-    <string name="switch_default">По умолчанию</string>
-    <string name="switch_md2">Material Design 2</string>
-    <string name="switch_oneplus">OnePlus</string>
-    <string name="switch_narrow">Узкий</string>
-    <string name="switch_contained">Содержимое</string>
-    <string name="switch_retro">Ретро</string>
-    <string name="switch_stockish">Заливка</string>
-    <string name="switch_telegram">Телеграм</string>
-    <!-- Gaming mode -->
-    <string name="gaming_mode_title">Игровой режим</string>
-    <string name="gaming_mode_summary">Настроить параметры игрового режима</string>
-    <string name="gaming_mode_app_picker_title">Автоматически включать для этих приложений</string>
-    <string name="add_gaming_mode_package_title">Добавить приложения для игрового режима</string>
-    <string name="add_gaming_mode_package_summary">Игровой режим будет включен автоматически, когда эти приложения будут открыты, и выключен, когда они закроются</string>
-    <string name="gaming_mode_headsup_title">Блокировать уведомления</string>
-    <string name="gaming_mode_headsup_summary">Блокировать все уведомления, кроме звонков</string>
-    <string name="gaming_mode_hardware_keys_title">Заблокировать кнопки</string>
-    <string name="gaming_mode_hardware_keys_summary">Отключить аппаратные кнопки при включённом игровом режиме</string>
-    <string name="gaming_mode_brightness_title">Отключить автоматическую яркость</string>
-    <string name="gaming_mode_brightness_summary">Фиксировать яркость экрана при включённом игровом режиме</string>
-    <string name="gaming_mode_ringer_title">Звонок в игровом режиме</string>
-    <string name="gaming_mode_ringer_off_title">Не изменять</string>
-    <string name="gaming_mode_ringer_vibrate_title">Вибрация</string>
-    <string name="gaming_mode_ringer_dnd_title">Не беспокоить</string>
-    <string name="gaming_mode_ringer_silent_title">Без звука</string>
-    <string name="gaming_mode_notifications_title">Индикация в игровом режиме</string>
-    <string name="gaming_mode_notifications_off_title">Отключена</string>
-    <string name="gaming_mode_notifications_notif_title">Показывать уведомление</string>
-    <string name="gaming_mode_notifications_toast_title">Показывать всплывающие сообщения</string>
-    <string name="gaming_mode_notifications_all_title">Показывать всплывающие сообщения и уведомления</string>
-    <string name="gaming_mode_dynamic_title">Автоматический режим</string>
-    <string name="gaming_mode_dynamic_summary">Пытаться обнаружить и добавить игровые приложения автоматически</string>
-    <!-- Heads up timeout -->
-    <string name="heads_up_time_out_title">Длительность</string>
-    <string name="heads_up_time_out_summary">Уведомление будет показываться <xliff:g id="number">%d</xliff:g> секунд</string>
-    <string name="heads_up_time_out_2sec">2 секунды</string>
-    <string name="heads_up_time_out_4sec">4 секунды</string>
-    <string name="heads_up_time_out_5sec">5 секунд</string>
-    <string name="heads_up_time_out_6sec">6 секунд</string>
-    <string name="heads_up_time_out_8sec">8 секунд</string>
-    <string name="heads_up_time_out_10sec">10 секунд</string>
-    <!-- Heads up -->
-    <string name="heads_up_notifications">Всплывающие</string>
-    <string name="notification_stat">Всплытие</string>
-    <string name="heads_up_notifications_summary">Выводить уведомления строки состояния</string>
-    <string name="add_heads_up_package">Добавить приложение</string>
-    <string name="heads_up_stoplist_title">Список остановок</string>
-    <string name="add_heads_up_stoplist_summary">Отключить всплывающие уведомления от этих приложений</string>
-    <string name="heads_up_blacklist_title">Чёрный список</string>
-    <string name="add_heads_up_blacklist_summary">Отключить всплывающие уведомления для этих приложений</string>
-    <!-- Heads up snooze -->
-    <string name="heads_up_snooze_title">Таймер переноса</string>
-    <string name="heads_up_snooze_summary_one_minute">Свайп вверх по всплывающему уведомлению от этого приложения скроет его на одну минуту</string>
-    <string name="heads_up_snooze_summary">Смахивание вверх отложит всплывающие уведомления от приложения на <xliff:g id="number">%d</xliff:g> минут(ы)</string>
-    <string name="heads_up_snooze_disabled_summary">Функция \"Отложить\" отключена</string>
-    <string name="heads_up_snooze_1min">1 мин.</string>
-    <string name="heads_up_snooze_5min">5 минут</string>
-    <string name="heads_up_snooze_10min">10 минут</string>
-    <string name="heads_up_snooze_15min">15 минут</string>
-    <string name="heads_up_snooze_20min">20 минут</string>
-    <!-- Heads up options -->
-    <string name="less_boring_heads_up_title">Меньше всплывающих уведомлений</string>
-    <string name="less_boring_heads_up_summary">Показывать всплывающие уведомления только для телефона, сообщений и будильника</string>
-    <!-- FOD icon picker -->
-    <string name="fod_title">Посторонние </string>
-    <string name="fod_icon_picker_title">Выбор иконки FOD</string>
-    <string name="fod_icon_picker_summary">Выберите вашу любимую иконку отпечатка пальца</string>
-    <string name="fod_icon_picker_footer">Чтобы добавить свою иконку, выберите иконку в верхнем левом углу и с помощью приложения OnePlus 6T FP Customizer добавьте нужную иконку.</string>
-    <!-- Settings dashboard icon style -->
-    <string name="theming_settings_dashboard_icons_title">Значки панели настроек</string>
-    <string name="theming_settings_dashboard_icons_default2">Стандартный фон</string>
-    <string name="theming_settings_dashboard_icons_default_accent2">Акцент фона</string>
-    <string name="theming_settings_dashboard_icons_plain">Обычный</string>
-    <string name="theming_settings_dashboard_icons_plain_accent">Обычный акцент</string>
-    <string name="theming_settings_dashboard_icons_default_oneplus">OnePlus</string>
-    <string name="theming_settings_dashboard_icons_bg_random">Random Background</string>
-    <string name="theming_settings_dashboard_icons_random">Random Icon</string>
-    <string name="theming_settings_dashboard_icons_random_bg_accent">Icon Random Bg Accent</string>
-    <string name="theming_settings_dashboard_icons_accent_bg_random">Icon Accent Bg Random</string>
-    <!-- Audio Panel view -->
-    <string name="audio_panel_view">Панель громкости</string>
-    <string name="audio_panel_view_media_title">Медиа</string>
-    <string name="audio_panel_view_ringer_title">Кольцо</string>
-    <string name="audio_panel_view_notification_title">Уведомление</string>
-    <string name="audio_panel_view_alarm_title">Будильник</string>
-    <string name="audio_panel_view_voice_title">Голос</string>
-    <string name="audio_panel_view_bt_sco_title">Bluetooth</string>
-    <!-- VoWiFi icon -->
-    <string name="vowifi_icon_title">Значок VoWiFi</string>
-    <string name="vowifi_icon_enabled">Значок VoWiFi включен</string>
-    <string name="vowifi_icon_disabled">Значок VoWiFi отключен</string>
-    <string name="vowifi_icon_enabled_volte_disabled">VoWiFi вместо значка VoLTE</string>
-    <string name="vowifi_icon_style_title">Стиль иконки VoWiFi</string>
-    <string name="vowifi_icon_default">Стандартная иконка</string>
-    <string name="vowifi_icon_emui">Значок EMUI</string>
-    <string name="vowifi_icon_asus">Asus иконка</string>
-    <string name="vowifi_icon_oneplus">OOS иконка</string>
-    <string name="vowifi_icon_moto">Иконка Motorola</string>
-    <!-- QS Footer Text -->
-    <string name="qs_footer_text_title">Текст нижнего колонтитула</string>
-    <string name="qs_footer_text_summary">Отображать текст внизу панели быстрых настроек</string>
-    <string name="qs_footer_text_string_title">Пользовательский текст нижнего колонтитула</string>
-    <string name="qs_footer_text_string_summary">Выставьте пустым для строки по умолчанию #KeepEvolving</string>
-    <string name="brightness_slider_qs_unexpanded">Слайдер яркости MIUI (бета)</string>
-    <string name="brightness_slider_qs_unexpanded_summary">Показывать ползунок яркости в панели быстрых настроек</string>
-    <!-- Settings Dashboard conditions and suggestions -->
-    <string name="settings_show_conditions_title">Dashboard conditions</string>
-    <string name="settings_show_conditions_summary">Display condition cards in Settings screen</string>
-    <string name="settings_show_suggestions_title">Dashboard suggestions</string>
-    <string name="settings_show_suggestions_summary">Display suggestion cards in Settings screen</string>
-    <!-- Volume Panel Plugin -->
-    <string name="volume_panel">Volume Panel Style</string>
-    <string name="volume_panel_aosp">AOSP</string>
-    <string name="volume_panel_compat">Compat</string>
-    <string name="volume_panel_oreo">Oreo</string>
-    <string name="volume_panel_tiled">Tiled</string>
-    <!-- Volume Panel Plugin Values -->
-    <string name="volume_panel_aosp_val">co.potatoproject.plugin.volume.aosp</string>
-    <string name="volume_panel_compat_val">co.potatoproject.plugin.volume.compact</string>
-    <string name="volume_panel_oreo_val">co.potatoproject.plugin.volume.oreo</string>
-    <string name="volume_panel_tiled_val">co.potatoproject.plugin.volume.tiled</string>
-    <!-- Power menu Animations  -->
-    <string name="power_menu_animation">Power menu</string>
-    <string name="power_menu_animation_title">Power menu animation</string>
-    <string name="power_menu_animation_summary">Change the enter/exit animation of the power menu</string>
-    <string name="power_menu_animation_dialog_title">Select power menu animation</string>
-    <string name="power_menu_animation_aosp">AOSP (default)</string>
-    <string name="power_menu_animation_bottom">Bottom</string>
-    <string name="power_menu_animation_top">Top</string>
-    <string name="power_menu_animation_xylon">Fly</string>
-    <string name="power_menu_animation_slide">Slide</string>
-    <string name="power_menu_animation_turn">Turn</string>
-    <string name="power_menu_animation_fly">Glow</string>
-    <string name="power_menu_animation_card">3D</string>
-    <string name="power_menu_animation_translucent_top">Translucent (top)</string>
-    <string name="power_menu_animation_translucent_bottom">Translucent (bottom)</string>
-    <string name="power_menu_animation_rotate">Rotate</string>
-    <!-- QS header image -->
-    <string name="status_bar_custom_header_title">Header image</string>
-    <string name="status_bar_custom_header_summary">Use a custom image for QS header</string>
-    <string name="custom_header_provider_title">Image type</string>
-    <string name="daylight_header_provider_title">Automatic (Time based)</string>
-    <string name="file_header_provider_title">Static</string>
-    <string name="daylight_header_pack_title">Image collection</string>
-    <string name="header_provider_disabled">Disabled</string>
-    <string name="custom_header_pick_title">Pick image from collection</string>
-    <string name="custom_header_pick_summary">Select an image from pre-installed image collections</string>
-    <string name="file_header_select_title">Pick image from storage</string>
-    <string name="file_header_select_summary">Select an image from internal storage</string>
-    <string name="status_bar_custom_header_shadow_title">Darken image</string>
-    <string name="status_bar_custom_header_height_title">Image height offset</string>
-    <!-- Ambient edge lighting -->
-    <string name="notification_screen_title">Screen</string>
-    <string name="pulse_ambient_light_title">Edge lighting</string>
-    <string name="pulse_ambient_light_summary">Light up the side edges of the screen on notification pulse</string>
-    <string name="pulse_ambient_light_color_title">Edge light color</string>
-    <string name="pulse_ambient_light_auto_color_title">Automatic color</string>
-    <string name="pulse_ambient_light_auto_color_summary">Sync color with wallpaper</string>
-    <string name="pulse_ambient_light_duration">Edge light pulse duration</string>
-    <string name="edgelight_left">Left Edge</string>
-    <string name="edgelight_right">Right Edge</string>
-    <string name="ambient_notification_light_enabled_title">Show on AoD</string>
-    <string name="ambient_notification_light_enabled_sumary">Keep showing on always on display. Until the screen is turned on</string>
-    <string name="ambient_notification_light_hide_aod_title">Hide AoD content</string>
-    <string name="ambient_notification_light_hide_aod_sumary">Hide other AoD content when bars are showing</string>
-    <string name="pulse_ambient_light_pulse_for_all_title">Pulse for all doze events</string>
-    <string name="pulse_ambient_light_pulse_for_all_summary">Pulses for any doze wake and not just notifications when enabled</string>
-    <string name="ambient_notification_light_accent_title">Accent color</string>
-    <string name="ambient_notification_light_accent_summary">Sync color with accent color</string>
-    <string name="pulse_ambient_light_pulse_for_all_repeat_title">Repeat edge lighting</string>
-    <string name="pulse_ambient_light_pulse_for_all_repeat_summary">Repeat edge lighting animation on doze wake</string>
-    <string name="pulse_ambient_light_repeat_mode_title">Edge Light Animation</string>
-    <string name="pulse_ambient_light_anim_restart">Restart</string>
-    <string name="pulse_ambient_light_anim_reverse">Reverse</string>
-    <string name="pulse_ambient_light_layout_title">Edge Light View</string>
-    <string name="pulse_ambient_light_layout_solid">Solid</string>
-    <string name="pulse_ambient_light_layout_faded">Faded</string>
-    <string name="qs_datausage_title">Show data usage in qs header</string>
-    <string name="qs_datausage_subtitle">Shows data usage in quick settings header of sim used for data</string>
-    <!-- QS header styles -->
-    <string name="qs_header_style_title">QS Header style</string>
-    <string name="qs_header_black">Black</string>
-    <string name="qs_header_grey">Grey</string>
-    <string name="qs_header_lightgrey">Light Grey</string>
-    <string name="qs_header_accent">Accent Based</string>
-    <string name="qs_header_transparent">Transparent</string>
-</resources>
diff --git a/res/values-uk/cherish_about.xml b/res/values-uk/cherish_about.xml
deleted file mode 100644
index 5da7d21..0000000
--- a/res/values-uk/cherish_about.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 CherishOS
-
-      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="about_cherish">Про</string>
-  <string name="about_info">Про нас</string>
-  <string name="about_info_summary">CherishOS на основі Пікселя досвіду, з деяким доданим додатком. Ми приносимо прошивку з цим винятковим досвідом, баланс функцій і поліпшимо життя батареї.</string>
-  <string name="dev_info">Про CherishOS</string>
-  <string name="devs_header">Зустрітись з нашою командою</string>
-  <string name="founder">Кунг Фан</string>
-  <string name="founder_description">Засновник</string>
-  <string name="lead">Кунг Фан</string>
-  <string name="lead_description">Головний розробник</string>
-  <string name="social_header">Поїхали!</string>
-  <string name="cherish_web">Вебсайт</string>
-  <string name="cherish_web_description">Сайт CherishOS для інформації та іншого.</string>
-  <string name="cherish_web_link">http://cherish.github.io</string>
-  <string name="cherish_telegram">Телеграм</string>
-  <string name="cherish_telegram_description">CherishOS канал.</string>
-  <string name="cherish_telegram_link">https://t.me/CherishOS</string>
-  <string name="cherish_github">ГітХаб</string>
-  <string name="cherish_github_description">Ми є відкритим кодом!</string>
-  <string name="cherish_github_link">https://github.com/CherishOS/</string>
-  <string name="donate">Підтримати</string>
-  <string name="donate_description">Пожертва не є необхідною, але кожна копійка від вас допоможе нам сплачувати рахунки за сервери.</string>
-  <string name="donation_link">https://paypal.me</string>
-  <!--Device maintainers -->
-  <string name="official_devices">Офіційні пристрої</string>
-  <string name="maintainers_header">Супроводжуючі</string>
-  <string name="maintainers_summary">офіційні пристрої та супроводжуючі</string>
-</resources>
diff --git a/res/values-uk/cherish_strings.xml b/res/values-uk/cherish_strings.xml
deleted file mode 100644
index 7a73c15..0000000
--- a/res/values-uk/cherish_strings.xml
+++ /dev/null
@@ -1,396 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 CherishOS
-     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">
-    <!-- App Title -->
-    <string name="cherish_settings_title">Улюблені налаштування </string>
-    <!-- Categories -->
-    <string name="button_title">Кнопки</string>
-    <string name="gestures_title">Жести</string>
-    <string name="lockscreen_title">Екран блокування</string>
-    <string name="misc_title">Різне</string>
-    <string name="animations_title">Анімації</string>
-    <string name="powermenu_title">Меню живлення</string>
-    <string name="theme_title">Теми</string>
-    <string name="quicksettings_title">Швидкі налаштування</string>
-    <string name="recents_title">Нещодавні додатки</string>
-    <string name="statusbar_title">Панель статусу</string>
-    <string name="volume_title">Клавіші регулювання гучності</string>
-    <string name="notifications_title">Сповіщення</string>
-    <string name="device_part_title">Функції пристрою</string>
-    <string name="qs_category">Категорія QS</string>
-    <!-- General strings -->
-    <string name="ok">Добре</string>
-    <string name="reset">Скинути</string>
-    <string name="cancel">Скасувати</string>
-    <string name="save">Зберегти</string>
-    <!-- Color Picker -->
-    <string name="dialog_color_picker">Палітра кольорів</string>
-    <string name="press_color_to_apply">Натисніть на колір нижче, щоб застосувати</string>
-    <string name="arrow_right">→</string>
-    <string name="arrow_down">↓</string>
-    <string name="hex">Хекс:</string>
-    <string name="hex_hint">#ff000000</string>
-    <string name="set">Встановити</string>
-    <string name="color_default">Типово</string>
-    <!-- Lockscreen battery info indicator  -->
-    <string name="lockscreen_battery_info_title">Інформація про заряджання</string>
-    <string name="lockscreen_battery_info_summary">Відображення максимальної напруги струму і температуру акумулятора на екрані блокування під час зарядки</string>
-    <!-- QS category -->
-    <string name="enable_clear_all_button">Змінити напис Очистити все на декоративну кнопку</string>
-    <string name="enable_clear_all_button_summary">Показувати декоративну кнопку замість напису Очистити все для очистки повідомлень</string>
-    <string name="qs_bg_use_new_tint">Кольори плиток швидких налаштувань</string>
-    <string name="qs_bg_use_new_tint_summary">Використовувати колір акценту для плиток швидких налаштувань і тла</string>
-    <string name="qs_blur_alpha_title">Прозорість альфа</string>
-    <string name="qs_blur_alpha_summary">Встановлює прозорість розмиття</string>
-    <string name="blur_quicksettings">Розмиття позаду швидких налаштувань (бета-версія)</string>
-    <string name="blur_quicksettings_subtitle">розмиття темного фону позаду швидких налаштувань</string>
-    <string name="qs_blur_intensity_title">Інтенсивність ефекту розмиття</string>
-    <string name="qs_blur_intensity_summary">Встановлює інтенсивність/радіус розмиття</string>
-    <string name="unit_percent">\u0025</string>
-    <!-- In-call feedback -->
-    <string name="incall_feeedback_vibrate_title">Вібрація під час індексації статусу виклику</string>
-    <!-- Lock screen cover art -->
-    <string name="lockscreen_media_art_title">Показувати обкладинку мультимедіа</string>
-    <string name="lockscreen_media_blur_title">Рівень розмитості медіа</string>
-    <!-- QS settings -->
-    <string name="qs_title">Швидкі налаштування</string>
-    <string name="qs_rows_portrait_title">Рядки (портретна орієнтація)</string>
-    <string name="qs_rows_landscape_title">Рядки (альбомна орієнтація)</string>
-    <string name="qs_columns_portrait_title">Колонки (портретна орієнтація)</string>
-    <string name="qs_columns_landscape_title">Колонки (ландшафтна орієнтація)</string>
-    <!-- QS title visibility -->
-    <string name="qs_tile_title_visibility_title">Видимість назви</string>
-    <string name="qs_tile_title_visibility_summary">Відображення заголовка плиток</string>
-    <!-- QS tiles haptic feedback -->
-    <string name="qs_vibrate_title">Вібрація при дотику</string>
-    <string name="qs_vibrate_summary">Вібрація при дотику до плитки швидких налаштувань</string>
-    <string name="qs_brightness_position_bottom_title">Повзунок яскравості знизу</string>
-    <string name="qs_brightness_position_bottom_summary">Показувати повзунок яскравості на панелі швидких налаштувань</string>
-    <string name="enable_oneui">OneUI</string>
-    <string name="enable_oneui_summary">Показати пробіл над панеллю налаштувань для спрощення використання однією рукою\nПРИМІТКА: перезапустіть параметри, щоб побачити ефект</string>
-    <!-- Lockscreen clock style -->
-    <string name="lockscreen_clock_title">Стиль годинника</string>
-    <string name="lockscreen_clock_dialog_title">Обрати стиль годинника</string>
-    <string name="lockscreen_clock_hide">Приховати</string>
-    <string name="lockscreen_clock_default">Типово</string>
-    <string name="lockscreen_clock_default_bold">За замовчуванням (жирний)</string>
-    <string name="lockscreen_clock_default_accent">За замовчуванням (акцент годин)</string>
-    <string name="lockscreen_clock_default_accent_min">За замовчуванням (акцент хвилин)</string>
-    <string name="lockscreen_clock_default_accent_hour">За замовчуванням (акцент годин)</string>
-    <string name="lockscreen_clock_sammy">Вертикальний</string>
-    <string name="lockscreen_clock_sammy_bold">Вертикальний (жирний)</string>
-    <string name="lockscreen_clock_sammy_accent_hour">Вертикальні (акцент годин)</string>
-    <string name="lockscreen_clock_sammy_accent_min">Вертикальні (акцент хвилин)</string>
-    <!-- Lockscreen Date styles -->
-    <string name="lockscreen_date_title">Стиль дати</string>
-    <string name="lockscreen_date_selection_title">Стиль дати</string>
-    <string name="lockscreen_date_dialog_title">Вибрати стиль дати</string>
-    <string name="lockscreen_date_selection_default">Типово</string>
-    <string name="lockscreen_date_selection_str_box">Напів-прозора коробка</string>
-    <string name="lockscreen_date_selection_str_round">Напівпрозорий (закруглений)</string>
-    <string name="lockscreen_date_selection_qbeta_style">Q Бета пігулка</string>
-    <string name="lockscreen_date_selection_str_accent">Закруглена, проста з акцентом</string>
-    <string name="lockscreen_date_selection_str_accent_transparent">Закруглена, прозора з акцентом</string>
-    <string name="lockscreen_date_selection_str_gradient">Градієнт</string>
-    <string name="lockscreen_date_selection_str_border_accent">Темний з акцентованими гранями</string>
-    <string name="lockscreen_date_selection_str_border_gradient">Темна з градієнтом кутів</string>
-    <!-- Status bar - icons -->
-    <string name="status_bar_icons_title">Значки статус бару</string>
-    <string name="status_bar_system_icons_title">Системні значки</string>
-    <string name="status_bar_system_icons_summary">Керування відображенням значків в рядку стану</string>
-    <!-- Statusbar Clock -->
-    <string name="statusbar_items_title">Значки рядку стану</string>
-    <string name="clock_category_title">Годинник</string>
-    <string name="date_category_title">Дата</string>
-    <string name="status_bar_clock_title">Годинник і дата</string>
-    <string name="status_bar_clock_summary">Налаштування годинника і дати в рядку стану</string>
-    <string name="status_bar_clock_style_title">Позиція годинника</string>
-    <string name="status_bar_clock_style_right">Праворуч</string>
-    <string name="status_bar_clock_style_center">По центру</string>
-    <string name="status_bar_clock_style_left">Ліворуч</string>
-    <string name="status_bar_am_pm_title">12-годинний формат часу (AM/PM)</string>
-    <string name="status_bar_am_pm_info">24-годинний формат часу ввімкнено</string>
-    <string name="status_bar_am_pm_normal">Звичайний</string>
-    <string name="status_bar_am_pm_small">Малий</string>
-    <string name="status_bar_am_pm_hidden">Прихований</string>
-    <string name="clock_seconds_display">Показати секунди</string>
-    <string name="clock_seconds_display_summary">Відображати годинник з секундами в рядку стану</string>
-    <string name="clock_date_display">Дата</string>
-    <string name="clock_date_display_summary">Відображати користувацький формат дати перед годинником</string>
-    <string name="clock_date_display_none">Прихований</string>
-    <string name="clock_date_display_small">Малий</string>
-    <string name="clock_date_display_normal">Звичайний</string>
-    <string name="clock_date_style">Стиль дати</string>
-    <string name="clock_date_style_normal">Звичайний</string>
-    <string name="clock_date_style_lowercase">Нижній регістр</string>
-    <string name="clock_date_style_uppercase">Верхній регістр</string>
-    <string name="clock_date_format_custom">Користувацький java формат</string>
-    <string name="clock_date_format">Формат дати</string>
-    <string name="clock_date_format_summary">%1$s</string>
-    <string name="clock_date_string_edittext_title">Значення має відповідати формату дати, наприклад: ММ/ДД/РР</string>
-    <string name="clock_date_string_edittext_summary">Введіть рядок</string>
-    <string name="clock_date_right">Праворуч від часу</string>
-    <string name="clock_date_left">Ліворуч від часу</string>
-    <string name="clock_date_position">Розташування дати</string>
-    <string name="status_bar_clock_auto_hide_title">Автоматично приховувати годинник</string>
-    <string name="status_bar_clock_auto_hide_summary">Приховати і відображати годинник через регулярні проміжки часу</string>
-    <string name="status_bar_clock_auto_hide_hdur_title">Приховати тривалість</string>
-    <string name="status_bar_clock_auto_hide_sdur_title">Показати тривалість</string>
-    <!-- Charging animation -->
-    <string name="lockscreen_charging_animation_title">Анімація заряджання</string>
-    <string name="lockscreen_charging_animation_summary">Показувати анімацію при підключенні зарядного пристрою</string>
-    <string name="lockscreen_charging_animation_off">Вимкнено</string>
-    <string name="lockscreen_charging_animation_flash">Спалах</string>
-    <string name="lockscreen_charging_animation_battery">Батарея</string>
-    <string name="lockscreen_charging_animation_drop">Крапля</string>
-    <string name="lockscreen_charging_animation_explosion">Вибух</string>
-    <string name="lockscreen_charging_animation_water">Вода</string>
-    <!-- Battery Styles -->
-    <string name="battery_style_category_title">Рівень заряду акумулятора</string>
-    <string name="battery_percent_title">Відсоток заряду батареї</string>
-    <!-- Status bar - Battery -->
-    <string name="status_bar_battery_style_title">Стиль батареї</string>
-    <string name="status_bar_battery_style_q">Портретна іконка (за замовчуванням)</string>
-    <string name="status_bar_battery_style_dotted_circle">Кільце (пунктирне)</string>
-    <string name="status_bar_battery_style_circle">Кільце</string>
-    <string name="status_bar_battery_style_text">Текст</string>
-    <string name="status_bar_battery_style_hidden">Прихований</string>
-    <string name="status_bar_battery_style_big_circle">Велике коло</string>
-    <string name="status_bar_battery_style_filled_circle">Коло (заповнене)</string>
-    <!-- Status bar - Battery percentage -->
-    <string name="status_bar_battery_percentage_title">Відсоток заряду батареї</string>
-    <string name="status_bar_battery_percentage_default">Прихований (типово)</string>
-    <string name="status_bar_battery_percentage_text_inside">Всередині значка</string>
-    <string name="status_bar_battery_percentage_text_next">Поруч зі значком</string>
-    <string name="status_bar_battery_text_charging_title">Показувати відсотки при заряджанні</string>
-    <string name="status_bar_battery_text_charging_summary">Завжди показувати відсотки акумулятора під час заряджання</string>
-    <!-- Battery mode -->
-    <string name="battery_percentage_title">Відсоток заряду батареї</string>
-    <string name="battery_percentage_off">Вимкнено</string>
-    <string name="battery_percentage_next">Ввімкнено</string>
-    <string name="battery_percentage_inside">Увімкнено (всередині значка)</string>
-    <string name="battery_percentage_estimate">Увімкнено (приблизно)</string>
-    <string name="battery_percentage_percentage_estimate">Увімкнено (відсоток | оцінка)</string>
-    <!-- Network traffic -->
-    <string name="traffic_title">Індикатор трафіку</string>
-    <string name="traffic_title_summary">Налаштування індикатора трафіку</string>
-    <string name="network_traffic_title">Мережевий трафік</string>
-    <string name="network_traffic_type">Оберіть тип мережевої активності</string>
-    <string name="show_network_traffic_up">Вихідний</string>
-    <string name="show_network_traffic_down">Вхідний</string>
-    <string name="show_network_traffic_all">Вихідний і вхідний</string>
-    <string name="network_traffic_state_title">Відображати активність мережі у рядку стану</string>
-    <string name="network_traffic_autohide_threshold_title">Автоматичне приховування індикатора мережевої активності (кБ/с)</string>
-    <string name="network_traffic_hidearrow">Приховати стрілки</string>
-    <string name="network_traffic_hidearrow_summary">Приховати стрілки в індикаторі трафіку</string>
-    <!-- 4G icon -->
-    <string name="statusbar_items_category">Значки</string>
-    <string name="show_fourg_icon_title">Значок 4G</string>
-    <string name="show_fourg_icon_summary">Показувати значок 4G замість LTE в рядку стану</string>
-    <!-- Show VoLTE icon on statusbar -->
-    <string name="volte_icon_title">VoLTE значок</string>
-    <string name="volte_icon_summary">Відображати значок VoLTE (потребує перезавантаження SystemUI, щоб зміни вступили в силу)</string>
-    <!-- VoLTE icon styles -->
-    <string name="volte_icon_style_title">Виберіть значок VoLTE</string>
-    <string name="volte_icon_vo">Типовий значок</string>
-    <string name="volte_icon_volte">VoLTE значок</string>
-    <string name="volte_icon_oos">VoLTE OOS значок</string>
-    <string name="volte_icon_hd">Значок HD</string>
-    <string name="volte_icon_miui">VoLTE Miui значок </string>
-    <string name="volte_icon_asus">VoLTE Asus значок</string>
-    <!-- Lock screen visualizer -->
-    <string name="visualizer_title">Відображати візуалізатор музики</string>
-    <string name="lockscreen_visualizer_title">Візуалізатор музики</string>
-    <!-- Fingerprint authentication vibration -->
-    <string name="fprint_sucess_vib_title">Вібрація розпізнавання відбитку пальця</string>
-    <string name="fprint_sucess_vib_summary">Вібрувати при успішному розпізнаванні відбитку пальця</string>
-    <!-- Advanced restart options -->
-    <string name="advanced_reboot_title">Розширене перезавантаження</string>
-    <string name="advanced_reboot_summary">Коли пристрій розблоковано, в меню живлення доступні опції перезавантаження в режим відновлення і завантажувач</string>
-    <!-- Battery light -->
-    <string name="battery_light_settings">Індикація зарядки акумулятора</string>
-    <string name="battery_light_enable">Увімкнений</string>
-    <string name="battery_light_allow_on_dnd_title">Індикатор заряду в режимі \"Не турбувати\"</string>
-    <string name="battery_light_low_blinking_title">Блимання індикатора при низькому заряді</string>
-    <string name="battery_light_cat">Колір індикатора під час заряджання</string>
-    <string name="battery_light_low_color">Низький заряд батареї</string>
-    <string name="battery_light_medium_color">Помірний заряд батареї</string>
-    <string name="battery_light_full_color">Майже повний заряд батареї</string>
-    <string name="battery_light_reallyfull_color">Повний заряд батареї (100%)</string>
-    <!-- Old MobileType Toggle -->
-    <string name="use_old_mobiletype_title">Використовувати старий стиль мобільних даних</string>
-    <string name="use_old_mobiletype_summary">Об\'єднати значки сигналу і типу підключення</string>
-    <!-- Themes -->
-    <string name="theme_type_title">Тема системи</string>
-    <string name="theme_type_summary">Обрати тему</string>
-    <string name="theme_type_light">Світлий</string>
-    <string name="theme_type_pitch_black">Темна Google</string>
-    <string name="theme_type_solarized_dark">Термінова темна</string>
-    <string name="theme_type_baked_green">Печена зелена</string>
-    <string name="theme_type_choco_x">Чоко - Х</string>
-    <string name="theme_type_du_pitchblack">Насичена чорна</string>
-    <string name="theme_type_dark_grey">Темно-сірий</string>
-    <string name="theme_type_material_ocean">Матеріальний океан</string>
-    <!-- RGB Accenter -->
-    <string name="theme_rgb_title">Акцент ПГБ | Градієнт Теми</string>
-    <string name="themes_hub_title">Теми</string>
-    <string name="themes_hub_summary">Акканс-Градієнт-Тем</string>
-    <string name="accent_color">Вибір акценту</string>
-    <string name="accent_summary">Градієнтний Мейкер</string>
-    <string name="gradient_color">Вибір градієнту</string>
-    <string name="gradient_summary">Градієнтний ефект</string>
-    <!-- Power menu and dialogs opacity -->
-    <string name="lockscreen_secure_power_title">Захищене меню живлення</string>
-    <string name="lockscreen_secure_power_menu_title">Захищене меню живлення</string>
-    <string name="lockscreen_secure_power_menu_summary">Дозволити меню живлення тільки після аутентифікації</string>
-    <string name="power_menu_emergency_title">Екстрений виклик</string>
-    <string name="panel_porn_title">Прозорість меню вимкнення / перезавантаження</string>
-    <string name="power_menu_transparency">Прозорість меню живлення/перезавантаження</string>
-    <string name="power_menu_dialog_dim">Затемнення фону при відображенні меню живлення</string>
-    <!-- Rounded corners -->
-    <string name="corners_category_title">Затемнення фону при відображенні меню живлення</string>
-    <string name="corners_category_summary">Налаштувати закруглені кути та поля</string>
-    <string name="corners_title">Налаштувати закруглені кути</string>
-    <string name="corner_radius">Радіус закруглення кутів</string>
-    <string name="content_padding">Відступ від кута</string>
-    <string name="status_bar_padding">Відступ рядка стану</string>
-    <string name="corner_fwvals">Використовувати значення фреймворку</string>
-    <string name="corner_fwvals_summary">Корисно, якщо пристрій уже має закруглені кути</string>
-    <!-- Adaptive Playback -->
-    <string name="media_title">Медіа</string>
-    <string name="adaptive_playback_title">Адаптивне відтворення</string>
-    <string name="adaptive_playback_summary">Призупиняти медіа, коли гучність вимкнено та відновіть його шляхом збільшення гучності в межах тайм-ауту</string>
-    <string name="adaptive_playback_timeout_title">Тайм-аут відтворення</string>
-    <string name="adaptive_playback_timeout_30_secs">30 секунд</string>
-    <string name="adaptive_playback_timeout_1_min">1 хвилина</string>
-    <string name="adaptive_playback_timeout_2_min">2 хвилини</string>
-    <string name="adaptive_playback_timeout_5_min">5 хвилин</string>
-    <string name="adaptive_playback_timeout_10_min">10 хвилин</string>
-    <!-- Custom carrier label and position -->
-    <string name="label_title">Відмітка</string>
-    <string name="carrier_label_settings_title">Мітка оператора</string>
-    <string name="carrier_label_settings_summary">Власна назва оператора</string>
-    <string name="custom_carrier_label_title">Власна мітка оператора</string>
-    <string name="custom_carrier_label_explain">Введіть свою назву оператора. Залиште порожнім, щоб використовувати поточне ім\'я мережі</string>
-    <string name="custom_carrier_label_notset">Мітка оператора не встановлена</string>
-    <string name="show_carrier_title">Колір мітки оператора</string>
-    <string name="show_carrier_disabled">Вимкнено</string>
-    <string name="show_carrier_keyguard">Екран блокування</string>
-    <string name="show_carrier_statusbar">Панель стану</string>
-    <string name="show_carrier_enabled">Обидва</string>
-    <!-- Power menu on secure lockscreen -->
-    <string name="lockscreen_enable_power_menu_title">Меню живлення</string>
-    <string name="lockscreen_enable_power_menu_summary">Показувати меню живлення на екрані блокування</string>
-    <!-- Slim recents -->
-    <string name="alternative_recents_category">Альтернативні панелі нещодавніх</string>
-    <string name="alternative_recents_swipe_up_enabled_warning_summary">При при свайпі вверх до домашньої навігації, відкриваються \"останні\" (підтримуються лише стокові додатки)</string>
-    <string name="slim_recents_title">Панель нещодавніх додатків Slim</string>
-    <string name="slim_recents_summary">Увімкніть, щоб використовувати альтернативний вигляд нещодавніх</string>
-    <string name="slim_recents_fragment_title">Налаштування меню нещодавніх додатків від Slim</string>
-    <string name="slim_recents_fragment_summary">Налаштувати додаткові налаштування для нещодавніх Slim</string>
-    <string name="recents_max_apps_title">Максимальна дозволена кількість застосунків</string>
-    <string name="recent_panel_scale_title">Розмір</string>
-    <string name="recent_panel_expanded_mode_title">Розширений режим</string>
-    <string name="recent_panel_expanded_mode_summary">Останні завдання розширеного \"режим перегляду\"</string>
-    <string name="recent_panel_expanded_mode_auto">Авто (за замовчуванням)</string>
-    <string name="recent_panel_expanded_mode_always">Завжди </string>
-    <string name="recent_panel_expanded_mode_never">Ніколи</string>
-    <string name="recent_panel_expanded_mode_disabled">Вимкнено</string>
-    <string name="recent_panel_bg_color_title">Колір фону панелі</string>
-    <string name="recent_card_bg_color_title">Колір фону картки</string>
-    <string name="slim_recents_mem_display_long_click_clear_title">Довге натиснення на індикатор пам\'яті</string>
-    <string name="slim_recents_mem_display_long_click_clear_summary">Очищення нещодавніх довгим натисненням на індикатор пам\'яті</string>
-    <string name="slim_icon_pack_title">Набір значків</string>
-    <string name="slim_icon_pack_summary">Застосувати користувацький набір іконок для додатків на панелі</string>
-    <string name="no_iconpacks_summary">Жодного набору значків не встановлено</string>
-    <string name="dialog_pick_iconpack_title">Вибрати набір значків</string>
-    <string name="default_iconpack_title">Типові значки</string>
-    <string name="slim_recents_corner_radius_title">Змінити радіус округлення</string>
-    <!-- ATTENTION: RTL languages need to replace left with right -->
-    <string name="recent_panel_lefty_mode_title">Показати на лівому краю</string>
-    <string name="recent_panel_lefty_mode_summary">Показати панель останніх програм на лівому краю</string>
-    <string name="slim_blacklist_apps_cat_title">Чорний список</string>
-    <string name="slim_blacklist_apps_title">Чорний список додатків</string>
-    <string name="slim_blacklist_apps_summary">Додаток не відображатиметься в панелі</string>
-    <string name="slim_blacklist_add_apps_title">Додати застосунки</string>
-    <string name="slim_blacklist_add_apps_summary">Натисніть тут, щоб додати новий додаток; натисніть на додаток, щоб видалити його</string>
-    <!-- Slim Recent App Sidebar  -->
-    <string name="recent_app_sidebar_cat_title">Бічна панель додатка</string>
-    <string name="recent_app_sidebar_title">Бокова панель нещодавніх</string>
-    <string name="recent_app_sidebar_summary">Показувати ярлики додатків біля іншого краю</string>
-    <string name="recent_app_sidebar_picker_title">Бічна панель ярликів</string>
-    <string name="recent_app_sidebar_picker_summary">Виберіть додатки для відображення в бічній панелі</string>
-    <string name="recent_app_sidebar_style_title">Вид бічній панелі</string>
-    <string name="recent_app_sidebar_style_summary">Змінити вигляд бічній панелі</string>
-    <string name="recent_app_sidebar_hide_labels_title">Сховати підписи значків</string>
-    <string name="recent_app_sidebar_label_color_title">Колір підписів значків</string>
-    <string name="recent_app_sidebar_bg_color_title">Колір фону</string>
-    <string name="recent_app_sidebar_scale_title">Розмір</string>
-    <string name="recent_app_sidebar_open_simultaneously_title">Відкривати одночасно з нещодавніми</string>
-    <string name="recent_app_sidebar_open_simultaneously_summary">Зменшити підлагування відкриття нещодавніх, вимкнувши це</string>
-    <string name="default_auto_string">За замовчуванням (залежно від додатку)</string>
-    <!-- Slim recents membar -->
-    <string name="default_string">Типово</string>
-    <string name="profile_choose_app">Вибрати програму</string>
-    <string name="dialog_delete_title">Видалити</string>
-    <string name="dialog_delete_message">Видалити вибраний елемент?</string>
-    <string name="slim_recents_mem_display_category_title">Смуга використання Озу</string>
-    <string name="slim_recents_mem_display_title">Пам\'яті рядок</string>
-    <string name="slim_recents_mem_display_summary">Показувати смугу використання ОЗП</string>
-    <string name="slim_recents_mem_display_color">Колір індикатора памяті</string>
-    <string name="slim_recents_mem_display_text_color">Колір тексту в індикаторі памяті</string>
-    <string name="slim_recents_enter_exit_animation_title">Анімація</string>
-    <string name="slim_recents_enter_exit_animation_translate">Переклад</string>
-    <string name="slim_recents_enter_exit_animation_fade">Блякнути</string>
-    <!-- R Notification headers -->
-    <string name="notification_headers_title">Показувати сповіщення</string>
-    <string name="notification_headers_summary">Чи показувати заголовки сповіщень в стилі R (потрібен перезапуск SystemUI)</string>
-    <!-- AOKP custom system animations -->
-    <string name="system_animation_title">Система</string>
-    <string name="activity_open_title">Анімація відкриття</string>
-    <string name="activity_close_title">Анімація закриття активності</string>
-    <string name="task_open_title">Анімація відкриття задачі</string>
-    <string name="task_open_behind_title">Анімація відкриття фонової задачі</string>
-    <string name="task_close_title">Анімація закриття задачі</string>
-    <string name="task_move_to_front_title">Анімація переміщення на передній план</string>
-    <string name="task_move_to_back_title">Анімація дії \"назад\"</string>
-    <string name="wallpaper_open_title">Анімація відкриття шпалери</string>
-    <string name="wallpaper_close_title">Анімація закриття шпалер</string>
-    <string name="wallpaper_intra_open_title">Анімація всередині відкриття шпалери</string>
-    <string name="wallpaper_intra_close_title">Анімація всередині закриття шпалери</string>
-    <string name="animation_duration_title">Тривалість анімації</string>
-    <string name="title_animation_no_override">Запобігти перевизначення програми</string>
-    <string name="summary_animation_no_override">Запобігти перевизначення переходів в програмах</string>
-    <string name="animation_duration_default">Типово</string>
-    <!-- Wake on charge -->
-    <string name="wake_when_plugged_or_unplugged_title">Прокидатися при зарядці</string>
-    <string name="wake_when_plugged_or_unplugged_summary">Розбудити пристрій, якщо  підключено/відключено від ЗП</string>
-    <!-- Quick Settings -->
-    <string name="lockscreen_qs_disabled_title">Вимкнути швидкі налаштування на екрані блокування</string>
-    <string name="lockscreen_qs_disabled_summary">Вимкнути швидкі налаштування на захищеному екрані блокування</string>
-    <!-- Quick pull down-->
-    <string name="quick_pulldown_title">Швидкий доступ</string>
-    <string name="quick_pulldown_summary">%1$s край рядка стану витягує швидкі налаштування</string>
-    <string name="quick_pulldown_summary_always">Завжди витягати швидкі налаштування</string>
-    <string name="quick_pulldown_off">Вимкнено</string>
-    <string name="quick_pulldown_left">Ліворуч</string>
-    <string name="quick_pulldown_right">Праворуч</string>
-    <string name="quick_pulldown_always">Завжди </string>
-    <!-- Headset ringtone audio focus -->
-    <string name="ringtone_focus_mode_title">При підключенні гарнітури відтворюється вхідний дзвінок</string>
-    <string name="ringtone_focus_mode_dynamic">Навушники, лише якщо музика активна</string>
-    <string name="ringtone_focus_mode_stock">Звук і динамік, і гарнітура</string>
-    <!-- Force expanded notifications -->
-    <string name="force_expanded_notifications_title">Примусово розширені повідомлення</string>
-    <string name="force_expanded_notifications_summary">Примусити показувати розширені сповіщення для програм, які це підтримують</string>
-</resources>
diff --git a/res/values-uk/dslv_strings.xml b/res/values-uk/dslv_strings.xml
deleted file mode 100644
index 8b0c989..0000000
--- a/res/values-uk/dslv_strings.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Slim lockscreen shortcuts -->
-    <string name="shortcut_action_none">Жоден</string>
-    <string name="shortcut_action_longpress">Тривале натискання:</string>
-    <string name="shortcut_action_select_action_longpress">Виберіть дію при тривалому натисканні:</string>
-    <string name="shortcut_action_select_action">Вибрати дію:</string>
-    <string name="shortcut_action_select_action_newaction">Вибрати нову дію:</string>
-    <string name="shortcut_action_reset">Скинути</string>
-    <string name="shortcut_action_add">Додати</string>
-    <string name="shortcut_action_max">Досягнуто максимальний розмір записів</string>
-    <string name="shortcut_action_warning">Попередження</string>
-    <string name="shortcut_action_warning_message">Неможливо видалити останній запис</string>
-    <string name="shortcut_action_disable_message">Вимкнено\nДодайте запис, щоб увімкнути цю функцію</string>
-    <string name="shortcut_image_not_valid">Вибраний додаток не повертає допустимий значок або не підтримує кадрування зображень. Використайте інший додаток.</string>
-    <string name="shortcut_duplicate_entry">Вибрану дію не можна додати двічі</string>
-    <string name="shortcut_action_help_shortcut">Ярлик</string>
-    <string name="shortcut_action_help_button">кнопка</string>
-    <string name="shortcut_action_help_app">додаток</string>
-    <string name="shortcut_action_help_icon">, вибір значка виведе параметри персоналізації</string>
-    <string name="shortcut_action_help_main">Щоб додати %1$s, виберіть піктограму Додати. Після того, як %1$s додано, вибраний рядок змінить ціль%2$s\n\nЩоб видалити %1$s, проведіть пальцем по рядку горизонтально вправи чи вліво.  Змініть порядок %1$s в списку, пересунувши вертикально якір вліво.\n\nЩоб очистити значення, або скинути по замовчуванням - виберіть піктограму Скинути.</string>
-    <string name="shortcut_action_help_delete_last_entry">Видалення кожного %1$s в списку повністю вимкне функцію.</string>
-    <string name="shortcut_action_help_pie_second_layer_delete_last_entry">Видалення кожного %1$s в списку повністю вимкне другий шар pie.</string>
-    <string name="shortcuts_applications">Додатки</string>
-    <string name="shortcuts_select_custom_app_title">Обрати власну програму</string>
-    <string name="shortcuts_icon_picker_type">Виберіть тип значка:</string>
-    <string name="shortcuts_icon_default">Типово</string>
-    <string name="shortcuts_icon_custom">Світлини</string>
-    <string name="reset_message">Скинути всі записи за замовчуванням?</string>
-    <string name="help">Допомога</string>
-    <string name="shortcut_action_app">Користувацький додаток</string>
-    <string name="shortcut_action_home">Головна</string>
-    <string name="shortcut_action_back">Назад</string>
-    <string name="shortcut_action_menu">Меню</string>
-    <string name="shortcut_action_ime">Відкрити перемикач IME</string>
-    <string name="shortcut_action_power_menu">Меню живлення</string>
-    <string name="shortcut_action_recent">Нещодавні</string>
-    <string name="shortcut_action_power">Вимкнути екран</string>
-    <string name="shortcut_action_search">Пошук у застосунку</string>
-</resources>
diff --git a/res/values-vi/cherish_strings.xml b/res/values-vi/cherish_strings.xml
deleted file mode 100644
index cb76404..0000000
--- a/res/values-vi/cherish_strings.xml
+++ /dev/null
@@ -1,721 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 CherishOS
-     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">
-    <!-- App Title -->
-    <string name="cherish_settings_title">Thông Điệp Yêu Thương</string>
-    <!-- Categories -->
-    <string name="button_title">Phím</string>
-    <string name="button_summary">Phím cứng, Thanh điều hướng</string>
-    <string name="gestures_title">Cử chỉ</string>
-    <string name="gestures_summary">Mở nhanh máy ảnh, vuốt để chụp màn hình</string>
-    <string name="lockscreen_title">Màn hình khoá</string>
-    <string name="lockscreen_summary">Sóng nhạc, hiệu ứng sạc, kiểu đồng hồ</string>
-    <string name="misc_title">Khác</string>
-    <string name="misc_summary">Chế độ chơi game, bảng điều khiển âm lượng</string>
-    <string name="animations_title">Hiệu ứng</string>
-    <string name="animations_summary">Hoạt ảnh hệ thống</string>
-    <string name="powermenu_title">Trình đơn nguồn</string>
-    <string name="powermenu_summary">Khởi động nâng cao, menu nguồn độ mờ</string>
-    <string name="theme_title">Chủ đề</string>
-    <string name="theme_summary">Chủ đề hệ thống, tròn, chủ đề công tắc</string>
-    <string name="quicksettings_title">Cài đặt nhanh</string>
-    <string name="quicksettings_summary">Bố cục gạch, độ sáng Miui, mờ</string>
-    <string name="recents_title">Ứng dụng gần đây</string>
-    <string name="recents_summary">Kiểu Slim recents</string>
-    <string name="statusbar_title">Thanh trạng thái</string>
-    <string name="statusbar_summary">Đồng hồ, nhà mạng, biểu tượng trạng thái</string>
-    <string name="volume_title">Phím Âm lượng</string>
-    <string name="volume_summary">Phím Âm lượng</string>
-    <string name="notifications_title">Thông báo</string>
-    <string name="notifications_summary">Đèn sạc, tiêu đề thông báo</string>
-    <string name="about_summary">Tìm hiểu thêm về CherishOS</string>
-    <string name="device_part_title">Tính năng thiết bị</string>
-    <string name="qs_category">Kiểu Qs</string>
-    <!-- General strings -->
-    <string name="ok">OK</string>
-    <string name="reset">Thiết lập lại</string>
-    <string name="cancel">Huỷ</string>
-    <string name="save">Lưu</string>
-    <!-- Color Picker -->
-    <string name="dialog_color_picker">Bảng màu</string>
-    <string name="press_color_to_apply">Chạm vào màu sắc bên dưới để áp dụng</string>
-    <string name="arrow_right">→</string>
-    <string name="arrow_down">↓</string>
-    <string name="hex">Hex:</string>
-    <string name="hex_hint">#ff000000</string>
-    <string name="set">Thiết lập</string>
-    <string name="color_default">Mặc định</string>
-    <string name="led_color_green">Xanh</string>
-    <string name="led_color_red">Đỏ</string>
-    <!-- Lockscreen battery info indicator  -->
-    <string name="lockscreen_battery_info_title">Thông tin sạc màn hình khoá</string>
-    <string name="lockscreen_battery_info_summary">Hiển thị điện áp bộ sạc tối đa hiện tại đã ước tính và nhiệt độ pin trên màn hình khóa trong khi sạc</string>
-    <!-- QS category -->
-    <string name="enable_clear_all_button">Thay thế xóa tất cả văn bản bằng nút đẹp</string>
-    <string name="enable_clear_all_button_summary">Hiển thị xóa tất cả nút thông báo trong cài đặt nhanh thay vì văn bản mặc định</string>
-    <string name="qs_bg_use_new_tint">Màu tiles QS</string>
-    <string name="qs_bg_use_new_tint_summary">Sử dụng màu nhấn cho biểu tượng và hình nền của qs</string>
-    <string name="qs_blur_alpha_title">Làm mờ alpha</string>
-    <string name="qs_blur_alpha_summary">Đặt độ trong suốt mờ</string>
-    <string name="blur_quicksettings">Làm mờ phía sau cài đặt nhanh (beta)</string>
-    <string name="blur_quicksettings_subtitle">làm mờ nền tối phía sau cài đặt nhanh</string>
-    <string name="qs_blur_intensity_title">Mức độ làm mờ</string>
-    <string name="qs_blur_intensity_summary">Đặt cường độ / bán kính mờ</string>
-    <string name="unit_percent">\u0025</string>
-    <!-- In-call feedback -->
-    <string name="incall_feeedback_vibrate_title">Rung để chỉ trạng thái cuộc gọi</string>
-    <!-- Lock screen cover art -->
-    <string name="lockscreen_media_art_title">Hiển thị ảnh bìa đa phương tiện</string>
-    <string name="lockscreen_media_blur_title">Mức độ mờ ảnh bìa</string>
-    <!-- QS settings -->
-    <string name="qs_title">Cài đặt nhanh</string>
-    <string name="qs_rows_portrait_title">Hàng (màn hình dọc)</string>
-    <string name="qs_rows_landscape_title">Hàng (ngang)</string>
-    <string name="qs_columns_portrait_title">Cột (màn hình dọc)</string>
-    <string name="qs_columns_landscape_title">Cột (màn hình ngang)</string>
-    <!-- QS title visibility -->
-    <string name="qs_tile_title_visibility_title">Hiển thị tiêu đề</string>
-    <string name="qs_tile_title_visibility_summary">Hiển thị các tiêu đề bên dưới ô cài đặt nhanh</string>
-    <!-- QS tiles haptic feedback -->
-    <string name="qs_vibrate_title">Rung khi chạm</string>
-    <string name="qs_vibrate_summary">Rung khi chạm các ô cài đặt nhanh</string>
-    <string name="qs_brightness_position_bottom_title">Thanh trượt chỉnh độ sáng ở dưới</string>
-    <string name="qs_brightness_position_bottom_summary">Hiển thị thanh trượt độ sáng trong bảng cài đặt nhanh</string>
-    <string name="enable_oneui">OneUI</string>
-    <string name="enable_oneui_summary">Hiển thị thanh hành động cài đặt trên miếng đệm để sử dụng dễ dàng hơn bằng một tay \ nNote: khởi động lại ứng dụng cài đặt để thấy hiệu quả</string>
-    <!-- Lockscreen clock style -->
-    <string name="lockscreen_clock_title">Kiểu đồng hồ</string>
-    <string name="lockscreen_clock_dialog_title">Chọn kiểu đồng hồ</string>
-    <string name="lockscreen_clock_hide">Ẩn</string>
-    <string name="lockscreen_clock_default">Mặc định</string>
-    <string name="lockscreen_clock_default_bold">Mặc định (đậm)</string>
-    <string name="lockscreen_clock_default_accent">Mặc định (màu ấn)</string>
-    <string name="lockscreen_clock_default_accent_min">Đồng hồ dọc (Màu nhấn theo phút)</string>
-    <string name="lockscreen_clock_default_accent_hour">Mặc định (giờ nhấn)</string>
-    <string name="lockscreen_clock_sammy">Đồng hồ dọc</string>
-    <string name="lockscreen_clock_sammy_bold">Xếp dọc (đậm)</string>
-    <string name="lockscreen_clock_sammy_accent_hour">Đồng hồ dọc (Màu nhấn theo giờ)</string>
-    <string name="lockscreen_clock_sammy_accent_min">Đồng hồ dọc (Màu nhấn theo phút)</string>
-    <!-- Lockscreen Date styles -->
-    <string name="lockscreen_date_title">Kiểu ngày</string>
-    <string name="lockscreen_date_selection_title">Kiểu ngày</string>
-    <string name="lockscreen_date_dialog_title">Chọn kiểu đồng hồ</string>
-    <string name="lockscreen_date_selection_default">Mặc định</string>
-    <string name="lockscreen_date_selection_str_box">Hộp bán trong suốt</string>
-    <string name="lockscreen_date_selection_str_round">Hộp bán trong suốt (bo tròn)</string>
-    <string name="lockscreen_date_selection_qbeta_style">Q Beta pill</string>
-    <string name="lockscreen_date_selection_str_accent">Bo tròn, đơn giản và với màu nhấn</string>
-    <string name="lockscreen_date_selection_str_accent_transparent">Bo tròn, trong suốt và với màu nhấn</string>
-    <string name="lockscreen_date_selection_str_gradient">Gradient</string>
-    <string name="lockscreen_date_selection_str_border_accent">Tối với viền có dấu</string>
-    <string name="lockscreen_date_selection_str_border_gradient">Tối với viền chuyển màu</string>
-    <!-- Status bar - icons -->
-    <string name="status_bar_icons_title">Biểu tượng thanh trạng thái</string>
-    <string name="status_bar_system_icons_title">Biểu tượng hệ thống</string>
-    <string name="status_bar_system_icons_summary">Kiểm soát những biểu tượng thanh trang thái được hiển thị</string>
-    <!-- Statusbar Clock -->
-    <string name="statusbar_items_title">Biểu tượng thanh trạng thái</string>
-    <string name="clock_category_title">Đồng hồ</string>
-    <string name="date_category_title">Ngày</string>
-    <string name="status_bar_clock_title">Đồng hồ &amp; ngày</string>
-    <string name="status_bar_clock_summary">Tuỳ chỉnh đồng hồ và ngày trong thanh trạng thái</string>
-    <string name="status_bar_clock_style_title">Vị trí đồng hồ</string>
-    <string name="status_bar_clock_style_right">Phải</string>
-    <string name="status_bar_clock_style_center">Giữa</string>
-    <string name="status_bar_clock_style_left">Trái</string>
-    <string name="status_bar_am_pm_title">Kiểu SA/CH</string>
-    <string name="status_bar_am_pm_info">đồng hồ dạng 24-giờ được kích hoạt</string>
-    <string name="status_bar_am_pm_normal">Bình thường</string>
-    <string name="status_bar_am_pm_small">Nhỏ</string>
-    <string name="status_bar_am_pm_hidden">Ẩn</string>
-    <string name="clock_seconds_display">Hiển thị giây</string>
-    <string name="clock_seconds_display_summary">Hiển thị giây trong đồng hồ trên thanh trạng thái</string>
-    <string name="clock_date_display">Ngày</string>
-    <string name="clock_date_display_summary">Hiển thị ngày tùy chỉnh trước đồng hồ</string>
-    <string name="clock_date_display_none">Ẩn</string>
-    <string name="clock_date_display_small">Nhỏ</string>
-    <string name="clock_date_display_normal">Bình thường</string>
-    <string name="clock_date_style">Kiểu ngày</string>
-    <string name="clock_date_style_normal">Bình thường</string>
-    <string name="clock_date_style_lowercase">Chữ thường</string>
-    <string name="clock_date_style_uppercase">Chữ thường</string>
-    <string name="clock_date_format_custom">Định dạng java tùy chỉnh</string>
-    <string name="clock_date_format">Định dạng ngày tháng</string>
-    <string name="clock_date_format_summary">%1$s</string>
-    <string name="clock_date_string_edittext_title">Phải thuộc định dạng ngày, ví dụ MM/dd/yy</string>
-    <string name="clock_date_string_edittext_summary">Nhập Chuỗi</string>
-    <string name="clock_date_right">Bên phải thời gian</string>
-    <string name="clock_date_left">Bên trái thời gian</string>
-    <string name="clock_date_position">Vị trí ngày</string>
-    <string name="status_bar_clock_auto_hide_title">Tự ẩn đồng hồ</string>
-    <string name="status_bar_clock_auto_hide_summary">Ẩn và hiển thị đồng hồ trong khoảng thời gian đều đặn</string>
-    <string name="status_bar_clock_auto_hide_hdur_title">Thời gian ẩn</string>
-    <string name="status_bar_clock_auto_hide_sdur_title">Hiển thị thời gian</string>
-    <!-- Charging animation -->
-    <string name="lockscreen_charging_animation_title">Hiệu ứng sạc</string>
-    <string name="lockscreen_charging_animation_summary">Hiển thị hiệu ứng chớp khi thiết bị được cắm sạc</string>
-    <string name="lockscreen_charging_animation_off">Tắt</string>
-    <string name="lockscreen_charging_animation_flash">Đèn flash</string>
-    <string name="lockscreen_charging_animation_battery">Pin</string>
-    <string name="lockscreen_charging_animation_drop">Bỏ</string>
-    <string name="lockscreen_charging_animation_explosion">Nổ</string>
-    <string name="lockscreen_charging_animation_water">Nước</string>
-    <string name="lockscreen_charging_animation_split">Split Loading</string>
-    <string name="lockscreen_charging_animation_yellow">Hoạt ảnh màu vàng</string>
-    <string name="lockscreen_charging_animation_covid">Covid19</string>
-    <string name="lockscreen_charging_animation_wash">Rửa tay của bạn</string>
-    <string name="lockscreen_charging_animation_wear">Đeo khẩu trang</string>
-    <string name="lockscreen_charging_animation_loading">Đang tải</string>
-    <!-- Battery Styles -->
-    <string name="battery_style_category_title">Mức pin</string>
-    <string name="battery_percent_title">Phần trăm pin</string>
-    <!-- Status bar - Battery -->
-    <string name="status_bar_battery_style_title">Kiểu pin</string>
-    <string name="status_bar_battery_style_q">Biểu tượng chân dung (mặc định)</string>
-    <string name="status_bar_battery_style_dotted_circle">Vòng tròn (Chấm)</string>
-    <string name="status_bar_battery_style_circle">Vòng tròn</string>
-    <string name="status_bar_battery_style_text">Văn bản</string>
-    <string name="status_bar_battery_style_hidden">Ẩn</string>
-    <string name="status_bar_battery_style_big_circle">Vòng tròn lớn</string>
-    <string name="status_bar_battery_style_filled_circle">Vòng tròn (Đầy)</string>
-    <!-- Status bar - Battery percentage -->
-    <string name="status_bar_battery_percentage_title">Phần trăm pin</string>
-    <string name="status_bar_battery_percentage_default">Ẩn (mặc định)</string>
-    <string name="status_bar_battery_percentage_text_inside">Bên trong biểu tượng pin</string>
-    <string name="status_bar_battery_percentage_text_next">Bên cạnh biểu tượng pin</string>
-    <string name="status_bar_battery_text_charging_title">Hiển thị phần trăm pin lúc sạc</string>
-    <string name="status_bar_battery_text_charging_summary">Luôn hiển thị dung lượng pin lúc sạc</string>
-    <string name="status_bar_battery_charging_bolt_title">Hiển thị tình trạng sạc pin</string>
-    <string name="status_bar_battery_charging_bolt_summary">Hiển thị biểu tượng \u26A1\uFE0E gần văn bản pin khi sạc</string>
-    <!-- Battery mode -->
-    <string name="battery_title">Biểu tượng pin</string>
-    <string name="qs_hide_battery_title">Ẩn biểu tượng pin</string>
-    <string name="qs_hide_battery_summary">Ẩn biểu tượng pin khỏi tiêu đề cài đặt nhanh</string>
-    <string name="battery_percentage_title">Phần trăm pin</string>
-    <string name="battery_percentage_off">Tắt</string>
-    <string name="battery_percentage_next">Bật</string>
-    <string name="battery_percentage_inside">Đã bật (biểu tượng bên trong)</string>
-    <string name="battery_percentage_estimate">Đã bật (ước tính)</string>
-    <string name="battery_percentage_percentage_estimate">Đã bật (phần trăm | ước tính)</string>
-    <!-- Network traffic -->
-    <string name="traffic_title">Hiển thị tốc độ mạng</string>
-    <string name="traffic_title_summary">Tùy chỉnh chỉ số lưu lượng mạng</string>
-    <string name="network_traffic_title">Lưu thông mạng</string>
-    <string name="network_traffic_type">Chọn kiểu hoạt động mạng</string>
-    <string name="show_network_traffic_up">Tải lên</string>
-    <string name="show_network_traffic_down">Tải xuống</string>
-    <string name="show_network_traffic_all">Tải lên và Tải xuống</string>
-    <string name="network_traffic_state_title">Hiện biểu tượng lưu lượng mạng trên thanh trạng thái</string>
-    <string name="network_traffic_autohide_threshold_title">Tự động ẩn mạng (KB/s)</string>
-    <string name="network_traffic_hidearrow">Ẩn mũi tên</string>
-    <string name="network_traffic_hidearrow_summary">Ẩn biểu tượng mũi tên chỉ lưu lượng mạng</string>
-    <!-- 4G icon -->
-    <string name="statusbar_items_category">Biểu tượng</string>
-    <string name="show_fourg_icon_title">Biểu tượng 4G</string>
-    <string name="show_fourg_icon_summary">Hiển thị biểu tượng 4G thay vì LTE</string>
-    <!-- Show VoLTE icon on statusbar -->
-    <string name="volte_icon_title">Biểu tượng VoLTE</string>
-    <string name="volte_icon_summary">Hiển thị biểu tượng VoLTE (Cần khởi động lại SystemUI để có hiệu lực)</string>
-    <!-- VoLTE icon styles -->
-    <string name="volte_icon_style_title">Chọn biểu tượng VoLTE</string>
-    <string name="volte_icon_vo">Biểu tượng Mặc định</string>
-    <string name="volte_icon_volte">Biểu tượng VoLTE</string>
-    <string name="volte_icon_oos">Biểu tượng VoLTE OOS</string>
-    <string name="volte_icon_hd">Biểu tượng HD</string>
-    <string name="volte_icon_miui">Biểu tượng VoLTE Miui</string>
-    <string name="volte_icon_asus">Biểu tượng VoLTE Asus</string>
-    <string name="volte_icon_emui">EMUI</string>
-    <!-- Lock screen visualizer -->
-    <string name="visualizer_title">Hiển thị trình trực quan âm nhạc</string>
-    <string name="lockscreen_visualizer_title">Trình hiển thị nhạc</string>
-    <!-- Fingerprint authentication vibration -->
-    <string name="fprint_sucess_vib_title">Rung khi xác thực dấu vân tay</string>
-    <string name="fprint_sucess_vib_summary">Rung khi xác thực dấu vân tay thành công</string>
-    <!-- Advanced restart options -->
-    <string name="advanced_reboot_title">Khởi động lại nâng cao</string>
-    <string name="advanced_reboot_summary">Khi mở khóa, bao gồm các tùy chọn trong trình đơn nguồn để khởi động lại vào phục hồi hoặc trình nạp khởi động</string>
-    <!-- Battery light -->
-    <string name="battery_light_settings">Đèn báo sạc pin</string>
-    <string name="battery_light_enable">Bật</string>
-    <string name="battery_light_allow_on_dnd_title">Đèn báo pin trong chế độ không làm phiền</string>
-    <string name="battery_light_low_blinking_title">Đèn nhấp nháy trên pin yếu</string>
-    <string name="battery_light_cat">Màu đèn báo pin khi sạc</string>
-    <string name="battery_light_low_color">Pin yếu</string>
-    <string name="battery_light_medium_color">Pin trung bình</string>
-    <string name="battery_light_full_color">Gần đầy pin</string>
-    <string name="battery_light_reallyfull_color">Pin đầy (100%)</string>
-    <!-- Old MobileType Toggle -->
-    <string name="use_old_mobiletype_title">Sử dụng kiểu di động cũ</string>
-    <string name="use_old_mobiletype_summary">Hợp nhất các tín hiệu và loại biểu tượng</string>
-    <!-- Themes -->
-    <string name="theme_type_title">Chủ đề hệ thống</string>
-    <string name="theme_type_summary">Lựa chọn chủ đê</string>
-    <string name="theme_type_light">Sáng</string>
-    <string name="theme_type_pitch_black">Google dark</string>
-    <string name="theme_type_solarized_dark">Solarized dark</string>
-    <string name="theme_type_baked_green">Baked Green</string>
-    <string name="theme_type_choco_x">Choco X</string>
-    <string name="theme_type_du_pitchblack">Đen tuyền</string>
-    <string name="theme_type_dark_grey">Màu xám đen</string>
-    <string name="theme_type_material_ocean">Material Ocean</string>
-    <string name="theme_type_clear_spring">Clear Spring</string>
-    <!-- Power menu and dialogs opacity -->
-    <string name="lockscreen_secure_power_title">Menu nguồn an toàn</string>
-    <string name="lockscreen_secure_power_menu_title">Khóa menu nguồn</string>
-    <string name="lockscreen_secure_power_menu_summary">Chỉ cho phép hành động menu nguồn sau khi xác thực</string>
-    <string name="power_menu_emergency_title">Khẩn cấp</string>
-    <string name="panel_porn_title">Menu nguồn trong suốt</string>
-    <string name="power_menu_transparency">Độ mờ của menu nguồn / khởi động lại</string>
-    <string name="power_menu_dialog_dim"> Nguồn/ khởi động lại hộp thoại mờ nền</string>
-    <!-- Rounded corners -->
-    <string name="corners_category_title">Góc tròn</string>
-    <string name="corners_category_summary">Điều chỉnh các góc tròn và phần đệm</string>
-    <string name="corners_title">Tùy chỉnh các góc tròn</string>
-    <string name="corner_radius">Bán kính góc tròn</string>
-    <string name="content_padding">Góc đệm nội dung</string>
-    <string name="status_bar_padding">Thanh đệm thêm thanh trạng thái</string>
-    <string name="corner_fwvals">Sử dụng các giá trị khung</string>
-    <string name="corner_fwvals_summary">Hữu ích nếu thiết bị thực sự có các góc tròn</string>
-    <!-- Adaptive Playback -->
-    <string name="media_title">Âm nhạc/phương tiện</string>
-    <string name="adaptive_playback_title">Phát lại thích ứng</string>
-    <string name="adaptive_playback_summary">Tạm dừng phương tiện khi âm lượng bị tắt và tiếp tục lại bằng cách tăng âm lượng trong thời gian chờ</string>
-    <string name="adaptive_playback_timeout_title">Thời hạn phát lại</string>
-    <string name="adaptive_playback_timeout_30_secs">30 giây</string>
-    <string name="adaptive_playback_timeout_1_min">1 phút</string>
-    <string name="adaptive_playback_timeout_2_min">2 phút</string>
-    <string name="adaptive_playback_timeout_5_min">5 phút</string>
-    <string name="adaptive_playback_timeout_10_min">10 phút</string>
-    <!-- Custom carrier label and position -->
-    <string name="label_title">Nhãn hiệu</string>
-    <string name="carrier_label_settings_title">Tên nhà mạng</string>
-    <string name="carrier_label_settings_summary">Tùy chỉnh tên của nhà mạng</string>
-    <string name="custom_carrier_label_title">Tùy chỉnh tên nhà mạng</string>
-    <string name="custom_carrier_label_explain">Nhập nhãn tùy chỉnh. Để trống để sử dụng tên mạng của bạn</string>
-    <string name="custom_carrier_label_notset">Nhãn tùy chỉnh hiện không được đặt</string>
-    <string name="show_carrier_title">Địa chỉ tên nhà mạng</string>
-    <string name="show_carrier_disabled">Đã tắt</string>
-    <string name="show_carrier_keyguard">Màn hình khóa</string>
-    <string name="show_carrier_statusbar">Thanh trạng thái</string>
-    <string name="show_carrier_enabled">Cả hai</string>
-    <!-- Power menu on secure lockscreen -->
-    <string name="lockscreen_enable_power_menu_title">Menu nguồn</string>
-    <string name="lockscreen_enable_power_menu_summary">Cho phép truy cập menu nguồn trên màn hình khóa an toàn</string>
-    <!-- Slim recents -->
-    <string name="alternative_recents_category">Thay thế gần đây</string>
-    <string name="alternative_recents_swipe_up_enabled_warning_summary">Khi sử dụng thao tác vuốt lên nút home điều hướng để mở đa nhiệm , chỉ mục gần đây gốc được hỗ trợ</string>
-    <string name="slim_recents_title">Slim Recents</string>
-    <string name="slim_recents_summary">Cho phép sử dụng một màn hình đa nhiệm thay thế</string>
-    <string name="slim_recents_fragment_title">Cài đặt slim recents</string>
-    <string name="slim_recents_fragment_summary">Tùy chỉnh các cài đặt bổ sung cho slim recents</string>
-    <string name="recents_max_apps_title">Ứng dụng cho phép tối đa</string>
-    <string name="recent_panel_scale_title">Kích thước</string>
-    <string name="recent_panel_expanded_mode_title">Chế độ mở rộng</string>
-    <string name="recent_panel_expanded_mode_summary">Chế độ xem trước các tác vụ gần đây mở rộng</string>
-    <string name="recent_panel_expanded_mode_auto">Tự động (mặc định)</string>
-    <string name="recent_panel_expanded_mode_always">Luôn luôn</string>
-    <string name="recent_panel_expanded_mode_never">Chưa bao giờ</string>
-    <string name="recent_panel_expanded_mode_disabled">Tắt</string>
-    <string name="recent_panel_bg_color_title">Màu nền bảng ứng dụng gần đây</string>
-    <string name="recent_card_bg_color_title">Màu nền thẻ</string>
-    <string name="slim_recents_mem_display_long_click_clear_title">Nhấn giữ thanh hiển thị bộ nhớ</string>
-    <string name="slim_recents_mem_display_long_click_clear_summary">Xóa các mục gần đây bằng cách nhấn giữ thanh hiển thị bộ nhớ</string>
-    <string name="slim_icon_pack_title">Gói biểu tượng</string>
-    <string name="slim_icon_pack_summary">Áp dụng một gói biểu tượng tuỳ chỉnh cho các ứng dụng trong bảng điều khiển</string>
-    <string name="no_iconpacks_summary">Chưa cài gói biểu tượng</string>
-    <string name="dialog_pick_iconpack_title">Chọn gói biểu tượng</string>
-    <string name="default_iconpack_title">Biểu tượng mặc định</string>
-    <string name="slim_recents_corner_radius_title">Độ bo góc</string>
-    <!-- ATTENTION: RTL languages need to replace left with right -->
-    <string name="recent_panel_lefty_mode_title">Hiện bên trái góc</string>
-    <string name="recent_panel_lefty_mode_summary">Hiện bảng điều khiển ứng dụng gần đây trên cạnh trái của góc màn hình</string>
-    <string name="slim_blacklist_apps_cat_title">Danh sách đen</string>
-    <string name="slim_blacklist_apps_title">Ứng dụng danh sách đen</string>
-    <string name="slim_blacklist_apps_summary">Ứng dụng không hiển thị trong bảng điều khiển</string>
-    <string name="slim_blacklist_add_apps_title">Thêm ứng dụng</string>
-    <string name="slim_blacklist_add_apps_summary">Chạm vào đây để thêm, chạm vào ứng dụng đã thêm để xoá</string>
-    <!-- Slim Recent App Sidebar  -->
-    <string name="recent_app_sidebar_cat_title">Thanh bên ứng dụng</string>
-    <string name="recent_app_sidebar_title">Cạnh bên các ứng dụng đa nhiệm</string>
-    <string name="recent_app_sidebar_summary">Hiện các lối tắt ứng dụng trên cạnh khác</string>
-    <string name="recent_app_sidebar_picker_title">Phím tắt cạnh bên</string>
-    <string name="recent_app_sidebar_picker_summary">Chọn ứng dụng hiện thị trên cạnh bên</string>
-    <string name="recent_app_sidebar_style_title">Kiểu thanh bên</string>
-    <string name="recent_app_sidebar_style_summary">Thay đổi giao diện của thanh bên</string>
-    <string name="recent_app_sidebar_hide_labels_title">Ẩn nhãn biểu tượng</string>
-    <string name="recent_app_sidebar_label_color_title">Màu nhãn</string>
-    <string name="recent_app_sidebar_bg_color_title">Màu nền</string>
-    <string name="recent_app_sidebar_scale_title">Kích thước</string>
-    <string name="recent_app_sidebar_open_simultaneously_title">Mở đồng thời với danh sách đa nhiệm</string>
-    <string name="recent_app_sidebar_open_simultaneously_summary">Giảm độ trễ khi mở đa nhiệm bằng cách tắt nó</string>
-    <string name="default_auto_string">Mặc định (dựa trên ứng dụng)</string>
-    <!-- Slim recents membar -->
-    <string name="default_string">Mặc định</string>
-    <string name="profile_choose_app">Chọn ứng dụng</string>
-    <string name="dialog_delete_title">Xóa</string>
-    <string name="dialog_delete_message">Xóa mục đã chọn?</string>
-    <string name="slim_recents_mem_display_category_title">Thanh hiển thị bộ nhớ</string>
-    <string name="slim_recents_mem_display_title">Thanh hiển thị bộ nhớ</string>
-    <string name="slim_recents_mem_display_summary">Hiển thị thanh tiến trình hiển thị RAM</string>
-    <string name="slim_recents_mem_display_color">Màu thanh bộ nhớ</string>
-    <string name="slim_recents_mem_display_text_color">Màu văn bản thanh bộ nhớ</string>
-    <string name="slim_recents_enter_exit_animation_title">Hoạt ảnh</string>
-    <string name="slim_recents_enter_exit_animation_translate">Dịch</string>
-    <string name="slim_recents_enter_exit_animation_fade">Mờ dần</string>
-    <!-- R Notification headers -->
-    <string name="notification_headers_title">Hiển thị tiêu đề thông báo</string>
-    <string name="notification_headers_summary">Có hiển thị tiêu đề thông báo kiểu R hay không (Yêu cầu khởi động lại giao diện người dùng hệ thống)</string>
-    <!-- AOKP custom system animations -->
-    <string name="system_animation_title">Hệ thống</string>
-    <string name="activity_open_title">Hoạt ảnh hành động mở</string>
-    <string name="activity_close_title">Hoạt ảnh hành động đóng</string>
-    <string name="task_open_title">Hoạt ảnh mở tác vụ</string>
-    <string name="task_open_behind_title">Hoạt ảnh mở tác vụ phía sau</string>
-    <string name="task_close_title">Hoạt ảnh đóng tác vụ</string>
-    <string name="task_move_to_front_title">Hoạt ảnh di chuyển tới trước</string>
-    <string name="task_move_to_back_title">Hoạt ảnh di chuyển ra sau</string>
-    <string name="wallpaper_open_title">Hoạt ảnh mở hình nền</string>
-    <string name="wallpaper_close_title">Hoạt ảnh đóng hình nền</string>
-    <string name="wallpaper_intra_open_title">Hoạt ảnh mở giữa hình nền</string>
-    <string name="wallpaper_intra_close_title">Hiệu ứng đóng bên trong ảnh nền</string>
-    <string name="animation_duration_title">Thời lượng hoạt ảnh</string>
-    <string name="title_animation_no_override">Ngăn chặn ứng dụng ghi đè</string>
-    <string name="summary_animation_no_override">Ngăn ứng dụng ghi đè các hiệu ứng chuyển động</string>
-    <string name="animation_duration_default">Mặc định</string>
-    <!-- Wake on charge -->
-    <string name="wake_when_plugged_or_unplugged_title">Bật màn hình khi sạc</string>
-    <string name="wake_when_plugged_or_unplugged_summary">Đánh thức thiết bị nếu đã cắm/đã rút sạc</string>
-    <!-- Quick Settings -->
-    <string name="lockscreen_qs_disabled_title">Vô hiệu hoá bảng cài đặt nhanh khi bị khoá</string>
-    <string name="lockscreen_qs_disabled_summary">Vô hiệu hóa mở rộng cài đặt nhanh trên màn hình khóa an toàn</string>
-    <!-- Quick pull down-->
-    <string name="quick_pulldown_title">Kéo xuống nhanh</string>
-    <string name="quick_pulldown_summary">Kéo từ cạnh %1$s thanh trạng thái xuống để truy cập cài đặt nhanh</string>
-    <string name="quick_pulldown_summary_always">Luôn hiển thị Cài đặt nhanh khi kéo xuống thanh trạng thái</string>
-    <string name="quick_pulldown_off">Tắt</string>
-    <string name="quick_pulldown_left">Trái</string>
-    <string name="quick_pulldown_right">Phải</string>
-    <string name="quick_pulldown_always">Luôn luôn</string>
-    <!-- Headset ringtone audio focus -->
-    <string name="ringtone_focus_mode_title">Khi tai nghe được kết nối, cuộc gọi đến sẽ bật</string>
-    <string name="ringtone_focus_mode_dynamic">Tai nghe chỉ hoạt động khi nhạc đang phát</string>
-    <string name="ringtone_focus_mode_stock">Cả loa và tai nghe</string>
-    <!-- Force expanded notifications -->
-    <string name="force_expanded_notifications_title">Buộc mở rộng thông báo</string>
-    <string name="force_expanded_notifications_summary">Chỉ có sẵn cho các ứng dụng hỗ trợ thông báo mở rộng</string>
-    <!-- Switch styles -->
-    <string name="switch_style_title">Chuyển đổi ngoại hình</string>
-    <string name="switch_default">Mặc định</string>
-    <string name="switch_md2">Material Design 2</string>
-    <string name="switch_oneplus">OnePlus</string>
-    <string name="switch_narrow">Hẹp</string>
-    <string name="switch_contained">Bộ chứa</string>
-    <string name="switch_retro">Retro</string>
-    <string name="switch_stockish">Stockish</string>
-    <string name="switch_telegram">Telegram</string>
-    <!-- Gaming mode -->
-    <string name="gaming_mode_title">Chế độ chơi game</string>
-    <string name="gaming_mode_summary">Tùy chỉnh tùy chọn chế độ trò chơi</string>
-    <string name="gaming_mode_app_picker_title">Tự động bật cho các ứng dụng này</string>
-    <string name="add_gaming_mode_package_title">Thêm ứng dụng cho chế độ chơi game</string>
-    <string name="add_gaming_mode_package_summary">Chế độ chơi game sẽ tự động bật tắt đối với các ứng dụng này</string>
-    <string name="gaming_mode_headsup_title">Chặn thông báo</string>
-    <string name="gaming_mode_headsup_summary">Chặn tất cả các thông báo nổi ngoại trừ cuộc gọi</string>
-    <string name="gaming_mode_hardware_keys_title">Khóa phím</string>
-    <string name="gaming_mode_hardware_keys_summary">Vô hiệu hóa phím cứng khi chế độ trò chơi được bật</string>
-    <string name="gaming_mode_brightness_title">Vô hiệu hóa độ sáng tự động</string>
-    <string name="gaming_mode_brightness_summary">Khóa độ sáng màn hình khi chế độ trò chơi được bật</string>
-    <string name="gaming_mode_ringer_title">Chuông trong chế độ trò chơi</string>
-    <string name="gaming_mode_ringer_off_title">Không thay đổi</string>
-    <string name="gaming_mode_ringer_vibrate_title">Rung</string>
-    <string name="gaming_mode_ringer_dnd_title">Không làm phiền</string>
-    <string name="gaming_mode_ringer_silent_title">Im lặng</string>
-    <string name="gaming_mode_notifications_title">Thông báo chế độ chơi game</string>
-    <string name="gaming_mode_notifications_off_title">Đã tắt</string>
-    <string name="gaming_mode_notifications_notif_title">Hiển thị thông báo</string>
-    <string name="gaming_mode_notifications_toast_title">Hiện thông báo nhanh</string>
-    <string name="gaming_mode_notifications_all_title">Hiện thông báo nhanh và thông báo</string>
-    <string name="gaming_mode_dynamic_title">Chế độ động</string>
-    <string name="gaming_mode_dynamic_summary">Tự động phát hiện và thêm trò chơi</string>
-    <!-- Heads up timeout -->
-    <string name="heads_up_time_out_title">Thời gian chờ</string>
-    <string name="heads_up_time_out_summary">Thông báo nổi sẽ hiển thị trong <xliff:g id="number">%d</xliff:g> giây</string>
-    <string name="heads_up_time_out_2sec">2 giây</string>
-    <string name="heads_up_time_out_4sec">4 giây</string>
-    <string name="heads_up_time_out_5sec">5 giây</string>
-    <string name="heads_up_time_out_6sec">6 giây</string>
-    <string name="heads_up_time_out_8sec">8 giây</string>
-    <string name="heads_up_time_out_10sec">10 giây</string>
-    <!-- Heads up -->
-    <string name="heads_up_notifications">Thông báo nổi</string>
-    <string name="notification_stat">Thông báo nổi</string>
-    <string name="heads_up_notifications_summary">Thông báo trên thanh trạng thái</string>
-    <string name="add_heads_up_package">Thêm ứng dụng</string>
-    <string name="heads_up_stoplist_title">Danh sách dừng</string>
-    <string name="add_heads_up_stoplist_summary">Tắt thông báo nổi từ các ứng dụng này</string>
-    <string name="heads_up_blacklist_title">Danh sách đen</string>
-    <string name="add_heads_up_blacklist_summary">Vô hiệu hóa thông báo nổi từ các ứng dụng này</string>
-    <!-- Heads up snooze -->
-    <string name="heads_up_snooze_title">Thời gian tạm ngưng</string>
-    <string name="heads_up_snooze_summary_one_minute">Vuốt lên trên thông báo nổi sẽ báo lại thông báo đó trong 1 phút</string>
-    <string name="heads_up_snooze_summary">Vuốt thông báo nổi lên trên sẽ báo lại thông báo đó trong vòng <xliff:g id="number">%d</xliff:g> phút</string>
-    <string name="heads_up_snooze_disabled_summary">Bộ đếm tạm ngưng bị vô hiệu</string>
-    <string name="heads_up_snooze_1min">1 phút</string>
-    <string name="heads_up_snooze_5min">5 phút</string>
-    <string name="heads_up_snooze_10min">10 phút</string>
-    <string name="heads_up_snooze_15min">15 phút</string>
-    <string name="heads_up_snooze_20min">20 phút</string>
-    <!-- Heads up options -->
-    <string name="less_boring_heads_up_title">Ít thông báo nổi hơn</string>
-    <string name="less_boring_heads_up_summary">Chỉ hiển thị thông báo cho ứng dụng quay số, ứng dụng nhắn tin và báo thức</string>
-    <!-- FOD icon picker -->
-    <string name="fod_title">FOD</string>
-    <string name="fod_icon_picker_title">Công cụ chọn biểu tượng FOD</string>
-    <string name="fod_icon_picker_summary">Chọn biểu tượng vân tay ưa thích</string>
-    <string name="fod_icon_picker_footer">Để thêm biểu tượng của riêng bạn, hãy chọn biểu tượng trên cùng bên trái và sử dụng ứng dụng OnePlus 6T tuỳ biến FP để chọn biểu tượng bạn mong muốn.</string>
-    <!-- Settings dashboard icon style -->
-    <string name="theming_settings_dashboard_icons_title">Cài đặt biểu tượng bảng điều khiển</string>
-    <string name="theming_settings_dashboard_icons_default2">Hình nền mặc định</string>
-    <string name="theming_settings_dashboard_icons_default_accent2">Nền nhấn</string>
-    <string name="theming_settings_dashboard_icons_plain">Đơn giản</string>
-    <string name="theming_settings_dashboard_icons_plain_accent">Giọng đồng bằng</string>
-    <string name="theming_settings_dashboard_icons_default_oneplus">OnePlus</string>
-    <string name="theming_settings_dashboard_icons_bg_random">Nền ngẫu nhiên</string>
-    <string name="theming_settings_dashboard_icons_random">Biểu tượng ngẫu nhiên</string>
-    <string name="theming_settings_dashboard_icons_random_bg_accent">Biểu tượng Dấu Bg Ngẫu nhiên</string>
-    <string name="theming_settings_dashboard_icons_accent_bg_random">Biểu tượng Trọng âm Bg Ngẫu nhiên</string>
-    <!-- Audio Panel view -->
-    <string name="audio_panel_view">Bảng điều chỉnh âm lượng</string>
-    <string name="audio_panel_view_media_title">Âm nhạc/phương tiện</string>
-    <string name="audio_panel_view_ringer_title">Chuông báo</string>
-    <string name="audio_panel_view_notification_title">Thông báo</string>
-    <string name="audio_panel_view_alarm_title">Báo thức</string>
-    <string name="audio_panel_view_voice_title">Giọng nói</string>
-    <string name="audio_panel_view_bt_sco_title">Bluetooth</string>
-    <!-- VoWiFi icon -->
-    <string name="vowifi_icon_title">Biểu tượng VoWifi</string>
-    <string name="vowifi_icon_enabled">Kiểu biểu tượng VoWiFi</string>
-    <string name="vowifi_icon_disabled">Biểu tượng VoWiFi đã tắt</string>
-    <string name="vowifi_icon_enabled_volte_disabled">VoWiFi thay vì icon VoLTE</string>
-    <string name="vowifi_icon_style_title">Kiểu biểu tượng VoWiFi</string>
-    <string name="vowifi_icon_default">Biểu tượng Mặc định</string>
-    <string name="vowifi_icon_emui">Biểu tượng EMUI</string>
-    <string name="vowifi_icon_asus">Biểu tượng Asus</string>
-    <string name="vowifi_icon_oneplus">Biểu tượng OOS</string>
-    <string name="vowifi_icon_moto">Biểu tượng Motorola</string>
-    <!-- QS Footer Text -->
-    <string name="qs_footer_text_title">QS văn bản cuối trang</string>
-    <string name="qs_footer_text_summary">Hiển thị văn bản ở dưới cùng của bảng cài đặt nhanh</string>
-    <string name="qs_footer_text_string_title">Tùy chỉnh văn bản cuối trang</string>
-    <string name="qs_footer_text_string_summary">Đặt mặc định là #KeeptheLove</string>
-    <string name="brightness_slider_qs_unexpanded">Thanh trượt độ sáng kiểu MIUI (beta)</string>
-    <string name="brightness_slider_qs_unexpanded_summary">Hiển thị thanh trượt độ sáng trong bảng điều khiển nhanh</string>
-    <!-- Settings Dashboard conditions and suggestions -->
-    <string name="settings_show_conditions_title">Bảng điều khiển điều kiện</string>
-    <string name="settings_show_conditions_summary">Hiển thị thẻ gợi ý trong màn hình Cài đặt</string>
-    <string name="settings_show_suggestions_title">Bảng điều khiển đề xuất</string>
-    <string name="settings_show_suggestions_summary">Hiển thị thẻ gợi ý trong màn hình Cài đặt</string>
-    <!-- Volume Panel Plugin -->
-    <string name="volume_panel">Kiểu âm lượng</string>
-    <string name="volume_panel_aosp">AOSP</string>
-    <string name="volume_panel_compat">Compat</string>
-    <string name="volume_panel_oreo">Android 8</string>
-    <string name="volume_panel_tiled">Ô xếp</string>
-    <string name="volume_panel_default">Mặc định</string>
-    <!-- Volume Panel Plugin Values -->
-    <string name="volume_panel_aosp_val">co.potatoproject.plugin.volume.aosp</string>
-    <string name="volume_panel_compat_val">co.potatoproject.plugin.volume.compact</string>
-    <string name="volume_panel_oreo_val">co.potatoproject.plugin.volume.oreo</string>
-    <string name="volume_panel_tiled_val">co.potatoproject.plugin.volume.tiled</string>
-    <string name="volume_panel_default_val">com.android.systemui.volume</string>
-    <!-- Power menu Animations  -->
-    <string name="power_menu_animation">Trình đơn nguồn</string>
-    <string name="power_menu_animation_title">Hoạt ảnh menu nguồn</string>
-    <string name="power_menu_animation_summary">Thay đổi hoạt ảnh Mở/Tắt trình đơn nguồn</string>
-    <string name="power_menu_animation_dialog_title">Chọn hoạt ảnh menu nguồn</string>
-    <string name="power_menu_animation_aosp">AOSP (mặc định)</string>
-    <string name="power_menu_animation_bottom">Dưới cùng</string>
-    <string name="power_menu_animation_top">Trên cùng</string>
-    <string name="power_menu_animation_xylon">Bay</string>
-    <string name="power_menu_animation_slide">Trượt</string>
-    <string name="power_menu_animation_turn">Xoay</string>
-    <string name="power_menu_animation_fly">Phát sáng</string>
-    <string name="power_menu_animation_card">3D</string>
-    <string name="power_menu_animation_translucent_top">Mờ (phía trên)</string>
-    <string name="power_menu_animation_translucent_bottom">Mờ (dưới cùng)</string>
-    <string name="power_menu_animation_rotate">Xoay</string>
-    <!-- QS header image -->
-    <string name="status_bar_custom_header_title">Hình ảnh header</string>
-    <string name="status_bar_custom_header_summary">Sử dụng hình ảnh tùy chỉnh cho tiêu đề cài đặt nhanh</string>
-    <string name="custom_header_provider_title">Kiểu ảnh</string>
-    <string name="daylight_header_provider_title">Tự động (Dựa trên thời gian)</string>
-    <string name="file_header_provider_title">Tĩnh</string>
-    <string name="daylight_header_pack_title">Bộ sưu tập ảnh</string>
-    <string name="header_provider_disabled">Tắt</string>
-    <string name="custom_header_pick_title">Chọn hình ảnh từ bộ sưu tập</string>
-    <string name="custom_header_pick_summary">Chọn một hình ảnh từ bộ sưu tập hình ảnh được cài đặt sẵn</string>
-    <string name="file_header_select_title">Chọn hình ảnh từ bộ nhớ</string>
-    <string name="file_header_select_summary">Chọn một hình ảnh từ bộ nhớ trong</string>
-    <string name="status_bar_custom_header_shadow_title">Hình ảnh tối</string>
-    <string name="status_bar_custom_header_height_title">Thu phóng kích thước hình ảnh</string>
-    <!-- Ambient edge lighting -->
-    <string name="notification_screen_title">Màn hình</string>
-    <string name="pulse_ambient_light_title">Ánh sáng cạnh</string>
-    <string name="pulse_ambient_light_summary">Làm sáng các cạnh bên của màn hình trên thông báo đẩy</string>
-    <string name="pulse_ambient_light_color_title">Đặt màu đèn</string>
-    <string name="pulse_ambient_light_auto_color_title">Màu sắc tự động</string>
-    <string name="pulse_ambient_light_auto_color_summary">Đồng bộ màu với ảnh album</string>
-    <string name="pulse_ambient_light_duration">Thời gian sáng</string>
-    <string name="edgelight_left">Cạnh trái</string>
-    <string name="edgelight_right">Cạnh phải</string>
-    <string name="ambient_notification_light_enabled_title">Hiển thị trên màn hình AOD</string>
-    <string name="ambient_notification_light_enabled_sumary">Tiếp tục hiển thị. Cho đến khi màn hình được bật</string>
-    <string name="ambient_notification_light_hide_aod_title">Ẩn AOD</string>
-    <string name="ambient_notification_light_hide_aod_sumary">Ẩn nội dung AOD khi các thanh đang hiển thị</string>
-    <string name="pulse_ambient_light_pulse_for_all_title">Pulse cho tất cả các sự kiện doze</string>
-    <string name="pulse_ambient_light_pulse_for_all_summary">Hiển thị xung cho chế độ thức và thông báo khi được bật</string>
-    <string name="ambient_notification_light_accent_title">Màu nhấn</string>
-    <string name="ambient_notification_light_accent_summary">Đồng bộ màu sắc với màu accent</string>
-    <string name="pulse_ambient_light_pulse_for_all_repeat_title">Lặp lại ánh sáng cạnh</string>
-    <string name="pulse_ambient_light_pulse_for_all_repeat_summary">Lặp lại hoạt ảnh ánh sáng cạnh doze wake</string>
-    <string name="pulse_ambient_light_repeat_mode_title">Hoạt ảnh Edge Light</string>
-    <string name="pulse_ambient_light_anim_restart">Khởi động lại</string>
-    <string name="pulse_ambient_light_anim_reverse">Đảo vị trí</string>
-    <string name="pulse_ambient_light_layout_title">Bật sáng màn hình cạnh</string>
-    <string name="pulse_ambient_light_layout_solid">Khối</string>
-    <string name="pulse_ambient_light_layout_faded">Mờ dần</string>
-    <!-- QS Header Data Usage -->
-    <string name="qs_datausage_title">Hiện thị mức sử dụng dữ liệu ở cài đặt nhanh</string>
-    <string name="qs_datausage_disabled">Đã tắt</string>
-    <string name="qs_datausage_daily">Sử dụng hàng ngày</string>
-    <string name="qs_datausage_monthly">Sử dụng hàng tháng</string>
-    <!-- QS header styles -->
-    <string name="qs_header_style_title">Kiểu tiêu đề cài đặt nhanh</string>
-    <string name="qs_header_black">Màu đen</string>
-    <string name="qs_header_grey">Xám</string>
-    <string name="qs_header_lightgrey">Xám nhạt</string>
-    <string name="qs_header_accent">Dựa vào màu hệ thống</string>
-    <string name="qs_header_transparent">Trong suốt</string>
-    <!-- Brightness control -->
-    <string name="status_bar_toggle_brightness">Điều chỉnh độ sáng</string>
-    <string name="status_bar_toggle_brightness_summary">Điều chỉnh độ sáng bằng cách trượt qua thanh trạng thái</string>
-    <!-- Charger Connected Animation -->
-    <string name="charging_animation_title">Hiệu ứng sạc</string>
-    <string name="charging_animation_summary">Hiển thị một hiệu ứng khi thiết bị được cắm sạc</string>
-    <!-- Fingerprint unlock keystore -->
-    <string name="fp_unlock_keystore_title">Mở khóa bằng vân tay</string>
-    <string name="fp_unlock_keystore_summary">Mở khóa điện thoại bằng vân tay sau khi khởi động lại mà không cần PIN/Mật khẩu/Mẫu hình\nChú ý: nguy cơ của riêng bạn!</string>
-    <!-- Lockscreen -->
-    <string name="lockscreen_category">Màn hình khóa</string>
-    <string name="lockscreen_tuner_title">Lối tắt phía dưới</string>
-    <string name="lockscreen_tuner_summary">Tùy chỉnh các phím tắt dưới cùng bên trái và bên phải</string>
-    <!-- Pulse -->
-    <string name="pulse_help_policy_notice_summary">Sóng nhạc không hoạt động với một số nguồn âm thanh khi nghe trên loa thiết bị</string>
-    <string name="pulse_settings">Sóng nhạc</string>
-    <string name="pulse_settings_summary">Sóng nhạc trên thanh điều hướng</string>
-    <string name="show_pulse_title">Hiện thị sóng nhạc</string>
-    <string name="show_pulse_summary">Trình trực quan đồ họa âm thanh trên thanh điều hướng</string>
-    <string name="pulse_render_mode_title">Chế độ hiển thị</string>
-    <string name="pulse_render_mode_fading_bars">Khối mờ dần</string>
-    <string name="pulse_render_mode_solid_lines">Đường liền nét</string>
-    <string name="pulse_color">Màu sắc</string>
-    <string name="pulse_color_mode">Chế độ màu</string>
-    <string name="pulse_color_accent">Màu nhấn</string>
-    <string name="pulse_color_custom">Tuỳ chỉnh</string>
-    <string name="pulse_color_lava_lamp">Đèn dung nham</string>
-    <string name="pulse_color_auto">Ảnh album</string>
-    <string name="pulse_color_chooser">Chọn màu sắc</string>
-    <string name="smoothing_enabled_title">Bật làm mượt</string>
-    <string name="smoothing_enabled_summary">Thanh hoạt cảnh mượt hơn</string>
-    <string name="show_navbar_pulse_title">Thanh điều hướng sóng nhạc</string>
-    <string name="show_navbar_pulse_summary">Bộ cân bằng đồ họa âm thanh trên khu vực thanh điều hướng, cũng như nếu thanh bị ẩn</string>
-    <string name="show_lockscreen_pulse_title">Sóng nhạc trên màn hình khoá</string>
-    <string name="show_lockscreen_pulse_summary">Trình trực quan đồ họa âm thanh trên thanh điều hướng</string>
-    <string name="show_ambient_pulse_title">Hiển thị tương tác sóng nhạc</string>
-    <string name="show_ambient_pulse_summary">Trình trực quan đồ họa âm thanh trên thanh điều hướng</string>
-    <string name="pulse_advanced_category">Nâng cao</string>
-    <string name="pulse_legacy_mode_advanced_category">Cài đặt chế độ khối mờ dần</string>
-    <string name="pulse_custom_fudge_factor">Mức độ mạnh</string>
-    <string name="lavamp_speed_title">Tốc độ đèn dung nham</string>
-    <string name="pulse_solid_units_count">Số đường liền nét</string>
-    <string name="pulse_solid_lines_count">Số đường liền nét</string>
-    <string name="pulse_solid_units_opacity">Độ đậm đường liền nét</string>
-    <string name="pulse_solid_dimen_category">Cài đặt chế độ đường thẳng liền nét</string>
-    <string name="pulse_custom_dimen">Độ rộng thanh</string>
-    <string name="pulse_custom_div">Khoảng cách thanh</string>
-    <string name="pulse_filled_block_size">Kích thước khối</string>
-    <string name="pulse_empty_block_size">Khoảng cách khối</string>
-    <!-- does the device have multi color led support or only
-         a fixed set of led colors -->
-    <!-- Center R Notification headers -->
-    <string name="center_notification_headers_title">Hiển thị tiêu đề thông báo trung tâm</string>
-    <string name="center_notification_headers_summary">Có hiển thị tiêu đề thông báo kiểu R hay không (Yêu cầu khởi động lại giao diện người dùng hệ thống)</string>
-    <!-- Blink flashlight for incoming calls -->
-    <string name="flashlight_category">Đèn pin</string>
-    <string name="flashlight_on_call_title">Nháy đèn pin khi có cuộc gọi</string>
-    <string name="flashlight_on_call_disabled">Tắt</string>
-    <string name="flashlight_on_call_ringer">Khi đổ chuông</string>
-    <string name="flashlight_on_call_no_ringer">Khi chuông đã im lặng</string>
-    <string name="flashlight_on_call_silent">Khi hoàn toàn im lặng (không có chuông hoặc bộ rung)</string>
-    <string name="flashlight_on_call_always">Luôn luôn</string>
-    <string name="flashlight_on_call_ignore_dnd_title">Loại bỏ không làm phiền</string>
-    <string name="flashlight_on_call_ignore_dnd_summary">Có nhấp nháy khi ở chế độ Không làm phiền không</string>
-    <string name="flashlight_on_call_rate_title">Đánh giá</string>
-    <string name="flashlight_on_call_rate_summary">Đèn pin trên tỷ lệ nhấp nháy cuộc gọi</string>
-    <!-- Battery bar -->
-    <string name="enable_first">Hãy ghép nối trước</string>
-    <string name="battery_bar_title">Thanh hiển thị pin</string>
-    <string name="sb_battery_bar_title">Thanh pin</string>
-    <string name="sb_battery_bar_summary">Hiển thị và tuỳ chỉnh thanh pin gần thanh trạng thái hoặc thanh điều hướng</string>
-    <string name="sb_battery_bar_location">Vị trí hiển thị thanh pin</string>
-    <string name="sb_battery_bar_color">Màu thanh pin</string>
-    <string name="sb_battery_bar_style_title">Kiểu thanh hiển thị pin</string>
-    <string name="sb_battery_bar_thickness_title">Độ dày thanh pin</string>
-    <string name="sb_battery_bar_animate_title">Hiệu ứng sạc</string>
-    <string name="sb_battery_bar_animate_summary">Các hoạt ảnh khi sạc có thể dẫn đến một trải nghiệm không tốt cho người dùng. Bật tính năng theo ý riêng của bạn.</string>
-    <string name="sb_battery_bar_hide">Ẩn</string>
-    <string name="sb_battery_bar_statusbar">Thanh trạng thái</string>
-    <string name="sb_battery_bar_topnav">Phía trên thanh điều hướng</string>
-    <string name="sb_battery_bar_bottomnav">Phía dưới thanh điều hướng</string>
-    <string name="sb_battery_bar_reg">Binh thường</string>
-    <string name="sb_battery_bar_center">Đối xứng giữa</string>
-    <string name="sb_battery_bar_charging_color">Màu thanh pin khi sạc</string>
-    <string name="sb_battery_bar_battery_low_color">Màu thanh pin khi pin yếu</string>
-    <string name="sb_battery_bar_reversed">Đảo ngược</string>
-    <string name="sb_battery_bar_use_gradient_color">Sử dụng màu chuyển sắc</string>
-    <string name="sb_battery_bar_gradient_color_summary">Sử dụng màu chuyển sắc làm thang đo cho mức pin</string>
-    <string name="sb_battery_bar_high_color">Màu mức cao\"</string>
-    <string name="sb_battery_bar_low_color">Màu mức thấp\"</string>
-    <!-- Brightness Slider style -->
-    <string name="brightness_slider_style_title">Vị trí thanh trượt độ sáng</string>
-    <string name="brightness_slider_style_default">Mặc định</string>
-    <string name="brightness_slider_style_daniel">Đa-ni-ên</string>
-    <string name="brightness_slider_style_mememini">Meme mini</string>
-    <string name="brightness_slider_style_memeround">Tròn Meme</string>
-    <string name="brightness_slider_style_memeroundstroke">Meme tròn nét</string>
-    <string name="brightness_slider_style_memestroke">Meme nét</string>
-    <!-- GUI styles -->
-    <string name="ui_style_title">Kiểu giao diện</string>
-    <string name="ui_style_default">Mặc định</string>
-    <string name="ui_style_no_corner_radius">Không có bán kính bo góc</string>
-    <string name="ui_style_rectangle">Chữ Nhật</string>
-    <string name="ui_style_round_large">Tròn rộng</string>
-    <string name="ui_style_round_medium">Tròn vừa</string>
-    <!-- Navbar styles -->
-    <string name="navbar_style_title">Kiểu thanh điều hướng</string>
-    <string name="navbar_default">Mặc định</string>
-    <string name="navbar_asus">ASUS</string>
-    <string name="navbar_oneplus">OnePlus</string>
-    <string name="navbar_oneui">One UI</string>
-    <string name="navbar_tecno">Tecno Camon</string>
-</resources>
diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index ac275c6..25e71c1 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -12,739 +12,4 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-	<!-- QS customization -->
-    <string-array name="qs_rows_portrait_values" translatable="false">
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item>5</item>
-    </string-array>
-    <string-array name="qs_rows_landscape_values" translatable="false">
-        <item>1</item>
-        <item>2</item>
-    </string-array>
-    <string-array name="qs_columns_portrait_values" translatable="false">
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item>5</item>
-    </string-array>
-    <string-array name="qs_columns_landscape_values" translatable="false">
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item>5</item>
-        <item>6</item>
-        <item>7</item>
-    </string-array>
-
-	<!-- Lockscreen clock style -->
-    <string-array name="lockscreen_clock_titles">
-        <item>@string/lockscreen_clock_hide</item>
-        <item>@string/lockscreen_clock_default</item>
-        <item>@string/lockscreen_clock_default_bold</item>
-        <item>@string/lockscreen_clock_default_accent</item>
-        <item>@string/lockscreen_clock_default_accent_hour</item>
-        <item>@string/lockscreen_clock_default_accent_min</item>
-        <item>@string/lockscreen_clock_sammy</item>
-        <item>@string/lockscreen_clock_sammy_bold</item>
-        <item>@string/lockscreen_clock_sammy_accent_hour</item>
-        <item>@string/lockscreen_clock_sammy_accent_min</item>
-    </string-array>
-
-    <string-array name="lockscreen_clock_values">
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item>5</item>
-        <item>6</item>
-        <item>7</item>
-        <item>8</item>
-        <item>9</item>
-        <item>10</item>
-    </string-array>
-
-	<!-- Lockscreen date styles -->
-    <string-array name="lockscreen_date_selection_entries" translatable="false">
-        <item>@string/lockscreen_date_selection_default</item>
-        <item>@string/lockscreen_date_selection_str_box</item>
-        <item>@string/lockscreen_date_selection_str_round</item>
-        <item>@string/lockscreen_date_selection_qbeta_style</item>
-        <item>@string/lockscreen_date_selection_str_accent</item>
-        <item>@string/lockscreen_date_selection_str_accent_transparent</item>
-        <item>@string/lockscreen_date_selection_str_gradient</item>
-        <item>@string/lockscreen_date_selection_str_border_accent</item>
-        <item>@string/lockscreen_date_selection_str_border_gradient</item>
-    </string-array>
-
-    <string-array name="lockscreen_date_selection_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item>5</item>
-        <item>6</item>
-        <item>7</item>
-        <item>8</item>
-    </string-array>
-
-	<!-- Statusbar Clock -->
-    <string-array name="status_bar_clock_style_entries" translatable="false">
-        <item>@string/status_bar_clock_style_left</item>
-        <item>@string/status_bar_clock_style_center</item>
-        <item>@string/status_bar_clock_style_right</item>
-    </string-array>
-    <string-array name="status_bar_clock_style_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-    </string-array>
-    <string-array name="status_bar_am_pm_entries" translatable="false">
-        <item>@string/status_bar_am_pm_hidden</item>
-        <item>@string/status_bar_am_pm_small</item>
-        <item>@string/status_bar_am_pm_normal</item>
-    </string-array>
-    <string-array name="status_bar_am_pm_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-    </string-array>
-    <string-array name="clock_date_display_entries">
-        <item>@string/clock_date_display_none</item>
-        <item>@string/clock_date_display_small</item>
-        <item>@string/clock_date_display_normal</item>
-    </string-array>
-    <string-array name="clock_date_display_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-    </string-array>
-    <string-array name="clock_date_style_entries">
-        <item>@string/clock_date_style_normal</item>
-        <item>@string/clock_date_style_lowercase</item>
-        <item>@string/clock_date_style_uppercase</item>
-    </string-array>
-    <string-array name="clock_date_style_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-    </string-array>
-    <string-array name="clock_date_format_entries_values">
-        <item>dd/MM/yy</item>
-        <item>MM/dd/yy</item>
-        <item>yyyy-MM-dd</item>
-        <item>yyyy-dd-MM</item>
-        <item>dd-MM-yyyy</item>
-        <item>MM-dd-yyyy</item>
-        <item>MMM dd</item>
-        <item>MMM dd, yyyy</item>
-        <item>MMMM dd, yyyy</item>
-        <item>EEE</item>
-        <item>EEE dd</item>
-        <item>EEE dd/MM</item>
-        <item>EEE MM/dd</item>
-        <item>EEE dd MMM</item>
-        <item>EEE MMM dd</item>
-        <item>EEE MMMM dd</item>
-        <item>EEEE dd/MM</item>
-        <item>EEEE MM/dd</item>
-        <item>@string/clock_date_format_custom</item>
-    </string-array>
-
-	<string-array name="clock_date_position_entries" translatable="false">
-        <item>@string/clock_date_left</item>
-        <item>@string/clock_date_right</item>
-    </string-array>
-
-    <string-array name="clock_date_position_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-    </string-array>
-
-    <!-- Battery percent -->
-    <string-array name="battery_percent_entries">
-        <item>@string/status_bar_battery_percentage_default</item>
-        <item>@string/status_bar_battery_percentage_text_inside</item>
-        <item>@string/status_bar_battery_percentage_text_next</item>
-    </string-array>
-
-    <string-array name="battery_percent_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-    </string-array>
-
-    <string-array name="status_bar_battery_style_entries" translatable="false">
-        <item>@string/status_bar_battery_style_q</item>
-        <item>@string/status_bar_battery_style_dotted_circle</item>
-        <item>@string/status_bar_battery_style_filled_circle</item>
-        <item>@string/status_bar_battery_style_text</item>
-        <item>@string/status_bar_battery_style_hidden</item>
-        <item>@string/status_bar_battery_style_circle</item>
-        <item>@string/status_bar_battery_style_big_circle</item>
-    </string-array>
-
-    <string-array name="status_bar_battery_style_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item>5</item>
-        <item>6</item>
-    </string-array>
-
-    <!-- Battery mode -->
-    <string-array name="qs_battery_mode_entries">
-        <item>@string/battery_percentage_off</item>
-        <item>@string/battery_percentage_next</item>
-        <item>@string/battery_percentage_inside</item>
-        <item>@string/battery_percentage_estimate</item>
-        <item>@string/battery_percentage_percentage_estimate</item>
-    </string-array>
-
-    <string-array name="qs_battery_mode_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-    </string-array>
-
-	<!-- Network Traffic Type -->
-    <string-array name="show_network_traffic_type_entries" translatable="false">
-        <item>@string/show_network_traffic_up</item>
-        <item>@string/show_network_traffic_down</item>
-        <item>@string/show_network_traffic_all</item>
-    </string-array>
-
-    <string-array name="show_network_traffic_type_values" translatable="false">
-        <item>1</item>
-        <item>2</item>
-        <item>0</item>
-    </string-array>
-
-	<!-- VoLTE Icon Type -->
-    <string-array name="volte_icon_type_entries" translatable="false">
-        <item>@string/volte_icon_emui</item>
-        <item>@string/volte_icon_asus</item>
-        <item>@string/volte_icon_miui</item>
-        <item>@string/volte_icon_hd</item>
-        <item>@string/volte_icon_oos</item>
-        <item>@string/volte_icon_volte</item>
-        <item>@string/volte_icon_vo</item>
-    </string-array>
-
-    <string-array name="volte_icon_type_values" translatable="false">
-        <item>6</item>
-        <item>5</item>
-        <item>4</item>
-        <item>3</item>
-        <item>2</item>
-        <item>1</item>
-        <item>0</item>
-    </string-array>
-
-	<!-- Lockscreen Charging Animation options -->
-    <string-array name="lockscreen_charging_animation_entries" translatable="false">
-        <item>@string/lockscreen_charging_animation_off</item>
-        <item>@string/lockscreen_charging_animation_flash</item>
-        <item>@string/lockscreen_charging_animation_battery</item>
-        <item>@string/lockscreen_charging_animation_drop</item>
-        <item>@string/lockscreen_charging_animation_explosion</item>
-        <item>@string/lockscreen_charging_animation_water</item>
-        <item>@string/lockscreen_charging_animation_split</item>
-        <item>@string/lockscreen_charging_animation_yellow</item>
-        <item>@string/lockscreen_charging_animation_covid</item>
-        <item>@string/lockscreen_charging_animation_wash</item>
-        <item>@string/lockscreen_charging_animation_wear</item>
-        <item>@string/lockscreen_charging_animation_loading</item>
-    </string-array>
-
-    <string-array name="lockscreen_charging_animation_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item>5</item>
-        <item>6</item>
-        <item>7</item>
-        <item>8</item>
-        <item>9</item>
-        <item>10</item>
-        <item>11</item>
-    </string-array>
-
-	<!-- Themes -->
-    <string-array name="theme_type_titles">
-        <item>@string/theme_type_light</item>
-        <item>@string/theme_type_pitch_black</item>
-        <item>@string/theme_type_solarized_dark</item>
-        <item>@string/theme_type_baked_green</item>
-        <item>@string/theme_type_choco_x</item>
-        <item>@string/theme_type_du_pitchblack</item>
-	<item>@string/theme_type_dark_grey</item>
-	<item>@string/theme_type_material_ocean</item>
-        <item>@string/theme_type_clear_spring</item>
-    </string-array>
-
-    <string-array name="theme_type_values">
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item>5</item>
-        <item>6</item>
-	<item>7</item>
-	<item>8</item>
-        <item>9</item>
-    </string-array>
-
-	<!-- Adaptive Playback -->
-    <string-array name="adaptive_playback_timeout_entries" translatable="false">
-        <item>@string/adaptive_playback_timeout_30_secs</item>
-        <item>@string/adaptive_playback_timeout_1_min</item>
-        <item>@string/adaptive_playback_timeout_2_min</item>
-        <item>@string/adaptive_playback_timeout_5_min</item>
-        <item>@string/adaptive_playback_timeout_10_min</item>
-    </string-array>
-    <string-array name="adaptive_playback_timeout_values" translatable="false">
-        <item>30000</item>
-        <item>60000</item>
-        <item>120000</item>
-        <item>300000</item>
-        <item>600000</item>
-    </string-array>
-
-    <!-- Slim recents -->
-    <string-array name="recent_panel_expanded_mode_entries">
-        <item>@string/recent_panel_expanded_mode_auto</item>
-        <item>@string/recent_panel_expanded_mode_always</item>
-        <item>@string/recent_panel_expanded_mode_never</item>
-        <item>@string/recent_panel_expanded_mode_disabled</item>
-    </string-array>
-    <string-array name="recent_panel_expanded_mode_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-    </string-array>
-
-    <string-array name="slim_recents_enter_exit_animation_entries" translatable="false">
-        <item>@string/slim_recents_enter_exit_animation_translate</item>
-        <item>@string/slim_recents_enter_exit_animation_fade</item>
-    </string-array>
-    <string-array name="slim_recents_enter_exit_animation_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-    </string-array>
-	
-	<!-- Quick Pulldown -->
-    <string-array name="quick_pulldown_entries" translatable="false">
-        <item>@string/quick_pulldown_off</item>
-        <item>@string/quick_pulldown_right</item>
-        <item>@string/quick_pulldown_left</item>
-        <item>@string/quick_pulldown_always</item>
-    </string-array>
-
-    <string-array name="quick_pulldown_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-    </string-array>
-	
-	<!-- Wired headset ringtone audio focus -->
-    <string-array name="ringtone_focus_mode_entries">
-        <item>@string/ringtone_focus_mode_stock</item>
-        <item>@string/ringtone_focus_mode_dynamic</item>
-    </string-array>
-    <string-array name="ringtone_focus_mode_values" translatable="false">
-        <item>1</item>
-        <item>0</item>
-    </string-array>
-	
-	<!-- Switch styles -->
-    <string-array name="switch_style_entries" translatable="false">
-        <item>@string/switch_default</item>
-        <item>@string/switch_md2</item>
-        <item>@string/switch_oneplus</item>
-        <item>@string/switch_narrow</item>
-        <item>@string/switch_contained</item>
-        <item>@string/switch_retro</item>
-        <item>@string/switch_stockish</item>
-        <item>@string/switch_telegram</item>
-    </string-array>
-    <string-array name="switch_style_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item>5</item>
-        <item>6</item>
-        <item>7</item>
-    </string-array>
-	
-	<!-- Gaming mode -->
-    <string-array name="gaming_mode_ringer_entries">
-        <item>@string/gaming_mode_ringer_off_title</item>
-        <item>@string/gaming_mode_ringer_vibrate_title</item>
-        <item>@string/gaming_mode_ringer_dnd_title</item>
-        <item>@string/gaming_mode_ringer_silent_title</item>
-    </string-array>
-    <string-array name="gaming_mode_ringer_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-    </string-array>
-
-    <string-array name="gaming_mode_notifications_entries">
-        <item>@string/gaming_mode_notifications_off_title</item>
-        <item>@string/gaming_mode_notifications_notif_title</item>
-        <item>@string/gaming_mode_notifications_toast_title</item>
-        <item>@string/gaming_mode_notifications_all_title</item>
-    </string-array>
-    <string-array name="gaming_mode_notifications_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-    </string-array>
-	
-	<!-- Heads up timeout -->
-    <string-array name="heads_up_time_out_entries" translatable="false">
-        <item>@string/heads_up_time_out_2sec</item>
-        <item>@string/heads_up_time_out_4sec</item>
-        <item>@string/heads_up_time_out_5sec</item>
-        <item>@string/heads_up_time_out_6sec</item>
-        <item>@string/heads_up_time_out_8sec</item>
-        <item>@string/heads_up_time_out_10sec</item>
-    </string-array>
-
-    <string-array name="heads_up_time_out_values" translatable="false">
-        <item>2000</item>
-        <item>4000</item>
-        <item>5000</item>
-        <item>6000</item>
-        <item>8000</item>
-        <item>10000</item>
-    </string-array>
-	
-	<!-- Heads up snooze -->
-    <string-array name="heads_up_snooze_entries">
-        <item>@string/disabled</item>
-        <item>@string/heads_up_snooze_1min</item>
-        <item>@string/heads_up_snooze_5min</item>
-        <item>@string/heads_up_snooze_10min</item>
-        <item>@string/heads_up_snooze_15min</item>
-        <item>@string/heads_up_snooze_20min</item>
-    </string-array>
-
-    <string-array name="heads_up_snooze_values" translatable="false">
-        <item>0</item>
-        <item>60000</item>
-        <item>300000</item>
-        <item>600000</item>
-        <item>900000</item>
-        <item>1200000</item>
-    </string-array>
-	
-	<!-- Settings dashboard icon style -->
-    <string-array name="theming_settings_dashboard_icons_entries" translatable="false">
-        <item>@string/theming_settings_dashboard_icons_default2</item>
-        <item>@string/theming_settings_dashboard_icons_default_accent2</item>
-        <item>@string/theming_settings_dashboard_icons_plain</item>
-        <item>@string/theming_settings_dashboard_icons_plain_accent</item>
-        <item>@string/theming_settings_dashboard_icons_default_oneplus</item>
-        <item>@string/theming_settings_dashboard_icons_bg_random</item>
-        <item>@string/theming_settings_dashboard_icons_random</item>
-        <item>@string/theming_settings_dashboard_icons_random_bg_accent</item>
-        <item>@string/theming_settings_dashboard_icons_accent_bg_random</item>
-    </string-array>
-
-    <string-array name="theming_settings_dashboard_icons_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item>5</item>
-        <item>6</item>
-        <item>7</item>
-        <item>8</item>
-    </string-array>
-	
-	<!-- VoWiFi Icon -->
-    <string-array name="vowifi_icon_entries" translatable="false">
-        <item>@string/vowifi_icon_disabled</item>
-        <item>@string/vowifi_icon_enabled</item>
-        <item>@string/vowifi_icon_enabled_volte_disabled</item>
-    </string-array>
-
-    <string-array name="vowifi_icon_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-    </string-array>
-	
-	<!-- VoWiFi icon style -->
-    <string-array name="vowifi_icon_style_entries" translatable="false">
-        <item>@string/vowifi_icon_default</item>
-        <item>@string/vowifi_icon_oneplus</item>
-        <item>@string/vowifi_icon_moto</item>
-        <item>@string/vowifi_icon_asus</item>
-        <item>@string/vowifi_icon_emui</item>
-    </string-array>
-
-    <string-array name="vowifi_icon_style_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-    </string-array>
-	
-	<!--  Volume Panel  -->
-    <string-array name="volume_panel_entries">
-        <item>@string/volume_panel_default</item>
-        <item>@string/volume_panel_aosp</item>
-        <item>@string/volume_panel_compat</item>
-        <item>@string/volume_panel_oreo</item>
-        <item>@string/volume_panel_tiled</item>
-    </string-array>
-
-    <string-array name="volume_panel_values" translatable="false">
-        <item>@string/volume_panel_default_val</item>
-        <item>@string/volume_panel_aosp_val</item>
-        <item>@string/volume_panel_compat_val</item>
-        <item>@string/volume_panel_oreo_val</item>
-        <item>@string/volume_panel_tiled_val</item>
-    </string-array>
-	
-	<!-- Power menu Animations  -->
-    <string-array name="power_menu_animations_entries">
-        <item>@string/power_menu_animation_aosp</item>
-        <item>@string/power_menu_animation_bottom</item>
-        <item>@string/power_menu_animation_top</item>
-        <item>@string/power_menu_animation_fly</item>
-        <item>@string/power_menu_animation_turn</item>
-        <item>@string/power_menu_animation_slide</item>
-        <item>@string/power_menu_animation_xylon</item>
-        <item>@string/power_menu_animation_card</item>
-        <item>@string/power_menu_animation_translucent_top</item>
-        <item>@string/power_menu_animation_translucent_bottom</item>
-        <item>@string/power_menu_animation_rotate</item>
-    </string-array>
-
-    <string-array name="power_menu_animations_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item>5</item>
-        <item>6</item>
-        <item>7</item>
-        <item>8</item>
-        <item>9</item>
-        <item>10</item>
-    </string-array>
-	
-	<!-- QS header image -->
-    <string-array name="custom_header_provider_entries" translatable="false">
-        <item>@string/daylight_header_provider_title</item>
-        <item>@string/file_header_provider_title</item>
-    </string-array>
-    <string-array name="custom_header_provider_values" translatable="false">
-        <item>@string/daylight_header_provider</item>
-        <item>@string/file_header_provider</item>
-    </string-array>
-	
-	<!-- Edge light Animation -->
-    <string-array name="pulse_ambient_light_anim_entries">
-        <item>@string/pulse_ambient_light_anim_restart</item>
-        <item>@string/pulse_ambient_light_anim_reverse</item>
-    </string-array>
-
-    <string-array name="pulse_ambient_light_anim_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-    </string-array>
-	
-	<!-- Edge light layout -->
-    <string-array name="pulse_ambient_light_layout_entries">
-        <item>@string/pulse_ambient_light_layout_solid</item>
-        <item>@string/pulse_ambient_light_layout_faded</item>
-    </string-array>
-
-    <string-array name="pulse_ambient_light_layout_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-    </string-array>
-
-    <!-- QS header styles -->
-    <string-array name="qs_header_style_entries" translatable="false">
-        <item>@string/qs_header_black</item>
-        <item>@string/qs_header_grey</item>
-        <item>@string/qs_header_lightgrey</item>
-        <item>@string/qs_header_accent</item>
-        <item>@string/qs_header_transparent</item>
-    </string-array>
-    <string-array name="qs_header_style_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-    </string-array>
-
-     <!-- QS Header Data Usage -->
-    <string-array name="qs_datausage_entries" translatable="false">
-        <item>@string/qs_datausage_disabled</item>
-        <item>@string/qs_datausage_daily</item> 
-        <item>@string/qs_datausage_monthly</item>
-    </string-array>
-    <string-array name="qs_datausage_values" translatable="false"> 
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-    </string-array>
-
-    <!-- Pulse -->
-    <string-array name="pulse_render_mode_entries">
-       <item>@string/pulse_render_mode_fading_bars</item>
-       <item>@string/pulse_render_mode_solid_lines</item>
-    </string-array>
-
-    <string-array name="pulse_render_mode_values" translatable="false">
-      <item>0</item>
-      <item>1</item>
-    </string-array>
-
-    <string-array name="pulse_color_mode_entries">
-       <item>@string/pulse_color_accent</item>
-       <item>@string/pulse_color_custom</item>
-       <item>@string/pulse_color_lava_lamp</item>
-       <item>@string/pulse_color_auto</item>
-    </string-array>
-
-    <string-array name="pulse_color_mode_values" translatable="false">
-      <item>0</item>
-      <item>1</item>
-      <item>2</item>
-      <item>3</item>
-    </string-array>
-	
-	<string-array name="entries_led_colors" translatable="false">
-        <item>@string/led_color_green</item>
-        <item>@string/led_color_red</item>
-    </string-array>
-
-    <string-array name="values_led_colors" translatable="false">
-        <item>#FF00FF00</item>
-        <item>#FFFF0000</item>
-    </string-array>
-	
-	<!-- Blink flashlight for incoming calls -->
-    <string-array name="flashlight_on_call_entries">
-        <item>@string/flashlight_on_call_disabled</item>
-        <item>@string/flashlight_on_call_ringer</item>
-        <item>@string/flashlight_on_call_no_ringer</item>
-        <item>@string/flashlight_on_call_silent</item>
-        <item>@string/flashlight_on_call_always</item>
-    </string-array>
-
-    <string-array name="flashlight_on_call_values">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-    </string-array>
-	
-	<!-- Battery bar -->
-    <string-array name="battery_bar_entries" translatable="false">
-        <item>@string/sb_battery_bar_statusbar</item>
-        <item>@string/sb_battery_bar_topnav</item>
-        <item>@string/sb_battery_bar_bottomnav</item>
-    </string-array>
-
-    <string-array name="battery_bar_values" translatable="false">
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-    </string-array>
-
-    <string-array name="battery_bar_style_entries" translatable="false">
-        <item>@string/sb_battery_bar_reg</item>
-        <item>@string/sb_battery_bar_center</item>
-        <item>@string/sb_battery_bar_reversed</item>
-    </string-array>
-
-    <string-array name="battery_bar_style_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-    </string-array>
-	
-	<!-- Brightness sliders styles -->
-    <string-array name="brightness_slider_style_selector_entries" translatable="false">
-        <item>@string/brightness_slider_style_default</item>
-        <item>@string/brightness_slider_style_daniel</item>
-        <item>@string/brightness_slider_style_mememini</item>
-        <item>@string/brightness_slider_style_memeround</item>
-        <item>@string/brightness_slider_style_memeroundstroke</item>
-        <item>@string/brightness_slider_style_memestroke</item>
-    </string-array>
-
-    <string-array name="brightness_slider_style_selector_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item>5</item>
-    </string-array>
-
-	<!-- Notification Background styles -->
-    <string-array name="ui_style_selector_entries" translatable="false">
-        <item>@string/ui_style_default</item>
-        <item>@string/ui_style_no_corner_radius</item>
-        <item>@string/ui_style_rectangle</item>
-        <item>@string/ui_style_round_large</item>
-        <item>@string/ui_style_round_medium</item>
-    </string-array>
-
-    <string-array name="ui_style_selector_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-    </string-array>
-	
-	<!-- Navbar styles -->
-    <string-array name="navbar_style_entries" translatable="false">
-        <item>@string/navbar_default</item>
-        <item>@string/navbar_asus</item>
-        <item>@string/navbar_oneplus</item>
-        <item>@string/navbar_oneui</item>
-        <item>@string/navbar_tecno</item>
-    </string-array>
-
-    <string-array name="navbar_style_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-    </string-array>
 </resources>
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index a0034fd..6d40caa 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -61,742 +61,30 @@
     <string name="led_color_green">Green</string>
     <string name="led_color_red">Red</string>
 
-    <!-- Lockscreen battery info indicator  -->
-    <string name="lockscreen_battery_info_title">Lockscreen charging info</string>
-    <string name="lockscreen_battery_info_summary">Display negociated charger max current and voltage and battery temperature on lockscreen while charging</string>
-
-    <!-- QS category -->
-    <string name="enable_clear_all_button">Replace clear all text with nice button</string>
-    <string name="enable_clear_all_button_summary">Show clear all notifications button in quick settings instead of default text one</string>
-
-    <string name="qs_bg_use_new_tint">QS tile colors</string>
-    <string name="qs_bg_use_new_tint_summary">Use accent color for qs tile icons and background</string>
-    <string name="qs_blur_alpha_title">Blur alpha</string>
-    <string name="qs_blur_alpha_summary">Sets the blur transparency</string>
-    <string name="blur_quicksettings">Blur behind quick settings (beta)</string>
-    <string name="blur_quicksettings_subtitle">blurs darkened background behind quick settings</string>
-	 <string name="qs_blur_intensity_title">Blur intensity</string>
-    <string name="qs_blur_intensity_summary">Sets the blur intensity/radius</string>
-	<string name="unit_percent">\u0025</string>
-
-    <!-- In-call feedback -->
-    <string name="incall_feeedback_vibrate_title">Vibrate to indicate call status</string>
-
-    <!-- Lock screen cover art -->
-    <string name="lockscreen_media_art_title">Display media cover art</string>
-    <string name="lockscreen_media_blur_title">Media art blur level</string>
-
 	<!-- QS settings -->
     <string name="qs_title">Quick settings</string>
-    <string name="qs_rows_portrait_title">Rows (portrait)</string>
-    <string name="qs_rows_landscape_title">Rows (landscape)</string>
-    <string name="qs_columns_portrait_title">Columns (portrait)</string>
-    <string name="qs_columns_landscape_title">Columns (landscape)</string>
-
-    <!-- QS title visibility -->
-    <string name="qs_tile_title_visibility_title">Title visibility</string>
-    <string name="qs_tile_title_visibility_summary">Show the titles underneath QS tiles</string>
-
-    <!-- QS tiles haptic feedback -->
-    <string name="qs_vibrate_title">Vibrate on touch</string>
-    <string name="qs_vibrate_summary">Vibrate when touching QS tiles</string>
-    <string name="qs_brightness_position_bottom_title">Brightness slider at bottom</string>
-    <string name="qs_brightness_position_bottom_summary">Show a brightness slider on bottom quick settings</string>
-    <string name="enable_oneui">OneUI</string>
-    <string name="enable_oneui_summary">Show spacer above settings actionbar for easier use with one hand\nNOTE: restart settings app to see effect</string>
-
-     <!-- Lockscreen clock style -->
-    <string name="lockscreen_clock_title">Clock style</string>
-    <string name="lockscreen_clock_dialog_title">Select clock style</string>
-    <string name="lockscreen_clock_hide">Hide</string>
-    <string name="lockscreen_clock_default">Default</string>
-    <string name="lockscreen_clock_default_bold">Default (bold)</string>
-    <string name="lockscreen_clock_default_accent">Default (accent)</string>
-    <string name="lockscreen_clock_default_accent_min">Default (accent minutes)</string>
-    <string name="lockscreen_clock_default_accent_hour">Default (accent hours)</string>
-    <string name="lockscreen_clock_sammy">Sammy</string>
-    <string name="lockscreen_clock_sammy_bold">Sammy (bold)</string>
-    <string name="lockscreen_clock_sammy_accent_hour">Sammy (accent hour)</string>
-    <string name="lockscreen_clock_sammy_accent_min">Sammy (accent minute)</string>
-
-	<!-- Lockscreen Date styles -->
-	<string name="lockscreen_date_title">Date style</string>
-    <string name="lockscreen_date_selection_title">Date style</string>
-    <string name="lockscreen_date_dialog_title">Select date style</string>
-    <string name="lockscreen_date_selection_default">Default</string>
-    <string name="lockscreen_date_selection_str_box">Semi-transparent box</string>
-    <string name="lockscreen_date_selection_str_round">Semi-transparent box (round)</string>
-    <string name="lockscreen_date_selection_qbeta_style">Q Beta pill</string>
-    <string name="lockscreen_date_selection_str_accent">Rounded, simple and with accent</string>
-    <string name="lockscreen_date_selection_str_accent_transparent">Rounded, transparent and with accent</string>
-    <string name="lockscreen_date_selection_str_gradient">Gradient</string>
-    <string name="lockscreen_date_selection_str_border_accent">Dark with accented borders</string>
-    <string name="lockscreen_date_selection_str_border_gradient">Dark with gradient borders</string>
 
 	<!-- Status bar - icons -->
     <string name="status_bar_icons_title">Status bar icons</string>
-    <string name="status_bar_system_icons_title">System icons</string>
-    <string name="status_bar_system_icons_summary">Control which status bar icons are shown</string>
 
 	<!-- Statusbar Clock -->
 	<string name="statusbar_items_title">Statusbar items</string>
-    <string name="clock_category_title">Clock</string>
-    <string name="date_category_title">Date</string>
-    <string name="status_bar_clock_title">Clock &amp; Date</string>
-    <string name="status_bar_clock_summary">Customize clock and date in statusbar</string>
-    <string name="status_bar_clock_style_title">Clock position</string>
-    <string name="status_bar_clock_style_right">Right</string>
-    <string name="status_bar_clock_style_center">Center</string>
-    <string name="status_bar_clock_style_left">Left</string>
-    <string name="status_bar_am_pm_title">AM/PM style</string>
-    <string name="status_bar_am_pm_info">24-hour clock is enabled</string>
-    <string name="status_bar_am_pm_normal">Normal</string>
-    <string name="status_bar_am_pm_small">Small</string>
-    <string name="status_bar_am_pm_hidden">Hidden</string>
-    <string name="clock_seconds_display">Show seconds</string>
-    <string name="clock_seconds_display_summary">Display seconds in the clock</string>
-    <string name="clock_date_display">Date</string>
-    <string name="clock_date_display_summary">Display custom date before the clock</string>
-    <string name="clock_date_display_none">Hidden</string>
-    <string name="clock_date_display_small">Small</string>
-    <string name="clock_date_display_normal">Normal</string>
-    <string name="clock_date_style">Date style</string>
-    <string name="clock_date_style_normal">Normal</string>
-    <string name="clock_date_style_lowercase">Lowercase</string>
-    <string name="clock_date_style_uppercase">Uppercase</string>
-    <string name="clock_date_format_custom">Custom java format</string>
-    <string name="clock_date_format">Date format</string>
-    <string name="clock_date_format_summary">%1$s</string>
-    <string name="clock_date_string_edittext_title">Must be in DateFormat eg. MM/dd/yy</string>
-    <string name="clock_date_string_edittext_summary">Enter string</string>
-    <string name="clock_date_right">Right of time</string>
-    <string name="clock_date_left">Left of time</string>
-    <string name="clock_date_position">Date position</string>
-    <string name="status_bar_clock_auto_hide_title">Auto-hide clock</string>
-    <string name="status_bar_clock_auto_hide_summary">Hide and show clock at regular intervals of time</string>
-    <string name="status_bar_clock_auto_hide_hdur_title">Hide duration</string>
-    <string name="status_bar_clock_auto_hide_sdur_title">Show duration</string>
-
-    <!-- Charging animation -->
-    <string name="lockscreen_charging_animation_title">Charging animation</string>
-    <string name="lockscreen_charging_animation_summary">Display an animation when the device is plugged in</string>
-    <string name="lockscreen_charging_animation_off">Off</string>
-    <string name="lockscreen_charging_animation_flash">Flash</string>
-    <string name="lockscreen_charging_animation_battery">Battery</string>
-    <string name="lockscreen_charging_animation_drop">Drop</string>
-    <string name="lockscreen_charging_animation_explosion">Explosion</string>
-    <string name="lockscreen_charging_animation_water">Water</string>
-    <string name="lockscreen_charging_animation_split">Split Loading</string>
-    <string name="lockscreen_charging_animation_yellow">Yellow Animation</string>
-    <string name="lockscreen_charging_animation_covid">Covid19</string>
-    <string name="lockscreen_charging_animation_wash">Wash Your Hand</string>
-    <string name="lockscreen_charging_animation_wear">Wear Your Mask</string>
-    <string name="lockscreen_charging_animation_loading">Loading</string>
-
-    <!-- Battery Styles -->
-    <string name="battery_style_category_title">Battery level</string>
-    <string name="battery_percent_title">Battery percent</string>
-
-    <!-- Status bar - Battery -->
-    <string name="status_bar_battery_style_title">Battery style</string>
-    <string name="status_bar_battery_style_q">Icon portrait (default)</string>
-    <string name="status_bar_battery_style_dotted_circle">Circle (Dotted)</string>
-    <string name="status_bar_battery_style_circle">Circle</string>
-    <string name="status_bar_battery_style_text">Text</string>
-    <string name="status_bar_battery_style_hidden">Hidden</string>
-    <string name="status_bar_battery_style_big_circle">Big circle</string>
-    <string name="status_bar_battery_style_filled_circle">Circle (Filled)</string>
-
-    <!-- Status bar - Battery percentage -->
-    <string name="status_bar_battery_percentage_title">Battery percentage</string>
-    <string name="status_bar_battery_percentage_default">Hidden (default)</string>
-    <string name="status_bar_battery_percentage_text_inside">Inside the icon</string>
-    <string name="status_bar_battery_percentage_text_next">Next to the icon</string>
-    <string name="status_bar_battery_text_charging_title">Battery percentage when charging</string>
-    <string name="status_bar_battery_text_charging_summary">Always display battery percentage when charging</string>
-    <string name="status_bar_battery_charging_bolt_title">Show charging bolt</string>
-    <string name="status_bar_battery_charging_bolt_summary">Show a \u26A1\uFE0E symbol near battery text when charging</string>
-
-    <!-- Battery mode -->
-    <string name="battery_title">Battery icon</string>
-    <string name="qs_hide_battery_title">Hide battery icon</string>
-    <string name="qs_hide_battery_summary">Hides the battery icon from the QS header</string>
-    <string name="battery_percentage_title">Battery percentage</string>
-    <string name="battery_percentage_off">Disabled</string>
-    <string name="battery_percentage_next">Enabled</string>
-    <string name="battery_percentage_inside">Enabled (inside icon)</string>
-    <string name="battery_percentage_estimate">Enabled (estimate)</string>
-    <string name="battery_percentage_percentage_estimate">Enabled (percent | estimate)</string>
-
-	<!-- Network traffic -->
-    <string name="traffic_title">Traffic indicators</string>
-    <string name="traffic_title_summary">Customize network traffic indicators</string>
-    <string name="network_traffic_title">Network traffic</string>
-    <string name="network_traffic_type">Select net activity type</string>
-    <string name="show_network_traffic_up">Uplink</string>
-    <string name="show_network_traffic_down">Downlink</string>
-    <string name="show_network_traffic_all">Uplink and Downlink</string>
-    <string name="network_traffic_state_title">Show net activity in statusbar</string>
-    <string name="network_traffic_autohide_threshold_title">Net activity autohide threshold (KB/s)</string>
-    <string name="network_traffic_hidearrow">Hide arrows</string>
-    <string name="network_traffic_hidearrow_summary">Hide the network traffic indicator arrows</string>
-
-	<!-- 4G icon -->
-    <string name="statusbar_items_category">Icons</string>
-    <string name="show_fourg_icon_title">4G icon</string>
-    <string name="show_fourg_icon_summary">Display 4G icon in signal icon instead LTE</string>
-
-	<!-- Show VoLTE icon on statusbar -->
-    <string name="volte_icon_title">VoLTE icon</string>
-    <string name="volte_icon_summary">Display VoLTE icon (Needs a SystemUI restart to take effect)</string>
-
-	<!-- VoLTE icon styles -->
-    <string name="volte_icon_style_title">Select VoLTE Icon</string>
-    <string name="volte_icon_vo">Default Icon</string>
-    <string name="volte_icon_volte">VoLTE Icon</string>
-    <string name="volte_icon_oos">VoLTE OOS Icon</string>
-    <string name="volte_icon_hd">HD Icon</string>
-    <string name="volte_icon_miui">VoLTE Miui Icon</string>
-    <string name="volte_icon_asus">VoLTE Asus Icon</string>
-    <string name="volte_icon_emui">EMUI</string>
 
 	<!-- Lock screen visualizer -->
 	<string name="visualizer_title">Display music visualizer</string>
-    <string name="lockscreen_visualizer_title">Music visualizer</string>
-
-    <!-- Fingerprint authentication vibration -->
-    <string name="fprint_sucess_vib_title">Fingerprint authentication vibration</string>
-    <string name="fprint_sucess_vib_summary">Vibrate on successful fingerprint authentication</string>
-
-     <!-- Advanced restart options -->
-    <string name="advanced_reboot_title">Advanced restart</string>
-    <string name="advanced_reboot_summary">When unlocked, include options in the power menu for restarting into recovery or bootloader</string>
-
-    <!-- Battery light -->
-    <string name="battery_light_settings">Battery charging light</string>
-    <string name="battery_light_enable">Enable</string>
-    <string name="battery_light_allow_on_dnd_title">Battery light in Do Not Disturb mode</string>
-    <string name="battery_light_low_blinking_title">Blinking light on low battery</string>
-    <string name="battery_light_cat">Battery light color when charging</string>
-    <string name="battery_light_low_color">Low battery</string>
-    <string name="battery_light_medium_color">Medium battery</string>
-    <string name="battery_light_full_color">Almost full battery</string>
-    <string name="battery_light_reallyfull_color">Full (100) battery</string>
-
-	<!-- Old MobileType Toggle -->
-    <string name="use_old_mobiletype_title">Use old mobile type style</string>
-    <string name="use_old_mobiletype_summary">Merge signal and type icons</string>
-
-	<!-- Themes -->
-    <string name="theme_type_title">System theme</string>
-    <string name="theme_type_summary">Select theme</string>
-    <string name="theme_type_light">Light</string>
-    <string name="theme_type_pitch_black">Google dark</string>
-    <string name="theme_type_solarized_dark">Solarized dark</string>
-    <string name="theme_type_baked_green">Baked Green</string>
-    <string name="theme_type_choco_x">Choco X</string>
-    <string name="theme_type_du_pitchblack">Pitch black</string>
-    <string name="theme_type_dark_grey">Dark Grey</string>
-    <string name="theme_type_material_ocean">Material Ocean</string>
-    <string name="theme_type_clear_spring">Clear Spring</string>
 
 	<!-- Power menu and dialogs opacity -->
-    <string name="lockscreen_secure_power_title">Secure power menu</string>
-    <string name="lockscreen_secure_power_menu_title">Secure power menu</string>
-    <string name="lockscreen_secure_power_menu_summary">Allow power menu action only after authentication</string>
-    <string name="power_menu_emergency_title">Emergency</string>
-    <string name="panel_porn_title">Power Menu Transparency</string>
-    <string name="power_menu_transparency">Power/reboot menu opacity</string>
-    <string name="power_menu_dialog_dim">Power/reboot dialog dim background amount</string>
 
 	<!-- Rounded corners -->
     <string name="corners_category_title">Rounded corners</string>
-    <string name="corners_category_summary">Adjust rounded corners and padding</string>
-    <string name="corners_title">Customize rounded corners</string>
-    <string name="corner_radius">Rounded corner radius</string>
-    <string name="content_padding">Corner content padding</string>
-    <string name="status_bar_padding">Statusbar extra padding</string>
-    <string name="corner_fwvals">Use framework values</string>
-    <string name="corner_fwvals_summary">Useful if the device actually has rounded corners</string>
 
-
-    <!-- Adaptive Playback -->
-    <string name="media_title">Media</string>
-    <string name="adaptive_playback_title">Adaptive playback</string>
-    <string name="adaptive_playback_summary">Pause media when volume is muted and resume it by increasing volume within the timeout</string>
-    <string name="adaptive_playback_timeout_title">Playback timeout</string>
-    <string name="adaptive_playback_timeout_30_secs">30 seconds</string>
-    <string name="adaptive_playback_timeout_1_min">1 minute</string>
-    <string name="adaptive_playback_timeout_2_min">2 minutes</string>
-    <string name="adaptive_playback_timeout_5_min">5 minutes</string>
-    <string name="adaptive_playback_timeout_10_min">10 minutes</string>
-
-	<!-- Custom carrier label and position -->
-    <string name="label_title">Label</string>
-    <string name="carrier_label_settings_title">Carrier label</string>
-    <string name="carrier_label_settings_summary">Customize the carrier label</string>
-    <string name="custom_carrier_label_title">Custom carrier label</string>
-    <string name="custom_carrier_label_explain">Enter a custom label. Leave blank to use your network name</string>
-    <string name="custom_carrier_label_notset">Custom label currently not set</string>
-    <string name="show_carrier_title">Carrier label location</string>
-    <string name="show_carrier_disabled">Disabled</string>
-    <string name="show_carrier_keyguard">Lockscreen</string>
-    <string name="show_carrier_statusbar">Statusbar</string>
-    <string name="show_carrier_enabled">Both</string>
-
-    <!-- Power menu on secure lockscreen -->
-    <string name="lockscreen_enable_power_menu_title">Power menu</string>
-    <string name="lockscreen_enable_power_menu_summary">Allow accessing power menu on secure lock screen</string>
-
-    <!-- Slim recents -->
-    <string name="alternative_recents_category">Alternative recents</string>
-    <string name="alternative_recents_swipe_up_enabled_warning_summary">When using swipe up home navigation to open recents, only stock recents are supported</string>
-    <string name="slim_recents_title">Slim Recents</string>
-    <string name="slim_recents_summary">Enable to use an alternative recents screen</string>
-    <string name="slim_recents_fragment_title">Slim recents settings</string>
-    <string name="slim_recents_fragment_summary">Customize the additional settings for slim recents</string>
-    <string name="recents_max_apps_title">Max allowed apps</string>
-    <string name="recent_panel_scale_title">Size</string>
-    <string name="recent_panel_expanded_mode_title">Expanded mode</string>
-    <string name="recent_panel_expanded_mode_summary">Recent tasks expanded preview mode</string>
-    <string name="recent_panel_expanded_mode_auto">Auto (Default)</string>
-    <string name="recent_panel_expanded_mode_always">Always</string>
-    <string name="recent_panel_expanded_mode_never">Never</string>
-    <string name="recent_panel_expanded_mode_disabled">Disabled</string>
-    <string name="recent_panel_bg_color_title">Panel background color</string>
-    <string name="recent_card_bg_color_title">Card background color</string>
-    <string name="slim_recents_mem_display_long_click_clear_title">Memory bar longpress gesture</string>
-    <string name="slim_recents_mem_display_long_click_clear_summary">Clear recents by long-pressing the memory bar</string>
-    <string name="slim_icon_pack_title">Icon Pack</string>
-    <string name="slim_icon_pack_summary">Apply a custom icon pack for apps in the panel</string>
-    <string name="no_iconpacks_summary">No icon packs installed</string>
-    <string name="dialog_pick_iconpack_title">Pick icon pack</string>
-    <string name="default_iconpack_title">Default icons</string>
-    <string name="slim_recents_corner_radius_title">Card corner radius</string>
-    <!-- ATTENTION: RTL languages need to replace left with right -->
-    <string name="recent_panel_lefty_mode_title">Show on the left edge</string>
-    <string name="recent_panel_lefty_mode_summary">Show recent apps panel on the left edge of the screen</string>
-    <string name="slim_blacklist_apps_cat_title">Blacklist</string>
-    <string name="slim_blacklist_apps_title">Apps blacklist</string>
-    <string name="slim_blacklist_apps_summary">Apps to not show in the panel</string>
-    <string name="slim_blacklist_add_apps_title">Add app</string>
-    <string name="slim_blacklist_add_apps_summary">Tap here to add, tap on added app to remove it</string>
-
-    <!-- Slim Recent App Sidebar  -->
-    <string name="recent_app_sidebar_cat_title">App Sidebar</string>
-    <string name="recent_app_sidebar_title">Recents app sidebar</string>
-    <string name="recent_app_sidebar_summary">Show app shortcuts on the other edge</string>
-    <string name="recent_app_sidebar_picker_title">Sidebar shortcuts</string>
-    <string name="recent_app_sidebar_picker_summary">Choose apps to show in the sidebar</string>
-    <string name="recent_app_sidebar_style_title">Sidebar style</string>
-    <string name="recent_app_sidebar_style_summary">Change the look of the sidebar</string>
-    <string name="recent_app_sidebar_hide_labels_title">Hide icon labels</string>
-    <string name="recent_app_sidebar_label_color_title">Label color</string>
-    <string name="recent_app_sidebar_bg_color_title">Background color</string>
-    <string name="recent_app_sidebar_scale_title">Size</string>
-    <string name="recent_app_sidebar_open_simultaneously_title">Open simultaneously with recents</string>
-    <string name="recent_app_sidebar_open_simultaneously_summary">Reduce recents opening lag by disabling this</string>
-    <string name="default_auto_string">Default (App based)</string>
-
-    <!-- Slim recents membar -->
-    <string name="default_string">Default</string>
-    <string name="profile_choose_app">Choose app</string>
-    <string name="dialog_delete_title">Delete</string>
-    <string name="dialog_delete_message">Remove selected item?</string>
-    <string name="slim_recents_mem_display_category_title">Memory Bar</string>
-    <string name="slim_recents_mem_display_title">Memory bar</string>
-    <string name="slim_recents_mem_display_summary">Show a progress bar displaying RAM</string>
-    <string name="slim_recents_mem_display_color">Memory bar color</string>
-    <string name="slim_recents_mem_display_text_color">Memory bar text color</string>
-    <string name="slim_recents_enter_exit_animation_title">Animation</string>
-    <string name="slim_recents_enter_exit_animation_translate">Translate</string>
-    <string name="slim_recents_enter_exit_animation_fade">Fade</string>
-
-    <!-- R Notification headers -->
-    <string name="notification_headers_title">Show notification headers</string>
-    <string name="notification_headers_summary">Whether to show R style notification headers (Requires a SystemUI restart)</string>
-	
 	<!-- AOKP custom system animations -->
-    <string name="system_animation_title">System</string>
-    <string name="activity_open_title">Activity open animation</string>
-    <string name="activity_close_title">Activity close animation</string>
-    <string name="task_open_title">Task open animation</string>
-    <string name="task_open_behind_title">Task open behind animation</string>
-    <string name="task_close_title">Task close animation</string>
-    <string name="task_move_to_front_title">Move to front animation</string>
-    <string name="task_move_to_back_title">Move to back animation</string>
-    <string name="wallpaper_open_title">Wallpaper open animation</string>
-    <string name="wallpaper_close_title">Wallpaper close animation</string>
-    <string name="wallpaper_intra_open_title">Wallpaper intra open animation</string>
-    <string name="wallpaper_intra_close_title">Wallpaper intra close animation</string>
-    <string name="animation_duration_title">Animation duration</string>
-    <string name="title_animation_no_override">Prevent app overrides</string>
-    <string name="summary_animation_no_override">Prevent apps from overriding transitions</string>
-    <string name="animation_duration_default">Default</string>
-	
-	<!-- Wake on charge -->
-    <string name="wake_when_plugged_or_unplugged_title">Wake up on charge</string>
-    <string name="wake_when_plugged_or_unplugged_summary">Wake up the device if charger is plugged/unplugged</string>
-	
-	<!-- Quick Settings -->
-    <string name="lockscreen_qs_disabled_title">Disable quick settings when locked</string>
-    <string name="lockscreen_qs_disabled_summary">Disable expanding quick settings on secure lock screens</string>
-	
-	<!-- Quick pull down-->
-    <string name="quick_pulldown_title">Quick pulldown</string>
-    <string name="quick_pulldown_summary">%1$s edge of the status bar pulls down Quick Settings</string>
-    <string name="quick_pulldown_summary_always">Always show Quick Settings on status bar pulldown</string>
-    <string name="quick_pulldown_off">Off</string>
-    <string name="quick_pulldown_left">Left</string>
-    <string name="quick_pulldown_right">Right</string>
-    <string name="quick_pulldown_always">Always</string>
-	
-	<!-- Headset ringtone audio focus -->
-    <string name="ringtone_focus_mode_title">When headset connected, incoming call plays on</string>
-    <string name="ringtone_focus_mode_dynamic">Headset only if music is active</string>
-    <string name="ringtone_focus_mode_stock">Both speaker and headset</string>
-
-    <!-- Force expanded notifications -->
-    <string name="force_expanded_notifications_title">Force expanded notifications</string>
-    <string name="force_expanded_notifications_summary">Force apps that support expanded notifications</string>
-	
-    <!-- Switch styles -->
-    <string name="switch_style_title">Switch appearance</string>
-    <string name="switch_default">Default</string>
-    <string name="switch_md2">Material Design 2</string>
-    <string name="switch_oneplus">OnePlus</string>
-    <string name="switch_narrow">Narrow</string>
-    <string name="switch_contained">Contained</string>
-    <string name="switch_retro">Retro</string>
-    <string name="switch_stockish">Stockish</string>
-    <string name="switch_telegram">Telegram</string>
-	
-	<!-- Gaming mode -->
-    <string name="gaming_mode_title">Gaming Mode</string>
-    <string name="gaming_mode_summary">Customize gaming mode preferences</string>
-    <string name="gaming_mode_app_picker_title">Automatically turn on for these apps</string>
-    <string name="add_gaming_mode_package_title">Add apps for Gaming mode</string>
-    <string name="add_gaming_mode_package_summary">Gaming mode will turn on automatically when these apps are opened and turn off when they are closed</string>
-    <string name="gaming_mode_headsup_title">Block notifications</string>
-    <string name="gaming_mode_headsup_summary">Block all headsup messages except calls</string>
-    <string name="gaming_mode_hardware_keys_title">Lock buttons</string>
-    <string name="gaming_mode_hardware_keys_summary">Disable hardware buttons when Gaming mode is turned on</string>
-    <string name="gaming_mode_brightness_title">Disable automatic brightness</string>
-    <string name="gaming_mode_brightness_summary">Lock screen brightness when Gaming mode is turned on</string>
-    <string name="gaming_mode_ringer_title">Ringer in gaming mode</string>
-    <string name="gaming_mode_ringer_off_title">Do not change</string>
-    <string name="gaming_mode_ringer_vibrate_title">Vibrate</string>
-    <string name="gaming_mode_ringer_dnd_title">Do Not Disturb</string>
-    <string name="gaming_mode_ringer_silent_title">Silent</string>
-    <string name="gaming_mode_notifications_title">Gaming mode indication</string>
-    <string name="gaming_mode_notifications_off_title">Disabled</string>
-    <string name="gaming_mode_notifications_notif_title">Show notification</string>
-    <string name="gaming_mode_notifications_toast_title">Show toasts</string>
-    <string name="gaming_mode_notifications_all_title">Show toasts and notification</string>
-    <string name="gaming_mode_dynamic_title">Dynamic mode</string>
-    <string name="gaming_mode_dynamic_summary">Try detecting and adding gaming apps automatically</string>
-
-    <!-- Heads up timeout -->
-    <string name="heads_up_time_out_title">Time out</string>
-    <string name="heads_up_time_out_summary">Peeking notifications will show for <xliff:g id="number">%d</xliff:g> seconds</string>
-    <string name="heads_up_time_out_2sec">2 seconds</string>
-    <string name="heads_up_time_out_4sec">4 seconds</string>
-    <string name="heads_up_time_out_5sec">5 seconds</string>
-    <string name="heads_up_time_out_6sec">6 seconds</string>
-    <string name="heads_up_time_out_8sec">8 seconds</string>
-    <string name="heads_up_time_out_10sec">10 seconds</string>
-
-    <!-- Heads up -->
-    <string name="heads_up_notifications">Heads Up</string>
-	<string name="notification_stat">Headsup</string>
-    <string name="heads_up_notifications_summary">Pop up statusbar notifications</string>
-    <string name="add_heads_up_package">Add app</string>
-    <string name="heads_up_stoplist_title">Stoplist</string>
-    <string name="add_heads_up_stoplist_summary">Disable heads up in these applications</string>
-    <string name="heads_up_blacklist_title">Blacklist</string>
-    <string name="add_heads_up_blacklist_summary">Disable heads up for these applications</string>
-	
-	<!-- Heads up snooze -->
-    <string name="heads_up_snooze_title">Snooze timer</string>
-    <string name="heads_up_snooze_summary_one_minute">Swiping up on peeking notifications will snooze heads up from that application for 1 minute</string>
-    <string name="heads_up_snooze_summary">Swiping up on peeking notifications will snooze heads up from that application for <xliff:g id="number">%d</xliff:g> minutes</string>
-    <string name="heads_up_snooze_disabled_summary">Snooze timer is disabled</string>
-    <string name="heads_up_snooze_1min">1 minute</string>
-    <string name="heads_up_snooze_5min">5 minutes</string>
-    <string name="heads_up_snooze_10min">10 minutes</string>
-    <string name="heads_up_snooze_15min">15 minutes</string>
-    <string name="heads_up_snooze_20min">20 minutes</string>
-
-    <!-- Heads up options -->
-    <string name="less_boring_heads_up_title">Less boring heads up</string>
-    <string name="less_boring_heads_up_summary">Show heads up only for dialer, messaging and alarm app</string>
-	
-	<!-- FOD icon picker -->
-    <string name="fod_title">FOD</string>
-    <string name="fod_icon_picker_title">FOD icon picker</string>
-    <string name="fod_icon_picker_summary">Choose your favorite fingerprint icon</string>
-    <string name="fod_icon_picker_footer">In order to add your own icon, select the top left icon and use the OnePlus 6T FP Customizer app to select the icon you want.</string>
-
-	<!-- Settings dashboard icon style -->
-    <string name="theming_settings_dashboard_icons_title">Settings dashboard icons</string>
-    <string name="theming_settings_dashboard_icons_default2">Default background</string>
-    <string name="theming_settings_dashboard_icons_default_accent2">Accent background</string>
-    <string name="theming_settings_dashboard_icons_plain">Plain</string>
-    <string name="theming_settings_dashboard_icons_plain_accent">Plain accent</string>
-    <string name="theming_settings_dashboard_icons_default_oneplus">OnePlus</string>
-    <string name="theming_settings_dashboard_icons_bg_random">Random Background</string>
-    <string name="theming_settings_dashboard_icons_random">Random Icon</string>
-    <string name="theming_settings_dashboard_icons_random_bg_accent">Icon Random Bg Accent</string>
-    <string name="theming_settings_dashboard_icons_accent_bg_random">Icon Accent Bg Random</string>
-	
-	<!-- Audio Panel view -->
-    <string name="audio_panel_view">Volume panel</string>
-    <string name="audio_panel_view_media_title">Media</string> 
-    <string name="audio_panel_view_ringer_title">Ring</string> 
-    <string name="audio_panel_view_notification_title">Notification</string> 
-    <string name="audio_panel_view_alarm_title">Alarm</string> 
-    <string name="audio_panel_view_voice_title">Voice</string>
-    <string name="audio_panel_view_bt_sco_title">Bluetooth</string>
-	
-	<!-- VoWiFi icon -->
-    <string name="vowifi_icon_title">VoWiFi icon</string>
-    <string name="vowifi_icon_enabled">VoWiFi icon enabled</string>
-    <string name="vowifi_icon_disabled">VoWiFi icon disabled</string>
-    <string name="vowifi_icon_enabled_volte_disabled">VoWiFi instead of VoLTE icon</string>
-	<string name="vowifi_icon_style_title">VoWiFi icon style</string>
-    <string name="vowifi_icon_default">Default Icon</string>
-    <string name="vowifi_icon_emui">EMUI Icon</string>
-    <string name="vowifi_icon_asus">Asus Icon</string>
-    <string name="vowifi_icon_oneplus">OOS Icon</string>
-    <string name="vowifi_icon_moto">Motorola Icon</string>
-	
-	<!-- QS Footer Text -->
-    <string name="qs_footer_text_title">QS footer text</string>
-    <string name="qs_footer_text_summary">Display text at bottom of QS panel</string>
-    <string name="qs_footer_text_string_title">Customize footer text</string>
-    <string name="qs_footer_text_string_summary">Set to empty for default #KeeptheLove</string> 
-	
-	<string name="brightness_slider_qs_unexpanded">MIUI style brightness slider (beta)</string>
-    <string name="brightness_slider_qs_unexpanded_summary">Shows brightness slider below qs panel</string>
-
-    <!-- Settings Dashboard conditions and suggestions -->
-    <string name="settings_show_conditions_title">Dashboard conditions</string>
-    <string name="settings_show_conditions_summary">Display condition cards in Settings screen</string>
-    <string name="settings_show_suggestions_title">Dashboard suggestions</string>
-    <string name="settings_show_suggestions_summary">Display suggestion cards in Settings screen</string>
-	
-	<!-- Volume Panel Plugin -->
-    <string name="volume_panel">Volume Panel Style</string>
-    <string name="volume_panel_aosp">AOSP</string>
-    <string name="volume_panel_compat">Compat</string>
-    <string name="volume_panel_oreo">Oreo</string>
-    <string name="volume_panel_tiled">Tiled</string>
-    <string name="volume_panel_default">Default</string>
-
-    <!-- Volume Panel Plugin Values -->
-    <string name="volume_panel_aosp_val">co.potatoproject.plugin.volume.aosp</string>
-    <string name="volume_panel_compat_val">co.potatoproject.plugin.volume.compact</string>
-    <string name="volume_panel_oreo_val">co.potatoproject.plugin.volume.oreo</string>
-    <string name="volume_panel_tiled_val">co.potatoproject.plugin.volume.tiled</string>
-    <string name="volume_panel_default_val">com.android.systemui.volume</string>
 	
     <!-- Power menu Animations  -->
     <string name="power_menu_animation">Power menu</string>
-    <string name="power_menu_animation_title">Power menu animation</string>
-    <string name="power_menu_animation_summary">Change the enter/exit animation of the power menu</string>
-    <string name="power_menu_animation_dialog_title">Select power menu animation</string>
-    <string name="power_menu_animation_aosp">AOSP (default)</string>
-    <string name="power_menu_animation_bottom">Bottom</string>
-    <string name="power_menu_animation_top">Top</string>
-    <string name="power_menu_animation_xylon">Fly</string>
-    <string name="power_menu_animation_slide">Slide</string>
-    <string name="power_menu_animation_turn">Turn</string>
-    <string name="power_menu_animation_fly">Glow</string>
-    <string name="power_menu_animation_card">3D</string>
-    <string name="power_menu_animation_translucent_top">Translucent (top)</string>
-    <string name="power_menu_animation_translucent_bottom">Translucent (bottom)</string>
-    <string name="power_menu_animation_rotate">Rotate</string>
 	
 	<!-- QS header image -->
-    <string name="status_bar_custom_header_title">Header image</string>
-    <string name="status_bar_custom_header_summary">Use a custom image for QS header</string>
-    <string name="daylight_header_provider" translatable="false">daylight</string>
-    <string name="file_header_provider" translatable="false">file</string>
-    <string name="custom_header_provider_title">Image type</string>
-    <string name="daylight_header_provider_title">Automatic (Time based)</string>
-    <string name="file_header_provider_title">Static</string>
-    <string name="daylight_header_pack_title">Image collection</string>
-    <string name="header_provider_disabled">Disabled</string>
-    <string name="custom_header_pick_title">Pick image from collection</string>
-    <string name="custom_header_pick_summary">Select an image from pre-installed image collections</string>
-    <string name="file_header_select_title">Pick image from storage</string>
-    <string name="file_header_select_summary">Select an image from internal storage</string>
-    <string name="status_bar_custom_header_shadow_title">Darken image</string>
-    <string name="status_bar_custom_header_height_title">Image height offset</string>
-
-    <!-- Ambient edge lighting -->
-    <string name="notification_screen_title">Screen</string>
-    <string name="pulse_ambient_light_title">Edge lighting</string>
-    <string name="pulse_ambient_light_summary">Light up the side edges of the screen on notification pulse</string>
-    <string name="pulse_ambient_light_color_title">Edge light color</string>
-    <string name="pulse_ambient_light_auto_color_title">Automatic color</string>
-    <string name="pulse_ambient_light_auto_color_summary">Sync color with wallpaper</string>
-    <string name="pulse_ambient_light_duration">Edge light pulse duration</string>
-    <string name="edgelight_left">Left Edge</string>
-    <string name="edgelight_right">Right Edge</string>
-    <string name="ambient_notification_light_enabled_title">Show on AoD</string>
-    <string name="ambient_notification_light_enabled_sumary">Keep showing on always on display. Until the screen is turned on</string>
-    <string name="ambient_notification_light_hide_aod_title">Hide AoD content</string>
-    <string name="ambient_notification_light_hide_aod_sumary">Hide other AoD content when bars are showing</string>
-    <string name="pulse_ambient_light_pulse_for_all_title">Pulse for all doze events</string>
-    <string name="pulse_ambient_light_pulse_for_all_summary">Pulses for any doze wake and not just notifications when enabled</string>
-    <string name="ambient_notification_light_accent_title">Accent color</string>
-    <string name="ambient_notification_light_accent_summary">Sync color with accent color</string>
-    <string name="pulse_ambient_light_pulse_for_all_repeat_title">Repeat edge lighting</string>
-    <string name="pulse_ambient_light_pulse_for_all_repeat_summary">Repeat edge lighting animation on doze wake</string>
-    <string name="pulse_ambient_light_repeat_mode_title">Edge Light Animation</string>
-    <string name="pulse_ambient_light_anim_restart">Restart</string>
-    <string name="pulse_ambient_light_anim_reverse">Reverse</string>
-    <string name="pulse_ambient_light_layout_title">Edge Light View</string>
-    <string name="pulse_ambient_light_layout_solid">Solid</string>
-    <string name="pulse_ambient_light_layout_faded">Faded</string>
-
-    <!-- QS Header Data Usage -->
-    <string name="qs_datausage_title">Data Usage in QS Header</string>
-    <string name="qs_datausage_disabled">Disabled</string>
-    <string name="qs_datausage_daily">Daily usage</string>
-    <string name="qs_datausage_monthly">Monthly usage</string>
-
-    <!-- QS header styles -->
-    <string name="qs_header_style_title">QS Header style</string>
-    <string name="qs_header_black">Black</string>
-    <string name="qs_header_grey">Grey</string>
-    <string name="qs_header_lightgrey">Light Grey</string>
-    <string name="qs_header_accent">Accent Based</string>
-    <string name="qs_header_transparent">Transparent</string>
-
-    <!-- Brightness control -->
-    <string name="status_bar_toggle_brightness">Brightness control</string> 
-    <string name="status_bar_toggle_brightness_summary">Adjust brightness by sliding across the status bar</string>
-
-    <!-- Charger Connected Animation -->
-    <string name="charging_animation_title">Charging animation</string>
-    <string name="charging_animation_summary">Display an animation when the device is plugged in</string>
-
-    <!-- Fingerprint unlock keystore -->
-    <string name="fp_unlock_keystore_title">Fingerprint unlock</string>  
-    <string name="fp_unlock_keystore_summary">Unlock device with fingerprint after reboot without PIN/Password/Pattern\nNote: at your own risk!</string> 
 
     <!-- Lockscreen -->
     <string name="lockscreen_category">Lockscreen</string>
-    <string name="lockscreen_tuner_title">Lockscreen bottom shortcuts</string>
-    <string name="lockscreen_tuner_summary">Customize bottom left and right shortcuts</string>
-
-    <!-- Pulse -->
-    <string name="pulse_help_policy_notice_summary">Pulse does not work with some audio sources when listening on device speaker</string>
-    <string name="pulse_settings">Pulse</string>
-    <string name="pulse_settings_summary">Navigation bar audio graphic equalizer</string>
-    <string name="show_pulse_title">Show Pulse</string>
-    <string name="show_pulse_summary">Audio graphic equalizer on the navigation bar</string>
-    <string name="pulse_render_mode_title">Render mode</string>
-    <string name="pulse_render_mode_fading_bars">Fading blocks</string>
-    <string name="pulse_render_mode_solid_lines">Solid lines</string>
-    <string name="pulse_color">Color</string>
-    <string name="pulse_color_mode">Color mode</string>
-    <string name="pulse_color_accent">Accent</string>
-    <string name="pulse_color_custom">Custom</string>
-    <string name="pulse_color_lava_lamp">Lava lamp</string>
-    <string name="pulse_color_auto">Album art</string>
-    <string name="pulse_color_chooser">Choose color</string>
-    <string name="smoothing_enabled_title">Turn on smoothing</string>
-    <string name="smoothing_enabled_summary">Each bar is animated more smoothly</string>
-    <string name="show_navbar_pulse_title">Navbar Pulse</string>
-    <string name="show_navbar_pulse_summary">Audio graphic equalizer on the navigation bar area, also if bar is hidden</string>
-    <string name="show_lockscreen_pulse_title">Lockscreen Pulse</string>
-    <string name="show_lockscreen_pulse_summary">Audio graphic equalizer on the lockscreen</string>
-    <string name="show_ambient_pulse_title">Ambient Pulse</string>
-    <string name="show_ambient_pulse_summary">Audio graphic equalizer on the ambient screen</string>
-    <string name="pulse_advanced_category">Advanced</string>
-    <string name="pulse_legacy_mode_advanced_category">Fading blocks mode settings</string>
-    <string name="pulse_custom_fudge_factor">Sanity level</string>
-    <string name="lavamp_speed_title">Lava lamp speed</string>
-    <string name="pulse_solid_units_count">Solid lines count</string>
-    <string name="pulse_solid_lines_count">Solid lines count</string>
-    <string name="pulse_solid_units_opacity">Solid lines opacity</string>
-    <string name="pulse_solid_dimen_category">Solid lines mode settings</string>
-    <string name="pulse_custom_dimen">Bar width</string>
-    <string name="pulse_custom_div">Bar spacing</string>
-    <string name="pulse_filled_block_size">Block size</string>
-    <string name="pulse_empty_block_size">Block spacing</string>
-	
-	 <!-- does the device have multi color led support or only
-         a fixed set of led colors -->
-    <bool name="config_has_multi_color_led">true</bool>
-
-   <!-- Center R Notification headers -->
-    <string name="center_notification_headers_title">Center notification headers</string>
-    <string name="center_notification_headers_summary">Whether to Center R style notification headers (Requires a SystemUI restart)</string>
-
-    <!-- Blink flashlight for incoming calls -->
-	<string name="flashlight_category">Flashlight</string>
-    <string name="flashlight_on_call_title">Blink Flashlight for incoming call</string>
-    <string name="flashlight_on_call_disabled">Disabled</string>
-    <string name="flashlight_on_call_ringer">When ringing</string>
-    <string name="flashlight_on_call_no_ringer">When ringer is silent</string>
-    <string name="flashlight_on_call_silent">When entirely silent (no ringer or vibrator)</string>
-    <string name="flashlight_on_call_always">Always</string>
-	<string name="flashlight_on_call_ignore_dnd_title">Ignore DND</string>
-    <string name="flashlight_on_call_ignore_dnd_summary">Whether to flash when in Do Not Disturb mode</string>
-    <string name="flashlight_on_call_rate_title">Rate</string>
-    <string name="flashlight_on_call_rate_summary">Flashlight on call blink rate</string>
-	
-	<!-- Battery bar -->
-	<string name="enable_first">Please enable first</string>
-	<string name="battery_bar_title">Battery bar</string>
-    <string name="sb_battery_bar_title">Battery bar</string>
-    <string name="sb_battery_bar_summary">Display and customize battery bar near status bar or navigation bar</string>
-    <string name="sb_battery_bar_location">Battery bar location</string>
-    <string name="sb_battery_bar_color">Battery bar color</string>
-    <string name="sb_battery_bar_style_title">Battery bar style</string>
-    <string name="sb_battery_bar_thickness_title">Battery bar thickness</string>
-    <string name="sb_battery_bar_animate_title">Charging animation</string>
-    <string name="sb_battery_bar_animate_summary">The charging animation may result in a poor user experience. Enable at your own discretion.</string>
-    <string name="sb_battery_bar_hide">Hide</string>
-    <string name="sb_battery_bar_statusbar">Statusbar</string>
-    <string name="sb_battery_bar_topnav">Top of navbar</string>
-    <string name="sb_battery_bar_bottomnav">Bottom of navbar</string>
-    <string name="sb_battery_bar_reg">Regular</string>
-    <string name="sb_battery_bar_center">Center-mirrored</string>
-    <string name="sb_battery_bar_charging_color">Battery bar charging color</string>
-    <string name="sb_battery_bar_battery_low_color">Battery bar low battery color</string>
-    <string name="sb_battery_bar_reversed">Reversed</string>
-    <string name="sb_battery_bar_use_gradient_color">Use gradient color</string>
-    <string name="sb_battery_bar_gradient_color_summary">Use gradient color as a scale for the battery level</string>
-    <string name="sb_battery_bar_high_color">High level color"</string>
-    <string name="sb_battery_bar_low_color">Low level color"</string>
-	
-	<!-- Brightness Slider style -->
-    <string name="brightness_slider_style_title">Brightness slider style</string>
-    <string name="brightness_slider_style_default">Default</string>
-    <string name="brightness_slider_style_daniel">Daniel</string>
-    <string name="brightness_slider_style_mememini">Meme mini</string>
-    <string name="brightness_slider_style_memeround">Meme round</string>
-    <string name="brightness_slider_style_memeroundstroke">Meme round stroke</string>
-    <string name="brightness_slider_style_memestroke">Meme stroke</string>
-
-	<!-- GUI styles -->
-    <string name="ui_style_title">UI Style</string>
-    <string name="ui_style_default">Default</string>
-    <string name="ui_style_no_corner_radius">No Corner Radius</string>
-    <string name="ui_style_rectangle">Rectangle</string>
-    <string name="ui_style_round_large">Round Large</string>
-    <string name="ui_style_round_medium">Round Medium</string>
-
-    <!-- Navbar styles -->
-    <string name="navbar_style_title">Navbar style</string>
-    <string name="navbar_default">Default</string>
-    <string name="navbar_asus">ASUS</string>
-    <string name="navbar_oneplus">OnePlus</string>
-    <string name="navbar_oneui">One UI</string>
-    <string name="navbar_tecno">Tecno Camon</string>
 </resources>
diff --git a/res/xml/audio_panel.xml b/res/xml/audio_panel.xml
deleted file mode 100644
index 8fe2edf..0000000
--- a/res/xml/audio_panel.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2018 gzosp
-  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.
-  -->
-
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:key="button_settings"
-    android:title="@string/audio_panel_view">
-
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="audio_panel_view_media"
-        android:icon="@drawable/ic_music"
-        android:title="@string/audio_panel_view_media_title"
-        android:defaultValue="true"
-        android:enabled="false"/>
-
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="audio_panel_view_ringer"
-        android:icon="@drawable/ic_ring"
-        android:title="@string/audio_panel_view_ringer_title"
-        android:defaultValue="false"/>
-
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="audio_panel_view_notification"
-        android:icon="@drawable/ic_notification"
-        android:title="@string/audio_panel_view_notification_title"
-        android:defaultValue="false"/>
-
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="audio_panel_view_alarm"
-        android:icon="@drawable/ic_alarm"
-        android:title="@string/audio_panel_view_alarm_title"
-        android:defaultValue="false"/>
-
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="audio_panel_view_voice"
-        android:icon="@drawable/ic_voice"
-        android:title="@string/audio_panel_view_voice_title"
-        android:defaultValue="false"/>
-
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="audio_panel_view_bt_sco"
-        android:icon="@drawable/ic_bluetooth"
-        android:title="@string/audio_panel_view_bt_sco_title"
-        android:defaultValue="false"/>
-</PreferenceScreen>
diff --git a/res/xml/battery_bar.xml b/res/xml/battery_bar.xml
deleted file mode 100644
index e879552..0000000
--- a/res/xml/battery_bar.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2018 AospExtended ROM 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.
--->
-<PreferenceScreen
-    android:title="@string/battery_bar_title"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-
-        <ListPreference
-            android:key="battery_bar_list"
-            android:title="@string/sb_battery_bar_location"
-            android:entries="@array/battery_bar_entries"
-            android:entryValues="@array/battery_bar_values" />
-
-        <ListPreference
-            android:key="battery_bar_style"
-            android:title="@string/sb_battery_bar_style_title"
-            android:entries="@array/battery_bar_style_entries"
-            android:entryValues="@array/battery_bar_style_values" />
-
-        <com.cherish.settings.preferences.CustomSeekBarPreference
-            android:key="battery_bar_thickness"
-            android:title="@string/sb_battery_bar_thickness_title"
-            android:max="4"
-            settings:min="1"
-            settings:units="dp"
-            android:persistent="false" />
-
-        <SwitchPreference
-            android:key="battery_bar_animate"
-            android:title="@string/sb_battery_bar_animate_title"
-            android:summary="@string/sb_battery_bar_animate_summary" />
-
-        <net.margaritov.preference.colorpicker.ColorPickerPreference
-            android:key="battery_bar_color"
-            android:title="@string/sb_battery_bar_color"
-            android:defaultValue="0xffffff" />
-
-        <net.margaritov.preference.colorpicker.ColorPickerPreference
-            android:key="battery_bar_charging_color"
-            android:title="@string/sb_battery_bar_charging_color"
-            android:defaultValue="0xff00ff00" />
-
-        <net.margaritov.preference.colorpicker.ColorPickerPreference
-            android:key="battery_bar_battery_low_color_warning"
-            android:title="@string/sb_battery_bar_battery_low_color"
-            android:defaultValue="0xffff6600" />
-
-        <SwitchPreference
-            android:key="battery_bar_use_gradient_color"
-            android:title="@string/sb_battery_bar_use_gradient_color"
-            android:summary="@string/sb_battery_bar_gradient_color_summary" />
-
-        <net.margaritov.preference.colorpicker.ColorPickerPreference
-            android:key="battery_bar_low_color"
-            android:title="@string/sb_battery_bar_low_color"
-            android:dependency="battery_bar_use_gradient_color"
-            android:defaultValue="0xffff4400" />
-
-        <net.margaritov.preference.colorpicker.ColorPickerPreference
-            android:key="battery_bar_high_color"
-            android:title="@string/sb_battery_bar_high_color"
-            android:dependency="battery_bar_use_gradient_color"
-            android:defaultValue="0xff99cc00" />
-
-</PreferenceScreen>
diff --git a/res/xml/battery_light_settings.xml b/res/xml/battery_light_settings.xml
index a8c5b9e..43c706c 100644
--- a/res/xml/battery_light_settings.xml
+++ b/res/xml/battery_light_settings.xml
@@ -17,54 +17,4 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="battery_light_enabled"
-        android:icon="@drawable/ic_battery_full"
-        android:title="@string/battery_light_enable"
-        android:defaultValue="true" />
-
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="battery_light_allow_on_dnd"
-        android:icon="@drawable/ic_dnd"
-        android:title="@string/battery_light_allow_on_dnd_title"
-        android:defaultValue="false" />
-
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="battery_light_low_blinking"
-        android:icon="@drawable/ic_blinking"
-        android:title="@string/battery_light_low_blinking_title"
-        android:defaultValue="false" />
-
-    <PreferenceCategory
-        android:key="battery_light_cat"
-        android:title="@string/battery_light_cat">
-        <net.margaritov.preference.colorpicker.ColorPickerPreference
-            android:key="battery_light_low_color"
-            android:icon="@drawable/ic_battery_low"
-            android:title="@string/battery_light_low_color"
-            ledPreview="true"
-            settings:defaultColorValue="0xFFFF0000" />
-
-        <net.margaritov.preference.colorpicker.ColorPickerPreference
-            android:key="battery_light_medium_color"
-            android:icon="@drawable/ic_battery_medium"
-            android:title="@string/battery_light_medium_color"
-            ledPreview="true"
-            settings:defaultColorValue="0xFFFFFF00" />
-
-        <net.margaritov.preference.colorpicker.ColorPickerPreference
-            android:key="battery_light_full_color"
-            android:icon="@drawable/ic_battery_almostfull"
-            android:title="@string/battery_light_full_color"
-            ledPreview="true"
-            settings:defaultColorValue="0xFFFFFF00" />
-
-        <net.margaritov.preference.colorpicker.ColorPickerPreference
-            android:key="battery_light_reallyfull_color"
-            android:icon="@drawable/ic_battery_full"
-            android:title="@string/battery_light_reallyfull_color"
-            ledPreview="true"
-            settings:defaultColorValue="0xFF00FF00" />
-    </PreferenceCategory>
-
 </PreferenceScreen>
diff --git a/res/xml/cherish_settings.xml b/res/xml/cherish_settings.xml
index 044c63d..fc65045 100644
--- a/res/xml/cherish_settings.xml
+++ b/res/xml/cherish_settings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 Nitrogen Project
+<!-- Copyright (C) 2020 CherishOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@
             android:title="@string/button_title"
 	    android:summary="@string/button_summary"
             android:icon="@drawable/ic_cherish_button_settings_background"
-            android:fragment="com.android.settings.custom.buttons.ButtonSettings"/>
+            android:fragment="com.cherish.settings.fragments.ButtonSettings"/>
 			
 		<!-- Animations -->
 		<Preference
diff --git a/res/xml/cherish_settings_animations.xml b/res/xml/cherish_settings_animations.xml
index b6a0611..b8501c6 100644
--- a/res/xml/cherish_settings_animations.xml
+++ b/res/xml/cherish_settings_animations.xml
@@ -19,89 +19,4 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:title="@string/animations_title"
     xmlns:settings="http://schemas.android.com/apk/res/com.android.settings" >
-	
-	<PreferenceCategory
-        android:title="@string/system_animation_title">
-
-        <com.cherish.settings.preferences.CustomSeekBarPreference
-            android:key="animation_controls_duration"
-            android:title="@string/animation_duration_title"
-            android:max="400"
-            settings:min="0"
-            settings:interval="10"
-            android:defaultValue="0"
-            android:persistent="false" />
-
-        <ListPreference
-            android:key="activity_open"
-            android:icon="@drawable/ic_qs_animation"
-            android:title="@string/activity_open_title" />
-
-        <ListPreference
-            android:key="activity_close"
-	    android:icon="@drawable/ic_qs_animation"
-            android:title="@string/activity_close_title" />
-
-        <ListPreference
-            android:key="task_open"
-	    android:icon="@drawable/ic_qs_animation"
-            android:title="@string/task_open_title" />
-
-        <ListPreference
-            android:key="task_open_behind"
-            android:icon="@drawable/ic_qs_animation"
-            android:title="@string/task_open_behind_title" />
-
-        <ListPreference
-            android:key="task_close"
-            android:icon="@drawable/ic_qs_animation"
-            android:title="@string/task_close_title" />
-
-        <ListPreference
-            android:key="task_move_to_front"
-            android:icon="@drawable/ic_qs_animation"
-            android:title="@string/task_move_to_front_title" />
-
-        <ListPreference
-            android:key="task_move_to_back"
-            android:icon="@drawable/ic_qs_animation"
-            android:title="@string/task_move_to_back_title" />
-
-        <ListPreference
-            android:key="wallpaper_open"
-            android:icon="@drawable/ic_qs_animation"
-            android:title="@string/wallpaper_open_title" />
-
-        <ListPreference
-            android:key="wallpaper_close"
-            android:icon="@drawable/ic_qs_animation"
-            android:title="@string/wallpaper_close_title" />
-
-        <ListPreference
-            android:key="wallpaper_intra_open"
-            android:icon="@drawable/ic_qs_animation"
-            android:title="@string/wallpaper_intra_open_title" />
-
-        <ListPreference
-            android:key="wallpaper_intra_close"
-            android:icon="@drawable/ic_qs_animation"
-            android:title="@string/wallpaper_intra_close_title" />
-
-    </PreferenceCategory>
-	
-	<PreferenceCategory
-        android:title="@string/power_menu_animation">
-	
-	<ListPreference
-        android:key="power_menu_animations"
-        android:icon="@drawable/ic_power"
-        android:title="@string/power_menu_animation_title"
-        android:dialogTitle="@string/power_menu_animation_dialog_title"
-        android:entries="@array/power_menu_animations_entries"
-        android:entryValues="@array/power_menu_animations_values"
-        android:summary="@string/power_menu_animation_summary"
-        android:persistent="false" />
-		
-	</PreferenceCategory>
-
 </PreferenceScreen>
diff --git a/res/xml/cherish_settings_button.xml b/res/xml/cherish_settings_button.xml
index 9fc99bd..191beb9 100644
--- a/res/xml/cherish_settings_button.xml
+++ b/res/xml/cherish_settings_button.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 cherish Project
+<!-- Copyright (C) 2020 CherishOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -18,12 +18,6 @@
         android:title="@string/button_title"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 
-     <PreferenceScreen
-            android:key="button_settings"
-            android:title="@string/button_pref_title"
-            android:icon="@drawable/ic_button_settings"
-            android:fragment="com.android.settings.custom.buttons.ButtonSettings"/>
-
     <PreferenceScreen
         android:key="volume_key"
         android:fragment="com.cherish.settings.fragments.VolumeRockerSettings"
diff --git a/res/xml/cherish_settings_clock.xml b/res/xml/cherish_settings_clock.xml
deleted file mode 100644
index 1e63ad7..0000000
--- a/res/xml/cherish_settings_clock.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017-2018 The Dirty Unicorns 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.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-            xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-            android:title="@string/status_bar_clock_title" >
-
-    <PreferenceCategory
-        android:key="clock_category"
-        android:title="@string/clock_category_title">
-
-        <com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="status_bar_clock_auto_hide"
-            android:icon="@drawable/ic_clock"
-            android:title="@string/status_bar_clock_auto_hide_title"
-            android:summary="@string/status_bar_clock_auto_hide_summary"
-            android:defaultValue="false" />
-
-        <com.cherish.settings.preferences.SystemSettingSeekBarPreference
-            android:key="status_bar_clock_auto_hide_hduration"
-            android:title="@string/status_bar_clock_auto_hide_hdur_title"
-            android:max="300"
-            settings:min="5"
-            settings:interval="5"
-            settings:units="sec"
-            android:dependency="status_bar_clock_auto_hide"
-            android:defaultValue="60" />
-
-        <com.cherish.settings.preferences.SystemSettingSeekBarPreference
-            android:key="status_bar_clock_auto_hide_sduration"
-            android:title="@string/status_bar_clock_auto_hide_sdur_title"
-            android:max="300"
-            settings:min="5"
-            settings:interval="5"
-            settings:units="sec"
-            android:dependency="status_bar_clock_auto_hide"
-            android:defaultValue="5" />
-
-        <ListPreference
-            android:key="statusbar_clock_style"
-            android:title="@string/status_bar_clock_style_title"
-            android:entries="@array/status_bar_clock_style_entries"
-            android:entryValues="@array/status_bar_clock_style_values" />
-
-        <ListPreference
-            android:key="status_bar_am_pm"
-            android:icon="@drawable/ic_24h"
-            android:title="@string/status_bar_am_pm_title"
-            android:entries="@array/status_bar_am_pm_entries"
-            android:entryValues="@array/status_bar_am_pm_values" />
-
-        <com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="status_bar_clock_seconds"
-            android:icon="@drawable/ic_seconds"
-            android:title="@string/clock_seconds_display"
-            android:summary="@string/clock_seconds_display_summary"
-            android:defaultValue="false" />
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:key="date_category"
-        android:title="@string/date_category_title">
-
-        <ListPreference
-            android:key="clock_date_display"
-            android:icon="@drawable/ic_calendar"
-            android:title="@string/clock_date_display"
-            android:entries="@array/clock_date_display_entries"
-            android:entryValues="@array/clock_date_display_values" />
-
-        <ListPreference
-            android:key="statusbar_clock_date_position"
-            android:title="@string/clock_date_position"
-            android:icon="@drawable/ic_qs"
-            android:entries="@array/clock_date_position_entries"
-            android:entryValues="@array/clock_date_position_values"
-            android:dependency="clock_date_display" />
-
-        <ListPreference
-            android:key="clock_date_style"
-            android:icon="@drawable/ic_font"
-            android:title="@string/clock_date_style"
-            android:entries="@array/clock_date_style_entries"
-            android:entryValues="@array/clock_date_style_values"
-            android:dependency="clock_date_display" />
-
-        <ListPreference
-            android:key="clock_date_format"
-            android:icon="@drawable/ic_qs"
-            android:title="@string/clock_date_format"
-            android:summary="@string/clock_date_format_summary"
-            android:entries="@array/clock_date_format_entries_values"
-            android:entryValues="@array/clock_date_format_entries_values"
-            android:dependency="clock_date_display" />
-    </PreferenceCategory>
-</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/cherish_settings_fod_picker.xml b/res/xml/cherish_settings_fod_picker.xml
deleted file mode 100644
index e648745..0000000
--- a/res/xml/cherish_settings_fod_picker.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2020 CherishOS 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.
--->
-
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-    android:title="@string/fod_icon_picker_title">
-
-    <!-- Preview -->
-    <com.cherish.settings.preferences.FODIconPicker
-        android:key="fod_icon"
-        android:layout="@layout/fod_picker_preference"
-        android:selectable="false"/>
-
-</PreferenceScreen>
diff --git a/res/xml/cherish_settings_gaming_mode.xml b/res/xml/cherish_settings_gaming_mode.xml
deleted file mode 100644
index cab2a8d..0000000
--- a/res/xml/cherish_settings_gaming_mode.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2016-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.
--->
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-    android:title="@string/gaming_mode_title">
-
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="gaming_mode_headsup_toggle"
-        android:title="@string/gaming_mode_headsup_title"
-        android:summary="@string/gaming_mode_headsup_summary"
-        android:defaultValue="true" />
-
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="gaming_mode_hw_keys_toggle"
-        android:title="@string/gaming_mode_hardware_keys_title"
-        android:summary="@string/gaming_mode_hardware_keys_summary"
-        android:defaultValue="false" />
-
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="gaming_mode_manual_brightness_toggle"
-        android:title="@string/gaming_mode_brightness_title"
-        android:summary="@string/gaming_mode_brightness_summary"
-        android:defaultValue="true" />
-
-    <com.cherish.settings.preferences.SystemSettingListPreference
-        android:key="gaming_mode_ringer_mode"
-        android:title="@string/gaming_mode_ringer_title"
-        android:entries="@array/gaming_mode_ringer_entries"
-        android:entryValues="@array/gaming_mode_ringer_values"
-        android:defaultValue="0"
-        android:summary="%s" />
-
-    <com.cherish.settings.preferences.SystemSettingListPreference
-        android:key="gaming_mode_notifications"
-        android:title="@string/gaming_mode_notifications_title"
-        android:entries="@array/gaming_mode_notifications_entries"
-        android:entryValues="@array/gaming_mode_notifications_values"
-        android:defaultValue="3"
-        android:summary="%s" />
-
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="gaming_mode_dynamic_state"
-        android:title="@string/gaming_mode_dynamic_title"
-        android:summary="@string/gaming_mode_dynamic_summary"
-        android:defaultValue="false" />
-
-    <PreferenceCategory
-        android:title="@string/gaming_mode_app_picker_title"
-        android:key="gamingmode_applications">
-
-        <Preference
-            android:key="add_gamingmode_packages"
-            android:icon="@drawable/ic_menu_add_white"
-            android:title="@string/add_gaming_mode_package_title" />
-
-    </PreferenceCategory>
-
-</PreferenceScreen>
diff --git a/res/xml/cherish_settings_lockscreen.xml b/res/xml/cherish_settings_lockscreen.xml
index 4cdae8d..9a523c2 100644
--- a/res/xml/cherish_settings_lockscreen.xml
+++ b/res/xml/cherish_settings_lockscreen.xml
@@ -23,108 +23,12 @@
         android:key="lockscreen_category"
         android:title="@string/lockscreen_category">
 
-        <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="lockscreen_battery_info"
-        android:icon="@drawable/ic_batteryenergy"
-        android:title="@string/lockscreen_battery_info_title"
-        android:summary="@string/lockscreen_battery_info_summary"
-        android:defaultValue="true" />
-		
-	<com.cherish.settings.preferences.SystemSettingListPreference
-        android:key="lockscreen_charging_animation_style"
-	android:icon="@drawable/ic_charging"
-        android:dialogTitle="@string/lockscreen_charging_animation_title"
-        android:title="@string/lockscreen_charging_animation_title"
-        android:entries="@array/lockscreen_charging_animation_entries"
-        android:entryValues="@array/lockscreen_charging_animation_values"
-        android:summary="%s"
-        android:defaultValue="1" />
-
-        <Preference
-            android:title="@string/lockscreen_tuner_title"
-            android:icon="@drawable/ic_shortcut"
-            android:summary="@string/lockscreen_tuner_summary" >
-            <intent android:action="android.intent.action.MAIN"
-                android:targetPackage="com.android.systemui"
-                android:targetClass="com.android.systemui.tuner.LockscreenActivity" />
-        </Preference>
-
-
     </PreferenceCategory>
 
-
-   <!-- Lockscreen Clock -->
-    <PreferenceCategory
-        android:key="lockscreen_clock"
-        android:title="@string/lockscreen_clock_title">
-   
-   <com.cherish.settings.preferences.SecureSettingListPreference
-        android:key="lockscreen_clock_selection"
-        android:icon="@drawable/ic_lockscreen_clock_selection"
-        android:title="@string/lockscreen_clock_title"
-        android:dialogTitle="@string/lockscreen_clock_dialog_title"
-        android:entries="@array/lockscreen_clock_titles"
-        android:entryValues="@array/lockscreen_clock_values"
-        android:defaultValue="2" />
-
-   </PreferenceCategory>
-
-   <!-- Lockscreen Date Styles-->
-    <PreferenceCategory
-        android:key="lockscreen_date"
-        android:title="@string/lockscreen_date_title">
-
-   <com.cherish.settings.preferences.SecureSettingListPreference
-        android:key="lockscreen_date_selection"
-        android:icon="@drawable/ic_calendar"
-        android:title="@string/lockscreen_date_selection_title"
-        android:dialogTitle="@string/lockscreen_date_dialog_title"
-        android:entries="@array/lockscreen_date_selection_entries"
-        android:entryValues="@array/lockscreen_date_selection_values"
-        android:defaultValue="0" />
-   </PreferenceCategory>
-
   <!-- Lockscreen Visualizer-->
     <PreferenceCategory
         android:key="visualizer"
         android:title="@string/visualizer_title">
 
-   <com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="lockscreen_media_metadata"
-            android:title="@string/lockscreen_media_art_title"
-            android:icon="@drawable/ic_media"
-            android:defaultValue="true" />
-
-   <Preference
-            android:key="pulse"
-            android:title="@string/pulse_settings"
-            android:icon="@drawable/ic_visualizer"
-            android:summary="@string/pulse_settings_summary"
-            android:fragment="com.cherish.settings.fragments.PulseSettings" />
-
-   <com.cherish.settings.preferences.SystemSettingSeekBarPreference
-            android:key="lockscreen_media_blur"
-            android:title="@string/lockscreen_media_blur_title"
-            android:dependency="lockscreen_media_metadata"
-            android:max="100"
-            settings:min="5"
-            settings:units="%"
-            settings:interval="5"
-            android:defaultValue="100"/>
   </PreferenceCategory>
-
-    <SwitchPreference
-        android:key="fingerprint_success_vib"
-        android:icon="@drawable/ic_fingerprint"
-        android:title="@string/fprint_sucess_vib_title"
-        android:summary="@string/fprint_sucess_vib_summary"
-        android:persistent="false" />
-
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="fp_unlock_keystore"
-        android:icon="@drawable/ic_unlock"
-        android:title="@string/fp_unlock_keystore_title"
-        android:summary="@string/fp_unlock_keystore_summary"
-        android:defaultValue="false" />
-
 </PreferenceScreen>
diff --git a/res/xml/cherish_settings_misc.xml b/res/xml/cherish_settings_misc.xml
index 7a7f36d..0f2bfd2 100644
--- a/res/xml/cherish_settings_misc.xml
+++ b/res/xml/cherish_settings_misc.xml
@@ -18,76 +18,4 @@
 	android:title="@string/misc_title"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 
-        <com.cherish.settings.preferences.SystemSettingMasterSwitchPreference
-        android:key="gaming_mode_enabled"
-        android:icon="@drawable/ic_gaming_mode"
-        android:fragment="com.cherish.settings.fragments.GamingMode"
-        android:title="@string/gaming_mode_title"
-        android:summary="@string/gaming_mode_summary"
-        android:defaultValue="false" />
-
-     <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="settings_show_conditions"
-        android:icon="@drawable/ic_dashboard"
-        android:title="@string/settings_show_conditions_title"
-        android:summary="@string/settings_show_conditions_summary"
-        android:defaultValue="true" />
-
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="settings_show_suggestions"
-        android:icon="@drawable/ic_dashboard"
-        android:title="@string/settings_show_suggestions_title"
-        android:summary="@string/settings_show_suggestions_summary"
-        android:defaultValue="true" />
-
-        <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="wake_when_plugged_or_unplugged"
-        android:icon="@drawable/ic_plug"
-        android:title="@string/wake_when_plugged_or_unplugged_title"
-        android:summary="@string/wake_when_plugged_or_unplugged_summary"
-        android:defaultValue="@*android:bool/config_unplugTurnsOnScreen" />
-
-        <PreferenceCategory
-        android:key="media"
-        android:title="@string/media_title">
-		
-	<com.cherish.settings.preferences.GlobalSettingListPreference
-        android:icon="@drawable/ic_ring"
-        android:key="ringtone_focus_mode"
-        android:title="@string/ringtone_focus_mode_title"
-        android:entries="@array/ringtone_focus_mode_entries"
-        android:entryValues="@array/ringtone_focus_mode_values"
-        android:defaultValue="1" />
-
-        <com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="adaptive_playback_enabled"
-            android:icon="@drawable/ic_headset"
-            android:title="@string/adaptive_playback_title"
-            android:summary="@string/adaptive_playback_summary"
-            android:defaultValue="false" />
-
-        <com.cherish.settings.preferences.SystemSettingListPreference
-            android:key="adaptive_playback_timeout"
-            android:icon="@drawable/ic_play"
-            android:title="@string/adaptive_playback_timeout_title"
-            android:entries="@array/adaptive_playback_timeout_entries"
-            android:entryValues="@array/adaptive_playback_timeout_values"
-            android:defaultValue="30000"
-            android:dependency="adaptive_playback_enabled" />
-    </PreferenceCategory>
-
-        <!-- In-call feedback -->
-        <com.cherish.settings.preferences.SystemSettingSwitchPreference
-          android:key="incall_feeedback_vibrate"
-          android:icon="@drawable/ic_vibrate"
-          android:title="@string/incall_feeedback_vibrate_title"
-          android:defaultValue="false"
-          settings:controller="com.cherish.settings.fragments.IncallFeedbackPreferenceController" />
-  
-        <Preference
-        android:key="audio_panel" 
-	android:icon="@drawable/ic_music"
-        android:fragment="com.cherish.settings.fragments.AudioPanelSettings"
-        android:title="@string/audio_panel_view" />
-
 </PreferenceScreen>
diff --git a/res/xml/cherish_settings_notifications.xml b/res/xml/cherish_settings_notifications.xml
index 4db0f2f..a95f054 100644
--- a/res/xml/cherish_settings_notifications.xml
+++ b/res/xml/cherish_settings_notifications.xml
@@ -18,80 +18,4 @@
 	android:title="@string/notifications_title"
     xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 
-<com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="notification_headers"
-        android:icon="@drawable/ic_notification_center"
-        android:title="@string/notification_headers_title"
-        android:summary="@string/notification_headers_summary"
-        android:defaultValue="true" />
-
-<com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="center_notification_headers"
-        android:title="@string/center_notification_headers_title"
-        android:summary="@string/center_notification_headers_summary"
-        android:dependency="notification_headers"
-        android:defaultValue="true" />
-
- <com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="force_expanded_notifications"
-	    android:icon="@drawable/ic_notification"
-            android:title="@string/force_expanded_notifications_title"
-            android:summary="@string/force_expanded_notifications_summary"
-            android:defaultValue="false" />
-
- <Preference
-        android:key="charging_light"
-        android:icon="@drawable/ic_battery_almostfull"
-        android:fragment="com.cherish.settings.fragments.BatteryLightSettings"
-        android:title="@string/battery_light_settings" />
-		
-<com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="charging_animation"
-	android:icon="@drawable/ic_charging"
-        android:title="@string/charging_animation_title"
-        android:summary="@string/charging_animation_summary"
-        android:defaultValue="false" />
-
-<PreferenceCategory
-        android:key="notification_screen"
-        android:title="@string/notification_screen_title" >
-
-        <com.cherish.settings.preferences.SystemSettingMasterSwitchPreference
-            android:key="pulse_ambient_light"
-            android:icon="@drawable/ic_pulse"
-            android:title="@string/pulse_ambient_light_title"
-            android:summary="@string/pulse_ambient_light_summary"
-			android:fragment="com.cherish.settings.fragments.EdgePulse"
-            android:defaultValue="false" />
-    </PreferenceCategory>
-
-  <PreferenceCategory
-        android:title="@string/flashlight_category">
-
-  <com.cherish.settings.preferences.SystemSettingListPreference
-            android:key="flashlight_on_call"
-            android:icon="@drawable/ic_flashlight"
-            android:title="@string/flashlight_on_call_title"
-            android:entries="@array/flashlight_on_call_entries"
-            android:entryValues="@array/flashlight_on_call_values"
-            android:defaultValue="0" />
-
-  <com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="flashlight_on_call_ignore_dnd"
-            android:icon="@drawable/ic_call_dnd"
-            android:title="@string/flashlight_on_call_ignore_dnd_title"
-            android:summary="@string/flashlight_on_call_ignore_dnd_summary"
-            android:defaultValue="false" />
-
-        <com.cherish.settings.preferences.CustomSeekBarPreference
-            android:key="flashlight_on_call_rate"
-            android:icon="@drawable/ic_call"
-            android:title="@string/flashlight_on_call_rate_title"
-            android:summary="@string/flashlight_on_call_rate_summary"
-            android:max="5"
-            settings:min="1"
-            settings:defaultValue="1"
-            settings:units="Hz" />
-      </PreferenceCategory>
-
 </PreferenceScreen>
diff --git a/res/xml/cherish_settings_power.xml b/res/xml/cherish_settings_power.xml
index f63498f..15b2385 100644
--- a/res/xml/cherish_settings_power.xml
+++ b/res/xml/cherish_settings_power.xml
@@ -18,65 +18,4 @@
     android:title="@string/powermenu_title"
     xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 	
-	<PreferenceCategory
-        android:title="@string/panel_porn_title">
-
-        <com.cherish.settings.preferences.SystemSettingSeekBarPreference
-            android:key="transparent_power_menu"
-            android:title="@string/power_menu_transparency"
-            android:max="100"
-            android:min="0"
-            settings:unitsLeft=""
-            settings:unitsRight="%"
-            android:defaultValue="100" />
-
-        <com.cherish.settings.preferences.SystemSettingSeekBarPreference
-            android:key="transparent_power_dialog_dim"
-            android:title="@string/power_menu_dialog_dim"
-            android:max="100"
-            android:min="0"
-            settings:unitsLeft=""
-            settings:unitsRight="%"
-            android:defaultValue="50" />
-    </PreferenceCategory>
-
-   <com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:icon="@drawable/ic_recovery"
-            android:key="advanced_reboot"
-            android:title="@string/advanced_reboot_title"
-            android:summary="@string/advanced_reboot_summary"
-            android:defaultValue="false" />
- 
-   <com.cherish.settings.preferences.GlobalSettingSwitchPreference
-        android:key="power_menu_emergency_affordance"
-        android:icon="@drawable/ic_emergency"
-        android:title="@string/power_menu_emergency_title"
-        android:defaultValue="true" />
-	
-
-   <PreferenceCategory
-        android:title="@string/lockscreen_secure_power_title">	
-	
-	<com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="lockscreen_disable_power_menu"
-            android:icon="@drawable/ic_lock_outline"
-            android:title="@string/lockscreen_power_menu_disabled_title"
-            android:summary="@string/lockscreen_power_menu_disabled_summary"
-            android:defaultValue="false" />
-
-    <com.cherish.settings.preferences.GlobalSettingSwitchPreference
-               android:key="lockscreen_enable_power_menu"
-               android:icon="@drawable/ic_power"
-               android:title="@string/lockscreen_enable_power_menu_title"
-               android:summary="@string/lockscreen_enable_power_menu_summary"
-               android:defaultValue="true" />
-
-   <com.cherish.settings.preferences.GlobalSettingSwitchPreference
-               android:key="lockscreen_powermenu_secure"
-               android:icon="@drawable/ic_lock_outline"
-               android:title="@string/lockscreen_secure_power_menu_title"
-               android:summary="@string/lockscreen_secure_power_menu_summary"
-               android:dependency="lockscreen_enable_power_menu"
-               android:defaultValue="false" />
-   </PreferenceCategory>
 </PreferenceScreen>
diff --git a/res/xml/cherish_settings_pulse.xml b/res/xml/cherish_settings_pulse.xml
deleted file mode 100644
index 42c13b6..0000000
--- a/res/xml/cherish_settings_pulse.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2012-2014 The TeamEos 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.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-    android:title="@string/pulse_settings" >
-
-    <SwitchPreference
-        android:key="navbar_pulse_enabled"
-        android:title="@string/show_navbar_pulse_title"
-        android:summary="@string/show_navbar_pulse_summary"/>
-
-    <SwitchPreference
-        android:key="lockscreen_pulse_enabled"
-        android:title="@string/show_lockscreen_pulse_title"
-        android:summary="@string/show_lockscreen_pulse_summary"/>
-
-    <SwitchPreference
-        android:key="ambient_pulse_enabled"
-        android:title="@string/show_ambient_pulse_title"
-        android:summary="@string/show_ambient_pulse_summary"/>
-
-    <com.cherish.settings.preferences.SecureSettingListPreference
-        android:key="pulse_render_style"
-        android:title="@string/pulse_render_mode_title"
-        android:entries="@array/pulse_render_mode_entries"
-        android:entryValues="@array/pulse_render_mode_values"
-        android:defaultValue="0" />
-
-    <com.cherish.settings.preferences.SecureSettingSwitchPreference
-        android:key="pulse_smoothing_enabled"
-        android:title="@string/smoothing_enabled_title"
-        android:summary="@string/smoothing_enabled_summary"
-        android:defaultValue="false" />
-
-    <PreferenceCategory
-        android:key="pulse_color_category"
-        android:title="@string/pulse_color">
-
-        <com.cherish.settings.preferences.SecureSettingListPreference
-            android:key="pulse_color_mode"
-            android:title="@string/pulse_color_mode"
-            android:entries="@array/pulse_color_mode_entries"
-            android:entryValues="@array/pulse_color_mode_values"
-            android:defaultValue="1"/>
-
-        <net.margaritov.preference.colorpicker.ColorPickerPreference
-            android:key="pulse_color_user"
-            android:title="@string/pulse_color_chooser"
-            android:persistent="false" />
-
-        <com.cherish.settings.preferences.SecureSettingSeekBarPreference
-            android:key="pulse_lavalamp_speed"
-            android:title="@string/lavamp_speed_title"
-            android:max="30000"
-            android:defaultValue="10000"
-            android:min="200"
-            settings:interval="200"
-            settings:units="ms"/>
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:key="pulse_fading_bars_category"
-        android:title="@string/pulse_legacy_mode_advanced_category">
-
-        <com.cherish.settings.preferences.SecureSettingSeekBarPreference
-            android:key="pulse_custom_dimen"
-            android:title="@string/pulse_custom_dimen"
-            android:max="30"
-            android:defaultValue="14"
-            android:min="1"
-            settings:units="dp"/>
-
-        <com.cherish.settings.preferences.SecureSettingSeekBarPreference
-            android:key="pulse_custom_div"
-            android:title="@string/pulse_custom_div"
-            android:max="44"
-            android:defaultValue="16"
-            android:min="2"
-            settings:interval="2"
-            settings:units="dp"/>
-
-        <com.cherish.settings.preferences.SecureSettingSeekBarPreference
-            android:key="pulse_filled_block_size"
-            android:title="@string/pulse_filled_block_size"
-            android:max="8"
-            android:defaultValue="4"
-            android:min="4"
-            settings:units="dp"/>
-
-        <com.cherish.settings.preferences.SecureSettingSeekBarPreference
-            android:key="pulse_empty_block_size"
-            android:title="@string/pulse_empty_block_size"
-            android:max="4"
-            android:defaultValue="1"
-            android:min="0"
-            settings:units="dp"/>
-
-        <com.cherish.settings.preferences.SecureSettingSeekBarPreference
-            android:key="pulse_custom_fudge_factor"
-            android:title="@string/pulse_custom_fudge_factor"
-            android:max="6"
-            android:defaultValue="4"
-            android:min="2"/>
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:key="pulse_2"
-        android:title="@string/pulse_solid_dimen_category">
-
-        <com.cherish.settings.preferences.SecureSettingSeekBarPreference
-            android:key="pulse_solid_units_opacity"
-            android:title="@string/pulse_solid_units_opacity"
-            android:max="255"
-            android:defaultValue="200"
-            android:min="0"/>
-
-        <com.cherish.settings.preferences.SecureSettingSeekBarPreference
-            android:key="pulse_solid_units_count"
-            android:title="@string/pulse_solid_units_count"
-            android:max="128"
-            android:defaultValue="64"
-            settings:interval="16"
-            android:min="32"/>
-
-        <com.cherish.settings.preferences.SecureSettingSeekBarPreference
-            android:key="pulse_solid_fudge_factor"
-            android:title="@string/pulse_custom_fudge_factor"
-            android:max="7"
-            android:defaultValue="5"
-            android:min="2"/>
-    </PreferenceCategory>
-
-</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/cherish_settings_quicksettings.xml b/res/xml/cherish_settings_quicksettings.xml
index b38abd5..30b37f6 100644
--- a/res/xml/cherish_settings_quicksettings.xml
+++ b/res/xml/cherish_settings_quicksettings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 Nitrogen Project
+<!-- Copyright (C) 2020 CherishOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -17,227 +17,5 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:title="@string/quicksettings_title"
     xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-	
-	<PreferenceCategory
-        android:title="@string/qs_category">
-
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="qs_panel_bg_use_new_tint"
-            android:icon="@drawable/ic_accent_picker"
-            android:title="@string/qs_bg_use_new_tint"
-            android:summary="@string/qs_bg_use_new_tint_summary"
-            android:defaultValue="true" />
-			
-	<com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="qs_blur"
-            android:icon="@drawable/ic_blur"
-            android:title="@string/blur_quicksettings"
-            android:summary="@string/blur_quicksettings_subtitle"
-            android:defaultValue="true" />
-			
-	<com.cherish.settings.preferences.CustomSeekBarPreference
-        android:key="qs_blur_intensity"
-        android:title="@string/qs_blur_intensity_title"
-        android:summary="@string/qs_blur_intensity_summary"
-        android:max="100"
-        settings:min="1"
-        settings:unitsRight="@string/unit_percent"
-        android:persistent="false"
-        android:dependency="qs_blur" />
-
-      <com.cherish.settings.preferences.CustomSeekBarPreference
-        android:key="qs_blur_alpha"
-        android:title="@string/qs_blur_alpha_title"
-        android:summary="@string/qs_blur_alpha_summary"
-        android:max="100"
-        settings:min="1"
-        settings:unitsRight="@string/unit_percent"
-        android:persistent="false"
-        android:dependency="qs_blur" />
-
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-      android:key="dismiss_all_button"
-      android:icon="@drawable/ic_notification_clear_all"
-      android:title="@string/enable_clear_all_button"
-      android:summary="@string/enable_clear_all_button_summary"
-      android:defaultValue="false" />
-
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference 
-            android:key="settings_spacer"
-            android:icon="@drawable/ic_settings"
-            android:title="@string/enable_oneui"
-            android:summary="@string/enable_oneui_summary"
-            android:defaultValue="true" />
-			
-	<com.cherish.settings.preferences.SystemSettingListPreference
-            android:key="qs_datausage"
-			android:icon="@drawable/ic_data"
-            android:title="@string/qs_datausage_title"
-            android:entries="@array/qs_datausage_entries" 
-        android:entryValues="@array/qs_datausage_values"
-        android:defaultValue="0" />
-
-         <com.cherish.settings.preferences.SystemSettingMasterSwitchPreference
-            android:key="status_bar_custom_header"
-            android:icon="@drawable/ic_header"
-            android:fragment="com.cherish.settings.fragments.QsHeader"
-            android:title="@string/status_bar_custom_header_title"
-            android:summary="@string/status_bar_custom_header_summary"
-            android:defaultValue="false" />
-			
-	<com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="footer_text_show"
-	android:icon="@drawable/ic_edit_show"
-        android:title="@string/qs_footer_text_title"
-        android:summary="@string/qs_footer_text_summary"
-        android:defaultValue="false"/>
-
-    <com.cherish.settings.preferences.SystemSettingEditTextPreference
-        android:key="footer_text_string"
-	android:icon="@drawable/ic_edit"
-        android:title="@string/qs_footer_text_string_title"
-        android:summary="@string/qs_footer_text_string_summary"
-        android:dependency="footer_text_show"
-        android:defaultValue="#KeeptheLove" />
-			
-	</PreferenceCategory>
-
-        <PreferenceCategory
-        android:key="notification_stat"
-        android:title="@string/notification_stat">
-
-        <com.cherish.settings.preferences.GlobalSettingMasterSwitchPreference
-            android:key="heads_up_notifications_enabled"
-            android:icon="@drawable/ic_blacklist"
-            android:fragment="com.cherish.settings.fragments.HeadsUp"
-            android:title="@string/heads_up_notifications"
-            android:summary="@string/heads_up_notifications_summary"
-            android:defaultValue="true" />
-
-        <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="less_boring_heads_up"
-        android:icon="@drawable/ic_less_notification"
-        android:title="@string/less_boring_heads_up_title"
-        android:summary="@string/less_boring_heads_up_summary"
-        android:defaultValue="false" />
-
-    </PreferenceCategory>
-	  
-	<PreferenceCategory
-        android:title="@string/qs_title">
-		
-	<ListPreference
-        android:key="quick_pulldown" 
-        android:icon="@drawable/ic_pulldown"
-        android:title="@string/quick_pulldown_title" 
-        android:entries="@array/quick_pulldown_entries" 
-        android:entryValues="@array/quick_pulldown_values"
-        android:persistent="false" />
-		
-	<com.cherish.settings.preferences.SecureSettingSwitchPreference
-        android:key="status_bar_locked_on_secure_keyguard"
-        android:icon="@drawable/ic_lock_qs"
-        android:title="@string/lockscreen_qs_disabled_title"
-        android:summary="@string/lockscreen_qs_disabled_summary"
-        android:defaultValue="false" />
-
-        <com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="brightness_slider_qs_unexpanded"
-            android:icon="@drawable/ic_brightness_qs"
-            android:title="@string/brightness_slider_qs_unexpanded"
-            android:summary="@string/brightness_slider_qs_unexpanded_summary"
-            android:defaultValue="false" />
-        
-        <com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="qs_bottom_brightness" 
-            android:icon="@drawable/ic_brightness"           
-            android:title="@string/qs_brightness_position_bottom_title"
-            android:summary="@string/qs_brightness_position_bottom_summary"
-            android:defaultValue="false" />
-			
-		<com.cherish.settings.preferences.SystemSettingSwitchPreference 
-        android:key="status_bar_brightness_control" 
-		android:icon="@drawable/ic_brightness_control"   
-        android:title="@string/status_bar_toggle_brightness" 
-        android:summary="@string/status_bar_toggle_brightness_summary"
-        android:defaultValue="false" />
-
-
-        <com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="qs_tile_title_visibility"
-            android:icon="@drawable/ic_qs_tile"
-            android:title="@string/qs_tile_title_visibility_title"
-            android:summary="@string/qs_tile_title_visibility_summary"
-            android:defaultValue="true" />
-
-        <com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="quick_settings_vibrate"
-            android:icon="@drawable/ic_vibrate"
-            android:title="@string/qs_vibrate_title"
-            android:summary="@string/qs_vibrate_summary"
-            android:defaultValue="false" />
-
-        <com.cherish.settings.preferences.SystemSettingListPreference
-            android:key="qs_rows_portrait"
-            android:icon="@drawable/ic_qs_tile"
-            android:dialogTitle="@string/qs_rows_portrait_title"
-            android:title="@string/qs_rows_portrait_title"
-            android:summary="%s"
-            android:entries="@array/qs_rows_portrait_values"
-            android:entryValues="@array/qs_rows_portrait_values"
-            android:defaultValue="3" />
-
-        <com.cherish.settings.preferences.SystemSettingListPreference
-            android:key="qs_rows_landscape"
-            android:icon="@drawable/ic_qs_tile"
-            android:dialogTitle="@string/qs_rows_landscape_title"
-            android:title="@string/qs_rows_landscape_title"
-            android:summary="%s"
-            android:entries="@array/qs_rows_landscape_values"
-            android:entryValues="@array/qs_rows_landscape_values"
-            android:defaultValue="1" />
-
-        <com.cherish.settings.preferences.SystemSettingListPreference
-            android:key="qs_columns_portrait"
-            android:icon="@drawable/ic_qs_tile"
-            android:dialogTitle="@string/qs_columns_portrait_title"
-            android:title="@string/qs_columns_portrait_title"
-            android:summary="%s"
-            android:entries="@array/qs_columns_portrait_values"
-            android:entryValues="@array/qs_columns_portrait_values"
-            android:defaultValue="3" />
-
-        <com.cherish.settings.preferences.SystemSettingListPreference
-            android:key="qs_columns_landscape"
-            android:icon="@drawable/ic_qs_tile"
-            android:dialogTitle="@string/qs_columns_landscape_title"
-            android:title="@string/qs_columns_landscape_title"
-            android:summary="%s"
-            android:entries="@array/qs_columns_landscape_values"
-            android:entryValues="@array/qs_columns_landscape_values"
-            android:defaultValue="4" />
-
-    </PreferenceCategory>
-
-     <PreferenceCategory
-        android:title="@string/battery_title">
-	
-	<!-- Battery hide -->
-        <com.cherish.settings.preferences.SystemSettingSwitchPreference
-             android:key="qs_hide_battery"
-             android:icon="@drawable/ic_battery_outline"
-             android:title="@string/qs_hide_battery_title"
-             android:summary="@string/qs_hide_battery_summary"
-             android:defaultValue="false" />
-
-    <com.cherish.settings.preferences.SystemSettingListPreference
-        android:key="qs_battery_mode"
-        android:icon="@drawable/ic_battery_percent"
-        android:title="@string/battery_percentage_title"
-        android:entries="@array/qs_battery_mode_entries"
-        android:entryValues="@array/qs_battery_mode_values"
-        android:defaultValue="1" />
-
-   </PreferenceCategory>
 		
 </PreferenceScreen>
diff --git a/res/xml/cherish_settings_recents.xml b/res/xml/cherish_settings_recents.xml
index 357ecf9..9f59e14 100644
--- a/res/xml/cherish_settings_recents.xml
+++ b/res/xml/cherish_settings_recents.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 Nitrogen Project
+<!-- Copyright (C) 2020 CherishOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -18,22 +18,4 @@
     android:title="@string/recents_title"
     xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 
-    <PreferenceCategory
-        android:key="alternative_recents_category"
-        android:title="@string/alternative_recents_category">
-
-    <Preference
-        android:key="swipe_up_enabled_warning"
-        android:selectable="false"
-        android:summary="@string/alternative_recents_swipe_up_enabled_warning_summary" />
-
-    <com.cherish.settings.preferences.SystemSettingMasterSwitchPreference
-        android:key="use_slim_recents"
-        android:icon="@drawable/ic_baseline_recent"
-        android:fragment="com.cherish.settings.fragments.SlimRecents"
-        android:title="@string/slim_recents_fragment_title"
-        android:summary="@string/slim_recents_fragment_summary"/>
-
-    </PreferenceCategory>
-
 </PreferenceScreen>
diff --git a/res/xml/cherish_settings_statusbar.xml b/res/xml/cherish_settings_statusbar.xml
index db9a119..9f22076 100644
--- a/res/xml/cherish_settings_statusbar.xml
+++ b/res/xml/cherish_settings_statusbar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 Nitrogen Project
+<!-- Copyright (C) 2020 CherishOS 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
@@ -14,156 +14,4 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:title="@string/statusbar_title"
     xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-	
-       <PreferenceCategory
-            android:key="label"
-            android:title="@string/label_title">
-
-	<Preference
-            android:key="carrier_label"
-            android:icon="@drawable/ic_carrierlabel"
-            android:title="@string/carrier_label_settings_title"
-            android:summary="@string/carrier_label_settings_summary"
-            android:fragment="com.cherish.settings.fragments.CustomCarrierLabel" />
- 
-        </PreferenceCategory>
-
-	<PreferenceCategory
-            android:key="status_bar_icons"
-            android:title="@string/status_bar_system_icons_title">
-			
-	<com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="show_fourg_icon"
-            android:icon="@drawable/ic_4g"
-            android:title="@string/show_fourg_icon_title"
-            android:summary="@string/show_fourg_icon_summary"
-            android:defaultValue="false"/>
-    
-        <com.cherish.settings.preferences.SystemSettingSwitchPreference
-         android:key="use_old_mobiletype"
-         android:icon="@drawable/ic_4g_old"
-         android:title="@string/use_old_mobiletype_title"
-         android:summary="@string/use_old_mobiletype_summary"
-         android:defaultValue="false" />
-
-        <com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="volte_icon"
-            android:icon="@drawable/ic_volte"
-            android:title="@string/volte_icon_title"
-            android:summary="@string/volte_icon_summary"
-            android:defaultValue="true"/>
-
-      	<com.cherish.settings.preferences.SystemSettingListPreference
-            android:key="volte_icon_style"
-            android:icon="@drawable/ic_4g_volte"
-            android:title="@string/volte_icon_style_title"
-            android:entries="@array/volte_icon_type_entries"
-            android:entryValues="@array/volte_icon_type_values"
-            android:dependency="volte_icon"
-            android:summary="%s"
-            android:defaultValue="0"/>
-
-        <com.cherish.settings.preferences.SystemSettingListPreference
-         android:key="vowifi_icon"
-         android:icon="@drawable/ic_vowifi"
-         android:title="@string/vowifi_icon_title"
-         android:entries="@array/vowifi_icon_entries"
-         android:entryValues="@array/vowifi_icon_values"
-         android:summary="%s"
-         android:defaultValue="0"/>
-
-         <com.cherish.settings.preferences.SystemSettingListPreference
-         android:key="vowifi_icon_style"
-         android:icon="@drawable/ic_vowifi"
-         android:title="@string/vowifi_icon_style_title"
-         android:entries="@array/vowifi_icon_style_entries"
-         android:entryValues="@array/vowifi_icon_style_values"
-         android:summary="%s"
-         android:defaultValue="0"/>
-
-    <Preference
-            android:title="@string/statusbar_items_title" 
-            android:icon="@drawable/ic_shortcuts">
-            <intent android:action="android.intent.action.MAIN"
-                android:targetPackage="com.android.systemui"
-                android:targetClass="com.android.systemui.tuner.StatusbarItemsActivity" />
-    </Preference>
-
-<com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="network_traffic_state"
-		android:icon="@drawable/ic_network_traffic"
-        android:title="@string/network_traffic_state_title"
-        android:defaultValue="false" />
-
-    <com.cherish.settings.preferences.CustomSeekBarPreference
-        android:key="network_traffic_autohide_threshold"
-		android:icon="@drawable/ic_network_traffic"
-        android:title="@string/network_traffic_autohide_threshold_title"
-        android:max="10"
-        settings:min="0"
-        settings:units="" />
-
-   <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="network_traffic_hidearrow"
-        android:title="@string/network_traffic_hidearrow"
-	android:icon="@drawable/ic_arrow"
-        android:summary="@string/network_traffic_hidearrow_summary"
-        android:dependency="network_traffic_state"
-        android:defaultValue="false" />
-
-<com.cherish.settings.preferences.SystemSettingMasterSwitchPreference
-        android:key="status_bar_clock"
-        android:icon="@drawable/ic_clock"
-        android:fragment="com.cherish.settings.fragments.ClockSettings" 
-        android:title="@string/status_bar_clock_title"
-        android:summary="@string/status_bar_clock_summary"
-        android:defaultValue="true" />
-
-		</PreferenceCategory>
-
-     <PreferenceCategory
-
-        android:key="battery_style_category"
-        android:title="@string/battery_style_category_title" >
-
-        <com.cherish.settings.preferences.SystemSettingMasterSwitchPreference
-            android:key="battery_bar_settings"
-            android:icon="@drawable/ic_battery_bar"
-            android:title="@string/sb_battery_bar_title"
-            android:fragment="com.cherish.settings.fragments.BatteryBar" />
-
-       <com.cherish.settings.preferences.SystemSettingListPreference
-            android:key="status_bar_battery_style"
-            android:icon="@drawable/ic_battery_styles"
-            android:title="@string/status_bar_battery_style_title"
-            android:summary="%s"
-            android:dialogTitle="@string/status_bar_battery_style_title"
-            android:entries="@array/status_bar_battery_style_entries"
-            android:entryValues="@array/status_bar_battery_style_values"
-            android:defaultValue="0" />
-
-       <com.cherish.settings.preferences.SystemSettingListPreference
-            android:key="status_bar_show_battery_percent"
-            android:icon="@drawable/ic_battery_percent"
-            android:title="@string/battery_percent_title"
-            android:dialogTitle="@string/battery_percent_title"
-            android:entries="@array/battery_percent_entries"
-            android:entryValues="@array/battery_percent_values"
-            android:defaultValue="0" />
-
-       <com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:icon="@drawable/ic_battery_charging"
-            android:key="status_bar_battery_text_charging"
-            android:title="@string/status_bar_battery_text_charging_title"
-            android:summary="@string/status_bar_battery_text_charging_summary"
-            android:defaultValue="true" />
-			
-		<com.cherish.settings.preferences.SystemSettingSwitchPreference
-         android:key="status_bar_battery_charging_bolt"
-		 android:icon="@drawable/ic_lighting_bolt"
-         android:title="@string/status_bar_battery_charging_bolt_title"
-         android:summary="@string/status_bar_battery_charging_bolt_summary"
-         android:defaultValue="true" />
-
-    </PreferenceCategory>
 </PreferenceScreen> 
\ No newline at end of file
diff --git a/res/xml/cherish_settings_theme.xml b/res/xml/cherish_settings_theme.xml
index 694edd5..c1ab711 100644
--- a/res/xml/cherish_settings_theme.xml
+++ b/res/xml/cherish_settings_theme.xml
@@ -17,133 +17,4 @@
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:title="@string/theme_title"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-		
-		
-<PreferenceCategory
-     android:key="system_theme_category"
-     android:title="@string/theme_type_title">
-
-      <ListPreference
-          android:key="theme_switch"
-	  android:icon="@drawable/ic_system_theme"
-          android:title="@string/theme_type_title"
-          android:summary="%s"
-          android:dialogTitle="@string/theme_type_summary"
-          android:entries="@array/theme_type_titles"
-          android:entryValues="@array/theme_type_values"
-          android:defaultValue="1"/>
-		  
-      <ListPreference
-        android:key="switch_style"
-        android:icon="@drawable/ic_switch_theme"
-        android:title="@string/switch_style_title"
-        android:persistent="false"
-        android:entries="@array/switch_style_entries"
-        android:entryValues="@array/switch_style_values" />
-		
-		<ListPreference
-        android:key="ui_style"
-		 android:icon="@drawable/ic_ui"
-        android:title="@string/ui_style_title"
-        android:entries="@array/ui_style_selector_entries"
-        android:entryValues="@array/ui_style_selector_values"
-        android:persistent="false" />
-
-      <ListPreference
-            android:key="qs_tile_style"
-	    android:icon="@drawable/ic_shape2_icon"
-            android:title="@string/qs_tile_style_title"
-            android:persistent="false"
-            android:entries="@array/qs_selector_entries"
-            android:entryValues="@array/qs_selector_values" />
-			
-	<ListPreference
-        android:key="qs_header_style"
-		 android:icon="@drawable/ic_header"
-        android:title="@string/qs_header_style_title"
-        android:persistent="false"
-        android:entries="@array/qs_header_style_entries"
-        android:entryValues="@array/qs_header_style_values" />
-		
-	<ListPreference
-        android:key="brightness_slider_style"
-		android:icon="@drawable/ic_brightness"
-        android:title="@string/brightness_slider_style_title"
-        android:entries="@array/brightness_slider_style_selector_entries"
-        android:entryValues="@array/brightness_slider_style_selector_values"
-        android:persistent="false" />
-
-        <!-- Navbar Style -->
-        <ListPreference
-        android:key="navbar_style"
-        android:title="@string/navbar_style_title"
-        android:icon="@drawable/ic_nav"
-        android:dialogTitle="@string/navbar_style_title"
-        android:entries="@array/navbar_style_entries"
-        android:entryValues="@array/navbar_style_values"
-        android:defaultValue="0" />
-		
-	<com.cherish.settings.preferences.SystemSettingIntListPreference
-        android:key="theming_settings_dashboard_icons"
-        android:icon="@drawable/ic_dashboard"
-        android:title="@string/theming_settings_dashboard_icons_title"
-        android:entries="@array/theming_settings_dashboard_icons_entries"
-        android:entryValues="@array/theming_settings_dashboard_icons_values"
-        android:defaultValue="0" />
-
-  </PreferenceCategory>
-
-  <PreferenceCategory
-        android:key="volume_panel_stuff"
-        android:title="@string/volume_panel">
-
-        <com.cherish.settings.preferences.SystemSettingListPreference
-            android:key="systemui_plugin_volume"
-            android:title="@string/volume_panel"
-            android:icon="@drawable/ic_volume"
-            android:entries="@array/volume_panel_entries"
-            android:entryValues="@array/volume_panel_values"
-            android:defaultValue="@string/volume_panel_default_val" />
-
-    </PreferenceCategory>
-
-  <PreferenceCategory
-        android:key="rounded_corners_category"
-        android:title="@string/corners_category_title" >
-
-    <com.cherish.settings.preferences.SecureSettingSwitchPreference
-       android:key="sysui_rounded_fwvals"
-       android:title="@string/corner_fwvals"
-       android:icon="@drawable/ic_round"
-       android:defaultValue="true"
-       android:disableDependentsState="true" />
-
-    <com.cherish.settings.preferences.CustomSeekBarPreference
-        android:key="sysui_rounded_size"
-        android:title="@string/corner_radius"
-        android:max="60"
-        settings:min="0"
-        settings:units="dp"
-        android:persistent="false"
-        android:dependency="sysui_rounded_fwvals" />
-
-    <com.cherish.settings.preferences.CustomSeekBarPreference
-        android:key="sysui_rounded_content_padding"
-        android:title="@string/content_padding"
-        android:max="30"
-        settings:min="0"
-        settings:units="dp"
-        android:persistent="false"
-        android:dependency="sysui_rounded_fwvals" />
-
-    <com.cherish.settings.preferences.CustomSeekBarPreference
-        android:key="sysui_status_bar_padding"
-        android:title="@string/status_bar_padding"
-        android:max="30"
-        settings:min="0"
-        settings:units="dp"
-        android:persistent="false"
-        android:dependency="sysui_rounded_fwvals" />
-
-    </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/cherish_settings_volume.xml b/res/xml/cherish_settings_volume.xml
index 7a006cd..f490769 100644
--- a/res/xml/cherish_settings_volume.xml
+++ b/res/xml/cherish_settings_volume.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 Nitrogen OS
+<!-- Copyright (C) 2020 CherishOS
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/res/xml/custom_carrier_label.xml b/res/xml/custom_carrier_label.xml
deleted file mode 100644
index 43c0ca9..0000000
--- a/res/xml/custom_carrier_label.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2020 CherishOS
-
-     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.
--->
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-	android:title="@string/carrier_label_settings_title"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-
-    <com.cherish.settings.preferences.SystemSettingListPreference
-        android:key="status_bar_show_carrier"
-        android:title="@string/show_carrier_title"
-        android:defaultValue="1" />
-
-    <PreferenceScreen
-        android:key="custom_carrier_label"
-        android:title="@string/custom_carrier_label_title" />
-
-</PreferenceScreen>
diff --git a/res/xml/edgepulse_settings.xml b/res/xml/edgepulse_settings.xml
deleted file mode 100644
index 08be041..0000000
--- a/res/xml/edgepulse_settings.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 CherishOS
-
-     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.
--->
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/pulse_ambient_light_title"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-	
-	<com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="pulse_ambient_light_pulse_for_all"
-        android:title="@string/pulse_ambient_light_pulse_for_all_title"
-        android:summary="@string/pulse_ambient_light_pulse_for_all_summary"
-        android:defaultValue="false" />
-		
-	<com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="pulse_ambient_light_pulse_for_all_repeat"
-        android:title="@string/pulse_ambient_light_pulse_for_all_repeat_title"
-        android:summary="@string/pulse_ambient_light_pulse_for_all_repeat_summary"
-        android:dependency="pulse_ambient_light_pulse_for_all"
-        android:defaultValue="false" />
-
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="ambient_notification_light_enabled"
-        android:title="@string/ambient_notification_light_enabled_title"
-        android:summary="@string/ambient_notification_light_enabled_sumary"
-        android:defaultValue="false" />
-
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="ambient_notification_light_hide_aod"
-        android:title="@string/ambient_notification_light_hide_aod_title"
-        android:summary="@string/ambient_notification_light_hide_aod_sumary"
-        android:dependency="ambient_notification_light_enabled"
-        android:defaultValue="false" />
-
-    <com.cherish.settings.preferences.SystemSettingListPreference
-        android:key="pulse_ambient_light_layout"
-        android:title="@string/pulse_ambient_light_layout_title"
-        android:entries="@array/pulse_ambient_light_layout_entries"
-        android:entryValues="@array/pulse_ambient_light_layout_values"
-        android:defaultValue="0" />
-
-    <PreferenceCategory
-        android:title="@string/edgelight_left" >
-		
-		<com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="ambient_notification_light_accent_left"
-            android:title="@string/ambient_notification_light_accent_title"
-            android:summary="@string/ambient_notification_light_accent_summary"
-            android:defaultValue="true"
-            android:disableDependentsState="true" />
-
-        <com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="pulse_ambient_light_auto_color_left"
-            android:title="@string/pulse_ambient_light_auto_color_title"
-            android:summary="@string/pulse_ambient_light_auto_color_summary"
-            android:defaultValue="false"
-            android:dependency="ambient_notification_light_accent_left"
-            android:disableDependentsState="true" />
-
-        <net.margaritov.preference.colorpicker.ColorPickerPreference
-            android:key="pulse_ambient_light_color_left"
-            android:title="@string/pulse_ambient_light_color_title"
-            android:persistent="false"
-            android:dependency="pulse_ambient_light_auto_color_left"
-            settings:defaultColorValue="0xFF3980FF" />
-			
-		<com.cherish.settings.preferences.SystemSettingListPreference
-            android:key="pulse_ambient_light_repeat_mode_left"
-            android:title="@string/pulse_ambient_light_repeat_mode_title"
-            android:entries="@array/pulse_ambient_light_anim_entries"
-            android:entryValues="@array/pulse_ambient_light_anim_values"
-            android:defaultValue="0" />
-
-        <com.cherish.settings.preferences.SystemSettingSeekBarPreference
-            android:key="pulse_ambient_light_left_duration"
-            android:title="@string/pulse_ambient_light_duration"
-            android:defaultValue="2000"
-            android:max="10000"
-            settings:min="500"
-            settings:interval="250"
-            settings:units="ms" />
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:title="@string/edgelight_right" >
-		
-		<com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="ambient_notification_light_accent_right"
-            android:title="@string/ambient_notification_light_accent_title"
-            android:summary="@string/ambient_notification_light_accent_summary"
-            android:defaultValue="true"
-            android:disableDependentsState="true" />
-
-        <com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="pulse_ambient_light_auto_color_right"
-            android:title="@string/pulse_ambient_light_auto_color_title"
-            android:summary="@string/pulse_ambient_light_auto_color_summary"
-            android:defaultValue="false"
-            android:dependency="ambient_notification_light_accent_right"
-            android:disableDependentsState="true" />
-
-        <net.margaritov.preference.colorpicker.ColorPickerPreference
-            android:key="pulse_ambient_light_color_right"
-            android:title="@string/pulse_ambient_light_color_title"
-            android:persistent="false"
-            android:dependency="pulse_ambient_light_auto_color_right"
-            settings:defaultColorValue="0xFF3980FF" />
-			
-		<com.cherish.settings.preferences.SystemSettingListPreference
-            android:key="pulse_ambient_light_repeat_mode_right"
-            android:title="@string/pulse_ambient_light_repeat_mode_title"
-            android:entries="@array/pulse_ambient_light_anim_entries"
-            android:entryValues="@array/pulse_ambient_light_anim_values"
-            android:defaultValue="0" />
-
-        <com.cherish.settings.preferences.SystemSettingSeekBarPreference
-            android:key="pulse_ambient_light_right_duration"
-            android:title="@string/pulse_ambient_light_duration"
-            android:defaultValue="2000"
-            android:max="10000"
-            settings:min="500"
-            settings:interval="250"
-            settings:units="ms" />
-    </PreferenceCategory>
-</PreferenceScreen>
diff --git a/res/xml/heads_up_settings.xml b/res/xml/heads_up_settings.xml
deleted file mode 100644
index 8f92741..0000000
--- a/res/xml/heads_up_settings.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The CyanogenMod 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.
--->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/heads_up_notifications">
-
-    <ListPreference
-        android:key="heads_up_time_out"
-        android:title="@string/heads_up_time_out_title"
-        android:entries="@array/heads_up_time_out_entries"
-        android:entryValues="@array/heads_up_time_out_values"
-        android:persistent="false" />
-
-    <ListPreference
-        android:key="heads_up_snooze_time"
-        android:title="@string/heads_up_snooze_title"
-        android:entries="@array/heads_up_snooze_entries"
-        android:entryValues="@array/heads_up_snooze_values"
-        android:persistent="false" />
-
-    <PreferenceCategory
-            android:title="@string/heads_up_stoplist_title"
-            android:key="stoplist_applications" >
-        <Preference
-            android:key="add_stoplist_packages"
-            android:icon="@drawable/ic_menu_add_activated_tint"
-            android:title="@string/add_heads_up_package"
-            android:summary="@string/add_heads_up_stoplist_summary" />
-    </PreferenceCategory>
-
-    <PreferenceCategory
-            android:title="@string/heads_up_blacklist_title"
-            android:key="blacklist_applications" >
-        <Preference
-            android:key="add_blacklist_packages"
-            android:icon="@drawable/ic_menu_add_activated_tint"
-            android:title="@string/add_heads_up_package"
-            android:summary="@string/add_heads_up_blacklist_summary" />
-    </PreferenceCategory>
-
-</PreferenceScreen>
diff --git a/res/xml/qs_header.xml b/res/xml/qs_header.xml
deleted file mode 100644
index 4daf713..0000000
--- a/res/xml/qs_header.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2020 ion-OS
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<PreferenceScreen 
-    android:title="@string/status_bar_custom_header_title" 
-    xmlns:android="http://schemas.android.com/apk/res/android" 
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"> 
-
-    <ListPreference
-        android:key="custom_header_provider"
-        android:title="@string/custom_header_provider_title"
-        android:persistent="false"
-        android:entries="@array/custom_header_provider_entries"
-        android:entryValues="@array/custom_header_provider_values" />
-
-    <ListPreference
-        android:key="daylight_header_pack"
-        android:title="@string/daylight_header_pack_title"
-        android:persistent="false" />
-
-    <Preference
-        android:key="custom_header_browse"
-        android:title="@string/custom_header_pick_title"
-        android:summary="@string/custom_header_pick_summary"
-        android:persistent="false" >
-        <intent android:action="android.intent.action.MAIN"
-            android:targetPackage="org.omnirom.omnistyle"
-            android:targetClass="org.omnirom.omnistyle.PickHeaderActivity" />
-    </Preference>
-
-    <Preference
-        android:key="file_header_select"
-        android:title="@string/file_header_select_title"
-        android:summary="@string/file_header_select_summary"
-        android:persistent="false" >
-    </Preference>
-
-    <com.cherish.settings.preferences.CustomSeekBarPreference
-        android:key="status_bar_custom_header_shadow"
-        android:title="@string/status_bar_custom_header_shadow_title"
-        android:max="100"
-        settings:min="0"
-        android:defaultValue="0"
-        settings:units="%" />
-
-    <com.cherish.settings.preferences.SystemSettingSeekBarPreference
-        android:key="status_bar_custom_header_height"
-        android:title="@string/status_bar_custom_header_height_title"
-        android:max="100"
-        settings:min="0"
-        android:defaultValue="25"
-        settings:units="dp" />
-</PreferenceScreen>
diff --git a/res/xml/slim_recent_app_sidebar.xml b/res/xml/slim_recent_app_sidebar.xml
deleted file mode 100644
index c0cb87c..0000000
--- a/res/xml/slim_recent_app_sidebar.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/**
- * Copyright (C) 2017 AICP
- *
- * 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.
- */
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/recent_app_sidebar_picker_title">
-
-</PreferenceScreen>
diff --git a/res/xml/slim_recent_app_sidebar_style.xml b/res/xml/slim_recent_app_sidebar_style.xml
deleted file mode 100644
index cd85f50..0000000
--- a/res/xml/slim_recent_app_sidebar_style.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/**
- * Copyright (C) 2017 AICP
- *
- * 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.
- */
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-    android:title="@string/recent_app_sidebar_style_title">
-
-    <com.cherish.settings.preferences.SystemSettingSeekBarPreference
-        android:key="recent_app_sidebar_scale_factor"
-        android:title="@string/recent_app_sidebar_scale_title"
-        android:defaultValue="100"
-        android:max="160"
-        settings:min="60"
-        settings:interval="5"
-        settings:units="%" />
-
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="recent_app_sidebar_disable_labels"
-        android:title="@string/recent_app_sidebar_hide_labels_title"
-        android:disableDependentsState="true"
-        android:defaultValue="false" />
-
-    <net.margaritov.preference.colorpicker.ColorPickerPreference
-        android:key="recent_app_sidebar_text_color"
-        android:title="@string/recent_app_sidebar_label_color_title"
-        settings:defaultColorValue="0xffffffff"
-        alphaSlider="false"
-        android:dependency="recent_app_sidebar_disable_labels" />
-
-    <net.margaritov.preference.colorpicker.ColorPickerPreference
-        android:key="recent_app_sidebar_bg_color"
-        android:title="@string/recent_app_sidebar_bg_color_title"
-        settings:defaultColorValue="0x00ffffff"
-        alphaSlider="true" />
-
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="recent_app_sidebar_open_simultaneously"
-        android:title="@string/recent_app_sidebar_open_simultaneously_title"
-        android:summary="@string/recent_app_sidebar_open_simultaneously_summary"
-        android:defaultValue="true" />
-
-</PreferenceScreen>
diff --git a/res/xml/slim_recents.xml b/res/xml/slim_recents.xml
deleted file mode 100644
index fb7344b..0000000
--- a/res/xml/slim_recents.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/**
- * Copyright (C) 2017 AICP
- *
- * 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.
- */
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-    android:title="@string/slim_recents_title">
-
-    <com.cherish.settings.preferences.SystemSettingSeekBarPreference
-        android:key="recent_panel_scale_factor"
-        android:title="@string/recent_panel_scale_title"
-        settings:min="60"
-        settings:interval="5"
-        android:max="160"
-        android:defaultValue="100"
-        settings:units="%" />
-
-    <net.margaritov.preference.colorpicker.ColorPickerPreference
-        android:key="recent_panel_bg_color"
-        android:title="@string/recent_panel_bg_color_title"
-        settings:defaultColorValue="0x00ffffff"
-        alphaSlider="true" />
-
-    <net.margaritov.preference.colorpicker.ColorPickerPreference
-        android:key="recent_card_bg_color"
-        android:title="@string/recent_card_bg_color_title"
-        settings:defaultColorValue="0x00ffffff"
-        alphaSlider="true" />
-
-    <com.cherish.settings.preferences.SystemSettingSeekBarPreference
-        android:key="recents_max_apps"
-        android:title="@string/recents_max_apps_title"
-        android:defaultValue="15"
-        settings:min="5"
-        android:max="105" />
-
-    <SwitchPreference
-        android:key="recent_panel_lefty_mode"
-        android:title="@string/recent_panel_lefty_mode_title"
-        android:summary="@string/recent_panel_lefty_mode_summary"
-        android:defaultValue="false" />
-
-    <com.cherish.settings.preferences.SystemSettingListPreference
-        android:key="slim_recent_enter_exit_animation"
-        android:title="@string/slim_recents_enter_exit_animation_title"
-        android:entries="@array/slim_recents_enter_exit_animation_entries"
-        android:entryValues="@array/slim_recents_enter_exit_animation_values"
-        android:defaultValue="0" />
-
-    <com.cherish.settings.preferences.SystemSettingSeekBarPreference
-        android:key="slim_recents_corner_radius"
-        android:title="@string/slim_recents_corner_radius_title"
-        settings:min="0"
-        android:max="20"
-        android:defaultValue="8"
-        settings:units="dp" />
-
-    <com.cherish.settings.preferences.SystemSettingListPreference
-        android:key="recent_panel_expanded_mode"
-        android:entries="@array/recent_panel_expanded_mode_entries"
-        android:entryValues="@array/recent_panel_expanded_mode_values"
-        android:title="@string/recent_panel_expanded_mode_title"
-        android:summary="@string/recent_panel_expanded_mode_summary"
-        android:defaultValue="0" />
-
-    <Preference
-        android:key="slim_icon_pack"
-        android:title="@string/slim_icon_pack_title"
-        android:summary="@string/slim_icon_pack_summary" />
-
-    <PreferenceScreen
-        android:key="blacklist_fragment"
-        android:fragment="com.cherish.settings.fragments.SlimRecentsBlacklist"
-        android:title="@string/slim_blacklist_apps_title"
-        android:summary="@string/slim_blacklist_apps_summary" />
-
-    <PreferenceCategory
-        android:title="@string/recent_app_sidebar_cat_title">
-
-        <com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="use_recent_app_sidebar"
-            android:title="@string/recent_app_sidebar_title"
-            android:summary="@string/recent_app_sidebar_summary"
-            android:defaultValue="true" />
-
-        <PreferenceScreen
-            android:key="recent_app_sidebar"
-            android:title="@string/recent_app_sidebar_picker_title"
-            android:summary="@string/recent_app_sidebar_picker_summary"
-            android:fragment="com.cherish.settings.preferences.dslv.ActionListViewSettings"
-            android:dependency="use_recent_app_sidebar" >
-            <extra android:name="actionMode" android:value="7" />
-            <extra android:name="maxAllowedActions" android:value="-1" />
-            <extra android:name="useAppPickerOnly" android:value="true" />
-            <extra android:name="fragment" android:value="com.cherish.settings.fragments.SlimRecentAppSidebar" />
-        </PreferenceScreen>
-
-        <PreferenceScreen
-            android:key="recent_app_sidebar_fragment"
-            android:fragment="com.cherish.settings.fragments.SlimRecentAppSidebarStyle"
-            android:title="@string/recent_app_sidebar_style_title"
-            android:summary="@string/recent_app_sidebar_style_summary"
-            android:dependency="use_recent_app_sidebar" />
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:title="@string/slim_recents_mem_display_category_title">
-
-        <com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="slim_recents_mem_display"
-            android:title="@string/slim_recents_mem_display_title"
-            android:summary="@string/slim_recents_mem_display_summary"
-            android:defaultValue="false" />
-
-        <com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="slim_recents_mem_display_long_click_clear"
-            android:title="@string/slim_recents_mem_display_long_click_clear_title"
-            android:summary="@string/slim_recents_mem_display_long_click_clear_summary"
-            android:defaultValue="false"
-            android:dependency="slim_recents_mem_display" />
-
-        <net.margaritov.preference.colorpicker.ColorPickerPreference
-            android:key="slim_mem_bar_color"
-            android:title="@string/slim_recents_mem_display_color"
-            settings:defaultColorValue="0xffffffff"
-            android:dependency="slim_recents_mem_display"/>
-
-        <net.margaritov.preference.colorpicker.ColorPickerPreference
-            android:key="slim_mem_text_color"
-            android:title="@string/slim_recents_mem_display_text_color"
-            settings:defaultColorValue="0xffffffff"
-            android:dependency="slim_recents_mem_display"/>
-
-    </PreferenceCategory>
-</PreferenceScreen>
diff --git a/res/xml/slim_recents_blacklist.xml b/res/xml/slim_recents_blacklist.xml
deleted file mode 100644
index f47bcd0..0000000
--- a/res/xml/slim_recents_blacklist.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The ABC rom
-     Copyright (C) 2017 AICP
-
-     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.
--->
-
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/slim_blacklist_apps_title">
-
-    <Preference
-        android:key="add_blacklist_packages"
-        android:title="@string/slim_blacklist_add_apps_title"
-        android:summary="@string/slim_blacklist_add_apps_summary" />
-
-</PreferenceScreen>
diff --git a/src/com/cherish/settings/fragments/AnimationsSettings.java b/src/com/cherish/settings/fragments/AnimationsSettings.java
index a7ea9ec..14bf440 100644
--- a/src/com/cherish/settings/fragments/AnimationsSettings.java
+++ b/src/com/cherish/settings/fragments/AnimationsSettings.java
@@ -34,8 +34,6 @@ import androidx.preference.Preference.OnPreferenceChangeListener;
 import androidx.preference.SwitchPreference;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.internal.util.cherish.AwesomeAnimationHelper;
-
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
@@ -48,39 +46,6 @@ import java.util.HashSet;
 import java.util.List;
 
 public class AnimationsSettings extends SettingsPreferenceFragment implements OnPreferenceChangeListener {
-	
-	private static final String ANIMATION_DURATION = "animation_controls_duration";
-    private static final String ACTIVITY_OPEN = "activity_open";
-    private static final String ACTIVITY_CLOSE = "activity_close";
-    private static final String TASK_OPEN = "task_open";
-    private static final String TASK_OPEN_BEHIND = "task_open_behind";
-    private static final String TASK_CLOSE = "task_close";
-    private static final String TASK_MOVE_TO_FRONT = "task_move_to_front";
-    private static final String TASK_MOVE_TO_BACK = "task_move_to_back";
-    private static final String WALLPAPER_OPEN = "wallpaper_open";
-    private static final String WALLPAPER_CLOSE = "wallpaper_close";
-    private static final String WALLPAPER_INTRA_OPEN = "wallpaper_intra_open";
-    private static final String WALLPAPER_INTRA_CLOSE = "wallpaper_intra_close";
-    private static final String POWER_MENU_ANIMATIONS = "power_menu_animations";
-	
-	private CustomSeekBarPreference mAnimDuration;
-        private ListPreference mPowerMenuAnimations;
-	
-	ListPreference mActivityOpenPref;
-    ListPreference mActivityClosePref;
-    ListPreference mTaskOpenPref;
-    ListPreference mTaskOpenBehind;
-    ListPreference mTaskClosePref;
-    ListPreference mTaskMoveToFrontPref;
-    ListPreference mTaskMoveToBackPref;
-    ListPreference mWallpaperOpen;
-    ListPreference mWallpaperClose;
-    ListPreference mWallpaperIntraOpen;
-    ListPreference mWallpaperIntraClose;
-
-    private int[] mAnimations;
-    private String[] mAnimationsStrings;
-    private String[] mAnimationsNum;
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -88,209 +53,13 @@ public class AnimationsSettings extends SettingsPreferenceFragment implements On
         addPreferencesFromResource(R.xml.cherish_settings_animations);
 		
         ContentResolver resolver = getActivity().getContentResolver();
-		
-	mAnimDuration = (CustomSeekBarPreference) findPreference(ANIMATION_DURATION);
-        int animdef = Settings.Global.getInt(resolver,
-                Settings.Global.ANIMATION_CONTROLS_DURATION, 0);
-        mAnimDuration.setValue(animdef);
-        mAnimDuration.setOnPreferenceChangeListener(this);
-
-        mAnimations = AwesomeAnimationHelper.getAnimationsList();
-        int animqty = mAnimations.length;
-        mAnimationsStrings = new String[animqty];
-        mAnimationsNum = new String[animqty];
-        for (int i = 0; i < animqty; i++) {
-            mAnimationsStrings[i] = AwesomeAnimationHelper.getProperName(getActivity().getApplicationContext(), mAnimations[i]);
-            mAnimationsNum[i] = String.valueOf(mAnimations[i]);
-        }
-
-        mActivityOpenPref = (ListPreference) findPreference(ACTIVITY_OPEN);
-        mActivityOpenPref.setSummary(getProperSummary(mActivityOpenPref));
-        mActivityOpenPref.setEntries(mAnimationsStrings);
-        mActivityOpenPref.setEntryValues(mAnimationsNum);
-        mActivityOpenPref.setOnPreferenceChangeListener(this);
-
-        mActivityClosePref = (ListPreference) findPreference(ACTIVITY_CLOSE);
-        mActivityClosePref.setSummary(getProperSummary(mActivityClosePref));
-        mActivityClosePref.setEntries(mAnimationsStrings);
-        mActivityClosePref.setEntryValues(mAnimationsNum);
-        mActivityClosePref.setOnPreferenceChangeListener(this);
-
-        mTaskOpenPref = (ListPreference) findPreference(TASK_OPEN);
-        mTaskOpenPref.setSummary(getProperSummary(mTaskOpenPref));
-        mTaskOpenPref.setEntries(mAnimationsStrings);
-        mTaskOpenPref.setEntryValues(mAnimationsNum);
-        mTaskOpenPref.setOnPreferenceChangeListener(this);
-
-        mTaskOpenBehind = (ListPreference) findPreference(TASK_OPEN_BEHIND);
-        mTaskOpenBehind.setSummary(getProperSummary(mTaskOpenBehind));
-        mTaskOpenBehind.setEntries(mAnimationsStrings);
-        mTaskOpenBehind.setEntryValues(mAnimationsNum);
-        mTaskOpenBehind.setOnPreferenceChangeListener(this);
-
-        mTaskClosePref = (ListPreference) findPreference(TASK_CLOSE);
-        mTaskClosePref.setSummary(getProperSummary(mTaskClosePref));
-        mTaskClosePref.setEntries(mAnimationsStrings);
-        mTaskClosePref.setEntryValues(mAnimationsNum);
-        mTaskClosePref.setOnPreferenceChangeListener(this);
-
-        mTaskMoveToFrontPref = (ListPreference) findPreference(TASK_MOVE_TO_FRONT);
-        mTaskMoveToFrontPref.setSummary(getProperSummary(mTaskMoveToFrontPref));
-        mTaskMoveToFrontPref.setEntries(mAnimationsStrings);
-        mTaskMoveToFrontPref.setEntryValues(mAnimationsNum);
-        mTaskMoveToFrontPref.setOnPreferenceChangeListener(this);
-
-        mTaskMoveToBackPref = (ListPreference) findPreference(TASK_MOVE_TO_BACK);
-        mTaskMoveToBackPref.setSummary(getProperSummary(mTaskMoveToBackPref));
-        mTaskMoveToBackPref.setEntries(mAnimationsStrings);
-        mTaskMoveToBackPref.setEntryValues(mAnimationsNum);
-        mTaskMoveToBackPref.setOnPreferenceChangeListener(this);
-
-        mWallpaperOpen = (ListPreference) findPreference(WALLPAPER_OPEN);
-        mWallpaperOpen.setSummary(getProperSummary(mWallpaperOpen));
-        mWallpaperOpen.setEntries(mAnimationsStrings);
-        mWallpaperOpen.setEntryValues(mAnimationsNum);
-        mWallpaperOpen.setOnPreferenceChangeListener(this);
-
-        mWallpaperClose = (ListPreference) findPreference(WALLPAPER_CLOSE);
-        mWallpaperClose.setSummary(getProperSummary(mWallpaperClose));
-        mWallpaperClose.setEntries(mAnimationsStrings);
-        mWallpaperClose.setEntryValues(mAnimationsNum);
-        mWallpaperClose.setOnPreferenceChangeListener(this);
-
-        mWallpaperIntraOpen = (ListPreference) findPreference(WALLPAPER_INTRA_OPEN);
-        mWallpaperIntraOpen.setSummary(getProperSummary(mWallpaperIntraOpen));
-        mWallpaperIntraOpen.setEntries(mAnimationsStrings);
-        mWallpaperIntraOpen.setEntryValues(mAnimationsNum);
-        mWallpaperIntraOpen.setOnPreferenceChangeListener(this);
-
-        mWallpaperIntraClose = (ListPreference) findPreference(WALLPAPER_INTRA_CLOSE);
-        mWallpaperIntraClose.setSummary(getProperSummary(mWallpaperIntraClose));
-        mWallpaperIntraClose.setEntries(mAnimationsStrings);
-        mWallpaperIntraClose.setEntryValues(mAnimationsNum);
-        mWallpaperIntraClose.setOnPreferenceChangeListener(this);
-
-        mPowerMenuAnimations = (ListPreference) findPreference(POWER_MENU_ANIMATIONS);
-        mPowerMenuAnimations.setValue(String.valueOf(Settings.System.getInt(
-                getContentResolver(), Settings.System.POWER_MENU_ANIMATIONS, 0)));
-        mPowerMenuAnimations.setSummary(mPowerMenuAnimations.getEntry());
-        mPowerMenuAnimations.setOnPreferenceChangeListener(this);
     }
 
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
             ContentResolver resolver = getActivity().getContentResolver();
-		if (preference == mAnimDuration) {
-            int value = (Integer) newValue;
-            Settings.Global.putInt(resolver,
-                    Settings.Global.ANIMATION_CONTROLS_DURATION, value);
-            return true;
-        } else if (preference == mActivityOpenPref) {
-            int val = Integer.parseInt((String) newValue);
-            Settings.Global.putInt(resolver,
-                    Settings.Global.ACTIVITY_ANIMATION_CONTROLS[0], val);
-            preference.setSummary(getProperSummary(preference));
-            return true;
-        } else if (preference == mActivityClosePref) {
-            int val = Integer.parseInt((String) newValue);
-            Settings.Global.putInt(resolver,
-                    Settings.Global.ACTIVITY_ANIMATION_CONTROLS[1], val);
-            preference.setSummary(getProperSummary(preference));
-            return true;
-        } else if (preference == mTaskOpenPref) {
-            int val = Integer.parseInt((String) newValue);
-            Settings.Global.putInt(resolver,
-                    Settings.Global.ACTIVITY_ANIMATION_CONTROLS[2], val);
-            preference.setSummary(getProperSummary(preference));
-            return true;
-        } else if (preference == mTaskClosePref) {
-            int val = Integer.parseInt((String) newValue);
-            Settings.Global.putInt(resolver,
-                    Settings.Global.ACTIVITY_ANIMATION_CONTROLS[3], val);
-            preference.setSummary(getProperSummary(preference));
-            return true;
-        } else if (preference == mTaskMoveToFrontPref) {
-            int val = Integer.parseInt((String) newValue);
-            Settings.Global.putInt(resolver,
-                    Settings.Global.ACTIVITY_ANIMATION_CONTROLS[4], val);
-            preference.setSummary(getProperSummary(preference));
-            return true;
-        } else if (preference == mTaskMoveToBackPref) {
-            int val = Integer.parseInt((String) newValue);
-            Settings.Global.putInt(resolver,
-                    Settings.Global.ACTIVITY_ANIMATION_CONTROLS[5], val);
-            preference.setSummary(getProperSummary(preference));
-            return true;
-        } else if (preference == mWallpaperOpen) {
-            int val = Integer.parseInt((String) newValue);
-            Settings.Global.putInt(resolver,
-                    Settings.Global.ACTIVITY_ANIMATION_CONTROLS[6], val);
-            preference.setSummary(getProperSummary(preference));
-            return true;
-        } else if (preference == mWallpaperClose) {
-            int val = Integer.parseInt((String) newValue);
-            Settings.Global.putInt(resolver,
-                    Settings.Global.ACTIVITY_ANIMATION_CONTROLS[7], val);
-            preference.setSummary(getProperSummary(preference));
-            return true;
-        } else if (preference == mWallpaperIntraOpen) {
-            int val = Integer.parseInt((String) newValue);
-            Settings.Global.putInt(resolver,
-                    Settings.Global.ACTIVITY_ANIMATION_CONTROLS[8], val);
-            preference.setSummary(getProperSummary(preference));
-            return true;
-        } else if (preference == mWallpaperIntraClose) {
-            int val = Integer.parseInt((String) newValue);
-            Settings.Global.putInt(resolver,
-                    Settings.Global.ACTIVITY_ANIMATION_CONTROLS[9], val);
-            preference.setSummary(getProperSummary(preference));
-            return true;
-        } else if (preference == mTaskOpenBehind) {
-            int val = Integer.parseInt((String) newValue);
-            Settings.Global.putInt(resolver,
-                    Settings.Global.ACTIVITY_ANIMATION_CONTROLS[10], val);
-            preference.setSummary(getProperSummary(preference));
-            return true;
-        } else if (preference == mPowerMenuAnimations) {
-            Settings.System.putInt(getContentResolver(), Settings.System.POWER_MENU_ANIMATIONS,
-                    Integer.valueOf((String) newValue));
-            mPowerMenuAnimations.setValue(String.valueOf(newValue));
-            mPowerMenuAnimations.setSummary(mPowerMenuAnimations.getEntry());
-            return true;
-		}
         return false;
     }
-	
-	private String getProperSummary(Preference preference) {
-        String mString = "";
-        if (preference == mActivityOpenPref) {
-            mString = Settings.Global.ACTIVITY_ANIMATION_CONTROLS[0];
-        } else if (preference == mActivityClosePref) {
-            mString = Settings.Global.ACTIVITY_ANIMATION_CONTROLS[1];
-        } else if (preference == mTaskOpenPref) {
-            mString = Settings.Global.ACTIVITY_ANIMATION_CONTROLS[2];
-        } else if (preference == mTaskClosePref) {
-            mString = Settings.Global.ACTIVITY_ANIMATION_CONTROLS[3];
-        } else if (preference == mTaskMoveToFrontPref) {
-            mString = Settings.Global.ACTIVITY_ANIMATION_CONTROLS[4];
-        } else if (preference == mTaskMoveToBackPref) {
-            mString = Settings.Global.ACTIVITY_ANIMATION_CONTROLS[5];
-        } else if (preference == mWallpaperOpen) {
-            mString = Settings.Global.ACTIVITY_ANIMATION_CONTROLS[6];
-        } else if (preference == mWallpaperClose) {
-            mString = Settings.Global.ACTIVITY_ANIMATION_CONTROLS[7];
-        } else if (preference == mWallpaperIntraOpen) {
-            mString = Settings.Global.ACTIVITY_ANIMATION_CONTROLS[8];
-        } else if (preference == mWallpaperIntraClose) {
-            mString = Settings.Global.ACTIVITY_ANIMATION_CONTROLS[9];
-        } else if (preference == mTaskOpenBehind) {
-            mString = Settings.Global.ACTIVITY_ANIMATION_CONTROLS[10];
-        }
-
-        int mNum = Settings.Global.getInt(getActivity().getContentResolver(),
-                    mString, 0);
-        return mAnimationsStrings[mNum];
-    }
 
     @Override
     public int getMetricsCategory() {
diff --git a/src/com/cherish/settings/fragments/AudioPanelSettings.java b/src/com/cherish/settings/fragments/AudioPanelSettings.java
deleted file mode 100644
index 78c1bce..0000000
--- a/src/com/cherish/settings/fragments/AudioPanelSettings.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2014-2016 The Dirty Unicorns 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.
- */
-
-package com.cherish.settings.fragments;
-
-import android.content.Context;
-import android.content.ContentResolver;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.provider.Settings;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.SwitchPreference;
-
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.Utils;
-
-public class AudioPanelSettings extends SettingsPreferenceFragment implements
-        Preference.OnPreferenceChangeListener {
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        addPreferencesFromResource(R.xml.audio_panel);
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsProto.MetricsEvent.CHERISH_SETTINGS;
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-    }
-
-    public boolean onPreferenceChange(Preference preference, Object objValue) {
-        return true;
-    }
-
-}
diff --git a/src/com/cherish/settings/fragments/BatteryLightSettings.java b/src/com/cherish/settings/fragments/BatteryLightSettings.java
index b3718b6..69d2166 100644
--- a/src/com/cherish/settings/fragments/BatteryLightSettings.java
+++ b/src/com/cherish/settings/fragments/BatteryLightSettings.java
@@ -36,67 +36,12 @@ import net.margaritov.preference.colorpicker.ColorPickerPreference;
 public class BatteryLightSettings extends SettingsPreferenceFragment implements
         Preference.OnPreferenceChangeListener {
 
-    private ColorPickerPreference mLowColor;
-    private ColorPickerPreference mMediumColor;
-    private ColorPickerPreference mFullColor;
-    private ColorPickerPreference mReallyFullColor;
-    private SystemSettingSwitchPreference mLowBatteryBlinking;
-
-    private PreferenceCategory mColorCategory;
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.battery_light_settings);
 
         PreferenceScreen prefSet = getPreferenceScreen();
-        mColorCategory = (PreferenceCategory) findPreference("battery_light_cat");
-
-        mLowBatteryBlinking = (SystemSettingSwitchPreference)prefSet.findPreference("battery_light_low_blinking");
-        if (getResources().getBoolean(
-                        com.android.internal.R.bool.config_ledCanPulse)) {
-            mLowBatteryBlinking.setChecked(Settings.System.getIntForUser(getContentResolver(),
-                            Settings.System.BATTERY_LIGHT_LOW_BLINKING, 0, UserHandle.USER_CURRENT) == 1);
-            mLowBatteryBlinking.setOnPreferenceChangeListener(this);
-        } else {
-            prefSet.removePreference(mLowBatteryBlinking);
-        }
-
-        if (getResources().getBoolean(com.android.internal.R.bool.config_multiColorBatteryLed)) {
-            int color = Settings.System.getIntForUser(getContentResolver(),
-                    Settings.System.BATTERY_LIGHT_LOW_COLOR, 0xFFFF0000,
-                            UserHandle.USER_CURRENT);
-            mLowColor = (ColorPickerPreference) findPreference("battery_light_low_color");
-            mLowColor.setAlphaSliderEnabled(false);
-            mLowColor.setNewPreviewColor(color);
-            mLowColor.setOnPreferenceChangeListener(this);
-
-            color = Settings.System.getIntForUser(getContentResolver(),
-                    Settings.System.BATTERY_LIGHT_MEDIUM_COLOR, 0xFFFFFF00,
-                            UserHandle.USER_CURRENT);
-            mMediumColor = (ColorPickerPreference) findPreference("battery_light_medium_color");
-            mMediumColor.setAlphaSliderEnabled(false);
-            mMediumColor.setNewPreviewColor(color);
-            mMediumColor.setOnPreferenceChangeListener(this);
-
-            color = Settings.System.getIntForUser(getContentResolver(),
-                    Settings.System.BATTERY_LIGHT_FULL_COLOR, 0xFFFFFF00,
-                            UserHandle.USER_CURRENT);
-            mFullColor = (ColorPickerPreference) findPreference("battery_light_full_color");
-            mFullColor.setAlphaSliderEnabled(false);
-            mFullColor.setNewPreviewColor(color);
-            mFullColor.setOnPreferenceChangeListener(this);
-
-            color = Settings.System.getIntForUser(getContentResolver(),
-                    Settings.System.BATTERY_LIGHT_REALLYFULL_COLOR, 0xFF00FF00,
-                            UserHandle.USER_CURRENT);
-            mReallyFullColor = (ColorPickerPreference) findPreference("battery_light_reallyfull_color");
-            mReallyFullColor.setAlphaSliderEnabled(false);
-            mReallyFullColor.setNewPreviewColor(color);
-            mReallyFullColor.setOnPreferenceChangeListener(this);
-        } else {
-            prefSet.removePreference(mColorCategory);
-        }
     }
 
     @Override
@@ -105,38 +50,7 @@ public class BatteryLightSettings extends SettingsPreferenceFragment implements
     }
 
     public boolean onPreferenceChange(Preference preference, Object newValue) {
-        if (preference.equals(mLowColor)) {
-            int color = ((Integer) newValue).intValue();
-            Settings.System.putIntForUser(getContentResolver(),
-                    Settings.System.BATTERY_LIGHT_LOW_COLOR, color,
-                    UserHandle.USER_CURRENT);
-            return true;
-        } else if (preference.equals(mMediumColor)) {
-            int color = ((Integer) newValue).intValue();
-            Settings.System.putIntForUser(getContentResolver(),
-                    Settings.System.BATTERY_LIGHT_MEDIUM_COLOR, color,
-                    UserHandle.USER_CURRENT);
-            return true;
-        } else if (preference.equals(mFullColor)) {
-            int color = ((Integer) newValue).intValue();
-            Settings.System.putIntForUser(getContentResolver(),
-                    Settings.System.BATTERY_LIGHT_FULL_COLOR, color,
-                    UserHandle.USER_CURRENT);
-            return true;
-        } else if (preference.equals(mReallyFullColor)) {
-            int color = ((Integer) newValue).intValue();
-            Settings.System.putIntForUser(getContentResolver(),
-                    Settings.System.BATTERY_LIGHT_REALLYFULL_COLOR, color,
-                    UserHandle.USER_CURRENT);
-            return true;
-        } else if (preference == mLowBatteryBlinking) {
-            boolean value = (Boolean) newValue;
-            Settings.System.putIntForUser(getActivity().getContentResolver(),
-                    Settings.System.BATTERY_LIGHT_LOW_BLINKING, value ? 1 : 0,
-                    UserHandle.USER_CURRENT);
-            mLowBatteryBlinking.setChecked(value);
-            return true;
-        }
+ 
         return false;
     }
 }
diff --git a/src/com/cherish/settings/fragments/ClockSettings.java b/src/com/cherish/settings/fragments/ClockSettings.java
deleted file mode 100644
index 688ae22..0000000
--- a/src/com/cherish/settings/fragments/ClockSettings.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- * Copyright (C) 2017-2018 The Dirty Unicorns 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.
- */
-
-package com.cherish.settings.fragments;
-
-import android.app.AlertDialog;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnCancelListener;
-import android.content.res.Resources;
-import android.database.ContentObserver;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.UserHandle;
-import androidx.preference.ListPreference;
-import androidx.preference.SwitchPreference;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import android.provider.Settings;
-import android.text.format.DateFormat;
-import android.util.Log;
-import android.view.View;
-import android.widget.EditText;
-
-import com.android.internal.logging.nano.MetricsProto;
-
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.Utils;
-
-import com.cherish.settings.preferences.SystemSettingSwitchPreference;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Date;
-
-public class ClockSettings extends SettingsPreferenceFragment
-        implements Preference.OnPreferenceChangeListener {
-
-    private static final String STATUS_BAR_CLOCK_SECONDS = "status_bar_clock_seconds";
-    private static final String STATUS_BAR_CLOCK_STYLE = "statusbar_clock_style";
-    private static final String STATUS_BAR_AM_PM = "status_bar_am_pm";
-    private static final String STATUS_BAR_CLOCK_DATE_DISPLAY = "clock_date_display";
-    private static final String STATUS_BAR_CLOCK_DATE_STYLE = "clock_date_style";
-    private static final String STATUS_BAR_CLOCK_DATE_FORMAT = "clock_date_format";
-    private static final String STATUS_BAR_CLOCK_DATE_POSITION = "statusbar_clock_date_position";
-    public static final int CLOCK_DATE_STYLE_LOWERCASE = 1;
-    public static final int CLOCK_DATE_STYLE_UPPERCASE = 2;
-    private static final int CUSTOM_CLOCK_DATE_FORMAT_INDEX = 18;
-
-    private SystemSettingSwitchPreference mStatusBarSecondsShow;
-    private ListPreference mStatusBarClock;
-    private ListPreference mStatusBarAmPm;
-    private ListPreference mClockDateDisplay;
-    private ListPreference mClockDateStyle;
-    private ListPreference mClockDateFormat;
-    private ListPreference mClockDatePosition;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        addPreferencesFromResource(R.xml.cherish_settings_clock);
-        PreferenceScreen prefSet = getPreferenceScreen();
-        ContentResolver resolver = getActivity().getContentResolver();
-
-        mStatusBarSecondsShow = (SystemSettingSwitchPreference) findPreference(STATUS_BAR_CLOCK_SECONDS);
-        mStatusBarClock = (ListPreference) findPreference(STATUS_BAR_CLOCK_STYLE);
-        mStatusBarAmPm = (ListPreference) findPreference(STATUS_BAR_AM_PM);
-        mClockDateDisplay = (ListPreference) findPreference(STATUS_BAR_CLOCK_DATE_DISPLAY);
-        mClockDateStyle = (ListPreference) findPreference(STATUS_BAR_CLOCK_DATE_STYLE);
-        mClockDatePosition = (ListPreference) findPreference(STATUS_BAR_CLOCK_DATE_POSITION);
-
-        mStatusBarSecondsShow.setChecked((Settings.System.getInt(resolver,
-                Settings.System.STATUS_BAR_CLOCK_SECONDS, 0) == 1));
-        mStatusBarSecondsShow.setOnPreferenceChangeListener(this);
-
-        int clockStyle = Settings.System.getInt(resolver,
-                Settings.System.STATUSBAR_CLOCK_STYLE, 0);
-        mStatusBarClock.setValue(String.valueOf(clockStyle));
-        mStatusBarClock.setSummary(mStatusBarClock.getEntry());
-        mStatusBarClock.setOnPreferenceChangeListener(this);
-
-        if (DateFormat.is24HourFormat(getActivity())) {
-            mStatusBarAmPm.setEnabled(false);
-            mStatusBarAmPm.setSummary(R.string.status_bar_am_pm_info);
-        } else {
-            int statusBarAmPm = Settings.System.getInt(resolver,
-                    Settings.System.STATUSBAR_CLOCK_AM_PM_STYLE, 2);
-            mStatusBarAmPm.setValue(String.valueOf(statusBarAmPm));
-            mStatusBarAmPm.setSummary(mStatusBarAmPm.getEntry());
-            mStatusBarAmPm.setOnPreferenceChangeListener(this);
-        }
-
-        int clockDateDisplay = Settings.System.getInt(resolver,
-                Settings.System.STATUSBAR_CLOCK_DATE_DISPLAY, 0);
-        mClockDateDisplay.setValue(String.valueOf(clockDateDisplay));
-        mClockDateDisplay.setSummary(mClockDateDisplay.getEntry());
-        mClockDateDisplay.setOnPreferenceChangeListener(this);
-
-        int clockDateStyle = Settings.System.getInt(resolver,
-                Settings.System.STATUSBAR_CLOCK_DATE_STYLE, 0);
-        mClockDateStyle.setValue(String.valueOf(clockDateStyle));
-        mClockDateStyle.setSummary(mClockDateStyle.getEntry());
-        mClockDateStyle.setOnPreferenceChangeListener(this);
-
-        mClockDateFormat = (ListPreference) findPreference(STATUS_BAR_CLOCK_DATE_FORMAT);
-        mClockDateFormat.setOnPreferenceChangeListener(this);
-        String value = Settings.System.getString(getActivity().getContentResolver(),
-                Settings.System.STATUSBAR_CLOCK_DATE_FORMAT);
-        if (value == null || value.isEmpty()) {
-            value = "EEE";
-        }
-        int index = mClockDateFormat.findIndexOfValue((String) value);
-        if (index == -1) {
-            mClockDateFormat.setValueIndex(CUSTOM_CLOCK_DATE_FORMAT_INDEX);
-        } else {
-            mClockDateFormat.setValue(value);
-        }
-
-        parseClockDateFormats();
-
-        int clockDatePosition = Settings.System.getInt(resolver,
-                Settings.System.STATUSBAR_CLOCK_DATE_POSITION, 0);
-        mClockDatePosition.setValue(String.valueOf(clockDatePosition));
-        mClockDatePosition.setSummary(mClockDatePosition.getEntry());
-        mClockDatePosition.setOnPreferenceChangeListener(this);
-
-        setDateOptions();
-
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsProto.MetricsEvent.CHERISH_SETTINGS;
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        AlertDialog dialog;
-	    ContentResolver resolver = getActivity().getContentResolver();
-        if (preference == mStatusBarSecondsShow) {
-            boolean value = (Boolean) newValue;
-            Settings.System.putInt(getActivity().getContentResolver(),
-                    Settings.System.STATUS_BAR_CLOCK_SECONDS, value ? 1 : 0);
-            return true;
-        } else if (preference == mStatusBarClock) {
-            int clockStyle = Integer.parseInt((String) newValue);
-            int index = mStatusBarClock.findIndexOfValue((String) newValue);
-            Settings.System.putInt(getActivity().getContentResolver(),
-                    Settings.System.STATUSBAR_CLOCK_STYLE, clockStyle);
-            mStatusBarClock.setSummary(mStatusBarClock.getEntries()[index]);
-            return true;
-        } else if (preference == mStatusBarAmPm) {
-            int statusBarAmPm = Integer.valueOf((String) newValue);
-            int index = mStatusBarAmPm.findIndexOfValue((String) newValue);
-            Settings.System.putInt(getActivity().getContentResolver(),
-                    Settings.System.STATUSBAR_CLOCK_AM_PM_STYLE, statusBarAmPm);
-            mStatusBarAmPm.setSummary(mStatusBarAmPm.getEntries()[index]);
-            return true;
-        } else if (preference == mClockDateDisplay) {
-            int clockDateDisplay = Integer.valueOf((String) newValue);
-            int index = mClockDateDisplay.findIndexOfValue((String) newValue);
-            Settings.System.putInt(getActivity().getContentResolver(),
-                    Settings.System.STATUSBAR_CLOCK_DATE_DISPLAY, clockDateDisplay);
-            mClockDateDisplay.setSummary(mClockDateDisplay.getEntries()[index]);
-            setDateOptions();
-            return true;
-        } else if (preference == mClockDateStyle) {
-            int clockDateStyle = Integer.valueOf((String) newValue);
-            int index = mClockDateStyle.findIndexOfValue((String) newValue);
-            Settings.System.putInt(getActivity().getContentResolver(),
-                    Settings.System.STATUSBAR_CLOCK_DATE_STYLE, clockDateStyle);
-            mClockDateStyle.setSummary(mClockDateStyle.getEntries()[index]);
-            parseClockDateFormats();
-            return true;
-        } else if (preference == mClockDateFormat) {
-            int index = mClockDateFormat.findIndexOfValue((String) newValue);
-
-            if (index == CUSTOM_CLOCK_DATE_FORMAT_INDEX) {
-                AlertDialog.Builder alert = new AlertDialog.Builder(getActivity());
-                alert.setTitle(R.string.clock_date_string_edittext_title);
-                alert.setMessage(R.string.clock_date_string_edittext_summary);
-
-                final EditText input = new EditText(getActivity());
-                String oldText = Settings.System.getString(
-                    getActivity().getContentResolver(),
-                    Settings.System.STATUSBAR_CLOCK_DATE_FORMAT);
-                if (oldText != null) {
-                    input.setText(oldText);
-                }
-                alert.setView(input);
-
-                alert.setPositiveButton(R.string.menu_save, new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface dialogInterface, int whichButton) {
-                        String value = input.getText().toString();
-                        if (value.equals("")) {
-                            return;
-                        }
-                        Settings.System.putString(getActivity().getContentResolver(),
-                            Settings.System.STATUSBAR_CLOCK_DATE_FORMAT, value);
-                        return;
-                    }
-                });
-
-                alert.setNegativeButton(R.string.menu_cancel,
-                    new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface dialogInterface, int which) {
-                        return;
-                    }
-                });
-                dialog = alert.create();
-                dialog.show();
-            } else {
-                if ((String) newValue != null) {
-                    Settings.System.putString(getActivity().getContentResolver(),
-                        Settings.System.STATUSBAR_CLOCK_DATE_FORMAT, (String) newValue);
-                }
-            }
-            return true;
-        } else if (preference == mClockDatePosition) {
-            int val = Integer.parseInt((String) newValue);
-            int index = mClockDatePosition.findIndexOfValue((String) newValue);
-            Settings.System.putInt(getActivity().getContentResolver(),
-                    Settings.System.STATUSBAR_CLOCK_DATE_POSITION, val);
-            mClockDatePosition.setSummary(mClockDatePosition.getEntries()[index]);
-            parseClockDateFormats();
-            return true;
-        } else if (preference == mClockDatePosition) {
-            int val = Integer.parseInt((String) newValue);
-            int index = mClockDatePosition.findIndexOfValue((String) newValue);
-            Settings.System.putInt(getActivity().getContentResolver(),
-                    Settings.System.STATUSBAR_CLOCK_DATE_POSITION, val);
-            mClockDatePosition.setSummary(mClockDatePosition.getEntries()[index]);
-            parseClockDateFormats();
-            return true;
-      	}
-        return false;
-    }
-
-    private void parseClockDateFormats() {
-        String[] dateEntries = getResources().getStringArray(R.array.clock_date_format_entries_values);
-        CharSequence parsedDateEntries[];
-        parsedDateEntries = new String[dateEntries.length];
-        Date now = new Date();
-
-        int lastEntry = dateEntries.length - 1;
-        int dateFormat = Settings.System.getInt(getActivity()
-                .getContentResolver(), Settings.System.STATUSBAR_CLOCK_DATE_STYLE, 0);
-        for (int i = 0; i < dateEntries.length; i++) {
-            if (i == lastEntry) {
-                parsedDateEntries[i] = dateEntries[i];
-            } else {
-                String newDate;
-                CharSequence dateString = DateFormat.format(dateEntries[i], now);
-                if (dateFormat == CLOCK_DATE_STYLE_LOWERCASE) {
-                    newDate = dateString.toString().toLowerCase();
-                } else if (dateFormat == CLOCK_DATE_STYLE_UPPERCASE) {
-                    newDate = dateString.toString().toUpperCase();
-                } else {
-                    newDate = dateString.toString();
-                }
-
-                parsedDateEntries[i] = newDate;
-            }
-        }
-        mClockDateFormat.setEntries(parsedDateEntries);
-    }
-
-    private void setDateOptions() {
-        int enableDateOptions = Settings.System.getInt(getActivity().getContentResolver(),
-                Settings.System.STATUSBAR_CLOCK_DATE_DISPLAY, 0);
-        if (enableDateOptions == 0) {
-            mClockDateStyle.setEnabled(false);
-            mClockDateFormat.setEnabled(false);
-            mClockDatePosition.setEnabled(false);
-        } else {
-            mClockDateStyle.setEnabled(true);
-            mClockDateFormat.setEnabled(true);
-            mClockDatePosition.setEnabled(true);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/com/cherish/settings/fragments/CustomCarrierLabel.java b/src/com/cherish/settings/fragments/CustomCarrierLabel.java
deleted file mode 100644
index 5e1207d..0000000
--- a/src/com/cherish/settings/fragments/CustomCarrierLabel.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (C) 2020 CherishOS
- *
- * 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.
- */
-package com.cherish.settings.fragments;
-
-import android.app.AlertDialog;
-import android.content.ContentResolver;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnCancelListener;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.provider.Settings;
-import android.text.InputFilter;
-import android.text.Spannable;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.View;
-import android.widget.EditText;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-import android.widget.LinearLayout;
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.internal.util.cherish.CherishUtils;
-
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-
-import com.cherish.settings.preferences.SystemSettingListPreference;
-
-public class CustomCarrierLabel extends SettingsPreferenceFragment
-        implements Preference.OnPreferenceChangeListener {
-
-    public static final String TAG = "CarrierLabel";
-    private static final String CUSTOM_CARRIER_LABEL = "custom_carrier_label";
-    private static final String KEY_CARRIER_LABEL = "status_bar_show_carrier";
-
-    private PreferenceScreen mCustomCarrierLabel;
-    private String mCustomCarrierLabelText;
-    private SystemSettingListPreference mShowCarrierLabel;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        ContentResolver resolver = getActivity().getContentResolver();
-
-        addPreferencesFromResource(R.xml.custom_carrier_label);
-        PreferenceScreen prefSet = getPreferenceScreen();
-
-        mCustomCarrierLabel = (PreferenceScreen) findPreference(CUSTOM_CARRIER_LABEL);
-        updateCustomLabelTextSummary();
-
-        mShowCarrierLabel = (SystemSettingListPreference) findPreference(KEY_CARRIER_LABEL);
-        int showCarrierLabel = Settings.System.getInt(resolver,
-        Settings.System.STATUS_BAR_SHOW_CARRIER, 1);
-        CharSequence[] NonNotchEntries = { getResources().getString(R.string.show_carrier_disabled),
-                getResources().getString(R.string.show_carrier_keyguard),
-                getResources().getString(R.string.show_carrier_statusbar), getResources().getString(
-                        R.string.show_carrier_enabled) };
-        CharSequence[] NotchEntries = { getResources().getString(R.string.show_carrier_disabled),
-                getResources().getString(R.string.show_carrier_keyguard) };
-        CharSequence[] NonNotchValues = {"0", "1" , "2", "3"};
-        CharSequence[] NotchValues = {"0", "1"};
-        mShowCarrierLabel.setEntries(CherishUtils.hasNotch(getActivity()) ? NotchEntries : NonNotchEntries);
-        mShowCarrierLabel.setEntryValues(CherishUtils.hasNotch(getActivity()) ? NotchValues : NonNotchValues);
-        mShowCarrierLabel.setValue(String.valueOf(showCarrierLabel));
-        mShowCarrierLabel.setSummary(mShowCarrierLabel.getEntry());
-        mShowCarrierLabel.setOnPreferenceChangeListener(this);
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
- 		ContentResolver resolver = getActivity().getContentResolver();
-        if (preference == mShowCarrierLabel) {
-            int value = Integer.parseInt((String) newValue);
-            updateCarrierLabelSummary(value);
-            return true;
-        }
-        return false;
-    }
-
-    private void updateCarrierLabelSummary(int value) {
-        Resources res = getResources();
-
-        if (value == 0) {
-            // Carrier Label disabled
-            mShowCarrierLabel.setSummary(res.getString(R.string.show_carrier_disabled));
-        } else if (value == 1) {
-            mShowCarrierLabel.setSummary(res.getString(R.string.show_carrier_keyguard));
-        } else if (value == 2) {
-            mShowCarrierLabel.setSummary(res.getString(R.string.show_carrier_statusbar));
-        } else if (value == 3) {
-            mShowCarrierLabel.setSummary(res.getString(R.string.show_carrier_enabled));
-        }
-    }
-
-    public boolean onPreferenceTreeClick(Preference preference) {
-        ContentResolver resolver = getActivity().getContentResolver();
-        boolean value;
-        if (preference == mCustomCarrierLabel) {
-            AlertDialog.Builder alert = new AlertDialog.Builder(getActivity());
-            alert.setTitle(R.string.custom_carrier_label_title);
-            alert.setMessage(R.string.custom_carrier_label_explain);
-            LinearLayout container = new LinearLayout(getActivity());
-            container.setOrientation(LinearLayout.VERTICAL);
-            LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(
-                    LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.WRAP_CONTENT);
-            lp.setMargins(55, 20, 55, 20);
-            final EditText input = new EditText(getActivity());
-            int maxLength = 25;
-            input.setLayoutParams(lp);
-            input.setGravity(android.view.Gravity.TOP| Gravity.START);
-            input.setText(TextUtils.isEmpty(mCustomCarrierLabelText) ? "" : mCustomCarrierLabelText);
-            input.setFilters(new InputFilter[] {new InputFilter.LengthFilter(maxLength)});
-            container.addView(input);
-            alert.setView(container);
-            alert.setPositiveButton(getString(android.R.string.ok),
-                    new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int whichButton) {
-                            String value = ((Spannable) input.getText()).toString().trim();
-                            Settings.System.putString(resolver, Settings.System.CUSTOM_CARRIER_LABEL, value);
-                            updateCustomLabelTextSummary();
-                            Intent i = new Intent();
-                            i.setAction(Intent.ACTION_CUSTOM_CARRIER_LABEL_CHANGED);
-                            getActivity().sendBroadcast(i);
-                }
-            });
-            alert.setNegativeButton(getString(android.R.string.cancel), null);
-            alert.show();
-            return true;
-        }
-        return false;
-    }
-
-    private void updateCustomLabelTextSummary() {
-        mCustomCarrierLabelText = Settings.System.getString(
-            getContentResolver(), Settings.System.CUSTOM_CARRIER_LABEL);
-        if (TextUtils.isEmpty(mCustomCarrierLabelText)) {
-            mCustomCarrierLabel.setSummary(R.string.custom_carrier_label_notset);
-        } else {
-            mCustomCarrierLabel.setSummary(mCustomCarrierLabelText);
-        }
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsProto.MetricsEvent.CHERISH_SETTINGS;
-    }
-}
diff --git a/src/com/cherish/settings/fragments/EdgePulse.java b/src/com/cherish/settings/fragments/EdgePulse.java
deleted file mode 100644
index c1f7988..0000000
--- a/src/com/cherish/settings/fragments/EdgePulse.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (C) 2020 CherishOS
- *
- * 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.
- */
-
-package com.cherish.settings.fragments;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.provider.Settings;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
-import com.android.internal.logging.nano.MetricsProto;
-
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-
-import net.margaritov.preference.colorpicker.ColorPickerPreference;
-
-public class EdgePulse extends SettingsPreferenceFragment implements
-        OnPreferenceChangeListener {
-
-    private static final String PULSE_AMBIENT_LIGHT_COLOR_LEFT = "pulse_ambient_light_color_left";
-    private static final String PULSE_AMBIENT_LIGHT_COLOR_RIGHT = "pulse_ambient_light_color_right";
-    private static final String AMBIENT_NOTIFICATION_LIGHT_ENABLED = "ambient_notification_light_enabled";
-    private static final String AMBIENT_NOTIFICATION_LIGHT_HIDE_AOD = "ambient_notification_light_hide_aod";
-
-    private ColorPickerPreference mLeftEdgeLightColorPreference;
-    private ColorPickerPreference mRightEdgeLightColorPreference;
-    private SwitchPreference mAmbientNotifLight;
-    private SwitchPreference mAmbientContentHide;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        addPreferencesFromResource(R.xml.edgepulse_settings);
-
-        ContentResolver resolver = getActivity().getContentResolver();
-        PreferenceScreen prefScreen = getPreferenceScreen();
-
-        mLeftEdgeLightColorPreference = (ColorPickerPreference) findPreference(PULSE_AMBIENT_LIGHT_COLOR_LEFT);
-        mLeftEdgeLightColorPreference.setOnPreferenceChangeListener(this);
-        int leftEdgeLightColor = Settings.System.getInt(getContentResolver(),
-                Settings.System.PULSE_AMBIENT_LIGHT_COLOR_LEFT, 0xFF3980FF);
-        String leftEdgeLightColorHex = String.format("#%08x", (0xFF3980FF & leftEdgeLightColor));
-        if (leftEdgeLightColorHex.equals("#ff3980ff")) {
-            mLeftEdgeLightColorPreference.setSummary(R.string.default_string);
-        } else {
-            mLeftEdgeLightColorPreference.setSummary(leftEdgeLightColorHex);
-        }
-        mLeftEdgeLightColorPreference.setNewPreviewColor(leftEdgeLightColor);
-
-        mRightEdgeLightColorPreference = (ColorPickerPreference) findPreference(PULSE_AMBIENT_LIGHT_COLOR_RIGHT);
-        mRightEdgeLightColorPreference.setOnPreferenceChangeListener(this);
-        int rightEdgeLightColor = Settings.System.getInt(getContentResolver(),
-                Settings.System.PULSE_AMBIENT_LIGHT_COLOR_RIGHT, 0xFF3980FF);
-        String rightEdgeLightColorHex = String.format("#%08x", (0xFF3980FF & rightEdgeLightColor));
-        if (rightEdgeLightColorHex.equals("#ff3980ff")) {
-            mRightEdgeLightColorPreference.setSummary(R.string.default_string);
-        } else {
-            mRightEdgeLightColorPreference.setSummary(rightEdgeLightColorHex);
-        }
-        mRightEdgeLightColorPreference.setNewPreviewColor(rightEdgeLightColor);
-
-        mAmbientNotifLight = (SwitchPreference) findPreference(AMBIENT_NOTIFICATION_LIGHT_ENABLED);
-        mAmbientContentHide = (SwitchPreference) findPreference(AMBIENT_NOTIFICATION_LIGHT_HIDE_AOD);
-        boolean mAlwaysOnByDefault = getResources().getBoolean(com.android.internal.R.bool.config_dozeAlwaysOnEnabled);
-        boolean mAODDisabled = Settings.Secure.getIntForUser(resolver,
-                Settings.Secure.DOZE_ALWAYS_ON, mAlwaysOnByDefault ? 1 : 0,
-                UserHandle.USER_CURRENT) == 0;
-        if (!getResources().getBoolean(com.android.internal.R.bool.config_dozeAlwaysOnDisplayAvailable)) {
-            prefScreen.removePreference(mAmbientNotifLight);
-            prefScreen.removePreference(mAmbientContentHide);
-        } else if (!mAODDisabled) {
-            prefScreen.removePreference(mAmbientContentHide);
-        }
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        ContentResolver resolver = getActivity().getContentResolver();
-        if (preference == mLeftEdgeLightColorPreference) {
-            String hex = ColorPickerPreference.convertToARGB(
-                    Integer.valueOf(String.valueOf(newValue)));
-            if (hex.equals("#ff3980ff")) {
-                preference.setSummary(R.string.default_string);
-            } else {
-                preference.setSummary(hex);
-            }
-            int intHex = ColorPickerPreference.convertToColorInt(hex);
-            Settings.System.putInt(getContentResolver(),
-                    Settings.System.PULSE_AMBIENT_LIGHT_COLOR_LEFT, intHex);
-            return true;
-        } else if (preference == mRightEdgeLightColorPreference) {
-            String hex = ColorPickerPreference.convertToARGB(
-                    Integer.valueOf(String.valueOf(newValue)));
-            if (hex.equals("#ff3980ff")) {
-                preference.setSummary(R.string.default_string);
-            } else {
-                preference.setSummary(hex);
-            }
-            int intHex = ColorPickerPreference.convertToColorInt(hex);
-            Settings.System.putInt(getContentResolver(),
-                    Settings.System.PULSE_AMBIENT_LIGHT_COLOR_RIGHT, intHex);
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsProto.MetricsEvent.CHERISH_SETTINGS;
-    }
-}
diff --git a/src/com/cherish/settings/fragments/FODIconPickerFragment.java b/src/com/cherish/settings/fragments/FODIconPickerFragment.java
deleted file mode 100644
index 6705f56..0000000
--- a/src/com/cherish/settings/fragments/FODIconPickerFragment.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2020 The CherishOS 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.
- */
-
-package com.cherish.settings.fragments;
-
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.provider.Settings;
-
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-
-import com.android.internal.logging.nano.MetricsProto;
-
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-
-public class FODIconPickerFragment extends SettingsPreferenceFragment {
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        addPreferencesFromResource(R.xml.cherish_settings_fod_picker);
-
-        getActivity().getActionBar().setTitle(R.string.fod_icon_picker_title);
-
-        mFooterPreferenceMixin.createFooterPreference().setTitle(R.string.fod_icon_picker_footer);
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsProto.MetricsEvent.CHERISH_SETTINGS;
-    }
-}
diff --git a/src/com/cherish/settings/fragments/GamingMode.java b/src/com/cherish/settings/fragments/GamingMode.java
deleted file mode 100644
index 4c6d82e..0000000
--- a/src/com/cherish/settings/fragments/GamingMode.java
+++ /dev/null
@@ -1,342 +0,0 @@
-/*
- * 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.
- */
-
-package com.cherish.settings.fragments;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.database.ContentObserver;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.UserHandle;
-import android.provider.Settings;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ListView;
-
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-
-import com.cherish.settings.preferences.PackageListAdapter;
-import com.cherish.settings.preferences.PackageListAdapter.PackageItem;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class GamingMode extends SettingsPreferenceFragment
-        implements Preference.OnPreferenceClickListener {
-
-    private static final int DIALOG_GAMING_APPS = 1;
-    private static final String GAMING_MODE_HW_KEYS = "gaming_mode_hw_keys_toggle";
-
-    private SwitchPreference mHardwareKeysDisable;
-
-    private PackageListAdapter mPackageAdapter;
-    private PackageManager mPackageManager;
-    private PreferenceGroup mGamingPrefList;
-    private Preference mAddGamingPref;
-
-    private String mGamingPackageList;
-    private Map<String, Package> mGamingPackages;
-    private Context mContext;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        // Get launch-able applications
-        addPreferencesFromResource(R.xml.cherish_settings_gaming_mode);
-
-        mFooterPreferenceMixin.createFooterPreference().setTitle(R.string.add_gaming_mode_package_summary);
-
-        final PreferenceScreen prefScreen = getPreferenceScreen();
-
-        mHardwareKeysDisable = (SwitchPreference) findPreference(GAMING_MODE_HW_KEYS);
-
-        mPackageManager = getPackageManager();
-        mPackageAdapter = new PackageListAdapter(getActivity());
-
-        mGamingPrefList = (PreferenceGroup) findPreference("gamingmode_applications");
-        mGamingPrefList.setOrderingAsAdded(false);
-
-        mGamingPackages = new HashMap<String, Package>();
-
-        mAddGamingPref = findPreference("add_gamingmode_packages");
-
-        mAddGamingPref.setOnPreferenceClickListener(this);
-
-        mContext = getActivity().getApplicationContext();
-
-        SettingsObserver observer = new SettingsObserver(new Handler(Looper.getMainLooper()));
-        observer.observe();
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        refreshCustomApplicationPrefs();
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsProto.MetricsEvent.CHERISH_SETTINGS;
-    }
-
-    @Override
-    public int getDialogMetricsCategory(int dialogId) {
-        if (dialogId == DIALOG_GAMING_APPS) {
-            return MetricsProto.MetricsEvent.CHERISH_SETTINGS;
-        }
-        return 0;
-    }
-
-    /**
-     * Utility classes and supporting methods
-     */
-    @Override
-    public Dialog onCreateDialog(int id) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        final Dialog dialog;
-        final ListView list = new ListView(getActivity());
-        list.setAdapter(mPackageAdapter);
-
-        builder.setTitle(R.string.profile_choose_app);
-        builder.setView(list);
-        dialog = builder.create();
-
-        switch (id) {
-            case DIALOG_GAMING_APPS:
-                list.setOnItemClickListener(new OnItemClickListener() {
-                    @Override
-                    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                        // Add empty application definition, the user will be able to edit it later
-                        PackageItem info = (PackageItem) parent.getItemAtPosition(position);
-                        addCustomApplicationPref(info.packageName, mGamingPackages);
-                        dialog.cancel();
-                    }
-                });
-        }
-        return dialog;
-    }
-
-    class SettingsObserver extends ContentObserver {
-        SettingsObserver(Handler handler) {
-            super(handler);
-        }
-
-        void observe() {
-            ContentResolver resolver = mContext.getContentResolver();
-
-            resolver.registerContentObserver(Settings.System.getUriFor(
-                    Settings.System.GAMING_MODE_ACTIVE), false, this,
-                    UserHandle.USER_ALL);
-        }
-
-        @Override
-        public void onChange(boolean selfChange, Uri uri) {
-            if (uri.equals(Settings.System.getUriFor(
-                                   Settings.System.GAMING_MODE_ACTIVE))) {
-                boolean enable = Settings.System.getInt(mContext.getContentResolver(),
-                    Settings.System.GAMING_MODE_ACTIVE, 0) == 1;
-            }
-        }
-    }
-
-    /**
-     * Application class
-     */
-    private static class Package {
-        public String name;
-        /**
-         * Stores all the application values in one call
-         * @param name
-         */
-        public Package(String name) {
-            this.name = name;
-        }
-
-        public String toString() {
-            StringBuilder builder = new StringBuilder();
-            builder.append(name);
-            return builder.toString();
-        }
-
-        public static Package fromString(String value) {
-            if (TextUtils.isEmpty(value)) {
-                return null;
-            }
-
-            try {
-                Package item = new Package(value);
-                return item;
-            } catch (NumberFormatException e) {
-                return null;
-            }
-        }
-
-    };
-
-    private void refreshCustomApplicationPrefs() {
-        if (!parsePackageList()) {
-            return;
-        }
-
-        // Add the Application Preferences
-        if (mGamingPrefList != null) {
-            mGamingPrefList.removeAll();
-
-            for (Package pkg : mGamingPackages.values()) {
-                try {
-                    Preference pref = createPreferenceFromInfo(pkg);
-                    mGamingPrefList.addPreference(pref);
-                } catch (PackageManager.NameNotFoundException e) {
-                    // Do nothing
-                }
-            }
-        }
-
-        // Keep these at the top
-        mAddGamingPref.setOrder(0);
-        // Add 'add' options
-        mGamingPrefList.addPreference(mAddGamingPref);
-    }
-
-    @Override
-    public boolean onPreferenceClick(Preference preference) {
-        if (preference == mAddGamingPref) {
-            showDialog(DIALOG_GAMING_APPS);
-        } else {
-            AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
-                    .setTitle(R.string.dialog_delete_title)
-                    .setMessage(R.string.dialog_delete_message)
-                    .setIconAttribute(android.R.attr.alertDialogIcon)
-                    .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            if (preference == mGamingPrefList.findPreference(preference.getKey())) {
-                                removeApplicationPref(preference.getKey(), mGamingPackages);
-                            }
-                        }
-                    })
-                    .setNegativeButton(android.R.string.cancel, null);
-
-            builder.show();
-        }
-        return true;
-    }
-
-    private void addCustomApplicationPref(String packageName, Map<String,Package> map) {
-        Package pkg = map.get(packageName);
-        if (pkg == null) {
-            pkg = new Package(packageName);
-            map.put(packageName, pkg);
-            savePackageList(false, map);
-            refreshCustomApplicationPrefs();
-        }
-    }
-
-    private Preference createPreferenceFromInfo(Package pkg)
-            throws PackageManager.NameNotFoundException {
-        PackageInfo info = mPackageManager.getPackageInfo(pkg.name,
-                PackageManager.GET_META_DATA);
-        Preference pref =
-                new Preference(getActivity());
-
-        pref.setKey(pkg.name);
-        pref.setTitle(info.applicationInfo.loadLabel(mPackageManager));
-        pref.setIcon(info.applicationInfo.loadIcon(mPackageManager));
-        pref.setPersistent(false);
-        pref.setOnPreferenceClickListener(this);
-        return pref;
-    }
-
-    private void removeApplicationPref(String packageName, Map<String,Package> map) {
-        if (map.remove(packageName) != null) {
-            savePackageList(false, map);
-            refreshCustomApplicationPrefs();
-        }
-    }
-
-    private boolean parsePackageList() {
-        boolean parsed = false;
-
-        final String gamingModeString = Settings.System.getString(getContentResolver(),
-                Settings.System.GAMING_MODE_VALUES);
-
-        if (!TextUtils.equals(mGamingPackageList, gamingModeString)) {
-            mGamingPackageList = gamingModeString;
-            mGamingPackages.clear();
-            parseAndAddToMap(gamingModeString, mGamingPackages);
-            parsed = true;
-        }
-
-        return parsed;
-    }
-
-    private void parseAndAddToMap(String baseString, Map<String,Package> map) {
-        if (baseString == null) {
-            return;
-        }
-
-        final String[] array = TextUtils.split(baseString, "\\|");
-        for (String item : array) {
-            if (TextUtils.isEmpty(item)) {
-                continue;
-            }
-            Package pkg = Package.fromString(item);
-            map.put(pkg.name, pkg);
-        }
-    }
-
-
-    private void savePackageList(boolean preferencesUpdated, Map<String,Package> map) {
-        String setting = map == mGamingPackages ? Settings.System.GAMING_MODE_VALUES : Settings.System.GAMING_MODE_DUMMY;
-
-        List<String> settings = new ArrayList<String>();
-        for (Package app : map.values()) {
-            settings.add(app.toString());
-        }
-        final String value = TextUtils.join("|", settings);
-        if (preferencesUpdated) {
-            if (TextUtils.equals(setting, Settings.System.GAMING_MODE_VALUES)) {
-                mGamingPackageList = value;
-            }
-        }
-        Settings.System.putString(getContentResolver(),
-                setting, value);
-    }
-}
diff --git a/src/com/cherish/settings/fragments/GamingModeReceiver.java b/src/com/cherish/settings/fragments/GamingModeReceiver.java
deleted file mode 100644
index abf08d2..0000000
--- a/src/com/cherish/settings/fragments/GamingModeReceiver.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 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.
- */
-
-package com.cherish.settings.fragments;
-
-import android.app.AlertDialog;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.provider.Settings;
-import android.util.Log;
-import android.text.TextUtils;
-
-import com.android.settings.R;
-import com.android.internal.util.gaming.GamingModeController;
-
-public class GamingModeReceiver extends BroadcastReceiver {
-
-    private static final String TAG = "GamingModeReceiver";
-    private static final boolean DEBUG = false;
-
-    public GamingModeReceiver() {
-    }
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        if (intent.getAction() != null &&
-                intent.getAction().equals(GamingModeController.GAMING_MODE_TURN_OFF)) {
-            if (DEBUG) Log.d(TAG, "Received " + GamingModeController.GAMING_MODE_TURN_OFF);
-            Settings.System.putInt(context.getContentResolver(), Settings.System.GAMING_MODE_ACTIVE, 0);
-        } else if (intent.getAction() != null &&
-                intent.getAction().equals(GamingModeController.GAMING_MODE_TURN_ON)) {
-            if (DEBUG) Log.d(TAG, "Received " + GamingModeController.GAMING_MODE_TURN_ON);
-            Settings.System.putInt(context.getContentResolver(), Settings.System.GAMING_MODE_ACTIVE, 1);
-        }
-    }
-}
diff --git a/src/com/cherish/settings/fragments/HeadsUp.java b/src/com/cherish/settings/fragments/HeadsUp.java
deleted file mode 100644
index 9a255f3..0000000
--- a/src/com/cherish/settings/fragments/HeadsUp.java
+++ /dev/null
@@ -1,411 +0,0 @@
-/*
- * Copyright (C) 2014 The Nitrogen 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.
- */
-
-package com.cherish.settings.fragments;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.DialogInterface;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.res.Resources;
-import android.os.Bundle;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.PreferenceViewHolder;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ListView;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-import com.cherish.settings.preferences.PackageListAdapter;
-import com.cherish.settings.preferences.PackageListAdapter.PackageItem;
-import android.provider.Settings;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class HeadsUp extends SettingsPreferenceFragment
-        implements Preference.OnPreferenceClickListener, Preference.OnPreferenceChangeListener {
-
-    private static final int DIALOG_STOPLIST_APPS = 0;
-    private static final int DIALOG_BLACKLIST_APPS = 1;
-    private static final String PREF_HEADS_UP_TIME_OUT = "heads_up_time_out";
-    private static final String PREF_HEADS_UP_SNOOZE_TIME = "heads_up_snooze_time";
-
-    private PackageListAdapter mPackageAdapter;
-    private PackageManager mPackageManager;
-    private PreferenceGroup mStoplistPrefList;
-    private PreferenceGroup mBlacklistPrefList;
-    private Preference mAddStoplistPref;
-    private Preference mAddBlacklistPref;
-    private ListPreference mHeadsUpTimeOut;
-    private ListPreference mHeadsUpSnoozeTime;
-
-    private String mStoplistPackageList;
-    private String mBlacklistPackageList;
-    private Map<String, Package> mStoplistPackages;
-    private Map<String, Package> mBlacklistPackages;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        // Get launch-able applications
-        addPreferencesFromResource(R.xml.heads_up_settings);
-        mPackageManager = getPackageManager();
-        mPackageAdapter = new PackageListAdapter(getActivity());
-
-        mStoplistPrefList = (PreferenceGroup) findPreference("stoplist_applications");
-        mStoplistPrefList.setOrderingAsAdded(false);
-
-        mBlacklistPrefList = (PreferenceGroup) findPreference("blacklist_applications");
-        mBlacklistPrefList.setOrderingAsAdded(false);
-
-        mStoplistPackages = new HashMap<String, Package>();
-        mBlacklistPackages = new HashMap<String, Package>();
-
-        mAddStoplistPref = findPreference("add_stoplist_packages");
-        mAddBlacklistPref = findPreference("add_blacklist_packages");
-
-        mAddStoplistPref.setOnPreferenceClickListener(this);
-        mAddBlacklistPref.setOnPreferenceClickListener(this);
-
-        Resources systemUiResources;
-        try {
-            systemUiResources = getPackageManager().getResourcesForApplication("com.android.systemui");
-        } catch (Exception e) {
-            return;
-        }
-
-        int defaultTimeOut = systemUiResources.getInteger(systemUiResources.getIdentifier(
-                    "com.android.systemui:integer/heads_up_notification_decay", null, null));
-        mHeadsUpTimeOut = (ListPreference) findPreference(PREF_HEADS_UP_TIME_OUT);
-        mHeadsUpTimeOut.setOnPreferenceChangeListener(this);
-        int headsUpTimeOut = Settings.System.getInt(getContentResolver(),
-                Settings.System.HEADS_UP_TIMEOUT, defaultTimeOut);
-        mHeadsUpTimeOut.setValue(String.valueOf(headsUpTimeOut));
-        updateHeadsUpTimeOutSummary(headsUpTimeOut);
-
-        int defaultSnooze = systemUiResources.getInteger(systemUiResources.getIdentifier(
-                    "com.android.systemui:integer/heads_up_default_snooze_length_ms", null, null));
-        mHeadsUpSnoozeTime = (ListPreference) findPreference(PREF_HEADS_UP_SNOOZE_TIME);
-        mHeadsUpSnoozeTime.setOnPreferenceChangeListener(this);
-        int headsUpSnooze = Settings.System.getInt(getContentResolver(),
-                Settings.System.HEADS_UP_NOTIFICATION_SNOOZE, defaultSnooze);
-        mHeadsUpSnoozeTime.setValue(String.valueOf(headsUpSnooze));
-        updateHeadsUpSnoozeTimeSummary(headsUpSnooze);
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        if (preference == mHeadsUpTimeOut) {
-            int headsUpTimeOut = Integer.valueOf((String) newValue);
-            Settings.System.putInt(getContentResolver(),
-                    Settings.System.HEADS_UP_TIMEOUT,
-                    headsUpTimeOut);
-            updateHeadsUpTimeOutSummary(headsUpTimeOut);
-            return true;
-        } else if (preference == mHeadsUpSnoozeTime) {
-            int headsUpSnooze = Integer.valueOf((String) newValue);
-            Settings.System.putInt(getContentResolver(),
-                    Settings.System.HEADS_UP_NOTIFICATION_SNOOZE,
-                    headsUpSnooze);
-            updateHeadsUpSnoozeTimeSummary(headsUpSnooze);
-            return true;
-        }
-        return false;
-    }
-
-    private void updateHeadsUpTimeOutSummary(int value) {
-        String summary = getResources().getString(R.string.heads_up_time_out_summary,
-                value / 1000);
-        mHeadsUpTimeOut.setSummary(summary);
-    }
-
-    private void updateHeadsUpSnoozeTimeSummary(int value) {
-        if (value == 0) {
-            mHeadsUpSnoozeTime.setSummary(getResources().getString(R.string.heads_up_snooze_disabled_summary));
-        } else if (value == 60000) {
-            mHeadsUpSnoozeTime.setSummary(getResources().getString(R.string.heads_up_snooze_summary_one_minute));
-        } else {
-            String summary = getResources().getString(R.string.heads_up_snooze_summary, value / 60 / 1000);
-            mHeadsUpSnoozeTime.setSummary(summary);
-        }
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        refreshCustomApplicationPrefs();
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsProto.MetricsEvent.CHERISH_SETTINGS;
-    }
-
-    @Override
-    public int getDialogMetricsCategory(int dialogId) {
-        if (dialogId == DIALOG_STOPLIST_APPS || dialogId == DIALOG_BLACKLIST_APPS ) {
-            return MetricsProto.MetricsEvent.CHERISH_SETTINGS;
-        }
-        return 0;
-    }
-
-    /**
-     * Utility classes and supporting methods
-     */
-    @Override
-    public Dialog onCreateDialog(int id) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        final Dialog dialog;
-        final ListView list = new ListView(getActivity());
-        list.setAdapter(mPackageAdapter);
-
-        builder.setTitle(R.string.profile_choose_app);
-        builder.setView(list);
-        dialog = builder.create();
-
-        switch (id) {
-            case DIALOG_STOPLIST_APPS:
-                list.setOnItemClickListener(new OnItemClickListener() {
-                    @Override
-                    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                        // Add empty application definition, the user will be able to edit it later
-                        PackageItem info = (PackageItem) parent.getItemAtPosition(position);
-                        addCustomApplicationPref(info.packageName, mStoplistPackages);
-                        dialog.cancel();
-                    }
-                });
-                break;
-            case DIALOG_BLACKLIST_APPS:
-                list.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-                    @Override
-                    public void onItemClick(AdapterView<?> parent,
-                            View view, int position, long id) {
-                        PackageItem info = (PackageItem) parent.getItemAtPosition(position);
-                        addCustomApplicationPref(info.packageName, mBlacklistPackages);
-                        dialog.cancel();
-                    }
-                });
-        }
-        return dialog;
-    }
-
-    /**
-     * Application class
-     */
-    private static class Package {
-        public String name;
-        /**
-         * Stores all the application values in one call
-         * @param name
-         */
-        public Package(String name) {
-            this.name = name;
-        }
-
-        public String toString() {
-            StringBuilder builder = new StringBuilder();
-            builder.append(name);
-            return builder.toString();
-        }
-
-        public static Package fromString(String value) {
-            if (TextUtils.isEmpty(value)) {
-                return null;
-            }
-
-            try {
-                Package item = new Package(value);
-                return item;
-            } catch (NumberFormatException e) {
-                return null;
-            }
-        }
-
-    };
-
-    private void refreshCustomApplicationPrefs() {
-        if (!parsePackageList()) {
-            return;
-        }
-
-        // Add the Application Preferences
-        if (mStoplistPrefList != null && mBlacklistPrefList != null) {
-            mStoplistPrefList.removeAll();
-            mBlacklistPrefList.removeAll();
-
-            for (Package pkg : mStoplistPackages.values()) {
-                try {
-                    Preference pref = createPreferenceFromInfo(pkg);
-                    mStoplistPrefList.addPreference(pref);
-                } catch (PackageManager.NameNotFoundException e) {
-                    // Do nothing
-                }
-            }
-
-            for (Package pkg : mBlacklistPackages.values()) {
-                try {
-                    Preference pref = createPreferenceFromInfo(pkg);
-                    mBlacklistPrefList.addPreference(pref);
-                } catch (PackageManager.NameNotFoundException e) {
-                    // Do nothing
-                }
-            }
-        }
-
-        // Keep these at the top
-        mAddStoplistPref.setOrder(0);
-        mAddBlacklistPref.setOrder(0);
-        // Add 'add' options
-        mStoplistPrefList.addPreference(mAddStoplistPref);
-        mBlacklistPrefList.addPreference(mAddBlacklistPref);
-    }
-
-    @Override
-    public boolean onPreferenceClick(Preference preference) {
-        if (preference == mAddStoplistPref) {
-            showDialog(DIALOG_STOPLIST_APPS);
-        } else if (preference == mAddBlacklistPref) {
-            showDialog(DIALOG_BLACKLIST_APPS);
-        } else {
-            AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
-                    .setTitle(R.string.dialog_delete_title)
-                    .setMessage(R.string.dialog_delete_message)
-                    .setIconAttribute(android.R.attr.alertDialogIcon)
-                    .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            if (preference == mBlacklistPrefList.findPreference(preference.getKey())) {
-                                 removeApplicationPref(preference.getKey(), mBlacklistPackages);
-                            } else if (preference == mStoplistPrefList.findPreference(preference.getKey())) {
-                                removeApplicationPref(preference.getKey(), mStoplistPackages);
-                            }
-                        }
-                    })
-                    .setNegativeButton(android.R.string.cancel, null);
-
-        builder.show();
-        }
-        return true;
-    }
-
-     private void addCustomApplicationPref(String packageName, Map<String,Package> map) {
-        Package pkg = map.get(packageName);
-        if (pkg == null) {
-            pkg = new Package(packageName);
-            map.put(packageName, pkg);
-            savePackageList(false, map);
-            refreshCustomApplicationPrefs();
-        }
-    }
-
-    private Preference createPreferenceFromInfo(Package pkg)
-            throws PackageManager.NameNotFoundException {
-        PackageInfo info = mPackageManager.getPackageInfo(pkg.name,
-                PackageManager.GET_META_DATA);
-        Preference pref =
-                new Preference(getActivity());
-
-        pref.setKey(pkg.name);
-        pref.setTitle(info.applicationInfo.loadLabel(mPackageManager));
-        pref.setIcon(info.applicationInfo.loadIcon(mPackageManager));
-        pref.setPersistent(false);
-        pref.setOnPreferenceClickListener(this);
-        return pref;
-    }
-
-    private void removeApplicationPref(String packageName, Map<String,Package> map) {
-        if (map.remove(packageName) != null) {
-            savePackageList(false, map);
-            refreshCustomApplicationPrefs();
-        }
-    }
-
-    private boolean parsePackageList() {
-        boolean parsed = false;
-
-        final String stoplistString = Settings.System.getString(getContentResolver(),
-                Settings.System.HEADS_UP_STOPLIST_VALUES);
-        final String blacklistString = Settings.System.getString(getContentResolver(),
-                Settings.System.HEADS_UP_BLACKLIST_VALUES);
-
-        if (!TextUtils.equals(mStoplistPackageList, stoplistString)) {
-            mStoplistPackageList = stoplistString;
-            mStoplistPackages.clear();
-            parseAndAddToMap(stoplistString, mStoplistPackages);
-            parsed = true;
-        }
-
-        if (!TextUtils.equals(mBlacklistPackageList, blacklistString)) {
-            mBlacklistPackageList = blacklistString;
-            mBlacklistPackages.clear();
-            parseAndAddToMap(blacklistString, mBlacklistPackages);
-            parsed = true;
-        }
-
-        return parsed;
-    }
-
-    private void parseAndAddToMap(String baseString, Map<String,Package> map) {
-        if (baseString == null) {
-            return;
-        }
-
-        final String[] array = TextUtils.split(baseString, "\\|");
-        for (String item : array) {
-            if (TextUtils.isEmpty(item)) {
-                continue;
-            }
-            Package pkg = Package.fromString(item);
-            map.put(pkg.name, pkg);
-        }
-    }
-
-
-    private void savePackageList(boolean preferencesUpdated, Map<String,Package> map) {
-        String setting = map == mStoplistPackages
-                ? Settings.System.HEADS_UP_STOPLIST_VALUES
-                : Settings.System.HEADS_UP_BLACKLIST_VALUES;
-
-        List<String> settings = new ArrayList<String>();
-        for (Package app : map.values()) {
-            settings.add(app.toString());
-        }
-        final String value = TextUtils.join("|", settings);
-        if (preferencesUpdated) {
-            if (TextUtils.equals(setting, Settings.System.HEADS_UP_STOPLIST_VALUES)) {
-                mStoplistPackageList = value;
-            } else {
-                mBlacklistPackageList = value;
-            }
-        }
-        Settings.System.putString(getContentResolver(),
-                setting, value);
-    }
-}
diff --git a/src/com/cherish/settings/fragments/IncallFeedbackPreferenceController.java b/src/com/cherish/settings/fragments/IncallFeedbackPreferenceController.java
deleted file mode 100644
index 2076ae7..0000000
--- a/src/com/cherish/settings/fragments/IncallFeedbackPreferenceController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2019 The PixelExperience 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.
- */
-
-package com.cherish.settings.fragments;
-
-import android.content.Context;
-import android.telephony.TelephonyManager;
-
-import com.android.settings.core.BasePreferenceController;
-
-public class IncallFeedbackPreferenceController extends BasePreferenceController {
-
-    public IncallFeedbackPreferenceController(Context context, String key) {
-        super(context, key);
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        return isVoiceCapable() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
-    }
-
-    private boolean isVoiceCapable() {
-        TelephonyManager telephony =
-                (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
-        return telephony != null && telephony.isVoiceCapable();
-    }
-
-}
\ No newline at end of file
diff --git a/src/com/cherish/settings/fragments/LockScreenSettings.java b/src/com/cherish/settings/fragments/LockScreenSettings.java
index a6315ab..2bcf7c0 100644
--- a/src/com/cherish/settings/fragments/LockScreenSettings.java
+++ b/src/com/cherish/settings/fragments/LockScreenSettings.java
@@ -42,13 +42,6 @@ import com.cherish.settings.preferences.SystemSettingListPreference;
 
 public class LockScreenSettings extends SettingsPreferenceFragment implements
         Preference.OnPreferenceChangeListener {
-			
-    private static final String FINGERPRINT_VIB = "fingerprint_success_vib";
-    private static final String FOD_ICON_PICKER_CATEGORY = "fod_icon_picker_category";
-
-    private FingerprintManager mFingerprintManager;
-    private SwitchPreference mFingerprintVib;
-    private Preference mFODIconPicker;
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -58,33 +51,11 @@ public class LockScreenSettings extends SettingsPreferenceFragment implements
         ContentResolver resolver = getActivity().getContentResolver();
         final PreferenceScreen prefScreen = getPreferenceScreen();
         Resources resources = getResources();
-
-        mFODIconPicker = (Preference) findPreference(FOD_ICON_PICKER_CATEGORY);
-        if (mFODIconPicker != null
-                && !getResources().getBoolean(com.android.internal.R.bool.config_supportsInDisplayFingerprint)) {
-            prefScreen.removePreference(mFODIconPicker);
-        }
-        
-        mFingerprintManager = (FingerprintManager) getActivity().getSystemService(Context.FINGERPRINT_SERVICE);
-        mFingerprintVib = (SwitchPreference) findPreference(FINGERPRINT_VIB);
-        if (!mFingerprintManager.isHardwareDetected()){
-            prefScreen.removePreference(mFingerprintVib);
-        } else {
-        mFingerprintVib.setChecked((Settings.System.getInt(getContentResolver(),
-                Settings.System.FINGERPRINT_SUCCESS_VIB, 1) == 1));
-        mFingerprintVib.setOnPreferenceChangeListener(this);
-        }
-
     }
 
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         ContentResolver resolver = getActivity().getContentResolver();
-        if (preference == mFingerprintVib) {
-            boolean value = (Boolean) newValue;
-            Settings.System.putInt(getActivity().getContentResolver(),
-                    Settings.System.FINGERPRINT_SUCCESS_VIB, value ? 1 : 0);
-            return true;
-        }
+
         return false;
     }
 
@@ -93,4 +64,4 @@ public class LockScreenSettings extends SettingsPreferenceFragment implements
         return MetricsProto.MetricsEvent.CHERISH_SETTINGS;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/com/cherish/settings/fragments/MiscSettings.java b/src/com/cherish/settings/fragments/MiscSettings.java
index 2189ff9..cb450a4 100644
--- a/src/com/cherish/settings/fragments/MiscSettings.java
+++ b/src/com/cherish/settings/fragments/MiscSettings.java
@@ -45,22 +45,12 @@ public class MiscSettings extends SettingsPreferenceFragment implements
 
         addPreferencesFromResource(R.xml.cherish_settings_misc);
 
-        mGamingMode = (SystemSettingMasterSwitchPreference) findPreference(GAMING_MODE_ENABLED);
-        mGamingMode.setChecked((Settings.System.getInt(getActivity().getContentResolver(),
-                Settings.System.GAMING_MODE_ENABLED, 0) == 1));
-        mGamingMode.setOnPreferenceChangeListener(this);
-
     }
 
     @Override
     public boolean onPreferenceChange(Preference preference, Object objValue) {
         ContentResolver resolver = getActivity().getContentResolver();
-        if (preference == mGamingMode) {
-        boolean value = (Boolean) objValue;
-        Settings.System.putInt(getActivity().getContentResolver(),
-                Settings.System.GAMING_MODE_ENABLED, value ? 1 : 0);
-        return true;
-        }
+
         return false;
     }
 
diff --git a/src/com/cherish/settings/fragments/NotificationSettings.java b/src/com/cherish/settings/fragments/NotificationSettings.java
index 338d4bc..cde1f7f 100644
--- a/src/com/cherish/settings/fragments/NotificationSettings.java
+++ b/src/com/cherish/settings/fragments/NotificationSettings.java
@@ -21,17 +21,6 @@ import net.margaritov.preference.colorpicker.ColorPickerPreference;
 
 public class NotificationSettings extends SettingsPreferenceFragment implements Preference.OnPreferenceChangeListener{
 
-    private static final String PULSE_AMBIENT_LIGHT = "pulse_ambient_light";
-    private static final String PREF_FLASH_ON_CALL = "flashlight_on_call";
-    private static final String PREF_FLASH_ON_CALL_DND = "flashlight_on_call_ignore_dnd";
-    private static final String PREF_FLASH_ON_CALL_RATE = "flashlight_on_call_rate";
-
-    private Preference mChargingLeds;
-    private SystemSettingMasterSwitchPreference mEdgePulse;
-    private SystemSettingListPreference mFlashOnCall;
-    private SystemSettingSwitchPreference mFlashOnCallIgnoreDND;
-    private CustomSeekBarPreference mFlashOnCallRate;
-
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
@@ -39,61 +28,13 @@ public class NotificationSettings extends SettingsPreferenceFragment implements
         addPreferencesFromResource(R.xml.cherish_settings_notifications);
         PreferenceScreen prefScreen = getPreferenceScreen();
 		ContentResolver resolver = getActivity().getContentResolver();
-
-        mChargingLeds = (Preference) findPreference("charging_light");
-        if (mChargingLeds != null
-                && !getResources().getBoolean(
-                        com.android.internal.R.bool.config_intrusiveBatteryLed)) {
-            prefScreen.removePreference(mChargingLeds);
-        }
-
-        mEdgePulse = (SystemSettingMasterSwitchPreference) findPreference(PULSE_AMBIENT_LIGHT);
-        mEdgePulse.setOnPreferenceChangeListener(this);
-        int edgePulse = Settings.System.getInt(getContentResolver(),
-                PULSE_AMBIENT_LIGHT, 0);
-        mEdgePulse.setChecked(edgePulse != 0);
-
-        mFlashOnCallRate = (CustomSeekBarPreference)
-                findPreference(PREF_FLASH_ON_CALL_RATE);
-        int value = Settings.System.getInt(resolver,
-                Settings.System.FLASHLIGHT_ON_CALL_RATE, 1);
-        mFlashOnCallRate.setValue(value);
-        mFlashOnCallRate.setOnPreferenceChangeListener(this);
-
-        mFlashOnCallIgnoreDND = (SystemSettingSwitchPreference)
-                findPreference(PREF_FLASH_ON_CALL_DND);
-        value = Settings.System.getInt(resolver,
-                Settings.System.FLASHLIGHT_ON_CALL, 0);
-        mFlashOnCallIgnoreDND.setVisible(value > 1);
-        mFlashOnCallRate.setVisible(value != 0);
-
-        mFlashOnCall = (SystemSettingListPreference)
-                findPreference(PREF_FLASH_ON_CALL);
-        mFlashOnCall.setOnPreferenceChangeListener(this);
         
     }
 
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
            ContentResolver resolver = getActivity().getContentResolver();
-            if (preference == mEdgePulse) {
-            boolean value = (Boolean) newValue;
-            Settings.System.putInt(getContentResolver(),
-                    PULSE_AMBIENT_LIGHT, value ? 1 : 0);
-            return true;
-             } else if (preference == mFlashOnCall) {
-            int value = Integer.parseInt((String) newValue);
-            Settings.System.putInt(resolver,
-                    Settings.System.FLASHLIGHT_ON_CALL, value);
-            mFlashOnCallIgnoreDND.setVisible(value > 1);
-            mFlashOnCallRate.setVisible(value != 0);
-            return true;
-        } else if (preference == mFlashOnCallRate) {
-            int value = (Integer) newValue;
-            Settings.System.putInt(resolver,
-                    Settings.System.FLASHLIGHT_ON_CALL_RATE, value);
-            return true;
-          }
+
         return false;
     }
 
diff --git a/src/com/cherish/settings/fragments/PulseSettings.java b/src/com/cherish/settings/fragments/PulseSettings.java
deleted file mode 100644
index e6e15f8..0000000
--- a/src/com/cherish/settings/fragments/PulseSettings.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * Copyright (C) 2020 The Dirty Unicorns 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.
- */
-
-package com.cherish.settings.fragments;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
-import com.android.settingslib.search.SearchIndexable;
-import net.margaritov.preference.colorpicker.ColorPickerPreference;
-import com.cherish.settings.preferences.SecureSettingListPreference;
-import com.cherish.settings.preferences.SecureSettingSeekBarPreference;
-import com.android.internal.util.cherish.CherishUtils;
-
-import android.content.Context;
-import android.content.ContentResolver;
-import android.graphics.Color;
-import android.os.Bundle;
-import android.os.UserHandle;
-
-import androidx.preference.PreferenceCategory;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.SwitchPreference;
-
-import android.provider.SearchIndexableResource;
-import android.provider.Settings;
-
-@SearchIndexable
-public class PulseSettings extends SettingsPreferenceFragment implements
-        Preference.OnPreferenceChangeListener, Indexable {
-    private static final String TAG = PulseSettings.class.getSimpleName();
-    private static final String NAVBAR_PULSE_ENABLED_KEY = "navbar_pulse_enabled";
-    private static final String LOCKSCREEN_PULSE_ENABLED_KEY = "lockscreen_pulse_enabled";
-    private static final String AMBIENT_PULSE_ENABLED_KEY = "ambient_pulse_enabled";
-    private static final String PULSE_SMOOTHING_KEY = "pulse_smoothing_enabled";
-    private static final String PULSE_COLOR_MODE_KEY = "pulse_color_mode";
-    private static final String PULSE_COLOR_MODE_CHOOSER_KEY = "pulse_color_user";
-    private static final String PULSE_COLOR_MODE_LAVA_SPEED_KEY = "pulse_lavalamp_speed";
-    private static final String PULSE_RENDER_CATEGORY_SOLID = "pulse_2";
-    private static final String PULSE_RENDER_CATEGORY_FADING = "pulse_fading_bars_category";
-    private static final String PULSE_RENDER_MODE_KEY = "pulse_render_style";
-    private static final int RENDER_STYLE_FADING_BARS = 0;
-    private static final int RENDER_STYLE_SOLID_LINES = 1;
-    private static final int COLOR_TYPE_ACCENT = 0;
-    private static final int COLOR_TYPE_USER = 1;
-    private static final int COLOR_TYPE_LAVALAMP = 2;
-    private static final int COLOR_TYPE_AUTO = 3;
-
-    private SwitchPreference mNavbarPulse;
-    private SwitchPreference mLockscreenPulse;
-    private SwitchPreference mAmbientPulse;
-    private SwitchPreference mPulseSmoothing;
-    private Preference mRenderMode;
-    private ListPreference mColorModePref;
-    private ColorPickerPreference mColorPickerPref;
-    private Preference mLavaSpeedPref;
-
-    private PreferenceCategory mFadingBarsCat;
-    private PreferenceCategory mSolidBarsCat;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        addPreferencesFromResource(R.xml.cherish_settings_pulse);
-
-        mFooterPreferenceMixin.createFooterPreference()
-                .setTitle(R.string.pulse_help_policy_notice_summary);
-
-        ContentResolver resolver = getContentResolver();
-
-        mNavbarPulse = (SwitchPreference) findPreference(NAVBAR_PULSE_ENABLED_KEY);
-        boolean navbarPulse = Settings.Secure.getIntForUser(resolver,
-                Settings.Secure.NAVBAR_PULSE_ENABLED, 0, UserHandle.USER_CURRENT) != 0;
-        mNavbarPulse.setChecked(navbarPulse);
-        mNavbarPulse.setOnPreferenceChangeListener(this);
-
-        mLockscreenPulse = (SwitchPreference) findPreference(LOCKSCREEN_PULSE_ENABLED_KEY);
-        boolean lockscreenPulse = Settings.Secure.getIntForUser(resolver,
-                Settings.Secure.LOCKSCREEN_PULSE_ENABLED, 0, UserHandle.USER_CURRENT) != 0;
-        mLockscreenPulse.setChecked(lockscreenPulse);
-        mLockscreenPulse.setOnPreferenceChangeListener(this);
-
-        mAmbientPulse = (SwitchPreference) findPreference(AMBIENT_PULSE_ENABLED_KEY);
-        boolean ambientPulse = Settings.Secure.getIntForUser(resolver,
-                Settings.Secure.AMBIENT_PULSE_ENABLED, 1, UserHandle.USER_CURRENT) != 0;
-        mAmbientPulse.setChecked(ambientPulse);
-        mAmbientPulse.setOnPreferenceChangeListener(this);
-
-        mColorModePref = (ListPreference) findPreference(PULSE_COLOR_MODE_KEY);
-        mColorPickerPref = (ColorPickerPreference) findPreference(PULSE_COLOR_MODE_CHOOSER_KEY);
-        mLavaSpeedPref = findPreference(PULSE_COLOR_MODE_LAVA_SPEED_KEY);
-        mColorModePref.setOnPreferenceChangeListener(this);
-        mColorPickerPref.setDefaultValue(CherishUtils.getThemeAccentColor(getContext()));
-		int colorMode = Settings.Secure.getIntForUser(getContentResolver(),
-                Settings.Secure.PULSE_COLOR_MODE, COLOR_TYPE_ACCENT, UserHandle.USER_CURRENT);
-        if (colorMode == COLOR_TYPE_ACCENT) {
-            mColorPickerPref.setNewPreviewColor(CherishUtils.getThemeAccentColor(getContext()));
-        }
-        updateColorPrefs(colorMode);
-
-        mRenderMode = findPreference(PULSE_RENDER_MODE_KEY);
-        mRenderMode.setOnPreferenceChangeListener(this);
-        mFadingBarsCat = (PreferenceCategory) findPreference(
-                PULSE_RENDER_CATEGORY_FADING);
-        mSolidBarsCat = (PreferenceCategory) findPreference(
-                PULSE_RENDER_CATEGORY_SOLID);
-
-        mPulseSmoothing = (SwitchPreference) findPreference(PULSE_SMOOTHING_KEY);
-
-        updateAllPrefs();
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        ContentResolver resolver = getContext().getContentResolver();
-        if (preference == mNavbarPulse) {
-            boolean val = (Boolean) newValue;
-            Settings.Secure.putIntForUser(resolver,
-                Settings.Secure.NAVBAR_PULSE_ENABLED, val ? 1 : 0, UserHandle.USER_CURRENT);
-            updateAllPrefs();
-            return true;
-        } else if (preference == mLockscreenPulse) {
-            boolean val = (Boolean) newValue;
-            Settings.Secure.putIntForUser(resolver,
-                Settings.Secure.LOCKSCREEN_PULSE_ENABLED, val ? 1 : 0, UserHandle.USER_CURRENT);
-            updateAllPrefs();
-            return true;
-        } else if (preference == mAmbientPulse) {
-            boolean val = (Boolean) newValue;
-            Settings.Secure.putIntForUser(resolver,
-                Settings.Secure.AMBIENT_PULSE_ENABLED, val ? 1 : 0, UserHandle.USER_CURRENT);
-            updateAllPrefs();
-            return true;
-        } else if (preference == mColorModePref) {
-            updateColorPrefs(Integer.valueOf(String.valueOf(newValue)));
-            return true;
-        } else if (preference == mRenderMode) {
-            updateRenderCategories(Integer.valueOf(String.valueOf(newValue)));
-            return true;
-        }
-        return false;
-    }
-
-    private void updateAllPrefs() {
-        ContentResolver resolver = getContentResolver();
-
-        boolean navbarPulse = Settings.Secure.getIntForUser(resolver,
-                Settings.Secure.NAVBAR_PULSE_ENABLED, 0, UserHandle.USER_CURRENT) != 0;
-        boolean lockscreenPulse = Settings.Secure.getIntForUser(resolver,
-                Settings.Secure.LOCKSCREEN_PULSE_ENABLED, 0, UserHandle.USER_CURRENT) != 0;
-        boolean ambientPulse = Settings.Secure.getIntForUser(resolver,
-                Settings.Secure.AMBIENT_PULSE_ENABLED, 0, UserHandle.USER_CURRENT) != 0;
-
-        mPulseSmoothing.setEnabled(navbarPulse || lockscreenPulse || ambientPulse);
-
-        mColorModePref.setEnabled(navbarPulse || lockscreenPulse || ambientPulse);
-        if (navbarPulse || lockscreenPulse) {
-            int colorMode = Settings.Secure.getIntForUser(resolver,
-                Settings.Secure.PULSE_COLOR_MODE, COLOR_TYPE_ACCENT, UserHandle.USER_CURRENT);
-            updateColorPrefs(colorMode);
-        } else {
-            mColorPickerPref.setEnabled(false);
-            mLavaSpeedPref.setEnabled(false);
-        }
-
-        mRenderMode.setEnabled(navbarPulse || lockscreenPulse || ambientPulse);
-        if (navbarPulse || lockscreenPulse || ambientPulse) {
-            int renderMode = Settings.Secure.getIntForUser(resolver,
-                Settings.Secure.PULSE_RENDER_STYLE, RENDER_STYLE_SOLID_LINES, UserHandle.USER_CURRENT);
-            updateRenderCategories(renderMode);
-        } else {
-            mFadingBarsCat.setEnabled(false);
-            mSolidBarsCat.setEnabled(false);
-        }
-    }
-
-    private void updateColorPrefs(int val) {
-        switch (val) {
-            case COLOR_TYPE_ACCENT:
-                mColorPickerPref.setEnabled(false);
-                mLavaSpeedPref.setEnabled(false);
-                break;
-            case COLOR_TYPE_USER:
-                mColorPickerPref.setEnabled(true);
-                mLavaSpeedPref.setEnabled(false);
-                break;
-            case COLOR_TYPE_LAVALAMP:
-                mColorPickerPref.setEnabled(false);
-                mLavaSpeedPref.setEnabled(true);
-                break;
-            case COLOR_TYPE_AUTO:
-                mColorPickerPref.setEnabled(false);
-                mLavaSpeedPref.setEnabled(false);
-                break;
-        }
-    }
-
-    private void updateRenderCategories(int mode) {
-        mFadingBarsCat.setEnabled(mode == RENDER_STYLE_FADING_BARS);
-        mSolidBarsCat.setEnabled(mode == RENDER_STYLE_SOLID_LINES);
-    }
-
-    public static void reset(Context mContext) {
-        ContentResolver resolver = mContext.getContentResolver();
-        Settings.Secure.putIntForUser(resolver,
-                Settings.Secure.LOCKSCREEN_PULSE_ENABLED, 1, UserHandle.USER_CURRENT);
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsProto.MetricsEvent.CHERISH_SETTINGS;
-    }
-
-    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() {
-        @Override
-        public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
-                boolean enabled) {
-            final ArrayList<SearchIndexableResource> result = new ArrayList<>();
-            final SearchIndexableResource sir = new SearchIndexableResource(context);
-            sir.xmlResId = R.xml.cherish_settings_pulse;
-            result.add(sir);
-            return result;
-        }
-
-        @Override
-        public List<String> getNonIndexableKeys(Context context) {
-            final List<String> keys = super.getNonIndexableKeys(context);
-            return keys;
-        }
-    };
-}
diff --git a/src/com/cherish/settings/fragments/QsHeader.java b/src/com/cherish/settings/fragments/QsHeader.java
deleted file mode 100644
index df59d34..0000000
--- a/src/com/cherish/settings/fragments/QsHeader.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * Copyright (C) 2019 ion-OS
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.cherish.settings.fragments;
-
-import android.app.Activity;
-import android.content.ContentResolver;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.net.Uri;
-import android.os.Bundle;
-import android.provider.Settings;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-
-import com.android.internal.logging.nano.MetricsProto;
-
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-
-import com.cherish.settings.preferences.CustomSeekBarPreference;
-import com.cherish.settings.preferences.SystemSettingSwitchPreference;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class QsHeader extends SettingsPreferenceFragment 
-             implements Preference.OnPreferenceChangeListener{
-
-    private static final String CUSTOM_HEADER_BROWSE = "custom_header_browse";
-    private static final String DAYLIGHT_HEADER_PACK = "daylight_header_pack";
-    private static final String CUSTOM_HEADER_IMAGE_SHADOW = "status_bar_custom_header_shadow";
-    private static final String CUSTOM_HEADER_PROVIDER = "custom_header_provider";
-    private static final String FILE_HEADER_SELECT = "file_header_select";
-
-    private static final int REQUEST_PICK_IMAGE = 0;
-
-    private Preference mHeaderBrowse;
-    private ListPreference mDaylightHeaderPack;
-    private CustomSeekBarPreference mHeaderShadow;
-    private ListPreference mHeaderProvider;
-    private String mDaylightHeaderProvider;
-    private Preference mFileHeader;
-    private String mFileHeaderProvider;
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        updateEnablement();
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        addPreferencesFromResource(R.xml.qs_header);
-        ContentResolver resolver = getActivity().getContentResolver();
-
-        mDaylightHeaderProvider = getResources().getString(R.string.daylight_header_provider);
-        mFileHeaderProvider = getResources().getString(R.string.file_header_provider);
-        mHeaderBrowse = findPreference(CUSTOM_HEADER_BROWSE);
-
-        mDaylightHeaderPack = (ListPreference) findPreference(DAYLIGHT_HEADER_PACK);
-
-        List<String> entries = new ArrayList<String>();
-        List<String> values = new ArrayList<String>();
-        getAvailableHeaderPacks(entries, values);
-        mDaylightHeaderPack.setEntries(entries.toArray(new String[entries.size()]));
-        mDaylightHeaderPack.setEntryValues(values.toArray(new String[values.size()]));
-
-        boolean headerEnabled = Settings.System.getInt(resolver,
-                Settings.System.STATUS_BAR_CUSTOM_HEADER, 0) != 0;
-        updateHeaderProviderSummary(headerEnabled);
-        mDaylightHeaderPack.setOnPreferenceChangeListener(this);
-
-        mHeaderShadow = (CustomSeekBarPreference) findPreference(CUSTOM_HEADER_IMAGE_SHADOW);
-        final int headerShadow = Settings.System.getInt(resolver,
-                Settings.System.STATUS_BAR_CUSTOM_HEADER_SHADOW, 0);
-        mHeaderShadow.setValue((int)(((double) headerShadow / 255) * 100));
-        mHeaderShadow.setOnPreferenceChangeListener(this);
-
-        mHeaderProvider = (ListPreference) findPreference(CUSTOM_HEADER_PROVIDER);
-        mHeaderProvider.setOnPreferenceChangeListener(this);
-
-        mFileHeader = findPreference(FILE_HEADER_SELECT);
-
-    }
-
-    private void updateHeaderProviderSummary(boolean headerEnabled) {
-        mDaylightHeaderPack.setSummary(getResources().getString(R.string.header_provider_disabled));
-        if (headerEnabled) {
-            String settingHeaderPackage = Settings.System.getString(getContentResolver(),
-                    Settings.System.STATUS_BAR_DAYLIGHT_HEADER_PACK);
-            if (settingHeaderPackage != null) {
-                int valueIndex = mDaylightHeaderPack.findIndexOfValue(settingHeaderPackage);
-                mDaylightHeaderPack.setValueIndex(valueIndex >= 0 ? valueIndex : 0);
-                mDaylightHeaderPack.setSummary(mDaylightHeaderPack.getEntry());
-            }
-        }
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(Preference preference) {
-        if (preference == mFileHeader) {
-            Intent intent = new Intent(Intent.ACTION_PICK);
-            intent.setType("image/*");
-            startActivityForResult(intent, REQUEST_PICK_IMAGE);
-            return true;
-        }
-        return super.onPreferenceTreeClick(preference);
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        if (preference == mDaylightHeaderPack) {
-            String value = (String) newValue;
-            Settings.System.putString(getContentResolver(),
-                    Settings.System.STATUS_BAR_DAYLIGHT_HEADER_PACK, value);
-            int valueIndex = mDaylightHeaderPack.findIndexOfValue(value);
-            mDaylightHeaderPack.setSummary(mDaylightHeaderPack.getEntries()[valueIndex]);
-        } else if (preference == mHeaderShadow) {
-            Integer headerShadow = (Integer) newValue;
-            int realHeaderValue = (int) (((double) headerShadow / 100) * 255);
-            Settings.System.putInt(getContentResolver(),
-                    Settings.System.STATUS_BAR_CUSTOM_HEADER_SHADOW, realHeaderValue);
-        } else if (preference == mHeaderProvider) {
-            String value = (String) newValue;
-            Settings.System.putString(getContentResolver(),
-                    Settings.System.STATUS_BAR_CUSTOM_HEADER_PROVIDER, value);
-            int valueIndex = mHeaderProvider.findIndexOfValue(value);
-            mHeaderProvider.setSummary(mHeaderProvider.getEntries()[valueIndex]);
-            updateEnablement();
-        }
-        return true;
-    }
-
-    private boolean isBrowseHeaderAvailable() {
-        PackageManager pm = getPackageManager();
-        Intent browse = new Intent();
-        browse.setClassName("org.omnirom.omnistyle", "org.omnirom.omnistyle.PickHeaderActivity");
-        return pm.resolveActivity(browse, 0) != null;
-    }
-
-    private void getAvailableHeaderPacks(List<String> entries, List<String> values) {
-        Map<String, String> headerMap = new HashMap<String, String>();
-        Intent i = new Intent();
-        PackageManager packageManager = getPackageManager();
-        i.setAction("org.omnirom.DaylightHeaderPack");
-        for (ResolveInfo r : packageManager.queryIntentActivities(i, 0)) {
-            String packageName = r.activityInfo.packageName;
-            String label = r.activityInfo.loadLabel(getPackageManager()).toString();
-            if (label == null) {
-                label = r.activityInfo.packageName;
-            }
-            headerMap.put(label, packageName);
-        }
-        i.setAction("org.omnirom.DaylightHeaderPack1");
-        for (ResolveInfo r : packageManager.queryIntentActivities(i, 0)) {
-            String packageName = r.activityInfo.packageName;
-            String label = r.activityInfo.loadLabel(getPackageManager()).toString();
-            if (r.activityInfo.name.endsWith(".theme")) {
-                continue;
-            }
-            if (label == null) {
-                label = packageName;
-            }
-            headerMap.put(label, packageName  + "/" + r.activityInfo.name);
-        }
-        List<String> labelList = new ArrayList<String>();
-        labelList.addAll(headerMap.keySet());
-        Collections.sort(labelList);
-        for (String label : labelList) {
-            entries.add(label);
-            values.add(headerMap.get(label));
-        }
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent result) {
-        if (requestCode == REQUEST_PICK_IMAGE) {
-            if (resultCode != Activity.RESULT_OK) {
-                return;
-            }
-            final Uri imageUri = result.getData();
-            Settings.System.putString(getContentResolver(), Settings.System.STATUS_BAR_CUSTOM_HEADER_PROVIDER, "file");
-            Settings.System.putString(getContentResolver(), Settings.System.STATUS_BAR_FILE_HEADER_IMAGE, imageUri.toString());
-        }
-    }
-
-    private void updateEnablement() {
-        String providerName = Settings.System.getString(getContentResolver(),
-                Settings.System.STATUS_BAR_CUSTOM_HEADER_PROVIDER);
-        if (providerName == null) {
-            providerName = mDaylightHeaderProvider;
-        }
-        if (!providerName.equals(mDaylightHeaderProvider)) {
-            providerName = mFileHeaderProvider;
-        }
-        int valueIndex = mHeaderProvider.findIndexOfValue(providerName);
-        mHeaderProvider.setValueIndex(valueIndex >= 0 ? valueIndex : 0);
-        mHeaderProvider.setSummary(mHeaderProvider.getEntry());
-        mDaylightHeaderPack.setEnabled(providerName.equals(mDaylightHeaderProvider));
-        mFileHeader.setEnabled(providerName.equals(mFileHeaderProvider));
-        mHeaderBrowse.setEnabled(isBrowseHeaderAvailable() && providerName.equals(mFileHeaderProvider));
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsProto.MetricsEvent.CHERISH_SETTINGS;
-    }
-}
diff --git a/src/com/cherish/settings/fragments/QuickSettings.java b/src/com/cherish/settings/fragments/QuickSettings.java
index 0da22fb..52fd1a2 100644
--- a/src/com/cherish/settings/fragments/QuickSettings.java
+++ b/src/com/cherish/settings/fragments/QuickSettings.java
@@ -31,21 +31,6 @@ import java.util.ArrayList;
 
 public class QuickSettings extends SettingsPreferenceFragment implements
         OnPreferenceChangeListener {
-   private static final String QS_BLUR_ALPHA = "qs_blur_alpha";
-   private static final String QS_BLUR_INTENSITY = "qs_blur_intensity";
-   private static final String QUICK_PULLDOWN = "quick_pulldown";
-   private static final String FOOTER_TEXT_STRING = "footer_text_string";
-   private static final String STATUS_BAR_CUSTOM_HEADER = "status_bar_custom_header";
-   private static final String QS_HIDE_BATTERY = "qs_hide_battery";
-   private static final String QS_BATTERY_MODE = "qs_battery_mode";
-
-   private ListPreference mQuickPulldown;
-   private CustomSeekBarPreference mQSBlurAlpha;
-   private CustomSeekBarPreference mQSBlurIntensity;
-   private SystemSettingEditTextPreference mFooterString;
-   private SystemSettingMasterSwitchPreference mCustomHeader;
-   private SystemSettingSwitchPreference mHideBattery;
-   private SystemSettingListPreference mQsBatteryMode;
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -55,108 +40,13 @@ public class QuickSettings extends SettingsPreferenceFragment implements
 
         PreferenceScreen prefScreen = getPreferenceScreen();
         ContentResolver resolver = getActivity().getContentResolver();
-        mQSBlurAlpha = (CustomSeekBarPreference) findPreference(QS_BLUR_ALPHA);
-        int qsBlurAlpha = Settings.System.getInt(getContentResolver(),
-                Settings.System.QS_BLUR_ALPHA, 100);
-        mQSBlurAlpha.setValue(qsBlurAlpha);
-        mQSBlurAlpha.setOnPreferenceChangeListener(this);
-
-        mQSBlurIntensity = (CustomSeekBarPreference) findPreference(QS_BLUR_INTENSITY);
-        int qsBlurIntensity = Settings.System.getInt(getContentResolver(),
-                Settings.System.QS_BLUR_INTENSITY, 30);
-        mQSBlurIntensity.setValue(qsBlurIntensity);
-        mQSBlurIntensity.setOnPreferenceChangeListener(this);
-
-        mQuickPulldown = (ListPreference) findPreference(QUICK_PULLDOWN);
-        mQuickPulldown.setOnPreferenceChangeListener(this);
-        int quickPulldownValue = Settings.System.getIntForUser(resolver,
-                Settings.System.STATUS_BAR_QUICK_QS_PULLDOWN, 0, UserHandle.USER_CURRENT);
-        mQuickPulldown.setValue(String.valueOf(quickPulldownValue));
-        updatePulldownSummary(quickPulldownValue);
-
-        mCustomHeader = (SystemSettingMasterSwitchPreference) findPreference(STATUS_BAR_CUSTOM_HEADER);
-        int qsHeader = Settings.System.getInt(resolver,
-                Settings.System.STATUS_BAR_CUSTOM_HEADER, 0);
-        mCustomHeader.setChecked(qsHeader != 0);
-        mCustomHeader.setOnPreferenceChangeListener(this);
-      
-        mQsBatteryMode = (SystemSettingListPreference) findPreference(QS_BATTERY_MODE);
-        mHideBattery = (SystemSettingSwitchPreference) findPreference(QS_HIDE_BATTERY);
-        mHideBattery.setOnPreferenceChangeListener(this);
-
-        mFooterString = (SystemSettingEditTextPreference) findPreference(FOOTER_TEXT_STRING);
-        mFooterString.setOnPreferenceChangeListener(this);
-        String footerString = Settings.System.getString(getContentResolver(),
-                FOOTER_TEXT_STRING);
-        if (footerString != null && footerString != "")
-            mFooterString.setText(footerString);
-        else {
-            mFooterString.setText("#KeepTheLove");
-            Settings.System.putString(getActivity().getContentResolver(),
-                    Settings.System.FOOTER_TEXT_STRING, "#KeepTheLove");
-
-        }
 	}
 
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         ContentResolver resolver = getActivity().getContentResolver();
-         if (preference == mQSBlurAlpha) {
-            int value = (Integer) newValue;
-            Settings.System.putInt(getContentResolver(),
-                    Settings.System.QS_BLUR_ALPHA, value);
-            return true;
-        } else if (preference == mQSBlurIntensity) {
-            int value = (Integer) newValue;
-            Settings.System.putInt(getContentResolver(),
-                    Settings.System.QS_BLUR_INTENSITY, value);
-            return true;
-        } else if (preference == mQuickPulldown) {
-            int quickPulldownValue = Integer.valueOf((String) newValue);
-            Settings.System.putIntForUser(resolver, Settings.System.STATUS_BAR_QUICK_QS_PULLDOWN,
-                    quickPulldownValue, UserHandle.USER_CURRENT);
-            updatePulldownSummary(quickPulldownValue);
-            return true;
-        } else if (preference == mFooterString) {
-            String value = (String) newValue;
-            if (value != "" && value != null)
-                Settings.System.putString(getActivity().getContentResolver(),
-                        Settings.System.FOOTER_TEXT_STRING, value);
-            else {
-                mFooterString.setText("#KeepTheLove");
-                Settings.System.putString(getActivity().getContentResolver(),
-                        Settings.System.FOOTER_TEXT_STRING, "#KeepTheLove");
-            }
-            return true;
-            } else if (preference == mCustomHeader) {
-            boolean header = (Boolean) newValue;
-            Settings.System.putInt(resolver,
-                    Settings.System.STATUS_BAR_CUSTOM_HEADER, header ? 1 : 0);
-            return true;
-            } else if (preference == mHideBattery) {
-            Boolean value = (Boolean) newValue;
-            Settings.System.putInt(getContentResolver(),
-                    Settings.System.QS_HIDE_BATTERY, value ? 1 : 0);
-            mQsBatteryMode.setEnabled(!value);
-            return true;
-        }
-        return false;
-    }
 
-    private void updatePulldownSummary(int value) {
-        Resources res = getResources();
-         if (value == 0) {
-            // quick pulldown deactivated
-            mQuickPulldown.setSummary(res.getString(R.string.quick_pulldown_off));
-        } else if (value == 3) {
-            // quick pulldown always
-            mQuickPulldown.setSummary(res.getString(R.string.quick_pulldown_summary_always));
-        } else {
-            String direction = res.getString(value == 2
-                    ? R.string.quick_pulldown_left
-                    : R.string.quick_pulldown_right);
-            mQuickPulldown.setSummary(res.getString(R.string.quick_pulldown_summary, direction));
-        }
+        return false;
     }
 
     @Override
diff --git a/src/com/cherish/settings/fragments/RecentsSettings.java b/src/com/cherish/settings/fragments/RecentsSettings.java
index 0b8b9eb..f7380a3 100644
--- a/src/com/cherish/settings/fragments/RecentsSettings.java
+++ b/src/com/cherish/settings/fragments/RecentsSettings.java
@@ -26,12 +26,6 @@ import com.android.settings.SettingsPreferenceFragment;
 public class RecentsSettings extends SettingsPreferenceFragment implements
         OnPreferenceChangeListener {
 
-    private static final String PREF_STOCK_RECENTS_CATEGORY = "stock_recents_category";
-    private static final String PREF_ALTERNATIVE_RECENTS_CATEGORY = "alternative_recents_category";
-    private static final String PREF_SWIPE_UP_ENABLED = "swipe_up_enabled_warning";
-
-    private PreferenceCategory mStockRecentsCategory;
-    private PreferenceCategory mAlternativeRecentsCategory;
     private Context mContext;
 
     @Override
@@ -41,78 +35,8 @@ public class RecentsSettings extends SettingsPreferenceFragment implements
         addPreferencesFromResource(R.xml.cherish_settings_recents);
 
         ContentResolver resolver = getActivity().getContentResolver();
-
-        mStockRecentsCategory = (PreferenceCategory) findPreference(PREF_STOCK_RECENTS_CATEGORY);
-        mAlternativeRecentsCategory =
-                (PreferenceCategory) findPreference(PREF_ALTERNATIVE_RECENTS_CATEGORY);
-
-        // Alternative recents en-/disabling
-        Preference.OnPreferenceChangeListener alternativeRecentsChangeListener =
-                new Preference.OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                updateDependencies(preference, (Boolean) newValue);
-                return true;
-            }
-        };
-        for (int i = 0; i < mAlternativeRecentsCategory.getPreferenceCount(); i++) {
-            Preference preference = mAlternativeRecentsCategory.getPreference(i);
-            if (preference instanceof SystemSettingMasterSwitchPreference) {
-                preference.setOnPreferenceChangeListener(alternativeRecentsChangeListener);
-            }
-        }
-
-        updateDependencies();
-
-        // Warning for alternative recents when gesture navigation is enabled,
-        // which directly controls quickstep (launcher) recents.
-        final int navigationMode = getActivity().getResources()
-                .getInteger(com.android.internal.R.integer.config_navBarInteractionMode);
-        // config_navBarInteractionMode:
-        //  0: 3 button mode (supports slim recents)
-        //  1: 2 button mode (currently does not support alternative recents)
-        //  2: gesture only (currently does not support alternative recents)
-        if (navigationMode != 0) {
-            for (int i = 0; i < mAlternativeRecentsCategory.getPreferenceCount(); i++) {
-                Preference preference = mAlternativeRecentsCategory.getPreference(i);
-                if (PREF_SWIPE_UP_ENABLED.equals(preference.getKey())) {
-                    // We want to have that one enabled
-                    continue;
-                }
-                preference.setEnabled(false);
-            }
-        } else {
-            mAlternativeRecentsCategory.removePreference(findPreference(PREF_SWIPE_UP_ENABLED));
-        }
-    }
-
-    private void updateDependencies() {
-        updateDependencies(null, null);
-    }
-
-    private void updateDependencies(Preference updatedPreference, Boolean newValue) {
-        // Disable stock recents category if alternative enabled
-        boolean alternativeRecentsEnabled = newValue != null && newValue;
-        if (!alternativeRecentsEnabled) {
-            for (int i = 0; i < mAlternativeRecentsCategory.getPreferenceCount(); i++) {
-                Preference preference = mAlternativeRecentsCategory.getPreference(i);
-                if (preference == updatedPreference) {
-                    // Already used newValue
-                    continue;
-                }
-                if (preference instanceof SystemSettingMasterSwitchPreference
-                        && ((SystemSettingMasterSwitchPreference) preference).isChecked()) {
-                    alternativeRecentsEnabled = true;
-                    break;
-                }
-            }
-        }
-        if (mStockRecentsCategory != null) {
-            mStockRecentsCategory.setEnabled(!alternativeRecentsEnabled);
-        }
-
-    }
-
+	}
+	
     @Override
     public boolean onPreferenceChange(Preference preference, Object objValue) {
 
@@ -124,4 +48,4 @@ public class RecentsSettings extends SettingsPreferenceFragment implements
     public int getMetricsCategory() {
         return MetricsProto.MetricsEvent.CHERISH_SETTINGS;
     }
-}
+}
\ No newline at end of file
diff --git a/src/com/cherish/settings/fragments/SlimRecentAppSidebar.java b/src/com/cherish/settings/fragments/SlimRecentAppSidebar.java
deleted file mode 100644
index 850c394..0000000
--- a/src/com/cherish/settings/fragments/SlimRecentAppSidebar.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2018 Havoc-OS
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.cherish.settings.fragments;
-
-import android.os.Bundle;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.SettingsPreferenceFragment;
-
-import com.android.settings.R;
-
-public class SlimRecentAppSidebar extends SettingsPreferenceFragment {
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        addPreferencesFromResource(R.xml.slim_recent_app_sidebar);
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsProto.MetricsEvent.CHERISH_SETTINGS;
-    }
-}
diff --git a/src/com/cherish/settings/fragments/SlimRecentAppSidebarStyle.java b/src/com/cherish/settings/fragments/SlimRecentAppSidebarStyle.java
deleted file mode 100644
index fd4029d..0000000
--- a/src/com/cherish/settings/fragments/SlimRecentAppSidebarStyle.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (C) 2018 Havoc-OS
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.cherish.settings.fragments;
-
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.provider.Settings;
-import androidx.preference.Preference;
-
-import com.android.internal.logging.nano.MetricsProto; 
-import com.android.settings.SettingsPreferenceFragment;
-
-import com.android.settings.R;
-
-import net.margaritov.preference.colorpicker.ColorPickerPreference;
-
-public class SlimRecentAppSidebarStyle extends SettingsPreferenceFragment
-        implements Preference.OnPreferenceChangeListener {
-
-    private static final String RECENT_APP_SIDEBAR_TEXT_COLOR = "recent_app_sidebar_text_color";
-    private static final String RECENT_APP_SIDEBAR_BG_COLOR = "recent_app_sidebar_bg_color";
-
-    private ColorPickerPreference mRecentSidebarTextColor;
-    private ColorPickerPreference mRecentSidebarBgColor;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        addPreferencesFromResource(R.xml.slim_recent_app_sidebar_style);
-
-        mRecentSidebarTextColor = (ColorPickerPreference) findPreference(RECENT_APP_SIDEBAR_TEXT_COLOR);
-        mRecentSidebarTextColor.setOnPreferenceChangeListener(this);
-        final int intColor = Settings.System.getInt(getContext().getContentResolver(),
-                Settings.System.RECENT_APP_SIDEBAR_TEXT_COLOR, 0xffffffff);
-        String hexColor = String.format("#%08x", (0xffffffff & intColor));
-        if (hexColor.equals("#ffffffff")) {
-            mRecentSidebarTextColor.setSummary(R.string.default_string);
-        } else {
-            mRecentSidebarTextColor.setSummary(hexColor);
-        }
-        mRecentSidebarTextColor.setNewPreviewColor(intColor);
-
-        mRecentSidebarBgColor = (ColorPickerPreference) findPreference(RECENT_APP_SIDEBAR_BG_COLOR);
-        mRecentSidebarBgColor.setOnPreferenceChangeListener(this);
-        final int intColorCard = Settings.System.getInt(getContext().getContentResolver(),
-                Settings.System.RECENT_APP_SIDEBAR_BG_COLOR, 0x00ffffff);
-        String hexColorCard = String.format("#%08x", (0x00ffffff & intColorCard));
-        if (hexColorCard.equals("#00ffffff")) {
-            mRecentSidebarBgColor.setSummary(R.string.default_string);
-        } else {
-            mRecentSidebarBgColor.setSummary(hexColorCard);
-        }
-        mRecentSidebarBgColor.setNewPreviewColor(intColorCard);
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        if (preference == mRecentSidebarTextColor) {
-            String hex = ColorPickerPreference.convertToARGB(
-                    Integer.valueOf(String.valueOf(newValue)));
-            if (hex.equals("#ffffffff")) {
-                preference.setSummary(R.string.default_string);
-            } else {
-                preference.setSummary(hex);
-            }
-            int intHex = ColorPickerPreference.convertToColorInt(hex);
-            Settings.System.putIntForUser(getContext().getContentResolver(),
-                    Settings.System.RECENT_APP_SIDEBAR_TEXT_COLOR,
-                    intHex, UserHandle.USER_CURRENT);
-            return true;
-        } else if (preference == mRecentSidebarBgColor) {
-            String hex = ColorPickerPreference.convertToARGB(
-                    Integer.valueOf(String.valueOf(newValue)));
-            if (hex.equals("#00ffffff")) {
-                preference.setSummary(R.string.default_string);
-            } else {
-                preference.setSummary(hex);
-            }
-            int intHex = ColorPickerPreference.convertToColorInt(hex);
-            Settings.System.putIntForUser(getContext().getContentResolver(),
-                    Settings.System.RECENT_APP_SIDEBAR_BG_COLOR,
-                    intHex, UserHandle.USER_CURRENT);
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsProto.MetricsEvent.CHERISH_SETTINGS;
-    }
-}
diff --git a/src/com/cherish/settings/fragments/SlimRecents.java b/src/com/cherish/settings/fragments/SlimRecents.java
deleted file mode 100644
index e795ab5..0000000
--- a/src/com/cherish/settings/fragments/SlimRecents.java
+++ /dev/null
@@ -1,392 +0,0 @@
-/*
- * Copyright (C) 2017 AICP
- *
- * 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.
- */
-
-
-package com.cherish.settings.fragments;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.res.Resources;
-import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.provider.Settings;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.RadioButton;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.android.internal.logging.nano.MetricsProto; 
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.R;
-
-import net.margaritov.preference.colorpicker.ColorPickerPreference;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Map;
-
-public class SlimRecents extends SettingsPreferenceFragment
-        implements Preference.OnPreferenceChangeListener, DialogInterface.OnDismissListener {
-
-    private static final String RECENT_PANEL_LEFTY_MODE = "recent_panel_lefty_mode";
-    private static final String RECENT_ICON_PACK = "slim_icon_pack";
-    private static final String RECENT_PANEL_BG_COLOR = "recent_panel_bg_color";
-    private static final String RECENT_CARD_BG_COLOR = "recent_card_bg_color";
-    private static final String SLIM_MEM_BAR_COLOR = "slim_mem_bar_color";
-    private static final String SLIM_MEM_TEXT_COLOR = "slim_mem_text_color";
-
-    private SwitchPreference mRecentPanelLeftyMode;
-    private Preference mIconPack;
-    private ColorPickerPreference mRecentPanelBgColor;
-    private ColorPickerPreference mRecentCardBgColor;
-    private ColorPickerPreference mMemBarColor;
-    private ColorPickerPreference mMemTextColor;
-
-    // Icon pack
-    private final static String[] sSupportedActions = new String[] {
-        "org.adw.launcher.THEMES",
-        "com.gau.go.launcherex.theme"
-    };
-    private static final String[] sSupportedCategories = new String[] {
-        "com.fede.launcher.THEME_ICONPACK",
-        "com.anddoes.launcher.THEME",
-        "com.teslacoilsw.launcher.THEME"
-    };
-    private AlertDialog mDialog;
-    private ListView mListView;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        addPreferencesFromResource(R.xml.slim_recents);
-
-        mRecentPanelLeftyMode = (SwitchPreference) findPreference(RECENT_PANEL_LEFTY_MODE);
-        mRecentPanelLeftyMode.setOnPreferenceChangeListener(this);
-        mIconPack = findPreference(RECENT_ICON_PACK);
-
-        // Recent panel background color
-        mRecentPanelBgColor = (ColorPickerPreference) findPreference(RECENT_PANEL_BG_COLOR);
-        mRecentPanelBgColor.setOnPreferenceChangeListener(this);
-        final int intColor = Settings.System.getInt(getContext().getContentResolver(),
-                Settings.System.RECENT_PANEL_BG_COLOR, 0x00ffffff);
-        String hexColor = String.format("#%08x", (0x00ffffff & intColor));
-        if (hexColor.equals("#00ffffff")) {
-            mRecentPanelBgColor.setSummary(R.string.default_string);
-        } else {
-            mRecentPanelBgColor.setSummary(hexColor);
-        }
-        mRecentPanelBgColor.setNewPreviewColor(intColor);
-
-        // Recent card background color
-        mRecentCardBgColor = (ColorPickerPreference) findPreference(RECENT_CARD_BG_COLOR);
-        mRecentCardBgColor.setOnPreferenceChangeListener(this);
-        final int intColorCard = Settings.System.getInt(getContext().getContentResolver(),
-                Settings.System.RECENT_CARD_BG_COLOR, 0x00ffffff);
-        String hexColorCard = String.format("#%08x", (0x00ffffff & intColorCard));
-        if (hexColorCard.equals("#00ffffff")) {
-            mRecentCardBgColor.setSummary(R.string.default_auto_string);
-        } else {
-            mRecentCardBgColor.setSummary(hexColorCard);
-        }
-        mRecentCardBgColor.setNewPreviewColor(intColorCard);
-
-        mMemBarColor = (ColorPickerPreference) findPreference(SLIM_MEM_BAR_COLOR);
-        mMemBarColor.setOnPreferenceChangeListener(this);
-        final int intMemColor = Settings.System.getInt(getContext().getContentResolver(),
-                Settings.System.SLIM_MEM_BAR_COLOR, 0xffffffff);
-        String hexMemColor = String.format("#%08x", (0xffffffff & intMemColor));
-        if (hexMemColor.equals("#ffffffff")) {
-            mMemBarColor.setSummary(R.string.default_string);
-        } else {
-            mMemBarColor.setSummary(hexMemColor);
-        }
-        mMemBarColor.setNewPreviewColor(intMemColor);
-
-        mMemTextColor = (ColorPickerPreference) findPreference(SLIM_MEM_TEXT_COLOR);
-        mMemTextColor.setOnPreferenceChangeListener(this);
-        final int intTextColor = Settings.System.getInt(getContext().getContentResolver(),
-                Settings.System.SLIM_MEM_TEXT_COLOR, 0xffffffff);
-        String hexTextColor = String.format("#%08x", (0xffffffff & intTextColor));
-        if (hexTextColor.equals("#ffffffff")) {
-            mMemTextColor.setSummary(R.string.default_string);
-        } else {
-            mMemTextColor.setSummary(hexTextColor);
-        }
-        mMemTextColor.setNewPreviewColor(intTextColor);
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-
-        boolean recentLeftyMode = Settings.System.getInt(getContext().getContentResolver(),
-                Settings.System.RECENT_PANEL_GRAVITY, Gravity.END) == Gravity.START;
-        mRecentPanelLeftyMode.setChecked(recentLeftyMode);
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        if (preference == mRecentPanelLeftyMode) {
-            Settings.System.putInt(getContext().getContentResolver(),
-                    Settings.System.RECENT_PANEL_GRAVITY,
-                    ((Boolean) newValue) ? Gravity.START : Gravity.END);
-            return true;
-        } else if (preference == mRecentPanelBgColor) {
-            String hex = ColorPickerPreference.convertToARGB(
-                    Integer.valueOf(String.valueOf(newValue)));
-            if (hex.equals("#00ffffff")) {
-                preference.setSummary(R.string.default_string);
-            } else {
-                preference.setSummary(hex);
-            }
-            int intHex = ColorPickerPreference.convertToColorInt(hex);
-            Settings.System.putIntForUser(getContext().getContentResolver(),
-                    Settings.System.RECENT_PANEL_BG_COLOR,
-                    intHex, UserHandle.USER_CURRENT);
-            return true;
-        } else if (preference == mRecentCardBgColor) {
-            String hex = ColorPickerPreference.convertToARGB(
-                    Integer.valueOf(String.valueOf(newValue)));
-            if (hex.equals("#00ffffff")) {
-                preference.setSummary(R.string.default_auto_string);
-            } else {
-                preference.setSummary(hex);
-            }
-            int intHex = ColorPickerPreference.convertToColorInt(hex);
-            Settings.System.putIntForUser(getContext().getContentResolver(),
-                    Settings.System.RECENT_CARD_BG_COLOR,
-                    intHex, UserHandle.USER_CURRENT);
-            return true;
-        } else if (preference == mMemBarColor) {
-            String hex = ColorPickerPreference.convertToARGB(
-                    Integer.valueOf(String.valueOf(newValue)));
-            if (hex.equals("#ffffffff")) {
-                preference.setSummary(R.string.default_string);
-            } else {
-                preference.setSummary(hex);
-            }
-            int intHex = ColorPickerPreference.convertToColorInt(hex);
-            Settings.System.putIntForUser(getContext().getContentResolver(),
-                    Settings.System.SLIM_MEM_BAR_COLOR,
-                    intHex, UserHandle.USER_CURRENT);
-            return true;
-        } else if (preference == mMemTextColor) {
-            String hex = ColorPickerPreference.convertToARGB(
-                    Integer.valueOf(String.valueOf(newValue)));
-            if (hex.equals("#ffffffff")) {
-                preference.setSummary(R.string.default_string);
-            } else {
-                preference.setSummary(hex);
-            }
-            int intHex = ColorPickerPreference.convertToColorInt(hex);
-            Settings.System.putIntForUser(getContext().getContentResolver(),
-                    Settings.System.SLIM_MEM_TEXT_COLOR,
-                    intHex, UserHandle.USER_CURRENT);
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(Preference preference) {
-        if (preference == mIconPack) {
-            pickIconPack(getContext());
-            return true;
-        } else {
-            return super.onPreferenceTreeClick(preference);
-        }
-    }
-
-     /** Slim Recents Icon Pack Dialog **/
-    private void pickIconPack(final Context context) {
-        if (mDialog != null) {
-            return;
-        }
-        Map<String, IconPackInfo> supportedPackages = getSupportedPackages(context);
-        if (supportedPackages.isEmpty()) {
-            Toast.makeText(context, R.string.no_iconpacks_summary, Toast.LENGTH_SHORT).show();
-            return;
-        }
-        AlertDialog.Builder builder = new AlertDialog.Builder(context)
-        .setTitle(R.string.dialog_pick_iconpack_title)
-        .setOnDismissListener(this)
-        .setNegativeButton(R.string.cancel, null)
-        .setView(createDialogView(context, supportedPackages));
-        mDialog = builder.show();
-    }
-
-    private View createDialogView(final Context context, Map<String, IconPackInfo> supportedPackages) {
-        final LayoutInflater inflater = (LayoutInflater) context
-                .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        final View view = inflater.inflate(R.layout.dialog_iconpack, null);
-        final IconAdapter adapter = new IconAdapter(context, supportedPackages);
-
-        mListView = (ListView) view.findViewById(R.id.iconpack_list);
-        mListView.setAdapter(adapter);
-        mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view,
-                        int position, long id) {
-                if (adapter.isCurrentIconPack(position)) {
-                    return;
-                }
-                String selectedPackage = adapter.getItem(position);
-                Settings.System.putString(getContext().getContentResolver(),
-                        Settings.System.SLIM_RECENTS_ICON_PACK, selectedPackage);
-                mDialog.dismiss();
-            }
-        });
-
-        return view;
-    }
-
-    @Override
-    public void onDismiss(DialogInterface dialog) {
-        if (mDialog != null) {
-            mDialog = null;
-        }
-    }
-
-    private static class IconAdapter extends BaseAdapter {
-        ArrayList<IconPackInfo> mSupportedPackages;
-        LayoutInflater mLayoutInflater;
-        String mCurrentIconPack;
-        int mCurrentIconPackPosition = -1;
-
-        IconAdapter(Context ctx, Map<String, IconPackInfo> supportedPackages) {
-            mLayoutInflater = LayoutInflater.from(ctx);
-            mSupportedPackages = new ArrayList<IconPackInfo>(supportedPackages.values());
-            Collections.sort(mSupportedPackages, new Comparator<IconPackInfo>() {
-                @Override
-                public int compare(IconPackInfo lhs, IconPackInfo rhs) {
-                    return lhs.label.toString().compareToIgnoreCase(rhs.label.toString());
-                }
-            });
-
-            Resources res = ctx.getResources();
-            String defaultLabel = res.getString(R.string.default_iconpack_title);
-            Drawable icon = res.getDrawable(android.R.drawable.sym_def_app_icon);
-            mSupportedPackages.add(0, new IconPackInfo(defaultLabel, icon, ""));
-            mCurrentIconPack = Settings.System.getString(ctx.getContentResolver(),
-                Settings.System.SLIM_RECENTS_ICON_PACK);
-        }
-
-        @Override
-        public int getCount() {
-            return mSupportedPackages.size();
-        }
-
-        @Override
-        public String getItem(int position) {
-            return (String) mSupportedPackages.get(position).packageName;
-        }
-
-        @Override
-        public long getItemId(int position) {
-            return 0;
-        }
-
-        public boolean isCurrentIconPack(int position) {
-            return mCurrentIconPackPosition == position;
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            if (convertView == null) {
-                convertView = mLayoutInflater.inflate(R.layout.iconpack_view_radio, null);
-            }
-            IconPackInfo info = mSupportedPackages.get(position);
-            TextView txtView = (TextView) convertView.findViewById(R.id.title);
-            txtView.setText(info.label);
-            ImageView imgView = (ImageView) convertView.findViewById(R.id.icon);
-            imgView.setImageDrawable(info.icon);
-            RadioButton radioButton = (RadioButton) convertView.findViewById(R.id.radio);
-            boolean isCurrentIconPack = info.packageName.equals(mCurrentIconPack);
-            radioButton.setChecked(isCurrentIconPack);
-            if (isCurrentIconPack) {
-                mCurrentIconPackPosition = position;
-            }
-            return convertView;
-        }
-    }
-
-    private Map<String, IconPackInfo> getSupportedPackages(Context context) {
-        Intent i = new Intent();
-        Map<String, IconPackInfo> packages = new HashMap<String, IconPackInfo>();
-        PackageManager packageManager = context.getPackageManager();
-        for (String action : sSupportedActions) {
-            i.setAction(action);
-            for (ResolveInfo r : packageManager.queryIntentActivities(i, 0)) {
-                IconPackInfo info = new IconPackInfo(r, packageManager);
-                packages.put(r.activityInfo.packageName, info);
-            }
-        }
-        i = new Intent(Intent.ACTION_MAIN);
-        for (String category : sSupportedCategories) {
-            i.addCategory(category);
-            for (ResolveInfo r : packageManager.queryIntentActivities(i, 0)) {
-                IconPackInfo info = new IconPackInfo(r, packageManager);
-                packages.put(r.activityInfo.packageName, info);
-            }
-            i.removeCategory(category);
-        }
-        return packages;
-    }
-
-    private static class IconPackInfo {
-        String packageName;
-        CharSequence label;
-        Drawable icon;
-
-        IconPackInfo(ResolveInfo r, PackageManager packageManager) {
-            packageName = r.activityInfo.packageName;
-            icon = r.loadIcon(packageManager);
-            label = r.loadLabel(packageManager);
-        }
-
-        IconPackInfo(){
-        }
-
-        public IconPackInfo(String label, Drawable icon, String packageName) {
-            this.label = label;
-            this.icon = icon;
-            this.packageName = packageName;
-        }
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsProto.MetricsEvent.CHERISH_SETTINGS;
-    }
-}
diff --git a/src/com/cherish/settings/fragments/SlimRecentsBlacklist.java b/src/com/cherish/settings/fragments/SlimRecentsBlacklist.java
deleted file mode 100644
index 4b75820..0000000
--- a/src/com/cherish/settings/fragments/SlimRecentsBlacklist.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- * Copyright (C) 2017 The ABC rom
- * Copyright (C) 2017 AICP
- *
- * 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.
- */
-
-package com.cherish.settings.fragments;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.os.Bundle;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceScreen;
-import android.provider.Settings;
-import android.text.TextUtils;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.RadioButton;
-import android.widget.ListView;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.R;
-import com.cherish.settings.preferences.PackageListAdapter;
-import com.cherish.settings.preferences.PackageListAdapter.PackageItem;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.List;
-
-public class SlimRecentsBlacklist extends SettingsPreferenceFragment implements
-        Preference.OnPreferenceClickListener {
-
-    private static final String TAG = "SlimRecentsBlacklist";
-
-    private static final int DIALOG_BLACKLIST_APPS = 1;
-
-    private PackageListAdapter mPackageAdapter;
-    private PackageManager mPackageManager;
-    private PreferenceGroup mBlacklistPrefList;
-    private Preference mAddBlacklistPref;
-    private String mBlacklistPackageList;
-    private Map<String, Package> mBlacklistPackages;
-
-    private AlertDialog mDialog;
-    private ListView mListView;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        addPreferencesFromResource(R.xml.slim_recents_blacklist);
-
-        initializeAllPreferences();
-    }
-
-    @Override
-    public Dialog onCreateDialog(int dialogId) {
-        switch (dialogId) {
-            case DIALOG_BLACKLIST_APPS: {
-                Dialog dialog;
-                AlertDialog.Builder alertDialog = new AlertDialog.Builder(getActivity());
-                final ListView list = new ListView(getActivity());
-                list.setAdapter(mPackageAdapter);
-                alertDialog.setTitle(R.string.profile_choose_app);
-                alertDialog.setView(list);
-                dialog = alertDialog.create();
-                list.setOnItemClickListener(new OnItemClickListener() {
-                    @Override
-                    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                        // Add empty application definition, the user will be able to edit it later
-                        PackageItem info = (PackageItem) parent.getItemAtPosition(position);
-                        addCustomApplicationPref(info.packageName, mBlacklistPackages);
-                        dialog.cancel();
-                    }
-                });
-                return dialog;
-            }
-         }
-        return super.onCreateDialog(dialogId);
-    }
-
-    @Override
-    public int getDialogMetricsCategory(int dialogId) {
-        switch (dialogId) {
-            case DIALOG_BLACKLIST_APPS:
-                return MetricsProto.MetricsEvent.CHERISH_SETTINGS;
-            default:
-                return 0;
-        }
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsProto.MetricsEvent.CHERISH_SETTINGS;
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        refreshCustomApplicationPrefs();
-    }
-
-    private void initializeAllPreferences() {
-        mPackageManager = getActivity().getPackageManager();
-        mPackageAdapter = new PackageListAdapter(getActivity());
-        //mBlacklistPrefList = (PreferenceGroup) findPreference("blacklist_applications");
-        mBlacklistPrefList = getPreferenceScreen();
-        mBlacklistPrefList.setOrderingAsAdded(false);
-        mBlacklistPackages = new HashMap<String, Package>();
-        mAddBlacklistPref = findPreference("add_blacklist_packages");
-        mAddBlacklistPref.setOnPreferenceClickListener(this);
-    }
-
-    @Override
-    public boolean onPreferenceClick(Preference preference) {
-        if (preference == mAddBlacklistPref) {
-            showDialog(DIALOG_BLACKLIST_APPS);
-        } else {
-            AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
-                        .setTitle(R.string.dialog_delete_title)
-                        .setMessage(R.string.dialog_delete_message)
-                        //.setIconAttribute(android.R.attr.alertDialogIcon)
-                        .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int which) {
-                                removeApplicationPref(preference.getKey(), mBlacklistPackages);
-                            }
-                        })
-                        .setNegativeButton(android.R.string.cancel, null);
-
-            builder.show();
-        }
-        return true;
-    }
-
-    /**
-     * Application class
-     */
-    private static class Package {
-        public String name;
-        /**
-         * Stores all the application values in one call
-         * @param name
-         */
-        public Package(String name) {
-            this.name = name;
-        }
-
-        public String toString() {
-            StringBuilder builder = new StringBuilder();
-            builder.append(name);
-            return builder.toString();
-        }
-
-        public static Package fromString(String value) {
-            if (TextUtils.isEmpty(value)) {
-                return null;
-            }
-
-            try {
-                Package item = new Package(value);
-                return item;
-            } catch (NumberFormatException e) {
-                return null;
-            }
-        }
-
-    };
-
-    private void refreshCustomApplicationPrefs() {
-        if (!parsePackageList()) {
-            return;
-        }
-
-        // Add the Application Preferences
-        if (mBlacklistPrefList != null) {
-            mBlacklistPrefList.removeAll();
-
-            for (Package pkg : mBlacklistPackages.values()) {
-                try {
-                    Preference pref = createPreferenceFromInfo(pkg);
-                    mBlacklistPrefList.addPreference(pref);
-                } catch (PackageManager.NameNotFoundException e) {
-                    // Do nothing
-                }
-            }
-        }
-
-        // Keep these at the top
-        mAddBlacklistPref.setOrder(0);
-        // Add 'add' options
-        mBlacklistPrefList.addPreference(mAddBlacklistPref);
-    }
-
-     private void addCustomApplicationPref(String packageName, Map<String,Package> map) {
-        Package pkg = map.get(packageName);
-        if (pkg == null) {
-            pkg = new Package(packageName);
-            map.put(packageName, pkg);
-            savePackageList(false, map);
-            refreshCustomApplicationPrefs();
-        }
-    }
-
-    private Preference createPreferenceFromInfo(Package pkg)
-            throws PackageManager.NameNotFoundException {
-        PackageInfo info = mPackageManager.getPackageInfo(pkg.name,
-                PackageManager.GET_META_DATA);
-        Preference pref =
-                new Preference(getActivity());
-
-        pref.setKey(pkg.name);
-        pref.setTitle(info.applicationInfo.loadLabel(mPackageManager));
-        pref.setIcon(info.applicationInfo.loadIcon(mPackageManager));
-        pref.setPersistent(false);
-        pref.setOnPreferenceClickListener(this);
-        return pref;
-    }
-
-    private void removeApplicationPref(String packageName, Map<String,Package> map) {
-        if (map.remove(packageName) != null) {
-            savePackageList(false, map);
-            refreshCustomApplicationPrefs();
-        }
-    }
-
-    private boolean parsePackageList() {
-        boolean parsed = false;
-        final String blacklistString = Settings.System.getString(getActivity().getContentResolver(),
-                Settings.System.SLIM_RECENTS_BLACKLIST_VALUES);
-
-        if (!TextUtils.equals(mBlacklistPackageList, blacklistString)) {
-            mBlacklistPackageList = blacklistString;
-            mBlacklistPackages.clear();
-            parseAndAddToMap(blacklistString, mBlacklistPackages);
-            parsed = true;
-        }
-
-        return parsed;
-    }
-
-    private void parseAndAddToMap(String baseString, Map<String,Package> map) {
-        if (baseString == null) {
-            return;
-        }
-
-        final String[] array = TextUtils.split(baseString, "\\|");
-        for (String item : array) {
-            if (TextUtils.isEmpty(item)) {
-                continue;
-            }
-            Package pkg = Package.fromString(item);
-            map.put(pkg.name, pkg);
-        }
-    }
-
-    private void savePackageList(boolean preferencesUpdated, Map<String,Package> map) {
-        String setting = Settings.System.SLIM_RECENTS_BLACKLIST_VALUES;
-
-        List<String> settings = new ArrayList<String>();
-        for (Package app : map.values()) {
-            settings.add(app.toString());
-        }
-        final String value = TextUtils.join("|", settings);
-        if (preferencesUpdated) {
-            mBlacklistPackageList = value;
-        }
-        Settings.System.putString(getActivity().getContentResolver(),
-                setting, value);
-    }
-}
diff --git a/src/com/cherish/settings/fragments/StatusBarSettings.java b/src/com/cherish/settings/fragments/StatusBarSettings.java
index 85c3d44..21d3f73 100644
--- a/src/com/cherish/settings/fragments/StatusBarSettings.java
+++ b/src/com/cherish/settings/fragments/StatusBarSettings.java
@@ -39,28 +39,6 @@ import java.util.Collections;
 
 public class StatusBarSettings extends SettingsPreferenceFragment implements
         OnPreferenceChangeListener {
-    private static final String STATUS_BAR_CLOCK = "status_bar_clock";
-    private static final String STATUS_BAR_SHOW_BATTERY_PERCENT = "status_bar_show_battery_percent";
-    private static final String STATUS_BAR_BATTERY_TEXT_CHARGING = "status_bar_battery_text_charging";
-    private static final String STATUS_BAR_BATTERY_CHARGING_BOLT = "status_bar_battery_charging_bolt";
-    private static final String BATTERY_PERCENTAGE_HIDDEN = "0";
-    private static final String STATUS_BAR_BATTERY_STYLE = "status_bar_battery_style";
-    private static final String BATTERY_BAR = "battery_bar_settings";
-
-    private static final int BATTERY_STYLE_Q = 0;
-    private static final int BATTERY_STYLE_DOTTED_CIRCLE = 1;
-    private static final int BATTERY_STYLE_CIRCLE = 2;
-    private static final int BATTERY_STYLE_TEXT = 3;
-    private static final int BATTERY_STYLE_HIDDEN = 4;
-
-    private SystemSettingMasterSwitchPreference mStatusBarClockShow;
-    private ListPreference mBatteryPercent;
-    private ListPreference mBatteryStyle;
-    private SwitchPreference mBatteryCharging;
-	private CustomSeekBarPreference mThreshold;
-    private SystemSettingSwitchPreference mNetMonitor;
-    private SwitchPreference mBatteryBolt;
-    private SystemSettingMasterSwitchPreference mBatteryBar;
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -71,119 +49,14 @@ public class StatusBarSettings extends SettingsPreferenceFragment implements
 		ContentResolver resolver = getActivity().getContentResolver();
 
         PreferenceScreen prefSet = getPreferenceScreen();
-
-        mStatusBarClockShow = (SystemSettingMasterSwitchPreference) findPreference(STATUS_BAR_CLOCK);
-        mStatusBarClockShow.setChecked((Settings.System.getInt(resolver,
-                Settings.System.STATUS_BAR_CLOCK, 1) == 1));
-        mStatusBarClockShow.setOnPreferenceChangeListener(this);
-
-        mBatteryPercent = (ListPreference) findPreference(STATUS_BAR_SHOW_BATTERY_PERCENT);
-        mBatteryCharging = (SwitchPreference) findPreference(STATUS_BAR_BATTERY_TEXT_CHARGING);
-        mBatteryCharging.setOnPreferenceChangeListener(this);
-
-        mBatteryBolt = (SwitchPreference) findPreference(STATUS_BAR_BATTERY_CHARGING_BOLT);
-        mBatteryBolt.setOnPreferenceChangeListener(this);
-
-        mBatteryStyle = (ListPreference) findPreference(STATUS_BAR_BATTERY_STYLE);
-        int batterystyle = Settings.System.getInt(resolver,
-                Settings.System.STATUS_BAR_BATTERY_STYLE, BATTERY_STYLE_Q);
-        mBatteryStyle.setOnPreferenceChangeListener(this);
-
-        updateBatteryOptions(batterystyle);
-		
-		boolean isNetMonitorEnabled = Settings.System.getIntForUser(resolver,
-                Settings.System.NETWORK_TRAFFIC_STATE, 1, UserHandle.USER_CURRENT) == 1;
-        mNetMonitor = (SystemSettingSwitchPreference) findPreference("network_traffic_state");
-        mNetMonitor.setChecked(isNetMonitorEnabled);
-        mNetMonitor.setOnPreferenceChangeListener(this);
-
-        int value = Settings.System.getIntForUser(resolver,
-                Settings.System.NETWORK_TRAFFIC_AUTOHIDE_THRESHOLD, 1, UserHandle.USER_CURRENT);
-        mThreshold = (CustomSeekBarPreference) findPreference("network_traffic_autohide_threshold");
-        mThreshold.setValue(value);
-        mThreshold.setOnPreferenceChangeListener(this);
-        mThreshold.setEnabled(isNetMonitorEnabled);
-
-        mBatteryBar = (SystemSettingMasterSwitchPreference)
-                findPreference(BATTERY_BAR);
-        mBatteryBar.setOnPreferenceChangeListener(this);
-        boolean enabled = Settings.System.getInt(resolver,
-                Settings.System.BATTERY_BAR_LOCATION, 0) != 0;
-        mBatteryBar.setChecked(enabled);
     }
 
     @Override
     public boolean onPreferenceChange(Preference preference, Object objValue) {
-         if (preference == mStatusBarClockShow) {
-            boolean value = (Boolean) objValue;
-            Settings.System.putInt(getActivity().getContentResolver(),
-                    Settings.System.STATUS_BAR_CLOCK, value ? 1 : 0);
-            return true;
-        }   else if (preference == mBatteryStyle) {
-            int value = Integer.parseInt((String) objValue);
-            updateBatteryOptions(value);
-            return true;
-		} else if (preference == mNetMonitor) {
-            boolean value = (Boolean) objValue;
-            Settings.System.putIntForUser(getActivity().getContentResolver(),
-                    Settings.System.NETWORK_TRAFFIC_STATE, value ? 1 : 0,
-                    UserHandle.USER_CURRENT);
-            mNetMonitor.setChecked(value);
-            mThreshold.setEnabled(value);
-            return true;
-        } else if (preference == mThreshold) {
-            int val = (Integer) objValue;
-            Settings.System.putIntForUser(getContentResolver(),
-                    Settings.System.NETWORK_TRAFFIC_AUTOHIDE_THRESHOLD, val,
-                    UserHandle.USER_CURRENT);
-            return true;
-        } else if (preference == mBatteryCharging) {
-            boolean enabled = (Boolean) objValue;
-            Settings.System.putInt(getActivity().getContentResolver(),
-                    Settings.System.STATUS_BAR_BATTERY_TEXT_CHARGING,
-                    enabled ? 1 : 0);
-            updateBoltEnablement();
-            return true;
-        } else if (preference == mBatteryBolt) {
-            boolean enabled = (Boolean) objValue;
-            Settings.System.putInt(getActivity().getContentResolver(),
-                    Settings.System.STATUS_BAR_BATTERY_CHARGING_BOLT,
-                    enabled ? 1 : 0);
-            return true;
-        } else if (preference == mBatteryBar) {
-            boolean enabled = (boolean) objValue;
-            Settings.System.putInt(getActivity().getContentResolver(),
-                    Settings.System.BATTERY_BAR_LOCATION, enabled ? 1 : 0);
-            return true;
-        }
 		
         return false;
     }
 	
-	private void updateBatteryOptions(int batterystyle) {
-        boolean enabled = batterystyle != BATTERY_STYLE_TEXT && batterystyle != BATTERY_STYLE_HIDDEN;
-        if (batterystyle == BATTERY_STYLE_HIDDEN) {
-            mBatteryPercent.setValue(BATTERY_PERCENTAGE_HIDDEN);
-            mBatteryPercent.setSummary(mBatteryPercent.getEntry());
-            Settings.System.putInt(getActivity().getContentResolver(),
-                    Settings.System.STATUS_BAR_SHOW_BATTERY_PERCENT, 0);
-        }
-        mBatteryCharging.setEnabled(enabled);
-        mBatteryPercent.setEnabled(enabled);
-        updateBoltEnablement();
-    }
-
-    private void updateBoltEnablement() {
-        int batteryStyle = Settings.System.getInt(getActivity().getContentResolver(),
-                Settings.System.STATUS_BAR_BATTERY_STYLE, BATTERY_STYLE_Q);
-        boolean precentOnCharging = Settings.System.getInt(getActivity().getContentResolver(),
-                Settings.System.STATUS_BAR_BATTERY_TEXT_CHARGING, 1) == 1;
-        boolean textEnabled = batteryStyle == BATTERY_STYLE_TEXT ||
-                (batteryStyle == BATTERY_STYLE_HIDDEN && precentOnCharging);
-        mBatteryBolt.setEnabled(textEnabled);
-		
-	}
-
     @Override
     public int getMetricsCategory() {
         return MetricsProto.MetricsEvent.CHERISH_SETTINGS;
diff --git a/src/com/cherish/settings/fragments/ThemeSettings.java b/src/com/cherish/settings/fragments/ThemeSettings.java
index 50b3c1f..4120f6e 100644
--- a/src/com/cherish/settings/fragments/ThemeSettings.java
+++ b/src/com/cherish/settings/fragments/ThemeSettings.java
@@ -43,33 +43,6 @@ import net.margaritov.preference.colorpicker.ColorPickerPreference;
 
 public class ThemeSettings extends SettingsPreferenceFragment implements
         OnPreferenceChangeListener {
-			
-			private static final String PREF_THEME_SWITCH = "theme_switch";
-    private static final String SYSUI_ROUNDED_SIZE = "sysui_rounded_size";
-    private static final String SYSUI_ROUNDED_CONTENT_PADDING = "sysui_rounded_content_padding";
-    private static final String SYSUI_STATUS_BAR_PADDING = "sysui_status_bar_padding";
-    private static final String SYSUI_ROUNDED_FWVALS = "sysui_rounded_fwvals";
-    private static final String SWITCH_STYLE = "switch_style";
-    private static final String QS_TILE_STYLE = "qs_tile_style";
-    private static final String QS_HEADER_STYLE = "qs_header_style";
-    private static final String BRIGHTNESS_SLIDER_STYLE = "brightness_slider_style";
-    private static final String NAVBAR_STYLE = "navbar_style";
-
-    private static final String UI_STYLE = "ui_style";
-
-    private UiModeManager mUiModeManager;
-    private IOverlayManager mOverlayService;
-    private ListPreference mThemeSwitch;
-    private CustomSeekBarPreference mCornerRadius;
-    private CustomSeekBarPreference mContentPadding;
-    private CustomSeekBarPreference mSBPadding;
-    private SwitchPreference mRoundedFwvals;
-    private ListPreference mSwitchStyle;
-    private ListPreference mQsTileStyle;
-    private ListPreference mQsHeaderStyle;
-    private ListPreference mBrightnessSliderStyle;
-    private ListPreference mUIStyle;
-    private ListPreference mNavbarStyle;
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -79,377 +52,14 @@ public class ThemeSettings extends SettingsPreferenceFragment implements
 
         PreferenceScreen prefScreen = getPreferenceScreen();
         ContentResolver resolver = getActivity().getContentResolver();
-
-        Resources res = null;
-        Context ctx = getContext();
-        float density = Resources.getSystem().getDisplayMetrics().density;
-
-        try {
-            res = ctx.getPackageManager().getResourcesForApplication("com.android.systemui");
-        } catch (NameNotFoundException e) {
-            e.printStackTrace();
-        }
-
-        mUIStyle = (ListPreference) findPreference(UI_STYLE);
-        int UIStyle = Settings.System.getInt(getActivity().getContentResolver(),
-                Settings.System.UI_STYLE, 0);
-        int UIStyleValue = getOverlayPosition(ThemesUtils.UI_THEMES);
-        if (UIStyleValue != 0) {
-            mUIStyle.setValue(String.valueOf(UIStyle));
-        }
-        mUIStyle.setSummary(mUIStyle.getEntry());
-        mUIStyle.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                if (preference == mUIStyle) {
-                    String value = (String) newValue;
-                    Settings.System.putInt(getActivity().getContentResolver(), Settings.System.UI_STYLE, Integer.valueOf(value));
-                    int valueIndex = mUIStyle.findIndexOfValue(value);
-                    mUIStyle.setSummary(mUIStyle.getEntries()[valueIndex]);
-                    String overlayName = getOverlayName(ThemesUtils.UI_THEMES);
-                    if (overlayName != null) {
-                    handleOverlays(overlayName, false, mOverlayService);
-                    }
-                    if (valueIndex > 0) {
-                        handleOverlays(ThemesUtils.UI_THEMES[valueIndex],
-                                true, mOverlayService);
-                    }
-                    return true;
-                }
-                return false;
-            }
-       });
-
-        mBrightnessSliderStyle = (ListPreference) findPreference(BRIGHTNESS_SLIDER_STYLE);
-        int BrightnessSliderStyle = Settings.System.getInt(getActivity().getContentResolver(),
-                Settings.System.BRIGHTNESS_SLIDER_STYLE, 0);
-        int BrightnessSliderStyleValue = getOverlayPosition(ThemesUtils.BRIGHTNESS_SLIDER_THEMES);
-        if (BrightnessSliderStyleValue != 0) {
-            mBrightnessSliderStyle.setValue(String.valueOf(BrightnessSliderStyle));
-        }
-        mBrightnessSliderStyle.setSummary(mBrightnessSliderStyle.getEntry());
-        mBrightnessSliderStyle.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                if (preference == mBrightnessSliderStyle) {
-                    String value = (String) newValue;
-                    Settings.System.putInt(getActivity().getContentResolver(), Settings.System.BRIGHTNESS_SLIDER_STYLE, Integer.valueOf(value));
-                    int valueIndex = mBrightnessSliderStyle.findIndexOfValue(value);
-                    mBrightnessSliderStyle.setSummary(mBrightnessSliderStyle.getEntries()[valueIndex]);
-                    String overlayName = getOverlayName(ThemesUtils.BRIGHTNESS_SLIDER_THEMES);
-                    if (overlayName != null) {
-                    handleOverlays(overlayName, false, mOverlayService);
-                    }
-                    if (valueIndex > 0) {
-                        handleOverlays(ThemesUtils.BRIGHTNESS_SLIDER_THEMES[valueIndex],
-                                true, mOverlayService);
-                    }
-                    return true;
-                }
-                return false;
-            }
-       });
-
-        mNavbarStyle = (ListPreference) findPreference(NAVBAR_STYLE);
-        int navbarStyle = Settings.System.getInt(getActivity().getContentResolver(),
-                Settings.System.NAVBAR_STYLE, 0);
-        int navbarStyleValue = getOverlayPosition(ThemesUtils.NAVBAR_STYLES);
-        if (navbarStyleValue != 0) {
-            mNavbarStyle.setValue(String.valueOf(navbarStyle));
-        }
-        mNavbarStyle.setSummary(mNavbarStyle.getEntry());
-        mNavbarStyle.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                if (preference == mNavbarStyle) {
-                    String value = (String) newValue;
-                    Settings.System.putInt(getActivity().getContentResolver(), Settings.System.NAVBAR_STYLE, Integer.valueOf(value));
-                    int valueIndex = mNavbarStyle.findIndexOfValue(value);
-                    mNavbarStyle.setSummary(mNavbarStyle.getEntries()[valueIndex]);
-                    String overlayName = getOverlayName(ThemesUtils.NAVBAR_STYLES);
-                    if (overlayName != null) {
-                    handleOverlays(overlayName, false, mOverlayService);
-                    }
-                    if (valueIndex > 0) {
-                        handleOverlays(ThemesUtils.NAVBAR_STYLES[valueIndex],
-                                true, mOverlayService);
-                    }
-                    return true;
-                }
-                return false;
-            }
-       });
-
-        // Rounded Corner Radius
-        mCornerRadius = (CustomSeekBarPreference) findPreference(SYSUI_ROUNDED_SIZE);
-        int resourceIdRadius = (int) ctx.getResources().getDimension(com.android.internal.R.dimen.rounded_corner_radius);
-        int cornerRadius = Settings.Secure.getIntForUser(ctx.getContentResolver(), Settings.Secure.SYSUI_ROUNDED_SIZE,
-                ((int) (resourceIdRadius / density)), UserHandle.USER_CURRENT);
-        mCornerRadius.setValue(cornerRadius);
-        mCornerRadius.setOnPreferenceChangeListener(this);
-
-        // Rounded Content Padding
-        mContentPadding = (CustomSeekBarPreference) findPreference(SYSUI_ROUNDED_CONTENT_PADDING);
-        int resourceIdPadding = res.getIdentifier("com.android.systemui:dimen/rounded_corner_content_padding", null,
-                null);
-        int contentPadding = Settings.Secure.getIntForUser(ctx.getContentResolver(),
-                Settings.Secure.SYSUI_ROUNDED_CONTENT_PADDING,
-                (int) (res.getDimension(resourceIdPadding) / density), UserHandle.USER_CURRENT);
-        mContentPadding.setValue(contentPadding);
-        mContentPadding.setOnPreferenceChangeListener(this);
-
-        // Status Bar Content Padding
-        mSBPadding = (CustomSeekBarPreference) findPreference(SYSUI_STATUS_BAR_PADDING);
-        int resourceIdSBPadding = res.getIdentifier("com.android.systemui:dimen/status_bar_extra_padding", null,
-                null);
-        int sbPadding = Settings.Secure.getIntForUser(ctx.getContentResolver(),
-                Settings.Secure.SYSUI_STATUS_BAR_PADDING,
-                (int) (res.getDimension(resourceIdSBPadding) / density), UserHandle.USER_CURRENT);
-        mSBPadding.setValue(sbPadding);
-        mSBPadding.setOnPreferenceChangeListener(this);
-
-        // Rounded use Framework Values
-        mRoundedFwvals = (SwitchPreference) findPreference(SYSUI_ROUNDED_FWVALS);
-        mRoundedFwvals.setOnPreferenceChangeListener(this);
-
-        mSwitchStyle = (ListPreference) findPreference(SWITCH_STYLE);
-        int switchStyle = Settings.System.getInt(resolver,
-                Settings.System.SWITCH_STYLE, 1);
-        int switchValueIndex = mSwitchStyle.findIndexOfValue(String.valueOf(switchStyle));
-        mSwitchStyle.setValueIndex(switchValueIndex >= 0 ? switchValueIndex : 0);
-        mSwitchStyle.setSummary(mSwitchStyle.getEntry());
-        mSwitchStyle.setOnPreferenceChangeListener(this);
-
-        mQsTileStyle = (ListPreference) findPreference(QS_TILE_STYLE);
-        int qsTileStyle = Settings.System.getIntForUser(resolver,
-                Settings.System.QS_TILE_STYLE, 0, UserHandle.USER_CURRENT);
-        int valueIndex = mQsTileStyle.findIndexOfValue(String.valueOf(qsTileStyle));
-        mQsTileStyle.setValueIndex(valueIndex >= 0 ? valueIndex : 0);
-        mQsTileStyle.setSummary(mQsTileStyle.getEntry());
-        mQsTileStyle.setOnPreferenceChangeListener(this);
-
-        mQsHeaderStyle = (ListPreference)findPreference(QS_HEADER_STYLE);
-        int qsHeaderStyle = Settings.System.getInt(resolver,
-                Settings.System.QS_HEADER_STYLE, 0);
-        int qsvalueIndex = mQsHeaderStyle.findIndexOfValue(String.valueOf(qsHeaderStyle));
-        mQsHeaderStyle.setValueIndex(qsvalueIndex >= 0 ? qsvalueIndex : 0);
-        mQsHeaderStyle.setSummary(mQsHeaderStyle.getEntry());
-        mQsHeaderStyle.setOnPreferenceChangeListener(this);
-
-
-		mOverlayService = IOverlayManager.Stub
-                .asInterface(ServiceManager.getService(Context.OVERLAY_SERVICE));
-		mUiModeManager = getContext().getSystemService(UiModeManager.class);
-		setupThemeSwitchPref();
         }
 
     @Override
-    public boolean onPreferenceChange(Preference preference, Object objValue) {
-           ContentResolver resolver = getActivity().getContentResolver();
-           if (preference == mThemeSwitch) {
-            String theme_switch = (String) objValue;
-            final Context context = getContext();
-            switch (theme_switch) {
-                case "1":
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_NO, ThemesUtils.SOLARIZED_DARK);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_NO, ThemesUtils.BAKED_GREEN);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_NO, ThemesUtils.CHOCO_X);
-					handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_NO, ThemesUtils.PITCH_BLACK);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_NO, ThemesUtils.DARK_GREY);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_NO, ThemesUtils.MATERIAL_OCEAN);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_NO, ThemesUtils.CLEAR_SPRING);
-                    break;
-                case "2":
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.SOLARIZED_DARK);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.BAKED_GREEN);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.CHOCO_X);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.PITCH_BLACK);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.DARK_GREY);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.MATERIAL_OCEAN);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.CLEAR_SPRING);
-                    break;
-                case "3":
-                    handleBackgrounds(true, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.SOLARIZED_DARK);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.BAKED_GREEN);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.CHOCO_X);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.PITCH_BLACK);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.DARK_GREY);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.MATERIAL_OCEAN);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.CLEAR_SPRING);
-                    break;
-                case "4":
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.SOLARIZED_DARK);
-                    handleBackgrounds(true, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.BAKED_GREEN);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.CHOCO_X);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.PITCH_BLACK);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.DARK_GREY);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.MATERIAL_OCEAN);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.CLEAR_SPRING);
-                    break;
-                case "5":
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.SOLARIZED_DARK);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.BAKED_GREEN);
-                    handleBackgrounds(true, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.CHOCO_X);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.PITCH_BLACK);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.DARK_GREY);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.MATERIAL_OCEAN);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.CLEAR_SPRING);
-                    break;
-                case "6":
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.SOLARIZED_DARK);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.BAKED_GREEN);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.CHOCO_X);
-                    handleBackgrounds(true, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.PITCH_BLACK);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.DARK_GREY);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.MATERIAL_OCEAN);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.CLEAR_SPRING);
-                    break;
-                case "7":
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.SOLARIZED_DARK);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.BAKED_GREEN);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.CHOCO_X);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.PITCH_BLACK);
-                    handleBackgrounds(true, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.DARK_GREY);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.MATERIAL_OCEAN);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.CLEAR_SPRING);
-                    break;
-                case "8":
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.SOLARIZED_DARK);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.BAKED_GREEN);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.CHOCO_X);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.PITCH_BLACK);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.DARK_GREY);
-                    handleBackgrounds(true, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.MATERIAL_OCEAN);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.CLEAR_SPRING);
-                    break;
-                case "9":
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.SOLARIZED_DARK);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.BAKED_GREEN);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.CHOCO_X);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.PITCH_BLACK);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.DARK_GREY);
-                    handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.MATERIAL_OCEAN);
-                    handleBackgrounds(true, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.CLEAR_SPRING);
-                    break;
-            }
-            try {
-                 mOverlayService.reloadAndroidAssets(UserHandle.USER_CURRENT);
-                 mOverlayService.reloadAssets("com.android.settings", UserHandle.USER_CURRENT);
-                 mOverlayService.reloadAssets("com.android.systemui", UserHandle.USER_CURRENT);
-             } catch (RemoteException ignored) {
-             }
-        } else if (preference == mCornerRadius) {
-            Settings.Secure.putIntForUser(getContext().getContentResolver(), Settings.Secure.SYSUI_ROUNDED_SIZE,
-                    (int) objValue, UserHandle.USER_CURRENT);
-        } else if (preference == mContentPadding) {
-            Settings.Secure.putIntForUser(getContext().getContentResolver(), Settings.Secure.SYSUI_ROUNDED_CONTENT_PADDING,
-                    (int) objValue, UserHandle.USER_CURRENT);
-        } else if (preference == mSBPadding) {
-            Settings.Secure.putIntForUser(getContext().getContentResolver(), Settings.Secure.SYSUI_STATUS_BAR_PADDING,
-                    (int) objValue, UserHandle.USER_CURRENT);
-        } else if (preference == mRoundedFwvals) {
-            restoreCorners();
-        } else if (preference == mSwitchStyle) {
-            String value = (String) objValue;
-            Settings.System.putInt(resolver, Settings.System.SWITCH_STYLE, Integer.valueOf(value));
-            int valueIndex = mSwitchStyle.findIndexOfValue(value);
-            mSwitchStyle.setSummary(mSwitchStyle.getEntries()[valueIndex]);
-         } else if (preference == mQsTileStyle) {
-            int qsTileStyleValue = Integer.valueOf((String) objValue);
-            Settings.System.putIntForUser(resolver,
-                    Settings.System.QS_TILE_STYLE, qsTileStyleValue, UserHandle.USER_CURRENT);
-            mQsTileStyle.setSummary(mQsTileStyle.getEntries()[qsTileStyleValue]);
-        } else if (preference == mQsHeaderStyle) {
-            String value = (String) objValue;
-            Settings.System.putInt(resolver,
-			    Settings.System.QS_HEADER_STYLE, Integer.valueOf(value));
-            int newIndex = mQsHeaderStyle.findIndexOfValue(value);
-            mQsHeaderStyle.setSummary(mQsHeaderStyle.getEntries()[newIndex]);
-		}
-        return true;
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        ContentResolver resolver = getActivity().getContentResolver();
+
+        return false;
     }
-	
-	private void setupThemeSwitchPref() {
-        mThemeSwitch = (ListPreference) findPreference(PREF_THEME_SWITCH);
-        mThemeSwitch.setOnPreferenceChangeListener(this);
-        if (CherishUtils.isThemeEnabled("com.android.theme.clearspring.system")) {
-            mThemeSwitch.setValue("9");
-        } else if (CherishUtils.isThemeEnabled("com.android.theme.darkgrey.system")) {
-            mThemeSwitch.setValue("7");
-        } else if (CherishUtils.isThemeEnabled("com.android.theme.pitchblack.system")) {
-            mThemeSwitch.setValue("6");
-        } else if (CherishUtils.isThemeEnabled("com.android.theme.materialocean.system")) {
-            mThemeSwitch.setValue("8");
-        } else if (CherishUtils.isThemeEnabled("com.android.theme.chocox.system")) {
-            mThemeSwitch.setValue("5");
-        } else if (CherishUtils.isThemeEnabled("com.android.theme.bakedgreen.system")) {
-            mThemeSwitch.setValue("4");
-        } else if (CherishUtils.isThemeEnabled("com.android.theme.solarizeddark.system")) {
-            mThemeSwitch.setValue("3");
-        } else if (mUiModeManager.getNightMode() == UiModeManager.MODE_NIGHT_YES) {
-            mThemeSwitch.setValue("2");
-        } else {
-            mThemeSwitch.setValue("1");
-        }
-    }
-
-    private void handleBackgrounds(Boolean state, Context context, int mode, String[] overlays) {
-        if (context != null) {
-            Objects.requireNonNull(context.getSystemService(UiModeManager.class))
-                    .setNightMode(mode);
-        }
-        for (int i = 0; i < overlays.length; i++) {
-            String background = overlays[i];
-            try {
-                mOverlayService.setEnabled(background, state, USER_SYSTEM);
-            } catch (RemoteException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    private void restoreCorners() {
-        Resources res = null;
-        float density = Resources.getSystem().getDisplayMetrics().density;
-        Context ctx = getContext();
-
-        try {
-            res = ctx.getPackageManager().getResourcesForApplication("com.android.systemui");
-        } catch (NameNotFoundException e) {
-            e.printStackTrace();
-        }
-
-        int resourceIdRadius = (int) ctx.getResources().getDimension(com.android.internal.R.dimen.rounded_corner_radius);
-        int resourceIdPadding = res.getIdentifier("com.android.systemui:dimen/rounded_corner_content_padding", null,
-                null);
-        int resourceIdSBPadding = res.getIdentifier("com.android.systemui:dimen/status_bar_extra_padding", null,
-                null);
-        mCornerRadius.setValue((int) (resourceIdRadius / density));
-        mContentPadding.setValue((int) (res.getDimension(resourceIdPadding) / density));
-        mSBPadding.setValue((int) (res.getDimension(resourceIdSBPadding) / density));
-    }
-	
-	private String getOverlayName(String[] overlays) {
-            String overlayName = null;
-            for (int i = 0; i < overlays.length; i++) {
-                String overlay = overlays[i];
-                if (CherishUtils.isThemeEnabled(overlay)) {
-                    overlayName = overlay;
-                }
-            }
-            return overlayName;
-        }
-
-    private int getOverlayPosition(String[] overlays) {
-            int position = -1;
-            for (int i = 0; i < overlays.length; i++) {
-                String overlay = overlays[i];
-                if (CherishUtils.isThemeEnabled(overlay)) {
-                    position = i;
-                }
-            }
-            return position;
-        }
 
     @Override
     public int getMetricsCategory() {
diff --git a/src/com/cherish/settings/preferences/fragments/BatteryBar.java b/src/com/cherish/settings/preferences/fragments/BatteryBar.java
deleted file mode 100644
index bf780ea..0000000
--- a/src/com/cherish/settings/preferences/fragments/BatteryBar.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * Copyright (C) 2013 Android Open Kang Project
- * Copyright (C) 2017 faust93 at monumentum@gmail.com
- *
- * 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.
- */
-
-package com.cherish.settings.fragments;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.ContentResolver;
-import android.content.res.Resources;
-import android.graphics.Color;
-import android.net.ConnectivityManager;
-import android.os.Bundle;
-import android.os.UserManager;
-import android.provider.SearchIndexableResource;
-import android.provider.Settings;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.View;
-
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.SwitchPreference;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.Utils;
-import com.android.settingslib.search.SearchIndexable;
-
-import com.cherish.settings.preferences.CustomSeekBarPreference;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import net.margaritov.preference.colorpicker.ColorPickerPreference;
-
-@SearchIndexable
-public class BatteryBar extends SettingsPreferenceFragment
-        implements Preference.OnPreferenceChangeListener, Indexable {
-
-    private static final String PREF_BATT_BAR = "battery_bar_list";
-    private static final String PREF_BATT_BAR_STYLE = "battery_bar_style";
-    private static final String PREF_BATT_BAR_COLOR = "battery_bar_color";
-    private static final String PREF_BATT_BAR_CHARGING_COLOR = "battery_bar_charging_color";
-    private static final String PREF_BATT_BAR_LOW_COLOR_WARNING = "battery_bar_battery_low_color_warning";
-    private static final String PREF_BATT_BAR_USE_GRADIENT_COLOR = "battery_bar_use_gradient_color";
-    private static final String PREF_BATT_BAR_LOW_COLOR = "battery_bar_low_color";
-    private static final String PREF_BATT_BAR_HIGH_COLOR = "battery_bar_high_color";
-    private static final String PREF_BATT_BAR_WIDTH = "battery_bar_thickness";
-    private static final String PREF_BATT_ANIMATE = "battery_bar_animate";
-
-    private Context mContext;
-
-    private ListPreference mBatteryBar;
-    private ListPreference mBatteryBarStyle;
-    private CustomSeekBarPreference mBatteryBarThickness;
-    private SwitchPreference mBatteryBarChargingAnimation;
-    private SwitchPreference mBatteryBarUseGradient;
-    private ColorPickerPreference mBatteryBarColor;
-    private ColorPickerPreference mBatteryBarChargingColor;
-    private ColorPickerPreference mBatteryBarBatteryLowColor;
-    private ColorPickerPreference mBatteryBarBatteryLowColorWarn;
-    private ColorPickerPreference mBatteryBarBatteryHighColor;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        addPreferencesFromResource(R.xml.battery_bar);
-
-        mContext = (Context) getActivity();
-        final ContentResolver resolver = getActivity().getContentResolver();
-        PreferenceScreen prefSet = getPreferenceScreen();
-
-        mBatteryBar = (ListPreference) findPreference(PREF_BATT_BAR);
-        mBatteryBar.setOnPreferenceChangeListener(this);
-        boolean enabled = Settings.System.getInt(resolver,
-                Settings.System.BATTERY_BAR_LOCATION, 0) != 0;
-        if (enabled) {
-            mBatteryBar.setValue((Settings.System.getInt(resolver, Settings.System.BATTERY_BAR_LOCATION, 0)) + "");
-            mBatteryBar.setSummary(mBatteryBar.getEntry());
-        } else {
-            mBatteryBar.setEnabled(false);
-            mBatteryBar.setSummary(R.string.enable_first);
-        }
-
-        mBatteryBarStyle = (ListPreference) findPreference(PREF_BATT_BAR_STYLE);
-        mBatteryBarStyle.setOnPreferenceChangeListener(this);
-        mBatteryBarStyle.setValue((Settings.System.getInt(resolver,
-                Settings.System.BATTERY_BAR_STYLE, 0)) + "");
-        mBatteryBarStyle.setSummary(mBatteryBarStyle.getEntry());
-
-        mBatteryBarColor = (ColorPickerPreference) prefSet.findPreference(PREF_BATT_BAR_COLOR);
-        mBatteryBarColor.setNewPreviewColor(Settings.System.getInt(resolver,
-                Settings.System.BATTERY_BAR_COLOR, Color.WHITE));
-        mBatteryBarColor.setOnPreferenceChangeListener(this);
-
-        mBatteryBarChargingColor = (ColorPickerPreference) prefSet.findPreference(PREF_BATT_BAR_CHARGING_COLOR);
-        mBatteryBarChargingColor.setNewPreviewColor(Settings.System.getInt(resolver,
-                Settings.System.BATTERY_BAR_CHARGING_COLOR, Color.WHITE));
-        mBatteryBarChargingColor.setOnPreferenceChangeListener(this);
-
-        mBatteryBarBatteryLowColorWarn = (ColorPickerPreference) prefSet.findPreference(PREF_BATT_BAR_LOW_COLOR_WARNING);
-        mBatteryBarBatteryLowColorWarn.setNewPreviewColor(Settings.System.getInt(resolver,
-                Settings.System.BATTERY_BAR_BATTERY_LOW_COLOR_WARNING,Color.WHITE));
-        mBatteryBarBatteryLowColorWarn.setOnPreferenceChangeListener(this);
-
-        mBatteryBarBatteryLowColor = (ColorPickerPreference) prefSet.findPreference(PREF_BATT_BAR_LOW_COLOR);
-        mBatteryBarBatteryLowColor.setNewPreviewColor(Settings.System.getInt(resolver,
-                Settings.System.BATTERY_BAR_LOW_COLOR, Color.WHITE));
-        mBatteryBarBatteryLowColor.setOnPreferenceChangeListener(this);
-
-        mBatteryBarBatteryHighColor = (ColorPickerPreference) prefSet.findPreference(PREF_BATT_BAR_HIGH_COLOR);
-        mBatteryBarBatteryHighColor.setNewPreviewColor(Settings.System.getInt(resolver,
-                Settings.System.BATTERY_BAR_HIGH_COLOR, Color.WHITE));
-        mBatteryBarBatteryHighColor.setOnPreferenceChangeListener(this);
-
-        mBatteryBarUseGradient = (SwitchPreference) findPreference(PREF_BATT_BAR_USE_GRADIENT_COLOR);
-        mBatteryBarUseGradient.setChecked(Settings.System.getInt(resolver,
-                Settings.System.BATTERY_BAR_USE_GRADIENT_COLOR, 0) == 1);
-
-        mBatteryBarChargingAnimation = (SwitchPreference) findPreference(PREF_BATT_ANIMATE);
-        mBatteryBarChargingAnimation.setChecked(Settings.System.getInt(resolver,
-                Settings.System.BATTERY_BAR_ANIMATE, 0) == 1);
-
-        mBatteryBarThickness = (CustomSeekBarPreference) prefSet.findPreference(PREF_BATT_BAR_WIDTH);
-        mBatteryBarThickness.setValue(Settings.System.getInt(resolver,
-                Settings.System.BATTERY_BAR_THICKNESS, 1));
-        mBatteryBarThickness.setOnPreferenceChangeListener(this);
-
-        updateBatteryBarOptions();
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        ContentResolver resolver = getActivity().getContentResolver();
-        if (preference == mBatteryBarColor) {
-            int intHex = (Integer) newValue;
-            Settings.System.putInt(resolver,
-                    Settings.System.BATTERY_BAR_COLOR, intHex);
-            return true;
-        } else if (preference == mBatteryBarChargingColor) {
-            int intHex = (Integer) newValue;
-            Settings.System.putInt(resolver,
-                    Settings.System.BATTERY_BAR_CHARGING_COLOR, intHex);
-            return true;
-        } else if (preference == mBatteryBarBatteryLowColor) {
-            int intHex = (Integer) newValue;
-            Settings.System.putInt(resolver,
-                    Settings.System.BATTERY_BAR_LOW_COLOR, intHex);
-            return true;
-        } else if (preference == mBatteryBarBatteryLowColorWarn) {
-            int intHex = (Integer) newValue;
-            Settings.System.putInt(resolver,
-                    Settings.System.BATTERY_BAR_BATTERY_LOW_COLOR_WARNING, intHex);
-            return true;
-        } else if (preference == mBatteryBarBatteryHighColor) {
-            int intHex = (Integer) newValue;
-            Settings.System.putInt(resolver,
-                    Settings.System.BATTERY_BAR_HIGH_COLOR, intHex);
-            return true;
-        } else if (preference == mBatteryBar) {
-            int val = Integer.parseInt((String) newValue);
-            int index = mBatteryBar.findIndexOfValue((String) newValue);
-            Settings.System.putInt(resolver,
-                    Settings.System.BATTERY_BAR_LOCATION, val);
-            mBatteryBar.setSummary(mBatteryBar.getEntries()[index]);
-            updateBatteryBarOptions();
-            return true;
-        } else if (preference == mBatteryBarStyle) {
-            int val = Integer.parseInt((String) newValue);
-            int index = mBatteryBarStyle.findIndexOfValue((String) newValue);
-            Settings.System.putInt(resolver,
-                    Settings.System.BATTERY_BAR_STYLE, val);
-            mBatteryBarStyle.setSummary(mBatteryBarStyle.getEntries()[index]);
-            return true;
-        } else if (preference == mBatteryBarThickness) {
-            int val = (Integer) newValue;
-            Settings.System.putInt(resolver,
-                Settings.System.BATTERY_BAR_THICKNESS, val);
-            return true;
-        }
-        return false;
-    }
-
-    public boolean onPreferenceTreeClick(Preference preference) {
-        ContentResolver resolver = getActivity().getContentResolver();
-        if (preference == mBatteryBarChargingAnimation) {
-            boolean value = mBatteryBarChargingAnimation.isChecked();
-            Settings.System.putInt(resolver,
-                    Settings.System.BATTERY_BAR_ANIMATE, value ? 1 : 0);
-            return true;
-         } else if (preference == mBatteryBarUseGradient) {
-            boolean value = mBatteryBarUseGradient.isChecked();
-            Settings.System.putInt(getContentResolver(),
-                    Settings.System.BATTERY_BAR_USE_GRADIENT_COLOR, value ? 1 : 0);
-            return true;
-        }
-        return false;
-    }
-
-    private void updateBatteryBarOptions() {
-        boolean enabled = Settings.System.getInt(getActivity().getContentResolver(),
-                Settings.System.BATTERY_BAR_LOCATION, 0) != 0;
-        mBatteryBarStyle.setEnabled(enabled);
-        mBatteryBarThickness.setEnabled(enabled);
-        mBatteryBarChargingAnimation.setEnabled(enabled);
-        mBatteryBarColor.setEnabled(enabled);
-        mBatteryBarChargingColor.setEnabled(enabled);
-        mBatteryBarUseGradient.setEnabled(enabled);
-        mBatteryBarBatteryLowColor.setEnabled(enabled);
-        mBatteryBarBatteryHighColor.setEnabled(enabled);
-        mBatteryBarBatteryLowColorWarn.setEnabled(enabled);
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsEvent.CHERISH_SETTINGS;
-    }
-
-    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider() {
-                @Override
-                public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
-                                                                            boolean enabled) {
-                    ArrayList<SearchIndexableResource> result =
-                            new ArrayList<SearchIndexableResource>();
-
-                    SearchIndexableResource sir = new SearchIndexableResource(context);
-                    sir.xmlResId = R.xml.battery_bar;
-                    result.add(sir);
-                    return result;
-                }
-
-                @Override
-                public List<String> getNonIndexableKeys(Context context) {
-                    List<String> keys = super.getNonIndexableKeys(context);
-                    return keys;
-                }
-            };
-}