diff --git a/app/src/main/java/com/vectras/qemu/MainSettingsManager.java b/app/src/main/java/com/vectras/qemu/MainSettingsManager.java
index bec234e..605f13c 100644
--- a/app/src/main/java/com/vectras/qemu/MainSettingsManager.java
+++ b/app/src/main/java/com/vectras/qemu/MainSettingsManager.java
@@ -30,6 +30,7 @@ import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.SwitchPreference;
 import androidx.preference.SwitchPreferenceCompat;
 
+import com.google.android.material.appbar.CollapsingToolbarLayout;
 import com.vectras.vm.AboutActivity;
 import com.vectras.vm.MainActivity;
 import com.vectras.vm.R;
@@ -108,7 +109,12 @@ public class MainSettingsManager extends AppCompatActivity
         @Override
         public void onResume() {
             super.onResume();
+            CollapsingToolbarLayout collapsingToolbarLayout =
+                    requireActivity().findViewById(R.id.collapsingToolbarLayout);
 
+            if (collapsingToolbarLayout != null) {
+                collapsingToolbarLayout.setSubtitle(getString(R.string.general));
+            }
         }
 
         @Override
@@ -122,7 +128,6 @@ public class MainSettingsManager extends AppCompatActivity
         public void onCreatePreferences(Bundle bundle, String root_key) {
             // Load the Preferences from the XML file
             setPreferencesFromResource(R.xml.headers_preference, root_key);
-
         }
 
         @Override
@@ -159,11 +164,40 @@ public class MainSettingsManager extends AppCompatActivity
             // Load the Preferences from the XML file
             setPreferencesFromResource(R.xml.settings, rootKey);
 
+            CollapsingToolbarLayout collapsingToolbarLayout =
+                    requireActivity().findViewById(R.id.collapsingToolbarLayout);
+
+            if (collapsingToolbarLayout != null) {
+                collapsingToolbarLayout.setSubtitle(getString(R.string.system));
+            }
+
             // Find the ListPreference and set the change listener
             ListPreference languagePref = findPreference("language");
             if (languagePref != null) {
                 languagePref.setOnPreferenceChangeListener(this);
             }
+
+            SwitchPreferenceCompat switchPreferenceCompat = findPreference("updateVersionPrompt");
+            assert switchPreferenceCompat != null;
+            SwitchPreferenceCompat switchJoinBetaChannel = findPreference("checkforupdatesfromthebetachannel");
+            assert switchJoinBetaChannel != null;
+
+            if (!switchPreferenceCompat.isChecked()) {
+                switchJoinBetaChannel.setEnabled(false);
+            }
+
+            switchPreferenceCompat.setOnPreferenceChangeListener((preference, newValue) -> {
+                if (!(Boolean) newValue) {
+                    if (switchJoinBetaChannel.isEnabled())
+                        switchJoinBetaChannel.setEnabled(false);
+                } else {
+                    if (!switchJoinBetaChannel.isEnabled())
+                        switchJoinBetaChannel.setEnabled(true);
+
+                }
+                return true;
+            });
+
         }
 
         @Override
@@ -200,15 +234,9 @@ public class MainSettingsManager extends AppCompatActivity
             mHandler = new Handler();
             Preference pref = findPreference("modeNight");
             if (pref != null) {
-                pref.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-
-                    @Override
-                    public boolean onPreferenceChange(@NonNull Preference preference,
-                                                      Object newValue) {
-                        onNightMode();
-                        return true;
-                    }
-
+                pref.setOnPreferenceChangeListener((preference, newValue) -> {
+                    onNightMode();
+                    return true;
                 });
             }
         }
@@ -243,7 +271,12 @@ public class MainSettingsManager extends AppCompatActivity
         public void onCreatePreferences(Bundle bundle, String root_key) {
             // Load the Preferences from the XML file
             setPreferencesFromResource(R.xml.userinterface, root_key);
+            CollapsingToolbarLayout collapsingToolbarLayout =
+                    requireActivity().findViewById(R.id.collapsingToolbarLayout);
 
+            if (collapsingToolbarLayout != null) {
+                collapsingToolbarLayout.setSubtitle(getString(R.string.personalization));
+            }
         }
 
         @Override
@@ -269,15 +302,9 @@ public class MainSettingsManager extends AppCompatActivity
 
             Preference pref = findPreference("vmArch");
             if (pref != null) {
-                pref.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-
-                    @Override
-                    public boolean onPreferenceChange(@NonNull Preference preference,
-                                                      Object newValue) {
-                        onArch();
-                        return true;
-                    }
-
+                pref.setOnPreferenceChangeListener((preference, newValue) -> {
+                    onArch();
+                    return true;
                 });
             }
 
@@ -307,26 +334,23 @@ public class MainSettingsManager extends AppCompatActivity
 
             SwitchPreferenceCompat useDefaultBiosPref = findPreference("useDefaultBios");
             assert useDefaultBiosPref != null;
