diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 8544f6138..f73b7d022 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -520,7 +520,9 @@
     <codeStyleSettings language="XML">
       <option name="FORCE_REARRANGE_MODE" value="1" />
       <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
       </indentOptions>
       <arrangement>
         <rules>
diff --git a/app/src/main/res/layout/activity_editor.xml b/app/src/main/res/layout/activity_editor.xml
index 31ef1ae94..1fbef3ff0 100755
--- a/app/src/main/res/layout/activity_editor.xml
+++ b/app/src/main/res/layout/activity_editor.xml
@@ -1,102 +1,101 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.itsaky.androidide.views.InterceptableDrawerLayout 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/editor_drawerLayout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:animateLayoutChanges="true"
-    tools:ignore="DuplicateIncludedIds">
-
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
-        android:id="@+id/realContainer"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/editor_appBarLayout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$Behavior">
-
-            <com.google.android.material.appbar.MaterialToolbar
-                android:id="@+id/editor_toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/primaryDarkColor"
-                android:elevation="10dp" />
-
-            <com.google.android.material.progressindicator.LinearProgressIndicator
-                android:id="@+id/build_progress_indicator"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:indeterminate="true"
-                app:indicatorColor="@color/secondaryColor" />
-
-            <com.itsaky.androidide.views.MaterialBanner
-                android:id="@+id/syncBanner"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:visibility="gone" />
-
-            <com.google.android.material.tabs.TabLayout
-                android:id="@+id/tabs"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/file_tab_height"
-                android:background="@color/primaryDarkColor"
-                app:tabGravity="start"
-                app:tabIndicatorAnimationMode="elastic"
-                app:tabIndicatorColor="@color/secondaryColor"
-                app:tabIndicatorFullWidth="false"
-                app:tabIndicatorGravity="bottom"
-                app:tabIndicatorHeight="3dp"
-                app:tabMode="scrollable"
-                app:tabSelectedTextColor="@color/secondaryColor"
-                app:tabTextAppearance="@style/AppTheme.TabLayout.Title"
-                app:tabTextColor="@color/secondaryTextColor_light" />
-
-        </com.google.android.material.appbar.AppBarLayout>
-
-        <ViewFlipper
-            android:id="@+id/editor_container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginBottom="@dimen/editor_sheet_peek_height"
-            android:background="@color/content_background"
-            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
-
-        <include
-            android:id="@+id/bottom_sheet"
-            layout="@layout/layout_editor_bottom_sheet" />
-
-        <include
-            android:id="@+id/diagnosticInfo"
-            layout="@layout/layout_diagnostic_info" />
-
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
-
-    <com.google.android.material.navigation.NavigationView
-        android:id="@+id/startNav"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="start"
-        android:background="@color/primaryColor"
-        app:headerLayout="@layout/layout_nav_header"
-        app:menu="@menu/menu_editor_nav">
-
-    </com.google.android.material.navigation.NavigationView>
-
-    <com.google.android.material.navigation.NavigationView
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="end"
-        android:background="@color/primaryColor">
-
-        <FrameLayout
-            android:id="@+id/editor_frameLayout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-    </com.google.android.material.navigation.NavigationView>
-
-</com.itsaky.androidide.views.InterceptableDrawerLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<com.itsaky.androidide.views.InterceptableDrawerLayout 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/editor_drawerLayout"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:animateLayoutChanges="true"
+  tools:ignore="DuplicateIncludedIds"
+  tools:openDrawer="start">
+
+  <androidx.coordinatorlayout.widget.CoordinatorLayout
+    android:id="@+id/realContainer"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.google.android.material.appbar.AppBarLayout
+      android:id="@+id/editor_appBarLayout"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      app:layout_behavior="com.google.android.material.appbar.AppBarLayout$Behavior">
+
+      <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/editor_toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/primaryDarkColor"
+        android:elevation="10dp" />
+
+      <com.google.android.material.progressindicator.LinearProgressIndicator
+        android:id="@+id/build_progress_indicator"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:indeterminate="true"
+        app:indicatorColor="@color/secondaryColor" />
+
+      <com.itsaky.androidide.views.MaterialBanner
+        android:id="@+id/syncBanner"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone" />
+
+      <com.google.android.material.tabs.TabLayout
+        android:id="@+id/tabs"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/file_tab_height"
+        android:background="@color/primaryDarkColor"
+        app:tabGravity="start"
+        app:tabIndicatorAnimationMode="elastic"
+        app:tabIndicatorColor="@color/secondaryColor"
+        app:tabIndicatorFullWidth="false"
+        app:tabIndicatorGravity="bottom"
+        app:tabIndicatorHeight="3dp"
+        app:tabMode="scrollable"
+        app:tabSelectedTextColor="@color/secondaryColor"
+        app:tabTextAppearance="@style/AppTheme.TabLayout.Title"
+        app:tabTextColor="@color/secondaryTextColor_light" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <ViewFlipper
+      android:id="@+id/editor_container"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:layout_marginBottom="@dimen/editor_sheet_peek_height"
+      android:background="@color/content_background"
+      app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
+
+    <include
+      android:id="@+id/bottom_sheet"
+      layout="@layout/layout_editor_bottom_sheet" />
+
+    <include
+      android:id="@+id/diagnosticInfo"
+      layout="@layout/layout_diagnostic_info" />
+
+  </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+  <com.google.android.material.navigation.NavigationView
+    android:id="@+id/startNav"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_gravity="start"
+    app:headerLayout="@layout/layout_nav_header"
+    app:itemIconTint="@color/primaryIconColor"
+    app:itemTextColor="@color/primaryTextColor"
+    app:menu="@menu/menu_editor_nav" />
+
+  <com.google.android.material.navigation.NavigationView
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_gravity="end">
+
+    <FrameLayout
+      android:id="@+id/editor_frameLayout"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent" />
+
+  </com.google.android.material.navigation.NavigationView>
+
+</com.itsaky.androidide.views.InterceptableDrawerLayout>
diff --git a/app/src/main/res/layout/layout_editor_bottom_sheet.xml b/app/src/main/res/layout/layout_editor_bottom_sheet.xml
index 60ba7a14e..c9ddb2767 100644
--- a/app/src/main/res/layout/layout_editor_bottom_sheet.xml
+++ b/app/src/main/res/layout/layout_editor_bottom_sheet.xml
@@ -15,85 +15,83 @@
   ~   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
   -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  app:behavior_hideable="false"
