diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f4795da37..fc7e2d61c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,6 +23,7 @@ env:
 
 jobs:
   build-android:
+    needs: android-screenshot-test
     runs-on: ubuntu-latest
     env:
       TMDB_API_KEY: ${{ secrets.TMDB_API_KEY }}
@@ -73,12 +74,19 @@ jobs:
             -Pandroidx.baselineprofile.skipgeneration=true \
             --no-configuration-cache
 
-
-  android-lint:
+  android-screenshot-test:
     runs-on: ubuntu-latest
+    timeout-minutes: 45
+    permissions:
+      contents: write
+      pull-requests: write
+
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up JDK
+        uses: actions/setup-java@v4
         with:
           distribution: ${{ env.DISTRIBUTION }}
           java-version: ${{ env.JDK_VERSION }}
@@ -91,17 +99,47 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
 
-      - name: Lint Project
-        run: ./gradlew lint
+      - name: Install Dependencies
+        run: ./gradlew dependencies
 
-      - name: Upload Lint Report
+      - name: Roborazzi Screenshot Tests
+        id: screenshotsverify
+        continue-on-error: true
+        run: ./gradlew clean verifyRoborazziDebug
+
+      - name: Generate Roborazzi Screenshot Report
+        id: screenshots-report
+        continue-on-error: true
+        run: ./gradlew compareRoborazziDebug
+
+      - name: Prevent Pushing New Screenshots if This is a Fork
+        id: checkfork_screenshots
+        if: steps.screenshotsverify.outcome == 'failure' && github.event.pull_request.head.repo.full_name != github.repository
+        run: |
+          echo "::error::Screenshot tests failed, please create a PR in your fork first." && exit 1
+
+      - name: Generate New Screenshots if Verification Failed and It's a PR
+        id: screenshotsrecord
+        if: steps.screenshotsverify.outcome == 'failure' && github.event_name == 'pull_request'
+        run: ./gradlew recordRoborazziDebug
+
+      - name: Push New Screenshots if Available
+        uses: stefanzweifel/git-auto-commit-action@v5
+        if: steps.screenshotsrecord.outcome == 'success'
+        with:
+          file_pattern: '**/*.png'
+          disable_globbing: true
+          commit_message: "🤖 Beep Beep: Update screenshots 🤖"
+
+      - name: Upload Screenshot Results
+        if: ${{ !cancelled() }}
         uses: actions/upload-artifact@v4
-        if: always()
         with:
-          name: android-lint-report
-          path: app/build/reports/lint-results*.html
+          name: screenshot-test-results
+          path: '**/build/outputs/roborazzi/*_compare.png'
 
-  spotless:
+  android-lint:
+    needs: android-screenshot-test
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -118,20 +156,17 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
 
-      - name: Run Spotless
-        run: ./gradlew spotlessCheck
+      - name: Lint Project
+        run: ./gradlew :android:app:lintRelease
 
-      - name: Upload Spotless Report
+      - name: Upload Lint Report
+        if: ${{ !cancelled() }}
         uses: actions/upload-artifact@v4
-        if: always()
         with:
-          name: spotless-report
-          path: |
-            **/build/reports/spotless
-            app/build/reports/spotless
-
+          name: android-lint-report
+          path: '**/build/reports/lint-results-*.html'
 
-  dependency-health:
+  spotless:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -148,29 +183,14 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
 
-      - name: Dependency Health
-        run: ./gradlew buildHealth
-
-      - name: Upload Dependency Report
-        uses: actions/upload-artifact@v4
-        if: always()
-        with:
-          name: dependency-health-report
-          path: ./**/build/reports/tests/
+      - name: Run Spotless
+        run: ./gradlew spotlessCheck --no-configuration-cache
 
-  android-screenshot-test:
+  dependency-health:
     runs-on: ubuntu-latest
-    timeout-minutes: 45
-    permissions:
-      contents: write
-      pull-requests: write
-
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set up JDK
-        uses: actions/setup-java@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: ${{ env.DISTRIBUTION }}
           java-version: ${{ env.JDK_VERSION }}
@@ -183,43 +203,15 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
 
-      - name: Roborazzi screenshot tests
-        id: screenshotsverify
-        continue-on-error: true
-        run: ./gradlew clean verifyRoborazziDebug
-
-      - name: Generate Roborazzi screenshot Report
-        id: screenshots-report
-        continue-on-error: true
-        run: ./gradlew compareRoborazziDebug
-
-      - name: Prevent pushing new screenshots if this is a fork
-        id: checkfork_screenshots
-        continue-on-error: false
-        if: steps.screenshotsverify.outcome == 'failure' && github.event.pull_request.head.repo.full_name != github.repository
-        run: |
-          echo "::error::Screenshot tests failed, please create a PR in your fork first." && exit 1
-
-      - name: Generate new screenshots if verification failed and it's a PR
-        id: screenshotsrecord
-        if: steps.screenshotsverify.outcome == 'failure' && github.event_name == 'pull_request'
-        run: |
-          ./gradlew recordRoborazziDebug
-
-      - name: Push new screenshots if available
-        uses: stefanzweifel/git-auto-commit-action@v5
-        if: steps.screenshotsrecord.outcome == 'success'
-        with:
-          file_pattern: '*/*.png'
-          disable_globbing: true
-          commit_message: "🤖 Beep Beep: Update screenshots 🤖"
+      - name: Dependency Health
+        run: ./gradlew buildHealth
 
-      - name: Upload screenshot results
-        if: always()
+      - name: Upload Dependency health Report
         uses: actions/upload-artifact@v4
+        if: always()
         with:
-          name: screenshot-test-results
-          path: '**/build/outputs/roborazzi/*_compare.png'
+          name: dependency-health-report
+          path: '**/build/reports/dependency-analysis/build-health-report.txt'
 
   jvm-test:
     runs-on: ubuntu-latest
@@ -241,12 +233,12 @@ jobs:
       - name: Run JVM Tests
         run: ./gradlew jvmTest
 
-      - name: Upload Test Report
+      - name: Upload Test Reports
         uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: jvm-test-report
-          path: ./**/build/reports/tests/
+          name: test-report
+          path: '**/build/reports/*'
 
   common-test:
     runs-on: macos-latest
@@ -282,7 +274,7 @@ jobs:
         if: always()
         with:
           name: common-test-report
-          path: ./**/build/reports/tests/
+          path: '**/build/reports/*'
 
   build-ios:
     runs-on: macos-15