-            useDefaultBiosPref.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-                @Override
-                public boolean onPreferenceChange(@NonNull Preference preference, Object newValue) {
-                    SwitchPreferenceCompat useUEFIPref = findPreference("useUEFI");
-                    assert useUEFIPref != null;
-                    if (!(Boolean) newValue) {
-                        if (getuseUEFI(getActivity())) {
-                            useUEFIPref.setChecked(false);
-                            setuseUEFI(getActivity(), false);
-                        }
-                        if (useUEFIPref.isEnabled()) {
-                            useUEFIPref.setEnabled(false);
-                        }
-                    } else {
-                        if (!useUEFIPref.isEnabled()) {
-                            useUEFIPref.setEnabled(true);
-                        }
+            useDefaultBiosPref.setOnPreferenceChangeListener((preference, newValue) -> {
+                SwitchPreferenceCompat useUEFIPref = findPreference("useUEFI");
+                assert useUEFIPref != null;
+                if (!(Boolean) newValue) {
+                    if (getuseUEFI(getActivity())) {
+                        useUEFIPref.setChecked(false);
+                        setuseUEFI(getActivity(), false);
+                    }
+                    if (useUEFIPref.isEnabled()) {
+                        useUEFIPref.setEnabled(false);
+                    }
+                } else {
+                    if (!useUEFIPref.isEnabled()) {
+                        useUEFIPref.setEnabled(true);
                     }
-                    return true;
                 }
+                return true;
             });
         }
 
@@ -360,6 +384,32 @@ public class MainSettingsManager extends AppCompatActivity
         public void onCreatePreferences(Bundle bundle, String root_key) {
             // Load the Preferences from the XML file
             setPreferencesFromResource(R.xml.qemu, root_key);
+            CollapsingToolbarLayout collapsingToolbarLayout =
+                    requireActivity().findViewById(R.id.collapsingToolbarLayout);
+
+            if (collapsingToolbarLayout != null) {
+                collapsingToolbarLayout.setSubtitle(getString(R.string.qemu));
+            }
+
+            SwitchPreferenceCompat customMemory = findPreference("customMemory");
+            assert customMemory != null;
+            EditTextPreference memory = findPreference("memory");
+            assert memory != null;
+
+            if (!customMemory.isChecked()) {
+                memory.setEnabled(false);
+            }
+            customMemory.setOnPreferenceChangeListener((preference, newValue) -> {
+                if (!(Boolean) newValue) {
+                    if (memory.isEnabled())
+                        memory.setEnabled(false);
+                } else {
+                    if (!memory.isEnabled())
+                        memory.setEnabled(true);
+
+                }
+                return true;
+            });
         }
 
         @Override
@@ -394,6 +444,12 @@ public class MainSettingsManager extends AppCompatActivity
         public void onCreatePreferences(Bundle bundle, String root_key) {
             // Load the Preferences from the XML file
             setPreferencesFromResource(R.xml.vnc, root_key);
+            CollapsingToolbarLayout collapsingToolbarLayout =
+                    requireActivity().findViewById(R.id.collapsingToolbarLayout);
+
+            if (collapsingToolbarLayout != null) {
+                collapsingToolbarLayout.setSubtitle(getString(R.string.vnc_server));
+            }
 
         }
 
diff --git a/app/src/main/java/com/vectras/vm/Minitools.java b/app/src/main/java/com/vectras/vm/Minitools.java
index c983c47..c523630 100644
--- a/app/src/main/java/com/vectras/vm/Minitools.java
+++ b/app/src/main/java/com/vectras/vm/Minitools.java
@@ -65,7 +65,7 @@ public class Minitools extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         EdgeToEdge.enable(this);
         setContentView(R.layout.activity_minitools);
-        UIUtils.setOnApplyWindowInsetsListener(findViewById(R.id.main));
+//        UIUtils.setOnApplyWindowInsetsListener(findViewById(R.id.main));
 
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
diff --git a/app/src/main/java/com/vectras/vm/x11/LoriePreferences.java b/app/src/main/java/com/vectras/vm/x11/LoriePreferences.java
index 9a9fd55..476ac25 100644
--- a/app/src/main/java/com/vectras/vm/x11/LoriePreferences.java
+++ b/app/src/main/java/com/vectras/vm/x11/LoriePreferences.java
@@ -45,6 +45,7 @@ import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.google.android.material.appbar.CollapsingToolbarLayout;
 import com.vectras.vm.x11.utils.KeyInterceptor;
 import com.vectras.vm.x11.utils.SamsungDexUtils;
 import com.vectras.vm.x11.utils.TermuxX11ExtraKeys;
@@ -133,6 +134,14 @@ public class LoriePreferences extends AppCompatActivity {
             }
 
             addPreferencesFromResource(R.xml.preferences);
+
+            //Set Subtitle for CollapsingToolbarLayout in MainSettingsManager
+            CollapsingToolbarLayout collapsingToolbarLayout =
+                    requireActivity().findViewById(R.id.collapsingToolbarLayout);
+
+            if (collapsingToolbarLayout != null) {
+                collapsingToolbarLayout.setSubtitle(getString(R.string.x11));
+            }
         }
 
         @SuppressWarnings("ConstantConditions")
