diff --git a/app/build.gradle b/app/build.gradle
index 0186185e..3b6f4440 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,7 +6,7 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 'android-S'
     buildToolsVersion "30.0.3"
 
     defaultConfig {
@@ -43,6 +43,7 @@ dependencies {
     def jellyfin_version = "1.0.0-beta.9"
 
     implementation 'androidx.core:core-ktx:1.6.0'
+    implementation 'androidx.core:core-splashscreen:1.0.0-alpha01'
     implementation 'androidx.appcompat:appcompat:1.3.0'
 
     // Material
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a5422d5a..6657f639 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,7 +16,8 @@
             android:label="@string/title_activity_main" />
         <activity
             android:name=".SetupActivity"
-            android:windowSoftInputMode="adjustPan">
+            android:windowSoftInputMode="adjustPan"
+            android:theme="@style/Theme.JellyfinSplashScreen">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/dev/jdtech/jellyfin/SetupActivity.kt b/app/src/main/java/dev/jdtech/jellyfin/SetupActivity.kt
index 73c4ddea..7384b75e 100644
--- a/app/src/main/java/dev/jdtech/jellyfin/SetupActivity.kt
+++ b/app/src/main/java/dev/jdtech/jellyfin/SetupActivity.kt
@@ -2,10 +2,12 @@ package dev.jdtech.jellyfin
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 
 class SetupActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        installSplashScreen()
         setContentView(R.layout.activity_setup)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index e3f7d428..1774d697 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -10,9 +10,15 @@
         <item name="colorSecondaryVariant">@color/secondary_variant</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
         <item name="android:windowBackground">@color/neutral_900</item>
         <item name="android:colorBackgroundFloating">@color/neutral_900</item>
     </style>
+
+    <style name="Theme.JellyfinSplashScreen" parent="Theme.SplashScreen">
+        <item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground</item>
+        <item name="windowSplashScreenBackground">@color/neutral_900</item>
+        <item name="postSplashScreenTheme">@style/Theme.Jellyfin</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 d754cccf..6e34c809 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -10,9 +10,15 @@
         <item name="colorSecondaryVariant">@color/secondary_variant</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
         <item name="android:windowBackground">@color/neutral_100</item>
         <item name="android:colorBackgroundFloating">@color/neutral_100</item>
     </style>
+
+    <style name="Theme.JellyfinSplashScreen" parent="Theme.SplashScreen">
+        <item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground</item>
+        <item name="windowSplashScreenBackground">@color/neutral_100</item>
+        <item name="postSplashScreenTheme">@style/Theme.Jellyfin</item>
+    </style>
 </resources>
\ No newline at end of file