diff --git a/java/Android.bp b/java/Android.bp
index d9cf6c5eaee30b952b2590c3bf8805e451efbae6..f41e94af0c46eae81853dc7e7f9e87f77df59926 100644
--- a/java/Android.bp
+++ b/java/Android.bp
@@ -36,7 +36,7 @@ android_app {
 
     min_sdk_version: "14",
     target_sdk_version: "23",
-    platform_apis: true,
+    sdk_version: "current",
 
     product_specific: true,
 
diff --git a/java/res/values/colors.xml b/java/res/values/colors.xml
index 7b11cafcf49a6817d6ee60452c662b24c77cd476..7256b2bd9770b5360b2931495c0d85ad05221c52 100644
--- a/java/res/values/colors.xml
+++ b/java/res/values/colors.xml
@@ -47,12 +47,12 @@
     <color name="key_text_inactive_color_lxx_light">#B337474F</color>
     <color name="key_hint_letter_color_lxx_light">#B337474F</color>
     <color name="language_on_spacebar_text_color_lxx_light">#B337474F</color>
-    <color name="highlight_color_lxx_light">@lineageos.platform:color/color_default_accent</color>
+    <color name="highlight_color_lxx_light">@*android:color/accent_material_light</color>
     <color name="auto_correct_color_lxx_light">#37474F</color>
     <color name="typed_word_color_lxx_light">#D937474F</color>
     <color name="suggested_word_color_lxx_light">#B337474F</color>
-    <color name="gesture_trail_color_lxx_light">@lineageos.platform:color/color_default_accent</color>
-    <color name="sliding_key_input_preview_color_lxx_light">@lineageos.platform:color/color_default_accent</color>
+    <color name="gesture_trail_color_lxx_light">@*android:color/accent_material_light</color>
+    <color name="sliding_key_input_preview_color_lxx_light">@*android:color/accent_material_light</color>
     <color name="key_background_lxx_light">#ECEFF1</color>
     <color name="key_background_pressed_lxx_light">#2637474F</color>
     <color name="suggested_word_background_selected_lxx_light">#2637474F</color>
@@ -65,12 +65,12 @@
     <color name="key_text_inactive_color_lxx_dark">#80FFFFFF</color>
     <color name="key_hint_letter_color_lxx_dark">#80FFFFFF</color>
     <color name="language_on_spacebar_text_color_lxx_dark">#B3FFFFFF</color>
-    <color name="highlight_color_lxx_dark">@lineageos.platform:color/color_default_accent</color>
+    <color name="highlight_color_lxx_dark">@*android:color/accent_material_dark</color>
     <color name="auto_correct_color_lxx_dark">#FFFFFF</color>
     <color name="typed_word_color_lxx_dark">#D9FFFFFF</color>
     <color name="suggested_word_color_lxx_dark">#B3FFFFFF</color>
-    <color name="gesture_trail_color_lxx_dark">@lineageos.platform:color/color_default_accent</color>
-    <color name="sliding_key_input_preview_color_lxx_dark">@lineageos.platform:color/color_default_accent</color>
+    <color name="gesture_trail_color_lxx_dark">@*android:color/accent_material_dark</color>
+    <color name="sliding_key_input_preview_color_lxx_dark">@*android:color/accent_material_dark</color>
     <color name="key_background_lxx_dark">#263238</color>
     <color name="key_background_pressed_lxx_dark">#19FFFFFF</color>
     <color name="suggested_word_background_selected_lxx_dark">#19FFFFFF</color>
@@ -79,7 +79,7 @@
     <!-- Color resources for setup wizard and tutorial -->
     <color name="setup_background">#FFEBEBEB</color>
     <color name="setup_text_dark">#FF707070</color>
-    <color name="setup_text_action">@lineageos.platform:color/color_default_accent</color>
+    <color name="setup_text_action">@*android:color/accent_material_light</color>
     <color name="setup_step_background">@android:color/background_light</color>
     <color name="setup_welcome_video_margin_color">#FFCCCCCC</color>
     <!-- Accent color for the notification. We need to match this to the OS build -->