diff --git a/app/src/main/res/drawable/object_shape_bottom.xml b/app/src/main/res/drawable/object_shape_bottom.xml
new file mode 100644
index 0000000..5f76ea7
--- /dev/null
+++ b/app/src/main/res/drawable/object_shape_bottom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?attr/colorControlHighlight">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="?attr/colorSurfaceContainer" />
+            <corners
+                android:bottomLeftRadius="18dp"
+                android:bottomRightRadius="18dp"
+                android:topLeftRadius="4dp"
+                android:topRightRadius="4dp" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/object_shape_inside_object_top.xml b/app/src/main/res/drawable/object_shape_inside_object_top.xml
new file mode 100644
index 0000000..933aa1b
--- /dev/null
+++ b/app/src/main/res/drawable/object_shape_inside_object_top.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?attr/colorControlHighlight">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="?attr/colorSurface" />
+            <corners
+                android:bottomLeftRadius="4dp"
+                android:bottomRightRadius="4dp"
+                android:topLeftRadius="18dp"
+                android:topRightRadius="18dp" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/object_shape_middle.xml b/app/src/main/res/drawable/object_shape_middle.xml
new file mode 100644
index 0000000..18c3ee9
--- /dev/null
+++ b/app/src/main/res/drawable/object_shape_middle.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?attr/colorControlHighlight">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="?attr/colorSurfaceContainer" />
+            <corners android:radius="4dp" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/object_shape_single.xml b/app/src/main/res/drawable/object_shape_single.xml
new file mode 100644
index 0000000..0905b47
--- /dev/null
+++ b/app/src/main/res/drawable/object_shape_single.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?attr/colorControlHighlight">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="?attr/colorSurfaceContainer" />
+            <corners android:radius="18dp" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/object_shape_top.xml b/app/src/main/res/drawable/object_shape_top.xml
new file mode 100644
index 0000000..373f64e
--- /dev/null
+++ b/app/src/main/res/drawable/object_shape_top.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?attr/colorControlHighlight">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="?attr/colorSurfaceContainer" />
+            <corners
+                android:bottomLeftRadius="4dp"
+                android:bottomRightRadius="4dp"
+                android:topLeftRadius="18dp"
+                android:topRightRadius="18dp" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_minitools.xml b/app/src/main/res/layout/activity_minitools.xml
index 549b926..fb5104b 100644
--- a/app/src/main/res/layout/activity_minitools.xml
+++ b/app/src/main/res/layout/activity_minitools.xml
@@ -1,200 +1,217 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    android:orientation="vertical"
     tools:context=".Minitools">
 
-    <LinearLayout
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appbar"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$Behavior">
 
-        <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/storeAppBar"
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+            style="?attr/collapsingToolbarLayoutLargeStyle"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
+            android:fitsSystemWindows="true"
+            app:collapsedTitleTextAppearance="@style/TextAppearance.Material3.TitleMedium"
+            app:expandedTitleTextAppearance="@style/TextAppearance.Material3.DisplaySmall"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed"
+            app:title="@string/mini_tools">
 
-            <androidx.appcompat.widget.Toolbar
+            <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize" />
+                android:layout_height="?attr/actionBarSize"
+                android:elevation="0dp"
+                app:layout_collapseMode="pin"
+                app:navigationIcon="@drawable/arrow_back_24px" />
 
-            <com.google.android.material.progressindicator.CircularProgressIndicator
-                android:id="@+id/loadingPb"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:indeterminate="true"
-                app:showAnimationBehavior="inward"
-                android:visibility="gone" />
-        </com.google.android.material.appbar.AppBarLayout>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
-        <ScrollView
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent" >
+            android:layout_height="wrap_content"
+            android:animateLayoutChanges="true"
+            android:orientation="vertical"
+            android:padding="8dp">
+
             <LinearLayout
+                android:id="@+id/mirror"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:animateLayoutChanges="true" >
+                android:background="@drawable/object_shape_top"
+                android:gravity="center_vertical"
+                android:paddingLeft="16dp"
+                android:paddingTop="2dp"
+                android:paddingRight="2dp"
+                android:paddingBottom="2dp">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/host_24px" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dp"
+                    android:layout_weight="1"
+                    android:text="@string/mirror" />
 
                 <LinearLayout
-                    android:layout_width="match_parent"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:paddingLeft="16dp"
-                    android:paddingRight="16dp"
-                    android:id="@+id/mirror"
-                    android:background="?android:attr/selectableItemBackground" >
+                    android:background="@drawable/object_shape_inside_object_top">
 
-                    <ImageView
+                    <Spinner
+                        android:id="@+id/spinnerselectmirror"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:src="@drawable/host_24px"/>
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/mirror"
-                        android:layout_marginLeft="8dp"
-                        android:layout_weight="1"/>
-
-                    <com.google.android.material.card.MaterialCardView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content">
-
-                        <Spinner
-                            android:id="@+id/spinnerselectmirror"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:spinnerMode="dialog"
-                            tools:listitem="@layout/simple_layout_for_spiner"/>
-                    </com.google.android.material.card.MaterialCardView>
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:padding="16dp"
-                    android:id="@+id/setupsoundfortermux"
-                    android:background="?android:attr/selectableItemBackground" >
-
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:src="@drawable/volume_up_24px"/>
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/setup_sound"
-                        android:layout_marginLeft="8dp"/>
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:padding="16dp"
-                    android:id="@+id/cleanup"
-                    android:background="?android:attr/selectableItemBackground" >
-
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:src="@drawable/cleaning_services_24px"/>
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/clean_up"
-                        android:layout_marginLeft="8dp"/>
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:padding="16dp"
-                    android:id="@+id/restore"
-                    android:background="?android:attr/selectableItemBackground" >
-
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:src="@drawable/settings_backup_restore_24px"/>
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/restore"
-                        android:layout_marginLeft="8dp"/>
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:padding="16dp"
-                    android:id="@+id/deleteallvm"
-                    android:background="?android:attr/selectableItemBackground" >
-
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:src="@drawable/delete_24px"/>
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/delete_all_vm"
-                        android:layout_marginLeft="8dp"/>
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:padding="16dp"
-                    android:id="@+id/deleteall"
-                    android:background="?android:attr/selectableItemBackground" >
-
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:src="@drawable/delete_forever_24px"/>
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/delete_all"
-                        android:layout_marginLeft="8dp"/>
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:padding="16dp"
-                    android:id="@+id/reinstallsystem"
-                    android:background="?android:attr/selectableItemBackground" >
-
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:src="@drawable/system_update_24px"/>
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/reinstall_system"
-                        android:layout_marginLeft="8dp"/>
+                        android:spinnerMode="dialog"
+                        tools:listitem="@layout/simple_layout_for_spiner" />
                 </LinearLayout>
             </LinearLayout>
