From dbd70d1d0b5da29aeb5f17c9fd8c0cea2888451c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= <kuba@szczodrzynski.pl>
Date: Wed, 7 May 2025 13:23:27 +0200
Subject: [PATCH] [UI] Upgrade to Material 4

---
 app/src/main/AndroidManifest.xml              | 14 ++---
 .../edziennik/core/manager/UiManager.kt       |  6 +-
 .../edziennik/data/config/Config.kt           |  2 +-
 .../config/migration/ConfigMigration14.kt     |  4 +-
 .../edziennik/data/enums/Theme.kt             | 34 +++++------
 .../edziennik/ext/DialogExtensions.kt         |  4 +-
 .../edziennik/ui/debug/DebugFragment.java     |  2 +-
 .../dialogs/settings/ProfileConfigDialog.kt   |  2 +-
 .../edziennik/ui/login/LoginActivity.kt       |  2 +-
 app/src/main/res/drawable/emoji_glasses.xml   |  2 +-
 app/src/main/res/drawable/ic_announcement.xml |  4 +-
 app/src/main/res/drawable/ic_archive.xml      |  2 +-
 app/src/main/res/drawable/ic_attendance.xml   |  8 +--
 app/src/main/res/drawable/ic_behavior.xml     |  4 +-
 app/src/main/res/drawable/ic_bell.xml         |  4 +-
 .../main/res/drawable/ic_calendar_event.xml   |  8 +--
 app/src/main/res/drawable/ic_no_messages.xml  |  2 +-
 .../main/res/drawable/ic_no_notifications.xml |  4 +-
 app/src/main/res/drawable/ic_note.xml         |  4 +-
 app/src/main/res/drawable/ic_rip.xml          | 10 ++--
 app/src/main/res/drawable/ic_sunbed.xml       |  2 +-
 app/src/main/res/drawable/ic_timetable.xml    |  8 +--
 .../res/drawable/ic_web_push_no_browsers.xml  |  2 +-
 .../main/res/drawable/profile_archived.xml    |  2 +-
 app/src/main/res/layout/activity_counter.xml  |  4 +-
 app/src/main/res/layout/card_home.xml         |  2 +-
 .../res/layout/material_drawer_header.xml     |  2 +-
 .../res/layout/messages_compose_fragment.xml  |  2 +-
 .../main/res/values-night/styles_black.xml    | 12 ++--
 app/src/main/res/values/styles.xml            | 44 +++++++-------
 app/src/main/res/values/styles_black.xml      | 12 ++--
 app/src/main/res/values/styles_m2.xml         |  2 +-
 app/src/main/res/values/styles_m3.xml         | 58 +++++++++----------
 33 files changed, 137 insertions(+), 137 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8f6aabd4..8f7c4628 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -25,7 +25,7 @@
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme.M3.Blue"
+        android:theme="@style/AppTheme.M4.Blue"
         android:usesCleartextTraffic="true"
         tools:ignore="UnusedAttribute">
 
@@ -67,7 +67,7 @@
             android:excludeFromRecents="true"
             android:noHistory="true"
             android:exported="true"
-            android:theme="@style/AppTheme.M3.NoDisplay">
+            android:theme="@style/AppTheme.M4.NoDisplay">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
             </intent-filter>
@@ -91,7 +91,7 @@
             android:excludeFromRecents="true"
             android:noHistory="true"
             android:exported="true"
-            android:theme="@style/AppTheme.M3.NoDisplay" />
+            android:theme="@style/AppTheme.M4.NoDisplay" />
         <!-- NOTIFICATIONS -->
         <receiver android:name=".ui.widgets.notifications.WidgetNotificationsProvider"
             android:label="@string/widget_notifications_title"
@@ -139,18 +139,18 @@
             android:configChanges="orientation|screenSize"
             android:launchMode="singleTop"
             android:exported="false"
-            android:theme="@style/AppTheme.M3" />
+            android:theme="@style/AppTheme.M4" />
         <activity android:name=".ui.home.CounterActivity"
             android:exported="false"
-            android:theme="@style/AppTheme.M3" />
+            android:theme="@style/AppTheme.M4" />
         <activity android:name=".ui.feedback.FeedbackActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:exported="false"
-            android:theme="@style/AppTheme.M3" />
+            android:theme="@style/AppTheme.M4" />
         <activity android:name=".ui.settings.SettingsLicenseActivity"
             android:configChanges="orientation|keyboardHidden"
             android:exported="false"
