diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 8efdbaa..3b2c5b2 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -27,7 +27,7 @@ android {
         minSdk = libs.versions.minSdk.get().toInt()
         targetSdk = libs.versions.targetSdk.get().toInt()
         versionCode = (100000000 + Instant.now().toEpochMilli() / 1000).toInt()
-        versionName = "1.9"
+        versionName = "1.9.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
@@ -68,6 +68,11 @@ android {
     }
     namespace = "ru.beryukhov.coffeegram"
 
+    configurations.configureEach {
+        exclude(group = "androidx.appcompat", module = "appcompat")
+        exclude(group = "androidx.appcompat", module = "appcompat-resources")
+    }
+
     experimentalProperties["android.experimental.enableScreenshotTest"] = true
 
     testOptions {
@@ -92,7 +97,6 @@ dependencies {
     implementation(projects.dateTimeUtils)
 
     implementation(libs.core.coreKtx)
-    implementation(libs.material)
 
     implementation(libs.cmp.ui)
     implementation(libs.cmp.material3)
diff --git a/app/src/main/java/ru/beryukhov/coffeegram/MainActivity.kt b/app/src/main/java/ru/beryukhov/coffeegram/MainActivity.kt
index 72c0735..fe7b31f 100644
--- a/app/src/main/java/ru/beryukhov/coffeegram/MainActivity.kt
+++ b/app/src/main/java/ru/beryukhov/coffeegram/MainActivity.kt
@@ -25,9 +25,7 @@ import ru.beryukhov.coffeegram.model.ThemeStore
 import ru.beryukhov.coffeegram.pages.LandingPage
 import ru.beryukhov.coffeegram.screens.RootScreen
 import ru.beryukhov.coffeegram.wearable.WearableSyncService
-import kotlin.time.ExperimentalTime
 
-@OptIn(ExperimentalTime::class)
 class MainActivity : ComponentActivity() {
 
     private val wearableSyncService by lazy { WearableSyncService(this) }
@@ -48,7 +46,7 @@ class MainActivity : ComponentActivity() {
             themeStore = themeStore,
             daysCoffeesStore = daysCoffeesStore,
             showMap = showMap,
-            onAndroidStartWearableActivity = ::startWearableActivity,
+            onAndroidStartWearableActivity = if (BuildConfig.DEBUG) ::startWearableActivity else null,
             onAndroidIconChange = { isSummer -> changeIcon(this, isSummer) },
         )
 
diff --git a/app/src/main/java/ru/beryukhov/coffeegram/widget/WidgetDataBridge.kt b/app/src/main/java/ru/beryukhov/coffeegram/widget/WidgetDataBridge.kt
index c26b705..dd3bd3b 100644
--- a/app/src/main/java/ru/beryukhov/coffeegram/widget/WidgetDataBridge.kt
+++ b/app/src/main/java/ru/beryukhov/coffeegram/widget/WidgetDataBridge.kt
@@ -14,7 +14,6 @@ import ru.beryukhov.coffeegram.data.withEmpty
 import ru.beryukhov.coffeegram.model.DaysCoffeesIntent
 import ru.beryukhov.coffeegram.model.DaysCoffeesStore
 import kotlin.time.Clock
-import kotlin.time.ExperimentalTime
 
 /**
  * Bridge between Glance widget and Store pattern.
@@ -32,7 +31,6 @@ class DefaultWidgetDataBridge(
     private val daysCoffeesStore: DaysCoffeesStore,
 ) : WidgetDataBridge {
 
-    @OptIn(ExperimentalTime::class)
     private fun getCurrentDay() = Clock.System.todayIn(TimeZone.currentSystemDefault())
 
     override fun getCurrentDayCupsCount(): Flow<Int> =
diff --git a/app/src/main/res/layout/widget_preview_row.xml b/app/src/main/res/layout/widget_preview_row.xml
index 3ed77d9..d20d344 100644
--- a/app/src/main/res/layout/widget_preview_row.xml
+++ b/app/src/main/res/layout/widget_preview_row.xml
@@ -19,7 +19,7 @@
         android:layout_gravity="center_vertical"
         android:text="@string/widget_preview_latte"
         android:layout_marginStart="16dp"
-        android:textColor="?colorPrimary"
+        android:textColor="?android:attr/colorPrimary"
         android:textSize="16sp"
         android:layout_weight="1"
         />
@@ -33,7 +33,7 @@
         android:padding="0dp"
         android:text="-"
         android:layout_marginStart="16dp"
-        android:textColor="?colorPrimary"
+        android:textColor="?android:attr/colorPrimary"
         tools:ignore="HardcodedText" />
 
     <TextView
@@ -44,7 +44,7 @@
         android:textSize="20sp"
         android:textStyle="bold"
         android:layout_marginStart="16dp"
-        android:textColor="?colorSecondary"
+        android:textColor="?android:attr/colorAccent"
         tools:ignore="HardcodedText" />
 
     <Button
@@ -55,6 +55,6 @@
         android:padding="0dp"
         android:text="+"
         android:layout_marginStart="16dp"
-        android:textColor="?colorPrimary"
+        android:textColor="?android:attr/colorPrimary"
         tools:ignore="HardcodedText" />
 </LinearLayout>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
new file mode 100644
index 0000000..945ff48
--- /dev/null
+++ b/app/src/main/res/values-de/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Kaffegram</string>
+    <string name="app_widget_title">Heutiger Kaffeekonsum</string>
+    <string name="app_widget_description">Schneller Zugriff auf die Kaffee-Nachverfolgung</string>
+    <string name="loading_widget">Widget wird geladen</string>
+    <string name="widget_preview_latte">Latte</string>
+</resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
new file mode 100644
index 0000000..c19b3cf
--- /dev/null
+++ b/app/src/main/res/values-el/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Καφεγράμ</string>
+    <string name="app_widget_title">Σημερινή κατανάλωση καφέ</string>
+    <string name="app_widget_description">Γρήγορη πρόσβαση στην παρακολούθηση καφέ</string>
+    <string name="loading_widget">Φόρτωση widget</string>
+    <string name="widget_preview_latte">Λάτε</string>
+</resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
new file mode 100644
index 0000000..66d6c0f
--- /dev/null
+++ b/app/src/main/res/values-es/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Cafégrаm</string>
+    <string name="app_widget_title">Consumo de café de hoy</string>
+    <string name="app_widget_description">Acceso rápido al seguimiento del café</string>
+    <string name="loading_widget">Widget de carga</string>
+    <string name="widget_preview_latte">Latte</string>
+</resources>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 7c4e954..8dc6ac8 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,11 +1,3 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.Coffeegram" parent="Theme.Material3.DayNight">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/brown_200</item>
-        <item name="colorOnPrimary">@color/black</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorOnSecondary">@color/black</item>
-    </style>
+    <style name="Theme.Coffeegram" parent="android:Theme.Material.NoActionBar" />
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
new file mode 100644
index 0000000..8f248b9
--- /dev/null
+++ b/app/src/main/res/values-ru/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Кофеграм</string>
+    <string name="app_widget_title">Потребление кофе сегодня</string>
+    <string name="app_widget_description">Быстрый доступ к отслеживанию кофе</string>
+    <string name="loading_widget">Загрузка виджета</string>
+    <string name="widget_preview_latte">Латте</string>
+</resources>
diff --git a/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml
index 7e5e1e3..ab7daa2 100644
--- a/app/src/main/res/values-v31/themes.xml
+++ b/app/src/main/res/values-v31/themes.xml
@@ -4,7 +4,5 @@
         <item name="android:windowSplashScreenBackground">@color/brown_500</item>
         <item name="android:windowSplashScreenAnimatedIcon">@drawable/ic_splashscreen_logo_animated</item>
         <item name="android:windowSplashScreenAnimationDuration">2147483647</item><!--Integer.MAX_VALUE-->
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 367aa02..7e3921d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,19 +1,8 @@
 <resources>
     <string name="app_name">Coffeegram</string>
-    <string name="calendar">Calendar</string>
-    <string name="stats">Stats</string>
-    <string name="settings">Settings</string>
-    <string name="map_short">Specialty</string>
-    <string name="add_drink">Drinks</string>
-    <string name="app_theme">App theme</string>
-    <string name="app_theme_system">System</string>
-    <string name="app_theme_light">Light</string>
-    <string name="app_theme_dark">Dark</string>
-    <string name="app_theme_dynamic">Dynamic</string>
-    <string name="app_theme_summer">Summer</string>
+
     <string name="app_widget_title">Today\'s coffee consumption</string>
     <string name="app_widget_description">Quick access to coffee tracking</string>
     <string name="loading_widget">Loading widget</string>
-    <string name="stats_tab_all">All</string>
-    <string name="stats_tab_weekly">Weekly</string>
+    <string name="widget_preview_latte">Latte</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d3e793b..1200591 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="Widget.AppWidget.AppWidget.Container" parent="Theme.Material3.DynamicColors.DayNight">
+    <style name="Widget.AppWidget.AppWidget.Container" parent="android:Widget">
         <item name="android:id">@android:id/background</item>
-        <item name="android:background">?colorSurface</item>
+        <item name="android:background">?android:attr/colorBackground</item>
         <item name="android:padding">@dimen/appWidgetPadding</item>
     </style>
 
     <dimen name="appWidgetPadding">16dp</dimen>
     <dimen name="appWidgetRadius">16dp</dimen>
 
-    <color name="appwidget_background">?colorSurface</color>
+    <color name="appwidget_background">?android:attr/colorBackground</color>
 
     <!-- The themes below are only used for the preview layouts -->
-    <style name="Theme.AppWidget.AppWidgetContainer" parent="Theme.Material3.DynamicColors.DayNight"/>
+    <style name="Theme.AppWidget.AppWidgetContainer" parent="android:Theme.Material.Light"/>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index b12cec4..6ba9306 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,18 +1,8 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.Coffeegram" parent="Theme.Material3.DayNight">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/brown_500</item>
-        <item name="colorOnPrimary">@color/white</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorOnSecondary">@color/black</item>
-    </style>
+    <style name="Theme.Coffeegram" parent="android:Theme.Material.Light.NoActionBar" />
 
     <style name="Theme.Coffeegram.NoActionBar">
         <item name="android:windowBackground">@drawable/background_splash</item>
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
     </style>
 
 </resources>
diff --git a/cmp-common/src/androidMain/kotlin/ru/beryukhov/coffeegram/app_ui/isSystemInDarkTheme.kt b/cmp-common/src/androidMain/kotlin/ru/beryukhov/coffeegram/app_ui/isSystemInDarkTheme.kt
index fe7423c..8bb5c3c 100644
--- a/cmp-common/src/androidMain/kotlin/ru/beryukhov/coffeegram/app_ui/isSystemInDarkTheme.kt
+++ b/cmp-common/src/androidMain/kotlin/ru/beryukhov/coffeegram/app_ui/isSystemInDarkTheme.kt
@@ -1,3 +1,19 @@
 package ru.beryukhov.coffeegram.app_ui
 
+import android.os.Build
+import androidx.compose.material3.ColorScheme
+import androidx.compose.material3.dynamicDarkColorScheme
+import androidx.compose.material3.dynamicLightColorScheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+
 actual fun isCupertinoDefault(): Boolean = false
+
+@Composable
+actual fun dynamicColorSchemeOrNull(darkTheme: Boolean): ColorScheme? =
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+        val context = LocalContext.current
+        if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
+    } else {
+        null
+    }
diff --git a/cmp-common/src/androidMain/res/values/strings.xml b/cmp-common/src/androidMain/res/values/strings.xml
deleted file mode 100644
index 5e76869..0000000
--- a/cmp-common/src/androidMain/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="widget_preview_latte">Latte</string>
-</resources>
diff --git a/cmp-common/src/commonMain/composeResources/font/DMMono-Regular.ttf b/cmp-common/src/commonMain/composeResources/font/DMMono-Regular.ttf
index 7efe813..aa77851 100644
Binary files a/cmp-common/src/commonMain/composeResources/font/DMMono-Regular.ttf and b/cmp-common/src/commonMain/composeResources/font/DMMono-Regular.ttf differ
diff --git a/cmp-common/src/commonMain/composeResources/font/FONTS.md b/cmp-common/src/commonMain/composeResources/font/FONTS.md
new file mode 100644
index 0000000..a6e77c6
--- /dev/null
+++ b/cmp-common/src/commonMain/composeResources/font/FONTS.md
@@ -0,0 +1,131 @@
+# Fonts
+
+The four `.ttf` files in this directory are **merged builds**: each combines a brand
+font (Fraunces / Plus Jakarta Sans / DM Mono) with a script-coverage donor for
+Cyrillic and Greek. Compose Resources auto-generates `Res.font.<name>` for every file
+here, so donor files are removed after merging — see [Reproducing the merges](#reproducing-the-merges).
+
+## Files in use (referenced from `Theme.kt`)
+
+| File | Family | Style | Weight | Size (B) | Glyphs | Latin¹ | Cyrillic² | Greek³ | Role |
+|---|---|---|---:|---:|---:|---:|---:|---:|---|
+| `Fraunces.ttf` | Fraunces | Regular | 900 | 455 072 | 1 475 | 388 | 132 | 322 | display serif (headlines, titles) |
+| `Fraunces-Italic.ttf` | Fraunces | Italic | 900 | 479 528 | 1 475 | 388 | 132 | 322 | display serif italic |
+| `PlusJakartaSans.ttf` | Plus Jakarta Sans | Regular | 400 | 191 076 | 908 | 380 | 104 | 75 | body / UI sans |
+| `DMMono-Regular.ttf` | DM Mono | Regular | 400 | 163 728 | 978 | 343 | 98 | 77 | small body / numeric mono |
+
+¹ codepoints `U+0000..U+024F`  ² `U+0400..U+052F`  ³ `U+0370..U+03FF` and `U+1F00..U+1FFF`
+
+To restore a pre-merge original, fetch from git: `git log -- <path>` then
+`git cat-file -p <blob>` (filenames matching pre-merge state may have been deleted, so
+use `git rev-list --all --objects | grep <name>` to find the blob hash).
+
+## Donors used in current merges
+
+| File | Family | Style | Glyphs | Latin | Cyrillic | Greek | Weight | Paired with |
+|---|---|---|---:|---:|---:|---:|---:|---|
+| `Spectral-ExtraBold.ttf` | Spectral | ExtraBold | 878 | 381 | 128 | 3 | 800 | Fraunces |
+| `Spectral-ExtraBoldItalic.ttf` | Spectral | ExtraBold Italic | 878 | 381 | 128 | 3 | 800 | Fraunces-Italic |
+| `GFSDidot-Regular.ttf` | GFS Didot | Regular | 1104 | 332 | 4 | 322 | 400 | Fraunces (Greek)¹ |
+| `Manrope-Regular.ttf` | Manrope | Regular | 678 | 316 | 104 | 75 | 400 | Plus Jakarta Sans |
+| `JetBrainsMono-Regular.ttf` | JetBrains Mono | Regular | 976 | 343 | 98 | 77 | 400 | DM Mono |
+
+Donor files are removed from this directory after merging (Compose Resources auto-packages
+every `.ttf` here). Redownload from Google Fonts when re-merging.
+
+¹ GFS Didot only ships in Regular (weight 400). Fraunces is pinned at weight 900 (Black)
+so Greek letters render lighter than Latin/Cyrillic. Acceptable trade-off for the `el`
+locale; to fix later, swap to a heavier Greek serif (e.g. GFS Bodoni Black or a Noto
+Serif Greek heavy weight) and re-merge.
+
+## Sources & licenses
+
+All seven families are redistributed under the SIL Open Font License 1.1 (OFL). Merging
+with `pyftmerge` and shipping the merged binary in this app is permitted; per OFL the
+copyright/license notices must be preserved (kept inside each `.ttf`'s `name` table).
+Do **not** rename the resulting family to imply it's an unmodified original.
+
+- **Fraunces** — Undercase Type (Phaedra Charles, David Jonathan Ross). https://fonts.google.com/specimen/Fraunces
+- **Plus Jakarta Sans** — Tokotype. https://fonts.google.com/specimen/Plus+Jakarta+Sans
+- **DM Mono** — Colophon Foundry / Google. https://fonts.google.com/specimen/DM+Mono
+- **Spectral** — Production Type. https://fonts.google.com/specimen/Spectral
+- **GFS Didot** — Greek Font Society. https://fonts.google.com/specimen/GFS+Didot
+- **Manrope** — Mikhail Sharanda. https://fonts.google.com/specimen/Manrope
+- **JetBrains Mono** — JetBrains. https://www.jetbrains.com/lp/mono/
+
+## Known caveats
+
+1. **Variable fonts must be flattened first.** The original `Fraunces`, `Fraunces-Italic`,
+   and `PlusJakartaSans` upstream files are variable fonts; `pyftmerge` errors on VFs
+   (`VarStore has no attribute mergeMap`). Use `fontTools.varLib.instancer.instantiateVariableFont`
+   to bake them at the desired axis values first.
+2. **UPEM mismatches must be reconciled.** `pyftmerge` requires identical
+   `head.unitsPerEm` across all inputs. Fraunces is 2000 UPEM; PT Serif / GFS Didot /
+   Spectral / Plus Jakarta Sans are 1000 UPEM; Manrope is 2000 UPEM. Use
+   `fontTools.ttLib.scaleUpem.scale_upem` on the donor before merging.
+3. **Weight matching matters.** Fraunces is pinned at `wght=900` (Black), so its
+   Cyrillic donor must also be heavy or the scripts render at visibly different
+   weights. Spectral ExtraBold (800) is the closest available match. The Greek donor
+   GFS Didot is only Regular (400) — Greek currently renders lighter than Latin/Cyrillic;
+   acceptable for the small `el` locale audience, swap to a heavier Greek serif later
+   if it becomes a problem.
+4. **First font wins on overlapping codepoints** — always list the brand font first.
+   `pyftmerge` keeps the GPOS/GSUB tables of the first font only, so donor-specific
+   kerning/ligatures for Cyrillic/Greek are dropped (usually invisible at body sizes).
+5. **`U+2126` (Ohm sign) and `U+2206` (Increment)** were dropped from the Fraunces merges
+   because both Fraunces and GFS Didot define glyphs named `Omega`/`Delta`. The real
+   Greek letters Ω (`U+03A9`) and Δ (`U+0394`) are unaffected.
+
+## Reproducing the merges
+
+From inside this directory, with `fonttools` installed (`pip install fonttools`).
+Donor files are needed in the working directory but should be deleted after merging.
+
+```bash
+PY=python3   # adjust if fonttools isn't on system python
+PYFT=pyftmerge
+
+# 1) Flatten Fraunces / PJS VFs to static instances at their current axis defaults.
+$PY -c "
+from fontTools.ttLib import TTFont
+from fontTools.varLib.instancer import instantiateVariableFont
+for fn, axes in [
+    ('Fraunces.ttf',       {'opsz': 9, 'wght': 900, 'SOFT': 0, 'WONK': 1}),
+    ('Fraunces-Italic.ttf',{'opsz': 9, 'wght': 900, 'SOFT': 0, 'WONK': 1}),
+    ('PlusJakartaSans.ttf',{'wght': 400}),
+]:
+    instantiateVariableFont(TTFont(fn), axes).save(fn.replace('.ttf','-static.ttf'))
+"
+
+# 2) Rescale donors so they share UPEM with their base.
+$PY -c "
+from fontTools.ttLib import TTFont, scaleUpem
+for fn, upem in [
+    ('Spectral-ExtraBold.ttf',       2000),
+    ('Spectral-ExtraBoldItalic.ttf', 2000),
+    ('GFSDidot-Regular.ttf',         2000),
+    ('Manrope-Regular.ttf',          1000),
+]:
+    f = TTFont(fn); scaleUpem.scale_upem(f, upem); f.save(fn.replace('.ttf', f'-u{upem}.ttf'))
+"
+
+# 3) Merge. Brand font always first.
+$PYFT Fraunces-static.ttf        Spectral-ExtraBold-u2000.ttf       GFSDidot-Regular-u2000.ttf && mv merged.ttf Fraunces.ttf
+$PYFT Fraunces-Italic-static.ttf Spectral-ExtraBoldItalic-u2000.ttf GFSDidot-Regular-u2000.ttf && mv merged.ttf Fraunces-Italic.ttf
+$PYFT PlusJakartaSans-static.ttf Manrope-Regular-u1000.ttf                                     && mv merged.ttf PlusJakartaSans.ttf
+$PYFT DMMono-Regular.ttf         JetBrainsMono-Regular.ttf                                     && mv merged.ttf DMMono-Regular.ttf
+
+# 4) Clean up.
+rm -f *-static.ttf *-u1000.ttf *-u2000.ttf \
+      Spectral-ExtraBold.ttf Spectral-ExtraBoldItalic.ttf \
+      GFSDidot-Regular.ttf Manrope-Regular.ttf JetBrainsMono-Regular.ttf
+```
+
+Sanity-check coverage after each merge:
+
+```bash
+python3 -c "from fontTools.ttLib import TTFont; \
+  f=TTFont('Fraunces.ttf'); cps=set(f.getBestCmap()); \
+  print('Cyr:', any(0x0400<=c<=0x04FF for c in cps), \
+        'Greek:', any(0x0370<=c<=0x03FF for c in cps))"
+```
diff --git a/cmp-common/src/commonMain/composeResources/font/Fraunces-Italic.ttf b/cmp-common/src/commonMain/composeResources/font/Fraunces-Italic.ttf
index 7884a1e..b510493 100644
Binary files a/cmp-common/src/commonMain/composeResources/font/Fraunces-Italic.ttf and b/cmp-common/src/commonMain/composeResources/font/Fraunces-Italic.ttf differ
diff --git a/cmp-common/src/commonMain/composeResources/font/Fraunces.ttf b/cmp-common/src/commonMain/composeResources/font/Fraunces.ttf
index c3f165a..80459ee 100644
Binary files a/cmp-common/src/commonMain/composeResources/font/Fraunces.ttf and b/cmp-common/src/commonMain/composeResources/font/Fraunces.ttf differ
diff --git a/cmp-common/src/commonMain/composeResources/font/PlusJakartaSans.ttf b/cmp-common/src/commonMain/composeResources/font/PlusJakartaSans.ttf
index 080a386..5a851ba 100644
Binary files a/cmp-common/src/commonMain/composeResources/font/PlusJakartaSans.ttf and b/cmp-common/src/commonMain/composeResources/font/PlusJakartaSans.ttf differ
diff --git a/cmp-common/src/commonMain/composeResources/values-de/strings.xml b/cmp-common/src/commonMain/composeResources/values-de/strings.xml
new file mode 100644
index 0000000..da75fea
--- /dev/null
+++ b/cmp-common/src/commonMain/composeResources/values-de/strings.xml
@@ -0,0 +1,63 @@
+<resources>
+    <string name="cappuccino">Cappuccino</string>
+    <string name="latte">Latte Macchiato</string>
+    <string name="americano">Americano</string>
+    <string name="common">Klassischer Kaffee</string>
+    <string name="macchiato">Espresso Macchiato</string>
+    <string name="glace">Eiskaffee</string>
+    <string name="frappe">Frappé</string>
+    <string name="espresso">Espresso</string>
+    <string name="mocha">Mokka</string>
+    <string name="fredo">Freddo</string>
+    <string name="irish">Irish Coffee</string>
+    <string name="cocoa">Kakao</string>
+    <string name="chocolate">Schokolade</string>
+
+    <string name="app_theme">App-Design</string>
+    <string name="app_theme_system">System</string>
+    <string name="app_theme_light">Hell</string>
+    <string name="app_theme_dark">Dunkel</string>
+    <string name="app_theme_cupertino">Cupertino</string>
+    <string name="app_theme_dynamic">Dynamisch</string>
+    <string name="app_theme_summer">Sommer</string>
+    <string name="app_theme_system_snackbar">Das App-Design folgt jetzt dem Systemdesign</string>
+    <string name="app_theme_summer_snackbar">Sommermodus aktiviert</string>
+    <string name="ok">Alles klar</string>
+
+    <string name="settings">Einstellungen</string>
+    <string name="calendar">Kalender</string>
+    <string name="stats">Statistiken</string>
+    <string name="map_short">Specialty</string>
+    <string name="add_drink">Getränk hinzufügen</string>
+
+    <string name="tab_weekly">Wöchentlich</string>
+    <string name="tab_all_time">Gesamt</string>
+    <string name="chart_title_weekly">Kaffeekonsum diese Woche</string>
+    <string name="chart_title_over_time">Kaffeekonsum im Zeitverlauf</string>
+    <string name="chart_title_distribution">Verteilung der Kaffeesorten</string>
+    <string name="no_data_available">Keine Daten verfügbar</string>
+
+    <string name="day_mon">Mo</string>
+    <string name="day_tue">Di</string>
+    <string name="day_wed">Mi</string>
+    <string name="day_thu">Do</string>
+    <string name="day_fri">Fr</string>
+    <string name="day_sat">Sa</string>
+    <string name="day_sun">So</string>
+
+    <string name="month_jan">Januar</string>
+    <string name="month_feb">Februar</string>
+    <string name="month_mar">März</string>
+    <string name="month_apr">April</string>
+    <string name="month_may">Mai</string>
+    <string name="month_jun">Juni</string>
+    <string name="month_jul">Juli</string>
+    <string name="month_aug">August</string>
+    <string name="month_sep">September</string>
+    <string name="month_oct">Oktober</string>
+    <string name="month_nov">November</string>
+    <string name="month_dec">Dezember</string>
+
+    <string name="map_long">Specialty-Coffee-Karte</string>
+    <string name="location_permission_required">Standortberechtigung erforderlich</string>
+</resources>
diff --git a/cmp-common/src/commonMain/composeResources/values-el/strings.xml b/cmp-common/src/commonMain/composeResources/values-el/strings.xml
new file mode 100644
index 0000000..d38a6c8
--- /dev/null
+++ b/cmp-common/src/commonMain/composeResources/values-el/strings.xml
@@ -0,0 +1,63 @@
+<resources>
+    <string name="cappuccino">Καπουτσίνο</string>
+    <string name="latte">Λάτε</string>
+    <string name="americano">Αμερικάνο</string>
+    <string name="common">Κοινός Καφές</string>
+    <string name="macchiato">Εσπρέσο Μακιάτο</string>
+    <string name="glace">Γκλασέ</string>
+    <string name="frappe">Φραπέ</string>
+    <string name="espresso">Εσπρέσο</string>
+    <string name="mocha">Μόκα</string>
+    <string name="fredo">Φρέντο</string>
+    <string name="irish">Ιρλανδικός</string>
+    <string name="cocoa">Κακάο</string>
+    <string name="chocolate">Σοκολάτα</string>
+
+    <string name="app_theme">Θέμα εφαρμογής</string>
+    <string name="app_theme_system">Σύστημα</string>
+    <string name="app_theme_light">Φωτεινό</string>
+    <string name="app_theme_dark">Σκοτεινό</string>
+    <string name="app_theme_cupertino">Κουπερτίνο</string>
+    <string name="app_theme_dynamic">Δυναμικό</string>
+    <string name="app_theme_summer">Καλοκαίρι</string>
+    <string name="app_theme_system_snackbar">Το θέμα της εφαρμογής θα ακολουθεί πλέον το θέμα του συστήματος</string>
+    <string name="app_theme_summer_snackbar">Ξεκινάει το καλοκαιρινό θέμα</string>
+    <string name="ok">Εντάξει</string>
+
+    <string name="settings">Ρυθμίσεις</string>
+    <string name="calendar">Ημερολόγιο</string>
+    <string name="stats">Στατιστικά</string>
+    <string name="map_short">Σπέσιαλτι</string>
+    <string name="add_drink">Προσθήκη ροφήματος</string>
+
+    <string name="tab_weekly">Εβδομαδιαία</string>
+    <string name="tab_all_time">Συνολικά</string>
+    <string name="chart_title_weekly">Κατανάλωση καφέ αυτή την εβδομάδα</string>
+    <string name="chart_title_over_time">Κατανάλωση καφέ με την πάροδο του χρόνου</string>
+    <string name="chart_title_distribution">Κατανομή τύπων καφέ</string>
+    <string name="no_data_available">Δεν υπάρχουν διαθέσιμα δεδομένα</string>
+
+    <string name="day_mon">Δευ</string>
+    <string name="day_tue">Τρι</string>
+    <string name="day_wed">Τετ</string>
+    <string name="day_thu">Πεμ</string>
+    <string name="day_fri">Παρ</string>
+    <string name="day_sat">Σαβ</string>
+    <string name="day_sun">Κυρ</string>
+
+    <string name="month_jan">Ιανουάριος</string>
+    <string name="month_feb">Φεβρουάριος</string>
+    <string name="month_mar">Μάρτιος</string>
+    <string name="month_apr">Απρίλιος</string>
+    <string name="month_may">Μάιος</string>
+    <string name="month_jun">Ιούνιος</string>
+    <string name="month_jul">Ιούλιος</string>
+    <string name="month_aug">Αύγουστος</string>
+    <string name="month_sep">Σεπτέμβριος</string>
+    <string name="month_oct">Οκτώβριος</string>
+    <string name="month_nov">Νοέμβριος</string>
+    <string name="month_dec">Δεκέμβριος</string>
+
+    <string name="map_long">Χάρτης Καφέ Σπέσιαλτι</string>
+    <string name="location_permission_required">Πρέπει να δώσετε άδεια τοποθεσίας</string>
+</resources>
diff --git a/cmp-common/src/commonMain/composeResources/values-es/strings.xml b/cmp-common/src/commonMain/composeResources/values-es/strings.xml
new file mode 100644
index 0000000..54b3bda
--- /dev/null
+++ b/cmp-common/src/commonMain/composeResources/values-es/strings.xml
@@ -0,0 +1,63 @@
+<resources>
+    <string name="cappuccino">Capuchino</string>
+    <string name="latte">Latte</string>
+    <string name="americano">Americano</string>
+    <string name="common">Café Común</string>
+    <string name="macchiato">Espresso Macchiato</string>
+    <string name="glace">Café Glacé</string>
+    <string name="frappe">Frappé</string>
+    <string name="espresso">Espresso</string>
+    <string name="mocha">Moca</string>
+    <string name="fredo">Freddo</string>
+    <string name="irish">Café Irlandés</string>
+    <string name="cocoa">Cacao</string>
+    <string name="chocolate">Chocolate</string>
+
+    <string name="app_theme">Tema de la app</string>
+    <string name="app_theme_system">Sistema</string>
+    <string name="app_theme_light">Claro</string>
+    <string name="app_theme_dark">Oscuro</string>
+    <string name="app_theme_cupertino">Cupertino</string>
+    <string name="app_theme_dynamic">Dinámico</string>
+    <string name="app_theme_summer">Verano</string>
+    <string name="app_theme_system_snackbar">El tema de la app ahora seguirá el del sistema</string>
+    <string name="app_theme_summer_snackbar">Empieza el modo verano</string>
+    <string name="ok">Vale</string>
+
+    <string name="settings">Configuración</string>
+    <string name="calendar">Calendario</string>
+    <string name="stats">Estadísticas</string>
+    <string name="map_short">Specialty</string>
+    <string name="add_drink">Añadir bebida</string>
+
+    <string name="tab_weekly">Semanal</string>
+    <string name="tab_all_time">Todo el tiempo</string>
+    <string name="chart_title_weekly">Consumo de café esta semana</string>
+    <string name="chart_title_over_time">Consumo de café a lo largo del tiempo</string>
+    <string name="chart_title_distribution">Distribución de tipos de café</string>
+    <string name="no_data_available">No hay datos disponibles</string>
+
+    <string name="day_mon">Lun</string>
+    <string name="day_tue">Mar</string>
+    <string name="day_wed">Mié</string>
+    <string name="day_thu">Jue</string>
+    <string name="day_fri">Vie</string>
+    <string name="day_sat">Sáb</string>
+    <string name="day_sun">Dom</string>
+
+    <string name="month_jan">Enero</string>
+    <string name="month_feb">Febrero</string>
+    <string name="month_mar">Marzo</string>
+    <string name="month_apr">Abril</string>
+    <string name="month_may">Mayo</string>
+    <string name="month_jun">Junio</string>
+    <string name="month_jul">Julio</string>
+    <string name="month_aug">Agosto</string>
+    <string name="month_sep">Septiembre</string>
+    <string name="month_oct">Octubre</string>
+    <string name="month_nov">Noviembre</string>
+    <string name="month_dec">Diciembre</string>
+
+    <string name="map_long">Mapa de Café Specialty</string>
+    <string name="location_permission_required">Debes otorgar permiso de ubicación</string>
+</resources>
diff --git a/cmp-common/src/commonMain/composeResources/values-ru/strings.xml b/cmp-common/src/commonMain/composeResources/values-ru/strings.xml
new file mode 100644
index 0000000..67fd986
--- /dev/null
+++ b/cmp-common/src/commonMain/composeResources/values-ru/strings.xml
@@ -0,0 +1,63 @@
+<resources>
+    <string name="cappuccino">Капучино</string>
+    <string name="latte">Латте</string>
+    <string name="americano">Американо</string>
+    <string name="common">Обычный кофе</string>
+    <string name="macchiato">Эспрессо Макиато</string>
+    <string name="glace">Глясе</string>
+    <string name="frappe">Фраппе</string>
+    <string name="espresso">Эспрессо</string>
+    <string name="mocha">Мокко</string>
+    <string name="fredo">Фредо</string>
+    <string name="irish">Айриш</string>
+    <string name="cocoa">Какао</string>
+    <string name="chocolate">Шоколад</string>
+
+    <string name="app_theme">Тема приложения</string>
+    <string name="app_theme_system">Системная</string>
+    <string name="app_theme_light">Светлая</string>
+    <string name="app_theme_dark">Тёмная</string>
+    <string name="app_theme_cupertino">Cupertino</string>
+    <string name="app_theme_dynamic">Динамическая</string>
+    <string name="app_theme_summer">Летняя</string>
+    <string name="app_theme_system_snackbar">Тема приложения теперь следует системной теме</string>
+    <string name="app_theme_summer_snackbar">Включена летняя тема</string>
+    <string name="ok">Ладно</string>
+
+    <string name="settings">Настройки</string>
+    <string name="calendar">Календарь</string>
+    <string name="stats">Статистика</string>
+    <string name="map_short">Спешелти</string>
+    <string name="add_drink">Добавить напиток</string>
+
+    <string name="tab_weekly">Неделя</string>
+    <string name="tab_all_time">Всё время</string>
+    <string name="chart_title_weekly">Потребление кофе за неделю</string>
+    <string name="chart_title_over_time">Потребление кофе со временем</string>
+    <string name="chart_title_distribution">Распределение видов кофе</string>
+    <string name="no_data_available">Нет данных</string>
+
+    <string name="day_mon">Пн</string>
+    <string name="day_tue">Вт</string>
+    <string name="day_wed">Ср</string>
+    <string name="day_thu">Чт</string>
+    <string name="day_fri">Пт</string>
+    <string name="day_sat">Сб</string>
+    <string name="day_sun">Вс</string>
+
+    <string name="month_jan">Январь</string>
+    <string name="month_feb">Февраль</string>
+    <string name="month_mar">Март</string>
+    <string name="month_apr">Апрель</string>
+    <string name="month_may">Май</string>
+    <string name="month_jun">Июнь</string>
+    <string name="month_jul">Июль</string>
+    <string name="month_aug">Август</string>
+    <string name="month_sep">Сентябрь</string>
+    <string name="month_oct">Октябрь</string>
+    <string name="month_nov">Ноябрь</string>
+    <string name="month_dec">Декабрь</string>
+
+    <string name="map_long">Карта спешелти кофе</string>
+    <string name="location_permission_required">Необходимо разрешение на геолокацию</string>
+</resources>
diff --git a/cmp-common/src/commonMain/composeResources/values/strings.xml b/cmp-common/src/commonMain/composeResources/values/strings.xml
index a5efadd..fc9ffaa 100644
--- a/cmp-common/src/commonMain/composeResources/values/strings.xml
+++ b/cmp-common/src/commonMain/composeResources/values/strings.xml
@@ -20,6 +20,9 @@
     <string name="app_theme_cupertino">Cupertino</string>
     <string name="app_theme_dynamic">Dynamic</string>
     <string name="app_theme_summer">Summer</string>
+    <string name="app_theme_system_snackbar">Now app theme will follow system theme</string>
+    <string name="app_theme_summer_snackbar">Summer starting</string>
+    <string name="ok">Now app theme will follow system theme</string>
 
     <string name="settings">Settings</string>
     <string name="calendar">Calendar</string>
@@ -42,6 +45,19 @@
     <string name="day_sat">Sat</string>
     <string name="day_sun">Sun</string>
 
+    <string name="month_jan">January</string>
+    <string name="month_feb">February</string>
+    <string name="month_mar">March</string>
+    <string name="month_apr">April</string>
+    <string name="month_may">May</string>
+    <string name="month_jun">June</string>
+    <string name="month_jul">July</string>
+    <string name="month_aug">August</string>
+    <string name="month_sep">September</string>
+    <string name="month_oct">October</string>
+    <string name="month_nov">November</string>
+    <string name="month_dec">December</string>
+
     <string name="map_long">Specialty Coffee Map</string>
     <string name="location_permission_required">You should give location permission</string>
 </resources>
diff --git a/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/app_ui/StorePreview.kt b/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/app_ui/StorePreview.kt
index 17fe988..fd01d53 100644
--- a/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/app_ui/StorePreview.kt
+++ b/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/app_ui/StorePreview.kt
@@ -23,14 +23,13 @@ import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.tooling.preview.Devices
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 
 // kudos to https://medium.com/@benlue/generate-app-store-screenshots-directly-from-jetpack-compose-previews-b2e30e4569a7
 // 1290x2796 at 2.5x scale = 516dp x 1118dp
-private const val widthDp = 516
-private const val heightDp = 1118
+private const val widthDp = 500 // 516
+private const val heightDp = 1000 // 1118
 
 private val DynamicIslandTopInset = 14.dp
 private val DynamicIslandHeight = 32.dp
@@ -39,7 +38,12 @@ private val SafeAreaTop = DynamicIslandTopInset + DynamicIslandHeight + 4.dp
 val LocalPhoneFrameInsets = compositionLocalOf { WindowInsets(0) }
 
 @Preview(name = "en-mobile", locale = "en", widthDp = widthDp, heightDp = heightDp)
-@Preview(name = "en-tablet", locale = "en", device = Devices.PIXEL_C)
+// @Preview(name = "ru-mobile", locale = "ru", widthDp = widthDp, heightDp = heightDp)
+// @Preview(name = "es-mobile", locale = "es", widthDp = widthDp, heightDp = heightDp)
+// @Preview(name = "de-mobile", locale = "de", widthDp = widthDp, heightDp = heightDp)
+// @Preview(name = "el-mobile", locale = "el", widthDp = widthDp, heightDp = heightDp)
+@Preview(name = "en-tablet07", locale = "en", widthDp = 1200, heightDp = 900)
+@Preview(name = "en-tablet10", locale = "en", widthDp = 1500, heightDp = 1200)
 annotation class StorePreview
 
 @Composable
@@ -138,7 +142,7 @@ fun StoreMarketingScreen(
                     ),
                     color = Color.White,
                     textAlign = TextAlign.Center,
-                    modifier = Modifier.fillMaxWidth()
+                    modifier = Modifier.fillMaxWidth().padding(horizontal = 32.dp, vertical = 4.dp)
                 )
             }
             subheadline?.let {
diff --git a/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/app_ui/Theme.kt b/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/app_ui/Theme.kt
index efd71b0..632fa6b 100644
--- a/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/app_ui/Theme.kt
+++ b/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/app_ui/Theme.kt
@@ -3,6 +3,7 @@ package ru.beryukhov.coffeegram.app_ui
 import androidx.compose.foundation.background
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Box
+import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.MaterialTheme.shapes
 import androidx.compose.material3.Typography
@@ -108,14 +109,17 @@ fun CoffeegramTheme(
     )
     val plusJakarta = FontFamily(Font(Res.font.PlusJakartaSans))
 
+    val brandScheme = if (darkTheme) DarkThemeColors else LightThemeColors
+    val materialScheme = if (themeState.isDynamic == true) {
+        dynamicColorSchemeOrNull(darkTheme) ?: brandScheme
+    } else {
+        brandScheme
+    }
+
     AdaptiveTheme(
         material =
             MaterialThemeSpec(
-                colorScheme = if (darkTheme) {
-                    DarkThemeColors
-                } else {
-                    LightThemeColors
-                },
+                colorScheme = materialScheme,
                 typography = Typography(
                     headlineSmall = TextStyle(
                         fontFamily = frauncesFontFamily,
@@ -164,3 +168,6 @@ fun PreviewTheme(
 }
 
 expect fun isCupertinoDefault(): Boolean
+
+@Composable
+expect fun dynamicColorSchemeOrNull(darkTheme: Boolean): ColorScheme?
diff --git a/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/components/DateUtils.kt b/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/components/DateUtils.kt
new file mode 100644
index 0000000..c5dbfa1
--- /dev/null
+++ b/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/components/DateUtils.kt
@@ -0,0 +1,58 @@
+package ru.beryukhov.coffeegram.components
+
+import androidx.compose.runtime.Composable
+import coffeegram.cmp_common.generated.resources.Res
+import coffeegram.cmp_common.generated.resources.day_fri
+import coffeegram.cmp_common.generated.resources.day_mon
+import coffeegram.cmp_common.generated.resources.day_sat
+import coffeegram.cmp_common.generated.resources.day_sun
+import coffeegram.cmp_common.generated.resources.day_thu
+import coffeegram.cmp_common.generated.resources.day_tue
+import coffeegram.cmp_common.generated.resources.day_wed
+import coffeegram.cmp_common.generated.resources.month_apr
+import coffeegram.cmp_common.generated.resources.month_aug
+import coffeegram.cmp_common.generated.resources.month_dec
+import coffeegram.cmp_common.generated.resources.month_feb
+import coffeegram.cmp_common.generated.resources.month_jan
+import coffeegram.cmp_common.generated.resources.month_jul
+import coffeegram.cmp_common.generated.resources.month_jun
+import coffeegram.cmp_common.generated.resources.month_mar
+import coffeegram.cmp_common.generated.resources.month_may
+import coffeegram.cmp_common.generated.resources.month_nov
+import coffeegram.cmp_common.generated.resources.month_oct
+import coffeegram.cmp_common.generated.resources.month_sep
+import kotlinx.datetime.Month
+import org.jetbrains.compose.resources.stringResource
+
+val dayNames
+    @Composable get() = listOf(
+        stringResource(Res.string.day_mon),
+        stringResource(Res.string.day_tue),
+        stringResource(Res.string.day_wed),
+        stringResource(Res.string.day_thu),
+        stringResource(Res.string.day_fri),
+        stringResource(Res.string.day_sat),
+        stringResource(Res.string.day_sun),
+    )
+
+@Composable
+fun getFullMonthName(month: Month): String {
+    return when (month) {
+        Month.JANUARY -> stringResource(Res.string.month_jan)
+        Month.FEBRUARY -> stringResource(Res.string.month_feb)
+        Month.MARCH -> stringResource(Res.string.month_mar)
+        Month.APRIL -> stringResource(Res.string.month_apr)
+        Month.MAY -> stringResource(Res.string.month_may)
+        Month.JUNE -> stringResource(Res.string.month_jun)
+        Month.JULY -> stringResource(Res.string.month_jul)
+        Month.AUGUST -> stringResource(Res.string.month_aug)
+        Month.SEPTEMBER -> stringResource(Res.string.month_sep)
+        Month.OCTOBER -> stringResource(Res.string.month_oct)
+        Month.NOVEMBER -> stringResource(Res.string.month_nov)
+        Month.DECEMBER -> stringResource(Res.string.month_dec)
+    }
+}
+
+// todo separate localisation
+@Composable
+fun getShortMonthName(month: Month): String = getFullMonthName(month).take(3)
diff --git a/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/pages/CoffeeCharts.kt b/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/screens/CoffeeCharts.kt
similarity index 88%
rename from cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/pages/CoffeeCharts.kt
rename to cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/screens/CoffeeCharts.kt
index d014935..80c7d04 100644
--- a/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/pages/CoffeeCharts.kt
+++ b/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/screens/CoffeeCharts.kt
@@ -1,7 +1,6 @@
 @file:Suppress("ModifierMissing")
-@file:OptIn(ExperimentalTime::class)
 
-package ru.beryukhov.coffeegram.pages
+package ru.beryukhov.coffeegram.screens
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxWithConstraints
@@ -32,13 +31,6 @@ import coffeegram.cmp_common.generated.resources.Res
 import coffeegram.cmp_common.generated.resources.chart_title_distribution
 import coffeegram.cmp_common.generated.resources.chart_title_over_time
 import coffeegram.cmp_common.generated.resources.chart_title_weekly
-import coffeegram.cmp_common.generated.resources.day_fri
-import coffeegram.cmp_common.generated.resources.day_mon
-import coffeegram.cmp_common.generated.resources.day_sat
-import coffeegram.cmp_common.generated.resources.day_sun
-import coffeegram.cmp_common.generated.resources.day_thu
-import coffeegram.cmp_common.generated.resources.day_tue
-import coffeegram.cmp_common.generated.resources.day_wed
 import coffeegram.cmp_common.generated.resources.no_data_available
 import coffeegram.cmp_common.generated.resources.tab_all_time
 import coffeegram.cmp_common.generated.resources.tab_weekly
@@ -57,11 +49,14 @@ import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.datetime.DatePeriod
 import kotlinx.datetime.LocalDate
+import kotlinx.datetime.Month
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.minus
 import kotlinx.datetime.plus
 import kotlinx.datetime.toLocalDateTime
 import org.jetbrains.compose.resources.stringResource
+import ru.beryukhov.coffeegram.components.dayNames
+import ru.beryukhov.coffeegram.components.getShortMonthName
 import ru.beryukhov.coffeegram.data.CoffeeType
 import ru.beryukhov.coffeegram.data.CoffeeTypes
 import ru.beryukhov.coffeegram.data.DayCoffee
@@ -69,7 +64,6 @@ import ru.beryukhov.coffeegram.data.printableText
 import ru.beryukhov.coffeegram.model.DaysCoffeesState
 import ru.beryukhov.date_time_utils.YearMonth
 import kotlin.time.Clock
-import kotlin.time.ExperimentalTime
 
 @Composable
 fun CoffeeCharts(coffeeState: DaysCoffeesState, modifier: Modifier = Modifier) {
@@ -127,15 +121,7 @@ fun WeeklyCoffeeChart(coffeeState: DaysCoffeesState) {
 
         Spacer(modifier = Modifier.height(16.dp))
 
-        val dayNames = listOf(
-            stringResource(Res.string.day_mon),
-            stringResource(Res.string.day_tue),
-            stringResource(Res.string.day_wed),
-            stringResource(Res.string.day_thu),
-            stringResource(Res.string.day_fri),
-            stringResource(Res.string.day_sat),
-            stringResource(Res.string.day_sun),
-        )
+        val dayNames = dayNames
 
         CartesianChartHost(
             chart = rememberCartesianChart(
@@ -200,10 +186,12 @@ fun AllTimeCoffeeChart(coffeeState: DaysCoffeesState) {
     val useMonthlyAggregation = daysBetween > 31
 
     // Aggregate data
-    val aggregatedData = if (useMonthlyAggregation) {
-        monthlyAggregation(coffeeState)
-    } else {
-        dailyAggregation(coffeeState)
+    val aggregatedData = remember(coffeeState) {
+        if (useMonthlyAggregation) {
+            monthlyAggregation(coffeeState)
+        } else {
+            dailyAggregation(coffeeState)
+        }
     }
 
     BoxWithConstraints(
@@ -231,7 +219,7 @@ fun AllTimeCoffeeChart(coffeeState: DaysCoffeesState) {
                         textAlign = TextAlign.Center
                     )
                     Spacer(modifier = Modifier.height(16.dp))
-                    LineChart(aggregatedData.toImmutableList())
+                    LineChart(aggregatedData.display())
                 }
 
                 Spacer(modifier = Modifier.width(16.dp))
@@ -267,7 +255,7 @@ fun AllTimeCoffeeChart(coffeeState: DaysCoffeesState) {
                 )
 
                 Spacer(modifier = Modifier.height(16.dp))
-                LineChart(aggregatedData.toImmutableList())
+                LineChart(aggregatedData.display())
 
                 Spacer(modifier = Modifier.height(24.dp))
 
@@ -288,6 +276,22 @@ fun AllTimeCoffeeChart(coffeeState: DaysCoffeesState) {
     }
 }
 
+@Composable
+private fun List<AggregatedRawData>.display(): ImmutableList<AggregatedData> =
+    this.map {
+        when (it) {
+            is AggregatedDailyData -> AggregatedData(
+                "${getShortMonthName(it.month)} ${it.day}",
+                totalCount = it.totalCount,
+            )
+
+            is AggregatedMonthlyData -> AggregatedData(
+                label = "${getShortMonthName(it.month)} ${it.year}",
+                totalCount = it.totalCount,
+            )
+        }
+    }.toImmutableList()
+
 @Composable
 private fun ColumnChart(coffeeState: DaysCoffeesState) {
     // Create coffee type distribution data
@@ -361,15 +365,16 @@ private fun LineChart(aggregatedData: ImmutableList<AggregatedData>) {
     )
 }
 
-internal fun dailyAggregation(coffeeState: DaysCoffeesState): List<AggregatedData> =
+internal fun dailyAggregation(coffeeState: DaysCoffeesState): List<AggregatedDailyData> =
     coffeeState.coffees.map { (date, dayCoffee) ->
-        AggregatedData(
-            label = "${date.month.name.take(3)} ${date.day}",
+        AggregatedDailyData(
+            month = date.month,
+            day = date.day,
             totalCount = dayCoffee.coffeeCountMap.values.sum(),
         ) to date
     }.sortedBy { it.second }.map { it.first }
 
-internal fun monthlyAggregation(coffeeState: DaysCoffeesState): List<AggregatedData> =
+internal fun monthlyAggregation(coffeeState: DaysCoffeesState): List<AggregatedMonthlyData> =
     coffeeState.coffees.entries.groupBy { entry ->
         YearMonth(entry.key.year, entry.key.month)
     }.map { (yearMonth, entries) ->
@@ -380,8 +385,10 @@ internal fun monthlyAggregation(coffeeState: DaysCoffeesState): List<AggregatedD
             }
         }
 
-        AggregatedData(
-            label = yearMonth.toString(),
+        AggregatedMonthlyData(
+            year = yearMonth.year,
+            month = yearMonth.month,
+            // label = "${getShortMonthName(yearMonth.month)} ${yearMonth.year}",
             totalCount = typeCounts.values.sum(),
         ) to yearMonth
     }.sortedBy { it.second }.map { it.first }
@@ -397,4 +404,20 @@ data class AggregatedData(
     val totalCount: Int,
 )
 
+sealed interface AggregatedRawData {
+    val totalCount: Int
+}
+
+data class AggregatedDailyData(
+    val month: Month,
+    val day: Int,
+    override val totalCount: Int,
+) : AggregatedRawData
+
+data class AggregatedMonthlyData(
+    val year: Int,
+    val month: Month,
+    override val totalCount: Int,
+) : AggregatedRawData
+
 data class CoffeeTypeCount(val type: CoffeeType, val count: Int)
diff --git a/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/screens/DayListScreen.kt b/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/screens/DayListScreen.kt
index e24e5d5..15a7eb7 100644
--- a/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/screens/DayListScreen.kt
+++ b/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/screens/DayListScreen.kt
@@ -26,9 +26,9 @@ import com.slapps.cupertino.adaptive.ExperimentalAdaptiveApi
 import org.jetbrains.compose.resources.stringResource
 import ru.beryukhov.coffeegram.app_ui.LocalPhoneFrameInsets
 import ru.beryukhov.coffeegram.components.DayListComponent
+import ru.beryukhov.coffeegram.components.getShortMonthName
 import ru.beryukhov.coffeegram.data.CoffeeTypeWithCount
 import ru.beryukhov.coffeegram.view.CoffeeTypeItem
-import ru.beryukhov.date_time_utils.getFullMonthName
 
 @Composable
 fun DayListScreen(
@@ -69,7 +69,7 @@ fun DayListAppBar(
     AdaptiveTopAppBar(
         title = {
             Text(
-                "${localDate.day} ${getFullMonthName(localDate.month).take(3)} "
+                "${localDate.day} ${getShortMonthName(localDate.month)} "
                     + stringResource(Res.string.add_drink)
             )
         },
diff --git a/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/screens/MonthTableScreen.kt b/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/screens/MonthTableScreen.kt
index 7c7e9de..aba2b05 100644
--- a/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/screens/MonthTableScreen.kt
+++ b/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/screens/MonthTableScreen.kt
@@ -31,12 +31,11 @@ import kotlinx.datetime.TimeZone
 import kotlinx.datetime.toLocalDateTime
 import ru.beryukhov.coffeegram.app_ui.LocalPhoneFrameInsets
 import ru.beryukhov.coffeegram.components.MonthTableComponent
+import ru.beryukhov.coffeegram.components.getFullMonthName
 import ru.beryukhov.coffeegram.view.MonthTable
-import ru.beryukhov.date_time_utils.getFullMonthName
 import kotlin.time.Clock
-import kotlin.time.ExperimentalTime
 
-@OptIn(ExperimentalAdaptiveApi::class, ExperimentalTime::class)
+@OptIn(ExperimentalAdaptiveApi::class)
 @Composable
 fun MonthTableScreen(
     component: MonthTableComponent,
diff --git a/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/screens/ScreensPreviews.kt b/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/screens/ScreensPreviews.kt
index 3f1da2e..f682556 100644
--- a/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/screens/ScreensPreviews.kt
+++ b/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/screens/ScreensPreviews.kt
@@ -1,5 +1,7 @@
 package ru.beryukhov.coffeegram.screens
 
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.remember
@@ -15,6 +17,9 @@ import com.arkivanov.essenty.lifecycle.Lifecycle
 import com.arkivanov.essenty.lifecycle.Lifecycle.State
 import com.slapps.cupertino.adaptive.AdaptiveScaffold
 import com.slapps.cupertino.adaptive.ExperimentalAdaptiveApi
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.datetime.LocalDate
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.todayIn
 import repository.InMemoryCoffeeRepository
@@ -25,7 +30,15 @@ import ru.beryukhov.coffeegram.app_ui.StorePreview
 import ru.beryukhov.coffeegram.components.CoffeeEditComponent
 import ru.beryukhov.coffeegram.components.DefaultCoffeeEditComponent
 import ru.beryukhov.coffeegram.components.DefaultDayListComponent
+import ru.beryukhov.coffeegram.components.DefaultMonthTableComponent
 import ru.beryukhov.coffeegram.components.DefaultRootComponent
+import ru.beryukhov.coffeegram.components.DefaultStatsComponent
+import ru.beryukhov.coffeegram.components.StatsComponent
+import ru.beryukhov.coffeegram.data.CoffeeTypes
+import ru.beryukhov.coffeegram.data.DayCoffee
+import ru.beryukhov.coffeegram.model.DaysCoffeesIntent
+import ru.beryukhov.coffeegram.model.DaysCoffeesState
+import ru.beryukhov.coffeegram.model.DaysCoffeesStore
 import ru.beryukhov.coffeegram.model.DaysCoffeesStoreImpl
 import ru.beryukhov.coffeegram.model.ThemeStore
 import ru.beryukhov.coffeegram.model.getNavBarItems
@@ -35,107 +48,158 @@ import kotlin.time.Clock
 
 @StorePreview
 @Composable
-private fun MonthTableScreenPreview() = ScreenPreview(
-    headlineLines = listOf("Track your coffee habits and discover new flavors"),
-    backgroundColor = Color(0xFFDCA865),
-    pageNum = 0,
-)
-
-private val coffeeEditComponent
-    get() = object : CoffeeEditComponent {
-        override val childStack: Value<ChildStack<DefaultCoffeeEditComponent.Config, CoffeeEditComponent.Child>>
-            get() = MutableValue<ChildStack<DefaultCoffeeEditComponent.Config, CoffeeEditComponent.Child>>(
-                ChildStack(
-                    configuration = DefaultCoffeeEditComponent.Config.DayList(
-                        Clock.System.todayIn(TimeZone.currentSystemDefault())
-                    ),
-                    instance = CoffeeEditComponent.Child.DayList(
-                        DefaultDayListComponent(
-                            context = DefaultComponentContext(object : Lifecycle {
-                                override val state: State = State.RESUMED
-                                override fun subscribe(callbacks: Lifecycle.Callbacks) = Unit
-                                override fun unsubscribe(callbacks: Lifecycle.Callbacks) = Unit
-                            }),
-                            daysCoffeesStore = DaysCoffeesStoreImpl(
-                                CoffeeStorage(repository = InMemoryCoffeeRepository())
-                            ),
-                            date = Clock.System.todayIn(TimeZone.currentSystemDefault()),
-                            onBackNavigation = {},
-                        )
-                    )
-                )
-            )
-
-        override val backHandler: BackHandler = BackDispatcher()
-
-        override fun onBack() = Unit
+private fun MonthTableScreenPreview() = PreviewTheme {
+    val component = monthTableCoffeeEditComponent
+    StoreMarketingScreen(
+        headlineLines = listOf("Track your coffee habits day by day"),
+        backgroundColor = Color(0xFFDCA865),
+    ) {
+        RootScreen(
+            pageNum = 0,
+            TopBar = { CoffeeEditAppBar(coffeeEditComponent = component) },
+            CurrentScreen = { padding -> CoffeeEditScreen(component, contentPadding = padding) },
+        )
     }
+}
 
 @StorePreview
 @Composable
 private fun ListScreenPreview() = PreviewTheme {
+    val component = dayListCoffeeEditComponent
     StoreMarketingScreen(
-        headlineLines = listOf("Track your coffee habits and discover new flavors"),
+        headlineLines = listOf("Log every cup you brewed today"),
         backgroundColor = Color(0xFFDEB784),
     ) {
         RootScreen(
             pageNum = 0,
-            TopBar = {
-                CoffeeEditAppBar(coffeeEditComponent = coffeeEditComponent)
-            },
-            CurrentScreen = { CoffeeEditScreen(coffeeEditComponent) },
+            TopBar = { CoffeeEditAppBar(coffeeEditComponent = component) },
+            CurrentScreen = { padding -> CoffeeEditScreen(component, contentPadding = padding) },
         )
     }
 }
 
-@StorePreview
-@Composable
-private fun StatsScreenPreview() = ScreenPreview(
-    headlineLines = listOf("Discover your coffee preferences and explore new flavors"),
-    backgroundColor = Color(0xFFBFA6A0),
-    pageNum = 1,
-)
+private val previewLifecycle = object : Lifecycle {
+    override val state: State = State.RESUMED
+    override fun subscribe(callbacks: Lifecycle.Callbacks) = Unit
+    override fun unsubscribe(callbacks: Lifecycle.Callbacks) = Unit
+}
 
-@StorePreview
-@Composable
-private fun SettingsScreenPreview() = ScreenPreview(
-    headlineLines = listOf("Customize your coffee experience and explore new flavors"),
-    backgroundColor = Color(0xFFBFA6A0),
-    pageNum = 2,
-)
+private val previewDaysCoffeesStore: DaysCoffeesStore
+    get() = object : DaysCoffeesStore {
+        override val state: StateFlow<DaysCoffeesState> = MutableStateFlow(sampleDaysCoffeesState())
+        override fun newIntent(intent: DaysCoffeesIntent) = Unit
+    }
+
+private fun sampleDaysCoffeesState(): DaysCoffeesState {
+    val today = Clock.System.todayIn(TimeZone.currentSystemDefault())
+    fun day(d: Int): LocalDate = LocalDate(today.year, today.month, d)
+    // Seed every visible calendar week with at least one entry. `today` goes last so
+    // it overrides if it happens to fall on one of the seeded days.
+    return DaysCoffeesState(
+        coffees = mapOf(
+            day(4) to DayCoffee(mapOf(CoffeeTypes.Espresso to 2)),
+            day(7) to DayCoffee(mapOf(CoffeeTypes.Latte to 1)),
+            day(11) to DayCoffee(mapOf(CoffeeTypes.Mocha to 1, CoffeeTypes.Macchiato to 1)),
+            day(14) to DayCoffee(mapOf(CoffeeTypes.Cappuccino to 1)),
+            day(18) to DayCoffee(mapOf(CoffeeTypes.Glace to 1, CoffeeTypes.Frappe to 1)),
+            day(22) to DayCoffee(mapOf(CoffeeTypes.Americano to 1)),
+            day(26) to DayCoffee(mapOf(CoffeeTypes.Latte to 2)),
+            today to DayCoffee(
+                mapOf(
+                    CoffeeTypes.Cappuccino to 1,
+                    CoffeeTypes.Americano to 2,
+                    CoffeeTypes.Latte to 1,
+                )
+            ),
+        )
+    )
+}
+
+private val monthTableCoffeeEditComponent: CoffeeEditComponent
+    get() = previewCoffeeEditComponent(
+        configuration = DefaultCoffeeEditComponent.Config.MonthTable,
+        instance = { store ->
+            CoffeeEditComponent.Child.MonthTable(
+                DefaultMonthTableComponent(
+                    context = DefaultComponentContext(previewLifecycle),
+                    daysCoffeesStore = store,
+                    onNavigate = {},
+                )
+            )
+        },
+    )
+
+private val dayListCoffeeEditComponent: CoffeeEditComponent
+    get() {
+        val today = Clock.System.todayIn(TimeZone.currentSystemDefault())
+        return previewCoffeeEditComponent(
+            configuration = DefaultCoffeeEditComponent.Config.DayList(today),
+            instance = { store ->
+                CoffeeEditComponent.Child.DayList(
+                    DefaultDayListComponent(
+                        context = DefaultComponentContext(previewLifecycle),
+                        daysCoffeesStore = store,
+                        date = today,
+                        onBackNavigation = {},
+                    )
+                )
+            },
+        )
+    }
 
+private fun previewCoffeeEditComponent(
+    configuration: DefaultCoffeeEditComponent.Config,
+    instance: (DaysCoffeesStore) -> CoffeeEditComponent.Child,
+): CoffeeEditComponent = object : CoffeeEditComponent {
+    override val childStack: Value<ChildStack<DefaultCoffeeEditComponent.Config, CoffeeEditComponent.Child>> =
+        MutableValue(
+            ChildStack(
+                configuration = configuration,
+                instance = instance(previewDaysCoffeesStore),
+            )
+        )
+
+    override val backHandler: BackHandler = BackDispatcher()
+
+    override fun onBack() = Unit
+}
+
+@StorePreview
 @Composable
-private fun ScreenPreview(
-    headlineLines: List<String>,
-    subheadline: String? = null,
-    backgroundColor: Color,
-    pageNum: Int,
-) = PreviewTheme {
+private fun StatsScreenPreview() = PreviewTheme {
+    val component = previewStatsComponent
     StoreMarketingScreen(
-        headlineLines = headlineLines,
-        subheadline = subheadline,
-        backgroundColor = backgroundColor,
+        headlineLines = listOf("Discover trends across every cup you brewed"),
+        backgroundColor = Color(0xFFBFA6A0),
     ) {
         RootScreen(
-            rootComponent = DefaultRootComponent(
-                context = DefaultComponentContext(object : Lifecycle {
-                    override val state: State = State.RESUMED
-                    override fun subscribe(callbacks: Lifecycle.Callbacks) = Unit
-                    override fun unsubscribe(callbacks: Lifecycle.Callbacks) = Unit
-                }),
-                themeStore = ThemeStore(ThemeInMemoryStorage()),
-                daysCoffeesStore = DaysCoffeesStoreImpl(CoffeeStorage(repository = InMemoryCoffeeRepository()))
-            ).apply { selectPage(pageNum) },
+            pageNum = 1,
+            TopBar = { StatsAppBar() },
+            CurrentScreen = { padding -> StatsScreen(component, modifier = Modifier.padding(padding)) },
         )
     }
 }
 
+private val previewStatsComponent: StatsComponent
+    get() = DefaultStatsComponent(
+        context = DefaultComponentContext(previewLifecycle),
+        daysCoffeesStore = previewDaysCoffeesStore,
+    )
+
+// @StorePreview
+// @Composable
+// private fun SettingsScreenPreview() = ScreenPreview(
+//     headlineLines = listOf("Customize your coffee experience and explore new flavors"),
+//     backgroundColor = Color(0xFFBFA6A0),
+//     pageNum = 2,
+// )
+
 @OptIn(ExperimentalAdaptiveApi::class)
 @Composable
 private fun RootScreen(
     pageNum: Int,
     TopBar: @Composable (Modifier) -> Unit = { _ -> },
-    CurrentScreen: @Composable () -> Unit = { },
+    CurrentScreen: @Composable (PaddingValues) -> Unit = { },
     modifier: Modifier = Modifier,
 ) {
     val rootComponent = remember {
@@ -160,7 +224,7 @@ private fun RootScreen(
             topBar = { TopBar(modifier) },
             bottomBar = { BottomBar(rootComponent, navBarItems) }
         ) { paddingValues ->
-            CurrentScreen()
+            CurrentScreen(paddingValues)
         }
     }
 }
diff --git a/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/screens/SettingsScreen.kt b/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/screens/SettingsScreen.kt
index d50114e..196c26a 100644
--- a/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/screens/SettingsScreen.kt
+++ b/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/screens/SettingsScreen.kt
@@ -29,7 +29,10 @@ import coffeegram.cmp_common.generated.resources.app_theme_dark
 import coffeegram.cmp_common.generated.resources.app_theme_dynamic
 import coffeegram.cmp_common.generated.resources.app_theme_light
 import coffeegram.cmp_common.generated.resources.app_theme_summer
+import coffeegram.cmp_common.generated.resources.app_theme_summer_snackbar
 import coffeegram.cmp_common.generated.resources.app_theme_system
+import coffeegram.cmp_common.generated.resources.app_theme_system_snackbar
+import coffeegram.cmp_common.generated.resources.ok
 import coffeegram.cmp_common.generated.resources.settings
 import com.slapps.cupertino.adaptive.AdaptiveTopAppBar
 import com.slapps.cupertino.adaptive.ExperimentalAdaptiveApi
@@ -76,14 +79,16 @@ fun SettingsScreen(
             )
         }
         if (themeState.isDynamic != null) {
+            val message = stringResource(Res.string.app_theme_system_snackbar)
+            val actionLabel = stringResource(Res.string.ok)
             ThemeSwitchWithText(
                 checked = themeState.isDynamic == true,
                 onCheckedChange = {
                     if (it) {
                         scope.launch {
                             snackbarHostState.showSnackbar(
-                                message = "Now app theme will follow system theme",
-                                actionLabel = "OK",
+                                message = message,
+                                actionLabel = actionLabel,
                             )
                         }
                     }
@@ -93,14 +98,16 @@ fun SettingsScreen(
             )
         }
         if (themeState.isSummer != null) {
+            val message = stringResource(Res.string.app_theme_summer_snackbar)
+            val actionLabel = stringResource(Res.string.ok)
             ThemeSwitchWithText(
                 checked = themeState.isSummer == true,
                 onCheckedChange = {
                     if (it) {
                         scope.launch {
                             snackbarHostState.showSnackbar(
-                                message = "Summer starting",
-                                actionLabel = "OK",
+                                message = message,
+                                actionLabel = actionLabel,
                             )
                         }
                     }
diff --git a/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/screens/StatsScreen.kt b/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/screens/StatsScreen.kt
index a675595..5636859 100644
--- a/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/screens/StatsScreen.kt
+++ b/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/screens/StatsScreen.kt
@@ -19,7 +19,6 @@ import com.slapps.cupertino.adaptive.ExperimentalAdaptiveApi
 import org.jetbrains.compose.resources.stringResource
 import ru.beryukhov.coffeegram.app_ui.LocalPhoneFrameInsets
 import ru.beryukhov.coffeegram.components.StatsComponent
-import ru.beryukhov.coffeegram.pages.CoffeeCharts
 
 @Composable
 fun StatsScreen(
diff --git a/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/view/CalendarTable.kt b/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/view/CalendarTable.kt
index cb1d313..d71e75c 100644
--- a/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/view/CalendarTable.kt
+++ b/cmp-common/src/commonMain/kotlin/ru/beryukhov/coffeegram/view/CalendarTable.kt
@@ -30,10 +30,10 @@ import kotlinx.collections.immutable.toPersistentMap
 import kotlinx.datetime.LocalDate
 import kotlinx.datetime.Month
 import ru.beryukhov.coffeegram.app_ui.PreviewTheme
+import ru.beryukhov.coffeegram.components.dayNames
 import ru.beryukhov.coffeegram.data.CoffeeTypes
 import ru.beryukhov.coffeegram.data.Picture
 import ru.beryukhov.date_time_utils.YearMonth
-import ru.beryukhov.date_time_utils.dateFormatSymbolsShortWeekdays
 
 private data class DayItem(
     val day: String,
@@ -100,7 +100,7 @@ fun MonthTable(
             items(7) { index ->
                 Column(horizontalAlignment = Alignment.CenterHorizontally, modifier = Modifier.padding(top = 8.dp)) {
                     Text(
-                        text = getWeekDaysNames()[index],
+                        text = dayNames[index],
                         textAlign = TextAlign.Center,
                         style = typography.bodySmall
                     )
@@ -146,6 +146,3 @@ fun SampleTable(modifier: Modifier = Modifier) =
         modifier = modifier,
         onClick = {},
     )
-
-fun getWeekDaysNames(): List<String> =
-    dateFormatSymbolsShortWeekdays()
diff --git a/cmp-common/src/commonTest/kotlin/ru/beryukhov/coffeegram/pages/CoffeeChartsDataTest.kt b/cmp-common/src/commonTest/kotlin/ru/beryukhov/coffeegram/pages/CoffeeChartsDataTest.kt
index e8e7aa4..bd0240a 100644
--- a/cmp-common/src/commonTest/kotlin/ru/beryukhov/coffeegram/pages/CoffeeChartsDataTest.kt
+++ b/cmp-common/src/commonTest/kotlin/ru/beryukhov/coffeegram/pages/CoffeeChartsDataTest.kt
@@ -1,9 +1,17 @@
 package ru.beryukhov.coffeegram.pages
 
 import kotlinx.datetime.LocalDate
+import kotlinx.datetime.Month
 import ru.beryukhov.coffeegram.data.CoffeeTypes
 import ru.beryukhov.coffeegram.data.DayCoffee
 import ru.beryukhov.coffeegram.model.DaysCoffeesState
+import ru.beryukhov.coffeegram.screens.AggregatedDailyData
+import ru.beryukhov.coffeegram.screens.AggregatedMonthlyData
+import ru.beryukhov.coffeegram.screens.WeeklyChartData
+import ru.beryukhov.coffeegram.screens.dailyAggregation
+import ru.beryukhov.coffeegram.screens.entries
+import ru.beryukhov.coffeegram.screens.monthlyAggregation
+import ru.beryukhov.coffeegram.screens.weeklyChartData
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
@@ -15,7 +23,12 @@ class CoffeeChartsDataTest {
             startOfWeek = LocalDate(2023, 1, 2),
             coffeeState = DaysCoffeesState(
                 coffees = mapOf(
-                    LocalDate(2023, 1, 2) to DayCoffee(mapOf(CoffeeTypes.Latte to 1, CoffeeTypes.Espresso to 2)),
+                    LocalDate(2023, 1, 2) to DayCoffee(
+                        mapOf(
+                            CoffeeTypes.Latte to 1,
+                            CoffeeTypes.Espresso to 2
+                        )
+                    ),
                     LocalDate(2023, 1, 3) to DayCoffee(mapOf(CoffeeTypes.Latte to 4)),
                 )
             )
@@ -46,16 +59,21 @@ class CoffeeChartsDataTest {
             coffeeState = DaysCoffeesState(
                 coffees = mapOf(
                     LocalDate(2022, 12, 31) to DayCoffee(mapOf(CoffeeTypes.Irish to 6)),
-                    LocalDate(2023, 1, 2) to DayCoffee(mapOf(CoffeeTypes.Latte to 1, CoffeeTypes.Espresso to 2)),
+                    LocalDate(2023, 1, 2) to DayCoffee(
+                        mapOf(
+                            CoffeeTypes.Latte to 1,
+                            CoffeeTypes.Espresso to 2
+                        )
+                    ),
                     LocalDate(2023, 1, 3) to DayCoffee(mapOf(CoffeeTypes.Latte to 4)),
                 )
             )
         )
         assertEquals(
             expected = listOf(
-                AggregatedData(label = "DEC 31", totalCount = 6),
-                AggregatedData(label = "JAN 2", totalCount = 3),
-                AggregatedData(label = "JAN 3", totalCount = 4),
+                AggregatedDailyData(month = Month.DECEMBER, day = 31, totalCount = 6),
+                AggregatedDailyData(month = Month.JANUARY, day = 2, totalCount = 3),
+                AggregatedDailyData(month = Month.JANUARY, day = 3, totalCount = 4),
             ),
             actual = actualData
         )
@@ -67,16 +85,21 @@ class CoffeeChartsDataTest {
             coffeeState = DaysCoffeesState(
                 coffees = mapOf(
                     LocalDate(2022, 8, 14) to DayCoffee(mapOf(CoffeeTypes.Frappe to 7)),
-                    LocalDate(2023, 1, 2) to DayCoffee(mapOf(CoffeeTypes.Latte to 1, CoffeeTypes.Espresso to 2)),
+                    LocalDate(2023, 1, 2) to DayCoffee(
+                        mapOf(
+                            CoffeeTypes.Latte to 1,
+                            CoffeeTypes.Espresso to 2
+                        )
+                    ),
                     LocalDate(2023, 2, 3) to DayCoffee(mapOf(CoffeeTypes.Latte to 4)),
                 )
             )
         )
         assertEquals(
             expected = listOf(
-                AggregatedData(label = "AUG 2022", totalCount = 7),
-                AggregatedData(label = "JAN 2023", totalCount = 3),
-                AggregatedData(label = "FEB 2023", totalCount = 4),
+                AggregatedMonthlyData(month = Month.AUGUST, year = 2022, totalCount = 7),
+                AggregatedMonthlyData(month = Month.JANUARY, year = 2023, totalCount = 3),
+                AggregatedMonthlyData(month = Month.FEBRUARY, year = 2023, totalCount = 4),
             ),
             actual = actualData
         )
diff --git a/cmp-common/src/iosMain/kotlin/ru/beryukhov/coffeegram/app_ui/isSystemInDarkTheme.kt b/cmp-common/src/iosMain/kotlin/ru/beryukhov/coffeegram/app_ui/isSystemInDarkTheme.kt
index 680aa10..bf9afa6 100644
--- a/cmp-common/src/iosMain/kotlin/ru/beryukhov/coffeegram/app_ui/isSystemInDarkTheme.kt
+++ b/cmp-common/src/iosMain/kotlin/ru/beryukhov/coffeegram/app_ui/isSystemInDarkTheme.kt
@@ -1,3 +1,9 @@
 package ru.beryukhov.coffeegram.app_ui
 
+import androidx.compose.material3.ColorScheme
+import androidx.compose.runtime.Composable
+
 actual fun isCupertinoDefault(): Boolean = true
+
+@Composable
+actual fun dynamicColorSchemeOrNull(darkTheme: Boolean): ColorScheme? = null
diff --git a/cmp-common/src/jvmMain/kotlin/ru/beryukhov/coffeegram/app_ui/isSystemInDarkTheme.kt b/cmp-common/src/jvmMain/kotlin/ru/beryukhov/coffeegram/app_ui/isSystemInDarkTheme.kt
index fe7423c..9d3140d 100644
--- a/cmp-common/src/jvmMain/kotlin/ru/beryukhov/coffeegram/app_ui/isSystemInDarkTheme.kt
+++ b/cmp-common/src/jvmMain/kotlin/ru/beryukhov/coffeegram/app_ui/isSystemInDarkTheme.kt
@@ -1,3 +1,9 @@
 package ru.beryukhov.coffeegram.app_ui
 
+import androidx.compose.material3.ColorScheme
+import androidx.compose.runtime.Composable
+
 actual fun isCupertinoDefault(): Boolean = false
+
+@Composable
+actual fun dynamicColorSchemeOrNull(darkTheme: Boolean): ColorScheme? = null
diff --git a/cmp-common/src/webMain/kotlin/ru/beryukhov/coffeegram/app_ui/isSystemInDarkTheme.kt b/cmp-common/src/webMain/kotlin/ru/beryukhov/coffeegram/app_ui/isSystemInDarkTheme.kt
index fe7423c..9d3140d 100644
--- a/cmp-common/src/webMain/kotlin/ru/beryukhov/coffeegram/app_ui/isSystemInDarkTheme.kt
+++ b/cmp-common/src/webMain/kotlin/ru/beryukhov/coffeegram/app_ui/isSystemInDarkTheme.kt
@@ -1,3 +1,9 @@
 package ru.beryukhov.coffeegram.app_ui
 
+import androidx.compose.material3.ColorScheme
+import androidx.compose.runtime.Composable
+
 actual fun isCupertinoDefault(): Boolean = false
+
+@Composable
+actual fun dynamicColorSchemeOrNull(darkTheme: Boolean): ColorScheme? = null
diff --git a/date-time-utils/src/commonMain/kotlin/YearMonth.kt b/date-time-utils/src/commonMain/kotlin/YearMonth.kt
index 2809eff..6546c34 100644
--- a/date-time-utils/src/commonMain/kotlin/YearMonth.kt
+++ b/date-time-utils/src/commonMain/kotlin/YearMonth.kt
@@ -1,9 +1,6 @@
-@file:OptIn(ExperimentalTime::class)
-
 package ru.beryukhov.date_time_utils
 
 import kotlinx.datetime.DateTimeUnit.Companion.MONTH
-import kotlinx.datetime.DayOfWeek
 import kotlinx.datetime.LocalDate
 import kotlinx.datetime.Month
 import kotlinx.datetime.TimeZone
@@ -11,7 +8,6 @@ import kotlinx.datetime.number
 import kotlinx.datetime.plus
 import kotlinx.datetime.toLocalDateTime
 import kotlin.time.Clock
-import kotlin.time.ExperimentalTime
 
 data class YearMonth(val year: Int, val month: Month) : Comparable<YearMonth> {
 
@@ -32,10 +28,6 @@ data class YearMonth(val year: Int, val month: Month) : Comparable<YearMonth> {
         return LocalDate(year, month, day)
     }
 
-    fun isValidDay(dayOfMonth: Int): Boolean {
-        return dayOfMonth >= 1 && dayOfMonth <= lengthOfMonth()
-    }
-
     fun lengthOfMonth(): Int {
         return month.days(isLeapYear(year))
     }
@@ -43,15 +35,8 @@ data class YearMonth(val year: Int, val month: Month) : Comparable<YearMonth> {
     override fun compareTo(other: YearMonth): Int {
         return toTotalMonths().compareTo(other.toTotalMonths())
     }
-
-    override fun toString(): String {
-        return "${month.name.take(3)} $year"
-    }
 }
 
-fun getFullMonthName(month: Month): String =
-    month.name.lowercase().replaceFirstChar { it.titlecase() }
-
 fun nowYM(): YearMonth {
     val ld = nowLD()
     return YearMonth(ld.year, ld.month)
@@ -61,17 +46,6 @@ fun nowLD(): LocalDate {
     return Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault()).date
 }
 
-fun DayOfWeek.getShortDisplayName(): String =
-    when (this) {
-        DayOfWeek.MONDAY -> "MON"
-        DayOfWeek.TUESDAY -> "TUE"
-        DayOfWeek.WEDNESDAY -> "WED"
-        DayOfWeek.THURSDAY -> "THU"
-        DayOfWeek.FRIDAY -> "FRI"
-        DayOfWeek.SATURDAY -> "SAT"
-        DayOfWeek.SUNDAY -> "SUN"
-    }.lowercase().replaceFirstChar { it.titlecase() }
-
 private fun Month.days(leapYear: Boolean): Int =
     when (this) {
         Month.FEBRUARY -> if (leapYear) 29 else 28
@@ -86,9 +60,6 @@ private fun Month.days(leapYear: Boolean): Int =
 private fun isLeapYear(prolepticYear: Int): Boolean =
     prolepticYear and 3 == 0 && (prolepticYear % 100 != 0 || prolepticYear % 400 == 0)
 
-fun dateFormatSymbolsShortWeekdays(): List<String> =
-    DayOfWeek.entries.map { it.getShortDisplayName() }
-
 fun YearMonth.toTotalMonths(): Int {
     val yearsInMonths = this.year * 12
     val months = this.month.number - 1
diff --git a/wear/src/main/res/values-round/strings.xml b/wear/src/main/res/values-round/strings.xml
deleted file mode 100644
index d74c66c..0000000
--- a/wear/src/main/res/values-round/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <string name="hello_world">Hello Round World!</string>
-</resources>
\ No newline at end of file
diff --git a/wear/src/main/res/values/dimens.xml b/wear/src/main/res/values/dimens.xml
deleted file mode 100644
index 1a7ba4a..0000000
--- a/wear/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--
-    Because the window insets on round devices are larger than 15dp, this padding only applies
-    to square screens.
-    -->
-    <dimen name="box_inset_layout_padding">0dp</dimen>
-
-    <!--
-    This padding applies to both square and round screens. The total padding between the buttons
-    and the window insets is box_inset_layout_padding (above variable) on square screens and
-    inner_frame_layout_padding (below variable) on round screens.
-    -->
-    <dimen name="inner_frame_layout_padding">5dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/wear/src/main/res/values/strings.xml b/wear/src/main/res/values/strings.xml
index d30c2bd..efce3c0 100644
--- a/wear/src/main/res/values/strings.xml
+++ b/wear/src/main/res/values/strings.xml
@@ -1,8 +1,3 @@
 <resources>
-    <string name="app_name">CoffeegramWear</string>
-    <!--
-    This string is used for square devices and overridden by hello_world in
-    values-round/strings.xml for round devices.
-    -->
-    <string name="hello_world">Hello Square World!</string>
-</resources>
\ No newline at end of file
+    <string name="app_name">Coffeegram</string>
+</resources>