diff --git a/XiaomiDoze/Android.mk b/DeviceDoze/Android.mk
similarity index 94%
rename from XiaomiDoze/Android.mk
rename to DeviceDoze/Android.mk
index f651d357..8e2e5b9e 100644
--- a/XiaomiDoze/Android.mk
+++ b/DeviceDoze/Android.mk
@@ -5,7 +5,7 @@ LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_PACKAGE_NAME := XiaomiDoze
+LOCAL_PACKAGE_NAME := DeviceDoze
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_PRIVILEGED_MODULE := true
diff --git a/XiaomiDoze/AndroidManifest.xml b/DeviceDoze/AndroidManifest.xml
similarity index 88%
rename from XiaomiDoze/AndroidManifest.xml
rename to DeviceDoze/AndroidManifest.xml
index bf2c80d9..ed4e0a39 100644
--- a/XiaomiDoze/AndroidManifest.xml
+++ b/DeviceDoze/AndroidManifest.xml
@@ -16,9 +16,9 @@
      limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.lineageos.settings.doze"
-    android:versionCode="1"
-    android:versionName="1.0"
+    package="com.advanced.settings.doze"
+    android:versionCode="2"
+    android:versionName="2.0"
     android:sharedUserId="android.uid.system">
 
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
@@ -42,7 +42,7 @@
         </receiver>
 
         <service android:name=".DozeService"
-                 android:permission="XiaomiDozeService">
+                 android:permission="DeviceDozeService">
         </service>
 
         <activity
@@ -50,13 +50,13 @@
             android:label="@string/ambient_display_title"
             android:theme="@style/Theme.Main">
             <intent-filter>
-                <action android:name="org.lineageos.settings.device.DOZE_SETTINGS" />
+                <action android:name="com.my.device.parts.DOZE_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
         
         <service
-            android:name="org.lineageos.settings.doze.DozeTileService"
+            android:name="com.advanced.settings.doze.DozeTileService"
             android:icon="@drawable/ic_doze"
             android:label="@string/ambient_display_gestures_title"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
diff --git a/DeviceDoze/proguard.flags b/DeviceDoze/proguard.flags
new file mode 100644
index 00000000..51c3f333
--- /dev/null
+++ b/DeviceDoze/proguard.flags
@@ -0,0 +1,3 @@
+-keep class com.advanced.settings.doze.* {
+  *;
+}
diff --git a/DeviceDoze/res/color-night/switchbar_switch_thumb_tint.xml b/DeviceDoze/res/color-night/switchbar_switch_thumb_tint.xml
new file mode 100644
index 00000000..3e931c6c
--- /dev/null
+++ b/DeviceDoze/res/color-night/switchbar_switch_thumb_tint.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
+
+     https://github.com/xiaomi-sdm660
+     
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@android:color/black" />
+</selector>
diff --git a/DeviceDoze/res/color-night/switchbar_switch_track_tint.xml b/DeviceDoze/res/color-night/switchbar_switch_track_tint.xml
new file mode 100644
index 00000000..4e264ac3
--- /dev/null
+++ b/DeviceDoze/res/color-night/switchbar_switch_track_tint.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
+
+     https://github.com/xiaomi-sdm660
+     
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="#82000000" />
+</selector>
diff --git a/XiaomiDoze/res/color/switch_bar_bg.xml b/DeviceDoze/res/color/switch_bar_bg.xml
similarity index 89%
rename from XiaomiDoze/res/color/switch_bar_bg.xml
rename to DeviceDoze/res/color/switch_bar_bg.xml
index cae20c76..a1508f38 100644
--- a/XiaomiDoze/res/color/switch_bar_bg.xml
+++ b/DeviceDoze/res/color/switch_bar_bg.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 The LineageOS Project
+<!-- Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
 
+     https://github.com/xiaomi-sdm660
+     
      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
diff --git a/DeviceDoze/res/color/switchbar_switch_thumb_tint.xml b/DeviceDoze/res/color/switchbar_switch_thumb_tint.xml
new file mode 100644
index 00000000..a9f158c5
--- /dev/null
+++ b/DeviceDoze/res/color/switchbar_switch_thumb_tint.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
+
+     https://github.com/xiaomi-sdm660
+     
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="#FFFFFF" />
+</selector>
diff --git a/DeviceDoze/res/color/switchbar_switch_track_tint.xml b/DeviceDoze/res/color/switchbar_switch_track_tint.xml
new file mode 100644
index 00000000..a13b91e6
--- /dev/null
+++ b/DeviceDoze/res/color/switchbar_switch_track_tint.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
+
+     https://github.com/xiaomi-sdm660
+     
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="#BFFFFFFF" />
+</selector>
diff --git a/XiaomiDoze/res/drawable/ic_doze.xml b/DeviceDoze/res/drawable/ic_doze.xml
similarity index 100%
rename from XiaomiDoze/res/drawable/ic_doze.xml
rename to DeviceDoze/res/drawable/ic_doze.xml
diff --git a/DeviceDoze/res/drawable/ic_hand_wave.xml b/DeviceDoze/res/drawable/ic_hand_wave.xml
new file mode 100644
index 00000000..03ee74cb
--- /dev/null
+++ b/DeviceDoze/res/drawable/ic_hand_wave.xml
@@ -0,0 +1,9 @@
+<!-- drawable/arrow-decision_auto -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?android:attr/colorControlNormal">
+   <path android:fillColor="#FFFFFFFF" android:pathData="M21,6.58V18.67A3.33,3.33 0 0,1 17.67,22H11.58C10.68,22 9.83,21.64 9.21,21L2.67,14.36C2.67,14.36 3.72,13.33 3.75,13.32C3.93,13.16 4.16,13.07 4.41,13.07C4.59,13.07 4.76,13.12 4.91,13.21C4.94,13.22 8.5,15.26 8.5,15.26V5.33A1.25,1.25 0 0,1 9.75,4.08A1.25,1.25 0 0,1 11,5.33V11.17H11.83V3.25A1.25,1.25 0 0,1 13.08,2C13.78,2 14.33,2.56 14.33,3.25V11.17H15.17V4.08C15.17,3.39 15.72,2.83 16.42,2.83A1.25,1.25 0 0,1 17.67,4.08V11.17H18.5V6.58A1.25,1.25 0 0,1 19.75,5.33A1.25,1.25 0 0,1 21,6.58Z" />
+</vector>
diff --git a/XiaomiDoze/res/drawable/ic_pickup.xml b/DeviceDoze/res/drawable/ic_pickup.xml
similarity index 100%
rename from XiaomiDoze/res/drawable/ic_pickup.xml
rename to DeviceDoze/res/drawable/ic_pickup.xml
diff --git a/XiaomiDoze/res/drawable/ic_pocket.xml b/DeviceDoze/res/drawable/ic_pocket.xml
similarity index 100%
rename from XiaomiDoze/res/drawable/ic_pocket.xml
rename to DeviceDoze/res/drawable/ic_pocket.xml
diff --git a/DeviceDoze/res/drawable/ic_raise.xml b/DeviceDoze/res/drawable/ic_raise.xml
new file mode 100644
index 00000000..22795da2
--- /dev/null
+++ b/DeviceDoze/res/drawable/ic_raise.xml
@@ -0,0 +1,9 @@
+<!-- drawable/arrow_decision_outline.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?android:attr/colorControlNormal" >
+    <path android:fillColor="#FFFFFFFF" android:pathData="M9.64,13.4C8.63,12.5 7.34,12.03 6,12V15L2,11L6,7V10C7.67,10 9.3,10.57 10.63,11.59C10.22,12.15 9.89,12.76 9.64,13.4M18,15V12C17.5,12 13.5,12.16 13.05,16.2C14.61,16.75 15.43,18.47 14.88,20.03C14.33,21.59 12.61,22.41 11.05,21.86C9.5,21.3 8.67,19.59 9.22,18.03C9.5,17.17 10.2,16.5 11.05,16.2C11.34,12.61 14.4,9.88 18,10V7L22,11L18,15M13,19A1,1 0 0,0 12,18A1,1 0 0,0 11,19A1,1 0 0,0 12,20A1,1 0 0,0 13,19M11,11.12C11.58,10.46 12.25,9.89 13,9.43V5H16L12,1L8,5H11V11.12Z" />
+</vector>
diff --git a/XiaomiDoze/res/drawable/switchbar_background.xml b/DeviceDoze/res/drawable/switchbar_background.xml
similarity index 88%
rename from XiaomiDoze/res/drawable/switchbar_background.xml
rename to DeviceDoze/res/drawable/switchbar_background.xml
index f2107076..285fb2a8 100644
--- a/XiaomiDoze/res/drawable/switchbar_background.xml
+++ b/DeviceDoze/res/drawable/switchbar_background.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 The LineageOS Project
+<!-- Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
 
+     https://github.com/xiaomi-sdm660
+     
      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
