diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index ebde6187..94dd7c83 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -19,7 +19,7 @@ fun String.execute() = ByteArrayOutputStream().use { baot ->
             workingDir = projectDir
             commandLine = this@execute.split(Regex("\\s"))
             standardOutput = baot
-    }.exitValue == 0)
+        }.exitValue == 0)
         String(baot.toByteArray()).trim()
     else null
 }
@@ -74,12 +74,18 @@ android {
             isDebuggable = false
             isMinifyEnabled = false
             isShrinkResources = false
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
         }
         debug {
             isDebuggable = true
             applicationIdSuffix = ".debug"
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
         }
     }
     flavorDimensions.add("state")
@@ -155,10 +161,16 @@ dependencies {
     // implementation("androidx.leanback:leanback-paging:1.1.0-alpha09")
 
     // Exoplayer
-    implementation("com.google.android.exoplayer:exoplayer:2.18.2")
-    implementation("com.google.android.exoplayer:extension-cast:2.18.2")
-    implementation("com.google.android.exoplayer:extension-mediasession:2.18.2")
-    implementation("com.google.android.exoplayer:extension-okhttp:2.18.2")
+    implementation("androidx.media3:media3-common:1.1.0")
+    implementation("androidx.media3:media3-exoplayer:1.1.0")
+    implementation("androidx.media3:media3-datasource-okhttp:1.1.0")
+    implementation("androidx.media3:media3-ui:1.1.0")
+    implementation("androidx.media3:media3-session:1.1.0")
+    implementation("androidx.media3:media3-cast:1.1.0")
+    implementation("androidx.media3:media3-exoplayer-hls:1.1.0")
+    implementation("androidx.media3:media3-exoplayer-dash:1.1.0")
+
+
     // Use the Jellyfin ffmpeg extension for easy ffmpeg audio decoding in exoplayer. Thank you Jellyfin <3
 //    implementation("org.jellyfin.exoplayer:exoplayer-ffmpeg-extension:2.18.2+1")
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
index 89f0ae51..0a42da72 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
@@ -222,6 +222,7 @@ object CommonActivity {
                 "AmoledLight" -> R.style.AmoledModeLight
                 "Monet" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
                     R.style.MonetMode else R.style.AppTheme
+
                 else -> R.style.AppTheme
             }
 
@@ -244,8 +245,10 @@ object CommonActivity {
                 "Pink" -> R.style.OverlayPrimaryColorPink
                 "Monet" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
                     R.style.OverlayPrimaryColorMonet else R.style.OverlayPrimaryColorNormal
+
                 "Monet2" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
                     R.style.OverlayPrimaryColorMonetTwo else R.style.OverlayPrimaryColorNormal
+
                 else -> R.style.OverlayPrimaryColorNormal
             }
         act.theme.applyStyle(currentTheme, true)
@@ -271,12 +274,15 @@ object CommonActivity {
             FocusDirection.Left -> {
                 view.nextFocusLeftId
             }
+
             FocusDirection.Up -> {
                 view.nextFocusUpId
             }
+
             FocusDirection.Right -> {
                 view.nextFocusRightId
             }
+
             FocusDirection.Down -> {
                 view.nextFocusDownId
             }
@@ -328,30 +334,39 @@ object CommonActivity {
             KeyEvent.KEYCODE_FORWARD, KeyEvent.KEYCODE_D, KeyEvent.KEYCODE_MEDIA_SKIP_FORWARD, KeyEvent.KEYCODE_MEDIA_FAST_FORWARD -> {
                 PlayerEventType.SeekForward
             }
+
             KeyEvent.KEYCODE_A, KeyEvent.KEYCODE_MEDIA_SKIP_BACKWARD, KeyEvent.KEYCODE_MEDIA_REWIND -> {
                 PlayerEventType.SeekBack
             }
+
             KeyEvent.KEYCODE_MEDIA_NEXT, KeyEvent.KEYCODE_BUTTON_R1, KeyEvent.KEYCODE_N -> {
                 PlayerEventType.NextEpisode
             }
+
             KeyEvent.KEYCODE_MEDIA_PREVIOUS, KeyEvent.KEYCODE_BUTTON_L1, KeyEvent.KEYCODE_B -> {
                 PlayerEventType.PrevEpisode
             }
+
             KeyEvent.KEYCODE_MEDIA_PAUSE -> {
                 PlayerEventType.Pause
             }
+
             KeyEvent.KEYCODE_MEDIA_PLAY, KeyEvent.KEYCODE_BUTTON_START -> {
                 PlayerEventType.Play
             }
+
             KeyEvent.KEYCODE_L, KeyEvent.KEYCODE_NUMPAD_7, KeyEvent.KEYCODE_7 -> {
                 PlayerEventType.Lock
             }
+
             KeyEvent.KEYCODE_H, KeyEvent.KEYCODE_MENU -> {
                 PlayerEventType.ToggleHide
             }
+
             KeyEvent.KEYCODE_M, KeyEvent.KEYCODE_VOLUME_MUTE -> {
                 PlayerEventType.ToggleMute
             }
+
             KeyEvent.KEYCODE_S, KeyEvent.KEYCODE_NUMPAD_9, KeyEvent.KEYCODE_9 -> {
                 PlayerEventType.ShowMirrors
             }
@@ -359,21 +374,27 @@ object CommonActivity {
             KeyEvent.KEYCODE_O, KeyEvent.KEYCODE_NUMPAD_8, KeyEvent.KEYCODE_8 -> {
                 PlayerEventType.SearchSubtitlesOnline
             }
+
             KeyEvent.KEYCODE_E, KeyEvent.KEYCODE_NUMPAD_3, KeyEvent.KEYCODE_3 -> {
                 PlayerEventType.ShowSpeed
             }
+
             KeyEvent.KEYCODE_R, KeyEvent.KEYCODE_NUMPAD_0, KeyEvent.KEYCODE_0 -> {
                 PlayerEventType.Resize
             }
+
             KeyEvent.KEYCODE_C, KeyEvent.KEYCODE_NUMPAD_4, KeyEvent.KEYCODE_4 -> {
                 PlayerEventType.SkipOp
             }
+
             KeyEvent.KEYCODE_V, KeyEvent.KEYCODE_NUMPAD_5, KeyEvent.KEYCODE_5 -> {
                 PlayerEventType.SkipCurrentChapter
             }
+
             KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE, KeyEvent.KEYCODE_P, KeyEvent.KEYCODE_SPACE, KeyEvent.KEYCODE_NUMPAD_ENTER, KeyEvent.KEYCODE_ENTER -> { // space is not captured due to navigation
                 PlayerEventType.PlayPauseToggle
             }
+
             else -> null
         }?.let { playerEvent ->
             playerEventListener?.invoke(playerEvent)
@@ -398,16 +419,19 @@ object CommonActivity {
                                 act.currentFocus,
                                 FocusDirection.Left
                             )
+
                             KeyEvent.KEYCODE_DPAD_RIGHT -> getNextFocus(
                                 act,
                                 act.currentFocus,
                                 FocusDirection.Right
                             )
+
                             KeyEvent.KEYCODE_DPAD_UP -> getNextFocus(
                                 act,
                                 act.currentFocus,
                                 FocusDirection.Up
                             )
+
                             KeyEvent.KEYCODE_DPAD_DOWN -> getNextFocus(
                                 act,
                                 act.currentFocus,
diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index d054f504..23bd7001 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -10,7 +10,11 @@ import android.os.Build
 import android.os.Bundle
 import android.util.AttributeSet
 import android.util.Log
-import android.view.*
+import android.view.KeyEvent
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.view.WindowManager
 import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
 import androidx.annotation.IdRes
@@ -31,7 +35,11 @@ import androidx.preference.PreferenceManager
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import com.google.android.gms.cast.framework.*
+import com.google.android.gms.cast.framework.CastButtonFactory
+import com.google.android.gms.cast.framework.CastContext
+import com.google.android.gms.cast.framework.Session
+import com.google.android.gms.cast.framework.SessionManager
+import com.google.android.gms.cast.framework.SessionManagerListener
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.navigationrail.NavigationRailView
 import com.google.android.material.snackbar.Snackbar
@@ -49,7 +57,10 @@ import com.lagradost.cloudstream3.CommonActivity.onDialogDismissedEvent
 import com.lagradost.cloudstream3.CommonActivity.onUserLeaveHint
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.CommonActivity.updateLocale
-import com.lagradost.cloudstream3.mvvm.*
+import com.lagradost.cloudstream3.mvvm.Resource
+import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
+import com.lagradost.cloudstream3.mvvm.observeNullable
 import com.lagradost.cloudstream3.network.initClient
 import com.lagradost.cloudstream3.plugins.PluginManager
 import com.lagradost.cloudstream3.plugins.PluginManager.loadAllOnlinePlugins
@@ -83,7 +94,7 @@ import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.updateT
 import com.lagradost.cloudstream3.ui.settings.SettingsGeneral
 import com.lagradost.cloudstream3.ui.setup.HAS_DONE_SETUP_KEY
 import com.lagradost.cloudstream3.ui.setup.SetupFragmentExtensions
-import com.lagradost.cloudstream3.utils.*
+import com.lagradost.cloudstream3.utils.ApkInstaller
 import com.lagradost.cloudstream3.utils.AppUtils.html
 import com.lagradost.cloudstream3.utils.AppUtils.isCastApiAvailable
 import com.lagradost.cloudstream3.utils.AppUtils.isNetworkAvailable
@@ -98,6 +109,8 @@ import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.DataStore.getKey
 import com.lagradost.cloudstream3.utils.DataStore.setKey
 import com.lagradost.cloudstream3.utils.DataStoreHelper.migrateResumeWatching
+import com.lagradost.cloudstream3.utils.Event
+import com.lagradost.cloudstream3.utils.IOnBackPressed
 import com.lagradost.cloudstream3.utils.InAppUpdater.Companion.runAutoUpdate
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
 import com.lagradost.cloudstream3.utils.UIHelper.changeStatusBarState
@@ -108,11 +121,26 @@ import com.lagradost.cloudstream3.utils.UIHelper.getResourceColor
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.requestRW
+import com.lagradost.cloudstream3.utils.USER_PROVIDER_API
+import com.lagradost.cloudstream3.utils.USER_SELECTED_HOMEPAGE_API
 import com.lagradost.nicehttp.Requests
 import com.lagradost.nicehttp.ResponseParser
-import kotlinx.android.synthetic.main.activity_main.*
-import kotlinx.android.synthetic.main.bottom_resultview_preview.*
-import kotlinx.android.synthetic.main.fragment_result_swipe.*
+import kotlinx.android.synthetic.main.activity_main.cast_mini_controller_holder
+import kotlinx.android.synthetic.main.activity_main.nav_host_fragment
+import kotlinx.android.synthetic.main.activity_main.nav_rail_view
+import kotlinx.android.synthetic.main.activity_main.nav_view
+import kotlinx.android.synthetic.main.bottom_resultview_preview.resultview_preview_description
+import kotlinx.android.synthetic.main.bottom_resultview_preview.resultview_preview_loading
+import kotlinx.android.synthetic.main.bottom_resultview_preview.resultview_preview_loading_shimmer
+import kotlinx.android.synthetic.main.bottom_resultview_preview.resultview_preview_meta_duration
+import kotlinx.android.synthetic.main.bottom_resultview_preview.resultview_preview_meta_rating
+import kotlinx.android.synthetic.main.bottom_resultview_preview.resultview_preview_meta_type
+import kotlinx.android.synthetic.main.bottom_resultview_preview.resultview_preview_meta_year
+import kotlinx.android.synthetic.main.bottom_resultview_preview.resultview_preview_more_info
+import kotlinx.android.synthetic.main.bottom_resultview_preview.resultview_preview_poster
+import kotlinx.android.synthetic.main.bottom_resultview_preview.resultview_preview_result
+import kotlinx.android.synthetic.main.bottom_resultview_preview.resultview_preview_title
+import kotlinx.android.synthetic.main.fragment_result_swipe.media_route_button
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import java.io.File
@@ -464,9 +492,11 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
             Configuration.ORIENTATION_LANDSCAPE -> {
                 true
             }
+
             Configuration.ORIENTATION_PORTRAIT -> {
                 false
             }
+
             else -> {
                 false
             }
@@ -839,6 +869,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
                     showToast(this, R.string.error)
                     hidePreviewPopupDialog()
                 }
+
                 is Resource.Loading -> {
                     showPreviewPopupDialog().apply {
                         resultview_preview_loading?.isVisible = true
@@ -846,6 +877,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
                         resultview_preview_loading_shimmer?.startShimmer()
                     }
                 }
+
                 is Resource.Success -> {
                     val d = resource.value
                     showPreviewPopupDialog().apply {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/AbstractPlayerFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/AbstractPlayerFragment.kt
index 52f0b760..17e64b67 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/AbstractPlayerFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/AbstractPlayerFragment.kt
@@ -7,7 +7,6 @@ import android.graphics.drawable.AnimatedVectorDrawable
 import android.media.metrics.PlaybackErrorEvent
 import android.os.Build
 import android.os.Bundle
-import android.support.v4.media.session.MediaSessionCompat
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -17,14 +16,13 @@ import androidx.annotation.LayoutRes
 import androidx.annotation.StringRes
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
-import androidx.media.session.MediaButtonReceiver
 import androidx.preference.PreferenceManager
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
-import com.google.android.exoplayer2.ExoPlayer
-import com.google.android.exoplayer2.PlaybackException
-import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector
-import com.google.android.exoplayer2.ui.AspectRatioFrameLayout
-import com.google.android.exoplayer2.ui.SubtitleView
+import androidx.media3.common.PlaybackException
+import androidx.media3.exoplayer.ExoPlayer
+import androidx.media3.session.MediaSession
+import androidx.media3.ui.AspectRatioFrameLayout
+import androidx.media3.ui.SubtitleView
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
 import com.lagradost.cloudstream3.CommonActivity.canEnterPipMode
@@ -34,6 +32,7 @@ import com.lagradost.cloudstream3.CommonActivity.playerEventListener
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.ui.subtitles.SaveCaptionStyle
 import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment
 import com.lagradost.cloudstream3.utils.AppUtils
@@ -171,7 +170,7 @@ abstract class AbstractPlayerFragment(
         }
 
         canEnterPipMode = isPlayingRightNow && hasPipModeSupport
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && isInPIPMode) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             activity?.let { act ->
                 PlayerPipHelper.updatePIPModeActions(act, isPlayingRightNow)
             }
@@ -180,6 +179,7 @@ abstract class AbstractPlayerFragment(
 
     private var pipReceiver: BroadcastReceiver? = null
     override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean) {
+        super.onPictureInPictureModeChanged(isInPictureInPictureMode)
         try {
             isInPIPMode = isInPictureInPictureMode
             if (isInPictureInPictureMode) {
@@ -202,9 +202,7 @@ abstract class AbstractPlayerFragment(
                     }
                 }
                 val filter = IntentFilter()
-                filter.addAction(
-                    ACTION_MEDIA_CONTROL
-                )
+                filter.addAction(ACTION_MEDIA_CONTROL)
                 activity?.registerReceiver(pipReceiver, filter)
                 val isPlaying = player.getIsPlaying()
                 val isPlayingValue =
@@ -215,7 +213,10 @@ abstract class AbstractPlayerFragment(
                 piphide?.isVisible = true
                 exitedPipMode()
                 pipReceiver?.let {
-                    activity?.unregisterReceiver(it)
+                    // Prevents java.lang.IllegalArgumentException: Receiver not registered
+                    normalSafeApiCall {
+                        activity?.unregisterReceiver(it)
+                    }
                 }
                 activity?.hideSystemUI()
                 this.view?.let { UIHelper.hideKeyboard(it) }
@@ -270,18 +271,21 @@ abstract class AbstractPlayerFragment(
                             gotoNext = true
                         )
                     }
+
                     PlaybackException.ERROR_CODE_REMOTE_ERROR, PlaybackException.ERROR_CODE_IO_BAD_HTTP_STATUS, PlaybackException.ERROR_CODE_TIMEOUT, PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_FAILED, PlaybackException.ERROR_CODE_IO_INVALID_HTTP_CONTENT_TYPE -> {
                         showToast(
                             "${ctx.getString(R.string.remote_error)}\n$errorName ($code)\n$msg",
                             gotoNext = true
                         )
                     }
+
                     PlaybackException.ERROR_CODE_DECODING_FAILED, PlaybackErrorEvent.ERROR_AUDIO_TRACK_INIT_FAILED, PlaybackErrorEvent.ERROR_AUDIO_TRACK_OTHER, PlaybackException.ERROR_CODE_AUDIO_TRACK_WRITE_FAILED, PlaybackException.ERROR_CODE_DECODER_INIT_FAILED, PlaybackException.ERROR_CODE_DECODER_QUERY_FAILED -> {
                         showToast(
                             "${ctx.getString(R.string.render_error)}\n$errorName ($code)\n$msg",
                             gotoNext = true
                         )
                     }
+
                     else -> {
                         showToast(
                             "${ctx.getString(R.string.unexpected_error)}\n$errorName ($code)\n$msg",
@@ -290,12 +294,14 @@ abstract class AbstractPlayerFragment(
                     }
                 }
             }
+
             is InvalidFileException -> {
                 showToast(
                     "${ctx.getString(R.string.source_error)}\n${exception.message}",
                     gotoNext = true
                 )
             }
+
             else -> {
                 exception.message?.let {
                     showToast(
@@ -316,15 +322,8 @@ abstract class AbstractPlayerFragment(
     private fun playerUpdated(player: Any?) {
         if (player is ExoPlayer) {
             context?.let { ctx ->
-                val mediaButtonReceiver = ComponentName(ctx, MediaButtonReceiver::class.java)
-                MediaSessionCompat(ctx, "Player", mediaButtonReceiver, null).let { media ->
-                    //media.setCallback(mMediaSessionCallback)
-                    //media.setFlags(MediaSessionCompat.FLAG_HANDLES_MEDIA_BUTTONS or MediaSessionCompat.FLAG_HANDLES_TRANSPORT_CONTROLS)
-                    val mediaSessionConnector = MediaSessionConnector(media)
-                    mediaSessionConnector.setPlayer(player)
-                    media.isActive = true
-                    mMediaSessionCompat = media
-                }
+                mMediaSession?.release()
+                mMediaSession = MediaSession.Builder(ctx, player).build()
             }
 
             // Necessary for multiple combined videos
@@ -334,8 +333,7 @@ abstract class AbstractPlayerFragment(
         }
     }
 
-    private var mediaSessionConnector: MediaSessionConnector? = null
-    private var mMediaSessionCompat: MediaSessionCompat? = null
+    private var mMediaSession: MediaSession? = null
 
     // this can be used in the future for players other than exoplayer
     //private val mMediaSessionCallback: MediaSessionCompat.Callback = object : MediaSessionCompat.Callback() {
@@ -436,6 +434,7 @@ abstract class AbstractPlayerFragment(
         playerEventListener = null
         keyEventListener = null
         canEnterPipMode = false
+        mMediaSession?.release()
         SubtitlesFragment.applyStyleEvent -= ::onSubStyleChanged
 
         keepScreenOn(false)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
index 9ec18b9c..aa664b34 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
@@ -6,29 +6,40 @@ import android.os.Handler
 import android.os.Looper
 import android.util.Log
 import android.widget.FrameLayout
+import androidx.media3.common.C
 import androidx.preference.PreferenceManager
-import com.google.android.exoplayer2.*
-import com.google.android.exoplayer2.C.*
-import com.google.android.exoplayer2.DefaultRenderersFactory.EXTENSION_RENDERER_MODE_ON
-import com.google.android.exoplayer2.DefaultRenderersFactory.EXTENSION_RENDERER_MODE_PREFER
-import com.google.android.exoplayer2.database.StandaloneDatabaseProvider
-import com.google.android.exoplayer2.ext.okhttp.OkHttpDataSource
-import com.google.android.exoplayer2.mediacodec.MediaCodecSelector
-import com.google.android.exoplayer2.source.*
-import com.google.android.exoplayer2.text.TextRenderer
-import com.google.android.exoplayer2.trackselection.DefaultTrackSelector
-import com.google.android.exoplayer2.trackselection.TrackSelectionOverride
-import com.google.android.exoplayer2.trackselection.TrackSelector
-import com.google.android.exoplayer2.ui.SubtitleView
-import com.google.android.exoplayer2.upstream.DataSource
-import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory
-import com.google.android.exoplayer2.upstream.DefaultHttpDataSource
-import com.google.android.exoplayer2.upstream.HttpDataSource
-import com.google.android.exoplayer2.upstream.cache.CacheDataSource
-import com.google.android.exoplayer2.upstream.cache.LeastRecentlyUsedCacheEvictor
-import com.google.android.exoplayer2.upstream.cache.SimpleCache
-import com.google.android.exoplayer2.util.MimeTypes
-import com.google.android.exoplayer2.video.VideoSize
+import androidx.media3.common.C.*
+import androidx.media3.common.Format
+import androidx.media3.common.MediaItem
+import androidx.media3.common.TrackSelectionOverride
+import androidx.media3.common.MimeTypes
+import androidx.media3.common.PlaybackException
+import androidx.media3.common.Player
+import androidx.media3.common.TrackGroup
+import androidx.media3.common.Tracks
+import androidx.media3.common.VideoSize
+import androidx.media3.database.StandaloneDatabaseProvider
+import androidx.media3.datasource.DataSource
+import androidx.media3.datasource.DefaultDataSourceFactory
+import androidx.media3.datasource.DefaultHttpDataSource
+import androidx.media3.datasource.HttpDataSource
+import androidx.media3.datasource.cache.CacheDataSource
+import androidx.media3.datasource.cache.LeastRecentlyUsedCacheEvictor
+import androidx.media3.datasource.cache.SimpleCache
+import androidx.media3.datasource.okhttp.OkHttpDataSource
+import androidx.media3.exoplayer.DefaultLoadControl
+import androidx.media3.exoplayer.DefaultRenderersFactory
+import androidx.media3.exoplayer.ExoPlayer
+import androidx.media3.exoplayer.SeekParameters
+import androidx.media3.exoplayer.source.ClippingMediaSource
+import androidx.media3.exoplayer.source.ConcatenatingMediaSource
+import androidx.media3.exoplayer.source.DefaultMediaSourceFactory
+import androidx.media3.exoplayer.source.MergingMediaSource
+import androidx.media3.exoplayer.source.SingleSampleMediaSource
+import androidx.media3.exoplayer.text.TextRenderer
+import androidx.media3.exoplayer.trackselection.DefaultTrackSelector
+import androidx.media3.exoplayer.trackselection.TrackSelector
+import androidx.media3.ui.SubtitleView
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
@@ -44,7 +55,6 @@ import com.lagradost.cloudstream3.utils.ExtractorLinkPlayList
 import com.lagradost.cloudstream3.utils.ExtractorUri
 import com.lagradost.cloudstream3.utils.SubtitleHelper.fromTwoLettersToLanguage
 import java.io.File
-import java.time.Duration
 import javax.net.ssl.HttpsURLConnection
 import javax.net.ssl.SSLContext
 import javax.net.ssl.SSLSession
@@ -387,6 +397,7 @@ class CS3IPlayer : IPlayer {
                         Log.i(TAG, "setPreferredSubtitles REQUIRES_RELOAD")
                         return@let true
                     }
+
                     SubtitleStatus.IS_ACTIVE -> {
                         Log.i(TAG, "setPreferredSubtitles IS_ACTIVE")
 
@@ -412,6 +423,7 @@ class CS3IPlayer : IPlayer {
                         //    }, 1)
                         //}
                     }
+
                     SubtitleStatus.NOT_FOUND -> {
                         Log.i(TAG, "setPreferredSubtitles NOT_FOUND")
                         return@let true
@@ -678,22 +690,22 @@ class CS3IPlayer : IPlayer {
                             // Enable Ffmpeg extension
 //                            setExtensionRendererMode(EXTENSION_RENDERER_MODE_ON)
                         }.createRenderers(
-                                eventHandler,
-                                videoRendererEventListener,
-                                audioRendererEventListener,
-                                textRendererOutput,
-                                metadataRendererOutput
-                            ).map {
-                                if (it is TextRenderer) {
-                                    currentTextRenderer = CustomTextRenderer(
-                                        subtitleOffset,
-                                        textRendererOutput,
-                                        eventHandler.looper,
-                                        CustomSubtitleDecoderFactory()
-                                    )
-                                    currentTextRenderer!!
-                                } else it
-                            }.toTypedArray()
+                            eventHandler,
+                            videoRendererEventListener,
+                            audioRendererEventListener,
+                            textRendererOutput,
+                            metadataRendererOutput
+                        ).map {
+                            if (it is TextRenderer) {
+                                currentTextRenderer = CustomTextRenderer(
+                                    subtitleOffset,
+                                    textRendererOutput,
+                                    eventHandler.looper,
+                                    CustomSubtitleDecoderFactory()
+                                )
+                                currentTextRenderer!!
+                            } else it
+                        }.toTypedArray()
                     }
                     .setTrackSelector(
                         trackSelector ?: getTrackSelector(
@@ -810,9 +822,11 @@ class CS3IPlayer : IPlayer {
                     CSPlayerEvent.Play -> {
                         play()
                     }
+
                     CSPlayerEvent.Pause -> {
                         pause()
                     }
+
                     CSPlayerEvent.ToggleMute -> {
                         if (volume <= 0) {
                             //is muted
@@ -823,6 +837,7 @@ class CS3IPlayer : IPlayer {
                             volume = 0f
                         }
                     }
+
                     CSPlayerEvent.PlayPauseToggle -> {
                         if (isPlaying) {
                             pause()
@@ -830,6 +845,7 @@ class CS3IPlayer : IPlayer {
                             play()
                         }
                     }
+
                     CSPlayerEvent.SeekForward -> seekTime(seekActionTime)
                     CSPlayerEvent.SeekBack -> seekTime(-seekActionTime)
                     CSPlayerEvent.NextEpisode -> nextEpisode?.invoke()
@@ -954,6 +970,7 @@ class CS3IPlayer : IPlayer {
                         Player.STATE_READY -> {
                             onRenderFirst()
                         }
+
                         else -> {}
                     }
 
@@ -963,6 +980,7 @@ class CS3IPlayer : IPlayer {
                             Player.STATE_READY -> {
 
                             }
+
                             Player.STATE_ENDED -> {
                                 // Only play next episode if autoplay is on (default)
                                 if (PreferenceManager.getDefaultSharedPreferences(context)
@@ -974,12 +992,15 @@ class CS3IPlayer : IPlayer {
                                     handleEvent(CSPlayerEvent.NextEpisode)
                                 }
                             }
+
                             Player.STATE_BUFFERING -> {
                                 updatedTime()
                             }
+
                             Player.STATE_IDLE -> {
                                 // IDLE
                             }
+
                             else -> Unit
                         }
                     }
@@ -994,11 +1015,13 @@ class CS3IPlayer : IPlayer {
                                 && exoPlayer?.duration != TIME_UNSET -> {
                             exoPlayer?.prepare()
                         }
+
                         error.errorCode == PlaybackException.ERROR_CODE_BEHIND_LIVE_WINDOW -> {
                             // Re-initialize player at the current live window default position.
                             exoPlayer?.seekToDefaultPosition()
                             exoPlayer?.prepare()
                         }
+
                         else -> {
                             playerError?.invoke(error)
                         }
@@ -1025,6 +1048,7 @@ class CS3IPlayer : IPlayer {
                         Player.STATE_READY -> {
 
                         }
+
                         Player.STATE_ENDED -> {
                             // Only play next episode if autoplay is on (default)
                             if (PreferenceManager.getDefaultSharedPreferences(context)
@@ -1036,12 +1060,15 @@ class CS3IPlayer : IPlayer {
                                 handleEvent(CSPlayerEvent.NextEpisode)
                             }
                         }
+
                         Player.STATE_BUFFERING -> {
                             updatedTime()
                         }
+
                         Player.STATE_IDLE -> {
                             // IDLE
                         }
+
                         else -> Unit
                     }
                 }
@@ -1169,6 +1196,7 @@ class CS3IPlayer : IPlayer {
                         null
                     }
                 }
+
                 SubtitleOrigin.URL -> {
                     if (onlineSourceFactory != null) {
                         activeSubtitles.add(sub)
@@ -1181,6 +1209,7 @@ class CS3IPlayer : IPlayer {
                         null
                     }
                 }
+
                 SubtitleOrigin.EMBEDDED_IN_VIDEO -> {
                     if (offlineSourceFactory != null) {
                         activeSubtitles.add(sub)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CustomSubtitleDecoderFactory.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CustomSubtitleDecoderFactory.kt
index 974a5d26..b830d4e0 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CustomSubtitleDecoderFactory.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CustomSubtitleDecoderFactory.kt
@@ -3,19 +3,23 @@ package com.lagradost.cloudstream3.ui.player
 import android.content.Context
 import android.util.Log
 import androidx.preference.PreferenceManager
-import com.google.android.exoplayer2.Format
-import com.google.android.exoplayer2.text.*
-import com.google.android.exoplayer2.text.cea.Cea608Decoder
-import com.google.android.exoplayer2.text.cea.Cea708Decoder
-import com.google.android.exoplayer2.text.dvb.DvbDecoder
-import com.google.android.exoplayer2.text.pgs.PgsDecoder
-import com.google.android.exoplayer2.text.ssa.SsaDecoder
-import com.google.android.exoplayer2.text.subrip.SubripDecoder
-import com.google.android.exoplayer2.text.ttml.TtmlDecoder
-import com.google.android.exoplayer2.text.tx3g.Tx3gDecoder
-import com.google.android.exoplayer2.text.webvtt.Mp4WebvttDecoder
-import com.google.android.exoplayer2.text.webvtt.WebvttDecoder
-import com.google.android.exoplayer2.util.MimeTypes
+import androidx.media3.common.Format
+import androidx.media3.common.MimeTypes
+import androidx.media3.exoplayer.text.ExoplayerCuesDecoder
+import androidx.media3.exoplayer.text.SubtitleDecoderFactory
+import androidx.media3.extractor.text.SubtitleDecoder
+import androidx.media3.extractor.text.SubtitleInputBuffer
+import androidx.media3.extractor.text.SubtitleOutputBuffer
+import androidx.media3.extractor.text.cea.Cea608Decoder
+import androidx.media3.extractor.text.cea.Cea708Decoder
+import androidx.media3.extractor.text.dvb.DvbDecoder
+import androidx.media3.extractor.text.pgs.PgsDecoder
+import androidx.media3.extractor.text.ssa.SsaDecoder
+import androidx.media3.extractor.text.subrip.SubripDecoder
+import androidx.media3.extractor.text.ttml.TtmlDecoder
+import androidx.media3.extractor.text.tx3g.Tx3gDecoder
+import androidx.media3.extractor.text.webvtt.Mp4WebvttDecoder
+import androidx.media3.extractor.text.webvtt.WebvttDecoder
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.mvvm.logError
 import org.mozilla.universalchardet.UniversalDetector
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CustomTextRenderer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CustomTextRenderer.kt
index d3f4171a..514aaeab 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CustomTextRenderer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CustomTextRenderer.kt
@@ -1,8 +1,8 @@
 package com.lagradost.cloudstream3.ui.player
 
 import android.os.Looper
-import com.google.android.exoplayer2.text.SubtitleDecoderFactory
-import com.google.android.exoplayer2.text.TextOutput
+import androidx.media3.exoplayer.text.SubtitleDecoderFactory
+import androidx.media3.exoplayer.text.TextOutput
 
 class CustomTextRenderer(
     offset: Long,
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
index fd29d998..fdb19d7a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
@@ -19,8 +19,8 @@ import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.lifecycle.ViewModelProvider
 import androidx.preference.PreferenceManager
-import com.google.android.exoplayer2.Format.NO_VALUE
-import com.google.android.exoplayer2.util.MimeTypes
+import androidx.media3.common.Format.NO_VALUE
+import androidx.media3.common.MimeTypes
 import com.hippo.unifile.UniFile
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.java b/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.java
index 3b47b27a..b5ecfe8f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.java
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.java
@@ -15,10 +15,10 @@
  */
 package com.lagradost.cloudstream3.ui.player;
 
-import static com.google.android.exoplayer2.text.Cue.DIMEN_UNSET;
-import static com.google.android.exoplayer2.text.Cue.LINE_TYPE_NUMBER;
-import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
-import static com.google.android.exoplayer2.util.Assertions.checkState;
+import static androidx.media3.common.text.Cue.DIMEN_UNSET;
+import static androidx.media3.common.text.Cue.LINE_TYPE_NUMBER;
+import static androidx.media3.common.util.Assertions.checkNotNull;
+import static androidx.media3.common.util.Assertions.checkState;
 import static java.lang.annotation.ElementType.TYPE_USE;
 
 import android.os.Handler;
@@ -28,25 +28,24 @@ import android.os.Message;
 
 import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
-
-import com.google.android.exoplayer2.BaseRenderer;
-import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.Format;
-import com.google.android.exoplayer2.FormatHolder;
-import com.google.android.exoplayer2.RendererCapabilities;
-import com.google.android.exoplayer2.source.SampleStream.ReadDataResult;
-import com.google.android.exoplayer2.text.Cue;
-import com.google.android.exoplayer2.text.CueGroup;
-import com.google.android.exoplayer2.text.Subtitle;
-import com.google.android.exoplayer2.text.SubtitleDecoder;
-import com.google.android.exoplayer2.text.SubtitleDecoderException;
-import com.google.android.exoplayer2.text.SubtitleDecoderFactory;
-import com.google.android.exoplayer2.text.SubtitleInputBuffer;
-import com.google.android.exoplayer2.text.SubtitleOutputBuffer;
-import com.google.android.exoplayer2.text.TextOutput;
-import com.google.android.exoplayer2.util.Log;
-import com.google.android.exoplayer2.util.MimeTypes;
-import com.google.android.exoplayer2.util.Util;
+import androidx.media3.common.C;
+import androidx.media3.common.Format;
+import androidx.media3.common.text.Cue;
+import androidx.media3.common.text.CueGroup;
+import androidx.media3.common.MimeTypes;
+import androidx.media3.common.util.Log;
+import androidx.media3.common.util.Util;
+import androidx.media3.exoplayer.BaseRenderer;
+import androidx.media3.exoplayer.FormatHolder;
+import androidx.media3.exoplayer.RendererCapabilities;
+import androidx.media3.exoplayer.source.SampleStream;
+import androidx.media3.exoplayer.text.SubtitleDecoderFactory;
+import androidx.media3.exoplayer.text.TextOutput;
+import androidx.media3.extractor.text.Subtitle;
+import androidx.media3.extractor.text.SubtitleDecoder;
+import androidx.media3.extractor.text.SubtitleDecoderException;
+import androidx.media3.extractor.text.SubtitleInputBuffer;
+import androidx.media3.extractor.text.SubtitleOutputBuffer;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
@@ -310,7 +309,7 @@ public class NonFinalTextRenderer extends BaseRenderer implements Callback {
                     return;
                 }
                 // Try and read the next subtitle from the source.
-                @ReadDataResult int result = readSource(formatHolder, nextInputBuffer, /* readFlags= */ 0);
+                @SampleStream.ReadDataResult int result = readSource(formatHolder, nextInputBuffer, /* readFlags= */ 0);
                 if (result == C.RESULT_BUFFER_READ) {
                     if (nextInputBuffer.isEndOfStream()) {
                         inputStreamEnded = true;
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerPipHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerPipHelper.kt
index 0fbc22f6..8757aae0 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerPipHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerPipHelper.kt
@@ -26,7 +26,7 @@ class PlayerPipHelper {
                     activity,
                     code,
                     Intent("media_control").putExtra("control_type", code),
-                    0
+                    PendingIntent.FLAG_IMMUTABLE
                 )
             }
         }
@@ -88,7 +88,15 @@ class PlayerPipHelper {
                 )
             )
             activity.setPictureInPictureParams(
-                PictureInPictureParams.Builder().setActions(actions).build()
+                PictureInPictureParams.Builder()
+                    .apply {
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                            setSeamlessResizeEnabled(true)
+                            setAutoEnterEnabled(isPlaying)
+                        }
+                    }
+                    .setActions(actions)
+                    .build()
             )
         }
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerSubtitleHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerSubtitleHelper.kt
index 8d85f176..e532d1a3 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerSubtitleHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerSubtitleHelper.kt
@@ -4,8 +4,8 @@ import android.util.Log
 import android.util.TypedValue
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import com.google.android.exoplayer2.ui.SubtitleView
-import com.google.android.exoplayer2.util.MimeTypes
+import androidx.media3.common.MimeTypes
+import androidx.media3.ui.SubtitleView
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.ui.player.CustomDecoder.Companion.regexSubtitlesToRemoveBloat
 import com.lagradost.cloudstream3.ui.player.CustomDecoder.Companion.regexSubtitlesToRemoveCaptions
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/ChromecastSubtitlesFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/ChromecastSubtitlesFragment.kt
index 83d134cb..bbb5e833 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/ChromecastSubtitlesFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/ChromecastSubtitlesFragment.kt
@@ -14,7 +14,7 @@ import android.widget.TextView
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.google.android.exoplayer2.text.Cue
+import androidx.media3.common.text.Cue
 import com.google.android.gms.cast.TextTrackStyle
 import com.google.android.gms.cast.TextTrackStyle.*
 import com.jaredrummler.android.colorpicker.ColorPickerDialog
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt
index ff0e0e82..01995af1 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt
@@ -18,8 +18,8 @@ import androidx.core.content.res.ResourcesCompat
 import androidx.fragment.app.Fragment
 import androidx.preference.PreferenceManager
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.google.android.exoplayer2.text.Cue
-import com.google.android.exoplayer2.ui.CaptionStyleCompat
+import androidx.media3.common.text.Cue
+import androidx.media3.ui.CaptionStyleCompat
 import com.jaredrummler.android.colorpicker.ColorPickerDialog
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/CastHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/CastHelper.kt
index 9e8cc1d4..6b5e9ec2 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/CastHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/CastHelper.kt
@@ -1,7 +1,7 @@
 package com.lagradost.cloudstream3.utils
 
 import android.net.Uri
-import com.google.android.exoplayer2.util.MimeTypes
+import androidx.media3.common.MimeTypes
 import com.google.android.gms.cast.*
 import com.google.android.gms.cast.framework.CastSession
 import com.google.android.gms.cast.framework.media.RemoteMediaClient
diff --git a/app/src/main/res/layout/chromecast_subtitle_settings.xml b/app/src/main/res/layout/chromecast_subtitle_settings.xml
index 624c2201..4d3b50df 100644
--- a/app/src/main/res/layout/chromecast_subtitle_settings.xml
+++ b/app/src/main/res/layout/chromecast_subtitle_settings.xml
@@ -35,7 +35,7 @@
                     android:layout_height="match_parent"
                     android:contentDescription="@string/preview_background_img_des" />
 
-            <com.google.android.exoplayer2.ui.SubtitleView
+            <androidx.media3.ui.SubtitleView
                     android:id="@+id/subtitle_text"
 
                     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml
index 250551cb..347aaca5 100644
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@@ -13,7 +13,7 @@
     <!--
           app:fastforward_increment="10000"
             app:rewind_increment="10000"-->
-    <com.google.android.exoplayer2.ui.PlayerView
+    <androidx.media3.ui.PlayerView
         android:id="@+id/player_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/fragment_player_tv.xml b/app/src/main/res/layout/fragment_player_tv.xml
index a0826087..2a7607b9 100644
--- a/app/src/main/res/layout/fragment_player_tv.xml
+++ b/app/src/main/res/layout/fragment_player_tv.xml
@@ -13,7 +13,7 @@
     <!--
           app:fastforward_increment="10000"
             app:rewind_increment="10000"-->
-    <com.google.android.exoplayer2.ui.PlayerView
+    <androidx.media3.ui.PlayerView
         android:id="@+id/player_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/fragment_trailer.xml b/app/src/main/res/layout/fragment_trailer.xml
index ff477118..977198cf 100644
--- a/app/src/main/res/layout/fragment_trailer.xml
+++ b/app/src/main/res/layout/fragment_trailer.xml
@@ -14,7 +14,7 @@
     <!--
           app:fastforward_increment="10000"
             app:rewind_increment="10000"-->
-    <com.google.android.exoplayer2.ui.PlayerView
+    <androidx.media3.ui.PlayerView
             android:id="@+id/player_view"
             app:show_timeout="0"
             app:hide_on_touch="false"
diff --git a/app/src/main/res/layout/player_custom_layout.xml b/app/src/main/res/layout/player_custom_layout.xml
index 54f92d1f..1ed0cd4b 100644
--- a/app/src/main/res/layout/player_custom_layout.xml
+++ b/app/src/main/res/layout/player_custom_layout.xml
@@ -432,7 +432,7 @@
                         android:textStyle="normal"
                         tools:text="15:30" />
                     <!--app:buffered_color="@color/videoCache"-->
-                    <com.google.android.exoplayer2.ui.DefaultTimeBar
+                    <androidx.media3.ui.DefaultTimeBar
                         android:id="@id/exo_progress"
                         android:layout_width="0dp"
                         android:layout_height="30dp"
diff --git a/app/src/main/res/layout/player_custom_layout_tv.xml b/app/src/main/res/layout/player_custom_layout_tv.xml
index 62b359b6..fed3e0e5 100644
--- a/app/src/main/res/layout/player_custom_layout_tv.xml
+++ b/app/src/main/res/layout/player_custom_layout_tv.xml
@@ -260,7 +260,7 @@
                         android:textStyle="normal"
                         tools:text="15:30" />
                     <!--app:buffered_color="@color/videoCache"-->
-                    <com.google.android.exoplayer2.ui.DefaultTimeBar
+                    <androidx.media3.ui.DefaultTimeBar
                         android:id="@id/exo_progress"
                         android:layout_width="0dp"
                         android:layout_height="30dp"
diff --git a/app/src/main/res/layout/subtitle_settings.xml b/app/src/main/res/layout/subtitle_settings.xml
index 2491b254..8b3f5b2f 100644
--- a/app/src/main/res/layout/subtitle_settings.xml
+++ b/app/src/main/res/layout/subtitle_settings.xml
@@ -35,9 +35,8 @@
                 android:scaleType="centerCrop"
                 android:src="@drawable/subtitles_preview_background" />
 
-            <com.google.android.exoplayer2.ui.SubtitleView
+            <androidx.media3.ui.SubtitleView
                 android:id="@+id/subtitle_text"
-
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_gravity="center"
diff --git a/app/src/main/res/layout/trailer_custom_layout.xml b/app/src/main/res/layout/trailer_custom_layout.xml
index 0dd19a5b..0488f1f3 100644
--- a/app/src/main/res/layout/trailer_custom_layout.xml
+++ b/app/src/main/res/layout/trailer_custom_layout.xml
@@ -333,7 +333,7 @@
                     android:textStyle="normal"
                     tools:text="15:30" />
                 <!--app:buffered_color="@color/videoCache"-->
-                <com.google.android.exoplayer2.ui.DefaultTimeBar
+                <androidx.media3.ui.DefaultTimeBar
                     android:id="@id/exo_progress"
                     android:layout_width="0dp"
                     android:layout_height="30dp"
diff --git a/gradle.properties b/gradle.properties
index 98bed167..143de3dd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,6 +16,6 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
+# android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
\ No newline at end of file