diff --git a/app/build.gradle b/app/build.gradle
index e7257e7f0..12b999f33 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -80,9 +80,7 @@ android {
 
 dependencies {
 // AndroidX
-    implementation "androidx.multidex:multidex:2.0.1"
     implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
     implementation 'androidx.exifinterface:exifinterface:1.3.3'
     implementation 'androidx.preference:preference:1.1.1'
diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java b/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
index 1e24b4a70..15791d381 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
@@ -21,7 +21,6 @@ import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.util.ArrayList;
 
-import androidx.cardview.widget.CardView;
 import androidx.recyclerview.widget.RecyclerView;
 import protect.card_locker.preferences.Settings;
 
diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardLockerApplication.java b/app/src/main/java/protect/card_locker/LoyaltyCardLockerApplication.java
index 4765f6fc9..c031f7904 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardLockerApplication.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardLockerApplication.java
@@ -1,14 +1,18 @@
 package protect.card_locker;
 
+import android.app.Application;
+
 import androidx.appcompat.app.AppCompatDelegate;
-import androidx.multidex.MultiDexApplication;
+
 import protect.card_locker.preferences.Settings;
 
-public class LoyaltyCardLockerApplication extends MultiDexApplication {
+public class LoyaltyCardLockerApplication extends Application {
+
+    @Override
     public void onCreate() {
         super.onCreate();
 
-        Settings settings = new Settings(getApplicationContext());
+        Settings settings = new Settings(this);
         AppCompatDelegate.setDefaultNightMode(settings.getTheme());
     }
 }
diff --git a/app/src/main/res/layout/loyalty_card_edit_activity.xml b/app/src/main/res/layout/loyalty_card_edit_activity.xml
index 1201fddd4..634dc05b3 100644
--- a/app/src/main/res/layout/loyalty_card_edit_activity.xml
+++ b/app/src/main/res/layout/loyalty_card_edit_activity.xml
@@ -68,7 +68,7 @@
                     android:paddingTop="@dimen/inputPadding"
                     android:orientation="horizontal">
 
-                    <androidx.cardview.widget.CardView
+                    <com.google.android.material.card.MaterialCardView
                         android:layout_width="@dimen/cardThumbnailSize"
                         android:layout_height="@dimen/cardThumbnailSize"
                         android:layout_marginEnd="@dimen/activity_margin"
@@ -84,7 +84,7 @@
                             android:contentDescription="@string/thumbnailDescription"
                             android:src="@mipmap/ic_launcher"/>
 
-                    </androidx.cardview.widget.CardView>
+                    </com.google.android.material.card.MaterialCardView>
 
                     <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/storeNameField"
@@ -347,7 +347,7 @@
                     android:paddingTop="@dimen/inputPadding">
 
                     <!-- Front image -->
-                    <androidx.cardview.widget.CardView
+                    <com.google.android.material.card.MaterialCardView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
@@ -369,7 +369,7 @@
                             android:scaleType="fitCenter"
                             app:srcCompat="@drawable/ic_camera_white" />
 
-                    </androidx.cardview.widget.CardView>
+                    </com.google.android.material.card.MaterialCardView>
                 </LinearLayout>
 
                 <!-- Back image -->
@@ -382,7 +382,7 @@
                     android:paddingTop="@dimen/inputPadding">
 
                     <!-- Back image -->
-                    <androidx.cardview.widget.CardView
+                    <com.google.android.material.card.MaterialCardView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
@@ -404,7 +404,7 @@
                             android:scaleType="fitCenter"
                             app:srcCompat="@drawable/ic_camera_white" />
 
-                    </androidx.cardview.widget.CardView>
+                    </com.google.android.material.card.MaterialCardView>
                 </LinearLayout>
             </TableLayout>
         </TableLayout>
diff --git a/app/src/main/res/layout/loyalty_card_layout.xml b/app/src/main/res/layout/loyalty_card_layout.xml
index c1f94cb4b..0456b8340 100644
--- a/app/src/main/res/layout/loyalty_card_layout.xml
+++ b/app/src/main/res/layout/loyalty_card_layout.xml
@@ -25,7 +25,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-                <androidx.cardview.widget.CardView
+                <com.google.android.material.card.MaterialCardView
                     android:id="@+id/thumbnail_container"
                     android:layout_width="@dimen/cardThumbnailSize"
                     android:layout_height="@dimen/cardThumbnailSize"
@@ -59,7 +59,7 @@
                             app:srcCompat="@drawable/ic_done" />
 
                     </RelativeLayout>
-                </androidx.cardview.widget.CardView>
+                </com.google.android.material.card.MaterialCardView>
 
                 <LinearLayout
                     android:minHeight="@dimen/cardThumbnailSize"