diff --git a/DeviceDoze/res/layout/doze.xml b/DeviceDoze/res/layout/doze.xml
new file mode 100644
index 00000000..af67d024
--- /dev/null
+++ b/DeviceDoze/res/layout/doze.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
+
+     https://github.com/xiaomi-sdm660
+     
+     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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_height="match_parent"
+              android:layout_width="match_parent">
+
+    <include layout="@layout/switch_bar" />
+
+</LinearLayout>
+
diff --git a/XiaomiDoze/res/layout/preference_category_material_settings.xml b/DeviceDoze/res/layout/preference_category_material_settings.xml
similarity index 75%
rename from XiaomiDoze/res/layout/preference_category_material_settings.xml
rename to DeviceDoze/res/layout/preference_category_material_settings.xml
index 5a1043dc..df2cb9fe 100644
--- a/XiaomiDoze/res/layout/preference_category_material_settings.xml
+++ b/DeviceDoze/res/layout/preference_category_material_settings.xml
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2016 The Android Open Source Project
+<!-- Copyright (C) 2018-2020 The Xiaomi-SDM660 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
+     https://github.com/xiaomi-sdm660
+     
+     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
+          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.
-  -->
+     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.
+-->
 
 <!-- Based off frameworks/base/core/res/res/layout/preference_category_material.xml
      except that this supports icon -->
@@ -63,4 +64,4 @@
             android:singleLine="true" />
     </LinearLayout>
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/XiaomiDoze/res/layout/preference_material_settings.xml b/DeviceDoze/res/layout/preference_material_settings.xml
similarity index 97%
rename from XiaomiDoze/res/layout/preference_material_settings.xml
rename to DeviceDoze/res/layout/preference_material_settings.xml
index 9682e32e..1c1c93ed 100644
--- a/XiaomiDoze/res/layout/preference_material_settings.xml
+++ b/DeviceDoze/res/layout/preference_material_settings.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
+<!-- Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
 
+     https://github.com/xiaomi-sdm660
+     
      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
diff --git a/XiaomiDoze/res/layout/switch_bar.xml b/DeviceDoze/res/layout/switch_bar.xml
similarity index 94%
rename from XiaomiDoze/res/layout/switch_bar.xml
rename to DeviceDoze/res/layout/switch_bar.xml
index 3307ee1f..bd6ae807 100644
--- a/XiaomiDoze/res/layout/switch_bar.xml
+++ b/DeviceDoze/res/layout/switch_bar.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<!-- Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
 
+     https://github.com/xiaomi-sdm660
+     
      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
diff --git a/XiaomiDoze/res/values-es/strings.xml b/DeviceDoze/res/values-es-rES/strings.xml
similarity index 96%
rename from XiaomiDoze/res/values-es/strings.xml
rename to DeviceDoze/res/values-es-rES/strings.xml
index 60689bf5..08fbb8e1 100644
--- a/XiaomiDoze/res/values-es/strings.xml
+++ b/DeviceDoze/res/values-es-rES/strings.xml
@@ -1,17 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013-2016 The CyanogenMod Project
-               (C) 2017 The LineageOS Project
+<!-- Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
+
+     https://github.com/xiaomi-sdm660
+     
      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">
     <!-- Label for feature switch [CHAR LIMIT=30] -->
     <string name="switch_bar_on">Activado</string>
diff --git a/XiaomiDoze/res/values-pt-rBR/strings.xml b/DeviceDoze/res/values-pt-rBR/strings.xml
similarity index 95%
rename from XiaomiDoze/res/values-pt-rBR/strings.xml
rename to DeviceDoze/res/values-pt-rBR/strings.xml
index 09a10467..4fd507e0 100644
--- a/XiaomiDoze/res/values-pt-rBR/strings.xml
+++ b/DeviceDoze/res/values-pt-rBR/strings.xml
@@ -1,17 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013-2016 The CyanogenMod Project
-               (C) 2017 The LineageOS Project
+<!-- Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
+
+     https://github.com/xiaomi-sdm660
+     
      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">
     <!-- Label for feature switch [CHAR LIMIT=30] -->
     <string name="switch_bar_on">Ligado</string>
@@ -53,4 +57,4 @@
     <!-- Help texts -->
     <string name="doze_settings_help_title">Ajuda</string>
     <string name="doze_settings_help_text">Estes recursos usam eventos de sensores para lançar um pulso de notificação doze. O sensor escolhido só é ativado quando o dispositivo recebe uma notificação, isso ajuda a reduzir o uso da bateria. Há também uma opção para ativar o sensor escolhido assim que a tela desliga, isso causará maior uso da bateria.</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/XiaomiDoze/res/values-ru/strings.xml b/DeviceDoze/res/values-ru-rRU/strings.xml
similarity index 95%
rename from XiaomiDoze/res/values-ru/strings.xml
rename to DeviceDoze/res/values-ru-rRU/strings.xml
index 179dfd95..6e76327c 100644
--- a/XiaomiDoze/res/values-ru/strings.xml
+++ b/DeviceDoze/res/values-ru-rRU/strings.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-2016 The CyanogenMod Project
-               (C) 2017 The LineageOS Project
+<!-- Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
 
+     https://github.com/xiaomi-sdm660
+     
      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
@@ -16,6 +15,7 @@
      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">
   <!-- Label for feature switch [CHAR LIMIT=30] -->
   <string name="switch_bar_on">Включено</string>
diff --git a/XiaomiDoze/res/values/strings.xml b/DeviceDoze/res/values/strings.xml
similarity index 85%
rename from XiaomiDoze/res/values/strings.xml
rename to DeviceDoze/res/values/strings.xml
index 29644687..49233ef7 100644
--- a/XiaomiDoze/res/values/strings.xml
+++ b/DeviceDoze/res/values/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013-2016 The CyanogenMod Project
-               (C) 2017 The LineageOS Project
+<!-- Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
 
+     https://github.com/xiaomi-sdm660
+     
      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
@@ -15,6 +15,7 @@
      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">
     <!-- Label for feature switch [CHAR LIMIT=30] -->
     <string name="switch_bar_on">On</string>
@@ -23,10 +24,10 @@
     <string name="switch_bar_off">Off</string>
 
     <!-- Device specific settings -->
-    <string name="device_settings_app_name">Advanced settings</string>
+    <string name="device_settings_app_name">Advanced Doze Settings</string>
 
     <!-- Ambient Display -->
-    <string name="ambient_display_title">Ambient display</string>
+    <string name="ambient_display_title">Ambient Display</string>
 
     <!-- Tilt sensor -->
     <string name="tilt_sensor_title">Tilt Sensor Gestures</string>
@@ -35,11 +36,11 @@
     <string name="proximity_sensor_title">Proximity Sensor Gestures</string>
 
     <!-- Hand wave gesture -->
-    <string name="hand_wave_gesture_title">Hand wave</string>
+    <string name="hand_wave_gesture_title">Hand Wave</string>
     <string name="hand_wave_gesture_summary">Pulse notifications on hand wave</string>
 
     <!-- Pick-up gesture -->
-    <string name="pick_up_gesture_title">Pick-up</string>
+    <string name="pick_up_gesture_title">Pick-Up</string>
     <string name="pick_up_gesture_summary">Pulse notifications on pick-up</string>
 
     <!-- Pocket gesture -->
@@ -47,7 +48,7 @@
     <string name="pocket_gesture_summary">Pulse notifications on removal from pocket</string>
 
     <!-- Proximity wake -->
-    <string name="proximity_wake_title">Proximity wake</string>
+    <string name="proximity_wake_title">Proximity Wake</string>
     <string name="proximity_wake_enable_summary">Wake device on hand wave</string>
 
     <!-- Dialog texts -->
diff --git a/XiaomiDoze/res/values/styles.xml b/DeviceDoze/res/values/styles.xml
similarity index 96%
rename from XiaomiDoze/res/values/styles.xml
rename to DeviceDoze/res/values/styles.xml
index 3443c0bd..7d6e6ff1 100644
--- a/XiaomiDoze/res/values/styles.xml
+++ b/DeviceDoze/res/values/styles.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2015-2016 The CyanogenMod Project
-                   2017 The LineageOS Project
+<!-- Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
 
+     https://github.com/xiaomi-sdm660
+     
      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">
     <style name="Theme.Main" parent="@android:style/Theme.DeviceDefault.Settings">
         <item name="dialogPreferenceStyle">@style/Theme.Main.DialogPreferenceStyle</item>
diff --git a/XiaomiDoze/res/xml/doze_settings.xml b/DeviceDoze/res/xml/doze_settings.xml
similarity index 93%
rename from XiaomiDoze/res/xml/doze_settings.xml
rename to DeviceDoze/res/xml/doze_settings.xml
index 5c759d0d..f2a8fc9a 100644
--- a/XiaomiDoze/res/xml/doze_settings.xml
+++ b/DeviceDoze/res/xml/doze_settings.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2015 The CyanogenMod Project
+<!-- Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
 
