diff --git a/app/build.gradle b/app/build.gradle
index 4069464..96b874e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@ android {
 
     defaultConfig {
         applicationId "de.jrpie.android.launcher"
-        minSdkVersion 16
+        minSdkVersion 21
         targetSdkVersion 33
         versionCode 13
         versionName "j-alpha-0.1"
diff --git a/app/src/main/res/layout/list.xml b/app/src/main/res/layout/list.xml
index ddca686..be14f3f 100644
--- a/app/src/main/res/layout/list.xml
+++ b/app/src/main/res/layout/list.xml
@@ -16,7 +16,7 @@
         android:gravity="center"
 
         android:background="@null"
-        android:elevation="0dp"
+        app:elevation="0dp"
 
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/settings.xml b/app/src/main/res/layout/settings.xml
index d7b582e..22ce89b 100644
--- a/app/src/main/res/layout/settings.xml
+++ b/app/src/main/res/layout/settings.xml
@@ -12,9 +12,9 @@
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/settings_appbar"
         android:background="@null"
-        android:elevation="0dp"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        app:elevation="0dp">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
deleted file mode 100644
index a38b53a..0000000
--- a/app/src/main/res/values-v21/styles.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="baseTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="colorPrimary">@color/finnmglasTheme_background_color</item>
-        <item name="colorPrimaryDark">@color/finnmglasTheme_background_color</item>
-        <item name="android:colorBackground">@color/finnmglasTheme_background_color</item>
-
-        <item name="android:statusBarColor">@android:color/transparent</item>
-
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowShowWallpaper">true</item>
-
-        <item name="colorAccent">#555</item>
-
-        <item name="android:textColor">#ffffff</item>
-        <item name="android:textColorSecondary">@color/finnmglasTheme_text_color</item>
-        <item name="android:textColorPrimary">@color/finnmglasTheme_text_color</item>
-        <item name="android:textColorHint">#555</item>
-
-        <item name="android:fontFamily">@font/hack</item>
-
-        <item name="android:buttonStyle">@style/Widget.AppCompat.Button.Colored</item>
-        <item name="colorButtonNormal">#555</item>
-
-        <item name="android:popupMenuStyle">@style/PopupMenuCustom</item>
-
-
-        <item name="android:windowDisablePreview">true</item>
-        <item name="android:windowAnimationStyle">@style/WindowFadeTransition</item>
-    </style>
-</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
index a4a0622..a5f34aa 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -13,7 +13,7 @@
         <item name="colorPrimaryDark">@color/finnmglasTheme_background_color</item>
         <item name="android:colorBackground">@color/finnmglasTheme_background_color</item>
 
-        <item name="android:statusBarColor">@null</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
 
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowShowWallpaper">true</item>
@@ -23,12 +23,12 @@
         <item name="android:textColor">#ffffff</item>
         <item name="android:textColorSecondary">@color/finnmglasTheme_text_color</item>
         <item name="android:textColorPrimary">@color/finnmglasTheme_text_color</item>
-        <item name="android:textColorHint">#555</item>
+        <item name="android:textColorHint">?android:textColor</item>
 
         <item name="android:fontFamily">@font/hack</item>
 
         <item name="android:buttonStyle">@style/Widget.AppCompat.Button.Colored</item>
-        <item name="colorButtonNormal">#555</item>
+        <item name="colorButtonNormal">?colorAccent</item>
 
         <item name="android:popupMenuStyle">@style/PopupMenuCustom</item>