diff --git a/app/build.gradle b/app/build.gradle
index a629f65eb..2f5f492fb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,14 +12,14 @@ plugins {
 }
 
 android {
-    compileSdk 34
+    compileSdk 36
     namespace 'org.schabi.newpipe'
 
     defaultConfig {
         applicationId "org.schabi.newpipe"
         resValue "string", "app_name", "NewPipe"
         minSdk 21
-        targetSdk 33
+        targetSdk 35
         if (System.properties.containsKey('versionCodeOverride')) {
             versionCode System.getProperty('versionCodeOverride') as Integer
         } else {
diff --git a/app/src/main/res/values-v35/styles.xml b/app/src/main/res/values-v35/styles.xml
new file mode 100644
index 000000000..beb16bcdf
--- /dev/null
+++ b/app/src/main/res/values-v35/styles.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Base Theme -->
+    <style name="Base.V35" parent="Base.V29">
+        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
+    </style>
+    <style name="Base" parent="Base.V35"/>
+
+    <!-- Light Theme -->
+    <style name="Base.V35.LightTheme" parent="Base.V29.LightTheme">
+    </style>
+    <style name="Base.LightTheme" parent="Base.V35.LightTheme" />
+
+    <!-- Dark Theme -->
+    <style name="Base.V35.DarkTheme" parent="Base.V29.DarkTheme">
+
+    </style>
+    <style name="Base.DarkTheme" parent="Base.V35.DarkTheme" />
+
+    <!-- Black Theme -->
+    <style name="Base.V35.BlackTheme" parent="Base.V29.BlackTheme">
+
+    </style>
+    <style name="Base.BlackTheme" parent="Base.V35.BlackTheme" />
+
+</resources>