-     Licensed under the Apache License, Version 2.0 (the "License"
+     https://github.com/xiaomi-sdm660
+     
+     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,6 +15,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
+
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
     <PreferenceCategory
@@ -44,7 +46,7 @@
         <SwitchPreference
             android:key="gesture_hand_wave"
             android:defaultValue="false"
-            android:icon="@drawable/ic_wave"
+            android:icon="@drawable/ic_hand_wave"
             android:title="@string/hand_wave_gesture_title"
             android:summary="@string/hand_wave_gesture_summary" />
 
diff --git a/XiaomiDoze/src/org/lineageos/settings/doze/BootCompletedReceiver.java b/DeviceDoze/src/com/advanced/settings/doze/BootCompletedReceiver.java
similarity index 83%
rename from XiaomiDoze/src/org/lineageos/settings/doze/BootCompletedReceiver.java
rename to DeviceDoze/src/com/advanced/settings/doze/BootCompletedReceiver.java
index dcb8d912..e06802e7 100644
--- a/XiaomiDoze/src/org/lineageos/settings/doze/BootCompletedReceiver.java
+++ b/DeviceDoze/src/com/advanced/settings/doze/BootCompletedReceiver.java
@@ -1,6 +1,7 @@
 /*
- * Copyright (C) 2015 The CyanogenMod Project
- *               2017 The LineageOS Project
+ * Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
+ *
+ *  https://github.com/xiaomi-sdm660
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,10 +13,10 @@
  * 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.
+ * limitations under the License
  */
 
-package org.lineageos.settings.doze;
+package com.advanced.settings.doze;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -25,7 +26,7 @@ import android.util.Log;
 public class BootCompletedReceiver extends BroadcastReceiver {
 
     private static final boolean DEBUG = false;
-    private static final String TAG = "XiaomiDoze";
+    private static final String TAG = "DeviceDoze";
 
     @Override
     public void onReceive(final Context context, Intent intent) {
diff --git a/XiaomiDoze/src/org/lineageos/settings/doze/DozeService.java b/DeviceDoze/src/com/advanced/settings/doze/DozeService.java
similarity index 94%
rename from XiaomiDoze/src/org/lineageos/settings/doze/DozeService.java
rename to DeviceDoze/src/com/advanced/settings/doze/DozeService.java
index 5b161e28..b98533c2 100644
--- a/XiaomiDoze/src/org/lineageos/settings/doze/DozeService.java
+++ b/DeviceDoze/src/com/advanced/settings/doze/DozeService.java
@@ -1,6 +1,7 @@
 /*
- * Copyright (C) 2015 The CyanogenMod Project
- *               2017-2018 The LineageOS Project
+ * Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
+ *
+ *  https://github.com/xiaomi-sdm660
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,10 +13,10 @@
  * 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.
+ * limitations under the License
  */
 
-package org.lineageos.settings.doze;
+package com.advanced.settings.doze;
 
 import android.app.Service;
 import android.content.BroadcastReceiver;
diff --git a/XiaomiDoze/src/org/lineageos/settings/doze/DozeSettingsActivity.java b/DeviceDoze/src/com/advanced/settings/doze/DozeSettingsActivity.java
similarity index 85%
rename from XiaomiDoze/src/org/lineageos/settings/doze/DozeSettingsActivity.java
rename to DeviceDoze/src/com/advanced/settings/doze/DozeSettingsActivity.java
index 1591b2c5..d9b01127 100644
--- a/XiaomiDoze/src/org/lineageos/settings/doze/DozeSettingsActivity.java
+++ b/DeviceDoze/src/com/advanced/settings/doze/DozeSettingsActivity.java
@@ -1,6 +1,7 @@
 /*
- * Copyright (C) 2015-2016 The CyanogenMod Project
- *               2017 The LineageOS Project
+ * Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
+ *
+ *  https://github.com/xiaomi-sdm660
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,10 +13,10 @@
  * 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.
+ * limitations under the License
  */
 
-package org.lineageos.settings.doze;
+package com.advanced.settings.doze;
 
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
diff --git a/XiaomiDoze/src/org/lineageos/settings/doze/DozeSettingsFragment.java b/DeviceDoze/src/com/advanced/settings/doze/DozeSettingsFragment.java
similarity index 97%
rename from XiaomiDoze/src/org/lineageos/settings/doze/DozeSettingsFragment.java
rename to DeviceDoze/src/com/advanced/settings/doze/DozeSettingsFragment.java
index 47ee37ff..2abfe1e4 100644
--- a/XiaomiDoze/src/org/lineageos/settings/doze/DozeSettingsFragment.java
+++ b/DeviceDoze/src/com/advanced/settings/doze/DozeSettingsFragment.java
@@ -1,6 +1,7 @@
 /*
- * Copyright (C) 2015 The CyanogenMod Project
- *               2017-2018 The LineageOS Project
+ * Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
+ *
+ *  https://github.com/xiaomi-sdm660
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,10 +13,10 @@
  * 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.
+ * limitations under the License
  */
 
-package org.lineageos.settings.doze;
+package com.advanced.settings.doze;
 
 import android.app.ActionBar;
 import android.app.Activity;
diff --git a/DeviceDoze/src/com/advanced/settings/doze/DozeTileService.java b/DeviceDoze/src/com/advanced/settings/doze/DozeTileService.java
new file mode 100644
index 00000000..853b77da
--- /dev/null
+++ b/DeviceDoze/src/com/advanced/settings/doze/DozeTileService.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
+ *
+ *  https://github.com/xiaomi-sdm660
+ *
+ * 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.advanced.settings.doze;
+
+import android.annotation.TargetApi;
+import android.content.Intent;
+import android.service.quicksettings.Tile;
+import android.service.quicksettings.TileService;
+
+import com.advanced.settings.doze.R;
+
+@TargetApi(24)
+public class DozeTileService extends TileService {
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+    }
+
+    @Override
+    public void onTileAdded() {
+        super.onTileAdded();
+    }
+
+    @Override
+    public void onTileRemoved() {
+        super.onTileRemoved();
+    }
+
+    @Override
+    public void onStartListening() {
+        super.onStartListening();
+    }
+
+    @Override
+    public void onStopListening() {
+        super.onStopListening();
+    }
+
+    @Override
+    public void onClick() {
+        super.onClick();
+        Intent DeviceDoze = new Intent(this, DozeSettingsActivity.class);
+        DeviceDoze.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        startActivityAndCollapse(DeviceDoze);
+    }
+}
diff --git a/XiaomiDoze/src/org/lineageos/settings/doze/ProximitySensor.java b/DeviceDoze/src/com/advanced/settings/doze/ProximitySensor.java
similarity index 95%
rename from XiaomiDoze/src/org/lineageos/settings/doze/ProximitySensor.java
rename to DeviceDoze/src/com/advanced/settings/doze/ProximitySensor.java
index 71594ff4..d4cafab7 100644
--- a/XiaomiDoze/src/org/lineageos/settings/doze/ProximitySensor.java
+++ b/DeviceDoze/src/com/advanced/settings/doze/ProximitySensor.java
@@ -1,6 +1,7 @@
 /*
- * Copyright (c) 2015 The CyanogenMod Project
- *               2017-2018 The LineageOS Project
+ * Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
+ *
+ *  https://github.com/xiaomi-sdm660
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,10 +13,10 @@
  * 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.
+ * limitations under the License
  */
 
-package org.lineageos.settings.doze;
+package com.advanced.settings.doze;
 
 import android.content.Context;
 import android.hardware.Sensor;
diff --git a/XiaomiDoze/src/org/lineageos/settings/doze/TiltSensor.java b/DeviceDoze/src/com/advanced/settings/doze/TiltSensor.java
similarity index 96%
rename from XiaomiDoze/src/org/lineageos/settings/doze/TiltSensor.java
rename to DeviceDoze/src/com/advanced/settings/doze/TiltSensor.java
index 073d6ab8..3ff97563 100644
--- a/XiaomiDoze/src/org/lineageos/settings/doze/TiltSensor.java
+++ b/DeviceDoze/src/com/advanced/settings/doze/TiltSensor.java
@@ -1,6 +1,7 @@
 /*
- * Copyright (c) 2015 The CyanogenMod Project
- *               2017-2018 The LineageOS Project
+ * Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
+ *
+ *  https://github.com/xiaomi-sdm660
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,10 +13,10 @@
  * 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.
+ * limitations under the License
  */
 
-package org.lineageos.settings.doze;
+package com.advanced.settings.doze;
 
 import android.content.Context;
 import android.hardware.Sensor;
diff --git a/XiaomiDoze/src/org/lineageos/settings/doze/Utils.java b/DeviceDoze/src/com/advanced/settings/doze/Utils.java
similarity index 96%
rename from XiaomiDoze/src/org/lineageos/settings/doze/Utils.java
rename to DeviceDoze/src/com/advanced/settings/doze/Utils.java
index ab6fddf3..7bd01878 100644
--- a/XiaomiDoze/src/org/lineageos/settings/doze/Utils.java
+++ b/DeviceDoze/src/com/advanced/settings/doze/Utils.java
@@ -1,6 +1,7 @@
 /*
- * Copyright (C) 2015 The CyanogenMod Project
- *               2017-2018 The LineageOS Project
+ * Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
+ *
+ *  https://github.com/xiaomi-sdm660
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,10 +13,10 @@
  * 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.
+ * limitations under the License
  */
 
-package org.lineageos.settings.doze;
+package com.advanced.settings.doze;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/XiaomiParts/Android.mk b/DeviceSettings/Android.mk
similarity index 78%
rename from XiaomiParts/Android.mk
rename to DeviceSettings/Android.mk
index d3b53523..2a3126fe 100644
--- a/XiaomiParts/Android.mk
+++ b/DeviceSettings/Android.mk
@@ -7,7 +7,7 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \
     androidx.preference_preference
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_PACKAGE_NAME := XiaomiParts
+LOCAL_PACKAGE_NAME := DeviceSettings
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
@@ -16,14 +16,13 @@ LOCAL_USE_AAPT2 := true
 
 package_resource_overlays := $(strip \
     $(wildcard $(foreach dir, $(PRODUCT_PACKAGE_OVERLAYS), \
-      $(addprefix $(dir)/, packages/apps/XiaomiParts/res))) \
+      $(addprefix $(dir)/, packages/apps/DeviceSettings/res))) \
     $(wildcard $(foreach dir, $(DEVICE_PACKAGE_OVERLAYS), \
-      $(addprefix $(dir)/, packages/apps/XiaomiParts/res))))
+      $(addprefix $(dir)/, packages/apps/DeviceSettings/res))))
 
 LOCAL_RESOURCE_DIR := $(package_resource_overlays) $(LOCAL_RESOURCE_DIR)
 
