diff --git a/app/build.gradle b/app/build.gradle
index 40f01733f..cd021040f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,8 +15,8 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdkVersion 21
 		targetSdkVersion 33
-		versionCode 510
-		versionName '4.2.1'
+		versionCode 511
+		versionName '4.3'
 		generatedDensities = []
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 13d052231..01c535da6 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -94,7 +94,6 @@
 		android:layout_height="wrap_content"
 		android:layout_gravity="bottom"
 		android:clickable="true"
-		app:itemActiveIndicatorStyle="@style/Widget.Kotatsu.BottomNavigationView.ActiveIndicator"
 		app:layout_insetEdge="bottom"
 		app:menu="@menu/nav_bottom"
 		tools:ignore="KeyboardInaccessibleWidget" />
diff --git a/app/src/main/res/values-night-v31/themes.xml b/app/src/main/res/values-night-v31/themes.xml
index cc914fa7c..8c93dcd18 100644
--- a/app/src/main/res/values-night-v31/themes.xml
+++ b/app/src/main/res/values-night-v31/themes.xml
@@ -2,30 +2,34 @@
 <resources>
 	<!-- From ThemeOverlay.Material3.DynamicColors.Dark -->
 	<style name="Theme.Kotatsu.Monet">
+		<item name="isMaterial3DynamicColorApplied">true</item>
 		<!-- Color palettes -->
-		<item name="colorPrimary">@android:color/system_accent1_200</item>
-		<item name="colorOnPrimary">@android:color/system_accent1_900</item>
-		<item name="colorPrimaryInverse">@android:color/system_accent1_600</item>
-		<item name="colorPrimaryContainer">@android:color/system_accent1_700</item>
-		<item name="colorOnPrimaryContainer">@android:color/system_accent1_100</item>
-		<item name="colorSecondary">@android:color/system_accent1_200</item>
-		<item name="colorOnSecondary">@android:color/system_neutral1_1000</item>
-		<item name="colorSecondaryContainer">@android:color/system_accent2_800</item>
-		<item name="colorOnSecondaryContainer">@android:color/system_accent2_100</item>
-		<item name="colorTertiary">@android:color/system_accent3_200</item>
-		<item name="colorOnTertiary">@android:color/system_accent3_800</item>
-		<item name="colorTertiaryContainer">@android:color/system_accent3_700</item>
-		<item name="colorOnTertiaryContainer">@android:color/system_accent3_100</item>
-		<item name="android:colorBackground">@android:color/system_neutral1_900</item>
-		<item name="colorOnBackground">@android:color/system_neutral1_200</item>
-		<item name="colorSurface">@android:color/system_neutral1_900</item>
-		<item name="colorOnSurface">@android:color/system_neutral1_100</item>
-		<item name="colorSurfaceVariant">@android:color/system_neutral2_700</item>
-		<item name="colorOnSurfaceVariant">@android:color/system_neutral2_200</item>
-		<item name="colorSurfaceInverse">@android:color/system_neutral1_100</item>
-		<item name="colorOnSurfaceInverse">@android:color/system_neutral1_800</item>
-		<item name="colorOutline">@android:color/system_neutral2_500</item>
-
+		<item name="colorPrimary">@color/m3_sys_color_dynamic_dark_primary</item>
+		<item name="colorOnPrimary">@color/m3_sys_color_dynamic_dark_on_primary</item>
+		<item name="colorPrimaryInverse">@color/m3_sys_color_dynamic_dark_inverse_primary</item>
+		<item name="colorPrimaryContainer">@color/m3_sys_color_dynamic_dark_primary_container</item>
+		<item name="colorOnPrimaryContainer">@color/m3_sys_color_dynamic_dark_on_primary_container</item>
+		<item name="colorSecondary">@color/m3_sys_color_dynamic_dark_secondary</item>
+		<item name="colorOnSecondary">@color/m3_sys_color_dynamic_dark_on_secondary</item>
+		<item name="colorSecondaryContainer">@color/m3_sys_color_dynamic_dark_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="colorOnTertiary">@color/m3_sys_color_dynamic_dark_on_tertiary</item>
+		<item name="colorTertiaryContainer">@color/m3_sys_color_dynamic_dark_tertiary_container</item>
+		<item name="colorOnTertiaryContainer">@color/m3_sys_color_dynamic_dark_on_tertiary_container</item>
+		<item name="android:colorBackground">@color/m3_sys_color_dynamic_dark_background</item>
+		<item name="colorOnBackground">@color/m3_sys_color_dynamic_dark_on_background</item>
+		<item name="colorSurface">@color/m3_sys_color_dynamic_dark_surface</item>
+		<item name="colorOnSurface">@color/m3_sys_color_dynamic_dark_on_surface</item>
+		<item name="colorSurfaceVariant">@color/m3_sys_color_dynamic_dark_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="colorOutline">@color/m3_sys_color_dynamic_dark_outline</item>
+		<item name="colorError">@color/m3_sys_color_dark_error</item>
+		<item name="colorOnError">@color/m3_sys_color_dark_on_error</item>
+		<item name="colorErrorContainer">@color/m3_sys_color_dark_error_container</item>
+		<item name="colorOnErrorContainer">@color/m3_sys_color_dark_on_error_container</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>
@@ -40,6 +44,8 @@
 		<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>