-        </ScrollView>
-    </LinearLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+            <LinearLayout
+                android:id="@+id/setupsoundfortermux"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:background="@drawable/object_shape_middle"
+                android:gravity="center_vertical"
+                android:padding="16dp">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/volume_up_24px" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dp"
+                    android:text="@string/setup_sound" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/cleanup"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:background="@drawable/object_shape_middle"
+                android:gravity="center_vertical"
+                android:padding="16dp">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/cleaning_services_24px" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dp"
+                    android:text="@string/clean_up" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/restore"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:background="@drawable/object_shape_middle"
+                android:gravity="center_vertical"
+                android:padding="16dp">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/settings_backup_restore_24px" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dp"
+                    android:text="@string/restore" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/deleteallvm"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:background="@drawable/object_shape_middle"
+                android:gravity="center_vertical"
+                android:padding="16dp">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/delete_24px" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dp"
+                    android:text="@string/delete_all_vm" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/deleteall"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:background="@drawable/object_shape_middle"
+                android:gravity="center_vertical"
+                android:padding="16dp">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/delete_forever_24px" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dp"
+                    android:text="@string/delete_all" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/reinstallsystem"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:background="@drawable/object_shape_bottom"
+                android:gravity="center_vertical"
+                android:padding="16dp">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/system_update_24px" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dp"
+                    android:text="@string/reinstall_system" />
+            </LinearLayout>
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 97a9bd7..4afd724 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -9,12 +9,30 @@
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" >
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$Behavior">
 
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+            android:id="@+id/collapsingToolbarLayout"
+            style="?attr/collapsingToolbarLayoutLargeStyle"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"/>
+            android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
+            android:fitsSystemWindows="true"
+            app:collapsedTitleTextAppearance="@style/TextAppearance.Material3.TitleMedium"
+            app:expandedTitleTextAppearance="@style/TextAppearance.Material3.DisplaySmall"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed"
+            app:title="@string/settings">
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:elevation="0dp"
+                app:layout_collapseMode="pin"
+                app:navigationIcon="@drawable/arrow_back_24px" />
+
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
 
     <fragment
@@ -22,6 +40,8 @@
         android:name="com.vectras.qemu.MainSettingsManager$AppPreferencesFragment"
         class="com.vectras.qemu.MainSettingsManager$AppPreferencesFragment"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
 
-</LinearLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a06a482..45e08b9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -72,7 +72,7 @@
     <string name="linux" translatable="false">Linux</string>
     <string name="windows" translatable="false">Windows</string>
     <string name="apple" translatable="false">Apple</string>
-    <string name="external_vnc">EXTERNAL VNC</string>
+    <string name="external_vnc">External VNC</string>
     <string name="hosted_successfully">HOSTED SUCCESSFULLY!</string>
     <string name="ip" translatable="false">IP: 127.0.0.1:9</string>
     <string name="install_rom">Install Rom</string>
@@ -247,7 +247,7 @@
     <string name="vnc_ui_environment">vnc ui environment.</string>
     <string name="vm_arch">VM ARCH</string>
     <string name="cpu_model">CPU MODEL</string>
-    <string name="custom_memory">CUSTOM MEMORY</string>
+    <string name="custom_memory">Custom memory</string>
     <string name="memory_mb">MEMORY (MB)</string>
     <string name="sound_card">SOUND CARD</string>
     <string name="tb_size_kb">TB SIZE (KB)</string>
@@ -257,15 +257,15 @@
     <string name="kvm" translatable="false">KVM</string>
     <string name="cpu_cores">CPU CORES</string>
     <string name="harddisk_type">HARDDISK TYPE</string>
-    <string name="boot_from">BOOT FROM</string>
-    <string name="shared_folder">SHARED FOLDER</string>
-    <string name="custom_params">CUSTOM PARAMS</string>
+    <string name="boot_from">Boot from</string>
+    <string name="shared_folder">Shared folder</string>
+    <string name="custom_params">Custom params</string>
     <string name="vm_ui_environment">VM UI ENVIRONMENT</string>
     <string name="x11_resolution">X11 Resolution</string>
     <string name="mouse">MOUSE</string>
     <string name="check_for_software_updates_on_startup">CHECK FOR SOFTWARE UPDATES ON STARTUP</string>
     <string name="check_for_software_updates">CHECK FOR SOFTWARE UPDATES</string>
-    <string name="night_mode">NIGHT MODE</string>
+    <string name="night_mode">Night mode</string>
     <string name="description">Description</string>
     <string name="qemu_website">QEMU website</string>
     <string name="powerpc_qemu" translatable="false">PowerPC</string>
@@ -288,7 +288,7 @@
     <string name="instagram">Instagram</string>
     <string name="facebook">Facebook</string>
     <string name="change_log">Change Log</string>
-    <string name="language">LANGUAGE</string>
+    <string name="language">Language</string>
     <string name="set">SET</string>
     <string name="change_app_locale">CHANGE APP LOCALE</string>
     <string name="are_you_sure_you_want_to_shutdown_vm">Are you sure you want to shutdown vm? To leave this but keep everything running, tap and hold the Shut down button.</string>
@@ -409,7 +409,7 @@
     <string name="welcome_to_vectras_vm_lets_get_started">Welcome to Vectras VM. Let\'s get started!</string>
     <string name="processing_this_may_take_a_few_minutes">Processing...\nThis may take a few minutes.</string>
     <string name="check_for_updates_from_the_beta_channel">Check for updates from the Beta channel</string>
