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 5f6ef921..11b8c940 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
@@ -212,6 +212,30 @@ class CS3IPlayer : IPlayer {
 
     var currentSubtitles: SubtitleData? = null
 
+    override fun setExoplayerVideoSize(width: Int, height: Int) {
+        exoPlayer?.trackSelectionParameters = exoPlayer?.trackSelectionParameters
+            ?.buildUpon()
+            ?.setMaxVideoSize(width, height)
+            ?.build()
+            ?: return
+    }
+
+    override fun setExoplayerAudioTrack(trackLanguage: String?) {
+        exoPlayer?.trackSelectionParameters = exoPlayer?.trackSelectionParameters
+            ?.buildUpon()
+            ?.setPreferredAudioLanguage(trackLanguage)
+            ?.build()
+            ?: return
+    }
+
+    override fun getExoplayerTracks(): ExoplayerTracks {
+        return ExoplayerTracks(
+            exoPlayer?.videoFormat,
+            exoPlayer?.audioFormat,
+            exoPlayer?.currentTracksInfo?.trackGroupInfos ?: emptyList()
+        )
+    }
+
     /**
      * @return True if the player should be reloaded
      * */
@@ -465,6 +489,7 @@ class CS3IPlayer : IPlayer {
             trackSelector.parameters = DefaultTrackSelector.ParametersBuilder(context)
                 // .setRendererDisabled(C.TRACK_TYPE_VIDEO, true)
                 .setRendererDisabled(C.TRACK_TYPE_TEXT, true)
+                .setTunnelingEnabled(true)
                 .setDisabledTextTrackSelectionFlags(C.TRACK_TYPE_TEXT)
                 .clearSelectionOverrides()
                 .build()
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
index 2ddef9a4..19f2b25b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
@@ -176,6 +176,10 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         throw NotImplementedError()
     }
 
+    open fun showTracksDialogue() {
+        throw NotImplementedError()
+    }
+
     open fun openOnlineSubPicker(
         context: Context,
         imdbId: Long?,
@@ -1101,6 +1105,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
 
         // if nothing has loaded these buttons should not be visible
         player_skip_episode?.isVisible = false
+        player_tracks_btt?.isVisible = false
         player_skip_op?.isVisible = false
         shadow_overlay?.isVisible = false
 
@@ -1296,6 +1301,10 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
             showMirrorsDialogue()
         }
 
+        player_tracks_btt?.setOnClickListener {
+            showTracksDialogue()
+        }
+
         player_intro_play?.setOnClickListener {
             player_intro_play?.isGone = true
             player.handleEvent(CSPlayerEvent.Play)
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 3e6e24cb..ef6bea6b 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
@@ -18,6 +18,11 @@ import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.lifecycle.ViewModelProvider
 import androidx.preference.PreferenceManager
+import com.google.android.exoplayer2.C.TRACK_TYPE_AUDIO
+import com.google.android.exoplayer2.C.TRACK_TYPE_VIDEO
+import com.google.android.exoplayer2.Format
+import com.google.android.exoplayer2.Format.NO_VALUE
+import com.google.android.exoplayer2.TracksInfo
 import com.google.android.exoplayer2.util.MimeTypes
 import com.hippo.unifile.UniFile
 import com.lagradost.cloudstream3.*
@@ -53,6 +58,8 @@ import kotlinx.android.synthetic.main.dialog_online_subtitles.cancel_btt
 import kotlinx.android.synthetic.main.fragment_player.*
 import kotlinx.android.synthetic.main.player_custom_layout.*
 import kotlinx.android.synthetic.main.player_select_source_and_subs.*
+import kotlinx.android.synthetic.main.player_select_source_and_subs.subtitles_click_settings
+import kotlinx.android.synthetic.main.player_select_tracks.*
 import kotlinx.coroutines.Job
 
 class GeneratorPlayer : FullScreenPlayer() {
@@ -106,6 +113,12 @@ class GeneratorPlayer : FullScreenPlayer() {
 
     override fun embeddedSubtitlesFetched(subtitles: List<SubtitleData>) {
         viewModel.addSubtitles(subtitles.toSet())
+
+        val tracks = player.getExoplayerTracks().allTracks
+        val videoTracks = tracks.filter {  it.trackType == TRACK_TYPE_VIDEO }.getFormats().size
+        val audioTracks = tracks.filter {  it.trackType == TRACK_TYPE_AUDIO }.getFormats().size
+
+        player_tracks_btt?.isVisible = videoTracks > 1 || audioTracks > 1
     }
 
     private fun noSubtitles(): Boolean {
@@ -476,6 +489,8 @@ class GeneratorPlayer : FullScreenPlayer() {
         }
 
     var selectSourceDialog: AlertDialog? = null
+//    var selectTracksDialog: AlertDialog? = null
+
     override fun showMirrorsDialogue() {
         try {
             currentSelectedSubtitles = player.getCurrentPreferredSubtitle()
@@ -667,6 +682,139 @@ class GeneratorPlayer : FullScreenPlayer() {
         }
     }
 
+    /**
+     * Gets all supported formats in a list
+     * */
+    private fun List<TracksInfo.TrackGroupInfo>.getFormats(): List<Format> {
+        return this.map {
+            (0 until it.trackGroup.length).mapNotNull { i ->
+                if (it.isSupported)
+                    it.trackGroup.getFormat(i) // to it.isSelected
+                else null
+            }
+        }.flatten()
+    }
+
+    override fun showTracksDialogue() {
+        try {
+            //println("CURRENT SELECTED :$currentSelectedSubtitles of $currentSubs")
+            context?.let { ctx ->
+                val tracks = player.getExoplayerTracks()
+
+                val isPlaying = player.getIsPlaying()
+                player.handleEvent(CSPlayerEvent.Pause)
+
+                val currentVideoTracks = tracks.allTracks.filter {
+                    it.trackType == TRACK_TYPE_VIDEO
+                }.getFormats().sortedBy {
+                    -it.height
+                }
+
+                val currentAudioTracks = tracks.allTracks.filter {
+                    it.trackType == TRACK_TYPE_AUDIO
+                }.getFormats()
+
+                val trackBuilder = AlertDialog.Builder(ctx, R.style.AlertDialogCustomBlack)
+                    .setView(R.layout.player_select_tracks)
+
+                val tracksDialog = trackBuilder.create()
+
+//                selectTracksDialog = tracksDialog
+
+                tracksDialog.show()
+                val videosList = tracksDialog.video_tracks_list
+                val audioList = tracksDialog.auto_tracks_list
+
+                tracksDialog.video_tracks_holder.isVisible = currentVideoTracks.size > 1
+                tracksDialog.audio_tracks_holder.isVisible = currentAudioTracks.size > 1
+
+                fun dismiss() {
+                    if (isPlaying) {
+                        player.handleEvent(CSPlayerEvent.Play)
+                    }
+                    activity?.hideSystemUI()
+                }
+
+                val videosArrayAdapter =
+                    ArrayAdapter<String>(ctx, R.layout.sort_bottom_single_choice)
+
+                videosArrayAdapter.addAll(currentVideoTracks.mapIndexed { index, format ->
+                    format.label
+                        ?: (if (format.height == NO_VALUE || format.width == NO_VALUE) index else "${format.width}x${format.height}").toString()
+                })
+
+                videosList.choiceMode = AbsListView.CHOICE_MODE_SINGLE
+                videosList.adapter = videosArrayAdapter
+
+                // Sometimes the data is not the same because some data gets resolved at different stages i think
+                var videoIndex = currentVideoTracks.indexOf(tracks.currentVideoFormat).takeIf {
+                    it != -1
+                } ?: currentVideoTracks.indexOfFirst {
+                    tracks.currentVideoFormat?.id == it.id
+                }
+
+                videosList.setSelection(videoIndex)
+                videosList.setItemChecked(videoIndex, true)
+
+                videosList.setOnItemClickListener { _, _, which, _ ->
+                    videoIndex = which
+                    videosList.setItemChecked(which, true)
+                }
+
+                tracksDialog.setOnDismissListener {
+                    dismiss()
+//                    selectTracksDialog = null
+                }
+
+                var audioIndexStart = currentAudioTracks.indexOf(tracks.currentAudioFormat).takeIf {
+                    it != -1
+                } ?: currentVideoTracks.indexOfFirst {
+                    tracks.currentAudioFormat?.id == it.id
+                }
+
+                val audioArrayAdapter =
+                    ArrayAdapter<String>(ctx, R.layout.sort_bottom_single_choice)
+//                audioArrayAdapter.add(ctx.getString(R.string.no_subtitles))
+                audioArrayAdapter.addAll(currentAudioTracks.mapIndexed { index, format ->
+                    format.label ?: format.language?.let { fromTwoLettersToLanguage(it) } ?: index.toString()
+                })
+
+                audioList.adapter = audioArrayAdapter
+                audioList.choiceMode = AbsListView.CHOICE_MODE_SINGLE
+
+                audioList.setSelection(audioIndexStart)
+                audioList.setItemChecked(audioIndexStart, true)
+
+                audioList.setOnItemClickListener { _, _, which, _ ->
+                    audioIndexStart = which
+                    audioList.setItemChecked(which, true)
+                }
+
+                tracksDialog.cancel_btt?.setOnClickListener {
+                    tracksDialog.dismissSafe(activity)
+                }
+
+                tracksDialog.apply_btt?.setOnClickListener {
+                    player.setExoplayerAudioTrack(
+                        currentAudioTracks.getOrNull(audioIndexStart)?.language
+                    )
+
+                    val currentVideo = currentVideoTracks.getOrNull(videoIndex)
+                    val width = currentVideo?.width ?: NO_VALUE
+                    val height = currentVideo?.height ?: NO_VALUE
+                    if (width != NO_VALUE && height != NO_VALUE) {
+                        player.setExoplayerVideoSize(width, height)
+                    }
+
+                    tracksDialog.dismissSafe(activity)
+                }
+            }
+        } catch (e: Exception) {
+            logError(e)
+        }
+    }
+
+
     override fun playerError(exception: Exception) {
         Log.i(TAG, "playerError = $currentSelectedLink")
         super.playerError(exception)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt
index 8561a0f4..42980455 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt
@@ -1,6 +1,8 @@
 package com.lagradost.cloudstream3.ui.player
 
 import android.content.Context
+import com.google.android.exoplayer2.Format
+import com.google.android.exoplayer2.TracksInfo
 import com.lagradost.cloudstream3.ui.subtitles.SaveCaptionStyle
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorUri
@@ -46,7 +48,13 @@ enum class CSPlayerLoading {
     //IsDone,
 }
 
-class InvalidFileException(msg : String) : Exception(msg)
+data class ExoplayerTracks(
+    val currentVideoFormat: Format?,
+    val currentAudioFormat: Format?,
+    val allTracks: List<TracksInfo.TrackGroupInfo>
+)
+
+class InvalidFileException(msg: String) : Exception(msg)
 
 //http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4
 const val STATE_RESUME_WINDOW = "resumeWindow"
@@ -73,8 +81,8 @@ interface IPlayer {
     fun seekTime(time: Long)
     fun seekTo(time: Long)
 
-    fun getSubtitleOffset() : Long // in ms
-    fun setSubtitleOffset(offset : Long) // in ms
+    fun getSubtitleOffset(): Long // in ms
+    fun setSubtitleOffset(offset: Long) // in ms
 
     fun initCallbacks(
         playerUpdated: (Any?) -> Unit,                              // attach player to view
@@ -89,6 +97,7 @@ interface IPlayer {
         subtitlesUpdates: (() -> Unit)? = null,                     // callback from player to inform that subtitles have updated in some way
         embeddedSubtitlesFetched: ((List<SubtitleData>) -> Unit)? = null, // callback from player to give all embedded subtitles
     )
+
     fun releaseCallbacks()
 
     fun updateSubtitleStyle(style: SaveCaptionStyle)
@@ -100,16 +109,16 @@ interface IPlayer {
         link: ExtractorLink? = null,
         data: ExtractorUri? = null,
         startPosition: Long? = null,
-        subtitles : Set<SubtitleData>,
-        subtitle : SubtitleData?,
-        autoPlay : Boolean? = true
+        subtitles: Set<SubtitleData>,
+        subtitle: SubtitleData?,
+        autoPlay: Boolean? = true
     )
 
     fun reloadPlayer(context: Context)
 
-    fun setActiveSubtitles(subtitles : Set<SubtitleData>)
-    fun setPreferredSubtitles(subtitle : SubtitleData?) : Boolean // returns true if the player requires a reload, null for nothing
-    fun getCurrentPreferredSubtitle() : SubtitleData?
+    fun setActiveSubtitles(subtitles: Set<SubtitleData>)
+    fun setPreferredSubtitles(subtitle: SubtitleData?): Boolean // returns true if the player requires a reload, null for nothing
+    fun getCurrentPreferredSubtitle(): SubtitleData?
 
     fun handleEvent(event: CSPlayerEvent)
 
@@ -120,5 +129,13 @@ interface IPlayer {
     fun release()
 
     /** Get if player is actually used */
-    fun isActive() : Boolean
+    fun isActive(): Boolean
+
+    fun getExoplayerTracks(): ExoplayerTracks
+
+    /** If no parameters are set it'll default to no set size */
+    fun setExoplayerVideoSize(width: Int = Int.MAX_VALUE, height: Int = Int.MAX_VALUE)
+
+    /** If no trackLanguage is set it'll default to first track */
+    fun setExoplayerAudioTrack(trackLanguage: String?)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt
index db0a7e16..a3556964 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt
@@ -75,6 +75,8 @@ open class ResultTrailerPlayer : com.lagradost.cloudstream3.ui.player.FullScreen
     }
 
     override fun showMirrorsDialogue() {}
+    override fun showTracksDialogue() {}
+
     override fun openOnlineSubPicker(context: Context, imdbId: Long?, dismissCallback: () -> Unit) {}
 
     override fun subtitlesChanged() {}
diff --git a/app/src/main/res/layout/player_custom_layout.xml b/app/src/main/res/layout/player_custom_layout.xml
index 5e10e471..9bbded4e 100644
--- a/app/src/main/res/layout/player_custom_layout.xml
+++ b/app/src/main/res/layout/player_custom_layout.xml
@@ -1,23 +1,23 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:id="@+id/player_holder"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:screenOrientation="landscape"
-        tools:orientation="vertical">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/player_holder"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:screenOrientation="landscape"
+    tools:orientation="vertical">
 
     <FrameLayout
-            android:id="@+id/subtitle_holder"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
+        android:id="@+id/subtitle_holder"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
         <View
-                android:id="@+id/shadow_overlay"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@color/black_overlay" />
+            android:id="@+id/shadow_overlay"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/black_overlay" />
     </FrameLayout>
     <!--
         <LinearLayout android:layout_width="match_parent"
@@ -54,75 +54,75 @@
     </LinearLayout>
 -->
     <RelativeLayout
-            android:id="@+id/player_time_menu"
-            android:layout_width="match_parent"
-            android:layout_height="200dp"
-            android:orientation="horizontal"
-            app:layout_constraintBottom_toTopOf="@+id/player_center_menu"
-            app:layout_constraintTop_toBottomOf="@+id/topMenuRight">
+        android:id="@+id/player_time_menu"
+        android:layout_width="match_parent"
+        android:layout_height="200dp"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toTopOf="@+id/player_center_menu"
+        app:layout_constraintTop_toBottomOf="@+id/topMenuRight">
 
         <TextView
-                android:id="@+id/player_time_text"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="center"
-                android:shadowColor="@android:color/black"
-                android:shadowRadius="10.0"
-                android:textColor="@android:color/white"
-                android:textSize="30sp"
-                tools:text="+100" />
+            android:id="@+id/player_time_text"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:shadowColor="@android:color/black"
+            android:shadowRadius="10.0"
+            android:textColor="@android:color/white"
+            android:textSize="30sp"
+            tools:text="+100" />
     </RelativeLayout>
 
     <FrameLayout
-            android:id="@+id/player_episode_filler_holder"
-            android:layout_margin="20dp"
-            android:layout_gravity="end"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
+        android:id="@+id/player_episode_filler_holder"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end"
+        android:layout_margin="20dp">
 
         <com.google.android.material.button.MaterialButton
-                style="@style/SmallBlackButton"
-                android:text="@string/filler"
-                android:id="@+id/player_episode_filler" />
+            android:id="@+id/player_episode_filler"
+            style="@style/SmallBlackButton"
+            android:text="@string/filler" />
     </FrameLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/player_video_holder"
+        android:id="@+id/player_video_holder"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <FrameLayout
+            android:id="@+id/player_top_holder"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-        <FrameLayout
-                android:id="@+id/player_top_holder"
+            <TextView
+                android:id="@+id/player_video_title"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="wrap_content"
+                android:layout_marginStart="80dp"
+                android:layout_marginTop="35dp"
+                android:layout_marginEnd="80dp"
+                android:gravity="center"
+                android:textColor="@color/white"
+                android:textStyle="bold"
+                android:visibility="visible"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:text="Hello world" />
 
             <TextView
-                    android:id="@+id/player_video_title"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="80dp"
-                    android:layout_marginTop="35dp"
-                    android:layout_marginEnd="80dp"
-                    android:gravity="center"
-                    android:textColor="@color/white"
-                    android:textStyle="bold"
-                    android:visibility="visible"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    tools:text="Hello world" />
-
-            <TextView
-                    android:id="@+id/player_video_title_rez"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="80dp"
-                    android:layout_marginTop="20dp"
-                    android:layout_marginEnd="80dp"
-                    android:gravity="center"
-                    android:textColor="@color/white"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/player_video_title"
-                    tools:text="1920x1080" />
+                android:id="@+id/player_video_title_rez"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="80dp"
+                android:layout_marginTop="20dp"
+                android:layout_marginEnd="80dp"
+                android:gravity="center"
+                android:textColor="@color/white"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/player_video_title"
+                tools:text="1920x1080" />
 
 
             <!-- Removed as it has no use anymore-->
@@ -138,30 +138,30 @@
                     app:layout_constraintTop_toTopOf="parent" />-->
 
             <FrameLayout
-                    android:id="@+id/player_go_back_holder"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="5dp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent">
+                android:id="@+id/player_go_back_holder"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="5dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
 
                 <ImageView
-                        android:layout_width="30dp"
-                        android:layout_height="30dp"
-                        android:layout_gravity="center"
-                        android:src="@drawable/ic_baseline_arrow_back_24"
-                        app:tint="@android:color/white"
-                        android:contentDescription="@string/go_back_img_des" />
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_gravity="center"
+                    android:contentDescription="@string/go_back_img_des"
+                    android:src="@drawable/ic_baseline_arrow_back_24"
+                    app:tint="@android:color/white" />
 
                 <ImageView
-                        android:id="@+id/player_go_back"
-                        android:layout_width="70dp"
-                        android:layout_height="70dp"
-                        android:layout_gravity="center"
-                        android:background="@drawable/video_tap_button_always_white"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:contentDescription="@string/go_back_img_des" />
+                    android:id="@+id/player_go_back"
+                    android:layout_width="70dp"
+                    android:layout_height="70dp"
+                    android:layout_gravity="center"
+                    android:background="@drawable/video_tap_button_always_white"
+                    android:clickable="true"
+                    android:contentDescription="@string/go_back_img_des"
+                    android:focusable="true" />
             </FrameLayout>
 
 
@@ -169,362 +169,374 @@
 
         <!--use for thinner app:trackThickness="3dp" com.google.android.material.progressindicator.CircularProgressIndicator-->
         <ProgressBar
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
+            android:id="@+id/player_buffering"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
 
-                android:focusable="false"
-                android:clickable="false"
-                android:focusableInTouchMode="false"
+            android:clickable="false"
+            android:focusable="false"
+            android:focusableInTouchMode="false"
 
-                android:indeterminate="true"
-                android:visibility="gone"
-                tools:visibility="visible"
-                android:id="@+id/player_buffering"
-                android:layout_gravity="center"
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content" />
+            android:indeterminate="true"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:visibility="visible" />
 
         <!-- This nested layout is necessary because of buffering and clicking-->
         <FrameLayout
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                android:layout_width="100dp"
-                android:layout_height="100dp"
-                android:id="@+id/player_pause_play_holder_holder">
+            android:id="@+id/player_pause_play_holder_holder"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
 
             <FrameLayout
-                    tools:ignore="uselessParent"
-                    android:id="@+id/player_pause_play_holder"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
+                android:id="@+id/player_pause_play_holder"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                tools:ignore="uselessParent">
 
                 <ImageView
-                        app:tint="@color/white"
-                        android:id="@+id/player_pause_play"
-                        android:nextFocusLeft="@id/exo_rew"
-                        android:nextFocusRight="@id/exo_ffwd"
-                        android:nextFocusUp="@id/player_go_back"
-                        android:nextFocusDown="@id/player_lock"
+                    android:id="@+id/player_pause_play"
+                    android:layout_width="70dp"
+                    android:layout_height="70dp"
+                    android:layout_gravity="center"
+                    android:background="@drawable/video_tap_button"
+                    android:nextFocusLeft="@id/exo_rew"
 
-                        android:layout_gravity="center"
+                    android:nextFocusRight="@id/exo_ffwd"
 
-                        android:src="@drawable/netflix_pause"
-                        android:background="@drawable/video_tap_button"
+                    android:nextFocusUp="@id/player_go_back"
+                    android:nextFocusDown="@id/player_lock"
 
-                        android:layout_width="70dp"
-                        android:layout_height="70dp"
-                        tools:ignore="ContentDescription" />
+                    android:src="@drawable/netflix_pause"
+                    app:tint="@color/white"
+                    tools:ignore="ContentDescription" />
             </FrameLayout>
         </FrameLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/player_center_menu"
-                android:layout_width="match_parent"
-                android:layout_height="100dp"
-                android:layout_gravity="center"
-                android:gravity="center"
-                android:orientation="horizontal"
-                android:layoutDirection="ltr"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
+            android:id="@+id/player_center_menu"
+            android:layout_width="match_parent"
+            android:layout_height="100dp"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:layoutDirection="ltr"
+            android:orientation="horizontal"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
 
             <FrameLayout
-                    android:id="@+id/player_rew_holder"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    app:layout_constraintWidth_percent="0.5"
-                    android:layout_gravity="center_vertical|start"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintRight_toLeftOf="@id/player_ffwd_holder"
-                    app:layout_constraintTop_toTopOf="parent">
+                android:id="@+id/player_rew_holder"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical|start"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toLeftOf="@id/player_ffwd_holder"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintWidth_percent="0.5">
 
                 <TextView
-                        android:id="@+id/exo_rew_text"
-                        android:layout_width="200dp"
-                        android:layout_height="40dp"
-                        android:layout_gravity="center"
+                    android:id="@+id/exo_rew_text"
+                    android:layout_width="200dp"
+                    android:layout_height="40dp"
+                    android:layout_gravity="center"
 
-                        android:gravity="center"
-                        android:textColor="@color/white"
-                        android:textSize="19sp"
+                    android:gravity="center"
+                    android:textColor="@color/white"
+                    android:textSize="19sp"
 
-                        android:textStyle="bold"
-                        tools:text="10" />
+                    android:textStyle="bold"
+                    tools:text="10" />
 
                 <ImageButton
-                        android:id="@id/exo_rew"
-                        android:layout_width="70dp"
-                        android:layout_height="70dp"
-                        android:layout_gravity="center"
+                    android:id="@id/exo_rew"
+                    android:layout_width="70dp"
+                    android:layout_height="70dp"
+                    android:layout_gravity="center"
 
-                        android:background="@drawable/video_tap_button_skip"
-                        android:nextFocusLeft="@id/exo_rew"
-                        android:nextFocusUp="@id/player_go_back"
-                        android:nextFocusDown="@id/player_lock"
-                        android:padding="10dp"
-                        android:scaleType="fitCenter"
-                        android:scaleX="-1"
-                        android:src="@drawable/netflix_skip_forward"
-                        app:tint="@color/white"
-                        android:tintMode="src_in"
-                        tools:ignore="ContentDescription" />
+                    android:background="@drawable/video_tap_button_skip"
+                    android:nextFocusLeft="@id/exo_rew"
+                    android:nextFocusUp="@id/player_go_back"
+                    android:nextFocusDown="@id/player_lock"
+                    android:padding="10dp"
+                    android:scaleType="fitCenter"
+                    android:scaleX="-1"
+                    android:src="@drawable/netflix_skip_forward"
+                    android:tintMode="src_in"
+                    app:tint="@color/white"
+                    tools:ignore="ContentDescription" />
             </FrameLayout>
 
             <FrameLayout
-                    android:id="@+id/player_ffwd_holder"
-                    android:layout_width="0dp"
-                    app:layout_constraintWidth_percent="0.5"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical|end"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintLeft_toRightOf="@id/player_rew_holder"
-                    app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toTopOf="parent">
+                android:id="@+id/player_ffwd_holder"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical|end"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toRightOf="@id/player_rew_holder"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintWidth_percent="0.5">
 
                 <TextView
-                        android:id="@+id/exo_ffwd_text"
-                        android:layout_width="200dp"
-                        android:layout_height="40dp"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:textColor="@color/white"
-                        android:textSize="19sp"
-                        android:textStyle="bold"
-                        tools:text="10" />
+                    android:id="@+id/exo_ffwd_text"
+                    android:layout_width="200dp"
+                    android:layout_height="40dp"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:textColor="@color/white"
+                    android:textSize="19sp"
+                    android:textStyle="bold"
+                    tools:text="10" />
 
                 <ImageButton
-                        android:id="@id/exo_ffwd"
-                        android:layout_width="70dp"
-                        android:layout_height="70dp"
-                        android:layout_gravity="center"
+                    android:id="@id/exo_ffwd"
+                    android:layout_width="70dp"
+                    android:layout_height="70dp"
+                    android:layout_gravity="center"
 
-                        android:background="@drawable/video_tap_button_skip"
-                        android:nextFocusRight="@id/exo_rew"
-                        android:nextFocusUp="@id/player_go_back"
-                        android:nextFocusDown="@id/player_lock"
-                        android:padding="10dp"
-                        android:scaleType="fitCenter"
-                        android:src="@drawable/netflix_skip_forward"
-                        app:tint="@color/white"
-                        android:tintMode="src_in"
-                        tools:ignore="ContentDescription" />
+                    android:background="@drawable/video_tap_button_skip"
+                    android:nextFocusRight="@id/exo_rew"
+                    android:nextFocusUp="@id/player_go_back"
+                    android:nextFocusDown="@id/player_lock"
+                    android:padding="10dp"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/netflix_skip_forward"
+                    android:tintMode="src_in"
+                    app:tint="@color/white"
+                    tools:ignore="ContentDescription" />
             </FrameLayout>
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom"
-                android:layout_marginBottom="20dp"
-                android:gravity="center"
-                android:orientation="horizontal"
-                android:paddingTop="4dp"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent">
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:layout_marginBottom="20dp"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:paddingTop="4dp"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent">
 
             <ImageButton
-                    android:id="@id/exo_prev"
-                    style="@style/ExoMediaButton.Previous"
-                    app:tint="?attr/colorPrimaryDark"
-                    android:tintMode="src_in"
-                    tools:ignore="ContentDescription" />
+                android:id="@id/exo_prev"
+                style="@style/ExoMediaButton.Previous"
+                android:tintMode="src_in"
+                app:tint="?attr/colorPrimaryDark"
+                tools:ignore="ContentDescription" />
 
 
             <ImageButton
-                    android:id="@id/exo_repeat_toggle"
-                    style="@style/ExoMediaButton"
-                    app:tint="?attr/colorPrimaryDark"
-                    android:tintMode="src_in"
-                    tools:ignore="ContentDescription" />
+                android:id="@id/exo_repeat_toggle"
+                style="@style/ExoMediaButton"
+                android:tintMode="src_in"
+                app:tint="?attr/colorPrimaryDark"
+                tools:ignore="ContentDescription" />
 
 
             <ImageButton
-                    android:id="@id/exo_next"
-                    style="@style/ExoMediaButton.Next"
-                    app:tint="?attr/colorPrimaryDark"
-                    android:tintMode="src_in"
-                    tools:ignore="ContentDescription" />
+                android:id="@id/exo_next"
+                style="@style/ExoMediaButton.Next"
+                android:tintMode="src_in"
+                app:tint="?attr/colorPrimaryDark"
+                tools:ignore="ContentDescription" />
 
             <ImageButton
-                    android:id="@id/exo_vr"
-                    style="@style/ExoMediaButton.VR"
-                    app:tint="?attr/colorPrimaryDark"
-                    android:tintMode="src_in"
-                    tools:ignore="ContentDescription" />
+                android:id="@id/exo_vr"
+                style="@style/ExoMediaButton.VR"
+                android:tintMode="src_in"
+                app:tint="?attr/colorPrimaryDark"
+                tools:ignore="ContentDescription" />
 
             <ImageButton
-                    android:id="@id/exo_play"
-                    app:tint="?attr/colorPrimaryDark"
-                    android:tintMode="src_in"
-                    tools:ignore="ContentDescription"
-                    android:layout_height="0dp"
-                    android:layout_width="0dp" />
+                android:id="@id/exo_play"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:tintMode="src_in"
+                app:tint="?attr/colorPrimaryDark"
+                tools:ignore="ContentDescription" />
 
             <ImageButton
-                    android:id="@id/exo_pause"
-                    app:tint="?attr/colorPrimaryDark"
-                    android:tintMode="src_in"
-                    tools:ignore="ContentDescription"
-                    android:layout_height="0dp"
-                    android:layout_width="0dp" />
+                android:id="@id/exo_pause"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:tintMode="src_in"
+                app:tint="?attr/colorPrimaryDark"
+                tools:ignore="ContentDescription" />
         </LinearLayout>
 
         <LinearLayout
-                android:id="@+id/bottom_player_bar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="10dp"
-                android:gravity="center_vertical"
-                android:orientation="vertical"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent">
+            android:id="@+id/bottom_player_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:gravity="center_vertical"
+            android:orientation="vertical"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent">
 
             <LinearLayout
-                    android:id="@+id/player_video_bar"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layoutDirection="ltr"
-                    android:orientation="horizontal">
+                android:id="@+id/player_video_bar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layoutDirection="ltr"
+                android:orientation="horizontal">
 
                 <TextView
-                        android:id="@id/exo_position"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:layout_marginStart="20dp"
-                        android:gravity="end"
-                        android:includeFontPadding="false"
-                        android:minWidth="50dp"
-                        android:paddingLeft="4dp"
-                        android:paddingRight="4dp"
-                        android:textColor="@android:color/white"
-                        android:textSize="14sp"
-                        android:textStyle="normal"
-                        tools:text="15:30" />
+                    android:id="@id/exo_position"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginStart="20dp"
+                    android:gravity="end"
+                    android:includeFontPadding="false"
+                    android:minWidth="50dp"
+                    android:paddingLeft="4dp"
+                    android:paddingRight="4dp"
+                    android:textColor="@android:color/white"
+                    android:textSize="14sp"
+                    android:textStyle="normal"
+                    tools:text="15:30" />
                 <!--app:buffered_color="@color/videoCache"-->
                 <com.google.android.exoplayer2.ui.DefaultTimeBar
-                        android:id="@id/exo_progress"
-                        android:layout_width="0dp"
-                        android:layout_height="30dp"
-                        android:layout_weight="1"
-                        app:bar_height="2dp"
-                        app:played_color="?attr/colorPrimary"
+                    android:id="@id/exo_progress"
+                    android:layout_width="0dp"
+                    android:layout_height="30dp"
+                    android:layout_weight="1"
+                    app:bar_height="2dp"
+                    app:played_color="?attr/colorPrimary"
 
-                        app:scrubber_color="?attr/colorPrimary"
-                        app:scrubber_dragged_size="26dp"
-                        app:scrubber_enabled_size="24dp"
-                        app:unplayed_color="@color/videoProgress" />
+                    app:scrubber_color="?attr/colorPrimary"
+                    app:scrubber_dragged_size="26dp"
+                    app:scrubber_enabled_size="24dp"
+                    app:unplayed_color="@color/videoProgress" />
 
                 <!-- exo_duration-->
                 <TextView
-                        android:id="@id/exo_duration"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:layout_marginEnd="20dp"
-                        android:includeFontPadding="false"
-                        android:minWidth="50dp"
-                        android:paddingLeft="4dp"
-                        android:paddingRight="4dp"
-                        android:textColor="@android:color/white"
-                        android:textSize="14sp"
-                        android:textStyle="normal"
-                        tools:text="23:20" />
+                    android:id="@id/exo_duration"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginEnd="20dp"
+                    android:includeFontPadding="false"
+                    android:minWidth="50dp"
+                    android:paddingLeft="4dp"
+                    android:paddingRight="4dp"
+                    android:textColor="@android:color/white"
+                    android:textSize="14sp"
+                    android:textStyle="normal"
+                    tools:text="23:20" />
 
             </LinearLayout>
 
             <HorizontalScrollView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center">
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center">
 
                 <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="60dp"
-                        android:gravity="center"
-                        android:orientation="horizontal"
-                        android:paddingTop="10dp"
-                        android:paddingBottom="10dp">
+                    android:layout_width="wrap_content"
+                    android:layout_height="60dp"
+                    android:gravity="center"
+                    android:orientation="horizontal"
+                    android:paddingTop="10dp"
+                    android:paddingBottom="10dp">
 
                     <com.google.android.material.button.MaterialButton
-                            android:id="@+id/player_lock"
-                            style="@style/VideoButton"
-                            android:nextFocusLeft="@id/player_skip_episode"
-                            android:nextFocusRight="@id/player_resize_btt"
-                            android:text="@string/video_lock"
-                            app:icon="@drawable/video_locked"
+                        android:id="@+id/player_lock"
+                        style="@style/VideoButton"
+                        android:nextFocusLeft="@id/player_skip_episode"
+                        android:nextFocusRight="@id/player_resize_btt"
+                        android:text="@string/video_lock"
+                        app:icon="@drawable/video_locked"
 
-                            app:iconSize="30dp" />
+                        app:iconSize="30dp" />
 
                     <LinearLayout
-                            android:id="@+id/player_lock_holder"
-                            android:layout_width="wrap_content"
-                            android:layout_height="match_parent"
-                            android:orientation="horizontal">
+                        android:id="@+id/player_lock_holder"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:orientation="horizontal">
 
                         <com.google.android.material.button.MaterialButton
-                                android:id="@+id/player_resize_btt"
-                                style="@style/VideoButton"
-                                android:nextFocusLeft="@id/player_lock"
+                            android:id="@+id/player_resize_btt"
+                            style="@style/VideoButton"
+                            android:nextFocusLeft="@id/player_lock"
 
-                                android:nextFocusRight="@id/player_speed_btt"
-                                android:text="@string/video_aspect_ratio_resize"
-                                app:icon="@drawable/ic_baseline_aspect_ratio_24" />
+                            android:nextFocusRight="@id/player_speed_btt"
+                            android:text="@string/video_aspect_ratio_resize"
+                            app:icon="@drawable/ic_baseline_aspect_ratio_24" />
 
                         <com.google.android.material.button.MaterialButton
-                                android:id="@+id/player_speed_btt"
-                                style="@style/VideoButton"
-                                android:nextFocusLeft="@id/player_resize_btt"
+                            android:id="@+id/player_speed_btt"
+                            style="@style/VideoButton"
+                            android:nextFocusLeft="@id/player_resize_btt"
 
-                                android:nextFocusRight="@id/player_subtitle_offset_btt"
-                                app:icon="@drawable/ic_baseline_speed_24"
-                                tools:text="Speed" />
+                            android:nextFocusRight="@id/player_subtitle_offset_btt"
+                            app:icon="@drawable/ic_baseline_speed_24"
+                            tools:text="Speed" />
 
                         <com.google.android.material.button.MaterialButton
-                                android:visibility="gone"
-                                tools:visibility="visible"
-                                android:id="@+id/player_subtitle_offset_btt"
-                                style="@style/VideoButton"
-                                android:nextFocusLeft="@id/player_speed_btt"
+                            android:id="@+id/player_subtitle_offset_btt"
+                            style="@style/VideoButton"
+                            android:nextFocusLeft="@id/player_speed_btt"
+                            android:nextFocusRight="@id/player_sources_btt"
+                            android:text="@string/subtitle_offset"
 
-                                android:nextFocusRight="@id/player_sources_btt"
-                                app:icon="@drawable/ic_outline_subtitles_24"
-                                android:text="@string/subtitle_offset" />
+                            android:visibility="gone"
+                            app:icon="@drawable/ic_outline_subtitles_24"
+                            tools:visibility="visible" />
 
                         <com.google.android.material.button.MaterialButton
-                                android:id="@+id/player_sources_btt"
-                                style="@style/VideoButton"
-                                android:nextFocusLeft="@id/player_subtitle_offset_btt"
+                            android:id="@+id/player_sources_btt"
+                            style="@style/VideoButton"
+                            android:layout_height="40dp"
+
+                            android:nextFocusLeft="@id/player_subtitle_offset_btt"
+                            android:nextFocusRight="@id/player_tracks_btt"
+                            android:text="@string/video_source"
+                            app:icon="@drawable/ic_baseline_playlist_play_24" />
 
-                                android:nextFocusRight="@id/player_skip_op"
-                                android:text="@string/video_source"
-                                app:icon="@drawable/ic_baseline_playlist_play_24" />
 
                         <com.google.android.material.button.MaterialButton
-                                android:id="@+id/player_skip_op"
-                                style="@style/VideoButton"
-                                android:nextFocusLeft="@id/player_sources_btt"
+                            android:id="@+id/player_tracks_btt"
+                            style="@style/VideoButton"
+                            android:layout_height="40dp"
 
-                                android:nextFocusRight="@id/player_skip_episode"
-                                android:text="@string/video_skip_op"
-                                app:icon="@drawable/ic_baseline_fast_forward_24" />
+                            android:nextFocusLeft="@id/player_sources_btt"
+                            android:nextFocusRight="@id/player_skip_op"
+                            android:text="@string/tracks"
+                            app:icon="@drawable/ic_baseline_playlist_play_24" />
 
                         <com.google.android.material.button.MaterialButton
-                                android:id="@+id/player_skip_episode"
-                                style="@style/VideoButton"
-                                android:nextFocusLeft="@id/player_skip_op"
+                            android:id="@+id/player_skip_op"
+                            style="@style/VideoButton"
+                            android:nextFocusLeft="@id/player_sources_btt"
 
-                                android:nextFocusRight="@id/player_lock"
-                                android:text="@string/next_episode"
-                                app:icon="@drawable/ic_baseline_skip_next_24" />
+                            android:nextFocusRight="@id/player_skip_episode"
+                            android:text="@string/video_skip_op"
+                            app:icon="@drawable/ic_baseline_fast_forward_24" />
+
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/player_skip_episode"
+                            style="@style/VideoButton"
+                            android:nextFocusLeft="@id/player_skip_op"
+
+                            android:nextFocusRight="@id/player_lock"
+                            android:text="@string/next_episode"
+                            app:icon="@drawable/ic_baseline_skip_next_24" />
                     </LinearLayout>
                 </LinearLayout>
             </HorizontalScrollView>
@@ -532,66 +544,66 @@
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layoutDirection="ltr"
-            android:orientation="horizontal">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layoutDirection="ltr"
+        android:orientation="horizontal">
 
         <RelativeLayout
-                android:id="@+id/player_progressbar_left_holder"
-                android:layout_width="100dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:gravity="start"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toLeftOf="@+id/centerMenuView"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:alpha="1"
-                tools:visibility="visible">
+            android:id="@+id/player_progressbar_left_holder"
+            android:layout_width="100dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:gravity="start"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toLeftOf="@+id/centerMenuView"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:alpha="1"
+            tools:visibility="visible">
             <!--VERY hacky layout -->
             <ImageView
-                    android:id="@+id/player_progressbar_left_icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginBottom="220dp"
-                    android:src="@drawable/ic_baseline_volume_up_24"
-                    app:tint="@android:color/white"
-                    tools:ignore="ContentDescription">
+                android:id="@+id/player_progressbar_left_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_marginBottom="220dp"
+                android:src="@drawable/ic_baseline_volume_up_24"
+                app:tint="@android:color/white"
+                tools:ignore="ContentDescription">
 
             </ImageView>
 
             <ProgressBar
-                    android:id="@+id/player_progressbar_left"
-                    style="@android:style/Widget.Material.ProgressBar.Horizontal"
-                    android:layout_width="4dp"
-                    android:layout_height="150dp"
-                    android:layout_gravity="end|center_vertical"
-                    android:layout_marginStart="40dp"
-                    android:indeterminate="false"
-                    android:max="100"
-                    android:progress="100"
-                    android:progressDrawable="@drawable/progress_drawable_vertical"
-                    tools:progress="30"
-                    android:layout_centerInParent="true" />
+                android:id="@+id/player_progressbar_left"
+                style="@android:style/Widget.Material.ProgressBar.Horizontal"
+                android:layout_width="4dp"
+                android:layout_height="150dp"
+                android:layout_centerInParent="true"
+                android:layout_gravity="end|center_vertical"
+                android:layout_marginStart="40dp"
+                android:indeterminate="false"
+                android:max="100"
+                android:progress="100"
+                android:progressDrawable="@drawable/progress_drawable_vertical"
+                tools:progress="30" />
         </RelativeLayout>
 
         <RelativeLayout
-                android:id="@+id/player_progressbar_right_holder"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:gravity="right"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toRightOf="@+id/centerMenuView"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:alpha="1"
-                tools:ignore="RtlHardcoded"
-                tools:visibility="visible">
+            android:id="@+id/player_progressbar_right_holder"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:gravity="right"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toRightOf="@+id/centerMenuView"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:alpha="1"
+            tools:ignore="RtlHardcoded"
+            tools:visibility="visible">
 
             <ImageView
                 android:id="@+id/player_progressbar_right_icon"
@@ -606,59 +618,59 @@
             </ImageView>
 
             <ProgressBar
-                    android:id="@+id/player_progressbar_right"
-                    style="@android:style/Widget.Material.ProgressBar.Horizontal"
-                    android:layout_width="4dp"
-                    android:layout_height="150dp"
-                    android:layout_gravity="end|center_vertical"
-                    android:layout_marginEnd="40dp"
-                    android:indeterminate="false"
-                    android:max="100"
-                    android:progress="100"
-                    android:progressDrawable="@drawable/progress_drawable_vertical"
-                    android:layout_centerInParent="true" />
+                android:id="@+id/player_progressbar_right"
+                style="@android:style/Widget.Material.ProgressBar.Horizontal"
+                android:layout_width="4dp"
+                android:layout_height="150dp"
+                android:layout_centerInParent="true"
+                android:layout_gravity="end|center_vertical"
+                android:layout_marginEnd="40dp"
+                android:indeterminate="false"
+                android:max="100"
+                android:progress="100"
+                android:progressDrawable="@drawable/progress_drawable_vertical" />
         </RelativeLayout>
     </LinearLayout>
 
-<!--
-    <ImageView
-            android:padding="15dp"
-            android:id="@+id/player_episodes_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end|center_vertical"
-            android:src="@drawable/ic_baseline_arrow_back_ios_24"
-            android:background="@drawable/video_tap_button_always_white"
+    <!--
+        <ImageView
+                android:padding="15dp"
+                android:id="@+id/player_episodes_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end|center_vertical"
+                android:src="@drawable/ic_baseline_arrow_back_ios_24"
+                android:background="@drawable/video_tap_button_always_white"
 
-            app:tint="@android:color/white"
-            tools:ignore="ContentDescription"></ImageView>
+                app:tint="@android:color/white"
+                tools:ignore="ContentDescription"></ImageView>
 
-    <LinearLayout
-            android:visibility="gone"
-            android:background="?attr/primaryBlackBackground"
-            android:orientation="vertical"
-            android:layout_gravity="end"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent">
-
-        <TextView
-                android:padding="10dp"
-                style="@style/WatchHeaderText"
-                android:textSize="15sp"
-                android:layout_marginEnd="0dp"
-                android:text="@string/episodes"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-        <androidx.recyclerview.widget.RecyclerView
-                android:requiresFadingEdge="vertical"
-                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                android:id="@+id/player_episode_list"
-                tools:listitem="@layout/player_episodes"
-                android:layout_width="200dp"
+        <LinearLayout
+                android:visibility="gone"
+                android:background="?attr/primaryBlackBackground"
+                android:orientation="vertical"
+                android:layout_gravity="end"
+                android:layout_width="wrap_content"
                 android:layout_height="match_parent">
 
-        </androidx.recyclerview.widget.RecyclerView>
-    </LinearLayout>
-    -->
+            <TextView
+                    android:padding="10dp"
+                    style="@style/WatchHeaderText"
+                    android:textSize="15sp"
+                    android:layout_marginEnd="0dp"
+                    android:text="@string/episodes"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+
+            <androidx.recyclerview.widget.RecyclerView
+                    android:requiresFadingEdge="vertical"
+                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                    android:id="@+id/player_episode_list"
+                    tools:listitem="@layout/player_episodes"
+                    android:layout_width="200dp"
+                    android:layout_height="match_parent">
+
+            </androidx.recyclerview.widget.RecyclerView>
+        </LinearLayout>
+        -->
 </FrameLayout>
diff --git a/app/src/main/res/layout/player_select_tracks.xml b/app/src/main/res/layout/player_select_tracks.xml
new file mode 100644
index 00000000..d32e1b4e
--- /dev/null
+++ b/app/src/main/res/layout/player_select_tracks.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@null"
+        android:orientation="vertical">
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginBottom="60dp"
+            android:baselineAligned="false"
+            android:orientation="horizontal">
+
+        <LinearLayout
+                android:id="@+id/video_tracks_holder"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="50"
+                android:orientation="vertical">
+
+            <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_rowWeight="1"
+                    android:layout_marginTop="10dp"
+                    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+                    android:paddingTop="10dp"
+                    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+                    android:paddingBottom="10dp"
+                    android:text="@string/video_tracks"
+                    android:textColor="?attr/textColor"
+                    android:textSize="20sp"
+                    android:textStyle="bold" />
+
+            <ListView
+                    android:requiresFadingEdge="vertical"
+                    android:id="@+id/video_tracks_list"
+                    android:layout_width="match_parent"
+
+                    android:layout_height="match_parent"
+                    android:layout_rowWeight="1"
+                    android:background="?attr/primaryBlackBackground"
+                    android:nextFocusLeft="@id/sort_subtitles"
+                    android:nextFocusRight="@id/apply_btt"
+                    tools:listitem="@layout/sort_bottom_single_choice" />
+        </LinearLayout>
+
+        <LinearLayout
+                android:id="@+id/audio_tracks_holder"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="50"
+                android:orientation="vertical">
+
+            <!--   android:id="@+id/subs_settings"                 android:foreground="?android:attr/selectableItemBackgroundBorderless"
+-->
+            <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    tools:ignore="UseCompoundDrawables">
+
+                <LinearLayout
+                        android:foreground="?attr/selectableItemBackgroundBorderless"
+                        android:id="@+id/subtitles_click_settings"
+                        android:layout_rowWeight="1"
+                        android:paddingTop="10dp"
+                        android:paddingBottom="10dp"
+                        android:layout_marginTop="10dp"
+                        android:orientation="horizontal"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+
+                    <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+                            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+                            android:text="@string/audio_tracks"
+                            android:textColor="?attr/textColor"
+                            android:textSize="20sp"
+                            android:textStyle="bold" />
+
+<!--                    <TextView-->
+<!--                            android:textSize="15sp"-->
+<!--                            android:id="@+id/subtitles_encoding_format"-->
+<!--                            android:textColor="?attr/textColor"-->
+<!--                            android:layout_gravity="center"-->
+<!--                            android:gravity="center"-->
+<!--                            tools:text="Thai (TIS 620-2533/ISO 8859-11)"-->
+<!--                            android:layout_width="wrap_content"-->
+<!--                            android:layout_height="wrap_content" />-->
+                </LinearLayout>
+
+                <ImageView
+                        android:layout_width="25dp"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="end|center_vertical"
+                        android:layout_marginTop="0dp"
+                        android:layout_marginEnd="10dp"
+
+                        android:contentDescription="@string/home_change_provider_img_des"
+                        android:src="@drawable/ic_outline_settings_24"
+                        android:visibility="gone" />
+            </LinearLayout>
+
+            <ListView
+                    android:requiresFadingEdge="vertical"
+                    android:id="@+id/auto_tracks_list"
+                    android:layout_width="match_parent"
+
+                    android:layout_height="match_parent"
+                    android:layout_rowWeight="1"
+                    android:background="?attr/primaryBlackBackground"
+                    android:nextFocusLeft="@id/sort_providers"
+                    android:nextFocusRight="@id/cancel_btt"
+                    tools:listfooter="@layout/sort_bottom_footer_add_choice"
+                    tools:listitem="@layout/sort_bottom_single_choice" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+            android:id="@+id/apply_btt_holder"
+            android:orientation="horizontal"
+            android:layout_gravity="bottom"
+            android:gravity="bottom|end"
+            android:layout_marginTop="-60dp"
+            android:layout_width="match_parent"
+            android:layout_height="60dp">
+
+
+        <com.google.android.material.button.MaterialButton
+                style="@style/WhiteButton"
+                android:layout_gravity="center_vertical|end"
+                android:text="@string/sort_apply"
+                android:id="@+id/apply_btt"
+                android:layout_width="wrap_content" />
+
+        <com.google.android.material.button.MaterialButton
+                style="@style/BlackButton"
+                android:layout_gravity="center_vertical|end"
+                android:text="@string/sort_cancel"
+                android:id="@+id/cancel_btt"
+                android:layout_width="wrap_content" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1b47b180..3a25427c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -607,4 +607,7 @@
 
     <string name="download_all_plugins_from_repo">Download all plugins from this repository?</string>
     <string name="single_plugin_disabled" formatted="true">%s (Disabled)</string>
+    <string name="tracks">Tracks</string>
+    <string name="audio_tracks">Audio tracks</string>
+    <string name="video_tracks">Video tracks</string>
 </resources>