+  app:behavior_peekHeight="@dimen/editor_sheet_peek_height"
+  app:layout_behavior="com.itsaky.androidide.utils.EditorBottomSheetBehavior">
+
+  <LinearLayout
+    android:id="@+id/text_container"
+    android:layout_width="match_parent"
+    android:layout_height="56dp"
+    android:layout_marginBottom="12dp"
+    android:background="@android:color/black"
+    android:orientation="vertical">
+
+    <TextView
+      android:id="@+id/statusText"
+      android:layout_width="match_parent"
+      android:layout_height="20dp"
+      android:gravity="center"
+      android:paddingStart="16dp"
+      android:paddingEnd="16dp"
+      android:singleLine="true"
+      android:textColor="@color/primaryTextColor"
+      android:textSize="14sp" />
+
+    <TextView
+      android:id="@+id/swipe_hint"
+      android:layout_width="match_parent"
+      android:layout_height="18dp"
+      android:gravity="center"
+      android:text="@string/msg_swipe_up"
+      android:textColor="@color/secondaryTextColor"
+      android:textSize="11sp" />
+
+  </LinearLayout>
+
+  <com.google.android.material.tabs.TabLayout
+    android:id="@+id/tabs"
+    android:layout_width="match_parent"
+    android:layout_height="36dp"
+    android:layout_below="@id/text_container"
+    android:background="@android:color/black"
+    app:tabGravity="fill"
+    app:tabIndicatorAnimationMode="elastic"
+    app:tabIndicatorColor="@color/secondaryColor"
+    app:tabIndicatorGravity="bottom"
+    app:tabIndicatorHeight="4dp"
+    app:tabMode="scrollable"
+    app:tabSelectedTextColor="@color/primaryTextColor"
+    app:tabTextAppearance="@style/AppTheme.TabLayout.Title" />
+
+  <androidx.viewpager2.widget.ViewPager2
+    android:id="@+id/pager"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_marginTop="16dp"
-    android:elevation="8dp"
-    android:orientation="vertical"
-    app:behavior_hideable="false"
-    app:behavior_peekHeight="@dimen/editor_sheet_peek_height"
-    app:layout_behavior="com.itsaky.androidide.utils.EditorBottomSheetBehavior">
+    android:layout_below="@id/tabs"
+    android:background="@color/content_background" />
 
