diff --git a/app/src/gplay/res/layout/upgrade_fragment.xml b/app/src/gplay/res/layout/upgrade_fragment.xml
index ccb7065e..06a7d8d0 100644
--- a/app/src/gplay/res/layout/upgrade_fragment.xml
+++ b/app/src/gplay/res/layout/upgrade_fragment.xml
@@ -45,7 +45,8 @@
                 style="@style/Widget.Material3.CardView.Elevated"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp">
+                android:layout_marginTop="8dp"
+                android:backgroundTint="?colorTertiaryContainer">
 
                 <com.google.android.material.textview.MaterialTextView
                     style="@style/TextAppearance.Material3.BodyMedium"
diff --git a/app/src/main/res/drawable/ic_chevron_right_24.xml b/app/src/main/res/drawable/ic_chevron_right_24.xml
new file mode 100644
index 00000000..68d11d54
--- /dev/null
+++ b/app/src/main/res/drawable/ic_chevron_right_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M8.59,16.58L13.17,12L8.59,7.41L10,6L16,12L10,18L8.59,16.58Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dashboard_device_apps_item.xml b/app/src/main/res/layout/dashboard_device_apps_item.xml
index e8caba37..d26d1d17 100644
--- a/app/src/main/res/layout/dashboard_device_apps_item.xml
+++ b/app/src/main/res/layout/dashboard_device_apps_item.xml
@@ -5,12 +5,23 @@
     style="@style/DashboardDeviceInfoRow"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?selectableItemBackground">
+    android:background="?selectableItemBackground"
+    android:paddingStart="0dp">
+
+    <ImageView
+        android:id="@+id/tap_indicator"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:src="@drawable/ic_chevron_right_24"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
         android:id="@+id/wifi_icon"
         android:layout_width="20dp"
         android:layout_height="20dp"
+        android:layout_marginStart="16dp"
         android:src="@drawable/ic_baseline_apps_24"
         app:layout_constraintBottom_toBottomOf="@id/apps_secondary"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/dashboard_device_item.xml b/app/src/main/res/layout/dashboard_device_item.xml
index 18f786a8..bd4f5ff1 100644
--- a/app/src/main/res/layout/dashboard_device_item.xml
+++ b/app/src/main/res/layout/dashboard_device_item.xml
@@ -76,7 +76,7 @@
             android:layout_height="wrap_content"
             android:visibility="gone"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            app:layout_constraintBottom_toTopOf="@id/click_hint"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/device_subtitle"
@@ -85,21 +85,6 @@
             tools:listitem="@layout/dashboard_device_power_item"
             tools:visibility="visible" />
 
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/click_hint"
-            style="@style/TextAppearance.Material3.LabelSmall"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_constraintTop_toBottomOf="@id/module_data_list"
-            android:layout_marginBottom="8dp"
-            android:gravity="center"
-            android:layout_marginTop="2dp"
-            android:text="@string/dashboard_click_hint"
-            android:textSize="8sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dashboard_fragment.xml b/app/src/main/res/layout/dashboard_fragment.xml
index 995cd94a..79c820b8 100644
--- a/app/src/main/res/layout/dashboard_fragment.xml
+++ b/app/src/main/res/layout/dashboard_fragment.xml
@@ -47,6 +47,7 @@
         android:layout_gravity="bottom|end"
         android:layout_margin="24dp"
         android:contentDescription="@string/general_refresh_action"
+        app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior"
         app:srcCompat="@drawable/ic_baseline_refresh_24" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dashboard_upgrade_item.xml b/app/src/main/res/layout/dashboard_upgrade_item.xml
index 187fd76b..fb2d98c6 100644
--- a/app/src/main/res/layout/dashboard_upgrade_item.xml
+++ b/app/src/main/res/layout/dashboard_upgrade_item.xml
@@ -4,7 +4,8 @@
     style="@style/DashboardCardItem"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:backgroundTint="?colorSecondaryContainer">
+    android:layout_marginBottom="32dp"
+    android:backgroundTint="?colorTertiaryContainer">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -47,7 +48,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/upgrade_action"
-            style="@style/Widget.Material3.Button.TonalButton"
+            style="@style/Widget.Material3.FloatingActionButton.Tertiary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index b86b64db..03d71912 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -19,7 +19,6 @@
     <string name="general_sync_action">Sincronizar</string>
     <string name="general_select_server_label">Seleccionar un servidor</string>
     <string name="general_quota_label">Cuota</string>