-LOCAL_PROGUARD_ENABLED := disabled
-LOCAL_DEX_PREOPT := false
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
 include frameworks/base/packages/SettingsLib/common.mk
 
diff --git a/XiaomiParts/AndroidManifest.xml b/DeviceSettings/AndroidManifest.xml
similarity index 98%
rename from XiaomiParts/AndroidManifest.xml
rename to DeviceSettings/AndroidManifest.xml
index abe6e2f8..e11e5348 100644
--- a/XiaomiParts/AndroidManifest.xml
+++ b/DeviceSettings/AndroidManifest.xml
@@ -45,7 +45,7 @@
         <activity
             android:name=".DeviceSettingsActivity"
             android:exported="false"
-            android:icon="@drawable/ic_mi"
+            android:icon="@drawable/ic_device"
             android:label="@string/advanced_settings"
             android:launchMode="singleTask">
             <intent-filter>
diff --git a/DeviceSettings/proguard.flags b/DeviceSettings/proguard.flags
new file mode 100644
index 00000000..55f91d46
--- /dev/null
+++ b/DeviceSettings/proguard.flags
@@ -0,0 +1,3 @@
+-keep class org.lineageos.settings.device.* {
+  *;
+}
diff --git a/XiaomiParts/res/drawable/action_presets.xml b/DeviceSettings/res/drawable/action_presets.xml
similarity index 100%
rename from XiaomiParts/res/drawable/action_presets.xml
rename to DeviceSettings/res/drawable/action_presets.xml
diff --git a/XiaomiParts/res/drawable/action_reset.xml b/DeviceSettings/res/drawable/action_reset.xml
similarity index 100%
rename from XiaomiParts/res/drawable/action_reset.xml
rename to DeviceSettings/res/drawable/action_reset.xml
diff --git a/XiaomiParts/res/drawable/ic_color.xml b/DeviceSettings/res/drawable/ic_color.xml
similarity index 100%
rename from XiaomiParts/res/drawable/ic_color.xml
rename to DeviceSettings/res/drawable/ic_color.xml
diff --git a/DeviceSettings/res/drawable/ic_device.xml b/DeviceSettings/res/drawable/ic_device.xml
new file mode 100644
index 00000000..d25332d0
--- /dev/null
+++ b/DeviceSettings/res/drawable/ic_device.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M17,1L7,1C5.9,1,5,1.9,5,3v2h2v4H5v12c0,1.1,0.9,2,2,2h10c1.1,0,2-0.9,2-2V3C19,1.9,18.1,1,17,1z M11,21H7v-2h4V21z M17,21 h-4v-2h4V21z" />
+</vector>
diff --git a/XiaomiParts/res/drawable/ic_doze.xml b/DeviceSettings/res/drawable/ic_doze.xml
similarity index 100%
rename from XiaomiParts/res/drawable/ic_doze.xml
rename to DeviceSettings/res/drawable/ic_doze.xml
diff --git a/XiaomiParts/res/drawable/ic_flip.xml b/DeviceSettings/res/drawable/ic_flip.xml
similarity index 100%
rename from XiaomiParts/res/drawable/ic_flip.xml
rename to DeviceSettings/res/drawable/ic_flip.xml
diff --git a/XiaomiParts/res/drawable/ic_fps_info.xml b/DeviceSettings/res/drawable/ic_fps_info.xml
similarity index 100%
rename from XiaomiParts/res/drawable/ic_fps_info.xml
rename to DeviceSettings/res/drawable/ic_fps_info.xml
diff --git a/XiaomiParts/res/drawable/ic_headphone.xml b/DeviceSettings/res/drawable/ic_headphone.xml
similarity index 100%
rename from XiaomiParts/res/drawable/ic_headphone.xml
rename to DeviceSettings/res/drawable/ic_headphone.xml
diff --git a/XiaomiParts/res/drawable/ic_jason.xml b/DeviceSettings/res/drawable/ic_jason.xml
similarity index 100%
rename from XiaomiParts/res/drawable/ic_jason.xml
rename to DeviceSettings/res/drawable/ic_jason.xml
diff --git a/XiaomiParts/res/drawable/ic_mic.xml b/DeviceSettings/res/drawable/ic_mic.xml
similarity index 100%
rename from XiaomiParts/res/drawable/ic_mic.xml
rename to DeviceSettings/res/drawable/ic_mic.xml
diff --git a/XiaomiParts/res/drawable/ic_thermal.xml b/DeviceSettings/res/drawable/ic_thermal.xml
similarity index 100%
rename from XiaomiParts/res/drawable/ic_thermal.xml
rename to DeviceSettings/res/drawable/ic_thermal.xml
diff --git a/XiaomiParts/res/drawable/preview.jpg b/DeviceSettings/res/drawable/preview.jpg
similarity index 100%
rename from XiaomiParts/res/drawable/preview.jpg
rename to DeviceSettings/res/drawable/preview.jpg
diff --git a/XiaomiParts/res/drawable/thermal_balance.xml b/DeviceSettings/res/drawable/thermal_balance.xml
similarity index 100%
rename from XiaomiParts/res/drawable/thermal_balance.xml
rename to DeviceSettings/res/drawable/thermal_balance.xml
diff --git a/XiaomiParts/res/layout/activity_kcal.xml b/DeviceSettings/res/layout/activity_kcal.xml
similarity index 100%
rename from XiaomiParts/res/layout/activity_kcal.xml
rename to DeviceSettings/res/layout/activity_kcal.xml
diff --git a/XiaomiParts/res/layout/custom_seekbar_preference_dialog.xml b/DeviceSettings/res/layout/custom_seekbar_preference_dialog.xml
similarity index 100%
rename from XiaomiParts/res/layout/custom_seekbar_preference_dialog.xml
rename to DeviceSettings/res/layout/custom_seekbar_preference_dialog.xml
diff --git a/XiaomiParts/res/layout/preference_custom_seekbar.xml b/DeviceSettings/res/layout/preference_custom_seekbar.xml
similarity index 100%
rename from XiaomiParts/res/layout/preference_custom_seekbar.xml
rename to DeviceSettings/res/layout/preference_custom_seekbar.xml
diff --git a/XiaomiParts/res/menu/menu_reset.xml b/DeviceSettings/res/menu/menu_reset.xml
similarity index 100%
rename from XiaomiParts/res/menu/menu_reset.xml
rename to DeviceSettings/res/menu/menu_reset.xml
diff --git a/XiaomiParts/res/values-de-rDE/strings.xml b/DeviceSettings/res/values-de-rDE/strings.xml
similarity index 98%
rename from XiaomiParts/res/values-de-rDE/strings.xml
rename to DeviceSettings/res/values-de-rDE/strings.xml
index af830ba1..aac1bdaa 100644
--- a/XiaomiParts/res/values-de-rDE/strings.xml
+++ b/DeviceSettings/res/values-de-rDE/strings.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 <resources>
-    <string name="advanced_settings">Xiaomi Parts</string>
+    <string name="advanced_settings">Device Settings</string>
     <string name="advanced_settings_summary">Erweiterte Einstellungen</string>
     <string name="display_title">Display</string>
     <string name="device_kcal_title">Displaykalibierung</string>
diff --git a/XiaomiParts/res/values-es/strings.xml b/DeviceSettings/res/values-es-rES/strings.xml
similarity index 95%
rename from XiaomiParts/res/values-es/strings.xml
rename to DeviceSettings/res/values-es-rES/strings.xml
index d7a72ff5..b62296e8 100644
--- a/XiaomiParts/res/values-es/strings.xml
+++ b/DeviceSettings/res/values-es-rES/strings.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 <resources>
-    <string name="advanced_settings">Ajustes Xiaomi</string>
+    <string name="advanced_settings">Ajustes Device</string>
     <string name="advanced_settings_summary">Ajustes adicionales</string>
 
     <string name="display_title">Pantalla</string>
@@ -31,8 +31,8 @@
     <string name="notification_led_title">Brillo del LED</string>
 
      <!-- Ambient Display -->
-    <string name="ambient_display_xiaomi">Doze de xiaomi</string>
-    <string name="advanced_doze_summary">Pantalla ambiente</string>
+    <string name="ambient_display">Pantalla ambiente</string>
+    <string name="advanced_doze_summary">Ajustes pantalla ambiente</string>
      
     <!-- Thermal Profiles -->
     <string name="thermal_profile_title">Rendimiento</string>
