diff --git a/app/build.gradle b/app/build.gradle
index ea34434..379b009 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,13 +3,13 @@ plugins {
 }
 
 android {
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
         applicationId "com.sjapps.jsonlist"
         minSdk 23
-        targetSdk 34
-        versionCode 23
+        targetSdk 35
+        versionCode 24
         versionName "1.6"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -28,7 +28,7 @@ android {
         }
         debug {
             applicationIdSuffix '.debug'
-            versionNameSuffix ' dev 3'
+            versionNameSuffix ' dev 4'
         }
     }
     compileOptions {
diff --git a/app/src/main/java/com/sjapps/about/AboutActivity.java b/app/src/main/java/com/sjapps/about/AboutActivity.java
index acfaf39..61b6f0b 100644
--- a/app/src/main/java/com/sjapps/about/AboutActivity.java
+++ b/app/src/main/java/com/sjapps/about/AboutActivity.java
@@ -10,13 +10,18 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.widget.ImageView;
 
+import androidx.activity.EdgeToEdge;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.content.res.AppCompatResources;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
 import androidx.core.widget.NestedScrollView;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -50,8 +55,10 @@ public class AboutActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        EdgeToEdge.enable(this);
         setContentView(R.layout.activity_about);
         initialize();
+        setLayoutBounds();
         Animation animation = AnimationUtils.loadAnimation(this, R.anim.slide_from_bottom);
         nestedScrollView.startAnimation(animation);
         PackageManager manager = getPackageManager();
@@ -74,6 +81,23 @@ protected void onCreate(Bundle savedInstanceState) {
 
     }
 
+    private void setLayoutBounds() {
+        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.rootView), (v, windowInsets) -> {
+            Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+            Insets insetsN = windowInsets.getInsets(WindowInsetsCompat.Type.displayCutout());
+
+            ViewGroup.MarginLayoutParams layoutParams = (ViewGroup.MarginLayoutParams) v.getLayoutParams();
+
+            layoutParams.leftMargin = insets.left + insetsN.left;
+            layoutParams.topMargin = insets.top;
+            layoutParams.rightMargin = insets.right + insetsN.right;
+            View scrollRL = findViewById(R.id.scrollRL);
+            scrollRL.setPadding(scrollRL.getPaddingLeft(),scrollRL.getPaddingTop(),scrollRL.getPaddingRight(),insets.bottom + insetsN.bottom);
+            v.setLayoutParams(layoutParams);
+            return WindowInsetsCompat.CONSUMED;
+        });
+    }
+
     private void setupList(ArrayList<AboutListItem> items, @NonNull RecyclerView view) {
         AboutListAdapter adapter = new AboutListAdapter(items);
         view.setNestedScrollingEnabled(false);
diff --git a/app/src/main/java/com/sjapps/jsonlist/MainActivity.java b/app/src/main/java/com/sjapps/jsonlist/MainActivity.java
index 16a3cbe..0917dd5 100644
--- a/app/src/main/java/com/sjapps/jsonlist/MainActivity.java
+++ b/app/src/main/java/com/sjapps/jsonlist/MainActivity.java
@@ -8,6 +8,9 @@
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -127,6 +130,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         setContentView(R.layout.activity_main);
         initialize();
+        setLayoutBounds();
 
         if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE){
             isVertical = false;
@@ -271,6 +275,22 @@ protected void onCreate(Bundle savedInstanceState) {
         });
     }
 
+    private void setLayoutBounds() {
+        ViewCompat.setOnApplyWindowInsetsListener(viewGroup, (v, windowInsets) -> {
+            Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+            Insets insetsN = windowInsets.getInsets(WindowInsetsCompat.Type.displayCutout());
+
+            ViewGroup.MarginLayoutParams layoutParams = (ViewGroup.MarginLayoutParams) v.getLayoutParams();
+
+            layoutParams.leftMargin = insets.left + insetsN.left;
+            layoutParams.topMargin = insets.top;
+            layoutParams.rightMargin = insets.right + insetsN.right;
+            layoutParams.bottomMargin = insets.bottom;
+            v.setLayoutParams(layoutParams);
+            return WindowInsetsCompat.CONSUMED;
+        });
+    }
+
     private void LoadStateData() {
         boolean prevSH = state != null && state.isSyntaxHighlighting();
 
diff --git a/app/src/main/java/com/sjapps/jsonlist/SettingsActivity.java b/app/src/main/java/com/sjapps/jsonlist/SettingsActivity.java
index d8c2732..1f11145 100644
--- a/app/src/main/java/com/sjapps/jsonlist/SettingsActivity.java
+++ b/app/src/main/java/com/sjapps/jsonlist/SettingsActivity.java
@@ -3,6 +3,7 @@
 import android.annotation.SuppressLint;
 import android.os.Bundle;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.widget.AdapterView;
@@ -10,6 +11,9 @@
 import android.widget.Spinner;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
 
 import com.google.android.material.materialswitch.MaterialSwitch;
 
@@ -28,6 +32,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_settings);
 
         initialize();