+		<!-- Fixes -->
+		<item name="bottomNavigationStyle">@style/Widget.Kotatsu.BottomNavigationView</item>
 	</style>
 
 	<style name="Theme.Kotatsu.AppWidgetContainer" parent="@android:style/Theme.DeviceDefault.DayNight">
diff --git a/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml
index 1a4b1df43..4980e63c5 100644
--- a/app/src/main/res/values-v31/themes.xml
+++ b/app/src/main/res/values-v31/themes.xml
@@ -2,30 +2,34 @@
 <resources>
 	<!-- From ThemeOverlay.Material3.DynamicColors.Light -->
 	<style name="Theme.Kotatsu.Monet">
+		<item name="isMaterial3DynamicColorApplied">true</item>
 		<!-- Color palettes -->
-		<item name="colorPrimary">@android:color/system_accent1_500</item>
-		<item name="colorOnPrimary">@android:color/system_accent1_0</item>
-		<item name="colorPrimaryInverse">@android:color/system_accent1_200</item>
-		<item name="colorPrimaryContainer">@android:color/system_accent1_100</item>
-		<item name="colorOnPrimaryContainer">@android:color/system_accent1_900</item>
-		<item name="colorSecondary">@android:color/system_neutral1_600</item>
-		<item name="colorOnSecondary">@android:color/system_neutral1_0</item>
-		<item name="colorSecondaryContainer">@android:color/system_accent2_100</item>
-		<item name="colorOnSecondaryContainer">@android:color/system_accent1_900</item>
-		<item name="colorTertiary">@android:color/system_accent3_500</item>
-		<item name="colorOnTertiary">@android:color/system_accent3_50</item>
-		<item name="colorTertiaryContainer">@android:color/system_accent3_100</item>
-		<item name="colorOnTertiaryContainer">@android:color/system_accent3_900</item>
-		<item name="android:colorBackground">@android:color/system_neutral1_50</item>
-		<item name="colorOnBackground">@android:color/system_neutral1_900</item>
-		<item name="colorSurface">@android:color/system_neutral1_50</item>
-		<item name="colorOnSurface">@android:color/system_neutral1_900</item>
-		<item name="colorSurfaceVariant">@android:color/system_neutral2_100</item>
-		<item name="colorOnSurfaceVariant">@android:color/system_neutral2_700</item>
-		<item name="colorSurfaceInverse">@android:color/system_neutral1_800</item>
-		<item name="colorOnSurfaceInverse">@android:color/system_neutral1_50</item>
-		<item name="colorOutline">@android:color/system_neutral2_500</item>
-
+		<item name="colorPrimary">@color/m3_sys_color_dynamic_light_primary</item>
+		<item name="colorOnPrimary">@color/m3_sys_color_dynamic_light_on_primary</item>
+		<item name="colorPrimaryInverse">@color/m3_sys_color_dynamic_light_inverse_primary</item>
+		<item name="colorPrimaryContainer">@color/m3_sys_color_dynamic_light_primary_container</item>
+		<item name="colorOnPrimaryContainer">@color/m3_sys_color_dynamic_light_on_primary_container</item>
+		<item name="colorSecondary">@color/m3_sys_color_dynamic_light_secondary</item>
+		<item name="colorOnSecondary">@color/m3_sys_color_dynamic_light_on_secondary</item>
+		<item name="colorSecondaryContainer">@color/m3_sys_color_dynamic_light_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="colorOnTertiary">@color/m3_sys_color_dynamic_light_on_tertiary</item>
+		<item name="colorTertiaryContainer">@color/m3_sys_color_dynamic_light_tertiary_container</item>
+		<item name="colorOnTertiaryContainer">@color/m3_sys_color_dynamic_light_on_tertiary_container</item>
+		<item name="android:colorBackground">@color/m3_sys_color_dynamic_light_background</item>
+		<item name="colorOnBackground">@color/m3_sys_color_dynamic_light_on_background</item>
+		<item name="colorSurface">@color/m3_sys_color_dynamic_light_surface</item>
+		<item name="colorOnSurface">@color/m3_sys_color_dynamic_light_on_surface</item>
+		<item name="colorSurfaceVariant">@color/m3_sys_color_dynamic_light_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="colorOutline">@color/m3_sys_color_dynamic_light_outline</item>
+		<item name="colorError">@color/m3_sys_color_light_error</item>
+		<item name="colorOnError">@color/m3_sys_color_light_on_error</item>
+		<item name="colorErrorContainer">@color/m3_sys_color_light_error_container</item>
+		<item name="colorOnErrorContainer">@color/m3_sys_color_light_on_error_container</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>
@@ -40,6 +44,8 @@
 		<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>
