diff --git a/app/src/main/res/drawable-v31/bg_appwidget_card.xml b/app/src/main/res/drawable-v31/bg_appwidget_card.xml
deleted file mode 100644
index 4cff15c71..000000000
--- a/app/src/main/res/drawable-v31/bg_appwidget_card.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:shape="rectangle">
-	<corners android:radius="@dimen/appwidget_corner_radius_inner" />
-	<solid android:color="@android:color/system_accent2_100" />
-</shape>
diff --git a/app/src/main/res/drawable-v31/bg_appwidget_root.xml b/app/src/main/res/drawable-v31/bg_appwidget_root.xml
deleted file mode 100644
index cb7dbf180..000000000
--- a/app/src/main/res/drawable-v31/bg_appwidget_root.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:shape="rectangle">
-	<corners android:radius="@dimen/appwidget_corner_radius_background" />
-	<solid android:color="@android:color/system_accent2_50" />
-</shape>
diff --git a/app/src/main/res/drawable/bg_appwidget_card.xml b/app/src/main/res/drawable/bg_appwidget_card.xml
index b18a84c01..9dcc796fd 100644
--- a/app/src/main/res/drawable/bg_appwidget_card.xml
+++ b/app/src/main/res/drawable/bg_appwidget_card.xml
@@ -3,5 +3,5 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:shape="rectangle">
 	<corners android:radius="@dimen/appwidget_corner_radius_inner" />
-	<solid android:color="@color/kotatsu_primaryContainer" />
+	<solid android:color="?android:panelColorBackground" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_appwidget_root.xml b/app/src/main/res/drawable/bg_appwidget_root.xml
index 189ce5e53..7625f547c 100644
--- a/app/src/main/res/drawable/bg_appwidget_root.xml
+++ b/app/src/main/res/drawable/bg_appwidget_root.xml
@@ -3,5 +3,5 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:shape="rectangle">
 	<corners android:radius="@dimen/appwidget_corner_radius_background" />
-	<solid android:color="@color/kotatsu_background" />
+	<solid android:color="?android:colorBackground" />
 </shape>
diff --git a/app/src/main/res/layout/widget_shelf.xml b/app/src/main/res/layout/widget_shelf.xml
index 1aa5e345e..466ad4935 100644
--- a/app/src/main/res/layout/widget_shelf.xml
+++ b/app/src/main/res/layout/widget_shelf.xml
@@ -20,6 +20,7 @@
 		android:numColumns="auto_fit"
 		android:orientation="horizontal"
 		android:padding="4dp"
+		android:scrollbarStyle="insideOverlay"
 		tools:listitem="@layout/item_shelf" />
 
 	<TextView
diff --git a/app/src/main/res/values-night-v31/themes.xml b/app/src/main/res/values-night-v31/themes.xml
index ab2f43458..705b3d182 100644
--- a/app/src/main/res/values-night-v31/themes.xml
+++ b/app/src/main/res/values-night-v31/themes.xml
@@ -7,29 +7,46 @@
 		<item name="colorPrimary">@color/m3_sys_color_dynamic_dark_primary</item>
 		<item name="colorPrimaryContainer">@color/m3_sys_color_dynamic_dark_primary_container</item>
 		<item name="colorOnPrimary">@color/m3_sys_color_dynamic_dark_on_primary</item>
-		<item name="colorOnPrimaryContainer">@color/m3_sys_color_dynamic_dark_on_primary_container</item>
+		<item name="colorOnPrimaryContainer">@color/m3_sys_color_dynamic_dark_on_primary_container
+		</item>
 		<item name="colorPrimaryInverse">@color/m3_sys_color_dynamic_dark_inverse_primary</item>
 		<item name="colorSecondary">@color/m3_sys_color_dynamic_dark_secondary</item>
