From f01fd187116883c08d3848591b52ec5e2a1002b8 Mon Sep 17 00:00:00 2001
From: Zakhar Timoshenko <vp1984tanki@gmail.com>
Date: Fri, 30 Jun 2023 21:27:20 +0300
Subject: [PATCH] Main activity theming

---
 .../core/ui/widgets/SegmentedBarView.kt       |   5 +-
 .../kotatsu/explore/ui/ExploreFragment.kt     |  10 +-
 .../ui/adapter/ExploreAdapterDelegates.kt     |  10 +-
 .../koitharu/kotatsu/main/ui/MainActivity.kt  |   2 +-
 .../settings/tools/views/MemoryUsageView.kt   |  34 ++++--
 app/src/main/res/color-v23/colored_button.xml |   2 +-
 app/src/main/res/color/colored_button.xml     |   2 +-
 .../main/res/color/navigation_bar_scrim.xml   |   2 +-
 .../res/drawable-v23/toolbar_background.xml   |  18 +++
 .../res/drawable/search_bar_background.xml    |   7 ++
 .../main/res/drawable/toolbar_background.xml  |  23 +++-
 .../res/layout-w600dp-land/activity_main.xml  |   2 +-
 app/src/main/res/layout/activity_details.xml  |   2 +-
 app/src/main/res/layout/activity_main.xml     |   2 +-
 .../main/res/layout/activity_manga_list.xml   |   3 +-
 app/src/main/res/layout/fragment_tools.xml    | 105 +++++++++++-------
 app/src/main/res/layout/item_empty_state.xml  |   1 -
 .../main/res/layout/item_explore_buttons.xml  |  20 +---
 app/src/main/res/layout/item_manga_grid.xml   |   2 +-
 app/src/main/res/layout/layout_app_update.xml |   3 +-
 .../main/res/layout/layout_details_info.xml   |   2 +-
 .../main/res/layout/layout_memory_usage.xml   |   4 +-
 .../main/res/values-night/colors_kotatsu.xml  |  60 ++++++----
 app/src/main/res/values/colors_kotatsu.xml    |  52 +++++----
 app/src/main/res/values/styles.xml            |  27 +++--
 app/src/main/res/values/themes.xml            |  33 +++---
 26 files changed, 267 insertions(+), 166 deletions(-)
 create mode 100644 app/src/main/res/drawable-v23/toolbar_background.xml
 create mode 100644 app/src/main/res/drawable/search_bar_background.xml

diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/SegmentedBarView.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/SegmentedBarView.kt
index 39591490a..12920d740 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/SegmentedBarView.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/SegmentedBarView.kt
@@ -28,13 +28,12 @@ class SegmentedBarView @JvmOverloads constructor(
 	private val paint = Paint(Paint.ANTI_ALIAS_FLAG)
 	private val segmentsData = ArrayList<Segment>()
 	private val segmentsSizes = ArrayList<Float>()
-	private val outlineColor = context.getThemeColor(materialR.attr.colorOutline)
 	private var cornerSize = 0f
 	private var scaleFactor = 1f
 	private var scaleAnimator: ValueAnimator? = null
 
 	init {
-		paint.strokeWidth = context.resources.resolveDp(1f)
+		paint.strokeWidth = context.resources.resolveDp(0f)
 		outlineProvider = OutlineProvider()
 		clipToOutline = true
 	}
@@ -57,12 +56,10 @@ class SegmentedBarView @JvmOverloads constructor(
 			paint.style = Paint.Style.FILL
 			val segmentWidth = segmentsSizes[i]
 			canvas.drawRoundRect(0f, 0f, x + cornerSize, height.toFloat(), cornerSize, cornerSize, paint)
-			paint.color = outlineColor
 			paint.style = Paint.Style.STROKE
 			canvas.drawRoundRect(0f, 0f, x + cornerSize, height.toFloat(), cornerSize, cornerSize, paint)
 			x -= segmentWidth
 		}
-		paint.color = outlineColor
 		paint.style = Paint.Style.STROKE
 		canvas.drawRoundRect(0f, 0f, w, height.toFloat(), cornerSize, cornerSize, paint)
 	}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/ExploreFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/ExploreFragment.kt
index bf58733d5..21522301c 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/ExploreFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/ExploreFragment.kt
@@ -105,12 +105,12 @@ class ExploreFragment :
 			R.id.button_history -> HistoryActivity.newIntent(v.context)
 			R.id.button_local -> MangaListActivity.newIntent(v.context, MangaSource.LOCAL)
 			R.id.button_bookmarks -> BookmarksActivity.newIntent(v.context)
-			R.id.button_suggestions -> SuggestionsActivity.newIntent(v.context)
+			//R.id.button_suggestions -> SuggestionsActivity.newIntent(v.context)
 			R.id.button_favourites -> FavouriteCategoriesActivity.newIntent(v.context)
-			R.id.button_random -> {
-				viewModel.openRandom()
-				return
-			}
+			//R.id.button_random -> {
+			//	viewModel.openRandom()
+			//	return
+			//}
 
 			else -> return
 		}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/adapter/ExploreAdapterDelegates.kt b/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/adapter/ExploreAdapterDelegates.kt
