diff --git a/app/build.gradle b/app/build.gradle
index af0b75fcc..443568ac4 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,12 +3,12 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion "android-S"
 
     defaultConfig {
         applicationId "org.dslul.openboard.inputmethod.latin"
         minSdkVersion 19
-        targetSdkVersion 30
+        targetSdkVersion "S"
         versionCode 15
         versionName '1.4.3'
     }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fc7446ba4..df3ce4791 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -53,7 +53,8 @@
         <service android:name="LatinIME"
                 android:label="@string/english_ime_name"
                 android:permission="android.permission.BIND_INPUT_METHOD"
-                android:directBootAware="true">
+                android:directBootAware="true"
+                android:exported="true">
             <intent-filter>
                 <action android:name="android.view.InputMethod" />
             </intent-filter>
@@ -62,7 +63,8 @@
 
         <service android:name=".spellcheck.AndroidSpellCheckerService"
                  android:label="@string/spell_checker_service_name"
-                 android:permission="android.permission.BIND_TEXT_SERVICE">
+                 android:permission="android.permission.BIND_TEXT_SERVICE"
+                 android:exported="true">
             <intent-filter>
                 <action android:name="android.service.textservice.SpellCheckerService" />
             </intent-filter>
@@ -76,7 +78,8 @@
                 android:label="@string/english_ime_name"
                 android:icon="@mipmap/ic_launcher"
                 android:launchMode="singleTask"
-                android:noHistory="true">
+                android:noHistory="true"
+                android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -93,7 +96,8 @@
         <activity android:name=".setup.SetupWizardActivity"
                 android:theme="@style/platformActivityTheme"
                 android:label="@string/english_ime_name"
-                android:clearTaskOnLaunch="true">
+                android:clearTaskOnLaunch="true"
+                android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
@@ -101,7 +105,8 @@
 
         <activity android:name=".settings.SettingsActivity"
                 android:theme="@style/platformSettingsTheme"
-                android:label="@string/english_ime_settings">
+                android:label="@string/english_ime_settings"
+                android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
@@ -109,7 +114,8 @@
 
         <activity android:name=".spellcheck.SpellCheckerSettingsActivity"
                   android:theme="@style/platformSettingsTheme"
-                  android:label="@string/android_spell_checker_settings">
+                  android:label="@string/android_spell_checker_settings"
+                android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
@@ -120,7 +126,8 @@
                 android:exported="false" />
 
         <!-- Broadcast receivers -->
-        <receiver android:name="SystemBroadcastReceiver">
+        <receiver android:name="SystemBroadcastReceiver"
+                android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
diff --git a/app/src/main/res/drawable/ic_emoji_flags_lxx_dark.xml b/app/src/main/res/drawable/ic_emoji_flags_lxx_dark.xml
index 8284af83f..163e6c690 100644
--- a/app/src/main/res/drawable/ic_emoji_flags_lxx_dark.xml
+++ b/app/src/main/res/drawable/ic_emoji_flags_lxx_dark.xml
@@ -3,5 +3,5 @@
   <item android:drawable="@drawable/ic_emoji_flags_activated_lxx_dark" android:state_focused="true"/>
   <item android:drawable="@drawable/ic_emoji_flags_activated_lxx_dark" android:state_pressed="true"/>
   <item android:drawable="@drawable/ic_emoji_flags_activated_lxx_dark" android:state_selected="true"/>
-  <item android:drawable="@drawable/ic_emoji_flags_normal_lxx_dark"/>
+  <item android:drawable="@drawable/ic_emoji_flags_normal_lxx_dark" />
 </selector>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 3baab95ca..f1a388b2f 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -48,16 +48,16 @@
     <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">#1A73E8</color>
+    <color name="highlight_color_lxx_light">@android:color/system_accent1_600</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">#1A73E8</color>
-    <color name="sliding_key_input_preview_color_lxx_light">#1457af</color>
+    <color name="gesture_trail_color_lxx_light">@android:color/system_accent1_600</color>
+    <color name="sliding_key_input_preview_color_lxx_light">@android:color/system_accent1_800</color>
     <color name="key_background_lxx_light">#ECEFF1</color>
     <color name="key_background_pressed_lxx_light">#2637474F</color>
-    <color name="action_key_background_lxx_light">#1A73E8</color>
-    <color name="action_key_background_pressed_lxx_light">#3683e8</color>
+    <color name="action_key_background_lxx_light">@android:color/system_accent1_500</color>
+    <color name="action_key_background_pressed_lxx_light">@android:color/system_accent1_400</color>
     <color name="suggested_word_background_selected_lxx_light">#2637474F</color>
     <color name="gesture_floating_preview_color_lxx_light">#E6ECEFF1</color>
     <color name="emoji_tab_page_indicator_background_lxx_light">#E4E7E9</color>
@@ -77,16 +77,16 @@
     <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">#5E97F6</color>
+    <color name="highlight_color_lxx_dark">@android:color/system_accent1_200</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">#5E97F6</color>
-    <color name="sliding_key_input_preview_color_lxx_dark">#436baf</color>
+    <color name="gesture_trail_color_lxx_dark">@android:color/system_accent1_200</color>
+    <color name="sliding_key_input_preview_color_lxx_dark">@android:color/system_accent1_900</color>
     <color name="key_background_lxx_dark">#00000000</color>
     <color name="key_background_pressed_lxx_dark">#19FFFFFF</color>
-    <color name="action_key_background_lxx_dark">#5E97F6</color>
-    <color name="action_key_background_pressed_lxx_dark">#86b0f6</color>
+    <color name="action_key_background_lxx_dark">@android:color/system_accent1_500</color>
+    <color name="action_key_background_pressed_lxx_dark">@android:color/system_accent1_200</color>
     <color name="suggested_word_background_selected_lxx_dark">#1CFFFFFF</color>
     <color name="gesture_floating_preview_color_lxx_dark">#E621272B</color>
     <color name="emoji_tab_page_indicator_background_lxx_dark">#21272B</color>