-    <string name="general_tap_hint_msg">Toca para ver más opciones</string>
     <string name="general_upgrade_action">Actualizar</string>
     <string name="general_donate_action">Donar</string>
     <string name="general_check_action">Comprobar</string>
@@ -27,8 +26,6 @@
     <string name="general_refresh_action">Actualizar</string>
     <string name="general_continue">Continuar</string>
 
-    <string name="dashboard_click_hint">Se puede hacer clic en algunas entradas para ver más detalles.</string>
-
     <string name="debug_debuglog_size_label">Tamaño</string>
     <string name="debug_debuglog_size_compressed_label">Tamaño comprimido</string>
     <string name="debug_notification_channel_label">Notificaciones sobre la depuración</string>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 6b627e45..c53d221c 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -1,8 +1,150 @@
 <resources>
     <color name="colorUpgraded">#2962ff</color>
 
-    <color name="widgetBackground">@color/md_theme_dark_background</color>
-    <color name="widgetOnBackground">@color/md_theme_dark_onBackground</color>
-    <color name="widgetPrimary">@color/md_theme_dark_primary</color>
-    <color name="widgetOnPrimary">@color/md_theme_dark_onPrimary</color>
+    <color name="md_theme_primary">#95D5A7</color>
+    <color name="md_theme_onPrimary">#00391D</color>
+    <color name="md_theme_primaryContainer">#11512E</color>
+    <color name="md_theme_onPrimaryContainer">#B1F1C2</color>
+    <color name="md_theme_secondary">#B6CCB9</color>
+    <color name="md_theme_onSecondary">#223527</color>
+    <color name="md_theme_secondaryContainer">#384B3C</color>
+    <color name="md_theme_onSecondaryContainer">#D2E8D4</color>
+    <color name="md_theme_tertiary">#A2CDDA</color>
+    <color name="md_theme_onTertiary">#023640</color>
+    <color name="md_theme_tertiaryContainer">#214C57</color>
+    <color name="md_theme_onTertiaryContainer">#BEEAF7</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">#101510</color>
+    <color name="md_theme_onBackground">#DFE4DD</color>
+    <color name="md_theme_surface">#101510</color>
+    <color name="md_theme_onSurface">#DFE4DD</color>
+    <color name="md_theme_surfaceVariant">#414942</color>
+    <color name="md_theme_onSurfaceVariant">#C0C9BF</color>
+    <color name="md_theme_outline">#8B938A</color>
+    <color name="md_theme_outlineVariant">#414942</color>
+    <color name="md_theme_scrim">#000000</color>
+    <color name="md_theme_inverseSurface">#DFE4DD</color>
+    <color name="md_theme_inverseOnSurface">#2C322D</color>
+    <color name="md_theme_inversePrimary">#2D6A44</color>
+    <color name="md_theme_primaryFixed">#B1F1C2</color>
+    <color name="md_theme_onPrimaryFixed">#00210E</color>
+    <color name="md_theme_primaryFixedDim">#95D5A7</color>
+    <color name="md_theme_onPrimaryFixedVariant">#11512E</color>
+    <color name="md_theme_secondaryFixed">#D2E8D4</color>
+    <color name="md_theme_onSecondaryFixed">#0D1F13</color>
+    <color name="md_theme_secondaryFixedDim">#B6CCB9</color>
+    <color name="md_theme_onSecondaryFixedVariant">#384B3C</color>
+    <color name="md_theme_tertiaryFixed">#BEEAF7</color>
+    <color name="md_theme_onTertiaryFixed">#001F26</color>
+    <color name="md_theme_tertiaryFixedDim">#A2CDDA</color>
+    <color name="md_theme_onTertiaryFixedVariant">#214C57</color>
+    <color name="md_theme_surfaceDim">#101510</color>
+    <color name="md_theme_surfaceBright">#353A36</color>
+    <color name="md_theme_surfaceContainerLowest">#0A0F0B</color>
+    <color name="md_theme_surfaceContainerLow">#181D18</color>
+    <color name="md_theme_surfaceContainer">#1C211C</color>
+    <color name="md_theme_surfaceContainerHigh">#262B27</color>
+    <color name="md_theme_surfaceContainerHighest">#313631</color>
+    <color name="md_theme_primary_mediumContrast">#9AD9AB</color>
+    <color name="md_theme_onPrimary_mediumContrast">#001B0B</color>
+    <color name="md_theme_primaryContainer_mediumContrast">#619E74</color>
+    <color name="md_theme_onPrimaryContainer_mediumContrast">#000000</color>
+    <color name="md_theme_secondary_mediumContrast">#BAD0BD</color>
+    <color name="md_theme_onSecondary_mediumContrast">#071A0E</color>
+    <color name="md_theme_secondaryContainer_mediumContrast">#819684</color>
+    <color name="md_theme_onSecondaryContainer_mediumContrast">#000000</color>
+    <color name="md_theme_tertiary_mediumContrast">#A7D2DE</color>
+    <color name="md_theme_onTertiary_mediumContrast">#00191F</color>
+    <color name="md_theme_tertiaryContainer_mediumContrast">#6D97A3</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">#101510</color>
+    <color name="md_theme_onBackground_mediumContrast">#DFE4DD</color>
+    <color name="md_theme_surface_mediumContrast">#101510</color>
+    <color name="md_theme_onSurface_mediumContrast">#F7FCF5</color>
+    <color name="md_theme_surfaceVariant_mediumContrast">#414942</color>
+    <color name="md_theme_onSurfaceVariant_mediumContrast">#C5CDC3</color>
+    <color name="md_theme_outline_mediumContrast">#9DA59C</color>
+    <color name="md_theme_outlineVariant_mediumContrast">#7D857D</color>
+    <color name="md_theme_scrim_mediumContrast">#000000</color>
+    <color name="md_theme_inverseSurface_mediumContrast">#DFE4DD</color>
+    <color name="md_theme_inverseOnSurface_mediumContrast">#262B27</color>
+    <color name="md_theme_inversePrimary_mediumContrast">#12522F</color>
+    <color name="md_theme_primaryFixed_mediumContrast">#B1F1C2</color>
+    <color name="md_theme_onPrimaryFixed_mediumContrast">#001507</color>
+    <color name="md_theme_primaryFixedDim_mediumContrast">#95D5A7</color>
+    <color name="md_theme_onPrimaryFixedVariant_mediumContrast">#003F20</color>
+    <color name="md_theme_secondaryFixed_mediumContrast">#D2E8D4</color>
+    <color name="md_theme_onSecondaryFixed_mediumContrast">#031509</color>
+    <color name="md_theme_secondaryFixedDim_mediumContrast">#B6CCB9</color>
+    <color name="md_theme_onSecondaryFixedVariant_mediumContrast">#273A2C</color>
+    <color name="md_theme_tertiaryFixed_mediumContrast">#BEEAF7</color>
+    <color name="md_theme_onTertiaryFixed_mediumContrast">#001419</color>
+    <color name="md_theme_tertiaryFixedDim_mediumContrast">#A2CDDA</color>
+    <color name="md_theme_onTertiaryFixedVariant_mediumContrast">#0B3C46</color>
+    <color name="md_theme_surfaceDim_mediumContrast">#101510</color>
+    <color name="md_theme_surfaceBright_mediumContrast">#353A36</color>
+    <color name="md_theme_surfaceContainerLowest_mediumContrast">#0A0F0B</color>
+    <color name="md_theme_surfaceContainerLow_mediumContrast">#181D18</color>
+    <color name="md_theme_surfaceContainer_mediumContrast">#1C211C</color>
+    <color name="md_theme_surfaceContainerHigh_mediumContrast">#262B27</color>
+    <color name="md_theme_surfaceContainerHighest_mediumContrast">#313631</color>
+    <color name="md_theme_primary_highContrast">#EFFFEF</color>
+    <color name="md_theme_onPrimary_highContrast">#000000</color>
+    <color name="md_theme_primaryContainer_highContrast">#9AD9AB</color>
+    <color name="md_theme_onPrimaryContainer_highContrast">#000000</color>
+    <color name="md_theme_secondary_highContrast">#EFFFEF</color>
+    <color name="md_theme_onSecondary_highContrast">#000000</color>
+    <color name="md_theme_secondaryContainer_highContrast">#BAD0BD</color>
+    <color name="md_theme_onSecondaryContainer_highContrast">#000000</color>
+    <color name="md_theme_tertiary_highContrast">#F4FCFF</color>
+    <color name="md_theme_onTertiary_highContrast">#000000</color>
+    <color name="md_theme_tertiaryContainer_highContrast">#A7D2DE</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">#101510</color>
+    <color name="md_theme_onBackground_highContrast">#DFE4DD</color>
+    <color name="md_theme_surface_highContrast">#101510</color>
+    <color name="md_theme_onSurface_highContrast">#FFFFFF</color>
+    <color name="md_theme_surfaceVariant_highContrast">#414942</color>
+    <color name="md_theme_onSurfaceVariant_highContrast">#F5FDF3</color>
+    <color name="md_theme_outline_highContrast">#C5CDC3</color>
+    <color name="md_theme_outlineVariant_highContrast">#C5CDC3</color>
+    <color name="md_theme_scrim_highContrast">#000000</color>
+    <color name="md_theme_inverseSurface_highContrast">#DFE4DD</color>
+    <color name="md_theme_inverseOnSurface_highContrast">#000000</color>
+    <color name="md_theme_inversePrimary_highContrast">#003218</color>
+    <color name="md_theme_primaryFixed_highContrast">#B5F6C6</color>
+    <color name="md_theme_onPrimaryFixed_highContrast">#000000</color>
+    <color name="md_theme_primaryFixedDim_highContrast">#9AD9AB</color>
+    <color name="md_theme_onPrimaryFixedVariant_highContrast">#001B0B</color>
+    <color name="md_theme_secondaryFixed_highContrast">#D6EDD8</color>
+    <color name="md_theme_onSecondaryFixed_highContrast">#000000</color>
+    <color name="md_theme_secondaryFixedDim_highContrast">#BAD0BD</color>
+    <color name="md_theme_onSecondaryFixedVariant_highContrast">#071A0E</color>
+    <color name="md_theme_tertiaryFixed_highContrast">#C2EEFB</color>
+    <color name="md_theme_onTertiaryFixed_highContrast">#000000</color>
+    <color name="md_theme_tertiaryFixedDim_highContrast">#A7D2DE</color>
+    <color name="md_theme_onTertiaryFixedVariant_highContrast">#00191F</color>
+    <color name="md_theme_surfaceDim_highContrast">#101510</color>
+    <color name="md_theme_surfaceBright_highContrast">#353A36</color>
+    <color name="md_theme_surfaceContainerLowest_highContrast">#0A0F0B</color>
+    <color name="md_theme_surfaceContainerLow_highContrast">#181D18</color>
+    <color name="md_theme_surfaceContainer_highContrast">#1C211C</color>
+    <color name="md_theme_surfaceContainerHigh_highContrast">#262B27</color>
+    <color name="md_theme_surfaceContainerHighest_highContrast">#313631</color>
+
+    <color name="widgetBackground">@color/md_theme_background</color>
+    <color name="widgetOnBackground">@color/md_theme_onBackground</color>
+    <color name="widgetPrimary">@color/md_theme_primary</color>
+    <color name="widgetOnPrimary">@color/md_theme_onPrimary</color>
 </resources>
