diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5a81439
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,54 @@
+## Java
+*.class
+*.war
+*.ear
+hs_err_pid*
+
+## Intellij
+out/
+/lib/
+.idea/*
+!.idea/runConfigurations*
+!.idea/inspectionProfiles*
+!.idea/codeStyles*
+!.idea/dictionaries*
+*.ipr
+*.iws
+*.iml
+
+## Eclipse
+.classpath
+.project
+.metadata
+**/bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+.externalToolBuilders/
+*.launch
+
+## NetBeans
+**/nbproject/private/
+/build/
+/app/build/
+nbbuild/
+dist/
+nbdist/
+nbactions.xml
+nb-configuration.xml
+
+## Gradle
+.gradle
+keystore.properties
+gradle-app.setting
+
+## OS Specific
+.DS_Store
+
+## Android
+gen/
diff --git a/Android.bp b/Android.bp
deleted file mode 100644
index 4d416d3..0000000
--- a/Android.bp
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-// Build the setup design library.
-//
-
-package {
-    default_applicable_licenses: ["external_setupdesign_license"],
-}
-
-// Added automatically by a large-scale-change
-//
-// large-scale-change included anything that looked like it might be a license
-// text as a license_text. e.g. LICENSE, NOTICE, COPYING etc.
-//
-// Please consider removing redundant or irrelevant files from 'license_text:'.
-// See: http://go/android-license-faq
-license {
-    name: "external_setupdesign_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
-    ],
-    license_text: [
-        "LICENSE",
-        "NOTICE",
-    ],
-}
-
-android_library {
-    name: "setupdesign",
-    static_libs: [
-        "androidx.annotation_annotation",
-        "androidx.core_core",
-        "androidx.legacy_legacy-support-core-ui",
-        "androidx.appcompat_appcompat",
-        "androidx.recyclerview_recyclerview",
-        "com.google.android.material_material",
-        "setupcompat",
-        "setupdesign-strings",
-    ],
-    manifest: "main/AndroidManifest.xml",
-    resource_dirs: [
-        "main/res",
-    ],
-    sdk_version: "current",
-    srcs: [
-        "main/src/**/*.java",
-    ],
-    min_sdk_version: "14",
-}
-
-//
-// Strings that will not exposing.
-// If app requires these strings, please copy the string definitions directly.
-//
-
-android_library {
-    name: "setupdesign-strings",
-    manifest: "main/AndroidManifest.xml",
-    resource_dirs: [
-        "strings/res",
-    ],
-    min_sdk_version: "14",
-    sdk_version: "current"
-}
diff --git a/build.gradle b/build.gradle
index 7339ec4..73765dd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,11 +19,11 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 31
 
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 28
+        minSdkVersion 29
+        targetSdkVersion 31
     }
 
     buildTypes {
@@ -47,4 +47,5 @@ dependencies {
     implementation "androidx.annotation:annotation:1.0.0"
     implementation "androidx.recyclerview:recyclerview:1.0.0"
     implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'com.google.android.material:material:1.4.0'
 }
diff --git a/lint.xml b/lint.xml
index 7e2d5d3..0e93615 100644
--- a/lint.xml
+++ b/lint.xml
@@ -8,4 +8,8 @@
     <!-- Stop lint from complaining about SDK version checks in the "platform" variant -->
     <issue id="ObsoleteSdkInt" severity="ignore" />
     <issue id="RtlEnabled" severity="ignore" />
+
+    <issue id="ResourceType" severity="ignore" />
+    <issue id="AppCompatCustomView" severity="ignore" />
+    <issue id="MissingDefaultResource" severity="ignore" />
 </lint>
diff --git a/lottie_loading_layout/Android.bp b/lottie_loading_layout/Android.bp
deleted file mode 100644
index 6d41812..0000000
--- a/lottie_loading_layout/Android.bp
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-// Build the setup design - lottie_loading_layout.
-//
-
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_setupdesign_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["external_setupdesign_license"],
-}
-
-android_library {
-    name: "setupdesign-lottie-loading-layout",
-    manifest: "AndroidManifest.xml",
-    static_libs: [
-        "androidx.annotation_annotation",
-        "lottie",
-        "setupcompat",
-        "setupdesign",
-    ],
-    srcs: [
-        "src/**/*.java",
-    ],
-    resource_dirs: [
-        "res",
-    ],
-    min_sdk_version: "16",
-    sdk_version: "current"
-}
diff --git a/main/res/drawable-anydpi-v21/sud_navbar_ic_back.xml b/main/res/drawable-anydpi-v21/sud_navbar_ic_back.xml
index 6cf4229..e4e4942 100644
--- a/main/res/drawable-anydpi-v21/sud_navbar_ic_back.xml
+++ b/main/res/drawable-anydpi-v21/sud_navbar_ic_back.xml
@@ -17,8 +17,8 @@
 
 <!-- go/gm2-icons, from quantum_gm_ic_keyboard_arrow_left_vd_theme_24.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="@dimen/sud_navbar_ic_intrinsic_size"
-    android:height="@dimen/sud_navbar_ic_intrinsic_size"
+    android:width="24dp"
+    android:height="24dp"
     android:autoMirrored="true"
     android:tint="?attr/sudNavBarTextColor"
     android:viewportHeight="24"
diff --git a/main/res/drawable-anydpi-v21/sud_navbar_ic_more.xml b/main/res/drawable-anydpi-v21/sud_navbar_ic_more.xml
index d28ba90..404216a 100644
--- a/main/res/drawable-anydpi-v21/sud_navbar_ic_more.xml
+++ b/main/res/drawable-anydpi-v21/sud_navbar_ic_more.xml
@@ -17,8 +17,8 @@
 
 <!-- go/gm2-icons, from quantum_gm_ic_keyboard_arrow_down_vd_theme_24.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="@dimen/sud_navbar_ic_intrinsic_size"
-    android:height="@dimen/sud_navbar_ic_intrinsic_size"
+    android:width="24dp"
+    android:height="24dp"
     android:tint="?attr/sudNavBarTextColor"
     android:viewportHeight="24"
     android:viewportWidth="24">
diff --git a/main/res/drawable-anydpi-v21/sud_navbar_ic_next.xml b/main/res/drawable-anydpi-v21/sud_navbar_ic_next.xml
index 8daa32b..ccc8485 100644
--- a/main/res/drawable-anydpi-v21/sud_navbar_ic_next.xml
+++ b/main/res/drawable-anydpi-v21/sud_navbar_ic_next.xml
@@ -17,8 +17,8 @@
 
 <!-- go/gm2-icons, from quantum_gm_ic_keyboard_arrow_right_vd_theme_24.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="@dimen/sud_navbar_ic_intrinsic_size"
-    android:height="@dimen/sud_navbar_ic_intrinsic_size"
+    android:width="24dp"
+    android:height="24dp"
     android:autoMirrored="true"
     android:tint="?attr/sudNavBarTextColor"
     android:viewportHeight="24"