-    <LinearLayout
-        android:id="@+id/text_container"
-        android:layout_width="match_parent"
-        android:layout_height="56dp"
-        android:background="@android:color/black"
-        android:orientation="vertical">
+  <com.google.android.material.floatingactionbutton.FloatingActionButton
+    android:id="@+id/clear_fab"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_alignParentEnd="true"
+    android:layout_alignParentBottom="true"
+    android:layout_margin="16dp"
+    android:src="@drawable/ic_close"
+    app:backgroundTint="@color/secondaryColor" />
 
-        <TextView
-            android:id="@+id/statusText"
-            android:layout_width="match_parent"
-            android:layout_height="20dp"
-            android:gravity="center"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp"
-            android:singleLine="true"
-            android:textColor="@color/primaryTextColor"
-            android:textSize="14sp" />
-
-        <TextView
-            android:id="@+id/swipe_hint"
-            android:layout_width="match_parent"
-            android:layout_height="18dp"
-            android:gravity="center"
-            android:text="@string/msg_swipe_up"
-            android:textColor="@color/secondaryTextColor"
-            android:textSize="11sp" />
-
-    </LinearLayout>
-
-    <com.google.android.material.tabs.TabLayout
-        android:id="@+id/tabs"
-        android:layout_width="match_parent"
-        android:layout_height="36dp"
-        android:layout_below="@id/text_container"
-        android:background="@android:color/black"
-        app:tabGravity="fill"
-        app:tabIndicatorAnimationMode="elastic"
-        app:tabIndicatorColor="@color/secondaryColor"
-        app:tabIndicatorGravity="bottom"
-        app:tabIndicatorHeight="4dp"
-        app:tabMode="scrollable"
-        app:tabSelectedTextColor="@color/primaryTextColor"
-        app:tabTextAppearance="@style/AppTheme.TabLayout.Title" />
-
-    <androidx.viewpager2.widget.ViewPager2
-        android:id="@+id/pager"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/tabs"
-        android:background="@color/content_background" />
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/clear_fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:layout_margin="16dp"
-        android:src="@drawable/ic_close"
-        app:backgroundTint="@color/secondaryColor" />
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/share_output_fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/clear_fab"
-        android:layout_alignParentEnd="true"
-        android:layout_margin="16dp"
-        android:src="@drawable/ic_share"
-        app:backgroundTint="@color/secondaryColor" />
+  <com.google.android.material.floatingactionbutton.FloatingActionButton
+    android:id="@+id/share_output_fab"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_above="@id/clear_fab"
+    android:layout_alignParentEnd="true"
+    android:layout_margin="16dp"
+    android:src="@drawable/ic_share"
+    app:backgroundTint="@color/secondaryColor" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 2cd4c5562..f183bc98e 100755
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -12,6 +12,7 @@
     <color name="secondaryTextColor">#70ffffff</color>
     <color name="secondaryTextColor_light">#50ffffff</color>
     <color name="primaryIconColor">#ffffff</color>
+    <color name="surfaceColor">#323232</color>
     <color name="completionList_background">#373737</color>
     <color name="completionList_backgroundSelected">#505050</color>
     <color name="symbolInput_background">#000000</color>
@@ -19,7 +20,7 @@
     <color name="tabAction_background">#ffffff</color>
     <color name="tabAction_text">@color/primaryLightColor</color>
     <color name="tabAction_icon">#000000</color>
-    <color name="rippleHighlightColor">#50121212</color>
+    <color name="rippleHighlightColor">#85121212</color>
     <color name="log_warning">#FF7043</color>
     <color name="diagnostic_error">@color/secondaryDarkColor</color>
     <color name="diagnostic_warning">@color/log_warning</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4aecf02c9..c23033bcd 100755
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,147 +1,145 @@
 <resources>
 