-		<item name="colorSecondaryContainer">@color/m3_sys_color_dynamic_dark_secondary_container</item>
+		<item name="colorSecondaryContainer">@color/m3_sys_color_dynamic_dark_secondary_container
+		</item>
 		<item name="colorOnSecondary">@color/m3_sys_color_dynamic_dark_on_secondary</item>
-		<item name="colorOnSecondaryContainer">@color/m3_sys_color_dynamic_dark_on_secondary_container</item>
+		<item name="colorOnSecondaryContainer">
+			@color/m3_sys_color_dynamic_dark_on_secondary_container
+		</item>
 		<item name="colorTertiary">@color/m3_sys_color_dynamic_dark_tertiary</item>
-		<item name="colorTertiaryContainer">@color/m3_sys_color_dynamic_dark_tertiary_container</item>
+		<item name="colorTertiaryContainer">@color/m3_sys_color_dynamic_dark_tertiary_container
+		</item>
 		<item name="colorOnTertiary">@color/m3_sys_color_dynamic_dark_on_tertiary</item>
-		<item name="colorOnTertiaryContainer">@color/m3_sys_color_dynamic_dark_on_tertiary_container</item>
+		<item name="colorOnTertiaryContainer">
+			@color/m3_sys_color_dynamic_dark_on_tertiary_container
+		</item>
 		<item name="colorSurface">@color/m3_sys_color_dynamic_dark_surface</item>
 		<item name="colorSurfaceDim">@color/m3_sys_color_dynamic_dark_surface_dim</item>
 		<item name="colorSurfaceBright">@color/m3_sys_color_dynamic_dark_surface_bright</item>
-		<item name="colorSurfaceContainerLowest">@color/m3_sys_color_dynamic_dark_surface_container_lowest</item>
-		<item name="colorSurfaceContainerLow">@color/m3_sys_color_dynamic_dark_surface_container_low</item>
+		<item name="colorSurfaceContainerLowest">
+			@color/m3_sys_color_dynamic_dark_surface_container_lowest
+		</item>
+		<item name="colorSurfaceContainerLow">
+			@color/m3_sys_color_dynamic_dark_surface_container_low
+		</item>
 		<item name="colorSurfaceContainer">@color/m3_sys_color_dynamic_dark_surface_container</item>
-		<item name="colorSurfaceContainerHigh">@color/m3_sys_color_dynamic_dark_surface_container_high</item>
-		<item name="colorSurfaceContainerHighest">@color/m3_sys_color_dynamic_dark_surface_container_highest</item>
+		<item name="colorSurfaceContainerHigh">
+			@color/m3_sys_color_dynamic_dark_surface_container_high
+		</item>
+		<item name="colorSurfaceContainerHighest">
+			@color/m3_sys_color_dynamic_dark_surface_container_highest
+		</item>
 		<item name="colorSurfaceVariant">@color/m3_sys_color_dynamic_dark_surface_variant</item>
 		<item name="colorOnSurface">@color/m3_sys_color_dynamic_dark_on_surface</item>
-		<item name="colorOnSurfaceVariant">@color/m3_sys_color_dynamic_dark_on_surface_variant</item>
+		<item name="colorOnSurfaceVariant">@color/m3_sys_color_dynamic_dark_on_surface_variant
+		</item>
 		<item name="colorSurfaceInverse">@color/m3_sys_color_dynamic_dark_inverse_surface</item>
-		<item name="colorOnSurfaceInverse">@color/m3_sys_color_dynamic_dark_inverse_on_surface</item>
+		<item name="colorOnSurfaceInverse">@color/m3_sys_color_dynamic_dark_inverse_on_surface
+		</item>
 		<item name="colorOnBackground">@color/m3_sys_color_dynamic_dark_on_background</item>
 		<item name="colorError">@color/m3_sys_color_dark_error</item>
 		<item name="colorErrorContainer">@color/m3_sys_color_dark_error_container</item>