diff --git a/XiaomiParts/res/values-es-rES/strings.xml b/DeviceSettings/res/values-es-rMX/strings.xml
similarity index 91%
rename from XiaomiParts/res/values-es-rES/strings.xml
rename to DeviceSettings/res/values-es-rMX/strings.xml
index ee640638..40f27237 100644
--- a/XiaomiParts/res/values-es-rES/strings.xml
+++ b/DeviceSettings/res/values-es-rMX/strings.xml
@@ -14,8 +14,8 @@
      limitations under the License.
 -->
 <resources>
-    <string name="advanced_settings">Ajustes Xiaomi</string>
-    <string name="advanced_settings_summary">Ajustes Extras de Xiaomi MI 6X/A2</string>
+    <string name="advanced_settings">Ajustes Device</string>
+    <string name="advanced_settings_summary">Ajustes extras de device</string>
 
     <string name="display_title">Pantalla</string>
 
diff --git a/XiaomiParts/res/values-ja-rJP/strings.xml b/DeviceSettings/res/values-ja-rJP/strings.xml
similarity index 96%
rename from XiaomiParts/res/values-ja-rJP/strings.xml
rename to DeviceSettings/res/values-ja-rJP/strings.xml
index d7d19a8e..c880391a 100644
--- a/XiaomiParts/res/values-ja-rJP/strings.xml
+++ b/DeviceSettings/res/values-ja-rJP/strings.xml
@@ -23,8 +23,8 @@
     <string name="device_kcal_title">画面の色補正</string>
 
     <!-- Ambient Display -->
-    <string name="ambient_display_xiaomi">Xiaomi Doze</string>
-    <string name="advanced_doze_summary">アンビエント画面</string>
+    <string name="ambient_display">アンビエント画面</string>
+    <string name="advanced_doze_summary">追加の設定アンビエント画面</string>
 
     <string name="vibration_title">振動フィードバック</string>
     <string name="vibration_strength_title">強さ</string>
diff --git a/XiaomiParts/res/values-ko-rKR/strings.xml b/DeviceSettings/res/values-ko-rKR/strings.xml
similarity index 97%
rename from XiaomiParts/res/values-ko-rKR/strings.xml
rename to DeviceSettings/res/values-ko-rKR/strings.xml
index 28a2e41a..fb62f7a6 100644
--- a/XiaomiParts/res/values-ko-rKR/strings.xml
+++ b/DeviceSettings/res/values-ko-rKR/strings.xml
@@ -25,7 +25,7 @@
     <string name="device_kcal_title">디스플레이 컬러 캘리브레이션</string>
 
     <!-- Ambient Display -->
-    <string name="ambient_display_xiaomi">Xiaomi Doze</string>
+    <string name="ambient_display">앰비언트 디스플레이</string>
     <string name="advanced_doze_summary">앰비언트 디스플레이</string>
 
     <string name="vibration_title">햅틱 피드백</string>
diff --git a/XiaomiParts/res/values-pt-rBR/strings.xml b/DeviceSettings/res/values-pt-rBR/strings.xml
similarity index 95%
rename from XiaomiParts/res/values-pt-rBR/strings.xml
rename to DeviceSettings/res/values-pt-rBR/strings.xml
index 0e8b928b..0aa273c6 100644
--- a/XiaomiParts/res/values-pt-rBR/strings.xml
+++ b/DeviceSettings/res/values-pt-rBR/strings.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 <resources>
-    <string name="advanced_settings">Xiaomi Parts</string>
+    <string name="advanced_settings">Device Settings</string>
     <string name="advanced_settings_summary">Configurações adicionais</string>
     
     <string name="display_title">Display</string>
@@ -31,8 +31,8 @@
     <string name="notification_led_title">Brilho do LED</string>
 
     <!-- Ambient Display -->
-    <string name="ambient_display_xiaomi">Xiaomi Doze</string>
-    <string name="advanced_doze_summary">Tela Ambiente</string>
+    <string name="ambient_display">Tela Ambiente</string>
+    <string name="advanced_doze_summary">Configurações do dispositivo tela ambiente</string>
     
     <string name="vibration_title">Feedback tátil</string>
     <string name="vibration_strength_title">Força</string>
diff --git a/XiaomiParts/res/values-ru-rRU/strings.xml b/DeviceSettings/res/values-ru-rRU/strings.xml
similarity index 93%
rename from XiaomiParts/res/values-ru-rRU/strings.xml
rename to DeviceSettings/res/values-ru-rRU/strings.xml
index 326ed630..872ae919 100644
--- a/XiaomiParts/res/values-ru-rRU/strings.xml
+++ b/DeviceSettings/res/values-ru-rRU/strings.xml
@@ -16,7 +16,7 @@
 	 Translated with <3 by pqhaz
 -->
 <resources>
-    <string name="advanced_settings">Настройки Xiaomi</string>
+    <string name="advanced_settings">Настройки Device</string>
     <string name="advanced_settings_summary">Дополнительные настройки</string>
 
     <string name="display_title">Экран</string>
@@ -25,8 +25,8 @@
     <string name="device_kcal_title">Калибрация цвета экрана</string>
 
     <!-- Ambient Display -->
-    <string name="ambient_display_xiaomi">Дозе Xiaomi</string>
-    <string name="advanced_doze_summary">Ambient экран</string>
+    <string name="ambient_display">Ambient экран</string>
+    <string name="advanced_doze_summary">Дополнительные ambient экран</string>
 
     <string name="vibration_title">Вибрация</string>
     <string name="vibration_strength_title">Сила</string>
diff --git a/XiaomiParts/res/values-sk-rSK/strings.xml b/DeviceSettings/res/values-sk-rSK/strings.xml
similarity index 98%
rename from XiaomiParts/res/values-sk-rSK/strings.xml
rename to DeviceSettings/res/values-sk-rSK/strings.xml
index 24dabde3..e7bbbc3e 100644
--- a/XiaomiParts/res/values-sk-rSK/strings.xml
+++ b/DeviceSettings/res/values-sk-rSK/strings.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 <resources>
-    <string name="advanced_settings">Xiaomi Parts</string>
+    <string name="advanced_settings">Device Settings</string>
     <string name="advanced_settings_summary">Rozšírené nastavenia</string>
     <string name="display_title">Displej</string>
     <string name="device_kcal_title">Kalibrácia farieb</string>
diff --git a/XiaomiParts/res/values-zh-rCN/strings.xml b/DeviceSettings/res/values-zh-rCN/strings.xml
similarity index 96%
rename from XiaomiParts/res/values-zh-rCN/strings.xml
rename to DeviceSettings/res/values-zh-rCN/strings.xml
index d1e4301a..6617123d 100644
--- a/XiaomiParts/res/values-zh-rCN/strings.xml
+++ b/DeviceSettings/res/values-zh-rCN/strings.xml
@@ -23,8 +23,8 @@
     <string name="device_kcal_title">显示颜色矫正</string>
 
     <!-- Ambient Display -->
-    <string name="ambient_display_xiaomi">Xiaomi Doze</string>
-    <string name="advanced_doze_summary">环境显示</string>
+    <string name="ambient_display">环境显示</string>
+    <string name="advanced_doze_summary">环境显示附加设置</string>
 
     <string name="vibration_title">触觉反馈</string>
     <string name="vibration_strength_title">强度</string>
diff --git a/XiaomiParts/res/values/arrays.xml b/DeviceSettings/res/values/arrays.xml
similarity index 100%
rename from XiaomiParts/res/values/arrays.xml
rename to DeviceSettings/res/values/arrays.xml
diff --git a/XiaomiParts/res/values/attrs.xml b/DeviceSettings/res/values/attrs.xml
similarity index 100%
rename from XiaomiParts/res/values/attrs.xml
rename to DeviceSettings/res/values/attrs.xml
diff --git a/XiaomiParts/res/values/colors.xml b/DeviceSettings/res/values/colors.xml
similarity index 100%
rename from XiaomiParts/res/values/colors.xml
rename to DeviceSettings/res/values/colors.xml
diff --git a/XiaomiParts/res/values/strings.xml b/DeviceSettings/res/values/strings.xml
similarity index 88%
rename from XiaomiParts/res/values/strings.xml
rename to DeviceSettings/res/values/strings.xml
index 0ebfe8f9..0cbd40b9 100644
--- a/XiaomiParts/res/values/strings.xml
+++ b/DeviceSettings/res/values/strings.xml
@@ -14,8 +14,8 @@
      limitations under the License.
 -->
 <resources>
-    <string name="advanced_settings">Xiaomi Parts</string>
-    <string name="advanced_settings_summary">Extra Settings</string>
+    <string name="advanced_settings">Device Settings</string>
+    <string name="advanced_settings_summary">Device specific advanced settings</string>
 
     <string name="display_title">Display</string>
 
@@ -31,10 +31,10 @@
     <string name="notification_led_title">LED brightness</string>
 
     <!-- Ambient Display -->
-    <string name="ambient_display_xiaomi">Xiaomi Doze</string>
-    <string name="advanced_doze_summary">Ambient Display</string>
+    <string name="ambient_display">Ambient Display</string>
+    <string name="advanced_doze_summary">Device specific ambient gesture settings</string>
 