diff --git a/README.md b/README.md
index 4f533a19e..d94aa5fcc 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,6 @@ TvManiac
 ![kmp](https://img.shields.io/badge/multiplatform-%237F52FF.svg?style=for-the-badge&logo=kotlin&logoColor=white)
 ![compose](https://img.shields.io/badge/jetpack_compose-2bab6b.svg?style=for-the-badge&logo=android&logoColor=white)
 ![swiftui](https://img.shields.io/badge/swiftui-%23000000.svg?style=for-the-badge&logo=swift&logoColor=white)
-[![TvManiac Debug](https://img.shields.io/badge/Debug--Apk-download-green?style=for-the-badge&logo=android)](https://github.com/c0de-wizard/tv-maniac/releases/latest/download/app-debug.apk)
 
 **TvManiac** is a personalized entertainment tracking and recommendation Multiplatform app. By utilizing
 [TMDB](https://developer.themoviedb.org/docs), we can view shows, create a watchlist get statistics, and much more. This project aims to demonstrate KMP development capabilities. This is currently running on:
@@ -17,7 +16,7 @@ This is my playground for learning Kotlin Multiplatform. With that said, I'm sur
 
 | Android | iOS |
 | -- | -- |
-| <video src="https://github.com/thomaskioko/tv-maniac/assets/841885/a9991256-27a8-4a99-87f3-0f071c7cbc68" width=350/> | <video src="https://github.com/user-attachments/assets/d446aabc-5569-456b-9964-bbd1a9bfe371" width=350/> |
+| <video src="https://github.com/user-attachments/assets/90ec7924-7d50-40a4-bb0b-89d79aa9bbcd" width=350/> | <video src="https://github.com/user-attachments/assets/69f101b7-e100-4775-9893-6687e455560c" width=350/> |
 
 
 > [!IMPORTANT]
@@ -40,68 +39,6 @@ This is my playground for learning Kotlin Multiplatform. With that said, I'm sur
 ![TvManiac Architecture](https://github.com/thomaskioko/tv-maniac/assets/841885/84e314fc-71a5-40e5-b034-213e6b546f9a)
 
 
-### Android Screenshots
-
-<table>
-  <td>
-    <p align="center">
-      <img src="https://github.com/c0de-wizard/tv-maniac/blob/main/art/AndroidHomeLight.png?raw=true" alt="Home Screen Light" width="500"/>
-    </p>
-  </td>
-    <td>
-    <p align="center">
-      <img src="https://github.com/c0de-wizard/tv-maniac/blob/main/art/AndroidDetailLight.png?raw=true" alt="Home Screen Light" width="500"/>
-    </p>
-  </td>
-    <td>
-    <p align="center">
-      <img src="https://github.com/c0de-wizard/tv-maniac/blob/main/art/EpisodeListLight.png?raw=true" alt="Episodes List Light" width="500"/>
-    </p>
-  </td>
-  <td>
-    <p align="center">
-      <img src="https://github.com/c0de-wizard/tv-maniac/blob/main/art/AnroidHomeDark.png?raw=true" alt="Show Details Dark" width="500"/>
-    </p>
-  </td>
-</tr>
-    <td>
-    <p align="center">
-      <img src="https://github.com/c0de-wizard/tv-maniac/blob/main/art/AnroidDetailDark.png?raw=true" alt="Show Details Dark" width="500"/>
-    </p>
-  </td>
-  <td>
-    <p align="center">
-      <img src="https://github.com/c0de-wizard/tv-maniac/blob/main/art/EpisodeListDark.png?raw=true" alt="Episodes List Dark" width="500"/>
-    </p>
-  </td>
-</table>
-
-### 🔆 iOS Screenshots
-
-<table>
-  <td>
-    <p align="center">
-      <img src="https://github.com/c0de-wizard/tv-maniac/blob/main/art/iOSHomeLight.png?raw=true" alt="Home Screen Light" width="500"/>
-    </p>
-  </td>
-    <td>
-    <p align="center">
-      <img src="https://github.com/c0de-wizard/tv-maniac/blob/main/art/iOSDetailLight.png?raw=true" alt="Home Screen Light" width="500"/>
-    </p>
-  </td>
-    <td>
-    <p align="center">
-      <img src="https://github.com/c0de-wizard/tv-maniac/blob/main/art/iOSHomeDark.png?raw=true" alt="Home Screen Dark" width="500"/>
-    </p>
-  </td>
-  <td>
-    <p align="center">
-      <img src="https://github.com/c0de-wizard/tv-maniac/blob/main/art/iOSDetailDark.png?raw=true" alt="Show Details Dark" width="500"/>
-    </p>
-  </td>
-</tr>
-</table>
-
 ## Libraries Used
 ### Android
 * [Accompanist](https://github.com/google/accompanist)
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 8ba0c32f8..e1d450805 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -79,7 +79,6 @@ dependencies {
   implementation(libs.androidx.core.core)
   implementation(libs.androidx.core.splashscreen)
   implementation(libs.androidx.compose.material3)
-  implementation(libs.androidx.profileinstaller)
   implementation(libs.appauth)
 
   implementation(libs.decompose.decompose)
@@ -99,6 +98,8 @@ dependencies {
   implementation(libs.ktor.core)
 
   baselineProfile(projects.android.benchmark)
+
+  runtimeOnly(libs.androidx.profileinstaller)
 }
 
 baselineProfile {
diff --git a/android/app/src/main/res/values-night/colors.xml b/android/app/src/main/res/values-night/colors.xml
index f01c039e8..3ea04e700 100644
--- a/android/app/src/main/res/values-night/colors.xml
+++ b/android/app/src/main/res/values-night/colors.xml
@@ -1,5 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_launcher_background_tint">#FCFCFC</color>
-    <color name="ic_launcher_foreground_tint">#1F2123</color>
-</resources>
+<resources></resources>
diff --git a/android/app/src/main/res/values-night/themes.xml b/android/app/src/main/res/values-night/themes.xml
index 8b869c6d1..2cbb26aab 100644
--- a/android/app/src/main/res/values-night/themes.xml
+++ b/android/app/src/main/res/values-night/themes.xml
@@ -4,7 +4,7 @@
     <style name="NightAdjusted.Theme.TvManiac" parent="android:Theme.Material.NoActionBar" />
 
     <style name="NightAdjusted.Theme.Splash" parent="Theme.SplashScreen">
-        <item name="android:windowLightStatusBar" tools:targetApi="23">false</item>
+        <item name="android:windowLightStatusBar" >false</item>
         <item name="android:windowLightNavigationBar" tools:targetApi="27">false</item>
     </style>
 
diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
index 8e59d9bca..3ea04e700 100644
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -1,5 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_launcher_background_tint">#000000</color>
-    <color name="ic_launcher_foreground_tint">#FCFCFC</color>
-</resources>
+<resources></resources>
diff --git a/android/app/src/main/res/values/themes.xml b/android/app/src/main/res/values/themes.xml
index 16d335a44..99c75908b 100644
--- a/android/app/src/main/res/values/themes.xml
+++ b/android/app/src/main/res/values/themes.xml
@@ -6,7 +6,7 @@
     <style name="Theme.TvManiac" parent="NightAdjusted.Theme.TvManiac" />
 
     <style name="NightAdjusted.Theme.Splash" parent="Theme.SplashScreen">
-        <item name="android:windowLightStatusBar" tools:targetApi="23">true</item>
+        <item name="android:windowLightStatusBar" >true</item>
         <item name="android:windowLightNavigationBar" tools:targetApi="27">true</item>
     </style>
 
diff --git a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Buttons.kt b/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Buttons.kt
index e218e670a..15434840e 100644
--- a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Buttons.kt
+++ b/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Buttons.kt
@@ -1,35 +1,50 @@
 package com.thomaskioko.tvmaniac.compose.components
 
+import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.sizeIn
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.widthIn
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.LibraryAddCheck
 import androidx.compose.material3.ButtonColors
 import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.graphics.luminance
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import com.thomaskioko.tvmaniac.compose.extensions.iconButtonBackgroundScrim
 import com.thomaskioko.tvmaniac.compose.theme.TvManiacTheme
 
 @Composable
-fun TvManiacTextButton(
+fun FilledTextButton(
   onClick: () -> Unit,
   modifier: Modifier = Modifier,
   enabled: Boolean = true,
@@ -48,66 +63,164 @@ fun TvManiacTextButton(
 }
 
 @Composable
-fun TvManiacOutlinedButton(
+fun FilledVerticalIconButton(
   text: String,
   onClick: () -> Unit,
+  imageVector: ImageVector,
   modifier: Modifier = Modifier,
   enabled: Boolean = true,
-  textPadding: Dp = 0.dp,
-  borderColor: Color = MaterialTheme.colorScheme.secondary,
-  leadingIcon: @Composable (() -> Unit)? = null,
+  shape: Shape = RectangleShape,
+  style: TextStyle = MaterialTheme.typography.bodyMedium,
+  containerColor: Color = MaterialTheme.colorScheme.secondary,
 ) {
-  TvManiacOutlinedButton(
+
+  TextButtonContent(
     onClick = onClick,
     modifier = modifier,
     enabled = enabled,
-    borderColor = borderColor,
-    contentPadding =
-      if (leadingIcon != null) {
-        ButtonDefaults.ButtonWithIconContentPadding
-      } else {
-        ButtonDefaults.ContentPadding
-      },
-  ) {
-    TvManiacButtonContent(
-      text = {
+    containerColor = containerColor,
+    shape = shape,
+    content = {
+      Column(
+        modifier = Modifier
+          .sizeIn(minWidth = 120.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
+      ) {
+        Icon(
+          imageVector = imageVector,
+          contentDescription = null,
+          tint = when {
+            enabled -> MaterialTheme.colorScheme.onSecondary
+            else -> MaterialTheme.colorScheme.onSurface.copy(alpha = 0.12f)
+          },
+        )
+
         Text(
+          modifier = Modifier.padding(top = 2.dp),
           text = text,
-          style = MaterialTheme.typography.bodyMedium,
-          color =
-            when {
-              enabled -> MaterialTheme.colorScheme.secondary
-              else -> MaterialTheme.colorScheme.onSurface.copy(alpha = 0.12f)
-            },
-          modifier = Modifier.padding(textPadding),
+          style = style,
+          color = when {
+            enabled -> MaterialTheme.colorScheme.onSecondary
+            else -> MaterialTheme.colorScheme.onSurface.copy(alpha = 0.12f)
+          },
         )
-      },
-      leadingIcon = leadingIcon,
-    )
+      }
+    },
+  )
+}
+
+@Composable
+fun FilledHorizontalIconButton(
+  text: String,
+  onClick: () -> Unit,
+  imageVector: ImageVector,
+  modifier: Modifier = Modifier,
+  enabled: Boolean = true,
+  shape: Shape = RectangleShape,
+  style: TextStyle = MaterialTheme.typography.bodyMedium,
+  containerColor: Color = MaterialTheme.colorScheme.secondary,
+) {
+  TextButtonContent(
+    onClick = onClick,
+    modifier = modifier,
+    enabled = enabled,
+    containerColor = containerColor,
+    shape = shape,
+    content = {
+      Row(
+        modifier = Modifier
+          .sizeIn(minHeight = 32.dp, minWidth = 140.dp),
+        horizontalArrangement = Arrangement.Center,
+        verticalAlignment = Alignment.CenterVertically,
+      ) {
+        Icon(
+          imageVector = imageVector,
+          contentDescription = null,
+          tint = when {
+            enabled -> MaterialTheme.colorScheme.onSecondary
+            else -> MaterialTheme.colorScheme.onSurface.copy(alpha = 0.12f)
+          },
+        )
+
+        Spacer(modifier = Modifier.width(8.dp))
+
+        Text(
+          text = text,
+          style = style,
+          color = when {
+            enabled -> MaterialTheme.colorScheme.onSecondary
+            else -> MaterialTheme.colorScheme.onSurface.copy(alpha = 0.12f)
+          },
+        )
+      }
+    },
+  )
+}
+
+@Composable
+private fun TextButtonContent(
+  onClick: () -> Unit,
+  enabled: Boolean,
+  containerColor: Color,
+  shape: Shape,
+  content: @Composable () -> Unit,
+  modifier: Modifier = Modifier,
+) {
+  TextButton(
+    onClick = onClick,
+    modifier = modifier,
+    enabled = enabled,
+    colors = ButtonDefaults.buttonColors(
+      contentColor = MaterialTheme.colorScheme.onBackground,
+      containerColor = containerColor,
+    ),
+    shape = shape,
+  ) {
+    content()
   }
 }
 
 @Composable
-fun TvManiacOutlinedButton(
+fun HorizontalOutlinedButton(
+  text: String,
   onClick: () -> Unit,
-  borderColor: Color,
   modifier: Modifier = Modifier,
   enabled: Boolean = true,
+  textPadding: Dp = 0.dp,
   shape: Shape = MaterialTheme.shapes.small,
-  contentPadding: PaddingValues = ButtonDefaults.ContentPadding,
-  content: @Composable RowScope.() -> Unit,
+  borderColor: Color = MaterialTheme.colorScheme.secondary,
+  leadingIcon: @Composable (() -> Unit)? = null,
 ) {
   OutlinedButton(
     onClick = onClick,
     modifier = modifier.padding(2.dp),
     enabled = enabled,
     shape = shape,
-    contentPadding = contentPadding,
-    content = content,
-    colors =
-      ButtonDefaults.outlinedButtonColors(
-        contentColor = MaterialTheme.colorScheme.onSecondary,
-      ),
+    content = {
+      if (leadingIcon != null) {
+        Box(Modifier.sizeIn(maxHeight = ButtonDefaults.IconSize)) { leadingIcon() }
+      }
+      Box(
+        Modifier.padding(
+          start =
+            when {
+              leadingIcon != null -> ButtonDefaults.IconSpacing
+              else -> 0.dp
+            },
+        ),
+      ) {
+        Text(
+          text = text,
+          style = MaterialTheme.typography.bodyMedium,
+          color = if (enabled) MaterialTheme.colorScheme.secondary
+          else MaterialTheme.colorScheme.onSurface.copy(alpha = 0.12f),
+          modifier = Modifier.padding(textPadding),
+        )
+      }
+    },
+    colors = ButtonDefaults.outlinedButtonColors(
+      contentColor = MaterialTheme.colorScheme.onSecondary,
+    ),
     border =
       BorderStroke(
         width = 1.dp,
@@ -121,32 +234,97 @@ fun TvManiacOutlinedButton(
 }
 
 @Composable
-private fun TvManiacButtonContent(
-  text: @Composable () -> Unit,
-  leadingIcon: @Composable (() -> Unit)? = null,
+fun OutlinedVerticalIconButton(
+  text: String,
+  onClick: () -> Unit,
+  modifier: Modifier = Modifier,
+  enabled: Boolean = true,
+  shape: Shape = MaterialTheme.shapes.small,
+  borderColor: Color = MaterialTheme.colorScheme.secondary,
+  leadingIcon: @Composable (() -> Unit) = {},
 ) {
-  if (leadingIcon != null) {
-    Box(Modifier.sizeIn(maxHeight = ButtonDefaults.IconSize)) { leadingIcon() }
-  }
-  Box(
-    Modifier.padding(
-      start =
+  OutlinedButton(
+    onClick = onClick,
+    modifier = modifier.widthIn(min = 140.dp),
+    enabled = enabled,
+    shape = shape,
+    content = {
+      Column(
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.Center,
+      ) {
+
+        leadingIcon()
+
+        Text(
+          text = text,
+          style = MaterialTheme.typography.bodyMedium,
+          color =
+            when {
+              enabled -> MaterialTheme.colorScheme.secondary
+              else -> MaterialTheme.colorScheme.onSurface.copy(alpha = 0.12f)
+            },
+          modifier = Modifier.padding(top = 2.dp),
+        )
+      }
+    },
+    colors = ButtonDefaults.outlinedButtonColors(
+      contentColor = MaterialTheme.colorScheme.onSecondary,
+    ),
+    border = BorderStroke(
+      width = 1.dp,
+      color =
         when {
-          leadingIcon != null -> ButtonDefaults.IconSpacing
-          else -> 0.dp
+          enabled -> borderColor
+          else -> MaterialTheme.colorScheme.onSurface.copy(alpha = 0.12f)
         },
     ),
-  ) {
-    text()
+  )
+}
+
+@Composable
+fun ScrimButton(
+  onClick: () -> Unit,
+  modifier: Modifier = Modifier,
+  show: Boolean = false,
+  color: Color = MaterialTheme.colorScheme.surface,
+  alpha: Float = 0.4f,
+  content: @Composable () -> Unit,
+) {
+  val isLight = color.luminance() > 0.5
+  TvManiacTheme(darkTheme = if (!show) isLight else !isLight) {
+    IconButton(
+      onClick = onClick,
+      modifier = modifier.iconButtonBackgroundScrim(enabled = !show, alpha = alpha),
+    ) {
+      content()
+    }
+  }
+}
+
+@Composable
+fun RefreshButton(
+  isRefreshing: Boolean,
+  modifier: Modifier = Modifier,
+  content: @Composable () -> Unit,
+) {
+  Crossfade(isRefreshing, label = "ActionButtonCrossfade") { targetRefreshing ->
+    if (targetRefreshing) {
+      AutoSizedCircularProgressIndicator(
+        modifier = modifier,
+      )
+    } else {
+      content()
+    }
   }
 }
 
 @ThemePreviews
 @Composable
-private fun TvManiacTextButtonPreview() {
+private fun FilledTextButtonPreview() {
   TvManiacTheme {
     Surface {
-      TvManiacTextButton(
+      FilledTextButton(
         onClick = {},
         enabled = false,
         buttonColors =
@@ -155,7 +333,8 @@ private fun TvManiacTextButtonPreview() {
             containerColor = MaterialTheme.colorScheme.secondary,
           ),
         modifier =
-          Modifier.fillMaxWidth()
+          Modifier
+            .fillMaxWidth()
             .padding(2.dp)
             .background(color = MaterialTheme.colorScheme.secondary),
       ) {
@@ -169,12 +348,42 @@ private fun TvManiacTextButtonPreview() {
   }
 }
 
+@ThemePreviews
+@Composable
+private fun FilledIconButtonPreview(@PreviewParameter(ButtonPreviewParamProvider::class) isEnable: Boolean) {
+  TvManiacTheme {
+    Surface {
+      FilledVerticalIconButton(
+        onClick = {},
+        enabled = isEnable,
+        text = "Track",
+        imageVector = Icons.Default.LibraryAddCheck,
+      )
+    }
+  }
+}
+
+@ThemePreviews
+@Composable
+private fun FilledHorizontalIconButtonPreview(@PreviewParameter(ButtonPreviewParamProvider::class) isEnable: Boolean) {
+  TvManiacTheme {
+    Surface {
+      FilledHorizontalIconButton(
+        onClick = {},
+        enabled = isEnable,
+        text = "Add To Library",
+        imageVector = Icons.Default.LibraryAddCheck,
+      )
+    }
+  }
+}
+
 @ThemePreviews
 @Composable
 private fun TvManiacAlphaTextButtonPreview() {
   TvManiacTheme {
     Surface {
-      TvManiacTextButton(
+      FilledTextButton(
         onClick = {},
         enabled = false,
         buttonColors =
@@ -198,7 +407,7 @@ private fun TvManiacAlphaTextButtonPreview() {
 private fun TvManiacOutlinedButtonPreview() {
   TvManiacTheme {
     Surface {
-      TvManiacOutlinedButton(
+      OutlinedVerticalIconButton(
         onClick = {},
         enabled = true,
         leadingIcon = {
@@ -218,3 +427,11 @@ private fun TvManiacOutlinedButtonPreview() {
     }
   }
 }
+
+
+private class ButtonPreviewParamProvider : PreviewParameterProvider<Boolean> {
+  override val values: Sequence<Boolean> = sequenceOf(
+    true,
+    false,
+  )
+}
diff --git a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Dialogs.kt b/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Dialogs.kt
index e2d175643..8a6841c3e 100644
--- a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Dialogs.kt
+++ b/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Dialogs.kt
@@ -51,7 +51,7 @@ fun BasicDialog(
       )
     },
     confirmButton = {
-      TvManiacOutlinedButton(
+      HorizontalOutlinedButton(
         enabled = enableConfirmButton,
         text = confirmButtonText,
         onClick = confirmButtonClicked,
@@ -59,7 +59,7 @@ fun BasicDialog(
     },
     dismissButton = {
       dismissButtonText?.let {
-        TvManiacOutlinedButton(
+        HorizontalOutlinedButton(
           enabled = enableDismissButton,
           text = dismissButtonText,
           onClick = dismissButtonClicked,
diff --git a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/EmptyLayout.kt b/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/EmptyLayout.kt
index bb11a8f46..5b09f4cb1 100644
--- a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/EmptyLayout.kt
+++ b/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/EmptyLayout.kt
@@ -61,7 +61,7 @@ fun EmptyContent(
     }
 
     buttonText?.let {
-      TvManiacOutlinedButton(
+      HorizontalOutlinedButton(
         modifier = Modifier.padding(top = 16.dp),
         text = buttonText,
         onClick = onClick,
diff --git a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/ErrorLayout.kt b/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/ErrorLayout.kt
index 0a31b3d9d..a1d7d49c7 100644
--- a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/ErrorLayout.kt
+++ b/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/ErrorLayout.kt
@@ -106,7 +106,7 @@ fun ErrorUi(
       Spacer(modifier = Modifier.height(8.dp))
 
       AnimatedVisibility(visible = showRetryButton) {
-        TvManiacOutlinedButton(
+        HorizontalOutlinedButton(
           text = "Retry",
           onClick = onRetry,
         )
@@ -134,7 +134,7 @@ fun RowError(
 
     Spacer(modifier = Modifier.height(8.dp))
 
-    TvManiacOutlinedButton(
+    HorizontalOutlinedButton(
       text = "Retry",
       onClick = onRetry,
     )
diff --git a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Image.kt b/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Image.kt
index 3bfad760f..3a31b86aa 100644
--- a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Image.kt
+++ b/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Image.kt
@@ -1,21 +1,32 @@
 package com.thomaskioko.tvmaniac.compose.components
 
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.pager.PagerState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.DefaultAlpha
 import androidx.compose.ui.graphics.FilterQuality
+import androidx.compose.ui.graphics.RectangleShape
+import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.graphics.drawscope.DrawScope
+import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.util.lerp
 import androidx.compose.ui.viewinterop.AndroidView
 import coil.compose.AsyncImage
 import coil.compose.AsyncImagePainter
 import coil.load
 import coil.request.ImageRequest
 import com.flaviofaria.kenburnsview.KenBurnsView
+import kotlin.math.absoluteValue
 
 @Composable
 fun AsyncImageComposable(
@@ -36,9 +47,9 @@ fun AsyncImageComposable(
     model =
       requestBuilder?.let { builder ->
         when (model) {
-            is ImageRequest -> model.newBuilder()
-            else -> ImageRequest.Builder(LocalContext.current).data(model)
-          }
+          is ImageRequest -> model.newBuilder()
+          else -> ImageRequest.Builder(LocalContext.current).data(model)
+        }
           .apply { this.builder() }
           .build()
       }
@@ -65,3 +76,46 @@ fun KenBurnsViewImage(
 
   AndroidView({ kenBuns }, modifier = modifier) { it.load(imageUrl) }
 }
+
+@Composable
+fun ParallaxCarouselImage(
+  state: PagerState,
+  currentPage: Int,
+  imageUrl: String?,
+  modifier: Modifier = Modifier,
+  shape: Shape = RectangleShape,
+  overlayContent: @Composable () -> Unit = {},
+) {
+  val currentPageOffset = calculatePageOffset(state, currentPage)
+  val cardTranslationX = lerp(100f, 0f, 1f - currentPageOffset)
+  val cardScaleX = lerp(0.8f, 1f, 1f - currentPageOffset.absoluteValue.coerceIn(0f, 1f))
+  val screenWidth = LocalConfiguration.current.screenWidthDp
+  val parallaxOffset = currentPageOffset * screenWidth * 2f
+
+  Box(
+    modifier = modifier
+      .fillMaxWidth()
+      .graphicsLayer {
+        scaleX = cardScaleX
+        translationX = cardTranslationX
+      },
+  ) {
+    AsyncImageComposable(
+      modifier = Modifier
+        .fillMaxSize()
+        .clip(shape)
+        .graphicsLayer {
+          translationX = lerp(10f, 0f, 1f - currentPageOffset) + parallaxOffset
+        },
+      model = imageUrl,
+      contentDescription = null,
+      contentScale = ContentScale.Crop,
+    )
+
+    overlayContent()
+  }
+}
+
+private fun calculatePageOffset(state: PagerState, currentPage: Int): Float {
+  return (state.currentPage + state.currentPageOffsetFraction - currentPage).coerceIn(-1f, 1f)
+}
diff --git a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/SheetDragHandle.kt b/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/SheetDragHandle.kt
index 019e5c85a..b99b13d99 100644
--- a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/SheetDragHandle.kt
+++ b/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/SheetDragHandle.kt
@@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.KeyboardArrowDown
 import androidx.compose.material3.Icon
+import androidx.compose.material3.LocalContentColor
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
@@ -21,6 +22,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import com.thomaskioko.tvmaniac.compose.theme.TvManiacTheme
@@ -28,19 +31,29 @@ import com.thomaskioko.tvmaniac.compose.theme.TvManiacTheme
 @Composable
 fun SheetDragHandle(
   onClick: () -> Unit,
+  imageVector: ImageVector,
   modifier: Modifier = Modifier,
   title: String? = null,
+  textAlign: TextAlign? = null,
+  tint: Color = LocalContentColor.current
 ) {
   Box(
-    modifier =
-      modifier.fillMaxWidth().statusBarsPadding().height(56.dp).background(Color.Transparent),
+    modifier = modifier
+        .fillMaxWidth()
+        .statusBarsPadding()
+        .height(56.dp)
+        .background(Color.Transparent),
   ) {
     Row(
-      modifier = Modifier.fillMaxWidth().align(Alignment.CenterStart).padding(start = 16.dp),
+      modifier = Modifier
+        .fillMaxWidth()
+        .align(Alignment.CenterStart)
+        .padding(start = 16.dp),
       verticalAlignment = Alignment.CenterVertically,
     ) {
       Icon(
-        imageVector = Icons.Outlined.KeyboardArrowDown,
+        imageVector = imageVector,
+        tint = tint,
         contentDescription = "Expand/Collapse",
         modifier = Modifier.size(24.dp).clickable { onClick() },
       )
@@ -53,6 +66,8 @@ fun SheetDragHandle(
           style = MaterialTheme.typography.titleMedium,
           maxLines = 1,
           overflow = TextOverflow.Ellipsis,
+          textAlign = textAlign,
+          modifier = Modifier.fillMaxWidth()
         )
       }
     }
@@ -67,6 +82,7 @@ private fun CustomSheetDragHandlePreview() {
       SheetDragHandle(
         title = "Drag Handle",
         onClick = {},
+        imageVector = Icons.Outlined.KeyboardArrowDown
       )
     }
   }
diff --git a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Text.kt b/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Text.kt
index 7bc56eff6..cc2e8bc4c 100644
--- a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Text.kt
+++ b/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Text.kt
@@ -15,6 +15,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.font.FontWeight.Companion.Bold
@@ -105,6 +106,7 @@ fun ExpandingText(
   expandable: Boolean = true,
   collapsedMaxLines: Int = 4,
   expandedMaxLines: Int = Int.MAX_VALUE,
+  color: Color = MaterialTheme.colorScheme.onSurface,
 ) {
   var canTextExpand by remember(text) { mutableStateOf(true) }
   var expanded by remember { mutableStateOf(false) }
@@ -114,7 +116,7 @@ fun ExpandingText(
     style = textStyle,
     fontWeight = fontWeight,
     overflow = TextOverflow.Ellipsis,
-    color = MaterialTheme.colorScheme.onSurface,
+    color = color,
     maxLines = if (expanded) expandedMaxLines else collapsedMaxLines,
     modifier =
       modifier.clickable(
diff --git a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/TopBar.kt b/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/TopBar.kt
index be531c122..cbf4f51b6 100644
--- a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/TopBar.kt
+++ b/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/TopBar.kt
@@ -1,5 +1,6 @@
 package com.thomaskioko.tvmaniac.compose.components
 
+import android.annotation.SuppressLint
 import androidx.compose.animation.Crossfade
 import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.core.animateDpAsState
@@ -35,10 +36,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
-import androidx.compose.ui.graphics.luminance
 import androidx.compose.ui.layout.onSizeChanged
 import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.coerceAtLeast
@@ -46,7 +45,6 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.min
 import com.thomaskioko.tvmaniac.compose.extensions.iconButtonBackgroundScrim
 import com.thomaskioko.tvmaniac.compose.theme.TvManiacTheme
-import com.thomaskioko.tvmaniac.resources.R
 import kotlin.math.roundToInt
 
 @Composable
@@ -70,15 +68,17 @@ fun TvManiacTopBar(
 }
 
 @Composable
-fun CollapsableTopAppBar(
+fun RefreshCollapsableTopAppBar(
   listState: LazyListState,
-  title: String,
-  isUpdating: Boolean,
-  onNavIconPressed: () -> Unit,
   modifier: Modifier = Modifier,
-  onActionIconPressed: () -> Unit = {},
+  showActionIcon: Boolean = true,
+  isRefreshing: Boolean = false,
   scrollBehavior: TopAppBarScrollBehavior? = null,
-  showActionIcon: Boolean = true
+  title: @Composable () -> Unit = {},
+  navigationIcon: @Composable () -> Unit = {},
+  actionIcon: @Composable () -> Unit = {},
+  onNavIconClicked: () -> Unit = {},
+  onActionIconClicked: () -> Unit = {},
 ) {
   var appBarHeight by remember { mutableIntStateOf(0) }
   val showAppBarBackground by remember {
@@ -98,68 +98,99 @@ fun CollapsableTopAppBar(
     }
   }
 
-  CollapsableTopAppBar(
-    modifier = modifier.fillMaxWidth().onSizeChanged { appBarHeight = it.height },
+  RefreshCollapsableTopAppBar(
+    modifier = modifier
+      .fillMaxWidth()
+      .onSizeChanged { appBarHeight = it.height },
     title = title,
-    isRefreshing = isUpdating,
+    navigationIcon = navigationIcon,
+    actionIcon = actionIcon,
     showAppBarBackground = showAppBarBackground,
     scrollBehavior = scrollBehavior,
-    onRefresh = onActionIconPressed,
-    onNavIconPressed = onNavIconPressed,
-    showActionIcon = showActionIcon
+    onActionClicked = onActionIconClicked,
+    onNavIconPressed = onNavIconClicked,
+    showActionIcon = showActionIcon,
+    isRefreshing = isRefreshing
   )
 }
 
 @Composable
-internal fun CollapsableTopAppBar(
-  title: String?,
-  isRefreshing: Boolean,
+fun CollapsableTopAppBar(
+  listState: LazyListState,
+  modifier: Modifier = Modifier,
+  title: @Composable () -> Unit = {},
+  navigationIcon: @Composable () -> Unit = {},
+  primaryActionIcon: @Composable () -> Unit = {},
+  onPrimaryIconPressed: () -> Unit = {},
+) {
+  var appBarHeight by remember { mutableIntStateOf(0) }
+  val showAppBarBackground by remember {
+    derivedStateOf {
+      val visibleItemsInfo = listState.layoutInfo.visibleItemsInfo
+      when {
+        visibleItemsInfo.isEmpty() -> false
+        appBarHeight <= 0 -> false
+        else -> {
+          val firstVisibleItem = visibleItemsInfo[0]
+          when {
+            firstVisibleItem.index > 0 -> true
+            else -> firstVisibleItem.size + firstVisibleItem.offset - 5 <= appBarHeight
+          }
+        }
+      }
+    }
+  }
+
+  CollapsableTopAppBar(
+    modifier = modifier
+      .fillMaxWidth()
+      .onSizeChanged { appBarHeight = it.height },
+    title = title,
+    showAppBarBackground = showAppBarBackground,
+    navigationIcon = navigationIcon,
+    primaryActionIcon = primaryActionIcon,
+    onPrimaryIconPressed = onPrimaryIconPressed,
+  )
+}
+
+@Composable
+internal fun RefreshCollapsableTopAppBar(
   showAppBarBackground: Boolean,
-  onRefresh: () -> Unit,
+  isRefreshing: Boolean,
+  showActionIcon: Boolean,
+  scrollBehavior: TopAppBarScrollBehavior?,
+  onActionClicked: () -> Unit,
+  title: @Composable () -> Unit,
+  navigationIcon: @Composable () -> Unit,
+  actionIcon: @Composable () -> Unit,
   onNavIconPressed: () -> Unit,
   modifier: Modifier = Modifier,
-  showActionIcon: Boolean = true,
-  scrollBehavior: TopAppBarScrollBehavior? = null,
 ) {
-  val backgroundColor by
-    animateColorAsState(
-      targetValue =
-        when {
-          showAppBarBackground -> MaterialTheme.colorScheme.surface
-          else -> Color.Transparent
-        },
-      animationSpec = spring(),
-      label = "backgroundColorAnimation",
-    )
+  val backgroundColor by animateColorAsState(
+    targetValue = when {
+      showAppBarBackground -> MaterialTheme.colorScheme.surface
+      else -> Color.Transparent
+    },
+    animationSpec = spring(),
+    label = "backgroundColorAnimation",
+  )
 
-  val elevation by
-    animateDpAsState(
-      targetValue =
-        when {
-          showAppBarBackground -> 4.dp
-          else -> 0.dp
-        },
-      animationSpec = spring(),
-      label = "elevationAnimation",
-    )
+  val elevation by animateDpAsState(
+    targetValue = when {
+      showAppBarBackground -> 4.dp
+      else -> 0.dp
+    },
+    animationSpec = spring(),
+    label = "elevationAnimation",
+  )
 
   TopAppBar(
     title = {
       Crossfade(
-        targetState = showAppBarBackground && title != null,
+        targetState = showAppBarBackground,
         label = "titleAnimation",
       ) { show ->
-        if (show) {
-          Text(
-            text = title ?: "",
-            style =
-              MaterialTheme.typography.titleMedium.copy(
-                color = MaterialTheme.colorScheme.onSurface,
-              ),
-            maxLines = 1,
-            overflow = TextOverflow.Ellipsis,
-          )
-        }
+        if (show) title()
       }
     },
     navigationIcon = {
@@ -167,38 +198,30 @@ internal fun CollapsableTopAppBar(
         show = showAppBarBackground,
         onClick = onNavIconPressed,
       ) {
-        Icon(
-          imageVector = Icons.Default.ArrowBack,
-          contentDescription = stringResource(R.string.cd_navigate_back),
-          tint = MaterialTheme.colorScheme.onBackground,
-        )
+        navigationIcon()
       }
     },
-    colors =
-      TopAppBarDefaults.centerAlignedTopAppBarColors(
-        containerColor = backgroundColor,
-      ),
+    colors = TopAppBarDefaults.centerAlignedTopAppBarColors(
+      containerColor = backgroundColor,
+    ),
     actions = {
       if (showActionIcon) {
-        ScrimButton(
-          show = showAppBarBackground,
-          onClick = onRefresh,
-        ) {
-          Crossfade(isRefreshing, label = "ActionButtonCrossfade") { targetRefreshing ->
-            if (targetRefreshing) {
-              AutoSizedCircularProgressIndicator(
-                modifier = Modifier.size(20.dp).padding(2.dp),
-              )
-            } else {
-              Icon(
-                imageVector = Icons.Default.Refresh,
-                contentDescription = null,
-                tint = MaterialTheme.colorScheme.onBackground,
-              )
+        RefreshButton(
+          modifier = Modifier
+            .size(20.dp)
+            .padding(2.dp),
+          isRefreshing = isRefreshing,
+          content = {
+            ScrimButton(
+              show = showAppBarBackground,
+              onClick = onActionClicked,
+            ) {
+              actionIcon()
             }
-          }
-        }
+          },
+        )
       }
+
     },
     modifier = modifier.shadow(elevation = elevation),
     scrollBehavior = scrollBehavior,
@@ -206,35 +229,72 @@ internal fun CollapsableTopAppBar(
 }
 
 @Composable
-fun ScrimButton(
-  onClick: () -> Unit,
+internal fun CollapsableTopAppBar(
+  showAppBarBackground: Boolean,
+  title: @Composable () -> Unit,
+  navigationIcon: @Composable () -> Unit,
+  primaryActionIcon: @Composable () -> Unit,
+  onPrimaryIconPressed: () -> Unit,
   modifier: Modifier = Modifier,
-  show: Boolean = false,
-  alpha: Float = 0.4f,
-  content: @Composable () -> Unit,
 ) {
-  val isLight = MaterialTheme.colorScheme.surface.luminance() > 0.5
-  TvManiacTheme(darkTheme = if (!show) isLight else !isLight) {
-    IconButton(
-      onClick = onClick,
-      modifier = modifier.iconButtonBackgroundScrim(enabled = !show, alpha = alpha),
-    ) {
-      content()
-    }
-  }
+  val backgroundColor by animateColorAsState(
+    targetValue =
+      when {
+        showAppBarBackground -> MaterialTheme.colorScheme.surface
+        else -> Color.Transparent
+      },
+    animationSpec = spring(),
+    label = "backgroundColorAnimation",
+  )
+
+  val elevation by animateDpAsState(
+    targetValue =
+      when {
+        showAppBarBackground -> 4.dp
+        else -> 0.dp
+      },
+    animationSpec = spring(),
+    label = "elevationAnimation",
+  )
+
+  TopAppBar(
+    title = {
+      Crossfade(
+        targetState = showAppBarBackground,
+        label = "titleAnimation",
+      ) { show ->
+        if (show) {
+          title()
+        }
+      }
+    },
+    navigationIcon = navigationIcon,
+    colors = TopAppBarDefaults.centerAlignedTopAppBarColors(
+      containerColor = backgroundColor,
+    ),
+    actions = {
+      ScrimButton(
+        show = showAppBarBackground,
+        onClick = onPrimaryIconPressed,
+      ) {
+        primaryActionIcon()
+      }
+    },
+    modifier = modifier.shadow(elevation = elevation),
+  )
 }
 
+@SuppressLint("UnusedBoxWithConstraintsScope")
 @Composable
 fun AutoSizedCircularProgressIndicator(
   modifier: Modifier = Modifier,
   color: Color = MaterialTheme.colorScheme.onBackground,
 ) {
   BoxWithConstraints(modifier) {
-    val diameter =
-      with(LocalDensity.current) {
-        // We need to minus the padding added within CircularProgressIndicator
-        min(constraints.maxWidth.toDp(), constraints.maxHeight.toDp()) - 4.dp
-      }
+    val diameter = with(LocalDensity.current) {
+      // We need to minus the padding added within CircularProgressIndicator
+      min(constraints.maxWidth.toDp(), constraints.maxHeight.toDp()) - 4.dp
+    }
 
     CircularProgressIndicator(
       strokeWidth = (diameter.value * (4.dp / 40.dp)).roundToInt().dp.coerceAtLeast(2.dp),
@@ -318,24 +378,12 @@ private fun TopBarScrimPreview() {
           imageVector = Icons.Filled.ArrowBack,
           contentDescription = null,
           colorFilter = ColorFilter.tint(color = MaterialTheme.colorScheme.onSurface),
-          modifier = Modifier.clickable(onClick = {}).padding(16.dp),
+          modifier = Modifier
+            .clickable(onClick = {})
+            .padding(16.dp),
         )
       },
       modifier = Modifier.iconButtonBackgroundScrim(enabled = true, alpha = 0.4f),
     )
   }
 }
-
-@ThemePreviews
-@Composable
-private fun CollapsableAppBarPreview() {
-  TvManiacTheme {
-    CollapsableTopAppBar(
-      title = "Star Wars",
-      isRefreshing = true,
-      showAppBarBackground = true,
-      onNavIconPressed = {},
-      onRefresh = {},
-    )
-  }
-}
diff --git a/android/resources/src/main/res/values/strings.xml b/android/resources/src/main/res/values/strings.xml
index c86a75fcb..904b638e4 100644
--- a/android/resources/src/main/res/values/strings.xml
+++ b/android/resources/src/main/res/values/strings.xml
@@ -29,9 +29,9 @@
     <string name="dialog_message_unwatched">Are you sure you want to mark the entire season as unwatched?</string>
     <string name="dialog_message_watched">Are you sure you want to mark the entire season as watched?</string>
 
-    <string name="following">Follow</string>
-    <string name="unfollow">Unfollow</string>
-    <string name="btn_trailer">Trailer</string>
+    <string name="following">Track</string>
+    <string name="unfollow">Stop Tracking</string>
+    <string name="btn_add_to_list">Add To List</string>
     <string name="title_recommended">Recommendations</string>
     <string name="title_similar">Similar Shows</string>
     <string name="title_seasons">Browse Seasons</string>
diff --git a/android/ui/discover/build.gradle.kts b/android/ui/discover/build.gradle.kts
index 0df4b6ddc..25be70719 100644
--- a/android/ui/discover/build.gradle.kts
+++ b/android/ui/discover/build.gradle.kts
@@ -16,7 +16,6 @@ dependencies {
   implementation(libs.androidx.compose.foundation)
   implementation(libs.androidx.compose.material3)
   implementation(libs.androidx.compose.material)
-  implementation(libs.androidx.compose.ui.util)
   implementation(libs.androidx.compose.runtime)
   implementation(libs.snapper)
 
@@ -30,6 +29,7 @@ addCompilerOptInArgs(
     listOf(
         "androidx.compose.foundation.ExperimentalFoundationApi",
         "androidx.compose.material.ExperimentalMaterialApi",
+        "androidx.compose.material3.ExperimentalMaterial3Api",
         "dev.chrisbanes.snapper.ExperimentalSnapperApi",
     ),
 )
diff --git a/android/ui/discover/src/main/java/com/thomaskioko/tvmaniac/ui/discover/DiscoverPreviewParameterProvider.kt b/android/ui/discover/src/main/java/com/thomaskioko/tvmaniac/ui/discover/DiscoverPreviewParameterProvider.kt
index 3467c1281..0eeb3ad18 100644
--- a/android/ui/discover/src/main/java/com/thomaskioko/tvmaniac/ui/discover/DiscoverPreviewParameterProvider.kt
+++ b/android/ui/discover/src/main/java/com/thomaskioko/tvmaniac/ui/discover/DiscoverPreviewParameterProvider.kt
@@ -13,6 +13,7 @@ val discoverShow =
     tmdbId = 84958,
     title = "Loki",
     posterImageUrl = "/kEl2t3OhXc3Zb9FBh1AuYzRTgZp.jpg",
+    overView = "After stealing the Tesseract during the events of “Avengers: Endgame,” an "
   )
 
 val discoverContentSuccess =
diff --git a/android/ui/discover/src/main/java/com/thomaskioko/tvmaniac/ui/discover/DiscoverScreen.kt b/android/ui/discover/src/main/java/com/thomaskioko/tvmaniac/ui/discover/DiscoverScreen.kt
index aff8b3a64..52b2e9e62 100644
--- a/android/ui/discover/src/main/java/com/thomaskioko/tvmaniac/ui/discover/DiscoverScreen.kt
+++ b/android/ui/discover/src/main/java/com/thomaskioko/tvmaniac/ui/discover/DiscoverScreen.kt
@@ -1,12 +1,14 @@
 package com.thomaskioko.tvmaniac.ui.discover
 
 import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.FastOutSlowInEasing
+import androidx.compose.animation.core.tween
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
@@ -14,14 +16,17 @@ import androidx.compose.foundation.layout.WindowInsetsSides
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
@@ -31,44 +36,46 @@ import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Movie
+import androidx.compose.material.icons.filled.Person
 import androidx.compose.material.icons.outlined.ErrorOutline
 import androidx.compose.material.pullrefresh.PullRefreshIndicator
 import androidx.compose.material.pullrefresh.pullRefresh
 import androidx.compose.material.pullrefresh.rememberPullRefreshState
+import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.SnackbarDuration
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.SnackbarResult
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
-import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.util.lerp
 import com.thomaskioko.tvmaniac.compose.components.BoxTextItems
+import com.thomaskioko.tvmaniac.compose.components.CollapsableTopAppBar
 import com.thomaskioko.tvmaniac.compose.components.EmptyContent
 import com.thomaskioko.tvmaniac.compose.components.ErrorUi
+import com.thomaskioko.tvmaniac.compose.components.ExpandingText
 import com.thomaskioko.tvmaniac.compose.components.LoadingIndicator
+import com.thomaskioko.tvmaniac.compose.components.ParallaxCarouselImage
+import com.thomaskioko.tvmaniac.compose.components.PosterCard
 import com.thomaskioko.tvmaniac.compose.components.ThemePreviews
 import com.thomaskioko.tvmaniac.compose.components.TvManiacBackground
-import com.thomaskioko.tvmaniac.compose.components.PosterCard
-import com.thomaskioko.tvmaniac.compose.extensions.verticalGradientScrim
-import com.thomaskioko.tvmaniac.compose.theme.MinContrastOfPrimaryVsSurface
 import com.thomaskioko.tvmaniac.compose.theme.TvManiacTheme
-import com.thomaskioko.tvmaniac.compose.theme.contrastAgainst
-import com.thomaskioko.tvmaniac.compose.util.DynamicThemePrimaryColorsFromImage
-import com.thomaskioko.tvmaniac.compose.util.rememberDominantColorState
+import com.thomaskioko.tvmaniac.presentation.discover.AccountClicked
 import com.thomaskioko.tvmaniac.presentation.discover.DataLoaded
 import com.thomaskioko.tvmaniac.presentation.discover.DiscoverShowAction
 import com.thomaskioko.tvmaniac.presentation.discover.DiscoverShowsPresenter
@@ -87,8 +94,8 @@ import com.thomaskioko.tvmaniac.presentation.discover.UpComingClicked
 import com.thomaskioko.tvmaniac.presentation.discover.model.DiscoverShow
 import com.thomaskioko.tvmaniac.resources.R
 import dev.chrisbanes.snapper.rememberSnapperFlingBehavior
-import kotlin.math.absoluteValue
 import kotlinx.collections.immutable.ImmutableList
+import kotlinx.coroutines.delay
 
 @Composable
 fun DiscoverScreen(
@@ -98,7 +105,6 @@ fun DiscoverScreen(
   val discoverState by presenter.state.collectAsState()
   val pagerState =
     rememberPagerState(
-      initialPage = 2,
       pageCount = { (discoverState as? DataLoaded)?.featuredShows?.size ?: 0 },
     )
   val snackBarHostState = remember { SnackbarHostState() }
@@ -123,28 +129,32 @@ internal fun DiscoverScreen(
   when (state) {
     Loading ->
       LoadingIndicator(
-        modifier = Modifier.fillMaxSize().wrapContentSize(Alignment.Center),
+        modifier = Modifier
+          .fillMaxSize()
+          .wrapContentSize(Alignment.Center),
       )
     EmptyState ->
       EmptyContent(
         modifier = modifier,
         imageVector = Icons.Filled.Movie,
-        title =  stringResource(R.string.generic_empty_content),
+        title = stringResource(R.string.generic_empty_content),
         message = stringResource(R.string.missing_api_key),
         buttonText = stringResource(id = R.string.generic_retry),
-        onClick = { onAction(ReloadData)
-                  },
+        onClick = { onAction(ReloadData) },
       )
     is DataLoaded ->
       DiscoverContent(
         modifier = modifier,
         pagerState = pagerState,
         snackBarHostState = snackBarHostState,
-        state = state,
+        dataLoadedState = state,
         onAction = onAction,
       )
     is ErrorState ->
       ErrorUi(
+        modifier = Modifier
+          .fillMaxSize()
+          .wrapContentSize(Alignment.Center),
         errorIcon = {
           Image(
             modifier = Modifier.size(120.dp),
@@ -155,21 +165,20 @@ internal fun DiscoverScreen(
         },
         errorMessage = state.errorMessage,
         onRetry = { onAction(ReloadData) },
-        modifier = Modifier.fillMaxSize().wrapContentSize(Alignment.Center),
       )
   }
 }
 
 @Composable
 private fun DiscoverContent(
-  state: DataLoaded,
+  dataLoadedState: DataLoaded,
   snackBarHostState: SnackbarHostState,
   pagerState: PagerState,
   onAction: (DiscoverShowAction) -> Unit,
   modifier: Modifier = Modifier,
 ) {
-  LaunchedEffect(key1 = state.errorMessage) {
-    state.errorMessage?.let {
+  LaunchedEffect(key1 = dataLoadedState.errorMessage) {
+    dataLoadedState.errorMessage?.let {
       val snackBarResult =
         snackBarHostState.showSnackbar(
           message = it,
@@ -177,76 +186,64 @@ private fun DiscoverContent(
         )
       when (snackBarResult) {
         SnackbarResult.ActionPerformed,
-        SnackbarResult.Dismissed, -> onAction(SnackBarDismissed)
+        SnackbarResult.Dismissed,
+          -> onAction(SnackBarDismissed)
       }
     }
   }
 
-  val pullRefreshState =
-    rememberPullRefreshState(refreshing = false, onRefresh = { onAction(RefreshData) })
+  val pullRefreshState = rememberPullRefreshState(refreshing = false, onRefresh = { onAction(RefreshData) })
+  val listState = rememberLazyListState()
 
   Box(
-    modifier = Modifier.fillMaxSize().pullRefresh(pullRefreshState),
-    contentAlignment = Alignment.BottomCenter,
+    modifier = Modifier
+      .fillMaxSize()
+      .pullRefresh(pullRefreshState)
   ) {
-    LazyColumn(
-      modifier =
-        modifier
-          .fillMaxSize()
-          .windowInsetsPadding(WindowInsets.systemBars.only(WindowInsetsSides.Horizontal)),
-    ) {
-      item {
-        DiscoverHeaderContent(
-          pagerState = pagerState,
-          showList = state.featuredShows,
-          onShowClicked = { onAction(ShowClicked(it)) },
-        )
-      }
-
-      item {
-        HorizontalRowContent(
-          category = stringResource(id = R.string.title_category_upcoming),
-          tvShows = state.upcomingShows,
-          onItemClicked = { onAction(ShowClicked(it)) },
-          onMoreClicked = { onAction(UpComingClicked) },
-        )
-      }
-
-      item {
-        HorizontalRowContent(
-          category = stringResource(id = R.string.title_category_trending_today),
-          tvShows = state.trendingToday,
-          onItemClicked = { onAction(ShowClicked(it)) },
-          onMoreClicked = { onAction(TrendingClicked) },
-        )
-      }
-
-      item {
-        HorizontalRowContent(
-          category = stringResource(id = R.string.title_category_popular),
-          tvShows = state.popularShows,
-          onItemClicked = { onAction(ShowClicked(it)) },
-          onMoreClicked = { onAction(PopularClicked) },
-        )
-      }
-
-      item {
-        HorizontalRowContent(
-          category = stringResource(id = R.string.title_category_top_rated),
-          tvShows = state.topRatedShows,
-          onItemClicked = { onAction(ShowClicked(it)) },
-          onMoreClicked = { onAction(TopRatedClicked) },
-        )
-      }
-    }
+    LazyColumnContent(
+      modifier = modifier,
+      pagerState = pagerState,
+      dataLoadedState = dataLoadedState,
+      listState = listState,
+      onAction = onAction,
+    )
 
     PullRefreshIndicator(
-      refreshing = state.isRefreshing,
+      refreshing = dataLoadedState.isRefreshing,
       state = pullRefreshState,
-      modifier = Modifier.align(Alignment.TopCenter),
+      modifier = Modifier
+        .align(Alignment.TopCenter)
+        .statusBarsPadding(),
       scale = true,
       backgroundColor = MaterialTheme.colorScheme.background,
-      contentColor = MaterialTheme.colorScheme.secondary
+      contentColor = MaterialTheme.colorScheme.secondary,
+    )
+
+    CollapsableTopAppBar(
+      listState = listState,
+      title = {
+        Text(
+          text = "Discover",
+          style = MaterialTheme.typography.titleLarge.copy(
+            color = MaterialTheme.colorScheme.onSurface,
+          ),
+          maxLines = 1,
+          overflow = TextOverflow.Ellipsis,
+          modifier = Modifier
+            .fillMaxWidth()
+            .padding(start = 16.dp),
+        )
+      },
+      primaryActionIcon = {
+        Icon(
+          imageVector = Icons.Default.Person,
+          contentDescription = null,
+          tint = MaterialTheme.colorScheme.onBackground,
+        )
+      },
+      onPrimaryIconPressed = {
+       onAction(AccountClicked)
+      }
     )
 
     SnackbarHost(hostState = snackBarHostState)
@@ -254,153 +251,227 @@ private fun DiscoverContent(
 }
 
 @Composable
-fun DiscoverHeaderContent(
-  showList: ImmutableList<DiscoverShow>,
+private fun LazyColumnContent(
   pagerState: PagerState,
+  dataLoadedState: DataLoaded,
+  listState: LazyListState,
   modifier: Modifier = Modifier,
-  onShowClicked: (Long) -> Unit,
+  onAction: (DiscoverShowAction) -> Unit,
 ) {
-  val selectedImageUrl = showList.getOrNull(pagerState.currentPage)?.posterImageUrl
+  LazyColumn(
+    modifier =
+      modifier
+        .fillMaxSize()
+        .windowInsetsPadding(WindowInsets.systemBars.only(WindowInsetsSides.Horizontal)),
+    state = listState,
+  ) {
+    item {
+      DiscoverHeaderContent(
+        pagerState = pagerState,
+        showList = dataLoadedState.featuredShows,
+        onShowClicked = { onAction(ShowClicked(it)) },
+      )
+    }
 
-  DynamicColorContainer(selectedImageUrl) {
-    Column(
-      modifier =
-        modifier.windowInsetsPadding(
-          WindowInsets.systemBars.only(WindowInsetsSides.Horizontal),
-        ),
-    ) {
-      val backgroundColor = MaterialTheme.colorScheme.primary.copy(alpha = 0.8f)
+    item {
+      HorizontalRowContent(
+        category = stringResource(id = R.string.title_category_upcoming),
+        tvShows = dataLoadedState.upcomingShows,
+        onItemClicked = { onAction(ShowClicked(it)) },
+        onMoreClicked = { onAction(UpComingClicked) },
+      )
+    }
 
-      HorizontalPagerItem(
-        list = showList,
-        pagerState = pagerState,
-        backgroundColor = backgroundColor,
-        onClick = onShowClicked,
+    item {
+      HorizontalRowContent(
+        category = stringResource(id = R.string.title_category_trending_today),
+        tvShows = dataLoadedState.trendingToday,
+        onItemClicked = { onAction(ShowClicked(it)) },
+        onMoreClicked = { onAction(TrendingClicked) },
       )
     }
 
-    Spacer(modifier = Modifier.height(16.dp))
+    item {
+      HorizontalRowContent(
+        category = stringResource(id = R.string.title_category_popular),
+        tvShows = dataLoadedState.popularShows,
+        onItemClicked = { onAction(ShowClicked(it)) },
+        onMoreClicked = { onAction(PopularClicked) },
+      )
+    }
+
+    item {
+      HorizontalRowContent(
+        category = stringResource(id = R.string.title_category_top_rated),
+        tvShows = dataLoadedState.topRatedShows,
+        onItemClicked = { onAction(ShowClicked(it)) },
+        onMoreClicked = { onAction(TopRatedClicked) },
+      )
+    }
   }
 }
 
 @Composable
-private fun DynamicColorContainer(
-  selectedImageUrl: String?,
-  content: @Composable () -> Unit,
+fun DiscoverHeaderContent(
+  showList: ImmutableList<DiscoverShow>,
+  pagerState: PagerState,
+  modifier: Modifier = Modifier,
+  onShowClicked: (Long) -> Unit,
 ) {
-  val surfaceColor = MaterialTheme.colorScheme.surface
-  val dominantColorState = rememberDominantColorState { color ->
-    // We want a color which has sufficient contrast against the surface color
-    color.contrastAgainst(surfaceColor) >= MinContrastOfPrimaryVsSurface
-  }
 
-  DynamicThemePrimaryColorsFromImage(dominantColorState) {
-    // When the selected image url changes, call updateColorsFromImageUrl() or reset()
-    LaunchedEffect(selectedImageUrl) {
-      if (selectedImageUrl != null) {
-        dominantColorState.updateColorsFromImageUrl(selectedImageUrl)
-      } else {
-        dominantColorState.reset()
-      }
-    }
-
-    content()
+  Column(
+    modifier =
+      modifier.windowInsetsPadding(
+        WindowInsets.systemBars.only(WindowInsetsSides.Horizontal),
+      ),
+  ) {
+    PosterCardsPager(
+      pagerState = pagerState,
+      list = showList,
+      onClick = onShowClicked,
+    )
   }
 }
 
+
 @Composable
-fun HorizontalPagerItem(
-  list: ImmutableList<DiscoverShow>,
+fun PosterCardsPager(
   pagerState: PagerState,
-  backgroundColor: Color,
+  list: ImmutableList<DiscoverShow>,
   modifier: Modifier = Modifier,
   onClick: (Long) -> Unit,
 ) {
-  Column(
-    modifier =
-      modifier
-        .windowInsetsPadding(
-          WindowInsets.systemBars.only(WindowInsetsSides.Horizontal),
-        )
-        .fillMaxWidth()
-        .verticalGradientScrim(
-          color = backgroundColor,
-          startYPercentage = 1f,
-          endYPercentage = 0.5f,
-        )
-        .padding(top = 84.dp),
-  ) {
+  val screenHeight = LocalConfiguration.current.screenHeightDp.dp
+  val pagerHeight = screenHeight / 1.5f
+  Box {
     HorizontalPager(
+      modifier = modifier
+        .fillMaxWidth()
+        .height(pagerHeight),
       state = pagerState,
-      beyondViewportPageCount = 2,
-      contentPadding = PaddingValues(horizontal = 45.dp),
-      modifier = Modifier.fillMaxSize(),
-    ) { pageNumber ->
-      Box(
-        modifier =
-          Modifier.graphicsLayer {
-            val pageOffset =
-              ((pagerState.currentPage - pageNumber) + pagerState.currentPageOffsetFraction)
-                .absoluteValue
-
-            // We animate the scaleX + scaleY, between 85% and 100%
-            lerp(
-                start = 0.85f,
-                stop = 1f,
-                fraction = 1f - pageOffset.coerceIn(0f, 1f),
-              )
-              .also { scale ->
-                scaleX = scale
-                scaleY = scale
-              }
-
-            // We animate the alpha, between 50% and 100%
-            alpha =
-              lerp(
-                start = 0.5f,
-                stop = 1f,
-                fraction = 1f - pageOffset.coerceIn(0f, 1f),
-              )
-          }
+      verticalAlignment = Alignment.Bottom,
+    ) { currentPage ->
+
+      ParallaxCarouselImage(
+        state = pagerState,
+        currentPage = currentPage,
+        imageUrl = list[currentPage].posterImageUrl,
+        modifier = Modifier
+          .clickable(onClick = { onClick(list[currentPage].tmdbId) }),
       ) {
-        PosterCard(
-          title = list[pageNumber].title,
-          imageUrl = list[pageNumber].posterImageUrl,
-          onClick = { onClick(list[pageNumber].tmdbId) },
-          modifier = Modifier.fillMaxWidth(),
+        ShowCardOverlay(
+          title = list[currentPage].title,
+          overview = list[currentPage].overView,
         )
       }
     }
 
     if (list.isNotEmpty()) {
-      LaunchedEffect(pagerState) {
-        snapshotFlow { pagerState.currentPage }.collect { page -> pagerState.scrollToPage(page) }
-      }
+      LaunchedEffect(Unit) {
+        while (true) {
+          delay(4_500)
+
+          // Animate to next page with custom animation spec
+          val nextPage = if (pagerState.currentPage + 1 < list.size) {
+            pagerState.currentPage + 1
+          } else {
+            0
+          }
 
-      Row(
-        Modifier.height(50.dp)
-          .fillMaxWidth()
-          .align(Alignment.CenterHorizontally)
-          .padding(top = 16.dp),
-        horizontalArrangement = Arrangement.Center,
-      ) {
-        repeat(list.size) { iteration ->
-          val color =
-            if (pagerState.currentPage == iteration) {
-              MaterialTheme.colorScheme.primary
-            } else {
-              MaterialTheme.colorScheme.primary.copy(alpha = 0.12f)
-            }
-
-          Box(
-            modifier = Modifier.padding(2.dp).clip(CircleShape).background(color).size(8.dp),
+          pagerState.animateScrollToPage(
+            page = nextPage,
+            animationSpec = tween(
+              durationMillis = 800,
+              easing = FastOutSlowInEasing
+            )
           )
         }
       }
+
+      CircularIndicator(
+        modifier = Modifier
+          .align(Alignment.BottomCenter),
+        size = list.size,
+        currentPage = pagerState.currentPage,
+      )
     }
   }
 }
 
+@Composable
+private fun CircularIndicator(
+  size: Int,
+  currentPage: Int,
+  modifier: Modifier = Modifier,
+) {
+  Row(
+    modifier = modifier
+      .fillMaxWidth()
+      .padding(bottom = 8.dp),
+    horizontalArrangement = Arrangement.Center,
+    verticalAlignment = Alignment.CenterVertically,
+  ) {
+    repeat(size) { iteration ->
+      val color = if (currentPage == iteration) MaterialTheme.colorScheme.onSecondary else Color.Gray
+      val size = if (currentPage == iteration) 10.dp else 6.dp
+
+      Box(
+        modifier = Modifier
+          .padding(2.dp)
+          .clip(CircleShape)
+          .size(size)
+          .background(color),
+      )
+    }
+  }
+}
+
+@Composable
+private fun ShowCardOverlay(
+  title: String,
+  overview: String?,
+) {
+  Box(
+    modifier = Modifier
+      .fillMaxSize()
+      .background(
+        Brush.verticalGradient(
+          listOf(Color.Transparent, Color.Black.copy(alpha = 0.8f)),
+          startY = 500f,
+          endY = 1000f,
+        ),
+      ),
+  ) {
+    Column(
+      modifier = Modifier
+        .align(Alignment.BottomCenter)
+        .offset(y = -(20).dp)
+        .padding(16.dp),
+      horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
+
+      Text(
+        text = title,
+        style = MaterialTheme.typography.headlineLarge,
+        color = MaterialTheme.colorScheme.onSecondary,
+        overflow = TextOverflow.Ellipsis,
+        maxLines = 1,
+      )
+
+      Spacer(modifier = Modifier.height(8.dp))
+
+      overview?.let {
+        ExpandingText(
+          text = overview,
+          textStyle = MaterialTheme.typography.labelLarge,
+          color = MaterialTheme.colorScheme.onSecondary,
+        )
+      }
+    }
+  }
+}
+
+
 @Composable
 private fun HorizontalRowContent(
   category: String,
@@ -411,7 +482,9 @@ private fun HorizontalRowContent(
   AnimatedVisibility(visible = tvShows.isNotEmpty()) {
     Column {
       BoxTextItems(
-        modifier = Modifier.fillMaxWidth().padding(start = 16.dp),
+        modifier = Modifier
+          .fillMaxWidth()
+          .padding(start = 16.dp),
         title = category,
         label = stringResource(id = R.string.str_more),
         onMoreClicked = onMoreClicked,
diff --git a/android/ui/discover/src/test/screenshots/DiscoverScreenDataLoaded_dark.png b/android/ui/discover/src/test/screenshots/DiscoverScreenDataLoaded_dark.png
index 33dfdc95a..b7caa1581 100644
Binary files a/android/ui/discover/src/test/screenshots/DiscoverScreenDataLoaded_dark.png and b/android/ui/discover/src/test/screenshots/DiscoverScreenDataLoaded_dark.png differ
diff --git a/android/ui/discover/src/test/screenshots/DiscoverScreenDataLoaded_light.png b/android/ui/discover/src/test/screenshots/DiscoverScreenDataLoaded_light.png
index 4c398f4cb..d04bbb593 100644
Binary files a/android/ui/discover/src/test/screenshots/DiscoverScreenDataLoaded_light.png and b/android/ui/discover/src/test/screenshots/DiscoverScreenDataLoaded_light.png differ
diff --git a/android/ui/season-details/src/main/java/com/thomaskioko/tvmaniac/seasondetails/ui/SeasonDetailsScreen.kt b/android/ui/season-details/src/main/java/com/thomaskioko/tvmaniac/seasondetails/ui/SeasonDetailsScreen.kt
index 6d33f5358..4886b6fdb 100644
--- a/android/ui/season-details/src/main/java/com/thomaskioko/tvmaniac/seasondetails/ui/SeasonDetailsScreen.kt
+++ b/android/ui/season-details/src/main/java/com/thomaskioko/tvmaniac/seasondetails/ui/SeasonDetailsScreen.kt
@@ -28,9 +28,12 @@ import androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridCells
 import androidx.compose.foundation.lazy.staggeredgrid.items
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.PhotoLibrary
+import androidx.compose.material.icons.filled.Refresh
 import androidx.compose.material.icons.outlined.Autorenew
 import androidx.compose.material.icons.outlined.ErrorOutline
+import androidx.compose.material.icons.outlined.KeyboardArrowDown
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.Icon
@@ -53,12 +56,12 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
 import com.thomaskioko.tvmaniac.compose.components.BasicDialog
-import com.thomaskioko.tvmaniac.compose.components.CollapsableTopAppBar
 import com.thomaskioko.tvmaniac.compose.components.EmptyContent
 import com.thomaskioko.tvmaniac.compose.components.ErrorUi
 import com.thomaskioko.tvmaniac.compose.components.ExpandingText
 import com.thomaskioko.tvmaniac.compose.components.LoadingIndicator
 import com.thomaskioko.tvmaniac.compose.components.PosterCard
+import com.thomaskioko.tvmaniac.compose.components.RefreshCollapsableTopAppBar
 import com.thomaskioko.tvmaniac.compose.components.SheetDragHandle
 import com.thomaskioko.tvmaniac.compose.components.ThemePreviews
 import com.thomaskioko.tvmaniac.compose.components.TvManiacBottomSheetScaffold
@@ -72,9 +75,9 @@ import com.thomaskioko.tvmaniac.presentation.seasondetails.ReloadSeasonDetails
 import com.thomaskioko.tvmaniac.presentation.seasondetails.SeasonDetailState
 import com.thomaskioko.tvmaniac.presentation.seasondetails.SeasonDetailsAction
 import com.thomaskioko.tvmaniac.presentation.seasondetails.SeasonDetailsBackClicked
-import com.thomaskioko.tvmaniac.presentation.seasondetails.SeasonDetailsPresenter
 import com.thomaskioko.tvmaniac.presentation.seasondetails.SeasonDetailsErrorState
 import com.thomaskioko.tvmaniac.presentation.seasondetails.SeasonDetailsLoaded
+import com.thomaskioko.tvmaniac.presentation.seasondetails.SeasonDetailsPresenter
 import com.thomaskioko.tvmaniac.presentation.seasondetails.SeasonGalleryClicked
 import com.thomaskioko.tvmaniac.presentation.seasondetails.UpdateSeasonWatchedState
 import com.thomaskioko.tvmaniac.presentation.seasondetails.model.Cast
@@ -121,6 +124,7 @@ internal fun SeasonDetailsScreen(
         )
       SheetDragHandle(
         title = title,
+        imageVector = Icons.Outlined.KeyboardArrowDown,
         onClick = { onAction(DismissSeasonGallery) },
       )
     },
@@ -158,13 +162,37 @@ internal fun SeasonDetailsScreen(
             )
         }
 
-        CollapsableTopAppBar(
+        RefreshCollapsableTopAppBar(
           listState = listState,
-          title = (state as? SeasonDetailsLoaded)?.seasonName ?: "",
-          isUpdating = state.isUpdating,
-          onNavIconPressed = { onAction(SeasonDetailsBackClicked) },
-          onActionIconPressed = { onAction(ReloadSeasonDetails) },
+          title = {
+            Text(
+              text = (state as? SeasonDetailsLoaded)?.seasonName ?: "",
+              style =
+                MaterialTheme.typography.titleMedium.copy(
+                  color = MaterialTheme.colorScheme.onSurface,
+                ),
+              maxLines = 1,
+              overflow = TextOverflow.Ellipsis,
+            )
+          },
+          navigationIcon = {
+            Icon(
+              imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+              contentDescription = stringResource(R.string.cd_navigate_back),
+              tint = MaterialTheme.colorScheme.onBackground,
+            )
+          },
+          actionIcon = {
+            Icon(
+              imageVector = Icons.Default.Refresh,
+              contentDescription = null,
+              tint = MaterialTheme.colorScheme.onBackground,
+            )
+          },
+          isRefreshing = state.isUpdating,
           showActionIcon = state is SeasonDetailsLoaded,
+          onNavIconClicked = { onAction(SeasonDetailsBackClicked) },
+          onActionIconClicked = { onAction(ReloadSeasonDetails) },
         )
       }
     },
diff --git a/android/ui/show-details/src/main/kotlin/com/thomaskioko/tvmaniac/ui/showdetails/DetailPreviewParameterProvider.kt b/android/ui/show-details/src/main/kotlin/com/thomaskioko/tvmaniac/ui/showdetails/DetailPreviewParameterProvider.kt
index a207d0ab8..0eef711f9 100644
--- a/android/ui/show-details/src/main/kotlin/com/thomaskioko/tvmaniac/ui/showdetails/DetailPreviewParameterProvider.kt
+++ b/android/ui/show-details/src/main/kotlin/com/thomaskioko/tvmaniac/ui/showdetails/DetailPreviewParameterProvider.kt
@@ -15,6 +15,7 @@ val showDetailsContent =
   ShowDetailsContent(
     showDetails =
       ShowDetails(
+        tmdbId = 849583,
         title = "Loki",
         overview =
           "After stealing the Tesseract during the events of “Avengers: Endgame,” " +
@@ -31,6 +32,7 @@ val showDetailsContent =
         genres = persistentListOf("Horror", "Action"),
         status = "Returning Series",
         year = "2024",
+        isFollowed = false
       ),
     showInfo =
       ShowInfoState.Loaded(
diff --git a/android/ui/show-details/src/main/kotlin/com/thomaskioko/tvmaniac/ui/showdetails/ShowDetailScreen.kt b/android/ui/show-details/src/main/kotlin/com/thomaskioko/tvmaniac/ui/showdetails/ShowDetailScreen.kt
index 15c932502..d73133afb 100644
--- a/android/ui/show-details/src/main/kotlin/com/thomaskioko/tvmaniac/ui/showdetails/ShowDetailScreen.kt
+++ b/android/ui/show-details/src/main/kotlin/com/thomaskioko/tvmaniac/ui/showdetails/ShowDetailScreen.kt
@@ -14,7 +14,6 @@ import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
@@ -29,10 +28,14 @@ import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.Cancel
 import androidx.compose.material.icons.filled.LibraryAdd
 import androidx.compose.material.icons.filled.LibraryAddCheck
-import androidx.compose.material.icons.filled.Movie
 import androidx.compose.material.icons.filled.PlayCircle
+import androidx.compose.material.icons.filled.Refresh
+import androidx.compose.material.icons.filled.Star
+import androidx.compose.material.icons.outlined.AutoAwesomeMotion
 import androidx.compose.material.icons.outlined.ErrorOutline
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Card
@@ -62,28 +65,31 @@ import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.tooling.preview.PreviewParameter
-import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
 import com.thomaskioko.tvmaniac.compose.components.AsyncImageComposable
-import com.thomaskioko.tvmaniac.compose.components.CollapsableTopAppBar
 import com.thomaskioko.tvmaniac.compose.components.ErrorUi
 import com.thomaskioko.tvmaniac.compose.components.ExpandingText
+import com.thomaskioko.tvmaniac.compose.components.FilledHorizontalIconButton
+import com.thomaskioko.tvmaniac.compose.components.FilledTextButton
+import com.thomaskioko.tvmaniac.compose.components.FilledVerticalIconButton
 import com.thomaskioko.tvmaniac.compose.components.KenBurnsViewImage
 import com.thomaskioko.tvmaniac.compose.components.LoadingIndicator
+import com.thomaskioko.tvmaniac.compose.components.PosterCard
+import com.thomaskioko.tvmaniac.compose.components.RefreshCollapsableTopAppBar
+import com.thomaskioko.tvmaniac.compose.components.SheetDragHandle
 import com.thomaskioko.tvmaniac.compose.components.TextLoadingItem
 import com.thomaskioko.tvmaniac.compose.components.ThemePreviews
 import com.thomaskioko.tvmaniac.compose.components.TvManiacBottomSheetScaffold
 import com.thomaskioko.tvmaniac.compose.components.TvManiacChip
-import com.thomaskioko.tvmaniac.compose.components.TvManiacOutlinedButton
-import com.thomaskioko.tvmaniac.compose.components.TvManiacTextButton
-import com.thomaskioko.tvmaniac.compose.components.PosterCard
 import com.thomaskioko.tvmaniac.compose.extensions.contentBackgroundGradient
 import com.thomaskioko.tvmaniac.compose.extensions.copy
 import com.thomaskioko.tvmaniac.compose.theme.TvManiacTheme
@@ -91,13 +97,15 @@ import com.thomaskioko.tvmaniac.compose.theme.backgroundGradient
 import com.thomaskioko.tvmaniac.presentation.showdetails.DetailBackClicked
 import com.thomaskioko.tvmaniac.presentation.showdetails.DetailShowClicked
 import com.thomaskioko.tvmaniac.presentation.showdetails.DismissErrorSnackbar
+import com.thomaskioko.tvmaniac.presentation.showdetails.DismissShowsListSheet
 import com.thomaskioko.tvmaniac.presentation.showdetails.FollowShowClicked
 import com.thomaskioko.tvmaniac.presentation.showdetails.ReloadShowDetails
 import com.thomaskioko.tvmaniac.presentation.showdetails.SeasonClicked
 import com.thomaskioko.tvmaniac.presentation.showdetails.ShowDetailsAction
-import com.thomaskioko.tvmaniac.presentation.showdetails.ShowDetailsPresenter
 import com.thomaskioko.tvmaniac.presentation.showdetails.ShowDetailsContent
+import com.thomaskioko.tvmaniac.presentation.showdetails.ShowDetailsPresenter
 import com.thomaskioko.tvmaniac.presentation.showdetails.ShowInfoState
+import com.thomaskioko.tvmaniac.presentation.showdetails.ShowShowsListSheet
 import com.thomaskioko.tvmaniac.presentation.showdetails.WatchTrailerClicked
 import com.thomaskioko.tvmaniac.presentation.showdetails.model.Casts
 import com.thomaskioko.tvmaniac.presentation.showdetails.model.Providers
@@ -107,7 +115,6 @@ import com.thomaskioko.tvmaniac.presentation.showdetails.model.ShowDetails
 import com.thomaskioko.tvmaniac.presentation.showdetails.model.ShowSeasonDetailsParam
 import com.thomaskioko.tvmaniac.presentation.showdetails.model.Trailer
 import com.thomaskioko.tvmaniac.resources.R
-import com.thomaskioko.tvmaniac.ui.showdetails.DetailConstants.HEADER_HEIGHT
 import dev.chrisbanes.snapper.rememberSnapperFlingBehavior
 import kotlinx.collections.immutable.ImmutableList
 
@@ -124,7 +131,7 @@ fun ShowDetailsScreen(
   ShowDetailsScreen(
     modifier = modifier,
     state = state,
-    title = (state as? ShowDetailsContent)?.showDetails?.title ?: "",
+    title = state.showDetails?.title ?: "",
     snackBarHostState = snackBarHostState,
     listState = listState,
     onAction = presenter::dispatch,
@@ -142,10 +149,19 @@ internal fun ShowDetailsScreen(
 ) {
   TvManiacBottomSheetScaffold(
     modifier = modifier,
-    showBottomSheet = false,
-    onDismissBottomSheet = {},
+    showBottomSheet = state.showListSheet,
+    onDismissBottomSheet = { onAction(DismissShowsListSheet) },
+    sheetDragHandle = {
+      SheetDragHandle(
+        title = "Add To ...",
+        textAlign = TextAlign.Start,
+        imageVector = Icons.Filled.Cancel,
+        onClick = { onAction(DismissShowsListSheet) },
+        tint = MaterialTheme.colorScheme.secondary
+      )
+    },
     sheetContent = {
-      // TODO: Add Trailer content
+      ShowListSheetContent(state, onAction)
     },
     snackbarHost = { SnackbarHost(hostState = snackBarHostState) },
     content = { contentPadding ->
@@ -160,7 +176,8 @@ internal fun ShowDetailsScreen(
             )
           when (actionResult) {
             SnackbarResult.ActionPerformed,
-            SnackbarResult.Dismissed, -> {
+            SnackbarResult.Dismissed,
+              -> {
               onAction(DismissErrorSnackbar)
             }
           }
@@ -177,7 +194,9 @@ internal fun ShowDetailsScreen(
           )
         } else if (!state.isUpdating && state.errorMessage != null) {
           ErrorUi(
-            modifier = Modifier.fillMaxSize().padding(top = 16.dp),
+            modifier = Modifier
+              .fillMaxSize()
+              .padding(top = 16.dp),
             errorMessage = stringResource(R.string.generic_error_message),
             onRetry = { onAction(ReloadShowDetails) },
             errorIcon = {
@@ -192,19 +211,135 @@ internal fun ShowDetailsScreen(
           )
         }
 
-        CollapsableTopAppBar(
+        RefreshCollapsableTopAppBar(
           listState = listState,
-          title = title,
-          isUpdating = state.isUpdating || state.showInfo is ShowInfoState.Loading,
+          title = {
+            Text(
+              text = title,
+              style =
+                MaterialTheme.typography.titleMedium.copy(
+                  color = MaterialTheme.colorScheme.onSurface,
+                ),
+              maxLines = 1,
+              overflow = TextOverflow.Ellipsis,
+            )
+          },
+          navigationIcon = {
+            Icon(
+              imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+              contentDescription = stringResource(R.string.cd_navigate_back),
+              tint = MaterialTheme.colorScheme.onBackground,
+            )
+          },
+          actionIcon = {
+            Icon(
+              imageVector = Icons.Default.Refresh,
+              contentDescription = null,
+              tint = MaterialTheme.colorScheme.onBackground,
+            )
+          },
+          isRefreshing = state.isUpdating || state.showInfo is ShowInfoState.Loading,
           showActionIcon = state.showInfo != ShowInfoState.Empty,
-          onNavIconPressed = { onAction(DetailBackClicked) },
-          onActionIconPressed = { onAction(ReloadShowDetails) },
+          onNavIconClicked = { onAction(DetailBackClicked) },
+          onActionIconClicked = { onAction(ReloadShowDetails) },
         )
       }
     },
   )
 }
 
+@Composable
+private fun ShowListSheetContent(
+  state: ShowDetailsContent,
+  onAction: (ShowDetailsAction) -> Unit,
+) {
+  var title = state.showDetails?.title ?: ""
+  Column(
+    modifier = Modifier
+      .fillMaxSize()
+      .padding(horizontal = 16.dp),
+    horizontalAlignment = Alignment.CenterHorizontally,
+  ) {
+    Spacer(modifier = Modifier.height(24.dp))
+
+    val title = stringResource(id = R.string.cd_show_images, title)
+
+    Card(
+      modifier = Modifier
+        .size(width = 150.dp, height = 240.dp),
+      shape = MaterialTheme.shapes.medium,
+      colors = CardDefaults.cardColors(
+        containerColor = MaterialTheme.colorScheme.surfaceVariant,
+      ),
+      elevation = CardDefaults.cardElevation(
+        defaultElevation = 8.dp,
+      ),
+    ) {
+      AsyncImageComposable(
+        model = state.showDetails?.posterImageUrl,
+        contentDescription = title,
+        contentScale = ContentScale.Crop,
+      )
+    }
+
+    Spacer(modifier = Modifier.height(16.dp))
+
+    //TODO:: Add check for empty list and display list
+
+    EmptyListContent(title, onAction)
+  }
+}
+
+@Composable
+private fun EmptyListContent(
+  title: String,
+  onAction: (ShowDetailsAction) -> Unit,
+) {
+  Column(
+    modifier = Modifier
+      .fillMaxSize()
+      .padding(horizontal = 16.dp),
+    horizontalAlignment = Alignment.CenterHorizontally,
+  ) {
+    Text(
+      text = title,
+      style = MaterialTheme.typography.titleMedium.copy(
+        color = MaterialTheme.colorScheme.onSurface,
+      ),
+      maxLines = 1,
+      overflow = TextOverflow.Ellipsis,
+    )
+
+    Spacer(modifier = Modifier.height(48.dp))
+
+    Text(
+      text = "Create List",
+      style = MaterialTheme.typography.headlineSmall,
+      fontWeight = FontWeight.Bold,
+      color = MaterialTheme.colorScheme.onSurface,
+      overflow = TextOverflow.Ellipsis,
+      maxLines = 1,
+    )
+
+    Text(
+      modifier = Modifier
+        .padding(top = 8.dp, bottom = 16.dp),
+      text = "You don't have any list. Create a new one?",
+      style = MaterialTheme.typography.labelMedium,
+      color = MaterialTheme.colorScheme.onSurface,
+    )
+
+    FilledHorizontalIconButton(
+      shape = MaterialTheme.shapes.medium,
+      text = "Create",
+      imageVector = Icons.Filled.LibraryAddCheck,
+      containerColor = MaterialTheme.colorScheme.secondary,
+      style = MaterialTheme.typography.labelMedium,
+      onClick = { onAction(DismissShowsListSheet) },
+    )
+  }
+}
+
 @Composable
 fun LazyColumnContent(
   detailsContent: ShowDetailsContent,
@@ -220,10 +355,9 @@ fun LazyColumnContent(
   ) {
     item {
       HeaderContent(
-        listState = listState,
         show = detailsContent.showDetails,
         onUpdateFavoriteClicked = { onAction(FollowShowClicked(it)) },
-        onWatchTrailerClicked = { onAction(WatchTrailerClicked(it)) },
+        onAddToListClicked = { onAction(ShowShowsListSheet) },
       )
     }
 
@@ -243,7 +377,9 @@ private fun EmptyInfoContent(
 ) {
   Column {
     ErrorUi(
-      modifier = modifier.fillMaxWidth().padding(top = 16.dp),
+      modifier = modifier
+        .fillMaxWidth()
+        .padding(top = 16.dp),
       errorMessage = stringResource(R.string.generic_error_message),
       onRetry = { onAction(ReloadShowDetails) },
     )
@@ -260,14 +396,17 @@ private fun ShowInfoContent(
 ) {
   when (showInfoState) {
     ShowInfoState.Empty,
-    ShowInfoState.Loading ->
+    ShowInfoState.Loading,
+      ->
       LoadingIndicator(
-        modifier = Modifier.fillMaxSize().wrapContentSize(Alignment.Center),
+        modifier = Modifier
+          .fillMaxSize()
+          .wrapContentSize(Alignment.Center),
       )
     is ShowInfoState.Error ->
       EmptyInfoContent(
         modifier = Modifier.fillMaxSize(),
-        onAction = { onAction(ReloadShowDetails) }
+        onAction = { onAction(ReloadShowDetails) },
       )
     is ShowInfoState.Loaded -> {
       Column(modifier = modifier.fillMaxWidth()) {
@@ -305,34 +444,29 @@ private fun ShowInfoContent(
 @Composable
 private fun HeaderContent(
   show: ShowDetails?,
-  listState: LazyListState,
   onUpdateFavoriteClicked: (Boolean) -> Unit,
-  onWatchTrailerClicked: (Long) -> Unit,
+  onAddToListClicked: () -> Unit,
 ) {
+  val screenHeight = LocalConfiguration.current.screenHeightDp.dp
+  val headerHeight = screenHeight / 1.5f
   Box(
     modifier =
-      Modifier.fillMaxWidth().height(HEADER_HEIGHT).clipToBounds().offset {
-        IntOffset(
-          x = 0,
-          y =
-            if (listState.firstVisibleItemIndex == 0) {
-              listState.firstVisibleItemScrollOffset / 2
-            } else {
-              0
-            },
-        )
-      },
+      Modifier
+        .fillMaxWidth()
+        .height(headerHeight),
   ) {
     KenBurnsViewImage(
       imageUrl = show?.backdropImageUrl,
-      modifier = Modifier.fillMaxSize().clipToBounds(),
+      modifier = Modifier
+        .fillMaxSize()
+        .clipToBounds(),
     )
 
     if (show != null) {
       Body(
         show = show,
         onUpdateFavoriteClicked = onUpdateFavoriteClicked,
-        onWatchTrailerClicked = onWatchTrailerClicked,
+        onAddToListClicked = onAddToListClicked,
       )
     }
   }
@@ -342,13 +476,14 @@ private fun HeaderContent(
 private fun Body(
   show: ShowDetails,
   onUpdateFavoriteClicked: (Boolean) -> Unit,
-  onWatchTrailerClicked: (Long) -> Unit,
+  onAddToListClicked: () -> Unit,
 ) {
   val surfaceGradient = backgroundGradient().reversed()
 
   Box(
     modifier =
-      Modifier.fillMaxSize()
+      Modifier
+        .fillMaxSize()
         .clipToBounds()
         .background(Brush.verticalGradient(surfaceGradient))
         .padding(horizontal = 16.dp),
@@ -369,7 +504,13 @@ private fun Body(
         maxLines = 1,
       )
 
-      Spacer(modifier = Modifier.height(8.dp))
+      ShowMetadata(
+        releaseYear = show.year,
+        status = show.status,
+        seasonNumber = show.numberOfSeasons,
+        language = show.language,
+        rating = show.rating,
+      )
 
       ExpandingText(
         text = show.overview,
@@ -379,26 +520,16 @@ private fun Body(
 
       Spacer(modifier = Modifier.height(8.dp))
 
-      ShowMetadata(
-        releaseYear = show.year,
-        status = show.status,
-        seasonNumber = show.numberOfSeasons,
-        language = show.language,
-        rating = show.rating,
-      )
-
       GenreText(show.genres)
 
       Spacer(modifier = Modifier.height(8.dp))
 
       ShowDetailButtons(
-        id = show.tmdbId,
         isFollowed = show.isFollowed,
-        onUpdateFavoriteClicked = onUpdateFavoriteClicked,
-        onWatchTrailerClicked = onWatchTrailerClicked,
+        onTrackShowClicked = onUpdateFavoriteClicked,
+        onAddToList = onAddToListClicked,
       )
 
-      Spacer(modifier = Modifier.height(8.dp))
     }
 
     Spacer(Modifier.height(16.dp))
@@ -415,7 +546,9 @@ fun ShowMetadata(
   modifier: Modifier = Modifier,
 ) {
   Column(
-    modifier = modifier,
+    modifier = modifier.padding(vertical = 8.dp),
+    horizontalAlignment = Alignment.CenterHorizontally,
+    verticalArrangement = Arrangement.Center,
   ) {
     val resources = LocalContext.current.resources
 
@@ -429,16 +562,14 @@ fun ShowMetadata(
       withStyle(tagStyle) { append("  •  ") }
     }
     val text = buildAnnotatedString {
-      val statusStyle =
-        MaterialTheme.typography.labelMedium
+      val statusStyle = MaterialTheme.typography.labelMedium
           .toSpanStyle()
           .copy(
             color = MaterialTheme.colorScheme.secondary,
             background = MaterialTheme.colorScheme.secondary.copy(alpha = 0.08f),
           )
 
-      val tagStyle =
-        MaterialTheme.typography.labelMedium
+      val tagStyle = MaterialTheme.typography.labelMedium
           .toSpanStyle()
           .copy(
             color = MaterialTheme.colorScheme.onSurface,
@@ -471,20 +602,44 @@ fun ShowMetadata(
         withStyle(tagStyle) { append(language) }
         append(divider)
       }
-      withStyle(tagStyle) { append("$rating") }
-      append(divider)
     }
 
-    Text(
-      text = text,
-      style = MaterialTheme.typography.bodyMedium,
+    Row(
       modifier = Modifier.fillMaxWidth(),
-      overflow = TextOverflow.Ellipsis,
-      maxLines = 1,
-      fontWeight = FontWeight.Medium,
-    )
+      horizontalArrangement = Arrangement.Center,
+      verticalAlignment = Alignment.CenterVertically
+    ) {
+      Row(
+        horizontalArrangement = Arrangement.Center,
+        verticalAlignment = Alignment.CenterVertically
+      ) {
+        Text(
+          text = text,
+          style = MaterialTheme.typography.bodyMedium,
+          overflow = TextOverflow.Ellipsis,
+          maxLines = 1,
+          fontWeight = FontWeight.Medium,
+        )
 
-    Spacer(modifier = Modifier.height(8.dp))
+        Row(
+          verticalAlignment = Alignment.CenterVertically,
+          modifier = Modifier.padding(end = 4.dp)
+        ) {
+          Icon(
+            imageVector = Icons.Filled.Star,
+            contentDescription = null,
+            modifier = Modifier.size(12.dp),
+            tint = MaterialTheme.colorScheme.secondary
+          )
+          Text(
+            text = rating.toString(),
+            style = MaterialTheme.typography.bodyMedium,
+            color = MaterialTheme.colorScheme.secondary,
+            modifier = Modifier.padding(start = 2.dp)
+          )
+        }
+      }
+    }
   }
 }
 
@@ -498,7 +653,7 @@ private fun GenreText(
     items(genreList) { genre ->
       Spacer(modifier = Modifier.width(4.dp))
 
-      TvManiacTextButton(
+      FilledTextButton(
         onClick = {},
         shape = RoundedCornerShape(4.dp),
         buttonColors =
@@ -521,65 +676,30 @@ private fun GenreText(
 @Composable
 fun ShowDetailButtons(
   isFollowed: Boolean,
-  id: Long,
-  onUpdateFavoriteClicked: (Boolean) -> Unit,
-  onWatchTrailerClicked: (Long) -> Unit,
+  onTrackShowClicked: (Boolean) -> Unit,
+  onAddToList: () -> Unit,
   modifier: Modifier = Modifier,
 ) {
   Row(
-    modifier = modifier,
-    horizontalArrangement = Arrangement.Center,
+    modifier = modifier.padding(top = 8.dp),
+    horizontalArrangement = Arrangement.spacedBy(8.dp),
   ) {
-    TvManiacOutlinedButton(
-      modifier = Modifier.fillMaxWidth().weight(1f),
-      leadingIcon = {
-        Image(
-          imageVector =
-            if (isFollowed) {
-              Icons.Filled.LibraryAddCheck
-            } else {
-              Icons.Filled.LibraryAdd
-            },
-          contentDescription = null,
-          colorFilter =
-            ColorFilter.tint(
-              MaterialTheme.colorScheme.secondary.copy(
-                alpha = 0.8F,
-              ),
-            ),
-        )
-      },
-      text =
-        if (isFollowed) {
-          stringResource(id = R.string.unfollow)
-        } else {
-          stringResource(id = R.string.following)
-        },
-      textPadding = 8.dp,
-      onClick = { onUpdateFavoriteClicked(isFollowed) },
-      borderColor = MaterialTheme.colorScheme.secondary,
+    FilledVerticalIconButton(
+      shape = MaterialTheme.shapes.medium,
+      text = if (isFollowed) stringResource(id = R.string.unfollow) else stringResource(id = R.string.following),
+      imageVector = if (isFollowed) Icons.Filled.LibraryAddCheck else Icons.Filled.LibraryAdd,
+      containerColor = if (!isFollowed) MaterialTheme.colorScheme.secondary else MaterialTheme.colorScheme.error,
+      style = MaterialTheme.typography.labelMedium,
+      onClick = { onTrackShowClicked(isFollowed) },
     )
 
-    Spacer(modifier = Modifier.width(8.dp))
-
-    TvManiacOutlinedButton(
-      modifier = Modifier.fillMaxWidth().weight(1f),
-      leadingIcon = {
-        Image(
-          imageVector = Icons.Filled.Movie,
-          contentDescription = null,
-          colorFilter =
-            ColorFilter.tint(
-              MaterialTheme.colorScheme.secondary.copy(
-                alpha = 0.8F,
-              ),
-            ),
-        )
-      },
-      text = stringResource(id = R.string.btn_trailer),
-      textPadding = 8.dp,
-      borderColor = MaterialTheme.colorScheme.secondary,
-      onClick = { onWatchTrailerClicked(id) },
+    FilledVerticalIconButton(
+      shape = MaterialTheme.shapes.medium,
+      text = stringResource(id = R.string.btn_add_to_list),
+      imageVector = Icons.Outlined.AutoAwesomeMotion,
+      containerColor = Color.Gray,
+      style = MaterialTheme.typography.labelMedium,
+      onClick = onAddToList,
     )
   }
 }
@@ -662,7 +782,8 @@ fun WatchProvider(
 
         Card(
           modifier =
-            Modifier.size(width = 80.dp, height = 60.dp)
+            Modifier
+              .size(width = 80.dp, height = 60.dp)
               .padding(
                 end = if (index == list.size - 1) 16.dp else 8.dp,
               ),
@@ -677,7 +798,10 @@ fun WatchProvider(
             model = tvShow.logoUrl,
             contentDescription = tvShow.name,
             contentScale = ContentScale.Crop,
-            modifier = Modifier.fillMaxWidth().aspectRatio(1f).animateItem(),
+            modifier = Modifier
+              .fillMaxWidth()
+              .aspectRatio(1f)
+              .animateItem(),
           )
         }
       }
@@ -718,25 +842,33 @@ private fun CastContent(
               ),
           ) {
             Box(
-              modifier = Modifier.fillMaxSize().size(width = 120.dp, height = 160.dp),
+              modifier = Modifier
+                .fillMaxSize()
+                .size(width = 120.dp, height = 160.dp),
               contentAlignment = Alignment.BottomStart,
             ) {
               AsyncImageComposable(
                 model = cast.profileUrl,
                 contentDescription = cast.name,
                 contentScale = ContentScale.Crop,
-                modifier = Modifier.fillMaxWidth().animateItem(),
+                modifier = Modifier
+                  .fillMaxWidth()
+                  .animateItem(),
               )
 
               Box(
-                modifier = Modifier.matchParentSize().background(contentBackgroundGradient()),
+                modifier = Modifier
+                  .matchParentSize()
+                  .background(contentBackgroundGradient()),
               )
               Column(
                 modifier = Modifier.padding(8.dp),
               ) {
                 Text(
                   text = cast.name,
-                  modifier = Modifier.padding(vertical = 2.dp).wrapContentWidth(),
+                  modifier = Modifier
+                    .padding(vertical = 2.dp)
+                    .wrapContentWidth(),
                   overflow = TextOverflow.Ellipsis,
                   maxLines = 1,
                   style =
@@ -796,7 +928,7 @@ private fun TrailersContent(
               CardDefaults.cardElevation(
                 defaultElevation = 4.dp,
               ),
-            colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant)
+            colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant),
           ) {
             Box {
               AsyncImageComposable(
@@ -804,32 +936,39 @@ private fun TrailersContent(
                 contentDescription = trailer.name,
                 contentScale = ContentScale.Crop,
                 modifier =
-                  Modifier.height(140.dp).aspectRatio(3 / 1.5f).drawWithCache {
-                    val gradient =
-                      Brush.verticalGradient(
-                        colors = listOf(Color.Transparent, Color.Black),
-                        startY = size.height / 3,
-                        endY = size.height,
-                      )
-                    onDrawWithContent {
-                      drawContent()
-                      drawRect(gradient, blendMode = BlendMode.Multiply)
-                    }
-                  },
+                  Modifier
+                    .height(140.dp)
+                    .aspectRatio(3 / 1.5f)
+                    .drawWithCache {
+                      val gradient =
+                        Brush.verticalGradient(
+                          colors = listOf(Color.Transparent, Color.Black),
+                          startY = size.height / 3,
+                          endY = size.height,
+                        )
+                      onDrawWithContent {
+                        drawContent()
+                        drawRect(gradient, blendMode = BlendMode.Multiply)
+                      }
+                    },
               )
 
               Icon(
                 imageVector = Icons.Filled.PlayCircle,
                 contentDescription = trailer.name,
                 tint = MaterialTheme.colorScheme.onSecondary,
-                modifier = Modifier.align(Alignment.Center).size(48.dp),
+                modifier = Modifier
+                  .align(Alignment.Center)
+                  .size(48.dp),
               )
             }
           }
 
           Text(
             text = trailer.name,
-            modifier = Modifier.padding(vertical = 8.dp).widthIn(0.dp, 280.dp),
+            modifier = Modifier
+              .padding(vertical = 8.dp)
+              .widthIn(0.dp, 280.dp),
             overflow = TextOverflow.Ellipsis,
             maxLines = 1,
             style =
@@ -914,10 +1053,6 @@ fun SimilarShowsContent(
   }
 }
 
-private object DetailConstants {
-  val HEADER_HEIGHT = 550.dp
-}
-
 @ThemePreviews
 @Composable
 private fun ShowDetailScreenPreview(
diff --git a/android/ui/show-details/src/test/screenshots/ShowDetailsLoadedState_dark.png b/android/ui/show-details/src/test/screenshots/ShowDetailsLoadedState_dark.png
index 65b97b00d..7fff6a8b1 100644
Binary files a/android/ui/show-details/src/test/screenshots/ShowDetailsLoadedState_dark.png and b/android/ui/show-details/src/test/screenshots/ShowDetailsLoadedState_dark.png differ
diff --git a/android/ui/show-details/src/test/screenshots/ShowDetailsLoadedState_light.png b/android/ui/show-details/src/test/screenshots/ShowDetailsLoadedState_light.png
index fb6152e19..be4463247 100644
Binary files a/android/ui/show-details/src/test/screenshots/ShowDetailsLoadedState_light.png and b/android/ui/show-details/src/test/screenshots/ShowDetailsLoadedState_light.png differ
diff --git a/android/ui/show-details/src/test/screenshots/ShowDetailsLoadedWithErrorInfoState_dark.png b/android/ui/show-details/src/test/screenshots/ShowDetailsLoadedWithErrorInfoState_dark.png
index d38ac24e3..f0e366d6f 100644
Binary files a/android/ui/show-details/src/test/screenshots/ShowDetailsLoadedWithErrorInfoState_dark.png and b/android/ui/show-details/src/test/screenshots/ShowDetailsLoadedWithErrorInfoState_dark.png differ
diff --git a/android/ui/show-details/src/test/screenshots/ShowDetailsLoadedWithErrorInfoState_light.png b/android/ui/show-details/src/test/screenshots/ShowDetailsLoadedWithErrorInfoState_light.png
index a69c550fd..d7bb920fa 100644
Binary files a/android/ui/show-details/src/test/screenshots/ShowDetailsLoadedWithErrorInfoState_light.png and b/android/ui/show-details/src/test/screenshots/ShowDetailsLoadedWithErrorInfoState_light.png differ
diff --git a/build-plugins/build.gradle.kts b/build-plugins/build.gradle.kts
index 3eee7ec10..24c9e3a14 100644
--- a/build-plugins/build.gradle.kts
+++ b/build-plugins/build.gradle.kts
@@ -38,32 +38,24 @@ dependencies {
 
 gradlePlugin {
   plugins {
-    register("kotlinMultiplatformPlugin") {
-      id = "plugin.tvmaniac.multiplatform"
-      implementationClass = "com.thomaskioko.tvmaniac.plugins.KotlinMultiplatformConventionPlugin"
-    }
     register("androidApplication") {
       id = "plugin.tvmaniac.application"
       implementationClass = "com.thomaskioko.tvmaniac.plugins.ApplicationPlugin"
     }
-    register("androidLibrary") {
-      id = "plugin.tvmaniac.android.library"
-      implementationClass = "com.thomaskioko.tvmaniac.plugins.AndroidLibraryPlugin"
-    }
 
     register("androidComposeLibrary") {
       id = "plugin.tvmaniac.compose.library"
       implementationClass = "com.thomaskioko.tvmaniac.plugins.ComposeLibraryPlugin"
     }
 
-    register("kotlinAndroid") {
-      id = "plugin.tvmaniac.kotlin.android"
-      implementationClass = "com.thomaskioko.tvmaniac.plugins.KotlinAndroidConventionPlugin"
+    register("androidLibrary") {
+      id = "plugin.tvmaniac.android.library"
+      implementationClass = "com.thomaskioko.tvmaniac.plugins.AndroidLibraryPlugin"
     }
 
-    register("spotless") {
-      id = "plugin.tvmaniac.spotless"
-      implementationClass = "com.thomaskioko.tvmaniac.plugins.SpotlessPlugin"
+    register("kotlinAndroid") {
+      id = "plugin.tvmaniac.kotlin.android"
+      implementationClass = "com.thomaskioko.tvmaniac.plugins.KotlinAndroidPlugin"
     }
 
     register("git-hooks") {
@@ -71,10 +63,21 @@ gradlePlugin {
       implementationClass = "com.thomaskioko.tvmaniac.plugins.GitHooksPlugin"
     }
 
+    register("kotlinMultiplatformPlugin") {
+      id = "plugin.tvmaniac.multiplatform"
+      implementationClass = "com.thomaskioko.tvmaniac.plugins.KotlinMultiplatformPlugin"
+    }
+
     register("root") {
       id = "plugin.tvmaniac.root"
       implementationClass = "com.thomaskioko.tvmaniac.plugins.RootPlugin"
     }
+
+    register("spotless") {
+      id = "plugin.tvmaniac.spotless"
+      implementationClass = "com.thomaskioko.tvmaniac.plugins.SpotlessPlugin"
+    }
+
     register("xcframework") {
       id = "plugin.tvmaniac.xcframework"
       implementationClass = "com.thomaskioko.tvmaniac.plugins.XCFrameworkPlugin"
diff --git a/build-plugins/src/main/kotlin/com/thomaskioko/tvmaniac/extensions/Android.kt b/build-plugins/src/main/kotlin/com/thomaskioko/tvmaniac/extensions/Android.kt
index d12f88c69..75da85f44 100644
--- a/build-plugins/src/main/kotlin/com/thomaskioko/tvmaniac/extensions/Android.kt
+++ b/build-plugins/src/main/kotlin/com/thomaskioko/tvmaniac/extensions/Android.kt
@@ -9,7 +9,7 @@ import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
 
 fun Project.configureAndroid() {
-  android {
+  extensions.configure<BaseExtension> {
     compileSdkVersion(Versions.COMPILE_SDK)
 
     defaultConfig {
@@ -32,7 +32,7 @@ fun Project.configureAndroid() {
     }
   }
 
-  androidComponents {
+  extensions.configure(AndroidComponentsExtension::class.java) {
     beforeVariants(selector().withBuildType("release")) { variantBuilder ->
       (variantBuilder as? HasUnitTestBuilder)?.apply {
         enableUnitTest = false
@@ -44,9 +44,3 @@ fun Project.configureAndroid() {
     add("coreLibraryDesugaring", libs.findLibrary("android-desugarJdkLibs").get())
   }
 }
-
-fun Project.android(action: BaseExtension.() -> Unit) = extensions.configure<BaseExtension>(action)
-
-private fun Project.androidComponents(action: AndroidComponentsExtension<*, *, *>.() -> Unit) {
-  extensions.configure(AndroidComponentsExtension::class.java, action)
-}
diff --git a/build-plugins/src/main/kotlin/com/thomaskioko/tvmaniac/extensions/Kotlin.kt b/build-plugins/src/main/kotlin/com/thomaskioko/tvmaniac/extensions/Kotlin.kt
index 780a3718c..2a1cb5dc3 100644
--- a/build-plugins/src/main/kotlin/com/thomaskioko/tvmaniac/extensions/Kotlin.kt
+++ b/build-plugins/src/main/kotlin/com/thomaskioko/tvmaniac/extensions/Kotlin.kt
@@ -18,13 +18,9 @@ internal fun Project.configureKotlinJvm() {
   extensions.configure<JavaPluginExtension> {
     sourceCompatibility = JavaVersion.VERSION_17
     targetCompatibility = JavaVersion.VERSION_17
-  }
 
-  java {
     toolchain {
       languageVersion.set(JavaLanguageVersion.of(17))
     }
   }
 }
-
-private fun Project.java(action: JavaPluginExtension.() -> Unit) = extensions.configure<JavaPluginExtension>(action)
diff --git a/build-plugins/src/main/kotlin/com/thomaskioko/tvmaniac/plugins/KotlinAndroidConventionPlugin.kt b/build-plugins/src/main/kotlin/com/thomaskioko/tvmaniac/plugins/KotlinAndroidPlugin.kt
similarity index 86%
rename from build-plugins/src/main/kotlin/com/thomaskioko/tvmaniac/plugins/KotlinAndroidConventionPlugin.kt
rename to build-plugins/src/main/kotlin/com/thomaskioko/tvmaniac/plugins/KotlinAndroidPlugin.kt
index 3f8fa1034..7912df222 100644
--- a/build-plugins/src/main/kotlin/com/thomaskioko/tvmaniac/plugins/KotlinAndroidConventionPlugin.kt
+++ b/build-plugins/src/main/kotlin/com/thomaskioko/tvmaniac/plugins/KotlinAndroidPlugin.kt
@@ -4,7 +4,7 @@ import com.thomaskioko.tvmaniac.extensions.configureKotlinJvm
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 
-class KotlinAndroidConventionPlugin : Plugin<Project> {
+class KotlinAndroidPlugin : Plugin<Project> {
   override fun apply(target: Project) {
     with(target) {
       with(pluginManager) {
diff --git a/build-plugins/src/main/kotlin/com/thomaskioko/tvmaniac/plugins/KotlinMultiplatformConventionPlugin.kt b/build-plugins/src/main/kotlin/com/thomaskioko/tvmaniac/plugins/KotlinMultiplatformPlugin.kt
similarity index 82%
rename from build-plugins/src/main/kotlin/com/thomaskioko/tvmaniac/plugins/KotlinMultiplatformConventionPlugin.kt
rename to build-plugins/src/main/kotlin/com/thomaskioko/tvmaniac/plugins/KotlinMultiplatformPlugin.kt
index 03fc8c6e2..3afdb3673 100644
--- a/build-plugins/src/main/kotlin/com/thomaskioko/tvmaniac/plugins/KotlinMultiplatformConventionPlugin.kt
+++ b/build-plugins/src/main/kotlin/com/thomaskioko/tvmaniac/plugins/KotlinMultiplatformPlugin.kt
@@ -1,26 +1,24 @@
 package com.thomaskioko.tvmaniac.plugins
 
 import com.thomaskioko.tvmaniac.extensions.configureKotlinJvm
-import com.thomaskioko.tvmaniac.extensions.libs
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
-import org.gradle.kotlin.dsl.findByType
 import org.gradle.kotlin.dsl.getByType
 import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 import java.util.Locale
 
-class KotlinMultiplatformConventionPlugin : Plugin<Project> {
+class KotlinMultiplatformPlugin : Plugin<Project> {
   override fun apply(target: Project) = with(target) {
     with(pluginManager) {
       apply("org.jetbrains.kotlin.multiplatform")
       apply("com.autonomousapps.dependency-analysis")
     }
 
-    version = libs.findVersion("shared-module-version")
+    configureKotlinJvm()
 
     extensions.configure<KotlinMultiplatformExtension> {
       applyDefaultHierarchyTemplate()
@@ -75,23 +73,6 @@ class KotlinMultiplatformConventionPlugin : Plugin<Project> {
         }
       }
     }
-
-    configureKotlinJvm()
-
-    target.afterEvaluate {
-      // Remove log pollution until Android support in KMP improves.
-      extensions.findByType<KotlinMultiplatformExtension>()?.let { kmpExt ->
-        kmpExt.sourceSets.removeAll {
-          setOf(
-            "androidAndroidTestRelease",
-            "androidTestFixtures",
-            "androidTestFixturesDebug",
-            "androidTestFixturesRelease",
-            "androidTestFixturesDemo",
-          ).contains(it.name)
-        }
-      }
-    }
   }
 }
 
@@ -106,6 +87,7 @@ fun Project.addLanguageArgs(vararg args: String) {
 }
 
 fun Project.addKspDependencyForAllTargets(dependencyNotation: Any) = addKspDependencyForAllTargets("", dependencyNotation)
+
 private fun Project.addKspDependencyForAllTargets(
   configurationNameSuffix: String,
   dependencyNotation: Any,
diff --git a/build-plugins/src/main/kotlin/com/thomaskioko/tvmaniac/plugins/RootPlugin.kt b/build-plugins/src/main/kotlin/com/thomaskioko/tvmaniac/plugins/RootPlugin.kt
index 24782c495..de832d0c5 100644
--- a/build-plugins/src/main/kotlin/com/thomaskioko/tvmaniac/plugins/RootPlugin.kt
+++ b/build-plugins/src/main/kotlin/com/thomaskioko/tvmaniac/plugins/RootPlugin.kt
@@ -14,7 +14,7 @@ class RootPlugin : Plugin<Project> {
       "Root plugin should only be applied on the root project."
     }
 
-    checkRequiredJdkVersion(libs.findVersion("java-jdk").get().requiredVersion)
+//    checkRequiredJdkVersion(libs.findVersion("java-jdk").get().requiredVersion)
 
     pluginManager.withPlugin("com.autonomousapps.dependency-analysis") {
       configureDependencyAnalysis()
diff --git a/build.gradle.kts b/build.gradle.kts
index 29dccb591..5c2d9e9d1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,6 +1,8 @@
 plugins {
   alias(libs.plugins.android.application) apply false
   alias(libs.plugins.android.library) apply false
+  alias(libs.plugins.android.test) apply false
+  alias(libs.plugins.androidx.baselineprofile) apply false
   alias(libs.plugins.compose.compiler) apply false
   alias(libs.plugins.dependency.analysis)
   alias(libs.plugins.kotlin.android) apply false
@@ -15,6 +17,4 @@ plugins {
   alias(libs.plugins.tvmaniac.git.hooks)
   alias(libs.plugins.tvmaniac.spotless)
   alias(libs.plugins.tvmaniac.root)
-  alias(libs.plugins.android.test) apply false
-  alias(libs.plugins.androidx.baselineprofile) apply false
 }
diff --git a/core/util/src/iosMain/kotlin/com/thomaskioko/tvmaniac/util/IosFormatterUtil.kt b/core/util/src/iosMain/kotlin/com/thomaskioko/tvmaniac/util/IosFormatterUtil.kt
index 65c44074d..e561d1a13 100644
--- a/core/util/src/iosMain/kotlin/com/thomaskioko/tvmaniac/util/IosFormatterUtil.kt
+++ b/core/util/src/iosMain/kotlin/com/thomaskioko/tvmaniac/util/IosFormatterUtil.kt
@@ -1,6 +1,9 @@
 package com.thomaskioko.tvmaniac.util
 
 import kotlin.math.abs
+import kotlin.math.floor
+import kotlin.math.log10
+import kotlin.math.pow
 import kotlin.math.sign
 import me.tatarka.inject.annotations.Inject
 import platform.Foundation.NSNumber
@@ -9,21 +12,20 @@ import software.amazon.lastmile.kotlin.inject.anvil.AppScope
 import software.amazon.lastmile.kotlin.inject.anvil.ContributesBinding
 import software.amazon.lastmile.kotlin.inject.anvil.SingleIn
 
-const val POSTER_PATH = "https://image.tmdb.org/t/p/original"
+const val POSTER_PATH = "https://image.tmdb.org/t/p/original%s"
 
 @Inject
 @SingleIn(AppScope::class)
 @ContributesBinding(AppScope::class)
 class IosFormatterUtil : FormatterUtil {
 
-  override fun formatTmdbPosterPath(imageUrl: String): String {
-    return POSTER_PATH.plus(imageUrl)
-  }
+  override fun formatTmdbPosterPath(imageUrl: String): String = POSTER_PATH.replace("%s", imageUrl)
 
   override fun formatDouble(number: Double?, scale: Int): Double {
     val formatter = NSNumberFormatter()
-    formatter.minimumFractionDigits = 0u
-    formatter.maximumFractionDigits = 1u
+    formatter.minimumFractionDigits = scale.toULong()
+    formatter.maximumFractionDigits = scale.toULong()
+    formatter.roundingMode = 0u // NSNumberFormatterRoundUp
     formatter.numberStyle = 1u // Decimal
     return when {
       number != null -> formatter.stringFromNumber(NSNumber(number))?.toDouble() ?: 0.0
@@ -32,17 +34,25 @@ class IosFormatterUtil : FormatterUtil {
   }
 
   override fun formatDuration(number: Int): String {
+    val suffix = charArrayOf(' ', 'k', 'M', 'B', 'T', 'P', 'E')
+    val numValue = number.toLong()
+    val value = floor(log10(numValue.toDouble())).toInt()
+    val base = value / 3
+
     val formatter = NSNumberFormatter()
     formatter.minimumFractionDigits = 0u
     formatter.maximumFractionDigits = 1u
     formatter.numberStyle = 1u // Decimal
 
-    val num = NSNumber((abs(number) / 1000))
-
-    return if (abs(number) > 999) {
-      "${(sign(number.toDouble()) * num.doubleValue) / 10.0} k"
-    } else {
-      (sign(number.toDouble()) * abs(number)).toString()
+    return when {
+      value >= 3 && base < suffix.size -> {
+        val scaledNum = numValue / 10.0.pow((base * 3).toDouble())
+        "${formatter.stringFromNumber(NSNumber(scaledNum))}${suffix[base]}"
+      }
+      else -> {
+        formatter.maximumFractionDigits = 0u
+        formatter.stringFromNumber(NSNumber(integer = numValue)) ?: number.toString()
+      }
     }
   }
 }
diff --git a/core/util/src/iosTest/kotlin/com/thomaskioko/tvmaniac/util/IosFormatterUtilTest.kt b/core/util/src/iosTest/kotlin/com/thomaskioko/tvmaniac/util/IosFormatterUtilTest.kt
new file mode 100644
index 000000000..536688b17
--- /dev/null
+++ b/core/util/src/iosTest/kotlin/com/thomaskioko/tvmaniac/util/IosFormatterUtilTest.kt
@@ -0,0 +1,81 @@
+package com.thomaskioko.tvmaniac.util
+
+import io.kotest.matchers.equals.shouldBeEqual
+import kotlin.test.Test
+
+class IosFormatterUtilTest {
+
+    private val formatterUtil = IosFormatterUtil()
+
+    @Test
+    fun `should return formatted poster path`() {
+        val imageUrl = "/path/to/image.jpg"
+        val expected = "https://image.tmdb.org/t/p/original/path/to/image.jpg"
+
+        val result = formatterUtil.formatTmdbPosterPath(imageUrl)
+
+        result shouldBeEqual expected
+    }
+
+    @Test
+    fun `should round double to two decimal places`() {
+        val number = 3.14159
+        val scale = 2
+        val expected = 3.15 // Rounds up due to RoundingMode.UP
+
+        val result = formatterUtil.formatDouble(number, scale)
+
+        result shouldBeEqual expected
+    }
+
+    @Test
+    fun `should round double to one decimal places`() {
+        val number = 3.14159
+        val expected = 3.2 // Rounds up due to RoundingMode.UP
+
+        val result = formatterUtil.formatDouble(number, 1)
+
+        result shouldBeEqual expected
+    }
+
+    @Test
+    fun formatDouble_withNull_returnsZero() {
+        val number: Double? = null
+        val scale = 2
+        val expected = 0.0
+
+        val result = formatterUtil.formatDouble(number, scale)
+
+        result shouldBeEqual expected
+    }
+
+    @Test
+    fun formatDuration_lessThanThousand_returnsPlainNumber() {
+        val number = 999
+        val expected = "999"
+
+        val result = formatterUtil.formatDuration(number)
+
+        result shouldBeEqual expected
+    }
+
+    @Test
+    fun formatDuration_thousands_returnsKSuffix() {
+        val number = 1500
+        val expected = "1.5k"
+
+        val result = formatterUtil.formatDuration(number)
+
+        result shouldBeEqual expected
+    }
+
+    @Test
+    fun formatDuration_millions_returnsMSuffix() {
+        val number = 1500000
+        val expected = "1.5M"
+
+        val result = formatterUtil.formatDuration(number)
+
+        result shouldBeEqual expected
+    }
+}
diff --git a/core/util/src/test/java/com/thomaskioko/tvmaniac/util/AndroidFormatterUtilTest.kt b/core/util/src/test/java/com/thomaskioko/tvmaniac/util/AndroidFormatterUtilTest.kt
new file mode 100644
index 000000000..e6b493e6f
--- /dev/null
+++ b/core/util/src/test/java/com/thomaskioko/tvmaniac/util/AndroidFormatterUtilTest.kt
@@ -0,0 +1,81 @@
+package com.thomaskioko.tvmaniac.util
+
+import io.kotest.matchers.equals.shouldBeEqual
+import kotlin.test.Test
+
+class AndroidFormatterUtilTest {
+
+    private val formatterUtil = AndroidFormatterUtil()
+
+    @Test
+    fun `should return formatted poster path`() {
+        val imageUrl = "/path/to/image.jpg"
+        val expected = "https://image.tmdb.org/t/p/original/path/to/image.jpg"
+
+        val result = formatterUtil.formatTmdbPosterPath(imageUrl)
+
+        result shouldBeEqual expected
+    }
+
+    @Test
+    fun `should round double to two decimal places`() {
+        val number = 3.14159
+        val scale = 2
+        val expected = 3.15 // Rounds up due to RoundingMode.UP
+
+        val result = formatterUtil.formatDouble(number, scale)
+
+        result shouldBeEqual expected
+    }
+
+    @Test
+    fun `should round double to one decimal places`() {
+        val number = 8.00
+        val expected = 8.0
+
+        val result = formatterUtil.formatDouble(number, 1)
+
+        result shouldBeEqual expected
+    }
+
+    @Test
+    fun formatDouble_withNull_returnsZero() {
+        val number: Double? = null
+        val scale = 2
+        val expected = 0.0
+
+        val result = formatterUtil.formatDouble(number, scale)
+
+        result shouldBeEqual expected
+    }
+
+    @Test
+    fun formatDuration_lessThanThousand_returnsPlainNumber() {
+        val number = 999
+        val expected = "999"
+
+        val result = formatterUtil.formatDuration(number)
+
+        result shouldBeEqual expected
+    }
+
+    @Test
+    fun formatDuration_thousands_returnsKSuffix() {
+        val number = 1500
+        val expected = "1.5k"
+
+        val result = formatterUtil.formatDuration(number)
+
+        result shouldBeEqual expected
+    }
+
+    @Test
+    fun formatDuration_millions_returnsMSuffix() {
+        val number = 1500000
+        val expected = "1.5M"
+
+        val result = formatterUtil.formatDuration(number)
+
+        result shouldBeEqual expected
+    }
+}
diff --git a/core/util/testing/src/commonMain/kotlin/com/thomakioko/tvmaniac/util/testing/FakeFormatterUtil.kt b/core/util/testing/src/commonMain/kotlin/com/thomakioko/tvmaniac/util/testing/FakeFormatterUtil.kt
index 3afd47913..708a5c2bd 100644
--- a/core/util/testing/src/commonMain/kotlin/com/thomakioko/tvmaniac/util/testing/FakeFormatterUtil.kt
+++ b/core/util/testing/src/commonMain/kotlin/com/thomakioko/tvmaniac/util/testing/FakeFormatterUtil.kt
@@ -5,7 +5,9 @@ import com.thomaskioko.tvmaniac.util.FormatterUtil
 class FakeFormatterUtil : FormatterUtil {
   override fun formatTmdbPosterPath(imageUrl: String): String = ""
 
-  override fun formatDouble(number: Double?, scale: Int): Double = 0.0
+  override fun formatDouble(number: Double?, scale: Int): Double {
+    return number ?: 0.0
+  }
 
   override fun formatDuration(number: Int): String = ""
 }
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 4ff395480..a6cefcf02 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -30,10 +30,10 @@ platform :ios do
       derived_data_path: "derived_data"
     )
 
-    # Run TvManiacUI snapshot tests
+    # Run TvManiacKit snapshot tests
     run_tests(
       project: "ios/tv-maniac.xcodeproj",
-      scheme: "TvManiacUI",
+      scheme: "TvManiacKit",
       device: TEST_DEVICE,
       clean: true,
       result_bundle: true,
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a248f6996..1f2f1943a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -48,7 +48,6 @@ robolectric = "4.14.1"
 roborazzi = "1.40.1"
 profileinstaller = "1.4.1"
 serialization-json = "1.8.0"
-shared-module-version = "0.9.1"
 skie = "0.10.1"
 snapper = "0.3.0"
 sqldelight = "2.0.2"
diff --git a/ios/Modules/SnapshotTestingLib/Package.resolved b/ios/Modules/SnapshotTestingLib/Package.resolved
index 57221f633..92a2c8e87 100644
--- a/ios/Modules/SnapshotTestingLib/Package.resolved
+++ b/ios/Modules/SnapshotTestingLib/Package.resolved
@@ -1,13 +1,22 @@
 {
-  "originHash" : "1b0c8108ca630f5fd17f4865c9157f11a1e4b6e0cce69816668c1a4fe6f8f714",
+  "originHash" : "e14b4ae095d15c4e28f4f55fb83235ba57847238e9a0e7b1451d49b336e36a20",
   "pins" : [
+    {
+      "identity" : "swift-custom-dump",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-custom-dump",
+      "state" : {
+        "revision" : "82645ec760917961cfa08c9c0c7104a57a0fa4b1",
+        "version" : "1.3.3"
+      }
+    },
     {
       "identity" : "swift-snapshot-testing",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-snapshot-testing.git",
       "state" : {
-        "revision" : "42a086182681cf661f5c47c9b7dc3931de18c6d7",
-        "version" : "1.17.6"
+        "revision" : "f5bfff796ee8e3bc9a685b7ffba1bf20663eb370",
+        "version" : "1.18.0"
       }
     },
     {
@@ -15,8 +24,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/swiftlang/swift-syntax",
       "state" : {
-        "revision" : "515f79b522918f83483068d99c68daeb5116342d",
-        "version" : "600.0.0-prerelease-2024-09-04"
+        "revision" : "0687f71944021d616d34d922343dcef086855920",
+        "version" : "600.0.1"
+      }
+    },
+    {
+      "identity" : "xctest-dynamic-overlay",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
+      "state" : {
+        "revision" : "b444594f79844b0d6d76d70fbfb3f7f71728f938",
+        "version" : "1.5.1"
       }
     }
   ],
diff --git a/ios/Modules/SwiftUIComponents/Package.resolved b/ios/Modules/SwiftUIComponents/Package.resolved
index ff672bafa..e2cc843f2 100644
--- a/ios/Modules/SwiftUIComponents/Package.resolved
+++ b/ios/Modules/SwiftUIComponents/Package.resolved
@@ -19,13 +19,22 @@
         "version" : "3.1.3"
       }
     },
+    {
+      "identity" : "swift-custom-dump",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-custom-dump",
+      "state" : {
+        "revision" : "82645ec760917961cfa08c9c0c7104a57a0fa4b1",
+        "version" : "1.3.3"
+      }
+    },
     {
       "identity" : "swift-snapshot-testing",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-snapshot-testing",
       "state" : {
-        "revision" : "2e6a85b73fc14e27d7542165ae73b1a10516ca9a",
-        "version" : "1.17.7"
+        "revision" : "f5bfff796ee8e3bc9a685b7ffba1bf20663eb370",
+        "version" : "1.18.0"
       }
     },
     {
@@ -33,8 +42,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/swiftlang/swift-syntax",
       "state" : {
-        "revision" : "515f79b522918f83483068d99c68daeb5116342d",
-        "version" : "600.0.0-prerelease-2024-09-04"
+        "revision" : "0687f71944021d616d34d922343dcef086855920",
+        "version" : "600.0.1"
+      }
+    },
+    {
+      "identity" : "xctest-dynamic-overlay",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
+      "state" : {
+        "revision" : "b444594f79844b0d6d76d70fbfb3f7f71728f938",
+        "version" : "1.5.1"
       }
     },
     {
diff --git a/ios/Modules/SwiftUIComponents/Sources/SwiftUIComponents/Components/CarouselView.swift b/ios/Modules/SwiftUIComponents/Sources/SwiftUIComponents/Components/CarouselView.swift
index 649098a75..bca0607a9 100644
--- a/ios/Modules/SwiftUIComponents/Sources/SwiftUIComponents/Components/CarouselView.swift
+++ b/ios/Modules/SwiftUIComponents/Sources/SwiftUIComponents/Components/CarouselView.swift
@@ -1,4 +1,5 @@
 import SwiftUI
+import Combine
 
 /// A view that displays a horizontally scrolling carousel of show posters
 /// with auto-scrolling and interactive gesture support.
@@ -9,13 +10,9 @@ public struct CarouselView<T, Content: View>: View {
   private let onItemTapped: (Int64) -> Void
   private let content: (Int) -> Content
 
-  @GestureState private var dragOffset: CGFloat = 0
-  @State private var offset: CGFloat = 0
-  @State private var dragging = false
-
-  /// The time interval between auto-scrolls in seconds
-  private let autoScrollInterval: TimeInterval = 6.0
-  @State private var autoScrollTimer: Timer?
+  @State private var timer: Timer.TimerPublisher = Timer.publish(every: 3, on: .main, in: .common)
+  @State private var timerCancellable: Cancellable?
+  @State private var isDragging: Bool = false
 
   public init(
     items: [T],
@@ -31,142 +28,68 @@ public struct CarouselView<T, Content: View>: View {
     self.content = content
   }
 
-  /// The items to display, including wraparound items for infinite scrolling
-  private var displayItems: [T] {
-    guard let first = items.first, let last = items.last else { return [] }
-    return [last] + items + [first]
-  }
-
   public var body: some View {
     ZStack(alignment: .bottom) {
-      GeometryReader { geometry in
-        let screenWidth = geometry.size.width
-
-        HStack(spacing: 0) {
-          ForEach(displayItems.indices, id: \.self) { index in
-            let actualIndex = (index - 1) % items.count
-            content(actualIndex >= 0 ? actualIndex : items.count - 1)
-              .frame(width: screenWidth)
-          }
-        }
-        .offset(x: offset + dragOffset)
-        .onChange(of: currentIndex) { _ in
-          resetOffsetIfNeeded(geometry: geometry)
-          notifyActiveItem()
-        }
-        .onAppear {
-          offset = -CGFloat(currentIndex) * screenWidth
-          startAutoScroll()
-          notifyActiveItem()
-        }
-        .onDisappear {
-          autoScrollTimer?.invalidate()
-        }
-        .gesture(
-          DragGesture()
-            .updating($dragOffset) { value, state, _ in
-              state = value.translation.width
-              if !dragging {
-                dragging = true
-                autoScrollTimer?.invalidate()
+      TabView(selection: $currentIndex) {
+        ForEach(items.indices, id: \.self) { index in
+          ZStack(alignment: Alignment(horizontal: .trailing, vertical: .bottom), content: {
+            GeometryReader { reader in
+              let screenWidth = reader.size.width
+              
+              HStack(spacing: 0) {
+                content(index)
+                  .offset(x: -reader.frame(in: .global).minX)
+                  .frame(width: screenWidth)
+              }
+              .onChange(of: currentIndex) { _ in
+                notifyActiveItem()
+              }
+              .onAppear {
+                notifyActiveItem()
               }
-
-              handleDragUpdate(
-                translation: value.translation.width,
-                screenWidth: screenWidth
-              )
-            }
-            .onEnded { value in
-              dragging = false
-              let velocity = value.predictedEndTranslation.width - value.translation.width
-              let translation = value.translation.width
-
-              handleDragEnd(
-                velocity: velocity,
-                translation: translation,
-                screenWidth: screenWidth
-              )
             }
-        )
-        .animation(dragging ? nil : .easeOut, value: dragOffset)
-      }
-    }
-  }
-
-  /// Starts the auto-scroll timer if not already running
-  private func startAutoScroll() {
-    autoScrollTimer?.invalidate()
-    autoScrollTimer = Timer.scheduledTimer(withTimeInterval: autoScrollInterval, repeats: true) { _ in
-      if !dragging {
-        withAnimation(.easeOut(duration: 0.6)) {
-          currentIndex += 1
-          offset = -CGFloat(currentIndex) * UIScreen.main.bounds.width
+            .cornerRadius(0)
+            .simultaneousGesture(
+              DragGesture(minimumDistance: 0)
+                .onChanged { _ in
+                  isDragging = true
+                  stopAutoScroll()
+                }
+                .onEnded { _ in
+                  isDragging = false
+                  setupAutoScroll()
+                }
+            )
+          })
         }
       }
-    }
-  }
-
-  /// Resets the offset when reaching the end to enable infinite scrolling
-  /// - Parameter geometry: The geometry proxy providing the container's dimensions
-  private func resetOffsetIfNeeded(geometry: GeometryProxy) {
-    let screenWidth = geometry.size.width
-    if currentIndex == displayItems.count - 1 {
-      withAnimation(.none) {
-        currentIndex = 1
-        offset = -screenWidth
+      .tabViewStyle(PageTabViewStyle(indexDisplayMode: .never))
+      .onAppear {
+        setupAutoScroll()
       }
-    }
-    if currentIndex == 0 {
-      withAnimation(.none) {
-        currentIndex = items.count
-        offset = -CGFloat(items.count) * screenWidth
+      .onDisappear {
+        stopAutoScroll()
       }
     }
   }
 
-  /// Notifies observers about the currently active item
-  private func notifyActiveItem() {
-    let actualIndex = (currentIndex - 1) % items.count
-    onItemScrolled(items[actualIndex])
-  }
-
-  /// Handles the drag gesture state update
-  private func handleDragUpdate(
-    translation: CGFloat,
-    screenWidth: CGFloat
-  ) {
-    let halfScreenWidth = screenWidth / 2
-
-    if abs(translation) > halfScreenWidth {
-      let direction = translation > 0 ? -1 : 1
-      let nextIndex = (currentIndex + direction - 1) % items.count
-      guard nextIndex >= 0 && nextIndex < items.count else { return }
-      onItemScrolled(items[nextIndex])
-    } else {
-      let actualIndex = (currentIndex - 1) % items.count
-      guard actualIndex >= 0 && actualIndex < items.count else { return }
-      onItemScrolled(items[actualIndex])
+  private func setupAutoScroll() {
+    guard !isDragging else { return }
+    timer = Timer.publish(every: 3, on: .main, in: .common)
+    timerCancellable = timer.autoconnect().sink { _ in
+      withAnimation(.easeOut(duration: 0.6)) {
+        currentIndex = (currentIndex + 1) % items.count
+      }
     }
   }
 
-  /// Handles the end of a drag gesture
-  private func handleDragEnd(
-    velocity: CGFloat,
-    translation: CGFloat,
-    screenWidth: CGFloat
-  ) {
-    if abs(velocity) > 100 || abs(translation) > screenWidth * 0.2 {
-      let direction: Int = translation > 0 ? -1 : 1
-      let targetIndex = currentIndex + direction
-      currentIndex = targetIndex
-      offset = -CGFloat(targetIndex) * screenWidth
-    } else {
-      offset = -CGFloat(currentIndex) * screenWidth
-    }
+  private func stopAutoScroll() {
+    timerCancellable?.cancel()
+    timerCancellable = nil
+  }
 
-    DispatchQueue.main.asyncAfter(deadline: .now() + 0.6) {
-      startAutoScroll()
-    }
+  private func notifyActiveItem() {
+    onItemScrolled(items[currentIndex])
   }
 }
 
diff --git a/ios/Modules/TvManiacKit/Package.swift b/ios/Modules/TvManiacKit/Package.swift
index 7d3bf1e4b..8e2bc5b96 100644
--- a/ios/Modules/TvManiacKit/Package.swift
+++ b/ios/Modules/TvManiacKit/Package.swift
@@ -16,7 +16,7 @@ let package = Package(
   ],
   dependencies: [
       .package(name: "SwiftUIComponents", path: "../SwiftUIComponents"),
-      .package(name: "TvManiacUI", path: "../TvManiacUI"),
+      .package(name: "SnapshotTestingLib", path: "../SnapshotTestingLib"),
   ],
   targets: [
     .binaryTarget(
@@ -28,9 +28,16 @@ let package = Package(
       dependencies: [
         "SwiftUIComponents",
         "TvManiac",
-        "TvManiacUI"
       ]
     ),
+    .testTarget(
+        name: "TvManiacKitTests",
+        dependencies: [
+            "SnapshotTestingLib",
+            "TvManiacKit"
+        ],
+        exclude: ["__Snapshots__"]
+    )
   ]
 )
 
diff --git a/ios/Modules/TvManiacKit/Sources/TvManiacKit/Mapper+Extensions.swift b/ios/Modules/TvManiacKit/Sources/TvManiacKit/Mapper+Extensions.swift
index e9973bcf7..0b4a5f2d8 100644
--- a/ios/Modules/TvManiacKit/Sources/TvManiacKit/Mapper+Extensions.swift
+++ b/ios/Modules/TvManiacKit/Sources/TvManiacKit/Mapper+Extensions.swift
@@ -1,5 +1,4 @@
 import TvManiac
-import TvManiacUI
 
 public extension TvManiac.WatchlistItem {
   func toSwift() -> ShowPosterImage {
diff --git a/ios/Modules/TvManiacUI/Sources/TvManiacUI/CastListView.swift b/ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/CastListView.swift
similarity index 100%
rename from ios/Modules/TvManiacUI/Sources/TvManiacUI/CastListView.swift
rename to ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/CastListView.swift
diff --git a/ios/Modules/TvManiacUI/Sources/TvManiacUI/Episode/EpisodeCollapsible.swift b/ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/Episode/EpisodeCollapsible.swift
similarity index 100%
rename from ios/Modules/TvManiacUI/Sources/TvManiacUI/Episode/EpisodeCollapsible.swift
rename to ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/Episode/EpisodeCollapsible.swift
diff --git a/ios/Modules/TvManiacUI/Sources/TvManiacUI/Episode/EpisodeItemView.swift b/ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/Episode/EpisodeItemView.swift
similarity index 100%
rename from ios/Modules/TvManiacUI/Sources/TvManiacUI/Episode/EpisodeItemView.swift
rename to ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/Episode/EpisodeItemView.swift
diff --git a/ios/Modules/TvManiacUI/Sources/TvManiacUI/Episode/EpisodeListView.swift b/ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/Episode/EpisodeListView.swift
similarity index 100%
rename from ios/Modules/TvManiacUI/Sources/TvManiacUI/Episode/EpisodeListView.swift
rename to ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/Episode/EpisodeListView.swift
diff --git a/ios/Modules/TvManiacUI/Sources/TvManiacUI/GridView.swift b/ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/GridView.swift
similarity index 100%
rename from ios/Modules/TvManiacUI/Sources/TvManiacUI/GridView.swift
rename to ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/GridView.swift
diff --git a/ios/Modules/TvManiacUI/Sources/TvManiacUI/HorizontalItemListView.swift b/ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/HorizontalItemListView.swift
similarity index 100%
rename from ios/Modules/TvManiacUI/Sources/TvManiacUI/HorizontalItemListView.swift
rename to ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/HorizontalItemListView.swift
diff --git a/ios/Modules/TvManiacUI/Sources/TvManiacUI/ImageGalleryContentView.swift b/ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/ImageGalleryContentView.swift
similarity index 100%
rename from ios/Modules/TvManiacUI/Sources/TvManiacUI/ImageGalleryContentView.swift
rename to ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/ImageGalleryContentView.swift
diff --git a/ios/Modules/TvManiacUI/Sources/TvManiacUI/Models/ShowPosterImage.swift b/ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/Models/ShowPosterImage.swift
similarity index 100%
rename from ios/Modules/TvManiacUI/Sources/TvManiacUI/Models/ShowPosterImage.swift
rename to ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/Models/ShowPosterImage.swift
diff --git a/ios/Modules/TvManiacUI/Sources/TvManiacUI/Models/SwiftCast.swift b/ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/Models/SwiftCast.swift
similarity index 100%
rename from ios/Modules/TvManiacUI/Sources/TvManiacUI/Models/SwiftCast.swift
rename to ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/Models/SwiftCast.swift
diff --git a/ios/Modules/TvManiacUI/Sources/TvManiacUI/Models/SwiftGenres.swift b/ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/Models/SwiftGenres.swift
similarity index 100%
rename from ios/Modules/TvManiacUI/Sources/TvManiacUI/Models/SwiftGenres.swift
rename to ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/Models/SwiftGenres.swift
diff --git a/ios/Modules/TvManiacUI/Sources/TvManiacUI/Models/SwiftProviders.swift b/ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/Models/SwiftProviders.swift
similarity index 100%
rename from ios/Modules/TvManiacUI/Sources/TvManiacUI/Models/SwiftProviders.swift
rename to ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/Models/SwiftProviders.swift
diff --git a/ios/Modules/TvManiacUI/Sources/TvManiacUI/Models/SwiftSearchShow.swift b/ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/Models/SwiftSearchShow.swift
similarity index 100%
rename from ios/Modules/TvManiacUI/Sources/TvManiacUI/Models/SwiftSearchShow.swift
rename to ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/Models/SwiftSearchShow.swift
diff --git a/ios/Modules/TvManiacUI/Sources/TvManiacUI/Models/SwiftSeason.swift b/ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/Models/SwiftSeason.swift
similarity index 100%
rename from ios/Modules/TvManiacUI/Sources/TvManiacUI/Models/SwiftSeason.swift
rename to ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/Models/SwiftSeason.swift
diff --git a/ios/Modules/TvManiacUI/Sources/TvManiacUI/Models/SwiftShow.swift b/ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/Models/SwiftShow.swift
similarity index 100%
rename from ios/Modules/TvManiacUI/Sources/TvManiacUI/Models/SwiftShow.swift
rename to ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/Models/SwiftShow.swift
diff --git a/ios/Modules/TvManiacUI/Sources/TvManiacUI/Models/SwiftShowGenre.swift b/ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/Models/SwiftShowGenre.swift
similarity index 100%
rename from ios/Modules/TvManiacUI/Sources/TvManiacUI/Models/SwiftShowGenre.swift
rename to ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/Models/SwiftShowGenre.swift
diff --git a/ios/Modules/TvManiacUI/Sources/TvManiacUI/Models/SwiftTrailer.swift b/ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/Models/SwiftTrailer.swift
similarity index 100%
rename from ios/Modules/TvManiacUI/Sources/TvManiacUI/Models/SwiftTrailer.swift
rename to ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/Models/SwiftTrailer.swift
diff --git a/ios/Modules/TvManiacUI/Sources/TvManiacUI/ProviderListView.swift b/ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/ProviderListView.swift
similarity index 100%
rename from ios/Modules/TvManiacUI/Sources/TvManiacUI/ProviderListView.swift
rename to ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/ProviderListView.swift
diff --git a/ios/Modules/TvManiacUI/Sources/TvManiacUI/Search/SearchItemView.swift b/ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/Search/SearchItemView.swift
similarity index 100%
rename from ios/Modules/TvManiacUI/Sources/TvManiacUI/Search/SearchItemView.swift
rename to ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/Search/SearchItemView.swift
diff --git a/ios/Modules/TvManiacUI/Sources/TvManiacUI/Search/SearchResultListView.swift b/ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/Search/SearchResultListView.swift
similarity index 100%
rename from ios/Modules/TvManiacUI/Sources/TvManiacUI/Search/SearchResultListView.swift
rename to ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/Search/SearchResultListView.swift
diff --git a/ios/Modules/TvManiacUI/Sources/TvManiacUI/Search/ShowContent/HorizontalShowContentView.swift b/ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/Search/ShowContent/HorizontalShowContentView.swift
similarity index 97%
rename from ios/Modules/TvManiacUI/Sources/TvManiacUI/Search/ShowContent/HorizontalShowContentView.swift
rename to ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/Search/ShowContent/HorizontalShowContentView.swift
index 4573b8dc9..338405559 100644
--- a/ios/Modules/TvManiacUI/Sources/TvManiacUI/Search/ShowContent/HorizontalShowContentView.swift
+++ b/ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/Search/ShowContent/HorizontalShowContentView.swift
@@ -1,10 +1,3 @@
-//
-//  HorizontalShowContentView.swift
-//  TvManiacUI
-//
-//  Created by Thomas Kioko on 11/4/24.
-//
-
 import SwiftUI
 import SwiftUIComponents
 
diff --git a/ios/Modules/TvManiacUI/Sources/TvManiacUI/Search/ShowContent/ShowContentItemView.swift b/ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/Search/ShowContent/ShowContentItemView.swift
similarity index 100%
rename from ios/Modules/TvManiacUI/Sources/TvManiacUI/Search/ShowContent/ShowContentItemView.swift
rename to ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/Search/ShowContent/ShowContentItemView.swift
diff --git a/ios/Modules/TvManiacUI/Sources/TvManiacUI/SeasonChipViewList.swift b/ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/SeasonChipViewList.swift
similarity index 100%
rename from ios/Modules/TvManiacUI/Sources/TvManiacUI/SeasonChipViewList.swift
rename to ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/SeasonChipViewList.swift
diff --git a/ios/Modules/TvManiacUI/Sources/TvManiacUI/ShowDetails/HeaderView.swift b/ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/ShowDetails/HeaderView.swift
similarity index 100%
rename from ios/Modules/TvManiacUI/Sources/TvManiacUI/ShowDetails/HeaderView.swift
rename to ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/ShowDetails/HeaderView.swift
diff --git a/ios/Modules/TvManiacUI/Sources/TvManiacUI/ShowDetails/ShowHeaderInfoView.swift b/ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/ShowDetails/ShowHeaderInfoView.swift
similarity index 96%
rename from ios/Modules/TvManiacUI/Sources/TvManiacUI/ShowDetails/ShowHeaderInfoView.swift
rename to ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/ShowDetails/ShowHeaderInfoView.swift
index a906bd097..6d226e41b 100644
--- a/ios/Modules/TvManiacUI/Sources/TvManiacUI/ShowDetails/ShowHeaderInfoView.swift
+++ b/ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/ShowDetails/ShowHeaderInfoView.swift
@@ -1,10 +1,3 @@
-//
-//  ShowHeaderInfoView.swift
-//  TvManiacUI
-//
-//  Created by Thomas Kioko on 11/4/24.
-//
-
 import SwiftUI
 import SwiftUIComponents
 
diff --git a/ios/Modules/TvManiacUI/Sources/TvManiacUI/ShowDetails/ShowInfoView.swift b/ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/ShowDetails/ShowInfoView.swift
similarity index 100%
rename from ios/Modules/TvManiacUI/Sources/TvManiacUI/ShowDetails/ShowInfoView.swift
rename to ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/ShowDetails/ShowInfoView.swift
diff --git a/ios/Modules/TvManiacUI/Sources/TvManiacUI/SnapCarousel.swift b/ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/SnapCarousel.swift
similarity index 100%
rename from ios/Modules/TvManiacUI/Sources/TvManiacUI/SnapCarousel.swift
rename to ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/SnapCarousel.swift
diff --git a/ios/Modules/TvManiacUI/Sources/TvManiacUI/TrailerListView.swift b/ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/TrailerListView.swift
similarity index 100%
rename from ios/Modules/TvManiacUI/Sources/TvManiacUI/TrailerListView.swift
rename to ios/Modules/TvManiacKit/Sources/TvManiacKit/UI/TrailerListView.swift
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/CastListViewTest.swift b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/CastListViewTest.swift
similarity index 97%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/CastListViewTest.swift
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/CastListViewTest.swift
index 1af7837fe..9c1897a31 100644
--- a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/CastListViewTest.swift
+++ b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/CastListViewTest.swift
@@ -1,6 +1,6 @@
 import SnapshotTestingLib
 import SwiftUI
-import TvManiacUI
+import TvManiacKit
 import XCTest
 
 class CastListViewTest: XCTestCase {
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/EpisodeCollapsibleTest.swift b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/EpisodeCollapsibleTest.swift
similarity index 95%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/EpisodeCollapsibleTest.swift
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/EpisodeCollapsibleTest.swift
index 21112a184..4a23532f7 100644
--- a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/EpisodeCollapsibleTest.swift
+++ b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/EpisodeCollapsibleTest.swift
@@ -1,6 +1,6 @@
 import SnapshotTestingLib
 import SwiftUI
-import TvManiacUI
+import TvManiacKit
 import XCTest
 
 class EpisodeCollapsibleTest: XCTestCase {
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/EpisodeItemViewTest.swift b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/EpisodeItemViewTest.swift
similarity index 96%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/EpisodeItemViewTest.swift
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/EpisodeItemViewTest.swift
index 510b238dc..2aef20f33 100644
--- a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/EpisodeItemViewTest.swift
+++ b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/EpisodeItemViewTest.swift
@@ -1,6 +1,6 @@
 import SnapshotTestingLib
 import SwiftUI
-import TvManiacUI
+import TvManiacKit
 import XCTest
 
 class EpisodeItemViewTest: XCTestCase {
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/EpisodeListViewTest.swift b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/EpisodeListViewTest.swift
similarity index 98%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/EpisodeListViewTest.swift
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/EpisodeListViewTest.swift
index d89df925d..11227cb6b 100644
--- a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/EpisodeListViewTest.swift
+++ b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/EpisodeListViewTest.swift
@@ -1,6 +1,6 @@
 import SnapshotTestingLib
 import SwiftUI
-import TvManiacUI
+import TvManiacKit
 import XCTest
 
 class EpisodeListViewTest: XCTestCase {
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/GridViewTest.swift b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/GridViewTest.swift
similarity index 98%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/GridViewTest.swift
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/GridViewTest.swift
index 848dea07f..2592c1a33 100644
--- a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/GridViewTest.swift
+++ b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/GridViewTest.swift
@@ -1,6 +1,6 @@
 import SnapshotTestingLib
 import SwiftUI
-import TvManiacUI
+import TvManiacKit
 import XCTest
 
 
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/HeaderViewTest.swift b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/HeaderViewTest.swift
similarity index 97%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/HeaderViewTest.swift
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/HeaderViewTest.swift
index 39a5945fb..0e3e33fe1 100644
--- a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/HeaderViewTest.swift
+++ b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/HeaderViewTest.swift
@@ -1,6 +1,6 @@
 import SnapshotTestingLib
 import SwiftUI
-import TvManiacUI
+import TvManiacKit
 import XCTest
 
 class HeaderViewTest: XCTestCase {
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/HorizontalItemListViewTest.swift b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/HorizontalItemListViewTest.swift
similarity index 98%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/HorizontalItemListViewTest.swift
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/HorizontalItemListViewTest.swift
index 77b54d3d3..85d6da4da 100644
--- a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/HorizontalItemListViewTest.swift
+++ b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/HorizontalItemListViewTest.swift
@@ -1,6 +1,6 @@
 import SnapshotTestingLib
 import SwiftUI
-import TvManiacUI
+import TvManiacKit
 import XCTest
 
 class HorizontalItemListViewTest: XCTestCase {
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/HorizontalShowContentViewTest.swift b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/HorizontalShowContentViewTest.swift
similarity index 97%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/HorizontalShowContentViewTest.swift
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/HorizontalShowContentViewTest.swift
index 1c13889e0..0aeb51801 100644
--- a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/HorizontalShowContentViewTest.swift
+++ b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/HorizontalShowContentViewTest.swift
@@ -1,6 +1,6 @@
 import SnapshotTestingLib
 import SwiftUI
-import TvManiacUI
+import TvManiacKit
 import XCTest
 
 class HorizontalShowContentViewViewTest: XCTestCase {
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/ProviderListViewTest.swift b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/ProviderListViewTest.swift
similarity index 97%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/ProviderListViewTest.swift
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/ProviderListViewTest.swift
index e9f3be466..28b514d88 100644
--- a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/ProviderListViewTest.swift
+++ b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/ProviderListViewTest.swift
@@ -1,6 +1,6 @@
 import SnapshotTestingLib
 import SwiftUI
-import TvManiacUI
+import TvManiacKit
 import XCTest
 
 class ProviderListViewTest: XCTestCase {
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/SearchItemViewTest.swift b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/SearchItemViewTest.swift
similarity index 96%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/SearchItemViewTest.swift
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/SearchItemViewTest.swift
index e4e8bc799..25c9f8043 100644
--- a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/SearchItemViewTest.swift
+++ b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/SearchItemViewTest.swift
@@ -1,6 +1,6 @@
 import SnapshotTestingLib
 import SwiftUI
-import TvManiacUI
+import TvManiacKit
 import XCTest
 
 class SearchItemViewTest: XCTestCase {
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/SeasonChipViewListTest.swift b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/SeasonChipViewListTest.swift
similarity index 96%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/SeasonChipViewListTest.swift
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/SeasonChipViewListTest.swift
index cc17b1941..d6ce543de 100644
--- a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/SeasonChipViewListTest.swift
+++ b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/SeasonChipViewListTest.swift
@@ -1,6 +1,6 @@
 import SnapshotTestingLib
 import SwiftUI
-import TvManiacUI
+import TvManiacKit
 import XCTest
 
 class SeasonChipViewListTest: XCTestCase {
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/ShowContentItemViewTest.swift b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/ShowContentItemViewTest.swift
similarity index 94%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/ShowContentItemViewTest.swift
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/ShowContentItemViewTest.swift
index 2f3c7abfb..1d981ea62 100644
--- a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/ShowContentItemViewTest.swift
+++ b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/ShowContentItemViewTest.swift
@@ -1,6 +1,6 @@
 import SnapshotTestingLib
 import SwiftUI
-import TvManiacUI
+import TvManiacKit
 import XCTest
 
 class ShowContentItemViewTest: XCTestCase {
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/ShowInfoViewTest.swift b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/ShowInfoViewTest.swift
similarity index 99%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/ShowInfoViewTest.swift
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/ShowInfoViewTest.swift
index afc50f2c0..80513a293 100644
--- a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/ShowInfoViewTest.swift
+++ b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/ShowInfoViewTest.swift
@@ -1,6 +1,6 @@
 import SnapshotTestingLib
 import SwiftUI
-import TvManiacUI
+import TvManiacKit
 import XCTest
 
 class ShowInfoViewTest: XCTestCase {
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/TrailerListViewTest.swift b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/TrailerListViewTest.swift
similarity index 96%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/TrailerListViewTest.swift
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/TrailerListViewTest.swift
index 8c5a8036c..44aee5efc 100644
--- a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/TrailerListViewTest.swift
+++ b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/TrailerListViewTest.swift
@@ -1,6 +1,6 @@
 import SnapshotTestingLib
 import SwiftUI
-import TvManiacUI
+import TvManiacKit
 import XCTest
 
 class TrailerListViewTest: XCTestCase {
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/CastListViewTest/CastListView.dark.png b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/CastListViewTest/CastListView.dark.png
similarity index 100%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/CastListViewTest/CastListView.dark.png
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/CastListViewTest/CastListView.dark.png
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/CastListViewTest/CastListView.light.png b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/CastListViewTest/CastListView.light.png
similarity index 100%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/CastListViewTest/CastListView.light.png
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/CastListViewTest/CastListView.light.png
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/EpisodeCollapsibleTest/EpisodeCollapsible.dark.png b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/EpisodeCollapsibleTest/EpisodeCollapsible.dark.png
similarity index 100%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/EpisodeCollapsibleTest/EpisodeCollapsible.dark.png
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/EpisodeCollapsibleTest/EpisodeCollapsible.dark.png
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/EpisodeCollapsibleTest/EpisodeCollapsible.light.png b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/EpisodeCollapsibleTest/EpisodeCollapsible.light.png
similarity index 100%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/EpisodeCollapsibleTest/EpisodeCollapsible.light.png
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/EpisodeCollapsibleTest/EpisodeCollapsible.light.png
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/EpisodeItemViewTest/EpisodeItemView.dark.png b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/EpisodeItemViewTest/EpisodeItemView.dark.png
similarity index 100%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/EpisodeItemViewTest/EpisodeItemView.dark.png
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/EpisodeItemViewTest/EpisodeItemView.dark.png
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/EpisodeItemViewTest/EpisodeItemView.light.png b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/EpisodeItemViewTest/EpisodeItemView.light.png
similarity index 100%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/EpisodeItemViewTest/EpisodeItemView.light.png
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/EpisodeItemViewTest/EpisodeItemView.light.png
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/EpisodeListViewTest/EpisodeListView.dark.png b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/EpisodeListViewTest/EpisodeListView.dark.png
similarity index 100%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/EpisodeListViewTest/EpisodeListView.dark.png
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/EpisodeListViewTest/EpisodeListView.dark.png
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/EpisodeListViewTest/EpisodeListView.light.png b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/EpisodeListViewTest/EpisodeListView.light.png
similarity index 100%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/EpisodeListViewTest/EpisodeListView.light.png
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/EpisodeListViewTest/EpisodeListView.light.png
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/GridViewTest/GridView.dark.png b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/GridViewTest/GridView.dark.png
similarity index 100%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/GridViewTest/GridView.dark.png
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/GridViewTest/GridView.dark.png
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/GridViewTest/GridView.light.png b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/GridViewTest/GridView.light.png
similarity index 100%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/GridViewTest/GridView.light.png
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/GridViewTest/GridView.light.png
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/HeaderViewTest/HeaderView.dark.png b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/HeaderViewTest/HeaderView.dark.png
similarity index 100%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/HeaderViewTest/HeaderView.dark.png
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/HeaderViewTest/HeaderView.dark.png
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/HeaderViewTest/HeaderView.light.png b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/HeaderViewTest/HeaderView.light.png
similarity index 100%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/HeaderViewTest/HeaderView.light.png
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/HeaderViewTest/HeaderView.light.png
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/HorizontalItemListViewTest/HorizontalItemListView.dark.png b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/HorizontalItemListViewTest/HorizontalItemListView.dark.png
similarity index 100%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/HorizontalItemListViewTest/HorizontalItemListView.dark.png
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/HorizontalItemListViewTest/HorizontalItemListView.dark.png
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/HorizontalItemListViewTest/HorizontalItemListView.light.png b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/HorizontalItemListViewTest/HorizontalItemListView.light.png
similarity index 100%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/HorizontalItemListViewTest/HorizontalItemListView.light.png
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/HorizontalItemListViewTest/HorizontalItemListView.light.png
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/HorizontalShowContentViewTest/HorizontalShowContentView.dark.png b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/HorizontalShowContentViewTest/HorizontalShowContentView.dark.png
similarity index 100%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/HorizontalShowContentViewTest/HorizontalShowContentView.dark.png
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/HorizontalShowContentViewTest/HorizontalShowContentView.dark.png
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/HorizontalShowContentViewTest/HorizontalShowContentView.light.png b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/HorizontalShowContentViewTest/HorizontalShowContentView.light.png
similarity index 100%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/HorizontalShowContentViewTest/HorizontalShowContentView.light.png
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/HorizontalShowContentViewTest/HorizontalShowContentView.light.png
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/ProviderListViewTest/ProviderList.dark.png b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/ProviderListViewTest/ProviderList.dark.png
similarity index 100%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/ProviderListViewTest/ProviderList.dark.png
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/ProviderListViewTest/ProviderList.dark.png
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/ProviderListViewTest/ProviderList.light.png b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/ProviderListViewTest/ProviderList.light.png
similarity index 100%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/ProviderListViewTest/ProviderList.light.png
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/ProviderListViewTest/ProviderList.light.png
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/SearchItemViewTest/SearchItemView.dark.png b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/SearchItemViewTest/SearchItemView.dark.png
similarity index 100%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/SearchItemViewTest/SearchItemView.dark.png
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/SearchItemViewTest/SearchItemView.dark.png
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/SearchItemViewTest/SearchItemView.light.png b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/SearchItemViewTest/SearchItemView.light.png
similarity index 100%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/SearchItemViewTest/SearchItemView.light.png
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/SearchItemViewTest/SearchItemView.light.png
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/SeasonChipViewListTest/SeasonChipViewList.dark.png b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/SeasonChipViewListTest/SeasonChipViewList.dark.png
similarity index 100%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/SeasonChipViewListTest/SeasonChipViewList.dark.png
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/SeasonChipViewListTest/SeasonChipViewList.dark.png
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/SeasonChipViewListTest/SeasonChipViewList.light.png b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/SeasonChipViewListTest/SeasonChipViewList.light.png
similarity index 100%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/SeasonChipViewListTest/SeasonChipViewList.light.png
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/SeasonChipViewListTest/SeasonChipViewList.light.png
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/ShowContentItemViewTest/ShowContentItemView.dark.png b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/ShowContentItemViewTest/ShowContentItemView.dark.png
similarity index 100%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/ShowContentItemViewTest/ShowContentItemView.dark.png
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/ShowContentItemViewTest/ShowContentItemView.dark.png
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/ShowContentItemViewTest/ShowContentItemView.light.png b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/ShowContentItemViewTest/ShowContentItemView.light.png
similarity index 100%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/ShowContentItemViewTest/ShowContentItemView.light.png
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/ShowContentItemViewTest/ShowContentItemView.light.png
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/ShowInfoViewTest/ShowInfoView.dark.png b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/ShowInfoViewTest/ShowInfoView.dark.png
similarity index 100%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/ShowInfoViewTest/ShowInfoView.dark.png
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/ShowInfoViewTest/ShowInfoView.dark.png
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/ShowInfoViewTest/ShowInfoView.light.png b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/ShowInfoViewTest/ShowInfoView.light.png
similarity index 100%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/ShowInfoViewTest/ShowInfoView.light.png
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/ShowInfoViewTest/ShowInfoView.light.png
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/TrailerListViewTest/TrailerListView.dark.png b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/TrailerListViewTest/TrailerListView.dark.png
similarity index 100%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/TrailerListViewTest/TrailerListView.dark.png
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/TrailerListViewTest/TrailerListView.dark.png
diff --git a/ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/TrailerListViewTest/TrailerListView.light.png b/ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/TrailerListViewTest/TrailerListView.light.png
similarity index 100%
rename from ios/Modules/TvManiacUI/Tests/TvManiacUITests/__Snapshots__/TrailerListViewTest/TrailerListView.light.png
rename to ios/Modules/TvManiacKit/Tests/TvManiacKitTests/__Snapshots__/TrailerListViewTest/TrailerListView.light.png
diff --git a/ios/Modules/TvManiacUI/.gitignore b/ios/Modules/TvManiacUI/.gitignore
deleted file mode 100644
index 0023a5340..000000000
--- a/ios/Modules/TvManiacUI/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.DS_Store
-/.build
-/Packages
-xcuserdata/
-DerivedData/
-.swiftpm/configuration/registries.json
-.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
-.netrc
diff --git a/ios/Modules/TvManiacUI/.swiftpm/xcode/package.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/Modules/TvManiacUI/.swiftpm/xcode/package.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
deleted file mode 100644
index 18d981003..000000000
--- a/ios/Modules/TvManiacUI/.swiftpm/xcode/package.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>
diff --git a/ios/Modules/TvManiacUI/.swiftpm/xcode/xcshareddata/xcschemes/TvManiacUI.xcscheme b/ios/Modules/TvManiacUI/.swiftpm/xcode/xcshareddata/xcschemes/TvManiacUI.xcscheme
deleted file mode 100644
index a2a95b6c5..000000000
--- a/ios/Modules/TvManiacUI/.swiftpm/xcode/xcshareddata/xcschemes/TvManiacUI.xcscheme
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1600"
-   version = "1.7">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES"
-      buildArchitectures = "Automatic">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "TvManiacUI"
-               BuildableName = "TvManiacUI"
-               BlueprintName = "TvManiacUI"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      shouldAutocreateTestPlan = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "TvManiacUITests"
-               BuildableName = "TvManiacUITests"
-               BlueprintName = "TvManiacUITests"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "TvManiacUI"
-            BuildableName = "TvManiacUI"
-            BlueprintName = "TvManiacUI"
-            ReferencedContainer = "container:">
-         </BuildableReference>
-      </MacroExpansion>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/ios/Modules/TvManiacUI/Package.resolved b/ios/Modules/TvManiacUI/Package.resolved
deleted file mode 100644
index 5efeff2d2..000000000
--- a/ios/Modules/TvManiacUI/Package.resolved
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "originHash" : "84d888f27615d8f2f1f884cbcb773d2498b4ea29dbe24029dfa6002c6e25a796",
-  "pins" : [
-    {
-      "identity" : "sdwebimage",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/SDWebImage/SDWebImage.git",
-      "state" : {
-        "revision" : "8a1be70a625683bc04d6903e2935bf23f3c6d609",
-        "version" : "5.19.7"
-      }
-    },
-    {
-      "identity" : "sdwebimageswiftui",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/SDWebImage/SDWebImageSwiftUI.git",
-      "state" : {
-        "revision" : "451c6dfd5ecec2cf626d1d9ca81c2d4a60355172",
-        "version" : "3.1.3"
-      }
-    },
-    {
-      "identity" : "swift-snapshot-testing",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/pointfreeco/swift-snapshot-testing.git",
-      "state" : {
-        "revision" : "42a086182681cf661f5c47c9b7dc3931de18c6d7",
-        "version" : "1.17.6"
-      }
-    },
-    {
-      "identity" : "swift-syntax",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/swiftlang/swift-syntax",
-      "state" : {
-        "revision" : "0687f71944021d616d34d922343dcef086855920",
-        "version" : "600.0.1"
-      }
-    },
-    {
-      "identity" : "youtubeplayerkit",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/SvenTiigi/YouTubePlayerKit.git",
-      "state" : {
-        "revision" : "fe1c1ec340f6d79866131432ecaa190fd6bbc4cb",
-        "version" : "1.9.0"
-      }
-    }
-  ],
-  "version" : 3
-}
diff --git a/ios/Modules/TvManiacUI/Package.swift b/ios/Modules/TvManiacUI/Package.swift
deleted file mode 100644
index b2367917d..000000000
--- a/ios/Modules/TvManiacUI/Package.swift
+++ /dev/null
@@ -1,37 +0,0 @@
-// swift-tools-version: 5.10
-
-import PackageDescription
-
-let package = Package(
-    name: "TvManiacUI",
-    defaultLocalization: "en",
-    platforms: [
-        .iOS(.v16)
-    ],
-    products: [
-        .library(
-            name: "TvManiacUI",
-            targets: ["TvManiacUI"]
-        )
-    ],
-    dependencies: [
-        .package(name: "SwiftUIComponents", path: "../SwiftUIComponents"),
-        .package(name: "SnapshotTestingLib", path: "../SnapshotTestingLib")
-    ],
-    targets: [
-        .target(
-            name: "TvManiacUI",
-            dependencies: [
-                "SwiftUIComponents"
-            ]
-        ),
-        .testTarget(
-            name: "TvManiacUITests",
-            dependencies: [
-                "SnapshotTestingLib",
-                "TvManiacUI"
-            ],
-            exclude: ["__Snapshots__"]
-        )
-    ]
-)
diff --git a/ios/ios/MoreShows/MoreShowsView.swift b/ios/ios/MoreShows/MoreShowsView.swift
index 59154ecce..bbf6a1ffb 100644
--- a/ios/ios/MoreShows/MoreShowsView.swift
+++ b/ios/ios/MoreShows/MoreShowsView.swift
@@ -9,7 +9,6 @@
 import SwiftUI
 import SwiftUIComponents
 import TvManiac
-import TvManiacUI
 import TvManiacKit
 
 struct MoreShowsView: View {
diff --git a/ios/ios/UI/SeasonDetails/SeasonDetailsView.swift b/ios/ios/UI/SeasonDetails/SeasonDetailsView.swift
index dbae5a5e8..23687d798 100644
--- a/ios/ios/UI/SeasonDetails/SeasonDetailsView.swift
+++ b/ios/ios/UI/SeasonDetails/SeasonDetailsView.swift
@@ -10,7 +10,6 @@ import SwiftUI
 import SwiftUIComponents
 import TvManiac
 import TvManiacKit
-import TvManiacUI
 
 struct SeasonDetailsView: View {
   private let presenter: SeasonDetailsPresenter
diff --git a/ios/ios/UI/ShowDetails/ShowDetailsView.swift b/ios/ios/UI/ShowDetails/ShowDetailsView.swift
index 8cba114d4..2b13dc901 100644
--- a/ios/ios/UI/ShowDetails/ShowDetailsView.swift
+++ b/ios/ios/UI/ShowDetails/ShowDetailsView.swift
@@ -2,7 +2,6 @@ import SwiftUI
 import SwiftUIComponents
 import TvManiac
 import TvManiacKit
-import TvManiacUI
 
 struct ShowDetailsView: View {
   private let presenter: ShowDetailsPresenter
diff --git a/ios/ios/UI/Tabs/Components/WatchlistListItem.swift b/ios/ios/UI/Tabs/Components/WatchlistListItem.swift
index 9a7029d1b..e05461d90 100644
--- a/ios/ios/UI/Tabs/Components/WatchlistListItem.swift
+++ b/ios/ios/UI/Tabs/Components/WatchlistListItem.swift
@@ -2,7 +2,6 @@ import SwiftUI
 import SwiftUIComponents
 import TvManiac
 import TvManiacKit
-import TvManiacUI
 
 struct WatchlistListItem: View {
   let item: TvManiac.WatchlistItem
diff --git a/ios/ios/UI/Tabs/DiscoverTab.swift b/ios/ios/UI/Tabs/DiscoverTab.swift
index 339176e60..b11e2b5e5 100644
--- a/ios/ios/UI/Tabs/DiscoverTab.swift
+++ b/ios/ios/UI/Tabs/DiscoverTab.swift
@@ -2,7 +2,6 @@ import SwiftUI
 import SwiftUIComponents
 import TvManiac
 import TvManiacKit
-import TvManiacUI
 
 struct DiscoverTab: View {
   private let presenter: DiscoverShowsPresenter
@@ -92,40 +91,26 @@ struct DiscoverTab: View {
         ) { index in
           CarouselItemView(item: items[index])
         }
-        .allowsHitTesting(true)
-        .gesture(DragGesture())
-
         headerNavigationBar(shows: items)
       }
     }
   }
 
-  /// A view that displays a single item in the carousel
   @ViewBuilder
   private func CarouselItemView(item: SwiftShow) -> some View {
     GeometryReader { geometry in
       let scrollViewHeight = geometry.size.height
 
       ZStack(alignment: .bottom) {
-        ScrollView(showsIndicators: false) {
-          GeometryReader { imageGeometry in
-            let minY = imageGeometry.frame(in: .global).minY
-            let scrollOffset = minY - geometry.frame(in: .global).minY
-            let stretchFactor = max(0, scrollOffset)
-
-            PosterItemView(
-              title: item.title,
-              posterUrl: item.posterUrl,
-              posterWidth: geometry.size.width,
-              posterHeight: scrollViewHeight + stretchFactor
-            )
-            .offset(y: -stretchFactor)
-          }
-          .frame(height: scrollViewHeight)
-        }
-        .simultaneousGesture(TapGesture().onEnded {
+        PosterItemView(
+          title: item.title,
+          posterUrl: item.posterUrl,
+          posterWidth: geometry.size.width,
+          posterHeight: scrollViewHeight
+        )
+        .onTapGesture {
           presenter.dispatch(action: ShowClicked(id: item.tmdbId))
-        })
+        }
       }
     }
   }
@@ -227,8 +212,8 @@ struct DiscoverTab: View {
     HStack(spacing: 5) {
       ForEach(shows.indices, id: \.self) { index in
         Circle()
-          .fill(currentIndex - 1 == index ? .white : .gray.opacity(0.5))
-          .frame(width: currentIndex - 1 == index ? 10 : 6, height: currentIndex - 1 == index ? 10 : 6)
+          .fill(currentIndex == index ? .white : .gray.opacity(0.5))
+          .frame(width: currentIndex == index ? 10 : 6, height: currentIndex == index ? 10 : 6)
       }
     }
     .animation(.easeInOut, value: currentIndex)
@@ -362,11 +347,44 @@ struct DiscoverTab: View {
     if shows.isEmpty {
       return nil
     }
-    let actualIndex = (currentIndex - 1) % shows.count
-    return shows[actualIndex >= 0 ? actualIndex : shows.count - 1]
+    return shows[currentIndex]
   }
 
   private enum CoordinateSpaces {
     case scrollView
   }
 }
+
+struct PullToRefreshView: View {
+    var coordinateSpaceName: String
+    var onRefresh: () async -> Void
+    @State private var needRefresh: Bool = false
+    
+    var body: some View {
+        GeometryReader { geo in
+            if geo.frame(in: .named(coordinateSpaceName)).midY > 50 {
+                Spacer()
+                    .onAppear {
+                        needRefresh = true
+                    }
+            } else if geo.frame(in: .named(coordinateSpaceName)).midY < 1 {
+                Spacer()
+                    .onAppear {
+                        if needRefresh {
+                            needRefresh = false
+                            Task {
+                                await onRefresh()
+                            }
+                        }
+                    }
+            }
+            HStack {
+                Spacer()
+                if needRefresh {
+                    ProgressView()
+                }
+                Spacer()
+            }
+        }.padding(.top, -50)
+    }
+}
diff --git a/ios/ios/UI/Tabs/SearchTab.swift b/ios/ios/UI/Tabs/SearchTab.swift
index 6839f071a..5d97ba5e0 100644
--- a/ios/ios/UI/Tabs/SearchTab.swift
+++ b/ios/ios/UI/Tabs/SearchTab.swift
@@ -2,7 +2,6 @@ import SwiftUI
 import SwiftUIComponents
 import TvManiac
 import TvManiacKit
-import TvManiacUI
 
 struct SearchTab: View {
   private let presenter: SearchShowsPresenter
diff --git a/ios/ios/UI/Tabs/WatchlistTab.swift b/ios/ios/UI/Tabs/WatchlistTab.swift
index 348912480..b694ab9df 100644
--- a/ios/ios/UI/Tabs/WatchlistTab.swift
+++ b/ios/ios/UI/Tabs/WatchlistTab.swift
@@ -2,7 +2,6 @@ import SwiftUI
 import SwiftUIComponents
 import TvManiac
 import TvManiacKit
-import TvManiacUI
 
 struct WatchlistTab: View {
     private let presenter: WatchlistPresenter
diff --git a/ios/tv-maniac.xcodeproj/project.pbxproj b/ios/tv-maniac.xcodeproj/project.pbxproj
index c7f8643ef..fd67ad706 100644
--- a/ios/tv-maniac.xcodeproj/project.pbxproj
+++ b/ios/tv-maniac.xcodeproj/project.pbxproj
@@ -22,7 +22,6 @@
 		D653926029DAC949000EE673 /* AuthenticatedProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D653925F29DAC949000EE673 /* AuthenticatedProfileView.swift */; };
 		D653926B29DAD8FA000EE673 /* config.json in Resources */ = {isa = PBXBuildFile; fileRef = D653926A29DAD8FA000EE673 /* config.json */; };
 		D6619D372C89D37900D273E7 /* SwiftUIComponents in Frameworks */ = {isa = PBXBuildFile; productRef = D6619D362C89D37900D273E7 /* SwiftUIComponents */; };
-		D68C97502C8EFBD800FAC88A /* TvManiacUI in Frameworks */ = {isa = PBXBuildFile; productRef = D68C974F2C8EFBD800FAC88A /* TvManiacUI */; };
 		E9AC834C26CEE00D00829A0D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E9AC834B26CEE00D00829A0D /* Assets.xcassets */; };
 /* End PBXBuildFile section */
 
@@ -56,7 +55,6 @@
 		D653925F29DAC949000EE673 /* AuthenticatedProfileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticatedProfileView.swift; sourceTree = "<group>"; };
 		D653926A29DAD8FA000EE673 /* config.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = config.json; sourceTree = "<group>"; };
 		D6619D352C89D36F00D273E7 /* SwiftUIComponents */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = SwiftUIComponents; sourceTree = "<group>"; };
-		D68C974E2C8EFB7C00FAC88A /* TvManiacUI */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = TvManiacUI; sourceTree = "<group>"; };
 		D6BDF2BB2C933DBB0042C86D /* SnapshotTestingLib */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = SnapshotTestingLib; sourceTree = "<group>"; };
 		E9AC834B26CEE00D00829A0D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -74,7 +72,6 @@
 				D6619D372C89D37900D273E7 /* SwiftUIComponents in Frameworks */,
 				D653924829D8B6A6000EE673 /* OAuthSwift in Frameworks */,
 				D60D952B2CDBE1160039884B /* TvManiacKit in Frameworks */,
-				D68C97502C8EFBD800FAC88A /* TvManiacUI in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -200,7 +197,6 @@
 				D6BDF2BB2C933DBB0042C86D /* SnapshotTestingLib */,
 				D6619D352C89D36F00D273E7 /* SwiftUIComponents */,
 				D60D95292CDBDFB30039884B /* TvManiacKit */,
-				D68C974E2C8EFB7C00FAC88A /* TvManiacUI */,
 			);
 			path = Modules;
 			sourceTree = "<group>";
@@ -229,7 +225,6 @@
 			packageProductDependencies = (
 				D653924729D8B6A6000EE673 /* OAuthSwift */,
 				D6619D362C89D37900D273E7 /* SwiftUIComponents */,
-				D68C974F2C8EFBD800FAC88A /* TvManiacUI */,
 				D60D952A2CDBE1160039884B /* TvManiacKit */,
 			);
 			productName = ios;
@@ -569,10 +564,6 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = SwiftUIComponents;
 		};
-		D68C974F2C8EFBD800FAC88A /* TvManiacUI */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = TvManiacUI;
-		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 7555FF73242A565900829871 /* Project object */;
diff --git a/ios/tv-maniac.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ios/tv-maniac.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index c9a62341a..9799b386f 100644
--- a/ios/tv-maniac.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/ios/tv-maniac.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,5 +1,5 @@
 {
-  "originHash" : "28e4608a7a22f02218bcd95ae3e01dd7f79a63121bdf22b23b31d9ca257b389a",
+  "originHash" : "0965ad432b35f7aabf55f5f6de85e4ec78bca39d20ca64ea532f7dd771c4d817",
   "pins" : [
     {
       "identity" : "brightfutures",
@@ -64,13 +64,22 @@
         "version" : "3.1.3"
       }
     },
+    {
+      "identity" : "swift-custom-dump",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-custom-dump",
+      "state" : {
+        "revision" : "82645ec760917961cfa08c9c0c7104a57a0fa4b1",
+        "version" : "1.3.3"
+      }
+    },
     {
       "identity" : "swift-snapshot-testing",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-snapshot-testing",
       "state" : {
-        "revision" : "2e6a85b73fc14e27d7542165ae73b1a10516ca9a",
-        "version" : "1.17.7"
+        "revision" : "f5bfff796ee8e3bc9a685b7ffba1bf20663eb370",
+        "version" : "1.18.0"
       }
     },
     {
@@ -78,8 +87,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/swiftlang/swift-syntax",
       "state" : {
-        "revision" : "515f79b522918f83483068d99c68daeb5116342d",
-        "version" : "600.0.0-prerelease-2024-09-04"
+        "revision" : "0687f71944021d616d34d922343dcef086855920",
+        "version" : "600.0.1"
       }
     },
     {
@@ -91,6 +100,15 @@
         "version" : "1.5.0"
       }
     },
+    {
+      "identity" : "xctest-dynamic-overlay",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
+      "state" : {
+        "revision" : "b444594f79844b0d6d76d70fbfb3f7f71728f938",
+        "version" : "1.5.1"
+      }
+    },
     {
       "identity" : "youtubeplayerkit",
       "kind" : "remoteSourceControl",
diff --git a/ios/Modules/TvManiacKit/.swiftpm/xcode/xcshareddata/xcschemes/TvManiacKit.xcscheme b/ios/tv-maniac.xcodeproj/xcshareddata/xcschemes/TvManiacKit.xcscheme
similarity index 73%
rename from ios/Modules/TvManiacKit/.swiftpm/xcode/xcshareddata/xcschemes/TvManiacKit.xcscheme
rename to ios/tv-maniac.xcodeproj/xcshareddata/xcschemes/TvManiacKit.xcscheme
index ca14fdddb..e3808cd29 100644
--- a/ios/Modules/TvManiacKit/.swiftpm/xcode/xcshareddata/xcschemes/TvManiacKit.xcscheme
+++ b/ios/tv-maniac.xcodeproj/xcshareddata/xcschemes/TvManiacKit.xcscheme
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1600"
-   version = "1.7">
+   version = "2.2">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES"
@@ -27,9 +27,18 @@
                BlueprintIdentifier = "TvManiacKit"
                BuildableName = "TvManiacKit"
                BlueprintName = "TvManiacKit"
-               ReferencedContainer = "container:">
+               ReferencedContainer = "container:Modules/TvManiacKit">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <AutocreatedTestPlanReference>
+            </AutocreatedTestPlanReference>
+         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
@@ -38,6 +47,18 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES"
       shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "TvManiacKitTests"
+               BuildableName = "TvManiacKitTests"
+               BlueprintName = "TvManiacKitTests"
+               ReferencedContainer = "container:Modules/TvManiacKit">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -62,7 +83,7 @@
             BlueprintIdentifier = "TvManiacKit"
             BuildableName = "TvManiacKit"
             BlueprintName = "TvManiacKit"
-            ReferencedContainer = "container:">
+            ReferencedContainer = "container:Modules/TvManiacKit">
          </BuildableReference>
       </MacroExpansion>
    </ProfileAction>
diff --git a/ios/tv-maniac.xcodeproj/xcshareddata/xcschemes/TvManiacUI.xcscheme b/ios/tv-maniac.xcodeproj/xcshareddata/xcschemes/TvManiacUI.xcscheme
deleted file mode 100644
index c45fc1515..000000000
--- a/ios/tv-maniac.xcodeproj/xcshareddata/xcschemes/TvManiacUI.xcscheme
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1600"
-   version = "1.7">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES"
-      buildArchitectures = "Automatic">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "TvManiacUI"
-               BuildableName = "TvManiacUI"
-               BlueprintName = "TvManiacUI"
-               ReferencedContainer = "container:Modules/TvManiacUI">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <TestPlans>
-         <TestPlanReference
-            reference = "container:Modules/TvManiacUI/TvManiacUI.xctestplan"
-            default = "YES">
-         </TestPlanReference>
-      </TestPlans>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "TvManiacUI"
-            BuildableName = "TvManiacUI"
-            BlueprintName = "TvManiacUI"
-            ReferencedContainer = "container:Modules/TvManiacUI">
-         </BuildableReference>
-      </MacroExpansion>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/ios/tv-maniac.xcodeproj/xcshareddata/xcschemes/TvManiacUITests.xcscheme b/ios/tv-maniac.xcodeproj/xcshareddata/xcschemes/TvManiacUITests.xcscheme
deleted file mode 100644
index 7d9ee8164..000000000
--- a/ios/tv-maniac.xcodeproj/xcshareddata/xcschemes/TvManiacUITests.xcscheme
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1600"
-   version = "2.2">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES"
-      buildArchitectures = "Automatic">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
-            <AutocreatedTestPlanReference>
-            </AutocreatedTestPlanReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      shouldAutocreateTestPlan = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "TvManiacUITests"
-               BuildableName = "TvManiacUITests"
-               BlueprintName = "TvManiacUITests"
-               ReferencedContainer = "container:Modules/TvManiacUI">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "TvManiacUITests"
-            BuildableName = "TvManiacUITests"
-            BlueprintName = "TvManiacUITests"
-            ReferencedContainer = "container:Modules/TvManiacUI">
-         </BuildableReference>
-      </MacroExpansion>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/navigation/implementation/src/commonTest/kotlin/com/thomaskioko/tvmaniac/navigation/DefaultRootComponentTest.kt b/navigation/implementation/src/commonTest/kotlin/com/thomaskioko/tvmaniac/navigation/DefaultRootComponentTest.kt
index 3e9e293ad..a98d73097 100644
--- a/navigation/implementation/src/commonTest/kotlin/com/thomaskioko/tvmaniac/navigation/DefaultRootComponentTest.kt
+++ b/navigation/implementation/src/commonTest/kotlin/com/thomaskioko/tvmaniac/navigation/DefaultRootComponentTest.kt
@@ -35,6 +35,7 @@ import com.thomaskioko.tvmaniac.presentation.seasondetails.SeasonDetailsPresente
 import com.thomaskioko.tvmaniac.presentation.seasondetails.model.SeasonDetailsUiParam
 import com.thomaskioko.tvmaniac.presentation.settings.SettingsPresenter
 import com.thomaskioko.tvmaniac.presentation.settings.SettingsPresenterFactory
+import com.thomaskioko.tvmaniac.presentation.showdetails.ShowDetailsMapper
 import com.thomaskioko.tvmaniac.presentation.showdetails.ShowDetailsPresenter
 import com.thomaskioko.tvmaniac.presentation.showdetails.ShowDetailsPresenterFactory
 import com.thomaskioko.tvmaniac.presentation.showdetails.model.ShowSeasonDetailsParam
@@ -272,6 +273,7 @@ class DefaultRootComponentTest {
           similarShowsRepository = FakeSimilarShowsRepository(),
           trailerRepository = FakeTrailerRepository(),
           watchProviders = FakeWatchProviderRepository(),
+          showDetailsMapper = ShowDetailsMapper(FakeFormatterUtil()),
         )
       },
     )
diff --git a/presenter/discover/src/commonMain/kotlin/com/thomaskioko/tvmaniac/presentation/discover/DiscoverShowsAction.kt b/presenter/discover/src/commonMain/kotlin/com/thomaskioko/tvmaniac/presentation/discover/DiscoverShowsAction.kt
index 6cd5822a7..596300d0c 100644
--- a/presenter/discover/src/commonMain/kotlin/com/thomaskioko/tvmaniac/presentation/discover/DiscoverShowsAction.kt
+++ b/presenter/discover/src/commonMain/kotlin/com/thomaskioko/tvmaniac/presentation/discover/DiscoverShowsAction.kt
@@ -16,6 +16,8 @@ data object TopRatedClicked : DiscoverShowAction
 
 data object RefreshData : DiscoverShowAction
 
+data object AccountClicked : DiscoverShowAction
+
 data class ShowClicked(val id: Long) : DiscoverShowAction
 
 data class UpdateShowInLibrary(val id: Long, val inLibrary: Boolean) : DiscoverShowAction
diff --git a/presenter/discover/src/commonMain/kotlin/com/thomaskioko/tvmaniac/presentation/discover/DiscoverShowsPresenter.kt b/presenter/discover/src/commonMain/kotlin/com/thomaskioko/tvmaniac/presentation/discover/DiscoverShowsPresenter.kt
index 69cec9cf6..0e86ebdb2 100644
--- a/presenter/discover/src/commonMain/kotlin/com/thomaskioko/tvmaniac/presentation/discover/DiscoverShowsPresenter.kt
+++ b/presenter/discover/src/commonMain/kotlin/com/thomaskioko/tvmaniac/presentation/discover/DiscoverShowsPresenter.kt
@@ -103,6 +103,9 @@ class DiscoverShowsPresenter(
             )
           }
         }
+        AccountClicked -> {
+          //TODO:: Add implementation.
+        }
       }
     }
 
diff --git a/presenter/show-details/build.gradle.kts b/presenter/show-details/build.gradle.kts
index 38b74306d..48a698cc9 100644
--- a/presenter/show-details/build.gradle.kts
+++ b/presenter/show-details/build.gradle.kts
@@ -8,14 +8,15 @@ kotlin {
     commonMain {
       dependencies {
         implementation(projects.core.base)
-        implementation(projects.data.watchlist.api)
+        implementation(projects.data.cast.api)
+        implementation(projects.data.recommendedshows.api)
         implementation(projects.data.seasons.api)
         implementation(projects.data.showdetails.api)
         implementation(projects.data.shows.api)
         implementation(projects.data.similar.api)
         implementation(projects.data.trailers.api)
-        implementation(projects.data.cast.api)
-        implementation(projects.data.recommendedshows.api)
+        implementation(projects.core.util)
+        implementation(projects.data.watchlist.api)
         implementation(projects.data.watchproviders.api)
 
         api(libs.decompose.decompose)
@@ -36,6 +37,7 @@ kotlin {
         implementation(projects.data.similar.testing)
         implementation(projects.data.trailers.testing)
         implementation(projects.data.watchproviders.testing)
+        implementation(projects.core.util.testing)
 
         implementation(libs.bundles.unittest)
       }
diff --git a/presenter/show-details/src/commonMain/kotlin/com/thomaskioko/tvmaniac/presentation/showdetails/ShowDetailsAction.kt b/presenter/show-details/src/commonMain/kotlin/com/thomaskioko/tvmaniac/presentation/showdetails/ShowDetailsAction.kt
index d4c78f966..541b07846 100644
--- a/presenter/show-details/src/commonMain/kotlin/com/thomaskioko/tvmaniac/presentation/showdetails/ShowDetailsAction.kt
+++ b/presenter/show-details/src/commonMain/kotlin/com/thomaskioko/tvmaniac/presentation/showdetails/ShowDetailsAction.kt
@@ -4,6 +4,12 @@ import com.thomaskioko.tvmaniac.presentation.showdetails.model.ShowSeasonDetails
 
 sealed interface ShowDetailsAction
 
+data object DismissShowsListSheet : ShowDetailsAction
+
+data object ShowShowsListSheet : ShowDetailsAction
+
+data object CreateCustomList : ShowDetailsAction
+
 data object DismissErrorSnackbar : ShowDetailsAction
 
 data object DetailBackClicked : ShowDetailsAction
diff --git a/presenter/show-details/src/commonMain/kotlin/com/thomaskioko/tvmaniac/presentation/showdetails/ShowDetailMapper.kt b/presenter/show-details/src/commonMain/kotlin/com/thomaskioko/tvmaniac/presentation/showdetails/ShowDetailsMapper.kt
similarity index 62%
rename from presenter/show-details/src/commonMain/kotlin/com/thomaskioko/tvmaniac/presentation/showdetails/ShowDetailMapper.kt
rename to presenter/show-details/src/commonMain/kotlin/com/thomaskioko/tvmaniac/presentation/showdetails/ShowDetailsMapper.kt
index 541c6f855..2fc2a537d 100644
--- a/presenter/show-details/src/commonMain/kotlin/com/thomaskioko/tvmaniac/presentation/showdetails/ShowDetailMapper.kt
+++ b/presenter/show-details/src/commonMain/kotlin/com/thomaskioko/tvmaniac/presentation/showdetails/ShowDetailsMapper.kt
@@ -15,9 +15,34 @@ import com.thomaskioko.tvmaniac.presentation.showdetails.model.Season
 import com.thomaskioko.tvmaniac.presentation.showdetails.model.Show
 import com.thomaskioko.tvmaniac.presentation.showdetails.model.ShowDetails
 import com.thomaskioko.tvmaniac.presentation.showdetails.model.Trailer
+import com.thomaskioko.tvmaniac.util.FormatterUtil
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
+import me.tatarka.inject.annotations.Inject
+
+@Inject
+class ShowDetailsMapper(
+  private val formatterUtil: FormatterUtil,
+) {
+
+  fun toShowDetails(show: TvshowDetails): ShowDetails =
+    ShowDetails(
+      tmdbId = show.id.id,
+      title = show.name,
+      overview = show.overview,
+      language = show.language,
+      posterImageUrl = show.poster_path,
+      backdropImageUrl = show.backdrop_path,
+      votes = show.vote_count,
+      rating = formatterUtil.formatDouble(show.vote_average, 1),
+      genres = show.genre_list?.split(", ")?.toImmutableList() ?: persistentListOf(),
+      year = show.last_air_date ?: show.first_air_date ?: "",
+      status = show.status,
+      isFollowed = show.in_library == 1L,
+    )
+
+}
 
 internal fun Either<Failure, List<ShowSeasons>>.toSeasonsListOrEmpty(): ImmutableList<Season> =
   (this as? Either.Right)?.right?.toSeasonsList() ?: persistentListOf()
@@ -38,89 +63,74 @@ internal fun Either<Failure, List<Trailers>>.toTrailerListOrEmpty(): ImmutableLi
 
 internal fun List<ShowCast>?.toCastList(): ImmutableList<Casts> =
   this?.map {
-      Casts(
-        id = it.id.id,
-        name = it.name,
-        profileUrl = it.profile_path,
-        characterName = it.character_name,
-      )
-    }
+    Casts(
+      id = it.id.id,
+      name = it.name,
+      profileUrl = it.profile_path,
+      characterName = it.character_name,
+    )
+  }
     ?.toImmutableList()
     ?: persistentListOf()
 
 private fun List<SimilarShows>?.toSimilarShowList(): ImmutableList<Show> =
   this?.map {
-      Show(
-        tmdbId = it.id.id,
-        title = it.name,
-        posterImageUrl = it.poster_path,
-        backdropImageUrl = it.backdrop_path,
-        isInLibrary = it.in_library == 1L,
-      )
-    }
+    Show(
+      tmdbId = it.id.id,
+      title = it.name,
+      posterImageUrl = it.poster_path,
+      backdropImageUrl = it.backdrop_path,
+      isInLibrary = it.in_library == 1L,
+    )
+  }
     ?.toImmutableList()
     ?: persistentListOf()
 
 private fun List<RecommendedShows>?.toRecommendedShowList(): ImmutableList<Show> =
   this?.map {
-      Show(
-        tmdbId = it.id.id,
-        title = it.name,
-        posterImageUrl = it.poster_path,
-        backdropImageUrl = it.backdrop_path,
-        isInLibrary = it.in_library == 1L,
-      )
-    }
+    Show(
+      tmdbId = it.id.id,
+      title = it.name,
+      posterImageUrl = it.poster_path,
+      backdropImageUrl = it.backdrop_path,
+      isInLibrary = it.in_library == 1L,
+    )
+  }
     ?.toImmutableList()
     ?: persistentListOf()
 
 private fun List<WatchProviders>?.toWatchProviderList(): ImmutableList<Providers> =
   this?.map {
-      Providers(
-        id = it.id.id,
-        name = it.name ?: "",
-        logoUrl = it.logo_path,
-      )
-    }
+    Providers(
+      id = it.id.id,
+      name = it.name ?: "",
+      logoUrl = it.logo_path,
+    )
+  }
     ?.toImmutableList()
     ?: persistentListOf()
 
-internal fun TvshowDetails.toShowDetails(): ShowDetails =
-  ShowDetails(
-    tmdbId = id.id,
-    title = name,
-    overview = overview,
-    language = language,
-    posterImageUrl = poster_path,
-    backdropImageUrl = backdrop_path,
-    votes = vote_count,
-    rating = vote_average,
-    genres = genre_list?.split(", ")?.toImmutableList() ?: persistentListOf(),
-    year = last_air_date ?: first_air_date ?: "",
-    status = status,
-    isFollowed = in_library == 1L,
-  )
 
 private fun List<ShowSeasons>?.toSeasonsList(): ImmutableList<Season> =
   this?.map {
-      Season(
-        seasonId = it.season_id.id,
-        tvShowId = it.show_id.id,
-        name = it.season_title,
-        seasonNumber = it.season_number,
-      )
-    }
+    Season(
+      seasonId = it.season_id.id,
+      tvShowId = it.show_id.id,
+      name = it.season_title,
+      seasonNumber = it.season_number,
+    )
+  }
     ?.toImmutableList()
     ?: persistentListOf()
 
 private fun List<Trailers>?.toTrailerList(): ImmutableList<Trailer> =
   this?.map {
-      Trailer(
-        showId = it.show_id.id,
-        key = it.key,
-        name = it.name,
-        youtubeThumbnailUrl = "https://i.ytimg.com/vi/${it.key}/hqdefault.jpg",
-      )
-    }
+    Trailer(
+      showId = it.show_id.id,
+      key = it.key,
+      name = it.name,
+      youtubeThumbnailUrl = "https://i.ytimg.com/vi/${it.key}/hqdefault.jpg",
+    )
+  }
     ?.toImmutableList()
     ?: persistentListOf()
diff --git a/presenter/show-details/src/commonMain/kotlin/com/thomaskioko/tvmaniac/presentation/showdetails/ShowDetailsPresenter.kt b/presenter/show-details/src/commonMain/kotlin/com/thomaskioko/tvmaniac/presentation/showdetails/ShowDetailsPresenter.kt
index 27a7be724..8187b8abc 100644
--- a/presenter/show-details/src/commonMain/kotlin/com/thomaskioko/tvmaniac/presentation/showdetails/ShowDetailsPresenter.kt
+++ b/presenter/show-details/src/commonMain/kotlin/com/thomaskioko/tvmaniac/presentation/showdetails/ShowDetailsPresenter.kt
@@ -41,20 +41,21 @@ class ShowDetailsPresenterFactory(
 class ShowDetailsPresenter
 @Inject
 constructor(
-    @Assisted componentContext: ComponentContext,
-    @Assisted private val showId: Long,
-    @Assisted private val onBack: () -> Unit,
-    @Assisted private val onNavigateToShow: (id: Long) -> Unit,
-    @Assisted private val onNavigateToSeason: (param: ShowSeasonDetailsParam) -> Unit,
-    @Assisted private val onNavigateToTrailer: (id: Long) -> Unit,
-    private val castRepository: CastRepository,
-    private val watchlistRepository: WatchlistRepository,
-    private val recommendedShowsRepository: RecommendedShowsRepository,
-    private val seasonsRepository: SeasonsRepository,
-    private val showDetailsRepository: ShowDetailsRepository,
-    private val similarShowsRepository: SimilarShowsRepository,
-    private val trailerRepository: TrailerRepository,
-    private val watchProviders: WatchProviderRepository,
+  @Assisted componentContext: ComponentContext,
+  @Assisted private val showId: Long,
+  @Assisted private val onBack: () -> Unit,
+  @Assisted private val onNavigateToShow: (id: Long) -> Unit,
+  @Assisted private val onNavigateToSeason: (param: ShowSeasonDetailsParam) -> Unit,
+  @Assisted private val onNavigateToTrailer: (id: Long) -> Unit,
+  private val castRepository: CastRepository,
+  private val watchlistRepository: WatchlistRepository,
+  private val recommendedShowsRepository: RecommendedShowsRepository,
+  private val seasonsRepository: SeasonsRepository,
+  private val showDetailsRepository: ShowDetailsRepository,
+  private val similarShowsRepository: SimilarShowsRepository,
+  private val trailerRepository: TrailerRepository,
+  private val watchProviders: WatchProviderRepository,
+  private val showDetailsMapper: ShowDetailsMapper,
 ) : ComponentContext by componentContext {
 
   private val coroutineScope = coroutineScope()
@@ -89,40 +90,44 @@ constructor(
           )
         }
       }
-      ReloadShowDetails -> coroutineScope.launch { observeShowDetails(forceReload = true) }
       DetailBackClicked -> onBack()
-      DismissErrorSnackbar ->
-        coroutineScope.launch { _state.update { it.copy(errorMessage = null) } }
+      ReloadShowDetails -> coroutineScope.launch { observeShowDetails(forceReload = true) }
+      DismissErrorSnackbar -> coroutineScope.launch { _state.update { it.copy(errorMessage = null) } }
+      DismissShowsListSheet -> coroutineScope.launch { _state.update { it.copy(showListSheet = false) } }
+      ShowShowsListSheet -> coroutineScope.launch { _state.update { it.copy(showListSheet = true) } }
+      CreateCustomList -> {
+        //TODO:: Add implementation
+      }
     }
   }
 
   private suspend fun observeShowDetails(forceReload: Boolean = false) {
     return combine(
-        showDetailsRepository.observeShowDetails(showId, forceReload),
-        trailerRepository.isYoutubePlayerInstalled(),
-        observeShowMetadata(forceReload),
-        observeAdditionalContent(forceReload),
-      ) { showDetailsResult, isWebViewInstalled, showMetadataResult, additionalContentResult ->
-        showDetailsResult.fold(
-          { error ->
-            _state.update {
-              it.copy(
-                isUpdating = false,
-                errorMessage = error.errorMessage ?: "An unknown error occurred",
-                showInfo = ShowInfoState.Error
-              )
-            }
-          },
-          { result ->
-            updateState(
-              result?.toShowDetails(),
-              isWebViewInstalled,
-              showMetadataResult,
-              additionalContentResult
+      showDetailsRepository.observeShowDetails(showId, forceReload),
+      trailerRepository.isYoutubePlayerInstalled(),
+      observeShowMetadata(forceReload),
+      observeAdditionalContent(forceReload),
+    ) { showDetailsResult, isWebViewInstalled, showMetadataResult, additionalContentResult ->
+      showDetailsResult.fold(
+        { error ->
+          _state.update {
+            it.copy(
+              isUpdating = false,
+              errorMessage = error.errorMessage ?: "An unknown error occurred",
+              showInfo = ShowInfoState.Error,
             )
           }
-        )
-      }
+        },
+        { result ->
+          updateState(
+            showDetails = showDetailsMapper.toShowDetails(result),
+            isWebViewInstalled = isWebViewInstalled,
+            showMetadata = showMetadataResult,
+            additionalContent = additionalContentResult,
+          )
+        },
+      )
+    }
       .onStart { _state.update { it.copy(isUpdating = true, showInfo = ShowInfoState.Loading) } }
       .collect()
   }
@@ -171,9 +176,9 @@ constructor(
               recommendedShowList = additionalContent.recommendedShows,
               trailersList = additionalContent.trailers,
               openTrailersInYoutube =
-                (currentState.showInfo as? ShowInfoState.Loaded)?.openTrailersInYoutube ?: false,
+                (currentState.showInfo as? ShowInfoState.Loaded)?.openTrailersInYoutube == true,
               selectedSeasonIndex =
-                (currentState.showInfo as? ShowInfoState.Loaded)?.selectedSeasonIndex ?: 0
+                (currentState.showInfo as? ShowInfoState.Loaded)?.selectedSeasonIndex ?: 0,
             )
         }
 
diff --git a/presenter/show-details/src/commonMain/kotlin/com/thomaskioko/tvmaniac/presentation/showdetails/ShowDetailsState.kt b/presenter/show-details/src/commonMain/kotlin/com/thomaskioko/tvmaniac/presentation/showdetails/ShowDetailsState.kt
index 88d5a3793..6241432a3 100644
--- a/presenter/show-details/src/commonMain/kotlin/com/thomaskioko/tvmaniac/presentation/showdetails/ShowDetailsState.kt
+++ b/presenter/show-details/src/commonMain/kotlin/com/thomaskioko/tvmaniac/presentation/showdetails/ShowDetailsState.kt
@@ -11,6 +11,7 @@ import kotlinx.collections.immutable.ImmutableList
 data class ShowDetailsContent(
   val errorMessage: String? = null,
   val isUpdating: Boolean = false,
+  val showListSheet: Boolean = false,
   val showDetails: ShowDetails? = null,
   val showInfo: ShowInfoState = ShowInfoState.Loading,
 )
diff --git a/presenter/show-details/src/commonMain/kotlin/com/thomaskioko/tvmaniac/presentation/showdetails/model/ShowDetails.kt b/presenter/show-details/src/commonMain/kotlin/com/thomaskioko/tvmaniac/presentation/showdetails/model/ShowDetails.kt
index 4796ca99d..4ee496005 100644
--- a/presenter/show-details/src/commonMain/kotlin/com/thomaskioko/tvmaniac/presentation/showdetails/model/ShowDetails.kt
+++ b/presenter/show-details/src/commonMain/kotlin/com/thomaskioko/tvmaniac/presentation/showdetails/model/ShowDetails.kt
@@ -4,18 +4,18 @@ import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 
 data class ShowDetails(
-  val tmdbId: Long = 0,
-  val title: String = "",
-  val overview: String = "",
-  val language: String? = null,
-  val posterImageUrl: String? = null,
-  val backdropImageUrl: String? = null,
-  val year: String = "",
-  val status: String? = null,
+  val tmdbId: Long,
+  val title: String,
+  val overview: String,
+  val language: String?,
+  val posterImageUrl: String?,
+  val backdropImageUrl: String?,
+  val year: String,
+  val status: String?,
   val votes: Long = 0,
   val numberOfSeasons: Int? = null,
   val numberOfEpisodes: Long? = null,
-  val rating: Double = 0.0,
-  val genres: ImmutableList<String> = persistentListOf(),
-  val isFollowed: Boolean = false,
+  val rating: Double,
+  val genres: ImmutableList<String>,
+  val isFollowed: Boolean,
 )
diff --git a/presenter/show-details/src/commonTest/kotlin/com/thomaskioko/tvmaniac/presentation/showdetails/MockData.kt b/presenter/show-details/src/commonTest/kotlin/com/thomaskioko/tvmaniac/presentation/showdetails/MockData.kt
index b37e43d4e..b960d880e 100644
--- a/presenter/show-details/src/commonTest/kotlin/com/thomaskioko/tvmaniac/presentation/showdetails/MockData.kt
+++ b/presenter/show-details/src/commonTest/kotlin/com/thomaskioko/tvmaniac/presentation/showdetails/MockData.kt
@@ -11,12 +11,10 @@ import kotlinx.collections.immutable.persistentListOf
 
 val showDetailsContent =
   ShowDetailsContent(
-    showDetails =
-      ShowDetails(
+    showDetails = ShowDetails(
         tmdbId = 849583,
         title = "Loki",
-        overview =
-          "After stealing the Tesseract in Avengers: Endgame, Loki lands before the Time Variance Authority.",
+        overview =  "After stealing the Tesseract in Avengers: Endgame, Loki lands before the Time Variance Authority.",
         posterImageUrl = "/kEl2t3OhXc3Zb9FBh1AuYzRTgZp.jpg",
         backdropImageUrl = "/kEl2t3OhXc3Zb9FBh1AuYzRTgZp.jpg",
         language = "en",
@@ -25,6 +23,7 @@ val showDetailsContent =
         votes = 1L,
         rating = 8.0,
         genres = persistentListOf("1234"),
+        isFollowed = false,
       ),
     showInfo = ShowInfoState.Empty,
     errorMessage = null,
diff --git a/presenter/show-details/src/commonTest/kotlin/com/thomaskioko/tvmaniac/presentation/showdetails/ShowDetailsMapperTest.kt b/presenter/show-details/src/commonTest/kotlin/com/thomaskioko/tvmaniac/presentation/showdetails/ShowDetailsMapperTest.kt
new file mode 100644
index 000000000..8bb3ea945
--- /dev/null
+++ b/presenter/show-details/src/commonTest/kotlin/com/thomaskioko/tvmaniac/presentation/showdetails/ShowDetailsMapperTest.kt
@@ -0,0 +1,35 @@
+package com.thomaskioko.tvmaniac.presentation.showdetails
+
+import com.thomakioko.tvmaniac.util.testing.FakeFormatterUtil
+import com.thomaskioko.tvmaniac.presentation.showdetails.model.ShowDetails
+import io.kotest.matchers.shouldBe
+import kotlinx.collections.immutable.persistentListOf
+import kotlin.test.Test
+
+class ShowDetailsMapperTest {
+
+  private val showDetailsMapper = ShowDetailsMapper(FakeFormatterUtil())
+
+  @Test
+  fun `should return ShowDetails when TvshowDetails is provided`() {
+
+    val expectedShowDetails = ShowDetails(
+      tmdbId = 849583,
+      title = "Loki",
+      overview = "After stealing the Tesseract in Avengers: Endgame, Loki lands before the Time Variance Authority.",
+      posterImageUrl = "/kEl2t3OhXc3Zb9FBh1AuYzRTgZp.jpg",
+      backdropImageUrl = "/kEl2t3OhXc3Zb9FBh1AuYzRTgZp.jpg",
+      language = "en",
+      year = "2021-06-09",
+      status = "Ended",
+      votes = 1L,
+      rating = 8.0,
+      genres = persistentListOf("1234"),
+      isFollowed = false,
+    )
+
+    val result = showDetailsMapper.toShowDetails(tvShowDetails)
+
+    result shouldBe expectedShowDetails
+  }
+}
diff --git a/presenter/show-details/src/commonTest/kotlin/com/thomaskioko/tvmaniac/presentation/showdetails/ShowDetailsPresenterTest.kt b/presenter/show-details/src/commonTest/kotlin/com/thomaskioko/tvmaniac/presentation/showdetails/ShowDetailsPresenterTest.kt
index 44b53fd09..e28c1d204 100644
--- a/presenter/show-details/src/commonTest/kotlin/com/thomaskioko/tvmaniac/presentation/showdetails/ShowDetailsPresenterTest.kt
+++ b/presenter/show-details/src/commonTest/kotlin/com/thomaskioko/tvmaniac/presentation/showdetails/ShowDetailsPresenterTest.kt
@@ -3,6 +3,7 @@ package com.thomaskioko.tvmaniac.presentation.showdetails
 import app.cash.turbine.test
 import com.arkivanov.decompose.DefaultComponentContext
 import com.arkivanov.essenty.lifecycle.LifecycleRegistry
+import com.thomakioko.tvmaniac.util.testing.FakeFormatterUtil
 import com.thomaskioko.tvmaniac.core.db.RecommendedShows
 import com.thomaskioko.tvmaniac.core.db.ShowCast
 import com.thomaskioko.tvmaniac.core.db.ShowSeasons
@@ -44,6 +45,7 @@ class ShowDetailsPresenterTest {
   private val castRepository = FakeCastRepository()
   private val recommendedShowsRepository = FakeRecommendedShowsRepository()
   private val showDetailsRepository = FakeShowDetailsRepository()
+  private val fakeFormatterUtil = FakeFormatterUtil()
   private val testDispatcher = StandardTestDispatcher()
 
   private lateinit var presenter: ShowDetailsPresenter
@@ -93,19 +95,17 @@ class ShowDetailsPresenterTest {
     buildMockData(showDetailResult = Either.Left(ServerError(errorMessage)))
 
     presenter.state.test {
-      awaitItem() shouldBe
-        ShowDetailsContent(
-          showDetails = null,
-          isUpdating = true,
-        )
+      awaitItem() shouldBe ShowDetailsContent(
+        showDetails = null,
+        isUpdating = true,
+      )
 
-      awaitItem() shouldBe
-        ShowDetailsContent(
-          showDetails = null,
-          isUpdating = false,
-          errorMessage = errorMessage,
-          showInfo = ShowInfoState.Error
-        )
+      awaitItem() shouldBe ShowDetailsContent(
+        showDetails = null,
+        isUpdating = false,
+        errorMessage = errorMessage,
+        showInfo = ShowInfoState.Error,
+      )
     }
   }
 
@@ -114,11 +114,10 @@ class ShowDetailsPresenterTest {
     buildMockData()
 
     presenter.state.test {
-      awaitItem() shouldBe
-        ShowDetailsContent(
-          showDetails = null,
-          isUpdating = true,
-        )
+      awaitItem() shouldBe ShowDetailsContent(
+        showDetails = null,
+        isUpdating = true,
+      )
 
       val emission = awaitItem()
       emission.showDetails shouldBe showDetailsContent.showDetails
@@ -151,8 +150,7 @@ class ShowDetailsPresenterTest {
       buildMockData()
 
       presenter.state.test {
-        awaitItem() shouldBe
-          ShowDetailsContent(
+        awaitItem() shouldBe ShowDetailsContent(
             showDetails = null,
             isUpdating = true,
           )
@@ -190,18 +188,16 @@ class ShowDetailsPresenterTest {
     )
 
     presenter.state.test {
-      awaitItem() shouldBe
-        ShowDetailsContent(
+      awaitItem() shouldBe ShowDetailsContent(
           showDetails = null,
           isUpdating = true,
         )
 
-      awaitItem() shouldBe
-        ShowDetailsContent(
+      awaitItem() shouldBe ShowDetailsContent(
           showDetails = null,
           isUpdating = false,
           errorMessage = "Failed to fetch show details",
-          showInfo = ShowInfoState.Error
+          showInfo = ShowInfoState.Error,
         )
 
       presenter.dispatch(DismissErrorSnackbar)
@@ -214,8 +210,7 @@ class ShowDetailsPresenterTest {
   @Test
   fun `should invoke navigateToSeason when SeasonClicked`() = runTest {
     var navigatedToSeason = false
-    val presenter =
-      buildShowDetailsPresenter(
+    val presenter = buildShowDetailsPresenter(
         onNavigateToSeason = { navigatedToSeason = true },
       )
 
@@ -274,6 +269,9 @@ class ShowDetailsPresenterTest {
       recommendedShowsRepository = recommendedShowsRepository,
       castRepository = castRepository,
       showDetailsRepository = showDetailsRepository,
+      showDetailsMapper = ShowDetailsMapper(
+        formatterUtil = fakeFormatterUtil,
+      ),
     )
   }
 }
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
index a7dacd962..ad359401b 100644
--- a/shared/build.gradle.kts
+++ b/shared/build.gradle.kts
@@ -17,8 +17,6 @@ plugins {
   alias(libs.plugins.tvmaniac.xcframework)
 }
 
-version = libs.versions.shared.module.version.get()
-
 kotlin {
   val xcFramework = XCFramework("TvManiac")