+        setLayoutBounds();
 
         LoadData();
 
@@ -83,6 +88,22 @@ public void onNothingSelected(AdapterView<?> parent) {
 
     }
 
+    private void setLayoutBounds() {
+        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.rootView), (v, windowInsets) -> {
+            Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+            Insets insetsN = windowInsets.getInsets(WindowInsetsCompat.Type.displayCutout());
+
+            ViewGroup.MarginLayoutParams layoutParams = (ViewGroup.MarginLayoutParams) v.getLayoutParams();
+
+            layoutParams.leftMargin = insets.left + insetsN.left;
+            layoutParams.topMargin = insets.top;
+            layoutParams.rightMargin = insets.right + insetsN.right;
+            layoutParams.bottomMargin = insets.bottom;
+            v.setLayoutParams(layoutParams);
+            return WindowInsetsCompat.CONSUMED;
+        });
+    }
+
     private void LoadData() {
         state = FileSystem.loadStateData(this);
     }
diff --git a/app/src/main/java/com/sjapps/logs/LogActivity.java b/app/src/main/java/com/sjapps/logs/LogActivity.java
index 10bad74..151c406 100644
--- a/app/src/main/java/com/sjapps/logs/LogActivity.java
+++ b/app/src/main/java/com/sjapps/logs/LogActivity.java
@@ -10,11 +10,16 @@
 import android.os.Bundle;
 import android.util.DisplayMetrics;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.activity.EdgeToEdge;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.content.FileProvider;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
 
 import com.google.gson.Gson;
 import com.sjapps.jsonlist.AppState;
@@ -38,8 +43,9 @@ public class LogActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_log);
-
+        EdgeToEdge.enable(this);
         logTxt = findViewById(R.id.logTxt);
+        setLayoutBounds();
         update();
 
         AppState state = FileSystem.loadStateData(this);
@@ -51,6 +57,22 @@ protected void onCreate(Bundle savedInstanceState) {
 
     }
 
