diff --git a/app/src/main/java/com/block/web/builder/ui/activities/BaseActivity.java b/app/src/main/java/com/block/web/builder/ui/activities/BaseActivity.java
index 9dfcd56..f4065a4 100644
--- a/app/src/main/java/com/block/web/builder/ui/activities/BaseActivity.java
+++ b/app/src/main/java/com/block/web/builder/ui/activities/BaseActivity.java
@@ -1,11 +1,13 @@
 package com.block.web.builder.ui.activities;
 
 import android.os.Bundle;
+import androidx.activity.EdgeToEdge;
 import androidx.appcompat.app.AppCompatActivity;
 
 public class BaseActivity extends AppCompatActivity {
   @Override
   protected void onCreate(Bundle arg0) {
+    EdgeToEdge.enable(this);
     super.onCreate(arg0);
   }
 }
diff --git a/app/src/main/java/com/block/web/builder/ui/activities/MainActivity.java b/app/src/main/java/com/block/web/builder/ui/activities/MainActivity.java
index e9fd869..47c15b6 100644
--- a/app/src/main/java/com/block/web/builder/ui/activities/MainActivity.java
+++ b/app/src/main/java/com/block/web/builder/ui/activities/MainActivity.java
@@ -14,7 +14,6 @@
 import android.os.Environment;
 import android.provider.Settings;
 import android.view.View;
-import androidx.activity.EdgeToEdge;
 import androidx.annotation.CallSuper;
 import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.core.app.ActivityCompat;