-    <string name="check_from_the_Beta_channel_instead_of_the_Stable_channel">Check from the Beta channel instead of the Stable channel</string>
+    <string name="check_from_the_Beta_channel_instead_of_the_Stable_channel">Check from the Beta channel instead of the Stable channel.</string>
     <string name="update">Update</string>
     <string name="new_version_is_now_available">New version is now available</string>
     <string name="ok">OK</string>
@@ -446,6 +446,25 @@
     <string name="seconds_left">seconds left</string>
     <string name="learn_more">Learn more</string>
     <string name="open">Open</string>
+    <string name="general">General</string>
+    <string name="personalization">Personalization</string>
+    <string name="system">System</string>
+    <string name="vnc_server">VNC Server</string>
+    <string name="system_settings_description">Language, check for updates and files.</string>
+    <string name="personalization_settings_description">Themes and user interface.</string>
+    <string name="qemu_settings_description">Settings for the emulator.</string>
+    <string name="vnc_settings_description">Using VNC Server for external.</string>
+    <string name="x11_settings_description">X11 user interface environment.</string>
+    <string name="automatically_check_for_updates">Automatically check for updates</string>
+    <string name="check_on_startup">Check on startup.</string>
+    <string name="join_the_beta_channel">Join the Beta channel</string>
+    <string name="you_will_receive_updates_to_experience_the_latest_features_early">You will receive updates to experience the latest features early.</string>
+    <string name="tap_here_to_select_language">Tap here to select language.</string>
+    <string name="memory">Memory</string>
+    <string name="memory_capacity_mb">Memory capacity (MB)</string>
+    <string name="hard_drive_interface">Hard drive interface</string>
+    <string name="ui_environment">UI environment</string>
+
 
     <!--======================TERMUX STRINGS====================-->
     <string name="application_name" translatable="false">Vterm</string>
diff --git a/app/src/main/res/xml/headers_preference.xml b/app/src/main/res/xml/headers_preference.xml
index 56d0ec5..8788bf7 100644
--- a/app/src/main/res/xml/headers_preference.xml
+++ b/app/src/main/res/xml/headers_preference.xml
@@ -5,31 +5,31 @@
     <Preference
         android:fragment="com.vectras.qemu.MainSettingsManager$AppPreferencesFragment"
         android:key="app"
-        android:summary="@string/main_app_settings"
-        android:title="@string/app_settings"
+        android:summary="@string/system_settings_description"
+        android:title="@string/system"
         app:iconSpaceReserved="false" />
     <Preference
         android:key="userinterface"
         android:fragment="com.vectras.qemu.MainSettingsManager$UserInterfacePreferencesFragment"
-        android:title="@string/user_interface"
-        android:summary="@string/themes_and_ui"
+        android:title="@string/personalization"
+        android:summary="@string/personalization_settings_description"
         app:iconSpaceReserved="false" />
     <Preference
         android:key="qemu"
         android:fragment="com.vectras.qemu.MainSettingsManager$QemuPreferencesFragment"
         android:title="@string/qemu"
-        android:summary="@string/emulation_settings"
+        android:summary="@string/qemu_settings_description"
         app:iconSpaceReserved="false" />
     <Preference
         android:key="vnc"
         android:fragment="com.vectras.qemu.MainSettingsManager$VncPreferencesFragment"
-        android:title="@string/vnc"
-        android:summary="@string/vnc_ui_environment"
+        android:title="@string/vnc_server"
+        android:summary="@string/vnc_settings_description"
         app:iconSpaceReserved="false" />
     <Preference
         android:key="x11"
         android:fragment="com.vectras.vm.x11.LoriePreferences$LoriePreferenceFragment"
         android:title="@string/x11"
-        android:summary="@string/x11_ui_environment"
+        android:summary="@string/x11_settings_description"
         app:iconSpaceReserved="false" />
 </PreferenceScreen>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 9096243..2ed6943 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -3,231 +3,272 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <PreferenceCategory
         android:key="output"
-        android:title="@string/settings_tag_output">
+        android:title="@string/settings_tag_output"
+        app:iconSpaceReserved="false">
         <ListPreference
             android:defaultValue="native"
             android:entries="@array/displayResolutionVariants"
             android:entryValues="@array/displayResolutionVariants"
             android:key="displayResolutionMode"
-            android:title="@string/settings_x11_display_resolution_mode" />
+            android:title="@string/settings_x11_display_resolution_mode"
+            app:iconSpaceReserved="false"/>
 
         <SeekBarPreference
             android:defaultValue="100"
             android:key="displayScale"
             android:max="200"
-            android:title="@string/settings_x11_display_scale" />
+            android:title="@string/settings_x11_display_scale"
+            app:iconSpaceReserved="false" />
 
         <ListPreference
             android:defaultValue="1280x1024"
             android:entries="@array/displayResolution"
             android:entryValues="@array/displayResolution"
             android:key="displayResolutionExact"
-            android:title="@string/settings_x11_display_resolution" />
+            android:title="@string/settings_x11_display_resolution"
+            app:iconSpaceReserved="false" />
 
         <EditTextPreference
             android:defaultValue="1280x1024"
             android:key="displayResolutionCustom"
             android:summary="Example: 1280x1024"
-            android:title="@string/settings_x11_display_resolution" />
+            android:title="@string/settings_x11_display_resolution"
+            app:iconSpaceReserved="false" />
 
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="displayStretch"
-            android:title="@string/settings_x11_stretch" />
+            android:title="@string/settings_x11_stretch"
+            app:iconSpaceReserved="false" />
 
         <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="Reseed"
             android:summary="@string/settings_x11_reseed_screen_summary"
