diff --git a/Android.bp b/Android.bp
index fc8062a919e7ddd619ef50a88492bae22a2941c2..f1a7dc111da217ed5797440985bde484d73f6f24 100644
--- a/Android.bp
+++ b/Android.bp
@@ -17,7 +17,6 @@ android_app {
     optimize: {
         proguard_flags_files: ["proguard.cfg"],
     },
-    sdk_version: "system_current",
     product_specific: true,
     privileged: true,
     required: ["privapp_whitelist_com.android.settings.intelligence"],
@@ -30,6 +29,7 @@ android_app {
         "androidx.preference_preference",
         "androidx.recyclerview_recyclerview",
         "androidx.legacy_legacy-preference-v14",
+        "org.lineageos.platform.sdk",
     ],
     resource_dirs: ["res"],
     srcs: [
@@ -39,4 +39,5 @@ android_app {
     proto: {
         type: "nano",
     },
+    platform_apis: true,
 }
diff --git a/res/layout/search_intent_item.xml b/res/layout/search_intent_item.xml
index 6bc00ad06b9100da72d21ba1f927041745714331..e188182ad48ac128045c36823a66abcb690f05a1 100644
--- a/res/layout/search_intent_item.xml
+++ b/res/layout/search_intent_item.xml
@@ -22,7 +22,6 @@
     android:paddingTop="16dp"
     android:paddingBottom="16dp"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:background="?android:attr/selectableItemBackground"
     android:clipToPadding="false">
 
     <include layout="@layout/search_icon_view"/>
diff --git a/res/layout/search_panel.xml b/res/layout/search_panel.xml
index 82b1e1102b3f45c9f9d23f7497083edd808d18f9..cb9b7823670ae86e8355e906f7d5e701b3d71dc2 100644
--- a/res/layout/search_panel.xml
+++ b/res/layout/search_panel.xml
@@ -38,7 +38,6 @@
                 android:id="@+id/search_toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/search_bar_height"
-                android:background="?android:attr/selectableItemBackground"
                 android:contentInsetStart="0dp"
                 android:contentInsetStartWithNavigation="0dp"
                 android:theme="?android:attr/actionBarTheme">
diff --git a/res/layout/search_saved_query_item.xml b/res/layout/search_saved_query_item.xml
index f8c239a9f04f170be38159b10a1815b8c57b0fef..44d46e0de5ce8a9bc1e7204c5dd0c38b3a8d81f7 100644
--- a/res/layout/search_saved_query_item.xml
+++ b/res/layout/search_saved_query_item.xml
@@ -21,7 +21,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:background="?android:attr/selectableItemBackground"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:gravity="center_vertical">
 
diff --git a/res/values-night/colors.xml b/res/values-night/bools.xml
similarity index 89%
rename from res/values-night/colors.xml
rename to res/values-night/bools.xml
index 399913a377de29c2b6f6008b18385d76f799ca39..f8bf923e6b90fe91c302ca24461947fd7c1d13b8 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/bools.xml
@@ -15,5 +15,5 @@
 -->
 
 <resources>
-    <color name="search_panel_background">@*android:color/material_grey_800</color>
+    <bool name="is_in_light_mode">false</bool>
 </resources>
diff --git a/res/values/bools.xml b/res/values/bools.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f6804fe19515110b53244f2355ac77b33cd7f757
--- /dev/null
+++ b/res/values/bools.xml
@@ -0,0 +1,19 @@
+<?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.
+-->
+
+<resources>
+    <bool name="is_in_light_mode">true</bool>
+</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 632c72d8cbc9e6511178bee1b99c3a9e0b531b09..6f28967a4ce60a00f2ccf36bb8a2d1278098e293 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -16,7 +16,14 @@
   -->
 
 <resources>
-    <color name="launcher_background_color">#ff008577</color>
+    <color name="color_default_primary">@lineageos.platform:color/color_default_primary</color>
+    <color name="color_default_primary_dark">@lineageos.platform:color/color_default_primary_dark</color>
+    <color name="color_default_accent">@lineageos.platform:color/color_default_accent</color>
+    <color name="color_default_background">@lineageos.platform:color/color_default_background</color>
+    <color name="color_default_primary_text">@lineageos.platform:color/color_default_primary_text</color>
+    <color name="color_default_secondary_text">@lineageos.platform:color/color_default_secondary_text</color>
 
-    <color name="search_panel_background">@android:color/white</color>
+    <color name="launcher_background_color">@color/color_default_accent</color>
+
+    <color name="search_panel_background">@color/color_default_background</color>
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 4e8ae4e0e8f2ff48c677c47b9f3449f4cdd917f1..922ececf90836607288d63a64e087c9e22522bce 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -16,10 +16,38 @@
   -->
 
 <resources>
-    <style name="Theme.Settings" parent="@android:style/Theme.DeviceDefault.Settings"/>
+    <style name="Theme.Settings" parent="@android:style/Theme.DeviceDefault.Settings">
+        <item name="android:windowBackground">@color/color_default_background</item>
+        <item name="android:colorPrimary">@color/color_default_primary</item>
+        <item name="android:colorPrimaryDark">@color/color_default_primary_dark</item>
+        <item name="android:colorAccent">@color/color_default_accent</item>
+        <item name="android:textColorPrimary">@color/color_default_primary_text</item>
+        <item name="android:textColorSecondary">@color/color_default_secondary_text</item>
+        <item name="android:textColor">@color/color_default_primary_text</item>
+        <item name="android:statusBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarDividerColor">@color/color_default_primary_dark</item>
+        <item name="android:windowLightStatusBar">@bool/is_in_light_mode</item>
+        <item name="android:windowLightNavigationBar">@bool/is_in_light_mode</item>
+        <item name="android:selectableItemBackground">@color/color_default_primary_dark</item>
+    </style>
 
     <style name="Theme.Settings.NoActionBar">
         <item name="android:windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
+
+        <item name="android:windowBackground">@color/color_default_background</item>
+        <item name="android:colorPrimary">@color/color_default_primary</item>
+        <item name="android:colorPrimaryDark">@color/color_default_primary_dark</item>
+        <item name="android:colorAccent">@color/color_default_accent</item>
+        <item name="android:textColorPrimary">@color/color_default_primary_text</item>
+        <item name="android:textColorSecondary">@color/color_default_secondary_text</item>
+        <item name="android:textColor">@color/color_default_primary_text</item>
+        <item name="android:statusBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarDividerColor">@color/color_default_primary_dark</item>
+        <item name="android:windowLightStatusBar">@bool/is_in_light_mode</item>
+        <item name="android:windowLightNavigationBar">@bool/is_in_light_mode</item>
+        <item name="android:selectableItemBackground">@color/color_default_primary_dark</item>
     </style>
 </resources>
\ No newline at end of file