@@ -42,26 +59,42 @@
 		<item name="m3ColorExploreButton">@android:color/system_neutral2_800</item>
 		<item name="m3ColorBottomMenuBackground">@android:color/system_neutral2_800</item>
 		<!-- Default Framework Text Colors. -->
-		<item name="android:textColorPrimary">@color/m3_dynamic_dark_default_color_primary_text</item>
-		<item name="android:textColorPrimaryInverse">@color/m3_dynamic_default_color_primary_text</item>
-		<item name="android:textColorSecondary">@color/m3_dynamic_dark_default_color_secondary_text</item>
-		<item name="android:textColorSecondaryInverse">@color/m3_dynamic_default_color_secondary_text</item>
-		<item name="android:textColorTertiary">@color/m3_dynamic_dark_default_color_secondary_text</item>
-		<item name="android:textColorTertiaryInverse">@color/m3_dynamic_default_color_secondary_text</item>
-		<item name="android:textColorPrimaryDisableOnly">@color/m3_dynamic_dark_primary_text_disable_only</item>
-		<item name="android:textColorPrimaryInverseDisableOnly">@color/m3_dynamic_primary_text_disable_only</item>
+		<item name="android:textColorPrimary">@color/m3_dynamic_dark_default_color_primary_text
+		</item>
+		<item name="android:textColorPrimaryInverse">@color/m3_dynamic_default_color_primary_text
+		</item>
+		<item name="android:textColorSecondary">
+			@color/m3_dynamic_dark_default_color_secondary_text
+		</item>
+		<item name="android:textColorSecondaryInverse">
+			@color/m3_dynamic_default_color_secondary_text
+		</item>
+		<item name="android:textColorTertiary">@color/m3_dynamic_dark_default_color_secondary_text
+		</item>
+		<item name="android:textColorTertiaryInverse">
+			@color/m3_dynamic_default_color_secondary_text
+		</item>
+		<item name="android:textColorPrimaryDisableOnly">
+			@color/m3_dynamic_dark_primary_text_disable_only
+		</item>
+		<item name="android:textColorPrimaryInverseDisableOnly">
+			@color/m3_dynamic_primary_text_disable_only
+		</item>
 		<item name="android:textColorHint">@color/m3_dynamic_dark_hint_foreground</item>
 		<item name="android:textColorHintInverse">@color/m3_dynamic_hint_foreground</item>
 		<item name="android:textColorHighlight">@color/m3_dynamic_dark_highlighted_text</item>
 		<item name="android:textColorHighlightInverse">@color/m3_dynamic_highlighted_text</item>
-		<item name="android:textColorAlertDialogListItem">@color/m3_dynamic_dark_default_color_primary_text</item>
+		<item name="android:textColorAlertDialogListItem">
+			@color/m3_dynamic_dark_default_color_primary_text
+		</item>
 		<!-- Fixes -->
 		<item name="bottomNavigationStyle">@style/Widget.Kotatsu.BottomNavigationView</item>
 	</style>
 
 	<style name="Theme.Kotatsu.AppWidgetContainer" parent="@android:style/Theme.DeviceDefault.DayNight">
-		<item name="android:colorBackground">@color/m3_sys_color_dynamic_dark_secondary_container</item>
-		<item name="android:panelColorBackground">@color/m3_sys_color_dynamic_dark_inverse_primary</item>
+		<item name="android:colorBackground">@color/m3_ref_palette_dynamic_secondary20</item>
+		<item name="android:panelColorBackground">@color/m3_ref_palette_dynamic_secondary40</item>
+		<item name="colorTertiary">@color/m3_ref_palette_dynamic_secondary40</item>
 	</style>
 
 </resources>
diff --git a/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml
index 29f004dae..6a2175ddb 100644
--- a/app/src/main/res/values-v31/themes.xml
+++ b/app/src/main/res/values-v31/themes.xml
@@ -13,31 +13,51 @@
 		<item name="isMaterial3DynamicColorApplied">true</item>
 		<!-- Color palettes -->
 		<item name="colorPrimary">@color/m3_sys_color_dynamic_light_primary</item>
