diff --git a/app/src/main/java/com/lagradost/cloudstream3/animeproviders/AnimeFlickProvider.kt b/app/src/main/java/com/lagradost/cloudstream3/animeproviders/AnimeFlickProvider.kt
index d2307233..0c849187 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/animeproviders/AnimeFlickProvider.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/animeproviders/AnimeFlickProvider.kt
@@ -64,7 +64,8 @@ class AnimeFlickProvider : MainAPI() {
         val poster = mainUrl + doc.selectFirst("img.rounded").attr("src")
         val title = doc.selectFirst("h2.title").text()
 
-        val year = Regex("""(\d{4})""").find(doc.selectFirst(".trending-year").text())!!.destructured.component1().toIntOrNull()
+        val yearText = doc.selectFirst(".trending-year")?.text()
+        val year = if(yearText != null) Regex("""(\d{4})""").find(yearText)?.destructured?.component1()?.toIntOrNull() else null
         val description = doc.selectFirst("p").text()
 
         val genres = doc.select("a[href*=\"genre-\"]").map { it.text() }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/animeproviders/AnimePaheProvider.kt b/app/src/main/java/com/lagradost/cloudstream3/animeproviders/AnimePaheProvider.kt
index 0770e59c..315e42db 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/animeproviders/AnimePaheProvider.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/animeproviders/AnimePaheProvider.kt
@@ -88,7 +88,7 @@ class AnimePaheProvider : MainAPI() {
                         "https://pahe.win/a/${it.animeId}",
                         this.name,
                         TvType.Anime,
-                        null,
+                        it.snapshot,
                         null,
                         null,
                         EnumSet.of(DubStatus.Subbed),
diff --git a/app/src/main/java/com/lagradost/cloudstream3/animeproviders/WatchCartoonOnlineProvider.kt b/app/src/main/java/com/lagradost/cloudstream3/animeproviders/WatchCartoonOnlineProvider.kt
index aa9ede09..f12b934f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/animeproviders/WatchCartoonOnlineProvider.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/animeproviders/WatchCartoonOnlineProvider.kt
@@ -204,7 +204,7 @@ class WatchCartoonOnlineProvider : MainAPI() {
                     this.name + " HD",
                     hdLink,
                     "",
-                    Qualities.HD.value
+                    Qualities.P720.value
                 )
             )
 
@@ -215,7 +215,7 @@ class WatchCartoonOnlineProvider : MainAPI() {
                     this.name + " SD",
                     sdLink,
                     "",
-                    Qualities.SD.value
+                    Qualities.P480.value
                 )
             )
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/MultiQuality.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/MultiQuality.kt
index da459408..19c14e93 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/MultiQuality.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/MultiQuality.kt
@@ -18,10 +18,10 @@ class MultiQuality : ExtractorApi() {
 
     private fun getQuality(string: String): Int {
         return when (string) {
-            "360" -> Qualities.SD.value
-            "480" -> Qualities.SD.value
-            "720" -> Qualities.HD.value
-            "1080" -> Qualities.FullHd.value
+            "360" -> Qualities.P480.value
+            "480" -> Qualities.P480.value
+            "720" -> Qualities.P720.value
+            "1080" -> Qualities.P1080.value
             else -> Qualities.Unknown.value
         }
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Shiro.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Shiro.kt
index 28552393..a343fd2b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Shiro.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Shiro.kt
@@ -25,7 +25,7 @@ class Shiro : ExtractorApi() {
                     it.replace(" ", "%20"),
                     "https://cherry.subsplea.se/",
                     // UHD to give top priority
-                    Qualities.UHD.value
+                    Qualities.P2160.value
                 )
             )
         }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/WcoStream.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/WcoStream.kt
index 33461d47..092db94b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/WcoStream.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/WcoStream.kt
@@ -47,7 +47,7 @@ class WcoStream : ExtractorApi() {
                         name + if (it.label != null) "- ${it.label}" else "",
                         it.file,
                         "",
-                        Qualities.HD.value,
+                        Qualities.P720.value,
                         it.file.contains(".m3u8")
                     )
                 )
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/XStreamCdn.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/XStreamCdn.kt
index 1102c667..d70781de 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/XStreamCdn.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/XStreamCdn.kt
@@ -29,10 +29,10 @@ class XStreamCdn : ExtractorApi() {
 
     private fun getQuality(string: String): Int {
         return when (string) {
-            "360p" -> Qualities.SD.value
-            "480p" -> Qualities.SD.value
-            "720p" -> Qualities.HD.value
-            "1080p" -> Qualities.FullHd.value
+            "360p" -> Qualities.P480.value
+            "480p" -> Qualities.P480.value
+            "720p" -> Qualities.P720.value
+            "1080p" -> Qualities.P1080.value
             else -> Qualities.Unknown.value
         }
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/movieproviders/HDMProvider.kt b/app/src/main/java/com/lagradost/cloudstream3/movieproviders/HDMProvider.kt
index bf3b1323..8525537d 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/movieproviders/HDMProvider.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/movieproviders/HDMProvider.kt
@@ -52,7 +52,7 @@ class HDMProvider : MainAPI() {
                 this.name,
                 "https://hls.1o.to/vod/$slug/playlist.m3u8$key",
                 "",
-                Qualities.HD.value,
+                Qualities.P720.value,
                 true
             )
         )
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/CastHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/CastHelper.kt
index f88ed6c6..00543923 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/CastHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/CastHelper.kt
@@ -107,7 +107,8 @@ object CastHelper {
         val holder =
             MetadataHolder(apiName, isMovie, title, poster, currentEpisodeIndex, episodes, currentLinks, subtitles)
 
-        val index = startIndex ?: 0
+        val index = if(startIndex == null || startIndex < 0) 0 else startIndex
+
         val mediaItem =
             getMediaInfo(epData, holder, index, JSONObject(mapper.writeValueAsString(holder)), subtitles)
 
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 bfdaa9d9..f93fe58f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
@@ -20,22 +20,24 @@ data class ExtractorSubtitleLink(
 
 enum class Qualities(var value: Int) {
     Unknown(0),
-    SD(-1), // 360p - 480p
-    HD(1), // 720p
-    FullHd(2), // 1080p
-    UHD(3) // 4k
+    P360(-2), // 360p
+    P480(-1), // 480p
+    P720(1), // 720p
+    P1080(2), // 1080p
+    P1440(3), // 1440p
+    P2160(4) // 4k or 2160p
 }
 
 fun getQualityFromName(qualityName: String): Int {
     return when (qualityName.replace("p", "").replace("P", "")) {
-        "360" -> Qualities.SD
-        "480" -> Qualities.SD
-        "720" -> Qualities.HD
-        "1080" -> Qualities.FullHd
-        "1440" -> Qualities.UHD // I KNOW KINDA MISLEADING
-        "2160" -> Qualities.UHD
-        "4k" -> Qualities.UHD
-        "4K" -> Qualities.UHD
+        "360" -> Qualities.P360
+        "480" -> Qualities.P480
+        "720" -> Qualities.P720
+        "1080" -> Qualities.P1080
+        "1440" -> Qualities.P1440
+        "2160" -> Qualities.P2160
+        "4k" -> Qualities.P2160
+        "4K" -> Qualities.P2160
         else -> Qualities.Unknown
     }.value
 }
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
index 7bbb50f4..ec65063e 100644
--- a/app/src/main/res/values/ic_launcher_background.xml
+++ b/app/src/main/res/values/ic_launcher_background.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!--5736E0-->
     <color name="ic_launcher_background">#3242D3</color>
 </resources>
\ No newline at end of file