diff --git a/app/src/main/res/color/color_on_primary_surface_divider.xml b/app/src/main/res/color/color_on_primary_surface_divider.xml
deleted file mode 100644
index 3e4b2b99..00000000
--- a/app/src/main/res/color/color_on_primary_surface_divider.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/colorOnSurface" android:alpha="0.2" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/color_on_surface_emphasis_medium.xml b/app/src/main/res/color/color_on_surface_emphasis_medium.xml
deleted file mode 100644
index bfbf26df..00000000
--- a/app/src/main/res/color/color_on_surface_emphasis_medium.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/colorOnSurface" android:alpha="?attr/emphasisMediumAlpha" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/avatar_none.xml b/app/src/main/res/drawable/avatar_none.xml
deleted file mode 100644
index b09a6b43..00000000
--- a/app/src/main/res/drawable/avatar_none.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="@color/color_on_primary_surface_divider" />
-</shape>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
deleted file mode 100644
index a082d2e0..00000000
--- a/app/src/main/res/values/arrays.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<resources>
-    <!-- Reply Preference -->
-
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 2c124a63..df69532c 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -21,4 +21,6 @@
     <!--Email previews-->
 
     <dimen name="chip_icon_diameter">32dp</dimen>
+    <dimen name="grid_1">8dp</dimen>
+    <dimen name="grid_4">32dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/elevation.xml b/app/src/main/res/values/elevation.xml
deleted file mode 100644
index 3495a41e..00000000
--- a/app/src/main/res/values/elevation.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (c) 2019 Google Inc.
-
-  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>
-
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/font_certs.xml b/app/src/main/res/values/font_certs.xml
deleted file mode 100644
index 3ea04e70..00000000
--- a/app/src/main/res/values/font_certs.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
deleted file mode 100644
index 98052dae..00000000
--- a/app/src/main/res/values/ids.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (c) 2019 Google Inc.
-
-  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>
-    <item name="tag_system_window_inset_top" type="id"/>
-    <item name="tag_view_top_snapshot" type="id"/>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/layout.xml b/app/src/main/res/values/layout.xml
deleted file mode 100644
index d628a854..00000000
--- a/app/src/main/res/values/layout.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (c) 2019 Google Inc.
-
-  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>
-
-    <!--Layout-->
-    <!--KeyPass uses an 8dp grid system. Smaller components can align to a 2dp 'sub' grid.-->
-
-    <!--2dp sub grid-->
-
-    <!--8dp grid-->
-    <dimen name="grid_1">8dp</dimen>
-    <dimen name="grid_4">32dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/motion.xml b/app/src/main/res/values/motion.xml
deleted file mode 100644
index 37ef77a2..00000000
--- a/app/src/main/res/values/motion.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!--Motion-->
-
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/shapes.xml b/app/src/main/res/values/shapes.xml
deleted file mode 100644
index 00e5e541..00000000
--- a/app/src/main/res/values/shapes.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-
-    <!--Shape-->
-
-    <style name="ShapeAppearance.KeyPass.SmallComponent" parent="ShapeAppearance.MaterialComponents.SmallComponent">
-        <item name="cornerFamily">rounded</item>
-        <item name="cornerSize">@dimen/keypass_small_component_corner_radius</item>
-    </style>
-
-    <style name="ShapeAppearance.KeyPass.MediumComponent" parent="ShapeAppearance.MaterialComponents.MediumComponent">
-        <item name="cornerFamily">rounded</item>
-        <item name="cornerSize">@dimen/keypass_medium_component_corner_radius</item>
-    </style>
-
-    <style name="ShapeAppearance.KeyPass.LargeComponent" parent="ShapeAppearance.MaterialComponents.LargeComponent">
-        <item name="cornerFamily">rounded</item>
-        <item name="cornerSize">@dimen/keypass_large_component_corner_radius</item>
-    </style>
-
-    <dimen name="keypass_small_component_corner_radius">4dp</dimen>
-    <dimen name="keypass_medium_component_corner_radius">0dp</dimen>
-    <dimen name="keypass_large_component_corner_radius">12dp</dimen>
-
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/style_text.xml b/app/src/main/res/values/style_text.xml
deleted file mode 100644
index 0d2c4cc4..00000000
--- a/app/src/main/res/values/style_text.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
deleted file mode 100644
index 42f3b05e..00000000
--- a/app/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--Components-->
-
-    <style name="Widget.KeyPass.NavigationView" parent="Widget.MaterialComponents.NavigationView">
-        <!--Remove any scrim insets applied by NavigationView for system bars-->
-        <item name="insetForeground">@android:color/transparent</item>
-        <!--Set the background color of NavigationView-->
-        <item name="android:background">@android:color/transparent</item>
-        <item name="elevation">0dp</item>
-        <item name="itemTextAppearance">?attr/textAppearanceBody2</item>
-        <item name="itemTextColor">@color/color_on_surface_emphasis_medium</item>
-        <item name="itemIconTint">@color/color_on_surface_emphasis_medium</item>
-    </style>
-
-    <style name="Widget.KeyPass.Chip.Entry" parent="Widget.MaterialComponents.Chip.Entry">
-        <item name="closeIconSize">0dp</item>
-        <item name="closeIconEnabled">false</item>
-        <item name="chipIcon">@drawable/avatar_none</item>
-        <item name="chipIconSize">@dimen/chip_icon_diameter</item>
-        <item name="chipStartPadding">0dp</item>
-        <item name="android:checkable">false</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index d706df7e..8158766c 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -27,10 +27,6 @@
         <item name="android:statusBarColor">@color/keypass_blue_50_alpha_060</item>
         <item name="android:navigationBarColor">@color/nav_bar</item>
 
-        <item name="shapeAppearanceSmallComponent">@style/ShapeAppearance.KeyPass.SmallComponent</item>
-        <item name="shapeAppearanceMediumComponent">@style/ShapeAppearance.KeyPass.MediumComponent</item>
-        <item name="shapeAppearanceLargeComponent">@style/ShapeAppearance.KeyPass.LargeComponent</item>
-
         <!--Typography-->
         <item name="textAppearanceDisplayLarge">@style/TextAppearance.KeyPass.DisplayLarge</item>
         <item name="textAppearanceDisplayMedium">@style/TextAppearance.KeyPass.DisplayMedium</item>
@@ -48,18 +44,8 @@
         <item name="textAppearanceLabelMedium">@style/TextAppearance.KeyPass.LabelMedium</item>
         <item name="textAppearanceLabelSmall">@style/TextAppearance.KeyPass.LabelSmall</item>
 
-        <item name="emphasisHighAlpha">0.87</item>
-        <item name="emphasisMediumAlpha">0.60</item>
-        <item name="emphasisDisabledAlpha">0.38</item>
-
-        <item name="motionInterpolatorPersistent">@android:interpolator/fast_out_slow_in</item>
-        <item name="motionInterpolatorIncoming">@android:interpolator/decelerate_cubic</item>
-        <item name="motionInterpolatorOutgoing">@android:interpolator/accelerate_cubic</item>
-
         <!--Styles-->
         <item name="bottomSheetStyle">@style/Widget.MaterialComponents.BottomSheet.Modal</item>
-        <item name="navigationViewStyle">@style/Widget.KeyPass.NavigationView</item>
-        <item name="chipStyle">@style/Widget.KeyPass.Chip.Entry</item>
 
         <!--System/Platform attributes-->
         <item name="android:windowBackground">?android:colorBackground</item>
diff --git a/common/src/main/res/values/colors.xml b/common/src/main/res/values/colors.xml
deleted file mode 100644
index a6b3daec..00000000
--- a/common/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file