+		<!-- Fixes -->
+		<item name="bottomNavigationStyle">@style/Widget.Kotatsu.BottomNavigationView</item>
 	</style>
 
 	<style name="Theme.Kotatsu.AppWidgetContainer" parent="@android:style/Theme.DeviceDefault.DayNight">
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 43601140e..a1c298b32 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -12,6 +12,10 @@
 		<item name="labelVisibilityMode">labeled</item>
 	</style>
 
+	<style name="Widget.Kotatsu.BottomNavigationView.ColoredIndicators">
+		<item name="itemActiveIndicatorStyle">@style/Widget.Kotatsu.BottomNavigationView.ActiveIndicator</item>
+	</style>
+
 	<style name="Widget.Kotatsu.BottomNavigationView.ActiveIndicator" parent="Widget.Material3.BottomNavigationView.ActiveIndicator">
 		<item name="android:color">@color/bottom_menu_active_indicator</item>
 	</style>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 5b27f6044..1569d905e 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -33,13 +33,11 @@
 		<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="colorOnErrorContainer">@color/onErrorContainer</item>
 
 		<item name="android:divider">@color/divider_default</item>
 
-		<!-- Ripples -->
-		<item name="colorControlHighlight">?attr/colorSurfaceVariant</item>
-
 		<!-- Handles RTL text -->
 		<item name="android:textAlignment">gravity</item>
 		<item name="android:textDirection">locale</item>
@@ -67,7 +65,7 @@
 		<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="bottomNavigationStyle">@style/Widget.Kotatsu.BottomNavigationView</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>
 		<item name="recyclerViewStyle">@style/Widget.Kotatsu.RecyclerView</item>