-            android:theme="@style/AppTheme.M3" />
+            android:theme="@style/AppTheme.M4" />
         <activity android:name="com.canhub.cropper.CropImageActivity"
             android:configChanges="orientation|keyboardHidden"
             android:exported="false"
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/core/manager/UiManager.kt b/app/src/main/java/pl/szczodrzynski/edziennik/core/manager/UiManager.kt
index cd99fd6b..5a04f619 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/core/manager/UiManager.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/core/manager/UiManager.kt
@@ -52,19 +52,19 @@ class UiManager(val app: App) {
         val themeRes = if (noDisplay) {
             when (type) {
                 Type.M2 -> R.style.AppTheme_M2_NoDisplay
-                Type.M3 -> R.style.AppTheme_M3_NoDisplay
+                Type.M4 -> R.style.AppTheme_M4_NoDisplay
             }
         } else {
             var color = app.config.ui.themeColor
             if (
                 Build.VERSION.SDK_INT < Build.VERSION_CODES.S
                 && color == Theme.DEFAULT
-                && type == Type.M3
+                && type == Type.M4
             ) {
                 color = Theme.BLUE
             }
             Timber.d("Applying theme $color($type, $mode)")
-            color.styleRes[type to mode] ?: color.styleRes[Type.M3 to Mode.DAYNIGHT]!!
+            color.styleRes[type to mode] ?: color.styleRes[Type.M4 to Mode.DAYNIGHT]!!
         }
         activity.setTheme(themeRes)
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/config/Config.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/config/Config.kt
index 4db241f8..7d976a84 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/config/Config.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/config/Config.kt
@@ -69,7 +69,7 @@ class Config(app: App) : BaseConfig<Config>(app, profileId = null) {
 
     inner class UI {
         var themeColor by config<Theme>(Theme.DEFAULT)
-        var themeType by config<Theme.Type>(Theme.Type.M3)
+        var themeType by config<Theme.Type>(Theme.Type.M4)
         var themeMode by config<Theme.Mode>(Theme.Mode.DAYNIGHT)
         var themeNightMode by config<Boolean?>(null)
         var themeBlackMode by config<Boolean>(false)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/config/migration/ConfigMigration14.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/config/migration/ConfigMigration14.kt
index 1d76859b..4b61e6c8 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/config/migration/ConfigMigration14.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/config/migration/ConfigMigration14.kt
@@ -16,7 +16,7 @@ import pl.szczodrzynski.edziennik.data.enums.Theme.Mode.FULL
 import pl.szczodrzynski.edziennik.data.enums.Theme.PURPLE
 import pl.szczodrzynski.edziennik.data.enums.Theme.RED
 import pl.szczodrzynski.edziennik.data.enums.Theme.TEAL
-import pl.szczodrzynski.edziennik.data.enums.Theme.Type.M3
+import pl.szczodrzynski.edziennik.data.enums.Theme.Type.M4
 import pl.szczodrzynski.edziennik.ext.toJsonArray
 
 class ConfigMigration14 : BaseMigration<Config>() {
@@ -38,7 +38,7 @@ class ConfigMigration14 : BaseMigration<Config>() {
                 6 -> TEAL
                 else -> DEFAULT
             }
-            ui.themeType = M3
+            ui.themeType = M4
             ui.themeMode = when (it) {
                 // Light, Dark, Black, Red, Amber
                 0, 1, 2, 13, 16 -> DAYNIGHT
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/enums/Theme.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/enums/Theme.kt
index f3f98471..9ba81f4a 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/enums/Theme.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/enums/Theme.kt
@@ -14,7 +14,7 @@ enum class Theme(
         nameRes = R.string.theme_default,
         styleRes = mapOf(
             (Type.M2 to Mode.DAYNIGHT) to R.style.AppTheme_M2,
-            (Type.M3 to Mode.DAYNIGHT) to R.style.AppTheme_M3,
+            (Type.M4 to Mode.DAYNIGHT) to R.style.AppTheme_M4,
         ),
     ),
     RED(
@@ -22,9 +22,9 @@ enum class Theme(
         styleRes = mapOf(
             (Type.M2 to Mode.DAYNIGHT) to R.style.AppTheme_M2_Red,
             (Type.M2 to Mode.FULL) to R.style.AppTheme_M2_Red_Full,
-            (Type.M3 to Mode.DAYNIGHT) to R.style.AppTheme_M3_Red,
-            (Type.M3 to Mode.FULL) to R.style.AppTheme_M3_Red_Full,
-            (Type.M3 to Mode.CLASSIC) to R.style.AppTheme_M3_Red_Classic,
+            (Type.M4 to Mode.DAYNIGHT) to R.style.AppTheme_M4_Red,
+            (Type.M4 to Mode.FULL) to R.style.AppTheme_M4_Red_Full,
+            (Type.M4 to Mode.CLASSIC) to R.style.AppTheme_M4_Red_Classic,
         ),
     ),
     GREEN(
@@ -32,9 +32,9 @@ enum class Theme(
         styleRes = mapOf(
             (Type.M2 to Mode.DAYNIGHT) to R.style.AppTheme_M2_Green,
             (Type.M2 to Mode.FULL) to R.style.AppTheme_M2_Green_Full,
-            (Type.M3 to Mode.DAYNIGHT) to R.style.AppTheme_M3_Green,
-            (Type.M3 to Mode.FULL) to R.style.AppTheme_M3_Green_Full,
-            (Type.M3 to Mode.CLASSIC) to R.style.AppTheme_M3_Green_Classic,
+            (Type.M4 to Mode.DAYNIGHT) to R.style.AppTheme_M4_Green,
+            (Type.M4 to Mode.FULL) to R.style.AppTheme_M4_Green_Full,
+            (Type.M4 to Mode.CLASSIC) to R.style.AppTheme_M4_Green_Classic,
         ),
     ),
     BLUE(
@@ -42,9 +42,9 @@ enum class Theme(
         styleRes = mapOf(
             (Type.M2 to Mode.DAYNIGHT) to R.style.AppTheme_M2_Blue,
             (Type.M2 to Mode.FULL) to R.style.AppTheme_M2_Blue_Full,
-            (Type.M3 to Mode.DAYNIGHT) to R.style.AppTheme_M3_Blue,
-            (Type.M3 to Mode.FULL) to R.style.AppTheme_M3_Blue_Full,
-            (Type.M3 to Mode.CLASSIC) to R.style.AppTheme_M3_Blue_Classic,
+            (Type.M4 to Mode.DAYNIGHT) to R.style.AppTheme_M4_Blue,
+            (Type.M4 to Mode.FULL) to R.style.AppTheme_M4_Blue_Full,
+            (Type.M4 to Mode.CLASSIC) to R.style.AppTheme_M4_Blue_Classic,
         ),
     ),
     PURPLE(
@@ -52,9 +52,9 @@ enum class Theme(
         styleRes = mapOf(
             (Type.M2 to Mode.DAYNIGHT) to R.style.AppTheme_M2_Purple,
             (Type.M2 to Mode.FULL) to R.style.AppTheme_M2_Purple_Full,
-            (Type.M3 to Mode.DAYNIGHT) to R.style.AppTheme_M3_Purple,
-            (Type.M3 to Mode.FULL) to R.style.AppTheme_M3_Purple_Full,
-            (Type.M3 to Mode.CLASSIC) to R.style.AppTheme_M3_Purple_Classic,
+            (Type.M4 to Mode.DAYNIGHT) to R.style.AppTheme_M4_Purple,
+            (Type.M4 to Mode.FULL) to R.style.AppTheme_M4_Purple_Full,
+            (Type.M4 to Mode.CLASSIC) to R.style.AppTheme_M4_Purple_Classic,
         ),
     ),
     TEAL(
@@ -62,15 +62,15 @@ enum class Theme(
         styleRes = mapOf(
             (Type.M2 to Mode.DAYNIGHT) to R.style.AppTheme_M2_Teal,
             (Type.M2 to Mode.FULL) to R.style.AppTheme_M2_Teal_Full,
-            (Type.M3 to Mode.DAYNIGHT) to R.style.AppTheme_M3_Teal,
-            (Type.M3 to Mode.FULL) to R.style.AppTheme_M3_Teal_Full,
-            (Type.M3 to Mode.CLASSIC) to R.style.AppTheme_M3_Teal_Classic,
+            (Type.M4 to Mode.DAYNIGHT) to R.style.AppTheme_M4_Teal,
+            (Type.M4 to Mode.FULL) to R.style.AppTheme_M4_Teal_Full,
+            (Type.M4 to Mode.CLASSIC) to R.style.AppTheme_M4_Teal_Classic,
         ),
     );
 
     enum class Type {
         M2,
-        M3,
+        M4,
     }
 
     enum class Mode {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ext/DialogExtensions.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ext/DialogExtensions.kt
index f887f3ea..5c065be6 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ext/DialogExtensions.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ext/DialogExtensions.kt
@@ -30,13 +30,13 @@ fun AlertDialog.overlayBackgroundColor(color: Int, alpha: Int) {
     val backgroundInsets = MaterialDialogs.getDialogBackgroundInsets(
         context,
         R.attr.alertDialogStyle,
-        R.style.MaterialAlertDialog_Material3,
+        R.style.MaterialAlertDialog_Material4,
     )
     val background = MaterialShapeDrawable(
         context,
         null,
         R.attr.alertDialogStyle,
-        R.style.MaterialAlertDialog_Material3
+        R.style.MaterialAlertDialog_Material4
     )
     with(background) {
         initializeElevationOverlay(context)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/DebugFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/DebugFragment.java
index c409575b..06302b37 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/DebugFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/DebugFragment.java
@@ -210,7 +210,7 @@ public class DebugFragment extends Fragment {
                 mRecyclerView.bindJson(result);
             }
             catch (Exception e) {
-                new MaterialAlertDialogBuilder(getActivity(), R.style.AppStyle_M3_MaterialAlertDialog_Monospace)
+                new MaterialAlertDialogBuilder(getActivity(), R.style.AppStyle_M4_MaterialAlertDialog_Monospace)
                         .setTitle("Result")
                         .setMessage(result)
                         .setPositiveButton(R.string.ok, null)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/ProfileConfigDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/ProfileConfigDialog.kt
index 0977a20f..4932133a 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/ProfileConfigDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/ProfileConfigDialog.kt
@@ -42,7 +42,7 @@ class ProfileConfigDialog(
             activity,
             null,
             R.attr.alertDialogStyle,
-            R.style.MaterialAlertDialog_Material3
+            R.style.MaterialAlertDialog_Material4
         )
         val surface = MaterialColors.getColor(activity, R.attr.colorSurface, 0)
         shape.setCornerSize(18.dp.toFloat())
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginActivity.kt
index c1197c2a..d9ba0fe5 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginActivity.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginActivity.kt
@@ -88,7 +88,7 @@ class LoginActivity : AppCompatActivity(), CoroutineScope {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setTheme(R.style.AppTheme_M3)
+        setTheme(R.style.AppTheme_M4)
 
         navOptionsBuilder = NavOptions.Builder()
                 .setEnterAnim(R.anim.slide_in_right)
diff --git a/app/src/main/res/drawable/emoji_glasses.xml b/app/src/main/res/drawable/emoji_glasses.xml
index 88460e0d..cbe3f1b5 100644
--- a/app/src/main/res/drawable/emoji_glasses.xml
+++ b/app/src/main/res/drawable/emoji_glasses.xml
@@ -23,6 +23,6 @@
       android:pathData="M95.94,45.05c-6.62,0.23 -11.65,1.31 -11.65,1.31c-9.84,2.06 -10.55,8.14 -9.93,12.97c0.8,6.07 3.29,13.75 10.04,18.49c0.53,0.38 1.76,0.79 2.35,-0.77c0,0 -0.02,0.11 0,0c2.22,-10.48 5.52,-20.14 10.78,-29.89l0,0C98.14,45.37 96.71,45.02 95.94,45.05z"
       android:fillColor="#FFFFFF"/>
   <path
-      android:pathData="M31.06,45.02c-4.27,-0.09 -9.11,0.19 -13.65,1.34c-5.1,1.28 -7.07,3.85 -7.6,9.39c-0.53,5.43 -1.13,19.27 8.73,24.46c0.57,0.3 1.83,0.5 2.44,-0.91l0,0C24,66.21 25.61,60.13 32.54,47.22l0,0C33.11,45.49 31.83,45.03 31.06,45.02z"
+      android:pathData="M41.06,45.02c-4.27,-0.09 -9.11,0.19 -13.65,1.34c-5.1,1.28 -7.07,3.85 -7.6,9.39c-0.53,5.43 -1.13,19.27 8.73,24.46c0.57,0.3 1.83,0.5 2.44,-0.91l0,0C24,66.21 25.61,60.13 32.54,47.22l0,0C33.11,45.49 31.83,45.03 31.06,45.02z"
       android:fillColor="#FFFFFF"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_announcement.xml b/app/src/main/res/drawable/ic_announcement.xml
index 96e798dd..86bcebe0 100644
--- a/app/src/main/res/drawable/ic_announcement.xml
+++ b/app/src/main/res/drawable/ic_announcement.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="48"
     android:viewportHeight="48">
   <path
-      android:pathData="M17.4,33H15v-4h4l0.4,1.5C19.7,31.8 18.7,33 17.4,33zM37,36c0,0 -11.8,-7 -18,-7V15c5.8,0 18,-7 18,-7V36z"
+      android:pathData="M17.4,33H15v-4h4l0.4,1.5C19.7,31.8 18.7,33 17.4,33zM47,36c0,0 -11.8,-7 -18,-7V15c5.8,0 18,-7 18,-7V36z"
       android:fillColor="#90CAF9"/>
   <path
       android:pathData="M9,17A5,5 0,1 0,9 27,5 5,0 1,0 9,17zM40,19h-3v6h3c1.7,0 3,-1.3 3,-3S41.7,19 40,19z"
@@ -16,6 +16,6 @@
       android:pathData="M9,29h10V15H9c-1.1,0 -2,0.9 -2,2v10C7,28.1 7.9,29 9,29z"
       android:fillColor="#3F51B5"/>
   <path
-      android:pathData="M38,38L38,38c-1.1,0 -2,-0.9 -2,-2V8c0,-1.1 0.9,-2 2,-2h0c1.1,0 2,0.9 2,2v28C40,37.1 39.1,38 38,38z"
+      android:pathData="M48,38L38,38c-1.1,0 -2,-0.9 -2,-2V8c0,-1.1 0.9,-2 2,-2h0c1.1,0 2,0.9 2,2v28C40,37.1 39.1,38 38,38z"
       android:fillColor="#42A5F5"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_archive.xml b/app/src/main/res/drawable/ic_archive.xml
index a61f71cc..e843d0d3 100644
--- a/app/src/main/res/drawable/ic_archive.xml
+++ b/app/src/main/res/drawable/ic_archive.xml
@@ -14,6 +14,6 @@
       android:pathData="m54,22h-44c-1.657,0 -3,-1.343 -3,-3v-5c0,-1.657 1.343,-3 3,-3h44c1.657,0 3,1.343 3,3v5c0,1.657 -1.343,3 -3,3z"
       android:fillColor="#ffa54a"/>
   <path
-      android:pathData="m37,32h-10c-1.65,0 -3,-1.35 -3,-3s1.35,-3 3,-3h10c1.65,0 3,1.35 3,3s-1.35,3 -3,3z"
+      android:pathData="m47,32h-10c-1.65,0 -3,-1.35 -3,-3s1.35,-3 3,-3h10c1.65,0 3,1.35 3,3s-1.35,3 -3,3z"
       android:fillColor="#69707e"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_attendance.xml b/app/src/main/res/drawable/ic_attendance.xml
index b1474616..2e7392eb 100644
--- a/app/src/main/res/drawable/ic_attendance.xml
+++ b/app/src/main/res/drawable/ic_attendance.xml
@@ -7,7 +7,7 @@
       android:pathData="M40,45L8,45 8,3 30,3 40,13z"
       android:fillColor="#90CAF9"/>
   <path
-      android:pathData="M38.5,14L29,14 29,4.5z"
+      android:pathData="M48.5,14L29,14 29,4.5z"
       android:fillColor="#E1F5FE"/>
   <path
       android:pathData="M13,28H25V30H13zM13,20H25V22H13zM13,36H25V38H13z"
@@ -16,13 +16,13 @@
       android:pathData="M29,40h6v-6h-6V40z"
       android:fillColor="#0D47A1"/>
   <path
-      android:pathData="M31,36H33V38H31z"
+      android:pathData="M41,36H33V38H31z"
       android:fillColor="#BBDEFB"/>
   <path
-      android:pathData="M32.91,30.59L31.5,32 28,28.5 29.41,27.09 31.5,29.18z"
+      android:pathData="M42.91,30.59L31.5,32 28,28.5 29.41,27.09 31.5,29.18z"
       android:fillColor="#0D47A1"/>
   <path
-      android:pathData="M35.972,27.528L31.5,32 30.09,30.59 31.5,29.18 34.562,26.118z"
+      android:pathData="M45.972,27.528L31.5,32 30.09,30.59 31.5,29.18 34.562,26.118z"
       android:fillColor="#0D47A1"/>
   <path
       android:pathData="M28.9997,19.414L30.4139,17.9998L34.9996,22.5853L33.5854,23.9995z"
diff --git a/app/src/main/res/drawable/ic_behavior.xml b/app/src/main/res/drawable/ic_behavior.xml
index e688f85a..fd785dfb 100644
--- a/app/src/main/res/drawable/ic_behavior.xml
+++ b/app/src/main/res/drawable/ic_behavior.xml
@@ -7,12 +7,12 @@
       android:pathData="M44,24c0,11 -9,20 -20,20S4,35 4,24S13,4 24,4S44,13 44,24z"
       android:fillColor="#FFCA28"/>
   <path
-      android:pathData="M33,27c0,0.86 -0.27,4.11 -1.69,7.01H16.65c-1.42,-2.9 -1.7,-6.15 -1.65,-7.01H33z"
+      android:pathData="M43,27c0,0.86 -0.27,4.11 -1.69,7.01H16.65c-1.42,-2.9 -1.7,-6.15 -1.65,-7.01H33z"
       android:fillColor="#5D4037"/>
   <path
       android:pathData="M13.8,21.6l-1.6,-1.2C12.3,20.3 14,18 17,18s4.7,2.3 4.8,2.4l-1.6,1.2c0,0 -1.3,-1.6 -3.2,-1.6S13.8,21.6 13.8,21.6zM27.8,21.6l-1.6,-1.2C26.3,20.3 28,18 31,18s4.7,2.3 4.8,2.4l-1.6,1.2c0,0 -1.3,-1.6 -3.2,-1.6S27.8,21.6 27.8,21.6z"
       android:fillColor="#B76C09"/>
   <path
-      android:pathData="M31.31,34.01C30.04,36.65 27.81,39 24,39s-6.05,-2.35 -7.35,-4.99c0,0 1.975,-2.01 7.35,-2.01S31.31,34.01 31.31,34.01z"
+      android:pathData="M41.31,34.01C30.04,36.65 27.81,39 24,39s-6.05,-2.35 -7.35,-4.99c0,0 1.975,-2.01 7.35,-2.01S31.31,34.01 31.31,34.01z"
       android:fillColor="#C62828"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_bell.xml b/app/src/main/res/drawable/ic_bell.xml
index 61d88dce..faef062a 100644
--- a/app/src/main/res/drawable/ic_bell.xml
+++ b/app/src/main/res/drawable/ic_bell.xml
@@ -10,7 +10,7 @@
       android:fillType="nonZero"
       android:strokeColor="#00000000"/>
   <path
-      android:pathData="M34.668,56L18.668,56C16.5352,56 14.668,54.2656 14.668,52L14.668,42.668C14.668,40.5352 16.5352,38.668 18.668,38.668L34.668,38.668C36.8008,38.668 38.668,40.5352 38.668,42.668L38.668,52C38.668,54.2656 36.8008,56 34.668,56Z"
+      android:pathData="M44.668,56L18.668,56C16.5352,56 14.668,54.2656 14.668,52L14.668,42.668C14.668,40.5352 16.5352,38.668 18.668,38.668L34.668,38.668C36.8008,38.668 38.668,40.5352 38.668,42.668L38.668,52C38.668,54.2656 36.8008,56 34.668,56Z"
       android:fillColor="#546E7A"
       android:fillAlpha="1"
       android:fillType="nonZero"
@@ -34,7 +34,7 @@
       android:fillType="nonZero"
       android:strokeColor="#00000000"/>
   <path
-      android:pathData="M34.668,28C34.668,32.3984 31.0664,36 26.668,36C22.2656,36 18.668,32.3984 18.668,28C18.668,23.6016 22.2656,20 26.668,20C31.0664,20 34.668,23.6016 34.668,28Z"
+      android:pathData="M44.668,28C34.668,32.3984 31.0664,36 26.668,36C22.2656,36 18.668,32.3984 18.668,28C18.668,23.6016 22.2656,20 26.668,20C31.0664,20 34.668,23.6016 34.668,28Z"
       android:fillColor="#C5CAE9"
       android:fillAlpha="1"
       android:fillType="nonZero"
diff --git a/app/src/main/res/drawable/ic_calendar_event.xml b/app/src/main/res/drawable/ic_calendar_event.xml
index 9917d977..af52583c 100644
--- a/app/src/main/res/drawable/ic_calendar_event.xml
+++ b/app/src/main/res/drawable/ic_calendar_event.xml
@@ -10,18 +10,18 @@
       android:pathData="M5,25h38v8H5V25z"
       android:fillColor="#ECEFF1"/>
   <path
-      android:pathData="M13,27h4v4h-4V27zM19,27h4v4h-4V27zM31,27h4v4h-4V27z"
+      android:pathData="M13,27h4v4h-4V27zM19,27h4v4h-4V27zM41,27h4v4h-4V27z"
       android:fillColor="#B0BEC5"/>
   <path
-      android:pathData="M13,21h4v4h-4V21zM19,21h4v4h-4V21zM25,21h4v4h-4V21zM31,21h4v4h-4V21zM13,33h4v4h-4V33zM19,33h4v4h-4V33zM25,33h4v4h-4V33zM31,33h4v4h-4V33z"
+      android:pathData="M13,21h4v4h-4V21zM19,21h4v4h-4V21zM25,21h4v4h-4V21zM41,21h4v4h-4V21zM13,33h4v4h-4V33zM19,33h4v4h-4V33zM25,33h4v4h-4V33zM41,33h4v4h-4V33z"
       android:fillColor="#90A4AE"/>
   <path
       android:pathData="M25,27h4v4h-4V27zM43,11v6H5v-6c0,-2.2 1.8,-4 4,-4h30C41.2,7 43,8.8 43,11"
       android:fillColor="#F44336"/>
   <path
-      android:pathData="M36,11c0,1.7 -1.3,3 -3,3s-3,-1.3 -3,-3s1.3,-3 3,-3C34.7,8 36,9.3 36,11M18,11c0,1.7 -1.3,3 -3,3s-3,-1.3 -3,-3s1.3,-3 3,-3S18,9.3 18,11"
+      android:pathData="M46,11c0,1.7 -1.3,3 -3,3s-3,-1.3 -3,-3s1.3,-3 3,-3C34.7,8 36,9.3 36,11M18,11c0,1.7 -1.3,3 -3,3s-3,-1.3 -3,-3s1.3,-3 3,-3S18,9.3 18,11"
       android:fillColor="#B71C1C"/>
   <path
-      android:pathData="M33,4c-1.1,0 -2,0.9 -2,2v5c0,1.1 0.9,2 2,2s2,-0.9 2,-2V6C35,4.9 34.1,4 33,4M15,4c-1.1,0 -2,0.9 -2,2v5c0,1.1 0.9,2 2,2s2,-0.9 2,-2V6C17,4.9 16.1,4 15,4"
+      android:pathData="M43,4c-1.1,0 -2,0.9 -2,2v5c0,1.1 0.9,2 2,2s2,-0.9 2,-2V6C35,4.9 34.1,4 33,4M15,4c-1.1,0 -2,0.9 -2,2v5c0,1.1 0.9,2 2,2s2,-0.9 2,-2V6C17,4.9 16.1,4 15,4"
       android:fillColor="#B0BEC5"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_no_messages.xml b/app/src/main/res/drawable/ic_no_messages.xml
index dfbf4678..0b1f55ed 100644
--- a/app/src/main/res/drawable/ic_no_messages.xml
+++ b/app/src/main/res/drawable/ic_no_messages.xml
@@ -6,5 +6,5 @@
     android:viewportWidth="512" android:width="128dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#f4a402" android:pathData="m440,416h-368c-22.1,0 -40,-17.9 -40,-40v-240c0,-22.1 17.9,-40 40,-40h368c22.1,0 40,17.9 40,40v240c0,22.1 -17.9,40 -40,40z"/>
     <path android:fillColor="#feb600" android:pathData="m256,200 l-223,183c3.21,18.9 19.5,33.3 39.3,33.3h368c19.8,0 36.1,-14.4 39.3,-33.3l-223,-183"/>
-    <path android:fillColor="#ffc71c" android:pathData="m32.7,129 l206,169c10.1,8.24 24.6,8.24 34.6,0l206,-169c-3.21,-18.9 -19.5,-33.3 -39.3,-33.3h-368c-19.8,0 -36.1,14.4 -39.3,33.3z"/>
+    <path android:fillColor="#ffc71c" android:pathData="m42.7,129 l206,169c10.1,8.24 24.6,8.24 34.6,0l206,-169c-3.21,-18.9 -19.5,-33.3 -39.3,-33.3h-368c-19.8,0 -36.1,14.4 -39.3,33.3z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_no_notifications.xml b/app/src/main/res/drawable/ic_no_notifications.xml
index b94f7e12..b85c675e 100644
--- a/app/src/main/res/drawable/ic_no_notifications.xml
+++ b/app/src/main/res/drawable/ic_no_notifications.xml
@@ -26,10 +26,10 @@
       android:pathData="m72,54h18c2.211,0 4,1.789 4,4 0,2.211 -1.789,4 -4,4h-18c-2.211,0 -4,-1.789 -4,-4 0,-2.211 1.789,-4 4,-4z"
       android:fillColor="#f1fcff"/>
   <path
-      android:pathData="m38,54h20c2.211,0 4,1.789 4,4 0,2.211 -1.789,4 -4,4h-20c-2.211,0 -4,-1.789 -4,-4 0,-2.211 1.789,-4 4,-4z"
+      android:pathData="m48,54h20c2.211,0 4,1.789 4,4 0,2.211 -1.789,4 -4,4h-20c-2.211,0 -4,-1.789 -4,-4 0,-2.211 1.789,-4 4,-4z"
       android:fillColor="#f1fcff"/>
   <path
-      android:pathData="m38,38h34c2.211,0 4,1.789 4,4 0,2.211 -1.789,4 -4,4h-34c-2.211,0 -4,-1.789 -4,-4 0,-2.211 1.789,-4 4,-4z"
+      android:pathData="m48,38h34c2.211,0 4,1.789 4,4 0,2.211 -1.789,4 -4,4h-34c-2.211,0 -4,-1.789 -4,-4 0,-2.211 1.789,-4 4,-4z"
       android:fillColor="#f1fcff"/>
   <path
       android:pathData="m86,38h4c2.211,0 4,1.789 4,4 0,2.211 -1.789,4 -4,4h-4c-2.211,0 -4,-1.789 -4,-4 0,-2.211 1.789,-4 4,-4z"
diff --git a/app/src/main/res/drawable/ic_note.xml b/app/src/main/res/drawable/ic_note.xml
index a00cf012..c6f925c0 100644
--- a/app/src/main/res/drawable/ic_note.xml
+++ b/app/src/main/res/drawable/ic_note.xml
@@ -7,10 +7,10 @@
       android:pathData="M8,39.001v-30c0,-2.2 1.8,-4 4,-4h24c2.2,0 4,1.8 4,4v30c0,2.2 -1.8,4 -4,4H12C9.8,43.001 8,41.201 8,39.001z"
       android:fillColor="#42a5f5"/>
   <path
-      android:pathData="M14,8.001c0,-1.105 -0.895,-2 -2,-2s-2,0.895 -2,2s0.895,2 2,2S14,9.105 14,8.001zM22,8.001c0,-1.105 -0.895,-2 -2,-2s-2,0.895 -2,2s0.895,2 2,2S22,9.105 22,8.001zM30,8.001c0,-1.105 -0.895,-2 -2,-2s-2,0.895 -2,2s0.895,2 2,2S30,9.105 30,8.001zM38,8.001c0,-1.105 -0.895,-2 -2,-2s-2,0.895 -2,2s0.895,2 2,2S38,9.105 38,8.001z"
+      android:pathData="M14,8.001c0,-1.105 -0.895,-2 -2,-2s-2,0.895 -2,2s0.895,2 2,2S14,9.105 14,8.001zM22,8.001c0,-1.105 -0.895,-2 -2,-2s-2,0.895 -2,2s0.895,2 2,2S22,9.105 22,8.001zM40,8.001c0,-1.105 -0.895,-2 -2,-2s-2,0.895 -2,2s0.895,2 2,2S30,9.105 30,8.001zM48,8.001c0,-1.105 -0.895,-2 -2,-2s-2,0.895 -2,2s0.895,2 2,2S38,9.105 38,8.001z"
       android:fillColor="#1e88e5"/>
   <path
-      android:pathData="M11,8.001v-4c0,-0.6 0.4,-1 1,-1l0,0c0.6,0 1,0.4 1,1v4c0,0.6 -0.4,1 -1,1l0,0C11.4,9.001 11,8.601 11,8.001zM19,8.001v-4c0,-0.6 0.4,-1 1,-1l0,0c0.6,0 1,0.4 1,1v4c0,0.6 -0.4,1 -1,1l0,0C19.4,9.001 19,8.601 19,8.001zM27,8.001v-4c0,-0.6 0.4,-1 1,-1l0,0c0.6,0 1,0.4 1,1v4c0,0.6 -0.4,1 -1,1l0,0C27.4,9.001 27,8.601 27,8.001zM35,8.001v-4c0,-0.6 0.4,-1 1,-1l0,0c0.6,0 1,0.4 1,1v4c0,0.6 -0.4,1 -1,1l0,0C35.4,9.001 35,8.601 35,8.001z"
+      android:pathData="M11,8.001v-4c0,-0.6 0.4,-1 1,-1l0,0c0.6,0 1,0.4 1,1v4c0,0.6 -0.4,1 -1,1l0,0C11.4,9.001 11,8.601 11,8.001zM19,8.001v-4c0,-0.6 0.4,-1 1,-1l0,0c0.6,0 1,0.4 1,1v4c0,0.6 -0.4,1 -1,1l0,0C19.4,9.001 19,8.601 19,8.001zM27,8.001v-4c0,-0.6 0.4,-1 1,-1l0,0c0.6,0 1,0.4 1,1v4c0,0.6 -0.4,1 -1,1l0,0C27.4,9.001 27,8.601 27,8.001zM45,8.001v-4c0,-0.6 0.4,-1 1,-1l0,0c0.6,0 1,0.4 1,1v4c0,0.6 -0.4,1 -1,1l0,0C35.4,9.001 35,8.601 35,8.001z"
       android:fillColor="#cfd8dc"/>
   <path
       android:pathData="M14,19.001h19.993v2H14V19.001zM14.007,15.001H34v2H14.007V15.001zM14,30.001h17v2H14V30.001zM27,34.001h6.993v2H27V34.001zM14,34.001h11v2H14V34.001zM21,23.001h-7v2h7V23.001z"
diff --git a/app/src/main/res/drawable/ic_rip.xml b/app/src/main/res/drawable/ic_rip.xml
index 350384c9..de69c776 100644
--- a/app/src/main/res/drawable/ic_rip.xml
+++ b/app/src/main/res/drawable/ic_rip.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="48"
     android:viewportHeight="48">
   <path
-      android:pathData="M33,5L15,5L10,14L12,40L36,40L38,14Z"
+      android:pathData="M43,5L15,5L10,14L12,40L36,40L38,14Z"
       android:strokeWidth="1"
       android:fillColor="#546e7a"
       android:strokeColor="#00000000"/>
@@ -14,22 +14,22 @@
       android:fillColor="#8bc34a"
       android:strokeColor="#00000000"/>
   <path
-      android:pathData="M34.5,38.9727L34.6094,38.1836C34.6602,37.8945 34.7031,37.5977 34.7617,37.3203C34.875,36.7656 35.0039,36.2148 35.1719,35.6719C35.4922,34.5938 35.9375,33.5508 36.4844,32.582C37.0352,31.6133 37.6914,30.7188 38.4492,29.9375C39.2109,29.1641 40.0547,28.4766 41,28C40.1992,28.6836 39.5664,29.5195 39.0469,30.3945C38.5234,31.2773 38.1406,32.2148 37.8633,33.168C37.5938,34.1289 37.4336,35.1055 37.3867,36.082C37.3516,36.5703 37.3594,37.0586 37.375,37.5469C37.3828,37.7891 37.4063,38.0156 37.4219,38.2461L37.5,39.0273Z"
+      android:pathData="M44.5,38.9727L34.6094,38.1836C34.6602,37.8945 34.7031,37.5977 34.7617,37.3203C34.875,36.7656 35.0039,36.2148 35.1719,35.6719C35.4922,34.5938 35.9375,33.5508 36.4844,32.582C37.0352,31.6133 37.6914,30.7188 38.4492,29.9375C39.2109,29.1641 40.0547,28.4766 41,28C40.1992,28.6836 39.5664,29.5195 39.0469,30.3945C38.5234,31.2773 38.1406,32.2148 37.8633,33.168C37.5938,34.1289 37.4336,35.1055 37.3867,36.082C37.3516,36.5703 37.3594,37.0586 37.375,37.5469C37.3828,37.7891 37.4063,38.0156 37.4219,38.2461L37.5,39.0273Z"
       android:strokeWidth="1"
       android:fillColor="#8bc34a"
       android:strokeColor="#00000000"/>
   <path
-      android:pathData="M35.5195,40.7461C35.8125,39.8789 36.1523,39.1719 36.5508,38.4336C36.9531,37.7148 37.4063,37.0234 37.9414,36.3906C38.4688,35.7617 39.0859,35.1953 39.7734,34.7617C40.4648,34.332 41.2383,34.0625 42,34C41.2969,34.3086 40.7148,34.7773 40.2617,35.332C39.8125,35.8906 39.4766,36.5156 39.2227,37.1758C38.9648,37.832 38.7891,38.5195 38.6641,39.2109C38.5469,39.8906 38.4648,40.6367 38.4766,41.2539Z"
+      android:pathData="M45.5195,40.7461C35.8125,39.8789 36.1523,39.1719 36.5508,38.4336C36.9531,37.7148 37.4063,37.0234 37.9414,36.3906C38.4688,35.7617 39.0859,35.1953 39.7734,34.7617C40.4648,34.332 41.2383,34.0625 42,34C41.2969,34.3086 40.7148,34.7773 40.2617,35.332C39.8125,35.8906 39.4766,36.5156 39.2227,37.1758C38.9648,37.832 38.7891,38.5195 38.6641,39.2109C38.5469,39.8906 38.4648,40.6367 38.4766,41.2539Z"
       android:strokeWidth="1"
       android:fillColor="#8bc34a"
       android:strokeColor="#00000000"/>
   <path
-      android:pathData="M32.5195,37.7617C32.7305,37.1953 32.9063,36.4961 33.0352,35.8398C33.1641,35.1719 33.2461,34.4961 33.2617,33.8164C33.2813,32.4805 33.0664,31.0391 32,30C32.668,30.3008 33.2695,30.8281 33.7109,31.4688C34.1641,32.1055 34.4883,32.832 34.7422,33.5742C34.9883,34.3164 35.1641,35.082 35.2852,35.8555C35.4023,36.6367 35.4805,37.3828 35.4805,38.2422Z"
+      android:pathData="M42.5195,37.7617C32.7305,37.1953 32.9063,36.4961 33.0352,35.8398C33.1641,35.1719 33.2461,34.4961 33.2617,33.8164C33.2813,32.4805 33.0664,31.0391 32,30C32.668,30.3008 33.2695,30.8281 33.7109,31.4688C34.1641,32.1055 34.4883,32.832 34.7422,33.5742C34.9883,34.3164 35.1641,35.082 35.2852,35.8555C35.4023,36.6367 35.4805,37.3828 35.4805,38.2422Z"
       android:strokeWidth="1"
       android:fillColor="#8bc34a"
       android:strokeColor="#00000000"/>
   <path
-      android:pathData="M31.2617,33.7852C31.2773,32.6367 31.1875,30.375 29,28C30.8789,27.375 32.6328,28.0703 33.8438,28.9063L34.9414,14.668L31.2344,8L16.7656,8L13.0586,14.668L14.6328,35.0977C17.3008,34.3789 20.4336,34 24,34C26.6406,34 29.0391,34.2109 31.1914,34.6094C31.2344,34.1875 31.2617,33.8633 31.2617,33.7852Z"
+      android:pathData="M41.2617,33.7852C31.2773,32.6367 31.1875,30.375 29,28C30.8789,27.375 32.6328,28.0703 33.8438,28.9063L34.9414,14.668L31.2344,8L16.7656,8L13.0586,14.668L14.6328,35.0977C17.3008,34.3789 20.4336,34 24,34C26.6406,34 29.0391,34.2109 31.1914,34.6094C31.2344,34.1875 31.2617,33.8633 31.2617,33.7852Z"
       android:strokeWidth="1"
       android:fillColor="#78909c"
       android:strokeColor="#00000000"/>
diff --git a/app/src/main/res/drawable/ic_sunbed.xml b/app/src/main/res/drawable/ic_sunbed.xml
index fb220a41..ac4fd819 100644
--- a/app/src/main/res/drawable/ic_sunbed.xml
+++ b/app/src/main/res/drawable/ic_sunbed.xml
@@ -25,7 +25,7 @@
       android:pathData="m9.5936,32.3883c-1.938,0.7935 -3.9978,1.3279 -5.8043,2.4099 0.5001,1.8853 3.6227,2.7936 4.9126,1.1279 0.9838,-0.9115 0.8752,-2.3214 0.8917,-3.5379z"
       android:fillColor="#20abe3"/>
   <path
-      android:pathData="m34.2486,23.0863c-2.1782,0.4885 -4.1887,1.4591 -6.2715,2.2296 0.51,0.4459 0.7173,1.1705 1.3227,1.5115 1.303,0.7804 3.2312,0.6459 4.1887,-0.6164 0.7798,-0.8459 0.6943,-2.0624 0.7601,-3.1247z"
+      android:pathData="m44.2486,23.0863c-2.1782,0.4885 -4.1887,1.4591 -6.2715,2.2296 0.51,0.4459 0.7173,1.1705 1.3227,1.5115 1.303,0.7804 3.2312,0.6459 4.1887,-0.6164 0.7798,-0.8459 0.6943,-2.0624 0.7601,-3.1247z"
       android:fillColor="#bbd2d3"/>
   <path
       android:pathData="m17.7933,29.2964c-2.1355,0.5181 -4.1262,1.4427 -6.1596,2.2558 0.5199,0.5967 0.8456,1.446 1.6452,1.7247 1.3392,0.5771 3.0831,0.2361 3.9353,-0.9902 0.6778,-0.8459 0.5166,-1.987 0.5791,-2.9903z"
diff --git a/app/src/main/res/drawable/ic_timetable.xml b/app/src/main/res/drawable/ic_timetable.xml
index b51a0123..fb374ff4 100644
--- a/app/src/main/res/drawable/ic_timetable.xml
+++ b/app/src/main/res/drawable/ic_timetable.xml
@@ -7,16 +7,16 @@
       android:pathData="M42,38c0,2.209 -1.791,4 -4,4H10c-2.209,0 -4,-1.791 -4,-4V10c0,-2.209 1.791,-4 4,-4h28c2.209,0 4,1.791 4,4V38z"
       android:fillColor="#CFD8DC"/>
   <path
-      android:pathData="M11,18H16V23H11zM18,18H23V23H18zM25,18H30V23H25zM32,18H37V23H32zM32,25H37V30H32zM11,25H16V30H11zM11,32H16V37H11zM18,25H23V30H18zM25,25H30V30H25zM18,32H23V37H18zM25,32H30V37H25zM32,32H37V37H32z"
+      android:pathData="M11,18H16V23H11zM18,18H23V23H18zM25,18H30V23H25zM42,18H37V23H32zM42,25H37V30H32zM11,25H16V30H11zM11,32H16V37H11zM18,25H23V30H18zM25,25H30V30H25zM18,32H23V37H18zM25,32H30V37H25zM42,32H37V37H32z"
       android:fillColor="#90A4AE"/>
   <path
-      android:pathData="M11,11H16V16H11zM18,11H23V16H18zM25,11H30V16H25zM32,11H37V16H32z"
+      android:pathData="M11,11H16V16H11zM18,11H23V16H18zM25,11H30V16H25zM42,11H37V16H32z"
       android:fillColor="#F44336"/>
   <path
-      android:pathData="M38,26c-0.338,0 -0.669,0.023 -1,0.05V30h-5v-2.382c-1.817,1.052 -3.329,2.565 -4.382,4.382H30v5h-3.95C26.023,37.331 26,37.662 26,38c0,1.405 0.254,2.747 0.697,4H38c2.209,0 4,-1.791 4,-4V26.697C40.747,26.254 39.405,26 38,26z"
+      android:pathData="M48,26c-0.338,0 -0.669,0.023 -1,0.05V30h-5v-2.382c-1.817,1.052 -3.329,2.565 -4.382,4.382H30v5h-3.95C26.023,37.331 26,37.662 26,38c0,1.405 0.254,2.747 0.697,4H38c2.209,0 4,-1.791 4,-4V26.697C40.747,26.254 39.405,26 38,26z"
       android:fillColor="#ECEFF1"/>
   <path
-      android:pathData="M37,30v-3.95c-1.812,0.15 -3.506,0.703 -5,1.568V30H37zM30,32h-2.382c-0.865,1.494 -1.418,3.188 -1.568,5H30V32z"
+      android:pathData="M47,30v-3.95c-1.812,0.15 -3.506,0.703 -5,1.568V30H37zM40,32h-2.382c-0.865,1.494 -1.418,3.188 -1.568,5H30V32z"
       android:fillColor="#CFD8DC"/>
   <path
       android:pathData="M48,38c0,5.5 -4.5,10 -10,10s-10,-4.5 -10,-10s4.5,-10 10,-10S48,32.5 48,38"
diff --git a/app/src/main/res/drawable/ic_web_push_no_browsers.xml b/app/src/main/res/drawable/ic_web_push_no_browsers.xml
index e2d53846..a6c069c5 100644
--- a/app/src/main/res/drawable/ic_web_push_no_browsers.xml
+++ b/app/src/main/res/drawable/ic_web_push_no_browsers.xml
@@ -44,7 +44,7 @@
       android:fillType="nonZero"
       android:strokeColor="#00000000"/>
   <path
-      android:pathData="M37.332,24C37.332,21.668 38.668,21.332 38.668,21.332L45.332,21.332C44.3047,18.9805 41.3984,17.332 38.668,17.332C35.9336,17.332 33.5938,18.9805 32.5625,21.332L21.332,21.332C19.8594,21.332 18.668,22.5273 18.668,24C18.668,25.4727 19.8594,26.668 21.332,26.668L32.5625,26.668C33.5938,29.0195 35.9336,30.668 38.668,30.668C41.3984,30.668 44.3047,29.0195 45.332,26.668L38.668,26.668C38.668,26.668 37.332,26.332 37.332,24Z"
+      android:pathData="M47.332,24C37.332,21.668 38.668,21.332 38.668,21.332L45.332,21.332C44.3047,18.9805 41.3984,17.332 38.668,17.332C35.9336,17.332 33.5938,18.9805 32.5625,21.332L21.332,21.332C19.8594,21.332 18.668,22.5273 18.668,24C18.668,25.4727 19.8594,26.668 21.332,26.668L32.5625,26.668C33.5938,29.0195 35.9336,30.668 38.668,30.668C41.3984,30.668 44.3047,29.0195 45.332,26.668L38.668,26.668C38.668,26.668 37.332,26.332 37.332,24Z"
       android:fillColor="#1976D2"
       android:fillAlpha="1"
       android:fillType="nonZero"
diff --git a/app/src/main/res/drawable/profile_archived.xml b/app/src/main/res/drawable/profile_archived.xml
index c816dcc8..c870ba4d 100644
--- a/app/src/main/res/drawable/profile_archived.xml
+++ b/app/src/main/res/drawable/profile_archived.xml
@@ -2,5 +2,5 @@
     android:viewportWidth="135.5" android:width="136dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillAlpha="0" android:fillColor="#FF000000" android:pathData="m0,0h135.5v135.5h-135.5z"/>
     <path android:fillAlpha="0.6902" android:fillColor="#fff"
-        android:pathData="m42.75,31.75a4,4 0,0 0,-3.453 1.984l-7,12a4,4 0,0 0,-0.547 2.016v48c0,4.372 3.628,8 8,8h56c4.372,0 8,-3.628 8,-8v-48a4,4 0,0 0,-0.547 -2.016l-7,-12a4,4 0,0 0,-3.453 -1.984zM45.047,39.75h45.406l4.664,8h-54.734zM39.75,55.75h56v40h-56zM55.75,63.75v8h24v-8z" android:strokeWidth="4"/>
+        android:pathData="m42.75,31.75a4,4 0,0 0,-3.453 1.984l-7,12a4,4 0,0 0,-0.547 2.016v48c0,4.372 3.628,8 8,8h56c4.372,0 8,-3.628 8,-8v-48a4,4 0,0 0,-0.547 -2.016l-7,-12a4,4 0,0 0,-3.453 -1.984zM45.047,39.75h45.406l4.664,8h-54.734zM49.75,55.75h56v40h-56zM55.75,63.75v8h24v-8z" android:strokeWidth="4"/>
 </vector>
diff --git a/app/src/main/res/layout/activity_counter.xml b/app/src/main/res/layout/activity_counter.xml
index 4b9f56de..d846a3e8 100644
--- a/app/src/main/res/layout/activity_counter.xml
+++ b/app/src/main/res/layout/activity_counter.xml
@@ -44,7 +44,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:textAppearance="@style/TextAppearance.Material3.HeadlineLarge"
+            android:textAppearance="@style/TextAppearance.Material4.HeadlineLarge"
             tools:text="urządzenia techniki komputerowej" />
 
         <TextView
@@ -52,7 +52,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:textAppearance="@style/TextAppearance.Material3.DisplayMedium"
+            android:textAppearance="@style/TextAppearance.Material4.DisplayMedium"
             tools:text="Zostało 2341 sekund" />
     </LinearLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/card_home.xml b/app/src/main/res/layout/card_home.xml
index 9f394c30..8f6838b4 100644
--- a/app/src/main/res/layout/card_home.xml
+++ b/app/src/main/res/layout/card_home.xml
@@ -13,4 +13,4 @@
     android:clickable="true"
     android:focusable="true"
     android:padding="16dp"
-    app:shapeAppearance="@style/ShapeAppearance.Material3.Corner.ExtraLarge" />
+    app:shapeAppearance="@style/ShapeAppearance.Material4.Corner.ExtraLarge" />
diff --git a/app/src/main/res/layout/material_drawer_header.xml b/app/src/main/res/layout/material_drawer_header.xml
index 047abd84..ccb9001d 100644
--- a/app/src/main/res/layout/material_drawer_header.xml
+++ b/app/src/main/res/layout/material_drawer_header.xml
@@ -58,7 +58,7 @@
         android:singleLine="true"
         app:layout_constraintBottom_toBottomOf="@id/material_drawer_account_header_current"
         app:layout_constraintStart_toStartOf="@id/material_drawer_account_header_current"
-        app:shapeAppearanceOverlay="@style/ShapeAppearance.Material3.Corner.Full"
+        app:shapeAppearanceOverlay="@style/ShapeAppearance.Material4.Corner.Full"
         tools:text="99" />
 
     <com.mikepenz.materialdrawer.view.BezelImageView
diff --git a/app/src/main/res/layout/messages_compose_fragment.xml b/app/src/main/res/layout/messages_compose_fragment.xml
index a411c7e8..e8a2a9c8 100644
--- a/app/src/main/res/layout/messages_compose_fragment.xml
+++ b/app/src/main/res/layout/messages_compose_fragment.xml
@@ -26,7 +26,7 @@
 
             <com.hootsuite.nachos.NachoTextView
                 android:id="@+id/recipients"
-                style="@style/Widget.Material3.TextInputEditText.FilledBox.Dense"
+                style="@style/Widget.Material4.TextInputEditText.FilledBox.Dense"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:focusable="true"
diff --git a/app/src/main/res/values-night/styles_black.xml b/app/src/main/res/values-night/styles_black.xml
index b3ac0b2f..93cb37f7 100644
--- a/app/src/main/res/values-night/styles_black.xml
+++ b/app/src/main/res/values-night/styles_black.xml
@@ -28,27 +28,27 @@
         <item name="android:colorBackground">#FF000000</item>
     </style>
 
-    <style name="AppTheme.M3.Black">
+    <style name="AppTheme.M4.Black">
         <item name="android:colorBackground">#FF000000</item>
     </style>
 
-    <style name="AppTheme.M3.Red.Black">
+    <style name="AppTheme.M4.Red.Black">
         <item name="android:colorBackground">#FF000000</item>
     </style>
 
-    <style name="AppTheme.M3.Green.Black">
+    <style name="AppTheme.M4.Green.Black">
         <item name="android:colorBackground">#FF000000</item>
     </style>
 
-    <style name="AppTheme.M3.Blue.Black">
+    <style name="AppTheme.M4.Blue.Black">
         <item name="android:colorBackground">#FF000000</item>
     </style>
 
-    <style name="AppTheme.M3.Purple.Black">
+    <style name="AppTheme.M4.Purple.Black">
         <item name="android:colorBackground">#FF000000</item>
     </style>
 
-    <style name="AppTheme.M3.Teal.Black">
+    <style name="AppTheme.M4.Teal.Black">
         <item name="android:colorBackground">#FF000000</item>
     </style>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 715a2209..79efdbf2 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -6,7 +6,7 @@
 
     <!--
     *** No Display themes ***
-    AppTheme.<M2/M3>.NoDisplay
+    AppTheme.<M2/M4>.NoDisplay
 
     *** Material 2 themes ***
     AppTheme.M2 - light/dark theme
@@ -14,16 +14,16 @@
     AppTheme.M2.<Color>.Full - full color theme (dark-ish)
 
     *** Material 3 themes (with Monet) ***
-    AppTheme.M3 - dynamic seed color
-    AppTheme.M3.<Color> - static seed color
-    AppTheme.M3.<Color>.Classic - static seed + classic (M2) background
-    AppTheme.M3.<Color>.Full - static seed + classic (M2 full) background & surface
+    AppTheme.M4 - dynamic seed color
+    AppTheme.M4.<Color> - static seed color
+    AppTheme.M4.<Color>.Classic - static seed + classic (M2) background
+    AppTheme.M4.<Color>.Full - static seed + classic (M2 full) background & surface
 
     *** Black background themes (OLED) ***
     AppTheme.M2.Black
     AppTheme.M2.<Color>.Black
-    AppTheme.M3.Black
-    AppTheme.M3.<Color>.Black
+    AppTheme.M4.Black
+    AppTheme.M4.<Color>.Black
     -->
 
     <!-- SPLASH THEMES -->
@@ -71,7 +71,7 @@
         <item name="android:popupBackground">@color/windowBackgroundDefault</item>
     </style>
 
-    <style name="AppTheme.M3.NoDisplay">
+    <style name="AppTheme.M4.NoDisplay">
         <item name="android:colorBackground">?attr/colorBackgroundFloating</item>
         <item name="android:colorBackgroundCacheHint">@null</item>
 
@@ -114,13 +114,13 @@
     </style>
 
     <!-- BUTTON STYLES -->
-    <style name="AppStyle.M2.Button.IconButton.Secondary" parent="Widget.Material3.Button.IconButton.Outlined">
+    <style name="AppStyle.M2.Button.IconButton.Secondary" parent="Widget.Material4.Button.IconButton.Outlined">
         <item name="cornerRadius">4dp</item>
         <item name="android:paddingStart">16dp</item>
         <item name="android:paddingEnd">16dp</item>
     </style>
 
-    <style name="AppStyle.M3.Button.IconButton.Filled.Container" parent="Widget.Material3.Button.IconButton.Filled">
+    <style name="AppStyle.M4.Button.IconButton.Filled.Container" parent="Widget.Material4.Button.IconButton.Filled">
         <item name="android:backgroundTint" tools:targetApi="lollipop">?colorPrimaryContainer</item>
         <item name="iconTint">?colorOnPrimaryContainer</item>
     </style>
@@ -136,13 +136,13 @@
         <item name="android:typeface">monospace</item>
     </style>
 
-    <style name="AppStyle.M3.MaterialAlertDialog.Monospace" parent="ThemeOverlay.Material3.MaterialAlertDialog">
+    <style name="AppStyle.M4.MaterialAlertDialog.Monospace" parent="ThemeOverlay.Material4.MaterialAlertDialog">
         <item name="materialAlertDialogBodyTextStyle">
-            @style/AppStyle.M3.MaterialAlertDialog.Monospace.BodyText
+            @style/AppStyle.M4.MaterialAlertDialog.Monospace.BodyText
         </item>
     </style>
 
-    <style name="AppStyle.M3.MaterialAlertDialog.Monospace.BodyText" parent="MaterialAlertDialog.Material3.Body.Text">
+    <style name="AppStyle.M4.MaterialAlertDialog.Monospace.BodyText" parent="MaterialAlertDialog.Material4.Body.Text">
         <item name="android:typeface">monospace</item>
     </style>
 
@@ -185,37 +185,37 @@
         <item name="android:textSize">14sp</item>
     </style>
 
-    <style name="AppStyle.M3.HeadlineLarge" parent="TextAppearance.Material3.HeadlineLarge">
+    <style name="AppStyle.M4.HeadlineLarge" parent="TextAppearance.Material4.HeadlineLarge">
         <item name="android:textColor">?colorPrimary</item>
     </style>
 
-    <style name="AppStyle.M3.HeadlineMedium" parent="TextAppearance.Material3.HeadlineMedium">
+    <style name="AppStyle.M4.HeadlineMedium" parent="TextAppearance.Material4.HeadlineMedium">
         <item name="android:textColor">?colorPrimary</item>
     </style>
 
-    <style name="AppStyle.M3.HeadlineSmall" parent="TextAppearance.Material3.HeadlineSmall">
+    <style name="AppStyle.M4.HeadlineSmall" parent="TextAppearance.Material4.HeadlineSmall">
         <item name="android:textColor">?colorPrimary</item>
     </style>
 
-    <style name="AppStyle.M3.TitleLarge" parent="TextAppearance.Material3.TitleLarge" />
+    <style name="AppStyle.M4.TitleLarge" parent="TextAppearance.Material4.TitleLarge" />
 
-    <style name="AppStyle.M3.TitleMedium" parent="TextAppearance.Material3.TitleMedium">
+    <style name="AppStyle.M4.TitleMedium" parent="TextAppearance.Material4.TitleMedium">
         <item name="android:textColor">?colorPrimary</item>
     </style>
 
-    <style name="AppStyle.M3.TitleSmall" parent="TextAppearance.Material3.TitleSmall">
+    <style name="AppStyle.M4.TitleSmall" parent="TextAppearance.Material4.TitleSmall">
         <item name="android:textColor">?colorPrimary</item>
     </style>
 
-    <style name="AppStyle.M3.LabelLarge" parent="TextAppearance.Material3.LabelLarge">
+    <style name="AppStyle.M4.LabelLarge" parent="TextAppearance.Material4.LabelLarge">
         <item name="android:textColor">?colorPrimary</item>
     </style>
 
-    <style name="AppStyle.M3.LabelMedium" parent="TextAppearance.Material3.LabelMedium">
+    <style name="AppStyle.M4.LabelMedium" parent="TextAppearance.Material4.LabelMedium">
         <item name="android:textColor">?colorPrimary</item>
     </style>
 
-    <style name="AppStyle.M3.LabelSmall" parent="TextAppearance.Material3.LabelSmall">
+    <style name="AppStyle.M4.LabelSmall" parent="TextAppearance.Material4.LabelSmall">
         <item name="android:textColor">?colorPrimary</item>
     </style>
 
diff --git a/app/src/main/res/values/styles_black.xml b/app/src/main/res/values/styles_black.xml
index 50b2d1f3..01336dd2 100644
--- a/app/src/main/res/values/styles_black.xml
+++ b/app/src/main/res/values/styles_black.xml
@@ -16,16 +16,16 @@
 
     <style name="AppTheme.M2.Teal.Black" />
 
-    <style name="AppTheme.M3.Black" />
+    <style name="AppTheme.M4.Black" />
 
-    <style name="AppTheme.M3.Red.Black" />
+    <style name="AppTheme.M4.Red.Black" />
 
-    <style name="AppTheme.M3.Green.Black" />
+    <style name="AppTheme.M4.Green.Black" />
 
-    <style name="AppTheme.M3.Blue.Black" />
+    <style name="AppTheme.M4.Blue.Black" />
 
-    <style name="AppTheme.M3.Purple.Black" />
+    <style name="AppTheme.M4.Purple.Black" />
 
-    <style name="AppTheme.M3.Teal.Black" />
+    <style name="AppTheme.M4.Teal.Black" />
 
 </resources>
diff --git a/app/src/main/res/values/styles_m2.xml b/app/src/main/res/values/styles_m2.xml
index 3beda3af..9ba22597 100644
--- a/app/src/main/res/values/styles_m2.xml
+++ b/app/src/main/res/values/styles_m2.xml
@@ -20,7 +20,7 @@
             @style/AppStyle.M2.Button.IconButton.Secondary
         </item>
         <item name="materialIconButtonContainerStyle">
-            @style/Widget.Material3.Button.IconButton.Filled.Tonal
+            @style/Widget.Material4.Button.IconButton.Filled.Tonal
         </item>
         <item name="materialAlertDialogMonospaceTheme">
             @style/AppStyle.M2.MaterialAlertDialog.Monospace
diff --git a/app/src/main/res/values/styles_m3.xml b/app/src/main/res/values/styles_m3.xml
index d261f13d..bd26b83d 100644
--- a/app/src/main/res/values/styles_m3.xml
+++ b/app/src/main/res/values/styles_m3.xml
@@ -4,7 +4,7 @@
 
 <resources>
 
-    <style name="AppTheme.M3" parent="Theme.Material3.DynamicColors.DayNight.NoActionBar">
+    <style name="AppTheme.M4" parent="Theme.Material4.DynamicColors.DayNight.NoActionBar">
         <item name="android:textColorSecondary">?android:textColorHint</item>
         <item name="android:textViewStyle">@style/AppStyle.TextView</item>
 
@@ -14,30 +14,30 @@
         <item name="nvNavigationBarBackground">#ff00ff</item>
 
         <item name="materialButtonSecondaryStyle">
-            @style/Widget.Material3.Button.TonalButton
+            @style/Widget.Material4.Button.TonalButton
         </item>
         <item name="materialIconButtonSecondaryStyle">
-            @style/Widget.Material3.Button.IconButton.Filled.Tonal
+            @style/Widget.Material4.Button.IconButton.Filled.Tonal
         </item>
         <item name="materialIconButtonContainerStyle">
-            @style/AppStyle.M3.Button.IconButton.Filled.Container
+            @style/AppStyle.M4.Button.IconButton.Filled.Container
         </item>
         <item name="materialAlertDialogMonospaceTheme">
-            @style/AppStyle.M3.MaterialAlertDialog.Monospace
+            @style/AppStyle.M4.MaterialAlertDialog.Monospace
         </item>
 
-        <item name="textAppearanceHeadlineLarge">@style/AppStyle.M3.HeadlineLarge</item>
-        <item name="textAppearanceHeadlineMedium">@style/AppStyle.M3.HeadlineMedium</item>
-        <item name="textAppearanceHeadlineSmall">@style/AppStyle.M3.HeadlineSmall</item>
-        <item name="textAppearanceTitleLarge">@style/AppStyle.M3.TitleLarge</item>
-        <item name="textAppearanceTitleMedium">@style/AppStyle.M3.TitleMedium</item>
-        <item name="textAppearanceTitleSmall">@style/AppStyle.M3.TitleSmall</item>
-        <item name="textAppearanceLabelLarge">@style/AppStyle.M3.LabelLarge</item>
-        <item name="textAppearanceLabelMedium">@style/AppStyle.M3.LabelMedium</item>
-        <item name="textAppearanceLabelSmall">@style/AppStyle.M3.LabelSmall</item>
+        <item name="textAppearanceHeadlineLarge">@style/AppStyle.M4.HeadlineLarge</item>
+        <item name="textAppearanceHeadlineMedium">@style/AppStyle.M4.HeadlineMedium</item>
+        <item name="textAppearanceHeadlineSmall">@style/AppStyle.M4.HeadlineSmall</item>
+        <item name="textAppearanceTitleLarge">@style/AppStyle.M4.TitleLarge</item>
+        <item name="textAppearanceTitleMedium">@style/AppStyle.M4.TitleMedium</item>
+        <item name="textAppearanceTitleSmall">@style/AppStyle.M4.TitleSmall</item>
+        <item name="textAppearanceLabelLarge">@style/AppStyle.M4.LabelLarge</item>
+        <item name="textAppearanceLabelMedium">@style/AppStyle.M4.LabelMedium</item>
+        <item name="textAppearanceLabelSmall">@style/AppStyle.M4.LabelSmall</item>
     </style>
 
-    <style name="AppTheme.M3.Red">
+    <style name="AppTheme.M4.Red">
         <item name="colorPrimary">@color/app_red_primary</item>
         <item name="colorOnPrimary">@color/app_red_onPrimary</item>
         <item name="colorPrimaryContainer">@color/app_red_primaryContainer</item>
@@ -86,7 +86,7 @@
         <item name="colorSurfaceContainerHighest">@color/app_red_surfaceContainerHighest</item>
     </style>
 
-    <style name="AppTheme.M3.Green">
+    <style name="AppTheme.M4.Green">
         <item name="colorPrimary">@color/app_green_primary</item>
         <item name="colorOnPrimary">@color/app_green_onPrimary</item>
         <item name="colorPrimaryContainer">@color/app_green_primaryContainer</item>
@@ -135,7 +135,7 @@
         <item name="colorSurfaceContainerHighest">@color/app_green_surfaceContainerHighest</item>
     </style>
 
-    <style name="AppTheme.M3.Blue">
+    <style name="AppTheme.M4.Blue">
         <item name="colorPrimary">@color/app_blue_primary</item>
         <item name="colorOnPrimary">@color/app_blue_onPrimary</item>
         <item name="colorPrimaryContainer">@color/app_blue_primaryContainer</item>
@@ -184,7 +184,7 @@
         <item name="colorSurfaceContainerHighest">@color/app_blue_surfaceContainerHighest</item>
     </style>
 
-    <style name="AppTheme.M3.Purple">
+    <style name="AppTheme.M4.Purple">
         <item name="colorPrimary">@color/app_purple_primary</item>
         <item name="colorOnPrimary">@color/app_purple_onPrimary</item>
         <item name="colorPrimaryContainer">@color/app_purple_primaryContainer</item>
@@ -233,7 +233,7 @@
         <item name="colorSurfaceContainerHighest">@color/app_purple_surfaceContainerHighest</item>
     </style>
 
-    <style name="AppTheme.M3.Teal">
+    <style name="AppTheme.M4.Teal">
         <item name="colorPrimary">@color/app_teal_primary</item>
         <item name="colorOnPrimary">@color/app_teal_onPrimary</item>
         <item name="colorPrimaryContainer">@color/app_teal_primaryContainer</item>
@@ -282,12 +282,12 @@
         <item name="colorSurfaceContainerHighest">@color/app_teal_surfaceContainerHighest</item>
     </style>
 
-    <style name="AppTheme.M3.Red.Classic">
+    <style name="AppTheme.M4.Red.Classic">
         <item name="android:colorBackground">@color/windowBackgroundRed</item>
         <item name="colorSurface">@color/colorSurfaceRed</item>
     </style>
 
-    <style name="AppTheme.M3.Red.Full">
+    <style name="AppTheme.M4.Red.Full">
         <item name="android:colorBackground">@color/windowBackgroundRedFull</item>
         <item name="colorSurface">@color/colorSurfaceRedFull</item>
         <item name="colorTertiary">?colorSurface</item>
@@ -295,12 +295,12 @@
         <item name="colorSecondaryContainer">?colorSurface</item>
     </style>
 
-    <style name="AppTheme.M3.Green.Classic">
+    <style name="AppTheme.M4.Green.Classic">
         <item name="android:colorBackground">@color/windowBackgroundGreen</item>
         <item name="colorSurface">@color/colorSurfaceGreen</item>
     </style>
 
-    <style name="AppTheme.M3.Green.Full">
+    <style name="AppTheme.M4.Green.Full">
         <item name="android:colorBackground">@color/windowBackgroundGreenFull</item>
         <item name="colorSurface">@color/colorSurfaceGreenFull</item>
         <item name="colorTertiary">?colorSurface</item>
@@ -308,12 +308,12 @@
         <item name="colorSecondaryContainer">?colorSurface</item>
     </style>
 
-    <style name="AppTheme.M3.Blue.Classic">
+    <style name="AppTheme.M4.Blue.Classic">
         <item name="android:colorBackground">@color/windowBackgroundBlue</item>
         <item name="colorSurface">@color/colorSurfaceBlue</item>
     </style>
 
-    <style name="AppTheme.M3.Blue.Full">
+    <style name="AppTheme.M4.Blue.Full">
         <item name="android:colorBackground">@color/windowBackgroundBlueFull</item>
         <item name="colorSurface">@color/colorSurfaceBlueFull</item>
         <item name="colorTertiary">?colorSurface</item>
@@ -321,12 +321,12 @@
         <item name="colorSecondaryContainer">?colorSurface</item>
     </style>
 
-    <style name="AppTheme.M3.Purple.Classic">
+    <style name="AppTheme.M4.Purple.Classic">
         <item name="android:colorBackground">@color/windowBackgroundPurple</item>
         <item name="colorSurface">@color/colorSurfacePurple</item>
     </style>
 
-    <style name="AppTheme.M3.Purple.Full">
+    <style name="AppTheme.M4.Purple.Full">
         <item name="android:colorBackground">@color/windowBackgroundPurpleFull</item>
         <item name="colorSurface">@color/colorSurfacePurpleFull</item>
         <item name="colorTertiary">?colorSurface</item>
@@ -334,12 +334,12 @@
         <item name="colorSecondaryContainer">?colorSurface</item>
     </style>
 
-    <style name="AppTheme.M3.Teal.Classic">
+    <style name="AppTheme.M4.Teal.Classic">
         <item name="android:colorBackground">@color/windowBackgroundTeal</item>
         <item name="colorSurface">@color/colorSurfaceTeal</item>
     </style>
 
-    <style name="AppTheme.M3.Teal.Full">
+    <style name="AppTheme.M4.Teal.Full">
         <item name="android:colorBackground">@color/windowBackgroundTealFull</item>
         <item name="colorSurface">@color/colorSurfaceTealFull</item>
         <item name="colorTertiary">?colorSurface</item>