\ No newline at end of file
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 00000000..ef687933
--- /dev/null
+++ b/app/src/main/res/values-night/theme-overlays.xml
@@ -0,0 +1,100 @@
+<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>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 127996e5..64775155 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,32 +1,52 @@
 <resources>
 
     <style 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="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 name="AppThemeFloating" parent="AppTheme">
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 8edd4657..83796b5f 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,71 +1,154 @@
 <resources>
     <color name="error">#B3261E</color>
     <color name="seed">#8ce9aa</color>
-    <color name="md_theme_light_primary">#006D3C</color>
-    <color name="md_theme_light_onPrimary">#FFFFFF</color>
-    <color name="md_theme_light_primaryContainer">#98F7B6</color>
-    <color name="md_theme_light_onPrimaryContainer">#00210E</color>
-    <color name="md_theme_light_secondary">#006780</color>
-    <color name="md_theme_light_onSecondary">#FFFFFF</color>
-    <color name="md_theme_light_secondaryContainer">#B8EAFF</color>
-    <color name="md_theme_light_onSecondaryContainer">#001F28</color>
-    <color name="md_theme_light_tertiary">#4B6709</color>
-    <color name="md_theme_light_onTertiary">#FFFFFF</color>
-    <color name="md_theme_light_tertiaryContainer">#CCEF85</color>
-    <color name="md_theme_light_onTertiaryContainer">#141F00</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">#FBFDF8</color>
-    <color name="md_theme_light_onBackground">#191C19</color>
-    <color name="md_theme_light_surface">#FBFDF8</color>
-    <color name="md_theme_light_onSurface">#191C19</color>
-    <color name="md_theme_light_surfaceVariant">#DDE5DB</color>
-    <color name="md_theme_light_onSurfaceVariant">#414942</color>
-    <color name="md_theme_light_outline">#717971</color>
-    <color name="md_theme_light_inverseOnSurface">#F0F1EC</color>
-    <color name="md_theme_light_inverseSurface">#2E312E</color>
-    <color name="md_theme_light_inversePrimary">#7CDA9C</color>
-    <color name="md_theme_light_shadow">#000000</color>
-    <color name="md_theme_light_surfaceTint">#006D3C</color>
-    <color name="md_theme_light_surfaceTintColor">#006D3C</color>
-    <color name="md_theme_dark_primary">#7CDA9C</color>
-    <color name="md_theme_dark_onPrimary">#00391D</color>
-    <color name="md_theme_dark_primaryContainer">#00522C</color>
-    <color name="md_theme_dark_onPrimaryContainer">#98F7B6</color>
-    <color name="md_theme_dark_secondary">#5DD5FC</color>
-    <color name="md_theme_dark_onSecondary">#003544</color>
-    <color name="md_theme_dark_secondaryContainer">#004D61</color>
-    <color name="md_theme_dark_onSecondaryContainer">#B8EAFF</color>
-    <color name="md_theme_dark_tertiary">#B0D36D</color>
-    <color name="md_theme_dark_onTertiary">#253600</color>
-    <color name="md_theme_dark_tertiaryContainer">#374E00</color>
-    <color name="md_theme_dark_onTertiaryContainer">#CCEF85</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">#191C19</color>
-    <color name="md_theme_dark_onBackground">#E1E3DE</color>
-    <color name="md_theme_dark_surface">#191C19</color>
-    <color name="md_theme_dark_onSurface">#E1E3DE</color>
-    <color name="md_theme_dark_surfaceVariant">#414942</color>
-    <color name="md_theme_dark_onSurfaceVariant">#C0C9BF</color>
-    <color name="md_theme_dark_outline">#8B938A</color>
-    <color name="md_theme_dark_inverseOnSurface">#191C19</color>
-    <color name="md_theme_dark_inverseSurface">#E1E3DE</color>
-    <color name="md_theme_dark_inversePrimary">#006D3C</color>
-    <color name="md_theme_dark_shadow">#000000</color>
-    <color name="md_theme_dark_surfaceTint">#7CDA9C</color>
-    <color name="md_theme_dark_surfaceTintColor">#7CDA9C</color>
+    <color name="md_theme_primary">#2D6A44</color>
+    <color name="md_theme_onPrimary">#FFFFFF</color>
+    <color name="md_theme_primaryContainer">#B1F1C2</color>
+    <color name="md_theme_onPrimaryContainer">#00210E</color>
+    <color name="md_theme_secondary">#4F6353</color>
+    <color name="md_theme_onSecondary">#FFFFFF</color>
+    <color name="md_theme_secondaryContainer">#D2E8D4</color>
+    <color name="md_theme_onSecondaryContainer">#0D1F13</color>
+    <color name="md_theme_tertiary">#3A646F</color>
+    <color name="md_theme_onTertiary">#FFFFFF</color>
+    <color name="md_theme_tertiaryContainer">#BEEAF7</color>
+    <color name="md_theme_onTertiaryContainer">#001F26</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">#F6FBF3</color>
+    <color name="md_theme_onBackground">#181D18</color>
+    <color name="md_theme_surface">#F6FBF3</color>
+    <color name="md_theme_onSurface">#181D18</color>
+    <color name="md_theme_surfaceVariant">#DDE5DB</color>
+    <color name="md_theme_onSurfaceVariant">#414942</color>
+    <color name="md_theme_outline">#717971</color>
+    <color name="md_theme_outlineVariant">#C0C9BF</color>
+    <color name="md_theme_scrim">#000000</color>
+    <color name="md_theme_inverseSurface">#2C322D</color>
+    <color name="md_theme_inverseOnSurface">#EDF2EB</color>
+    <color name="md_theme_inversePrimary">#95D5A7</color>
+    <color name="md_theme_primaryFixed">#B1F1C2</color>
+    <color name="md_theme_onPrimaryFixed">#00210E</color>
+    <color name="md_theme_primaryFixedDim">#95D5A7</color>
+    <color name="md_theme_onPrimaryFixedVariant">#11512E</color>
+    <color name="md_theme_secondaryFixed">#D2E8D4</color>
+    <color name="md_theme_onSecondaryFixed">#0D1F13</color>
+    <color name="md_theme_secondaryFixedDim">#B6CCB9</color>
+    <color name="md_theme_onSecondaryFixedVariant">#384B3C</color>
+    <color name="md_theme_tertiaryFixed">#BEEAF7</color>
+    <color name="md_theme_onTertiaryFixed">#001F26</color>
+    <color name="md_theme_tertiaryFixedDim">#A2CDDA</color>
+    <color name="md_theme_onTertiaryFixedVariant">#214C57</color>
+    <color name="md_theme_surfaceDim">#D6DBD4</color>
+    <color name="md_theme_surfaceBright">#F6FBF3</color>
+    <color name="md_theme_surfaceContainerLowest">#FFFFFF</color>
+    <color name="md_theme_surfaceContainerLow">#F0F5ED</color>
+    <color name="md_theme_surfaceContainer">#EAEFE8</color>
+    <color name="md_theme_surfaceContainerHigh">#E5EAE2</color>
+    <color name="md_theme_surfaceContainerHighest">#DFE4DD</color>
+    <color name="md_theme_primary_mediumContrast">#0A4D2B</color>
+    <color name="md_theme_onPrimary_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_primaryContainer_mediumContrast">#458159</color>
+    <color name="md_theme_onPrimaryContainer_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_secondary_mediumContrast">#344739</color>
+    <color name="md_theme_onSecondary_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_secondaryContainer_mediumContrast">#657A69</color>
+    <color name="md_theme_onSecondaryContainer_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_tertiary_mediumContrast">#1C4853</color>
+    <color name="md_theme_onTertiary_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_tertiaryContainer_mediumContrast">#517B86</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">#F6FBF3</color>
+    <color name="md_theme_onBackground_mediumContrast">#181D18</color>
+    <color name="md_theme_surface_mediumContrast">#F6FBF3</color>
+    <color name="md_theme_onSurface_mediumContrast">#181D18</color>
+    <color name="md_theme_surfaceVariant_mediumContrast">#DDE5DB</color>
+    <color name="md_theme_onSurfaceVariant_mediumContrast">#3D453E</color>
+    <color name="md_theme_outline_mediumContrast">#596159</color>
+    <color name="md_theme_outlineVariant_mediumContrast">#757D75</color>
+    <color name="md_theme_scrim_mediumContrast">#000000</color>
+    <color name="md_theme_inverseSurface_mediumContrast">#2C322D</color>
+    <color name="md_theme_inverseOnSurface_mediumContrast">#EDF2EB</color>
+    <color name="md_theme_inversePrimary_mediumContrast">#95D5A7</color>
+    <color name="md_theme_primaryFixed_mediumContrast">#458159</color>
+    <color name="md_theme_onPrimaryFixed_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_primaryFixedDim_mediumContrast">#2B6742</color>
+    <color name="md_theme_onPrimaryFixedVariant_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_secondaryFixed_mediumContrast">#657A69</color>
+    <color name="md_theme_onSecondaryFixed_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_secondaryFixedDim_mediumContrast">#4D6151</color>
+    <color name="md_theme_onSecondaryFixedVariant_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_tertiaryFixed_mediumContrast">#517B86</color>
+    <color name="md_theme_onTertiaryFixed_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_tertiaryFixedDim_mediumContrast">#38626D</color>
+    <color name="md_theme_onTertiaryFixedVariant_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_surfaceDim_mediumContrast">#D6DBD4</color>
+    <color name="md_theme_surfaceBright_mediumContrast">#F6FBF3</color>
+    <color name="md_theme_surfaceContainerLowest_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_surfaceContainerLow_mediumContrast">#F0F5ED</color>
+    <color name="md_theme_surfaceContainer_mediumContrast">#EAEFE8</color>
+    <color name="md_theme_surfaceContainerHigh_mediumContrast">#E5EAE2</color>
+    <color name="md_theme_surfaceContainerHighest_mediumContrast">#DFE4DD</color>
+    <color name="md_theme_primary_highContrast">#002913</color>
+    <color name="md_theme_onPrimary_highContrast">#FFFFFF</color>
+    <color name="md_theme_primaryContainer_highContrast">#0A4D2B</color>
+    <color name="md_theme_onPrimaryContainer_highContrast">#FFFFFF</color>
+    <color name="md_theme_secondary_highContrast">#142619</color>
+    <color name="md_theme_onSecondary_highContrast">#FFFFFF</color>
+    <color name="md_theme_secondaryContainer_highContrast">#344739</color>
+    <color name="md_theme_onSecondaryContainer_highContrast">#FFFFFF</color>
+    <color name="md_theme_tertiary_highContrast">#00262E</color>
+    <color name="md_theme_onTertiary_highContrast">#FFFFFF</color>
+    <color name="md_theme_tertiaryContainer_highContrast">#1C4853</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">#F6FBF3</color>
+    <color name="md_theme_onBackground_highContrast">#181D18</color>
+    <color name="md_theme_surface_highContrast">#F6FBF3</color>
+    <color name="md_theme_onSurface_highContrast">#000000</color>
+    <color name="md_theme_surfaceVariant_highContrast">#DDE5DB</color>
+    <color name="md_theme_onSurfaceVariant_highContrast">#1E2620</color>
+    <color name="md_theme_outline_highContrast">#3D453E</color>
+    <color name="md_theme_outlineVariant_highContrast">#3D453E</color>
+    <color name="md_theme_scrim_highContrast">#000000</color>
+    <color name="md_theme_inverseSurface_highContrast">#2C322D</color>
+    <color name="md_theme_inverseOnSurface_highContrast">#FFFFFF</color>
+    <color name="md_theme_inversePrimary_highContrast">#BAFBCB</color>
+    <color name="md_theme_primaryFixed_highContrast">#0A4D2B</color>
+    <color name="md_theme_onPrimaryFixed_highContrast">#FFFFFF</color>
+    <color name="md_theme_primaryFixedDim_highContrast">#00351A</color>
+    <color name="md_theme_onPrimaryFixedVariant_highContrast">#FFFFFF</color>
+    <color name="md_theme_secondaryFixed_highContrast">#344739</color>
+    <color name="md_theme_onSecondaryFixed_highContrast">#FFFFFF</color>
+    <color name="md_theme_secondaryFixedDim_highContrast">#1E3123</color>
+    <color name="md_theme_onSecondaryFixedVariant_highContrast">#FFFFFF</color>
+    <color name="md_theme_tertiaryFixed_highContrast">#1C4853</color>
+    <color name="md_theme_onTertiaryFixed_highContrast">#FFFFFF</color>
+    <color name="md_theme_tertiaryFixedDim_highContrast">#00323B</color>
+    <color name="md_theme_onTertiaryFixedVariant_highContrast">#FFFFFF</color>
+    <color name="md_theme_surfaceDim_highContrast">#D6DBD4</color>
+    <color name="md_theme_surfaceBright_highContrast">#F6FBF3</color>
+    <color name="md_theme_surfaceContainerLowest_highContrast">#FFFFFF</color>
+    <color name="md_theme_surfaceContainerLow_highContrast">#F0F5ED</color>
+    <color name="md_theme_surfaceContainer_highContrast">#EAEFE8</color>
+    <color name="md_theme_surfaceContainerHigh_highContrast">#E5EAE2</color>
+    <color name="md_theme_surfaceContainerHighest_highContrast">#DFE4DD</color>
     <color name="CustomColor1">#3FC89C</color>
     <color name="CustomColor2">#009495</color>
 
     <color name="colorUpgraded">#00b8d4</color>
 