-    <style name="AppTheme" parent="Theme.Material3.Dark.NoActionBar">
-        <item name="actionOverflowButtonStyle">@style/AppTheme.Toolbar.OverflowButton</item>
-        <item name="colorPrimary">@color/primaryColor</item>
-        <item name="colorPrimaryDark">@color/primaryDarkColor</item>
-        <item name="colorAccent">@color/secondaryColor</item>
-        <item name="colorButtonNormal">@color/secondaryColor</item>
-        <item name="colorControlNormal">@color/secondaryColor</item>
-        <item name="colorControlHighlight">@color/rippleHighlightColor</item>
-        <item name="fontFamily">@font/josefin_sans</item>
-        <item name="hintTextColor">@color/secondaryColor</item>
-        <item name="shapeAppearanceLargeComponent">@style/AppTheme.ShapeOverlay.Large</item>
-        <item name="chipStyle">@style/AppTheme.UIDesigner.WidgetGroupChip</item>
-        <item name="windowActionModeOverlay">true</item>
-        <item name="windowActionBarOverlay">true</item>
-        <item name="android:colorButtonNormal">@color/secondaryColor</item>
-        <item name="android:textColorSecondary">@color/secondaryTextColor</item>
-        <item name="android:windowBackground">@color/content_background</item>
-        <item name="android:fontFamily">@font/josefin_sans</item>
-    </style>
+  <style name="AppTheme" parent="Theme.Material3.Dark.NoActionBar">
+    <item name="actionOverflowButtonStyle">@style/AppTheme.Toolbar.OverflowButton</item>
+    <item name="colorPrimary">@color/primaryColor</item>
+    <item name="colorPrimaryDark">@color/primaryDarkColor</item>
+    <item name="colorAccent">@color/secondaryColor</item>
+    <item name="colorSurface">@color/surfaceColor</item>
+    <item name="colorButtonNormal">@color/secondaryColor</item>
+    <item name="colorControlNormal">@color/secondaryColor</item>
+    <item name="colorControlHighlight">@color/rippleHighlightColor</item>
+    <item name="fontFamily">@font/josefin_sans</item>
+    <item name="hintTextColor">@color/secondaryColor</item>
+    <item name="shapeAppearanceLargeComponent">@style/AppTheme.ShapeOverlay.Large</item>
+    <item name="chipStyle">@style/AppTheme.UIDesigner.WidgetGroupChip</item>
+    <item name="windowActionModeOverlay">true</item>
+    <item name="windowActionBarOverlay">true</item>
+    <item name="android:colorButtonNormal">@color/secondaryColor</item>
+    <item name="android:textColorSecondary">@color/secondaryTextColor</item>
+    <item name="android:windowBackground">@color/content_background</item>
+    <item name="android:fontFamily">@font/josefin_sans</item>
+  </style>
 
-    <style name="AppTheme.UIDesigner.WidgetGroupChip" parent="Widget.Material3.Chip.Filter">
-        <item name="chipIconTint">@color/primaryIconColor</item>
-        <item name="chipBackgroundColor">@color/primaryColor</item>
-        <item name="chipStrokeColor">@color/secondaryColor</item>
-        <item name="chipStrokeWidth">1dp</item>
-    </style>
+  <style name="AppTheme.UIDesigner.WidgetGroupChip" parent="Widget.Material3.Chip.Filter">
+    <item name="chipIconTint">@color/primaryIconColor</item>
+    <item name="chipBackgroundColor">@color/primaryColor</item>
+    <item name="chipStrokeColor">@color/secondaryColor</item>
+    <item name="chipStrokeWidth">1dp</item>
+  </style>
 
-    <style name="AppTheme.Toolbar.OverflowButton" parent="@style/Widget.AppCompat.ActionButton.Overflow">
-        <item name="android:tint">@color/secondaryColor</item>
-    </style>
+  <style name="AppTheme.Toolbar.OverflowButton" parent="@style/Widget.AppCompat.ActionButton.Overflow">
+    <item name="android:tint">@color/secondaryColor</item>
+  </style>
 
-    <style name="AppTheme.MaterialToggleButton" parent="">
-        <item name="colorPrimary">@color/secondaryColor</item>
-    </style>
+  <style name="AppTheme.MaterialToggleButton" parent="">
+    <item name="colorPrimary">@color/secondaryColor</item>
+  </style>
 
-    <style name="AppTheme.TabLayout.Title" parent="TextAppearance.Design.Tab">
-        <item name="textAllCaps">false</item>
-        <item name="android:textAllCaps">false</item>
-    </style>
+  <style name="AppTheme.TabLayout.Title" parent="TextAppearance.Design.Tab">
+    <item name="textAllCaps">false</item>
+    <item name="android:textAllCaps">false</item>
+  </style>
 
