diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 35223d2..c4dae49 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -6,12 +6,12 @@ plugins {
 
 android {
     namespace = "it.danieleverducci.lunatracker"
-    compileSdk = 34
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "it.danieleverducci.lunatracker"
         minSdk = 21
-        targetSdk = 34
+        targetSdk = 36
         versionCode = 7
         versionName = "0.9"
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 9a5c676..97481d2 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -4,6 +4,11 @@
     <style name="Theme.LunaTracker" parent="Theme.AppCompat.NoActionBar">
         <item name="colorAccent">@color/accent</item>
         <item name="android:textColor">@color/textColor</item>
+
+        <!-- make the screen not overlap with the system bars -->
+        <item name="android:fitsSystemWindows">true</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
     </style>
 
     <style name="OverflowMenuText">