-    <color name="widgetBackground">@color/md_theme_light_background</color>
-    <color name="widgetOnBackground">@color/md_theme_light_onBackground</color>
-    <color name="widgetPrimary">@color/md_theme_light_primary</color>
-    <color name="widgetOnPrimary">@color/md_theme_light_onPrimary</color>
+    <color name="widgetBackground">@color/md_theme_background</color>
+    <color name="widgetOnBackground">@color/md_theme_onBackground</color>
+    <color name="widgetPrimary">@color/md_theme_primary</color>
+    <color name="widgetOnPrimary">@color/md_theme_onPrimary</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f4219400..8b8298d3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,8 +12,6 @@
     <string name="onboarding_body2">It synchronizes information between the devices so you can see one device from all other devices.</string>
     <string name="onboarding_body3">You can upgrade to Octi Pro to gain extra features and support development.</string>
 
-    <string name="dashboard_click_hint">Some entries can be clicked to view more details.</string>
-
     <string name="debug_debuglog_size_label">Size</string>
     <string name="debug_debuglog_size_compressed_label">Compressed size</string>
     <string name="debug_notification_channel_label">Debug notifications</string>
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 00000000..33370bde
--- /dev/null
+++ b/app/src/main/res/values/theme-overlays.xml
@@ -0,0 +1,100 @@
+<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>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 40b4c7b0..bf56a05b 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,32 +1,52 @@
 <resources>
 
     <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="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>
 
         <item name="alertDialogTheme">@style/AppTheme.LegacyAlertDialogTheme</item>
     </style>
