diff --git a/app/src/main/res/values-night-v31/themes.xml b/app/src/main/res/values-night-v31/themes.xml
index 583aa060e..06886d109 100644
--- a/app/src/main/res/values-night-v31/themes.xml
+++ b/app/src/main/res/values-night-v31/themes.xml
@@ -3,7 +3,7 @@
 
 	<style name="Base.V31.Kotatsu" parent="Base.V27.Kotatsu">
 		<item name="android:windowSplashScreenAnimatedIcon">@drawable/avd_splash</item>
-		<item name="android:windowSplashScreenBackground">@android:color/system_neutral2_900</item>
+		<item name="android:windowSplashScreenBackground">@color/m3_sys_color_dynamic_dark_surface</item>
 		<item name="android:windowSplashScreenAnimationDuration">800</item>
 	</style>
 
@@ -62,11 +62,11 @@
 		<item name="colorOnErrorContainer">@color/m3_sys_color_dark_on_error_container</item>
 		<item name="colorOutline">@color/m3_sys_color_dynamic_dark_outline</item>
 		<item name="colorOutlineVariant">@color/m3_sys_color_dynamic_dark_outline_variant</item>
-		<item name="android:colorBackground">@android:color/system_neutral2_900</item>
-		<item name="m3ColorBackground">@android:color/system_neutral2_900</item>
-		<item name="m3ColorExploreButton">@android:color/system_neutral2_800</item>
-		<item name="m3ColorCardBackground">@android:color/system_neutral2_700</item>
-		<item name="m3ColorBottomMenuBackground">@android:color/system_neutral2_800</item>
+		<item name="android:colorBackground">@color/m3_sys_color_dynamic_dark_surface</item>
+		<item name="m3ColorBackground">@color/m3_sys_color_dynamic_dark_surface</item>
+		<item name="m3ColorExploreButton">@color/m3_sys_color_dynamic_dark_surface_container_low</item>
+		<item name="m3ColorCardBackground">@color/m3_sys_color_dynamic_dark_surface_container_low</item>
+		<item name="m3ColorBottomMenuBackground">@color/m3_sys_color_dynamic_dark_surface_container_low</item>
 		<!-- Default Framework Text Colors. -->
 		<item name="android:textColorPrimary">@color/m3_dynamic_dark_default_color_primary_text
 		</item>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 72a8a8c73..d57d5efbc 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -2,9 +2,7 @@
 
 	<!--Toolbars-->
 
-	<style name="Widget.Kotatsu.CollapsingToolbar" parent="@style/Widget.Material3.CollapsingToolbar.Medium">
-		<item name="contentScrim">?attr/m3ColorBottomMenuBackground</item>
-	</style>
+	<style name="Widget.Kotatsu.CollapsingToolbar" parent="@style/Widget.Material3.CollapsingToolbar.Medium" />
 
 	<style name="Widget.Kotatsu.AppBarLayout" parent="@style/Widget.Material3.AppBarLayout">
 		<item name="android:background">?attr/m3ColorBackground</item>
@@ -14,19 +12,11 @@
 
 	<style name="Widget.Kotatsu.BottomNavigationView" parent="Widget.Material3.BottomNavigationView">
 		<item name="labelVisibilityMode">labeled</item>
-		<item name="android:background">?attr/m3ColorBottomMenuBackground</item>
-		<item name="itemActiveIndicatorStyle">@style/Widget.Kotatsu.BottomNavigationView.ActiveIndicator</item>
-		<item name="itemIconTint">@color/bottom_menu_active_item</item>
 	</style>
 
-	<style name="Widget.Kotatsu.BottomNavigationView.ColoredIndicators">
-		<item name="itemActiveIndicatorStyle">@style/Widget.Kotatsu.BottomNavigationView.ActiveIndicator</item>
-		<item name="itemIconTint">@color/bottom_menu_active_item</item>
-	</style>
+	<style name="Widget.Kotatsu.BottomNavigationView.ColoredIndicators" />
 
-	<style name="Widget.Kotatsu.BottomNavigationView.ActiveIndicator" parent="Widget.Material3.BottomNavigationView.ActiveIndicator">
-		<item name="android:color">@color/bottom_menu_active_indicator</item>
-	</style>
+	<style name="Widget.Kotatsu.BottomNavigationView.ActiveIndicator" parent="Widget.Material3.BottomNavigationView.ActiveIndicator" />
 
 	<style name="Widget.Kotatsu.ActionMode" parent="Base.Widget.Material3.ActionMode">
 		<!--<item name="titleTextStyle">@style/TextAppearance.Kotatsu.ActionBar.Title</item>-->
@@ -44,12 +34,10 @@
 	<!-- Bottom sheet -->
 
 	<style name="ThemeOverlay.Kotatsu.BottomSheetDialog" parent="ThemeOverlay.Material3.BottomSheetDialog">
-		<item name="bottomSheetStyle">@style/Widget.Kotatsu.BottomSheet.Modal</item>
 		<item name="android:windowAnimationStyle">@style/Animation.Kotatsu.BottomSheetDialog</item>
 	</style>
 
 	<style name="Widget.Kotatsu.BottomSheet.Modal" parent="Widget.Material3.BottomSheet.Modal">
-		<item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.Kotatsu.BottomSheet</item>
 		<item name="backgroundTint">?attr/m3ColorBottomMenuBackground</item>
 	</style>