-		<item name="colorPrimaryContainer">@color/m3_sys_color_dynamic_light_primary_container</item>
+		<item name="colorPrimaryContainer">@color/m3_sys_color_dynamic_light_primary_container
+		</item>
 		<item name="colorOnPrimary">@color/m3_sys_color_dynamic_light_on_primary</item>
-		<item name="colorOnPrimaryContainer">@color/m3_sys_color_dynamic_light_on_primary_container</item>
+		<item name="colorOnPrimaryContainer">
+			@color/m3_sys_color_dynamic_light_on_primary_container
+		</item>
 		<item name="colorPrimaryInverse">@color/m3_sys_color_dynamic_light_inverse_primary</item>
 		<item name="colorSecondary">@color/m3_sys_color_dynamic_light_secondary</item>
-		<item name="colorSecondaryContainer">@color/m3_sys_color_dynamic_light_secondary_container</item>
+		<item name="colorSecondaryContainer">@color/m3_sys_color_dynamic_light_secondary_container
+		</item>
 		<item name="colorOnSecondary">@color/m3_sys_color_dynamic_light_on_secondary</item>
-		<item name="colorOnSecondaryContainer">@color/m3_sys_color_dynamic_light_on_secondary_container</item>
+		<item name="colorOnSecondaryContainer">
+			@color/m3_sys_color_dynamic_light_on_secondary_container
+		</item>
 		<item name="colorTertiary">@color/m3_sys_color_dynamic_light_tertiary</item>
-		<item name="colorTertiaryContainer">@color/m3_sys_color_dynamic_light_tertiary_container</item>
+		<item name="colorTertiaryContainer">@color/m3_sys_color_dynamic_light_tertiary_container
+		</item>
 		<item name="colorOnTertiary">@color/m3_sys_color_dynamic_light_on_tertiary</item>
-		<item name="colorOnTertiaryContainer">@color/m3_sys_color_dynamic_light_on_tertiary_container</item>
+		<item name="colorOnTertiaryContainer">
+			@color/m3_sys_color_dynamic_light_on_tertiary_container
+		</item>
 		<item name="colorSurface">@color/m3_sys_color_dynamic_light_surface</item>
 		<item name="colorSurfaceDim">@color/m3_sys_color_dynamic_light_surface_dim</item>
 		<item name="colorSurfaceBright">@color/m3_sys_color_dynamic_light_surface_bright</item>
-		<item name="colorSurfaceContainerLowest">@color/m3_sys_color_dynamic_light_surface_container_lowest</item>
-		<item name="colorSurfaceContainerLow">@color/m3_sys_color_dynamic_light_surface_container_low</item>
-		<item name="colorSurfaceContainer">@color/m3_sys_color_dynamic_light_surface_container</item>
-		<item name="colorSurfaceContainerHigh">@color/m3_sys_color_dynamic_light_surface_container_high</item>
-		<item name="colorSurfaceContainerHighest">@color/m3_sys_color_dynamic_light_surface_container_highest</item>
+		<item name="colorSurfaceContainerLowest">
+			@color/m3_sys_color_dynamic_light_surface_container_lowest
+		</item>
+		<item name="colorSurfaceContainerLow">
+			@color/m3_sys_color_dynamic_light_surface_container_low
+		</item>
+		<item name="colorSurfaceContainer">@color/m3_sys_color_dynamic_light_surface_container
+		</item>
+		<item name="colorSurfaceContainerHigh">
+			@color/m3_sys_color_dynamic_light_surface_container_high
+		</item>
+		<item name="colorSurfaceContainerHighest">
+			@color/m3_sys_color_dynamic_light_surface_container_highest
+		</item>
 		<item name="colorSurfaceVariant">@color/m3_sys_color_dynamic_light_surface_variant</item>
 		<item name="colorOnSurface">@color/m3_sys_color_dynamic_light_on_surface</item>