-    <style name="AppTheme.ProjectCreator.TextInput" parent="Widget.Material3.TextInputLayout.FilledBox.Dense">
-        <item name="colorAccent">@color/primaryTextColor</item>
-        <item name="android:textColorHint">@color/secondaryTextColor</item>
-        <item name="colorControlActivated">@color/secondaryTextColor_light</item>
-    </style>
+  <style name="AppTheme.ProjectCreator.TextInput" parent="Widget.Material3.TextInputLayout.FilledBox.Dense">
+    <item name="colorAccent">@color/primaryTextColor</item>
+    <item name="android:textColorHint">@color/secondaryTextColor</item>
+    <item name="colorControlActivated">@color/secondaryTextColor_light</item>
+  </style>
 
-    <style name="AppTheme.ShapeOverlay.Large" parent="">
-        <item name="cornerFamily">rounded</item>
-        <item name="cornerSizeTopRight">16dp</item>
-        <item name="cornerSizeTopLeft">16dp</item>
-        <item name="cornerSizeBottomRight">0dp</item>
-        <item name="cornerSizeBottomLeft">0dp</item>
-    </style>
+  <style name="AppTheme.ShapeOverlay.Large" parent="">
+    <item name="cornerFamily">rounded</item>
+    <item name="cornerSizeTopRight">16dp</item>
+    <item name="cornerSizeTopLeft">16dp</item>
+    <item name="cornerSizeBottomRight">0dp</item>
+    <item name="cornerSizeBottomLeft">0dp</item>
+  </style>
 
-    <style name="AppTheme.ShapeAppearance.MainFragment.Logo" parent="">
-        <item name="cornerFamily">rounded</item>
-        <item name="cornerSize">25dp</item>
-    </style>
+  <style name="AppTheme.ShapeAppearance.MainFragment.Logo" parent="">
+    <item name="cornerFamily">rounded</item>
+    <item name="cornerSize">25dp</item>
+  </style>
 
-    <!-- Alert Dialog -->
-    <style name="AppTheme.MaterialAlertDialog" parent="@style/ThemeOverlay.Material3.MaterialAlertDialog">
-        <item name="shapeAppearanceOverlay">@style/MaterialDialog.ShapeAppearance</item>
-        <item name="materialAlertDialogTitleTextStyle">@style/MaterialDialog.Title.Text</item>
-        <item name="materialAlertDialogBodyTextStyle">@style/MaterialDialog.Body.Text</item>
-        <item name="buttonBarPositiveButtonStyle">@style/MaterialAlertDialog.PositiveButtonStyle
-        </item>
-        <item name="buttonBarNegativeButtonStyle">@style/MaterialAlertDialog.NegativeButtonStyle
-        </item>
-        <item name="buttonBarNeutralButtonStyle">@style/MaterialAlertDialog.NeutralButtonStyle
-        </item>
-        <item name="android:windowEnterAnimation">@animator/dialog_in</item>
-        <item name="android:windowExitAnimation">@animator/dialog_out</item>
-    </style>
+  <!-- Alert Dialog -->
+  <style name="AppTheme.MaterialAlertDialog" parent="@style/ThemeOverlay.Material3.MaterialAlertDialog">
+    <item name="shapeAppearanceOverlay">@style/MaterialDialog.ShapeAppearance</item>
+    <item name="materialAlertDialogTitleTextStyle">@style/MaterialDialog.Title.Text</item>
+    <item name="materialAlertDialogBodyTextStyle">@style/MaterialDialog.Body.Text</item>
+    <item name="buttonBarPositiveButtonStyle">@style/MaterialAlertDialog.PositiveButtonStyle</item>
+    <item name="buttonBarNegativeButtonStyle">@style/MaterialAlertDialog.NegativeButtonStyle</item>
+    <item name="buttonBarNeutralButtonStyle">@style/MaterialAlertDialog.NeutralButtonStyle</item>
+    <item name="android:windowEnterAnimation">@animator/dialog_in</item>
+    <item name="android:windowExitAnimation">@animator/dialog_out</item>
+  </style>
 
