diff --git a/.github/workflows/build_to_archive.yml b/.github/workflows/build_to_archive.yml
index 3b7aa9ae..e84bb08b 100644
--- a/.github/workflows/build_to_archive.yml
+++ b/.github/workflows/build_to_archive.yml
@@ -19,21 +19,21 @@ jobs:
     steps:
     - name: Generate access token
       id: generate_token
-      uses: tibdex/github-app-token@v1
+      uses: tibdex/github-app-token@v2
       with:
         app_id: ${{ secrets.GH_APP_ID }}
         private_key: ${{ secrets.GH_APP_KEY }}
         repository: "recloudstream/secrets"
     - name: Generate access token (archive)
       id: generate_archive_token
-      uses: tibdex/github-app-token@v1
+      uses: tibdex/github-app-token@v2
       with:
         app_id: ${{ secrets.GH_APP_ID }}
         private_key: ${{ secrets.GH_APP_KEY }}
         repository: "recloudstream/cloudstream-archive"
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up JDK 17
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
         java-version: '17'
         distribution: 'adopt'
@@ -58,7 +58,7 @@ jobs:
         SIGNING_STORE_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
         SIMKL_CLIENT_ID: ${{ secrets.SIMKL_CLIENT_ID }}
         SIMKL_CLIENT_SECRET: ${{ secrets.SIMKL_CLIENT_SECRET }}
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         repository: "recloudstream/cloudstream-archive"
         token: ${{ steps.generate_archive_token.outputs.token }}
diff --git a/.github/workflows/generate_dokka.yml b/.github/workflows/generate_dokka.yml
index abeee0b2..96e61644 100644
--- a/.github/workflows/generate_dokka.yml
+++ b/.github/workflows/generate_dokka.yml
@@ -20,7 +20,7 @@ jobs:
     steps:
       - name: Generate access token
         id: generate_token
-        uses: tibdex/github-app-token@v1
+        uses: tibdex/github-app-token@v2
         with:
           app_id: ${{ secrets.GH_APP_ID }}
           private_key: ${{ secrets.GH_APP_KEY }}
@@ -43,12 +43,13 @@ jobs:
           rm -rf "./-cloudstream"
 
       - name: Setup JDK 17
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
           java-version: 17
+          distribution: 'adopt'
 
       - name: Setup Android SDK
-        uses: android-actions/setup-android@v2
+        uses: android-actions/setup-android@v3
 
       - name: Generate Dokka
         run: |
diff --git a/.github/workflows/issue_action.yml b/.github/workflows/issue_action.yml
index 108cec82..88ab3656 100644
--- a/.github/workflows/issue_action.yml
+++ b/.github/workflows/issue_action.yml
@@ -10,7 +10,7 @@ jobs:
     steps:
       - name: Generate access token
         id: generate_token
-        uses: tibdex/github-app-token@v1
+        uses: tibdex/github-app-token@v2
         with:
           app_id: ${{ secrets.GH_APP_ID }}
           private_key: ${{ secrets.GH_APP_KEY }}
@@ -27,7 +27,7 @@ jobs:
           comment-body: '${index}. ${similarity} #${number}'
       - name: Label if possible duplicate
         if: steps.similarity.outputs.similar-issues-found =='true'
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           github-token: ${{ steps.generate_token.outputs.token }}
           script: |
@@ -37,7 +37,7 @@ jobs:
               repo: context.repo.repo,
               labels: ["possible duplicate"]
             })
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Automatically close issues that dont follow the issue template
         uses: lucasbento/auto-close-issues@v1.0.2
         with:
@@ -68,7 +68,7 @@ jobs:
             Found provider name: `${{ steps.provider_check.outputs.name }}`
       - name: Label if mentions provider
         if: steps.provider_check.outputs.name != 'none'
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           github-token: ${{ steps.generate_token.outputs.token }}
           script: |
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index 44eb6402..f35cd58c 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -18,14 +18,14 @@ jobs:
     steps:
     - name: Generate access token
       id: generate_token
-      uses: tibdex/github-app-token@v1
+      uses: tibdex/github-app-token@v2
       with:
         app_id: ${{ secrets.GH_APP_ID }}
         private_key: ${{ secrets.GH_APP_KEY }}
         repository: "recloudstream/secrets"
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up JDK 17
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
         java-version: '17'
         distribution: 'adopt'
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index b6177710..7f6dd412 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -6,9 +6,9 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up JDK 17
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
         java-version: '17'
         distribution: 'adopt'
@@ -17,7 +17,7 @@ jobs:
     - name: Run Gradle
       run: ./gradlew assemblePrereleaseDebug
     - name: Upload Artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: pull-request-build
         path: "app/build/outputs/apk/prerelease/debug/*.apk"
diff --git a/.github/workflows/update_locales.yml b/.github/workflows/update_locales.yml
index 628e9bc9..ce140e55 100644
--- a/.github/workflows/update_locales.yml
+++ b/.github/workflows/update_locales.yml
@@ -18,12 +18,12 @@ jobs:
     steps:
     - name: Generate access token
       id: generate_token
-      uses: tibdex/github-app-token@v1
+      uses: tibdex/github-app-token@v2
       with:
         app_id: ${{ secrets.GH_APP_ID }}
         private_key: ${{ secrets.GH_APP_KEY }}
         repository: "recloudstream/cloudstream"
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         token: ${{ steps.generate_token.outputs.token }}
     - name: Install dependencies
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index bae407fa..9ecae616 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -60,7 +60,7 @@ android {
         targetSdk = 33 /* Android 14 is Fu*ked
         ^ https://developer.android.com/about/versions/14/behavior-changes-14#safer-dynamic-code-loading*/
         versionCode = 63
-        versionName = "4.3.0"
+        versionName = "4.3.1"
 
         resValue("string", "app_version", "${defaultConfig.versionName}${versionNameSuffix ?: ""}")
         resValue("string", "commit_hash", "git rev-parse --short HEAD".execute() ?: "")
diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
index cf2e1cf0..a4edec33 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
@@ -9,7 +9,7 @@ import androidx.preference.PreferenceManager
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.json.JsonMapper
-import com.fasterxml.jackson.module.kotlin.KotlinModule
+import com.fasterxml.jackson.module.kotlin.kotlinModule
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.aniListApi
@@ -34,7 +34,7 @@ const val USER_AGENT =
     "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36"
 
 //val baseHeader = mapOf("User-Agent" to USER_AGENT)
-val mapper = JsonMapper.builder().addModule(KotlinModule())
+val mapper = JsonMapper.builder().addModule(kotlinModule())
     .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false).build()!!
 
 /**
diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index 2819ab98..71a24ced 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -77,6 +77,7 @@ import com.lagradost.cloudstream3.databinding.BottomResultviewPreviewBinding
 import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
+import com.lagradost.cloudstream3.mvvm.observe
 import com.lagradost.cloudstream3.mvvm.observeNullable
 import com.lagradost.cloudstream3.network.initClient
 import com.lagradost.cloudstream3.plugins.PluginManager
@@ -91,7 +92,9 @@ import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appStri
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appStringResumeWatching
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appStringSearch
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.inAppAuths
+import com.lagradost.cloudstream3.syncproviders.SyncAPI
 import com.lagradost.cloudstream3.ui.APIRepository
+import com.lagradost.cloudstream3.ui.SyncWatchType
 import com.lagradost.cloudstream3.ui.WatchType
 import com.lagradost.cloudstream3.ui.download.DOWNLOAD_NAVIGATE_TO
 import com.lagradost.cloudstream3.ui.home.HomeViewModel
@@ -101,6 +104,7 @@ import com.lagradost.cloudstream3.ui.player.LinkGenerator
 import com.lagradost.cloudstream3.ui.result.LinearListLayout
 import com.lagradost.cloudstream3.ui.result.ResultViewModel2
 import com.lagradost.cloudstream3.ui.result.START_ACTION_RESUME_LATEST
+import com.lagradost.cloudstream3.ui.result.SyncViewModel
 import com.lagradost.cloudstream3.ui.result.setImage
 import com.lagradost.cloudstream3.ui.result.setText
 import com.lagradost.cloudstream3.ui.result.txt
@@ -439,13 +443,30 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
     }
 
     var lastPopup: SearchResponse? = null
-    fun loadPopup(result: SearchResponse) {
+    fun loadPopup(result: SearchResponse, load : Boolean = true) {
         lastPopup = result
-        viewModel.load(
-            this, result.url, result.apiName, false, if (getApiDubstatusSettings()
-                    .contains(DubStatus.Dubbed)
-            ) DubStatus.Dubbed else DubStatus.Subbed, null
-        )
+        val syncName = syncViewModel.syncName(result.apiName)
+
+        // based on apiName we decide on if it is a local list or not, this is because
+        // we want to show a bit of extra UI to sync apis
+        if (result is SyncAPI.LibraryItem && syncName != null) {
+            isLocalList = false
+            syncViewModel.setSync(syncName, result.syncId)
+            syncViewModel.updateMetaAndUser()
+        } else {
+            isLocalList = true
+            syncViewModel.clear()
+        }
+
+        if (load) {
+            viewModel.load(
+                this, result.url, result.apiName, false, if (getApiDubstatusSettings()
+                        .contains(DubStatus.Dubbed)
+                ) DubStatus.Dubbed else DubStatus.Subbed, null
+            )
+        }else {
+            viewModel.loadSmall(this,result)
+        }
     }
 
     override fun onColorSelected(dialogId: Int, color: Int) {
@@ -733,10 +754,14 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
     }
 
     lateinit var viewModel: ResultViewModel2
-
+    lateinit var syncViewModel : SyncViewModel
+    /** kinda dirty, however it signals that we should use the watch status as sync or not*/
+    var isLocalList : Boolean = false
     override fun onCreateView(name: String, context: Context, attrs: AttributeSet): View? {
         viewModel =
             ViewModelProvider(this)[ResultViewModel2::class.java]
+        syncViewModel =
+            ViewModelProvider(this)[SyncViewModel::class.java]
 
         return super.onCreateView(name, context, attrs)
     }
@@ -1234,6 +1259,48 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
             builder.show().setDefaultFocus()
         }
 