-            android:title="@string/settings_x11_reseed_screen_title" />
+            android:title="@string/settings_x11_reseed_screen_title"
+            app:iconSpaceReserved="false" />
 
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="PIP"
             android:summary="@string/settings_x11_pip_summary"
-            android:title="@string/settings_x11_pip_title" />
+            android:title="@string/settings_x11_pip_title"
+            app:iconSpaceReserved="false" />
 
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="fullscreen"
             android:summary="@string/settings_x11_full_screen_summary"
-            android:title="@string/settings_x11_full_screen_title" />
+            android:title="@string/settings_x11_full_screen_title"
+            app:iconSpaceReserved="false" />
 
         <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="forceLandscape"
             android:title="Force landscape orientation"
-            app:isPreferenceVisible="false" />
+            app:isPreferenceVisible="false"
+            app:iconSpaceReserved="false" />
 
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="hideCutout"
-            android:title="@string/settings_x11_cutout" />
+            android:title="@string/settings_x11_cutout"
+            app:iconSpaceReserved="false" />
 
         <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="keepScreenOn"
-            android:title="@string/settings_x11_keep_screen_on" />
+            android:title="@string/settings_x11_keep_screen_on"
+            app:iconSpaceReserved="false" />
 
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="adjustHeightForEK"
             android:summary="@string/settings_x11_adjust_display_summary"
-            android:title="@string/settings_x11_adjust_display_title" />
+            android:title="@string/settings_x11_adjust_display_title"
+            app:iconSpaceReserved="false" />
     </PreferenceCategory>
     <PreferenceCategory
         android:key="pointer"
-        android:title="@string/settings_tag_point">
+        android:title="@string/settings_tag_point"
+        app:iconSpaceReserved="false" >
         <ListPreference
             android:defaultValue="1"
             android:entries="@array/touchscreenInputModesEntries"
             android:entryValues="@array/touchscreenInputModesValues"
             android:key="touchMode"
-            android:title="@string/settings_x11_touchscreen_input_mode" />
+            android:title="@string/settings_x11_touchscreen_input_mode"
+            app:iconSpaceReserved="false" />
 
         <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="scaleTouchpad"
-            android:title="@string/settings_x11_display_scale_factor_to_touchpad" />
+            android:title="@string/settings_x11_display_scale_factor_to_touchpad"
+            app:iconSpaceReserved="false" />
 
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="showStylusClickOverride"
             android:summary="@string/settings_x11_stylus_option_summary"
-            android:title="@string/settings_x11_stylus_option_title" />
+            android:title="@string/settings_x11_stylus_option_title"
+            app:iconSpaceReserved="false" />
 
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="showMouseHelper"
             android:summary="@string/settings_x11_mouse_overlay_summary"
-            android:title="@string/settings_x11_mouse_overlay_title" />
+            android:title="@string/settings_x11_mouse_overlay_title"
+            app:iconSpaceReserved="false" />
 
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="pointerCapture"
             android:summary="@string/settings_x11_capture_mouse_summary"
-            android:title="@string/settings_x11_capture_mouse_title" />
+            android:title="@string/settings_x11_capture_mouse_title"
+            app:iconSpaceReserved="false" />
 
         <ListPreference
             android:defaultValue="no"
             android:entries="@array/transformCapturedPointerEntries"
             android:entryValues="@array/transformCapturedPointerValues"
             android:key="transformCapturedPointer"
-            android:title="@string/settings_x11_capture_pointer_move" />
+            android:title="@string/settings_x11_capture_pointer_move"
+            app:iconSpaceReserved="false" />
 
         <SeekBarPreference
             android:defaultValue="100"
             android:key="capturedPointerSpeedFactor"
             android:max="200"
-            android:title="@string/settings_x11_capture_pointer_move_factor" />
+            android:title="@string/settings_x11_capture_pointer_move_factor"
+            app:iconSpaceReserved="false" />
 
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="tapToMove"
-            android:title="@string/settings_x11_tap_to_move" />
+            android:title="@string/settings_x11_tap_to_move"
+            app:iconSpaceReserved="false" />
     </PreferenceCategory>
     <PreferenceCategory
         android:key="kbd"
-        android:title="@string/settings_tag_keyboard">
+        android:title="@string/settings_tag_keyboard"
+        app:iconSpaceReserved="false" >
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="toggleIMEUsingBackKey"
             android:title="@string/settings_x11_back_toggle"
-            app:isPreferenceVisible="false" />
+            app:isPreferenceVisible="false"
+            app:iconSpaceReserved="false" />
 
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="showAdditionalKbd"
             android:summary="@string/settings_x11_ext_keyboard_summary"
             android:title="@string/settings_x11_ext_keyboard_title"
-            app:isPreferenceVisible="false" />
+            app:isPreferenceVisible="false"
+            app:iconSpaceReserved="false" />
 
         <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="captureVolumeKeys"
-            android:title="@string/settiongs_capture_volkey" />
+            android:title="@string/settiongs_capture_volkey"
+            app:iconSpaceReserved="false" />
 
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="hideEKOnVolDown"
             android:title="@string/settings_x11_hide_extkey_vol"
-            app:isPreferenceVisible="false" />
+            app:isPreferenceVisible="false"
+            app:iconSpaceReserved="false" />
 
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="useTermuxEKBarBehaviour"
             android:summary="@string/settings_x11_deact_speckey_summary"