@@ -39,7 +59,7 @@
     </style>
 
     <style name="AppThemeSplash" parent="Theme.SplashScreen">
-        <item name="windowSplashScreenBackground">@color/md_theme_light_primary</item>
+        <item name="windowSplashScreenBackground">@color/md_theme_primary</item>
         <item name="windowSplashScreenAnimatedIcon">@drawable/launch_screen</item>
         <item name="postSplashScreenTheme">@style/AppTheme</item>
     </style>
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index 3f2075b4..288bd4d3 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -122,18 +122,18 @@ fun DependencyHandlerScope.addWorkerManager() {
 }
 
 fun DependencyHandlerScope.addAndroidUI() {
-    implementation("androidx.activity:activity-ktx:1.5.0")
-    implementation("androidx.fragment:fragment-ktx:1.5.0")
+    implementation("androidx.activity:activity-ktx:1.9.1")
+    implementation("androidx.fragment:fragment-ktx:1.8.2")
 
     implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.0")
-    implementation("androidx.lifecycle:lifecycle-common-java8:2.5.0")
-    implementation("androidx.lifecycle:lifecycle-process:2.5.0")
-    implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.5.0")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.4")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.4")
+    implementation("androidx.lifecycle:lifecycle-common-java8:2.8.4")
+    implementation("androidx.lifecycle:lifecycle-process:2.8.4")
+    implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.8.4")
 
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-    implementation("com.google.android.material:material:1.5.0-rc01")
+    implementation("com.google.android.material:material:1.12.0")
 }
 
 fun DependencyHandlerScope.addTesting() {
diff --git a/buildSrc/src/main/java/ProjectConfig.kt b/buildSrc/src/main/java/ProjectConfig.kt
index 49ca5a04..3ae41129 100644
--- a/buildSrc/src/main/java/ProjectConfig.kt
+++ b/buildSrc/src/main/java/ProjectConfig.kt
@@ -9,8 +9,8 @@ import java.util.Properties
 
 object ProjectConfig {
     const val minSdk = 23
-    const val compileSdk = 33
-    const val targetSdk = 33
+    const val compileSdk = 34
+    const val targetSdk = 34
     const val packageName = "eu.darken.octi"
 
     object Version {