-    <string name="vibration_title">Haptic feedback</string>
+    <string name="vibration_title">Haptic Feedback</string>
     <string name="vibration_strength_title">Strength</string>
 
     <!-- Thermal Profiles -->
@@ -90,16 +90,17 @@
     <string name="kcal_reset">Reset</string>
 
     <!-- CustomSeekBarPreference -->
-    <string name="edit_value">Choose new Value</string>
-    <string name="default_value">Default Value</string>
+    <string name="edit_value">Choose new value</string>
+    <string name="default_value">Default value</string>
     <string name="edit_hint">Value between %1$d and %2$d</string>
 
     <!-- FPS Info -->
     <string name="fps_info_title">FPS Overlay</string>
-    <string name="fps_info_summary">Show overlay with with current frames per second</string>
+    <string name="fps_info_summary">Show overlay with current frames per second</string>
     
     <!-- Audio amplification -->
     <string name="audio_amplify">Amplify Audio</string>
     <string name="headphone_gain">Headphone Gain</string>
     <string name="mic_gain">Microphone Gain</string>
+
 </resources>
diff --git a/XiaomiParts/res/values/styles.xml b/DeviceSettings/res/values/styles.xml
similarity index 100%
rename from XiaomiParts/res/values/styles.xml
rename to DeviceSettings/res/values/styles.xml
diff --git a/XiaomiParts/res/xml/preferences_kcal.xml b/DeviceSettings/res/xml/preferences_kcal.xml
similarity index 100%
rename from XiaomiParts/res/xml/preferences_kcal.xml
rename to DeviceSettings/res/xml/preferences_kcal.xml
diff --git a/XiaomiParts/res/xml/preferences_xiaomi_parts.xml b/DeviceSettings/res/xml/preferences_xiaomi_parts.xml
similarity index 93%
rename from XiaomiParts/res/xml/preferences_xiaomi_parts.xml
rename to DeviceSettings/res/xml/preferences_xiaomi_parts.xml
index d33a5ce4..5dad4c96 100644
--- a/XiaomiParts/res/xml/preferences_xiaomi_parts.xml
+++ b/DeviceSettings/res/xml/preferences_xiaomi_parts.xml
@@ -65,6 +65,17 @@
         android:key="display"
         android:title="@string/display_title">
 
+        <Preference
+            android:key="device_doze"
+            android:persistent="false"
+            android:summary="@string/advanced_doze_summary"
+            android:title="@string/ambient_display"
+            android:icon="@drawable/ic_doze">
+            <intent
+                android:action="android.intent.action.MAIN"
+                android:targetClass="com.advanced.settings.doze.DozeSettingsActivity"
+                android:targetPackage="com.advanced.settings.doze" />
+        </Preference>
         <Preference
             android:key="device_kcal"
             android:persistent="false"
@@ -75,18 +86,6 @@
                 android:targetClass="org.lineageos.settings.kcal.KCalSettingsActivity"
                 android:targetPackage="org.lineageos.settings.kcal" />
         </Preference>
-
-        <Preference
-            android:key="device_doze"
-            android:persistent="false"
-            android:summary="@string/advanced_doze_summary"
-            android:title="@string/ambient_display_xiaomi"
-            android:icon="@drawable/ic_doze">
-            <intent
-                android:action="android.intent.action.MAIN"
-                android:targetClass="org.lineageos.settings.doze.DozeSettingsActivity"
-                android:targetPackage="org.lineageos.settings.doze" />
-        </Preference>
         <SwitchPreference
             android:key="fps_info"
             android:icon="@drawable/ic_fps_info"
diff --git a/XiaomiParts/src/org/lineageos/settings/device/BootReceiver.java b/DeviceSettings/src/org/lineageos/settings/device/BootReceiver.java
similarity index 100%
rename from XiaomiParts/src/org/lineageos/settings/device/BootReceiver.java
rename to DeviceSettings/src/org/lineageos/settings/device/BootReceiver.java
diff --git a/XiaomiParts/src/org/lineageos/settings/device/DeviceSettings.java b/DeviceSettings/src/org/lineageos/settings/device/DeviceSettings.java
similarity index 99%
rename from XiaomiParts/src/org/lineageos/settings/device/DeviceSettings.java
rename to DeviceSettings/src/org/lineageos/settings/device/DeviceSettings.java
index a8342aad..16507a75 100644
--- a/XiaomiParts/src/org/lineageos/settings/device/DeviceSettings.java
+++ b/DeviceSettings/src/org/lineageos/settings/device/DeviceSettings.java
@@ -74,7 +74,7 @@ public class DeviceSettings extends PreferenceFragment implements
     public static final String HALL_WAKEUP_PATH = "/sys/module/hall/parameters/hall_toggle";
     public static final String HALL_WAKEUP_PROP = "persist.service.folio_daemon";
 
-    private static final String DEVICE_DOZE_PACKAGE_NAME = "org.lineageos.settings.doze";
+    private static final String DEVICE_DOZE_PACKAGE_NAME = "com.advanced.settings.doze";
 
     private static final String DEVICE_JASON_PACKAGE_NAME = "org.lineageos.settings.devicex";
     private static final String PREF_DEVICE_JASON = "device_jason";
diff --git a/XiaomiParts/src/org/lineageos/settings/device/DeviceSettingsActivity.java b/DeviceSettings/src/org/lineageos/settings/device/DeviceSettingsActivity.java
similarity index 100%
rename from XiaomiParts/src/org/lineageos/settings/device/DeviceSettingsActivity.java
rename to DeviceSettings/src/org/lineageos/settings/device/DeviceSettingsActivity.java
diff --git a/XiaomiParts/src/org/lineageos/settings/device/FPSInfoService.java b/DeviceSettings/src/org/lineageos/settings/device/FPSInfoService.java
similarity index 100%
rename from XiaomiParts/src/org/lineageos/settings/device/FPSInfoService.java
rename to DeviceSettings/src/org/lineageos/settings/device/FPSInfoService.java
diff --git a/XiaomiParts/src/org/lineageos/settings/device/FPSTileService.java b/DeviceSettings/src/org/lineageos/settings/device/FPSTileService.java
similarity index 100%
rename from XiaomiParts/src/org/lineageos/settings/device/FPSTileService.java
rename to DeviceSettings/src/org/lineageos/settings/device/FPSTileService.java
diff --git a/XiaomiParts/src/org/lineageos/settings/device/FileUtils.java b/DeviceSettings/src/org/lineageos/settings/device/FileUtils.java
similarity index 100%
rename from XiaomiParts/src/org/lineageos/settings/device/FileUtils.java
rename to DeviceSettings/src/org/lineageos/settings/device/FileUtils.java
diff --git a/XiaomiParts/src/org/lineageos/settings/device/PerformanceTileService.java b/DeviceSettings/src/org/lineageos/settings/device/PerformanceTileService.java
similarity index 100%
rename from XiaomiParts/src/org/lineageos/settings/device/PerformanceTileService.java
rename to DeviceSettings/src/org/lineageos/settings/device/PerformanceTileService.java
diff --git a/XiaomiParts/src/org/lineageos/settings/device/kcal/KCalSettings.java b/DeviceSettings/src/org/lineageos/settings/device/kcal/KCalSettings.java
similarity index 100%
rename from XiaomiParts/src/org/lineageos/settings/device/kcal/KCalSettings.java
rename to DeviceSettings/src/org/lineageos/settings/device/kcal/KCalSettings.java
diff --git a/XiaomiParts/src/org/lineageos/settings/device/kcal/KCalSettingsActivity.java b/DeviceSettings/src/org/lineageos/settings/device/kcal/KCalSettingsActivity.java
similarity index 100%
rename from XiaomiParts/src/org/lineageos/settings/device/kcal/KCalSettingsActivity.java
rename to DeviceSettings/src/org/lineageos/settings/device/kcal/KCalSettingsActivity.java
diff --git a/XiaomiParts/src/org/lineageos/settings/device/kcal/PresetDialog.java b/DeviceSettings/src/org/lineageos/settings/device/kcal/PresetDialog.java
similarity index 100%
rename from XiaomiParts/src/org/lineageos/settings/device/kcal/PresetDialog.java
rename to DeviceSettings/src/org/lineageos/settings/device/kcal/PresetDialog.java
diff --git a/XiaomiParts/src/org/lineageos/settings/device/kcal/Utils.java b/DeviceSettings/src/org/lineageos/settings/device/kcal/Utils.java
similarity index 100%
rename from XiaomiParts/src/org/lineageos/settings/device/kcal/Utils.java
rename to DeviceSettings/src/org/lineageos/settings/device/kcal/Utils.java
diff --git a/XiaomiParts/src/org/lineageos/settings/device/preferences/CustomSeekBarPreference.java b/DeviceSettings/src/org/lineageos/settings/device/preferences/CustomSeekBarPreference.java
similarity index 100%
rename from XiaomiParts/src/org/lineageos/settings/device/preferences/CustomSeekBarPreference.java
rename to DeviceSettings/src/org/lineageos/settings/device/preferences/CustomSeekBarPreference.java
diff --git a/XiaomiParts/src/org/lineageos/settings/device/preferences/NotificationLedSeekBarPreference.java b/DeviceSettings/src/org/lineageos/settings/device/preferences/NotificationLedSeekBarPreference.java
similarity index 93%
rename from XiaomiParts/src/org/lineageos/settings/device/preferences/NotificationLedSeekBarPreference.java
rename to DeviceSettings/src/org/lineageos/settings/device/preferences/NotificationLedSeekBarPreference.java
index f01a6465..4a7e3fca 100644
--- a/XiaomiParts/src/org/lineageos/settings/device/preferences/NotificationLedSeekBarPreference.java
+++ b/DeviceSettings/src/org/lineageos/settings/device/preferences/NotificationLedSeekBarPreference.java
@@ -16,11 +16,11 @@ public class NotificationLedSeekBarPreference extends SecureSettingCustomSeekBar
     @Override
     public void onStartTrackingTouch(SeekBar seekBar) {
         notifyChanged();
-        FileUtils.setValue(NOTIF_LED_PATH, 64);
+        FileUtils.setValue(NOTIF_LED_PATH, 255);
     }
     @Override
     public void onStopTrackingTouch(SeekBar seekBar) {
         notifyChanged();
         FileUtils.setValue(NOTIF_LED_PATH, 0);
     }
