diff --git a/app/src/main/res/color/chip_surface_color.xml b/app/src/main/res/color/chip_surface_color.xml
deleted file mode 100644
index 8d8385d09..000000000
--- a/app/src/main/res/color/chip_surface_color.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
-  ~ SPDX-License-Identifier: GPL-3.0-only
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:color="@color/secondary_light_color" android:state_checked="true" />
-  <item android:color="?attr/colorSecondary" />
-</selector>
diff --git a/app/src/main/res/color/outlined_box_selector.xml b/app/src/main/res/color/outlined_box_selector.xml
deleted file mode 100644
index 49a79d9e9..000000000
--- a/app/src/main/res/color/outlined_box_selector.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
-  ~ SPDX-License-Identifier: GPL-3.0-only
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:color="@color/secondary_color" android:state_focused="true" />
-  <item android:color="@color/secondary_color" android:state_hovered="true" />
-  <item android:color="@color/secondary_color" />
-</selector>
diff --git a/app/src/main/res/color/toggle_button_selector.xml b/app/src/main/res/color/toggle_button_selector.xml
deleted file mode 100644
index 8992f1f99..000000000
--- a/app/src/main/res/color/toggle_button_selector.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
-  ~ SPDX-License-Identifier: GPL-3.0-only
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:color="#00FFFFFF" android:state_checked="false" />
-  <item android:color="@color/button_color" />
-</selector>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
deleted file mode 100644
index a9dc48da7..000000000
--- a/app/src/main/res/values-night/colors.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
-  ~ SPDX-License-Identifier: GPL-3.0-only
-  -->
-
-<resources>
-  <!-- Base palette -->
-  <color name="primary_color">#ff111111</color>
-  <color name="primary_light_color">#ff373737</color>
-  <color name="secondary_color">#ff3b6888</color>
-  <color name="secondary_light_color">#ff6b96b8</color>
-  <color name="primary_text_color">#ffffffff</color>
-
-  <!-- Theme variables -->
-  <color name="list_multiselect_background">#66eeeeee</color>
-  <color name="ripple_color">#aa3b6888</color>
-  <color name="button_color">#443b6888</color>
-</resources>
diff --git a/app/src/main/res/values-v27/colors.xml b/app/src/main/res/values-night/colors_material3.xml
similarity index 75%
rename from app/src/main/res/values-v27/colors.xml
rename to app/src/main/res/values-night/colors_material3.xml
index 61036921a..dde6b5a92 100644
--- a/app/src/main/res/values-v27/colors.xml
+++ b/app/src/main/res/values-night/colors_material3.xml
@@ -4,5 +4,5 @@
   -->
 
 <resources>
-  <color name="navigation_bar_color">@color/primary_color</color>
+  <color name="list_multiselect_background">#66eeeeee</color>
 </resources>
diff --git a/app/src/main/res/values-v27/themes.xml b/app/src/main/res/values-v27/themes.xml
deleted file mode 100644
index 367c59fec..000000000
--- a/app/src/main/res/values-v27/themes.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
-  ~ SPDX-License-Identifier: GPL-3.0-only
-  -->
-
-<resources>
-
-  <style name="AppTheme" parent="APSTheme">
-    <item name="android:windowLightNavigationBar">@bool/light_status_bar</item>
-  </style>
-</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
deleted file mode 100644
index 6c48ce966..000000000
--- a/app/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
-  ~ SPDX-License-Identifier: GPL-3.0-only
-  -->
-
-<resources>
-  <!-- Base palette -->
-  <color name="primary_color">@color/white</color>
-  <color name="primary_light_color">@color/white</color>
-  <color name="secondary_color">#003e5b</color>
-  <color name="secondary_dark_color">#001831</color>
-  <color name="secondary_light_color">#3b6888</color>
-  <color name="primary_text_color">#212121</color>
-  <color name="white">#ffffffff</color>
-
-  <!-- Theme variables -->
-  <color name="color_control_normal">@color/primary_text_color</color>
-  <color name="list_multiselect_background">#668eacbb</color>
-  <color name="navigation_bar_color">#000000</color>
-  <color name="status_bar_color">@color/primary_color</color>
-  <color name="ripple_color">#aa003e5b</color>
-  <color name="button_color">#44003e5b</color>
-</resources>
diff --git a/app/src/main/res/values/colors_material3.xml b/app/src/main/res/values/colors_material3.xml
index d8082f89a..52983f954 100644
--- a/app/src/main/res/values/colors_material3.xml
+++ b/app/src/main/res/values/colors_material3.xml
@@ -58,4 +58,7 @@
   <color name="md_theme_dark_primaryInverse">#006591</color>
   <color name="seed">#003E5B</color>
   <color name="error">#BA1B1B</color>
