partially revert c448b44fc4

updatelibraries and agp
* agp 8.0.2 -> 8.1.0 * kotlinx-coroutines-android 1.7.2 -> 1.7.3 * navigation-fragment-ktx 2.6.0 -> 2.7.0 * navigation-ui-ktx 2.6.0 -> 2.7.0
2023-08-11 15:07:33 +02:00 · 2023-08-11 14:58:17 +02:00 · 2023-08-11 14:41:55 +02:00 · 2023-07-21 21:42:55 +02:00 · 2023-07-21 17:22:45 +02:00 · 2023-07-21 11:43:38 +02:00
68 changed files with 708 additions and 549 deletions
--- a/README.md
+++ b/README.md
@ -26,4 +26,4 @@ Currently you need to have an Crunchyroll account to contribute to Teapod. Contr
 #### Why is it called Teapod?
 Teapod is a Acronym for "The ultimate anime app on demand", hence this project is called Teapod and not Teapot.

-Teapod © 2020-2022 [@Seil0](https://git.mosad.xyz/Seil0)
+Teapod © 2020-2023 [@Seil0](https://git.mosad.xyz/Seil0)
--- a/app/build.gradle
+++ b/app/build.gradle
@ -5,15 +5,15 @@ plugins {
 }

 android {
-    compileSdkVersion 33
-    buildToolsVersion "30.0.3"
+    compileSdk 33
+    buildToolsVersion '30.0.3'

    defaultConfig {
        applicationId "org.mosad.teapod"
-        minSdkVersion 23
-        targetSdkVersion 32
-        versionCode 100990 //01.00.000
-        versionName "1.1.0-beta1"
+        minSdk 23
+        targetSdk 33
+        versionCode 100992 //01.00.000
+        versionName "1.1.0-beta3"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        resValue "string", "build_time", buildTime()
@ -38,7 +38,7 @@ android {
    }
    kotlinOptions {
        jvmTarget = '1.8'
-        kotlin.sourceSets.all {
+        kotlin.sourceSets.configureEach {
            languageSettings.optIn("kotlin.RequiresOptIn")
        }
    }
@ -48,21 +48,21 @@ android {
 dependencies {
    implementation fileTree(dir: "libs", include: ["*.jar"])
    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
-    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
+    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1'

-    implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.core:core-splashscreen:1.0.0'
-    implementation 'androidx.appcompat:appcompat:1.6.0'
+    implementation 'androidx.core:core-ktx:1.10.1'
+    implementation 'androidx.core:core-splashscreen:1.0.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.5.3'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.5.3'
-    implementation 'androidx.security:security-crypto:1.1.0-alpha04'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.6.0'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.6.0'
+    implementation 'androidx.security:security-crypto:1.1.0-alpha06'
    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'

-    implementation 'com.google.android.material:material:1.7.0'
+    implementation 'com.google.android.material:material:1.9.0'
    implementation "com.google.android.exoplayer:exoplayer-core:$exo_version"
    implementation "com.google.android.exoplayer:exoplayer-hls:$exo_version"
    implementation "com.google.android.exoplayer:exoplayer-dash:$exo_version"
@ -71,7 +71,7 @@ dependencies {

    implementation 'com.facebook.shimmer:shimmer:0.5.0'

-    implementation 'com.github.bumptech.glide:glide:4.14.2'
+    implementation 'com.github.bumptech.glide:glide:4.15.1'
    implementation 'jp.wasabeef:glide-transformations:4.3.0'

    implementation "io.ktor:ktor-client-core:$ktor_version"
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -10,7 +10,7 @@
        android:label="@string/app_name"
        android:roundIcon="@mipmap/ic_launcher_round"
        android:supportsRtl="true"
-        android:theme="@style/AppTheme.Dark">
+        android:theme="@style/AppTheme">
        <activity
            android:exported="true"
            android:name="org.mosad.teapod.ui.activity.main.MainActivity"
--- a/app/src/main/java/org/mosad/teapod/parser/crunchyroll/Crunchyroll.kt
+++ b/app/src/main/java/org/mosad/teapod/parser/crunchyroll/Crunchyroll.kt
@ -34,8 +34,6 @@ import io.ktor.http.*
 import io.ktor.serialization.*
 import io.ktor.serialization.kotlinx.json.*
 import kotlinx.coroutines.*
-import kotlinx.serialization.SerializationException
-import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.buildJsonObject
@ -60,16 +58,12 @@ object Crunchyroll {

    private lateinit var token: Token
    private var tokenValidUntil: Long = 0
-    @OptIn(DelicateCoroutinesApi::class)
+    @OptIn(DelicateCoroutinesApi::class, ExperimentalCoroutinesApi::class)
    private val tokenRefreshContext = newSingleThreadContext("TokenRefreshContext")

    private var accountID = ""
    private var externalID = ""

-    private var policy = ""
-    private var signature = ""
-    private var keyPairID = ""
-
    private val browsingCache = hashMapOf<String, BrowseResult>()

    /**
@ -149,7 +143,7 @@ object Crunchyroll {
        }

        return@coroutineScope (Dispatchers.IO) {
-            val response: T = client.request(url) {
+            val response = client.request(url) {
                method = httpMethod
                header("Authorization", "${token.tokenType} ${token.accessToken}")
                params.forEach {
@ -161,9 +155,9 @@ object Crunchyroll {
                    setBody(bodyObject)
                    contentType(ContentType.Application.Json)
                }
-            }.body()
+            }

-            response
+            response.body<T>()
        }
    }

@ -214,27 +208,10 @@ object Crunchyroll {
    }

    /**
-     * Basic functions: index, account
+     * Basic functions: account
     * Needed for other functions to work properly!
     */

-    /**
-     * Retrieve the identifiers necessary for streaming. If the identifiers are
-     * retrieved, set the corresponding global var. The identifiers are valid for 24h.
-     */
-    suspend fun index() {
-        val indexEndpoint = "/index/v2"
-
-        val index: Index = requestGet(indexEndpoint)
-        policy = index.cms.policy
-        signature = index.cms.signature
-        keyPairID = index.cms.keyPairId
-
-        Log.i(TAG, "Policy : $policy")
-        Log.i(TAG, "Signature : $signature")
-        Log.i(TAG, "Key Pair ID : $keyPairID")
-    }
-
    /**
     * Retrieve the account id and set the corresponding global var.
     * The account id is needed for other calls.
@ -262,24 +239,30 @@ object Crunchyroll {
    /**
     * Browse the media available on crunchyroll.
     *
-     * @param sortBy
-     * @param n Number of items to return, defaults to 10
-     *
+     * @param start start of the item list, used for pagination, default = 0
+     * @param n number of items to return, default = 10
+     * @param sortBy the sort order, see **[SortBy]**
+     * @param ratings add user rating to the objects, default = false
+     * @param seasonTag filter by season tag, if present
+     * @param categories filter by category, if present
     * @return A **[BrowseResult]** object is returned.
     */
    suspend fun browse(
-        categories: List<Categories> = emptyList(),
-        sortBy: SortBy = SortBy.ALPHABETICAL,
-        seasonTag: String = "",
        start: Int = 0,
-        n: Int = 10
+        n: Int = 10,
+        sortBy: SortBy = SortBy.ALPHABETICAL,
+        ratings: Boolean = false,
+        seasonTag: String = "",
+        categories: List<Categories> = emptyList()
    ): BrowseResult {
-        val browseEndpoint = "/content/v1/browse"
+        val browseEndpoint = "/content/v2/discover/browse"
        val parameters = mutableListOf(
-            "locale" to Preferences.preferredSubtitleLocale.toLanguageTag(),
-            "sort_by" to sortBy.str,
            "start" to start,
-            "n" to n
+            "n" to n,
+            "sort_by" to sortBy.str,
+            "ratings" to ratings,
+            "preferred_audio_language" to Preferences.preferredSubtitleLocale.toLanguageTag(),
+            "locale" to Preferences.preferredSubtitleLocale.toLanguageTag(),
        )

        // if a season tag is present add it to the parameters
@ -304,9 +287,10 @@ object Crunchyroll {
                NoneBrowseResult
            }

-            // if the cache has more than 100 entries clear it, so it doesn't become a memory problem
+
+
+            // if the cache has more than 10 entries clear it, so it doesn't become a memory problem
            // Note: this value is totally guessed and should be replaced by a properly researched value
-            // TODO 100 is way to high as it's not the number of items but BrowseResults
            if (browsingCache.size > 10) {
                browsingCache.clear()
            }
@ -322,19 +306,20 @@ object Crunchyroll {
     * Search fo a query term.
     * Note: currently this function only supports series/tv shows.
     *
-     * TODO migrate to v2
-     *
     * @param query The query term as String
     * @param n The maximum number of results to return, default = 10
+     * @param ratings add user rating to the objects, default = false
     * @return A **[SearchResult]** object
     */
-    suspend fun search(query: String, n: Int = 10): SearchResult {
-        val searchEndpoint = "/content/v1/search"
+    suspend fun search(query: String, n: Int = 10, ratings: Boolean = false): SearchResult {
+        val searchEndpoint = "/content/v2/discover/search"
        val parameters = listOf(
-            "locale" to Preferences.preferredSubtitleLocale.toLanguageTag(),
            "q" to query,
            "n" to n,
-            "type" to "series"
+            "type" to "series",
+            "ratings" to ratings,
+            "preferred_audio_language" to Preferences.preferredSubtitleLocale.toLanguageTag(),
+            "locale" to Preferences.preferredSubtitleLocale.toLanguageTag()
        )

        // TODO episodes have thumbnails as image, and not poster_tall/poster_tall,
@ -353,22 +338,22 @@ object Crunchyroll {
     * Note: episode objects are currently not supported
     *
     * @param objects The object IDs as list of Strings
+     * @param ratings add user rating to the objects
     * @return A **[Collection]** of Panels
     */
-    suspend fun objects(objects: List<String>): Collection<Item> {
-        val episodesEndpoint = "/cms/v2/DE/M3/crunchyroll/objects/${objects.joinToString(",")}"
+    suspend fun objects(objects: List<String>, ratings: Boolean = false): CollectionV2<Item> {
+        val episodesEndpoint = "/content/v2/cms/objects/${objects.joinToString(",")}"
        val parameters = listOf(
-            "locale" to Preferences.preferredSubtitleLocale.toLanguageTag(),
-            "Signature" to signature,
-            "Policy" to policy,
-            "Key-Pair-Id" to keyPairID
+            "ratings" to ratings,
+            "preferred_audio_language" to Preferences.preferredAudioLocale.toLanguageTag(),
+            "locale" to Preferences.preferredSubtitleLocale.toLanguageTag()
        )

        return try {
            requestGet(episodesEndpoint, parameters)
        } catch (ex: Exception) {
            Log.e(TAG, "Exception in objects().", ex)
-            NoneCollection
+            NoneCollectionV2
        }
    }

@ -389,7 +374,7 @@ object Crunchyroll {
        return try {
            requestGet(seriesEndpoint, parameters)
        } catch (ex: Exception) {
-            Log.e(TAG, "Exception in series().", ex)
+            Log.e(TAG, "Exception in series() for id $seriesId.", ex)
            NoneSeries
        }
    }
@ -418,7 +403,7 @@ object Crunchyroll {
            Log.e(TAG, "JsonConvertException in upNextSeries() with seriesId=$seriesId", ex)
            NoneUpNextSeriesList
        } catch (ex: Exception) {
-            Log.e(TAG, "Exception in upNextSeries().", ex)
+            Log.e(TAG, "Exception in upNextSeries() for seriesId $seriesId.", ex)
            NoneUpNextSeriesList
        }
    }
@ -439,7 +424,7 @@ object Crunchyroll {
        return try {
            requestGet(seasonsEndpoint, parameters)
        } catch (ex: Exception) {
-            Log.e(TAG, "Exception in seasons().", ex)
+            Log.e(TAG, "Exception in seasons() for seriesId $seriesId.", ex)
            NoneSeasons
        }
    }
@ -460,7 +445,7 @@ object Crunchyroll {
        return try {
            requestGet(episodesEndpoint, parameters)
        } catch (ex: Exception) {
-            Log.e(TAG, "Exception in episodes().", ex)
+            Log.e(TAG, "Exception in episodes() for seasonId $seasonId.", ex)
            NoneEpisodes
        }
    }
@ -480,7 +465,7 @@ object Crunchyroll {
        return try {
            requestGet(url, parameters)
        } catch (ex: Exception) {
-            Log.e(TAG, "Exception in streams().", ex)
+            Log.e(TAG, "Exception in streams() with url $url.", ex)
            NoneStreams
        }
    }
@ -509,10 +494,10 @@ object Crunchyroll {
        )

        return try {
-            (requestGet(watchlistSeriesEndpoint, parameters) as Collection2<IsWatchlistItem>)
+            (requestGet(watchlistSeriesEndpoint, parameters) as CollectionV2<IsWatchlistItem>)
                .total == 1
        } catch (ex: Exception) {
-            Log.e(TAG, "Exception in isWatchlist() with seriesId = $seriesId", ex)
+            Log.e(TAG, "Exception in isWatchlist() with seriesId $seriesId", ex)
            false
        }
    }
@ -536,7 +521,7 @@ object Crunchyroll {
        try {
            requestPost(watchlistPostEndpoint, parameters, json)
        } catch (ex: Exception) {
-            Log.e(TAG, "Exception in postWatchlist() with seriesId = $seriesId", ex)
+            Log.e(TAG, "Exception in postWatchlist() with seriesId $seriesId", ex)
        }
    }

@ -555,7 +540,7 @@ object Crunchyroll {
        try {
            requestDelete(watchlistDeleteEndpoint, parameters)
        } catch (ex: Exception) {
-            Log.e(TAG, "Exception in deleteWatchlist() with seriesId = $seriesId", ex)
+            Log.e(TAG, "Exception in deleteWatchlist() with seriesId $seriesId", ex)
        }
    }

@ -575,7 +560,6 @@ object Crunchyroll {
            "locale" to Preferences.preferredSubtitleLocale.toLanguageTag()
        )

-
        return try {
            requestGet(playheadsEndpoint, parameters)
        } catch (ex: Exception) {
@ -632,14 +616,16 @@ object Crunchyroll {
     *
     * @param seriesId The crunchyroll series id of the media
     * @param n The maximum number of results to return, default = 10
+     * @param ratings add user rating to the objects
     * @return A **[SimilarToResult]** object
     */
-    suspend fun similarTo(seriesId: String, n: Int = 10): SimilarToResult {
-        val similarToEndpoint = "/content/v1/$accountID/similar_to"
+    suspend fun similarTo(seriesId: String, n: Int = 10, ratings: Boolean = false): SimilarToResult {
+        val similarToEndpoint = "/content/v2/discover/$accountID/similar_to/$seriesId"
        val parameters = listOf(
-            "guid" to seriesId,
+            "n" to n,
+            "ratings" to ratings,
+            "preferred_audio_language" to Preferences.preferredSubtitleLocale.toLanguageTag(),
            "locale" to Preferences.preferredSubtitleLocale.toLanguageTag(),
-            "n" to n
        )

        return try {
@ -660,7 +646,7 @@ object Crunchyroll {
     * @param n Number of items to return, defaults to 20.
     * @return A **[Collection]** containing up to n **[Item]**.
     */
-    suspend fun watchlist(n: Int = 20): Collection<Item> {
+    suspend fun watchlist(n: Int = 20): CollectionV2<Item> {
        val watchlistEndpoint = "/content/v2/discover/$accountID/watchlist"
        val parameters = listOf(
            "locale" to Preferences.preferredSubtitleLocale.toLanguageTag(),
@ -682,10 +668,10 @@ object Crunchyroll {
    /**
     * List the next up episodes for the logged in account.
     *
-     * @param n Number of items to return, defaults to 20.
+     * @param n Number of items to return, default = 20
     * @return A **[HistoryList]** containing up to n **[UpNextAccountItem]**.
     */
-    suspend fun upNextAccount(n: Int = 20): HistoryList {
+    suspend fun upNextAccount(n: Int = 10): HistoryList {
        val watchlistEndpoint = "/content/v2/discover/$accountID/history"
        val parameters = listOf(
            "locale" to Preferences.preferredSubtitleLocale.toLanguageTag(),
@ -700,13 +686,21 @@ object Crunchyroll {
        }
    }

-    suspend fun recommendations(n: Int = 20, start: Int = 0): RecommendationsList {
-        val recommendationsEndpoint = "/content/v1/$accountID/recommendations"
+    /**
+     * Returns a collection of recommendations for the currently logged in account.
+     *
+     * @param start start of the item list, used for pagination, default = 0
+     * @param n number of items to return, default = 10
+     * @param ratings add user rating to the objects, default = false
+     * @return A **[RecommendationsList]** containing up to n **[Item]**.
+     */
+    suspend fun recommendations(start: Int = 0, n: Int = 10, ratings: Boolean = false): RecommendationsList {
+        val recommendationsEndpoint = "/content/v2/discover/$accountID/recommendations"
        val parameters = listOf(
-            "locale" to Preferences.preferredSubtitleLocale.toLanguageTag(),
-            "n" to n,
            "start" to start,
-            "variant_id" to 0
+            "n" to n,
+            "ratings" to ratings,
+            "locale" to Preferences.preferredSubtitleLocale.toLanguageTag(),
        )

        return try {
@ -742,7 +736,7 @@ object Crunchyroll {
     *
     * @param languageTag the preferred language as language tag
     */
-    suspend fun postPrefSubLanguage(languageTag: String) {
+    suspend fun setPreferredSubtitleLanguage(languageTag: String) {
        val profileEndpoint = "/accounts/v1/me/profile"
        val json = buildJsonObject {
            put("preferred_content_subtitle_language", languageTag)
@ -751,6 +745,20 @@ object Crunchyroll {
        requestPatch(profileEndpoint, bodyObject = json)
    }

+    /**
+     * Patch the preferred content audio language.
+     *
+     * @param languageTag the preferred language as language tag
+     */
+    suspend fun setPreferredAudioLanguage(languageTag: String) {
+        val profileEndpoint = "/accounts/v1/me/profile"
+        val json = buildJsonObject {
+            put("preferred_content_audio_language", languageTag)
+        }
+
+        requestPatch(profileEndpoint, bodyObject = json)
+    }
+
    /**
     * Get additional profile (benefits) information for the currently logged in account.
     *
--- a/app/src/main/java/org/mosad/teapod/parser/crunchyroll/DataTypes.kt
+++ b/app/src/main/java/org/mosad/teapod/parser/crunchyroll/DataTypes.kt
@ -24,19 +24,47 @@ package org.mosad.teapod.parser.crunchyroll

 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import java.util.*
+import java.util.Locale

-val supportedLocals = listOf(
+val supportedAudioLocals = listOf(
    Locale.forLanguageTag("ar-SA"),
+    Locale.forLanguageTag("ca-ES"),
+    Locale.forLanguageTag("de-DE"),
+    Locale.forLanguageTag("en-US"),
+    Locale.forLanguageTag("en-IN"),
+    Locale.forLanguageTag("es-419"),
+    Locale.forLanguageTag("es-ES"),
+    Locale.forLanguageTag("fr-FR"),
+    Locale.forLanguageTag("hi-IN"),
+    Locale.forLanguageTag("it-IT"),
+    Locale.forLanguageTag("ko-KR"),
+    Locale.forLanguageTag("pl-PL"),
+    Locale.forLanguageTag("pt-BR"),
+    Locale.forLanguageTag("pt-PT"),
+    Locale.forLanguageTag("ru-RU"),
+    Locale.forLanguageTag("ta-IN"),
+    Locale.forLanguageTag("th-TH"),
+    Locale.forLanguageTag("zh-CN"),
+    Locale.forLanguageTag("zh-TW"),
+    Locale.ROOT
+)
+
+val supportedSubtitleLocals = listOf(
+    Locale.forLanguageTag("ar-SA"),
+    Locale.forLanguageTag("ca-ES"),
    Locale.forLanguageTag("de-DE"),
    Locale.forLanguageTag("en-US"),
    Locale.forLanguageTag("es-419"),
    Locale.forLanguageTag("es-ES"),
    Locale.forLanguageTag("fr-FR"),
+    Locale.forLanguageTag("hi-IN"),
    Locale.forLanguageTag("it-IT"),
+    Locale.forLanguageTag("ms-MY"),
+    Locale.forLanguageTag("pl-PL"),
    Locale.forLanguageTag("pt-BR"),
    Locale.forLanguageTag("pt-PT"),
    Locale.forLanguageTag("ru-RU"),
+    Locale.forLanguageTag("tr-TR"),
    Locale.ROOT
 )

@ -44,6 +72,10 @@ val supportedLocals = listOf(
 * data classes for browse
 * TODO make class names more clear/possibly overlapping for now
 */
+
+/**
+ * Enum of all supported sorting orders.
+ */
 enum class SortBy(val str: String) {
    ALPHABETICAL("alphabetical"),
    NEWLY_ADDED("newly_added"),
@ -112,23 +144,22 @@ val NoneAccount = Account("", "", false, "")
 */

@Serializable
-data class Collection<T>(
+data class CollectionV1<T>(
    @SerialName("total") val total: Int,
    @SerialName("items") val items: List<T>
 )

@Serializable
-data class Collection2<T>(
+data class CollectionV2<T>(
    @SerialName("total") val total: Int,
    @SerialName("data") val data: List<T>
 )

-typealias SearchResult = Collection<SearchCollection>
-typealias SearchCollection = Collection<Item>
-typealias BrowseResult = Collection<Item>
-typealias SimilarToResult = Collection<Item>
-typealias RecommendationsList = Collection<Item>
-typealias Benefits = Collection<Benefit>
+typealias SearchResult = CollectionV2<SearchTypedList<Item>>
+typealias BrowseResult = CollectionV2<Item>
+typealias SimilarToResult = CollectionV2<Item>
+typealias RecommendationsList = CollectionV2<Item>
+typealias Benefits = CollectionV1<Benefit>

 /**
 * panel data classes
@ -159,9 +190,9 @@ data class Poster(val height: Int, val width: Int, val source: String, val type:
 * up next & watchlist data classes
 */

-typealias Watchlist = Collection2<WatchlistItem>
-typealias HistoryList = Collection2<UpNextAccountItem>
-typealias UpNextSeriesList = Collection2<UpNextSeriesItem>
+typealias Watchlist = CollectionV2<WatchlistItem>
+typealias HistoryList = CollectionV2<UpNextAccountItem>
+typealias UpNextSeriesList = CollectionV2<UpNextSeriesItem>

@Serializable
 data class WatchlistItem(
@ -221,7 +252,7 @@ data class EpisodeMetadata(
    @SerialName("series_title") val seriesTitle: String,
 )

-val NoneCollection = Collection<Item>(0, emptyList())
+val NoneCollectionV2 = CollectionV2<Item>(0, emptyList())
 val NoneSearchResult = SearchResult(0, emptyList())
 val NoneBrowseResult = BrowseResult(0, emptyList())
 val NoneSimilarToResult = SimilarToResult(0, emptyList())
@ -235,7 +266,7 @@ val NoneBenefits = Benefits(0, emptyList())
 * series data class
 */

-typealias Series = Collection2<SeriesItem>
+typealias Series = CollectionV2<SeriesItem>

@Serializable
 data class SeriesItem(
@ -245,11 +276,11 @@ data class SeriesItem(
    @SerialName("images") val images: Images,
    @SerialName("is_simulcast") val isSimulcast: Boolean,
    @SerialName("maturity_ratings") val maturityRatings: List<String>,
-    @SerialName("audio_locales") val audioLocales: List<String>
-
+    @SerialName("audio_locales") val audioLocales: List<String>,
+    @SerialName("episode_count") val episodeCount: Int
 )

-val NoneSeriesItem = SeriesItem("", "", "", Images(emptyList(), emptyList()), false, emptyList(), emptyList())
+val NoneSeriesItem = SeriesItem("", "", "", Images(emptyList(), emptyList()), false, emptyList(), emptyList(), 0)
 val NoneSeries = Series(1, listOf(NoneSeriesItem))

 /**
@ -302,7 +333,7 @@ data class Episode(
    @SerialName("is_dubbed") val isDubbed: Boolean,
    @SerialName("images") val images: Thumbnail,
    @SerialName("duration_ms") val durationMs: Int,
-    @SerialName("versions") val versions: List<Version>,
+    @SerialName("versions") val versions: List<Version>? = null,
    @SerialName("streams_link") val streamsLink: String,
 )

@ -353,7 +384,7 @@ val NoneVersion = Version(
    variant = ""
 )

-typealias Playheads = Collection2<PlayheadObject>
+typealias Playheads = CollectionV2<PlayheadObject>

@Serializable
 data class PlayheadObject(
@ -449,7 +480,18 @@ data class Benefit(
    @SerialName("benefit") val benefit: String,
    @SerialName("source") val source: String,
 )
+@Suppress("unused")
 val NoneBenefit = Benefit(
    benefit = "",
    source = ""
 )
+
+/**
+ * search result typed list data class
+ */
+@Serializable
+data class SearchTypedList<T>(
+    @SerialName("type") val type: String,
+    @SerialName("count") val count: Int,
+    @SerialName("items") val items: List<T>
+)
--- a/app/src/main/java/org/mosad/teapod/preferences/Preferences.kt
+++ b/app/src/main/java/org/mosad/teapod/preferences/Preferences.kt
@ -12,13 +12,11 @@ object Preferences {
        internal set
    var preferredSubtitleLocale: Locale = Locale.forLanguageTag("en-US")
        internal set
-    var preferSubbed = false
-        internal set
    var autoplay = true
        internal set
    var devSettings = false
        internal set
-    var theme = DataTypes.Theme.DARK
+    var theme = DataTypes.Theme.SYSTEM
        internal set

    // dev settings
@ -50,15 +48,6 @@ object Preferences {
        this.preferredSubtitleLocale = preferredLocale
    }

-    fun savePreferSecondary(context: Context, preferSubbed: Boolean) {
-        with(getSharedPref(context).edit()) {
-            putBoolean(context.getString(R.string.save_key_prefer_secondary), preferSubbed)
-            apply()
-        }
-
-        this.preferSubbed = preferSubbed
-    }
-
    fun saveAutoplay(context: Context, autoplay: Boolean) {
        with(getSharedPref(context).edit()) {
            putBoolean(context.getString(R.string.save_key_autoplay), autoplay)
@ -111,9 +100,6 @@ object Preferences {
                context.getString(R.string.save_key_preferred_local), "en-US"
            ) ?: "en-US"
        )
-        preferSubbed = sharedPref.getBoolean(
-            context.getString(R.string.save_key_prefer_secondary), false
-        )
        autoplay = sharedPref.getBoolean(
            context.getString(R.string.save_key_autoplay), true
        )
@ -122,8 +108,8 @@ object Preferences {
        )
        theme = DataTypes.Theme.valueOf(
            sharedPref.getString(
-                context.getString(R.string.save_key_theme), DataTypes.Theme.DARK.toString()
-            ) ?:  DataTypes.Theme.DARK.toString()
+                context.getString(R.string.save_key_theme), DataTypes.Theme.SYSTEM.toString()
+            ) ?:  DataTypes.Theme.SYSTEM.toString()
        )

        // dev settings
--- a/app/src/main/java/org/mosad/teapod/ui/activity/main/MainActivity.kt
+++ b/app/src/main/java/org/mosad/teapod/ui/activity/main/MainActivity.kt
@ -28,6 +28,7 @@ import android.util.Log
 import android.view.MenuItem
 import androidx.activity.addCallback
 import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.commit
@ -69,7 +70,14 @@ class MainActivity : AppCompatActivity(), NavigationBarView.OnItemSelectedListen
        super.onCreate(savedInstanceState)

        load() // start the initial loading
-        theme.applyStyle(getThemeResource(), true)
+
+        // theming
+        val mode = when (Preferences.theme) {
+            DataTypes.Theme.LIGHT -> AppCompatDelegate.MODE_NIGHT_NO
+            DataTypes.Theme.DARK -> AppCompatDelegate.MODE_NIGHT_YES
+            else -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
+        }
+        AppCompatDelegate.setDefaultNightMode(mode)

        binding = ActivityMainBinding.inflate(layoutInflater)
        binding.navView.setOnItemSelectedListener(this)
@ -122,12 +130,12 @@ class MainActivity : AppCompatActivity(), NavigationBarView.OnItemSelectedListen
        return ret
    }

-    private fun getThemeResource(): Int {
-        return when (Preferences.theme) {
-            DataTypes.Theme.LIGHT -> R.style.AppTheme_Light
-            else -> R.style.AppTheme_Dark
-        }
-    }
+//    private fun getThemeResource(): Int {
+//        return when (Preferences.theme) {
+//            DataTypes.Theme.LIGHT -> R.style.AppTheme_Light
+//            else -> R.style.AppTheme_Dark
+//        }
+//    }

    /**
     * initial loading and login are run in parallel, as initial loading doesn't require
@ -165,7 +173,6 @@ class MainActivity : AppCompatActivity(), NavigationBarView.OnItemSelectedListen
    private fun initCrunchyroll(): List<Job> {
        val scope = CoroutineScope(Dispatchers.IO + CoroutineName("InitialCrunchyLoading"))
        return listOf(
-            scope.launch { Crunchyroll.index() },
            scope.launch { Crunchyroll.account() },
            scope.launch {
                // update the local preferred content language, since it may have changed
--- a/app/src/main/java/org/mosad/teapod/ui/activity/main/fragments/AccountFragment.kt
+++ b/app/src/main/java/org/mosad/teapod/ui/activity/main/fragments/AccountFragment.kt
@ -8,17 +8,15 @@ import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import kotlinx.coroutines.Deferred
-import kotlinx.coroutines.async
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.*
 import org.mosad.teapod.BuildConfig
 import org.mosad.teapod.R
 import org.mosad.teapod.databinding.FragmentAccountBinding
 import org.mosad.teapod.parser.crunchyroll.Benefits
 import org.mosad.teapod.parser.crunchyroll.Crunchyroll
 import org.mosad.teapod.parser.crunchyroll.Profile
-import org.mosad.teapod.parser.crunchyroll.supportedLocals
+import org.mosad.teapod.parser.crunchyroll.supportedAudioLocals
+import org.mosad.teapod.parser.crunchyroll.supportedSubtitleLocals
 import org.mosad.teapod.preferences.EncryptedPreferences
 import org.mosad.teapod.preferences.Preferences
 import org.mosad.teapod.ui.activity.main.MainActivity
@ -64,15 +62,18 @@ class AccountFragment : Fragment() {

        // add preferred subtitles
        lifecycleScope.launch {
-            binding.textSettingsContentLanguageDesc.text = Locale.forLanguageTag(
+            binding.textSettingsAudioLanguageDesc.text = Locale.forLanguageTag(
+                profile.await().preferredContentAudioLanguage
+            ).displayLanguage
+            binding.textSettingsSubtitleLanguageDesc.text = Locale.forLanguageTag(
                profile.await().preferredContentSubtitleLanguage
            ).displayLanguage
        }
-        binding.switchSecondary.isChecked = Preferences.preferSubbed
        binding.switchAutoplay.isChecked = Preferences.autoplay
        binding.textThemeSelected.text = when (Preferences.theme) {
+            Theme.SYSTEM -> getString(R.string.theme_system)
+            Theme.LIGHT -> getString(R.string.theme_light)
            Theme.DARK -> getString(R.string.theme_dark)
-            else -> getString(R.string.theme_light)
        }

        binding.linearDevSettings.isVisible = Preferences.devSettings
@ -88,12 +89,12 @@ class AccountFragment : Fragment() {
            showLoginDialog()
        }

-        binding.linearSettingsContentLanguage.setOnClickListener {
-            showContentLanguageSelection()
+        binding.linearSettingsAudioLanguage.setOnClickListener {
+            showAudioLanguageSelection()
        }

-        binding.switchSecondary.setOnClickListener {
-            Preferences.savePreferSecondary(requireContext(), binding.switchSecondary.isChecked)
+        binding.linearSettingsSubtitleLanguage.setOnClickListener {
+            showSubtitleLanguageSelection()
        }

        binding.switchAutoplay.setOnClickListener {
@ -138,43 +139,86 @@ class AccountFragment : Fragment() {
        activity?.let { loginModal.show(it.supportFragmentManager, LoginModalBottomSheet.TAG) }
    }

-    private fun showContentLanguageSelection() {
+    private fun showAudioLanguageSelection() {
        // we should be able to use the index of supportedLocals for language selection, items is GUI only
-        val items = supportedLocals.map {
+        val items = supportedAudioLocals.map {
            it.toDisplayString(getString(R.string.settings_content_language_none))
        }.toTypedArray()

        var initialSelection: Int
        // profile should be completed here, therefore blocking
        runBlocking {
-            initialSelection = supportedLocals.indexOf(Locale.forLanguageTag(
-                profile.await().preferredContentSubtitleLanguage))
-            if (initialSelection < 0) initialSelection = supportedLocals.lastIndex
+            initialSelection = supportedAudioLocals.indexOf(Locale.forLanguageTag(
+                profile.await().preferredContentAudioLanguage))
+            if (initialSelection < 0) initialSelection = supportedAudioLocals.lastIndex
        }

        MaterialAlertDialogBuilder(requireContext())
-            .setTitle(R.string.settings_content_language)
+            .setTitle(R.string.settings_audio_language)
            .setSingleChoiceItems(items, initialSelection){ dialog, which ->
-                updatePrefContentLanguage(supportedLocals[which])
+                updateAudioLanguage(supportedAudioLocals[which])
                dialog.dismiss()
            }
            .show()
    }

-    @kotlinx.coroutines.ExperimentalCoroutinesApi
-    private fun updatePrefContentLanguage(preferredLocale: Locale) {
+    private fun showSubtitleLanguageSelection() {
+        // we should be able to use the index of supportedLocals for language selection, items is GUI only
+        val items = supportedSubtitleLocals.map {
+            it.toDisplayString(getString(R.string.settings_content_language_none))
+        }.toTypedArray()
+
+        var initialSelection: Int
+        // profile should be completed here, therefore blocking
+        runBlocking {
+            initialSelection = supportedSubtitleLocals.indexOf(Locale.forLanguageTag(
+                profile.await().preferredContentSubtitleLanguage))
+            if (initialSelection < 0) initialSelection = supportedSubtitleLocals.lastIndex
+        }
+
+        MaterialAlertDialogBuilder(requireContext())
+            .setTitle(R.string.settings_audio_language)
+            .setSingleChoiceItems(items, initialSelection){ dialog, which ->
+                updateSubtitleLanguage(supportedSubtitleLocals[which])
+                dialog.dismiss()
+            }
+            .show()
+    }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    private fun updateAudioLanguage(preferredLocale: Locale) {
        lifecycleScope.launch {
-            Crunchyroll.postPrefSubLanguage(preferredLocale.toLanguageTag())
+            Crunchyroll.setPreferredAudioLanguage(preferredLocale.toLanguageTag())

        }.invokeOnCompletion {
-            // update the local preferred content language
-            Preferences.savePreferredSubtitleLocal(requireContext(), preferredLocale)
+            // update the local preferred audio language
+            Preferences.savePreferredAudioLocal(requireContext(), preferredLocale)

            // update profile since the language selection might have changed
            profile = lifecycleScope.async { Crunchyroll.profile() }
            profile.invokeOnCompletion {
                // update language once loading profile is completed
-                binding.textSettingsContentLanguageDesc.text = Locale.forLanguageTag(
+                binding.textSettingsAudioLanguageDesc.text = Locale.forLanguageTag(
+                    profile.getCompleted().preferredContentAudioLanguage
+                ).displayLanguage
+            }
+        }
+    }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    private fun updateSubtitleLanguage(preferredLocal: Locale) {
+        lifecycleScope.launch {
+            Crunchyroll.setPreferredSubtitleLanguage(preferredLocal.toLanguageTag())
+
+        }.invokeOnCompletion {
+            // update the local preferred subtitle language
+            Preferences.savePreferredSubtitleLocal(requireContext(), preferredLocal)
+
+            // update profile since the language selection might have changed
+            profile = lifecycleScope.async { Crunchyroll.profile() }
+            profile.invokeOnCompletion {
+                // update language once loading profile is completed
+                binding.textSettingsAudioLanguageDesc.text = Locale.forLanguageTag(
                    profile.getCompleted().preferredContentSubtitleLanguage
                ).displayLanguage
            }
@ -183,17 +227,19 @@ class AccountFragment : Fragment() {

    private fun showThemeDialog() {
        val items = arrayOf(
+            resources.getString(R.string.theme_system),
            resources.getString(R.string.theme_light),
            resources.getString(R.string.theme_dark)
        )

        MaterialAlertDialogBuilder(requireContext())
-            .setTitle(R.string.settings_content_language)
+            .setTitle(R.string.theme)
            .setSingleChoiceItems(items, Preferences.theme.ordinal){ _, which ->
                when(which) {
-                    0 -> Preferences.saveTheme(requireContext(), Theme.LIGHT)
-                    1 -> Preferences.saveTheme(requireContext(), Theme.DARK)
-                    else -> Preferences.saveTheme(requireContext(), Theme.DARK)
+                    0 -> Preferences.saveTheme(requireContext(), Theme.SYSTEM)
+                    1 -> Preferences.saveTheme(requireContext(), Theme.LIGHT)
+                    2 -> Preferences.saveTheme(requireContext(), Theme.DARK)
+                    else -> Preferences.saveTheme(requireContext(), Theme.SYSTEM)
                }

                (activity as MainActivity).restart()
--- a/app/src/main/java/org/mosad/teapod/ui/activity/main/fragments/MediaFragment.kt
+++ b/app/src/main/java/org/mosad/teapod/ui/activity/main/fragments/MediaFragment.kt
@ -47,7 +47,6 @@ class MediaFragment(private val mediaIdStr: String) : Fragment() {
        playerFinishedCallback()
    }

-
    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
        binding = FragmentMediaBinding.inflate(inflater, container, false)
        return binding.root
@ -91,6 +90,7 @@ class MediaFragment(private val mediaIdStr: String) : Fragment() {

        // load poster and backdrop
        Glide.with(requireContext()).load(posterUrl)
+            .apply(RequestOptions.placeholderOf(ColorDrawable(Color.DKGRAY)))
            .into(binding.imagePoster)
        Glide.with(requireContext()).load(backdropUrl)
            .apply(RequestOptions.placeholderOf(ColorDrawable(Color.DKGRAY)))
@ -147,14 +147,14 @@ class MediaFragment(private val mediaIdStr: String) : Fragment() {
                // episodes count
                binding.textEpisodesOrRuntime.text = resources.getQuantityString(
                    R.plurals.text_episodes_count,
-                    episodesCrunchy.total,
-                    episodesCrunchy.total
+                    seriesCrunchy.episodeCount,
+                    seriesCrunchy.episodeCount
                )
            }
            is TMDBMovie -> {
-                val tmdbMovie = (tmdbResult as TMDBMovie?)
+                val tmdbMovie = tmdbResult as TMDBMovie

-                if (tmdbMovie?.runtime != null) {
+                if (tmdbMovie.runtime != null) {
                    binding.textEpisodesOrRuntime.text = resources.getQuantityString(
                        R.plurals.text_runtime,
                        tmdbMovie.runtime,
--- a/app/src/main/java/org/mosad/teapod/ui/activity/main/viewmodel/HomeViewModel.kt
+++ b/app/src/main/java/org/mosad/teapod/ui/activity/main/viewmodel/HomeViewModel.kt
@ -66,16 +66,16 @@ class HomeViewModel : ViewModel()  {
            uiState.emit(UiState.Loading)
            try {
                // run the loading in parallel to speed up the process
-                val upNextJob = viewModelScope.async { Crunchyroll.upNextAccount().data }
-                val watchlistJob = viewModelScope.async { Crunchyroll.watchlist(WATCHLIST_LENGTH).items }
+                val upNextJob = viewModelScope.async { Crunchyroll.upNextAccount(n = 20).data }
+                val watchlistJob = viewModelScope.async { Crunchyroll.watchlist(WATCHLIST_LENGTH).data }
                val recommendationsJob = viewModelScope.async {
-                    Crunchyroll.recommendations(20).items
+                    Crunchyroll.recommendations(n = 20).data
                }
                val recentlyAddedJob = viewModelScope.async {
-                    Crunchyroll.browse(sortBy = SortBy.NEWLY_ADDED, n = 50).items
+                    Crunchyroll.browse(sortBy = SortBy.NEWLY_ADDED, n = 50).data
                }
                val topTenJob = viewModelScope.async {
-                    Crunchyroll.browse(sortBy = SortBy.POPULARITY, n = 10).items
+                    Crunchyroll.browse(sortBy = SortBy.POPULARITY, n = 10).data
                }

                val recentlyAddedItems = recentlyAddedJob.await()
@ -114,7 +114,7 @@ class HomeViewModel : ViewModel()  {
                    }

                    // update the watchlist after a item has been added/removed
-                    val watchlistItems = Crunchyroll.watchlist(WATCHLIST_LENGTH).items
+                    val watchlistItems = Crunchyroll.watchlist(WATCHLIST_LENGTH).data

                    currentUiState.copy(
                        watchlistItems = watchlistItems,
@ -133,7 +133,7 @@ class HomeViewModel : ViewModel()  {
        viewModelScope.launch {
            uiState.update { currentUiState ->
                if (currentUiState is UiState.Normal) {
-                    val upNextItems = Crunchyroll.upNextAccount().data
+                    val upNextItems = Crunchyroll.upNextAccount(n = 20).data
                    currentUiState.copy(upNextItems = upNextItems)
                } else {
                    currentUiState
--- a/app/src/main/java/org/mosad/teapod/ui/activity/main/viewmodel/LibraryFragmentViewModel.kt
+++ b/app/src/main/java/org/mosad/teapod/ui/activity/main/viewmodel/LibraryFragmentViewModel.kt
@ -90,7 +90,7 @@ class LibraryFragmentViewModel : ViewModel() {
                    delay(250)

                    val results = Crunchyroll.search(query, 50)
-                        .items.firstOrNull()?.items?.toItemMediaList()
+                        .data.firstOrNull()?.items?.toItemMediaList()
                        ?: listOf()
                    uiState.emit(UiState.Search(results))
                }
--- a/app/src/main/java/org/mosad/teapod/ui/activity/main/viewmodel/MediaFragmentViewModel.kt
+++ b/app/src/main/java/org/mosad/teapod/ui/activity/main/viewmodel/MediaFragmentViewModel.kt
@ -76,9 +76,9 @@ class MediaFragmentViewModel(application: Application) : AndroidViewModel(applic
        currentEpisodesCrunchy.clear()
        currentEpisodesCrunchy.addAll(episodesCrunchy.data)

-        // set media type
+        // set media type, for movies the episode field is empty
        mediaType = episodesCrunchy.data.firstOrNull()?.let {
-            if (it.episodeNumber != null) MediaType.TVSHOW else MediaType.MOVIE
+            if (it.episode.isNotEmpty()) MediaType.TVSHOW else MediaType.MOVIE
        } ?: MediaType.OTHER

        // load playheads and tmdb in parallel
--- a/app/src/main/java/org/mosad/teapod/ui/activity/player/PlayerViewModel.kt
+++ b/app/src/main/java/org/mosad/teapod/ui/activity/player/PlayerViewModel.kt
@ -157,9 +157,9 @@ class PlayerViewModel(application: Application) : AndroidViewModel(application)
        if (newAudioLocale != currentAudioLocale) {
            currentAudioLocale = newAudioLocale

-            currentVersion = currentEpisode.versions.firstOrNull {
+            currentVersion = currentEpisode.versions?.firstOrNull {
                it.audioLocale == currentAudioLocale.toLanguageTag()
-            } ?: currentEpisode.versions.first()
+            } ?: currentEpisode.versions?.first() ?: NoneVersion

            viewModelScope.launch {
                currentStreams = Crunchyroll.streamsFromMediaGUID(currentVersion.mediaGUID)
@ -222,15 +222,16 @@ class PlayerViewModel(application: Application) : AndroidViewModel(application)
        // needs to be blocking, currentPlayback must be present when calling playCurrentMedia()
        joinAll(
            viewModelScope.launch(Dispatchers.IO) {
-                currentVersion = if (Preferences.preferSubbed) {
-                    currentEpisode.versions.first { it.original }
-                } else {
-                    currentEpisode.versions
-                        .firstOrNull { it.audioLocale == currentAudioLocale.toLanguageTag() }
-                        ?: currentEpisode.versions.first()
-                }
+                currentVersion = currentEpisode.versions?.firstOrNull {
+                    it.audioLocale == currentAudioLocale.toLanguageTag()
+                } ?: currentEpisode.versions?.first() ?: NoneVersion

-                currentStreams = Crunchyroll.streamsFromMediaGUID(currentVersion.mediaGUID)
+                // get the current streams object, if no version is set, use streamsLink
+                currentStreams = if (currentVersion != NoneVersion) {
+                    Crunchyroll.streamsFromMediaGUID(currentVersion.mediaGUID)
+                } else {
+                    Crunchyroll.streams(currentEpisode.streamsLink)
+                }
                Log.d(classTag, currentVersion.toString())
            },
            viewModelScope.launch(Dispatchers.IO) {
@ -246,7 +247,7 @@ class PlayerViewModel(application: Application) : AndroidViewModel(application)
                }
            },
            viewModelScope.launch(Dispatchers.IO) {
-                currentIntroMetadata = NoneDatalabIntro //Crunchyroll.datalabIntro(currentEpisode.id)
+                currentIntroMetadata = Crunchyroll.datalabIntro(currentEpisode.id)
            }
        )
        Log.d(classTag, "streams: ${currentEpisode.streamsLink}")
--- a/app/src/main/java/org/mosad/teapod/ui/activity/player/fragment/LanguageSettingsDialogFragment.kt
+++ b/app/src/main/java/org/mosad/teapod/ui/activity/player/fragment/LanguageSettingsDialogFragment.kt
@ -64,7 +64,7 @@ class LanguageSettingsDialogFragment : DialogFragment() {

        val currentAudioLocal = Locale.forLanguageTag(model.currentVersion.audioLocale)
        var selectedAudioView: TextView? = null
-        model.currentEpisode.versions.forEach { version ->
+        model.currentEpisode.versions?.forEach { version ->
            val locale = Locale.forLanguageTag(version.audioLocale)
            val audioView = addLanguage(binding.linearAudioLanguages, locale) { v ->
                selectedAudioLocale = locale
@ -109,7 +109,7 @@ class LanguageSettingsDialogFragment : DialogFragment() {
            gravity = Gravity.CENTER_VERTICAL
            text = if (locale == Locale.ROOT) context.getString(R.string.no_subtitles) else locale.displayLanguage
            setTextSize(TypedValue.COMPLEX_UNIT_SP, 16f)
-            setTextColor(context.resources.getColor(R.color.textSecondaryDark, context.theme))
+            setTextColor(context.resources.getColor(R.color.player_text, context.theme))
            setPadding(75, 0, 0, 0)

            setOnClickListener(onClick)
@ -131,7 +131,7 @@ class LanguageSettingsDialogFragment : DialogFragment() {
        languageLayout.children.forEach { child ->
            if (child is TextView) {
                child.apply {
-                    setTextColor(context.resources.getColor(R.color.textPrimaryDark, context.theme))
+                    setTextColor(context.resources.getColor(R.color.player_text, context.theme))
                    setTypeface(null, Typeface.NORMAL)
                    setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, 0, 0)
                    setPadding(75, 0, 0, 0)
--- a/app/src/main/java/org/mosad/teapod/util/DataTypes.kt
+++ b/app/src/main/java/org/mosad/teapod/util/DataTypes.kt
@ -10,6 +10,7 @@ class DataTypes {
    }

    enum class Theme(val str: String) {
+        SYSTEM("System"),
        LIGHT("Light"),
        DARK("Dark")
    }
--- a/app/src/main/java/org/mosad/teapod/util/Utils.kt
+++ b/app/src/main/java/org/mosad/teapod/util/Utils.kt
@ -9,12 +9,11 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
 import androidx.fragment.app.Fragment
 import org.mosad.teapod.R
-import org.mosad.teapod.parser.crunchyroll.Collection
-import org.mosad.teapod.parser.crunchyroll.Collection2
+import org.mosad.teapod.parser.crunchyroll.CollectionV2
 import org.mosad.teapod.parser.crunchyroll.Item
 import org.mosad.teapod.parser.crunchyroll.PlayheadObject
 import org.mosad.teapod.ui.activity.player.PlayerActivity
-import java.util.*
+import java.util.Locale

 /**
 * Create a Intent for PlayerActivity with season and episode id.
@ -36,8 +35,8 @@ fun <T> concatenate(vararg lists: List<T>): List<T> {
 }

 // TODO move to correct location
-fun Collection<Item>.toItemMediaList(): List<ItemMedia> {
-    return this.items.map {
+fun CollectionV2<Item>.toItemMediaList(): List<ItemMedia> {
+    return this.data.map {
        ItemMedia(it.id, it.title, it.images.poster_wide[0][0].source)
    }
 }
@ -59,7 +58,7 @@ fun Locale.toDisplayString(fallback: String): String {
    }
 }

-fun Collection2<PlayheadObject>.toPlayheadsMap(): Map<String, PlayheadObject> {
+fun CollectionV2<PlayheadObject>.toPlayheadsMap(): Map<String, PlayheadObject> {
    return this.data.associateBy { it.contentId }
 }

--- a/app/src/main/java/org/mosad/teapod/util/tmdb/TMDBApiController.kt
+++ b/app/src/main/java/org/mosad/teapod/util/tmdb/TMDBApiController.kt
@ -67,7 +67,7 @@ class TMDBApiController {
    ): T = coroutineScope {
        val path = "$apiUrl$endpoint"
        val params = concatenate(
-            listOf("api_key" to apiKey, "language" to Preferences.preferredSubtitleLocale.language),
+            listOf("api_key" to apiKey, "language" to Preferences.preferredSubtitleLocale.toLanguageTag()),
            parameters
        )

--- a/app/src/main/res/color/bottom_nav_item_tint.xml
+++ b/app/src/main/res/color/bottom_nav_item_tint.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/colorPrimary" android:state_checked="true"/>
-    <item android:color="?attr/iconColor"/>
-</selector>
--- a/app/src/main/res/drawable/dot_default.xml
+++ b/app/src/main/res/drawable/dot_default.xml
@ -6,7 +6,7 @@
            android:shape="ring"
            android:thickness="4dp"
            android:useLevel="false">
-            <solid android:color="?iconColor"/>
+            <solid android:color="?colorOutline"/>
        </shape>
    </item>
 </layer-list>
--- a/app/src/main/res/drawable/dot_selected.xml
+++ b/app/src/main/res/drawable/dot_selected.xml
@ -6,7 +6,7 @@
            android:shape="ring"
            android:thickness="4dp"
            android:useLevel="false">
-            <solid android:color="@color/colorAccent" />
+            <solid android:color="?colorSecondary" />
        </shape>
    </item>
 </layer-list>
--- a/app/src/main/res/drawable/ic_baseline_access_time_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_access_time_24.xml
@ -1,6 +1,13 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
-    <path android:fillColor="@android:color/white" android:pathData="M12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z" />
 </vector>
--- a/app/src/main/res/drawable/ic_baseline_add_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_add_24.xml
@ -4,7 +4,7 @@
    android:viewportWidth="24"
    android:viewportHeight="24"
    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
 </vector>
--- a/app/src/main/res/drawable/ic_baseline_audiotrack_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_audiotrack_24.xml
@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,3v9.28c-0.47,-0.17 -0.97,-0.28 -1.5,-0.28C8.01,12 6,14.01 6,16.5S8.01,21 10.5,21c2.31,0 4.2,-1.75 4.45,-4H15V6h4V3h-7z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_baseline_code_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_code_24.xml
@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M9.4,16.6L4.8,12l4.6,-4.6L8,6l-6,6 6,6 1.4,-1.4zM14.6,16.6l4.6,-4.6 -4.6,-4.6L16,6l6,6 -6,6 -1.4,-1.4z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M9.4,16.6L4.8,12l4.6,-4.6L8,6l-6,6 6,6 1.4,-1.4zM14.6,16.6l4.6,-4.6 -4.6,-4.6L16,6l6,6 -6,6 -1.4,-1.4z"/>
 </vector>
--- a/app/src/main/res/drawable/ic_baseline_description_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_description_24.xml
@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M14,2L6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6zM16,18L8,18v-2h8v2zM16,14L8,14v-2h8v2zM13,9L13,3.5L18.5,9L13,9z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M14,2L6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6zM16,18L8,18v-2h8v2zM16,14L8,14v-2h8v2zM13,9L13,3.5L18.5,9L13,9z"/>
 </vector>
--- a/app/src/main/res/drawable/ic_baseline_language_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_language_24.xml
@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z"/>
 </vector>
--- a/app/src/main/res/drawable/ic_baseline_people_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_people_24.xml
@ -1,5 +1,8 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
    <path android:fillColor="@android:color/white" android:pathData="M16,11c1.66,0 2.99,-1.34 2.99,-3S17.66,5 16,5c-1.66,0 -3,1.34 -3,3s1.34,3 3,3zM8,11c1.66,0 2.99,-1.34 2.99,-3S9.66,5 8,5C6.34,5 5,6.34 5,8s1.34,3 3,3zM8,13c-2.33,0 -7,1.17 -7,3.5L1,19h14v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5zM16,13c-0.29,0 -0.62,0.02 -0.97,0.05 1.16,0.84 1.97,1.97 1.97,3.45L17,19h6v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5z"/>
 </vector>
--- a/app/src/main/res/drawable/ic_baseline_search_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_search_24.xml
@ -3,7 +3,7 @@
    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24"
-    android:tint="?attr/iconColor">
+    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="@android:color/white"
      android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
--- a/app/src/main/res/drawable/ic_baseline_style_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_style_24.xml
@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M2.53,19.65l1.34,0.56v-9.03l-2.43,5.86c-0.41,1.02 0.08,2.19 1.09,2.61zM22.03,15.95L17.07,3.98c-0.31,-0.75 -1.04,-1.21 -1.81,-1.23 -0.26,0 -0.53,0.04 -0.79,0.15L7.1,5.95c-0.75,0.31 -1.21,1.03 -1.23,1.8 -0.01,0.27 0.04,0.54 0.15,0.8l4.96,11.97c0.31,0.76 1.05,1.22 1.83,1.23 0.26,0 0.52,-0.05 0.77,-0.15l7.36,-3.05c1.02,-0.42 1.51,-1.59 1.09,-2.6zM7.88,8.75c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM5.88,19.75c0,1.1 0.9,2 2,2h1.45l-3.45,-8.34v6.34z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M2.53,19.65l1.34,0.56v-9.03l-2.43,5.86c-0.41,1.02 0.08,2.19 1.09,2.61zM22.03,15.95L17.07,3.98c-0.31,-0.75 -1.04,-1.21 -1.81,-1.23 -0.26,0 -0.53,0.04 -0.79,0.15L7.1,5.95c-0.75,0.31 -1.21,1.03 -1.23,1.8 -0.01,0.27 0.04,0.54 0.15,0.8l4.96,11.97c0.31,0.76 1.05,1.22 1.83,1.23 0.26,0 0.52,-0.05 0.77,-0.15l7.36,-3.05c1.02,-0.42 1.51,-1.59 1.09,-2.6zM7.88,8.75c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM5.88,19.75c0,1.1 0.9,2 2,2h1.45l-3.45,-8.34v6.34z"/>
 </vector>
--- a/app/src/main/res/drawable/ic_outline_info_24.xml
+++ b/app/src/main/res/drawable/ic_outline_info_24.xml
@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="#FFFFFF"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
    <path
        android:fillColor="@android:color/white"
        android:pathData="M11,7h2v2h-2zM11,11h2v6h-2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z" />
--- a/app/src/main/res/drawable/placeholder_image.xml
+++ b/app/src/main/res/drawable/placeholder_image.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="?shapeTextBackground"/>
+    <solid android:color="?colorSurfaceVariant"/>
    <size
        android:width="1920px"
        android:height="1080px"/>
--- a/app/src/main/res/drawable/placeholder_image_2_3.xml
+++ b/app/src/main/res/drawable/placeholder_image_2_3.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?colorSurfaceVariant"/>
+    <size
+        android:width="400px"
+        android:height="600px"/>
+</shape>
--- a/app/src/main/res/drawable/shape_rounded_corner.xml
+++ b/app/src/main/res/drawable/shape_rounded_corner.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="?attr/shapeTextBackground"/>
+    <solid android:color="?colorSurfaceVariant"/>
    <corners android:radius="3dp"/>
 </shape>
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@ -9,8 +9,6 @@
        android:id="@+id/nav_view"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
-        android:background="?themeSecondary"
-        app:itemIconTint="@color/bottom_nav_item_tint"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintLeft_toLeftOf="parent"
        app:layout_constraintRight_toRightOf="parent"
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:background="?themePrimary"
    tools:context=".ui.activity.main.fragments.AboutFragment">

    <LinearLayout
@ -67,8 +64,7 @@
                    android:minHeight="48dp"
                    android:padding="9dp"
                    android:scaleType="fitXY"
-                    android:src="@drawable/ic_outline_info_24"
-                    app:tint="?iconColor" />
+                    android:src="@drawable/ic_outline_info_24" />

                <LinearLayout
                    android:layout_width="match_parent"
@ -89,8 +85,7 @@
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:layout_weight="1"
-                        android:text="@string/version_desc"
-                        android:textColor="?textSecondary" />
+                        android:text="@string/version_desc" />
                </LinearLayout>
            </LinearLayout>

@ -112,8 +107,7 @@
                    android:minHeight="48dp"
                    android:padding="9dp"
                    android:scaleType="fitXY"
-                    android:src="@drawable/ic_baseline_people_24"
-                    app:tint="?iconColor" />
+                    android:src="@drawable/ic_baseline_people_24" />

                <LinearLayout
                    android:layout_width="match_parent"
@ -134,8 +128,7 @@
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:layout_weight="1"
-                        android:text="@string/author_desc"
-                        android:textColor="?textSecondary" />
+                        android:text="@string/author_desc" />
                </LinearLayout>
            </LinearLayout>

@ -157,8 +150,7 @@
                    android:minHeight="48dp"
                    android:padding="9dp"
                    android:scaleType="fitXY"
-                    android:src="@drawable/ic_baseline_code_24"
-                    app:tint="?iconColor" />
+                    android:src="@drawable/ic_baseline_code_24" />

                <LinearLayout
                    android:layout_width="match_parent"
@ -179,8 +171,7 @@
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:layout_weight="1"
-                        android:text="@string/teapod_repo"
-                        android:textColor="?textSecondary" />
+                        android:text="@string/teapod_repo" />
                </LinearLayout>
            </LinearLayout>

@ -202,8 +193,7 @@
                    android:minHeight="48dp"
                    android:padding="9dp"
                    android:scaleType="fitXY"
-                    android:src="@drawable/ic_baseline_description_24"
-                    app:tint="?iconColor" />
+                    android:src="@drawable/ic_baseline_description_24" />

                <LinearLayout
                    android:layout_width="match_parent"
@ -224,8 +214,7 @@
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:layout_weight="1"
-                        android:text="@string/license_desc"
-                        android:textColor="?textSecondary" />
+                        android:text="@string/license_desc" />
                </LinearLayout>
            </LinearLayout>

@ -267,8 +256,7 @@
            android:layout_marginEnd="7dp"
            android:paddingBottom="5dp"
            android:text="@string/tmdb_notice"
-            android:textAlignment="center"
-            android:textColor="?textSecondary" />
+            android:textAlignment="center" />

    </LinearLayout>
 </androidx.core.widget.NestedScrollView>
--- a/app/src/main/res/layout/fragment_account.xml
+++ b/app/src/main/res/layout/fragment_account.xml
@ -4,12 +4,12 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:background="?themePrimary"
    tools:context=".ui.activity.main.fragments.AccountFragment">

    <ScrollView
        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:scrollbars="none">

        <LinearLayout
            android:layout_width="match_parent"
@ -23,7 +23,6 @@
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_marginTop="12dp"
-                android:background="?themeSecondary"
                android:elevation="5dp"
                android:orientation="vertical">

@ -34,7 +33,7 @@
                    android:paddingStart="7dp"
                    android:paddingEnd="7dp"
                    android:text="@string/account"
-                    android:textSize="16sp"
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
                    android:textStyle="bold" />

                <LinearLayout
@ -55,8 +54,7 @@
                        android:minHeight="48dp"
                        android:padding="9dp"
                        android:scaleType="fitXY"
-                        android:src="@drawable/ic_baseline_account_box_24"
-                        app:tint="?iconColor" />
+                        android:src="@drawable/ic_baseline_account_box_24" />

                    <LinearLayout
                        android:layout_width="match_parent"
@ -69,15 +67,14 @@
                            android:layout_height="wrap_content"
                            android:layout_weight="1"
                            android:text="@string/account_login_ex"
-                            android:textSize="16sp" />
+                            android:textAppearance="@style/TextAppearance.Material3.BodyLarge" />

                        <TextView
                            android:id="@+id/text_account_login_desc"
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            android:layout_weight="1"
-                            android:text="@string/account_login_desc"
-                            android:textColor="?textSecondary" />
+                            android:text="@string/account_login_desc" />
                    </LinearLayout>
                </LinearLayout>

@ -99,8 +96,7 @@
                        android:minHeight="48dp"
                        android:padding="9dp"
                        android:scaleType="fitXY"
-                        android:src="@drawable/ic_baseline_access_time_24"
-                        app:tint="?iconColor" />
+                        android:src="@drawable/ic_baseline_access_time_24" />

                    <LinearLayout
                        android:layout_width="match_parent"
@ -113,15 +109,14 @@
                            android:layout_height="wrap_content"
                            android:layout_weight="1"
                            android:text="@string/loading"
-                            android:textSize="16sp" />
+                            android:textAppearance="@style/TextAppearance.Material3.BodyLarge" />

                        <TextView
                            android:id="@+id/text_account_subscription_desc"
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            android:layout_weight="1"
-                            android:text="@string/account_tier"
-                            android:textColor="?textSecondary" />
+                            android:text="@string/account_tier" />
                    </LinearLayout>
                </LinearLayout>

@ -132,7 +127,6 @@
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_marginTop="12dp"
-                android:background="?themeSecondary"
                android:elevation="5dp"
                android:orientation="vertical">

@ -143,11 +137,11 @@
                    android:paddingStart="7dp"
                    android:paddingEnd="7dp"
                    android:text="@string/settings"
-                    android:textSize="16sp"
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
                    android:textStyle="bold" />

                <LinearLayout
-                    android:id="@+id/linear_settings_content_language"
+                    android:id="@+id/linear_settings_audio_language"
                    android:layout_width="match_parent"
                    android:layout_height="match_parent"
                    android:orientation="horizontal"
@ -157,13 +151,12 @@
                        android:id="@+id/imageView4"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
-                        android:contentDescription="@string/settings_content_language"
+                        android:contentDescription="@string/settings_audio_language"
                        android:minWidth="48dp"
                        android:minHeight="48dp"
                        android:padding="9dp"
                        android:scaleType="fitXY"
-                        android:src="@drawable/ic_baseline_language_24"
-                        app:tint="?iconColor" />
+                        android:src="@drawable/ic_baseline_audiotrack_24" />

                    <LinearLayout
                        android:layout_width="match_parent"
@ -174,82 +167,53 @@
                            android:id="@+id/text_settings_content_language"
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
-                            android:text="@string/settings_content_language"
-                            android:textSize="16sp" />
+                            android:text="@string/settings_audio_language"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyLarge" />

                        <TextView
-                            android:id="@+id/text_settings_content_language_desc"
+                            android:id="@+id/text_settings_audio_language_desc"
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
-                            android:text="@string/settings_content_language_desc"
-                            android:textColor="?textSecondary" />
+                            android:text="@string/settings_content_language_desc" />
                    </LinearLayout>
                </LinearLayout>

                <LinearLayout
-                    android:id="@+id/linear_settings_secondary"
+                    android:id="@+id/linear_settings_subtitle_language"
                    android:layout_width="match_parent"
                    android:layout_height="match_parent"
-                    android:gravity="center"
                    android:orientation="horizontal"
                    android:padding="7dp">

                    <ImageView
-                        android:id="@+id/imageView3"
+                        android:id="@+id/imageView7"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
-                        android:contentDescription="@string/settings_prefer_subbed"
+                        android:contentDescription="@string/settings_subtitle_language"
                        android:minWidth="48dp"
                        android:minHeight="48dp"
                        android:padding="9dp"
                        android:scaleType="fitXY"
-                        android:src="@drawable/ic_baseline_subtitles_24"
-                        app:tint="?iconColor" />
+                        android:src="@drawable/ic_baseline_subtitles_24" />

-                    <androidx.constraintlayout.widget.ConstraintLayout
+                    <LinearLayout
                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
+                        android:layout_height="match_parent"
+                        android:orientation="vertical">

-                        <LinearLayout
-                            android:id="@+id/linearLayout"
-                            android:layout_width="0dp"
+                        <TextView
+                            android:id="@+id/text_settings_subtitle_language"
+                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
-                            android:orientation="vertical"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toStartOf="@+id/switch_secondary"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent">
+                            android:text="@string/settings_subtitle_language"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyLarge" />

-                            <TextView
-                                android:id="@+id/text_settings_secondary"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:text="@string/settings_prefer_subbed"
-                                android:textSize="16sp" />
-
-                            <TextView
-                                android:id="@+id/text_settings_secondary_desc"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:maxLines="2"
-                                android:text="@string/settings_prefer_subbed_desc"
-                                android:textColor="?textSecondary" />
-                        </LinearLayout>
-
-                        <com.google.android.material.switchmaterial.SwitchMaterial
-                            android:id="@+id/switch_secondary"
-                            android:layout_width="wrap_content"
+                        <TextView
+                            android:id="@+id/text_settings_subtitle_language_desc"
+                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
-                            android:checked="true"
-                            android:contentDescription="@string/settings_prefer_subbed"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-
+                            android:text="@string/settings_content_language_desc" />
+                    </LinearLayout>
                </LinearLayout>

                <LinearLayout
@ -268,8 +232,7 @@
                        android:minWidth="48dp"
                        android:minHeight="48dp"
                        android:padding="9dp"
-                        android:src="@drawable/ic_baseline_autorenew_24"
-                        app:tint="?iconColor" />
+                        android:src="@drawable/ic_baseline_autorenew_24" />

                    <androidx.constraintlayout.widget.ConstraintLayout
                        android:layout_width="match_parent"
@ -290,14 +253,13 @@
                                android:layout_width="match_parent"
                                android:layout_height="wrap_content"
                                android:text="@string/settings_autoplay"
-                                android:textSize="16sp" />
+                                android:textAppearance="@style/TextAppearance.Material3.BodyLarge" />

                            <TextView
                                android:id="@+id/text_settings_auoplay_desc"
                                android:layout_width="match_parent"
                                android:layout_height="wrap_content"
-                                android:text="@string/settings_autoplay_desc"
-                                android:textColor="?textSecondary" />
+                                android:text="@string/settings_autoplay_desc" />
                        </LinearLayout>

                        <com.google.android.material.switchmaterial.SwitchMaterial
@ -331,8 +293,7 @@
                        android:minHeight="48dp"
                        android:padding="9dp"
                        android:scaleType="fitXY"
-                        android:src="@drawable/ic_baseline_style_24"
-                        app:tint="?iconColor" />
+                        android:src="@drawable/ic_baseline_style_24" />

                    <LinearLayout
                        android:layout_width="match_parent"
@ -345,15 +306,14 @@
                            android:layout_height="wrap_content"
                            android:layout_weight="1"
                            android:text="@string/theme"
-                            android:textSize="16sp" />
+                            android:textAppearance="@style/TextAppearance.Material3.BodyLarge" />

                        <TextView
                            android:id="@+id/text_theme_selected"
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            android:layout_weight="1"
-                            android:text="@string/theme_light"
-                            android:textColor="?textSecondary" />
+                            android:text="@string/theme_light" />
                    </LinearLayout>

                </LinearLayout>
@ -365,7 +325,6 @@
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_marginTop="12dp"
-                android:background="?themeSecondary"
                android:clipToPadding="false"
                android:elevation="5dp"
                android:orientation="vertical">
@ -377,7 +336,7 @@
                    android:paddingStart="7dp"
                    android:paddingEnd="7dp"
                    android:text="@string/dev_settings"
-                    android:textSize="16sp"
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
                    android:textStyle="bold" />

                <LinearLayout
@ -397,8 +356,7 @@
                        android:minHeight="48dp"
                        android:padding="9dp"
                        android:scaleType="fitXY"
-                        android:src="@drawable/ic_baseline_access_time_24"
-                        app:tint="?iconColor" />
+                        android:src="@drawable/ic_baseline_access_time_24" />

                    <androidx.constraintlayout.widget.ConstraintLayout
                        android:layout_width="match_parent"
@ -419,14 +377,13 @@
                                android:layout_width="match_parent"
                                android:layout_height="wrap_content"
                                android:text="@string/update_playhead"
-                                android:textSize="16sp" />
+                                android:textAppearance="@style/TextAppearance.Material3.BodyLarge" />

                            <TextView
                                android:id="@+id/text_update_playhead_desc"
                                android:layout_width="match_parent"
                                android:layout_height="wrap_content"
-                                android:text="@string/update_playhead_desc"
-                                android:textColor="?textSecondary" />
+                                android:text="@string/update_playhead_desc" />
                        </LinearLayout>

                        <com.google.android.material.switchmaterial.SwitchMaterial
@ -462,8 +419,7 @@
                        android:minHeight="48dp"
                        android:padding="9dp"
                        android:scaleType="fitXY"
-                        app:srcCompat="@drawable/ic_outline_upload_24"
-                        app:tint="?iconColor" />
+                        app:srcCompat="@drawable/ic_outline_upload_24" />

                    <LinearLayout
                        android:layout_width="match_parent"
@ -483,8 +439,7 @@
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            android:layout_weight="1"
-                            android:text="@string/export_data_desc"
-                            android:textColor="?textSecondary" />
+                            android:text="@string/export_data_desc" />
                    </LinearLayout>

                </LinearLayout>
@ -508,8 +463,7 @@
                        android:minHeight="48dp"
                        android:padding="9dp"
                        android:scaleType="fitXY"
-                        app:srcCompat="@drawable/ic_outline_download_24"
-                        app:tint="?iconColor" />
+                        app:srcCompat="@drawable/ic_outline_download_24" />

                    <LinearLayout
                        android:layout_width="match_parent"
@ -529,8 +483,7 @@
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            android:layout_weight="1"
-                            android:text="@string/import_data_desc"
-                            android:textColor="?textSecondary" />
+                            android:text="@string/import_data_desc" />
                    </LinearLayout>

                </LinearLayout>
@ -542,7 +495,6 @@
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_marginTop="12dp"
-                android:background="?themeSecondary"
                android:clipToPadding="false"
                android:elevation="5dp"
                android:orientation="vertical">
@ -554,7 +506,7 @@
                    android:paddingStart="7dp"
                    android:paddingEnd="7dp"
                    android:text="@string/info"
-                    android:textSize="16sp"
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
                    android:textStyle="bold" />

                <LinearLayout
@ -575,8 +527,7 @@
                        android:minHeight="48dp"
                        android:padding="9dp"
                        android:scaleType="fitXY"
-                        app:srcCompat="@drawable/ic_outline_info_24"
-                        app:tint="?iconColor" />
+                        app:srcCompat="@drawable/ic_outline_info_24" />

                    <LinearLayout
                        android:layout_width="match_parent"
@ -589,15 +540,14 @@
                            android:layout_height="wrap_content"
                            android:layout_weight="1"
                            android:text="@string/info_about"
-                            android:textSize="16sp" />
+                            android:textAppearance="@style/TextAppearance.Material3.BodyLarge" />

                        <TextView
                            android:id="@+id/text_info_about_desc"
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            android:layout_weight="1"
-                            android:text="@string/info_about_desc"
-                            android:textColor="?textSecondary" />
+                            android:text="@string/info_about_desc" />
                    </LinearLayout>

                </LinearLayout>
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@ -5,12 +5,12 @@
    android:id="@+id/ff_test"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:background="?themePrimary"
    tools:context=".ui.activity.main.fragments.HomeFragment">

    <ScrollView
        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:scrollbars="none">

        <LinearLayout
            android:layout_width="match_parent"
@ -70,9 +70,7 @@
                        android:layout_height="wrap_content"
                        android:gravity="center"
                        android:text="@string/my_list"
-                        android:textColor="?textSecondary"
                        android:textSize="12sp"
-                        app:drawableTint="?buttonBackground"
                        app:drawableTopCompat="@drawable/ic_baseline_add_24" />

                    <Space
@ -87,12 +85,9 @@
                        android:gravity="center"
                        android:text="@string/button_play"
                        android:textAllCaps="false"
-                        android:textColor="?themePrimary"
                        android:textSize="16sp"
-                        app:backgroundTint="?buttonBackground"
                        app:icon="@drawable/ic_baseline_play_arrow_24"
-                        app:iconGravity="textStart"
-                        app:iconTint="?themePrimary" />
+                        app:iconGravity="textStart" />

                    <Space
                        android:layout_width="0dp"
@ -105,9 +100,7 @@
                        android:layout_height="wrap_content"
                        android:gravity="center"
                        android:text="@string/info"
-                        android:textColor="?textSecondary"
                        android:textSize="12sp"
-                        app:drawableTint="?buttonBackground"
                        app:drawableTopCompat="@drawable/ic_outline_info_24" />

                    <Space
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@ -4,14 +4,12 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:background="?themePrimary"
    tools:context=".ui.activity.main.fragments.LibraryFragment">

    <org.mosad.teapod.ui.components.EmptySubmitSearchView
        android:id="@+id/search_text"
        android:layout_width="match_parent"
        android:layout_height="0dp"
-        android:background="?themeSecondary"
        android:elevation="8dp"
        android:iconifiedByDefault="false"
        android:paddingBottom="5dp"
--- a/app/src/main/res/layout/fragment_media.xml
+++ b/app/src/main/res/layout/fragment_media.xml
@ -4,7 +4,6 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:background="?themePrimary"
    tools:context=".ui.activity.main.fragments.MediaFragment">

    <androidx.coordinatorlayout.widget.CoordinatorLayout
@ -14,8 +13,7 @@
        <com.google.android.material.appbar.AppBarLayout
            android:id="@+id/app_layout"
            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?themePrimary">
+            android:layout_height="wrap_content">

            <LinearLayout
                android:id="@+id/linear_media"
@ -44,7 +42,7 @@
                            android:layout_height="match_parent"
                            android:contentDescription="@string/media_poster_backdrop_desc"
                            android:scaleType="fitCenter"
-                            tools:srcCompat="@drawable/placeholder_image" />
+                            tools:srcCompat="@android:color/darker_gray" />

                        <com.google.android.material.imageview.ShapeableImageView
                            android:id="@+id/image_poster"
@ -55,7 +53,7 @@
                            android:layout_marginBottom="7dp"
                            android:scaleType="fitCenter"
                            app:shapeAppearance="@style/ShapeAppearance.Teapod.RoundedPoster"
-                            tools:src="@drawable/ic_launcher_background" />
+                            tools:src="@drawable/placeholder_image_2_3" />

                    </FrameLayout>

@ -108,12 +106,9 @@
                    android:gravity="center"
                    android:text="@string/button_play"
                    android:textAllCaps="false"
-                    android:textColor="?themePrimary"
                    android:textSize="16sp"
-                    app:backgroundTint="?buttonBackground"
                    app:icon="@drawable/ic_baseline_play_arrow_24"
-                    app:iconGravity="textStart"
-                    app:iconTint="?themePrimary" />
+                    app:iconGravity="textStart" />

                <TextView
                    android:id="@+id/text_title"
@ -163,15 +158,13 @@
                            android:paddingTop="11dp"
                            android:paddingEnd="11dp"
                            android:paddingBottom="7dp"
-                            android:src="@drawable/ic_baseline_add_24"
-                            app:tint="?buttonBackground" />
+                            android:src="@drawable/ic_baseline_add_24" />

                        <TextView
                            android:id="@+id/text_my_list_action"
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:text="@string/my_list"
-                            android:textColor="?textSecondary"
                            android:textSize="12sp" />

                    </LinearLayout>
@ -186,9 +179,7 @@
                    android:layout_marginEnd="7dp"
                    android:background="@android:color/transparent"
                    app:tabGravity="start"
-                    app:tabMode="scrollable"
-                    app:tabSelectedTextColor="?textPrimary"
-                    app:tabTextColor="?textSecondary" />
+                    app:tabMode="scrollable" />

            </LinearLayout>
        </com.google.android.material.appbar.AppBarLayout>
@ -207,7 +198,7 @@
        android:id="@+id/frame_loading"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
-        android:background="?themePrimary"
+        android:background="?android:colorBackground"
        android:visibility="gone">

        <com.google.android.material.progressindicator.CircularProgressIndicator
--- a/app/src/main/res/layout/fragment_my_lists.xml
+++ b/app/src/main/res/layout/fragment_my_lists.xml
@ -4,7 +4,6 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:background="?themePrimary"
    tools:context=".ui.activity.main.fragments.MyListsFragment">

    <com.google.android.material.tabs.TabLayout
@ -15,9 +14,8 @@
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
-        app:tabMode="fixed"
-        app:tabSelectedTextColor="?textPrimary"
-        app:tabTextColor="?textSecondary">
+        app:tabMode="fixed">
+        <!-- TODO app:tabTextColor="?colorOnPrimary" -->

        <com.google.android.material.tabs.TabItem
            android:layout_width="wrap_content"
--- a/app/src/main/res/layout/fragment_on_login.xml
+++ b/app/src/main/res/layout/fragment_on_login.xml
@ -2,8 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?themePrimary">
+    android:layout_height="match_parent">

    <ImageView
        android:id="@+id/image_login"
@ -11,12 +10,12 @@
        android:layout_height="128dp"
        android:contentDescription="@string/app_name"
        android:scaleType="fitCenter"
+        android:tint="?colorTeapodIcon"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintHorizontal_bias="0.5"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_launcher_foreground"
-        app:tint="?buttonBackground" />
+        app:srcCompat="@drawable/ic_launcher_foreground" />

    <LinearLayout
        android:id="@+id/linear_login"
--- a/app/src/main/res/layout/fragment_on_welcome.xml
+++ b/app/src/main/res/layout/fragment_on_welcome.xml
@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
    android:orientation="vertical"
    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?themePrimary">
+    android:layout_height="match_parent">

    <androidx.constraintlayout.widget.ConstraintLayout
        android:layout_width="match_parent"
@ -17,12 +15,12 @@
            android:layout_height="128dp"
            android:contentDescription="@string/app_name"
            android:scaleType="fitCenter"
+            android:tint="?colorTeapodIcon"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintHorizontal_bias="0.5"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/ic_launcher_foreground"
-            app:tint="?buttonBackground" />
+            app:srcCompat="@drawable/ic_launcher_foreground" />

        <LinearLayout
            android:id="@+id/linearLayout3"
--- a/app/src/main/res/layout/item_episode.xml
+++ b/app/src/main/res/layout/item_episode.xml
@ -24,8 +24,8 @@
                android:layout_width="match_parent"
                android:layout_height="match_parent"
                android:contentDescription="@string/component_poster_desc"
-                app:shapeAppearance="@style/ShapeAppearance.Teapod.RoundedPoster"
-                app:srcCompat="@color/imagePlaceholder" />
+                android:src="@drawable/placeholder_image"
+                app:shapeAppearance="@style/ShapeAppearance.Teapod.RoundedPoster" />

            <ImageView
                android:id="@+id/image_episode_play"
@ -56,7 +56,6 @@
            android:ellipsize="end"
            android:maxLines="3"
            android:text="@string/component_episode_title"
-            android:textColor="?textPrimary"
            android:textSize="16sp" />

        <ImageView
@ -65,8 +64,7 @@
            android:layout_height="30dp"
            android:layout_margin="2dp"
            android:contentDescription="@string/component_watched_desc"
-            app:srcCompat="@drawable/ic_baseline_check_circle_24"
-            app:tint="?iconColor" />
+            app:srcCompat="@drawable/ic_baseline_check_circle_24" />
    </LinearLayout>

    <TextView
@ -74,6 +72,6 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:ellipsize="end"
-        android:maxLines="3"
-        android:textColor="?textSecondary" />
+        android:maxLines="3" />
+    <!-- TODO android:textColor="?textSecondary" -->
 </LinearLayout>
--- a/app/src/main/res/layout/item_episode_player.xml
+++ b/app/src/main/res/layout/item_episode_player.xml
@ -15,8 +15,8 @@
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:contentDescription="@string/component_poster_desc"
-            app:shapeAppearance="@style/ShapeAppearance.Teapod.RoundedPoster"
-            app:srcCompat="@color/imagePlaceholder" />
+            android:src="@drawable/placeholder_image"
+            app:shapeAppearance="@style/ShapeAppearance.Teapod.RoundedPoster" />

        <ImageView
            android:id="@+id/image_episode_play"
@ -44,7 +44,7 @@
        android:layout_height="wrap_content"
        android:layout_marginTop="7dp"
        android:text="@string/component_episode_title"
-        android:textColor="@color/textPrimaryDark"
+        android:textColor="@color/player_text"
        android:textSize="16sp" />

    <View
@ -53,7 +53,7 @@
        android:layout_height="1dp"
        android:layout_marginTop="5dp"
        android:layout_marginBottom="5dp"
-        android:background="@color/textSecondaryDark" />
+        android:background="@color/player_text_secondary" />

    <TextView
        android:id="@+id/text_episode_desc2"
@ -62,6 +62,6 @@
        android:layout_marginTop="5dp"
        android:maxLines="10"
        android:text="@string/text_overview_ex"
-        android:textColor="@color/textPrimaryDark" />
+        android:textColor="@color/player_text" />

 </LinearLayout>
--- a/app/src/main/res/layout/item_highlight_shimmer.xml
+++ b/app/src/main/res/layout/item_highlight_shimmer.xml
@ -3,8 +3,7 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?themePrimary">
+    android:layout_height="wrap_content">

    <ImageView
        android:id="@+id/shimmer_image_highlight"
@ -21,7 +20,6 @@
        android:id="@+id/shimmer_linear_highlight"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
-        android:background="?themePrimary"
        android:orientation="vertical"
        android:paddingBottom="7dp"
        app:layout_constraintBottom_toBottomOf="parent"
@ -56,7 +54,6 @@
                android:layout_height="wrap_content"
                android:gravity="center"
                android:textSize="12sp"
-                app:drawableTint="?shapeTextBackground"
                app:drawableTopCompat="@drawable/ic_baseline_add_24" />

            <Space
@ -69,8 +66,7 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:gravity="center"
-                android:textSize="16sp"
-                app:backgroundTint="?shapeTextBackground" />
+                android:textSize="16sp" />

            <Space
                android:layout_width="0dp"
@ -82,7 +78,6 @@
                android:layout_width="64dp"
                android:layout_height="wrap_content"
                android:gravity="center"
-                app:drawableTint="?shapeTextBackground"
                app:drawableTopCompat="@drawable/ic_outline_info_24" />

            <Space
--- a/app/src/main/res/layout/item_media.xml
+++ b/app/src/main/res/layout/item_media.xml
@ -8,7 +8,6 @@
    <com.google.android.material.card.MaterialCardView
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:backgroundTint="?themeSecondary"
        app:cardCornerRadius="7dp"
        app:cardElevation="4dp"
        app:cardUseCompatPadding="true"
--- a/app/src/main/res/layout/item_media_shimmer.xml
+++ b/app/src/main/res/layout/item_media_shimmer.xml
@ -8,7 +8,6 @@
    <com.google.android.material.card.MaterialCardView
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:backgroundTint="?themeSecondary"
        app:cardCornerRadius="7dp"
        app:cardElevation="4dp"
        app:cardUseCompatPadding="true"
@ -35,7 +34,6 @@
                    android:id="@+id/image_poster"
                    android:layout_width="match_parent"
                    android:layout_height="match_parent"
-                    android:background="?shapeTextBackground"
                    tools:ignore="ContentDescription" />

            </FrameLayout>
--- a/app/src/main/res/layout/modal_bottom_sheet_login.xml
+++ b/app/src/main/res/layout/modal_bottom_sheet_login.xml
@ -4,7 +4,6 @@
    android:id="@+id/standard_bottom_sheet"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:background="?themeSecondary"
    android:orientation="vertical"
    android:paddingTop="24dp"
    android:paddingStart="24dp"
@ -61,8 +60,7 @@
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_marginEnd="24dp"
-                    android:text="@string/cancel"
-                    android:textColor="?colorPrimary" />
+                    android:text="@string/cancel" />

                <Button
                    android:id="@+id/positive_button"
@ -70,8 +68,7 @@
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_marginEnd="24dp"
-                    android:text="@string/save"
-                    android:textColor="?colorPrimary" />
+                    android:text="@string/save" />
        </LinearLayout>

 </LinearLayout>
--- a/app/src/main/res/layout/player_language_settings.xml
+++ b/app/src/main/res/layout/player_language_settings.xml
@ -138,9 +138,9 @@
            android:layout_marginEnd="7dp"
            android:text="@string/cancel"
            android:textAllCaps="false"
-            android:textColor="@color/player_white"
+            android:textColor="@color/button_text_color_light"
            android:textSize="16sp"
-            app:backgroundTint="@color/buttonBackgroundLight"
+            app:backgroundTint="@color/button_background_light"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintTop_toTopOf="parent" />
@ -151,9 +151,9 @@
            android:layout_height="wrap_content"
            android:text="@string/apply"
            android:textAllCaps="false"
-            android:textColor="@color/themePrimaryDark"
+            android:textColor="@color/button_text_color_dark"
            android:textSize="16sp"
-            app:backgroundTint="@color/buttonBackgroundDark"
+            app:backgroundTint="@color/button_background_dark"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintTop_toTopOf="parent"
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@ -45,7 +45,8 @@
    <string name="info">Info</string>
    <string name="info_about_desc">Version %1$s (%2$s)</string>
    <string name="settings">Einstellungen</string>
-    <string name="settings_content_language">Bevorzuge Inhaltssprache</string>
+    <string name="settings_audio_language">Audio Sprache</string>
+    <string name="settings_subtitle_language">Untertielsprache</string>
    <string name="settings_content_language_desc">Englisch</string>
    <string name="settings_content_language_none">Keine</string>
    <string name="settings_prefer_subbed">Bevorzuge OmU</string>
@ -55,6 +56,7 @@
    <string name="theme">Design</string>
    <string name="theme_light">Hell</string>
    <string name="theme_dark">Dunkel</string>
+    <string name="theme_system">System</string>
    <string name="dev_settings">Entwickler Einstellungen</string>
    <string name="update_playhead">Playhead Updates</string>
    <string name="update_playhead_desc">Fortschritt bei Episoden auf cr updaten</string>
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Widget.App.Button" parent="Widget.Material3.Button">
+        <item name="backgroundTint">@color/button_background_dark</item>
+        <item name="android:textColor">@color/button_text_color_dark</item>
+        <item name="iconTint">@color/button_text_color_dark</item>
+    </style>
+
+    <style name="AppTheme" parent="Theme.Material3.Dark.NoActionBar">
+<!--        <item name="materialButtonStyle">@style/Widget.App.Button</item>-->
+        <item name="searchViewStyle">@style/SearchViewStyle</item>
+        <item name="materialCardViewStyle">?attr/materialCardViewElevatedStyle</item>
+
+        <item name="colorPrimary">@color/seed</item>
+        <item name="colorOnPrimary">@color/md_theme_light_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/md_theme_dark_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_dark_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/md_theme_dark_secondary</item>
+        <item name="colorOnSecondary">@color/md_theme_dark_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/md_theme_dark_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_dark_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/md_theme_dark_tertiary</item>
+        <item name="colorOnTertiary">@color/md_theme_dark_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/md_theme_dark_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_dark_onTertiaryContainer</item>
+        <item name="colorError">@color/md_theme_dark_error</item>
+        <item name="colorErrorContainer">@color/md_theme_dark_errorContainer</item>
+        <item name="colorOnError">@color/md_theme_dark_onError</item>
+        <item name="colorOnErrorContainer">@color/md_theme_dark_onErrorContainer</item>
+        <item name="android:colorBackground">@color/md_theme_dark_background</item>
+        <item name="colorOnBackground">@color/md_theme_dark_onBackground</item>
+        <item name="colorSurface">@color/md_theme_dark_surface</item>
+        <item name="colorOnSurface">@color/md_theme_dark_onSurface</item>
+        <item name="colorSurfaceVariant">@color/md_theme_dark_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_dark_onSurfaceVariant</item>
+        <item name="colorOutline">@color/md_theme_dark_outline</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_dark_inverseOnSurface</item>
+        <item name="colorSurfaceInverse">@color/md_theme_dark_inverseSurface</item>
+        <item name="colorPrimaryInverse">@color/md_theme_dark_inversePrimary</item>
+        <item name="colorTeapodIcon">@color/button_background_dark</item>
+    </style>
+
+</resources>
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@ -1,10 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <attr format="color" name="themePrimary"/>
-    <attr format="color" name="themeSecondary"/>
-    <attr format="color" name="textPrimary"/>
-    <attr format="color" name="textSecondary"/>
-    <attr format="color" name="iconColor"/>
-    <attr format="color" name="buttonBackground"/>
-    <attr format="color" name="shapeTextBackground"/>
+    <attr format="color" name="colorTeapodIcon"/>
 </resources>
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@ -1,34 +1,83 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- base theme colors -->
-    <color name="colorPrimary">#66aa00</color>
-    <color name="colorPrimaryLight">#99dc45</color>
-    <color name="colorPrimaryDark">#317a00</color>
-    <color name="colorAccent">#607d8b</color>
-    <color name="imagePlaceholder">#c2c2c2</color>
-
    <!-- light theme colors -->
-    <color name="themePrimaryLight">#ffffff</color>
-    <color name="themeSecondaryLight">#ffffff</color>
-    <color name="textPrimaryLight">#de000000</color>
-    <color name="textSecondaryLight">#99000000</color>
-    <color name="textBackgroundLight">#55000000</color>
-    <color name="iconColorLight">#99000000</color>
-    <color name="buttonBackgroundLight">#000000</color>
+    <color name="button_background_light">#000000</color>
+    <color name="button_text_color_light">#ffffff</color>

    <!-- dark theme colors -->
-    <color name="themePrimaryDark">#121212</color>
-    <color name="themeSecondaryDark">#202020</color>
-    <color name="textPrimaryDark">#deffffff</color>
-    <color name="textSecondaryDark">#99ffffff</color>
-    <color name="textBackgroundDark">#55ffffff</color>
-    <color name="iconColorDark">#99ffffff</color>
-    <color name="buttonBackgroundDark">#ffffff</color>
-    <color name="controlHighlightDark">#11ffffff</color>
+    <color name="button_background_dark">#ffffff</color>
+    <color name="button_text_color_dark">#000000</color>
+
+    <!-- material3 colors -->
+    <color name="seed">#66aa00</color> <!-- base/primary color -->
+    <color name="md_theme_light_primary">#3E6A00</color>
+    <color name="md_theme_light_onPrimary">#FFFFFF</color>
+    <color name="md_theme_light_primaryContainer">#99d853</color>
+    <color name="md_theme_light_onPrimaryContainer">#0F2000</color>
+    <color name="md_theme_light_secondary">#416916</color>
+    <color name="md_theme_light_onSecondary">#FFFFFF</color>
+    <color name="md_theme_light_secondaryContainer">#C1F18E</color>
+    <color name="md_theme_light_onSecondaryContainer">#0E2000</color>
+    <color name="md_theme_light_tertiary">#006783</color>
+    <color name="md_theme_light_onTertiary">#FFFFFF</color>
+    <color name="md_theme_light_tertiaryContainer">#BDE9FF</color>
+    <color name="md_theme_light_onTertiaryContainer">#001F2A</color>
+    <color name="md_theme_light_error">#BA1A1A</color>
+    <color name="md_theme_light_errorContainer">#FFDAD6</color>
+    <color name="md_theme_light_onError">#FFFFFF</color>
+    <color name="md_theme_light_onErrorContainer">#410002</color>
+    <color name="md_theme_light_background">#FDFCF5</color>
+    <color name="md_theme_light_onBackground">#1B1C18</color>
+    <color name="md_theme_light_surface">#FDFCF5</color>
+    <color name="md_theme_light_onSurface">#1B1C18</color>
+    <color name="md_theme_light_surfaceVariant">#E1E4D5</color>
+    <color name="md_theme_light_onSurfaceVariant">#44483D</color>
+    <color name="md_theme_light_outline">#75796C</color>
+    <color name="md_theme_light_inverseOnSurface">#F2F1E9</color>
+    <color name="md_theme_light_inverseSurface">#30312C</color>
+    <color name="md_theme_light_inversePrimary">#92DA3E</color>
+    <color name="md_theme_light_shadow">#000000</color>
+    <color name="md_theme_light_surfaceTint">#3E6A00</color>
+    <color name="md_theme_light_outlineVariant">#C5C8BA</color>
+    <color name="md_theme_light_scrim">#000000</color>
+    <color name="md_theme_dark_primary">#92DA3E</color>
+    <color name="md_theme_dark_onPrimary">#1E3700</color>
+    <color name="md_theme_dark_primaryContainer">#2D5000</color>
+    <color name="md_theme_dark_onPrimaryContainer">#ACF758</color>
+    <color name="md_theme_dark_secondary">#A6D475</color>
+    <color name="md_theme_dark_onSecondary">#1D3700</color>
+    <color name="md_theme_dark_secondaryContainer">#2C5000</color>
+    <color name="md_theme_dark_onSecondaryContainer">#C1F18E</color>
+    <color name="md_theme_dark_tertiary">#65D3FF</color>
+    <color name="md_theme_dark_onTertiary">#003546</color>
+    <color name="md_theme_dark_tertiaryContainer">#004D64</color>
+    <color name="md_theme_dark_onTertiaryContainer">#BDE9FF</color>
+    <color name="md_theme_dark_error">#FFB4AB</color>
+    <color name="md_theme_dark_errorContainer">#93000A</color>
+    <color name="md_theme_dark_onError">#690005</color>
+    <color name="md_theme_dark_onErrorContainer">#FFDAD6</color>
+    <color name="md_theme_dark_background">#1B1C18</color>
+    <color name="md_theme_dark_onBackground">#E3E3DB</color>
+    <color name="md_theme_dark_surface">#1B1C18</color>
+    <color name="md_theme_dark_onSurface">#E3E3DB</color>
+    <color name="md_theme_dark_surfaceVariant">#44483D</color>
+    <color name="md_theme_dark_onSurfaceVariant">#C5C8BA</color>
+    <color name="md_theme_dark_outline">#8E9285</color>
+    <color name="md_theme_dark_inverseOnSurface">#1B1C18</color>
+    <color name="md_theme_dark_inverseSurface">#E3E3DB</color>
+    <color name="md_theme_dark_inversePrimary">#3E6A00</color>
+    <color name="md_theme_dark_shadow">#000000</color>
+    <color name="md_theme_dark_surfaceTint">#92DA3E</color>
+    <color name="md_theme_dark_outlineVariant">#44483D</color>
+    <color name="md_theme_dark_scrim">#000000</color>

    <!-- player colors -->
    <color name="player_white">#ffffff</color>
+    <color name="player_text">#deffffff</color>
+    <color name="player_text_secondary">#99ffffff</color>

+    <!-- launcher/splash screen colors -->
    <color name="ic_launcher_background">#ffffff</color>
    <color name="ic_splash_background">#ffffff</color>
+
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -59,7 +59,8 @@
    <string name="account_tier_mega_fan" translatable="false">Mega Fan</string>
    <string name="account_tier_ultimate_fan" translatable="false">Ultimate Fan</string>
    <string name="settings">Settings</string>
-    <string name="settings_content_language">Preferred content language</string>
+    <string name="settings_audio_language">Audio language</string>
+    <string name="settings_subtitle_language">Subtitle language</string>
    <string name="settings_content_language_desc">English</string>
    <string name="settings_content_language_none">None</string>
    <string name="settings_prefer_subbed">Prefer subbed</string>
@ -69,6 +70,7 @@
    <string name="theme">Theme</string>
    <string name="theme_light">Light</string>
    <string name="theme_dark">Dark</string>
+    <string name="theme_system">System</string>
    <string name="dev_settings">Developer Settings</string>
    <string name="update_playhead">Playhead updates</string>
    <string name="update_playhead_desc">Update episode playhead on cr</string>
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@ -1,57 +1,6 @@
 <resources>
-    <!-- application themes -->
-    <style name="AppTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="popupMenuStyle">@style/Widget.App.PopupMenu</item>
-        <item name="searchViewStyle">@style/SearchViewStyle</item>
-    </style>

-    <style name="AppTheme.Light" parent="AppTheme">
-        <item name="themePrimary">@color/themePrimaryLight</item>
-        <item name="themeSecondary">@color/themeSecondaryLight</item>
-        <item name="textPrimary">@color/textPrimaryLight</item>
-        <item name="textSecondary">@color/textSecondaryLight</item>
-        <item name="android:textColor">@color/textPrimaryLight</item>
-        <item name="android:textColorPrimary">@color/textPrimaryLight</item>
-        <item name="android:textColorHint">@color/textSecondaryLight</item>
-        <item name="shapeTextBackground">@color/textBackgroundLight</item>
-        <item name="iconColor">@color/iconColorLight</item>
-        <item name="buttonBackground">@color/buttonBackgroundLight</item>
-    </style>
-
-    <style name="AppTheme.Dark" parent="AppTheme">
-        <item name="themePrimary">@color/themePrimaryDark</item>
-        <item name="themeSecondary">@color/themeSecondaryDark</item>
-        <item name="textPrimary">@color/textPrimaryDark</item>
-        <item name="textSecondary">@color/textSecondaryDark</item>
-        <item name="android:textColor">@color/textPrimaryDark</item>
-        <item name="android:textColorPrimary">@color/textPrimaryDark</item>
-        <item name="android:textColorHint">@color/textSecondaryDark</item>
-        <item name="shapeTextBackground">@color/textBackgroundDark</item>
-        <item name="iconColor">@color/iconColorDark</item>
-        <item name="buttonBackground">@color/buttonBackgroundDark</item>
-
-        <item name="materialAlertDialogTheme">@style/ThemeOverlay.App.MaterialAlertDialog.Dark</item>
-        <!-- change on click indicator color for manually set components -->
-        <item name="colorControlHighlight">@color/controlHighlightDark</item>
-    </style>
-
-    <!-- dialog themes -->
-    <style name="ThemeOverlay.App.MaterialAlertDialog.Dark" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorSurface">@color/themeSecondaryDark</item>
-        <item name="colorOnSurface">@color/textPrimaryDark</item>
-        <item name="android:colorControlNormal">@color/textSecondaryDark</item> <!-- Radio button unchecked-->
-        <item name="materialAlertDialogTitleTextStyle">@style/MaterialAlertDialog.App.Title.Text</item>
-    </style>
-
-    <style name="MaterialAlertDialog.App.Title.Text" parent="MaterialAlertDialog.MaterialComponents.Title.Text">
-        <item name="android:textColor">?textPrimary</item>
-    </style>
-
-    <!-- search view theme -->
+    <!-- search view style -->
    <style name="SearchViewStyle" parent="Widget.AppCompat.SearchView.ActionBar">
        <item name="iconifiedByDefault">false</item>
        <item name="searchIcon">@drawable/ic_baseline_search_24</item>
@ -79,7 +28,7 @@
        <item name="windowSplashScreenAnimationDuration">200</item>

        <!-- Set the theme of the Activity that directly follows your splash screen. -->
-        <item name="postSplashScreenTheme">@style/AppTheme.Dark</item>  # Required.
+        <item name="postSplashScreenTheme">@style/AppTheme</item> <!-- Required -->
    </style>

    <!-- shapes -->
@ -88,11 +37,6 @@
        <item name="cornerSize">5dp</item>
    </style>

-    <!-- popup menus -->
-    <style name="Widget.App.PopupMenu" parent="Widget.MaterialComponents.PopupMenu">
-        <item name="android:popupBackground">?themeSecondary</item>
-    </style>
-
    <!-- fullscreen dialog fragments -->
    <style name="FullScreenDialogStyle" parent="AppTheme">
        <item name="android:windowFullscreen">true</item>
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Widget.App.Button" parent="Widget.Material3.Button">
+        <item name="backgroundTint">@color/button_background_light</item>
+        <item name="android:textColor">@color/button_text_color_light</item>
+        <item name="iconTint">@color/button_text_color_light</item>
+    </style>
+
+    <style name="AppTheme" parent="Theme.Material3.Light.NoActionBar">
+<!--        <item name="materialButtonStyle">@style/Widget.App.Button</item>-->
+        <item name="searchViewStyle">@style/SearchViewStyle</item>
+        <item name="materialCardViewStyle">?attr/materialCardViewElevatedStyle</item>
+
+        <item name="colorPrimary">@color/seed</item>
+        <item name="colorOnPrimary">@color/md_theme_light_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/md_theme_light_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_light_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/md_theme_light_secondary</item>
+        <item name="colorOnSecondary">@color/md_theme_light_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/md_theme_light_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_light_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/md_theme_light_tertiary</item>
+        <item name="colorOnTertiary">@color/md_theme_light_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/md_theme_light_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_light_onTertiaryContainer</item>
+        <item name="colorError">@color/md_theme_light_error</item>
+        <item name="colorErrorContainer">@color/md_theme_light_errorContainer</item>
+        <item name="colorOnError">@color/md_theme_light_onError</item>
+        <item name="colorOnErrorContainer">@color/md_theme_light_onErrorContainer</item>
+        <item name="android:colorBackground">@color/md_theme_light_background</item>
+        <item name="colorOnBackground">@color/md_theme_light_onBackground</item>
+        <item name="colorSurface">@color/md_theme_light_surface</item>
+        <item name="colorOnSurface">@color/md_theme_light_onSurface</item>
+        <item name="colorSurfaceVariant">@color/md_theme_light_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_light_onSurfaceVariant</item>
+        <item name="colorOutline">@color/md_theme_light_outline</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item>
+        <item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>
+        <item name="colorPrimaryInverse">@color/md_theme_light_inversePrimary</item>
+        <item name="colorTeapodIcon">@color/button_background_light</item>
+    </style>
+</resources>
--- a/build.gradle
+++ b/build.gradle
@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.7.20"
-    ext.ktor_version = "2.2.1"
-    ext.exo_version = "2.18.2"
+    ext.kotlin_version = "1.8.22"
+    ext.ktor_version = "2.3.2"
+    ext.exo_version = "2.18.7"
    repositories {
        google()
        mavenCentral()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.1'
+        classpath 'com.android.tools.build:gradle:8.1.0'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

        // NOTE: Do not place your application dependencies here; they belong
--- a/fastlane/metadata/android/de/changelogs/100990.txt
+++ b/fastlane/metadata/android/de/changelogs/100990.txt
@ -3,7 +3,7 @@ Dies ist der erste beta Release von Teapod 1.1.
 * Unterstützung für Crunchyroll v2 API
 * Intro überspringen hinzugefügt
 * Seperaten Screen für Meine Liste
-* Dynamische SPaltenanzahl für alle Screes um große Bildschirme besser zu unterstützen
+* Dynamische Spaltenanzahl für alle Screens um große Bildschirme besser zu unterstützen
 * Kleine UI/UX Verbesserungen

 Alle Änderungen: https://git.mosad.xyz/Seil0/teapod/compare/1.0.0...1.1.0-beta1
--- a/fastlane/metadata/android/de/changelogs/100991.txt
+++ b/fastlane/metadata/android/de/changelogs/100991.txt
@ -0,0 +1,10 @@
+Dies ist der zweite beta Release von Teapod 1.1.
+
+* Neues App Design (Material Design 3)
+* Unterstützung für Crunchyroll v2 API
+* Intro überspringen hinzugefügt
+* Seperaten Screen für "Meine Liste"
+* Dynamische Spaltenanzahl für alle Screens um große Bildschirme besser zu unterstützen
+* Kleine UI/UX Verbesserungen
+
+Alle Änderungen: https://git.mosad.xyz/Seil0/teapod/compare/1.0.0...1.1.0-beta2
--- a/fastlane/metadata/android/de/changelogs/100992.txt
+++ b/fastlane/metadata/android/de/changelogs/100992.txt
@ -0,0 +1,10 @@
+Dies ist der dritte beta Release von Teapod 1.1.
+
+* Neues App Design (Material Design 3)
+* Unterstützung für Crunchyroll v2 API
+* Intro überspringen hinzugefügt
+* Seperaten Screen für "Meine Liste"
+* Dynamische Spaltenanzahl für alle Screens um große Bildschirme besser zu unterstützen
+* Kleine UI/UX Verbesserungen
+
+Alle Änderungen: https://git.mosad.xyz/Seil0/teapod/compare/1.0.0...1.1.0-beta3
--- a/fastlane/metadata/android/en-US/changelogs/100990.txt
+++ b/fastlane/metadata/android/en-US/changelogs/100990.txt
@ -3,7 +3,7 @@ This is the first beta release of Teapod 1.1.
 * Migrate crunchyroll parser to v2 (fixes crunchyroll)
 * Add skip intro function
 * Add a separate Watchlist fragment
-* Dynamically set coulmn count based on the display size
+* Dynamically set column count based on the display size
 * Minor UI/UX improvements

 Full changelog: https://git.mosad.xyz/Seil0/teapod/compare/1.0.0...1.1.0-beta1
--- a/fastlane/metadata/android/en-US/changelogs/100991.txt
+++ b/fastlane/metadata/android/en-US/changelogs/100991.txt
@ -0,0 +1,10 @@
+This is the second beta release of Teapod 1.1.
+
+* Migrate to material design 3
+* Migrate crunchyroll parser to v2 (fixes crunchyroll)
+* Add skip intro function
+* Add a separate Watchlist fragment
+* Dynamically set column count based on the display size
+* Minor UI/UX improvements
+
+Full changelog: https://git.mosad.xyz/Seil0/teapod/compare/1.0.0...1.1.0-beta2
--- a/fastlane/metadata/android/en-US/changelogs/100992.txt
+++ b/fastlane/metadata/android/en-US/changelogs/100992.txt
@ -0,0 +1,10 @@
+This is the third beta release of Teapod 1.1.
+
+* Migrate to material design 3
+* Migrate crunchyroll parser to v2 (fixes crunchyroll)
+* Add skip intro function
+* Add a separate Watchlist fragment
+* Dynamically set column count based on the display size
+* Minor UI/UX improvements
+
+Full changelog: https://git.mosad.xyz/Seil0/teapod/compare/1.0.0...1.1.0-beta3
--- a/gradle.properties
+++ b/gradle.properties
@ -19,3 +19,6 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/19
+++ b/19
@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@ -80,13 +80,10 @@ do
    esac
 done

-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@ -143,12 +140,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
    case $MAX_FD in #(
      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
        MAX_FD=$( ulimit -H -n ) ||
            warn "Could not query maximum file descriptor limit"
    esac
    case $MAX_FD in  #(
      '' | soft) :;; #(
      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
        ulimit -n "$MAX_FD" ||
            warn "Could not set maximum file descriptor limit to $MAX_FD"
    esac
@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then
    done
 fi

+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
--- a/gradlew.bat
+++ b/gradlew.bat
@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal

 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
Author	SHA1	Message	Date
Jannik	6515f657d0	partially revert `c448b44fc4`	2023-08-11 15:07:33 +02:00
Jannik	c448b44fc4	updatelibraries and agp * agp 8.0.2 -> 8.1.0 * kotlinx-coroutines-android 1.7.2 -> 1.7.3 * navigation-fragment-ktx 2.6.0 -> 2.7.0 * navigation-ui-ktx 2.6.0 -> 2.7.0	2023-08-11 14:58:17 +02:00
Jannik	88ebc378d3	add changelog for beta3; update gradle wrapper to 8.2.1	2023-08-11 14:41:55 +02:00
Jannik	1a012cba7d	add support for dedicated subtitle and audio language settings	2023-07-21 21:42:55 +02:00
Jannik	59a457430e	migrate more Crunchyroll API endpoints to v2	2023-07-21 17:22:45 +02:00
Jannik	0662d656ac	update libraries, agp and kotlin * kotlin 1.8.10 -> 1.8.22 * kotlinx-coroutines-android 1.6.4 -> 1.7.2 * kotlinx-serialization-json 1.5.0 -> 1.5.1 * core-ktx 1.10.0 -> 1.10.1 * core-splashscreen 1.0.0 -> 1.0.1 * navigation-fragment-ktx 2.5.3 -> 2.6.0 * navigation-ui-ktx 2.5.3 -> 2.6.0 * security-crypto 1.1.0-alpha05 -> 1.1.0-alpha06 * material 1.8.0 -> 1.9.0 * ktor 2.2.4 -> 2.3.2 * exo-player 2.18.5 -> 2.18.7 * agp 8.0.0 -> 8.0.2	2023-07-21 11:43:38 +02:00
Jannik	3549a3d2a7	migrate Crunchyroll.objects() to new v2 endpoint fixes #71	2023-07-21 11:39:48 +02:00
Jannik	c89ae54929	fix typo in changelog for 1.1.0-beta2	2023-04-16 16:51:59 +02:00
Jannik	3aa03783a9	add changelogs for 1.1.0-beta2	2023-04-16 16:49:09 +02:00
Jannik	4bceacf75c	make versions in DataTypes -> Episodes -> Episode nullable since it is in fact nullable	2023-04-16 16:24:28 +02:00
Jannik	cf02bee7d4	minor fixes * fix episode count in MediaFragement * fix tmdb language tag * update media type detection to use the episode field as episodeNumber may be messinging from certain episodes of tv shows	2023-04-16 13:49:22 +02:00
Jannik	01d026cc7f	update libraries, agp and gradle * core-ktx 1.9.0 -> 1.10.0 * lifecycle-runtime-ktx 2.5.1 -> 2.6.1 * lifecycle-viewmodel-ktx 2.5.1 -> 2.6.1 * glide 4.15.0 -> 4.15.1 * exoplayer 2.18.3 -> 2.18.5 * agp 7.4.2 -> 8.0.0 * gradle wrapper 7.6 -> 8.1	2023-04-16 00:06:40 +02:00
Jannik	7580093649	Merge pull request 'migrate to material 3' (#70 ) from feature/material-3 into develop Reviewed-on: #70	2023-04-15 23:51:08 +02:00
Jannik	f266731115	remove old theme definition	2023-04-15 23:50:40 +02:00
Jannik	a6a23c8560	fix onboarding colors for light/dark theme	2023-04-15 23:46:13 +02:00
Jannik	2cb05de810	fix theme selection dialog to work with system theme also use system as new default	2023-04-15 22:48:59 +02:00
Jannik	5cf4527a92	clean up color and theme definitions also use separate theme definition for light/dark	2023-04-15 22:35:19 +02:00
Jannik	14ad34138c	fix onboarding fragments and bottom sheet login	2023-04-15 22:02:49 +02:00
Jannik	47e1f6bd49	initial migration to material 3	2023-03-29 16:16:31 +02:00
Jannik	fdcb76e26e	update glide and kotlinx-serialization * glide 4.14.2 -> 4.15.0 * kotlinx-serialization 1.4.1 -> 1.5.0	2023-03-01 17:24:02 +01:00
Jannik	7004d73b9f	update libraries and kotlin * kotlin 1.7.20 -> 1.8.10 * ktor 2.2.1 -> 2.2.4 * exo player 2.18.2 -> 2.18.3 * androidx.appcompat 1.6.0 -> 1.6.1 * androidx.security:security-crypto 1.1.0-alpha04 -> 1.1.0-alpha05 * com.google.android.material 1.7.0 -> 1.8.0	2023-03-01 17:17:23 +01:00