+    private void setLayoutBounds() {
+        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.rootView), (v, windowInsets) -> {
+            Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+            Insets insetsN = windowInsets.getInsets(WindowInsetsCompat.Type.displayCutout());
+
+            ViewGroup.MarginLayoutParams layoutParams = (ViewGroup.MarginLayoutParams) v.getLayoutParams();
+
+            layoutParams.leftMargin = insets.left + insetsN.left;
+            layoutParams.topMargin = insets.top;
+            layoutParams.rightMargin = insets.right + insetsN.right;
+            logTxt.setPadding(logTxt.getPaddingLeft(),logTxt.getPaddingTop(),logTxt.getPaddingRight(),insets.bottom + insetsN.bottom);
+            v.setLayoutParams(layoutParams);
+            return WindowInsetsCompat.CONSUMED;
+        });
+    }
+
     @Override
     protected void onResume() {
         super.onResume();
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index b5677b4..be9b027 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -4,41 +4,53 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.sjapps.about.AboutActivity">
-
-    <ImageButton
-        android:id="@+id/BackBtn"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_marginStart="20dp"
-        android:layout_marginTop="20dp"
-        android:contentDescription="@string/back"
-        android:background="@drawable/ripple"
-        android:onClick="Back"
-        android:src="@drawable/ic_back"
-        android:text="@string/back" />
-
-    <TextView
-        android:id="@+id/TitleText"
-        android:layout_width="wrap_content"
+    tools:context="com.sjapps.about.AboutActivity"
+    android:id="@+id/rootView"
+    >
+
+    <LinearLayout
+        android:id="@+id/topBar"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_marginStart="20dp"
-        android:layout_marginTop="20dp"
-        android:layout_toEndOf="@+id/BackBtn"
-        android:text="@string/about"
-        android:textColor="?colorOnBackground"
-        android:textSize="30sp" />
+        android:layout_marginTop="10dp"
+        android:gravity="center_vertical"
+        >
+
+        <ImageButton
+            android:id="@+id/BackBtn"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_marginStart="10dp"
+            android:contentDescription="@string/back"
+            android:background="@drawable/ripple"
+            android:onClick="Back"
+            android:src="@drawable/ic_back"
+
+            android:text="@string/back" />
+
+        <TextView
+            android:id="@+id/TitleText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:text="@string/about"
+            android:textStyle="bold"
+            android:textColor="?colorOnBackground"
+            android:textSize="30sp" />
+
+    </LinearLayout>
+
     <androidx.core.widget.NestedScrollView
         android:id="@+id/nestedList"
         android:layout_width="600dp"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/BackBtn"
+        android:layout_below="@+id/topBar"
         android:layout_marginTop="10dp"
         android:layout_centerHorizontal="true"
 
         >
         <RelativeLayout
+            android:id="@+id/scrollRL"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
diff --git a/app/src/main/res/layout/activity_log.xml b/app/src/main/res/layout/activity_log.xml
index 3f57632..524a76b 100644
--- a/app/src/main/res/layout/activity_log.xml
+++ b/app/src/main/res/layout/activity_log.xml
@@ -5,12 +5,15 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context="com.sjapps.logs.LogActivity">
+    tools:context="com.sjapps.logs.LogActivity"
+    android:id="@+id/rootView">
 
-    <RelativeLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-
+        android:layout_marginTop="10dp"
+        android:gravity="center_vertical"
+        android:weightSum="1"
         >
 
         <ImageButton
@@ -18,7 +21,7 @@
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:layout_marginStart="10dp"
-            android:layout_marginTop="10dp"
+
             android:background="@drawable/ripple"
             android:onClick="Back"
             android:src="@drawable/ic_back"
@@ -26,21 +29,17 @@
 
         <TextView
             android:id="@+id/TitleText"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:layout_marginStart="10dp"
-            android:layout_marginTop="10dp"
-            android:layout_toEndOf="@+id/BackBtn"
+            android:layout_marginHorizontal="10dp"
+            android:layout_weight="1"
             android:text="@string/crash_logs"
-            android:textSize="30dp"
+            android:textSize="30sp"
             android:textStyle="bold" />
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:layout_marginTop="10dp"
             android:layout_marginEnd="10dp"
             >
             <ImageButton
@@ -66,7 +65,7 @@
 
         </LinearLayout>
 
-    </RelativeLayout>
+    </LinearLayout>
 
 
     <ScrollView
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index b88b7d2..978157d 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -4,37 +4,47 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".SettingsActivity">
-
-    <ImageButton
-        android:id="@+id/BackBtn"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_marginStart="20dp"
-        android:layout_marginTop="20dp"
-        android:contentDescription="@string/back"
-        android:background="@drawable/ripple"
-        android:onClick="goBack"
-        android:src="@drawable/ic_back"
-        android:text="@string/back" />
-
-    <TextView
-        android:id="@+id/TitleText"
-        android:layout_width="wrap_content"
+    tools:context=".SettingsActivity"
+    android:id="@+id/rootView">
+
+
+    <LinearLayout
+        android:id="@+id/topBar"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_marginStart="20dp"
-        android:layout_marginTop="20dp"
-        android:layout_toEndOf="@+id/BackBtn"
-        android:text="@string/settings"
-        android:textColor="?colorOnBackground"
-        android:textSize="30sp" />
+        android:layout_marginTop="10dp"
+        android:gravity="center_vertical"
+        >
+
+        <ImageButton
+            android:id="@+id/BackBtn"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_marginStart="10dp"
+            android:contentDescription="@string/back"
+            android:background="@drawable/ripple"
+            android:onClick="goBack"
+            android:src="@drawable/ic_back"
+
+            android:text="@string/back" />
+
+        <TextView
+            android:id="@+id/TitleText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:text="@string/settings"
+            android:textStyle="bold"
+            android:textColor="?colorOnBackground"
+            android:textSize="30sp" />
+
+    </LinearLayout>
 
     <ScrollView
         android:id="@+id/mainSV"
         android:layout_width="600dp"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/TitleText"
+        android:layout_below="@+id/topBar"
         android:layout_centerHorizontal="true"
         android:layout_marginHorizontal="5dp"
         android:layout_marginTop="20dp">
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index d2ed08c..77b73e9 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -31,12 +31,14 @@
         <item name="materialButtonStyle">@style/ButtonColor</item>
 
         <item name="android:statusBarColor">?android:windowBackgroundFallback</item>
-        <item name="android:navigationBarColor">?android:windowBackgroundFallback</item>
+        <item name="android:navigationBarColor">?android:backdropColor</item>
         <item name="android:windowLayoutInDisplayCutoutMode" tools:targetApi="o_mr1">shortEdges</item>
         <item name="android:windowSplashScreenBackground" tools:targetApi="s">#000000</item>
         <item name="android:windowSplashScreenIconBackgroundColor" tools:targetApi="s">#000000</item>
         <item name="snackbarTextViewStyle">@style/SnackbarStyle</item>
         <item name="snackbarStyle">@style/SnackbarStyle</item>
+
+
     </style>
     <style name="ButtonColor" parent="@android:style/Widget.Button">
         <item name="android:background">@drawable/ripple_button</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 65b67e8..22d2314 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -30,7 +30,7 @@
         <item name="colorPrimaryInverse">@color/md_theme_light_primaryInverse</item>
 
         <item name="android:statusBarColor">?android:windowBackgroundFallback</item>
-        <item name="android:navigationBarColor">?android:windowBackgroundFallback</item>
+        <item name="android:navigationBarColor">?android:backdropColor</item>
         <item name="android:windowLayoutInDisplayCutoutMode" tools:targetApi="o_mr1">shortEdges</item>
         <item name="android:windowSplashScreenBackground" tools:targetApi="s">#ffffff</item>
         <item name="android:windowSplashScreenIconBackgroundColor" tools:targetApi="s">#ffffff</item>