diff --git a/lib/res/values-land/styles_design.xml b/lib/res/values-land/styles.xml
similarity index 100%
rename from lib/res/values-land/styles_design.xml
rename to lib/res/values-land/styles.xml
diff --git a/lib/res/values-sw600dp/styles_design.xml b/lib/res/values-sw600dp/styles.xml
similarity index 100%
rename from lib/res/values-sw600dp/styles_design.xml
rename to lib/res/values-sw600dp/styles.xml
diff --git a/lib/res/values-v21/styles_design.xml b/lib/res/values-v21/styles.xml
similarity index 100%
rename from lib/res/values-v21/styles_design.xml
rename to lib/res/values-v21/styles.xml
diff --git a/lib/res/values/styles_design.xml b/lib/res/values/styles.xml
similarity index 95%
rename from lib/res/values/styles_design.xml
rename to lib/res/values/styles.xml
index ffa87c06a..afe511a15 100644
--- a/lib/res/values/styles_design.xml
+++ b/lib/res/values/styles.xml
@@ -157,4 +157,10 @@
     <item name="behavior_skipCollapsed">false</item>
   </style>
 
+  <style name="Widget.MaterialComponents.FloatingActionButton" parent="Widget.Design.FloatingActionButton">
+    <item name="elevation">@dimen/mtrl_fab_elevation</item>
+    <item name="hoveredFocusedTranslationZ">@dimen/mtrl_fab_translation_z_hovered_focused</item>
+    <item name="pressedTranslationZ">@dimen/mtrl_fab_translation_z_pressed</item>
+  </style>
+
 </resources>
diff --git a/lib/res/values/styles_mtrl.xml b/lib/res/values/styles_mtrl.xml
deleted file mode 100644
index 0525c3060..000000000
--- a/lib/res/values/styles_mtrl.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright 2017 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<resources>
-
-  <style name="Widget.MaterialComponents.FloatingActionButton" parent="Widget.Design.FloatingActionButton">
-    <item name="elevation">@dimen/mtrl_fab_elevation</item>
-    <item name="hoveredFocusedTranslationZ">@dimen/mtrl_fab_translation_z_hovered_focused</item>
-    <item name="pressedTranslationZ">@dimen/mtrl_fab_translation_z_pressed</item>
-  </style>
-
-</resources>
diff --git a/lib/res/values/themes_mtrl.xml b/lib/res/values/themes.xml
similarity index 83%
rename from lib/res/values/themes_mtrl.xml
rename to lib/res/values/themes.xml
index cc37f30ef..262193d2b 100644
--- a/lib/res/values/themes_mtrl.xml
+++ b/lib/res/values/themes.xml
@@ -120,4 +120,28 @@
 
   <style name="ThemeOverlay.MaterialComponents.Dialog.Alert" parent="ThemeOverlay.AppCompat.Dialog.Alert"/>
 
+  <!-- Deprecated. Use Theme.MaterialComponents.BottomSheetDialog instead. -->
+  <style name="Theme.Design.BottomSheetDialog" parent="Theme.MaterialComponents.BottomSheetDialog">
+  </style>
+
+  <!-- Deprecated. Use Theme.MaterialComponents.BottomSheetDialog instead. -->
+  <style name="Theme.Design.Light.BottomSheetDialog" parent="Theme.MaterialComponents.Light.BottomSheetDialog">
+  </style>
+
+  <!-- Deprecated. Use Theme.MaterialComponents instead. -->
+  <style name="Theme.Design" parent="Theme.MaterialComponents">
+  </style>
+
+  <!-- Deprecated. Use Theme.MaterialComponents.Light instead. -->
+  <style name="Theme.Design.Light" parent="Theme.MaterialComponents.Light">
+  </style>
+
+  <!-- Deprecated. Use Theme.MaterialComponents.NoActionBar instead. -->
+  <style name="Theme.Design.NoActionBar" parent="Theme.MaterialComponents.NoActionBar">
+  </style>
+
+  <!-- Deprecated. Use Theme.MaterialComponents.Light.NoActionBar instead. -->
+  <style name="Theme.Design.Light.NoActionBar" parent="Theme.MaterialComponents.Light.NoActionBar">
+  </style>
+
 </resources>
diff --git a/lib/res/values/themes_design.xml b/lib/res/values/themes_design.xml
deleted file mode 100644
index ea4fd47d9..000000000
--- a/lib/res/values/themes_design.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright 2017 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<resources>
-
-  <!-- Themes in the "Theme.Design" family are legacy M1 themes. -->
-
-  <style name="Theme.Design.BottomSheetDialog" parent="Theme.AppCompat.Dialog">
-    <item name="android:windowBackground">@android:color/transparent</item>
-    <item name="android:windowAnimationStyle">@style/Animation.Design.BottomSheetDialog</item>
-    <item name="bottomSheetStyle">@style/Widget.Design.BottomSheet.Modal</item>
-  </style>
-
-  <style name="Theme.Design.Light.BottomSheetDialog" parent="Theme.AppCompat.Light.Dialog">
-    <item name="android:windowBackground">@android:color/transparent</item>
-    <item name="android:windowAnimationStyle">@style/Animation.Design.BottomSheetDialog</item>
-    <item name="bottomSheetStyle">@style/Widget.Design.BottomSheet.Modal</item>
-  </style>
-
-  <style name="Theme.Design" parent="Theme.AppCompat">
-    <item name="colorError">@color/error_color_material</item>
-  </style>
-
-  <style name="Theme.Design.Light" parent="Theme.AppCompat.Light">
-    <item name="colorError">@color/error_color_material</item>
-  </style>
-
-  <style name="Theme.Design.NoActionBar">
-    <item name="windowActionBar">false</item>
-    <item name="windowNoTitle">true</item>
-  </style>
-
-  <style name="Theme.Design.Light.NoActionBar">
-    <item name="windowActionBar">false</item>
-    <item name="windowNoTitle">true</item>
-  </style>
-
-</resources>