-		<item name="colorOnSurfaceVariant">@color/m3_sys_color_dynamic_light_on_surface_variant</item>
+		<item name="colorOnSurfaceVariant">@color/m3_sys_color_dynamic_light_on_surface_variant
+		</item>
 		<item name="colorSurfaceInverse">@color/m3_sys_color_dynamic_light_inverse_surface</item>
-		<item name="colorOnSurfaceInverse">@color/m3_sys_color_dynamic_light_inverse_on_surface</item>
+		<item name="colorOnSurfaceInverse">@color/m3_sys_color_dynamic_light_inverse_on_surface
+		</item>
 		<item name="colorOnBackground">@color/m3_sys_color_dynamic_light_on_background</item>
 		<item name="colorError">@color/m3_sys_color_light_error</item>
 		<item name="colorErrorContainer">@color/m3_sys_color_light_error_container</item>
@@ -51,25 +71,40 @@
 		<item name="m3ColorBottomMenuBackground">@android:color/system_neutral2_100</item>
 		<!-- Default Framework Text Colors. -->
 		<item name="android:textColorPrimary">@color/m3_dynamic_default_color_primary_text</item>
-		<item name="android:textColorPrimaryInverse">@color/m3_dynamic_dark_default_color_primary_text</item>
-		<item name="android:textColorSecondary">@color/m3_dynamic_default_color_secondary_text</item>
-		<item name="android:textColorSecondaryInverse">@color/m3_dynamic_dark_default_color_secondary_text</item>
+		<item name="android:textColorPrimaryInverse">
+			@color/m3_dynamic_dark_default_color_primary_text
+		</item>
+		<item name="android:textColorSecondary">@color/m3_dynamic_default_color_secondary_text
+		</item>
+		<item name="android:textColorSecondaryInverse">
+			@color/m3_dynamic_dark_default_color_secondary_text
+		</item>
 		<item name="android:textColorTertiary">@color/m3_dynamic_default_color_secondary_text</item>
-		<item name="android:textColorTertiaryInverse">@color/m3_dynamic_dark_default_color_secondary_text</item>
-		<item name="android:textColorPrimaryDisableOnly">@color/m3_dynamic_primary_text_disable_only</item>
-		<item name="android:textColorPrimaryInverseDisableOnly">@color/m3_dynamic_dark_primary_text_disable_only</item>
+		<item name="android:textColorTertiaryInverse">
+			@color/m3_dynamic_dark_default_color_secondary_text
+		</item>
+		<item name="android:textColorPrimaryDisableOnly">
+			@color/m3_dynamic_primary_text_disable_only
+		</item>
+		<item name="android:textColorPrimaryInverseDisableOnly">
+			@color/m3_dynamic_dark_primary_text_disable_only
+		</item>
 		<item name="android:textColorHint">@color/m3_dynamic_hint_foreground</item>
 		<item name="android:textColorHintInverse">@color/m3_dynamic_dark_hint_foreground</item>
 		<item name="android:textColorHighlight">@color/m3_dynamic_highlighted_text</item>
-		<item name="android:textColorHighlightInverse">@color/m3_dynamic_dark_highlighted_text</item>
-		<item name="android:textColorAlertDialogListItem">@color/m3_dynamic_default_color_primary_text</item>
+		<item name="android:textColorHighlightInverse">@color/m3_dynamic_dark_highlighted_text
+		</item>
+		<item name="android:textColorAlertDialogListItem">
+			@color/m3_dynamic_default_color_primary_text
+		</item>
 		<!-- Fixes -->
 		<item name="bottomNavigationStyle">@style/Widget.Kotatsu.BottomNavigationView</item>
 	</style>
 
 	<style name="Theme.Kotatsu.AppWidgetContainer" parent="@android:style/Theme.DeviceDefault.DayNight">
