diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt
index 46c1e4385..7c5013b88 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt
@@ -41,7 +41,6 @@ class LockScreenActivity : AbsMusicServiceActivity() {
     private var fragment: LockScreenControlsFragment? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        setDrawUnderStatusBar()
         super.onCreate(savedInstanceState)
         lockScreenInit()
         binding = ActivityLockScreenBinding.inflate(layoutInflater)
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt
index 348084f66..d7d99f4bc 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt
@@ -51,7 +51,6 @@ class MainActivity : AbsCastActivity(), OnSharedPreferenceChangeListener {
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        setDrawUnderStatusBar()
         super.onCreate(savedInstanceState)
         setTaskDescriptionColorAuto()
         hideStatusBar()
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt
index 1054c1ef9..656423df5 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt
@@ -28,7 +28,6 @@ import code.name.monkey.retromusic.Constants.PRO_VERSION_PRODUCT_ID
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsBaseActivity
 import code.name.monkey.retromusic.databinding.ActivityProVersionBinding
-import code.name.monkey.retromusic.extensions.setDrawUnderStatusBar
 import code.name.monkey.retromusic.extensions.setLightStatusBar
 import code.name.monkey.retromusic.extensions.setStatusBarColor
 import com.anjlab.android.iab.v3.BillingProcessor
@@ -40,7 +39,6 @@ class PurchaseActivity : AbsBaseActivity(), BillingProcessor.IBillingHandler {
     private lateinit var billingProcessor: BillingProcessor
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        setDrawUnderStatusBar()
         super.onCreate(savedInstanceState)
         binding = ActivityProVersionBinding.inflate(layoutInflater)
         setContentView(binding.root)
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/SettingsActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/SettingsActivity.kt
index 39702cf9f..23ae725a3 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/SettingsActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/SettingsActivity.kt
@@ -32,7 +32,6 @@ import com.afollestad.materialdialogs.color.ColorCallback
 class SettingsActivity : AbsThemeActivity(), ColorCallback, OnThemeChangedListener {
     private lateinit var binding: ActivitySettingsBinding
     override fun onCreate(savedInstanceState: Bundle?) {
-        setDrawUnderStatusBar()
         val mSavedInstanceState = extra<Bundle>(TAG).value ?: savedInstanceState
         super.onCreate(mSavedInstanceState)
         setLightStatusBarAuto(surfaceColor())
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/ShareInstagramStory.kt b/app/src/main/java/code/name/monkey/retromusic/activities/ShareInstagramStory.kt
index 6fd9a2b86..7632d68e1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/ShareInstagramStory.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/ShareInstagramStory.kt
@@ -28,8 +28,6 @@ import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.retromusic.activities.base.AbsBaseActivity
 import code.name.monkey.retromusic.databinding.ActivityShareInstagramBinding
-import code.name.monkey.retromusic.extensions.applyToolbar
-import code.name.monkey.retromusic.extensions.setDrawUnderStatusBar
 import code.name.monkey.retromusic.extensions.setLightStatusBar
 import code.name.monkey.retromusic.extensions.setStatusBarColor
 import code.name.monkey.retromusic.glide.GlideApp
@@ -60,7 +58,6 @@ class ShareInstagramStory : AbsBaseActivity() {
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        setDrawUnderStatusBar()
         super.onCreate(savedInstanceState)
         binding = ActivityShareInstagramBinding.inflate(layoutInflater)
         setContentView(binding.root)
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt
index 87ff2f32a..e9cac3e2a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt
@@ -35,6 +35,7 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
     private val handler = Handler()
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        setDrawBehindSystemBars()
         updateTheme()
         hideStatusBar()
         super.onCreate(savedInstanceState)
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt
index 4b9958c6b..18b73ed29 100755
--- a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt
@@ -32,7 +32,6 @@ import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.databinding.ActivityAlbumTagEditorBinding
 import code.name.monkey.retromusic.extensions.appHandleColor
-import code.name.monkey.retromusic.extensions.setDrawUnderStatusBar
 import code.name.monkey.retromusic.extensions.setTint
 import code.name.monkey.retromusic.glide.GlideApp
 import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
@@ -109,7 +108,6 @@ class AlbumTagEditorActivity : AbsTagEditorActivity<ActivityAlbumTagEditorBindin
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        setDrawUnderStatusBar()
         super.onCreate(savedInstanceState)
         window.sharedElementsUseOverlay = true
         binding.imageContainer.transitionName = getString(R.string.transition_album_art)
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/ActivityThemeExtensions.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/ActivityThemeExtensions.kt
index 217f11b67..adedcdba2 100644
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/ActivityThemeExtensions.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/extensions/ActivityThemeExtensions.kt
@@ -11,13 +11,11 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
 import androidx.fragment.app.FragmentActivity
 import code.name.monkey.appthemehelper.ATH
-import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.VersionUtils
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.RetroUtil
 
 fun AppCompatActivity.toggleScreenOn() {
     if (PreferenceUtil.isScreenOnEnabled) {
@@ -60,9 +58,13 @@ private fun AppCompatActivity.hideStatusBar(fullscreen: Boolean) {
     }
 }
 
-fun AppCompatActivity.setDrawUnderStatusBar() {
+fun AppCompatActivity.setDrawBehindSystemBars() {
     WindowCompat.setDecorFitsSystemWindows(window, false)
     window.statusBarColor = Color.TRANSPARENT
+    window.navigationBarColor = Color.TRANSPARENT
+    if (VersionUtils.hasQ()) {
+        window.isNavigationBarContrastEnforced = false
+    }
 }
 
 fun FragmentActivity.setTaskDescriptionColor(color: Int) {
@@ -100,9 +102,7 @@ fun AppCompatActivity.setLightStatusBarAuto(bgColor: Int) {
 }
 
 fun AppCompatActivity.setLightNavigationBar(enabled: Boolean) {
-    if (!ATHUtil.isWindowBackgroundDark(this) and ThemeStore.coloredNavigationBar(this)) {
-        ATH.setLightNavigationBar(this, enabled)
-    }
+   ATH.setLightNavigationBar(this, enabled)
 }
 
 
diff --git a/app/src/main/res/layout/fragment_album_content.xml b/app/src/main/res/layout/fragment_album_content.xml
index a89abb496..419a99832 100644
--- a/app/src/main/res/layout/fragment_album_content.xml
+++ b/app/src/main/res/layout/fragment_album_content.xml
@@ -62,7 +62,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/songTitle"
-        tools:listitem="@layout/item_song" />
+        tools:listitem="@layout/item_song"/>
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/moreTitle"
diff --git a/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml b/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml
index 1eedab69b..a8f9a71a5 100644
--- a/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml
@@ -28,6 +28,7 @@
         android:id="@+id/progressSlider"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
         android:maxHeight="2dp"
         android:progressDrawable="@drawable/color_progress_seek"
         app:layout_constraintEnd_toStartOf="@id/songTotalTime"
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ATH.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ATH.kt
index 4e76e0bdd..73644f888 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ATH.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ATH.kt
@@ -36,7 +36,6 @@ object ATH {
 
     fun setLightNavigationBar(activity: Activity, enabled: Boolean) {
         activity.window.apply {
-            navigationBarColor = Color.TRANSPARENT
             WindowInsetsControllerCompat(
                 this,
                 decorView
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ATHUtil.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ATHUtil.kt
index 1433f6691..3c1c240a1 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ATHUtil.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ATHUtil.kt
@@ -2,6 +2,7 @@ package code.name.monkey.appthemehelper.util
 
 import android.content.Context
 import androidx.annotation.AttrRes
+import androidx.core.content.res.use
 
 /**
  * @author Aidan Follestad (afollestad)
@@ -14,11 +15,8 @@ object ATHUtil {
 
     @JvmOverloads
     fun resolveColor(context: Context, @AttrRes attr: Int, fallback: Int = 0): Int {
-        val a = context.theme.obtainStyledAttributes(intArrayOf(attr))
-        try {
-            return a.getColor(0, fallback)
-        } finally {
-            a.recycle()
+        context.theme.obtainStyledAttributes(intArrayOf(attr)).use {
+            return it.getColor(0, fallback)
         }
     }
 }
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 2f15419a8..0bc9d912a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,10 +1,21 @@
-org.gradle.jvmargs=-Xmx4608m
-org.gradle.daemon=true
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 org.gradle.parallel=true
-jvmArgs='-Xmx2048m'
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app"s APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-android.enabelR8=true
-android.enableR8.fullMode=false
+# Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
-android.debug.obsoleteApi=true
+# Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
\ No newline at end of file