-}
\ No newline at end of file
+}
diff --git a/XiaomiParts/src/org/lineageos/settings/device/preferences/SecureSettingCustomSeekBarPreference.java b/DeviceSettings/src/org/lineageos/settings/device/preferences/SecureSettingCustomSeekBarPreference.java
similarity index 100%
rename from XiaomiParts/src/org/lineageos/settings/device/preferences/SecureSettingCustomSeekBarPreference.java
rename to DeviceSettings/src/org/lineageos/settings/device/preferences/SecureSettingCustomSeekBarPreference.java
diff --git a/XiaomiParts/src/org/lineageos/settings/device/preferences/SecureSettingListPreference.java b/DeviceSettings/src/org/lineageos/settings/device/preferences/SecureSettingListPreference.java
similarity index 100%
rename from XiaomiParts/src/org/lineageos/settings/device/preferences/SecureSettingListPreference.java
rename to DeviceSettings/src/org/lineageos/settings/device/preferences/SecureSettingListPreference.java
diff --git a/XiaomiParts/src/org/lineageos/settings/device/preferences/SecureSettingSwitchPreference.java b/DeviceSettings/src/org/lineageos/settings/device/preferences/SecureSettingSwitchPreference.java
similarity index 100%
rename from XiaomiParts/src/org/lineageos/settings/device/preferences/SecureSettingSwitchPreference.java
rename to DeviceSettings/src/org/lineageos/settings/device/preferences/SecureSettingSwitchPreference.java
diff --git a/XiaomiParts/src/org/lineageos/settings/device/preferences/SecureSettingsStore.java b/DeviceSettings/src/org/lineageos/settings/device/preferences/SecureSettingsStore.java
similarity index 100%
rename from XiaomiParts/src/org/lineageos/settings/device/preferences/SecureSettingsStore.java
rename to DeviceSettings/src/org/lineageos/settings/device/preferences/SecureSettingsStore.java
diff --git a/XiaomiParts/src/org/lineageos/settings/device/preferences/VibrationSeekBarPreference.java b/DeviceSettings/src/org/lineageos/settings/device/preferences/VibrationSeekBarPreference.java
similarity index 100%
rename from XiaomiParts/src/org/lineageos/settings/device/preferences/VibrationSeekBarPreference.java
rename to DeviceSettings/src/org/lineageos/settings/device/preferences/VibrationSeekBarPreference.java
diff --git a/XiaomiDoze/proguard.flags b/XiaomiDoze/proguard.flags
deleted file mode 100644
index f6d7a5b0..00000000
--- a/XiaomiDoze/proguard.flags
+++ /dev/null
@@ -1,3 +0,0 @@
--keep class org.lineageos.settings.doze.* {
-  *;
-}
diff --git a/XiaomiDoze/res/color-night/switchbar_switch_thumb_tint.xml b/XiaomiDoze/res/color-night/switchbar_switch_thumb_tint.xml
deleted file mode 100644
index e3895a22..00000000
--- a/XiaomiDoze/res/color-night/switchbar_switch_thumb_tint.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2018 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@android:color/black" />
-</selector>
diff --git a/XiaomiDoze/res/color-night/switchbar_switch_track_tint.xml b/XiaomiDoze/res/color-night/switchbar_switch_track_tint.xml
deleted file mode 100644
index fcccbfcc..00000000
--- a/XiaomiDoze/res/color-night/switchbar_switch_track_tint.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2018 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<selector
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="#82000000" />
-</selector>
diff --git a/XiaomiDoze/res/color/switchbar_switch_thumb_tint.xml b/XiaomiDoze/res/color/switchbar_switch_thumb_tint.xml
deleted file mode 100644
index d4bf9b3a..00000000
--- a/XiaomiDoze/res/color/switchbar_switch_thumb_tint.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2018 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="#FFFFFF" />
-</selector>
diff --git a/XiaomiDoze/res/color/switchbar_switch_track_tint.xml b/XiaomiDoze/res/color/switchbar_switch_track_tint.xml
deleted file mode 100644
index ae45c7a9..00000000
--- a/XiaomiDoze/res/color/switchbar_switch_track_tint.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2018 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<selector
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="#BFFFFFFF" />
-</selector>
diff --git a/XiaomiDoze/res/drawable/ic_raise.xml b/XiaomiDoze/res/drawable/ic_raise.xml
deleted file mode 100644
index a7d5eb7a..00000000
--- a/XiaomiDoze/res/drawable/ic_raise.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- drawable/arrow_decision_outline.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?android:attr/colorControlNormal" >
-    <path android:fillColor="#000" android:pathData="M9.64,13.4C8.63,12.5 7.34,12.03 6,12V15L2,11L6,7V10C7.67,10 9.3,10.57 10.63,11.59C10.22,12.15 9.89,12.76 9.64,13.4M18,15V12C17.5,12 13.5,12.16 13.05,16.2C14.61,16.75 15.43,18.47 14.88,20.03C14.33,21.59 12.61,22.41 11.05,21.86C9.5,21.3 8.67,19.59 9.22,18.03C9.5,17.17 10.2,16.5 11.05,16.2C11.34,12.61 14.4,9.88 18,10V7L22,11L18,15M13,19A1,1 0 0,0 12,18A1,1 0 0,0 11,19A1,1 0 0,0 12,20A1,1 0 0,0 13,19M11,11.12C11.58,10.46 12.25,9.89 13,9.43V5H16L12,1L8,5H11V11.12Z" />
-</vector>
diff --git a/XiaomiDoze/res/drawable/ic_wave.xml b/XiaomiDoze/res/drawable/ic_wave.xml
deleted file mode 100644
index e0e6e01b..00000000
--- a/XiaomiDoze/res/drawable/ic_wave.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- drawable/arrow-decision_auto -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?android:attr/colorControlNormal">
-   <path android:fillColor="#000" android:pathData="M21,6.58V18.67A3.33,3.33 0 0,1 17.67,22H11.58C10.68,22 9.83,21.64 9.21,21L2.67,14.36C2.67,14.36 3.72,13.33 3.75,13.32C3.93,13.16 4.16,13.07 4.41,13.07C4.59,13.07 4.76,13.12 4.91,13.21C4.94,13.22 8.5,15.26 8.5,15.26V5.33A1.25,1.25 0 0,1 9.75,4.08A1.25,1.25 0 0,1 11,5.33V11.17H11.83V3.25A1.25,1.25 0 0,1 13.08,2C13.78,2 14.33,2.56 14.33,3.25V11.17H15.17V4.08C15.17,3.39 15.72,2.83 16.42,2.83A1.25,1.25 0 0,1 17.67,4.08V11.17H18.5V6.58A1.25,1.25 0 0,1 19.75,5.33A1.25,1.25 0 0,1 21,6.58Z" />
-</vector>
diff --git a/XiaomiDoze/res/layout/doze.xml b/XiaomiDoze/res/layout/doze.xml
deleted file mode 100644
index 941cdf68..00000000
--- a/XiaomiDoze/res/layout/doze.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_height="match_parent"
-              android:layout_width="match_parent">
-
-    <include layout="@layout/switch_bar" />
-
-</LinearLayout>
-
diff --git a/XiaomiDoze/src/org/lineageos/settings/doze/DozeTileService.java b/XiaomiDoze/src/org/lineageos/settings/doze/DozeTileService.java
deleted file mode 100644
index 0a57d781..00000000
--- a/XiaomiDoze/src/org/lineageos/settings/doze/DozeTileService.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-* Copyright (C) 2019-20 Evolution X Project
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-package org.lineageos.settings.doze;
-
-import android.annotation.TargetApi;
-import android.content.Intent;
-import android.service.quicksettings.Tile;
-import android.service.quicksettings.TileService;
-
-import org.lineageos.settings.doze.R;
-
-@TargetApi(24)
-public class DozeTileService extends TileService {
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-    }
-
-    @Override
-    public void onTileAdded() {
-        super.onTileAdded();
-    }
-
-    @Override
-    public void onTileRemoved() {
-        super.onTileRemoved();
-    }
-
-    @Override
-    public void onStartListening() {
-        super.onStartListening();
-    }
-
-    @Override
-    public void onStopListening() {
-        super.onStopListening();
-    }
-
-    @Override
-    public void onClick() {
-        super.onClick();
-        Intent XiaomiDoze = new Intent(this, DozeSettingsActivity.class);
-        XiaomiDoze.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        startActivityAndCollapse(XiaomiDoze);
-    }
-}
diff --git a/XiaomiParts/res/drawable/ic_mi.xml b/XiaomiParts/res/drawable/ic_mi.xml
deleted file mode 100644
index ec3c3b96..00000000
--- a/XiaomiParts/res/drawable/ic_mi.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M4,6.771l2.529,0.028l6.297,0c1.6,0 2.683,1.428 2.684,2.922c0.002,2.386
-0.028,7.48 0.028,7.48l-2.454,0.01l-0.046,-6.7c-0.006,-0.935 -0.634,-1.542
--1.548,-1.555c-1.177,-0.017 -4.163,0.019
--4.961,0.029l0,8.244l-2.529,0l0,-10.458Zm4.462,4.035l2.586,0l0,6.338l-2.586,0l0,-6.338Zm9.009,-4.035l2.529,0l0,10.458l-2.529,0l0,-10.458Z" />
-</vector>
-
diff --git a/XiaomiParts/res/values-es-rMX/strings.xml b/XiaomiParts/res/values-es-rMX/strings.xml
deleted file mode 100644
index ee640638..00000000
--- a/XiaomiParts/res/values-es-rMX/strings.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 The Xiaomi-SDM660 Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-    <string name="advanced_settings">Ajustes Xiaomi</string>
-    <string name="advanced_settings_summary">Ajustes Extras de Xiaomi MI 6X/A2</string>
-
-    <string name="display_title">Pantalla</string>
-
-    <!-- KCal -->
-    <string name="device_kcal_title">Calibrar Color de Pantalla </string>
-
-    <string name="vibration_title">Retroalimentación háptica</string>
-    <string name="vibration_strength_title">Fuerza</string>
-
-    <!-- Thermal Profiles -->
-    <string name="thermal_profile_title">Rendimiento</string>
-    <string name="thermal_title">Ajustes de Rendimiento</string>
-    <string name="thermal_summary">Elija su configuración de Rendimiento</string>
-    <string name="thermal_dialogTitle">Elija su configuración de Rendimiento</string>
-
-    <!-- Values for Thermal Presets -->
-    <string name="thermal_performance">Rendimiento</string>
-    <string name="thermal_battery">Batería</string>
-    <string name="thermal_gaming">Juego</string>
-    <string name="thermal_balance">Balance</string>
-    <string name="thermal_extreme_battery">Batería Extrema</string>
-</resources>
diff --git a/XiaomiParts/res/values-ru/strings.xml b/XiaomiParts/res/values-ru/strings.xml
deleted file mode 100644
index de72db7f..00000000
--- a/XiaomiParts/res/values-ru/strings.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 The Xiaomi-SDM660 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.
-	 
-	 Translated with <3 by pqhaz
--->
-<resources>
-    <string name="advanced_settings">Настройки Xiaomi</string>
-    <string name="advanced_settings_summary">Дополнительные настройки</string>
-
-    <string name="display_title">Экран</string>
-
-    <!-- KCal -->
-    <string name="device_kcal_title">Калибрация цвета экрана</string>
-
-    <!-- Ambient Display -->
-    <string name="ambient_display_xiaomi">Индикация событий</string>
-    <string name="advanced_doze_summary">Ambient экран</string>
-
-    <string name="vibration_title">Вибрация</string>
-    <string name="vibration_strength_title">Сила</string>
-
-    <!-- Thermal Profiles -->
-    <string name="thermal_profile_title">Производительность</string>
-    <string name="thermal_title">Настройки производительности</string>
-    <string name="thermal_summary">Выберите Ваш профиль производительности</string>
-    <string name="thermal_dialogTitle">Выберите Ваш профиль производительности</string>
-
-    <!-- Values for Thermal Presets -->
-    <string name="thermal_performance">Производительность</string>
-    <string name="thermal_battery">Энергосбережение</string>
-    <string name="thermal_gaming">Игры</string>
-    <string name="thermal_balance">Баланс</string>
-    <string name="thermal_extreme_battery">Экстримальное энергосбережение</string>
-
-    <!-- kcal -->
-    <string name="advanced_settings_kcal">Калибрация цвета экрана</string>
-    <string name="cat_colormanagement">Настройки цвета</string>
-    <string name="cat_calibration">Калибрация экрана</string>
-
-    <string name="kcal_enabled">Включено</string>
-    <string name="kcal_disabled">Выключено</string>
-    <string name="set_on_boot">Включать при загрузке</string>
-    <string name="color_red">Красный</string>
-    <string name="color_green">Зелёный</string>
-    <string name="color_blue">Синий</string>
-    <string name="color_minimum">Минимум</string>
-    <string name="saturation">Насыщеность</string>
-    <string name="value">Экспозиция</string>
-    <string name="contrast">Контраст</string>
-    <string name="hue">Оттенок</string>
-    <string name="grayscale">Экран в оттенках серого</string>
-
-    <string name="presets_dialog_title">Выберите пресет</string>
-
-    <!-- menu -->
-    <string name="kcal_reset">Вернуть пресет по умолчанию</string>
-
-    <!-- CustomSeekBarPreference -->
-    <string name="edit_value">Введите новое значение</string>
-    <string name="default_value">Значение по умолчанию</string>
-    <string name="edit_hint">Значение между %1$d и %2$d</string>
-</resources>
diff --git a/XiaomiParts/res/values-zh/strings.xml b/XiaomiParts/res/values-zh/strings.xml
deleted file mode 100644
index d1e4301a..00000000
--- a/XiaomiParts/res/values-zh/strings.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 The Mokee Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-    <string name="advanced_settings">小米设置</string>
-    <string name="advanced_settings_summary">附加设置</string>
-
-    <string name="display_title">显示</string>
-
-    <!-- KCal -->
-    <string name="device_kcal_title">显示颜色矫正</string>
-
-    <!-- Ambient Display -->
-    <string name="ambient_display_xiaomi">Xiaomi Doze</string>
-    <string name="advanced_doze_summary">环境显示</string>
-
-    <string name="vibration_title">触觉反馈</string>
-    <string name="vibration_strength_title">强度</string>
-
-    <!-- Thermal Profiles -->
-    <string name="thermal_profile_title">性能</string>
-    <string name="thermal_title">性能选项</string>
-    <string name="thermal_summary">性能选项</string>
-    <string name="thermal_dialogTitle">设置性能选项</string>
-
-    <!-- Values for Thermal Presets -->
-    <string name="thermal_performance">高性能</string>
-    <string name="thermal_battery">延长电池</string>
-    <string name="thermal_gaming">游戏</string>
-    <string name="thermal_balance">平衡</string>
-    <string name="thermal_extreme_battery">极致延长电池</string>
-
-    <string name="advanced_settings_kcal">显示颜色矫正</string>
-    <string name="cat_calibration">显示矫正</string>
-    <string name="kcal_enabled">启用</string>
-    <string name="set_on_boot">在启动时设置</string>
-    <string name="kcal_disabled">关闭</string>
-    <string name="color_red">红</string>
-    <string name="color_green">绿</string>
-    <string name="color_blue">蓝</string>
-    <string name="color_minimum">最低</string>
-    <string name="saturation">饱和度</string>
-    <string name="value">设定值</string>
-    <string name="contrast">对比度</string>
-    <string name="hue">色调</string>
-    <string name="cat_colormanagement">颜色设置</string>
-    <string name="kcal_reset">重置</string>
-    <string name="edit_value">设定一个新的值</string>
-
-    <string name="presets_dialog_title">选择预设</string>
-    <!-- Presets -->
-    <string name="preset_default">默认</string>
-    <string name="preset_version_1">版本 1</string>
-    <string name="preset_version_2">版本 2</string>
-    <string name="preset_version_3">版本 3</string>
-    <string name="preset_triluminous">Triluminous</string>
-    <string name="preset_deep_black_white">Deep Black and White</string>
-    <string name="preset_deep_natural">Deep Natural</string>
-    <string name="preset_cool_amoled">Cool Amoled</string>
-    <string name="preset_extreme_amoled">Extreme Amoled</string>
-    <string name="preset_warm_amoled">Warm Amoled</string>
-    <string name="preset_hybrid_mamba">Hybrid Mamba</string>
-</resources>
diff --git a/sdm660.mk b/sdm660.mk
index d1d8287a..d9b4048e 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -212,9 +212,9 @@ PRODUCT_PACKAGES += \
     vendor.display.config@1.9 \
     vendor.display.config@1.9_vendor
 
-# Doze
+# DeviceDoze
 PRODUCT_PACKAGES += \
-    XiaomiDoze
+    DeviceDoze
 
 # DRM
 PRODUCT_PACKAGES += \
@@ -599,6 +599,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_BOOT_JARS += \
     WfdCommon
 
-# XiaomiParts
+# DeviceSettings
 PRODUCT_PACKAGES += \
-   XiaomiParts
+   DeviceSettings