-		<item name="android:colorBackground">@color/m3_sys_color_dynamic_light_secondary_container</item>
-		<item name="android:panelColorBackground">@color/m3_sys_color_dynamic_light_inverse_primary</item>
+		<item name="android:colorBackground">@color/m3_ref_palette_dynamic_secondary95</item>
+		<item name="android:panelColorBackground">@color/m3_ref_palette_dynamic_secondary90</item>
+		<item name="colorTertiary">@color/m3_ref_palette_dynamic_secondary70</item>
 	</style>
 
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index a3c728ec6..7ef6cfd8f 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -75,23 +75,31 @@
 		<item name="textInputStyle">@style/Widget.Material3.TextInputLayout.OutlinedBox</item>
 		<item name="toolbarStyle">@style/Widget.Material3.Toolbar</item>
 		<item name="appBarLayoutStyle">@style/Widget.Kotatsu.AppBarLayout</item>
-		<item name="bottomNavigationStyle">@style/Widget.Kotatsu.BottomNavigationView.ColoredIndicators</item>
+		<item name="bottomNavigationStyle">
+			@style/Widget.Kotatsu.BottomNavigationView.ColoredIndicators
+		</item>
 		<item name="tabStyle">@style/Widget.Kotatsu.Tabs</item>
 		<item name="materialCardViewStyle">@style/Widget.Kotatsu.MaterialCardView.Filled</item>
 		<item name="recyclerViewStyle">@style/Widget.Kotatsu.RecyclerView</item>
 		<item name="fastScrollerStyle">@style/Widget.Kotatsu.FastScroller</item>
 		<item name="listItemTextViewStyle">@style/Widget.Kotatsu.ListItemTextView</item>
-		<item name="materialSwitchStyle">@style/Widget.Material3.CompoundButton.MaterialSwitch</item>
+		<item name="materialSwitchStyle">@style/Widget.Material3.CompoundButton.MaterialSwitch
+		</item>
 		<item name="switchPreferenceCompatStyle">@style/Preference.SwitchPreferenceCompat.M3</item>
 		<item name="collapsingToolbarLayoutStyle">@style/Widget.Kotatsu.CollapsingToolbar</item>
-		<item name="circularProgressIndicatorStyle">@style/Widget.Kotatsu.CircularProgressIndicator</item>
-		<item name="linearProgressIndicatorStyle">@style/Widget.Kotatsu.LinearProgressIndicator</item>
+		<item name="circularProgressIndicatorStyle">
+			@style/Widget.Kotatsu.CircularProgressIndicator
+		</item>
+		<item name="linearProgressIndicatorStyle">@style/Widget.Kotatsu.LinearProgressIndicator
+		</item>
 		<item name="bottomSheetDragHandleStyle">@style/Widget.Kotatsu.BottomSheet.DragHandle</item>
 
 		<!-- Text appearance -->
 		<item name="actionMenuTextAppearance">@style/TextAppearance.Kotatsu.Menu</item>
 		<item name="android:textAppearanceListItem">?attr/textAppearanceBodyLarge</item>
-		<item name="android:textAppearanceListItemSecondary">@style/TextAppearance.Kotatsu.Preference.Secondary</item>
+		<item name="android:textAppearanceListItemSecondary">
+			@style/TextAppearance.Kotatsu.Preference.Secondary
+		</item>
 
 	</style>
 
@@ -106,7 +114,7 @@
 	<style name="ThemeOverlay.Kotatsu.Amoled" parent="" />
 
 	<style name="Theme.Kotatsu.AppWidgetContainer" parent="@style/Theme.MaterialComponents.Light">
-		<item name="android:colorBackground">@android:color/transparent</item>
+		<item name="android:colorBackground">@color/kotatsu_background</item>
 		<item name="android:panelColorBackground">@color/kotatsu_primaryContainer</item>
 	</style>
 </resources>