@@ -53,8 +52,6 @@ public class MainActivity extends BaseActivity {
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
-    EdgeToEdge.enable(this);
-
     super.onCreate(savedInstanceState);
 
     // Inflate and get instance of binding.
diff --git a/app/src/main/java/com/block/web/builder/ui/dialogs/CreateProjectDialog.java b/app/src/main/java/com/block/web/builder/ui/dialogs/CreateProjectDialog.java
index 2e90edb..e751927 100644
--- a/app/src/main/java/com/block/web/builder/ui/dialogs/CreateProjectDialog.java
+++ b/app/src/main/java/com/block/web/builder/ui/dialogs/CreateProjectDialog.java
@@ -14,7 +14,6 @@
 import com.block.web.builder.listeners.ProjectCreationListener;
 import com.block.web.builder.objects.Project;
 import com.block.web.builder.ui.activities.MainActivity;
-import com.block.web.builder.utils.ColorUtils;
 import com.block.web.builder.utils.ProjectNameValidator;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
@@ -40,10 +39,7 @@ public CreateProjectDialog(
     this.activity = activity;
 
     MaterialAlertDialogBuilder dialog = new MaterialAlertDialogBuilder(activity);
-    dialog
-        .getBackground()
-        .setTint(
-            ColorUtils.getColor(activity, com.google.android.material.R.attr.colorSurfaceVariant));
+
     dialog.setTitle(activity.getString(R.string.create_new_project));
 
     LayoutCreateProjectBinding binding =
diff --git a/app/src/main/java/com/block/web/builder/ui/dialogs/blockeditor/AddTextInBlockDialog.java b/app/src/main/java/com/block/web/builder/ui/dialogs/blockeditor/AddTextInBlockDialog.java
index 913c1fb..ddba42e 100644
--- a/app/src/main/java/com/block/web/builder/ui/dialogs/blockeditor/AddTextInBlockDialog.java
+++ b/app/src/main/java/com/block/web/builder/ui/dialogs/blockeditor/AddTextInBlockDialog.java
@@ -6,7 +6,6 @@
 import com.block.web.builder.R;
 import com.block.web.builder.databinding.LayoutAddTextInBlockBinding;
 import com.block.web.builder.listeners.ValueListener;
-import com.block.web.builder.utils.ColorUtils;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 public class AddTextInBlockDialog extends MaterialAlertDialogBuilder {
@@ -18,9 +17,6 @@ public class AddTextInBlockDialog extends MaterialAlertDialogBuilder {
   public AddTextInBlockDialog(Activity activity, ValueListener listener) {
     super(activity);
     this.activity = activity;
-    getBackground()
-        .setTint(
-            ColorUtils.getColor(activity, com.google.android.material.R.attr.colorSurfaceVariant));
     binding = LayoutAddTextInBlockBinding.inflate(activity.getLayoutInflater());
     setTitle(R.string.enter_value);
     setView(binding.getRoot());
diff --git a/app/src/main/java/com/block/web/builder/ui/dialogs/blocksholder/CreateBlocksHolderDialog.java b/app/src/main/java/com/block/web/builder/ui/dialogs/blocksholder/CreateBlocksHolderDialog.java
index b1cfd14..2446d92 100644
--- a/app/src/main/java/com/block/web/builder/ui/dialogs/blocksholder/CreateBlocksHolderDialog.java
+++ b/app/src/main/java/com/block/web/builder/ui/dialogs/blocksholder/CreateBlocksHolderDialog.java
@@ -7,7 +7,6 @@
 import com.block.web.builder.databinding.LayoutNewBlocksHolderDialogBinding;
 import com.block.web.builder.listeners.BlocksHolderListener;
 import com.block.web.builder.core.BlocksHolder;
-import com.block.web.builder.utils.ColorUtils;
 import com.block.web.builder.utils.HexColorValidator;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import java.util.ArrayList;
@@ -20,9 +19,6 @@ public class CreateBlocksHolderDialog extends MaterialAlertDialogBuilder {
   public CreateBlocksHolderDialog(
       Activity activity, ArrayList<BlocksHolder> blocksHolderList, BlocksHolderListener listener) {
     super(activity);
-    getBackground()
-        .setTint(
-            ColorUtils.getColor(activity, com.google.android.material.R.attr.colorSurfaceVariant));
     setTitle(getContext().getString(R.string.create_new_blocks_holder));
     LayoutNewBlocksHolderDialogBinding binding =
         LayoutNewBlocksHolderDialogBinding.inflate(activity.getLayoutInflater());
diff --git a/app/src/main/java/com/block/web/builder/ui/dialogs/eventList/AddEventDialog.java b/app/src/main/java/com/block/web/builder/ui/dialogs/eventList/AddEventDialog.java
index 255be76..b9021c1 100644
--- a/app/src/main/java/com/block/web/builder/ui/dialogs/eventList/AddEventDialog.java
+++ b/app/src/main/java/com/block/web/builder/ui/dialogs/eventList/AddEventDialog.java
@@ -10,7 +10,6 @@
 import com.block.web.builder.core.WebFile;
 import com.block.web.builder.ui.activities.EventListActivity;
 import com.block.web.builder.ui.adapters.EventAdapter;
-import com.block.web.builder.utils.ColorUtils;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import java.util.ArrayList;
 
@@ -29,9 +28,6 @@ public AddEventDialog(
 
     LayoutAddEventDialogBinding binding =
         LayoutAddEventDialogBinding.inflate(mEventListActivity.getLayoutInflater());
-    getBackground()
-        .setTint(
-            ColorUtils.getColor(mEventListActivity, com.google.android.material.R.attr.colorSurfaceVariant));
     setTitle(R.string.add_events);
     setCancelable(false);
     setView(binding.getRoot());
diff --git a/app/src/main/java/com/block/web/builder/ui/dialogs/eventList/ShowSourceCodeDialog.java b/app/src/main/java/com/block/web/builder/ui/dialogs/eventList/ShowSourceCodeDialog.java
index 2242770..1ae1c5f 100644
--- a/app/src/main/java/com/block/web/builder/ui/dialogs/eventList/ShowSourceCodeDialog.java
+++ b/app/src/main/java/com/block/web/builder/ui/dialogs/eventList/ShowSourceCodeDialog.java
@@ -19,9 +19,6 @@ public ShowSourceCodeDialog(
     super(activity);
     LayoutSouceCodeDialogBinding binding =
         LayoutSouceCodeDialogBinding.inflate(activity.getLayoutInflater());
-    getBackground()
-        .setTint(
-            ColorUtils.getColor(activity, com.google.android.material.R.attr.colorSurfaceVariant));
     setTitle(R.string.source_code);
 
     if (useSoraEditor) {
diff --git a/app/src/main/java/com/block/web/builder/ui/dialogs/filemanager/CreateFileDialog.java b/app/src/main/java/com/block/web/builder/ui/dialogs/filemanager/CreateFileDialog.java
index 68e368d..8812f65 100644
--- a/app/src/main/java/com/block/web/builder/ui/dialogs/filemanager/CreateFileDialog.java
+++ b/app/src/main/java/com/block/web/builder/ui/dialogs/filemanager/CreateFileDialog.java
@@ -14,7 +14,6 @@
 import com.block.web.builder.core.WebFile;
 import com.block.web.builder.ui.activities.FileManagerActivity;
 import com.block.web.builder.ui.adapters.FileListAdapterItem;
-import com.block.web.builder.utils.ColorUtils;
 import com.block.web.builder.utils.FileNameValidator;
 import com.block.web.builder.utils.ProjectFileUtils;
 import com.google.android.material.button.MaterialButtonToggleGroup;
@@ -65,9 +64,6 @@ public void onFileCreationFailed(String error) {
             Toast.makeText(activity, error, Toast.LENGTH_SHORT).show();
           }
         };
-    getBackground()
-        .setTint(
-            ColorUtils.getColor(activity, com.google.android.material.R.attr.colorSurfaceVariant));
     setTitle(activity.getString(R.string.create_new_file));
     binding = LayoutNewFileDialogBinding.inflate(activity.getLayoutInflater());
     setView(binding.getRoot());
diff --git a/app/src/main/res/color/navigation_item_background_color.xml b/app/src/main/res/color/navigation_item_background_color.xml
new file mode 100644
index 0000000..39a08b0
--- /dev/null
+++ b/app/src/main/res/color/navigation_item_background_color.xml
@@ -0,0 +1,11 @@
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:alpha="@dimen/material_emphasis_disabled"
+        android:color="?attr/colorTertiaryContainer"
+        android:state_activated="true" />
+    <item
+        android:alpha="@dimen/material_emphasis_disabled"
+        android:color="?attr/colorTertiaryContainer"
+        android:state_checked="true" />
+    <item android:color="@android:color/transparent" />
+</selector>
diff --git a/app/src/main/res/color/navigation_item_color.xml b/app/src/main/res/color/navigation_item_color.xml
new file mode 100644
index 0000000..e7625e0
--- /dev/null
+++ b/app/src/main/res/color/navigation_item_color.xml
@@ -0,0 +1,10 @@
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:color="?attr/colorOnTertiaryContainer"
+        android:state_checked="true" />
+    <item
+        android:alpha="@dimen/material_emphasis_disabled"
+        android:color="?attr/colorOnSurface"
+        android:state_enabled="false" />
+    <item android:color="?attr/colorOnSurfaceVariant" />
+</selector>
diff --git a/app/src/main/res/layout-land/activity_event_editor.xml b/app/src/main/res/layout-land/activity_event_editor.xml
index 397eebe..375e4fa 100644
--- a/app/src/main/res/layout-land/activity_event_editor.xml
+++ b/app/src/main/res/layout-land/activity_event_editor.xml
@@ -3,7 +3,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent"
-    android:layout_width="match_parent">
+    android:layout_width="match_parent"
+    android:fitsSystemWindows="true">
 
     <LinearLayout
         android:layout_height="match_parent"
@@ -169,6 +170,6 @@
 
         </LinearLayout>
 
-        </LinearLayout>
+    </LinearLayout>
 
-    </FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/activity_block_editor.xml b/app/src/main/res/layout/activity_block_editor.xml
index ea7c98a..251cdcd 100644
--- a/app/src/main/res/layout/activity_block_editor.xml
+++ b/app/src/main/res/layout/activity_block_editor.xml
@@ -4,7 +4,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:fitsSystemWindows="true">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_block_manager.xml b/app/src/main/res/layout/activity_block_manager.xml
index e9b4687..f8ae927 100644
--- a/app/src/main/res/layout/activity_block_manager.xml
+++ b/app/src/main/res/layout/activity_block_manager.xml
@@ -4,7 +4,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:fitsSystemWindows="true">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_height="wrap_content"
@@ -16,6 +17,7 @@
             android:layout_height="?attr/actionBarSize"
             android:layout_width="match_parent"
             android:id="@+id/toolbar" />
+
     </com.google.android.material.appbar.AppBarLayout>
 
     <LinearLayout
@@ -37,6 +39,7 @@
                 android:layout_width="wrap_content"
                 android:indeterminate="true"
                 android:id="@+id/progressbar" />
+
         </LinearLayout>
 
         <LinearLayout
@@ -51,6 +54,7 @@
                 android:layout_width="wrap_content"
                 android:textColor="?attr/colorOnSurface"
                 android:id="@+id/tv_info" />
+
         </LinearLayout>
 
         <LinearLayout
@@ -63,6 +67,7 @@
                 android:layout_height="match_parent"
                 android:layout_width="match_parent"
                 android:id="@+id/list" />
+
         </LinearLayout>
 
     </LinearLayout>
@@ -75,4 +80,5 @@
         android:text="@string/new_block"
         android:id="@+id/fab"
         android:layout_gravity="end|bottom" />
+
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_blocks_holder_manager.xml b/app/src/main/res/layout/activity_blocks_holder_manager.xml
index 9225b60..cc84d31 100644
--- a/app/src/main/res/layout/activity_blocks_holder_manager.xml
+++ b/app/src/main/res/layout/activity_blocks_holder_manager.xml
@@ -4,7 +4,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:fitsSystemWindows="true">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_height="wrap_content"
@@ -16,6 +17,7 @@
             android:layout_height="?attr/actionBarSize"
             android:layout_width="match_parent"
             android:id="@+id/toolbar" />
+
     </com.google.android.material.appbar.AppBarLayout>
 
     <LinearLayout
@@ -37,6 +39,7 @@
                 android:layout_width="wrap_content"
                 android:indeterminate="true"
                 android:id="@+id/progressbar" />
+
         </LinearLayout>
 
         <LinearLayout
@@ -51,6 +54,7 @@
                 android:layout_width="wrap_content"
                 android:textColor="?attr/colorOnSurface"
                 android:id="@+id/tv_info" />
+
         </LinearLayout>
 
         <LinearLayout
@@ -63,6 +67,7 @@
                 android:layout_height="match_parent"
                 android:layout_width="match_parent"
                 android:id="@+id/list" />
+
         </LinearLayout>
 
     </LinearLayout>
@@ -75,4 +80,5 @@
         android:text="@string/new_blocks_holder"
         android:id="@+id/fab"
         android:layout_gravity="end|bottom" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_debug.xml b/app/src/main/res/layout/activity_debug.xml
index 714442b..58500d4 100644
--- a/app/src/main/res/layout/activity_debug.xml
+++ b/app/src/main/res/layout/activity_debug.xml
@@ -5,6 +5,7 @@
     android:layout_height="match_parent"
     android:layout_width="match_parent"
     android:background="?attr/colorSurface"
+    android:fitsSystemWindows="true"
     android:id="@+id/coordinator">
 
     <ScrollView
diff --git a/app/src/main/res/layout/activity_event_editor.xml b/app/src/main/res/layout/activity_event_editor.xml
index e35c97d..c7b9fcd 100644
--- a/app/src/main/res/layout/activity_event_editor.xml
+++ b/app/src/main/res/layout/activity_event_editor.xml
@@ -3,7 +3,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent"
-    android:layout_width="match_parent">
+    android:layout_width="match_parent"
+    android:fitsSystemWindows="true">
 
     <LinearLayout
         android:layout_height="match_parent"
@@ -171,4 +172,4 @@
 
     </LinearLayout>
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/activity_event_list.xml b/app/src/main/res/layout/activity_event_list.xml
index 5686c49..67324d8 100644
--- a/app/src/main/res/layout/activity_event_list.xml
+++ b/app/src/main/res/layout/activity_event_list.xml
@@ -4,7 +4,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:fitsSystemWindows="true">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_height="wrap_content"
@@ -16,6 +17,7 @@
             android:layout_height="?attr/actionBarSize"
             android:layout_width="match_parent"
             android:id="@+id/toolbar" />
+
     </com.google.android.material.appbar.AppBarLayout>
 
     <LinearLayout
@@ -37,6 +39,7 @@
                 android:layout_width="wrap_content"
                 android:indeterminate="true"
                 android:id="@+id/progressbar" />
+
         </LinearLayout>
 
         <LinearLayout
@@ -51,6 +54,7 @@
                 android:layout_width="wrap_content"
                 android:textColor="?attr/colorOnSurface"
                 android:id="@+id/tv_info" />
+
         </LinearLayout>
 
         <LinearLayout
@@ -63,6 +67,7 @@
                 android:layout_height="match_parent"
                 android:layout_width="match_parent"
                 android:id="@+id/list" />
+
         </LinearLayout>
 
     </LinearLayout>
@@ -75,4 +80,5 @@
         android:text="New Event"
         android:id="@+id/fab"
         android:layout_gravity="end|bottom" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_file_manager.xml b/app/src/main/res/layout/activity_file_manager.xml
index 5e7e07f..d3d35b2 100644
--- a/app/src/main/res/layout/activity_file_manager.xml
+++ b/app/src/main/res/layout/activity_file_manager.xml
@@ -4,7 +4,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:fitsSystemWindows="true">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_image_cropper.xml b/app/src/main/res/layout/activity_image_cropper.xml
index 73c4165..2f603a0 100644
--- a/app/src/main/res/layout/activity_image_cropper.xml
+++ b/app/src/main/res/layout/activity_image_cropper.xml
@@ -4,7 +4,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:fitsSystemWindows="true">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_height="wrap_content"
@@ -52,4 +53,4 @@
 
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_license.xml b/app/src/main/res/layout/activity_license.xml
index 551d2e1..e9dd716 100644
--- a/app/src/main/res/layout/activity_license.xml
+++ b/app/src/main/res/layout/activity_license.xml
@@ -4,7 +4,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:fitsSystemWindows="true">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_license_reader.xml b/app/src/main/res/layout/activity_license_reader.xml
index baccc4a..1476d94 100644
--- a/app/src/main/res/layout/activity_license_reader.xml
+++ b/app/src/main/res/layout/activity_license_reader.xml
@@ -4,7 +4,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:fitsSystemWindows="true">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml
index 612bd1e..2f10106 100644
--- a/app/src/main/res/layout/activity_setting.xml
+++ b/app/src/main/res/layout/activity_setting.xml
@@ -1,28 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout
-     xmlns:android="http://schemas.android.com/apk/res/android"
-     xmlns:app="http://schemas.android.com/apk/res-auto"
-     android:layout_height="match_parent"
-     android:layout_width="match_parent"
-     android:orientation="vertical">
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    android:orientation="vertical"
+    android:fitsSystemWindows="true">
 
     <com.google.android.material.appbar.AppBarLayout
-         android:layout_height="wrap_content"
-         android:layout_width="match_parent"
-         android:id="@+id/appbar">
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:id="@+id/appbar">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
-             android:layout_height="?attr/collapsingToolbarLayoutMediumSize"
-             android:layout_width="match_parent"
-             app:layout_scrollFlags="scroll|exitUntilCollapsed"
-             app:titleCollapseMode="scale"
-             android:id="@+id/collapsingToolbar">
+            android:layout_height="?attr/collapsingToolbarLayoutMediumSize"
+            android:layout_width="match_parent"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed"
+            app:titleCollapseMode="scale"
+            android:id="@+id/collapsingToolbar">
 
             <com.google.android.material.appbar.MaterialToolbar
-                 android:layout_height="?attr/actionBarSize"
-                 android:layout_width="match_parent"
-                 app:layout_collapseMode="pin"
-                 android:id="@+id/toolbar" />
+                android:layout_height="?attr/actionBarSize"
+                android:layout_width="match_parent"
+                app:layout_collapseMode="pin"
+                android:id="@+id/toolbar" />
 
         </com.google.android.material.appbar.CollapsingToolbarLayout>
 
@@ -34,13 +35,13 @@
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <LinearLayout
-             android:layout_height="match_parent"
-             android:layout_width="match_parent"
-             android:orientation="vertical"
-             android:id="@+id/contents">
+            android:layout_height="match_parent"
+            android:layout_width="match_parent"
+            android:orientation="vertical"
+            android:id="@+id/contents">
 
         </LinearLayout>
 
     </androidx.core.widget.NestedScrollView>
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_web_view.xml b/app/src/main/res/layout/activity_web_view.xml
index b3e0aac..1b2870e 100644
--- a/app/src/main/res/layout/activity_web_view.xml
+++ b/app/src/main/res/layout/activity_web_view.xml
@@ -5,6 +5,7 @@
     android:layout_height="match_parent"
     android:layout_width="match_parent"
     android:orientation="vertical"
+    android:fitsSystemWindows="true"
     android:id="@+id/root">
 
     <com.google.android.material.appbar.AppBarLayout
@@ -24,16 +25,16 @@
         android:layout_height="0dp"
         android:layout_width="match_parent"
         android:background="?attr/colorSurface"
-        android:layout_weight="1"
         android:orientation="vertical"
+        android:layout_weight="1"
         android:id="@+id/mainContainer">
 
         <ScrollView
             android:layout_height="100dp"
             android:layout_width="match_parent"
+            android:visibility="gone"
             android:background="?attr/colorSurface"
-            android:id="@+id/console_content"
-            android:visibility="gone">
+            android:id="@+id/console_content">
 
             <LinearLayout
                 android:layout_height="match_parent"
@@ -43,42 +44,46 @@
                 <EditText
                     android:layout_height="wrap_content"
                     android:layout_width="match_parent"
+                    android:imeOptions="actionDone"
                     android:background="?attr/colorSurface"
-                    android:textColor="?attr/colorOnSurface"
                     android:hint="Execute"
-                    android:id="@+id/execute"
-                    android:imeOptions="actionDone"
-                    android:singleLine="true" />
+                    android:textColor="?attr/colorOnSurface"
+                    android:singleLine="true"
+                    android:id="@+id/execute" />
 
                 <LinearLayout
-                    android:id="@+id/console"
                     android:layout_height="wrap_content"
                     android:layout_width="match_parent"
-                    android:orientation="vertical" />
+                    android:orientation="vertical"
+                    android:id="@+id/console">
+
+                </LinearLayout>
 
             </LinearLayout>
 
         </ScrollView>
 
         <View
-            android:visibility="gone"
-            android:id="@+id/console_slider"
             android:layout_height="5dp"
             android:layout_width="match_parent"
-            android:background="?attr/colorOnSurfaceVariant" />
+            android:visibility="gone"
+            android:background="?attr/colorOnSurfaceVariant"
+            android:id="@+id/console_slider" />
 
         <LinearLayout
-            android:layout_weight="1"
             android:layout_height="0dp"
-            android:layout_width="wrap_content">
+            android:layout_width="wrap_content"
+            android:layout_weight="1">
 
             <android.webkit.WebView
                 android:layout_height="match_parent"
                 android:layout_width="match_parent"
-                android:id="@+id/webview" />
+                android:id="@+id/webview">
+
+            </android.webkit.WebView>
 
         </LinearLayout>
 
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
new file mode 100644
index 0000000..c2a59a6
--- /dev/null
+++ b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,143 @@
+<resources>
+    <color name="md_theme_primary">#B1D18A</color>
+    <color name="md_theme_onPrimary">#1E3702</color>
+    <color name="md_theme_primaryContainer">#344E16</color>
+    <color name="md_theme_onPrimaryContainer">#CCEDA4</color>
+    <color name="md_theme_secondary">#BFCBAD</color>
+    <color name="md_theme_onSecondary">#2A331E</color>
+    <color name="md_theme_secondaryContainer">#404A33</color>
+    <color name="md_theme_onSecondaryContainer">#DBE7C8</color>
+    <color name="md_theme_tertiary">#A0CFCC</color>
+    <color name="md_theme_onTertiary">#003735</color>
+    <color name="md_theme_tertiaryContainer">#1F4E4B</color>
+    <color name="md_theme_onTertiaryContainer">#BBECE8</color>
+    <color name="md_theme_error">#FFB4AB</color>
+    <color name="md_theme_onError">#690005</color>
+    <color name="md_theme_errorContainer">#93000A</color>
+    <color name="md_theme_onErrorContainer">#FFDAD6</color>
+    <color name="md_theme_background">#12140E</color>
+    <color name="md_theme_onBackground">#E2E3D8</color>
+    <color name="md_theme_surface">#12140E</color>
+    <color name="md_theme_onSurface">#E2E3D8</color>
+    <color name="md_theme_surfaceVariant">#44483D</color>
+    <color name="md_theme_onSurfaceVariant">#C5C8BA</color>
+    <color name="md_theme_outline">#8E9285</color>
+    <color name="md_theme_outlineVariant">#44483D</color>
+    <color name="md_theme_scrim">#000000</color>
+    <color name="md_theme_inverseSurface">#E2E3D8</color>
+    <color name="md_theme_inverseOnSurface">#2F312A</color>
+    <color name="md_theme_inversePrimary">#4B662C</color>
+    <color name="md_theme_primaryFixed">#CCEDA4</color>
+    <color name="md_theme_onPrimaryFixed">#0F2000</color>
+    <color name="md_theme_primaryFixedDim">#B1D18A</color>
+    <color name="md_theme_onPrimaryFixedVariant">#344E16</color>
+    <color name="md_theme_secondaryFixed">#DBE7C8</color>
+    <color name="md_theme_onSecondaryFixed">#151E0B</color>
+    <color name="md_theme_secondaryFixedDim">#BFCBAD</color>
+    <color name="md_theme_onSecondaryFixedVariant">#404A33</color>
+    <color name="md_theme_tertiaryFixed">#BBECE8</color>
+    <color name="md_theme_onTertiaryFixed">#00201F</color>
+    <color name="md_theme_tertiaryFixedDim">#A0CFCC</color>
+    <color name="md_theme_onTertiaryFixedVariant">#1F4E4B</color>
+    <color name="md_theme_surfaceDim">#12140E</color>
+    <color name="md_theme_surfaceBright">#373A32</color>
+    <color name="md_theme_surfaceContainerLowest">#0C0F09</color>
+    <color name="md_theme_surfaceContainerLow">#1A1C16</color>
+    <color name="md_theme_surfaceContainer">#1E201A</color>
+    <color name="md_theme_surfaceContainerHigh">#282B24</color>
+    <color name="md_theme_surfaceContainerHighest">#33362E</color>
+    <color name="md_theme_primary_mediumContrast">#B5D58E</color>
+    <color name="md_theme_onPrimary_mediumContrast">#0B1A00</color>
+    <color name="md_theme_primaryContainer_mediumContrast">#7C9A59</color>
+    <color name="md_theme_onPrimaryContainer_mediumContrast">#000000</color>
+    <color name="md_theme_secondary_mediumContrast">#C3CFB1</color>
+    <color name="md_theme_onSecondary_mediumContrast">#101907</color>
+    <color name="md_theme_secondaryContainer_mediumContrast">#8A9579</color>
+    <color name="md_theme_onSecondaryContainer_mediumContrast">#000000</color>
+    <color name="md_theme_tertiary_mediumContrast">#A4D4D0</color>
+    <color name="md_theme_onTertiary_mediumContrast">#001A19</color>
+    <color name="md_theme_tertiaryContainer_mediumContrast">#6B9996</color>
+    <color name="md_theme_onTertiaryContainer_mediumContrast">#000000</color>
+    <color name="md_theme_error_mediumContrast">#FFBAB1</color>
+    <color name="md_theme_onError_mediumContrast">#370001</color>
+    <color name="md_theme_errorContainer_mediumContrast">#FF5449</color>
+    <color name="md_theme_onErrorContainer_mediumContrast">#000000</color>
+    <color name="md_theme_background_mediumContrast">#12140E</color>
+    <color name="md_theme_onBackground_mediumContrast">#E2E3D8</color>
+    <color name="md_theme_surface_mediumContrast">#12140E</color>
+    <color name="md_theme_onSurface_mediumContrast">#FBFCF0</color>
+    <color name="md_theme_surfaceVariant_mediumContrast">#44483D</color>
+    <color name="md_theme_onSurfaceVariant_mediumContrast">#C9CCBE</color>
+    <color name="md_theme_outline_mediumContrast">#A1A497</color>
+    <color name="md_theme_outlineVariant_mediumContrast">#818578</color>
+    <color name="md_theme_scrim_mediumContrast">#000000</color>
+    <color name="md_theme_inverseSurface_mediumContrast">#E2E3D8</color>
+    <color name="md_theme_inverseOnSurface_mediumContrast">#282B24</color>
+    <color name="md_theme_inversePrimary_mediumContrast">#354F17</color>
+    <color name="md_theme_primaryFixed_mediumContrast">#CCEDA4</color>
+    <color name="md_theme_onPrimaryFixed_mediumContrast">#081400</color>
+    <color name="md_theme_primaryFixedDim_mediumContrast">#B1D18A</color>
+    <color name="md_theme_onPrimaryFixedVariant_mediumContrast">#243D06</color>
+    <color name="md_theme_secondaryFixed_mediumContrast">#DBE7C8</color>
+    <color name="md_theme_onSecondaryFixed_mediumContrast">#0B1403</color>
+    <color name="md_theme_secondaryFixedDim_mediumContrast">#BFCBAD</color>
+    <color name="md_theme_onSecondaryFixedVariant_mediumContrast">#303924</color>
+    <color name="md_theme_tertiaryFixed_mediumContrast">#BBECE8</color>
+    <color name="md_theme_onTertiaryFixed_mediumContrast">#001413</color>
+    <color name="md_theme_tertiaryFixedDim_mediumContrast">#A0CFCC</color>
+    <color name="md_theme_onTertiaryFixedVariant_mediumContrast">#083D3B</color>
+    <color name="md_theme_surfaceDim_mediumContrast">#12140E</color>
+    <color name="md_theme_surfaceBright_mediumContrast">#373A32</color>
+    <color name="md_theme_surfaceContainerLowest_mediumContrast">#0C0F09</color>
+    <color name="md_theme_surfaceContainerLow_mediumContrast">#1A1C16</color>
+    <color name="md_theme_surfaceContainer_mediumContrast">#1E201A</color>
+    <color name="md_theme_surfaceContainerHigh_mediumContrast">#282B24</color>
+    <color name="md_theme_surfaceContainerHighest_mediumContrast">#33362E</color>
+    <color name="md_theme_primary_highContrast">#F4FFE0</color>
+    <color name="md_theme_onPrimary_highContrast">#000000</color>
+    <color name="md_theme_primaryContainer_highContrast">#B5D58E</color>
+    <color name="md_theme_onPrimaryContainer_highContrast">#000000</color>
+    <color name="md_theme_secondary_highContrast">#F4FFE0</color>
+    <color name="md_theme_onSecondary_highContrast">#000000</color>
+    <color name="md_theme_secondaryContainer_highContrast">#C3CFB1</color>
+    <color name="md_theme_onSecondaryContainer_highContrast">#000000</color>
+    <color name="md_theme_tertiary_highContrast">#EAFFFC</color>
+    <color name="md_theme_onTertiary_highContrast">#000000</color>
+    <color name="md_theme_tertiaryContainer_highContrast">#A4D4D0</color>
+    <color name="md_theme_onTertiaryContainer_highContrast">#000000</color>
+    <color name="md_theme_error_highContrast">#FFF9F9</color>
+    <color name="md_theme_onError_highContrast">#000000</color>
+    <color name="md_theme_errorContainer_highContrast">#FFBAB1</color>
+    <color name="md_theme_onErrorContainer_highContrast">#000000</color>
+    <color name="md_theme_background_highContrast">#12140E</color>
+    <color name="md_theme_onBackground_highContrast">#E2E3D8</color>
+    <color name="md_theme_surface_highContrast">#12140E</color>
+    <color name="md_theme_onSurface_highContrast">#FFFFFF</color>
+    <color name="md_theme_surfaceVariant_highContrast">#44483D</color>
+    <color name="md_theme_onSurfaceVariant_highContrast">#F9FCED</color>
+    <color name="md_theme_outline_highContrast">#C9CCBE</color>
+    <color name="md_theme_outlineVariant_highContrast">#C9CCBE</color>
+    <color name="md_theme_scrim_highContrast">#000000</color>
+    <color name="md_theme_inverseSurface_highContrast">#E2E3D8</color>
+    <color name="md_theme_inverseOnSurface_highContrast">#000000</color>
+    <color name="md_theme_inversePrimary_highContrast">#193000</color>
+    <color name="md_theme_primaryFixed_highContrast">#D0F2A8</color>
+    <color name="md_theme_onPrimaryFixed_highContrast">#000000</color>
+    <color name="md_theme_primaryFixedDim_highContrast">#B5D58E</color>
+    <color name="md_theme_onPrimaryFixedVariant_highContrast">#0B1A00</color>
+    <color name="md_theme_secondaryFixed_highContrast">#E0EBCC</color>
+    <color name="md_theme_onSecondaryFixed_highContrast">#000000</color>
+    <color name="md_theme_secondaryFixedDim_highContrast">#C3CFB1</color>
+    <color name="md_theme_onSecondaryFixedVariant_highContrast">#101907</color>
+    <color name="md_theme_tertiaryFixed_highContrast">#C0F0EC</color>
+    <color name="md_theme_onTertiaryFixed_highContrast">#000000</color>
+    <color name="md_theme_tertiaryFixedDim_highContrast">#A4D4D0</color>
+    <color name="md_theme_onTertiaryFixedVariant_highContrast">#001A19</color>
+    <color name="md_theme_surfaceDim_highContrast">#12140E</color>
+    <color name="md_theme_surfaceBright_highContrast">#373A32</color>
+    <color name="md_theme_surfaceContainerLowest_highContrast">#0C0F09</color>
+    <color name="md_theme_surfaceContainerLow_highContrast">#1A1C16</color>
+    <color name="md_theme_surfaceContainer_highContrast">#1E201A</color>
+    <color name="md_theme_surfaceContainerHigh_highContrast">#282B24</color>
+    <color name="md_theme_surfaceContainerHighest_highContrast">#33362E</color>
+</resources>
diff --git a/app/src/main/res/values-night/theme_overlays.xml b/app/src/main/res/values-night/theme_overlays.xml
new file mode 100644
index 0000000..02adac7
--- /dev/null
+++ b/app/src/main/res/values-night/theme_overlays.xml
@@ -0,0 +1,98 @@
+<resources>
+    <style name="ThemeOverlay.AppTheme.MediumContrast" parent="Theme.Material3.Dark.NoActionBar">
+        <item name="colorPrimary">@color/md_theme_primary_mediumContrast</item>
+        <item name="colorOnPrimary">@color/md_theme_onPrimary_mediumContrast</item>
+        <item name="colorPrimaryContainer">@color/md_theme_primaryContainer_mediumContrast</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer_mediumContrast</item>
+        <item name="colorSecondary">@color/md_theme_secondary_mediumContrast</item>
+        <item name="colorOnSecondary">@color/md_theme_onSecondary_mediumContrast</item>
+        <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer_mediumContrast</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer_mediumContrast</item>
+        <item name="colorTertiary">@color/md_theme_tertiary_mediumContrast</item>
+        <item name="colorOnTertiary">@color/md_theme_onTertiary_mediumContrast</item>
+        <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer_mediumContrast</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer_mediumContrast</item>
+        <item name="colorError">@color/md_theme_error_mediumContrast</item>
+        <item name="colorOnError">@color/md_theme_onError_mediumContrast</item>
+        <item name="colorErrorContainer">@color/md_theme_errorContainer_mediumContrast</item>
+        <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer_mediumContrast</item>
+        <item name="android:colorBackground">@color/md_theme_background_mediumContrast</item>
+        <item name="colorOnBackground">@color/md_theme_onBackground_mediumContrast</item>
+        <item name="colorSurface">@color/md_theme_surface_mediumContrast</item>
+        <item name="colorOnSurface">@color/md_theme_onSurface_mediumContrast</item>
+        <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant_mediumContrast</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant_mediumContrast</item>
+        <item name="colorOutline">@color/md_theme_outline_mediumContrast</item>
+        <item name="colorOutlineVariant">@color/md_theme_outlineVariant_mediumContrast</item>
+        <item name="colorSurfaceInverse">@color/md_theme_inverseSurface_mediumContrast</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface_mediumContrast</item>
+        <item name="colorPrimaryInverse">@color/md_theme_inversePrimary_mediumContrast</item>
+        <item name="colorPrimaryFixed">@color/md_theme_primaryFixed_mediumContrast</item>
+        <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed_mediumContrast</item>
+        <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim_mediumContrast</item>
+        <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant_mediumContrast</item>
+        <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed_mediumContrast</item>
+        <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed_mediumContrast</item>
+        <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim_mediumContrast</item>
+        <item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant_mediumContrast</item>
+        <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed_mediumContrast</item>
+        <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed_mediumContrast</item>
+        <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim_mediumContrast</item>
+        <item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant_mediumContrast</item>
+        <item name="colorSurfaceDim">@color/md_theme_surfaceDim_mediumContrast</item>
+        <item name="colorSurfaceBright">@color/md_theme_surfaceBright_mediumContrast</item>
+        <item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest_mediumContrast</item>
+        <item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow_mediumContrast</item>
+        <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer_mediumContrast</item>
+        <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh_mediumContrast</item>
+        <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest_mediumContrast</item>
+    </style>
+    <style name="ThemeOverlay.AppTheme.HighContrast" parent="Theme.Material3.Dark.NoActionBar">
+        <item name="colorPrimary">@color/md_theme_primary_highContrast</item>
+        <item name="colorOnPrimary">@color/md_theme_onPrimary_highContrast</item>
+        <item name="colorPrimaryContainer">@color/md_theme_primaryContainer_highContrast</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer_highContrast</item>
+        <item name="colorSecondary">@color/md_theme_secondary_highContrast</item>
+        <item name="colorOnSecondary">@color/md_theme_onSecondary_highContrast</item>
+        <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer_highContrast</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer_highContrast</item>
+        <item name="colorTertiary">@color/md_theme_tertiary_highContrast</item>
+        <item name="colorOnTertiary">@color/md_theme_onTertiary_highContrast</item>
+        <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer_highContrast</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer_highContrast</item>
+        <item name="colorError">@color/md_theme_error_highContrast</item>
+        <item name="colorOnError">@color/md_theme_onError_highContrast</item>
+        <item name="colorErrorContainer">@color/md_theme_errorContainer_highContrast</item>
+        <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer_highContrast</item>
+        <item name="android:colorBackground">@color/md_theme_background_highContrast</item>
+        <item name="colorOnBackground">@color/md_theme_onBackground_highContrast</item>
+        <item name="colorSurface">@color/md_theme_surface_highContrast</item>
+        <item name="colorOnSurface">@color/md_theme_onSurface_highContrast</item>
+        <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant_highContrast</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant_highContrast</item>
+        <item name="colorOutline">@color/md_theme_outline_highContrast</item>
+        <item name="colorOutlineVariant">@color/md_theme_outlineVariant_highContrast</item>
+        <item name="colorSurfaceInverse">@color/md_theme_inverseSurface_highContrast</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface_highContrast</item>
+        <item name="colorPrimaryInverse">@color/md_theme_inversePrimary_highContrast</item>
+        <item name="colorPrimaryFixed">@color/md_theme_primaryFixed_highContrast</item>
+        <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed_highContrast</item>
+        <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim_highContrast</item>
+        <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant_highContrast</item>
+        <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed_highContrast</item>
+        <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed_highContrast</item>
+        <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim_highContrast</item>
+        <item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant_highContrast</item>
+        <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed_highContrast</item>
+        <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed_highContrast</item>
+        <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim_highContrast</item>
+        <item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant_highContrast</item>
+        <item name="colorSurfaceDim">@color/md_theme_surfaceDim_highContrast</item>
+        <item name="colorSurfaceBright">@color/md_theme_surfaceBright_highContrast</item>
+        <item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest_highContrast</item>
+        <item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow_highContrast</item>
+        <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer_highContrast</item>
+        <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh_highContrast</item>
+        <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest_highContrast</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 6338fe1..221e24b 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,67 +1,52 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <style
-        name="AppTheme3"
+        name="AppTheme"
         parent="Theme.Material3.Dark.NoActionBar">
-        <item name="colorPrimary">@color/md_theme_dark_primary</item>
-        <item name="colorOnPrimary">@color/md_theme_dark_onPrimary</item>
-        <item name="colorPrimaryContainer">@color/md_theme_dark_primaryContainer</item>
-        <item name="colorOnPrimaryContainer">@color/md_theme_dark_onPrimaryContainer</item>
-        <item name="colorSecondary">@color/md_theme_dark_secondary</item>
-        <item name="colorOnSecondary">@color/md_theme_dark_onSecondary</item>
-        <item name="colorSecondaryContainer">@color/md_theme_dark_secondaryContainer</item>
-        <item name="colorOnSecondaryContainer">@color/md_theme_dark_onSecondaryContainer</item>
-        <item name="colorTertiary">@color/md_theme_dark_tertiary</item>
-        <item name="colorOnTertiary">@color/md_theme_dark_onTertiary</item>
-        <item name="colorTertiaryContainer">@color/md_theme_dark_tertiaryContainer</item>
-        <item name="colorOnTertiaryContainer">@color/md_theme_dark_onTertiaryContainer</item>
-        <item name="colorError">@color/md_theme_dark_error</item>
-        <item name="colorErrorContainer">@color/md_theme_dark_errorContainer</item>
-        <item name="colorOnError">@color/md_theme_dark_onError</item>
-        <item name="colorOnErrorContainer">@color/md_theme_dark_onErrorContainer</item>
-        <item name="android:colorBackground">@color/md_theme_dark_background</item>
-        <item name="colorOnBackground">@color/md_theme_dark_onBackground</item>
-        <item name="colorSurface">@color/md_theme_dark_surface</item>
-        <item name="colorOnSurface">@color/md_theme_dark_onSurface</item>
-        <item name="colorSurfaceVariant">@color/md_theme_dark_surfaceVariant</item>
-        <item name="colorOnSurfaceVariant">@color/md_theme_dark_onSurfaceVariant</item>
-        <item name="colorOutline">@color/md_theme_dark_outline</item>
-        <item name="colorOnSurfaceInverse">@color/md_theme_dark_inverseOnSurface</item>
-        <item name="colorSurfaceInverse">@color/md_theme_dark_inverseSurface</item>
-        <item name="colorPrimaryInverse">@color/md_theme_dark_inversePrimary</item>
-
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="android:statusBarColor">@color/md_theme_dark_surface</item>
-        <item
-            name="android:forceDarkAllowed"
-            tools:targetApi="q">false</item>
-
-        <item name="materialAlertDialogTheme">@style/DefaultMaterialAlertDialog</item>
-
-        <item name="android:windowSplashScreenBackground">@color/md_theme_dark_surface</item>
-        <item name="android:windowSplashScreenAnimatedIcon">@drawable/ic_launcher_background</item>
-        <item name="android:windowSplashScreenAnimationDuration">1000</item>
-        <item name="android:windowSplashScreenIconBackgroundColor">@color/md_theme_dark_surface</item>
-        <item name="android:windowSplashScreenBehavior">icon_preferred</item>
-    </style>
-
-    <style
-        name="DefaultMaterialAlertDialog"
-        parent="ThemeOverlay.Material3.MaterialAlertDialog">
-        <item name="colorPrimary">@color/md_theme_dark_primary</item>
-        <item name="colorSecondary">@color/md_theme_dark_secondary</item>
-        <item name="colorSurface">@color/md_theme_dark_surface</item>
-        <item name="colorOnSurface">@color/md_theme_dark_onSurface</item>
-    </style>
-
-    <style
-        name="MaterialAlertDialog.App.Title.Text"
-        parent="MaterialAlertDialog.Material3.Title.Text">
-        <item name="android:textColor">@color/md_theme_dark_onSurface</item>
-    </style>
-
-    <style
-        name="Widget.App.Button"
-        parent="Widget.Material3.Button.TextButton.Dialog">
-        <item name="android:textColor">@color/md_theme_dark_onSurface</item>
+        <item name="colorPrimary">@color/md_theme_primary</item>
+        <item name="colorOnPrimary">@color/md_theme_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/md_theme_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/md_theme_secondary</item>
+        <item name="colorOnSecondary">@color/md_theme_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/md_theme_tertiary</item>
+        <item name="colorOnTertiary">@color/md_theme_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer</item>
+        <item name="colorError">@color/md_theme_error</item>
+        <item name="colorOnError">@color/md_theme_onError</item>
+        <item name="colorErrorContainer">@color/md_theme_errorContainer</item>
+        <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer</item>
+        <item name="android:colorBackground">@color/md_theme_background</item>
+        <item name="colorOnBackground">@color/md_theme_onBackground</item>
+        <item name="colorSurface">@color/md_theme_surface</item>
+        <item name="colorOnSurface">@color/md_theme_onSurface</item>
+        <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant</item>
+        <item name="colorOutline">@color/md_theme_outline</item>
+        <item name="colorOutlineVariant">@color/md_theme_outlineVariant</item>
+        <item name="colorSurfaceInverse">@color/md_theme_inverseSurface</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface</item>
+        <item name="colorPrimaryInverse">@color/md_theme_inversePrimary</item>
+        <item name="colorPrimaryFixed">@color/md_theme_primaryFixed</item>
+        <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed</item>
+        <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim</item>
+        <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant</item>
+        <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed</item>
+        <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed</item>
+        <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim</item>
+        <item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant</item>
+        <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed</item>
+        <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed</item>
+        <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim</item>
+        <item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant</item>
+        <item name="colorSurfaceDim">@color/md_theme_surfaceDim</item>
+        <item name="colorSurfaceBright">@color/md_theme_surfaceBright</item>
+        <item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest</item>
+        <item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow</item>
+        <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer</item>
+        <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item>
+        <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 2f6e77c..946afaf 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,63 +1,143 @@
-<?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="md_theme_light_primary">#436915</color>
-    <color name="md_theme_light_onPrimary">#FFFFFF</color>
-    <color name="md_theme_light_primaryContainer">#C2F18D</color>
-    <color name="md_theme_light_onPrimaryContainer">#0F2000</color>
-    <color name="md_theme_light_secondary">#57624A</color>
-    <color name="md_theme_light_onSecondary">#FFFFFF</color>
-    <color name="md_theme_light_secondaryContainer">#DBE7C8</color>
-    <color name="md_theme_light_onSecondaryContainer">#151E0B</color>
-    <color name="md_theme_light_tertiary">#386663</color>
-    <color name="md_theme_light_onTertiary">#FFFFFF</color>
-    <color name="md_theme_light_tertiaryContainer">#BBECE8</color>
-    <color name="md_theme_light_onTertiaryContainer">#00201F</color>
-    <color name="md_theme_light_error">#BA1A1A</color>
-    <color name="md_theme_light_errorContainer">#FFDAD6</color>
-    <color name="md_theme_light_onError">#FFFFFF</color>
-    <color name="md_theme_light_onErrorContainer">#410002</color>
-    <color name="md_theme_light_background">#FDFCF5</color>
-    <color name="md_theme_light_onBackground">#1B1C18</color>
-    <color name="md_theme_light_surface">#FDFCF5</color>
-    <color name="md_theme_light_onSurface">#1B1C18</color>
-    <color name="md_theme_light_surfaceVariant">#E1E4D5</color>
-    <color name="md_theme_light_onSurfaceVariant">#44483D</color>
-    <color name="md_theme_light_outline">#75796C</color>
-    <color name="md_theme_light_inverseOnSurface">#F2F1E9</color>
-    <color name="md_theme_light_inverseSurface">#30312C</color>
-    <color name="md_theme_light_inversePrimary">#A7D474</color>
-    <color name="md_theme_light_shadow">#000000</color>
-    <color name="md_theme_light_surfaceTint">#436915</color>
-    <color name="md_theme_light_outlineVariant">#C5C8BA</color>
-    <color name="md_theme_light_scrim">#000000</color>
-    <color name="md_theme_dark_primary">#A7D474</color>
-    <color name="md_theme_dark_onPrimary">#1E3700</color>
-    <color name="md_theme_dark_primaryContainer">#2D5000</color>
-    <color name="md_theme_dark_onPrimaryContainer">#C2F18D</color>
-    <color name="md_theme_dark_secondary">#BFCBAD</color>
-    <color name="md_theme_dark_onSecondary">#2A331E</color>
-    <color name="md_theme_dark_secondaryContainer">#404A33</color>
-    <color name="md_theme_dark_onSecondaryContainer">#DBE7C8</color>
-    <color name="md_theme_dark_tertiary">#A0CFCC</color>
-    <color name="md_theme_dark_onTertiary">#003735</color>
-    <color name="md_theme_dark_tertiaryContainer">#1F4E4B</color>
-    <color name="md_theme_dark_onTertiaryContainer">#BBECE8</color>
-    <color name="md_theme_dark_error">#FFB4AB</color>
-    <color name="md_theme_dark_errorContainer">#93000A</color>
-    <color name="md_theme_dark_onError">#690005</color>
-    <color name="md_theme_dark_onErrorContainer">#FFDAD6</color>
-    <color name="md_theme_dark_background">#1B1C18</color>
-    <color name="md_theme_dark_onBackground">#E3E3DB</color>
-    <color name="md_theme_dark_surface">#1B1C18</color>
-    <color name="md_theme_dark_onSurface">#E3E3DB</color>
-    <color name="md_theme_dark_surfaceVariant">#44483D</color>
-    <color name="md_theme_dark_onSurfaceVariant">#C5C8BA</color>
-    <color name="md_theme_dark_outline">#8E9285</color>
-    <color name="md_theme_dark_inverseOnSurface">#1B1C18</color>
-    <color name="md_theme_dark_inverseSurface">#E3E3DB</color>
-    <color name="md_theme_dark_inversePrimary">#436915</color>
-    <color name="md_theme_dark_shadow">#000000</color>
-    <color name="md_theme_dark_surfaceTint">#A7D474</color>
-    <color name="md_theme_dark_outlineVariant">#44483D</color>
-    <color name="md_theme_dark_scrim">#000000</color>
+    <color name="md_theme_primary">#4B662C</color>
+    <color name="md_theme_onPrimary">#FFFFFF</color>
+    <color name="md_theme_primaryContainer">#CCEDA4</color>
+    <color name="md_theme_onPrimaryContainer">#0F2000</color>
+    <color name="md_theme_secondary">#57624A</color>
+    <color name="md_theme_onSecondary">#FFFFFF</color>
+    <color name="md_theme_secondaryContainer">#DBE7C8</color>
+    <color name="md_theme_onSecondaryContainer">#151E0B</color>
+    <color name="md_theme_tertiary">#386663</color>
+    <color name="md_theme_onTertiary">#FFFFFF</color>
+    <color name="md_theme_tertiaryContainer">#BBECE8</color>
+    <color name="md_theme_onTertiaryContainer">#00201F</color>
+    <color name="md_theme_error">#BA1A1A</color>
+    <color name="md_theme_onError">#FFFFFF</color>
+    <color name="md_theme_errorContainer">#FFDAD6</color>
+    <color name="md_theme_onErrorContainer">#410002</color>
+    <color name="md_theme_background">#F9FAEF</color>
+    <color name="md_theme_onBackground">#1A1C16</color>
+    <color name="md_theme_surface">#F9FAEF</color>
+    <color name="md_theme_onSurface">#1A1C16</color>
+    <color name="md_theme_surfaceVariant">#E1E4D5</color>
+    <color name="md_theme_onSurfaceVariant">#44483D</color>
+    <color name="md_theme_outline">#75796C</color>
+    <color name="md_theme_outlineVariant">#C5C8BA</color>
+    <color name="md_theme_scrim">#000000</color>
+    <color name="md_theme_inverseSurface">#2F312A</color>
+    <color name="md_theme_inverseOnSurface">#F0F2E6</color>
+    <color name="md_theme_inversePrimary">#B1D18A</color>
+    <color name="md_theme_primaryFixed">#CCEDA4</color>
+    <color name="md_theme_onPrimaryFixed">#0F2000</color>
+    <color name="md_theme_primaryFixedDim">#B1D18A</color>
+    <color name="md_theme_onPrimaryFixedVariant">#344E16</color>
+    <color name="md_theme_secondaryFixed">#DBE7C8</color>
+    <color name="md_theme_onSecondaryFixed">#151E0B</color>
+    <color name="md_theme_secondaryFixedDim">#BFCBAD</color>
+    <color name="md_theme_onSecondaryFixedVariant">#404A33</color>
+    <color name="md_theme_tertiaryFixed">#BBECE8</color>
+    <color name="md_theme_onTertiaryFixed">#00201F</color>
+    <color name="md_theme_tertiaryFixedDim">#A0CFCC</color>
+    <color name="md_theme_onTertiaryFixedVariant">#1F4E4B</color>
+    <color name="md_theme_surfaceDim">#D9DBD0</color>
+    <color name="md_theme_surfaceBright">#F9FAEF</color>
+    <color name="md_theme_surfaceContainerLowest">#FFFFFF</color>
+    <color name="md_theme_surfaceContainerLow">#F3F5E9</color>
+    <color name="md_theme_surfaceContainer">#EEEFE4</color>
+    <color name="md_theme_surfaceContainerHigh">#E8E9DE</color>
+    <color name="md_theme_surfaceContainerHighest">#E2E3D8</color>
+    <color name="md_theme_primary_mediumContrast">#304A13</color>
+    <color name="md_theme_onPrimary_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_primaryContainer_mediumContrast">#617D40</color>
+    <color name="md_theme_onPrimaryContainer_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_secondary_mediumContrast">#3C4630</color>
+    <color name="md_theme_onSecondary_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_secondaryContainer_mediumContrast">#6D785F</color>
+    <color name="md_theme_onSecondaryContainer_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_tertiary_mediumContrast">#1A4A47</color>
+    <color name="md_theme_onTertiary_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_tertiaryContainer_mediumContrast">#4F7D7A</color>
+    <color name="md_theme_onTertiaryContainer_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_error_mediumContrast">#8C0009</color>
+    <color name="md_theme_onError_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_errorContainer_mediumContrast">#DA342E</color>
+    <color name="md_theme_onErrorContainer_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_background_mediumContrast">#F9FAEF</color>
+    <color name="md_theme_onBackground_mediumContrast">#1A1C16</color>
+    <color name="md_theme_surface_mediumContrast">#F9FAEF</color>
+    <color name="md_theme_onSurface_mediumContrast">#1A1C16</color>
+    <color name="md_theme_surfaceVariant_mediumContrast">#E1E4D5</color>
+    <color name="md_theme_onSurfaceVariant_mediumContrast">#40443A</color>
+    <color name="md_theme_outline_mediumContrast">#5D6155</color>
+    <color name="md_theme_outlineVariant_mediumContrast">#787C70</color>
+    <color name="md_theme_scrim_mediumContrast">#000000</color>
+    <color name="md_theme_inverseSurface_mediumContrast">#2F312A</color>
+    <color name="md_theme_inverseOnSurface_mediumContrast">#F0F2E6</color>
+    <color name="md_theme_inversePrimary_mediumContrast">#B1D18A</color>
+    <color name="md_theme_primaryFixed_mediumContrast">#617D40</color>
+    <color name="md_theme_onPrimaryFixed_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_primaryFixedDim_mediumContrast">#49642A</color>
+    <color name="md_theme_onPrimaryFixedVariant_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_secondaryFixed_mediumContrast">#6D785F</color>
+    <color name="md_theme_onSecondaryFixed_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_secondaryFixedDim_mediumContrast">#555F47</color>
+    <color name="md_theme_onSecondaryFixedVariant_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_tertiaryFixed_mediumContrast">#4F7D7A</color>
+    <color name="md_theme_onTertiaryFixed_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_tertiaryFixedDim_mediumContrast">#366461</color>
+    <color name="md_theme_onTertiaryFixedVariant_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_surfaceDim_mediumContrast">#D9DBD0</color>
+    <color name="md_theme_surfaceBright_mediumContrast">#F9FAEF</color>
+    <color name="md_theme_surfaceContainerLowest_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_surfaceContainerLow_mediumContrast">#F3F5E9</color>
+    <color name="md_theme_surfaceContainer_mediumContrast">#EEEFE4</color>
+    <color name="md_theme_surfaceContainerHigh_mediumContrast">#E8E9DE</color>
+    <color name="md_theme_surfaceContainerHighest_mediumContrast">#E2E3D8</color>
+    <color name="md_theme_primary_highContrast">#142700</color>
+    <color name="md_theme_onPrimary_highContrast">#FFFFFF</color>
+    <color name="md_theme_primaryContainer_highContrast">#304A13</color>
+    <color name="md_theme_onPrimaryContainer_highContrast">#FFFFFF</color>
+    <color name="md_theme_secondary_highContrast">#1C2511</color>
+    <color name="md_theme_onSecondary_highContrast">#FFFFFF</color>
+    <color name="md_theme_secondaryContainer_highContrast">#3C4630</color>
+    <color name="md_theme_onSecondaryContainer_highContrast">#FFFFFF</color>
+    <color name="md_theme_tertiary_highContrast">#002726</color>
+    <color name="md_theme_onTertiary_highContrast">#FFFFFF</color>
+    <color name="md_theme_tertiaryContainer_highContrast">#1A4A47</color>
+    <color name="md_theme_onTertiaryContainer_highContrast">#FFFFFF</color>
+    <color name="md_theme_error_highContrast">#4E0002</color>
+    <color name="md_theme_onError_highContrast">#FFFFFF</color>
+    <color name="md_theme_errorContainer_highContrast">#8C0009</color>
+    <color name="md_theme_onErrorContainer_highContrast">#FFFFFF</color>
+    <color name="md_theme_background_highContrast">#F9FAEF</color>
+    <color name="md_theme_onBackground_highContrast">#1A1C16</color>
+    <color name="md_theme_surface_highContrast">#F9FAEF</color>
+    <color name="md_theme_onSurface_highContrast">#000000</color>
+    <color name="md_theme_surfaceVariant_highContrast">#E1E4D5</color>
+    <color name="md_theme_onSurfaceVariant_highContrast">#21251C</color>
+    <color name="md_theme_outline_highContrast">#40443A</color>
+    <color name="md_theme_outlineVariant_highContrast">#40443A</color>
+    <color name="md_theme_scrim_highContrast">#000000</color>
+    <color name="md_theme_inverseSurface_highContrast">#2F312A</color>
+    <color name="md_theme_inverseOnSurface_highContrast">#FFFFFF</color>
+    <color name="md_theme_inversePrimary_highContrast">#D6F7AD</color>
+    <color name="md_theme_primaryFixed_highContrast">#304A13</color>
+    <color name="md_theme_onPrimaryFixed_highContrast">#FFFFFF</color>
+    <color name="md_theme_primaryFixedDim_highContrast">#1B3300</color>
+    <color name="md_theme_onPrimaryFixedVariant_highContrast">#FFFFFF</color>
+    <color name="md_theme_secondaryFixed_highContrast">#3C4630</color>
+    <color name="md_theme_onSecondaryFixed_highContrast">#FFFFFF</color>
+    <color name="md_theme_secondaryFixedDim_highContrast">#26301B</color>
+    <color name="md_theme_onSecondaryFixedVariant_highContrast">#FFFFFF</color>
+    <color name="md_theme_tertiaryFixed_highContrast">#1A4A47</color>
+    <color name="md_theme_onTertiaryFixed_highContrast">#FFFFFF</color>
+    <color name="md_theme_tertiaryFixedDim_highContrast">#003331</color>
+    <color name="md_theme_onTertiaryFixedVariant_highContrast">#FFFFFF</color>
+    <color name="md_theme_surfaceDim_highContrast">#D9DBD0</color>
+    <color name="md_theme_surfaceBright_highContrast">#F9FAEF</color>
+    <color name="md_theme_surfaceContainerLowest_highContrast">#FFFFFF</color>
+    <color name="md_theme_surfaceContainerLow_highContrast">#F3F5E9</color>
+    <color name="md_theme_surfaceContainer_highContrast">#EEEFE4</color>
+    <color name="md_theme_surfaceContainerHigh_highContrast">#E8E9DE</color>
+    <color name="md_theme_surfaceContainerHighest_highContrast">#E2E3D8</color>
 </resources>
diff --git a/app/src/main/res/values/theme_overlays.xml b/app/src/main/res/values/theme_overlays.xml
new file mode 100644
index 0000000..e81f18f
--- /dev/null
+++ b/app/src/main/res/values/theme_overlays.xml
@@ -0,0 +1,98 @@
+<resources>
+    <style name="ThemeOverlay.AppTheme.MediumContrast" parent="Theme.Material3.Light.NoActionBar">
+        <item name="colorPrimary">@color/md_theme_primary_mediumContrast</item>
+        <item name="colorOnPrimary">@color/md_theme_onPrimary_mediumContrast</item>
+        <item name="colorPrimaryContainer">@color/md_theme_primaryContainer_mediumContrast</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer_mediumContrast</item>
+        <item name="colorSecondary">@color/md_theme_secondary_mediumContrast</item>
+        <item name="colorOnSecondary">@color/md_theme_onSecondary_mediumContrast</item>
+        <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer_mediumContrast</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer_mediumContrast</item>
+        <item name="colorTertiary">@color/md_theme_tertiary_mediumContrast</item>
+        <item name="colorOnTertiary">@color/md_theme_onTertiary_mediumContrast</item>
+        <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer_mediumContrast</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer_mediumContrast</item>
+        <item name="colorError">@color/md_theme_error_mediumContrast</item>
+        <item name="colorOnError">@color/md_theme_onError_mediumContrast</item>
+        <item name="colorErrorContainer">@color/md_theme_errorContainer_mediumContrast</item>
+        <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer_mediumContrast</item>
+        <item name="android:colorBackground">@color/md_theme_background_mediumContrast</item>
+        <item name="colorOnBackground">@color/md_theme_onBackground_mediumContrast</item>
+        <item name="colorSurface">@color/md_theme_surface_mediumContrast</item>
+        <item name="colorOnSurface">@color/md_theme_onSurface_mediumContrast</item>
+        <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant_mediumContrast</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant_mediumContrast</item>
+        <item name="colorOutline">@color/md_theme_outline_mediumContrast</item>
+        <item name="colorOutlineVariant">@color/md_theme_outlineVariant_mediumContrast</item>
+        <item name="colorSurfaceInverse">@color/md_theme_inverseSurface_mediumContrast</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface_mediumContrast</item>
+        <item name="colorPrimaryInverse">@color/md_theme_inversePrimary_mediumContrast</item>
+        <item name="colorPrimaryFixed">@color/md_theme_primaryFixed_mediumContrast</item>
+        <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed_mediumContrast</item>
+        <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim_mediumContrast</item>
+        <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant_mediumContrast</item>
+        <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed_mediumContrast</item>
+        <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed_mediumContrast</item>
+        <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim_mediumContrast</item>
+        <item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant_mediumContrast</item>
+        <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed_mediumContrast</item>
+        <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed_mediumContrast</item>
+        <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim_mediumContrast</item>
+        <item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant_mediumContrast</item>
+        <item name="colorSurfaceDim">@color/md_theme_surfaceDim_mediumContrast</item>
+        <item name="colorSurfaceBright">@color/md_theme_surfaceBright_mediumContrast</item>
+        <item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest_mediumContrast</item>
+        <item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow_mediumContrast</item>
+        <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer_mediumContrast</item>
+        <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh_mediumContrast</item>
+        <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest_mediumContrast</item>
+    </style>
+    <style name="ThemeOverlay.AppTheme.HighContrast" parent="Theme.Material3.Light.NoActionBar">
+        <item name="colorPrimary">@color/md_theme_primary_highContrast</item>
+        <item name="colorOnPrimary">@color/md_theme_onPrimary_highContrast</item>
+        <item name="colorPrimaryContainer">@color/md_theme_primaryContainer_highContrast</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer_highContrast</item>
+        <item name="colorSecondary">@color/md_theme_secondary_highContrast</item>
+        <item name="colorOnSecondary">@color/md_theme_onSecondary_highContrast</item>
+        <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer_highContrast</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer_highContrast</item>
+        <item name="colorTertiary">@color/md_theme_tertiary_highContrast</item>
+        <item name="colorOnTertiary">@color/md_theme_onTertiary_highContrast</item>
+        <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer_highContrast</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer_highContrast</item>
+        <item name="colorError">@color/md_theme_error_highContrast</item>
+        <item name="colorOnError">@color/md_theme_onError_highContrast</item>
+        <item name="colorErrorContainer">@color/md_theme_errorContainer_highContrast</item>
+        <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer_highContrast</item>
+        <item name="android:colorBackground">@color/md_theme_background_highContrast</item>
+        <item name="colorOnBackground">@color/md_theme_onBackground_highContrast</item>
+        <item name="colorSurface">@color/md_theme_surface_highContrast</item>
+        <item name="colorOnSurface">@color/md_theme_onSurface_highContrast</item>
+        <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant_highContrast</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant_highContrast</item>
+        <item name="colorOutline">@color/md_theme_outline_highContrast</item>
+        <item name="colorOutlineVariant">@color/md_theme_outlineVariant_highContrast</item>
+        <item name="colorSurfaceInverse">@color/md_theme_inverseSurface_highContrast</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface_highContrast</item>
+        <item name="colorPrimaryInverse">@color/md_theme_inversePrimary_highContrast</item>
+        <item name="colorPrimaryFixed">@color/md_theme_primaryFixed_highContrast</item>
+        <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed_highContrast</item>
+        <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim_highContrast</item>
+        <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant_highContrast</item>
+        <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed_highContrast</item>
+        <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed_highContrast</item>
+        <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim_highContrast</item>
+        <item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant_highContrast</item>
+        <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed_highContrast</item>
+        <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed_highContrast</item>
+        <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim_highContrast</item>
+        <item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant_highContrast</item>
+        <item name="colorSurfaceDim">@color/md_theme_surfaceDim_highContrast</item>
+        <item name="colorSurfaceBright">@color/md_theme_surfaceBright_highContrast</item>
+        <item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest_highContrast</item>
+        <item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow_highContrast</item>
+        <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer_highContrast</item>
+        <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh_highContrast</item>
+        <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest_highContrast</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index d221ee4..0b7e299 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -4,70 +4,52 @@
     <style
         name="AppTheme"
         parent="Theme.Material3.Light.NoActionBar">
-        <item name="colorPrimary">@color/md_theme_light_primary</item>
-        <item name="colorOnPrimary">@color/md_theme_light_onPrimary</item>
-        <item name="colorPrimaryContainer">@color/md_theme_light_primaryContainer</item>
-        <item name="colorOnPrimaryContainer">@color/md_theme_light_onPrimaryContainer</item>
-        <item name="colorSecondary">@color/md_theme_light_secondary</item>
-        <item name="colorOnSecondary">@color/md_theme_light_onSecondary</item>
-        <item name="colorSecondaryContainer">@color/md_theme_light_secondaryContainer</item>
-        <item name="colorOnSecondaryContainer">@color/md_theme_light_onSecondaryContainer</item>
-        <item name="colorTertiary">@color/md_theme_light_tertiary</item>
-        <item name="colorOnTertiary">@color/md_theme_light_onTertiary</item>
-        <item name="colorTertiaryContainer">@color/md_theme_light_tertiaryContainer</item>
-        <item name="colorOnTertiaryContainer">@color/md_theme_light_onTertiaryContainer</item>
-        <item name="colorError">@color/md_theme_light_error</item>
-        <item name="colorErrorContainer">@color/md_theme_light_errorContainer</item>
-        <item name="colorOnError">@color/md_theme_light_onError</item>
-        <item name="colorOnErrorContainer">@color/md_theme_light_onErrorContainer</item>
-        <item name="android:colorBackground">@color/md_theme_light_background</item>
-        <item name="colorOnBackground">@color/md_theme_light_onBackground</item>
-        <item name="colorSurface">@color/md_theme_light_surface</item>
-        <item name="colorOnSurface">@color/md_theme_light_onSurface</item>
-        <item name="colorSurfaceVariant">@color/md_theme_light_surfaceVariant</item>
-        <item name="colorOnSurfaceVariant">@color/md_theme_light_onSurfaceVariant</item>
-        <item name="colorOutline">@color/md_theme_light_outline</item>
-        <item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item>
-        <item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>
-        <item name="colorPrimaryInverse">@color/md_theme_light_inversePrimary</item>
-
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="android:statusBarColor">@color/md_theme_light_surface</item>
-        <item
-            name="android:forceDarkAllowed"
-            tools:targetApi="q">false</item>
-
-        <item name="materialAlertDialogTheme">@style/DefaultMaterialAlertDialog</item>
-
-        <item name="android:windowSplashScreenBackground">@color/md_theme_light_surface</item>
-        <item name="android:windowSplashScreenAnimatedIcon">@drawable/ic_launcher_background</item>
-        <item name="android:windowSplashScreenAnimationDuration">1000</item>
-        <item name="android:windowSplashScreenIconBackgroundColor">@color/md_theme_light_surface</item>
-        <item name="android:windowSplashScreenBehavior">icon_preferred</item>
-    </style>
-
-    <style
-        name="DefaultMaterialAlertDialog"
-        parent="ThemeOverlay.Material3.MaterialAlertDialog">
-        <item name="colorPrimary">@color/md_theme_light_primary</item>
-        <item name="colorSecondary">@color/md_theme_light_secondary</item>
-        <item name="colorSurface">@color/md_theme_light_primary</item>
-        <item name="colorOnSurface">@color/md_theme_light_onSurface</item>
-        <item name="backgroundTint">@color/md_theme_light_surfaceVariant</item>
-        <item name="buttonBarPositiveButtonStyle">@style/Widget.App.Button</item>
-        <item name="buttonBarNegativeButtonStyle">@style/Widget.App.Button</item>
-    </style>
-
-    <style
-        name="MaterialAlertDialog.App.Title.Text"
-        parent="MaterialAlertDialog.Material3.Title.Text">
-        <item name="android:textColor">?attr/colorOnSurfaceVariant</item>
-    </style>
-
-    <style
-        name="Widget.App.Button"
-        parent="Widget.Material3.Button.TextButton.Dialog">
-        <item name="android:textColor">?attr/colorPrimary</item>
+        <item name="colorPrimary">@color/md_theme_primary</item>
+        <item name="colorOnPrimary">@color/md_theme_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/md_theme_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/md_theme_secondary</item>
+        <item name="colorOnSecondary">@color/md_theme_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/md_theme_tertiary</item>
+        <item name="colorOnTertiary">@color/md_theme_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer</item>
+        <item name="colorError">@color/md_theme_error</item>
+        <item name="colorOnError">@color/md_theme_onError</item>
+        <item name="colorErrorContainer">@color/md_theme_errorContainer</item>
+        <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer</item>
+        <item name="android:colorBackground">@color/md_theme_background</item>
+        <item name="colorOnBackground">@color/md_theme_onBackground</item>
+        <item name="colorSurface">@color/md_theme_surface</item>
+        <item name="colorOnSurface">@color/md_theme_onSurface</item>
+        <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant</item>
+        <item name="colorOutline">@color/md_theme_outline</item>
+        <item name="colorOutlineVariant">@color/md_theme_outlineVariant</item>
+        <item name="colorSurfaceInverse">@color/md_theme_inverseSurface</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface</item>
+        <item name="colorPrimaryInverse">@color/md_theme_inversePrimary</item>
+        <item name="colorPrimaryFixed">@color/md_theme_primaryFixed</item>
+        <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed</item>
+        <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim</item>
+        <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant</item>
+        <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed</item>
+        <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed</item>
+        <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim</item>
+        <item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant</item>
+        <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed</item>
+        <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed</item>
+        <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim</item>
+        <item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant</item>
+        <item name="colorSurfaceDim">@color/md_theme_surfaceDim</item>
+        <item name="colorSurfaceBright">@color/md_theme_surfaceBright</item>
+        <item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest</item>
+        <item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow</item>
+        <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer</item>
+        <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item>
+        <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item>
     </style>
 
     <style