-    <style name="MaterialDialog.ShapeAppearance" parent="">
-        <item name="cornerSize">10dp</item>
-    </style>
+  <style name="MaterialDialog.ShapeAppearance" parent="">
+    <item name="cornerSize">28dp</item>
+  </style>
 
-    <style name="MaterialDialog.Title.Text" parent="@style/MaterialAlertDialog.Material3.Title.Text">
-        <item name="android:textColor">@color/primaryTextColor</item>
-        <item name="android:textStyle">bold</item>
-        <item name="fontFamily">@font/josefin_sans</item>
-    </style>
+  <style name="MaterialDialog.Title.Text" parent="@style/MaterialAlertDialog.Material3.Title.Text">
+    <item name="android:textColor">@color/primaryTextColor</item>
+    <item name="android:textStyle">bold</item>
+    <item name="fontFamily">@font/josefin_sans</item>
+  </style>
 
-    <style name="MaterialDialog.Body.Text" parent="@style/MaterialAlertDialog.Material3.Body.Text">
-        <item name="android:textColor">@color/primaryTextColor</item>
-        <item name="fontFamily">@font/josefin_sans</item>
-    </style>
+  <style name="MaterialDialog.Body.Text" parent="@style/MaterialAlertDialog.Material3.Body.Text">
+    <item name="android:textColor">@color/primaryTextColor</item>
+    <item name="fontFamily">@font/josefin_sans</item>
+  </style>
 
-    <style name="MaterialAlertDialog.PositiveButtonStyle" parent="@style/Widget.Material3.Button.TextButton.Dialog">
-        <item name="android:textColor">@color/secondaryColor</item>
-        <item name="backgroundTint">@android:color/transparent</item>
-        <item name="fontFamily">@font/josefin_sans</item>
-    </style>
+  <style name="MaterialAlertDialog.PositiveButtonStyle" parent="@style/Widget.Material3.Button.TextButton.Dialog">
+    <item name="android:textColor">@color/secondaryColor</item>
+    <item name="backgroundTint">@android:color/transparent</item>
+    <item name="fontFamily">@font/josefin_sans</item>
+  </style>
 
-    <style name="MaterialAlertDialog.NegativeButtonStyle" parent="@style/Widget.Material3.Button.TextButton.Dialog">
-        <item name="android:textColor">@color/secondaryColor</item>
-        <item name="backgroundTint">@android:color/transparent</item>
-        <item name="fontFamily">@font/josefin_sans</item>
-    </style>
+  <style name="MaterialAlertDialog.NegativeButtonStyle" parent="@style/Widget.Material3.Button.TextButton.Dialog">
+    <item name="android:textColor">@color/secondaryColor</item>
+    <item name="backgroundTint">@android:color/transparent</item>
+    <item name="fontFamily">@font/josefin_sans</item>
+  </style>
 
-    <style name="MaterialAlertDialog.NeutralButtonStyle" parent="@style/Widget.Material3.Button.TextButton.Dialog">
-        <item name="android:textColor">@color/secondaryColor</item>
-        <item name="backgroundTint">@android:color/transparent</item>
-        <item name="fontFamily">@font/josefin_sans</item>
-    </style>
+  <style name="MaterialAlertDialog.NeutralButtonStyle" parent="@style/Widget.Material3.Button.TextButton.Dialog">
+    <item name="android:textColor">@color/secondaryColor</item>
+    <item name="backgroundTint">@android:color/transparent</item>
+    <item name="fontFamily">@font/josefin_sans</item>
+  </style>
 