+
+  <!-- Multiselect color -->
+  <color name="list_multiselect_background">#668eacbb</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
deleted file mode 100644
index e9c144490..000000000
--- a/app/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<!--
-  ~ Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
-  ~ SPDX-License-Identifier: GPL-3.0-only
-  -->
-
-<resources>
-
-  <style name="AppTheme.TextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense">
-    <item name="boxStrokeColor">@color/outlined_box_selector</item>
-    <item name="hintTextColor">?attr/colorSecondary</item>
-    <item name="materialThemeOverlay">
-      @style/ThemeOverlay.AppTheme.TextInputEditText.OutlinedBox
-    </item>
-  </style>
-
-  <style name="ThemeOverlay.AppTheme.TextInputEditText.OutlinedBox" parent="ThemeOverlay.MaterialComponents.TextInputEditText.OutlinedBox">
-    <item name="colorControlActivated">@color/color_control_normal</item>
-  </style>
-
-  <style name="AppTheme.MaterialButton" parent="Widget.MaterialComponents.Button">
-    <item name="android:textColor">@android:color/white</item>
-    <item name="backgroundTint">?attr/colorSecondary</item>
-    <item name="rippleColor">?attr/colorControlHighlight</item>
-  </style>
-
-  <style name="AppTheme.OutlinedButton" parent="Widget.MaterialComponents.Button.OutlinedButton">
-    <item name="android:textColor">?android:attr/textColorPrimary</item>
-    <item name="rippleColor">@color/ripple_color</item>
-    <item name="strokeColor">?attr/colorSecondary</item>
-    <item name="backgroundTint">@color/toggle_button_selector</item>
-  </style>
-
-  <style name="AppTheme.Dialog" parent="Theme.MaterialComponents.DayNight.Dialog.Alert">
-    <item name="colorPrimary">@color/secondary_color</item>
-    <item name="colorSecondary">@color/secondary_color</item>
-  </style>
-
-  <style name="AppTheme.Chip.Choice" parent="Widget.MaterialComponents.Chip.Choice">
-    <item name="chipSurfaceColor">@color/chip_surface_color</item>
-    <item name="android:textColor">@color/chip_text_color</item>
-    <item name="shapeAppearanceOverlay">@style/ShapeAppearance.AppTheme.SmallComponent</item>
-    <item name="android:textAppearance">?attr/textAppearanceButton</item>
-  </style>
-
-  <style name="ShapeAppearance.AppTheme.SmallComponent" parent="ShapeAppearance.MaterialComponents.SmallComponent">
-    <item name="cornerFamily">rounded</item>
-    <item name="cornerSize">8dp</item>
-  </style>
-
-  <style name="ActionMode" parent="@style/Widget.AppCompat.ActionMode">
-    <item name="background">@color/primary_color</item>
-  </style>
-
-  <style name="BottomSheetDialogTheme" parent="ThemeOverlay.MaterialComponents.BottomSheetDialog">
-    <item name="android:windowIsFloating">false</item>
-    <item name="android:statusBarColor">@android:color/transparent</item>
-    <item name="android:windowTranslucentNavigation">false</item>
-    <item name="android:windowIsTranslucent">false</item>
-    <item name="android:backgroundDimEnabled">true</item>
-    <item name="android:backgroundDimAmount">0.5</item>
-    <item name="android:windowTranslucentStatus">false</item>
-    <item name="android:colorBackground">@android:color/transparent</item>
-  </style>
-
-  <style name="NoBackgroundTheme" parent="@style/AppTheme">
-    <item name="android:background">@android:color/transparent</item>
-    <item name="android:backgroundDimEnabled">true</item>
-    <item name="android:navigationBarColor">@android:color/transparent</item>
-    <item name="android:statusBarColor">@android:color/transparent</item>
-    <item name="android:windowIsTranslucent">true</item>
-    <item name="android:windowContentOverlay">@null</item>
-    <item name="android:windowActionBar">false</item>
-    <item name="android:windowBackground">@android:color/transparent</item>
-    <item name="android:windowEnterAnimation">@android:anim/fade_in</item>
-    <item name="android:windowExitAnimation">@android:anim/fade_out</item>
-    <item name="colorPrimaryDark">@android:color/transparent</item>
-    <item name="windowNoTitle">true</item>
-  </style>
-
-  <style name="DialogLikeTheme" parent="AppTheme">
-    <item name="android:windowActionBar">false</item>
-    <item name="android:windowIsFloating">true</item>
-    <item name="android:backgroundDimEnabled">true</item>
-    <!-- Needs to be set without android: prefix as per https://stackoverflow.com/a/33417456 -->
-    <item name="windowNoTitle">true</item>
-  </style>
-</resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
deleted file mode 100644
index 3ed910fe4..000000000
--- a/app/src/main/res/values/themes.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
-  ~ SPDX-License-Identifier: GPL-3.0-only
-  -->
-
-<resources>
-  <!-- Base application theme. -->
-  <style name="APSTheme" parent="Theme.MaterialComponents.DayNight">
-    <item name="colorPrimary">@color/primary_color</item>
-    <item name="colorOnPrimary">@color/color_control_normal</item>
-    <item name="colorPrimaryDark">@color/primary_color</item>
-    <item name="colorPrimaryVariant">@color/primary_light_color</item>
-    <item name="colorSecondary">@color/secondary_color</item>
-    <item name="colorSecondaryVariant">@color/secondary_dark_color</item>
-    <item name="colorOnSecondary">@color/white</item>
-    <item name="colorSurface">@color/primary_color</item>
-    <item name="colorOnSurface">@color/color_control_normal</item>
-    <item name="colorControlNormal">@color/color_control_normal</item>
-    <item name="android:textColor">@color/primary_text_color</item>
-    <item name="android:colorBackgroundFloating">@color/primary_color</item>
-    <item name="android:statusBarColor">@color/status_bar_color</item>
-    <item name="android:navigationBarColor">@color/navigation_bar_color</item>
-    <item name="android:windowLightStatusBar">@bool/light_status_bar</item>
-    <item name="actionModeStyle">@style/ActionMode</item>
-    <item name="alertDialogTheme">@style/AppTheme.Dialog</item>
-    <item name="materialAlertDialogTheme">@style/AppTheme.Dialog</item>
-    <item name="materialButtonStyle">@style/AppTheme.MaterialButton</item>
-    <item name="materialButtonOutlinedStyle">@style/AppTheme.OutlinedButton</item>
-    <item name="bottomSheetDialogTheme">@style/BottomSheetDialogTheme</item>
-    <item name="textInputStyle">@style/AppTheme.TextInputLayout</item>
-    <item name="chipStyle">@style/AppTheme.Chip.Choice</item>
-  </style>
-
-  <style name="AppTheme" parent="APSTheme" />
-</resources>