index bccedb039..614b5ef78 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/adapter/ExploreAdapterDelegates.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/adapter/ExploreAdapterDelegates.kt
@@ -33,13 +33,13 @@ fun exploreButtonsAD(
 	binding.buttonBookmarks.setOnClickListener(clickListener)
 	binding.buttonHistory.setOnClickListener(clickListener)
 	binding.buttonLocal.setOnClickListener(clickListener)
-	binding.buttonSuggestions.setOnClickListener(clickListener)
+	//binding.buttonSuggestions.setOnClickListener(clickListener)
 	binding.buttonFavourites.setOnClickListener(clickListener)
-	binding.buttonRandom.setOnClickListener(clickListener)
+	//binding.buttonRandom.setOnClickListener(clickListener)
 
-	bind {
-		binding.buttonSuggestions.isVisible = item.isSuggestionsEnabled
-	}
+	//bind {
+	//	binding.buttonSuggestions.isVisible = item.isSuggestionsEnabled
+	//}
 }
 
 fun exploreSourcesHeaderAD(
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainActivity.kt
index e2edc3295..37e03e512 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainActivity.kt
@@ -364,7 +364,7 @@ class MainActivity :
 		viewBinding.toolbarCard.background = if (isOpened) {
 			null
 		} else {
-			ContextCompat.getDrawable(this, R.drawable.toolbar_background)
+			ContextCompat.getDrawable(this, R.drawable.search_bar_background)
 		}
 		val padding = if (isOpened) 0 else resources.getDimensionPixelOffset(R.dimen.margin_normal)
 		viewBinding.appbar.updatePadding(left = padding, right = padding)
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/tools/views/MemoryUsageView.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/tools/views/MemoryUsageView.kt
index 0328e5534..544105f35 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/tools/views/MemoryUsageView.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/tools/views/MemoryUsageView.kt
@@ -2,14 +2,18 @@ package org.koitharu.kotatsu.settings.tools.views
 
 import android.content.Context
 import android.content.res.ColorStateList
+import android.graphics.Color
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.widget.LinearLayout
+import androidx.annotation.AttrRes
 import androidx.annotation.ColorInt
 import androidx.annotation.StringRes
+import androidx.core.content.ContextCompat
 import androidx.core.graphics.ColorUtils
 import androidx.core.widget.TextViewCompat
 import com.google.android.material.color.MaterialColors
+import okio.ByteString.Companion.decodeHex
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.ui.widgets.SegmentedBarView
 import org.koitharu.kotatsu.core.util.FileSize
@@ -17,6 +21,7 @@ import org.koitharu.kotatsu.core.util.ext.getThemeColor
 import org.koitharu.kotatsu.databinding.LayoutMemoryUsageBinding
 import org.koitharu.kotatsu.settings.tools.model.StorageUsage
 
+
 class MemoryUsageView @JvmOverloads constructor(
 	context: Context,
 	attrs: AttributeSet? = null
@@ -35,9 +40,9 @@ class MemoryUsageView @JvmOverloads constructor(
 	}
 
 	fun bind(usage: StorageUsage?) {
-		val storageSegment = SegmentedBarView.Segment(usage?.savedManga?.percent ?: 0f, segmentColor(1))
-		val pagesSegment = SegmentedBarView.Segment(usage?.pagesCache?.percent ?: 0f, segmentColor(2))
-		val otherSegment = SegmentedBarView.Segment(usage?.otherCache?.percent ?: 0f, segmentColor(3))
+		val storageSegment = SegmentedBarView.Segment(usage?.savedManga?.percent ?: 0f, segmentColor(com.google.android.material.R.attr.colorPrimary))
+		val pagesSegment = SegmentedBarView.Segment(usage?.pagesCache?.percent ?: 0f, segmentColor(com.google.android.material.R.attr.colorSecondary))
+		val otherSegment = SegmentedBarView.Segment(usage?.otherCache?.percent ?: 0f, segmentColor(com.google.android.material.R.attr.colorTertiary))
 
 		with(binding) {
 			bar.animateSegments(listOf(storageSegment, pagesSegment, otherSegment).filter { it.percent > 0f })
@@ -67,11 +72,26 @@ class MemoryUsageView @JvmOverloads constructor(
 		}
 	}
 
+	private fun getHue(hex: String): Float {
+		val r = (hex.substring(0, 2).toInt(16)).toFloat()
+		val g = (hex.substring(2, 4).toInt(16)).toFloat()
+		val b = (hex.substring(4, 6).toInt(16)).toFloat()
+
+		var hue = 0F
+		if ((r >= g) && (g >= b)) {
+			hue = 60 * (g - b) / (r - b)
+		} else if ((g > r) && (r >= b)) {
+			hue = 60 * (2 - (r - b) / (g - b))
+		}
+		return hue
+	}
+
 	@ColorInt
-	private fun segmentColor(i: Int): Int {
-		val hue = (93.6f * i) % 360
-		val color = ColorUtils.HSLToColor(floatArrayOf(hue, 0.4f, 0.6f))
-		val backgroundColor = context.getThemeColor(com.google.android.material.R.attr.colorSecondaryContainer)
+	private fun segmentColor(@AttrRes resId: Int): Int {
+		val colorHex = String.format("%06x", context.getThemeColor(resId))
+		val hue = getHue(colorHex)
+		val color = ColorUtils.HSLToColor(floatArrayOf(hue, 0.5f, 0.5f))
+		val backgroundColor = context.getThemeColor(com.google.android.material.R.attr.colorSurfaceContainerHigh)
 		return MaterialColors.harmonize(color, backgroundColor)
 	}
 }
diff --git a/app/src/main/res/color-v23/colored_button.xml b/app/src/main/res/color-v23/colored_button.xml
index fce774b1a..ad0dd1b69 100644
--- a/app/src/main/res/color-v23/colored_button.xml
+++ b/app/src/main/res/color-v23/colored_button.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:alpha="0.08" android:color="?attr/elevationOverlayColor" />
+	<item android:color="?attr/colorSurfaceContainerLow" />
 </selector>
diff --git a/app/src/main/res/color/colored_button.xml b/app/src/main/res/color/colored_button.xml
index a585251c3..15a69be0a 100644
--- a/app/src/main/res/color/colored_button.xml
+++ b/app/src/main/res/color/colored_button.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:alpha="0.08" android:color="@color/kotatsu_onSurface" />
+	<item android:color="@color/kotatsu_surfaceContainerLow" />
 </selector>
diff --git a/app/src/main/res/color/navigation_bar_scrim.xml b/app/src/main/res/color/navigation_bar_scrim.xml
index 6d9fe48af..379700c44 100644
--- a/app/src/main/res/color/navigation_bar_scrim.xml
+++ b/app/src/main/res/color/navigation_bar_scrim.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:alpha="0.7" android:color="?attr/colorSurface" />
+	<item android:alpha="0.7" android:color="?attr/colorSurfaceContainerHigh" />
 </selector>
diff --git a/app/src/main/res/drawable-v23/toolbar_background.xml b/app/src/main/res/drawable-v23/toolbar_background.xml
new file mode 100644
index 000000000..774e73986
--- /dev/null
+++ b/app/src/main/res/drawable-v23/toolbar_background.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<!-- Fills the entire area with the divider's color first... -->
+	<item>
+		<shape
+			android:shape="rectangle">
+			<solid android:color="?attr/colorSecondary"/>
+		</shape>
+	</item>
+	<!-- ..., then draws a rectangle with the container color to cover the area not for the divider. -->
+	<item
+		android:bottom="1dp">
+		<shape
+			android:shape="rectangle">
+			<solid android:color="?attr/colorSurfaceContainerHigh"/>
+		</shape>
+	</item>
+</layer-list>
diff --git a/app/src/main/res/drawable/search_bar_background.xml b/app/src/main/res/drawable/search_bar_background.xml
new file mode 100644
index 000000000..32b28bd70
--- /dev/null
+++ b/app/src/main/res/drawable/search_bar_background.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:shape="rectangle">
+	<solid android:color="@color/colored_button" />
+	<corners android:radius="100dp" />
+</shape>
diff --git a/app/src/main/res/drawable/toolbar_background.xml b/app/src/main/res/drawable/toolbar_background.xml
index 32b28bd70..e032e2149 100644
--- a/app/src/main/res/drawable/toolbar_background.xml
+++ b/app/src/main/res/drawable/toolbar_background.xml
@@ -1,7 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:shape="rectangle">
-	<solid android:color="@color/colored_button" />
-	<corners android:radius="100dp" />
-</shape>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<!-- Fills the entire area with the divider's color first... -->
+	<item>
+		<shape
+			android:shape="rectangle">
+			<solid android:color="@color/kotatsu_secondary"/>
+		</shape>
+	</item>
+	<!-- ..., then draws a rectangle with the container color to cover the area not for the divider. -->
+	<item
+		android:bottom="1dp">
+		<shape
+			android:shape="rectangle">
+			<solid android:color="@color/kotatsu_surfaceContainerHigh"/>
+		</shape>
+	</item>
+</layer-list>
diff --git a/app/src/main/res/layout-w600dp-land/activity_main.xml b/app/src/main/res/layout-w600dp-land/activity_main.xml
index 320e64005..e566cad6f 100644
--- a/app/src/main/res/layout-w600dp-land/activity_main.xml
+++ b/app/src/main/res/layout-w600dp-land/activity_main.xml
@@ -52,7 +52,7 @@
 				android:layout_width="match_parent"
 				android:layout_height="56dp"
 				android:layout_marginVertical="8dp"
-				android:background="@drawable/toolbar_background"
+				android:background="@drawable/search_bar_background"
 				android:theme="@style/ThemeOverlay.Kotatsu.MainToolbar"
 				app:layout_scrollFlags="scroll|enterAlways|snap">
 
diff --git a/app/src/main/res/layout/activity_details.xml b/app/src/main/res/layout/activity_details.xml
index 579adf35d..f401b2a27 100644
--- a/app/src/main/res/layout/activity_details.xml
+++ b/app/src/main/res/layout/activity_details.xml
@@ -21,7 +21,7 @@
 			android:id="@id/toolbar"
 			android:layout_width="match_parent"
 			android:layout_height="?attr/actionBarSize"
-			android:background="@drawable/m3_tabs_background"
+			android:background="@drawable/toolbar_background"
 			android:theme="?attr/actionBarTheme"
 			app:layout_scrollFlags="noScroll"
 			tools:ignore="PrivateResource" />
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d3d46a580..a19fc1163 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -36,7 +36,7 @@
 			android:layout_width="match_parent"
 			android:layout_height="48dp"
 			android:layout_marginVertical="8dp"
-			android:background="@drawable/toolbar_background"
+			android:background="@drawable/search_bar_background"
 			android:theme="@style/ThemeOverlay.Kotatsu.MainToolbar"
 			app:layout_scrollFlags="scroll|enterAlways|snap">
 
diff --git a/app/src/main/res/layout/activity_manga_list.xml b/app/src/main/res/layout/activity_manga_list.xml
index d2fe1e037..b2b2967df 100644
--- a/app/src/main/res/layout/activity_manga_list.xml
+++ b/app/src/main/res/layout/activity_manga_list.xml
@@ -30,11 +30,12 @@
 				tools:ignore="RtlSymmetry">
 
 				<com.google.android.material.chip.Chip
+					style="@style/Widget.Material3.Chip.Assist"
 					android:id="@+id/chip_sort"
-					style="@style/Widget.Material3.Chip.Assist.Elevated"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:visibility="gone"
+					app:chipBackgroundColor="?attr/colorSurfaceContainerHigh"
 					app:chipIcon="@drawable/ic_sort"
 					app:chipIconEnabled="true"
 					app:closeIcon="@drawable/ic_expand_more"
diff --git a/app/src/main/res/layout/fragment_tools.xml b/app/src/main/res/layout/fragment_tools.xml
index af1af8fc9..f9f93cb0e 100644
--- a/app/src/main/res/layout/fragment_tools.xml
+++ b/app/src/main/res/layout/fragment_tools.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView
 	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
@@ -15,61 +16,79 @@
 			layout="@layout/layout_app_update"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_margin="@dimen/margin_normal"
+			android:layout_marginHorizontal="@dimen/margin_normal"
+			android:layout_marginTop="@dimen/margin_normal"
 			android:visibility="gone"
 			tools:visibility="visible" />
 
-		<com.google.android.material.divider.MaterialDivider
+		<com.google.android.material.card.MaterialCardView
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_marginVertical="@dimen/margin_small"
-			android:visibility="gone"
-			tools:visibility="visible" />
+			android:layout_marginTop="@dimen/margin_normal"
+			android:layout_marginHorizontal="@dimen/margin_normal"
+			app:cardBackgroundColor="?attr/colorSurfaceContainerLow"
+			app:cardCornerRadius="21dp">
 
-		<org.koitharu.kotatsu.settings.tools.views.MemoryUsageView
-			android:id="@+id/memory_usage_view"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content" />
+			<org.koitharu.kotatsu.settings.tools.views.MemoryUsageView
+				android:id="@+id/memory_usage_view"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content" />
 
-		<com.google.android.material.divider.MaterialDivider
+		</com.google.android.material.card.MaterialCardView>
+
+		<com.google.android.material.card.MaterialCardView
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_marginVertical="@dimen/margin_small" />
+			android:layout_marginHorizontal="@dimen/margin_normal"
+			android:layout_marginTop="@dimen/margin_normal"
+			app:cardBackgroundColor="?attr/colorSurfaceContainerLow"
+			app:cardCornerRadius="21dp"
+			app:contentPaddingBottom="8dp"
+			app:contentPaddingTop="8dp">
 
-		<com.google.android.material.materialswitch.MaterialSwitch
-			android:id="@+id/switch_incognito"
-			style="?listItemTextViewStyle"
-			android:layout_width="match_parent"
-			android:layout_height="?android:listPreferredItemHeightSmall"
-			android:drawableStart="@drawable/ic_incognito"
-			android:drawablePadding="?android:listPreferredItemPaddingStart"
-			android:paddingStart="?android:listPreferredItemPaddingStart"
-			android:paddingEnd="?android:listPreferredItemPaddingEnd"
-			android:text="@string/incognito_mode"
-			android:textAppearance="?attr/textAppearanceButton"
-			android:textColor="?attr/colorControlNormal" />
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:orientation="vertical">
 
-		<org.koitharu.kotatsu.core.ui.widgets.ListItemTextView
-			android:id="@+id/button_downloads"
-			android:layout_width="match_parent"
-			android:layout_height="?android:listPreferredItemHeightSmall"
-			android:drawableStart="@drawable/ic_download"
-			android:drawablePadding="?android:listPreferredItemPaddingStart"
-			android:paddingStart="?android:listPreferredItemPaddingStart"
-			android:paddingEnd="?android:listPreferredItemPaddingEnd"
-			android:text="@string/downloads"
-			android:textAppearance="?attr/textAppearanceButton" />
+				<com.google.android.material.materialswitch.MaterialSwitch
+					android:id="@+id/switch_incognito"
+					style="?listItemTextViewStyle"
+					android:layout_width="match_parent"
+					android:layout_height="?android:listPreferredItemHeightSmall"
+					android:drawableStart="@drawable/ic_incognito"
+					android:drawablePadding="?android:listPreferredItemPaddingStart"
+					android:paddingStart="?android:listPreferredItemPaddingStart"
+					android:paddingEnd="?android:listPreferredItemPaddingEnd"
+					android:text="@string/incognito_mode"
+					android:textAppearance="?attr/textAppearanceButton"
+					android:textColor="?attr/colorControlNormal" />
 
-		<org.koitharu.kotatsu.core.ui.widgets.ListItemTextView
-			android:id="@+id/button_settings"
-			android:layout_width="match_parent"
-			android:layout_height="?android:listPreferredItemHeightSmall"
-			android:drawableStart="@drawable/ic_settings"
-			android:drawablePadding="?android:listPreferredItemPaddingStart"
-			android:paddingStart="?android:listPreferredItemPaddingStart"
-			android:paddingEnd="?android:listPreferredItemPaddingEnd"
-			android:text="@string/settings"
-			android:textAppearance="?attr/textAppearanceButton" />
+				<org.koitharu.kotatsu.core.ui.widgets.ListItemTextView
+					android:id="@+id/button_downloads"
+					android:layout_width="match_parent"
+					android:layout_height="?android:listPreferredItemHeightSmall"
+					android:drawableStart="@drawable/ic_download"
+					android:drawablePadding="?android:listPreferredItemPaddingStart"
+					android:paddingStart="?android:listPreferredItemPaddingStart"
+					android:paddingEnd="?android:listPreferredItemPaddingEnd"
+					android:text="@string/downloads"
+					android:textAppearance="?attr/textAppearanceButton" />
+
+				<org.koitharu.kotatsu.core.ui.widgets.ListItemTextView
+					android:id="@+id/button_settings"
+					android:layout_width="match_parent"
+					android:layout_height="?android:listPreferredItemHeightSmall"
+					android:drawableStart="@drawable/ic_settings"
+					android:drawablePadding="?android:listPreferredItemPaddingStart"
+					android:paddingStart="?android:listPreferredItemPaddingStart"
+					android:paddingEnd="?android:listPreferredItemPaddingEnd"
+					android:text="@string/settings"
+					android:textAppearance="?attr/textAppearanceButton" />
+
+			</LinearLayout>
+
+		</com.google.android.material.card.MaterialCardView>
 
 	</LinearLayout>
 
diff --git a/app/src/main/res/layout/item_empty_state.xml b/app/src/main/res/layout/item_empty_state.xml
index ff9a86494..94198432e 100644
--- a/app/src/main/res/layout/item_empty_state.xml
+++ b/app/src/main/res/layout/item_empty_state.xml
@@ -37,7 +37,6 @@
 
 	<Button
 		android:id="@+id/button_retry"
-		style="@style/Widget.Material3.Button.TonalButton"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_marginTop="@dimen/margin_normal"
diff --git a/app/src/main/res/layout/item_explore_buttons.xml b/app/src/main/res/layout/item_explore_buttons.xml
index 1864b1cd4..34aa9b3bd 100644
--- a/app/src/main/res/layout/item_explore_buttons.xml
+++ b/app/src/main/res/layout/item_explore_buttons.xml
@@ -23,14 +23,6 @@
 		android:text="@string/favourites"
 		app:icon="@drawable/ic_heart_outline" />
 
-	<com.google.android.material.button.MaterialButton
-		android:id="@+id/button_suggestions"
-		style="@style/Widget.Kotatsu.ExploreButton"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:text="@string/suggestions"
-		app:icon="@drawable/ic_suggestion" />
-
 	<com.google.android.material.button.MaterialButton
 		android:id="@+id/button_local"
 		style="@style/Widget.Kotatsu.ExploreButton"
@@ -47,19 +39,11 @@
 		android:text="@string/bookmarks"
 		app:icon="@drawable/ic_bookmark" />
 
-	<com.google.android.material.button.MaterialButton
-		android:id="@+id/button_random"
-		style="@style/Widget.Kotatsu.ExploreButton"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:text="@string/random"
-		app:icon="@drawable/ic_dice" />
-
 	<androidx.constraintlayout.helper.widget.Flow
 		android:id="@+id/flow"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		app:constraint_referenced_ids="button_history,button_favourites,button_local,button_bookmarks,button_suggestions,button_random"
+		app:constraint_referenced_ids="button_history,button_favourites,button_local,button_bookmarks"
 		app:flow_horizontalGap="12dp"
 		app:flow_maxElementsWrap="@integer/explore_buttons_columns"
 		app:flow_verticalGap="8dp"
@@ -68,4 +52,4 @@
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_manga_grid.xml b/app/src/main/res/layout/item_manga_grid.xml
index d4699ec71..c7f630690 100644
--- a/app/src/main/res/layout/item_manga_grid.xml
+++ b/app/src/main/res/layout/item_manga_grid.xml
@@ -3,7 +3,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
-	style="@style/Widget.Material3.CardView.Filled"
+	style="@style/Widget.Kotatsu.CardView.Outlined"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:clipChildren="false"
diff --git a/app/src/main/res/layout/layout_app_update.xml b/app/src/main/res/layout/layout_app_update.xml
index 02701ea39..d9b7525e7 100644
--- a/app/src/main/res/layout/layout_app_update.xml
+++ b/app/src/main/res/layout/layout_app_update.xml
@@ -3,7 +3,8 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:id="@+id/card_update"
-	style="@style/Widget.Material3.CardView.Filled"
+	app:cardCornerRadius="21dp"
+	app:cardBackgroundColor="?attr/colorSurfaceContainerLow"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	app:contentPadding="@dimen/margin_normal">
diff --git a/app/src/main/res/layout/layout_details_info.xml b/app/src/main/res/layout/layout_details_info.xml
index 8551c127b..228a38b40 100644
--- a/app/src/main/res/layout/layout_details_info.xml
+++ b/app/src/main/res/layout/layout_details_info.xml
@@ -7,7 +7,7 @@
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:baselineAligned="false"
-	android:divider="?attr/colorOutline"
+	android:divider="?attr/colorSecondary"
 	android:dividerPadding="8dp"
 	android:gravity="center_vertical"
 	android:orientation="horizontal"
diff --git a/app/src/main/res/layout/layout_memory_usage.xml b/app/src/main/res/layout/layout_memory_usage.xml
index 6d6212caa..d1135f812 100644
--- a/app/src/main/res/layout/layout_memory_usage.xml
+++ b/app/src/main/res/layout/layout_memory_usage.xml
@@ -13,7 +13,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_marginStart="@dimen/screen_padding"
-		android:layout_marginTop="@dimen/margin_small">
+		android:layout_marginTop="4dp">
 
 		<TextView
 			android:layout_width="0dp"
@@ -35,7 +35,7 @@
 	<org.koitharu.kotatsu.core.ui.widgets.SegmentedBarView
 		android:id="@+id/bar"
 		android:layout_width="match_parent"
-		android:layout_height="16dp"
+		android:layout_height="18dp"
 		android:layout_marginStart="@dimen/screen_padding"
 		android:layout_marginEnd="@dimen/screen_padding"
 		android:background="?colorSecondaryContainer" />
diff --git a/app/src/main/res/values-night/colors_kotatsu.xml b/app/src/main/res/values-night/colors_kotatsu.xml
index 12f4d3023..520e2e02d 100644
--- a/app/src/main/res/values-night/colors_kotatsu.xml
+++ b/app/src/main/res/values-night/colors_kotatsu.xml
@@ -4,29 +4,41 @@
   ~ M3 colors generated by Material Theme Builder (https://goo.gle/material-theme-builder-web)
 -->
 <resources>
-	<color name="kotatsu_primary">#A5C8FF</color>
-	<color name="kotatsu_onPrimary">#00315E</color>
-	<color name="kotatsu_inversePrimary">#005FAE</color>
-	<color name="kotatsu_primaryContainer">#004785</color>
-	<color name="kotatsu_onPrimaryContainer">#D4E3FF</color>
-	<color name="kotatsu_secondary">#BCC7DC</color>
-	<color name="kotatsu_onSecondary">#263141</color>
-	<color name="kotatsu_secondaryContainer">#3D4758</color>
-	<color name="kotatsu_onSecondaryContainer">#D8E3F8</color>
-	<color name="kotatsu_tertiary">#DABDE2</color>
-	<color name="kotatsu_onTertiary">#3D2946</color>
-	<color name="kotatsu_tertiaryContainer">#553F5E</color>
-	<color name="kotatsu_onTertiaryContainer">#F7D8FF</color>
-	<color name="kotatsu_background">#1A1C1E</color>
-	<color name="kotatsu_onBackground">#E3E2E6</color>
-	<color name="kotatsu_surface">#1A1C1E</color>
-	<color name="kotatsu_onSurface">#E3E2E6</color>
-	<color name="kotatsu_surfaceVariant">#43474E</color>
-	<color name="kotatsu_onSurfaceVariant">#C3C6CF</color>
-	<color name="kotatsu_inverseSurface">#E3E2E6</color>
-	<color name="kotatsu_inverseOnSurface">#1A1C1E</color>
-	<color name="kotatsu_outline">#8D9199</color>
+	<color name="kotatsu_primary">#D0BCFF</color>
+	<color name="kotatsu_primaryContainer">#4F378B</color>
+	<color name="kotatsu_onPrimary">#371E73</color>
+	<color name="kotatsu_onPrimaryContainer">#EADDFF</color>
+	<color name="kotatsu_inversePrimary">#6750A4</color>
+	<color name="kotatsu_secondary">#CCC2DC</color>
+	<color name="kotatsu_secondaryContainer">#4A4458</color>
+	<color name="kotatsu_onSecondary">#332D41</color>
+	<color name="kotatsu_onSecondaryContainer">#E8DEF8</color>
+	<color name="kotatsu_tertiary">#EFB8C8</color>
+	<color name="kotatsu_tertiaryContainer">#633B48</color>
+	<color name="kotatsu_onTertiary">#492532</color>
+	<color name="kotatsu_onTertiaryContainer">#FFD8E4</color>
+	<color name="kotatsu_surface">#141218</color>
+	<color name="kotatsu_surfaceDim">#141218</color>
+	<color name="kotatsu_surfaceBright">#141218</color>
+	<color name="kotatsu_surfaceContainerLowest">#0F0D13</color>
+	<color name="kotatsu_surfaceContainerLow">#1D1B20</color>
+	<color name="kotatsu_surfaceContainer">#211F26</color>
+	<color name="kotatsu_surfaceContainerHigh">#2B2930</color>
+	<color name="kotatsu_surfaceContainerHighest">#36343B</color>
+	<color name="kotatsu_surfaceVariant">#49454F</color>
+	<color name="kotatsu_onSurface">#E6E1E5</color>
+	<color name="kotatsu_onSurfaceVariant">#CAC4D0</color>
+	<color name="kotatsu_inverseSurface">#E6E1E5</color>
+	<color name="kotatsu_inverseOnSurface">#313033</color>
+	<color name="kotatsu_background">#141218</color>
+	<color name="kotatsu_onBackground">#E6E1E5</color>
+	<color name="kotatsu_error">#F2B8B5</color>
+	<color name="kotatsu_errorContainer">#8C1D18</color>
+	<color name="kotatsu_onError">#601410</color>
+	<color name="kotatsu_onErrorContainer">#F9DEDC</color>
+	<color name="kotatsu_outline">#938F99</color>
+	<color name="kotatsu_outlineVariant">#444746</color>
 	<color name="kotatsu_shadow">#000000</color>
-	<color name="kotatsu_surfaceTint">#A5C8FF</color>
-	<color name="kotatsu_surfaceTintColor">#A5C8FF</color>
+	<color name="kotatsu_surfaceTint">#D0BCFF</color>
+	<color name="kotatsu_scrim">#000000</color>
 </resources>
diff --git a/app/src/main/res/values/colors_kotatsu.xml b/app/src/main/res/values/colors_kotatsu.xml
index 012c2e6ac..dc3b9d664 100644
--- a/app/src/main/res/values/colors_kotatsu.xml
+++ b/app/src/main/res/values/colors_kotatsu.xml
@@ -4,29 +4,41 @@
   ~ M3 colors generated by Material Theme Builder (https://goo.gle/material-theme-builder-web)
 -->
 <resources>
-	<color name="kotatsu_primary">#005FAE</color>
+	<color name="kotatsu_primary">#6750A4</color>
+	<color name="kotatsu_primaryContainer">#EADDFF</color>
 	<color name="kotatsu_onPrimary">#FFFFFF</color>
-	<color name="kotatsu_inversePrimary">#A5C8FF</color>
-	<color name="kotatsu_primaryContainer">#D4E3FF</color>
-	<color name="kotatsu_onPrimaryContainer">#001C3A</color>
-	<color name="kotatsu_secondary">#545F71</color>
+	<color name="kotatsu_onPrimaryContainer">#21005E</color>
+	<color name="kotatsu_inversePrimary">#D0BCFF</color>
+	<color name="kotatsu_secondary">#625B71</color>
+	<color name="kotatsu_secondaryContainer">#E8DEF8</color>
 	<color name="kotatsu_onSecondary">#FFFFFF</color>
-	<color name="kotatsu_secondaryContainer">#D8E3F8</color>
-	<color name="kotatsu_onSecondaryContainer">#111C2B</color>
-	<color name="kotatsu_tertiary">#6D5676</color>
+	<color name="kotatsu_onSecondaryContainer">#1E192B</color>
+	<color name="kotatsu_tertiary">#7D5260</color>
+	<color name="kotatsu_tertiaryContainer">#FFD8E4</color>
 	<color name="kotatsu_onTertiary">#FFFFFF</color>
-	<color name="kotatsu_tertiaryContainer">#F7D8FF</color>
-	<color name="kotatsu_onTertiaryContainer">#271430</color>
-	<color name="kotatsu_background">#F0F0F3</color>
-	<color name="kotatsu_onBackground">#1A1C1E</color>
-	<color name="kotatsu_surface">#F0F0F3</color>
-	<color name="kotatsu_onSurface">#1A1C1E</color>
-	<color name="kotatsu_surfaceVariant">#E0E2EC</color>
-	<color name="kotatsu_onSurfaceVariant">#43474E</color>
-	<color name="kotatsu_inverseSurface">#2F3033</color>
-	<color name="kotatsu_inverseOnSurface">#F1F0F4</color>
+	<color name="kotatsu_onTertiaryContainer">#370B1E</color>
+	<color name="kotatsu_surface">#FEF7FF</color>
+	<color name="kotatsu_surfaceDim">#DED8E1</color>
+	<color name="kotatsu_surfaceBright">#FEF7FF</color>
+	<color name="kotatsu_surfaceContainerLowest">#FFFFFF</color>
+	<color name="kotatsu_surfaceContainerLow">#F7F2FA</color>
+	<color name="kotatsu_surfaceContainer">#F3EDF7</color>
+	<color name="kotatsu_surfaceContainerHigh">#ECE6F0</color>
+	<color name="kotatsu_surfaceContainerHighest">#E6E0E9</color>
+	<color name="kotatsu_surfaceVariant">#E7E0EC</color>
+	<color name="kotatsu_onSurface">#1C1B1F</color>
+	<color name="kotatsu_onSurfaceVariant">#49454E</color>
+	<color name="kotatsu_inverseSurface">#313033</color>
+	<color name="kotatsu_inverseOnSurface">#F4EFF4</color>
+	<color name="kotatsu_background">#FEF7FF</color>
+	<color name="kotatsu_onBackground">#1C1B1F</color>
+	<color name="kotatsu_error">#B3261E</color>
+	<color name="kotatsu_errorContainer">#F9DEDC</color>
+	<color name="kotatsu_onError">#FFFFFF</color>
+	<color name="kotatsu_onErrorContainer">#410E0B</color>
 	<color name="kotatsu_outline">#74777F</color>
+	<color name="kotatsu_outlineVariant">#C4C7C5</color>
 	<color name="kotatsu_shadow">#000000</color>
-	<color name="kotatsu_surfaceTint">#005FAE</color>
-	<color name="kotatsu_surfaceTintColor">#005FAE</color>
+	<color name="kotatsu_surfaceTint">#6750A4</color>
+	<color name="kotatsu_scrim">#000000</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index fce1c7d72..ff1b2abb6 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -2,10 +2,16 @@
 
 	<!--Toolbars-->
 
+	<style name="Widget.Kotatsu.AppBarLayout" parent="@style/Widget.Material3.AppBarLayout">
+		<item name="android:background">?attr/colorSurfaceContainerHigh</item>
+	</style>
+
 	<!--Navigation Views-->
 
 	<style name="Widget.Kotatsu.BottomNavigationView" parent="Widget.Material3.BottomNavigationView">
-		<item name="labelVisibilityMode">labeled</item>
+		<item name="labelVisibilityMode">unlabeled</item>
+		<item name="android:background">?attr/colorSurfaceContainerHighest</item>
+		<item name="compatShadowEnabled">false</item>
 	</style>
 
 	<style name="Widget.Kotatsu.BottomNavigationView.ColoredIndicators">
@@ -61,6 +67,11 @@
 
 	<!-- Widget styles -->
 
+	<style name="Widget.Kotatsu.CardView.Outlined" parent="@style/Widget.Material3.CardView.Outlined">
+		<item name="strokeColor">?attr/colorSecondary</item>
+		<item name="cardBackgroundColor">?attr/colorSurfaceContainerLow</item>
+	</style>
+
 	<style name="Widget.Kotatsu.Tabs" parent="@style/Widget.Material3.TabLayout">
 		<item name="tabGravity">center</item>
 		<item name="tabInlineLabel">true</item>
@@ -86,7 +97,7 @@
 	</style>
 
 	<style name="Widget.Kotatsu.Chip" parent="Widget.Material3.Chip.Suggestion">
-		<item name="chipSurfaceColor">?attr/colorSurface</item>
+		<item name="chipBackgroundColor">?attr/colorSurfaceContainerHigh</item>
 		<item name="android:textColor">?attr/colorOnSurfaceVariant</item>
 		<item name="chipStrokeColor">?attr/colorOutline</item>
 		<item name="chipIconTint">?attr/colorControlNormal</item>
@@ -163,16 +174,18 @@
 	</style>
 
 	<style name="Widget.Kotatsu.ExploreButton" parent="Widget.Material3.Button.TonalButton.Icon">
-		<item name="android:minHeight">58dp</item>
-		<item name="android:textColor">?attr/colorOnSurface</item>
+		<item name="android:minHeight">54dp</item>
 		<item name="android:singleLine">true</item>
-		<item name="shapeAppearance">?shapeAppearanceCornerLarge</item>
+		<item name="shapeAppearance">?shapeAppearanceCornerExtraLarge</item>
+		<item name="android:ellipsize">marquee</item>
+		<item name="android:marqueeRepeatLimit">marquee_forever</item>
 		<item name="iconSize">22dp</item>
 		<item name="iconPadding">16dp</item>
 		<item name="iconGravity">start</item>
+		<item name="iconTint">?attr/colorPrimary</item>
+		<item name="android:textColor">?attr/colorPrimary</item>
 		<item name="android:insetTop">2dp</item>
 		<item name="android:insetBottom">2dp</item>
-		<item name="iconTint">?attr/colorPrimaryDark</item>
 		<item name="android:gravity">start|center_vertical</item>
 		<item name="android:textAppearance">?textAppearanceButton</item>
 		<item name="backgroundTint">@color/colored_button</item>
@@ -234,7 +247,7 @@
 	</style>
 
 	<style name="ShapeAppearanceOverlay.Kotatsu.Cover.Small" parent="">
-		<item name="cornerSize">6dp</item>
+		<item name="cornerSize">21dp</item>
 	</style>
 
 	<style name="ShapeAppearanceOverlay.Kotatsu.Circle" parent="">
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index b696d34d5..adcfbb78c 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -9,34 +9,41 @@
 
 		<!-- Theme Colors -->
 		<item name="colorPrimary">@color/kotatsu_primary</item>
-		<item name="colorOnPrimary">@color/kotatsu_onPrimary</item>
 		<item name="colorPrimaryContainer">@color/kotatsu_primaryContainer</item>
+		<item name="colorOnPrimary">@color/kotatsu_onPrimary</item>
 		<item name="colorOnPrimaryContainer">@color/kotatsu_onPrimaryContainer</item>
+		<item name="colorPrimaryInverse">@color/kotatsu_inversePrimary</item>
 		<item name="colorSecondary">@color/kotatsu_secondary</item>
-		<item name="colorOnSecondary">@color/kotatsu_onSecondary</item>
 		<item name="colorSecondaryContainer">@color/kotatsu_secondaryContainer</item>
+		<item name="colorOnSecondary">@color/kotatsu_onSecondary</item>
 		<item name="colorOnSecondaryContainer">@color/kotatsu_onSecondaryContainer</item>
 		<item name="colorTertiary">@color/kotatsu_tertiary</item>
-		<item name="colorOnTertiary">@color/kotatsu_onTertiary</item>
 		<item name="colorTertiaryContainer">@color/kotatsu_tertiaryContainer</item>
+		<item name="colorOnTertiary">@color/kotatsu_onTertiary</item>
 		<item name="colorOnTertiaryContainer">@color/kotatsu_onTertiaryContainer</item>
-		<item name="android:colorBackground">@color/kotatsu_background</item>
-		<item name="colorOnBackground">@color/kotatsu_onBackground</item>
 		<item name="colorSurface">@color/kotatsu_surface</item>
-		<item name="colorOnSurface">@color/kotatsu_onSurface</item>
+		<item name="colorSurfaceDim">@color/kotatsu_surfaceDim</item>
+		<item name="colorSurfaceBright">@color/kotatsu_surfaceBright</item>
+		<item name="colorSurfaceContainerLowest">@color/kotatsu_surfaceContainerLowest</item>
+		<item name="colorSurfaceContainerLow">@color/kotatsu_surfaceContainerLow</item>
+		<item name="colorSurfaceContainer">@color/kotatsu_surfaceContainer</item>
+		<item name="colorSurfaceContainerHigh">@color/kotatsu_surfaceContainerHigh</item>
+		<item name="colorSurfaceContainerHighest">@color/kotatsu_surfaceContainerHighest</item>
 		<item name="colorSurfaceVariant">@color/kotatsu_surfaceVariant</item>
+		<item name="colorOnSurface">@color/kotatsu_onSurface</item>
 		<item name="colorOnSurfaceVariant">@color/kotatsu_onSurfaceVariant</item>
-		<item name="colorOutline">@color/kotatsu_outline</item>
-		<item name="colorOnSurfaceInverse">@color/kotatsu_inverseOnSurface</item>
 		<item name="colorSurfaceInverse">@color/kotatsu_inverseSurface</item>
-		<item name="colorPrimaryInverse">@color/kotatsu_inversePrimary</item>
+		<item name="colorOnSurfaceInverse">@color/kotatsu_inverseOnSurface</item>
+		<item name="android:colorBackground">@color/kotatsu_surfaceContainerHigh</item>
+		<item name="colorOnBackground">@color/kotatsu_onSurface</item>
 		<item name="colorError">@color/error</item>
-		<item name="colorOnError">@color/onError</item>
 		<item name="colorErrorContainer">@color/errorContainer</item>
-		<item name="colorControlHighlight">?attr/colorSurfaceVariant</item>
+		<item name="colorOnError">@color/onError</item>
 		<item name="colorOnErrorContainer">@color/onErrorContainer</item>
+		<item name="colorOutline">@color/kotatsu_outline</item>
+		<item name="colorOutlineVariant">@color/kotatsu_outline</item>
 
-		<item name="android:divider">@color/divider_default</item>
+		<item name="android:divider">@color/kotatsu_outline</item>
 
 		<!-- Handles RTL text -->
 		<item name="android:textAlignment">gravity</item>
@@ -64,7 +71,7 @@
 		<item name="chipStyle">@style/Widget.Kotatsu.Chip</item>
 		<item name="textInputStyle">@style/Widget.Material3.TextInputLayout.OutlinedBox</item>
 		<item name="toolbarStyle">@style/Widget.Material3.Toolbar</item>
-		<item name="appBarLayoutStyle">@style/Widget.Material3.AppBarLayout</item>
+		<item name="appBarLayoutStyle">@style/Widget.Kotatsu.AppBarLayout</item>
 		<item name="bottomNavigationStyle">@style/Widget.Kotatsu.BottomNavigationView.ColoredIndicators</item>
 		<item name="tabStyle">@style/Widget.Kotatsu.Tabs</item>
 		<item name="materialCardViewStyle">@style/Widget.Material3.CardView.Filled</item>