-            android:title="@string/settings_x11_deact_speckey_title" />
+            android:title="@string/settings_x11_deact_speckey_title"
+            app:iconSpaceReserved="false" />
 
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="showIMEWhileExternalConnected"
             android:summary="@string/settings_x11_ime_with_hardkeyboard_summary"
-            android:title="@string/settings_x11_ime_with_hardkeyboard_title" />
+            android:title="@string/settings_x11_ime_with_hardkeyboard_title"
+            app:iconSpaceReserved="false" />
 
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="preferScancodes"
             android:summary="@string/settings_x11_prefer_scancode_summary"
-            android:title="@string/settings_x11_prefer_scancode_title" />
+            android:title="@string/settings_x11_prefer_scancode_title"
+            app:iconSpaceReserved="false" />
 
         <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="hardwareKbdScancodesWorkaround"
             android:summary="@string/settings_x11_fix_hard_keyboard_scancode_summary"
-            android:title="@string/settings_x11_fix_hard_keyboard_scancode_title" />
+            android:title="@string/settings_x11_fix_hard_keyboard_scancode_title"
+            app:iconSpaceReserved="false" />
 
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="dexMetaKeyCapture"
             android:summary="@string/settings_x11_full_screen_summary"
-            android:title="@string/settings_x11_full_screen_title" />
+            android:title="@string/settings_x11_full_screen_title"
+            app:iconSpaceReserved="false" />
 
         <Preference
             android:key="enableAccessibilityService"
             android:summary="@string/settings_x11_capture_shortcut_manually_summary"
-            android:title="@string/settings_x11_capture_shortcut_manually_title" />
+            android:title="@string/settings_x11_capture_shortcut_manually_title"
+            app:iconSpaceReserved="false" />
 
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="enableAccessibilityServiceAutomatically"
             android:summary="@string/settings_x11_auto_intercept_shortcut_summary"
-            android:title="@string/settings_x11_auto_intercept_shortcut_title" />
+            android:title="@string/settings_x11_auto_intercept_shortcut_title"
+            app:iconSpaceReserved="false" />
 
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="pauseKeyInterceptingWithEsc"
-            android:title="@string/settings_x11_intercepting_esc" />
+            android:title="@string/settings_x11_intercepting_esc"
+            app:iconSpaceReserved="false" />
 
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="filterOutWinkey"
             android:summary="@string/settings_x11_ignore_win_key_summary"
-            android:title="@string/settings_x11_ignore_win_key_title" />
+            android:title="@string/settings_x11_ignore_win_key_title"
+            app:iconSpaceReserved="false" />
 
         <SeekBarPreference
             android:defaultValue="100"
             android:key="opacityEKBar"
             android:max="100"
             android:title="@string/settings_x11_opacity_extra_keys_bar"
-            app:isPreferenceVisible="false" />
+            app:isPreferenceVisible="false"
+            app:iconSpaceReserved="false" />
 
         <Preference
             android:key="extra_keys_config"
             android:title="@string/settings_extra_keys_config"
-            app:isPreferenceVisible="false" />
+            app:isPreferenceVisible="false"
+            app:iconSpaceReserved="false" />
     </PreferenceCategory>
 
     <PreferenceCategory
         android:key="other"
-        android:title="@string/settings_tag_other">
+        android:title="@string/settings_tag_other"
+        app:iconSpaceReserved="false" >
         <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="clipboardEnable"
-            android:title="@string/settings_clipboard_sharing" />
+            android:title="@string/settings_clipboard_sharing"
+            app:iconSpaceReserved="false" />
 
         <Preference
             android:key="requestNotificationPermission"
-            android:title="Request notification permission" />
+            android:title="Request notification permission"
+            app:iconSpaceReserved="false" />
     </PreferenceCategory>
 </PreferenceScreen>
diff --git a/app/src/main/res/xml/qemu.xml b/app/src/main/res/xml/qemu.xml
index 38a35ec..8b56467 100644
--- a/app/src/main/res/xml/qemu.xml
+++ b/app/src/main/res/xml/qemu.xml
@@ -3,20 +3,20 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <PreferenceCategory
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:title="QEMU"
-        app:icon="@drawable/ic_qemu">
+        android:layout_height="wrap_content">
+<!--        android:title="QEMU"-->
+<!--        app:icon="@drawable/ic_qemu">-->
 
-        <ListPreference
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:defaultValue="X86_64"
-            android:entries="@array/vmArchLabels"
-            android:entryValues="@array/vmArchValues"
-            android:key="vmArch"
-            android:title="@string/vm_arch"
-            app:icon="@drawable/ic_arch"
-            app:useSimpleSummaryProvider="true" />
+<!--        <ListPreference-->
+<!--            android:layout_width="wrap_content"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:defaultValue="X86_64"-->
+<!--            android:entries="@array/vmArchLabels"-->
+<!--            android:entryValues="@array/vmArchValues"-->
+<!--            android:key="vmArch"-->
+<!--            android:title="@string/vm_arch"-->
+<!--            app:icon="@drawable/ic_arch"-->
+<!--            app:useSimpleSummaryProvider="true" />-->
 
         <SwitchPreferenceCompat
             android:layout_width="wrap_content"
@@ -33,7 +33,7 @@
             android:key="memory"
             android:selectAllOnFocus="true"
             android:singleLine="true"
-            android:title="@string/memory_mb"
+            android:title="@string/memory_capacity_mb"
             app:useSimpleSummaryProvider="true"
             app:icon="@drawable/round_memory_24" />
         <ListPreference
@@ -53,7 +53,7 @@
             android:defaultValue=""
             android:entries="@array/iftypeLabels"
             android:entryValues="@array/iftypeValues"
