diff --git a/app/src/main/java/dev/jdtech/jellyfin/utils/AppPreferences.kt b/app/src/main/java/dev/jdtech/jellyfin/utils/AppPreferences.kt
index 9fd2f394..3a707d9c 100644
--- a/app/src/main/java/dev/jdtech/jellyfin/utils/AppPreferences.kt
+++ b/app/src/main/java/dev/jdtech/jellyfin/utils/AppPreferences.kt
@@ -22,17 +22,17 @@ constructor(
         }
 
     // Appearance
-    val theme = sharedPreferences.getString(Constants.PREF_THEME, null)
-    val dynamicColors = sharedPreferences.getBoolean(Constants.PREF_DYNAMIC_COLORS, true)
+    val theme get() = sharedPreferences.getString(Constants.PREF_THEME, null)
+    val dynamicColors get() = sharedPreferences.getBoolean(Constants.PREF_DYNAMIC_COLORS, true)
 
     // Player
-    val displayExtendedTitle = sharedPreferences.getBoolean(Constants.PREF_DISPLAY_EXTENDED_TITLE, false)
+    val displayExtendedTitle get() = sharedPreferences.getBoolean(Constants.PREF_DISPLAY_EXTENDED_TITLE, false)
 
-    val playerGestures = sharedPreferences.getBoolean(Constants.PREF_PLAYER_GESTURES, true)
-    val playerGesturesVB = sharedPreferences.getBoolean(Constants.PREF_PLAYER_GESTURES_VB, true)
-    val playerGesturesZoom = sharedPreferences.getBoolean(Constants.PREF_PLAYER_GESTURES_ZOOM, true)
+    val playerGestures get() = sharedPreferences.getBoolean(Constants.PREF_PLAYER_GESTURES, true)
+    val playerGesturesVB get() = sharedPreferences.getBoolean(Constants.PREF_PLAYER_GESTURES_VB, true)
+    val playerGesturesZoom get() = sharedPreferences.getBoolean(Constants.PREF_PLAYER_GESTURES_ZOOM, true)
 
-    val playerBrightnessRemember =
+    val playerBrightnessRemember get() =
         sharedPreferences.getBoolean(Constants.PREF_PLAYER_BRIGHTNESS_REMEMBER, false)
 
     var playerBrightness: Float
@@ -45,40 +45,40 @@ constructor(
                 putFloat(Constants.PREF_PLAYER_BRIGHTNESS, value)
             }
         }
-    val playerSeekBackIncrement = sharedPreferences.getString(
+    val playerSeekBackIncrement get() = sharedPreferences.getString(
         Constants.PREF_PLAYER_SEEK_BACK_INC,
         DEFAULT_SEEK_BACK_INCREMENT_MS.toString()
     )!!.toLongOrNull() ?: DEFAULT_SEEK_BACK_INCREMENT_MS
-    val playerSeekForwardIncrement = sharedPreferences.getString(
+    val playerSeekForwardIncrement get() = sharedPreferences.getString(
         Constants.PREF_PLAYER_SEEK_FORWARD_INC,
         DEFAULT_SEEK_FORWARD_INCREMENT_MS.toString()
     )!!.toLongOrNull() ?: DEFAULT_SEEK_FORWARD_INCREMENT_MS
-    val playerMpv = sharedPreferences.getBoolean(Constants.PREF_PLAYER_MPV, false)
-    val playerMpvHwdec = sharedPreferences.getString(Constants.PREF_PLAYER_MPV_HWDEC, "mediacodec-copy")!!
-    val playerMpvHwdecCodecs: Set<String> = sharedPreferences.getStringSet(
+    val playerMpv get() = sharedPreferences.getBoolean(Constants.PREF_PLAYER_MPV, false)
+    val playerMpvHwdec get() = sharedPreferences.getString(Constants.PREF_PLAYER_MPV_HWDEC, "mediacodec-copy")!!
+    val playerMpvHwdecCodecs: Set<String> get() = sharedPreferences.getStringSet(
         Constants.PREF_PLAYER_MPV_HWDEC_CODECS,
         setOf("h264", "hevc", "mpeg4", "mpeg2video", "vp8", "vp9")
     )!!
-    val playerMpvVo = sharedPreferences.getString(Constants.PREF_PLAYER_MPV_VO, "gpu")!!
-    val playerMpvAo = sharedPreferences.getString(Constants.PREF_PLAYER_MPV_AO, "audiotrack")!!
-    val playerMpvGpuApi = sharedPreferences.getString(Constants.PREF_PLAYER_MPV_GPU_API, "opengl")!!
+    val playerMpvVo get() = sharedPreferences.getString(Constants.PREF_PLAYER_MPV_VO, "gpu")!!
+    val playerMpvAo get() = sharedPreferences.getString(Constants.PREF_PLAYER_MPV_AO, "audiotrack")!!
+    val playerMpvGpuApi get() = sharedPreferences.getString(Constants.PREF_PLAYER_MPV_GPU_API, "opengl")!!
 
     // Language
-    val preferredAudioLanguage = sharedPreferences.getString(Constants.PREF_AUDIO_LANGUAGE, "")!!
-    val preferredSubtitleLanguage = sharedPreferences.getString(Constants.PREF_SUBTITLE_LANGUAGE, "")!!
+    val preferredAudioLanguage get() = sharedPreferences.getString(Constants.PREF_AUDIO_LANGUAGE, "")!!
+    val preferredSubtitleLanguage get() = sharedPreferences.getString(Constants.PREF_SUBTITLE_LANGUAGE, "")!!
 
     // Network
-    val requestTimeout = sharedPreferences.getString(
+    val requestTimeout get() = sharedPreferences.getString(
         Constants.PREF_NETWORK_REQUEST_TIMEOUT,
         Constants.NETWORK_DEFAULT_REQUEST_TIMEOUT.toString()
     )!!.toLongOrNull() ?: Constants.NETWORK_DEFAULT_REQUEST_TIMEOUT
 
-    val connectTimeout = sharedPreferences.getString(
+    val connectTimeout get() = sharedPreferences.getString(
         Constants.PREF_NETWORK_CONNECT_TIMEOUT,
         Constants.NETWORK_DEFAULT_CONNECT_TIMEOUT.toString()
     )!!.toLongOrNull() ?: Constants.NETWORK_DEFAULT_CONNECT_TIMEOUT
 
-    val socketTimeout = sharedPreferences.getString(
+    val socketTimeout get() = sharedPreferences.getString(
         Constants.PREF_NETWORK_SOCKET_TIMEOUT,
         Constants.NETWORK_DEFAULT_SOCKET_TIMEOUT.toString()
     )!!.toLongOrNull() ?: Constants.NETWORK_DEFAULT_SOCKET_TIMEOUT