-    <style name="AppTheme.FilePicker" parent="Theme.Material3.DayNight.NoActionBar">
-        <item name="colorPrimary">@color/primaryDarkColor</item>
-        <item name="colorPrimaryDark">@color/primaryDarkColor</item>
-        <item name="colorAccent">@color/secondaryColor</item>
-        <item name="android:statusBarColor">@color/primaryDarkColor</item>
-        <item name="android:windowBackground">@color/content_background</item>
-        <item name="android:navigationBarColor">@color/primaryDarkColor</item>
-        <!-- textColorPrimary is for toolbar title text  -->
-        <item name="android:textColorPrimary">@color/primaryTextColor</item>
-        <!-- textColorSecondary is for toolbar action icons tint-->
-        <item name="android:textColorSecondary">@color/primaryIconColor</item>
-        <item name="unicorn.colorAccent">@color/secondaryColor</item>
-        <item name="unicorn.background">@color/content_background</item>
-        <item name="unicorn.secondaryTextColor">@color/secondaryTextColor</item>
-        <item name="unicorn.primaryTextColor">@color/primaryTextColor</item>
-        <item name="unicorn.file.heading">@color/primaryTextColor</item>
-        <item name="unicorn.file.subHeading">@color/primaryTextColorLight</item>
-        <item name="unicorn.file.iconTint">@color/primaryIconColor</item>
-        <item name="unicorn.file.arrowIconTint">@color/primaryIconColor</item>
-        <item name="unicorn.file.selectionTint">@color/secondaryLightColor</item>
-        <item name="unicorn.fabColor">@color/secondaryColor</item>
-    </style>
+  <style name="AppTheme.FilePicker" parent="Theme.Material3.DayNight.NoActionBar">
+    <item name="colorPrimary">@color/primaryDarkColor</item>
+    <item name="colorPrimaryDark">@color/primaryDarkColor</item>
+    <item name="colorAccent">@color/secondaryColor</item>
+    <item name="android:statusBarColor">@color/primaryDarkColor</item>
+    <item name="android:windowBackground">@color/content_background</item>
+    <item name="android:navigationBarColor">@color/primaryDarkColor</item>
+    <!-- textColorPrimary is for toolbar title text  -->
+    <item name="android:textColorPrimary">@color/primaryTextColor</item>
+    <!-- textColorSecondary is for toolbar action icons tint-->
+    <item name="android:textColorSecondary">@color/primaryIconColor</item>
+    <item name="unicorn.colorAccent">@color/secondaryColor</item>
+    <item name="unicorn.background">@color/content_background</item>
+    <item name="unicorn.secondaryTextColor">@color/secondaryTextColor</item>
+    <item name="unicorn.primaryTextColor">@color/primaryTextColor</item>
+    <item name="unicorn.file.heading">@color/primaryTextColor</item>
+    <item name="unicorn.file.subHeading">@color/primaryTextColorLight</item>
+    <item name="unicorn.file.iconTint">@color/primaryIconColor</item>
+    <item name="unicorn.file.arrowIconTint">@color/primaryIconColor</item>
+    <item name="unicorn.file.selectionTint">@color/secondaryLightColor</item>
+    <item name="unicorn.fabColor">@color/secondaryColor</item>
+  </style>
 
-    <style name="PopupAnimation">
-        <item name="android:windowEnterAnimation">@anim/popup_in</item>
-        <item name="android:windowExitAnimation">@anim/popup_out</item>
-    </style>
+  <style name="PopupAnimation">
+    <item name="android:windowEnterAnimation">@anim/popup_in</item>
+    <item name="android:windowExitAnimation">@anim/popup_out</item>
+  </style>
 
-    <style name="AppTheme.SheetAboveKeyboard" parent="Theme.Material3.Dark.BottomSheetDialog">
-        <item name="android:windowIsFloating">false</item>
-        <item name="android:windowSoftInputMode">adjustResize</item>
-    </style>
+  <style name="AppTheme.SheetAboveKeyboard" parent="Theme.Material3.Dark.BottomSheetDialog">
+    <item name="android:windowIsFloating">false</item>
+    <item name="android:windowSoftInputMode">adjustResize</item>
+  </style>
 
-    <style name="AppTheme.TextInputLayout.Outlined" parent="Widget.Material3.TextInputLayout.OutlinedBox">
-        <item name="hintTextColor">@color/secondaryColor</item>
-        <item name="boxStrokeColor">@color/text_input_box_stroke_selector</item>
-    </style>
+  <style name="AppTheme.TextInputLayout.Outlined" parent="Widget.Material3.TextInputLayout.OutlinedBox">
+    <item name="hintTextColor">@color/secondaryColor</item>
+    <item name="boxStrokeColor">@color/text_input_box_stroke_selector</item>
+  </style>
 </resources>
diff --git a/tests/test-home/.androidide/init/model.jar b/tests/test-home/.androidide/init/model.jar
index 7643fc7f1..3b35320b6 100644
Binary files a/tests/test-home/.androidide/init/model.jar and b/tests/test-home/.androidide/init/model.jar differ