diff --git a/app/build.gradle b/app/build.gradle
index 0bcae37978..23a622dc61 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,9 +26,6 @@ plugins {
 
     id 'kotlin-android'
     id 'kotlin-kapt'
-
-    id 'com.google.android.gms.oss-licenses-plugin'
-    id 'androidx.navigation.safeargs.kotlin'
 }
 
 play {
@@ -118,6 +115,12 @@ android {
 
     buildFeatures {
         viewBinding true
+        compose true
+    }
+
+    composeOptions {
+        kotlinCompilerVersion Libs.Kotlin.version
+        kotlinCompilerExtensionVersion Libs.AndroidX.Compose.version
     }
 
     testOptions {
@@ -163,6 +166,7 @@ dependencies {
     implementation project(':base-android')
     implementation project(':common-ui-view')
     implementation project(':common-imageloading')
+    implementation project(':common-ui-compose')
     implementation project(':data')
     implementation project(':data-android')
     implementation project(':trakt')
@@ -186,16 +190,19 @@ dependencies {
     implementation Libs.AndroidX.Lifecycle.livedata
     implementation Libs.AndroidX.Lifecycle.viewmodel
 
-    implementation Libs.AndroidX.appcompat
     implementation Libs.AndroidX.emoji
-    implementation Libs.AndroidX.constraintlayout
     implementation Libs.AndroidX.Fragment.fragmentKtx
     implementation Libs.AndroidX.Navigation.fragment
-    implementation Libs.AndroidX.Navigation.ui
 
-    implementation Libs.Mdc.material
+    implementation Libs.AndroidX.Compose.foundation
+    implementation Libs.AndroidX.Compose.ui
+    implementation Libs.AndroidX.Compose.layout
+    implementation Libs.AndroidX.Compose.material
+    implementation Libs.AndroidX.Compose.animation
+    implementation Libs.AndroidX.Compose.tooling
+    implementation Libs.AndroidX.Compose.livedata
 
-    implementation Libs.Insetter.ktx
+    implementation Libs.Accompanist.insets
 
     implementation Libs.threeTenAbp
 
@@ -215,7 +222,6 @@ dependencies {
 
     implementation Libs.Google.crashlytics
     implementation Libs.Google.analytics
-    implementation Libs.Google.openSourceLicensesLibrary
 
     debugImplementation Libs.leakCanary
 
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 24d7cd1751..af1af39614 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -24,22 +24,15 @@
     native <methods>;
 }
 
--keep public class * extends android.view.View {
+# We only need to keep ComposeView + FragmentContainerView
+-keep public class androidx.compose.ui.platform.ComposeView {
     public <init>(android.content.Context, android.util.AttributeSet);
 }
 
--keepclasseswithmembers class * {
+-keep public class androidx.fragment.app.FragmentContainerView {
     public <init>(android.content.Context, android.util.AttributeSet);
 }
 
--keepclasseswithmembers class * {
-    public <init>(android.content.Context, android.util.AttributeSet, int);
-}
-
--keepclassmembers class * extends android.app.Activity {
-   public void *(android.view.View);
-}
-
 # For enumeration classes
 -keepclassmembers enum * {
     <fields>;
diff --git a/app/src/main/java/app/tivi/home/Home.kt b/app/src/main/java/app/tivi/home/Home.kt
new file mode 100644
index 0000000000..4711e41dcc
--- /dev/null
+++ b/app/src/main/java/app/tivi/home/Home.kt
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package app.tivi.home
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.preferredHeight
+import androidx.compose.material.BottomNavigationItem
+import androidx.compose.material.Icon
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Surface
+import androidx.compose.material.Text
+import androidx.compose.material.contentColorFor
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.FavoriteBorder
+import androidx.compose.material.icons.filled.Search
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import app.tivi.R
+import app.tivi.common.compose.IconResource
+import dev.chrisbanes.accompanist.insets.navigationBarsHeight
+
+internal enum class HomeNavigation {
+    Discover,
+    Following,
+    Watched,
+    Search,
+}
+
+@Composable
+internal fun HomeBottomNavigation(
+    selectedNavigation: HomeNavigation,
+    onNavigationSelected: (HomeNavigation) -> Unit,
+    modifier: Modifier = Modifier
+) {
+    Surface(
+        color = MaterialTheme.colors.surface,
+        contentColor = contentColorFor(MaterialTheme.colors.surface),
+        elevation = 8.dp,
+        modifier = modifier
+    ) {
+        Column {
+            Row(
+                Modifier.fillMaxWidth().preferredHeight(56.dp),
+                horizontalArrangement = Arrangement.SpaceBetween,
+            ) {
+                BottomNavigationItem(
+                    icon = { IconResource(R.drawable.ic_weekend_black_24dp) },
+                    label = { Text(stringResource(R.string.discover_title)) },
+                    selected = selectedNavigation == HomeNavigation.Discover,
+                    onClick = { onNavigationSelected(HomeNavigation.Discover) },
+                )
+
+                BottomNavigationItem(
+                    icon = { Icon(Icons.Default.FavoriteBorder) },
+                    label = { Text(stringResource(R.string.following_shows_title)) },
+                    selected = selectedNavigation == HomeNavigation.Following,
+                    onClick = { onNavigationSelected(HomeNavigation.Following) },
+                )
+
+                BottomNavigationItem(
+                    icon = { IconResource(R.drawable.ic_visibility) },
+                    label = { Text(stringResource(R.string.watched_shows_title)) },
+                    selected = selectedNavigation == HomeNavigation.Watched,
+                    onClick = { onNavigationSelected(HomeNavigation.Watched) },
+                )
+
+                BottomNavigationItem(
+                    icon = { Icon(Icons.Default.Search) },
+                    label = { Text(stringResource(R.string.search_navigation_title)) },
+                    selected = selectedNavigation == HomeNavigation.Search,
+                    onClick = { onNavigationSelected(HomeNavigation.Search) },
+                )
+            }
+
+            Spacer(modifier = Modifier.navigationBarsHeight())
+        }
+    }
+}
diff --git a/app/src/main/java/app/tivi/home/MainActivity.kt b/app/src/main/java/app/tivi/home/MainActivity.kt
index 9442b13751..509d3424f8 100644
--- a/app/src/main/java/app/tivi/home/MainActivity.kt
+++ b/app/src/main/java/app/tivi/home/MainActivity.kt
@@ -18,19 +18,27 @@ package app.tivi.home
 
 import android.content.Intent
 import android.os.Bundle
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.core.view.WindowCompat
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.NavController
 import app.tivi.AppNavigator
 import app.tivi.R
 import app.tivi.TiviActivity
+import app.tivi.common.compose.shouldUseDarkColors
+import app.tivi.common.compose.theme.TiviTheme
 import app.tivi.databinding.ActivityMainBinding
+import app.tivi.extensions.MultipleBackStackNavigation
 import app.tivi.extensions.hideSoftInput
-import app.tivi.extensions.setupWithNavController
+import app.tivi.settings.TiviPreferences
 import app.tivi.trakt.TraktConstants
 import dagger.hilt.android.AndroidEntryPoint
-import dev.chrisbanes.insetter.Insetter
-import dev.chrisbanes.insetter.Side
+import dev.chrisbanes.accompanist.insets.ProvideWindowInsets
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -44,60 +52,37 @@ class MainActivity : TiviActivity() {
 
     @Inject lateinit var navigator: AppNavigator
 
+    @Inject lateinit var preferences: TiviPreferences
+
+    private var currentSelectedItem by mutableStateOf(HomeNavigation.Discover)
+
+    private lateinit var multiBackStackNavigation: MultipleBackStackNavigation
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+
         viewModel = ViewModelProvider(this).get(MainActivityViewModel::class.java)
 
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        Insetter.builder()
-            .applySystemWindowInsetsToPadding(Side.LEFT or Side.RIGHT)
-            .consumeSystemWindowInsets(Insetter.CONSUME_AUTO)
-            .applyToView(binding.root)
-
-        Insetter.builder()
-            .applySystemWindowInsetsToPadding(Side.BOTTOM)
-            .consumeSystemWindowInsets(Insetter.CONSUME_AUTO)
-            .applyToView(binding.homeBottomNavigation)
-
-        Insetter.setEdgeToEdgeSystemUiFlags(binding.homeRoot, true)
-
-        if (savedInstanceState == null) {
-            setupBottomNavigationBar()
-        }
-    }
-
-    override fun onRestoreInstanceState(savedInstanceState: Bundle) {
-        super.onRestoreInstanceState(savedInstanceState)
-        // Now that BottomNavigationBar has restored its instance state
-        // and its selectedItemId, we can proceed with setting up the
-        // BottomNavigationBar with Navigation
-        setupBottomNavigationBar()
-    }
-
-    override fun handleIntent(intent: Intent) {
-        when (intent.action) {
-            TraktConstants.INTENT_ACTION_HANDLE_AUTH_RESPONSE -> {
-                navigator.onAuthResponse(intent)
-            }
-        }
-    }
-
-    private fun setupBottomNavigationBar() {
-        currentNavController = binding.homeBottomNavigation.setupWithNavController(
-            navGraphIds = listOf(
+        multiBackStackNavigation = MultipleBackStackNavigation(
+            navGraphIds = intArrayOf(
                 R.navigation.discover_nav_graph,
-                R.navigation.watched_nav_graph,
                 R.navigation.following_nav_graph,
+                R.navigation.watched_nav_graph,
                 R.navigation.search_nav_graph
             ),
             fragmentManager = supportFragmentManager,
             containerId = R.id.home_nav_container,
-            intent = intent
+            intent = intent,
+            getSelectedItemId = { currentSelectedItem.toNavigationId() },
+            setSelectedItemId = { currentSelectedItem = navigationIdToHomeNavigation(it) },
         )
 
+        currentNavController = multiBackStackNavigation.selectedNavController
         currentNavController?.observe(this) { navController ->
             navController.addOnDestinationChangedListener { _, destination, _ ->
                 if (destination.id != R.id.navigation_search) {
@@ -105,9 +90,51 @@ class MainActivity : TiviActivity() {
                 }
             }
         }
+
+        binding.homeBottomNavigation.setContent {
+            ProvideWindowInsets {
+                TiviTheme(useDarkColors = preferences.shouldUseDarkColors()) {
+                    HomeBottomNavigation(
+                        selectedNavigation = currentSelectedItem,
+                        onNavigationSelected = { item ->
+                            if (currentSelectedItem == item) {
+                                multiBackStackNavigation.onReselected(item.toNavigationId())
+                            } else {
+                                currentSelectedItem = item
+                                multiBackStackNavigation.onItemSelected(item.toNavigationId())
+                            }
+                        },
+                        modifier = Modifier.fillMaxWidth()
+                    )
+                }
+            }
+        }
     }
 
-    override fun onSupportNavigateUp(): Boolean {
-        return currentNavController?.value?.navigateUp() ?: super.onSupportNavigateUp()
+    override fun handleIntent(intent: Intent) {
+        when (intent.action) {
+            TraktConstants.INTENT_ACTION_HANDLE_AUTH_RESPONSE -> {
+                navigator.onAuthResponse(intent)
+            }
+        }
+    }
+
+    override fun onNavigateUp(): Boolean {
+        return currentNavController?.value?.navigateUp() ?: super.onNavigateUp()
     }
 }
+
+private fun HomeNavigation.toNavigationId(): Int = when (this) {
+    HomeNavigation.Discover -> R.navigation.discover_nav_graph
+    HomeNavigation.Following -> R.navigation.following_nav_graph
+    HomeNavigation.Watched -> R.navigation.watched_nav_graph
+    HomeNavigation.Search -> R.navigation.search_nav_graph
+}
+
+private fun navigationIdToHomeNavigation(id: Int): HomeNavigation = when (id) {
+    R.navigation.discover_nav_graph -> HomeNavigation.Discover
+    R.navigation.following_nav_graph -> HomeNavigation.Following
+    R.navigation.watched_nav_graph -> HomeNavigation.Watched
+    R.navigation.search_nav_graph -> HomeNavigation.Search
+    else -> throw IllegalArgumentException("Navigation graph with id not found: $id")
+}
diff --git a/app/src/main/java/app/tivi/inject/AppModule.kt b/app/src/main/java/app/tivi/inject/AppModule.kt
index 8eb2f1b007..6372cd6011 100644
--- a/app/src/main/java/app/tivi/inject/AppModule.kt
+++ b/app/src/main/java/app/tivi/inject/AppModule.kt
@@ -18,10 +18,8 @@ package app.tivi.inject
 
 import android.app.Application
 import android.content.Context
-import androidx.navigation.ui.AppBarConfiguration
 import app.tivi.BuildConfig
 import app.tivi.extensions.withLocale
-import app.tivi.home.followed.R
 import app.tivi.tmdb.TmdbModule
 import app.tivi.trakt.TraktModule
 import app.tivi.util.AppCoroutineDispatchers
@@ -113,15 +111,6 @@ object AppModule {
         return DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT).withLocale(context)
     }
 
-    @Provides
-    @Singleton
-    fun provideAppBarConfiguration() = AppBarConfiguration.Builder(
-        R.id.navigation_followed,
-        R.id.navigation_watched,
-        R.id.navigation_discover,
-        R.id.navigation_search
-    ).build()
-
     @Provides
     @Singleton
     fun provideFirebaseCrashlytics(): FirebaseCrashlytics = FirebaseCrashlytics.getInstance()
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9950874202..18f94f273f 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -15,32 +15,23 @@
   ~
   -->
 
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/home_root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     tools:context=".home.MainActivity">
 
-    <!-- This needs to the best the first child to be able to consume insets -->
-    <com.google.android.material.bottomnavigation.BottomNavigationView
-        android:id="@+id/home_bottom_navigation"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:labelVisibilityMode="labeled"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:menu="@menu/home_bottomnav" />
-
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/home_nav_container"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@id/home_bottom_navigation"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:layout_width="match_parent"
+        android:layout_height="0px"
+        android:layout_weight="1" />
+
+    <androidx.compose.ui.platform.ComposeView
+        android:id="@+id/home_bottom_navigation"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>
diff --git a/app/src/main/res/menu/home_bottomnav.xml b/app/src/main/res/menu/home_bottomnav.xml
deleted file mode 100644
index 5f7f693bba..0000000000
--- a/app/src/main/res/menu/home_bottomnav.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2019 Google LLC
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@id/discover_nav_graph"
-        android:icon="@drawable/ic_weekend_black_24dp"
-        android:title="@string/discover_title" />
-
-    <item
-        android:id="@id/following_nav_graph"
-        android:icon="@drawable/ic_favorite"
-        android:title="@string/following_shows_title" />
-
-    <item
-        android:id="@id/watched_nav_graph"
-        android:icon="@drawable/ic_visibility"
-        android:title="@string/watched_shows_title" />
-
-    <item
-        android:id="@id/search_nav_graph"
-        android:icon="@drawable/ic_search_24dp"
-        android:title="@string/search_navigation_title" />
-
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/account_settings_nav_graph.xml b/app/src/main/res/navigation/account_settings_nav_graph.xml
index cfae7abeb5..258f45e03b 100644
--- a/app/src/main/res/navigation/account_settings_nav_graph.xml
+++ b/app/src/main/res/navigation/account_settings_nav_graph.xml
@@ -29,14 +29,9 @@
 
     </dialog>
 
-    <fragment
+    <activity
         android:id="@id/navigation_settings"
-        android:name="app.tivi.settings.SettingsFragment"
+        android:name="app.tivi.settings.SettingsActivity"
         android:label="@string/settings_title" />
 
-    <activity
-        android:id="@id/navigation_licences"
-        android:name="com.google.android.gms.oss.licenses.OssLicensesMenuActivity"
-        android:label="@string/oss_license_title" />
-
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/show_details_nav_graph.xml b/app/src/main/res/navigation/show_details_nav_graph.xml
index 4e9b323e98..0ad2f7d765 100644
--- a/app/src/main/res/navigation/show_details_nav_graph.xml
+++ b/app/src/main/res/navigation/show_details_nav_graph.xml
@@ -39,7 +39,7 @@
 
     </fragment>
 
-    <dialog
+    <fragment
         android:id="@id/navigation_episode_details"
         android:name="app.tivi.episodedetails.EpisodeDetailsFragment"
         android:label="@string/episode_navigation_title">
@@ -50,6 +50,6 @@
 
         <deepLink app:uri="app.tivi://episode/{episode_id}" />
 
-    </dialog>
+    </fragment>
 
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 0e3b6cb6a0..da16907623 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -16,15 +16,17 @@
   -->
 
 <resources>
+    <style name="Platform.Theme.Tivi" parent="android:Theme.Material" />
+
     <style name="Theme.Tivi" parent="Base.Theme.Tivi">
-        <item name="colorSurface">@color/tivi_slate_200_10pc_over_surface</item>
-        <item name="colorOnSurface">#FFFFFF</item>
+<!--        <item name="colorSurface">@color/tivi_slate_200_10pc_over_surface</item>-->
+<!--        <item name="colorOnSurface">#FFFFFF</item>-->
 
-        <item name="colorPrimary">@color/tivi_slate_200</item>
-        <item name="colorOnPrimary">#000000</item>
+<!--        <item name="colorPrimary">@color/tivi_slate_200</item>-->
+<!--        <item name="colorOnPrimary">#000000</item>-->
 
-        <item name="colorSecondary">@color/tivi_mtrl_orange_500</item>
-        <item name="colorSecondaryVariant">@color/tivi_mtrl_orange_700</item>
-        <item name="colorOnSecondary">#000000</item>
+<!--        <item name="colorSecondary">@color/tivi_mtrl_orange_500</item>-->
+<!--        <item name="colorSecondaryVariant">@color/tivi_mtrl_orange_700</item>-->
+<!--        <item name="colorOnSecondary">#000000</item>-->
     </style>
 </resources>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
deleted file mode 100644
index 371bb56e20..0000000000
--- a/app/src/main/res/values/attrs.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2018 Google, Inc.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<resources>
-    <declare-styleable name="TiviTheme">
-    </declare-styleable>
-
-    <declare-styleable name="TopLeftCutoutBackgroundView">
-        <attr name="topLeftCutSize" format="dimension" />
-        <attr name="backgroundColor" format="color" />
-    </declare-styleable>
-
-    <declare-styleable name="PopupMenuButton">
-        <attr name="menu" />
-    </declare-styleable>
-
-    <declare-styleable name="MaterialShapeConstraintLayout">
-        <attr name="materialBackgroundTopLeftRadius" format="dimension" />
-        <attr name="materialBackgroundTopRightRadius" format="dimension" />
-        <attr name="materialBackgroundColor" format="color" />
-    </declare-styleable>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles_typography.xml b/app/src/main/res/values/styles_typography.xml
deleted file mode 100644
index e2aec23990..0000000000
--- a/app/src/main/res/values/styles_typography.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2018 Google, Inc.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<resources>
-    <style name="TextAppearance.Tivi.Headline1" parent="TextAppearance.MaterialComponents.Headline1">
-        <item name="fontFamily">@font/inter_300</item>
-        <item name="android:fontFamily">@font/inter_300</item>
-        <item name="android:textSize">97.54sp</item>
-        <item name="android:letterSpacing">-0.0015</item>
-    </style>
-
-    <style name="TextAppearance.Tivi.Headline2" parent="TextAppearance.MaterialComponents.Headline2">
-        <item name="fontFamily">@font/inter_300</item>
-        <item name="android:fontFamily">@font/inter_300</item>
-        <item name="android:textSize">60.96sp</item>
-        <item name="android:letterSpacing">-0.005</item>
-    </style>
-
-    <style name="TextAppearance.Tivi.Headline3" parent="TextAppearance.MaterialComponents.Headline3">
-        <item name="fontFamily">@font/inter_400</item>
-        <item name="android:fontFamily">@font/inter_400</item>
-        <item name="android:textSize">48.77sp</item>
-        <item name="android:letterSpacing">0</item>
-    </style>
-
-    <style name="TextAppearance.Tivi.Headline4" parent="TextAppearance.MaterialComponents.Headline4">
-        <item name="fontFamily">@font/inter_400</item>
-        <item name="android:fontFamily">@font/inter_400</item>
-        <item name="android:textSize">34.54sp</item>
-        <item name="android:letterSpacing">0.0025</item>
-    </style>
-
-    <style name="TextAppearance.Tivi.Headline5" parent="TextAppearance.MaterialComponents.Headline5">
-        <item name="fontFamily">@font/inter_400</item>
-        <item name="android:fontFamily">@font/inter_400</item>
-        <item name="android:textSize">24.38sp</item>
-        <item name="android:letterSpacing">0</item>
-    </style>
-
-    <style name="TextAppearance.Tivi.Headline6" parent="TextAppearance.MaterialComponents.Headline6">
-        <item name="fontFamily">@font/inter_500</item>
-        <item name="android:fontFamily">@font/inter_500</item>
-        <item name="android:textSize">20.32sp</item>
-        <item name="android:letterSpacing">0.0025</item>
-    </style>
-
-    <style name="TextAppearance.Tivi.Body1" parent="TextAppearance.MaterialComponents.Body1">
-        <item name="fontFamily">@font/inter_400</item>
-        <item name="android:fontFamily">@font/inter_400</item>
-        <item name="android:textSize">16.26sp</item>
-        <item name="android:letterSpacing">0.005</item>
-    </style>
-
-    <style name="TextAppearance.Tivi.Body2" parent="TextAppearance.MaterialComponents.Body2">
-        <item name="fontFamily">@font/inter_400</item>
-        <item name="android:fontFamily">@font/inter_400</item>
-        <item name="android:textSize">14.22sp</item>
-        <item name="android:letterSpacing">0.0025</item>
-    </style>
-
-    <style name="TextAppearance.Tivi.Subtitle1" parent="TextAppearance.MaterialComponents.Subtitle1">
-        <item name="fontFamily">@font/inter_500</item>
-        <item name="android:fontFamily">@font/inter_500</item>
-        <item name="android:textSize">16.26sp</item>
-        <item name="android:letterSpacing">0.0015</item>
-    </style>
-
-    <style name="TextAppearance.Tivi.Subtitle2" parent="TextAppearance.MaterialComponents.Subtitle2">
-        <item name="fontFamily">@font/inter_500</item>
-        <item name="android:fontFamily">@font/inter_500</item>
-        <item name="android:textSize">14.22sp</item>
-        <item name="android:letterSpacing">0.001</item>
-    </style>
-
-    <style name="TextAppearance.Tivi.Button" parent="TextAppearance.MaterialComponents.Button">
-        <item name="fontFamily">@font/inter_500</item>
-        <item name="android:fontFamily">@font/inter_500</item>
-        <item name="android:textSize">14.22sp</item>
-        <item name="android:letterSpacing">0.0125</item>
-    </style>
-
-    <style name="TextAppearance.Tivi.Caption" parent="TextAppearance.MaterialComponents.Caption">
-        <item name="fontFamily">@font/inter_400</item>
-        <item name="android:fontFamily">@font/inter_400</item>
-        <item name="android:textSize">12.19sp</item>
-        <item name="android:letterSpacing">0.004</item>
-    </style>
-
-    <style name="TextAppearance.Tivi.Overline" parent="TextAppearance.MaterialComponents.Overline">
-        <item name="fontFamily">@font/inter_400</item>
-        <item name="android:fontFamily">@font/inter_400</item>
-        <item name="android:textSize">12.19sp</item>
-        <item name="android:letterSpacing">0.2</item>
-    </style>
-
-    <style name="TextAppearance.Tivi.PopupMenu.Header" parent="TextAppearance.Tivi.Button">
-        <item name="android:textColor">?android:attr/textColorSecondary</item>
-        <item name="android:textAllCaps">false</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 6bcfdecc26..e4c01044a3 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -18,47 +18,27 @@
 
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <style name="Platform.Theme.Tivi" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-    </style>
+    <style name="Platform.Theme.Tivi" parent="android:Theme.Material.Light" />
 
     <style name="Base.Theme.Tivi" parent="Platform.Theme.Tivi">
-        <item name="windowActionModeOverlay">true</item>
-
-        <!-- Type styles -->
-        <item name="textAppearanceHeadline1">@style/TextAppearance.Tivi.Headline1</item>
-        <item name="textAppearanceHeadline2">@style/TextAppearance.Tivi.Headline2</item>
-        <item name="textAppearanceHeadline3">@style/TextAppearance.Tivi.Headline3</item>
-        <item name="textAppearanceHeadline4">@style/TextAppearance.Tivi.Headline4</item>
-        <item name="textAppearanceHeadline5">@style/TextAppearance.Tivi.Headline5</item>
-        <item name="textAppearanceHeadline6">@style/TextAppearance.Tivi.Headline6</item>
-        <item name="textAppearanceSubtitle1">@style/TextAppearance.Tivi.Subtitle1</item>
-        <item name="textAppearanceSubtitle2">@style/TextAppearance.Tivi.Subtitle2</item>
-        <item name="textAppearanceBody1">@style/TextAppearance.Tivi.Body1</item>
-        <item name="textAppearanceBody2">@style/TextAppearance.Tivi.Body2</item>
-        <item name="textAppearanceCaption">@style/TextAppearance.Tivi.Caption</item>
-        <item name="textAppearanceButton">@style/TextAppearance.Tivi.Button</item>
-        <item name="textAppearanceOverline">@style/TextAppearance.Tivi.Overline</item>
-
-        <item name="textAppearanceLargePopupMenu">?attr/textAppearanceBody1</item>
-        <item name="textAppearanceSmallPopupMenu">?attr/textAppearanceBody2</item>
-        <item name="textAppearancePopupMenuHeader">@style/TextAppearance.Tivi.PopupMenu.Header</item>
+        <item name="android:windowActionModeOverlay">true</item>
     </style>
 
     <style name="Theme.Tivi" parent="Base.Theme.Tivi">
-        <item name="colorPrimary">@color/tivi_slate_700</item>
-        <item name="colorOnPrimary">#FFFFFF</item>
+<!--        <item name="colorPrimary">@color/tivi_slate_700</item>-->
+<!--        <item name="colorOnPrimary">#FFFFFF</item>-->
 
-        <item name="colorPrimaryVariant">@color/tivi_slate_600</item>
-        <item name="colorPrimaryDark">@color/tivi_slate_800</item>
+<!--        <item name="colorPrimaryVariant">@color/tivi_slate_600</item>-->
+<!--        <item name="colorPrimaryDark">@color/tivi_slate_800</item>-->
 
-        <item name="colorSecondary">@color/tivi_mtrl_orange_700</item>
-        <item name="colorSecondaryVariant">@color/tivi_mtrl_orange_500</item>
-        <item name="colorOnSecondary">#000000</item>
+<!--        <item name="colorSecondary">@color/tivi_mtrl_orange_700</item>-->
+<!--        <item name="colorSecondaryVariant">@color/tivi_mtrl_orange_500</item>-->
+<!--        <item name="colorOnSecondary">#000000</item>-->
     </style>
 
     <style name="Theme.Tivi.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
+        <item name="android:windowActionBar">false</item>
+        <item name="android:windowNoTitle">true</item>
     </style>
 
     <style name="Theme.Tivi.Immerse" parent="Theme.Tivi.NoActionBar">
@@ -72,6 +52,4 @@
         <item name="android:windowLightStatusBar">@bool/use_light_status_bar</item>
     </style>
 
-    <style name="Theme.Tivi.Settings" />
-
 </resources>
diff --git a/base/src/main/java/app/tivi/settings/TiviPreferences.kt b/base/src/main/java/app/tivi/settings/TiviPreferences.kt
index c182233ea9..01802beee5 100644
--- a/base/src/main/java/app/tivi/settings/TiviPreferences.kt
+++ b/base/src/main/java/app/tivi/settings/TiviPreferences.kt
@@ -16,12 +16,17 @@
 
 package app.tivi.settings
 
+import kotlinx.coroutines.flow.Flow
+
 interface TiviPreferences {
 
     fun setup()
 
-    var themePreference: Theme
+    var theme: Theme
+    fun observeTheme(): Flow<Theme>
+
     var useLessData: Boolean
+    fun observeUseLessData(): Flow<Boolean>
 
     enum class Theme {
         LIGHT,
diff --git a/build.gradle b/build.gradle
index cb4ed1beb1..2dc5dd90df 100644
--- a/build.gradle
+++ b/build.gradle
@@ -44,9 +44,6 @@ buildscript {
 
         classpath Libs.Google.gmsGoogleServices
         classpath Libs.Google.crashlyticsGradle
-        classpath Libs.Google.openSourceLicensesPlugin
-
-        classpath Libs.AndroidX.Navigation.safeArgs
 
         classpath Libs.Hilt.gradlePlugin
     }
@@ -78,6 +75,12 @@ allprojects {
 
 subprojects {
     configurations.configureEach {
+        // We forcefully exclude AppCompat + MDC from any transitive dependencies.
+        // This is a Compose app, so there's no need for these.
+        exclude group: 'androidx.appcompat', module: 'appcompat'
+        exclude group: 'com.google.android.material', module: 'material'
+        exclude group: 'com.google.android.material', module: 'material'
+
         resolutionStrategy.eachDependency { DependencyResolveDetails details ->
             def group = details.requested.group
             def module = details.requested.module.name
diff --git a/buildSrc/src/main/java/app/tivi/buildsrc/dependencies.kt b/buildSrc/src/main/java/app/tivi/buildsrc/dependencies.kt
index dffe1fdaa1..f5ad7f9534 100644
--- a/buildSrc/src/main/java/app/tivi/buildsrc/dependencies.kt
+++ b/buildSrc/src/main/java/app/tivi/buildsrc/dependencies.kt
@@ -63,21 +63,12 @@ object Libs {
         const val insets = "dev.chrisbanes.accompanist:accompanist-insets:$version"
     }
 
-    object Mdc {
-        const val material = "com.google.android.material:material:1.1.0"
-        // const val composeThemeAdapter = "com.google.android.material:compose-theme-adapter:1.0.0-alpha07"
-        const val composeThemeAdapter = "com.github.material-components:material-components-android-compose-theme-adapter:dev_alpha08-SNAPSHOT"
-    }
-
     object Google {
         const val crashlytics = "com.google.firebase:firebase-crashlytics-ktx:17.2.2"
         const val analytics = "com.google.firebase:firebase-analytics-ktx:17.6.0"
         const val crashlyticsGradle = "com.google.firebase:firebase-crashlytics-gradle:2.3.0"
 
         const val gmsGoogleServices = "com.google.gms:google-services:4.3.4"
-
-        const val openSourceLicensesPlugin = "com.google.android.gms:oss-licenses-plugin:0.10.2"
-        const val openSourceLicensesLibrary = "com.google.android.gms:play-services-oss-licenses:17.0.0"
     }
 
     object Kotlin {
@@ -95,7 +86,6 @@ object Libs {
     }
 
     object AndroidX {
-        const val appcompat = "androidx.appcompat:appcompat:1.3.0-alpha02"
         const val browser = "androidx.browser:browser:1.0.0"
         const val collection = "androidx.collection:collection-ktx:1.1.0"
         const val palette = "androidx.palette:palette:1.0.0"
@@ -104,8 +94,6 @@ object Libs {
         object Navigation {
             private const val version = "2.3.1"
             const val fragment = "androidx.navigation:navigation-fragment-ktx:$version"
-            const val ui = "androidx.navigation:navigation-ui-ktx:$version"
-            const val safeArgs = "androidx.navigation:navigation-safe-args-gradle-plugin:$version"
         }
 
         object Fragment {
@@ -140,15 +128,11 @@ object Libs {
             const val compose = "androidx.paging:paging-compose:1.0.0-alpha02"
         }
 
-        const val preference = "androidx.preference:preference:1.1.1"
-
-        const val constraintlayout = "androidx.constraintlayout:constraintlayout:2.0.2"
-
         const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha04"
 
         object Lifecycle {
             private const val version = "2.3.0-beta01"
-            const val extensions = "androidx.lifecycle:lifecycle-extensions:$version"
+            const val runtime = "androidx.lifecycle:lifecycle-runtime-ktx:$version"
             const val livedata = "androidx.lifecycle:lifecycle-livedata-ktx:$version"
             const val viewmodel = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
         }
diff --git a/common-ui-compose/build.gradle b/common-ui-compose/build.gradle
index c880b31619..e65a457262 100644
--- a/common-ui-compose/build.gradle
+++ b/common-ui-compose/build.gradle
@@ -65,9 +65,6 @@ dependencies {
 
     implementation Libs.AndroidX.Paging.runtime
 
-    implementation Libs.Mdc.material
-    implementation Libs.Mdc.composeThemeAdapter
-
     implementation Libs.Kotlin.stdlib
 
     implementation Libs.Accompanist.coil
diff --git a/common-ui-compose/src/main/java/app/tivi/common/compose/TiviPreferenceExtensions.kt b/common-ui-compose/src/main/java/app/tivi/common/compose/TiviPreferenceExtensions.kt
new file mode 100644
index 0000000000..db62bdc267
--- /dev/null
+++ b/common-ui-compose/src/main/java/app/tivi/common/compose/TiviPreferenceExtensions.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package app.tivi.common.compose
+
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import app.tivi.settings.TiviPreferences
+
+@Composable
+fun TiviPreferences.shouldUseDarkColors(): Boolean {
+    val themePreference = observeTheme().collectAsState(initial = TiviPreferences.Theme.SYSTEM)
+    return when (themePreference.value) {
+        TiviPreferences.Theme.LIGHT -> false
+        TiviPreferences.Theme.DARK -> true
+        else -> isSystemInDarkTheme()
+    }
+}
diff --git a/common-ui-compose/src/main/java/app/tivi/common/compose/theme/Color.kt b/common-ui-compose/src/main/java/app/tivi/common/compose/theme/Color.kt
new file mode 100644
index 0000000000..057a063965
--- /dev/null
+++ b/common-ui-compose/src/main/java/app/tivi/common/compose/theme/Color.kt
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package app.tivi.common.compose.theme
+
+import androidx.compose.material.Colors
+import androidx.compose.material.darkColors
+import androidx.compose.material.lightColors
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.compositeOver
+
+/**
+ * Return the fully opaque color that results from compositing [onSurface] atop [surface] with the
+ * given [alpha]. Useful for situations where semi-transparent colors are undesirable.
+ */
+fun Colors.compositedOnSurface(alpha: Float): Color {
+    return onSurface.copy(alpha = alpha).compositeOver(surface)
+}
+
+private val Slate200 = Color(0xFF81A9B3)
+private val Slate600 = Color(0xFF4A6572)
+private val Slate800 = Color(0xFF232F34)
+
+private val Orange500 = Color(0xFFF9AA33)
+private val Orange700 = Color(0xFFC78522)
+
+val TiviLightColors = lightColors(
+    primary = Slate800,
+    onPrimary = Color.White,
+    primaryVariant = Slate600,
+    secondary = Orange700,
+    secondaryVariant = Orange500,
+    onSecondary = Color.Black,
+)
+
+val TiviDarkColors = darkColors(
+    primary = Slate200,
+    onPrimary = Color.Black,
+    secondary = Orange500,
+    onSecondary = Color.Black,
+).withBrandedSurface()
+
+fun Colors.withBrandedSurface() = copy(
+    surface = primary.copy(alpha = 0.08f).compositeOver(this.surface),
+)
diff --git a/common-ui-compose/src/main/java/app/tivi/common/compose/TiviSetup.kt b/common-ui-compose/src/main/java/app/tivi/common/compose/theme/Shape.kt
similarity index 63%
rename from common-ui-compose/src/main/java/app/tivi/common/compose/TiviSetup.kt
rename to common-ui-compose/src/main/java/app/tivi/common/compose/theme/Shape.kt
index 7749d7f62a..9a7d009b68 100644
--- a/common-ui-compose/src/main/java/app/tivi/common/compose/TiviSetup.kt
+++ b/common-ui-compose/src/main/java/app/tivi/common/compose/theme/Shape.kt
@@ -14,19 +14,11 @@
  * limitations under the License.
  */
 
-@file:Suppress("NOTHING_TO_INLINE")
+package app.tivi.common.compose.theme
 
-package app.tivi.common.compose
-
-import androidx.compose.runtime.Composable
-import com.google.android.material.composethemeadapter.MdcTheme
+import androidx.compose.material.Shapes
 
 /**
- * Just groups some common Compose content setup
+ * We intentionally use the defaults for now.
  */
-@Composable
-inline fun TiviContentSetup(noinline content: @Composable () -> Unit) {
-    MdcTheme {
-        content()
-    }
-}
+val TiviShapes = Shapes()
diff --git a/common-ui-compose/src/main/java/app/tivi/common/compose/theme/Theme.kt b/common-ui-compose/src/main/java/app/tivi/common/compose/theme/Theme.kt
new file mode 100644
index 0000000000..d7ea73d49c
--- /dev/null
+++ b/common-ui-compose/src/main/java/app/tivi/common/compose/theme/Theme.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package app.tivi.common.compose.theme
+
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material.MaterialTheme
+import androidx.compose.runtime.Composable
+
+@Composable
+fun TiviTheme(
+    useDarkColors: Boolean = isSystemInDarkTheme(),
+    content: @Composable () -> Unit
+) {
+    MaterialTheme(
+        colors = if (useDarkColors) TiviDarkColors else TiviLightColors,
+        typography = TiviTypography,
+        shapes = TiviShapes,
+        content = content
+    )
+}
diff --git a/common-ui-compose/src/main/java/app/tivi/common/compose/theme/Type.kt b/common-ui-compose/src/main/java/app/tivi/common/compose/theme/Type.kt
new file mode 100644
index 0000000000..894ab20617
--- /dev/null
+++ b/common-ui-compose/src/main/java/app/tivi/common/compose/theme/Type.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package app.tivi.common.compose.theme
+
+import androidx.compose.material.Typography
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.font.font
+import androidx.compose.ui.text.font.fontFamily
+import app.tivi.common.compose.R
+
+private val Inter = fontFamily(
+    font(R.font.inter_300, FontWeight.Light),
+    font(R.font.inter_400, FontWeight.Normal),
+    font(R.font.inter_500, FontWeight.Medium),
+    font(R.font.inter_700, FontWeight.Bold)
+)
+
+val TiviTypography = Typography(defaultFontFamily = Inter)
diff --git a/common-ui-resources/build.gradle b/common-ui-resources/build.gradle
index eb76fd5f52..d46abce1ae 100644
--- a/common-ui-resources/build.gradle
+++ b/common-ui-resources/build.gradle
@@ -26,9 +26,4 @@ android {
     defaultConfig {
         minSdkVersion buildConfig.minSdk
     }
-}
-
-dependencies {
-    implementation Libs.AndroidX.appcompat
-    implementation Libs.Mdc.material
 }
\ No newline at end of file
diff --git a/common-ui-resources/src/main/res/drawable/ic_calendar_today.xml b/common-ui-resources/src/main/res/drawable/ic_calendar_today.xml
index fc49503916..d6d96cfaa3 100644
--- a/common-ui-resources/src/main/res/drawable/ic_calendar_today.xml
+++ b/common-ui-resources/src/main/res/drawable/ic_calendar_today.xml
@@ -19,7 +19,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:tint="?android:attr/colorControlNormal">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M20,3h-1L19,1h-2v2L7,3L7,1L5,1v2L4,3c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,5c0,-1.1 -0.9,-2 -2,-2zM20,21L4,21L4,8h16v13z"/>
diff --git a/common-ui-resources/src/main/res/drawable/ic_cloud_upload.xml b/common-ui-resources/src/main/res/drawable/ic_cloud_upload.xml
index 7efb53a506..09ddb17ae4 100644
--- a/common-ui-resources/src/main/res/drawable/ic_cloud_upload.xml
+++ b/common-ui-resources/src/main/res/drawable/ic_cloud_upload.xml
@@ -15,7 +15,7 @@
   -->
 
 <vector android:autoMirrored="true" android:height="24dp"
-    android:tint="?attr/colorControlNormal" android:viewportHeight="24"
+    android:tint="?android:attr/colorControlNormal" 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="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM14,13v4h-4v-4H7l5,-5 5,5h-3z"/>
 </vector>
diff --git a/common-ui-resources/src/main/res/drawable/ic_delete_sweep.xml b/common-ui-resources/src/main/res/drawable/ic_delete_sweep.xml
index 5c955685af..9f2ed3a40a 100644
--- a/common-ui-resources/src/main/res/drawable/ic_delete_sweep.xml
+++ b/common-ui-resources/src/main/res/drawable/ic_delete_sweep.xml
@@ -19,7 +19,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:tint="?android:attr/colorControlNormal">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M15,16h4v2h-4zM15,8h7v2h-7zM15,12h6v2h-6zM3,18c0,1.1 0.9,2 2,2h6c1.1,0 2,-0.9 2,-2L13,8L3,8v10zM14,5h-3l-1,-1L6,4L5,5L2,5v2h12z"/>
diff --git a/common-ui-resources/src/main/res/drawable/ic_favorite.xml b/common-ui-resources/src/main/res/drawable/ic_favorite.xml
index 9621cee89e..d7cff68627 100644
--- a/common-ui-resources/src/main/res/drawable/ic_favorite.xml
+++ b/common-ui-resources/src/main/res/drawable/ic_favorite.xml
@@ -17,7 +17,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
+    android:tint="?android:attr/colorControlNormal"
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
     <path
diff --git a/common-ui-resources/src/main/res/drawable/ic_favorite_outline.xml b/common-ui-resources/src/main/res/drawable/ic_favorite_outline.xml
index ad461f796f..bb9eee13b0 100644
--- a/common-ui-resources/src/main/res/drawable/ic_favorite_outline.xml
+++ b/common-ui-resources/src/main/res/drawable/ic_favorite_outline.xml
@@ -17,7 +17,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
+    android:tint="?android:attr/colorControlNormal"
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
     <path
diff --git a/common-ui-resources/src/main/res/drawable/ic_publish.xml b/common-ui-resources/src/main/res/drawable/ic_publish.xml
index c185085508..6bdeb8131b 100644
--- a/common-ui-resources/src/main/res/drawable/ic_publish.xml
+++ b/common-ui-resources/src/main/res/drawable/ic_publish.xml
@@ -19,7 +19,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:tint="?android:attr/colorControlNormal">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M5,4v2h14L19,4L5,4zM5,14h4v6h6v-6h4l-7,-7 -7,7z"/>
diff --git a/common-ui-resources/src/main/res/drawable/ic_search_24dp.xml b/common-ui-resources/src/main/res/drawable/ic_search_24dp.xml
index cb97efb180..5f1b02009a 100644
--- a/common-ui-resources/src/main/res/drawable/ic_search_24dp.xml
+++ b/common-ui-resources/src/main/res/drawable/ic_search_24dp.xml
@@ -20,7 +20,7 @@
     android:autoMirrored="true"
     android:viewportHeight="24.0"
     android:viewportWidth="24.0"
-    android:tint="?attr/colorControlNormal">
+    android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="#FF000000"
         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" />
diff --git a/common-ui-resources/src/main/res/drawable/ic_sort_black_24dp.xml b/common-ui-resources/src/main/res/drawable/ic_sort_black_24dp.xml
index 194891e4a6..bceec8b3f4 100644
--- a/common-ui-resources/src/main/res/drawable/ic_sort_black_24dp.xml
+++ b/common-ui-resources/src/main/res/drawable/ic_sort_black_24dp.xml
@@ -17,7 +17,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
+    android:tint="?android:attr/colorControlNormal"
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
     <path
diff --git a/common-ui-resources/src/main/res/drawable/ic_visibility_off.xml b/common-ui-resources/src/main/res/drawable/ic_visibility_off.xml
index 327d12bd59..6da041a3fa 100644
--- a/common-ui-resources/src/main/res/drawable/ic_visibility_off.xml
+++ b/common-ui-resources/src/main/res/drawable/ic_visibility_off.xml
@@ -15,7 +15,7 @@
   -->
 
 <vector android:autoMirrored="true" android:height="24dp"
-    android:tint="?attr/colorControlNormal" android:viewportHeight="24"
+    android:tint="?android:attr/colorControlNormal" 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="M12,7c2.76,0 5,2.24 5,5 0,0.65 -0.13,1.26 -0.36,1.83l2.92,2.92c1.51,-1.26 2.7,-2.89 3.43,-4.75 -1.73,-4.39 -6,-7.5 -11,-7.5 -1.4,0 -2.74,0.25 -3.98,0.7l2.16,2.16C10.74,7.13 11.35,7 12,7zM2,4.27l2.28,2.28 0.46,0.46C3.08,8.3 1.78,10.02 1,12c1.73,4.39 6,7.5 11,7.5 1.55,0 3.03,-0.3 4.38,-0.84l0.42,0.42L19.73,22 21,20.73 3.27,3 2,4.27zM7.53,9.8l1.55,1.55c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.66 1.34,3 3,3 0.22,0 0.44,-0.03 0.65,-0.08l1.55,1.55c-0.67,0.33 -1.41,0.53 -2.2,0.53 -2.76,0 -5,-2.24 -5,-5 0,-0.79 0.2,-1.53 0.53,-2.2zM11.84,9.02l3.15,3.15 0.02,-0.16c0,-1.66 -1.34,-3 -3,-3l-0.17,0.01z"/>
 </vector>
diff --git a/common-ui-view/build.gradle b/common-ui-view/build.gradle
index ec5103036f..195c1cb2c6 100644
--- a/common-ui-view/build.gradle
+++ b/common-ui-view/build.gradle
@@ -44,14 +44,10 @@ dependencies {
 
     implementation Libs.Coroutines.core
 
-    api Libs.AndroidX.appcompat
     implementation Libs.AndroidX.coreKtx
     implementation Libs.AndroidX.Fragment.fragment
     implementation Libs.AndroidX.Fragment.fragmentKtx
     implementation Libs.AndroidX.Navigation.fragment
-    implementation Libs.AndroidX.Navigation.ui
 
     implementation Libs.Hilt.library
-
-    api Libs.Mdc.material
 }
\ No newline at end of file
diff --git a/common-ui-view/src/main/java/app/tivi/TiviActivity.kt b/common-ui-view/src/main/java/app/tivi/TiviActivity.kt
index 5e8790deb6..80c70fdf2e 100644
--- a/common-ui-view/src/main/java/app/tivi/TiviActivity.kt
+++ b/common-ui-view/src/main/java/app/tivi/TiviActivity.kt
@@ -19,9 +19,9 @@ package app.tivi
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.FragmentActivity
 
-abstract class TiviActivity : AppCompatActivity() {
+abstract class TiviActivity : FragmentActivity() {
 
     override fun onPostCreate(savedInstanceState: Bundle?) {
         super.onPostCreate(savedInstanceState)
diff --git a/common-ui-view/src/main/java/app/tivi/extensions/MultipleBackStackNavigationExtensions.kt b/common-ui-view/src/main/java/app/tivi/extensions/MultipleBackStackNavigationExtensions.kt
index 3212fc055b..3f08114b26 100644
--- a/common-ui-view/src/main/java/app/tivi/extensions/MultipleBackStackNavigationExtensions.kt
+++ b/common-ui-view/src/main/java/app/tivi/extensions/MultipleBackStackNavigationExtensions.kt
@@ -26,169 +26,130 @@ import androidx.lifecycle.MutableLiveData
 import androidx.navigation.NavController
 import androidx.navigation.fragment.NavHostFragment
 import app.tivi.common.ui.R
-import com.google.android.material.bottomnavigation.BottomNavigationView
-
-/**
- * Manages the various graphs needed for a [BottomNavigationView].
- *
- * This sample is a workaround until the Navigation Component supports multiple back stacks.
- */
-fun BottomNavigationView.setupWithNavController(
-    navGraphIds: List<Int>,
-    fragmentManager: FragmentManager,
-    containerId: Int,
-    intent: Intent
-): LiveData<NavController> {
 
+class MultipleBackStackNavigation(
+    private val navGraphIds: IntArray,
+    private val fragmentManager: FragmentManager,
+    private val containerId: Int,
+    private val intent: Intent,
+    private val getSelectedItemId: () -> Int,
+    private val setSelectedItemId: (Int) -> Unit,
+) {
     // Map of tags
-    val graphIdToTagMap = SparseArray<String>()
-    // Result. Mutable live data with the selected controlled
-    val selectedNavController = MutableLiveData<NavController>()
+    private val graphIdToTagMap = SparseArray<String>()
 
-    var firstFragmentGraphId = 0
-
-    // First create a NavHostFragment for each NavGraph ID
-    navGraphIds.forEachIndexed { index, navGraphId ->
-        val fragmentTag = getFragmentTag(index)
+    // Result. Mutable live data with the selected controlled
+    private val _selectedNavController = MutableLiveData<NavController>()
 
-        // Find or create the Navigation host fragment
-        val navHostFragment = obtainNavHostFragment(
-            fragmentManager,
-            fragmentTag,
-            navGraphId,
-            containerId
-        )
+    val selectedNavController: LiveData<NavController>
+        get() = _selectedNavController
 
-        // Obtain its id
-        val graphId = navHostFragment.navController.graph.id
+    private var firstFragmentGraphId = 0
+    private val firstFragmentTag: String
 
-        if (index == 0) {
-            firstFragmentGraphId = graphId
+    // Now connect selecting an item with swapping Fragments
+    private var selectedItemTag: String
+    private var isOnFirstFragment: Boolean
+
+    init {
+        val currentSelectedId = getSelectedItemId()
+
+        // First create a NavHostFragment for each NavGraph ID
+        navGraphIds.forEachIndexed { index, navGraphId ->
+            val fragmentTag = getFragmentTag(index)
+
+            // Find or create the Navigation host fragment
+            val navHostFragment = obtainNavHostFragment(
+                fragmentManager,
+                fragmentTag,
+                navGraphId,
+                containerId,
+            )
+
+            if (index == 0) firstFragmentGraphId = navGraphId
+
+            // Save to the map
+            graphIdToTagMap[navGraphId] = fragmentTag
+
+            // Attach or detach nav host fragment depending on whether it's the selected item.
+            if (currentSelectedId == navGraphId) {
+                // Update livedata with the selected graph
+                _selectedNavController.value = navHostFragment.navController
+                attachNavHostFragment(fragmentManager, navHostFragment, index == 0)
+            } else {
+                detachNavHostFragment(fragmentManager, navHostFragment)
+            }
         }
 
-        // Save to the map
-        graphIdToTagMap[graphId] = fragmentTag
-
-        // Attach or detach nav host fragment depending on whether it's the selected item.
-        if (this.selectedItemId == graphId) {
-            // Update livedata with the selected graph
-            selectedNavController.value = navHostFragment.navController
-            attachNavHostFragment(fragmentManager, navHostFragment, index == 0)
-        } else {
-            detachNavHostFragment(fragmentManager, navHostFragment)
-        }
-    }
+        selectedItemTag = graphIdToTagMap[currentSelectedId]
+        firstFragmentTag = graphIdToTagMap[firstFragmentGraphId]
+        isOnFirstFragment = selectedItemTag == firstFragmentTag
 
-    // Now connect selecting an item with swapping Fragments
-    var selectedItemTag = graphIdToTagMap[this.selectedItemId]
-    val firstFragmentTag = graphIdToTagMap[firstFragmentGraphId]
-    var isOnFirstFragment = selectedItemTag == firstFragmentTag
+        // Finally, ensure that we update our BottomNavigationView when the back stack changes
+        fragmentManager.addOnBackStackChangedListener {
+            if (!isOnFirstFragment && !fragmentManager.isOnBackStack(firstFragmentTag)) {
+                setSelectedItemId(firstFragmentGraphId)
+            }
 
-    // When a navigation item is selected
-    setOnNavigationItemSelectedListener { item ->
-        // Don't do anything if the state is state has already been saved.
-        if (fragmentManager.isStateSaved) {
-            false
-        } else {
-            val newlySelectedItemTag = graphIdToTagMap[item.itemId]
-            if (selectedItemTag != newlySelectedItemTag) {
-                // Pop everything above the first fragment (the "fixed start destination")
-                fragmentManager.popBackStack(
-                    firstFragmentTag,
-                    FragmentManager.POP_BACK_STACK_INCLUSIVE
-                )
-                val selectedFragment = fragmentManager.findFragmentByTag(newlySelectedItemTag)
-                    as NavHostFragment
-
-                // Exclude the first fragment tag because it's always in the back stack.
-                if (firstFragmentTag != newlySelectedItemTag) {
-                    // Commit a transaction that cleans the back stack and adds the first fragment
-                    // to it, creating the fixed started destination.
-                    fragmentManager.beginTransaction()
-                        .setCustomAnimations(
-                            R.anim.tivi_enter_anim,
-                            R.anim.tivi_exit_anim,
-                            R.anim.tivi_pop_enter_anim,
-                            R.anim.tivi_pop_exit_anim
-                        )
-                        .attach(selectedFragment)
-                        .setPrimaryNavigationFragment(selectedFragment)
-                        .apply {
-                            // Detach all other Fragments
-                            graphIdToTagMap.forEach { _, fragmentTagIter ->
-                                if (fragmentTagIter != newlySelectedItemTag) {
-                                    detach(fragmentManager.findFragmentByTag(firstFragmentTag)!!)
-                                }
-                            }
-                        }
-                        .addToBackStack(firstFragmentTag)
-                        .setReorderingAllowed(true)
-                        .commit()
+            // Reset the graph if the currentDestination is not valid (happens when the back
+            // stack is popped after using the back button).
+            selectedNavController.value?.let { controller ->
+                if (controller.currentDestination == null) {
+                    controller.navigate(controller.graph.id)
                 }
-                selectedItemTag = newlySelectedItemTag
-                isOnFirstFragment = selectedItemTag == firstFragmentTag
-                selectedNavController.value = selectedFragment.navController
-                true
-            } else {
-                false
             }
         }
+
+        setupDeepLinks()
     }
 
-    // Optional: on item reselected, pop back stack to the destination of the graph
-    setupItemReselected(graphIdToTagMap, fragmentManager)
+    fun onItemSelected(itemId: Int): Boolean {
+        // Don't do anything if the state is state has already been saved.
+        if (fragmentManager.isStateSaved) return false
 
-    // Handle deep link
-    setupDeepLinks(navGraphIds, fragmentManager, containerId, intent)
+        val newlySelectedItemTag = graphIdToTagMap[itemId]
+        if (selectedItemTag == newlySelectedItemTag) return false
 
-    // Finally, ensure that we update our BottomNavigationView when the back stack changes
-    fragmentManager.addOnBackStackChangedListener {
-        if (!isOnFirstFragment && !fragmentManager.isOnBackStack(firstFragmentTag)) {
-            this.selectedItemId = firstFragmentGraphId
-        }
+        // Pop everything above the first fragment (the "fixed start destination")
+        fragmentManager.popBackStack(firstFragmentTag, FragmentManager.POP_BACK_STACK_INCLUSIVE)
 
-        // Reset the graph if the currentDestination is not valid (happens when the back
-        // stack is popped after using the back button).
-        selectedNavController.value?.let { controller ->
-            if (controller.currentDestination == null) {
-                controller.navigate(controller.graph.id)
-            }
-        }
-    }
-    return selectedNavController
-}
+        val selectedFragment = fragmentManager.findFragmentByTag(newlySelectedItemTag)
+            as NavHostFragment
 
-private fun BottomNavigationView.setupDeepLinks(
-    navGraphIds: List<Int>,
-    fragmentManager: FragmentManager,
-    containerId: Int,
-    intent: Intent
-) {
-    navGraphIds.forEachIndexed { index, navGraphId ->
-        val fragmentTag = getFragmentTag(index)
-
-        // Find or create the Navigation host fragment
-        val navHostFragment = obtainNavHostFragment(
-            fragmentManager,
-            fragmentTag,
-            navGraphId,
-            containerId
-        )
-        // Handle Intent
-        if (navHostFragment.navController.handleDeepLink(intent) &&
-            selectedItemId != navHostFragment.navController.graph.id
-        ) {
-            this.selectedItemId = navHostFragment.navController.graph.id
+        // Exclude the first fragment tag because it's always in the back stack.
+        if (firstFragmentTag != newlySelectedItemTag) {
+            // Commit a transaction that cleans the back stack and adds the first fragment
+            // to it, creating the fixed started destination.
+            fragmentManager.beginTransaction()
+                .setCustomAnimations(
+                    R.anim.tivi_fade_enter,
+                    R.anim.tivi_fade_exit,
+                    R.anim.tivi_fade_enter,
+                    R.anim.tivi_fade_exit
+                )
+                .attach(selectedFragment)
+                .setPrimaryNavigationFragment(selectedFragment)
+                .apply {
+                    // Detach all other Fragments
+                    graphIdToTagMap.forEach { _, fragmentTagIter ->
+                        if (fragmentTagIter != newlySelectedItemTag) {
+                            detach(fragmentManager.findFragmentByTag(firstFragmentTag)!!)
+                        }
+                    }
+                }
+                .addToBackStack(firstFragmentTag)
+                .setReorderingAllowed(true)
+                .commit()
         }
+        selectedItemTag = newlySelectedItemTag
+        isOnFirstFragment = selectedItemTag == firstFragmentTag
+        _selectedNavController.value = selectedFragment.navController
+
+        return true
     }
-}
 
-private fun BottomNavigationView.setupItemReselected(
-    graphIdToTagMap: SparseArray<String>,
-    fragmentManager: FragmentManager
-) {
-    setOnNavigationItemReselectedListener { item ->
-        val newlySelectedItemTag = graphIdToTagMap[item.itemId]
+    fun onReselected(itemId: Int) {
+        val newlySelectedItemTag = graphIdToTagMap[itemId]
         val selectedFragment = fragmentManager.findFragmentByTag(newlySelectedItemTag)
             as NavHostFragment
         val navController = selectedFragment.navController
@@ -198,6 +159,24 @@ private fun BottomNavigationView.setupItemReselected(
             false
         )
     }
+
+    private fun setupDeepLinks() {
+        navGraphIds.forEachIndexed { index, navGraphId ->
+            val fragmentTag = getFragmentTag(index)
+
+            // Find or create the Navigation host fragment
+            val navHostFragment = obtainNavHostFragment(
+                fragmentManager,
+                fragmentTag,
+                navGraphId,
+                containerId
+            )
+            // Handle Intent
+            if (navHostFragment.navController.handleDeepLink(intent)) {
+                setSelectedItemId(navHostFragment.navController.graph.id)
+            }
+        }
+    }
 }
 
 private fun detachNavHostFragment(
diff --git a/common-ui-view/src/main/java/app/tivi/extensions/NavigationExtensions.kt b/common-ui-view/src/main/java/app/tivi/extensions/NavigationExtensions.kt
index 9fd0234d60..28dd6cd2d0 100644
--- a/common-ui-view/src/main/java/app/tivi/extensions/NavigationExtensions.kt
+++ b/common-ui-view/src/main/java/app/tivi/extensions/NavigationExtensions.kt
@@ -19,6 +19,7 @@ package app.tivi.extensions
 import androidx.navigation.NavController
 import androidx.navigation.NavDestination
 import androidx.navigation.NavGraph
+import androidx.navigation.NavOptions
 import androidx.navigation.navOptions
 import app.tivi.common.ui.R
 
@@ -26,10 +27,10 @@ fun NavController.navigateToNavDestination(itemId: Int, popUpToStart: Boolean =
     val options = navOptions {
         launchSingleTop = true
         anim {
-            enter = R.anim.tivi_enter_anim
-            exit = R.anim.tivi_exit_anim
-            popEnter = R.anim.tivi_pop_enter_anim
-            popExit = R.anim.tivi_pop_exit_anim
+            enter = R.anim.tivi_fade_enter
+            exit = R.anim.tivi_fade_exit
+            popEnter = R.anim.tivi_fade_enter
+            popExit = R.anim.tivi_fade_exit
         }
         if (popUpToStart) {
             popUpTo(graph.findStartDestination().id) {
@@ -55,3 +56,12 @@ private fun NavGraph.findStartDestination(): NavDestination {
     }
     return startDestination
 }
+
+val DefaultNavOptions: NavOptions = navOptions {
+    anim {
+        enter = R.anim.tivi_fade_scale_enter
+        exit = R.anim.tivi_fade_exit
+        popEnter = 0
+        popExit = R.anim.tivi_fade_scale_exit
+    }
+}
diff --git a/common-ui-view/src/main/java/app/tivi/home/HomeTextCreator.kt b/common-ui-view/src/main/java/app/tivi/home/HomeTextCreator.kt
index b794207cbe..aa6ac73387 100644
--- a/common-ui-view/src/main/java/app/tivi/home/HomeTextCreator.kt
+++ b/common-ui-view/src/main/java/app/tivi/home/HomeTextCreator.kt
@@ -17,54 +17,27 @@
 package app.tivi.home
 
 import android.content.Context
-import android.content.res.Resources
-import android.graphics.Typeface
-import androidx.core.content.res.ResourcesCompat
-import androidx.core.text.buildSpannedString
-import androidx.core.text.inSpans
 import androidx.core.text.parseAsHtml
 import app.tivi.common.ui.R
 import app.tivi.data.entities.TiviShow
-import app.tivi.ui.text.TypefaceSpan
-import app.tivi.ui.text.textAppearanceSpanForAttribute
 import dagger.hilt.android.qualifiers.ActivityContext
 import javax.inject.Inject
 
 class HomeTextCreator @Inject constructor(
     @ActivityContext private val context: Context
 ) {
-    private var bodyTypeface: Typeface = Typeface.DEFAULT
-        get() {
-            if (field == Typeface.DEFAULT) {
-                try {
-                    ResourcesCompat.getFont(context, R.font.inter_400)?.also { field = it }
-                } catch (nfe: Resources.NotFoundException) {
-                    // getFont will throw a NFE if the device if offline or doesn't have
-                    // Play Services. Lets not crash
-                }
-            }
-            return field
-        }
-
-    @JvmOverloads
     fun showTitle(
-        context: Context = this.context,
         show: TiviShow
-    ): CharSequence = buildSpannedString {
-        append(show.title)
-
-        show.firstAired?.also { firstAired ->
-            append(" ")
-            inSpans(
-                textAppearanceSpanForAttribute(context, R.attr.textAppearanceCaption),
-                TypefaceSpan(bodyTypeface)
-            ) {
+    ): CharSequence = StringBuilder()
+        .append(show.title)
+        .apply {
+            show.firstAired?.also { firstAired ->
+                append(" ")
                 append("(")
                 append(firstAired.year.toString())
                 append(")")
             }
-        }
-    }
+        }.toString()
 
     fun showHeaderCount(count: Int, filtered: Boolean = false): CharSequence = when {
         filtered -> context.resources.getQuantityString(R.plurals.header_show_count_filtered, count, count)
diff --git a/common-ui-view/src/main/res/anim/tivi_pop_enter_anim.xml b/common-ui-view/src/main/res/anim/tivi_enter_bottom_anim.xml
similarity index 69%
rename from common-ui-view/src/main/res/anim/tivi_pop_enter_anim.xml
rename to common-ui-view/src/main/res/anim/tivi_enter_bottom_anim.xml
index bce0d2f741..7a14530b13 100644
--- a/common-ui-view/src/main/res/anim/tivi_pop_enter_anim.xml
+++ b/common-ui-view/src/main/res/anim/tivi_enter_bottom_anim.xml
@@ -15,10 +15,15 @@
   ~ limitations under the License.
   -->
 
-<set xmlns:android="http://schemas.android.com/apk/res/android">
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@integer/nav_anim_duration"
+    android:interpolator="@android:interpolator/fast_out_slow_in">
+
+    <translate
+        android:fromYDelta="20%p"
+        android:toYDelta="0" />
+
     <alpha
-        android:interpolator="@android:interpolator/fast_out_slow_in"
-        android:duration="@integer/nav_anim_duration"
         android:fromAlpha="0.0"
-        android:toAlpha="1.0"/>
+        android:toAlpha="1.0" />
 </set>
\ No newline at end of file
diff --git a/common-ui-view/src/main/res/anim/tivi_pop_exit_anim.xml b/common-ui-view/src/main/res/anim/tivi_exit_bottom_anim.xml
similarity index 69%
rename from common-ui-view/src/main/res/anim/tivi_pop_exit_anim.xml
rename to common-ui-view/src/main/res/anim/tivi_exit_bottom_anim.xml
index 96844e403f..2a69e42cc0 100644
--- a/common-ui-view/src/main/res/anim/tivi_pop_exit_anim.xml
+++ b/common-ui-view/src/main/res/anim/tivi_exit_bottom_anim.xml
@@ -15,10 +15,15 @@
   ~ limitations under the License.
   -->
 
-<set xmlns:android="http://schemas.android.com/apk/res/android">
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@integer/nav_anim_duration"
+    android:interpolator="@android:interpolator/fast_out_slow_in">
+
+    <translate
+        android:fromYDelta="0"
+        android:toYDelta="20%p" />
+
     <alpha
-        android:interpolator="@android:interpolator/fast_out_slow_in"
-        android:duration="@integer/nav_anim_duration"
         android:fromAlpha="1.0"
-        android:toAlpha="0.0"/>
+        android:toAlpha="0.0" />
 </set>
\ No newline at end of file
diff --git a/common-ui-view/src/main/res/anim/tivi_enter_anim.xml b/common-ui-view/src/main/res/anim/tivi_fade_enter.xml
similarity index 100%
rename from common-ui-view/src/main/res/anim/tivi_enter_anim.xml
rename to common-ui-view/src/main/res/anim/tivi_fade_enter.xml
diff --git a/common-ui-view/src/main/res/anim/tivi_exit_anim.xml b/common-ui-view/src/main/res/anim/tivi_fade_exit.xml
similarity index 100%
rename from common-ui-view/src/main/res/anim/tivi_exit_anim.xml
rename to common-ui-view/src/main/res/anim/tivi_fade_exit.xml
diff --git a/app/src/main/res/values-v27/themes.xml b/common-ui-view/src/main/res/anim/tivi_fade_scale_enter.xml
similarity index 55%
rename from app/src/main/res/values-v27/themes.xml
rename to common-ui-view/src/main/res/anim/tivi_fade_scale_enter.xml
index 7196417501..f53f5f1776 100644
--- a/app/src/main/res/values-v27/themes.xml
+++ b/common-ui-view/src/main/res/anim/tivi_fade_scale_enter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright 2019 Google, Inc.
+  ~ Copyright 2019 Google LLC
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -15,10 +15,19 @@
   ~ limitations under the License.
   -->
 
-<resources>
-    <style name="Platform.Theme.Tivi" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <item name="android:navigationBarColor">?android:colorBackground</item>
-        <item name="android:windowLightNavigationBar">@bool/is_light_theme</item>
-        <item name="android:navigationBarDividerColor">@color/color_on_background_10</item>
-    </style>
-</resources>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:interpolator/fast_out_slow_in"
+    android:duration="@integer/nav_anim_duration">
+
+    <scale
+        android:pivotX="50%"
+        android:pivotY="100%"
+        android:fromXScale="90%p"
+        android:fromYScale="90%p"
+        android:toXScale="100%p"
+        android:toYScale="100%p" />
+
+    <alpha
+        android:fromAlpha="0.0"
+        android:toAlpha="1.0"/>
+</set>
\ No newline at end of file
diff --git a/common-ui-resources/src/main/res/color/color_on_background_10.xml b/common-ui-view/src/main/res/anim/tivi_fade_scale_exit.xml
similarity index 55%
rename from common-ui-resources/src/main/res/color/color_on_background_10.xml
rename to common-ui-view/src/main/res/anim/tivi_fade_scale_exit.xml
index 55b4eb760e..c498229e01 100644
--- a/common-ui-resources/src/main/res/color/color_on_background_10.xml
+++ b/common-ui-view/src/main/res/anim/tivi_fade_scale_exit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright 2018 Google LLC
+  ~ Copyright 2019 Google LLC
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -15,6 +15,19 @@
   ~ limitations under the License.
   -->
 
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/colorOnBackground" android:alpha="0.1" />
-</selector>
\ No newline at end of file
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:interpolator/fast_out_slow_in"
+    android:duration="@integer/nav_anim_duration">
+
+    <scale
+        android:pivotX="50%"
+        android:pivotY="100%"
+        android:fromXScale="100%p"
+        android:fromYScale="100%p"
+        android:toXScale="90%p"
+        android:toYScale="90%p" />
+
+    <alpha
+        android:fromAlpha="1.0"
+        android:toAlpha="0.0"/>
+</set>
\ No newline at end of file
diff --git a/common-ui-view/src/main/res/values/ids.xml b/common-ui-view/src/main/res/values/ids.xml
index 76deb11d0b..82afe3d836 100644
--- a/common-ui-view/src/main/res/values/ids.xml
+++ b/common-ui-view/src/main/res/values/ids.xml
@@ -25,7 +25,6 @@
     <id name="navigation_search" />
     <id name="navigation_account" />
     <id name="navigation_settings" />
-    <id name="navigation_licences" />
     <id name="navigation_show_details" />
     <id name="navigation_episode_details" />
 </resources>
\ No newline at end of file
diff --git a/ui-account/build.gradle b/ui-account/build.gradle
index b891e9d531..c8ac749005 100644
--- a/ui-account/build.gradle
+++ b/ui-account/build.gradle
@@ -75,9 +75,6 @@ dependencies {
     implementation Libs.AndroidX.Compose.tooling
     implementation Libs.AndroidX.Compose.livedata
 
-    implementation Libs.Mdc.material
-    implementation Libs.Mdc.composeThemeAdapter
-
     implementation Libs.Accompanist.coil
     implementation Libs.Accompanist.insets
 
diff --git a/ui-account/src/main/java/app/tivi/account/AccountUi.kt b/ui-account/src/main/java/app/tivi/account/AccountUi.kt
index 99021c08b5..930fac14ff 100644
--- a/ui-account/src/main/java/app/tivi/account/AccountUi.kt
+++ b/ui-account/src/main/java/app/tivi/account/AccountUi.kt
@@ -17,7 +17,11 @@
 package app.tivi.account
 
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ExperimentalLayout
+import androidx.compose.foundation.layout.FlowMainAxisAlignment
+import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -26,6 +30,7 @@ import androidx.compose.foundation.layout.preferredHeight
 import androidx.compose.foundation.layout.preferredSize
 import androidx.compose.foundation.layout.preferredSizeIn
 import androidx.compose.foundation.layout.preferredWidth
+import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.AmbientContentAlpha
 import androidx.compose.material.ContentAlpha
@@ -53,6 +58,7 @@ import dev.chrisbanes.accompanist.coil.CoilImage
 import org.threeten.bp.OffsetDateTime
 import org.threeten.bp.ZoneOffset
 
+@OptIn(ExperimentalLayout::class)
 @Composable
 fun AccountUi(
     viewState: AccountUiViewState,
@@ -70,20 +76,25 @@ fun AccountUi(
                 Spacer(modifier = Modifier.preferredHeight(16.dp))
             }
 
-            Row(
-                modifier = Modifier.align(Alignment.End)
-                    .padding(horizontal = 16.dp)
+            Box(
+                modifier = Modifier.padding(horizontal = 16.dp)
+                    .wrapContentSize(Alignment.CenterEnd)
+                    .align(Alignment.End)
             ) {
-                if (viewState.authState == TraktAuthState.LOGGED_OUT) {
-                    OutlinedButton(onClick = { actioner(Login) }) {
-                        Text(text = stringResource(R.string.login))
+                FlowRow(
+                    mainAxisAlignment = FlowMainAxisAlignment.End,
+                    mainAxisSpacing = 8.dp,
+                    crossAxisSpacing = 4.dp,
+                ) {
+                    if (viewState.authState == TraktAuthState.LOGGED_OUT) {
+                        OutlinedButton(onClick = { actioner(Login) }) {
+                            Text(text = stringResource(R.string.login))
+                        }
+                    } else {
+                        TextButton(onClick = { actioner(Login) }) {
+                            Text(text = stringResource(R.string.refresh_credentials))
+                        }
                     }
-                } else {
-                    TextButton(onClick = { actioner(Login) }) {
-                        Text(text = stringResource(R.string.refresh_credentials))
-                    }
-
-                    Spacer(modifier = Modifier.preferredWidth(8.dp))
 
                     OutlinedButton(onClick = { actioner(Logout) }) {
                         Text(text = stringResource(R.string.logout))
diff --git a/ui-account/src/main/java/app/tivi/account/AccountUiFragment.kt b/ui-account/src/main/java/app/tivi/account/AccountUiFragment.kt
index e4abd0daf0..db6f60deaa 100644
--- a/ui-account/src/main/java/app/tivi/account/AccountUiFragment.kt
+++ b/ui-account/src/main/java/app/tivi/account/AccountUiFragment.kt
@@ -26,14 +26,16 @@ import androidx.compose.runtime.Providers
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.platform.ComposeView
+import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import app.tivi.common.compose.AmbientTiviDateFormatter
-import app.tivi.common.compose.TiviContentSetup
+import app.tivi.common.compose.shouldUseDarkColors
+import app.tivi.common.compose.theme.TiviTheme
 import app.tivi.extensions.navigateToNavDestination
+import app.tivi.settings.TiviPreferences
 import app.tivi.util.TiviDateFormatter
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import dagger.hilt.android.AndroidEntryPoint
 import dev.chrisbanes.accompanist.insets.AmbientWindowInsets
 import dev.chrisbanes.accompanist.insets.ViewWindowInsetObserver
@@ -44,12 +46,14 @@ import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class AccountUiFragment : BottomSheetDialogFragment() {
+class AccountUiFragment : DialogFragment() {
     private val pendingActions = Channel<AccountUiAction>()
     private val viewModel: AccountUiViewModel by viewModels()
 
     @Inject internal lateinit var tiviDateFormatter: TiviDateFormatter
 
+    @Inject lateinit var preferences: TiviPreferences
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -66,7 +70,7 @@ class AccountUiFragment : BottomSheetDialogFragment() {
                 AmbientTiviDateFormatter provides tiviDateFormatter,
                 AmbientWindowInsets provides windowInsets,
             ) {
-                TiviContentSetup {
+                TiviTheme(useDarkColors = preferences.shouldUseDarkColors()) {
                     val viewState by viewModel.liveData.observeAsState()
                     if (viewState != null) {
                         AccountUi(viewState!!) {
diff --git a/ui-discover/build.gradle b/ui-discover/build.gradle
index 0374e6930d..1b2dc5a59a 100644
--- a/ui-discover/build.gradle
+++ b/ui-discover/build.gradle
@@ -61,7 +61,6 @@ dependencies {
     implementation Libs.AndroidX.Lifecycle.livedata
     implementation Libs.AndroidX.Lifecycle.viewmodel
 
-    implementation Libs.AndroidX.appcompat
     implementation Libs.AndroidX.coreKtx
     implementation Libs.AndroidX.Fragment.fragment
     implementation Libs.AndroidX.Fragment.fragmentKtx
@@ -76,9 +75,6 @@ dependencies {
     implementation Libs.AndroidX.Compose.tooling
     implementation Libs.AndroidX.Compose.livedata
 
-    implementation Libs.Mdc.material
-    implementation Libs.Mdc.composeThemeAdapter
-
     implementation Libs.Accompanist.coil
     implementation Libs.Accompanist.insets
 
diff --git a/ui-discover/src/main/java/app/tivi/home/discover/DiscoverFragment.kt b/ui-discover/src/main/java/app/tivi/home/discover/DiscoverFragment.kt
index 9e2048cd7f..be8a851bc8 100644
--- a/ui-discover/src/main/java/app/tivi/home/discover/DiscoverFragment.kt
+++ b/ui-discover/src/main/java/app/tivi/home/discover/DiscoverFragment.kt
@@ -31,7 +31,10 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import app.tivi.common.compose.AmbientTiviDateFormatter
-import app.tivi.common.compose.TiviContentSetup
+import app.tivi.common.compose.shouldUseDarkColors
+import app.tivi.common.compose.theme.TiviTheme
+import app.tivi.extensions.DefaultNavOptions
+import app.tivi.settings.TiviPreferences
 import app.tivi.util.TiviDateFormatter
 import dagger.hilt.android.AndroidEntryPoint
 import dev.chrisbanes.accompanist.insets.AmbientWindowInsets
@@ -45,6 +48,7 @@ import javax.inject.Inject
 class DiscoverFragment : Fragment() {
     @Inject internal lateinit var tiviDateFormatter: TiviDateFormatter
     @Inject internal lateinit var textCreator: DiscoverTextCreator
+    @Inject lateinit var preferences: TiviPreferences
 
     private val viewModel: DiscoverViewModel by viewModels()
 
@@ -67,7 +71,7 @@ class DiscoverFragment : Fragment() {
                 AmbientDiscoverTextCreator provides textCreator,
                 AmbientWindowInsets provides windowInsets,
             ) {
-                TiviContentSetup {
+                TiviTheme(useDarkColors = preferences.shouldUseDarkColors()) {
                     val viewState by viewModel.liveData.observeAsState()
                     if (viewState != null) {
                         Discover(
@@ -93,11 +97,29 @@ class DiscoverFragment : Fragment() {
                         if (action.episodeId != null) {
                             uri += "/episode/${action.episodeId}"
                         }
-                        findNavController().navigate(uri.toUri())
+                        findNavController().navigate(uri.toUri(), DefaultNavOptions)
+                    }
+                    OpenTrendingShows -> {
+                        findNavController().navigate(
+                            R.id.navigation_trending,
+                            null,
+                            DefaultNavOptions
+                        )
+                    }
+                    OpenPopularShows -> {
+                        findNavController().navigate(
+                            R.id.navigation_popular,
+                            null,
+                            DefaultNavOptions
+                        )
+                    }
+                    OpenRecommendedShows -> {
+                        findNavController().navigate(
+                            R.id.navigation_recommended,
+                            null,
+                            DefaultNavOptions
+                        )
                     }
-                    OpenTrendingShows -> findNavController().navigate(R.id.navigation_trending)
-                    OpenPopularShows -> findNavController().navigate(R.id.navigation_popular)
-                    OpenRecommendedShows -> findNavController().navigate(R.id.navigation_recommended)
                     else -> viewModel.submitAction(action)
                 }
             }
diff --git a/ui-episodedetails/build.gradle b/ui-episodedetails/build.gradle
index a3e419ffdd..4330221d39 100644
--- a/ui-episodedetails/build.gradle
+++ b/ui-episodedetails/build.gradle
@@ -72,6 +72,7 @@ dependencies {
 
     implementation Libs.AndroidX.Fragment.fragment
     implementation Libs.AndroidX.Fragment.fragmentKtx
+    implementation Libs.AndroidX.Navigation.fragment
 
     implementation Libs.AndroidX.Compose.runtime
     implementation Libs.AndroidX.Compose.foundation
@@ -82,9 +83,6 @@ dependencies {
     implementation Libs.AndroidX.Compose.tooling
     implementation Libs.AndroidX.Compose.livedata
 
-    implementation Libs.Mdc.material
-    implementation Libs.Mdc.composeThemeAdapter
-
     implementation Libs.Accompanist.coil
     implementation Libs.Accompanist.insets
 
diff --git a/ui-episodedetails/src/main/java/app/tivi/episodedetails/EpisodeDetails.kt b/ui-episodedetails/src/main/java/app/tivi/episodedetails/EpisodeDetails.kt
index 889cd2989c..5bd69d881e 100644
--- a/ui-episodedetails/src/main/java/app/tivi/episodedetails/EpisodeDetails.kt
+++ b/ui-episodedetails/src/main/java/app/tivi/episodedetails/EpisodeDetails.kt
@@ -99,6 +99,7 @@ import app.tivi.ui.animations.lerp
 import dev.chrisbanes.accompanist.coil.CoilImage
 import dev.chrisbanes.accompanist.insets.navigationBarsHeight
 import dev.chrisbanes.accompanist.insets.navigationBarsPadding
+import dev.chrisbanes.accompanist.insets.statusBarsPadding
 import kotlinx.coroutines.launch
 import org.threeten.bp.OffsetDateTime
 import kotlin.math.absoluteValue
@@ -124,7 +125,8 @@ fun EpisodeDetails(
                     backgroundColor = Color.Transparent,
                     isRefreshing = viewState.refreshing,
                     actioner = actioner,
-                    elevation = 0.dp
+                    elevation = 0.dp,
+                    modifier = Modifier.fillMaxWidth().statusBarsPadding()
                 )
             }
             ScrollableColumn {
diff --git a/ui-episodedetails/src/main/java/app/tivi/episodedetails/EpisodeDetailsFragment.kt b/ui-episodedetails/src/main/java/app/tivi/episodedetails/EpisodeDetailsFragment.kt
index 024e728217..7fb0dcd863 100644
--- a/ui-episodedetails/src/main/java/app/tivi/episodedetails/EpisodeDetailsFragment.kt
+++ b/ui-episodedetails/src/main/java/app/tivi/episodedetails/EpisodeDetailsFragment.kt
@@ -26,13 +26,16 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.platform.ComposeView
 import androidx.core.os.bundleOf
+import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
+import androidx.navigation.fragment.findNavController
 import app.tivi.common.compose.AmbientTiviDateFormatter
-import app.tivi.common.compose.TiviContentSetup
+import app.tivi.common.compose.shouldUseDarkColors
+import app.tivi.common.compose.theme.TiviTheme
 import app.tivi.extensions.viewModelProviderFactoryOf
+import app.tivi.settings.TiviPreferences
 import app.tivi.util.TiviDateFormatter
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import dagger.hilt.android.AndroidEntryPoint
 import dev.chrisbanes.accompanist.insets.AmbientWindowInsets
 import dev.chrisbanes.accompanist.insets.ViewWindowInsetObserver
@@ -43,8 +46,9 @@ import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class EpisodeDetailsFragment : BottomSheetDialogFragment() {
+class EpisodeDetailsFragment : Fragment() {
     @Inject internal lateinit var vmFactory: EpisodeDetailsViewModel.Factory
+    @Inject lateinit var preferences: TiviPreferences
 
     companion object {
         private const val ARG_KEY_ID = "episode_id"
@@ -84,7 +88,7 @@ class EpisodeDetailsFragment : BottomSheetDialogFragment() {
                 AmbientTiviDateFormatter provides tiviDateFormatter,
                 AmbientWindowInsets provides windowInsets,
             ) {
-                TiviContentSetup {
+                TiviTheme(useDarkColors = preferences.shouldUseDarkColors()) {
                     val viewState by viewModel.liveData.observeAsState()
                     if (viewState != null) {
                         EpisodeDetails(viewState!!) {
@@ -98,12 +102,11 @@ class EpisodeDetailsFragment : BottomSheetDialogFragment() {
 
     override fun onStart() {
         super.onStart()
-        (requireDialog().findViewById(R.id.container) as View).fitsSystemWindows = false
 
         lifecycleScope.launch {
             pendingActions.consumeAsFlow().collect { action ->
                 when (action) {
-                    is Close -> requireView().post { dismiss() }
+                    is Close -> requireView().post { findNavController().navigateUp() }
                     else -> viewModel.submitAction(action)
                 }
             }
diff --git a/ui-followed/build.gradle b/ui-followed/build.gradle
index 8ecb48a8ba..e5d9cf30af 100644
--- a/ui-followed/build.gradle
+++ b/ui-followed/build.gradle
@@ -65,7 +65,6 @@ dependencies {
     implementation Libs.AndroidX.Paging.runtime
     implementation Libs.AndroidX.Paging.compose
 
-    implementation Libs.AndroidX.appcompat
     implementation Libs.AndroidX.coreKtx
     implementation Libs.AndroidX.Fragment.fragment
     implementation Libs.AndroidX.Fragment.fragmentKtx
@@ -80,9 +79,6 @@ dependencies {
     implementation Libs.AndroidX.Compose.tooling
     implementation Libs.AndroidX.Compose.livedata
 
-    implementation Libs.Mdc.material
-    implementation Libs.Mdc.composeThemeAdapter
-
     implementation Libs.Accompanist.coil
     implementation Libs.Accompanist.insets
 
diff --git a/ui-followed/src/main/java/app/tivi/home/followed/FollowedFragment.kt b/ui-followed/src/main/java/app/tivi/home/followed/FollowedFragment.kt
index f686ed7b50..9c5e053642 100644
--- a/ui-followed/src/main/java/app/tivi/home/followed/FollowedFragment.kt
+++ b/ui-followed/src/main/java/app/tivi/home/followed/FollowedFragment.kt
@@ -33,8 +33,11 @@ import androidx.navigation.fragment.findNavController
 import androidx.paging.compose.collectAsLazyPagingItems
 import app.tivi.common.compose.AmbientHomeTextCreator
 import app.tivi.common.compose.AmbientTiviDateFormatter
-import app.tivi.common.compose.TiviContentSetup
+import app.tivi.common.compose.shouldUseDarkColors
+import app.tivi.common.compose.theme.TiviTheme
+import app.tivi.extensions.DefaultNavOptions
 import app.tivi.home.HomeTextCreator
+import app.tivi.settings.TiviPreferences
 import app.tivi.util.TiviDateFormatter
 import dagger.hilt.android.AndroidEntryPoint
 import dev.chrisbanes.accompanist.insets.AmbientWindowInsets
@@ -48,6 +51,7 @@ import javax.inject.Inject
 class FollowedFragment : Fragment() {
     @Inject internal lateinit var tiviDateFormatter: TiviDateFormatter
     @Inject internal lateinit var homeTextCreator: HomeTextCreator
+    @Inject lateinit var preferences: TiviPreferences
 
     private val viewModel: FollowedViewModel by viewModels()
 
@@ -70,7 +74,7 @@ class FollowedFragment : Fragment() {
                 AmbientHomeTextCreator provides homeTextCreator,
                 AmbientWindowInsets provides windowInsets,
             ) {
-                TiviContentSetup {
+                TiviTheme(useDarkColors = preferences.shouldUseDarkColors()) {
                     val viewState by viewModel.liveData.observeAsState()
                     if (viewState != null) {
                         Followed(
@@ -91,9 +95,14 @@ class FollowedFragment : Fragment() {
             pendingActions.consumeAsFlow().collect { action ->
                 when (action) {
                     FollowedAction.LoginAction,
-                    FollowedAction.OpenUserDetails -> findNavController().navigate("app.tivi://account".toUri())
+                    FollowedAction.OpenUserDetails -> {
+                        findNavController().navigate("app.tivi://account".toUri())
+                    }
                     is FollowedAction.OpenShowDetails -> {
-                        findNavController().navigate("app.tivi://show/${action.showId}".toUri())
+                        findNavController().navigate(
+                            "app.tivi://show/${action.showId}".toUri(),
+                            DefaultNavOptions
+                        )
                     }
                     else -> viewModel.submitAction(action)
                 }
diff --git a/ui-popular/build.gradle b/ui-popular/build.gradle
index 18740b782b..6fcf434821 100644
--- a/ui-popular/build.gradle
+++ b/ui-popular/build.gradle
@@ -74,9 +74,6 @@ dependencies {
     implementation Libs.AndroidX.Compose.animation
     implementation Libs.AndroidX.Compose.tooling
 
-    implementation Libs.Mdc.material
-    implementation Libs.Mdc.composeThemeAdapter
-
     implementation Libs.Accompanist.coil
     implementation Libs.Accompanist.insets
 
diff --git a/ui-popular/src/main/java/app/tivi/home/popular/PopularShowsFragment.kt b/ui-popular/src/main/java/app/tivi/home/popular/PopularShowsFragment.kt
index e5549a8c80..1b45cc3a4f 100644
--- a/ui-popular/src/main/java/app/tivi/home/popular/PopularShowsFragment.kt
+++ b/ui-popular/src/main/java/app/tivi/home/popular/PopularShowsFragment.kt
@@ -30,9 +30,12 @@ import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import app.tivi.common.compose.AmbientHomeTextCreator
 import app.tivi.common.compose.AmbientTiviDateFormatter
-import app.tivi.common.compose.TiviContentSetup
 import app.tivi.common.compose.paging.collectAsLazyPagingItems
+import app.tivi.common.compose.shouldUseDarkColors
+import app.tivi.common.compose.theme.TiviTheme
+import app.tivi.extensions.DefaultNavOptions
 import app.tivi.home.HomeTextCreator
+import app.tivi.settings.TiviPreferences
 import app.tivi.util.TiviDateFormatter
 import dagger.hilt.android.AndroidEntryPoint
 import dev.chrisbanes.accompanist.insets.AmbientWindowInsets
@@ -46,6 +49,7 @@ import javax.inject.Inject
 class PopularShowsFragment : Fragment() {
     @Inject internal lateinit var tiviDateFormatter: TiviDateFormatter
     @Inject internal lateinit var homeTextCreator: HomeTextCreator
+    @Inject lateinit var preferences: TiviPreferences
 
     private val pendingActions = Channel<PopularAction>(Channel.BUFFERED)
 
@@ -72,7 +76,7 @@ class PopularShowsFragment : Fragment() {
                 AmbientHomeTextCreator provides homeTextCreator,
                 AmbientWindowInsets provides windowInsets,
             ) {
-                TiviContentSetup {
+                TiviTheme(useDarkColors = preferences.shouldUseDarkColors()) {
                     Popular(
                         lazyPagingItems = pagedList.collectAsLazyPagingItems { old, new ->
                             old.entry.id == new.entry.id
@@ -91,7 +95,10 @@ class PopularShowsFragment : Fragment() {
             pendingActions.consumeAsFlow().collect { action ->
                 when (action) {
                     is PopularAction.OpenShowDetails -> {
-                        findNavController().navigate("app.tivi://show/${action.showId}".toUri())
+                        findNavController().navigate(
+                            "app.tivi://show/${action.showId}".toUri(),
+                            DefaultNavOptions
+                        )
                     }
                     // else -> viewModel.submitAction(action)
                 }
diff --git a/ui-recommended/build.gradle b/ui-recommended/build.gradle
index 18740b782b..6fcf434821 100644
--- a/ui-recommended/build.gradle
+++ b/ui-recommended/build.gradle
@@ -74,9 +74,6 @@ dependencies {
     implementation Libs.AndroidX.Compose.animation
     implementation Libs.AndroidX.Compose.tooling
 
-    implementation Libs.Mdc.material
-    implementation Libs.Mdc.composeThemeAdapter
-
     implementation Libs.Accompanist.coil
     implementation Libs.Accompanist.insets
 
diff --git a/ui-recommended/src/main/java/app/tivi/home/recommended/RecommendedShowsFragment.kt b/ui-recommended/src/main/java/app/tivi/home/recommended/RecommendedShowsFragment.kt
index 222f1925be..4994dc1935 100644
--- a/ui-recommended/src/main/java/app/tivi/home/recommended/RecommendedShowsFragment.kt
+++ b/ui-recommended/src/main/java/app/tivi/home/recommended/RecommendedShowsFragment.kt
@@ -30,9 +30,12 @@ import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import app.tivi.common.compose.AmbientHomeTextCreator
 import app.tivi.common.compose.AmbientTiviDateFormatter
-import app.tivi.common.compose.TiviContentSetup
 import app.tivi.common.compose.paging.collectAsLazyPagingItems
+import app.tivi.common.compose.shouldUseDarkColors
+import app.tivi.common.compose.theme.TiviTheme
+import app.tivi.extensions.DefaultNavOptions
 import app.tivi.home.HomeTextCreator
+import app.tivi.settings.TiviPreferences
 import app.tivi.util.TiviDateFormatter
 import dagger.hilt.android.AndroidEntryPoint
 import dev.chrisbanes.accompanist.insets.AmbientWindowInsets
@@ -46,6 +49,7 @@ import javax.inject.Inject
 class RecommendedShowsFragment : Fragment() {
     @Inject internal lateinit var tiviDateFormatter: TiviDateFormatter
     @Inject internal lateinit var homeTextCreator: HomeTextCreator
+    @Inject lateinit var preferences: TiviPreferences
 
     private val pendingActions = Channel<RecommendedAction>(Channel.BUFFERED)
 
@@ -72,7 +76,7 @@ class RecommendedShowsFragment : Fragment() {
                 AmbientHomeTextCreator provides homeTextCreator,
                 AmbientWindowInsets provides windowInsets,
             ) {
-                TiviContentSetup {
+                TiviTheme(useDarkColors = preferences.shouldUseDarkColors()) {
                     Recommended(
                         lazyPagingItems = pagedList.collectAsLazyPagingItems { old, new ->
                             old.entry.id == new.entry.id
@@ -91,7 +95,10 @@ class RecommendedShowsFragment : Fragment() {
             pendingActions.consumeAsFlow().collect { action ->
                 when (action) {
                     is RecommendedAction.OpenShowDetails -> {
-                        findNavController().navigate("app.tivi://show/${action.showId}".toUri())
+                        findNavController().navigate(
+                            "app.tivi://show/${action.showId}".toUri(),
+                            DefaultNavOptions
+                        )
                     }
                     // else -> viewModel.submitAction(action)
                 }
diff --git a/ui-search/build.gradle b/ui-search/build.gradle
index 3672edce51..a4f6358936 100644
--- a/ui-search/build.gradle
+++ b/ui-search/build.gradle
@@ -62,7 +62,6 @@ dependencies {
     implementation Libs.AndroidX.Lifecycle.livedata
     implementation Libs.AndroidX.Lifecycle.viewmodel
 
-    implementation Libs.AndroidX.appcompat
     implementation Libs.AndroidX.coreKtx
     implementation Libs.AndroidX.Fragment.fragment
     implementation Libs.AndroidX.Navigation.fragment
@@ -76,9 +75,6 @@ dependencies {
     implementation Libs.AndroidX.Compose.tooling
     implementation Libs.AndroidX.Compose.livedata
 
-    implementation Libs.Mdc.material
-    implementation Libs.Mdc.composeThemeAdapter
-
     implementation Libs.Accompanist.coil
     implementation Libs.Accompanist.insets
 
diff --git a/ui-search/src/main/java/app/tivi/home/search/SearchFragment.kt b/ui-search/src/main/java/app/tivi/home/search/SearchFragment.kt
index c817733d39..579241c17f 100644
--- a/ui-search/src/main/java/app/tivi/home/search/SearchFragment.kt
+++ b/ui-search/src/main/java/app/tivi/home/search/SearchFragment.kt
@@ -31,14 +31,20 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import app.tivi.common.compose.LogCompositions
-import app.tivi.common.compose.TiviContentSetup
+import app.tivi.common.compose.shouldUseDarkColors
+import app.tivi.common.compose.theme.TiviTheme
+import app.tivi.extensions.DefaultNavOptions
+import app.tivi.settings.TiviPreferences
 import dagger.hilt.android.AndroidEntryPoint
 import dev.chrisbanes.accompanist.insets.AmbientWindowInsets
 import dev.chrisbanes.accompanist.insets.ViewWindowInsetObserver
 import kotlinx.coroutines.channels.Channel
+import javax.inject.Inject
 
 @AndroidEntryPoint
 internal class SearchFragment : Fragment() {
+    @Inject lateinit var preferences: TiviPreferences
+
     private val viewModel: SearchViewModel by viewModels()
     private val pendingActions = Channel<SearchAction>(Channel.BUFFERED)
 
@@ -49,7 +55,10 @@ internal class SearchFragment : Fragment() {
             for (action in pendingActions) {
                 when (action) {
                     is SearchAction.OpenShowDetails -> {
-                        findNavController().navigate("app.tivi://show/${action.showId}".toUri())
+                        findNavController().navigate(
+                            "app.tivi://show/${action.showId}".toUri(),
+                            DefaultNavOptions
+                        )
                     }
                     else -> viewModel.submitAction(action)
                 }
@@ -70,7 +79,7 @@ internal class SearchFragment : Fragment() {
 
         setContent {
             Providers(AmbientWindowInsets provides windowInsets) {
-                TiviContentSetup {
+                TiviTheme(useDarkColors = preferences.shouldUseDarkColors()) {
                     val viewState by viewModel.liveData.observeAsState()
                     if (viewState != null) {
                         LogCompositions("ViewState observeAsState")
diff --git a/ui-settings/build.gradle b/ui-settings/build.gradle
index 7754618751..7bc8a43e39 100644
--- a/ui-settings/build.gradle
+++ b/ui-settings/build.gradle
@@ -40,29 +40,17 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-
-    buildFeatures {
-        viewBinding true
-    }
 }
 
 dependencies {
     implementation project(':base')
     implementation project(':base-android')
-    implementation project(':domain')
     implementation project(':common-ui-resources')
     implementation project(':common-ui-view')
 
-    implementation Libs.AndroidX.appcompat
     implementation Libs.AndroidX.browser
     implementation Libs.AndroidX.coreKtx
-    api Libs.AndroidX.preference
-
-    implementation Libs.AndroidX.Navigation.fragment
-    implementation Libs.AndroidX.Fragment.fragment
-    implementation Libs.AndroidX.Fragment.fragmentKtx
-
-    implementation Libs.Mdc.material
+    implementation Libs.AndroidX.Lifecycle.runtime
 
     implementation Libs.Hilt.library
     kapt Libs.Hilt.compiler
diff --git a/ui-settings/src/main/AndroidManifest.xml b/ui-settings/src/main/AndroidManifest.xml
index 8c61f96909..ea07ccceac 100644
--- a/ui-settings/src/main/AndroidManifest.xml
+++ b/ui-settings/src/main/AndroidManifest.xml
@@ -19,4 +19,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="app.tivi.settings">
 
+    <application>
+
+        <activity android:name=".SettingsActivity"
+            android:label="@string/settings_title" />
+
+    </application>
+
 </manifest>
diff --git a/ui-settings/src/main/java/app/tivi/settings/SettingsActivity.kt b/ui-settings/src/main/java/app/tivi/settings/SettingsActivity.kt
new file mode 100644
index 0000000000..8181127420
--- /dev/null
+++ b/ui-settings/src/main/java/app/tivi/settings/SettingsActivity.kt
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@file:Suppress("DEPRECATION")
+
+package app.tivi.settings
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.lifecycle.lifecycleScope
+import app.tivi.util.PowerController
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.collect
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class SettingsActivity : ComponentActivity() {
+    @Inject lateinit var powerController: PowerController
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val fragment = SettingsPreferenceFragment()
+
+        fragmentManager.beginTransaction()
+            .replace(android.R.id.content, fragment)
+            .commit()
+
+        lifecycleScope.launchWhenStarted {
+            powerController.observeShouldSaveData(ignorePreference = true).collect { saveData ->
+                fragment.saveData = saveData
+            }
+        }
+    }
+}
diff --git a/ui-settings/src/main/java/app/tivi/settings/SettingsFragment.kt b/ui-settings/src/main/java/app/tivi/settings/SettingsFragment.kt
deleted file mode 100644
index 619a477048..0000000000
--- a/ui-settings/src/main/java/app/tivi/settings/SettingsFragment.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2018 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package app.tivi.settings
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.commitNow
-import androidx.navigation.fragment.findNavController
-import app.tivi.settings.databinding.FragmentSettingsBinding
-
-class SettingsFragment : Fragment() {
-    private lateinit var binding: FragmentSettingsBinding
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        binding = FragmentSettingsBinding.inflate(inflater, container, false)
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.settingsToolbar.setNavigationOnClickListener {
-            findNavController().navigateUp()
-        }
-
-        childFragmentManager.commitNow {
-            replace(R.id.settings_container, SettingsPreferenceFragment())
-        }
-    }
-}
diff --git a/ui-settings/src/main/java/app/tivi/settings/SettingsInject.kt b/ui-settings/src/main/java/app/tivi/settings/SettingsInject.kt
index daa1eaff06..ca677f9ee3 100644
--- a/ui-settings/src/main/java/app/tivi/settings/SettingsInject.kt
+++ b/ui-settings/src/main/java/app/tivi/settings/SettingsInject.kt
@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
+@file:Suppress("DEPRECATION")
+
 package app.tivi.settings
 
 import android.content.Context
 import android.content.SharedPreferences
-import androidx.preference.PreferenceManager
+import android.preference.PreferenceManager
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
diff --git a/ui-settings/src/main/java/app/tivi/settings/SettingsPreferenceFragment.kt b/ui-settings/src/main/java/app/tivi/settings/SettingsPreferenceFragment.kt
index 78f01b6759..fca3e6cdbd 100644
--- a/ui-settings/src/main/java/app/tivi/settings/SettingsPreferenceFragment.kt
+++ b/ui-settings/src/main/java/app/tivi/settings/SettingsPreferenceFragment.kt
@@ -14,66 +14,59 @@
  * limitations under the License.
  */
 
+@file:Suppress("DEPRECATION")
+
 package app.tivi.settings
 
 import android.content.pm.PackageManager
 import android.os.Bundle
+import android.preference.PreferenceFragment
+import android.preference.SwitchPreference
 import androidx.browser.customtabs.CustomTabsIntent
 import androidx.core.content.pm.PackageInfoCompat
 import androidx.core.net.toUri
-import androidx.lifecycle.lifecycleScope
-import androidx.navigation.fragment.findNavController
-import androidx.preference.Preference
-import androidx.preference.PreferenceFragmentCompat
 import app.tivi.extensions.resolveThemeColor
-import app.tivi.util.PowerController
 import app.tivi.util.SaveData
 import app.tivi.util.SaveDataReason
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.flow.collect
-import javax.inject.Inject
-
-@AndroidEntryPoint
-internal class SettingsPreferenceFragment : PreferenceFragmentCompat() {
-    @Inject lateinit var powerController: PowerController
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
+internal class SettingsPreferenceFragment : PreferenceFragment() {
+    internal var saveData: SaveData? = null
+        set(value) {
+            val pref = findPreference("pref_data_saver") as? SwitchPreference
+                ?: throw IllegalStateException()
 
-        lifecycleScope.launchWhenStarted {
-            powerController.observeShouldSaveData(ignorePreference = true).collect { saveData ->
-                val pref = findPreference<Preference>("pref_data_saver")
-                    ?: throw CancellationException()
-                val prefDisabled = findPreference<Preference>("pref_data_saver_disabled")
-                    ?: throw CancellationException()
+            pref.isEnabled = when (value) {
+                is SaveData.Enabled -> value.reason == SaveDataReason.PREFERENCE
+                else -> true
+            }
 
-                pref.isVisible = saveData is SaveData.Disabled ||
-                    (saveData is SaveData.Enabled && saveData.reason == SaveDataReason.PREFERENCE)
-                prefDisabled.isVisible = !pref.isVisible
+            if (pref.isEnabled) {
+                pref.summary = null
+                pref.setSummaryOn(R.string.settings_data_saver_summary_on)
+            } else {
+                pref.summaryOn = null
+                pref.setSummary(R.string.settings_data_saver_summary_system)
             }
+
+            field = value
         }
-    }
 
-    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        setPreferencesFromResource(R.xml.preferences, rootKey)
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        addPreferencesFromResource(R.xml.preferences)
 
-        findPreference<Preference>("privacy_policy")?.setOnPreferenceClickListener {
+        findPreference("privacy_policy")?.setOnPreferenceClickListener {
             CustomTabsIntent.Builder()
-                .setToolbarColor(requireContext().resolveThemeColor(R.attr.colorPrimaryVariant))
+                .setToolbarColor(context.resolveThemeColor(android.R.attr.colorPrimary))
                 .build()
-                .launchUrl(requireContext(), getString(R.string.privacy_policy_url).toUri())
-            true
-        }
-
-        findPreference<Preference>("open_source")?.setOnPreferenceClickListener {
-            findNavController().navigate(R.id.navigation_licences)
+                .launchUrl(context, getString(R.string.privacy_policy_url).toUri())
             true
         }
 
-        findPreference<Preference>("version")?.apply {
-            val pkgManager: PackageManager = requireContext().packageManager
-            val pkgInfo = pkgManager.getPackageInfo(requireContext().packageName, 0)
+        findPreference("version")?.apply {
+            val pkgManager: PackageManager = context.packageManager
+            val pkgInfo = pkgManager.getPackageInfo(context.packageName, 0)
             summary = getString(
                 R.string.settings_app_version_summary,
                 pkgInfo.versionName,
diff --git a/ui-settings/src/main/java/app/tivi/settings/TiviPreferencesImpl.kt b/ui-settings/src/main/java/app/tivi/settings/TiviPreferencesImpl.kt
index 111dd62b8c..2b8775d1ff 100644
--- a/ui-settings/src/main/java/app/tivi/settings/TiviPreferencesImpl.kt
+++ b/ui-settings/src/main/java/app/tivi/settings/TiviPreferencesImpl.kt
@@ -18,10 +18,15 @@ package app.tivi.settings
 
 import android.content.Context
 import android.content.SharedPreferences
-import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.edit
 import app.tivi.settings.TiviPreferences.Theme
 import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onStart
 import javax.inject.Inject
 import javax.inject.Named
 
@@ -29,25 +34,24 @@ class TiviPreferencesImpl @Inject constructor(
     @ApplicationContext private val context: Context,
     @Named("app") private val sharedPreferences: SharedPreferences
 ) : TiviPreferences {
+    private val defaultThemeValue = context.getString(R.string.pref_theme_default_value)
+
+    private val preferenceKeyChangedFlow = MutableSharedFlow<String>(extraBufferCapacity = 1)
+
     private val listener = SharedPreferences.OnSharedPreferenceChangeListener { _, key ->
-        when (key) {
-            KEY_THEME -> updateUsingThemePreference()
-        }
+        preferenceKeyChangedFlow.tryEmit(key)
     }
 
-    private val defaultThemeValue = context.getString(R.string.pref_theme_default_value)
-
     companion object {
         const val KEY_THEME = "pref_theme"
         const val KEY_DATA_SAVER = "pref_data_saver"
     }
 
     override fun setup() {
-        updateUsingThemePreference()
         sharedPreferences.registerOnSharedPreferenceChangeListener(listener)
     }
 
-    override var themePreference: Theme
+    override var theme: Theme
         get() = getThemeForStorageValue(sharedPreferences.getString(KEY_THEME, defaultThemeValue)!!)
         set(value) = sharedPreferences.edit {
             putString(KEY_THEME, value.storageKey)
@@ -59,7 +63,25 @@ class TiviPreferencesImpl @Inject constructor(
             putBoolean(KEY_DATA_SAVER, value)
         }
 
-    val Theme.storageKey: String
+    override fun observeUseLessData(): Flow<Boolean> {
+        return preferenceKeyChangedFlow
+            // Emit on start so that we always send the initial value
+            .onStart { emit(KEY_DATA_SAVER) }
+            .filter { it == KEY_DATA_SAVER }
+            .map { useLessData }
+            .distinctUntilChanged()
+    }
+
+    override fun observeTheme(): Flow<Theme> {
+        return preferenceKeyChangedFlow
+            // Emit on start so that we always send the initial value
+            .onStart { emit(KEY_THEME) }
+            .filter { it == KEY_THEME }
+            .map { theme }
+            .distinctUntilChanged()
+    }
+
+    private val Theme.storageKey: String
         get() = when (this) {
             Theme.LIGHT -> context.getString(R.string.pref_theme_light_value)
             Theme.DARK -> context.getString(R.string.pref_theme_dark_value)
@@ -71,10 +93,4 @@ class TiviPreferencesImpl @Inject constructor(
         context.getString(R.string.pref_theme_dark_value) -> Theme.DARK
         else -> Theme.SYSTEM
     }
-
-    private fun updateUsingThemePreference() = when (themePreference) {
-        Theme.DARK -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
-        Theme.LIGHT -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
-        Theme.SYSTEM -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
-    }
 }
diff --git a/ui-settings/src/main/res/layout/fragment_settings.xml b/ui-settings/src/main/res/layout/fragment_settings.xml
deleted file mode 100644
index 7faf1e0e79..0000000000
--- a/ui-settings/src/main/res/layout/fragment_settings.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2019 Google LLC
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<LinearLayout 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:orientation="vertical">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/search_app_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
-        android:theme="@style/ThemeOverlay.MaterialComponents.ActionBar"
-        style="@style/Widget.MaterialComponents.AppBarLayout.Surface">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/settings_toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            app:navigationIcon="?attr/homeAsUpIndicator"
-            app:title="@string/settings_title" />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/settings_container"
-        android:layout_width="match_parent"
-        android:layout_height="0px"
-        android:layout_weight="1" />
-
-</LinearLayout>
diff --git a/ui-settings/src/main/res/xml/preferences.xml b/ui-settings/src/main/res/xml/preferences.xml
index bbac31a23b..76cd675e7d 100644
--- a/ui-settings/src/main/res/xml/preferences.xml
+++ b/ui-settings/src/main/res/xml/preferences.xml
@@ -16,8 +16,7 @@
   ~
   -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
     <PreferenceCategory android:title="@string/settings_ui_category_title">
 
@@ -26,22 +25,14 @@
             android:entries="@array/prefs_theme_titles"
             android:entryValues="@array/prefs_theme_values"
             android:key="pref_theme"
-            android:title="@string/settings_theme_title"
-            app:useSimpleSummaryProvider="true" />
+            android:title="@string/settings_theme_title" />
 
-        <SwitchPreferenceCompat
+        <SwitchPreference
             android:key="pref_data_saver"
             android:defaultValue="false"
             android:title="@string/settings_data_saver_title"
             android:summaryOn="@string/settings_data_saver_summary_on" />
 
-        <Preference
-            android:key="pref_data_saver_disabled"
-            android:title="@string/settings_data_saver_title"
-            android:summary="@string/settings_data_saver_summary_system"
-            app:isPreferenceVisible="false"
-            android:enabled="false"/>
-
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -52,11 +43,6 @@
             android:key="privacy_policy"
             android:title="@string/view_privacy_policy" />
 
-        <Preference
-            android:key="open_source"
-            android:title="@string/settings_open_source"
-            android:summary="@string/settings_open_source_summary"/>
-
         <Preference
             android:key="version"
             android:title="@string/settings_app_version" />
diff --git a/ui-showdetails/build.gradle b/ui-showdetails/build.gradle
index 30d329865e..d4f304411d 100644
--- a/ui-showdetails/build.gradle
+++ b/ui-showdetails/build.gradle
@@ -69,7 +69,6 @@ dependencies {
     implementation Libs.AndroidX.Lifecycle.livedata
     implementation Libs.AndroidX.Lifecycle.viewmodel
 
-    implementation Libs.AndroidX.appcompat
     implementation Libs.AndroidX.coreKtx
     implementation Libs.AndroidX.emoji
     implementation Libs.AndroidX.Fragment.fragment
@@ -87,9 +86,6 @@ dependencies {
     implementation Libs.AndroidX.Compose.tooling
     implementation Libs.AndroidX.Compose.livedata
 
-    implementation Libs.Mdc.material
-    implementation Libs.Mdc.composeThemeAdapter
-
     implementation Libs.Accompanist.coil
     implementation Libs.Accompanist.insets
 
diff --git a/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsAction.kt b/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsAction.kt
index 8fb65d2b16..bd178b511b 100644
--- a/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsAction.kt
+++ b/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsAction.kt
@@ -43,6 +43,5 @@ data class ChangeSeasonExpandedAction(
 
 data class OpenShowDetails(val showId: Long) : ShowDetailsAction()
 data class OpenEpisodeDetails(val episodeId: Long) : ShowDetailsAction()
-data class ClearPendingUiEffect(val effect: UiEffect) : ShowDetailsAction()
 object ClearError : ShowDetailsAction()
 object NavigateUp : ShowDetailsAction()
diff --git a/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsFragment.kt b/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsFragment.kt
index de179bd9c2..94aef0b74e 100644
--- a/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsFragment.kt
+++ b/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsFragment.kt
@@ -30,9 +30,13 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
+import androidx.navigation.navOptions
 import app.tivi.common.compose.LogCompositions
-import app.tivi.common.compose.TiviContentSetup
+import app.tivi.common.compose.shouldUseDarkColors
+import app.tivi.common.compose.theme.TiviTheme
+import app.tivi.extensions.DefaultNavOptions
 import app.tivi.extensions.viewModelProviderFactoryOf
+import app.tivi.settings.TiviPreferences
 import app.tivi.util.TiviDateFormatter
 import dagger.hilt.android.AndroidEntryPoint
 import dev.chrisbanes.accompanist.insets.AmbientWindowInsets
@@ -40,7 +44,6 @@ import dev.chrisbanes.accompanist.insets.ViewWindowInsetObserver
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.consumeAsFlow
-import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -48,6 +51,7 @@ class ShowDetailsFragment : Fragment() {
     @Inject internal lateinit var vmFactory: ShowDetailsFragmentViewModel.Factory
     @Inject internal lateinit var textCreator: ShowDetailsTextCreator
     @Inject internal lateinit var tiviDateFormatter: TiviDateFormatter
+    @Inject lateinit var preferences: TiviPreferences
 
     private val pendingActions = Channel<ShowDetailsAction>(Channel.BUFFERED)
 
@@ -64,11 +68,51 @@ class ShowDetailsFragment : Fragment() {
         }
     }
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        lifecycleScope.launchWhenStarted {
+            pendingActions.consumeAsFlow().collect { action ->
+                when (action) {
+                    NavigateUp -> findNavController().navigateUp()
+                    else -> viewModel.submitAction(action)
+                }
+            }
+        }
+
+        lifecycleScope.launchWhenStarted {
+            viewModel.uiEffects.collect { effect ->
+                when (effect) {
+                    is OpenShowUiEffect -> {
+                        findNavController().navigate(
+                            "app.tivi://show/${effect.showId}".toUri(),
+                            DefaultNavOptions
+                        )
+                    }
+                    is OpenEpisodeUiEffect -> {
+                        findNavController().navigate(
+                            "app.tivi://episode/${effect.episodeId}".toUri(),
+                            navOptions {
+                                anim {
+                                    enter = R.anim.tivi_enter_bottom_anim
+                                    popExit = R.anim.tivi_exit_bottom_anim
+                                }
+                            }
+                        )
+                    }
+                    else -> {
+                        // TODO: any remaining ui effects need to be passed down to the UI
+                    }
+                }
+            }
+        }
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? = ComposeView(requireContext()).apply {
+    ): View = ComposeView(requireContext()).apply {
         layoutParams = ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT)
 
         // We use ViewWindowInsetObserver rather than ProvideWindowInsets
@@ -80,7 +124,7 @@ class ShowDetailsFragment : Fragment() {
                 AmbientShowDetailsTextCreator provides textCreator,
                 AmbientWindowInsets provides windowInsets,
             ) {
-                TiviContentSetup {
+                TiviTheme(useDarkColors = preferences.shouldUseDarkColors()) {
                     val viewState by viewModel.liveData.observeAsState()
                     if (viewState != null) {
                         LogCompositions("ViewState observeAsState")
@@ -92,34 +136,4 @@ class ShowDetailsFragment : Fragment() {
             }
         }
     }
-
-    override fun onStart() {
-        super.onStart()
-
-        viewModel.liveData.observe(this, ::render)
-
-        lifecycleScope.launch {
-            pendingActions.consumeAsFlow().collect { action ->
-                when (action) {
-                    NavigateUp -> findNavController().navigateUp()
-                    else -> viewModel.submitAction(action)
-                }
-            }
-        }
-    }
-
-    private fun render(state: ShowDetailsViewState) {
-        state.pendingUiEffects.forEach { effect ->
-            when (effect) {
-                is OpenShowUiEffect -> {
-                    findNavController().navigate("app.tivi://show/${effect.showId}".toUri())
-                    viewModel.submitAction(ClearPendingUiEffect(effect))
-                }
-                is OpenEpisodeUiEffect -> {
-                    findNavController().navigate("app.tivi://episode/${effect.episodeId}".toUri())
-                    viewModel.submitAction(ClearPendingUiEffect(effect))
-                }
-            }
-        }
-    }
 }
diff --git a/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsFragmentViewModel.kt b/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsViewModel.kt
similarity index 88%
rename from ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsFragmentViewModel.kt
rename to ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsViewModel.kt
index 34081d0799..0f9944f176 100644
--- a/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsFragmentViewModel.kt
+++ b/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsViewModel.kt
@@ -48,6 +48,8 @@ import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.consumeAsFlow
 import kotlinx.coroutines.flow.distinctUntilChanged
@@ -78,6 +80,11 @@ internal class ShowDetailsFragmentViewModel @AssistedInject constructor(
 
     private val pendingActions = Channel<ShowDetailsAction>(Channel.BUFFERED)
 
+    private val _uiEffects = MutableSharedFlow<UiEffect>(extraBufferCapacity = 100)
+
+    val uiEffects: Flow<UiEffect>
+        get() = _uiEffects.asSharedFlow()
+
     init {
         viewModelScope.launch {
             observeShowFollowStatus.observe()
@@ -138,7 +145,6 @@ internal class ShowDetailsFragmentViewModel @AssistedInject constructor(
                     is UnfollowPreviousSeasonsFollowedAction -> onUnfollowPreviousSeasonsFollowState(action)
                     is OpenEpisodeDetails -> openEpisodeDetails(action)
                     is OpenShowDetails -> openShowDetails(action)
-                    is ClearPendingUiEffect -> clearPendingUiEffect(action)
                     is ClearError -> snackbarManager.removeCurrentError()
                 }
             }
@@ -201,35 +207,27 @@ internal class ShowDetailsFragmentViewModel @AssistedInject constructor(
     }
 
     private fun openShowDetails(action: OpenShowDetails) {
-        viewModelScope.launchSetState {
-            val pending = pendingUiEffects.filter { it !is OpenShowUiEffect }
-            copy(pendingUiEffects = pending + OpenShowUiEffect(action.showId))
+        viewModelScope.launch {
+            _uiEffects.emit(OpenShowUiEffect(action.showId))
         }
     }
 
     private fun openEpisodeDetails(action: OpenEpisodeDetails) = viewModelScope.launch {
         val episode = getEpisode(GetEpisodeDetails.Params(action.episodeId)).first()
         if (episode != null) {
+            // Make sure the season is expanded
             setState {
-                val pending = pendingUiEffects.filterNot { it is OpenEpisodeUiEffect }
-                copy(
-                    expandedSeasonIds = expandedSeasonIds + episode.seasonId,
-                    pendingUiEffects = pending +
-                        OpenEpisodeUiEffect(action.episodeId, episode.seasonId)
-                )
+                copy(expandedSeasonIds = expandedSeasonIds + episode.seasonId)
             }
-        }
-    }
-
-    private fun clearPendingUiEffect(action: ClearPendingUiEffect) {
-        viewModelScope.launchSetState {
-            copy(pendingUiEffects = pendingUiEffects - action.effect)
+            // And emit an open episode ui effect
+            _uiEffects.emit(OpenEpisodeUiEffect(action.episodeId, episode.seasonId))
         }
     }
 
     private fun onMarkSeasonWatched(action: MarkSeasonWatchedAction) {
-        changeSeasonWatchedStatus(Params(action.seasonId, Action.WATCHED, action.onlyAired, action.date))
-            .watchStatus()
+        changeSeasonWatchedStatus(
+            Params(action.seasonId, Action.WATCHED, action.onlyAired, action.date)
+        ).watchStatus()
     }
 
     private fun onMarkSeasonUnwatched(action: MarkSeasonUnwatchedAction) {
@@ -237,17 +235,16 @@ internal class ShowDetailsFragmentViewModel @AssistedInject constructor(
     }
 
     private fun onChangeSeasonExpandState(seasonId: Long, expanded: Boolean) {
-        viewModelScope.launchSetState {
-            val pending = ArrayList(pendingUiEffects)
-            pending.removeAll { it is FocusSeasonUiEffect }
-
+        viewModelScope.launch {
+            setState {
+                when {
+                    expanded -> copy(expandedSeasonIds = expandedSeasonIds + seasonId)
+                    else -> copy(expandedSeasonIds = expandedSeasonIds - seasonId)
+                }
+            }
             if (expanded) {
-                copy(
-                    pendingUiEffects = pending + FocusSeasonUiEffect(seasonId),
-                    expandedSeasonIds = expandedSeasonIds + seasonId
-                )
-            } else {
-                copy(expandedSeasonIds = expandedSeasonIds - seasonId)
+                // If we've expanded, focus the season
+                _uiEffects.emit(FocusSeasonUiEffect(seasonId))
             }
         }
     }
diff --git a/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsViewState.kt b/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsViewState.kt
index 57d3cdea2e..f0179da2d2 100644
--- a/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsViewState.kt
+++ b/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsViewState.kt
@@ -37,7 +37,6 @@ data class ShowDetailsViewState(
     val watchStats: FollowedShowsWatchStats? = null,
     val seasons: List<SeasonWithEpisodesAndWatches> = emptyList(),
     val expandedSeasonIds: Set<Long> = emptySet(),
-    val pendingUiEffects: List<UiEffect> = emptyList(), // TODO this should really be a queue
     val refreshing: Boolean = false,
     val refreshError: UiError? = null
 )
diff --git a/ui-trending/build.gradle b/ui-trending/build.gradle
index 18740b782b..6fcf434821 100644
--- a/ui-trending/build.gradle
+++ b/ui-trending/build.gradle
@@ -74,9 +74,6 @@ dependencies {
     implementation Libs.AndroidX.Compose.animation
     implementation Libs.AndroidX.Compose.tooling
 
-    implementation Libs.Mdc.material
-    implementation Libs.Mdc.composeThemeAdapter
-
     implementation Libs.Accompanist.coil
     implementation Libs.Accompanist.insets
 
diff --git a/ui-trending/src/main/java/app/tivi/home/trending/TrendingShowsFragment.kt b/ui-trending/src/main/java/app/tivi/home/trending/TrendingShowsFragment.kt
index cd1a9ac8fa..526a2ce8b4 100644
--- a/ui-trending/src/main/java/app/tivi/home/trending/TrendingShowsFragment.kt
+++ b/ui-trending/src/main/java/app/tivi/home/trending/TrendingShowsFragment.kt
@@ -30,9 +30,12 @@ import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import app.tivi.common.compose.AmbientHomeTextCreator
 import app.tivi.common.compose.AmbientTiviDateFormatter
-import app.tivi.common.compose.TiviContentSetup
 import app.tivi.common.compose.paging.collectAsLazyPagingItems
+import app.tivi.common.compose.shouldUseDarkColors
+import app.tivi.common.compose.theme.TiviTheme
+import app.tivi.extensions.DefaultNavOptions
 import app.tivi.home.HomeTextCreator
+import app.tivi.settings.TiviPreferences
 import app.tivi.util.TiviDateFormatter
 import dagger.hilt.android.AndroidEntryPoint
 import dev.chrisbanes.accompanist.insets.AmbientWindowInsets
@@ -46,6 +49,7 @@ import javax.inject.Inject
 class TrendingShowsFragment : Fragment() {
     @Inject internal lateinit var tiviDateFormatter: TiviDateFormatter
     @Inject internal lateinit var homeTextCreator: HomeTextCreator
+    @Inject lateinit var preferences: TiviPreferences
 
     private val pendingActions = Channel<TrendingAction>(Channel.BUFFERED)
 
@@ -72,7 +76,7 @@ class TrendingShowsFragment : Fragment() {
                 AmbientHomeTextCreator provides homeTextCreator,
                 AmbientWindowInsets provides windowInsets,
             ) {
-                TiviContentSetup {
+                TiviTheme(useDarkColors = preferences.shouldUseDarkColors()) {
                     Trending(
                         lazyPagingItems = pagedList.collectAsLazyPagingItems { old, new ->
                             old.entry.id == new.entry.id
@@ -91,7 +95,10 @@ class TrendingShowsFragment : Fragment() {
             pendingActions.consumeAsFlow().collect { action ->
                 when (action) {
                     is TrendingAction.OpenShowDetails -> {
-                        findNavController().navigate("app.tivi://show/${action.showId}".toUri())
+                        findNavController().navigate(
+                            "app.tivi://show/${action.showId}".toUri(),
+                            DefaultNavOptions
+                        )
                     }
                     // else -> viewModel.submitAction(action)
                 }
diff --git a/ui-watched/build.gradle b/ui-watched/build.gradle
index 8ecb48a8ba..e5d9cf30af 100644
--- a/ui-watched/build.gradle
+++ b/ui-watched/build.gradle
@@ -65,7 +65,6 @@ dependencies {
     implementation Libs.AndroidX.Paging.runtime
     implementation Libs.AndroidX.Paging.compose
 
-    implementation Libs.AndroidX.appcompat
     implementation Libs.AndroidX.coreKtx
     implementation Libs.AndroidX.Fragment.fragment
     implementation Libs.AndroidX.Fragment.fragmentKtx
@@ -80,9 +79,6 @@ dependencies {
     implementation Libs.AndroidX.Compose.tooling
     implementation Libs.AndroidX.Compose.livedata
 
-    implementation Libs.Mdc.material
-    implementation Libs.Mdc.composeThemeAdapter
-
     implementation Libs.Accompanist.coil
     implementation Libs.Accompanist.insets
 
diff --git a/ui-watched/src/main/java/app/tivi/home/watched/WatchedFragment.kt b/ui-watched/src/main/java/app/tivi/home/watched/WatchedFragment.kt
index 206a78c2fc..fb05594d46 100644
--- a/ui-watched/src/main/java/app/tivi/home/watched/WatchedFragment.kt
+++ b/ui-watched/src/main/java/app/tivi/home/watched/WatchedFragment.kt
@@ -33,8 +33,11 @@ import androidx.navigation.fragment.findNavController
 import androidx.paging.compose.collectAsLazyPagingItems
 import app.tivi.common.compose.AmbientHomeTextCreator
 import app.tivi.common.compose.AmbientTiviDateFormatter
-import app.tivi.common.compose.TiviContentSetup
+import app.tivi.common.compose.shouldUseDarkColors
+import app.tivi.common.compose.theme.TiviTheme
+import app.tivi.extensions.DefaultNavOptions
 import app.tivi.home.HomeTextCreator
+import app.tivi.settings.TiviPreferences
 import app.tivi.util.TiviDateFormatter
 import dagger.hilt.android.AndroidEntryPoint
 import dev.chrisbanes.accompanist.insets.AmbientWindowInsets
@@ -48,6 +51,7 @@ import javax.inject.Inject
 class WatchedFragment : Fragment() {
     @Inject internal lateinit var tiviDateFormatter: TiviDateFormatter
     @Inject internal lateinit var homeTextCreator: HomeTextCreator
+    @Inject lateinit var preferences: TiviPreferences
 
     private val viewModel: WatchedViewModel by viewModels()
 
@@ -57,7 +61,7 @@ class WatchedFragment : Fragment() {
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? = ComposeView(requireContext()).apply {
+    ): View = ComposeView(requireContext()).apply {
         layoutParams = ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT)
 
         // We use ViewWindowInsetObserver rather than ProvideWindowInsets
@@ -70,7 +74,7 @@ class WatchedFragment : Fragment() {
                 AmbientHomeTextCreator provides homeTextCreator,
                 AmbientWindowInsets provides windowInsets,
             ) {
-                TiviContentSetup {
+                TiviTheme(useDarkColors = preferences.shouldUseDarkColors()) {
                     val viewState by viewModel.liveData.observeAsState()
                     if (viewState != null) {
                         Watched(
@@ -95,7 +99,10 @@ class WatchedFragment : Fragment() {
                         findNavController().navigate("app.tivi://account".toUri())
                     }
                     is WatchedAction.OpenShowDetails -> {
-                        findNavController().navigate("app.tivi://show/${action.showId}".toUri())
+                        findNavController().navigate(
+                            "app.tivi://show/${action.showId}".toUri(),
+                            DefaultNavOptions
+                        )
                     }
                     else -> viewModel.submitAction(action)
                 }