-            android:title="@string/harddisk_type"
+            android:title="@string/hard_drive_interface"
             android:key="ifType"
             app:useSimpleSummaryProvider="true"
             app:icon="@drawable/round_dns_24" />
@@ -127,7 +127,7 @@
     <PreferenceCategory
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:title="@string/vm_ui_environment"
+        android:title="@string/ui_environment"
         app:isPreferenceVisible="true"
         app:iconSpaceReserved="false">
 
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
index 0cd9ff6..bade35b 100644
--- a/app/src/main/res/xml/settings.xml
+++ b/app/src/main/res/xml/settings.xml
@@ -2,9 +2,9 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
     <PreferenceCategory
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:title="@string/app_settings"
-        app:icon="@drawable/round_settings_24">
+        android:layout_height="wrap_content">
+<!--        android:title="@string/app_settings"-->
+<!--        app:icon="@drawable/round_settings_24">-->
 
         <SwitchPreferenceCompat
             android:id="@+id/switchPreferenceCompat"
@@ -12,17 +12,18 @@
             android:layout_height="wrap_content"
             android:defaultValue="true"
             android:key="updateVersionPrompt"
-            android:summary="@string/check_for_software_updates_on_startup"
-            android:title="@string/check_for_software_updates"
+            android:summary="@string/check_on_startup"
+            android:title="@string/automatically_check_for_updates"
             app:icon="@drawable/round_update_24" />
 
         <SwitchPreferenceCompat
+            android:id="@+id/switchJoinBetaChannel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:defaultValue="false"
             android:key="checkforupdatesfromthebetachannel"
-            android:summary="@string/check_from_the_Beta_channel_instead_of_the_Stable_channel"
-            android:title="@string/check_for_updates_from_the_beta_channel"
+            android:summary="@string/you_will_receive_updates_to_experience_the_latest_features_early"
+            android:title="@string/join_the_beta_channel"
             app:icon="@drawable/science_24px" />
 
         <ListPreference
@@ -31,7 +32,7 @@
             android:entries="@array/languageLabels"
             android:entryValues="@array/languageValues"
             android:defaultValue="en"
-            android:summary="@string/change_app_locale"
+            android:summary="@string/tap_here_to_select_language"
             app:isPreferenceVisible="true"
             app:icon="@drawable/round_language_24" />
 
diff --git a/app/src/main/res/xml/userinterface.xml b/app/src/main/res/xml/userinterface.xml
index 2ecea4a..2f031e5 100644
--- a/app/src/main/res/xml/userinterface.xml
+++ b/app/src/main/res/xml/userinterface.xml
@@ -3,9 +3,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <PreferenceCategory
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:title="@string/user_interface"
-        app:iconSpaceReserved="false">
+        android:layout_height="wrap_content">
+<!--        android:title="@string/user_interface"-->
+<!--        app:iconSpaceReserved="false">-->
 
         <SwitchPreferenceCompat
             android:defaultValue="false"
diff --git a/app/src/main/res/xml/vnc.xml b/app/src/main/res/xml/vnc.xml
index 6b1fafd..93c22f9 100644
--- a/app/src/main/res/xml/vnc.xml
+++ b/app/src/main/res/xml/vnc.xml
@@ -3,9 +3,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <PreferenceCategory
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:title="VNC"
-        app:icon="@drawable/ic_vnc">
+        android:layout_height="wrap_content">
+<!--        android:title="VNC"-->
+<!--        app:icon="@drawable/ic_vnc">-->
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="vncExternal"
diff --git a/web/data/vroms-store.json b/web/data/vroms-store.json
index 66a910b..223d3e4 100644
--- a/web/data/vroms-store.json
+++ b/web/data/vroms-store.json
@@ -207,6 +207,19 @@
         "final_rom_file_name":"",
         "desc":"This Rom is from Nguyen Bao An Bui. You can get it on An Bui app: https://play.google.com/store/apps/details?id=com.anbui.app\n\nWindows 8 is a major release of the Windows NT operating system developed by Microsoft. It was released to manufacturing on August 1, 2012, made available for download via MSDN and TechNet on August 15, 2012, and generally released for retail on October 26, 2012."
     },
+    {
+        "rom_name":"Windows Server 2012 build 7788",
+        "rom_icon":"https://vuetiwuvbyxywfukompp.supabase.co/storage/v1/object/public/getmyos/v1/files/2018/09/17/windows-logo_1_926ed76111646acbbe332bc5af0cf2ce.png",
+        "rom_url":"https://youtu.be/N9fqaqLW5ow",
+        "rom_path":"Windows Server 2012 build 7788.cvbi",
+        "rom_avail":true,
+        "rom_size":"7 GB",
+        "rom_arch":"X86_64",
+        "rom_kernel":"windows",
+        "rom_extra":"",
+        "final_rom_file_name":"",
+        "desc":"This Rom is from Nguyen Bao An Bui. You can get it on An Bui app: https://play.google.com/store/apps/details?id=com.anbui.app\n\nWindows Server 2012 build 7904 is a build of Windows Server 2012, which was originally uploaded on 30 September 2021 as a free (retail) compile, while its checked (debug) compile was later shared on 3 November 2024 along with its client counterpart and public Symbol MSIs."
+    },
     {
         "rom_name":"Windows Server 2012 build 7904",
         "rom_icon":"https://vuetiwuvbyxywfukompp.supabase.co/storage/v1/object/public/getmyos/v1/files/2018/09/17/windows-logo_1_926ed76111646acbbe332bc5af0cf2ce.png",