+
+        fun setUserData(status : Resource<SyncAPI.AbstractSyncStatus>?) {
+            if (isLocalList) return
+            bottomPreviewBinding?.apply {
+                when (status) {
+                    is Resource.Success -> {
+                        resultviewPreviewBookmark.isEnabled = true
+                        resultviewPreviewBookmark.setText(status.value.status.stringRes)
+                        resultviewPreviewBookmark.setIconResource(status.value.status.iconRes)
+                    }
+
+                    is Resource.Failure -> {
+                        resultviewPreviewBookmark.isEnabled = false
+                        resultviewPreviewBookmark.setIconResource(R.drawable.ic_baseline_bookmark_border_24)
+                        resultviewPreviewBookmark.text = status.errorString
+                    }
+
+                    else -> {
+                        resultviewPreviewBookmark.isEnabled = false
+                        resultviewPreviewBookmark.setIconResource(R.drawable.ic_baseline_bookmark_border_24)
+                        resultviewPreviewBookmark.setText(R.string.loading)
+                    }
+                }
+            }
+        }
+
+        fun setWatchStatus(state : WatchType?) {
+            if (!isLocalList || state == null) return
+
+            bottomPreviewBinding?.resultviewPreviewBookmark?.apply {
+                setIconResource(state.iconRes)
+                setText(state.stringRes)
+            }
+        }
+
+        observe(viewModel.watchStatus) { state ->
+            setWatchStatus(state)
+        }
+        observe(syncViewModel.userData) { status ->
+            setUserData(status)
+        }
+
         observeNullable(viewModel.page) { resource ->
             if (resource == null) {
                 hidePreviewPopupDialog()
@@ -1273,17 +1340,37 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
                             d.posterImage ?: d.posterBackgroundImage
                         )
 
-                        resultviewPreviewPoster.setOnClickListener {
-                            //viewModel.updateWatchStatus(WatchType.PLANTOWATCH)
-                            val value = viewModel.watchStatus.value ?: WatchType.NONE
+                        setUserData(syncViewModel.userData.value)
+                        setWatchStatus(viewModel.watchStatus.value)
 
-                            this@MainActivity.showBottomDialog(
-                                WatchType.values().map { getString(it.stringRes) }.toList(),
-                                value.ordinal,
-                                this@MainActivity.getString(R.string.action_add_to_bookmarks),
-                                showApply = false,
-                                {}) {
-                                viewModel.updateWatchStatus(WatchType.values()[it], this@MainActivity)
+                        resultviewPreviewBookmark.setOnClickListener {
+                            //viewModel.updateWatchStatus(WatchType.PLANTOWATCH)
+                            if (isLocalList) {
+                                val value = viewModel.watchStatus.value ?: WatchType.NONE
+
+                                this@MainActivity.showBottomDialog(
+                                    WatchType.values().map { getString(it.stringRes) }.toList(),
+                                    value.ordinal,
+                                    this@MainActivity.getString(R.string.action_add_to_bookmarks),
+                                    showApply = false,
+                                    {}) {
+                                    viewModel.updateWatchStatus(
+                                        WatchType.values()[it],
+                                        this@MainActivity
+                                    )
+                                }
+                            } else {
+                                val value = (syncViewModel.userData.value as? Resource.Success)?.value?.status ?: SyncWatchType.NONE
+
+                                this@MainActivity.showBottomDialog(
+                                    SyncWatchType.values().map { getString(it.stringRes) }.toList(),
+                                    value.ordinal,
+                                    this@MainActivity.getString(R.string.action_add_to_bookmarks),
+                                    showApply = false,
+                                    {}) {
+                                    syncViewModel.setStatus(SyncWatchType.values()[it].internalId)
+                                    syncViewModel.publishUserData()
+                                }
                             }
                         }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/ContentXExtractor.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/ContentXExtractor.kt
new file mode 100644
index 00000000..61943b70
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/ContentXExtractor.kt
@@ -0,0 +1,54 @@
+// ! Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
+
+package com.lagradost.cloudstream3.extractors
+
+import android.util.Log
+import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.utils.*
+
+open class ContentX : ExtractorApi() {
+    override val name            = "ContentX"
+    override val mainUrl         = "https://contentx.me"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+        val ext_ref   = referer ?: ""
+        Log.d("Kekik_${this.name}", "url » ${url}")
+
+        val i_source  = app.get(url, referer=ext_ref).text
+        val i_extract = Regex("""window\.openPlayer\('([^']+)'""").find(i_source)!!.groups[1]?.value ?: throw ErrorLoadingException("i_extract is null")
+
+        val vid_source  = app.get("https://contentx.me/source2.php?v=${i_extract}", referer=ext_ref).text
+        val vid_extract = Regex("""file\":\"([^\"]+)""").find(vid_source)!!.groups[1]?.value ?: throw ErrorLoadingException("vid_extract is null")
+        val m3u_link    = vid_extract.replace("\\", "")
+
+        callback.invoke(
+            ExtractorLink(
+                source  = this.name,
+                name    = this.name,
+                url     = m3u_link,
+                referer = url,
+                quality = Qualities.Unknown.value,
+                isM3u8  = true
+            )
+        )
+
+        val i_dublaj = Regex(""",\"([^']+)\",\"Türkçe""").find(i_source)!!.groups[1]?.value
+        if (i_dublaj != null) {
+            val dublaj_source  = app.get("https://contentx.me/source2.php?v=${i_dublaj}", referer=ext_ref).text
+            val dublaj_extract = Regex("""file\":\"([^\"]+)""").find(dublaj_source)!!.groups[1]?.value ?: throw ErrorLoadingException("dublaj_extract is null")
+            val dublaj_link    = dublaj_extract.replace("\\", "")
+
+            callback.invoke(
+                ExtractorLink(
+                    source  = "${this.name} Türkçe Dublaj",
+                    name    = "${this.name} Türkçe Dublaj",
+                    url     = dublaj_link,
+                    referer = url,
+                    quality = Qualities.Unknown.value,
+                    isM3u8  = true
+                )
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/HDMomPlayerExtractor.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/HDMomPlayerExtractor.kt
new file mode 100644
index 00000000..03586386
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/HDMomPlayerExtractor.kt
@@ -0,0 +1,71 @@
+// ! Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
+
+package com.lagradost.cloudstream3.extractors
+
+import android.util.Log
+import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.utils.*
+import com.lagradost.cloudstream3.extractors.helper.AesHelper
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.fasterxml.jackson.module.kotlin.readValue
+
+open class HDMomPlayer : ExtractorApi() {
+    override val name            = "HDMomPlayer"
+    override val mainUrl         = "https://hdmomplayer.com"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+        val m3u_link:String?
+        val ext_ref  = referer ?: ""
+        val i_source = app.get(url, referer=ext_ref).text
+
+        val bePlayer = Regex("""bePlayer\('([^']+)',\s*'(\{[^\}]+\})'\);""").find(i_source)?.groupValues
+        if (bePlayer != null) {
+            val bePlayerPass = bePlayer.get(1)
+            val bePlayerData = bePlayer.get(2)
+            val encrypted    = AesHelper.cryptoAESHandler(bePlayerData, bePlayerPass.toByteArray(), false)?.replace("\\", "") ?: throw ErrorLoadingException("failed to decrypt")
+            Log.d("Kekik_${this.name}", "encrypted » ${encrypted}")
+
+            m3u_link = Regex("""video_location\":\"([^\"]+)""").find(encrypted)?.groupValues?.get(1)
+        } else {
+            m3u_link = Regex("""file:\"([^\"]+)""").find(i_source)?.groupValues?.get(1)
+
+            val track_str = Regex("""tracks:\[([^\]]+)""").find(i_source)?.groupValues?.get(1)
+            if (track_str != null) {
+                val tracks:List<Track> = jacksonObjectMapper().readValue("[${track_str}]")
+
+                for (track in tracks) {
+                    if (track.file == null || track.label == null) continue
+                    if (track.label.contains("Forced")) continue
+
+                    subtitleCallback.invoke(
+                        SubtitleFile(
+                            lang = track.label,
+                            url  = fixUrl(mainUrl + track.file)
+                        )
+                    )
+                }
+            }
+        }
+
+        callback.invoke(
+            ExtractorLink(
+                source  = this.name,
+                name    = this.name,
+                url     = m3u_link ?: throw ErrorLoadingException("m3u link not found"),
+                referer = url,
+                quality = Qualities.Unknown.value,
+                isM3u8  = true
+            )
+        )
+    }
+
+    data class Track(
+        @JsonProperty("file")     val file: String?,
+        @JsonProperty("label")    val label: String?,
+        @JsonProperty("kind")     val kind: String?,
+        @JsonProperty("language") val language: String?,
+        @JsonProperty("default")  val default: String?
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/HDPlayerSystemExtractor.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/HDPlayerSystemExtractor.kt
new file mode 100644
index 00000000..14333d35
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/HDPlayerSystemExtractor.kt
@@ -0,0 +1,59 @@
+// ! Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
+
+package com.lagradost.cloudstream3.extractors
+
+import android.util.Log
+import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.utils.*
+import com.fasterxml.jackson.annotation.JsonProperty
+
+open class HDPlayerSystem : ExtractorApi() {
+    override val name            = "HDPlayerSystem"
+    override val mainUrl         = "https://hdplayersystem.live"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+        val ext_ref  = referer ?: ""
+        val vid_id   = if (url.contains("video/")) {
+            url.substringAfter("video/")
+        } else {
+            url.substringAfter("?data=")
+        }
+        val post_url = "${mainUrl}/player/index.php?data=${vid_id}&do=getVideo"
+        Log.d("Kekik_${this.name}", "post_url » ${post_url}")
+
+        val response = app.post(
+            post_url,
+            data = mapOf(
+                "hash" to vid_id,
+                "r"    to ext_ref
+            ),
+            referer = ext_ref,
+            headers = mapOf(
+                "Content-Type"     to "application/x-www-form-urlencoded; charset=UTF-8",
+                "X-Requested-With" to "XMLHttpRequest"
+            )
+        )
+
+        val video_response = response.parsedSafe<SystemResponse>() ?: throw ErrorLoadingException("failed to parse response")
+        val m3u_link       = video_response.securedLink
+
+        callback.invoke(
+            ExtractorLink(
+                source  = this.name,
+                name    = this.name,
+                url     = m3u_link,
+                referer = ext_ref,
+                quality = Qualities.Unknown.value,
+                type    = INFER_TYPE
+            )
+        )
+    }
+
+    data class SystemResponse(
+        @JsonProperty("hls")         val hls: String,
+        @JsonProperty("videoImage")  val videoImage: String? = null,
+        @JsonProperty("videoSource") val videoSource: String,
+        @JsonProperty("securedLink") val securedLink: String
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/HDStreamAbleExtractor.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/HDStreamAbleExtractor.kt
new file mode 100644
index 00000000..214cd2d4
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/HDStreamAbleExtractor.kt
@@ -0,0 +1,8 @@
+// ! Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
+
+package com.lagradost.cloudstream3.extractors
+
+class HDStreamAble : PeaceMakerst() {
+    override var name    = "HDStreamAble"
+    override var mainUrl = "https://hdstreamable.com"
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/HotlingerExtractor.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/HotlingerExtractor.kt
new file mode 100644
index 00000000..4a77cbf3
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/HotlingerExtractor.kt
@@ -0,0 +1,8 @@
+// ! Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
+
+package com.lagradost.cloudstream3.extractors
+
+class Hotlinger : ContentX() {
+    override var name    = "Hotlinger"
+    override var mainUrl = "https://hotlinger.com"
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/MailRuExtractor.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/MailRuExtractor.kt
new file mode 100644
index 00000000..766c7762
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/MailRuExtractor.kt
@@ -0,0 +1,54 @@
+// ! Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
+
+package com.lagradost.cloudstream3.extractors
+
+import android.util.Log
+import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.utils.*
+import com.fasterxml.jackson.annotation.JsonProperty
+
+open class MailRu : ExtractorApi() {
+    override val name            = "MailRu"
+    override val mainUrl         = "https://my.mail.ru"
+    override val requiresReferer = false
+
+    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+        val ext_ref = referer ?: ""
+        Log.d("Kekik_${this.name}", "url » ${url}")
+
+        val vid_id     = url.substringAfter("video/embed/").trim()
+        val video_req  = app.get("${mainUrl}/+/video/meta/${vid_id}", referer=url)
+        val video_key  = video_req.cookies["video_key"].toString()
+        Log.d("Kekik_${this.name}", "video_key » ${video_key}")
+
+        val video_data = AppUtils.tryParseJson<MailRuData>(video_req.text) ?: throw ErrorLoadingException("Video not found")
+
+        for (video in video_data.videos) {
+            Log.d("Kekik_${this.name}", "video » ${video}")
+
+            val video_url = if (video.url.startsWith("//")) "https:${video.url}" else video.url
+
+            callback.invoke(
+                ExtractorLink(
+                    source  = this.name,
+                    name    = this.name,
+                    url     = video_url,
+                    referer = url,
+                    headers = mapOf("Cookie" to "video_key=${video_key}"),
+                    quality = getQualityFromName(video.key),
+                    isM3u8  = false
+                )
+            )
+        }
+    }
+
+    data class MailRuData(
+        @JsonProperty("provider") val provider: String,
+        @JsonProperty("videos")   val videos: List<MailRuVideoData>
+    )
+
+    data class MailRuVideoData(
+        @JsonProperty("url") val url: String,
+        @JsonProperty("key") val key: String
+    )
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/OdnoklassnikiExtractor.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/OdnoklassnikiExtractor.kt
new file mode 100644
index 00000000..46f6ad0f
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/OdnoklassnikiExtractor.kt
@@ -0,0 +1,61 @@
+// ! Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
+
+package com.lagradost.cloudstream3.extractors
+
+import android.util.Log
+import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.utils.*
+import com.fasterxml.jackson.annotation.JsonProperty
+
+open class Odnoklassniki : ExtractorApi() {
+    override val name            = "Odnoklassniki"
+    override val mainUrl         = "https://odnoklassniki.ru"
+    override val requiresReferer = false
+
+    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+        val ext_ref    = referer ?: ""
+        Log.d("Kekik_${this.name}", "url » ${url}")
+
+        val user_agent = mapOf("User-Agent" to "Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Mobile Safari/537.36")
+
+        val video_req  = app.get(url, headers=user_agent).text.replace("\\&quot;", "\"").replace("\\\\", "\\")
+            .replace(Regex("\\\\u([0-9A-Fa-f]{4})")) { matchResult ->
+                Integer.parseInt(matchResult.groupValues[1], 16).toChar().toString()
+            }
+        val videos_str = Regex("""\"videos\":(\[[^\]]*\])""").find(video_req)?.groupValues?.get(1) ?: throw ErrorLoadingException("Video not found")
+        val videos     = AppUtils.tryParseJson<List<OkRuVideo>>(videos_str) ?: throw ErrorLoadingException("Video not found")
+
+        for (video in videos) {
+            Log.d("Kekik_${this.name}", "video » ${video}")
+
+            val video_url = if (video.url.startsWith("//")) "https:${video.url}" else video.url
+
+            val quality   = video.name.uppercase()
+                .replace("MOBILE", "144p")
+                .replace("LOWEST", "240p")
+                .replace("LOW",    "360p")
+                .replace("SD",     "480p")
+                .replace("HD",     "720p")
+                .replace("FULL",   "1080p")
+                .replace("QUAD",   "1440p")
+                .replace("ULTRA",  "4k")
+
+            callback.invoke(
+                ExtractorLink(
+                    source  = this.name,
+                    name    = this.name,
+                    url     = video_url,
+                    referer = url,
+                    quality = getQualityFromName(quality),
+                    headers = user_agent,
+                    isM3u8  = false
+                )
+            )
+        }
+    }
+
+    data class OkRuVideo(
+        @JsonProperty("name") val name: String,
+        @JsonProperty("url")  val url: String,
+    )
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/OkRuExtractor.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/OkRuExtractor.kt
index 70e87fbf..824481eb 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/OkRuExtractor.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/OkRuExtractor.kt
@@ -1,67 +1,13 @@
+// ! Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
+
 package com.lagradost.cloudstream3.extractors
 
-import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.utils.*
-import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.AppUtils.parseJson
-
-data class DataOptionsJson (
-    @JsonProperty("flashvars") var flashvars : Flashvars? = Flashvars(),
-)
-data class Flashvars (
-    @JsonProperty("metadata") var metadata : String? = null,
-    @JsonProperty("hlsManifestUrl") var hlsManifestUrl : String? = null, //m3u8
-)
-
-data class MetadataOkru (
-    @JsonProperty("videos") var videos: ArrayList<Videos> = arrayListOf(),
-)
-
-data class Videos (
-    @JsonProperty("name") var name : String,
-    @JsonProperty("url") var url : String,
-    @JsonProperty("seekSchema") var seekSchema : Int? = null,
-    @JsonProperty("disallowed") var disallowed : Boolean? = null
-)
-
-class OkRuHttps: OkRu(){
+class OkRuSSL : Odnoklassniki() {
+    override var name    = "OkRuSSL"
     override var mainUrl = "https://ok.ru"
 }
 
-open class OkRu : ExtractorApi() {
-    override var name = "Okru"
+class OkRuHTTP : Odnoklassniki() {
+    override var name    = "OkRuHTTP"
     override var mainUrl = "http://ok.ru"
-    override val requiresReferer = false
-
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
-        val doc = app.get(url).document
-        val sources = ArrayList<ExtractorLink>()
-        val datajson = doc.select("div[data-options]").attr("data-options")
-        if (datajson.isNotBlank()) {
-            val main = parseJson<DataOptionsJson>(datajson)
-            val metadatajson = parseJson<MetadataOkru>(main.flashvars?.metadata!!)
-            val servers = metadatajson.videos
-            servers.forEach {
-                val quality = it.name.uppercase()
-                    .replace("MOBILE","144p")
-                    .replace("LOWEST","240p")
-                    .replace("LOW","360p")
-                    .replace("SD","480p")
-                    .replace("HD","720p")
-                    .replace("FULL","1080p")
-                    .replace("QUAD","1440p")
-                    .replace("ULTRA","4k")
-                val extractedurl = it.url.replace("\\\\u0026", "&")
-                sources.add(ExtractorLink(
-                    name,
-                    name = this.name,
-                    extractedurl,
-                    url,
-                    getQualityFromName(quality),
-                    isM3u8 = false
-                ))
-            }
-        }
-        return sources
-    }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/PeaceMakerstExtractor.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/PeaceMakerstExtractor.kt
new file mode 100644
index 00000000..b57449bf
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/PeaceMakerstExtractor.kt
@@ -0,0 +1,89 @@
+// ! Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
+
+package com.lagradost.cloudstream3.extractors
+
+import android.util.Log
+import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.utils.*
+import com.fasterxml.jackson.annotation.JsonProperty
+
+open class PeaceMakerst : ExtractorApi() {
+    override val name            = "PeaceMakerst"
+    override val mainUrl         = "https://peacemakerst.com"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+        val m3u_link:String?
+        val ext_ref  = referer ?: ""
+        val post_url = "${url}?do=getVideo"
+        Log.d("Kekik_${this.name}", "post_url » ${post_url}")
+
+        val response = app.post(
+            post_url,
+            data = mapOf(
+                "hash" to url.substringAfter("video/"),
+                "r"    to ext_ref,
+                "s"    to ""
+            ),
+            referer = ext_ref,
+            headers = mapOf(
+                "Content-Type"     to "application/x-www-form-urlencoded; charset=UTF-8",
+                "X-Requested-With" to "XMLHttpRequest"
+            )
+        )
+        if (response.text.contains("teve2.com.tr\\/embed\\/")) {
+            val teve2_id       = response.text.substringAfter("teve2.com.tr\\/embed\\/").substringBefore("\"")
+            val teve2_response = app.get(
+                "https://www.teve2.com.tr/action/media/${teve2_id}",
+                referer = "https://www.teve2.com.tr/embed/${teve2_id}"
+            ).parsedSafe<Teve2ApiResponse>() ?: throw ErrorLoadingException("teve2 response is null")
+
+            m3u_link           = teve2_response.media.link.serviceUrl + "//" + teve2_response.media.link.securePath
+        } else {
+            val video_response = response.parsedSafe<PeaceResponse>() ?: throw ErrorLoadingException("peace response is null")
+            val video_sources  = video_response.videoSources
+            if (video_sources.isNotEmpty()) {
+                m3u_link = video_sources.lastOrNull()?.file
+            } else {
+                m3u_link = null
+            }
+        }
+
+        callback.invoke(
+            ExtractorLink(
+                source  = this.name,
+                name    = this.name,
+                url     = m3u_link ?: throw ErrorLoadingException("m3u link not found"),
+                referer = ext_ref,
+                quality = Qualities.Unknown.value,
+                type    = INFER_TYPE
+            )
+        )
+    }
+
+    data class PeaceResponse(
+        @JsonProperty("videoImage")   val videoImage: String?,
+        @JsonProperty("videoSources") val videoSources: List<VideoSource>,
+        @JsonProperty("sIndex")       val sIndex: String,
+        @JsonProperty("sourceList")   val sourceList: Map<String, String>
+    )
+
+    data class VideoSource(
+        @JsonProperty("file")  val file: String,
+        @JsonProperty("label") val label: String,
+        @JsonProperty("type")  val type: String
+    )
+
+    data class Teve2ApiResponse(
+        @JsonProperty("Media") val media: Teve2Media
+    )
+
+    data class Teve2Media(
+        @JsonProperty("Link") val link: Teve2Link
+    )
+
+    data class Teve2Link(
+        @JsonProperty("ServiceUrl") val serviceUrl: String,
+        @JsonProperty("SecurePath") val securePath: String
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/PixelDrainExtractor.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/PixelDrainExtractor.kt
new file mode 100644
index 00000000..1c70cb54
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/PixelDrainExtractor.kt
@@ -0,0 +1,31 @@
+// ! Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
+
+package com.lagradost.cloudstream3.extractors
+
+import android.util.Log
+import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.utils.*
+
+open class PixelDrain : ExtractorApi() {
+    override val name            = "PixelDrain"
+    override val mainUrl         = "https://pixeldrain.com"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+        val ext_ref      = referer ?: ""
+        val pixel_id     = Regex("""([^\/]+)(?=\?download)""").find(url)?.groupValues?.get(1)
+        val downloadLink = "${mainUrl}/api/file/${pixel_id}?download"
+        Log.d("Kekik_${this.name}", "downloadLink » ${downloadLink}")
+
+        callback.invoke(
+            ExtractorLink(
+                source  = "pixeldrain - ${pixel_id}",
+                name    = "pixeldrain - ${pixel_id}",
+                url     = downloadLink,
+                referer = "${mainUrl}/u/${pixel_id}?download",
+                quality = Qualities.Unknown.value,
+                type    = INFER_TYPE
+            )
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Pixeldrain.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Pixeldrain.kt
deleted file mode 100644
index 9b481240..00000000
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Pixeldrain.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.lagradost.cloudstream3.extractors
-
-import com.lagradost.cloudstream3.SubtitleFile
-import com.lagradost.cloudstream3.utils.ExtractorApi
-import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.Qualities
-
-open class Pixeldrain : ExtractorApi() {
-    override val name = "Pixeldrain"
-    override val mainUrl = "https://pixeldrain.com"
-    override val requiresReferer = false
-    override suspend fun getUrl(
-        url: String,
-        referer: String?,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
-        val mId = Regex("/([ul]/[\\da-zA-Z\\-]+)").find(url)?.groupValues?.get(1)?.split("/")
-        callback.invoke(
-            ExtractorLink(
-                this.name,
-                this.name,
-                "$mainUrl/api/file/${mId?.last() ?: return}?download",
-                url,
-                Qualities.Unknown.value,
-            )
-        )
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Rabbitstream.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Rabbitstream.kt
index d5b52dd7..498eb6a4 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Rabbitstream.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Rabbitstream.kt
@@ -16,13 +16,13 @@ import javax.crypto.Cipher
 import javax.crypto.spec.IvParameterSpec
 import javax.crypto.spec.SecretKeySpec
 
-// Code found in https://github.com/theonlymo/keys
-// special credits to @theonlymo for providing key
+// Code found in https://github.com/Claudemirovsky/keys
+// special credits to @Claudemirovsky for providing key
 class Megacloud : Rabbitstream() {
     override val name = "Megacloud"
     override val mainUrl = "https://megacloud.tv"
     override val embed = "embed-2/ajax/e-1"
-    override val key = "https://raw.githubusercontent.com/theonlymo/keys/e1/key"
+    override val key = "https://raw.githubusercontent.com/Claudemirovsky/keys/e1/key"
 }
 
 class Dokicloud : Rabbitstream() {
@@ -35,7 +35,7 @@ open class Rabbitstream : ExtractorApi() {
     override val mainUrl = "https://rabbitstream.net"
     override val requiresReferer = false
     open val embed = "ajax/embed-4"
-    open val key = "https://raw.githubusercontent.com/theonlymo/keys/e4/key"
+    open val key = "https://raw.githubusercontent.com/Claudemirovsky/keys/e4/key"
 
     override suspend fun getUrl(
         url: String,
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/RapidVidExtractor.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/RapidVidExtractor.kt
new file mode 100644
index 00000000..a0d830cf
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/RapidVidExtractor.kt
@@ -0,0 +1,50 @@
+// ! Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
+
+package com.lagradost.cloudstream3.extractors
+
+import android.util.Log
+import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.utils.*
+
+open class RapidVid : ExtractorApi() {
+    override val name            = "RapidVid"
+    override val mainUrl         = "https://rapidvid.net"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+        val ext_ref   = referer ?: ""
+        val video_req = app.get(url, referer=ext_ref).text
+
+		val sub_urls = mutableSetOf<String>()
+        Regex("""captions\",\"file\":\"([^\"]+)\",\"label\":\"([^\"]+)\"""").findAll(video_req).forEach {
+            val (sub_url, sub_lang) = it.destructured
+
+			if (sub_url in sub_urls) { return@forEach }
+ 			sub_urls.add(sub_url)
+
+            subtitleCallback.invoke(
+                SubtitleFile(
+                    lang = sub_lang.replace("\\u0131", "ı").replace("\\u0130", "İ").replace("\\u00fc", "ü").replace("\\u00e7", "ç"),
+                    url  = fixUrl(sub_url.replace("\\", ""))
+                )
+            )
+        }
+
+        val extracted_value = Regex("""file": "(.*)",""").find(video_req)?.groupValues?.get(1) ?: throw ErrorLoadingException("File not found")
+
+        val bytes   = extracted_value.split("\\x").filter { it.isNotEmpty() }.map { it.toInt(16).toByte() }.toByteArray()
+        val decoded = String(bytes, Charsets.UTF_8)
+        Log.d("Kekik_${this.name}", "decoded » ${decoded}")
+
+        callback.invoke(
+            ExtractorLink(
+                source  = this.name,
+                name    = this.name,
+                url     = decoded,
+                referer = ext_ref,
+                quality = Qualities.Unknown.value,
+                isM3u8  = true
+            )
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/SibNetExtractor.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/SibNetExtractor.kt
new file mode 100644
index 00000000..a8bcee31
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/SibNetExtractor.kt
@@ -0,0 +1,33 @@
+// ! Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
+
+package com.lagradost.cloudstream3.extractors
+
+import android.util.Log
+import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.utils.*
+
+open class SibNet : ExtractorApi() {
+    override val name            = "SibNet"
+    override val mainUrl         = "https://video.sibnet.ru"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+        val ext_ref   = referer ?: ""
+        val i_source  = app.get(url, referer=ext_ref).text
+        var m3u_link  = Regex("""player.src\(\[\{src: \"([^\"]+)""").find(i_source)?.groupValues?.get(1) ?: throw ErrorLoadingException("m3u link not found")
+
+        m3u_link = "${mainUrl}${m3u_link}"
+        Log.d("Kekik_${this.name}", "m3u_link » ${m3u_link}")
+
+        callback.invoke(
+            ExtractorLink(
+                source  = this.name,
+                name    = this.name,
+                url     = m3u_link,
+                referer = url,
+                quality = Qualities.Unknown.value,
+                type    = INFER_TYPE
+            )
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/TRsTXExtractor.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/TRsTXExtractor.kt
new file mode 100644
index 00000000..645d7c0e
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/TRsTXExtractor.kt
@@ -0,0 +1,73 @@
+// ! Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
+
+package com.lagradost.cloudstream3.extractors
+
+import android.util.Log
+import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.utils.*
+import com.fasterxml.jackson.annotation.JsonProperty
+
+open class TRsTX : ExtractorApi() {
+    override val name            = "TRsTX"
+    override val mainUrl         = "https://trstx.org"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+        val ext_ref = referer ?: ""
+
+        val video_req = app.get(url, referer=ext_ref).text
+
+        val file     = Regex("""file\":\"([^\"]+)""").find(video_req)?.groupValues?.get(1) ?: throw ErrorLoadingException("File not found")
+        val postLink = "${mainUrl}/" + file.replace("\\", "")
+        val rawList  = app.post(postLink, referer=ext_ref).parsedSafe<List<Any>>() ?: throw ErrorLoadingException("Post link not found")
+
+        val postJson: List<TrstxVideoData> = rawList.drop(1).map { item ->
+            val mapItem = item as Map<*, *>
+            TrstxVideoData(
+                title = mapItem["title"] as? String,
+                file  = mapItem["file"]  as? String
+            )
+        }
+        Log.d("Kekik_${this.name}", "postJson » ${postJson}")
+
+		val vid_links = mutableSetOf<String>()
+        val vid_map   = mutableListOf<Map<String, String>>()
+        for (item in postJson) {
+            if (item.file == null || item.title == null) continue
+
+            val fileUrl   = "${mainUrl}/playlist/" + item.file.substring(1) + ".txt"
+            val videoData = app.post(fileUrl, referer=ext_ref).text
+
+			if (videoData in vid_links) { continue }
+ 			vid_links.add(videoData)
+
+            vid_map.add(mapOf(
+                "title"     to item.title,
+                "videoData" to videoData
+            ))
+        }
+
+
+        for (mapEntry in vid_map) {
+            Log.d("Kekik_${this.name}", "mapEntry » ${mapEntry}")
+            val title    = mapEntry["title"] ?: continue
+            val m3u_link = mapEntry["videoData"] ?: continue
+
+	        callback.invoke(
+                ExtractorLink(
+                    source  = this.name,
+                    name    = "${this.name} - ${title}",
+                    url     = m3u_link,
+                    referer = ext_ref,
+                    quality = Qualities.Unknown.value,
+                    type    = INFER_TYPE
+                )
+            )
+        }
+    }
+
+    data class TrstxVideoData(
+        @JsonProperty("title") val title: String? = null,
+        @JsonProperty("file")  val file: String?  = null
+    )
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/TauVideoExtractor.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/TauVideoExtractor.kt
new file mode 100644
index 00000000..2478edc1
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/TauVideoExtractor.kt
@@ -0,0 +1,45 @@
+// ! Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
+
+package com.lagradost.cloudstream3.extractors
+
+import android.util.Log
+import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.utils.*
+import com.fasterxml.jackson.annotation.JsonProperty
+
+open class TauVideo : ExtractorApi() {
+    override val name            = "TauVideo"
+    override val mainUrl         = "https://tau-video.xyz"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+        val ext_ref   = referer ?: ""
+        val video_key = url.split("/").last()
+        val video_url = "${mainUrl}/api/video/${video_key}"
+        Log.d("Kekik_${this.name}", "video_url » ${video_url}")
+
+        val api = app.get(video_url).parsedSafe<TauVideoUrls>() ?: throw ErrorLoadingException("TauVideo")
+
+        for (video in api.urls) {
+            callback.invoke(
+                ExtractorLink(
+                    source  = this.name,
+                    name    = this.name,
+                    url     = video.url,
+                    referer = ext_ref,
+                    quality = getQualityFromName(video.label),
+                    type    = INFER_TYPE
+                )
+            )
+        }
+    }
+
+    data class TauVideoUrls(
+        @JsonProperty("urls") val urls: List<TauVideoData>
+    )
+
+    data class TauVideoData(
+        @JsonProperty("url")   val url: String,
+        @JsonProperty("label") val label: String,
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/VidMoxyExtractor.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/VidMoxyExtractor.kt
new file mode 100644
index 00000000..b963fe56
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/VidMoxyExtractor.kt
@@ -0,0 +1,50 @@
+// ! Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
+
+package com.lagradost.cloudstream3.extractors
+
+import android.util.Log
+import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.utils.*
+
+open class VidMoxy : ExtractorApi() {
+    override val name            = "VidMoxy"
+    override val mainUrl         = "https://vidmoxy.com"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+        val ext_ref   = referer ?: ""
+        val video_req = app.get(url, referer=ext_ref).text
+
+		val sub_urls = mutableSetOf<String>()
+        Regex("""captions\",\"file\":\"([^\"]+)\",\"label\":\"([^\"]+)\"""").findAll(video_req).forEach {
+            val (sub_url, sub_lang) = it.destructured
+
+			if (sub_url in sub_urls) { return@forEach }
+ 			sub_urls.add(sub_url)
+
+            subtitleCallback.invoke(
+                SubtitleFile(
+                    lang = sub_lang.replace("\\u0131", "ı").replace("\\u0130", "İ").replace("\\u00fc", "ü").replace("\\u00e7", "ç"),
+                    url  = fixUrl(sub_url.replace("\\", ""))
+                )
+            )
+        }
+
+        val extracted_value = Regex("""file": "(.*)",""").find(video_req)?.groupValues?.get(1) ?: throw ErrorLoadingException("File not found")
+
+        val bytes   = extracted_value.split("\\x").filter { it.isNotEmpty() }.map { it.toInt(16).toByte() }.toByteArray()
+        val decoded = String(bytes, Charsets.UTF_8)
+        Log.d("Kekik_${this.name}", "decoded » ${decoded}")
+
+        callback.invoke(
+            ExtractorLink(
+                source  = this.name,
+                name    = this.name,
+                url     = decoded,
+                referer = ext_ref,
+                quality = Qualities.Unknown.value,
+                isM3u8  = true
+            )
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/VideoSeyredExtractor.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/VideoSeyredExtractor.kt
new file mode 100644
index 00000000..3060bb92
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/VideoSeyredExtractor.kt
@@ -0,0 +1,72 @@
+// ! Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
+
+package com.lagradost.cloudstream3.extractors
+
+import android.util.Log
+import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.utils.*
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.fasterxml.jackson.module.kotlin.readValue
+
+open class VideoSeyred : ExtractorApi() {
+    override val name            = "VideoSeyred"
+    override val mainUrl         = "https://videoseyred.in"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+        val ext_ref   = referer ?: ""
+        val video_id  = url.substringAfter("embed/").substringBefore("?")
+        val video_url = "${mainUrl}/playlist/${video_id}.json"
+        Log.d("Kekik_${this.name}", "video_url » ${video_url}")
+
+        val response_raw                          = app.get(video_url)
+        val response_list:List<VideoSeyredSource> = jacksonObjectMapper().readValue(response_raw.text) ?: throw ErrorLoadingException("VideoSeyred")
+        val response                              = response_list[0] ?: throw ErrorLoadingException("VideoSeyred")
+
+        for (track in response.tracks) {
+            if (track.label != null && track.kind == "captions") {
+                subtitleCallback.invoke(
+                    SubtitleFile(
+                        lang = track.label,
+                        url  = fixUrl(track.file)
+                    )
+                )
+            }
+        }
+
+        for (source in response.sources) {
+            callback.invoke(
+                ExtractorLink(
+                    source  = this.name,
+                    name    = this.name,
+                    url     = source.file,
+                    referer = ext_ref,
+                    quality = Qualities.Unknown.value,
+                    type    = INFER_TYPE
+                )
+            )
+        }
+    }
+
+    data class VideoSeyredSource(
+        @JsonProperty("image")   val image: String,
+        @JsonProperty("title")   val title: String,
+        @JsonProperty("sources") val sources: List<VSSource>,
+        @JsonProperty("tracks")  val tracks: List<VSTrack>
+    )
+
+    data class VSSource(
+        @JsonProperty("file")    val file: String,
+        @JsonProperty("type")    val type: String,
+        @JsonProperty("default") val default: String
+    )
+
+    data class VSTrack(
+        @JsonProperty("file")     val file: String,
+        @JsonProperty("kind")     val kind: String,
+        @JsonProperty("language") val language: String? = null,
+        @JsonProperty("label")    val label: String?    = null,
+        @JsonProperty("default")  val default: String?  = null
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Vidplay.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Vidplay.kt
index 6e3e16a2..463c1d1f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Vidplay.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Vidplay.kt
@@ -12,10 +12,22 @@ import javax.crypto.spec.SecretKeySpec
 
 // Code found in https://github.com/Claudemirovsky/worstsource-keys
 // special credits to @Claudemirovsky for providing key
+
+class MyCloud : Vidplay() {
+    override val name = "MyCloud"
+    override val mainUrl = "https://mcloud.bz"
+}
+
+class VidplayOnline : Vidplay() {
+    override val mainUrl = "https://vidplay.online"
+}
+
 open class Vidplay : ExtractorApi() {
     override val name = "Vidplay"
     override val mainUrl = "https://vidplay.site"
     override val requiresReferer = true
+    open val key =
+        "https://raw.githubusercontent.com/Claudemirovsky/worstsource-keys/keys/keys.json"
 
     override suspend fun getUrl(
         url: String,
@@ -44,8 +56,7 @@ open class Vidplay : ExtractorApi() {
     }
 
     private suspend fun getKeys(): List<String> {
-        return app.get("https://raw.githubusercontent.com/Claudemirovsky/worstsource-keys/keys/keys.json")
-            .parsed()
+        return app.get(key).parsed()
     }
 
     private suspend fun callFutoken(id: String, url: String): String? {
@@ -89,4 +100,4 @@ open class Vidplay : ExtractorApi() {
         @JsonProperty("result") val result: Result? = null,
     )
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
index 8e87cc99..025e6fb6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
@@ -477,13 +477,13 @@ object PluginManager {
         Log.i(TAG, "Loading plugin: $data")
 
         return try {
-            /* in case of android 14 then
+            // in case of android 14 then
             try {
                 File(filePath).setReadOnly()
-            } catch (t : Throwable) {
+            } catch (t: Throwable) {
                 Log.e(TAG, "Failed to set dex as readonly")
                 logError(t)
-            }*/
+            }
 
             val loader = PathClassLoader(filePath, context.classLoader)
             var manifest: Plugin.Manifest
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncAPI.kt
index ed496326..045fdc94 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncAPI.kt
@@ -1,6 +1,8 @@
 package com.lagradost.cloudstream3.syncproviders
 
 import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.ui.SyncWatchType
+import com.lagradost.cloudstream3.ui.WatchType
 import com.lagradost.cloudstream3.ui.library.ListSorting
 import com.lagradost.cloudstream3.ui.result.UiText
 import me.xdrop.fuzzywuzzy.FuzzySearch
@@ -61,7 +63,7 @@ interface SyncAPI : OAuth2API {
     ) : SearchResponse
 
     abstract class AbstractSyncStatus {
-        abstract var status: Int
+        abstract var status: SyncWatchType
 
         /** 1-10 */
         abstract var score: Int?
@@ -70,8 +72,9 @@ interface SyncAPI : OAuth2API {
         abstract var maxEpisodes: Int?
     }
 
+
     data class SyncStatus(
-        override var status: Int,
+        override var status: SyncWatchType,
         /** 1-10 */
         override var score: Int?,
         override var watchedEpisodes: Int?,
@@ -166,5 +169,8 @@ interface SyncAPI : OAuth2API {
         override var posterHeaders: Map<String, String>?,
         override var quality: SearchQuality?,
         override var id: Int? = null,
+        val plot : String? = null,
+        val rating: Int? = null,
+        val tags: List<String>? = null,
     ) : SearchResponse
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/AniListApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/AniListApi.kt
index d0c88901..5c02e7f7 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/AniListApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/AniListApi.kt
@@ -13,6 +13,7 @@ import com.lagradost.cloudstream3.syncproviders.AccountManager
 import com.lagradost.cloudstream3.syncproviders.AuthAPI
 import com.lagradost.cloudstream3.syncproviders.SyncAPI
 import com.lagradost.cloudstream3.syncproviders.SyncIdName
+import com.lagradost.cloudstream3.ui.SyncWatchType
 import com.lagradost.cloudstream3.ui.library.ListSorting
 import com.lagradost.cloudstream3.ui.result.txt
 import com.lagradost.cloudstream3.utils.AppUtils.parseJson
@@ -165,7 +166,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
         return SyncAPI.SyncStatus(
             score = data.score,
             watchedEpisodes = data.progress,
-            status = data.type?.value ?: return null,
+            status = SyncWatchType.fromInternalId(data.type?.value ?: return null),
             isFavorite = data.isFavourite,
             maxEpisodes = data.episodes,
         )
@@ -174,7 +175,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
     override suspend fun score(id: String, status: SyncAPI.AbstractSyncStatus): Boolean {
         return postDataAboutId(
             id.toIntOrNull() ?: return false,
-            fromIntToAnimeStatus(status.status),
+            fromIntToAnimeStatus(status.status.internalId),
             status.score,
             status.watchedEpisodes
         ).also {
@@ -595,7 +596,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
         //@JsonProperty("source") val source: String,
         @JsonProperty("episodes") val episodes: Int,
         @JsonProperty("title") val title: Title,
-        //@JsonProperty("description") val description: String,
+        @JsonProperty("description") val description: String?,
         @JsonProperty("coverImage") val coverImage: CoverImage,
         @JsonProperty("synonyms") val synonyms: List<String>,
         @JsonProperty("nextAiringEpisode") val nextAiringEpisode: SeasonNextAiringEpisode?,
@@ -629,7 +630,8 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
                 ?: this.media.coverImage.medium,
                 null,
                 null,
-                null
+                null,
+                plot = this.media.description
             )
         }
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/MALApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/MALApi.kt
index 02826401..fdbe763a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/MALApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/MALApi.kt
@@ -16,6 +16,7 @@ import com.lagradost.cloudstream3.syncproviders.AccountManager
 import com.lagradost.cloudstream3.syncproviders.AuthAPI
 import com.lagradost.cloudstream3.syncproviders.SyncAPI
 import com.lagradost.cloudstream3.syncproviders.SyncIdName
+import com.lagradost.cloudstream3.ui.SyncWatchType
 import com.lagradost.cloudstream3.ui.library.ListSorting
 import com.lagradost.cloudstream3.ui.result.txt
 import com.lagradost.cloudstream3.utils.AppUtils.parseJson
@@ -94,7 +95,7 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
     override suspend fun score(id: String, status: SyncAPI.AbstractSyncStatus): Boolean {
         return setScoreRequest(
             id.toIntOrNull() ?: return false,
-            fromIntToAnimeStatus(status.status),
+            fromIntToAnimeStatus(status.status.internalId),
             status.score,
             status.watchedEpisodes
         ).also {
@@ -245,7 +246,7 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
             getDataAboutMalId(internalId)?.my_list_status //?: throw ErrorLoadingException("No my_list_status")
         return SyncAPI.SyncStatus(
             score = data?.score,
-            status = malStatusAsString.indexOf(data?.status),
+            status = SyncWatchType.fromInternalId(malStatusAsString.indexOf(data?.status)) ,
             isFavorite = null,
             watchedEpisodes = data?.num_episodes_watched,
         )
@@ -442,6 +443,7 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
                 this.node.main_picture?.large ?: this.node.main_picture?.medium,
                 null,
                 null,
+                plot = this.node.synopsis,
             )
         }
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SimklApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SimklApi.kt
index 3a37a228..e0b13ba6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SimklApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SimklApi.kt
@@ -24,6 +24,7 @@ import com.lagradost.cloudstream3.syncproviders.AccountManager
 import com.lagradost.cloudstream3.syncproviders.AuthAPI
 import com.lagradost.cloudstream3.syncproviders.SyncAPI
 import com.lagradost.cloudstream3.syncproviders.SyncIdName
+import com.lagradost.cloudstream3.ui.SyncWatchType
 import com.lagradost.cloudstream3.ui.library.ListSorting
 import com.lagradost.cloudstream3.ui.result.txt
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
@@ -671,7 +672,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
                         this.movie.poster?.let { getPosterUrl(it) },
                         null,
                         null,
-                        movie.ids.simkl
+                        movie.ids.simkl,
                     )
                 }
             }
@@ -779,7 +780,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
     }
 
     class SimklSyncStatus(
-        override var status: Int,
+        override var status: SyncWatchType,
         override var score: Int?,
         val oldScore: Int?,
         override var watchedEpisodes: Int?,
@@ -826,7 +827,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
 
         if (foundItem != null) {
             return SimklSyncStatus(
-                status = foundItem.status?.let { SimklListStatusType.fromString(it)?.value }
+                status = foundItem.status?.let { SyncWatchType.fromInternalId(SimklListStatusType.fromString(it)?.value) }
                     ?: return null,
                 score = foundItem.user_rating,
                 watchedEpisodes = foundItem.watched_episodes_count,
@@ -838,7 +839,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
             )
         } else {
             return SimklSyncStatus(
-                status = SimklListStatusType.None.value,
+                status = SyncWatchType.fromInternalId(SimklListStatusType.None.value) ,
                 score = 0,
                 watchedEpisodes = 0,
                 maxEpisodes = if (searchResult.type == "movie") 0 else searchResult.total_episodes,
@@ -858,7 +859,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
         val builder = SimklScoreBuilder.Builder()
             .apiUrl(this.mainUrl)
             .score(status.score, simklStatus?.oldScore)
-            .status(status.status, (status as? SimklSyncStatus)?.oldStatus?.let { oldStatus ->
+            .status(status.status.internalId, (status as? SimklSyncStatus)?.oldStatus?.let { oldStatus ->
                 SimklListStatusType.values().firstOrNull {
                     it.originalName == oldStatus
                 }?.value
@@ -871,7 +872,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
         val episodes = simklStatus?.episodeConstructor?.getEpisodes()
 
         // All episodes if marked as completed
-        val watchedEpisodes = if (status.status == SimklListStatusType.Completed.value) {
+        val watchedEpisodes = if (status.status.internalId == SimklListStatusType.Completed.value) {
             episodes?.size
         } else {
             status.watchedEpisodes
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt
index 6c0e7796..688363e9 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt
@@ -8,7 +8,7 @@ import android.widget.*
 import androidx.appcompat.app.AlertDialog
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.json.JsonMapper
-import com.fasterxml.jackson.module.kotlin.KotlinModule
+import com.fasterxml.jackson.module.kotlin.kotlinModule
 import com.google.android.gms.cast.MediaQueueItem
 import com.google.android.gms.cast.MediaSeekOptions
 import com.google.android.gms.cast.MediaStatus.REPEAT_MODE_REPEAT_OFF
@@ -98,7 +98,7 @@ data class MetadataHolder(
 
 class SelectSourceController(val view: ImageView, val activity: ControllerActivity) :
     UIController() {
-    private val mapper: JsonMapper = JsonMapper.builder().addModule(KotlinModule())
+    private val mapper: JsonMapper = JsonMapper.builder().addModule(kotlinModule())
         .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false).build()
 
     init {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt
index eb4eb666..9532d1a9 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt
@@ -15,4 +15,27 @@ enum class WatchType(val internalId: Int, @StringRes val stringRes: Int, @Drawab
     companion object {
         fun fromInternalId(id: Int?) = values().find { value -> value.internalId == id } ?: NONE
     }
-}
\ No newline at end of file
+}
+
+enum class SyncWatchType(val internalId: Int, @StringRes val stringRes: Int, @DrawableRes val iconRes: Int) {
+    /*
+          -1 -> None
+          0 -> Watching
+          1 -> Completed
+          2 -> OnHold
+          3 -> Dropped
+          4 -> PlanToWatch
+          5 -> ReWatching
+          */
+    NONE(-1, R.string.type_none, R.drawable.ic_baseline_add_24),
+    WATCHING(0, R.string.type_watching, R.drawable.ic_baseline_bookmark_24),
+    COMPLETED(1, R.string.type_completed, R.drawable.ic_baseline_bookmark_24),
+    ONHOLD(2, R.string.type_on_hold, R.drawable.ic_baseline_bookmark_24),
+    DROPPED(3, R.string.type_dropped, R.drawable.ic_baseline_bookmark_24),
+    PLANTOWATCH(4, R.string.type_plan_to_watch, R.drawable.ic_baseline_bookmark_24),
+    REWATCHING(5, R.string.type_re_watching, R.drawable.ic_baseline_bookmark_24);
+
+    companion object {
+        fun fromInternalId(id: Int?) = values().find { value -> value.internalId == id } ?: NONE
+    }
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt
index c60c8ef0..a37fbcb3 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt
@@ -33,6 +33,7 @@ import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.openBrowser
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
 import com.lagradost.cloudstream3.CommonActivity
+import com.lagradost.cloudstream3.MainActivity
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.databinding.FragmentLibraryBinding
 import com.lagradost.cloudstream3.mvvm.Resource
@@ -293,11 +294,12 @@ class LibraryFragment : Fragment() {
 
                 when (searchClickCallback.action) {
                     SEARCH_ACTION_SHOW_METADATA -> {
-                        activity?.showPluginSelectionDialog(
+                        (activity as? MainActivity)?.loadPopup(searchClickCallback.card, load = false)
+                    /*activity?.showPluginSelectionDialog(
                             syncId,
                             syncName,
                             searchClickCallback.card.apiName
-                        )
+                        )*/
                     }
 
                     SEARCH_ACTION_LOAD -> {
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 74ea71e7..031f14fe 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
@@ -499,7 +499,11 @@ class CS3IPlayer : IPlayer {
         if (saveTime)
             updatedTime()
 
-        exoPlayer?.release()
+        exoPlayer?.apply {
+            setPlayWhenReady(false)
+            stop()
+            release()
+        }
         //simpleCache?.release()
         currentTextRenderer = null
 
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 819e50ba..6508721a 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
@@ -75,6 +75,7 @@ private const val SUBTITLE_DELAY_BUNDLE_KEY = "subtitle_delay"
 
 // All the UI Logic for the player
 open class FullScreenPlayer : AbstractPlayerFragment() {
+    private var isVerticalOrientation: Boolean = false
     protected open var lockRotation = true
     protected open var isFullScreenPlayer = true
     protected open var isTv = false
@@ -111,6 +112,8 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
     protected var playerResizeEnabled = false
     protected var doubleTapEnabled = false
     protected var doubleTapPauseEnabled = true
+    protected var playerRotateEnabled = false
+    protected var autoPlayerRotateEnabled = false
 
     protected var subtitleDelay
         set(value) = try {
@@ -286,6 +289,38 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
             player.getCurrentPreferredSubtitle() == null
     }
 
+    private fun restoreOrientationWithSensor(activity: Activity){
+        val currentOrientation = activity.resources.configuration.orientation
+        var orientation = 0
+        when (currentOrientation) {
+            Configuration.ORIENTATION_LANDSCAPE ->
+                orientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
+
+            Configuration.ORIENTATION_SQUARE, Configuration.ORIENTATION_UNDEFINED ->
+                orientation = dynamicOrientation()
+
+            Configuration.ORIENTATION_PORTRAIT ->
+                orientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT
+        }
+        activity.requestedOrientation = orientation
+    }
+
+    private fun toggleOrientationWithSensor(activity: Activity){
+        val currentOrientation = activity.resources.configuration.orientation
+        var orientation = 0
+        when (currentOrientation) {
+            Configuration.ORIENTATION_LANDSCAPE ->
+                orientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT
+
+            Configuration.ORIENTATION_SQUARE, Configuration.ORIENTATION_UNDEFINED ->
+                orientation = dynamicOrientation()
+
+            Configuration.ORIENTATION_PORTRAIT ->
+                orientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
+        }
+        activity.requestedOrientation = orientation
+    }
+
     open fun lockOrientation(activity: Activity) {
         val display =
             (activity.getSystemService(Context.WINDOW_SERVICE) as WindowManager).defaultDisplay
@@ -293,24 +328,39 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         val currentOrientation = activity.resources.configuration.orientation
         var orientation = 0
         when (currentOrientation) {
-            Configuration.ORIENTATION_LANDSCAPE -> orientation =
-                if (rotation == Surface.ROTATION_0 || rotation == Surface.ROTATION_90) ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE else ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE
+            Configuration.ORIENTATION_LANDSCAPE ->
+                orientation =
+                    if (rotation == Surface.ROTATION_0 || rotation == Surface.ROTATION_90)
+                        ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+                    else
+                        ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE
 
-            Configuration.ORIENTATION_SQUARE, Configuration.ORIENTATION_UNDEFINED, Configuration.ORIENTATION_PORTRAIT -> ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
-            //Configuration.ORIENTATION_PORTRAIT -> orientation =
-            //    if (rotation == Surface.ROTATION_0 || rotation == Surface.ROTATION_270) ActivityInfo.SCREEN_ORIENTATION_PORTRAIT else ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT
+            Configuration.ORIENTATION_SQUARE, Configuration.ORIENTATION_UNDEFINED ->
+                orientation = dynamicOrientation()
+
+            Configuration.ORIENTATION_PORTRAIT ->
+                orientation =
+                    if (rotation == Surface.ROTATION_0 || rotation == Surface.ROTATION_270)
+                        ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+                    else
+                        ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT
         }
         activity.requestedOrientation = orientation
     }
 
-    private fun updateOrientation() {
+    private fun updateOrientation(ignoreDynamicOrientation: Boolean = false) {
         activity?.apply {
             if(lockRotation) {
                 if(isLocked) {
                     lockOrientation(this)
                 }
                 else {
-                    requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
+                    if(ignoreDynamicOrientation){
+                        // restore when lock is disabled
+                        restoreOrientationWithSensor(this)
+                    } else {
+                        this.requestedOrientation = dynamicOrientation()
+                    }
                 }
             }
         }
@@ -584,7 +634,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         }
 
         isLocked = !isLocked
-        updateOrientation()
+        updateOrientation(true) // set true to ignore auto rotate to stay in current orientation
 
         if (isLocked && isShowing) {
             playerBinding?.playerHolder?.postDelayed({
@@ -1326,6 +1376,14 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                     ctx.getString(R.string.playback_speed_enabled_key),
                     false
                 )
+                playerRotateEnabled = settingsManager.getBoolean(
+                    ctx.getString(R.string.rotate_video_key),
+                    false
+                )
+                autoPlayerRotateEnabled = settingsManager.getBoolean(
+                    ctx.getString(R.string.auto_rotate_video_key),
+                    false
+                )
                 playerResizeEnabled =
                     settingsManager.getBoolean(
                         ctx.getString(R.string.player_resize_enabled_key),
@@ -1362,6 +1420,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
             playerBinding?.apply {
                 playerSpeedBtt.isVisible = playBackSpeedEnabled
                 playerResizeBtt.isVisible = playerResizeEnabled
+                playerRotateBtt.isVisible = playerRotateEnabled
             }
         } catch (e: Exception) {
             logError(e)
@@ -1376,6 +1435,11 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                 player.handleEvent(CSPlayerEvent.SkipCurrentChapter)
             }
 
+            playerRotateBtt.setOnClickListener {
+                autoHide()
+                toggleRotate()
+            }
+
             // init clicks
             playerResizeBtt.setOnClickListener {
                 autoHide()
@@ -1481,4 +1545,28 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
             logError(e)
         }
     }
+
+    @SuppressLint("SourceLockedOrientationActivity")
+    private fun toggleRotate() {
+        activity?.let {
+            toggleOrientationWithSensor(it)
+        }
+    }
+
+    override fun playerDimensionsLoaded(width: Int, height: Int) {
+        isVerticalOrientation = height > width
+        updateOrientation()
+    }
+
+    private fun dynamicOrientation(): Int {
+        return if (autoPlayerRotateEnabled) {
+            if (isVerticalOrientation) {
+                ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT
+            } else {
+                ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
+            }
+        } else {
+            ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE // default orientation
+        }
+    }
 }
\ No newline at end of file
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 43e51e55..0a626471 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
@@ -1237,6 +1237,7 @@ class GeneratorPlayer : FullScreenPlayer() {
     }
 
     override fun playerDimensionsLoaded(width: Int, height: Int) {
+        super.playerDimensionsLoaded(width, height)
         setPlayerDimen(width to height)
     }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
index 0541a40f..ad34309c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
@@ -851,7 +851,7 @@ open class ResultFragmentPhone : FullScreenPlayer() {
 
                         val d = status.value
                         resultSyncRating.value = d.score?.toFloat() ?: 0.0f
-                        resultSyncCheck.setItemChecked(d.status + 1, true)
+                        resultSyncCheck.setItemChecked(d.status.internalId + 1, true)
                         val watchedEpisodes = d.watchedEpisodes ?: 0
                         currentSyncProgress = watchedEpisodes
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
index 101a65ef..e60c388b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
@@ -826,16 +826,15 @@ class ResultViewModel2 : ViewModel() {
     private val _selectPopup: MutableLiveData<SelectPopup?> = MutableLiveData(null)
     val selectPopup: LiveData<SelectPopup?> = _selectPopup
 
-
     fun updateWatchStatus(
         status: WatchType,
         context: Context?,
         loadResponse: LoadResponse? = null,
         statusChangedCallback: ((statusChanged: Boolean) -> Unit)? = null
     ) {
-        val response = loadResponse ?: currentResponse ?: return
-
-        val currentId = response.getId()
+        val (response,currentId) = loadResponse?.let { load ->
+            (load to load.getId())
+        } ?: ((currentResponse ?: return) to (currentId ?: return))
 
         val currentStatus = getResultWatchState(currentId)
 
@@ -885,13 +884,17 @@ class ResultViewModel2 : ViewModel() {
                         response.type,
                         response.posterUrl,
                         response.year,
-                        response.syncData
+                        response.syncData,
+                        plot = response.plot,
+                        tags = response.tags,
+                        rating = response.rating
                     )
                 )
             }
 
             if (currentStatus != status) {
                 MainActivity.bookmarksUpdatedEvent(true)
+                MainActivity.reloadLibraryEvent(true)
             }
 
             _watchStatus.postValue(status)
@@ -926,7 +929,7 @@ class ResultViewModel2 : ViewModel() {
         val response = currentResponse ?: return
         if (response !is EpisodeResponse) return
 
-        val currentId = response.getId()
+        val currentId = currentId ?: return
 
         if (isSubscribed) {
             removeSubscribedData(currentId)
@@ -969,7 +972,10 @@ class ResultViewModel2 : ViewModel() {
                         response.type,
                         response.posterUrl,
                         response.year,
-                        response.syncData
+                        response.syncData,
+                        plot = response.plot,
+                        rating = response.rating,
+                        tags = response.tags
                     )
                 )
 
@@ -994,7 +1000,7 @@ class ResultViewModel2 : ViewModel() {
         val isFavorite = _favoriteStatus.value ?: return
         val response = currentResponse ?: return
 
-        val currentId = response.getId()
+        val currentId = currentId ?: return
 
         if (isFavorite) {
             removeFavoritesData(currentId)
@@ -1036,7 +1042,10 @@ class ResultViewModel2 : ViewModel() {
                         response.type,
                         response.posterUrl,
                         response.year,
-                        response.syncData
+                        response.syncData,
+                        plot = response.plot,
+                        rating = response.rating,
+                        tags = response.tags
                     )
                 )
 
@@ -1839,10 +1848,10 @@ class ResultViewModel2 : ViewModel() {
                             this.japName
                         ).filter { it.length > 2 }
                             .distinct().map {
-                            // this actually would be nice if we improved a bit as 3rd season == season 3 == III ect
+                                // this actually would be nice if we improved a bit as 3rd season == season 3 == III ect
                                 // right now it just removes the dubbed status
                                 it.lowercase().replace(Regex("""\(?[ds]ub(bed)?\)?(\s|$)""") , "").trim()
-                                            },
+                            },
                         TrackerType.getTypes(this.type),
                         this.year
                     )
@@ -1936,6 +1945,7 @@ class ResultViewModel2 : ViewModel() {
 
             postSuccessful(
                 value ?: return@launchSafe,
+                currentId ?: return@launchSafe,
                 currentRepo ?: return@launchSafe,
                 updateEpisodes ?: return@launchSafe,
                 false
@@ -2050,9 +2060,9 @@ class ResultViewModel2 : ViewModel() {
     }
 
     private fun postFavorites(loadResponse: LoadResponse) {
-            val id = loadResponse.getId()
-            val isFavorite = getFavoritesData(id) != null
-            _favoriteStatus.postValue(isFavorite)
+        val id = loadResponse.getId()
+        val isFavorite = getFavoritesData(id) != null
+        _favoriteStatus.postValue(isFavorite)
     }
 
     private fun postEpisodeRange(indexer: EpisodeIndexer?, range: EpisodeRange?) {
@@ -2185,26 +2195,25 @@ class ResultViewModel2 : ViewModel() {
 
     private suspend fun postSuccessful(
         loadResponse: LoadResponse,
+        mainId : Int,
         apiRepository: APIRepository,
         updateEpisodes: Boolean,
         updateFillers: Boolean,
     ) {
+        currentId = mainId
         currentResponse = loadResponse
         postPage(loadResponse, apiRepository)
         postSubscription(loadResponse)
         postFavorites(loadResponse)
+        _watchStatus.postValue(getResultWatchState(mainId))
+
         if (updateEpisodes)
-            postEpisodes(loadResponse, updateFillers)
+            postEpisodes(loadResponse, mainId, updateFillers)
     }
 
-    private suspend fun postEpisodes(loadResponse: LoadResponse, updateFillers: Boolean) {
+    private suspend fun postEpisodes(loadResponse: LoadResponse, mainId : Int, updateFillers: Boolean) {
         _episodes.postValue(Resource.Loading())
 
-        val mainId = loadResponse.getId()
-        currentId = mainId
-
-        _watchStatus.postValue(getResultWatchState(mainId))
-
         if (updateFillers && loadResponse is AnimeLoadResponse) {
             updateFillers(loadResponse.name)
         }
@@ -2561,6 +2570,49 @@ class ResultViewModel2 : ViewModel() {
             }
         }
 
+    data class LoadResponseFromSearch(
+        override var name: String,
+        override var url: String,
+        override var apiName: String,
+        override var type: TvType,
+        override var posterUrl: String?,
+        override var year: Int? = null,
+        override var plot: String? = null,
+        override var rating: Int? = null,
+        override var tags: List<String>? = null,
+        override var duration: Int? = null,
+        override var trailers: MutableList<TrailerData> = mutableListOf(),
+        override var recommendations: List<SearchResponse>? = null,
+        override var actors: List<ActorData>? = null,
+        override var comingSoon: Boolean = false,
+        override var syncData: MutableMap<String, String> = mutableMapOf(),
+        override var posterHeaders: Map<String, String>? = null,
+        override var backgroundPosterUrl: String? = null,
+        override var contentRating: String? = null,
+    ) : LoadResponse
+
+    fun loadSmall(activity: Activity?, searchResponse : SearchResponse) = ioSafe {
+        val url = searchResponse.url
+        _page.postValue(Resource.Loading(url))
+        _episodes.postValue(Resource.Loading())
+        val api = APIHolder.getApiFromNameNull(searchResponse.apiName) ?: APIHolder.getApiFromUrlNull(searchResponse.url) ?: APIRepository.noneApi
+        val repo = APIRepository(api)
+        val response = LoadResponseFromSearch(name = searchResponse.name, url = searchResponse.url, apiName = api.name, type = searchResponse.type ?: TvType.Others,
+            posterUrl = searchResponse.posterUrl).apply {
+            if (searchResponse is SyncAPI.LibraryItem) {
+                this.plot = searchResponse.plot
+                this.rating = searchResponse.personalRating?.times(100) ?: searchResponse.rating
+                this.tags = searchResponse.tags
+            }
+        }
+        val mainId = searchResponse.id ?: response.getId()
+
+        postSuccessful(
+            loadResponse = response,
+            mainId = mainId,
+            apiRepository = repo, updateEpisodes = false, updateFillers =  false)
+    }
+
     fun load(
         activity: Activity?,
         url: String,
@@ -2646,6 +2698,7 @@ class ResultViewModel2 : ViewModel() {
                         loadTrailers(data.value)
                     postSuccessful(
                         data.value,
+                        mainId,
                         updateEpisodes = true,
                         updateFillers = showFillers,
                         apiRepository = repo
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/SyncViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/SyncViewModel.kt
index a3e2ed87..51d3f50c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/SyncViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/SyncViewModel.kt
@@ -10,7 +10,9 @@ import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.SyncApis
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.aniListApi
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.malApi
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.simklApi
 import com.lagradost.cloudstream3.syncproviders.SyncAPI
+import com.lagradost.cloudstream3.ui.SyncWatchType
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.SyncUtil
 import java.util.*
@@ -31,15 +33,15 @@ class SyncViewModel : ViewModel() {
 
     private val repos = SyncApis
 
-    private val _metaResponse: MutableLiveData<Resource<SyncAPI.SyncResult>> =
-        MutableLiveData()
+    private val _metaResponse: MutableLiveData<Resource<SyncAPI.SyncResult>?> =
+        MutableLiveData(null)
 
-    val metadata: LiveData<Resource<SyncAPI.SyncResult>> get() = _metaResponse
+    val metadata: LiveData<Resource<SyncAPI.SyncResult>?> = _metaResponse
 
     private val _userDataResponse: MutableLiveData<Resource<SyncAPI.AbstractSyncStatus>?> =
         MutableLiveData(null)
 
-    val userData: LiveData<Resource<SyncAPI.AbstractSyncStatus>?> get() = _userDataResponse
+    val userData: LiveData<Resource<SyncAPI.AbstractSyncStatus>?> = _userDataResponse
 
     // prefix, id
     private val syncs = mutableMapOf<String, String>()
@@ -55,7 +57,7 @@ class SyncViewModel : ViewModel() {
         MutableLiveData(getMissing())
 
     // pair of name idPrefix isSynced
-    val synced: LiveData<List<CurrentSynced>> get() = _currentSynced
+    val synced: LiveData<List<CurrentSynced>> = _currentSynced
 
     private fun getMissing(): List<CurrentSynced> {
         return repos.map {
@@ -169,7 +171,7 @@ class SyncViewModel : ViewModel() {
         if (which < -1 || which > 5) return // validate input
         val user = userData.value
         if (user is Resource.Success) {
-            user.value.status = which
+            user.value.status = SyncWatchType.fromInternalId(which)
             _userDataResponse.postValue(Resource.Success(user.value))
         }
     }
@@ -279,7 +281,33 @@ class SyncViewModel : ViewModel() {
         setEpisodesDelta(0)
     }
 
+    fun syncName(syncName: String) : String? {
+        // fix because of bad old data :pensive:
+        val realName = when(syncName) {
+            "MAL" -> malApi.idPrefix
+            "Simkl" -> simklApi.idPrefix
+            "AniList" -> aniListApi.idPrefix
+            else -> syncName
+        }
+        return repos.firstOrNull { it.idPrefix == realName }?.idPrefix
+    }
+
+    fun setSync(syncName : String, syncId : String) {
+        syncs.clear()
+        syncs[syncName] = syncId
+    }
+
+    fun clear() {
+        syncs.clear()
+        _metaResponse.postValue(null)
+        _currentSynced.postValue(getMissing())
+        _userDataResponse.postValue(null)
+    }
+
     fun updateMetaAndUser() {
+        _userDataResponse.postValue(Resource.Loading())
+        _metaResponse.postValue(Resource.Loading())
+
         Log.i(TAG, "updateMetaAndUser")
         updateMetadata()
         updateUserData()
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
index ec61edf5..abd7fb9a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
@@ -95,6 +95,7 @@ val appLanguages = arrayListOf(
     Triple("", "മലയാളം", "ml"),
     Triple("", "bahasa Melayu", "ms"),
     Triple("", "ဗမာစာ", "my"),
+    Triple("", "नेपाली", "ne"),
     Triple("", "Nederlands", "nl"),
     Triple("", "norsk nynorsk", "nn"),
     Triple("", "norsk bokmål", "no"),
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/DataStore.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/DataStore.kt
index abcef753..01a64d7d 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/DataStore.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/DataStore.kt
@@ -5,7 +5,7 @@ import android.content.SharedPreferences
 import androidx.preference.PreferenceManager
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.json.JsonMapper
-import com.fasterxml.jackson.module.kotlin.KotlinModule
+import com.fasterxml.jackson.module.kotlin.kotlinModule
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKeyClass
 import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKeyClass
@@ -51,7 +51,7 @@ class PreferenceDelegate<T : Any>(
 }
 
 object DataStore {
-    val mapper: JsonMapper = JsonMapper.builder().addModule(KotlinModule())
+    val mapper: JsonMapper = JsonMapper.builder().addModule(kotlinModule())
         .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false).build()
 
     private fun getPreferences(context: Context): SharedPreferences {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt
index 6babe273..04387d80 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt
@@ -209,7 +209,10 @@ object DataStoreHelper {
         @JsonProperty("year") open val year: Int?,
         @JsonProperty("syncData") open val syncData: Map<String, String>?,
         @JsonProperty("quality") override var quality: SearchQuality?,
-        @JsonProperty("posterHeaders") override var posterHeaders: Map<String, String>?
+        @JsonProperty("posterHeaders") override var posterHeaders: Map<String, String>?,
+        @JsonProperty("plot") open val plot : String? = null,
+        @JsonProperty("rating") open val rating : Int? = null,
+        @JsonProperty("tags") open val tags : List<String>? = null,
     ) : SearchResponse
 
     data class SubscribedData(
@@ -225,8 +228,11 @@ object DataStoreHelper {
         override val year: Int?,
         override val syncData: Map<String, String>? = null,
         override var quality: SearchQuality? = null,
-        override var posterHeaders: Map<String, String>? = null
-    ) : LibrarySearchResponse(id, latestUpdatedTime, name, url, apiName, type, posterUrl, year, syncData, quality, posterHeaders) {
+        override var posterHeaders: Map<String, String>? = null,
+        override val plot: String? = null,
+        override val rating: Int? = null,
+        override val tags: List<String>? = null,
+    ) : LibrarySearchResponse(id, latestUpdatedTime, name, url, apiName, type, posterUrl, year, syncData, quality, posterHeaders, plot,rating,tags) {
         fun toLibraryItem(): SyncAPI.LibraryItem? {
             return SyncAPI.LibraryItem(
                 name,
@@ -236,7 +242,7 @@ object DataStoreHelper {
                 null,
                 null,
                 latestUpdatedTime,
-                apiName, type, posterUrl, posterHeaders, quality, this.id
+                apiName, type, posterUrl, posterHeaders, quality, this.id, plot = this.plot, rating = this.rating, tags = this.tags
             )
         }
     }
@@ -253,8 +259,11 @@ object DataStoreHelper {
         override val year: Int?,
         override val syncData: Map<String, String>? = null,
         override var quality: SearchQuality? = null,
-        override var posterHeaders: Map<String, String>? = null
-    ) : LibrarySearchResponse(id, latestUpdatedTime, name, url, apiName, type, posterUrl, year, syncData, quality, posterHeaders) {
+        override var posterHeaders: Map<String, String>? = null,
+        override val plot: String? = null,
+        override val rating: Int? = null,
+        override val tags: List<String>? = null,
+    ) : LibrarySearchResponse(id, latestUpdatedTime, name, url, apiName, type, posterUrl, year, syncData, quality, posterHeaders, plot) {
         fun toLibraryItem(id: String): SyncAPI.LibraryItem {
             return SyncAPI.LibraryItem(
                 name,
@@ -264,7 +273,7 @@ object DataStoreHelper {
                 null,
                 null,
                 latestUpdatedTime,
-                apiName, type, posterUrl, posterHeaders, quality, this.id
+                apiName, type, posterUrl, posterHeaders, quality, this.id, plot = this.plot, rating = this.rating, tags = this.tags
             )
         }
     }
@@ -281,8 +290,11 @@ object DataStoreHelper {
         override val year: Int?,
         override val syncData: Map<String, String>? = null,
         override var quality: SearchQuality? = null,
-        override var posterHeaders: Map<String, String>? = null
-    ) : LibrarySearchResponse(id, latestUpdatedTime, name, url, apiName, type, posterUrl, year, syncData, quality, posterHeaders) {
+        override var posterHeaders: Map<String, String>? = null,
+        override val plot: String? = null,
+        override val rating: Int? = null,
+        override val tags: List<String>? = null,
+    ) : LibrarySearchResponse(id, latestUpdatedTime, name, url, apiName, type, posterUrl, year, syncData, quality, posterHeaders,plot) {
         fun toLibraryItem(): SyncAPI.LibraryItem? {
             return SyncAPI.LibraryItem(
                 name,
@@ -292,7 +304,7 @@ object DataStoreHelper {
                 null,
                 null,
                 latestUpdatedTime,
-                apiName, type, posterUrl, posterHeaders, quality, this.id
+                apiName, type, posterUrl, posterHeaders, quality, this.id, plot = this.plot, rating = this.rating, tags = this.tags
             )
         }
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
index 2e9dd691..deb0eb3c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
@@ -96,12 +96,27 @@ import com.lagradost.cloudstream3.extractors.Moviesm4u
 import com.lagradost.cloudstream3.extractors.Mp4Upload
 import com.lagradost.cloudstream3.extractors.Mvidoo
 import com.lagradost.cloudstream3.extractors.MwvnVizcloudInfo
+import com.lagradost.cloudstream3.extractors.MyCloud
 import com.lagradost.cloudstream3.extractors.Neonime7n
 import com.lagradost.cloudstream3.extractors.Neonime8n
-import com.lagradost.cloudstream3.extractors.OkRu
-import com.lagradost.cloudstream3.extractors.OkRuHttps
+import com.lagradost.cloudstream3.extractors.Odnoklassniki
+import com.lagradost.cloudstream3.extractors.TauVideo
+import com.lagradost.cloudstream3.extractors.SibNet
+import com.lagradost.cloudstream3.extractors.ContentX
+import com.lagradost.cloudstream3.extractors.Hotlinger
+import com.lagradost.cloudstream3.extractors.HDMomPlayer
+import com.lagradost.cloudstream3.extractors.HDPlayerSystem
+import com.lagradost.cloudstream3.extractors.VideoSeyred
+import com.lagradost.cloudstream3.extractors.PeaceMakerst
+import com.lagradost.cloudstream3.extractors.HDStreamAble
+import com.lagradost.cloudstream3.extractors.RapidVid
+import com.lagradost.cloudstream3.extractors.TRsTX
+import com.lagradost.cloudstream3.extractors.VidMoxy
+import com.lagradost.cloudstream3.extractors.PixelDrain
+import com.lagradost.cloudstream3.extractors.MailRu
+import com.lagradost.cloudstream3.extractors.OkRuSSL
+import com.lagradost.cloudstream3.extractors.OkRuHTTP
 import com.lagradost.cloudstream3.extractors.Okrulink
-import com.lagradost.cloudstream3.extractors.Pixeldrain
 import com.lagradost.cloudstream3.extractors.PlayLtXyz
 import com.lagradost.cloudstream3.extractors.PlayerVoxzer
 import com.lagradost.cloudstream3.extractors.Rabbitstream
@@ -168,6 +183,7 @@ import com.lagradost.cloudstream3.extractors.Vidmoly
 import com.lagradost.cloudstream3.extractors.Vidmolyme
 import com.lagradost.cloudstream3.extractors.Vido
 import com.lagradost.cloudstream3.extractors.Vidplay
+import com.lagradost.cloudstream3.extractors.VidplayOnline
 import com.lagradost.cloudstream3.extractors.Vidstreamz
 import com.lagradost.cloudstream3.extractors.Vizcloud
 import com.lagradost.cloudstream3.extractors.Vizcloud2
@@ -662,11 +678,27 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     Evoload1(),
     UpstreamExtractor(),
 
+    Odnoklassniki(),
+    TauVideo(),
+    SibNet(),
+    ContentX(),
+    Hotlinger(),
+    HDMomPlayer(),
+    HDPlayerSystem(),
+    VideoSeyred(),
+    PeaceMakerst(),
+    HDStreamAble(),
+    RapidVid(),
+    TRsTX(),
+    VidMoxy(),
+    PixelDrain(),
+    MailRu(),
+
     Tomatomatela(),
     TomatomatelalClub(),
     Cinestart(),
-    OkRu(),
-    OkRuHttps(),
+    OkRuSSL(),
+    OkRuHTTP(),
     Okrulink(),
     Sendvid(),
 
@@ -746,7 +778,6 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     Movhide(),
     StreamhideCom(),
     StreamhideTo(),
-    Pixeldrain(),
     Wibufile(),
     FileMoonIn(),
     Moviesm4u(),
@@ -795,6 +826,8 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     PlayLtXyz(),
     AStreamHub(),
     Vidplay(),
+    VidplayOnline(),
+    MyCloud(),
 
     Cda(),
     Dailymotion(),
diff --git a/app/src/main/res/drawable/ic_baseline_open_in_new_24.xml b/app/src/main/res/drawable/ic_baseline_open_in_new_24.xml
new file mode 100644
index 00000000..2651015c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_open_in_new_24.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="?attr/white" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?attr/white" android:pathData="M19,19H5V5h7V3H5c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2v-7h-2v7zM14,3v2h3.59l-9.83,9.83 1.41,1.41L19,6.41V10h2V3h-7z"/>
+</vector>
diff --git a/app/src/main/res/drawable/screen_rotation.xml b/app/src/main/res/drawable/screen_rotation.xml
new file mode 100644
index 00000000..da0ac0fd
--- /dev/null
+++ b/app/src/main/res/drawable/screen_rotation.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/white">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M496,778L182,464Q159,441 159,410Q159,379 182,356L356,182Q379,159 410,159Q441,159 464,182L778,496Q801,519 801,550Q801,581 778,604L604,778Q581,801 550,801Q519,801 496,778ZM550,720Q550,720 550,720Q550,720 550,720L720,550Q720,550 720,550Q720,550 720,550L410,240Q410,240 410,240Q410,240 410,240L240,410Q240,410 240,410Q240,410 240,410L550,720ZM480,960Q381,960 293.5,922.5Q206,885 140.5,819.5Q75,754 37.5,666.5Q0,579 0,480L80,480Q80,551 104,616Q128,681 170.5,733Q213,785 272,821.5Q331,858 401,873L296,768L352,712L588,948Q562,954 534.5,957Q507,960 480,960ZM880,480Q880,409 856,344Q832,279 789.5,227Q747,175 688,138.5Q629,102 559,87L664,192L608,248L372,12Q398,6 425.5,3Q453,0 480,0Q579,0 666.5,37.5Q754,75 819.5,140.5Q885,206 922.5,293.5Q960,381 960,480L880,480ZM480,480L480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480Z"/>
+</vector>
diff --git a/app/src/main/res/layout/bottom_resultview_preview.xml b/app/src/main/res/layout/bottom_resultview_preview.xml
index ce41cb65..fe3f9b8d 100644
--- a/app/src/main/res/layout/bottom_resultview_preview.xml
+++ b/app/src/main/res/layout/bottom_resultview_preview.xml
@@ -114,17 +114,38 @@
             </LinearLayout>
         </LinearLayout>
 
-        <TextView
-            android:id="@+id/resultview_preview_more_info"
+        <LinearLayout
+            android:padding="7dp"
+            android:orientation="horizontal"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?android:attr/selectableItemBackground"
-            android:gravity="start|center_vertical"
-            android:padding="12dp"
-            android:text="@string/home_more_info"
-            android:textColor="?attr/textColor"
-            app:drawableRightCompat="@drawable/ic_baseline_arrow_forward_24"
-            app:drawableTint="?attr/white" />
+            android:layout_height="wrap_content">
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/resultview_preview_bookmark"
+                android:layout_weight="1"
+                android:nextFocusRight="@id/resultview_preview_more_info"
+
+                tools:visibility="visible"
+
+                app:icon="@drawable/ic_baseline_bookmark_24"
+                tools:text="Bookmark"
+                style="@style/BlackButton"
+
+                android:layout_width="50dp" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/resultview_preview_more_info"
+                android:layout_weight="1"
+                android:nextFocusLeft="@id/resultview_preview_bookmark"
+
+                tools:visibility="visible"
+
+                app:icon="@drawable/ic_baseline_open_in_new_24"
+                android:text="@string/home_more_info"
+                style="@style/WhiteButton"
+
+                android:layout_width="50dp" />
+        </LinearLayout>
     </LinearLayout>
 
     <FrameLayout
diff --git a/app/src/main/res/layout/player_custom_layout.xml b/app/src/main/res/layout/player_custom_layout.xml
index 38df4c5b..0d73246b 100644
--- a/app/src/main/res/layout/player_custom_layout.xml
+++ b/app/src/main/res/layout/player_custom_layout.xml
@@ -550,10 +550,19 @@
                             android:orientation="horizontal">
 
                             <com.google.android.material.button.MaterialButton
-                                android:id="@+id/player_resize_btt"
+                                android:id="@+id/player_rotate_btt"
                                 style="@style/VideoButton"
                                 android:nextFocusLeft="@id/player_lock"
 
+                                android:nextFocusRight="@id/player_resize_btt"
+                                android:text="@string/rotate_video"
+                                app:icon="@drawable/screen_rotation" />
+
+                            <com.google.android.material.button.MaterialButton
+                                android:id="@+id/player_resize_btt"
+                                style="@style/VideoButton"
+                                android:nextFocusLeft="@id/player_rotate_btt"
+
                                 android:nextFocusRight="@id/player_speed_btt"
                                 android:text="@string/video_aspect_ratio_resize"
                                 app:icon="@drawable/ic_baseline_aspect_ratio_24" />
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 12c61baa..de9e04ae 100644
--- a/app/src/main/res/layout/player_custom_layout_tv.xml
+++ b/app/src/main/res/layout/player_custom_layout_tv.xml
@@ -638,6 +638,11 @@
                                 app:icon="@drawable/video_locked" />
                         </FrameLayout>
 
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/player_rotate_btt"
+                            style="@style/VideoButton"
+                            android:visibility="gone"/>
+
                         <com.google.android.material.button.MaterialButton
                             android:id="@+id/player_skip_op"
                             style="@style/VideoButtonTV"
diff --git a/app/src/main/res/layout/trailer_custom_layout.xml b/app/src/main/res/layout/trailer_custom_layout.xml
index b367fc53..69fbbbd2 100644
--- a/app/src/main/res/layout/trailer_custom_layout.xml
+++ b/app/src/main/res/layout/trailer_custom_layout.xml
@@ -534,6 +534,10 @@
                     android:paddingTop="10dp"
                     android:paddingBottom="10dp">
 
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/player_rotate_btt"
+                        style="@style/VideoButton"/>
+
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/player_lock"
                         style="@style/VideoButton"
diff --git a/app/src/main/res/values-ajp/strings.xml b/app/src/main/res/values-ajp/strings.xml
index c6532ffa..131b9eec 100644
--- a/app/src/main/res/values-ajp/strings.xml
+++ b/app/src/main/res/values-ajp/strings.xml
@@ -481,7 +481,7 @@
     <string name="plugin_downloaded">تنزلت الإضافة</string>
     <string name="reload_error">رجاع جَرِب تعمل إتصال…</string>
     <string name="duplicate_add">زيد</string>
-    <string name="batch_download">نزلو الحلقات بالجملة</string>
+    <string name="batch_download">نزلو المصادر بالجملة</string>
     <string name="open_with">فتاح بـ</string>
     <string name="sync_score">راينيگ</string>
     <string name="delete_repository_plugins">محي الريپو كمان بمحي الإضافات يلي في</string>
@@ -588,4 +588,11 @@
 \nعلامت المصدر والجودة تبعو بينجمعو مع بعض (8 + 1 = 9). يلي علامتو 10 أو أعلى، بينحط تلقائيًا، من دون ما ينعمل لود لكل المصادر!</string>
     <string name="enter_current_pin">حطو الأرقام السرية الحالية</string>
     <string name="audio_tracks">صوت</string>
+    <string name="rotate_video_desc">حط كبسة لبرم إتجاه الشاشة</string>
+    <string name="rotate_video_key">rotate_video_key</string>
+    <string name="auto_rotate_video_key">auto_rotate_video_key</string>
+    <string name="auto_rotate_video">برم الشاشة أوتوماتيكيًا</string>
+    <string name="rotate_video">برومو</string>
+    <string name="auto_rotate_video_desc">غير إتجاه الشاشة أوتوماتيكيًا حسب شكل الڤيديو</string>
+    <string name="links_reloaded_toast">رجع نعمل لاود لاللينك</string>
 </resources>
diff --git a/app/src/main/res/values-am/strings.xml b/app/src/main/res/values-am/strings.xml
index 3ea31b54..7fd3274b 100644
--- a/app/src/main/res/values-am/strings.xml
+++ b/app/src/main/res/values-am/strings.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_dub_sub_episode_text_format" formatted="true">%s ክፍል %d</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%1$s ክፍል %2$d</string>
     <string name="cast_format" formatted="true">ተዋናዮች: %s</string>
     <string name="player_speed_text_format" formatted="true">ፍጥነት(%.2fx)</string>
     <string name="home_next_random_img_des">ቀጣይ በዘፈቀደ</string>
     <string name="preview_background_img_des">ዳራ ቅድም እይታ</string>
-    <string name="next_episode_time_hour_format" formatted="true">%dሰዓት %dደቂቃ</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$dሰዓት %2$dደቂቃ</string>
     <string name="search_poster_img_des">ፖስተር</string>
     <string name="title_downloads">የወረዱ</string>
     <string name="new_update_format" formatted="true">አዲስ ማሻሻያ ተገኝቷል!
-\n%s -&gt; %s</string>
+\n%1$s -&gt; %2$s</string>
     <string name="go_back_img_des">ተመለስ</string>
     <string name="episode_more_options_des">ተጨማሪ አማራጮች</string>
     <string name="type_watching">በማየት ላይ</string>
@@ -21,7 +21,7 @@
     <string name="search_hint">ፍለጋ…</string>
     <string name="rated_format" formatted="true">ተመዘነ: %.1f</string>
     <string name="browser">አሳሽ</string>
-    <string name="next_episode_time_day_format" formatted="true">%dቀን %dሰዓት %dደቂቃ</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$dቀን %2$dሰዓት %3$dደቂቃ</string>
     <string name="next_episode">ቀጣይ ክፍል</string>
     <string name="next_episode_time_min_format" formatted="true">%dደቂቃ</string>
     <string name="duration_format" formatted="true">%d ደቂቃ</string>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 11fe0ba3..c79c96b1 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -616,4 +616,11 @@
     <string name="skip_startup_account_select_pref">تخطي اختيار الحساب عند بدء التشغيل</string>
     <string name="manage_accounts">إدارة الحسابات</string>
     <string name="edit_account">تعديل الحساب</string>
+    <string name="links_reloaded_toast">تم إعادة تحميل الروابط</string>
+    <string name="rotate_video_desc">عرض زر تبديل لاتجاه الشاشة</string>
+    <string name="rotate_video_key">مفتاح تدوير الفيديو</string>
+    <string name="auto_rotate_video_key">مفتاح تدوير الفيديو التلقائي</string>
+    <string name="auto_rotate_video">الدوران التلقائي</string>
+    <string name="rotate_video">تدوير</string>
+    <string name="auto_rotate_video_desc">تمكين التبديل التلقائي لاتجاه الشاشة بناءً على اتجاه الفيديو</string>
 </resources>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index e8c5d0f5..32f5d72b 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
-    <string formatted="true" name="app_dub_sub_episode_text_format">%s еп. %d</string>
+    <string formatted="true" name="app_dub_sub_episode_text_format">%1$s еп. %2$d</string>
     <string formatted="true" name="cast_format">Актьори: %s</string>
     <string formatted="true" name="next_episode_format">Епизод %d ще бъде пуснат след</string>
-    <string formatted="true" name="next_episode_time_day_format">%dd %dh %dm</string>
-    <string formatted="true" name="next_episode_time_hour_format">%dh %dm</string>
+    <string formatted="true" name="next_episode_time_day_format">%1$dd %2$dh %3$dm</string>
+    <string formatted="true" name="next_episode_time_hour_format">%1$dh %2$dm</string>
     <string formatted="true" name="next_episode_time_min_format">%dm</string>
     <string name="result_poster_img_des">Poster</string>
     <string name="episode_poster_img_des">Episode Poster</string>
@@ -17,7 +17,7 @@
     <string formatted="true" name="player_speed_text_format">Скорост (%.2fx)</string>
     <string formatted="true" name="rated_format">Оценка: %.1f</string>
     <string formatted="true" name="new_update_format">Намерена е нова актуализация!
-\n%s -&gt; %s</string>
+\n%1$s -&gt; %2$s</string>
     <string formatted="true" name="filler">Шаблон</string>
     <string formatted="true" name="duration_format">%d мин</string>
     <string name="app_name">CloudStream</string>
@@ -174,12 +174,12 @@
     <string name="subs_default_reset_toast">Възстановяване на стойността по подразбиране</string>
     <string name="acra_report_toast">За съжаление приложението се срина. Анонимен доклад за грешка ще бъде изпратен до разработчиците</string>
     <string name="season">Сезон</string>
-    <string name="season_format">%s %d%s</string>
+    <string name="season_format">%1$s %2$d%3$s</string>
     <string name="no_season">Без сезон</string>
     <string name="episode">Епизод</string>
     <string name="episodes">Епизоди</string>
-    <string name="episodes_range">%d-%d</string>
-    <string formatted="true" name="episode_format">%d %s</string>
+    <string name="episodes_range">%1$d-%2$d</string>
+    <string formatted="true" name="episode_format">%1$d %2$s</string>
     <string name="season_short">С</string>
     <string name="episode_short">Е</string>
     <string name="no_episodes_found">Няма намерени епизоди</string>
@@ -307,7 +307,7 @@
     <string name="example_lang_name">Езиков код (en)</string>
     <!--
     -->
-    <string name="login_format" formatted="true">%s %s</string>
+    <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="account">Акаунт</string>
     <string name="logout">Излизане</string>
     <string name="login">Влизане</string>
@@ -404,8 +404,8 @@
     <string name="plugin_deleted">Приставката е изтрита</string>
     <string name="plugin_load_fail" formatted="true">Не може да зареди %s</string>
     <string name="is_adult">18+</string>
-    <string name="batch_download_start_format" formatted="true">Започна да изтегля %d %s…</string>
-    <string name="batch_download_finish_format" formatted="true">Изтеглено %d %s</string>
+    <string name="batch_download_start_format" formatted="true">Започна да изтегля %1$d %2$s…</string>
+    <string name="batch_download_finish_format" formatted="true">Изтеглено %1$d %2$s</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">Всички %s вече са изтеглени</string>
     <string name="batch_download">Пакетно изтегляне</string>
     <string name="plugin_singular">Плъгин</string>
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index 12f4343c..4f4891c6 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -4,8 +4,8 @@
     <string name="play_with_app_name">ক্লাউডস্ট্রিম দিয়ে চালান</string>
     <string name="title_home">হোম</string>
     <string name="cast_format" formatted="true">অভিনয়েঃ %s</string>
-    <string name="next_episode_time_day_format" formatted="true">%dদিন %dঘন্টা %dমিনিট</string>
-    <string name="next_episode_time_hour_format" formatted="true">%dঘন্টা %dমিনিট</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$dদিন %2$dঘন্টা %3$dমিনিট</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$dঘন্টা %2$dমিনিট</string>
     <string name="next_episode_time_min_format" formatted="true">%d মিনিট</string>
     <string name="episode_poster_img_des">পর্বের পোস্টার</string>
     <string name="home_main_poster_img_des">মূল পোস্টার</string>
@@ -16,7 +16,7 @@
     <string name="player_speed_text_format" formatted="true">গতি (%.2f গুণ)</string>
     <string name="rated_format" formatted="true">মূল্যায়নঃ %.1f</string>
     <string name="new_update_format" formatted="true">নতুন আপডেট এসেছে!
-\n%s -&gt; %s</string>
+\n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">ফিলার</string>
     <string name="duration_format" formatted="true">%d মিনিট</string>
     <string name="app_name">ক্লাউডস্ট্রিম</string>
diff --git a/app/src/main/res/values-bp/strings.xml b/app/src/main/res/values-bp/strings.xml
index 1c26c236..3c2f1896 100644
--- a/app/src/main/res/values-bp/strings.xml
+++ b/app/src/main/res/values-bp/strings.xml
@@ -2,11 +2,11 @@
 <resources>
     <!-- KEYS DON'T TRANSLATE -->
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
-    <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%1$s Ep %2$d</string>
     <string name="cast_format" formatted="true">Elenco: %s</string>
     <string name="next_episode_format" formatted="true">O episódio %d vai ser lançado em</string>
-    <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
-    <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$dd %2$dh %3$dm</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$dh %2$dm</string>
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
@@ -21,7 +21,7 @@
     <string name="player_speed_text_format" formatted="true">Velocidade (%.2fx)</string>
     <string name="rated_format" formatted="true">Nota: %.1f</string>
     <string name="new_update_format" formatted="true">Nova atualização encontrada!
-\n%s -&gt; %s</string>
+\n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">Filler</string>
     <string name="duration_format" formatted="true">%d min</string>
     <string name="app_name">CloudStream</string>
@@ -310,7 +310,7 @@
     <string name="kitsu_account_settings" translatable="false">Kitsu</string>
     <string name="trakt_account_settings" translatable="false">Trakt</string>
     -->
-    <string name="login_format" formatted="true">%s %s</string>
+    <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="account">Conta</string>
     <string name="logout">Sair</string>
     <string name="login">Entrar</string>
@@ -405,8 +405,8 @@
     <string name="plugin_loaded">Plugin Carregado</string>
     <string name="plugin_deleted">Plugin Apagado</string>
     <string name="plugin_load_fail" formatted="true">Não consegui carregar %s :-(</string>
-    <string name="batch_download_start_format" formatted="true">Iniciada a transferência %d %s…</string>
-    <string name="batch_download_finish_format" formatted="true">Transferido %d %s</string>
+    <string name="batch_download_start_format" formatted="true">Iniciada a transferência %1$d %2$s…</string>
+    <string name="batch_download_finish_format" formatted="true">Transferido %1$d %2$s</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">Tudo %s já transferido</string>
     <string name="batch_download">Transferência em batch</string>
     <string name="plugin_singular">Plugin</string>
@@ -507,11 +507,11 @@
     <string name="action_mark_as_watched">Marcar como assistido</string>
     <string name="delayed_update_notice">Aplicativo precisa ser fechado para atualizar</string>
     <string name="enable_skip_op_from_database_des">Mostrar popups pulados para abertura e finalização</string>
-    <string name="episodes_range">%d-%d</string>
+    <string name="episodes_range">%1$d-%2$d</string>
     <string name="player_settings_play_in_app">Player interno</string>
     <string name="extension_size">Tamanho</string>
     <string name="skip_type_op">Abrindo</string>
-    <string name="season_format">%s %d%s</string>
+    <string name="season_format">%1$s %2$d%3$s</string>
     <string name="plugins_updated" formatted="true">%d plugins atualizados</string>
     <string name="safe_mode_description">Todos as extensões serão desligadas para ajuda se talvez estejam causando algum bug.</string>
     <string name="app_not_found_error">Aplicativo não encontrado</string>
@@ -524,7 +524,7 @@
     <string name="extension_language">Linguagem</string>
     <string name="hls_playlist">Lista de reprodução HLS</string>
     <string name="skip_type_ed">Terminando</string>
-    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="episode_format" formatted="true">%1$d %2$s</string>
     <string name="sort_updated_old">Adicionado em (antigo para novo)</string>
     <string name="skip_type_intro">Introdução</string>
     <string name="no_plugins_found_error">plug-ins não foram encontrados no repositório</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 609d96ef..27ed3d11 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -608,4 +608,11 @@
     <string name="skip_startup_account_select_pref">Přeskočit výběr účtu při spuštění</string>
     <string name="manage_accounts">Správce účtů</string>
     <string name="edit_account">Upravit účet</string>
+    <string name="links_reloaded_toast">Odkazy znovu načteny</string>
+    <string name="rotate_video_desc">Zobrazit tlačítko pro přepnutí otočení obrazovky</string>
+    <string name="rotate_video_key">rotate_video_key</string>
+    <string name="auto_rotate_video_key">auto_rotate_video_key</string>
+    <string name="auto_rotate_video">Automatické otáčení</string>
+    <string name="rotate_video">Otočení</string>
+    <string name="auto_rotate_video_desc">Zapnout automatické otáčení obrazovky v závislosti na orientaci videa</string>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 112afc8b..0f6c4d90 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -399,7 +399,7 @@
     <string name="plugin_deleted">Plugin gelöscht</string>
     <string name="plugin_load_fail" formatted="true">Fehler beim Laden von %s</string>
     <string name="is_adult">18+</string>
-    <string name="batch_download_start_format" formatted="true">Herunterladen begonnen %d %s…</string>
+    <string name="batch_download_start_format" formatted="true">Herunterladen von %1$d %2$s gestartet…</string>
     <string name="batch_download_finish_format" formatted="true">%1$d %2$s heruntergeladen</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">Alle %s bereits heruntergeladen</string>
     <string name="batch_download">Batch-Download</string>
@@ -570,4 +570,19 @@
     <string name="enter_pin">PIN eingeben</string>
     <string name="pin">PIN</string>
     <string name="enter_current_pin">Aktuelle PIN eingeben</string>
+    <string name="logged_account" formatted="true">Angemeldet als %s</string>
+    <string name="enter_pin_with_name" formatted="true">PIN für %s eingeben</string>
+    <string name="use_default_account">Standard-Konto verwenden</string>
+    <string name="skip_startup_account_select_pref">Kontoauswahl beim Starten überspringen</string>
+    <string name="manage_accounts">Konten verwalten</string>
+    <string name="edit_account">Konto bearbeiten</string>
+    <string name="duplicate_message_multiple" formatted="true">Es wurden potentielle Duplikate in ihrer Bibliothek gefunden:
+\n
+\n%s
+\n
+\nWollen sie dieses Element trotzdem hinzufügen, das existierende Element ersetzen oder diese Aktion abbrechen?</string>
+    <string name="duplicate_message_single" formatted="true">Ihre Bibliothek enthält möglicherweise schon ein Duplikat dieses Elements: \'%s\'
+\n
+\nWollen sie dieses Element trotzdem hinzufügen, das existierende ersetzen oder diese Aktion abbrechen?</string>
+    <string name="links_reloaded_toast">Links wurden neu geladen</string>
 </resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 72a7c4c9..c2e24792 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -118,7 +118,7 @@
     <string name="player_speed_text_format" formatted="true">Ταχύτητα (%.2fx)</string>
     <string name="rated_format" formatted="true">Βαθμολογία: %.1f</string>
     <string name="new_update_format" formatted="true">Νέα διαθέσιμη ενημέρωση!
-\n%s -&gt; %s</string>
+\n%1$s -&gt; %2$s</string>
     <string name="double_tap_to_pause_settings_des">Πατήστε δύο φορές στη μέση για παύση</string>
     <string name="use_system_brightness_settings">Χρήση φωτεινότητας συστήματος</string>
     <string name="use_system_brightness_settings_des">Χρήση φωτεινότητας συστήματος στο ενσωματωμένο πρόγραμμα αναπαραγωγής, αντί εφαρμογής προεπιλεγμένου σκούρου επικαλύμματος</string>
@@ -142,12 +142,12 @@
     <string name="no_links_found_toast">Δεν βρέθηκαν διαθέσιμοι σύνδεσμοι</string>
     <string name="copy_link_toast">Ο σύνδεσμος αντιγράφηκε στο πρόχειρο</string>
     <string name="season">Κύκλος</string>
-    <string name="season_format">%s %d%s</string>
+    <string name="season_format">%1$s %2$d%3$s</string>
     <string name="no_season">Κανένας κύκλος</string>
     <string name="episode">Επεισόδιο</string>
     <string name="episodes">Επεισόδια</string>
-    <string name="episodes_range">%d-%d</string>
-    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="episodes_range">%1$d-%2$d</string>
+    <string name="episode_format" formatted="true">%1$d %2$s</string>
     <string name="season_short">Σ</string>
     <string name="episode_short">E</string>
     <string name="no_episodes_found">Δεν βρέθηκαν επεισόδια</string>
@@ -320,8 +320,8 @@
     <string name="plugin_loaded">Το πρόσθετο φορτώθηκε</string>
     <string name="plugin_deleted">Το πρόσθετο διαγράφηκε</string>
     <string name="plugin_load_fail" formatted="true">Αποτυχία φόρτωσης του %s</string>
-    <string name="batch_download_start_format" formatted="true">Ξεκίνησε η λήψη %d %s…</string>
-    <string name="batch_download_finish_format" formatted="true">Κατέβηκε το %d %s επιτυχώς</string>
+    <string name="batch_download_start_format" formatted="true">Ξεκίνησε η λήψη %1$d %2$s…</string>
+    <string name="batch_download_finish_format" formatted="true">Κατέβηκε το %1$d %2$s επιτυχώς</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">Όλα τα %s έχουν ήδη κατέβει</string>
     <string name="batch_download">Μαζική λήψη</string>
     <string name="plugin_singular">Πρόσθετο</string>
@@ -367,13 +367,13 @@
     <string name="player_settings_play_in_web">Web Video Cast</string>
     <string name="player_settings_play_in_browser">Περιηγητής</string>
     <string name="app_not_found_error">Η εφαρμογή δεν βρέθηκε</string>
-    <string name="app_dub_sub_episode_text_format" formatted="true">%s Επ %d</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%1$s Επ %2$d</string>
     <string name="next_episode_format" formatted="true">Το επεισόδιο %d θα κυκλοφορήσει σε</string>
     <string name="filler" formatted="true">Φίλτρο</string>
     <string name="duration_format" formatted="true">%d λεπτά</string>
     <string name="cast_format" formatted="true">Ηθοποιοί: %s</string>
-    <string name="next_episode_time_day_format" formatted="true">%dμ %dω %dλ</string>
-    <string name="next_episode_time_hour_format" formatted="true">%dω %dλ</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$dμ %2$dω %3$dλ</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$dω %2$dλ</string>
     <string name="next_episode_time_min_format" formatted="true">%dλ</string>
     <string name="search_hint_site" formatted="true">Αναζήτηση %s…</string>
     <string name="play_livestream_button">Αναπαραγωγή ζωντανής μετάδοσης</string>
@@ -461,7 +461,7 @@
     <string name="pref_category_subtitles">Υπότιτλοι</string>
     <string name="pref_category_player_layout">Δομή</string>
     <string name="pref_category_defaults">Προεπιλεγμένα</string>
-    <string name="login_format" formatted="true">%s %s</string>
+    <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="subs_font_size">Μέγεθος γραμματοσειράς</string>
     <string name="anime_singular">Άνιμε</string>
     <string name="pref_category_links">Σύνδεσμοι</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 5712700e..508f28fe 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -584,4 +584,11 @@
     <string name="skip_startup_account_select_pref">Omitir la selección de cuenta al inicio</string>
     <string name="manage_accounts">Gestionar las cuentas</string>
     <string name="edit_account">Editar la cuenta</string>
+    <string name="links_reloaded_toast">Enlaces recargados</string>
+    <string name="rotate_video_desc">Mostrar un botón para cambiar la orientación de la pantalla</string>
+    <string name="rotate_video_key">rotate_video_key</string>
+    <string name="auto_rotate_video_key">auto_rotate_video_key</string>
+    <string name="auto_rotate_video">Giro automático</string>
+    <string name="rotate_video">Girar</string>
+    <string name="auto_rotate_video_desc">Activar el cambio automático de la orientación de la pantalla en función de la orientación del vídeo</string>
 </resources>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index f9d28e24..6a98a860 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -26,11 +26,11 @@
     <string name="search_poster_img_des">پوستر</string>
     <string name="result_poster_img_des">پوستر</string>
     <string name="episode_poster_img_des">پوستر قسمت</string>
-    <string name="next_episode_time_day_format" formatted="true">%dروز %dساعت %dدقیقه</string>
-    <string name="app_dub_sub_episode_text_format" formatted="true">%s قسمت %d</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$dروز %2$dساعت %3$dدقیقه</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%1$s قسمت %2$d</string>
     <string name="cast_format" formatted="true">بازیگران: %s</string>
     <string name="next_episode_format" formatted="true">قسمت %d پخش خواهد شد</string>
-    <string name="next_episode_time_hour_format" formatted="true">%dساعت %dدقیقه</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$dساعت %2$dدقیقه</string>
     <string name="next_episode_time_min_format" formatted="true">%dدقیقه</string>
     <string name="home_main_poster_img_des">پوستر اصلی</string>
     <string name="torrent">تورنت</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 588c28ff..c571046c 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -126,8 +126,8 @@
     <string name="update">Mettre à jour</string>
     <string name="dns_pref_summary">Utile pour contourner les bloquages des FAI</string>
     <string name="download_path_pref">Emplacement de téléchargement</string>
-    <string name="new_update_format" formatted="true">Nouvelle mise à jour trouvée !
-\n%s -&gt; %s</string>
+    <string name="new_update_format" formatted="true">Nouvelle mise à jour trouvée !
+\n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">Épisode spécial</string>
     <string name="watch_quality_pref">Qualité de visionnage préférée (WiFi)</string>
     <string name="video_buffer_size_settings">Taille de la mémoire cache</string>
@@ -140,7 +140,7 @@
     <string name="dns_pref">DNS avec HTTPS</string>
     <string name="display_subbed_dubbed_settings">Afficher les animés en Anglais (Dub) / sous-titrés</string>
     <string name="phone_layout">Disposition en mode téléphone</string>
-    <string name="app_dub_sub_episode_text_format">%s Ep %d</string>
+    <string name="app_dub_sub_episode_text_format">%1$s Episode %2$d</string>
     <string name="rated_format" formatted="true">Note : %.1f</string>
     <string name="resize_zoom">Zoom</string>
     <string name="resize_fit">Adapter à l\'écran</string>
@@ -300,7 +300,7 @@
     <string name="lightnovel">Application Light Novel par les mêmes devs</string>
     <string name="anim">Anime app by the same devs</string>
     <string name="discord">Rejoignez le Discord</string>
-    <string name="next_episode_time_hour_format" formatted="true">%d h %d min</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$d h %2$d min</string>
     <string name="next_episode_time_min_format" formatted="true">%d min</string>
     <string name="play_with_app_name">Lire avec CloudStream</string>
     <string name="play_livestream_button">Lire en direct</string>
@@ -315,7 +315,7 @@
     <string name="skip_type_intro">Intro</string>
     <string name="clear_history">Effacer l\'historique</string>
     <string name="yes">Oui</string>
-    <string name="next_episode_time_day_format" formatted="true">%d j %d h %d min</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$d j %2$d h %3$d min</string>
     <string name="stream">Stream</string>
     <string name="confirm_exit_dialog">Êtes-vous sûr·e de vouloir quitter \?</string>
     <string name="no">Non</string>
@@ -366,9 +366,9 @@
     <string name="quality_dvd">DVD</string>
     <string name="next">Suivant</string>
     <string name="quality_blueray">Blu-ray</string>
-    <string name="season_format">%s %d%s</string>
-    <string name="episodes_range">%d-%d</string>
-    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="season_format">%1$s %2$d%3$s</string>
+    <string name="episodes_range">%1$d-%2$d</string>
+    <string name="episode_format" formatted="true">%1$d %2$s</string>
     <string name="nsfw">NSFW</string>
     <string name="example_ip">127.0.0.1</string>
     <string name="sync_score_format" formatted="true">%d / 10</string>
@@ -387,7 +387,7 @@
     <string name="anime_singular">@string/anime</string>
     <string name="ova_singular">OAV</string>
     <string name="nsfw_singular">NSFW</string>
-    <string name="login_format" formatted="true">%s %s</string>
+    <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="subtitles_filter_lang">Filtrez par langue préférée</string>
     <string name="extras">Extras</string>
     <string name="network_adress_example">Lien vers le stream</string>
@@ -414,8 +414,8 @@
     <string name="plugin_loaded">Plugin Chargé</string>
     <string name="plugin_deleted">Plugin Supprimé</string>
     <string name="batch_download">Téléchargement par lots</string>
-    <string name="batch_download_start_format" formatted="true">Début du téléchargement %d %s…</string>
-    <string name="batch_download_finish_format" formatted="true">Téléchargé %d %s</string>
+    <string name="batch_download_start_format" formatted="true">Début du téléchargement %1$d %2$s…</string>
+    <string name="batch_download_finish_format" formatted="true">Téléchargé %1$d %2$s</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">Tous les %s déjà téléchargés</string>
     <string name="setup_extensions_subtext">Télécharger la liste de sites que vous voulez utiliser</string>
     <string name="plugins_downloaded" formatted="true">Téléchargé : %d</string>
@@ -568,4 +568,21 @@
     <string name="select_an_account">Sélectionnez un compte</string>
     <string name="enter_pin">Entrer PIN</string>
     <string name="pin">PIN</string>
+    <string name="favorites_list_name">Favoris</string>
+    <string name="logged_account" formatted="true">Connecté en tant que %s</string>
+    <string name="duplicate_message_multiple" formatted="true">Des doublons potentiels ont été trouvés dans votre bibliothèque :
+\n
+\n%s
+\n
+\nSouhaitez-vous ajouter cet élément, remplacer les éléments existants ou annuler l\'action ?</string>
+    <string name="enter_pin_with_name" formatted="true">Entrer le code PIN pour %s</string>
+    <string name="duplicate_title">Doublon potentiel trouvé</string>
+    <string name="lock_profile">Verrouiller le profil</string>
+    <string name="skip_startup_account_select_pref">Passer la sélection de compte au démarrage</string>
+    <string name="action_unsubscribe">Se désabonner</string>
+    <string name="action_subscribe">S\'abonner</string>
+    <string name="duplicate_message_single" formatted="true">Il semble qu\'un élément potentiellement dupliqué existe déjà dans votre bibliothèque : \'%s.
+\n
+\nSouhaitez-vous ajouter cet élément, remplacer l\'élément existant ou annuler l\'action ?</string>
+    <string name="enter_current_pin">Entrer le code PIN actuel</string>
 </resources>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 92754082..d0a05bb0 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
-    <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$dd %2$dh %3$dm</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$dh %2$dm</string>
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <string name="home_main_poster_img_des">Póster Principal</string>
     <string name="home_next_random_img_des">Seguinte ó azar</string>
-    <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%1$s Ep %2$d</string>
     <string name="cast_format" formatted="true">Elenco: %s</string>
     <string name="next_episode_format" formatted="true">O episodio %d se lanzará en</string>
     <string name="result_poster_img_des">Póster</string>
@@ -14,7 +14,7 @@
     <string name="go_back_img_des">Regresar</string>
     <string name="home_change_provider_img_des">Cambiar provedor</string>
     <string name="new_update_format" formatted="true">Nova actualización atopada!
-\n%s -&gt; %s</string>
+\n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">Recheo</string>
     <string name="duration_format" formatted="true">%d min</string>
     <string name="title_settings">Configuración</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index ccc69da4..9785e0b7 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -161,4 +161,35 @@
     <string name="duration_format" formatted="true">%d मिनट</string>
     <string name="app_name">क्लाउडस्ट्रीम</string>
     <string name="play_with_app_name">क्लाउडस्ट्रीम के साथ चलाएं</string>
+    <string name="duplicate_message_multiple" formatted="true">आपकी लाइब्रेरी में संभावित डुप्लिकेट आइटम पाए गए हैं:
+\n
+\n%s
+\n
+\nक्या आप किसी भी तरह इस आइटम को जोड़ना चाहेंगे, मौजूदा आइटम को बदलना चाहेंगे, या कार्रवाई रद्द करना चाहेंगे?</string>
+    <string name="enter_pin_with_name" formatted="true">%s के लिए पिन दर्ज करें</string>
+    <string name="duplicate_title">संभावित डुप्लिकेट मिला</string>
+    <string name="update_started">अपडेट शुरू हुआ</string>
+    <string name="lock_profile">प्रोफ़ाइल लॉक करें</string>
+    <string name="duplicate_replace_all">सबको बदली करें</string>
+    <string name="pin_error_incorrect">ग़लत पिन. कृपया पुन: प्रयास करें।</string>
+    <string name="browser">ब्राउज़र</string>
+    <string name="pick_subtitle">उपशीर्षक</string>
+    <string name="pin_error_length">पिन 4 अक्षर का होना चाहिए</string>
+    <string name="duplicate_replace">बदली</string>
+    <string name="duplicate_add">जोड़े</string>
+    <string name="play_trailer_button">ट्रेलर देखे</string>
+    <string name="play_livestream_button">लाइवस्ट्रीम देखे</string>
+    <string name="result_poster_img_des">विज्ञापन</string>
+    <string name="type_re_watching">दोबारा देखे</string>
+    <string name="auto_rotate_video">स्वत: घुमाएँ</string>
+    <string name="select_an_account">अकाउंट चुनिये</string>
+    <string name="skip_loading">लोडिंग स्किप करे</string>
+    <string name="loading">लोडिंग…</string>
+    <string name="duplicate_message_single" formatted="true">ऐसा प्रतीत होता है कि संभावित रूप से डुप्लिकेट आइटम आपकी लाइब्रेरी में पहले से मौजूद है: \'%s.\'
+\n
+\nक्या आप किसी भी तरह इस आइटम को जोड़ना चाहेंगे, मौजूदा आइटम को बदलना चाहेंगे, या कार्रवाई रद्द करना चाहेंगे?</string>
+    <string name="enter_pin">पिन दर्ज करें</string>
+    <string name="pin">पिन</string>
+    <string name="links_reloaded_toast">लिंक पुन्ह खुली</string>
+    <string name="enter_current_pin">वर्तमान पिन दर्ज करें</string>
 </resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 58afb665..5b1dbcf0 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="cast_format" formatted="true">Stáblista: %s</string>
-    <string name="next_episode_time_day_format" formatted="true">%dn %dó%dp</string>
-    <string name="next_episode_time_hour_format" formatted="true">%dó%dp</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$dn %2$dó%3$dp</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$dó%2$dp</string>
     <string name="next_episode_time_min_format" formatted="true">%dp</string>
     <string name="episode_poster_img_des">Epizód Plakát</string>
     <string name="home_main_poster_img_des">Fő Plakát</string>
@@ -11,9 +11,9 @@
     <string name="player_speed_text_format" formatted="true">Sebesség (%.2fx)</string>
     <string name="rated_format" formatted="true">Értékelés: %.1f</string>
     <string name="new_update_format" formatted="true">Új frissítés található!
-\n%s -&gt; %s</string>
+\n%1$s -&gt; %2$s</string>
     <string name="duration_format" formatted="true">%d perc</string>
-    <string name="app_dub_sub_episode_text_format" formatted="true">%sEp%d</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%1$sEp%2$d</string>
     <string name="app_name">CloudStream</string>
     <string name="preview_background_img_des">Háttér Előnézet</string>
     <string name="download_failed">Letöltés sikertelen</string>
@@ -146,8 +146,8 @@
     <string name="episodes">Epizódok</string>
     <string name="season_short">Év</string>
     <string name="movies_singular">Film</string>
-    <string name="episodes_range">%d-%d</string>
-    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="episodes_range">%1$d-%2$d</string>
+    <string name="episode_format" formatted="true">%1$d %2$s</string>
     <string name="episode_short">Ep</string>
     <string name="no_episodes_found">Nem található epizód</string>
     <string name="delete_file">Fájl törlése</string>
@@ -210,7 +210,7 @@
     <string name="subs_default_reset_toast">Alapértelmezett értékre visszaállítása</string>
     <string name="acra_report_toast">Az alkalmazás összeomlott. Egy névtelen hibabejelentés küldünk a fejlesztőknek</string>
     <string name="season">Évad</string>
-    <string name="season_format">%s %d%s</string>
+    <string name="season_format">%1$s %2$d%3$s</string>
     <string name="no_season">Nincs évad</string>
     <string name="go_forward_30">+30</string>
     <string name="delete_message" formatted="true">Ezzel véglegesen törli a %s
@@ -365,7 +365,7 @@
     <string name="error_invalid_data">Érvénytelen adatok</string>
     <string name="network_adress_example">Link a streamhez</string>
     <string name="plugin_load_fail" formatted="true">Nem sikerült betölteni: %s</string>
-    <string name="batch_download_start_format" formatted="true">Elkezdődött a(z) %d %s letöltése…</string>
+    <string name="batch_download_start_format" formatted="true">Elkezdődött a(z) %1$d %2$s letöltése…</string>
     <string name="download_all_plugins_from_repo">Töltse le az összes bővítményt ebből a tárolóból\?</string>
     <string name="safe_mode_title">Biztonságos mód bekapcsolva</string>
     <string name="extension_size">Méret</string>
@@ -391,7 +391,7 @@
     <string name="error_invalid_id">Érvénytelen azonosító</string>
     <string name="provider_languages_tip">Videók megtekintése ezeken a nyelveken</string>
     <string name="previous">Előző</string>
-    <string name="batch_download_finish_format" formatted="true">%d%s letöltve</string>
+    <string name="batch_download_finish_format" formatted="true">%1$d%2$s letöltve</string>
     <string name="batch_download">Batch letöltés</string>
     <string name="plugin">bővítmények</string>
     <string name="apk_installer_legacy">Legacy</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index d6be0eed..74839a47 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
-    <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%1$s Ep %2$d</string>
     <string name="cast_format" formatted="true">Cast: %s</string>
     <string name="next_episode_format" formatted="true">L\'episodio %d uscirà in</string>
-    <string name="next_episode_time_day_format" formatted="true">%d g %d o %d min</string>
-    <string name="next_episode_time_hour_format" formatted="true">%d o %d min</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$dd %2$dh %3$dm</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$dh %2$dm</string>
     <string name="next_episode_time_min_format" formatted="true">%d min</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
@@ -177,12 +177,12 @@
     <string name="subs_default_reset_toast">Ripristina il valore predefinito</string>
     <string name="acra_report_toast">Spiacente, l\'applicazione è andata in crash. Una segnalazione anonima di bug sarà inviata agli sviluppatori</string>
     <string name="season">Stagione</string>
-    <string name="season_format">%s %d%s</string>
+    <string name="season_format">%1$s %2$d%3$s</string>
     <string name="no_season">Nessuna stagione</string>
     <string name="episode">Episodio</string>
     <string name="episodes">Episodi</string>
-    <string name="episodes_range">%d-%d</string>
-    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="episodes_range">%1$d-%2$d</string>
+    <string name="episode_format" formatted="true">%1$d %2$s</string>
     <string name="season_short">S</string>
     <string name="episode_short">E</string>
     <string name="no_episodes_found">Nessun episodio trovato</string>
@@ -311,7 +311,7 @@
     <string name="example_site_name">IlMioSito</string>
     <string name="example_site_url">example.com</string>
     <string name="example_lang_name">Codice lingua (it)</string>
-    <string name="login_format" formatted="true">%s %s</string>
+    <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="account">account</string>
     <string name="logout">Disconnetti</string>
     <string name="login">Accedi</string>
@@ -409,7 +409,7 @@
     <string name="plugin_deleted">Plugin eliminato</string>
     <string name="plugin_load_fail" formatted="true">Impossibile caricare %s</string>
     <string name="is_adult">18+</string>
-    <string name="batch_download_start_format" formatted="true">Download iniziato %1$d %2$s…</string>
+    <string name="batch_download_start_format" formatted="true">Avviato il download di %1$d %2$s…</string>
     <string name="batch_download_finish_format" formatted="true">Scaricato %1$d %2$s</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">Tutti %s già scaricati</string>
     <string name="batch_download">Download in blocco</string>
@@ -593,10 +593,19 @@
     <string name="action_subscribe">Iscriviti</string>
     <string name="action_remove_from_favorites">Rimuovi dai preferiti</string>
     <string name="select_an_account">Seleziona un Account</string>
-    <string name="duplicate_message_single">Sembra che un oggetto potenziale duplicato sia già presente nella tua libreria: \'%1$s.\'
+    <string name="duplicate_message_single">Sembra che nella tua libreria esista già un elemento potenzialmente duplicato: \'%s.\'
 \n
-\nVorresti aggiungere l\'oggetto lo stesso, rimpiazzare l\'esistente, o cancellare l\'azione\?</string>
+\nDesideri aggiungere comunque questo elemento, sostituire quello esistente o annullare l\'azione?</string>
     <string name="enter_pin">Inserisci PIN</string>
     <string name="pin">PIN</string>
     <string name="enter_current_pin">Inserisci PIN Corrente</string>
+    <string name="logged_account" formatted="true">Entrato come %s</string>
+    <string name="enter_pin_with_name" formatted="true">Inserisci il PIN per %s</string>
+    <string name="lock_profile">Blocca profilo</string>
+    <string name="use_default_account">Usa Account Default</string>
+    <string name="skip_startup_account_select_pref">Salta la selezione dell\'account all\'avvio</string>
+    <string name="manage_accounts">Gestisci Accounts</string>
+    <string name="edit_account">Modifica account</string>
+    <string name="links_reloaded_toast">Collegamenti ricaricati</string>
+    <string name="rotate_video">Ruota</string>
 </resources>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 55666df5..d5c2ad5e 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -7,7 +7,7 @@
     <string name="player_speed_text_format" formatted="true">מהירות (%.2fx)</string>
     <string name="rated_format" formatted="true">דירוג: %.1f</string>
     <string name="new_update_format" formatted="true">נמצא עדכון חדש!
-\n%s -&gt; %s</string>
+\n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">סינון</string>
     <string name="duration_format" formatted="true">%d דקות</string>
     <string name="app_name">קלאודסטרים</string>
@@ -24,8 +24,8 @@
     <string name="result_open_in_browser">לפתוח בדפדפן</string>
     <string name="skip_loading">דלג על טעינה</string>
     <string name="next_episode_format" formatted="true">פרק %d יצא בעוד</string>
-    <string name="next_episode_time_day_format" formatted="true">%dימים %dשעות %dחודשים</string>
-    <string name="next_episode_time_hour_format" formatted="true">%dשעות %dחודשים</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$dימים %2$dשעות %3$dחודשים</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$dשעות %2$dחודשים</string>
     <string name="next_episode_time_min_format" formatted="true">%dחודשים</string>
     <string name="result_poster_img_des">פוסטר</string>
     <string name="episode_poster_img_des">הפוסטר של הפרק</string>
@@ -70,7 +70,7 @@
     <string name="sort_close">לסגור</string>
     <string name="sort_clear">נקה</string>
     <string name="sort_save">לשמור</string>
-    <string name="app_dub_sub_episode_text_format" formatted="true">%s פרק %d</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%1$s פרק %2$d</string>
     <string name="play_with_app_name">נגן עם קלאודסטרים</string>
     <string name="next_episode">פרק הבא</string>
     <string name="loading">טוען…</string>
@@ -136,9 +136,9 @@
     <string name="uprereleases_settings">עדכן למהדורות מוקדמות</string>
     <string name="uprereleases_settings_des">חפש עדכוני מהדרות מוקדמות במקום מהדורות מלאות בלבד</string>
     <string name="episodes">פרקים</string>
-    <string name="episodes_range">%d-%d</string>
+    <string name="episodes_range">%1$d-%2$d</string>
     <string name="episode">פרק</string>
-    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="episode_format" formatted="true">%1$d %2$s</string>
     <string name="season_short">עו</string>
     <string name="episode_short">פר</string>
     <string name="no_episodes_found">לא נמצאו פרקים</string>
@@ -208,7 +208,7 @@
     <string name="pref_category_looks">נראה</string>
     <string name="automatic">אוטומטי</string>
     <string name="tv_layout">פריסת טלוויזיה</string>
-    <string name="login_format" formatted="true">%s %s</string>
+    <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="subtitles_filter_lang">סנן לפי שפת מדיה מועדפת</string>
     <string name="app_theme_settings">נושא אפליקציה</string>
     <string name="bottom_title_settings">מיקום כותרת פוסטר</string>
@@ -305,7 +305,7 @@
     <string name="synopsis">תקציר</string>
     <string name="queued">בתור</string>
     <string name="benene">לתת בניני למפתחים</string>
-    <string name="season_format">%s %d%s</string>
+    <string name="season_format">%1$s %2$d%3$s</string>
     <string name="app_storage">אפליקציה</string>
     <string name="movies">סרטים</string>
     <string name="anime">אנימה</string>
@@ -424,8 +424,8 @@
     <string name="plugin_downloaded">תוסף הורד</string>
     <string name="plugin_deleted">התוסף נמחק</string>
     <string name="plugin_load_fail" formatted="true">לא יכול לטעון %s</string>
-    <string name="batch_download_start_format" formatted="true">התחיל להוריד %d %s…</string>
-    <string name="batch_download_finish_format" formatted="true">הוריד %d %s</string>
+    <string name="batch_download_start_format" formatted="true">התחיל להוריד %1$d %2$s…</string>
+    <string name="batch_download_finish_format" formatted="true">הוריד %1$d %2$s</string>
     <string name="enable_skip_op_from_database_des">הצג חלונות קופצים של דילוג בשביל פתיח/שיר סיום</string>
     <string name="delete_repository">מחק מאגר</string>
     <string name="skip_type_mixed_op">פתיח מעורב</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 138c0957..fbd44d91 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -9,8 +9,8 @@
     <string name="title_home">ホーム</string>
     <string name="library">ライブラリ</string>
     <string name="home_play">再生</string>
-    <string name="next_episode_time_day_format" formatted="true">%9$d%9$d%9$d%9$d%d日 %d時間%d分</string>
-    <string name="next_episode_time_hour_format" formatted="true">%d時間%d分</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$d日 %2$d時間%3$d分</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$d時間%2$d分</string>
     <string name="search_hint">検索…</string>
     <string name="download">ダウンロード</string>
     <string name="home_info">情報</string>
@@ -74,7 +74,7 @@
     <string name="sort_close">閉じる</string>
     <string name="sort_save">保存</string>
     <string name="sort_clear">消去</string>
-    <string name="app_dub_sub_episode_text_format" formatted="true">%99$d%99$s%sエピ%d</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%1$sエピ%2$d</string>
     <string name="cast_format" formatted="true">出演者：%s</string>
     <string name="search_poster_img_des">ポスター</string>
     <string name="episode_poster_img_des">エピソードポスター</string>
@@ -83,7 +83,7 @@
     <string name="go_back_img_des">戻り</string>
     <string name="rated_format" formatted="true">視聴率 %.1f</string>
     <string name="new_update_format" formatted="true">新しいアップデートを発見!
-\n%s -&gt; %s</string>
+\n%1$s -&gt; %2$s</string>
     <string name="duration_format" formatted="true">%d分</string>
     <string name="search_hint_site" formatted="true">%sを検索…</string>
     <string name="pick_source">ソース</string>
diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml
index 07ff89e4..f3fb665d 100644
--- a/app/src/main/res/values-kn/strings.xml
+++ b/app/src/main/res/values-kn/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_dub_sub_episode_text_format" formatted="true">%sಎಪಿ%d</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%1$sಎಪಿ%2$d</string>
     <string name="cast_format" formatted="true">ಕ್ಯಾಸ್ಟ್:%s</string>
     <string name="go_back_img_des">ಹಿಂದೆ ಹೋಗು</string>
     <string name="filler" formatted="true">ಫಿಲ್ಲರ್</string>
@@ -16,7 +16,7 @@
     <string name="vpn_might_be_needed">ಈ ಪೂರೈಕೆದಾರರು ಸರಿಯಾಗಿ ಕೆಲಸ ಮಾಡಲು VPN ಬೇಕಾಗಬಹುದು</string>
     <string name="player_size_settings_des">ಕಪ್ಪು ಗಡಿಗಳನ್ನು ತೆಗೆದುಹಾಕಿ</string>
     <string name="next_episode_format" formatted="true">ಸಂಚಿಕೆ%d ಬಿಡುಗಡೆಯಾಗಲಿದೆ</string>
-    <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$dh %2$dm</string>
     <string name="result_poster_img_des">ಪೋಸ್ಟರ್</string>
     <string name="search_poster_img_des">ಪೋಸ್ಟರ್</string>
     <string name="episode_poster_img_des">ಸಂಚಿಕೆ ಪೋಸ್ಟರ್</string>
@@ -85,7 +85,7 @@
     <string name="popup_delete_file">ಫೈಲ್ ಅಳಿಸಿ</string>
     <string name="home_more_info">ಹೆಚ್ಚಿನ ಮಾಹಿತಿ</string>
     <string name="new_update_format" formatted="true">ಹೊಸ ಅಪ್ಡೇಟ್ ಬಂದಿದೆ
-\n%s-%s</string>
+\n%1$s-%2$s</string>
     <string name="loading">ಲೋಡಿಂಗ್…</string>
     <string name="subs_download_languages">ಡೌನ್‌ಲೋಡ್ ಭಾಷೆಗಳನ್ನು ಮಾಡಿ</string>
     <string name="play_livestream_button">ಲೈವ್‌ಸ್ಟ್ರೀಮ್ ಪ್ಲೇ ಮಾಡಿ</string>
@@ -99,7 +99,7 @@
     <string name="sort_copy">ಕಾಪಿ</string>
     <string name="no_data">ನೋ ಡೇಟಾ</string>
     <string name="player_speed">ಪ್ಲೇಯರ್ ಸ್ಪೀಡ್</string>
-    <string name="next_episode_time_day_format" formatted="true">%d %dh %dm</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$d %2$dh %3$dm</string>
     <string name="search_hint_site" formatted="true">ಹುಡುಕು %s…</string>
     <string name="episode_more_options_des">ಹೆಚ್ಚಿನ ಆಯ್ಕೆ</string>
     <string name="subs_import_text" formatted="true">ಫಾಂಟ್‌ಗಳನ್ನು ಇರಿಸುವ ಮೂಲಕ ಆಮದು ಮಾಡಿ %s</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index ef2f6cc5..0bf3bd9b 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -12,7 +12,7 @@
     <string name="player_speed_text_format" formatted="true">속도 (%.2fx)</string>
     <string name="rated_format" formatted="true">평점: %.1f</string>
     <string name="new_update_format" formatted="true">새로운 업데이트!
-\n%s -&gt; %s</string>
+\n%1$s -&gt; %2$s</string>
     <string name="duration_format" formatted="true">%d분</string>
     <string name="app_name">CloudStream</string>
     <string name="play_with_app_name">CloudStream에서 재생</string>
@@ -82,10 +82,10 @@
     <string name="continue_watching">계속 시청</string>
     <string name="action_remove_watching">제거</string>
     <string name="go_back_30">-30</string>
-    <string name="app_dub_sub_episode_text_format" formatted="true">%s 에피소드 %d</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%1$s 에피소드 %2$d</string>
     <string name="result_poster_img_des">포스터</string>
-    <string name="next_episode_time_day_format" formatted="true">%d일 %d시간 %d분</string>
-    <string name="next_episode_time_hour_format" formatted="true">%d시간 %d분</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$d일 %2$d시간 %3$d분</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$d시간 %2$d분</string>
     <string name="next_episode_time_min_format" formatted="true">%d분</string>
     <string name="title_search">검색</string>
     <string name="popup_delete_file">파일 삭제</string>
@@ -159,7 +159,7 @@
     <string name="subs_default_reset_toast">기본값으로 재설정</string>
     <string name="acra_report_toast">죄송합니다, 애플리케이션이 충돌했습니다. 버그 보고서가 익명으로 개발자에게 전송됩니다</string>
     <string name="episodes">에피소드</string>
-    <string name="episodes_range">%d-%d</string>
+    <string name="episodes_range">%1$d-%2$d</string>
     <string name="status_ongoing">진행중</string>
     <string name="status_completed">시청 완료</string>
     <string name="status">상태</string>
@@ -294,8 +294,8 @@
     <string name="extensions">확장 기능</string>
     <string name="extension_version">버전</string>
     <string name="is_adult">18+</string>
-    <string name="batch_download_start_format" formatted="true">다운로드 시작 %d %s…</string>
-    <string name="batch_download_finish_format" formatted="true">다운로드 %d %s</string>
+    <string name="batch_download_start_format" formatted="true">다운로드 시작 %1$d %2$s…</string>
+    <string name="batch_download_finish_format" formatted="true">다운로드 %1$d %2$s</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">모든 %s가 이미 다운로드되었습니다</string>
     <string name="batch_download">일괄 다운로드</string>
     <string name="plugin_singular">플러그인</string>
@@ -351,12 +351,12 @@
     <string name="season">시즌</string>
     <string name="delete">삭제</string>
     <string name="cancel">취소</string>
-    <string name="season_format">%s %d%s</string>
+    <string name="season_format">%1$s %2$d%3$s</string>
     <string name="delete_file">파일 삭제</string>
     <string name="pause">일시정지</string>
     <string name="episode">에피소드</string>
     <string name="episode_short">에피소드</string>
-    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="episode_format" formatted="true">%1$d %2$s</string>
     <string name="no_episodes_found">에피소드를 찾을 수 없음</string>
     <string name="start">시작</string>
     <string name="test_failed">실패</string>
@@ -412,7 +412,7 @@
     <string name="example_username">사용자 이름</string>
     <string name="example_lang_name">언어 코드 (ko)</string>
     <string name="example_site_name">사이트 이름</string>
-    <string name="login_format" formatted="true">%s %s</string>
+    <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="subtitle_offset_extra_hint_before_format">자막이 %d ms 너무 늦게 표시되는 경우, 사용하세요</string>
     <string name="subtitle_offset_extra_hint_none_format">자막 지연 없음</string>
     <string name="downloaded_file">다운로드한 파일</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index db5ac011..54f9be82 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -4,7 +4,7 @@
     <string name="action_remove_from_bookmarks">Pašalinti</string>
     <string name="player_speed_text_format" formatted="true">Greitis (%.2fx)</string>
     <string name="error_bookmarks_text">Žymos</string>
-    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="episode_format" formatted="true">%1$d %2$s</string>
     <string name="download_started">Siuntimas pradėtas</string>
     <string name="home_next_random_img_des">Sekantis atsitiktinai</string>
     <string name="preview_background_img_des">Peržiūros fonas</string>
@@ -33,7 +33,7 @@
     <string name="download_done">Atsiuntimas baigtas</string>
     <string name="continue_watching">Tęsti žiūrėjimą</string>
     <string name="new_update_format" formatted="true">Rastas atnaujinimas!
-\n%s -&gt; %s</string>
+\n%1$s -&gt; %2$s</string>
     <string name="subs_download_languages">Atsisiųsti kalbas</string>
     <string name="search_provider_text_providers">Ieškoti naudojant tiekėjus</string>
     <string name="go_back_img_des">Grįžti atgal</string>
@@ -110,7 +110,7 @@
     <string name="no_data">Nėra duomenų</string>
     <string name="subs_font">Šriftas</string>
     <string name="redo_setup_process">Perdaryti nustatymo procesą</string>
-    <string name="episodes_range">%d-%d</string>
+    <string name="episodes_range">%1$d-%2$d</string>
     <string name="benene">Duoti bananą kūrėjams</string>
     <string name="go_back">Sugryšti</string>
     <string name="copy_link_toast">Nuoroda nukopijuota į iškarpinę</string>
@@ -183,7 +183,7 @@
     <string name="source_error">Šaltinio klaida</string>
     <string name="view_public_repositories_button_short">Viešas sąrašas</string>
     <string name="example_ip">127.0.0.1</string>
-    <string name="batch_download_finish_format" formatted="true">Atsiųsta %d %s</string>
+    <string name="batch_download_finish_format" formatted="true">Atsiųsta %1$d %2$s</string>
     <string name="skip_type_format" formatted="true">Praleisti %s</string>
     <string name="blank_repo_message">Pagal numatytuosius nustatymus „CloudStream“ neturi įdiegtų svetainių. Turite įdiegti svetaines iš saugyklų.
 \n
@@ -196,7 +196,7 @@
     <string name="player_settings_play_in_browser">Naršyklė</string>
     <string name="all_languages_preference">Visos kalbos</string>
     <string name="quality_4k">4K</string>
-    <string name="batch_download_start_format" formatted="true">Pradėta siųsti %d %s…</string>
+    <string name="batch_download_start_format" formatted="true">Pradėta siųsti %1$d %2$s…</string>
     <string name="extension_description">Aprašymas</string>
     <string name="safe_mode_title">Saugus režimas įjungtas</string>
     <string name="quality_hdr">HDR</string>
@@ -257,7 +257,7 @@
     <string name="quality_dvd">DVD</string>
     <string name="player_settings_play_in_app">Integruotas grotuvas</string>
     <string name="setup_extensions_subtext">Atsisiųskite sąrašą puslapiu jūs norite naudoti</string>
-    <string name="app_dub_sub_episode_text_format" formatted="true">%s Ser %d</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%1$s Ser %2$d</string>
     <string name="confirm_exit_dialog">Ar tikrai norite išeiti\?</string>
     <string name="action_remove_from_watched">Pašalinti iš žiūrimų</string>
     <string name="audio_tracks">Garso takelis</string>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index 14e5b600..ab8db2a9 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="search_poster_img_des">Plakāts</string>
-    <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%1$s Ep %2$d</string>
     <string name="cast_format" formatted="true">Cast: %s</string>
     <string name="result_poster_img_des">Plakāts</string>
     <string name="episode_poster_img_des">Epizodes plakāts</string>
@@ -13,7 +13,7 @@
     <string name="player_speed_text_format" formatted="true">Ātrums (%.2fx)</string>
     <string name="rated_format" formatted="true">Lidzīgi: %.1f</string>
     <string name="new_update_format" formatted="true">Jauns atjauninājums atrasts!
-\n%s -&gt; %s</string>
+\n%1$s -&gt; %2$s</string>
     <string name="duration_format" formatted="true">%d galvenais</string>
     <string name="app_name">Claudstream</string>
     <string name="play_with_app_name">Atskaņo ar cloudstream</string>
@@ -96,9 +96,9 @@
     <string name="sort_clear">Iztīrīt</string>
     <string name="subs_text_color">Teksta krāsa</string>
     <string name="subs_auto_select_language">Automātiski-iestādīt valodu</string>
-    <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$dh %2$dm</string>
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
-    <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$dd %2$dh %3$dm</string>
     <string name="subs_download_languages">Ielādēt valodas</string>
     <string name="subs_subtitle_languages">Subtitru valoda</string>
     <string name="subs_hold_to_reset_to_default">Tūri lai restartētu uz sākumu</string>
@@ -179,12 +179,12 @@
     <string name="copy_link_toast">Links kopēts cliobordā</string>
     <string name="subs_default_reset_toast">Restartēt uz parasto value</string>
     <string name="season">Sezona</string>
-    <string name="season_format">%s %d%s</string>
+    <string name="season_format">%1$s %2$d%3$s</string>
     <string name="no_season">Nav sezonas</string>
     <string name="episode">Epizode</string>
     <string name="episodes">Epizodes</string>
-    <string name="episodes_range">%d-%d</string>
-    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="episodes_range">%1$d-%2$d</string>
+    <string name="episode_format" formatted="true">%1$d %2$s</string>
     <string name="season_short">S</string>
     <string name="episode_short">E</string>
     <string name="no_episodes_found">Epizodes netika atrastas</string>
@@ -402,8 +402,8 @@
     <string name="plugin_deleted">Plugins dzēsts</string>
     <string name="plugin_load_fail" formatted="true">Nevarēja ielādēt %s</string>
     <string name="is_adult">18+</string>
-    <string name="batch_download_start_format" formatted="true">Sākta %d %s lejupielāde…</string>
-    <string name="batch_download_finish_format" formatted="true">Lejuplādēts %d %s</string>
+    <string name="batch_download_start_format" formatted="true">Sākta %1$d %2$s lejupielāde…</string>
+    <string name="batch_download_finish_format" formatted="true">Lejuplādēts %1$d %2$s</string>
     <string name="batch_download">Pakešu lejupielāde</string>
     <string name="plugin_singular">Plugins</string>
     <string name="plugin">Plugins</string>
@@ -493,7 +493,7 @@
     <string name="jsdelivr_enabled">Neizdevās sasniegt GitHub. Pieslēdzas starpniekserverim caur jsDelivr…</string>
     <string name="resize_fill">Iztiept</string>
     <string name="primary_color_settings">Galvenā krāsa</string>
-    <string name="login_format" formatted="true">%s %s</string>
+    <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="bottom_title_settings_des">Likt nosaukumu zem plakāta</string>
     <string name="subtitle_offset_extra_hint_before_format">Izmantojiet šo, ja subtitri tiek rādīti %d ms pārāk vēlu</string>
     <string name="recommended">Rekomendācijas</string>
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index 7badfd18..956f18e5 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -3,8 +3,8 @@
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Брзина (%.2fx)</string>
     <string name="rated_format" formatted="true">Оценето: %.1f</string>
-    <string name="new_update_format" formatted="true">Пронајдена нова верзија на апликацијата!
-\n%s -&gt; %s</string>
+    <string name="new_update_format" formatted="true">"Пронајдена нова верзија!
+\n%1$s -&gt;  %2$s"</string>
     <string name="filler" formatted="true">Филтер</string>
     <string name="app_name">CloudStream</string>
     <string name="title_home">Дома</string>
@@ -32,7 +32,7 @@
     <string name="pick_subtitle">Преводи</string>
     <string name="reload_error">Повтори конекција…</string>
     <string name="go_back">Оди назад</string>
-    <string name="play_episode">Пушти епизода</string>
+    <string name="play_episode">Вклучи епизода</string>
     <!--<string name="need_storage">Allow to download episodes</string>-->
     <string name="download">Превземи</string>
     <string name="downloaded">Превземено</string>
@@ -195,7 +195,7 @@
     <string name="phone_layout">Изглед за гледање на телефон</string>
     <string name="primary_color_settings">Примарна боја</string>
     <string name="app_theme_settings">Тема на апликацијата</string>
-    <string name="login_format">%s %s</string>
+    <string name="login_format">%1$s %2$s</string>
     <string name="account">Корисничко име</string>
     <string name="logout">Одјави се</string>
     <string name="login">Најавете се</string>
@@ -214,8 +214,8 @@
     <string name="history">Историја</string>
     <string name="uppercase_all_subtitles">Голема буква на сите преводи</string>
     <string name="automatic_plugin_download_summary">Автоматски инсталирајте ги сите сè уште неинсталирани приклучоци од додадените складишта.</string>
-    <string name="episodes_range">%d-%d</string>
-    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="episodes_range">%1$d-%2$d</string>
+    <string name="episode_format" formatted="true">%1$d %2$s</string>
     <string name="livestreams">Пренос во живо</string>
     <string name="nsfw">NSFW</string>
     <string name="others">Други</string>
@@ -369,7 +369,7 @@
     <string name="authenticated_user_fail" formatted="true">Не можев да се најавам на %s</string>
     <string name="clipboard_too_large">Премногу текст. Не може да се зачува во таблата со исечоци.</string>
     <string name="error_invalid_id">Неважечки ID</string>
-    <string name="batch_download_finish_format" formatted="true">Преземено %d %s</string>
+    <string name="batch_download_finish_format" formatted="true">Преземено %1$d %2$s</string>
     <string name="subtitle_offset_extra_hint_later_format">Користете го ова ако преводите се прикажани %d ms премногу рано</string>
     <string name="error_invalid_url">Неважечка URL адреса</string>
     <string name="safe_mode_title">Безбедниот режим е вклучен</string>
@@ -428,7 +428,7 @@
     <string name="player_settings_play_in_vlc">VLC</string>
     <string name="restart">Рестартирај</string>
     <string name="cartoons_singular">Цртан филм</string>
-    <string name="batch_download_start_format" formatted="true">Почна да презема %d %s…</string>
+    <string name="batch_download_start_format" formatted="true">Почна да презема %1$d %2$s…</string>
     <string name="automatic_plugin_updates">Автоматски ажурирања на приклучоци</string>
     <string name="go_back_30">-30</string>
     <string name="resume_time_left" formatted="true">%dm
@@ -452,7 +452,7 @@
     <string name="app_not_found_error">Апликацијата не е пронајдена</string>
     <string name="example_username">MyCoolUsername</string>
     <string name="open_with">Отвори со</string>
-    <string name="season_format">%s %d%s</string>
+    <string name="season_format">%1$s %2$d%3$s</string>
     <string name="redo_setup_process">Повторете го процесот на поставување</string>
     <string name="pref_category_links">Линкови</string>
     <string name="skip_type_recap">Повторување</string>
@@ -517,13 +517,13 @@
     <string name="action_add_to_bookmarks">Поставете статус на пратење</string>
     <string name="play_livestream_button">Пушти Livestream</string>
     <string name="authenticated_user" formatted="true">%s е автентициран</string>
-    <string name="app_dub_sub_episode_text_format" formatted="true">%s Епизода %d</string>
-    <string name="next_episode_time_hour_format" formatted="true">%dч %dм</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%1$sЕп.%2$d</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$dч%2$dм</string>
     <string name="next_episode_time_min_format" formatted="true">%dм</string>
     <string name="home_next_random_img_des">Следен рандом</string>
     <string name="result_poster_img_des">Постер</string>
     <string name="search_poster_img_des">Постер</string>
-    <string name="next_episode_time_day_format" formatted="true">%dд %dч %dм</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$dч%2$dд%3$dм</string>
     <string name="home_main_poster_img_des">Главен постер</string>
     <string name="next_episode_format" formatted="true">Епизодата %d ќе биде објавена на</string>
     <string name="episode_poster_img_des">Постер за епизода</string>
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index cdc50cea..82f4a657 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -4,7 +4,7 @@
     <string name="player_speed_text_format" formatted="true">വേഗം (%.2fx)</string>
     <string name="rated_format" formatted="true">റേറ്റിംഗ്: %.1f</string>
     <string name="new_update_format" formatted="true">പുതിയ അപ്ഡേറ്റ്
-\n%s -&gt; %s</string>
+\n%1$s -&gt; %2$s</string>
     <string name="app_name">CloudStream</string>
     <string name="title_home">ഹോം</string>
     <string name="title_search">തിരയുക</string>
@@ -169,10 +169,10 @@
     <string name="watch_quality_pref">ഔചിത്യ വീഡിയോ ക്വാളിറ്റി</string>
     <string name="history">ചരിത്രം</string>
     <string name="action_mark_as_watched">കണ്ടതാണെന്ന് അടയാളപ്പെടുത്തുക</string>
-    <string name="next_episode_time_day_format" formatted="true">%dd%</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$d%2$d</string>
     <string name="next_episode_format" formatted="true">yg5t4r%dujyhtg</string>
     <string name="next_episode_time_hour_format" formatted="true">qeWERT</string>
-    <string name="app_dub_sub_episode_text_format" formatted="true">%fghj%gf</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%1$sghj%2$d</string>
     <string name="cast_format" formatted="true">rtf:%</string>
     <string name="create_account">അക്കൗണ്ട് ഉണ്ടാക്കുക</string>
     <string name="delayed_update_notice">പുറത്ത്പോകുന്നതോടുകൂടി ആപ് അപ്ഡേറ്റ് ആവുന്നതാണ്</string>
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
index e579381e..0c90b0c2 100644
--- a/app/src/main/res/values-ms/strings.xml
+++ b/app/src/main/res/values-ms/strings.xml
@@ -26,8 +26,8 @@
     <string name="next_episode_format" formatted="true">Episod %d akan disiarkan dalam</string>
     <string name="cast_format" formatted="true">Pelakon:%s</string>
     <string name="safe_mode_title">Mod Selamat Hidup</string>
-    <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
-    <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$dd %2$dh %3$dm</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$dh %2$dm</string>
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <string name="episode_poster_img_des">Poster Episod</string>
     <string name="home_main_poster_img_des">Poster Utama</string>
diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml
index e0346f19..f60362ae 100644
--- a/app/src/main/res/values-my/strings.xml
+++ b/app/src/main/res/values-my/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="cast_format" formatted="true">သရုပ်ဆောင်များ: %s</string>
-    <string name="next_episode_time_day_format" formatted="true">%dရက် %ddနာရီ %ddမိနစ်</string>
-    <string name="next_episode_time_hour_format" formatted="true">%ddနာရီ %ddမိနစ်</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$dရက် %2$ddနာရီ %3$ddမိနစ်</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$ddနာရီ %2$ddမိနစ်</string>
     <string name="next_episode_time_min_format" formatted="true">%ddမိနစ်</string>
     <string name="search_poster_img_des">ပိုစတာ</string>
     <string name="episode_poster_img_des">အပိုင်း ပိုစတာ</string>
@@ -12,7 +12,7 @@
     <string name="preview_background_img_des">နောက်ခံပုံရိပ်ကို အကြိုကြည့်ရန်</string>
     <string name="rated_format" formatted="true">အဆင့်: %.1f</string>
     <string name="new_update_format" formatted="true">အပ်ဒိတ်အသစ်!
-\n%s -&gt; %s</string>
+\n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">စစ်ထုတ်မှု</string>
     <string name="duration_format" formatted="true">%d မိနစ်</string>
     <string name="app_name">CloudStream</string>
@@ -111,7 +111,7 @@
     <string name="no_season">အတွဲမရှိပါ</string>
     <string name="episode">အပိုင်း</string>
     <string name="episodes">အပိုင်းများ</string>
-    <string name="episodes_range">%d-%d</string>
+    <string name="episodes_range">%1$d-%2$d</string>
     <string name="delete_message" formatted="true">ဒါကအပြီးဖျက်ခြင်းဖြစ်ပါသည် %s
 \nသင်သေချာပါသလား။</string>
     <string name="resume_time_left" formatted="true">%dမိနစ်
@@ -204,7 +204,7 @@
     <string name="pref_category_looks">ပုံပန်းသဏ္ဌာန်</string>
     <string name="category_general">အထွေထွေ</string>
     <string name="random_button_settings_desc">ပင်မစာမျက်နှာမှာကျပန်းခလုတ်ကိုပြပါ</string>
-    <string name="app_dub_sub_episode_text_format" formatted="true">%s အပိုင်း %d</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%1$s အပိုင်း %2$d</string>
     <string name="next_episode_format" formatted="true">အပိုင်း %d ထုတ်လွှင့်ပြသမည်</string>
     <string name="result_poster_img_des">ပိုစတာ</string>
     <string name="home_change_provider_img_des">ပံ့ပိုးပေးသောဝန်ဆောင်မှုပြောင်းရန်</string>
@@ -291,9 +291,9 @@
     <string name="app_language">အက်ပ်ဘာသာစကား</string>
     <string name="subs_default_reset_toast">မူလအခြေအနေများကိုပြန်ထားပါ</string>
     <string name="acra_report_toast">စိတ်မကောင်းပါ။အက်ပ်ရပ်တန့်သွားပါတယ်။အမည်မဖော်ထားတဲ့တင်ပြချက်ကို အက်ပ်ရေးသားသူများထံ ပို့မှာဖြစ်ပါတယ်</string>
-    <string name="season_format">%s %d%s</string>
+    <string name="season_format">%1$s %2$d%3$s</string>
     <string name="season_short">အတွဲ</string>
-    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="episode_format" formatted="true">%1$d %2$s</string>
     <string name="episode_short">အပိုင်း</string>
     <string name="no_episodes_found">အပိုင်းများမတွေ့ပါ</string>
     <string name="delete_file">ဖိုင်ကိုဖျက်ရန်</string>
@@ -442,7 +442,7 @@
     <string name="qualities">အရည်အသွေးများ</string>
     <string name="subtitles_encoding">စာတန်းထိုး ကုဒ်လုပ်ခြင်း</string>
     <string name="category_provider_test">ပံ့ပိုးပေးသူ စစ်ဆေးမှု</string>
-    <string name="login_format" formatted="true">%s %s</string>
+    <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="login">အကောင့်ဝင်မည်</string>
     <string name="switch_account">အကောင့်ပြောင်းမည်</string>
     <string name="upload_sync">ချိန်ညိှခြင်း</string>
@@ -478,8 +478,8 @@
     <string name="provider_languages_tip">ဤဘာသာစကားများဖြင့် ဗီဒီယိုများကို ကြည့်ရှုပါ</string>
     <string name="plugin_downloaded">ဖြည့်စွက်များ ဒေါင်းလုဒ်လုပ်ပြီး</string>
     <string name="plugin_deleted">ဖြည့်စွက်များဖျက်ပြီး</string>
-    <string name="batch_download_start_format" formatted="true">ဒေါင်းလုဒ်လုပ်ခြင်း စတင်သည် %d %s…</string>
-    <string name="batch_download_finish_format" formatted="true">ဒေါင်းလုဒ်လုပ်ပြီး %d %s</string>
+    <string name="batch_download_start_format" formatted="true">ဒေါင်းလုဒ်လုပ်ခြင်း စတင်သည် %1$d %2$s…</string>
+    <string name="batch_download_finish_format" formatted="true">ဒေါင်းလုဒ်လုပ်ပြီး %1$d %2$s</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">အားလုံး %s ဒေါင်းလုဒ်လုပ်ပြီးသား</string>
     <string name="no_plugins_found_error">ရီပိုစစ်ထရီထဲတွင်ဖြည့်စွက်များမတွေ့ပါ</string>
     <string name="no_repository_found_error">ရီပိုစစ်ထရီမတွေ့ပါ၊URLကိုပြန်စစ်ပြီးဗီပီအန်ဖြင့်ကြိုးစားကြည့်ပါ</string>
diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml
new file mode 100644
index 00000000..42eba3cc
--- /dev/null
+++ b/app/src/main/res/values-ne/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources/>
diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml
index c70ebd4b..95c527f9 100644
--- a/app/src/main/res/values-nn/strings.xml
+++ b/app/src/main/res/values-nn/strings.xml
@@ -16,12 +16,12 @@
     <string name="preview_background_img_des">Forhandsvis bakgrunnsbilete</string>
     <string name="rated_format" formatted="true">Vurdert: %.1f</string>
     <string name="new_update_format" formatted="true">Ny oppdatering tilgjengeleg!
-\n%s -&gt; %s</string>
+\n%1$s -&gt; %2$s</string>
     <string name="duration_format" formatted="true">%d minutt</string>
     <string name="result_poster_img_des">Miniatyrbilete</string>
     <string name="next_episode_format" formatted="true">Episode %d vil bli sleppt om</string>
-    <string name="next_episode_time_day_format" formatted="true">%dd %dt %dm</string>
-    <string name="next_episode_time_hour_format" formatted="true">%dt %dm</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$dd %2$dt %3$dm</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$dt %2$dm</string>
     <string name="cast_format" formatted="true">Rollebesetning: %s</string>
     <string name="home_main_poster_img_des">Hovudminiatyrbilete</string>
     <string name="home_change_provider_img_des">Endre leverandør</string>
@@ -104,7 +104,7 @@
     <string name="play_episode_toast">Spel av episode</string>
     <string name="subs_default_reset_toast">Tilbakestill til standardverdi</string>
     <string name="acra_report_toast">Beklager, programmet har krasjet. Ein anonymisert feilrapport vil bli sendt til utviklarane</string>
-    <string name="season_format">%s %d%s</string>
+    <string name="season_format">%1$s %2$d%3$s</string>
     <string name="no_season">Ingen sesong</string>
     <string name="episode">Episode</string>
     <string name="season_short">S</string>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index 9845120b..a1ccec46 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -13,7 +13,7 @@
     <string name="player_speed_text_format" formatted="true">Avspillingshastighet (%.2fx)</string>
     <string name="rated_format" formatted="true">Vurdert: %.1f</string>
     <string name="new_update_format" formatted="true">Ny oppdatering funnet!
-\n%s -&gt; %s</string>
+\n%1$s -&gt; %2$s</string>
     <string name="app_name">CloudStream</string>
     <string name="title_home">Hjem</string>
     <string name="title_search">Søk</string>
@@ -207,15 +207,15 @@
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <string name="sort_clear">Tøm</string>
     <string name="category_account">Kontoer</string>
-    <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%1$s Ep %2$d</string>
     <string name="play_with_app_name">Spill med CloudStream</string>
     <string name="sort_copy">Kopier</string>
     <string name="next_episode_format" formatted="true">Episode %d vil bli sluppet om</string>
-    <string name="next_episode_time_hour_format" formatted="true">%dt %dm</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$dt %2$dm</string>
     <string name="duration_format" formatted="true">%d min</string>
     <string name="sort_close">Lukk</string>
     <string name="subs_subtitle_languages">Undertekstspråk</string>
-    <string name="next_episode_time_day_format" formatted="true">%dd %dt %dm</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$dd %2$dt %3$dm</string>
     <string name="sort_save">Lagre</string>
     <string name="show_log_cat">Vis Logcat 🐈</string>
     <string name="chromecast_subtitles_settings_des">Innstillinger for Chromecast-innstillinger</string>
@@ -262,7 +262,7 @@
     <string name="max">Maks</string>
     <string name="movies_singular">Film</string>
     <string name="episode_action_download_subtitle">Last ned undertekster</string>
-    <string name="season_format">%s %d%s</string>
+    <string name="season_format">%1$s %2$d%3$s</string>
     <string name="add_site_pref">Klon siden</string>
     <string name="random_button_settings_desc">Vis tilfeldig-knapp på hjemmesiden</string>
     <string name="torrent_singular">Torrent</string>
@@ -353,18 +353,18 @@
     <string name="previous">Forrige</string>
     <string name="crash_reporting_title">Krasjrapportering</string>
     <string name="extensions">Utvidelser</string>
-    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="episode_format" formatted="true">%1$d %2$s</string>
     <string name="example_username">MittKuleBrukernavn</string>
     <string name="skip_setup">Hopp over oppsett</string>
     <string name="preferred_media_subtext">Hva du ønsker å se</string>
-    <string name="login_format" formatted="true">%s %s</string>
+    <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="provider_languages_tip">Se videoer på disse språkene</string>
     <string name="setup_done">Ferdig</string>
     <string name="plugin_singular">programtillegg</string>
     <string name="safe_mode_title">Trygt modus påslått</string>
     <string name="action_add_to_bookmarks">Sett visningsstatus</string>
     <string name="episode_sync_settings_des">Synkroniser automatisk fremdriften din for gjeldende episode</string>
-    <string name="episodes_range">%d-%d</string>
+    <string name="episodes_range">%1$d-%2$d</string>
     <string name="view_public_repositories_button_short">Offentlig liste</string>
     <string name="plugin">programtillegg</string>
     <string name="resume_time_left" formatted="true">%dm
@@ -455,9 +455,9 @@
     <string name="skip_type_recap">Tilbakeblikk</string>
     <string name="quality_sd">SD</string>
     <string name="trailer">Forfilm</string>
-    <string name="batch_download_finish_format" formatted="true">Lastet ned %d %s</string>
+    <string name="batch_download_finish_format" formatted="true">Lastet ned %1$d %2$s</string>
     <string name="bottom_title_settings_des">Navn under plakat</string>
-    <string name="batch_download_start_format" formatted="true">Begynte nedlasting av %d %s …</string>
+    <string name="batch_download_start_format" formatted="true">Begynte nedlasting av %1$d %2$s …</string>
     <string name="apply_on_restart">Bruk etter omstart av programmet</string>
     <string name="quality_cam_rip">Cam</string>
     <string name="quality_cam_hd">Cam</string>
diff --git a/app/src/main/res/values-or/strings.xml b/app/src/main/res/values-or/strings.xml
index 22f7d1ca..eb3d7cd3 100644
--- a/app/src/main/res/values-or/strings.xml
+++ b/app/src/main/res/values-or/strings.xml
@@ -2,8 +2,8 @@
 <resources>
     <string name="episode_more_options_des">ଅଧିକ ଵିକଳ୍ପ</string>
     <string name="type_watching">ଦେଖୁଛନ୍ତି</string>
-    <string name="next_episode_time_day_format" formatted="true">%dଦି %dଘ %dମି</string>
-    <string name="next_episode_time_hour_format" formatted="true">%dଘ %dମି</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$dଦି %2$dଘ %3$dମି</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$dଘ %2$dମି</string>
     <string name="next_episode_time_min_format" formatted="true">%dମି</string>
     <string name="type_re_watching">ପୁନଃଦେଖୁଛନ୍ତି</string>
     <string name="home_expanded_hide">ଲୁଚାଅ</string>
@@ -89,7 +89,7 @@
     <string name="pref_category_android_tv">ଆଣ୍ଡ୍ରଏଡ୍ ଟିଵି</string>
     <string name="pref_category_gestures">ଅଙ୍ଗଭଙ୍ଗୀ</string>
     <string name="new_update_format" formatted="true">ନୂଆ ଅଦ୍ୟତନ ମିଳିଲା!
-\n%s -&gt; %s</string>
+\n%1$s -&gt; %2$s</string>
     <string name="duration">ଅଵଧି</string>
     <string name="app_storage">ଆପ୍</string>
     <string name="restore_success">ବ୍ୟାକଅପ୍ ଫାଇଲ୍ ଧାରଣ ହେଲା</string>
@@ -157,5 +157,5 @@
     <string name="search_hint_site" formatted="true">%s ସନ୍ଧାନ କରିବା…</string>
     <string name="next_episode">ପରବର୍ତ୍ତୀ ଅଧ୍ୟାୟ</string>
     <string name="no_data">କୌଣସି ତଥ୍ୟ ନାହିଁ</string>
-    <string name="app_dub_sub_episode_text_format" formatted="true">%s ଅ %d</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%1$s ଅ %2$d</string>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 95a3e1c6..6ebb4575 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -3,10 +3,10 @@
     <string name="player_speed_text_format" formatted="true">Prędkość (%.2fx)</string>
     <string name="rated_format" formatted="true">Ocena: %.1f</string>
     <string name="new_update_format" formatted="true">Znaleziono nową aktualizację!
-\n%s -&gt; %s</string>
+\n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">Filler</string>
     <string name="duration_format" formatted="true">%d min</string>
-    <string name="app_dub_sub_episode_text_format">%s Odc. %d</string>
+    <string name="app_dub_sub_episode_text_format">%1$s Odc. %2$d</string>
     <string name="result_poster_img_des">Obrazek</string>
     <string name="episode_poster_img_des">Obrazek odcinka</string>
     <string name="home_main_poster_img_des">Główny obrazek</string>
@@ -168,12 +168,12 @@
     <string name="subs_default_reset_toast">Zresetowano</string>
     <string name="acra_report_toast">Awaria aplikacji. Anonimowe zgłoszenie błędu zostanie wysłane programistom</string>
     <string name="season">Sezon</string>
-    <string name="season_format">%s %d%s</string>
+    <string name="season_format">%1$s %2$d%3$s</string>
     <string name="no_season">Brak sezonu</string>
     <string name="episode">Odcinek</string>
     <string name="episodes">Odcinki</string>
-    <string name="episodes_range">%d-%d</string>
-    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="episodes_range">%1$d-%2$d</string>
+    <string name="episode_format" formatted="true">%1$d %2$s</string>
     <string name="season_short">S</string>
     <string name="episode_short">O</string>
     <string name="no_episodes_found">Nie znaleziono odcinków</string>
@@ -293,7 +293,7 @@
     <string name="bottom_title_settings">Pozycja tytułu względem obrazka</string>
     <string name="bottom_title_settings_des">Ustaw tytuł pod obrazkiem</string>
     <string name="example_lang_name">Kod języka (pl)</string>
-    <string name="login_format" formatted="true">%s %s</string>
+    <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="account">konto</string>
     <string name="logout">Wyloguj się</string>
     <string name="login">Zaloguj się</string>
@@ -382,8 +382,8 @@
     <string name="plugin_deleted">Usunięto rozszerzenie</string>
     <string name="plugin_load_fail" formatted="true">Błąd ładowania %s</string>
     <string name="is_adult">18+</string>
-    <string name="batch_download_start_format" formatted="true">Rozpoczęto pobieranie %d %s…</string>
-    <string name="batch_download_finish_format" formatted="true">Pobrano %d %s</string>
+    <string name="batch_download_start_format" formatted="true">Rozpoczęto pobieranie %1$d %2$s…</string>
+    <string name="batch_download_finish_format" formatted="true">Pobrano %1$d %2$s</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">Wszystkie %s już pobrane</string>
     <string name="batch_download">Pobierz wszystko</string>
     <string name="plugin_singular">rozszerzenie</string>
@@ -436,11 +436,11 @@
     <string name="network_adress_example">Link do odtwarzania</string>
     <string name="play_with_app_name">Odtwórz w CloudStream</string>
     <string name="skip_type_format" formatted="true">Pomiń %s</string>
-    <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$dh %2$dm</string>
     <string name="yes">Tak</string>
     <string name="no">Nie</string>
     <string name="update_notification_failed">Aktualizacja aplikacji nie powiodła się</string>
-    <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$dd %2$dh %3$dm</string>
     <string name="update_notification_installing">Instalowanie aktualizacji aplikacji…</string>
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <string name="action_mark_as_watched">Oznacz jako obejrzane</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 0cd970c4..398a1aa3 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -362,8 +362,8 @@
     <string name="plugin_loaded">Plugin Carregado</string>
     <string name="plugin_deleted">Plugin Apagado</string>
     <string name="plugin_load_fail" formatted="true">Falha ao carregar %s</string>
-    <string name="batch_download_start_format" formatted="true">Download iniciado %d %s…</string>
-    <string name="batch_download_finish_format" formatted="true">Transferido %d %s com sucesso</string>
+    <string name="batch_download_start_format" formatted="true">Download iniciado %1$d %2$s…</string>
+    <string name="batch_download_finish_format" formatted="true">Transferido %1$d %2$s com sucesso</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">Tudo %s já transferido</string>
     <string name="batch_download">Transferência em batch</string>
     <string name="plugin_singular">plugin</string>
@@ -395,13 +395,13 @@
     <string name="go_back_30">-30</string>
     <string name="other_singular">Vídeo</string>
     <string name="go_forward_30">+30</string>
-    <string name="season_format">%s %d%s</string>
+    <string name="season_format">%1$s %2$d%3$s</string>
     <string name="cast_format" formatted="true">Elenco: %s</string>
     <string name="update_started">Atualização iniciada</string>
     <string name="test_log">Log</string>
     <string name="apk_installer_settings_des">Alguns aparelhos não suportam o novo instalador de pacotes. Use a opção legado caso não esteja conseguindo atualizar.</string>
-    <string name="episodes_range">%d-%d</string>
-    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="episodes_range">%1$d-%2$d</string>
+    <string name="episode_format" formatted="true">%1$d %2$s</string>
     <string name="start">Iniciar</string>
     <string name="test_failed">Falha</string>
     <string name="test_passed">Sucesso</string>
@@ -506,7 +506,7 @@
     <string name="pref_category_cache">Cache</string>
     <string name="pref_category_android_tv">Android TV</string>
     <string name="pref_category_subtitles">Legendas</string>
-    <string name="login_format" formatted="true">%s %s</string>
+    <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="quality_ts">TS</string>
     <string name="quality_cam_rip">Cam</string>
     <string name="quality_cam_hd">Cam</string>
diff --git a/app/src/main/res/values-qt/strings.xml b/app/src/main/res/values-qt/strings.xml
index e1191d2b..72f16012 100644
--- a/app/src/main/res/values-qt/strings.xml
+++ b/app/src/main/res/values-qt/strings.xml
@@ -195,12 +195,12 @@
     <string name="primary_color_settings">a ou oh ouhuouhoaaha</string>
     <string name="show_fillers_settings">aaooohhouhhha hauauuu</string>
     <string name="new_update_format">aaaaaaa uuuuuu
-\n%s -&gt; %s</string>
-    <string name="app_dub_sub_episode_text_format" formatted="true">%s aaou %d</string>
+\n%1$s -&gt; %2$s</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%1$s aaou %2$d</string>
     <string name="cast_format" formatted="true">oouaaahh %s</string>
     <string name="next_episode_format" formatted="true">aaaaaaugh ouh %d uuoogahaaah ooua-h-ha</string>
-    <string name="next_episode_time_day_format" formatted="true">%daaa %duuu %dhhhg</string>
-    <string name="next_episode_time_hour_format" formatted="true">%daaaaaaauuhh %doouuahaaha</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$daaa %2$duuu %3$dhhhg</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$daaaaaaauuhh %2$doouuahaaha</string>
     <string name="next_episode_time_min_format" formatted="true">%dmmmm...</string>
     <string name="player_speed_text_format" formatted="true">aaaaaaaaaaaaahh (%.2foouo)</string>
     <string name="rated_format" formatted="true">aghaaaooo-ough %.1f</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 75388b23..1a084e02 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
-    <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%1$s Ep %2$d</string>
     <string name="cast_format" formatted="true">Distribuție: %s</string>
     <string name="next_episode_format" formatted="true">Episodul %d va fi lansat în</string>
-    <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
-    <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$dd %2$dh %3$dm</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$dh %2$dm</string>
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
@@ -20,7 +20,7 @@
     <string name="player_speed_text_format" formatted="true">Viteză (%.2fx)</string>
     <string name="rated_format" formatted="true">Evaluare: %.1f</string>
     <string name="new_update_format" formatted="true">Actualizare nouă găsită!
-\n%s -&gt; %s</string>
+\n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">Filler</string>
     <string name="duration_format" formatted="true">%d min</string>
     <!-- <string name="app_name">CloudStream</string> -->
@@ -295,7 +295,7 @@
     <string name="example_site_name">David Popovici</string>
     <string name="example_site_url">davidpopovici.com</string>
     <string name="example_lang_name">Cod limbă (RO)</string>
-    <string name="login_format" formatted="true">%s %s</string>
+    <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="account">Cont</string>
     <string name="logout">Deconectare</string>
     <string name="login">Conectare</string>
@@ -392,9 +392,9 @@
     <string name="others">Altele</string>
     <string name="test_passed">Trecut</string>
     <string name="start">Start</string>
-    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="episode_format" formatted="true">%1$d %2$s</string>
     <string name="nsfw">NSFW</string>
-    <string name="episodes_range">%d-%d</string>
+    <string name="episodes_range">%1$d-%2$d</string>
     <string name="android_tv_interface_on_seek_settings">Player Afișat - Căutați Suma</string>
     <string name="android_tv_interface_off_seek_settings">Player Ascuns - Căutați Suma</string>
     <string name="livestreams">Livestream-uri</string>
@@ -407,7 +407,7 @@
     <string name="other_singular">Video</string>
     <string name="apk_installer_settings">Instalator APK</string>
     <string name="automatic_plugin_download_summary">Instalează automat toate plugin-urile neinstalate din depozite adăugate.</string>
-    <string name="season_format">%s %d%s</string>
+    <string name="season_format">%1$s %2$d%3$s</string>
     <string name="apk_installer_settings_des">Unele telefoane nu acceptă noul program de instalare a pachetului. Încercați opțiunea veche dacă nu se instalează actualizările.</string>
     <string name="redo_setup_process">Refaceți procesul de configurare</string>
     <string name="skip_setup">Treci peste partea de configurare</string>
@@ -489,7 +489,7 @@
 \nDin cauza unui DMCA takedown fără creier de către Sky UK Limited 🤮 nu putem lega site-ul de depozit în aplicație.
 \n
 \nAlăturați-vă Discordului nostru sau căutați online.</string>
-    <string name="batch_download_start_format" formatted="true">A început să descarce %d %s…</string>
+    <string name="batch_download_start_format" formatted="true">A început să descarce %1$d %2$s…</string>
     <string name="safe_mode_title">Mod sigur pornit</string>
     <string name="safe_mode_file">Fișier Mod Sigur găsit!
 \nNu încarcă nicio extensie la pornire până când fișierul nu este eliminat.</string>
@@ -531,7 +531,7 @@
     <string name="network_adress_example">Link către stream</string>
     <string name="delete_repository_plugins">Acest lucru va șterge, de asemenea, toate plugin-urile din depozit</string>
     <string name="update_notification_installing">Se instalează actualizarea aplicației…</string>
-    <string name="batch_download_finish_format" formatted="true">S-a descărcat %d %s</string>
+    <string name="batch_download_finish_format" formatted="true">S-a descărcat %1$d %2$s</string>
     <string name="extension_types">Suportat</string>
     <string name="hls_playlist">Playlist HLS</string>
     <string name="video_tracks">Piste video</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 173c92cb..393ca0ba 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -35,7 +35,7 @@
     <string name="player_speed_text_format" formatted="true">Скорость (%.2fx)</string>
     <string name="rated_format" formatted="true">Оценили: %.1f</string>
     <string name="new_update_format" formatted="true">Новое обновление найдено!
-\n%s -&gt; %s</string>
+\n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">Заполнитель</string>
     <string name="app_name">CloudStream</string>
     <string name="action_remove_from_bookmarks">Убирать</string>
@@ -200,7 +200,7 @@
     <string name="discord">Присоединится в Discord</string>
     <string name="free_storage">Бесплатно</string>
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
-    <string name="next_episode_time_hour_format" formatted="true">%d ч. %d мин.</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$d ч. %2$d мин.</string>
     <string name="movies">Фильмы</string>
     <string name="cartoons_singular">Мультфильм</string>
     <string name="tv_series">Сериалы</string>
@@ -282,10 +282,10 @@
     <string name="uprereleases_settings_des">Поиск предварительных обновлений вместо полных выпусков</string>
     <string name="redo_setup_process">Повторить процесс настройки</string>
     <string name="no_chromecast_support_toast">Этот провайдер не поддерживает Chromecast</string>
-    <string name="season_format">%s %d%s</string>
+    <string name="season_format">%1$s %2$d%3$s</string>
     <string name="no_season">Нет сезона</string>
-    <string name="episodes_range">%d-%d</string>
-    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="episodes_range">%1$d-%2$d</string>
+    <string name="episode_format" formatted="true">%1$d %2$s</string>
     <string name="livestreams">Прямые трансляции</string>
     <string name="live_singular">Прямая трансляция</string>
     <string name="source_error">Ошибка источника</string>
@@ -390,7 +390,7 @@
     <string name="quality_cam">Cam</string>
     <string name="quality_hq">HQ</string>
     <string name="plugins_disabled" formatted="true">Отключено: %d</string>
-    <string name="login_format" formatted="true">%s %s</string>
+    <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="authenticated_user" formatted="true">%s аутентифицировано</string>
     <string name="authenticated_user_fail" formatted="true">Не удается логин на %s</string>
     <string name="max">Макс</string>
@@ -450,9 +450,9 @@
     <string name="subtitles_encoding">Кодировка субтитров</string>
     <string name="player_load_subtitles">Загрузить из файла</string>
     <string name="extension_rating" formatted="true">Рейтинг: %s</string>
-    <string name="batch_download_finish_format" formatted="true">Скачано %d %s</string>
+    <string name="batch_download_finish_format" formatted="true">Скачано %1$d %2$s</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">Все %s уже скачаны</string>
-    <string name="batch_download_start_format" formatted="true">Начата загрузка %d %s…</string>
+    <string name="batch_download_start_format" formatted="true">Начата загрузка %1$d %2$s…</string>
     <string name="plugins_not_downloaded" formatted="true">Не скачано: %d</string>
     <string name="download_all_plugins_from_repo">Скачать все плагины из этого репозитория\?</string>
     <string name="safe_mode_title">Включен безопасный режим</string>
diff --git a/app/src/main/res/values-so/strings.xml b/app/src/main/res/values-so/strings.xml
index c3d107f5..a63d44fe 100644
--- a/app/src/main/res/values-so/strings.xml
+++ b/app/src/main/res/values-so/strings.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="cast_format" formatted="true">Metalaya: %s</string>
-    <string name="next_episode_time_day_format" formatted="true">%dm %ds %dd</string>
-    <string name="next_episode_time_hour_format" formatted="true">%ds %dd</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$dm %2$ds %3$dd</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$ds %2$dd</string>
     <string name="next_episode_time_min_format" formatted="true">%dd</string>
-    <string name="app_dub_sub_episode_text_format" formatted="true">%s Xlq %d</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%1$s Xlq %2$d</string>
     <string name="next_episode_format" formatted="true">Xalqadda %d waxa lasoo deyn doonaa</string>
     <string name="download">Daji</string>
     <string name="download_failed">Dejintii ma guulaysan</string>
@@ -28,7 +28,7 @@
     <string name="title_home">Kadinka</string>
     <string name="rated_format" formatted="true">Qiimaysan: %.1f</string>
     <string name="new_update_format" formatted="true">App cusub baa soo baxay!
-\n%s -&gt; %s</string>
+\n%1$s -&gt; %2$s</string>
     <string name="title_downloads">Soo dejinta</string>
     <string name="title_search">Raadi</string>
     <string name="episode_more_options_des">Dookhyo kale</string>
@@ -163,7 +163,7 @@
     <string name="lightnovel">Light novel app, isla dhiseyaasha appkan baa leh</string>
     <string name="updates_settings">Tus wixii appka ku cusub</string>
     <string name="redo_setup_process">Dib uso bilow fadhiisinta appka</string>
-    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="episode_format" formatted="true">%1$d %2$s</string>
     <string name="uprereleases_settings">Ku cusbooneysii baahinta ugu horreysa</string>
     <string name="apk_installer_settings">Rakibaha APKga</string>
     <string name="status_ongoing">Socda</string>
@@ -179,10 +179,10 @@
     <string name="synopsis">Dulucuda</string>
     <string name="acra_report_toast">Raalliahow, wuu duqeeyey appku, waxa warbixin cillad-saarka ka caawisa loo direy dhiseyaasha</string>
     <string name="season">Kalka</string>
-    <string name="season_format">%s %d%s</string>
+    <string name="season_format">%1$s %2$d%3$s</string>
     <string name="episode">Xalqad</string>
     <string name="episodes">Xalqado</string>
-    <string name="episodes_range">%d illaa %d</string>
+    <string name="episodes_range">%1$d illaa %2$d</string>
     <string name="season_short">K</string>
     <string name="episode_short">X</string>
     <string name="cartoons">Kartoon</string>
@@ -361,7 +361,7 @@
     <string name="none">Midna</string>
     <string name="example_site_name">Websaydkayga.com</string>
     <string name="example_lang_name">Koodhka Luuqadda (en)</string>
-    <string name="login_format" formatted="true">%s %s</string>
+    <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="create_account">Akoon samee</string>
     <string name="upload_sync">Talantaalli</string>
     <string name="sync_score">Qiimaysan</string>
@@ -467,8 +467,8 @@
     <string name="plugin_deleted">Waa la tiray sidkanahan</string>
     <string name="plugin_load_fail" formatted="true">Waa ka keeni kari waayey %s</string>
     <string name="is_adult">18+</string>
-    <string name="batch_download_start_format" formatted="true">Waa la dejinayaa %d %s…</string>
-    <string name="batch_download_finish_format" formatted="true">Waa la dejiyey %d %s</string>
+    <string name="batch_download_start_format" formatted="true">Waa la dejinayaa %1$d %2$s…</string>
+    <string name="batch_download_finish_format" formatted="true">Waa la dejiyey %1$d %2$s</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">Dhammaan %s way dejisan yihiin</string>
     <string name="extensions">Kordhiyeyaasha</string>
     <string name="view_public_repositories_button_short">Liiska bulshada kale</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 806a1ca3..14f388a7 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -3,7 +3,7 @@
     <string name="rated_format">Betygsatt: %.1f</string>
     <string name="player_speed_text_format">Hastighet (%.2fx)</string>
     <string name="new_update_format">Ny uppdatering hittad!
-\n%s -&gt; %s</string>
+\n%1$s -&gt; %2$s</string>
     <string name="app_name">CloudStream</string>
     <string name="title_home">Hem</string>
     <string name="title_search">Sök</string>
@@ -210,8 +210,8 @@
     <string name="dns_pref">DNS över HTTPS</string>
     <string name="dns_pref_summary">" "</string>
     <string name="app_theme_settings">Appens tema</string>
-    <string name="app_dub_sub_episode_text_format">%s A%d</string>
-    <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
+    <string name="app_dub_sub_episode_text_format">%1$s A%2$d</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$dh %2$dm</string>
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <string name="play_with_app_name">Spela med CloudStream</string>
     <string name="chromecast_subtitles_settings">Chromecast-undertexter</string>
@@ -220,7 +220,7 @@
     <string name="category_account">Konton</string>
     <string name="category_updates">Uppdateringar och backup</string>
     <string name="automatic_plugin_updates">Automatiska pluginuppdateringar</string>
-    <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$dd %2$dh %3$dm</string>
     <string name="search_hint_site" formatted="true">Sök %s…</string>
     <string name="sort_copy">Kopiera</string>
     <string name="sort_close">Stäng</string>
@@ -236,9 +236,9 @@
     <string name="show_trailers_settings">Visa trailers</string>
     <string name="action_open_play">@string/home_play</string>
     <string name="ova">OVA</string>
-    <string name="episodes_range">%d-%d</string>
-    <string name="episode_format" formatted="true">%d %s</string>
-    <string name="season_format">%s %d%s</string>
+    <string name="episodes_range">%1$d-%2$d</string>
+    <string name="episode_format" formatted="true">%1$d %2$s</string>
+    <string name="season_format">%1$s %2$d%3$s</string>
     <string name="go_back_30">-30</string>
     <string name="resume_time_left" formatted="true">%dm
 \nåterstår</string>
@@ -321,7 +321,7 @@
     <string name="app_layout_subtext">Ändra appens utseende så att den passar din enhet</string>
     <string name="cast_format" formatted="true">Skådespelare: %s</string>
     <string name="play_livestream_button">Spela Livestream</string>
-    <string name="login_format" formatted="true">%s %s</string>
+    <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="subtitle_offset_extra_hint_none_format">Ingen undertextfördröjning</string>
     <string name="pref_category_player_features">Spelarfunktioner</string>
     <string name="trailer">Trailer</string>
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index ca4a1377..234207b9 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -106,18 +106,18 @@
     <string name="chromecast_subtitles_settings_des">Chromecast வசன அமைப்புகள்</string>
     <string name="use_system_brightness_settings_des">இருண்ட மேலடுக்குக்குப் பதிலாக ஆப் பிளேயரில் சிஸ்டம் பிரகாசத்தைப் பயன்படுத்தவும்</string>
     <string name="next_episode_format" formatted="true">அத்தியாயம் %d-இன் வெளியீட்டு நேரம்</string>
-    <string name="next_episode_time_hour_format" formatted="true">%dம %dநி</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$dம %2$dநி</string>
     <string name="next_episode_time_min_format" formatted="true">%dநி</string>
     <string name="home_next_random_img_des">அடுத்து ஏதாவது</string>
     <string name="browser">உலாவி</string>
     <string name="duration_format" formatted="true">%d நிமி</string>
     <string name="play_with_app_name">CloudStream-உடன் இயக்கு</string>
     <string name="new_update_format" formatted="true">புதிய புதுப்பிப்பு உள்ளது
-\n%s-&gt;%s</string>
+\n%1$s-&gt;%2$s</string>
     <string name="filler" formatted="true">நிரப்பி</string>
     <string name="search_poster_img_des">போஸ்டர்</string>
     <string name="episode_poster_img_des">எபிசோட்டின் போஸ்டர்</string>
     <string name="result_poster_img_des">போஸ்டர்</string>
     <string name="home_main_poster_img_des">பிரதான போஸ்டர்</string>
-    <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%1$s Ep %2$d</string>
 </resources>
diff --git a/app/src/main/res/values-ti/strings.xml b/app/src/main/res/values-ti/strings.xml
index a9079ed5..46235bbd 100644
--- a/app/src/main/res/values-ti/strings.xml
+++ b/app/src/main/res/values-ti/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_dub_sub_episode_text_format" formatted="true">%s ክፋል %d</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%1$s ክፋል %2$d</string>
     <string name="next_episode_format" formatted="true">ክፋል %d በ ላይ ይወጣል</string>
     <string name="cast_format" formatted="true">ተዋሳእቲ፡ %s</string>
 </resources>
diff --git a/app/src/main/res/values-tl/strings.xml b/app/src/main/res/values-tl/strings.xml
index 03138259..c5e29006 100644
--- a/app/src/main/res/values-tl/strings.xml
+++ b/app/src/main/res/values-tl/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <!-- KEYS DON'T TRANSLATE -->
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
-    <string name="app_dub_sub_episode_text_format">%s Ep %d</string>
+    <string name="app_dub_sub_episode_text_format">%1$s Ep %2$d</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
     <string name="search_poster_img_des">@string/result_poster_img_des</string>
@@ -16,7 +16,7 @@
     <string name="player_speed_text_format" formatted="true">Bilis (%.2fx)</string>
     <string name="rated_format" formatted="true">Rated: %.1f</string>
     <string name="new_update_format" formatted="true">Bagong update!
-\n%s -&gt; %s</string>
+\n%1$s -&gt; %2$s</string>
     <string name="app_name">CloudStream</string>
     <string name="title_home">Home</string>
     <string name="title_search">Maghanap</string>
@@ -214,8 +214,8 @@
     <string name="next_episode_format" formatted="true">Episode %d ay ipapalabas sa loob ng</string>
     <string name="search_hint_site" formatted="true">Hanapin ang %s…</string>
     <string name="duration_format" formatted="true">%d min</string>
-    <string name="next_episode_time_day_format" formatted="true">%dd, %dh:%dm</string>
-    <string name="next_episode_time_hour_format" formatted="true">%dh : %dm</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$dd, %2$dh:%3$dm</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$dh : %2$dm</string>
     <string name="play_with_app_name">I-play gamit ang CloudStream</string>
     <string name="type_re_watching">Pinapanuod Uli</string>
     <string name="play_livestream_button">Panuorin ang Livestream</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 3445c57a..4d8ae42c 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -631,4 +631,11 @@
     <string name="enter_pin">PIN girin</string>
     <string name="pin">PIN</string>
     <string name="enter_current_pin">Geçerli PIN\'i Giriniz</string>
+    <string name="rotate_video_desc">Ekran yönü için bir geçiş düğmesi göster</string>
+    <string name="rotate_video_key">rotate_video_key</string>
+    <string name="auto_rotate_video_key">auto_rotate_video_key</string>
+    <string name="auto_rotate_video">Otomatik döndürme</string>
+    <string name="rotate_video">Döndür</string>
+    <string name="auto_rotate_video_desc">Video yönüne göre ekran yönünün otomatik olarak değişmesini sağla</string>
+    <string name="links_reloaded_toast">Bağlantılar Yeniden Yüklendi</string>
 </resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 224b621a..aae04cb0 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -584,4 +584,11 @@
     <string name="skip_startup_account_select_pref">Пропускати вибір акаунту під час запуску</string>
     <string name="manage_accounts">Керування акаунтами</string>
     <string name="edit_account">Редагувати акаунт</string>
+    <string name="rotate_video_desc">Показувати кнопку перемикання орієнтації екрана</string>
+    <string name="rotate_video_key">rotate_video_key</string>
+    <string name="rotate_video">Поворот</string>
+    <string name="links_reloaded_toast">Посилання перезавантажені</string>
+    <string name="auto_rotate_video_key">auto_rotate_video_key</string>
+    <string name="auto_rotate_video">Автоповорот</string>
+    <string name="auto_rotate_video_desc">Ввімкнути автоматичний поворот екрана на основі орієнтації відео</string>
 </resources>
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index b437e2d0..28880f17 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -11,11 +11,11 @@
     <string name="preview_background_img_des">پس منظر کا دیکھنا</string>
     <string name="rated_format" formatted="true">درجہ بندی: %.1f</string>
     <string name="new_update_format" formatted="true">نیا update آگیا ہے!
-\n%s -&gt; %s</string>
+\n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">بھرنے والا</string>
     <string name="duration_format" formatted="true">%d منٹ</string>
-    <string name="next_episode_time_day_format" formatted="true">%d دن %d گھنٹے %d منٹ</string>
-    <string name="next_episode_time_hour_format" formatted="true">%d گھنٹے %d منٹ</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$d دن %2$d گھنٹے %3$d منٹ</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$d گھنٹے %2$d منٹ</string>
     <string name="next_episode_time_min_format" formatted="true">%d منٹ</string>
     <string name="app_name">CloudStream</string>
     <string name="play_with_app_name">CloudStream کے ساتھ چلائیں</string>
@@ -146,7 +146,7 @@
     <string name="copy_link_toast">کلپ بورڈ میں نقل ہوا</string>
     <string name="play_episode_toast">قسط چلائیں</string>
     <string name="subs_default_reset_toast">طے شدہ قدر پر ری سیٹ کریں</string>
-    <string name="app_dub_sub_episode_text_format" formatted="true">%s قسط %d</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%1$s قسط %2$d</string>
     <string name="result_poster_img_des">پوسٹر</string>
     <string name="result_share">شئیر کریں</string>
     <string name="result_tags">انواع</string>
@@ -180,12 +180,12 @@
     <string name="apk_installer_settings_des">کچھ فون نئے پیکیج انسٹالر کو سپورٹ نہیں کرتے ہیں. اگر اپ ڈیٹس انسٹال نہیں ہوتے ہیں تو لیگیسی آپشن کو آزمائیں.</string>
     <string name="acra_report_toast">معذرت، ایپلی کیشن کریش ہو گئی. ایک گمنام بگ رپورٹ ڈویلپرز کو بھیجی جائے گی</string>
     <string name="season">سیزن</string>
-    <string name="season_format">%s %d%s</string>
+    <string name="season_format">%1$s %2$d%3$s</string>
     <string name="no_season">کوئی سیزن نہیں</string>
     <string name="episode">قسط</string>
     <string name="episodes">اقساط</string>
-    <string name="episodes_range">%d-%d</string>
-    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="episodes_range">%1$d-%2$d</string>
+    <string name="episode_format" formatted="true">%1$d %2$s</string>
     <string name="season_short">S</string>
     <string name="episode_short">E</string>
     <string name="no_episodes_found">کوئی اقساط نہیں ملی</string>
@@ -344,7 +344,7 @@
     <string name="resize_fit">اسکرین پر فٹ</string>
     <string name="resize_fill">کھینچیں</string>
     <string name="create_account">اکاؤنٹ بنائیں</string>
-    <string name="login_format" formatted="true">%s %s</string>
+    <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="switch_account">اکاؤنٹ سوئچ کریں</string>
     <string name="add_sync">ٹریکنگ شامل کریں</string>
     <string name="upload_sync">تواقت</string>
@@ -406,8 +406,8 @@
     <string name="repository_url_hint">ذخیرہ URL</string>
     <string name="plugin_loaded">پلگ ان لوڈ ہو گیا</string>
     <string name="plugin_load_fail" formatted="true">%s کو لوڈ نہیں کیا جا سکا</string>
-    <string name="batch_download_start_format" formatted="true">ڈاؤن لوڈ ہونا شروع ہو گیا %d %s…</string>
-    <string name="batch_download_finish_format" formatted="true">ڈاؤن لوڈ کیا گیا %d %s</string>
+    <string name="batch_download_start_format" formatted="true">ڈاؤن لوڈ ہونا شروع ہو گیا %1$d %2$s…</string>
+    <string name="batch_download_finish_format" formatted="true">ڈاؤن لوڈ کیا گیا %1$d %2$s</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">سبھی %s پہلے ہی ڈاؤن لوڈ ہو چکے ہیں</string>
     <string name="plugin_singular">رابطہ بحال کرو</string>
     <string name="plugin">پلگ ان</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 52897633..bb30afc7 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -11,11 +11,11 @@
     <string name="rew_text_regular_format" formatted="true" translatable="false">%d</string>
     <string name="rating_format" formatted="true" translatable="false">%.1f/10.0</string>
     <string name="year_format" formatted="true" translatable="false">%d</string>
-    <string name="app_dub_sub_episode_text_format" formatted="true">%s 共 %d 集</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%1$s 共 %2$d 集</string>
     <string name="cast_format" formatted="true">演員：%s</string>
     <string name="next_episode_format" formatted="true">第 %d 集即將發佈於</string>
-    <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
-    <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$dd %2$dh %3$dm</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$dh %2$dm</string>
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">封面</string>
@@ -32,12 +32,12 @@
     <string name="player_speed_text_format" formatted="true">速度（%.2fx）</string>
     <string name="rated_format" formatted="true">評分：%.1f</string>
     <string name="new_update_format" formatted="true">發現新版本！
-\n%s -&gt; %s</string>
+\n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">填充</string>
     <string name="duration_format" formatted="true">%d 分鐘</string>
     <string name="app_name">CloudStream</string>
     <string name="play_with_app_name">使用 CloudStream 播放</string>
-    <string name="title_home">主頁</string>
+    <string name="title_home">主畫面</string>
     <string name="title_search">搜尋</string>
     <string name="title_downloads">下載</string>
     <string name="title_settings">設定</string>
@@ -78,14 +78,14 @@
     <string name="download_format" translatable="false">%s - %s</string>
     <string name="stream">播放</string>
     <string name="error_loading_links_toast">載入連結錯誤</string>
-    <string name="download_storage_text">內部存儲</string>
+    <string name="download_storage_text">內部儲存空間</string>
     <string name="app_dubbed_text">配音</string>
     <string name="app_subbed_text">字幕</string>
     <string name="popup_delete_file">刪除檔案</string>
     <string name="popup_play_file">播放檔案</string>
     <string name="popup_resume_download">繼續下載</string>
     <string name="popup_pause_download">暫停下載</string>
-    <string name="pref_disable_acra">禁用自動錯誤報告</string>
+    <string name="pref_disable_acra">停用自動錯誤報告</string>
     <string name="home_more_info">更多資訊</string>
     <string name="home_expanded_hide">隱藏</string>
     <string name="home_play">播放</string>
@@ -98,7 +98,7 @@
     <string name="sort_copy">複製</string>
     <string name="sort_close">關閉</string>
     <string name="sort_clear">清除</string>
-    <string name="sort_save">保存</string>
+    <string name="sort_save">儲存</string>
     <string name="player_speed">播放速度</string>
     <string name="subtitles_settings">字幕設定</string>
     <string name="subs_text_color">字體顏色</string>
@@ -167,14 +167,14 @@
     <string name="settings_info">資訊</string>
     <string name="advanced_search">進階搜尋</string>
     <string name="advanced_search_des">為您提供按片源分開的搜尋結果</string>
-    <string name="bug_report_settings_off">僅在崩潰時傳送資料</string>
+    <string name="bug_report_settings_off">僅在程式崩潰時傳送相關資料</string>
     <string name="bug_report_settings_on">不傳送資料</string>
     <string name="show_fillers_settings">顯示動畫外傳</string>
     <string name="show_trailers_settings">顯示預告片</string>
     <string name="kitsu_settings">顯示來自 Kitsu 的封面</string>
-    <string name="pref_filter_search_quality">在搜尋結果中隱藏選中的影片畫質</string>
+    <string name="pref_filter_search_quality">在搜尋結果中隱藏所選的影片畫質</string>
     <string name="automatic_plugin_updates">自動更新外掛程式</string>
-    <string name="updates_settings">顯示應用更新</string>
+    <string name="updates_settings">顯示應用程式更新</string>
     <string name="updates_settings_des">啟動應用程式後自動搜尋更新。</string>
     <string name="uprereleases_settings">更新至預覽版</string>
     <string name="uprereleases_settings_des">搜尋預覽版更新而不是僅搜尋正式版</string>
@@ -190,18 +190,18 @@
     <string name="copy_link_toast">連結已複製到剪貼簿</string>
     <string name="play_episode_toast">播放劇集</string>
     <string name="subs_default_reset_toast">重設為預設值</string>
-    <string name="acra_report_toast">很抱歉，應用崩潰了，將傳送一份匿名錯誤報告給開發者</string>
+    <string name="acra_report_toast">很抱歉，應用程式崩潰了，將傳送一份匿名錯誤報告給開發者</string>
     <string name="season">季</string>
-    <string name="season_format">%s %d%s</string>
+    <string name="season_format">%1$s %2$d%3$s</string>
     <string name="no_season">無季</string>
     <string name="episode">集</string>
     <string name="episodes">集</string>
-    <string name="episodes_range">%d-%d</string>
-    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="episodes_range">%1$d-%2$d</string>
+    <string name="episode_format" formatted="true">%1$d %2$s</string>
     <string name="season_short">S</string>
     <string name="episode_short">E</string>
     <string name="no_episodes_found">未找到劇集</string>
-    <string name="delete_file">刪除文件</string>
+    <string name="delete_file">刪除檔案</string>
     <string name="delete">刪除</string>
     <string name="cancel">取消</string>
     <string name="pause">暫停</string>
@@ -210,8 +210,8 @@
     <string name="go_forward_30">+30</string>
     <string name="delete_message" formatted="true">這將永遠刪除 %s
 \n你確定嗎\?</string>
-    <string name="resume_time_left" formatted="true">%d 分鐘
-\n剩餘的</string>
+    <string name="resume_time_left" formatted="true">剩下
+\n%d 分鐘</string>
     <string name="status_ongoing">連載中</string>
     <string name="status_completed">已完結</string>
     <string name="status">狀態</string>
@@ -252,7 +252,7 @@
     <string name="other_singular">其他</string>
     <string name="source_error">來源錯誤</string>
     <string name="remote_error">遠端錯誤</string>
-    <string name="render_error">渲染器錯誤</string>
+    <string name="render_error">算繪器錯誤</string>
     <string name="unexpected_error">意料之外的播放器錯誤</string>
     <string name="storage_error">下載錯誤，請檢查儲存權限</string>
     <string name="episode_action_chromecast_episode">Chromecast 劇集</string>
@@ -290,7 +290,7 @@
     <string name="video_buffer_length_settings">影片緩衝長度</string>
     <string name="video_buffer_disk_settings">影片快取存儲</string>
     <string name="video_buffer_clear_settings">清除影片和圖片快取</string>
-    <string name="video_ram_description">如果在記憶體不足的裝置（例如 Android TV）上設定得太高會導致崩潰。</string>
+    <string name="video_ram_description">如果在記憶體不足的裝置（例如 Android TV）上設定得太高會導致程式崩潰。</string>
     <string name="video_disk_description">如果在儲存空間較小的裝置（例如 Android TV）上設定過高會導致問題。</string>
     <string name="dns_pref">DNS over HTTPS</string>
     <string name="dns_pref_summary">用於繞過網路服務供應商的封鎖</string>
@@ -308,18 +308,18 @@
     <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application should be taken up with the actual file hosts and providers themselves as we are not affiliated with them. In case of copyright infringement, please directly contact the responsible parties or the streaming websites. The app is purely for educational and personal use. CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down. CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient, user-friendly interface. It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use CloudStream 3 at your own risk.</string>
     <string name="category_general">通用</string>
     <string name="random_button_settings">隨機按鈕</string>
-    <string name="random_button_settings_desc">在主頁中顯示隨機按鈕</string>
+    <string name="random_button_settings_desc">在主畫面中顯示隨機按鈕</string>
     <string name="provider_lang_settings">片源語言</string>
-    <string name="app_layout">應用佈局</string>
+    <string name="app_layout">應用程式版面配置</string>
     <string name="preferred_media_settings">偏好類型</string>
     <string name="enable_nsfw_on_providers">在支援的片源中啟用 NSFW 內容</string>
     <string name="subtitles_encoding">字幕編碼</string>
     <string name="category_providers">片源</string>
     <string name="category_ui">佈局</string>
     <string name="automatic">自動</string>
-    <string name="tv_layout">電視佈局</string>
-    <string name="phone_layout">手機佈局</string>
-    <string name="emulator_layout">模擬器佈局</string>
+    <string name="tv_layout">電視版面配置</string>
+    <string name="phone_layout">手機版面配置</string>
+    <string name="emulator_layout">模擬器版面配置</string>
     <string name="primary_color_settings">主題色</string>
     <string name="app_theme_settings">應用程式主題</string>
     <string name="bottom_title_settings">封面標題位置</string>
@@ -344,15 +344,15 @@
     <string name="kitsu_account_settings" translatable="false">Kitsu</string>
     <string name="trakt_account_settings" translatable="false">Trakt</string>
     -->
-    <string name="login_format" formatted="true">%s %s</string>
+    <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="account">帳號</string>
     <string name="logout">登出</string>
     <string name="login">登入</string>
     <string name="switch_account">切換帳號</string>
-    <string name="add_account">添加帳號</string>
-    <string name="create_account">創建帳號</string>
-    <string name="add_sync">添加同步</string>
-    <string name="added_sync_format" formatted="true">已添加 %s</string>
+    <string name="add_account">新增帳號</string>
+    <string name="create_account">建立帳號</string>
+    <string name="add_sync">加入同步</string>
+    <string name="added_sync_format" formatted="true">已新增 %s</string>
     <string name="upload_sync">同步</string>
     <string name="sync_score">評分</string>
     <string name="sync_score_format" formatted="true">%d / 10</string>
@@ -374,8 +374,8 @@
     <string name="subtitle_offset">同步字幕</string>
     <string name="subtitle_offset_hint">1000 毫秒</string>
     <string name="subtitle_offset_title">字幕延遲</string>
-    <string name="subtitle_offset_extra_hint_later_format">如果字幕過早顯示 %d 毫秒，請使用此選項</string>
-    <string name="subtitle_offset_extra_hint_before_format">如果字幕過晚顯示 %d 毫秒，請使用此選項</string>
+    <string name="subtitle_offset_extra_hint_later_format">如果字幕提早 %d 毫秒顯示，請使用此選項</string>
+    <string name="subtitle_offset_extra_hint_before_format">如果字幕延遲 %d 毫秒顯示，請使用此選項</string>
     <string name="subtitle_offset_extra_hint_none_format">無字幕延遲</string>
     <!--
     Example text (pangram) can optionally be translated; if you do, include all the letters in the alphabet,
@@ -422,7 +422,7 @@
     <string name="error">錯誤</string>
     <string name="subtitles_remove_captions">移除隱藏式字幕</string>
     <string name="subtitles_remove_bloat">移除字幕廣告</string>
-    <string name="subtitles_filter_lang">按偏好片源語言過濾</string>
+    <string name="subtitles_filter_lang">按偏好的片源語言篩選</string>
     <string name="extras">附加</string>
     <string name="trailer">預告片</string>
     <string name="network_adress_example">播放連結</string>
@@ -432,7 +432,7 @@
     <string name="previous">上一個</string>
     <string name="skip_setup">跳過設定</string>
     <string name="app_layout_subtext">更改應用程式的外觀以適應你的設備</string>
-    <string name="crash_reporting_title">崩潰報告</string>
+    <string name="crash_reporting_title">程式崩潰報告</string>
     <string name="preferred_media_subtext">你想要看什麼</string>
     <string name="setup_done">完成</string>
     <string name="extensions">擴充功能</string>
@@ -443,17 +443,17 @@
     <string name="plugin_deleted">外掛程式已刪除</string>
     <string name="plugin_load_fail" formatted="true">無法載入 %s</string>
     <string name="is_adult">18+</string>
-    <string name="batch_download_start_format" formatted="true">開始下載 %d %s …</string>
-    <string name="batch_download_finish_format" formatted="true">已下載 %d %s</string>
+    <string name="batch_download_start_format" formatted="true">開始下載 %1$d %2$s …</string>
+    <string name="batch_download_finish_format" formatted="true">已下載 %1$d %2$s</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">全部 %s 已經下載</string>
     <string name="batch_download">批次下載</string>
     <string name="plugin_singular">外掛程式</string>
     <string name="plugin">外掛程式</string>
-    <string name="delete_repository_plugins">這也將刪除所有資源庫外掛程式</string>
+    <string name="delete_repository_plugins">這也將刪除所有在資源庫中的外掛程式</string>
     <string name="delete_repository">刪除資源庫</string>
     <string name="setup_extensions_subtext">下載你所需的片源</string>
     <string name="plugins_downloaded" formatted="true">已下載：%d</string>
-    <string name="plugins_disabled" formatted="true">已禁用：%d</string>
+    <string name="plugins_disabled" formatted="true">已停用：%d</string>
     <string name="plugins_not_downloaded" formatted="true">未下載：%d</string>
     <string name="plugins_updated" formatted="true">已更新 %d 外掛程式</string>
     <string name="blank_repo_message">CloudStream 預設沒有安裝任何片源。您需要從資源庫安裝站點。
@@ -465,14 +465,14 @@
     <string name="view_public_repositories_button_short">公開列表</string>
     <string name="uppercase_all_subtitles">字幕全大寫</string>
     <string name="download_all_plugins_from_repo">從此資源庫下載所有外掛程式？</string>
-    <string name="single_plugin_disabled" formatted="true">%s （禁用）</string>
+    <string name="single_plugin_disabled" formatted="true">%s （停用）</string>
     <string name="tracks">軌道</string>
     <string name="audio_tracks">音頻軌道</string>
     <string name="video_tracks">影片軌道</string>
     <string name="apply_on_restart">重新啟動時生效</string>
     <string name="safe_mode_title">安全模式已啟用</string>
-    <string name="safe_mode_description">由於崩潰，所有外掛程式皆已關閉，以幫助您找到導致問題的程式。</string>
-    <string name="safe_mode_crash_info">查看崩潰資訊</string>
+    <string name="safe_mode_description">由於程式崩潰，所有外掛程式皆已關閉，以協助您找到導致問題的程式。</string>
+    <string name="safe_mode_crash_info">查看程式崩潰資訊</string>
     <string name="extension_rating" formatted="true">評分：%s</string>
     <string name="extension_description">簡介</string>
     <string name="extension_version">版本</string>
@@ -489,7 +489,7 @@
     <string name="player_settings_play_in_mpv">MPV</string>
     <string name="player_settings_play_in_web">網路影片播放</string>
     <string name="player_settings_play_in_browser">網頁瀏覽器</string>
-    <string name="app_not_found_error">未找到應用</string>
+    <string name="app_not_found_error">未找到應用程式</string>
     <string name="all_languages_preference">所有語言</string>
     <string name="skip_type_format" formatted="true">跳過 %s</string>
     <string name="skip_type_op">片頭</string>
@@ -504,7 +504,7 @@
     <string name="automatic_plugin_download">自動下載外掛程式</string>
     <string name="confirm_exit_dialog">你確定要離開？</string>
     <string name="automatic_plugin_download_summary">從添加的資源庫自動安裝所有尚未安裝的外掛程式。</string>
-    <string name="enable_skip_op_from_database_des">在開始/結束顯示跳過彈出窗口</string>
+    <string name="enable_skip_op_from_database_des">在開始/結束顯示跳過彈出視窗</string>
     <string name="update_notification_failed">無法安裝新版本的應用程式</string>
     <string name="apk_installer_settings">APK 安裝器</string>
     <string name="apk_installer_settings_des">有些手機不支援新的軟體包安裝程式。 如果未安裝更新，請嘗試使用舊版選項。</string>
@@ -532,7 +532,7 @@
     <string name="pref_category_looks">外觀</string>
     <string name="pref_category_ui_features">功能</string>
     <string name="browser">瀏覽器</string>
-    <string name="subscription_episode_released">第 %d 集已發行!</string>
+    <string name="subscription_episode_released">第 %d 集已發行！</string>
     <string name="library">媒體庫</string>
     <string name="start">開始</string>
     <string name="android_tv_interface_on_seek_settings">播放器顯示 - 快轉快退秒數</string>
@@ -541,7 +541,7 @@
     <string name="sort_rating_asc">評分（從低到高）</string>
     <string name="update_started">更新開始</string>
     <string name="plugin_downloaded">外掛程式已下載</string>
-    <string name="action_remove_from_watched">從觀看中刪除</string>
+    <string name="action_remove_from_watched">從已觀看清單中刪除</string>
     <string name="sort_by">排序方式</string>
     <string name="sort">排序</string>
     <string name="sort_rating_desc">評分（從高到低）</string>
@@ -569,10 +569,73 @@
     <string name="jsdelivr_proxy">raw.githubusercontent.com Proxy</string>
     <string name="pref_category_bypass">繞過 ISP</string>
     <string name="revert">還原</string>
-    <string name="jsdelivr_enabled">無法訪問 GitHub。 正在開啟 jsDelivr proxy…</string>
+    <string name="jsdelivr_enabled">無法存取 GitHub。 正在開啟 jsDelivr proxy…</string>
     <string name="jsdelivr_proxy_summary">使用 jsDelivr 繞過 GitHub 的阻擋。 可能導致更新延遲幾天。</string>
     <string name="empty_library_no_accounts_message">您的媒體庫是空的:(
-\n登入媒體庫帳戶或將節目添加到您本機的媒體庫。</string>
+\n登入媒體庫帳號或將節目新增到您本機的媒體庫。</string>
     <string name="empty_library_logged_in_message">此列表是空的。 嘗試切換到另一個。</string>
     <string name="subscription_in_progress_notification">正在更新訂閱節目</string>
+    <string name="backup_frequency">備份頻率</string>
+    <string name="favorite_removed">%s 已由我的最愛移除</string>
+    <string name="favorites_list_name">我的最愛</string>
+    <string name="favorite_added">%s 已加入我的最愛</string>
+    <string name="logged_account" formatted="true">以 %s 的身分登入</string>
+    <string name="duplicate_message_multiple" formatted="true">您的媒體庫中似乎有多個重覆的項目：
+\n
+\n%s
+\n
+\n您要強制加入、取代已有項目、還是取消操作？</string>
+    <string name="enter_pin_with_name" formatted="true">輸入 %s 的 PIN 碼</string>
+    <string name="mobile_data">行動數據</string>
+    <string name="duplicate_title">找到可能重覆的項目</string>
+    <string name="lock_profile">鎖定設定檔</string>
+    <string name="use_default_account">使用預設帳號</string>
+    <string name="skip_startup_account_select_pref">啟動時略過選擇帳號</string>
+    <string name="action_add_to_favorites">加入我的最愛</string>
+    <string name="manage_accounts">管理帳號</string>
+    <string name="profiles">設定檔</string>
+    <string name="unable_to_inflate">無法正確建立使用者介面，這是重大的程式錯誤，請立即回報 %s</string>
+    <string name="edit">編輯</string>
+    <string name="duplicate_replace_all">全部取代</string>
+    <string name="wifi">Wi-Fi</string>
+    <string name="profile_background_des">設定檔背景</string>
+    <string name="help">說明</string>
+    <string name="edit_account">編輯帳號</string>
+    <string name="pin_error_incorrect">PIN 碼不符，請再試一次。</string>
+    <string name="profile_number">設定檔 %d</string>
+    <string name="action_unsubscribe">取消訂閱</string>
+    <string name="pin_error_length">PIN 碼需為 4 個字元</string>
+    <string name="duplicate_replace">取代</string>
+    <string name="duplicate_add">加入</string>
+    <string name="action_subscribe">訂閱</string>
+    <string name="qualities">品質</string>
+    <string name="use">使用</string>
+    <string name="action_remove_from_favorites">由我的最愛移除</string>
+    <string name="select_an_account">選擇帳號</string>
+    <string name="disable">停用</string>
+    <string name="no_repository_found_error">找不到資源庫，請檢查網址與 VPN 設定</string>
+    <string name="already_voted">您已完成投票</string>
+    <string name="no_plugins_found_error">在資源庫中找不到外掛程式</string>
+    <string name="duplicate_message_single" formatted="true">您的媒體庫中似乎有重覆的項目：「%s」。
+\n
+\n您要強制加入、取代已有項目、還是取消操作？</string>
+    <string name="set_default">設回預設</string>
+    <string name="enter_pin">輸入 PIN 碼</string>
+    <string name="pin">PIN 碼</string>
+    <string name="quality_profile_help">您可在此調整來源的排序方式。具有愈小的優先值的影片，在來源選擇中顯示得愈前面。來源優先值與品質優先值的加總就是影片優先值。
+\n例如：
+\n來源 A：3
+\n品質 B： 7
+\n則該來源的影片優先值為 10。
+\n
+\n注意：如果加總達到 10 或更高，則載入該連結時播放器將自動跳過載入！</string>
+    <string name="enter_current_pin">輸入目前的 PIN 碼</string>
+    <string name="rotate_video_desc">顯示切換畫面方向的按鈕</string>
+    <string name="rotate_video_key">rotate_video_key</string>
+    <string name="automatic_plugin_download_mode_title">選擇篩選外掛程式下載的模式</string>
+    <string name="auto_rotate_video_key">auto_rotate_video_key</string>
+    <string name="auto_rotate_video">自動旋轉</string>
+    <string name="rotate_video">旋轉</string>
+    <string name="auto_rotate_video_desc">根據影片方向自動切換畫面方向</string>
+    <string name="links_reloaded_toast">連結已重新載入</string>
 </resources>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 682bcab7..ba81f968 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -11,11 +11,11 @@
     <string name="rew_text_regular_format" formatted="true" translatable="false">%d</string>
     <string name="rating_format" formatted="true" translatable="false">%.1f/10.0</string>
     <string name="year_format" formatted="true" translatable="false">%d</string>
-    <string name="app_dub_sub_episode_text_format" formatted="true">%s 共 %d 集</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%1$s 共 %2$d 集</string>
     <string name="cast_format" formatted="true">演员：%s</string>
     <string name="next_episode_format" formatted="true">第 %d 集将发布于</string>
-    <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
-    <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$dd %2$dh %3$dm</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$dh %2$dm</string>
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">封面</string>
@@ -32,7 +32,7 @@
     <string name="player_speed_text_format" formatted="true">速度（%.2fx）</string>
     <string name="rated_format" formatted="true">评分：%.1f</string>
     <string name="new_update_format" formatted="true">发现新版本！
-\n%s -&gt; %s</string>
+\n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">填充</string>
     <string name="duration_format" formatted="true">%d 分钟</string>
     <string name="app_name">CloudStream</string>
@@ -193,12 +193,12 @@
     <string name="subs_default_reset_toast">重置为默认值</string>
     <string name="acra_report_toast">抱歉，应用崩溃了，将发送一份匿名错误报告给开发者</string>
     <string name="season">季</string>
-    <string name="season_format">%s %d%s</string>
+    <string name="season_format">%1$s %2$d%3$s</string>
     <string name="no_season">无季</string>
     <string name="episode">集</string>
     <string name="episodes">集</string>
-    <string name="episodes_range">%d-%d</string>
-    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="episodes_range">%1$d-%2$d</string>
+    <string name="episode_format" formatted="true">%1$d %2$s</string>
     <string name="season_short">S</string>
     <string name="episode_short">E</string>
     <string name="no_episodes_found">未找到剧集</string>
@@ -345,7 +345,7 @@
     <string name="kitsu_account_settings" translatable="false">Kitsu</string>
     <string name="trakt_account_settings" translatable="false">Trakt</string>
     -->
-    <string name="login_format" formatted="true">%s %s</string>
+    <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="account">账户</string>
     <string name="logout">注销</string>
     <string name="login">登录</string>
@@ -444,8 +444,8 @@
     <string name="plugin_deleted">插件已删除</string>
     <string name="plugin_load_fail" formatted="true">无法加载 %s</string>
     <string name="is_adult">18+</string>
-    <string name="batch_download_start_format" formatted="true">开始下载 %d %s…</string>
-    <string name="batch_download_finish_format" formatted="true">已下载 %d %s</string>
+    <string name="batch_download_start_format" formatted="true">开始下载 %1$d %2$s…</string>
+    <string name="batch_download_finish_format" formatted="true">已下载 %1$d %2$s</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">全部 %s 已经下载</string>
     <string name="batch_download">批量下载</string>
     <string name="plugin_singular">插件</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 79e3d89d..6048d5cc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -734,4 +734,10 @@
     <string name="logged_account" formatted="true">Logged in as %s</string>
     <string name="skip_startup_account_select_pref">Skip account selection at startup</string>
     <string name="use_default_account">Use Default Account</string>
+    <string name="rotate_video">Rotate</string>
+    <string name="rotate_video_key">rotate_video_key</string>
+    <string name="rotate_video_desc">Display a toggle button for screen orientation</string>
+    <string name="auto_rotate_video_key">auto_rotate_video_key</string>
+    <string name="auto_rotate_video_desc">Enable automatic switching of screen orientation based on video orientation</string>
+    <string name="auto_rotate_video">Auto rotate</string>
 </resources>
diff --git a/app/src/main/res/xml/settings_player.xml b/app/src/main/res/xml/settings_player.xml
index ad33e036..eccb78e3 100644
--- a/app/src/main/res/xml/settings_player.xml
+++ b/app/src/main/res/xml/settings_player.xml
@@ -86,6 +86,18 @@
             app:defaultValue="true"
             android:summary="@string/enable_skip_op_from_database_des"
             app:key="@string/enable_skip_op_from_database" />
+        <SwitchPreference
+            android:icon="@drawable/screen_rotation"
+            android:title="@string/rotate_video"
+            app:defaultValue="false"
+            android:summary="@string/rotate_video_desc"
+            app:key="@string/rotate_video_key" />
+        <SwitchPreference
+            android:icon="@drawable/screen_rotation"
+            android:title="@string/auto_rotate_video"
+            app:defaultValue="false"
+            android:summary="@string/auto_rotate_video_desc"
+            app:key="@string/auto_rotate_video_key" />
     </PreferenceCategory>
     
     <PreferenceCategory
diff --git a/fastlane/metadata/android/apc/changelogs/2.txt b/fastlane/metadata/android/apc/changelogs/2.txt
new file mode 100644
index 00000000..94f6e9fc
--- /dev/null
+++ b/fastlane/metadata/android/apc/changelogs/2.txt
@@ -0,0 +1 @@
+- نزاد سجل التغيير!
diff --git a/fastlane/metadata/android/apc/full_description.txt b/fastlane/metadata/android/apc/full_description.txt
new file mode 100644
index 00000000..b692e388
--- /dev/null
+++ b/fastlane/metadata/android/apc/full_description.txt
@@ -0,0 +1,10 @@
+"كلاود ستريم-3" بخليكون تعملو ستريم للأفلام والمسلسلات والأنيمي.
+
+الآپليكايشن بيجي بلا دعايات أو أناليتيكس
+وبيحتوي ع كذا موقع للترايليرز والأفلام وإلخ.
+
+إشارات مرجعية
+
+تنزيل الترجمة
+
+بيدعم "كروم كاست"
diff --git a/fastlane/metadata/android/apc/title.txt b/fastlane/metadata/android/apc/title.txt
new file mode 100644
index 00000000..635e1390
--- /dev/null
+++ b/fastlane/metadata/android/apc/title.txt
@@ -0,0 +1 @@
+كلاود ستريم
diff --git a/fastlane/metadata/android/de-DE/full_description.txt b/fastlane/metadata/android/de-DE/full_description.txt
index ea2a8750..8e4af2eb 100644
--- a/fastlane/metadata/android/de-DE/full_description.txt
+++ b/fastlane/metadata/android/de-DE/full_description.txt
@@ -5,8 +5,6 @@ Sie unterstützt zahlreiche Trailer, Filmseiten und vieles mehr, unter anderem:
 
 Lesezeichen
 
-Herunterladen und Streaming von Filmen, Fernsehsendungen und Animes
-
 Downloads von Untertiteln
 
 Chromecast-Unterstützung
diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt
index 73078f8d..e881f12f 100644
--- a/fastlane/metadata/android/en-US/short_description.txt
+++ b/fastlane/metadata/android/en-US/short_description.txt
@@ -1 +1 @@
-Stream and download movies, TV-series and anime.
+Stream and download movies, TV series and anime.
diff --git a/fastlane/metadata/android/mk-MK/changelogs/2.txt b/fastlane/metadata/android/mk-MK/changelogs/2.txt
new file mode 100644
index 00000000..949f6579
--- /dev/null
+++ b/fastlane/metadata/android/mk-MK/changelogs/2.txt
@@ -0,0 +1 @@
+- Дневник на промени е додаден!
diff --git a/fastlane/metadata/android/mk-MK/full_description.txt b/fastlane/metadata/android/mk-MK/full_description.txt
index 87010c95..cb06980e 100644
--- a/fastlane/metadata/android/mk-MK/full_description.txt
+++ b/fastlane/metadata/android/mk-MK/full_description.txt
@@ -1,7 +1,8 @@
 CloudStream-3 ви дозволува да гледате и превземате филмови, телевизиски серии и аниме. Апликацијата нема реклами и аналитика. Таа поддржува повеќе страници за трејлери, филмови и многу повеќе.
 Апликацијата вклучува:
-
-Обележувачи (bookmarks)
-Превземање и гледање на филмови, серии и аниме
+ 
+Обележувачи (Bookmarks)
+ 
 Превземање на преводи
+ 
 Поддршка за Chromecast
diff --git a/fastlane/metadata/android/uk/short_description.txt b/fastlane/metadata/android/uk/short_description.txt
index b54cc950..19a6f367 100644
--- a/fastlane/metadata/android/uk/short_description.txt
+++ b/fastlane/metadata/android/uk/short_description.txt
@@ -1 +1 @@
-Трансляція та завантаження фільмів, серіалів та аніме.
+Транслюйте та завантажуйте фільми, серіали та аніме.