diff --git a/Owl/app/src/main/AndroidManifest.xml b/Owl/app/src/main/AndroidManifest.xml
index ce211706dd..d79c99177a 100644
--- a/Owl/app/src/main/AndroidManifest.xml
+++ b/Owl/app/src/main/AndroidManifest.xml
@@ -28,7 +28,8 @@
 
         <activity
             android:name=".ui.MainActivity"
-            android:exported="true">
+            android:exported="true"
+            android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/Owl/app/src/main/java/com/example/owl/ui/MainActivity.kt b/Owl/app/src/main/java/com/example/owl/ui/MainActivity.kt
index 500556fdb3..88cd5fa525 100644
--- a/Owl/app/src/main/java/com/example/owl/ui/MainActivity.kt
+++ b/Owl/app/src/main/java/com/example/owl/ui/MainActivity.kt
@@ -18,17 +18,22 @@ package com.example.owl.ui
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
+import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
-import androidx.core.view.WindowCompat
+import androidx.activity.enableEdgeToEdge
+import androidx.core.content.ContextCompat
+import com.example.owl.R
 
 class MainActivity : ComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge(
+            statusBarStyle = SystemBarStyle.dark(
+                ContextCompat.getColor(this, R.color.immersive_sys_ui)
+            )
+        )
         super.onCreate(savedInstanceState)
 
-        // This app draws behind the system bars, so we want to handle fitting system windows
-        WindowCompat.setDecorFitsSystemWindows(window, false)
-
         setContent {
             OwlApp { finish() }
         }
diff --git a/Owl/app/src/main/java/com/example/owl/ui/onboarding/Onboarding.kt b/Owl/app/src/main/java/com/example/owl/ui/onboarding/Onboarding.kt
index 68f73d1fab..efd8fe8539 100644
--- a/Owl/app/src/main/java/com/example/owl/ui/onboarding/Onboarding.kt
+++ b/Owl/app/src/main/java/com/example/owl/ui/onboarding/Onboarding.kt
@@ -29,7 +29,6 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.statusBarsPadding
@@ -87,7 +86,6 @@ fun Onboarding(onboardingComplete: () -> Unit) {
                 FloatingActionButton(
                     onClick = onboardingComplete,
                     modifier = Modifier
-                        .navigationBarsPadding()
                 ) {
                     Icon(
                         imageVector = Icons.Rounded.Explore,
@@ -97,10 +95,7 @@ fun Onboarding(onboardingComplete: () -> Unit) {
             }
         ) { innerPadding ->
             Column(
-                modifier = Modifier
-                    .statusBarsPadding()
-                    .navigationBarsPadding()
-                    .padding(innerPadding)
+                modifier = Modifier.padding(innerPadding)
             ) {
                 Text(
                     text = stringResource(R.string.choose_topics_that_interest_you),
diff --git a/Owl/app/src/main/res/values-v29/color.xml b/Owl/app/src/main/res/values-v29/color.xml
deleted file mode 100644
index 223b20c43d..0000000000
--- a/Owl/app/src/main/res/values-v29/color.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2020 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>
-
-    <color name="nav_bar">@android:color/transparent</color>
-
-</resources>
diff --git a/Owl/app/src/main/res/values/color.xml b/Owl/app/src/main/res/values/color.xml
index 57a447fe9e..78d3871dde 100644
--- a/Owl/app/src/main/res/values/color.xml
+++ b/Owl/app/src/main/res/values/color.xml
@@ -13,8 +13,5 @@
   the License.
   -->
 <resources>
-
     <color name="immersive_sys_ui">#33000000</color>
-    <color name="nav_bar">@color/immersive_sys_ui</color>
-
 </resources>
diff --git a/Owl/app/src/main/res/values/themes.xml b/Owl/app/src/main/res/values/themes.xml
index 33ea323956..4c4900ba87 100644
--- a/Owl/app/src/main/res/values/themes.xml
+++ b/Owl/app/src/main/res/values/themes.xml
@@ -13,14 +13,6 @@
   the License.
   -->
 <resources>
-
-    <style name="Theme.Owl" parent="@style/Theme.Material.DayNight.NoActionBar">
-        <item name="android:colorPrimary">#ff00ff</item>
-        <item name="android:colorAccent">#ff00ff</item>
-        <item name="android:statusBarColor">@color/immersive_sys_ui</item>
-        <item name="android:navigationBarColor">@color/nav_bar</item>
-    </style>
-
+    <style name="Theme.Owl" parent="@style/Theme.Material.DayNight.NoActionBar"/>
     <style name="Theme.Material.DayNight.NoActionBar" parent="@android:style/Theme.Material.Light.NoActionBar" />
-
 </resources>