From c5a4d5b6b7580b59a1f2f3e132d85e93e87af83f Mon Sep 17 00:00:00 2001
From: office-pc nix root <paul@fauchon.dev>
Date: Sat, 5 Oct 2024 14:18:35 +0800
Subject: [PATCH] revamp video models to only have one instead of 3

---
 lib/channels/models/channel.dart              |    4 +-
 lib/channels/models/channel.g.dart            |    2 +-
 lib/channels/models/channel_videos.dart       |    8 +-
 lib/channels/models/channel_videos.g.dart     |    2 +-
 lib/channels/views/components/info.dart       |   17 +-
 lib/channels/views/components/videos.dart     |    4 +-
 lib/channels/views/tv/screens/channel.dart    |   77 +-
 lib/comments/states/comments.dart             |    6 +-
 lib/comments/states/comments.freezed.dart     |   31 +-
 lib/comments/views/components/comment.dart    |    4 +-
 lib/comments/views/components/comments.dart   |    5 +-
 lib/downloads/models/downloaded_video.dart    |   56 +-
 .../models/downloaded_video.freezed.dart      |  349 +++++
 lib/downloads/models/downloaded_video.g.dart  |   14 +-
 lib/downloads/states/download_manager.dart    |   19 +-
 .../states/downloaded_video.freezed.dart      |   19 +
 lib/home/models/db/home_layout.dart           |    7 +-
 lib/player/states/audio_player.dart           |   10 +-
 lib/player/states/audio_player.freezed.dart   |   36 +
 lib/player/states/player.dart                 |   48 +-
 lib/player/states/player.freezed.dart         |   57 +-
 .../states/player_controls.freezed.dart       |    6 +-
 lib/player/states/tv_player_controls.dart     |    4 +-
 lib/player/states/video_player.dart           |   19 +-
 lib/player/states/video_player.freezed.dart   |   36 +
 lib/player/views/components/video_queue.dart  |    5 +-
 .../views/tv/components/player_controls.dart  |   20 +-
 .../views/tv/screens/tv_player_view.dart      |    4 +-
 lib/playlists/models/playlist.dart            |   36 +-
 lib/playlists/models/playlist.freezed.dart    |  476 +++++++
 lib/playlists/models/playlist.g.dart          |  242 +---
 lib/playlists/states/playlist.dart            |   10 +-
 lib/playlists/states/playlist.freezed.dart    |   15 +
 .../views/components/playlist_inner_view.dart |    5 +-
 .../views/components/playlist_thumbnail.dart  |    4 +-
 lib/playlists/views/screens/playlist.dart     |    4 +-
 .../views/tablet/playlist_inner_view.dart     |    7 +-
 lib/playlists/views/tv/screens/playlist.dart  |    4 +-
 lib/router.dart                               |    2 -
 lib/router.gr.dart                            |    8 +-
 lib/search/models/search_results.dart         |    5 +-
 lib/search/states/search.dart                 |    4 +-
 lib/search/views/screens/video_tab.dart       |    4 +-
 lib/search/views/tv/screens/search.dart       |    4 +-
 lib/service.dart                              |   42 +-
 lib/settings/models/db/video_filter.dart      |   27 +-
 lib/utils.dart                                |    4 +-
 lib/utils/models/image_object.dart            |   10 +-
 lib/utils/models/paginated_list.dart          |   12 +-
 lib/utils/sembast_sqflite_database.dart       |    2 +-
 lib/utils/video_post_processing.dart          |    6 +-
 .../views/components/text_linkified.dart      |    4 +-
 .../components/tv_horizontal_item_list.dart   |   15 +-
 .../tv_horizontal_paginated_list.dart         |    6 +-
 lib/videos/models/base_video.dart             |   90 --
 lib/videos/models/base_video.g.dart           |  181 ---
 lib/videos/models/db/history_video_cache.dart |   13 +-
 lib/videos/models/dearrow.dart                |   26 +-
 lib/videos/models/ided_video.dart             |    3 +
 lib/videos/models/recommended_video.dart      |   26 -
 lib/videos/models/recommended_video.g.dart    |   33 -
 lib/videos/models/user_feed.dart              |    7 +-
 lib/videos/models/user_feed.g.dart            |    4 +-
 lib/videos/models/video.dart                  |  120 +-
 lib/videos/models/video.freezed.dart          | 1186 +++++++++++++++++
 lib/videos/models/video.g.dart                |  135 +-
 lib/videos/models/video_in_list.dart          |   51 -
 lib/videos/models/video_in_list.g.dart        |  217 ---
 lib/videos/states/add_to_playlist.dart        |    6 +-
 lib/videos/states/compact_video.freezed.dart  |   19 +
 lib/videos/states/download_modal_sheet.dart   |    7 +-
 lib/videos/states/video.dart                  |    3 +-
 lib/videos/states/video.freezed.dart          |   36 +
 lib/videos/states/video_in_list.dart          |    4 +-
 lib/videos/states/video_in_list.freezed.dart  |   52 +-
 .../views/components/add_to_queue_button.dart |    6 +-
 .../views/components/compact_video.dart       |    4 +-
 .../components/download_modal_sheet.dart      |    6 +-
 .../views/components/history_video.dart       |    2 +-
 lib/videos/views/components/info.dart         |   20 +-
 lib/videos/views/components/popular.dart      |    4 +-
 .../views/components/recommended_videos.dart  |    9 +-
 .../views/components/subscriptions.dart       |    4 +-
 lib/videos/views/components/trending.dart     |    4 +-
 .../views/components/video_in_list.dart       |    8 +-
 lib/videos/views/components/video_list.dart   |   16 +-
 .../views/components/video_metrics.dart       |    2 +-
 .../views/components/video_modal_sheet.dart   |    6 +-
 .../views/components/video_share_button.dart  |    4 +-
 .../views/tv/components/video_item.dart       |   58 +-
 lib/videos/views/tv/screens/video.dart        |   33 +-
 .../views/tv/screens/video_grid_view.dart     |   10 +-
 lib/workmanager.dart                          |    4 +-
 93 files changed, 2903 insertions(+), 1343 deletions(-)
 create mode 100644 lib/downloads/models/downloaded_video.freezed.dart
 create mode 100644 lib/playlists/models/playlist.freezed.dart
 delete mode 100644 lib/videos/models/base_video.dart
 delete mode 100644 lib/videos/models/base_video.g.dart
 create mode 100644 lib/videos/models/ided_video.dart
 delete mode 100644 lib/videos/models/recommended_video.dart
 delete mode 100644 lib/videos/models/recommended_video.g.dart
 create mode 100644 lib/videos/models/video.freezed.dart
 delete mode 100644 lib/videos/models/video_in_list.dart
 delete mode 100644 lib/videos/models/video_in_list.g.dart

diff --git a/lib/channels/models/channel.dart b/lib/channels/models/channel.dart
index a704e5f8..515d1c14 100644
--- a/lib/channels/models/channel.dart
+++ b/lib/channels/models/channel.dart
@@ -1,6 +1,6 @@
 import 'package:clipious/settings/models/db/server.dart';
 import 'package:clipious/utils/models/sharelink.dart';
-import 'package:clipious/videos/models/video_in_list.dart';
+import 'package:clipious/videos/models/video.dart';
 import 'package:json_annotation/json_annotation.dart';
 
 import '../../utils/models/image_object.dart';
@@ -22,7 +22,7 @@ class Channel implements ShareLinks {
   String description;
 
   List<String>? allowedRegions;
-  List<VideoInList>? latestVideos;
+  List<Video>? latestVideos;
 
   Channel(
       this.author,
diff --git a/lib/channels/models/channel.g.dart b/lib/channels/models/channel.g.dart
index 3b4b752c..7cf946d2 100644
--- a/lib/channels/models/channel.g.dart
+++ b/lib/channels/models/channel.g.dart
@@ -26,7 +26,7 @@ Channel _$ChannelFromJson(Map<String, dynamic> json) => Channel(
           ?.map((e) => e as String)
           .toList(),
       (json['latestVideos'] as List<dynamic>?)
-          ?.map((e) => VideoInList.fromJson(e as Map<String, dynamic>))
+          ?.map((e) => Video.fromJson(e as Map<String, dynamic>))
           .toList(),
     );
 
diff --git a/lib/channels/models/channel_videos.dart b/lib/channels/models/channel_videos.dart
index 06dd5175..541c89f1 100644
--- a/lib/channels/models/channel_videos.dart
+++ b/lib/channels/models/channel_videos.dart
@@ -1,4 +1,4 @@
-import 'package:clipious/videos/models/video_in_list.dart';
+import 'package:clipious/videos/models/video.dart';
 import 'package:json_annotation/json_annotation.dart';
 
 import '../../utils/models/item_with_continuation.dart';
@@ -6,8 +6,8 @@ import '../../utils/models/item_with_continuation.dart';
 part 'channel_videos.g.dart';
 
 @JsonSerializable()
-class VideosWithContinuation extends ItemtWithContinuation<VideoInList> {
-  List<VideoInList> videos;
+class VideosWithContinuation extends ItemtWithContinuation<Video> {
+  List<Video> videos;
 
   VideosWithContinuation(this.videos, String? continuation)
       : super(continuation);
@@ -18,7 +18,7 @@ class VideosWithContinuation extends ItemtWithContinuation<VideoInList> {
   Map<String, dynamic> toJson() => _$VideosWithContinuationToJson(this);
 
   @override
-  List<VideoInList> getItems() {
+  List<Video> getItems() {
     return videos;
   }
 }
diff --git a/lib/channels/models/channel_videos.g.dart b/lib/channels/models/channel_videos.g.dart
index 9547b011..6b1eadb3 100644
--- a/lib/channels/models/channel_videos.g.dart
+++ b/lib/channels/models/channel_videos.g.dart
@@ -10,7 +10,7 @@ VideosWithContinuation _$VideosWithContinuationFromJson(
         Map<String, dynamic> json) =>
     VideosWithContinuation(
       (json['videos'] as List<dynamic>)
-          .map((e) => VideoInList.fromJson(e as Map<String, dynamic>))
+          .map((e) => Video.fromJson(e as Map<String, dynamic>))
           .toList(),
       json['continuation'] as String?,
     );
diff --git a/lib/channels/views/components/info.dart b/lib/channels/views/components/info.dart
index 0c5b907b..e4736cf8 100644
--- a/lib/channels/views/components/info.dart
+++ b/lib/channels/views/components/info.dart
@@ -8,7 +8,6 @@ import 'package:url_launcher/url_launcher.dart';
 
 import '../../../subscription_management/view/components/subscribe_button.dart';
 import '../../../utils/models/image_object.dart';
-import '../../../videos/models/video_in_list.dart';
 import '../../../videos/views/components/video_in_list.dart';
 import '../../../videos/views/components/video_thumbnail.dart';
 
@@ -85,22 +84,8 @@ class ChannelInfo extends StatelessWidget {
         mainAxisSpacing: 5,
         childAspectRatio: getGridAspectRatio(context),
         children: channel.latestVideos?.map((e) {
-              VideoInList videoInList = VideoInList(
-                  e.title,
-                  e.videoId,
-                  e.lengthSeconds,
-                  0,
-                  e.author,
-                  channel.authorId,
-                  channel.authorId,
-                  0,
-                  '',
-                  e.videoThumbnails)
-                ..deArrowThumbnailUrl = e.deArrowThumbnailUrl;
-              videoInList.filtered = e.filtered;
-              videoInList.matchedFilters = e.matchedFilters;
               return VideoListItem(
-                video: videoInList,
+                video: e,
               );
             }).toList() ??
             []));
diff --git a/lib/channels/views/components/videos.dart b/lib/channels/views/components/videos.dart
index 93e25931..72febbe2 100644
--- a/lib/channels/views/components/videos.dart
+++ b/lib/channels/views/components/videos.dart
@@ -1,9 +1,9 @@
 import 'dart:async';
 
+import 'package:clipious/videos/models/video.dart';
 import 'package:flutter/material.dart';
 import 'package:clipious/channels/models/channel_videos.dart';
 import 'package:clipious/globals.dart';
-import 'package:clipious/videos/models/video_in_list.dart';
 import 'package:clipious/videos/views/components/video_list.dart';
 
 import '../../../utils/models/paginated_list.dart';
@@ -25,7 +25,7 @@ class ChannelVideosView extends StatelessWidget {
       child: Container(
         color: colorScheme.surface,
         child: VideoList(
-          paginatedVideoList: ContinuationList<VideoInList>(
+          paginatedVideoList: ContinuationList<Video>(
               (continuation) => getVideos(channel.authorId, continuation)),
           // tags: 'channel-video-list-${(key as ValueKey<String>).value}'
         ),
diff --git a/lib/channels/views/tv/screens/channel.dart b/lib/channels/views/tv/screens/channel.dart
index 7bc9ae4a..478b0e72 100644
--- a/lib/channels/views/tv/screens/channel.dart
+++ b/lib/channels/views/tv/screens/channel.dart
@@ -2,6 +2,7 @@ import 'dart:ui';
 
 import 'package:auto_route/annotations.dart';
 import 'package:cached_network_image/cached_network_image.dart';
+import 'package:clipious/videos/models/video.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@@ -15,7 +16,6 @@ import 'package:clipious/utils/views/components/placeholders.dart';
 import 'package:clipious/utils/views/tv/components/tv_expandable_text.dart';
 import 'package:clipious/utils/views/tv/components/tv_horizontal_item_list.dart';
 import 'package:clipious/utils/views/tv/components/tv_overscan.dart';
-import 'package:clipious/videos/models/video_in_list.dart';
 
 import '../../../../playlists/models/playlist.dart';
 import '../../../../playlists/views/components/playlist_in_list.dart';
@@ -181,26 +181,21 @@ class TvChannelScreen extends StatelessWidget {
                                             TvHorizontalVideoList(
                                                 onItemFocus:
                                                     (video, index, focus) =>
-                                                        tvCubit
-                                                            .scrollTo(
-                                                                tvCubit
-                                                                    .videosTitle,
-                                                                focus),
+                                                        tvCubit.scrollTo(
+                                                            tvCubit.videosTitle,
+                                                            focus),
                                                 paginatedVideoList: ContinuationList<
-                                                        VideoInList>(
-                                                    (continuation) =>
-                                                        service
-                                                            .getChannelVideos(
-                                                                channel.channel
-                                                                        ?.authorId ??
-                                                                    '',
-                                                                continuation)
-                                                            .then((value) {
-                                                          tvCubit.setHasVideos(
-                                                              value.videos
-                                                                  .isNotEmpty);
-                                                          return value;
-                                                        }))),
+                                                    Video>((continuation) => service
+                                                        .getChannelVideos(
+                                                            channel.channel
+                                                                    ?.authorId ??
+                                                                '',
+                                                            continuation)
+                                                        .then((value) {
+                                                      tvCubit.setHasVideos(value
+                                                          .videos.isNotEmpty);
+                                                      return value;
+                                                    }))),
                                             tv.hasShorts
                                                 ? Padding(
                                                     key: tvCubit.shortTitle,
@@ -217,26 +212,21 @@ class TvChannelScreen extends StatelessWidget {
                                             TvHorizontalVideoList(
                                                 onItemFocus:
                                                     (video, index, focus) =>
-                                                        tvCubit
-                                                            .scrollTo(
-                                                                tvCubit
-                                                                    .shortTitle,
-                                                                focus),
+                                                        tvCubit.scrollTo(
+                                                            tvCubit.shortTitle,
+                                                            focus),
                                                 paginatedVideoList: ContinuationList<
-                                                        VideoInList>(
-                                                    (continuation) =>
-                                                        service
-                                                            .getChannelShorts(
-                                                                channel.channel
-                                                                        ?.authorId ??
-                                                                    '',
-                                                                continuation)
-                                                            .then((value) {
-                                                          tvCubit.setHasShorts(
-                                                              value.videos
-                                                                  .isNotEmpty);
-                                                          return value;
-                                                        }))),
+                                                    Video>((continuation) => service
+                                                        .getChannelShorts(
+                                                            channel.channel
+                                                                    ?.authorId ??
+                                                                '',
+                                                            continuation)
+                                                        .then((value) {
+                                                      tvCubit.setHasShorts(value
+                                                          .videos.isNotEmpty);
+                                                      return value;
+                                                    }))),
                                             tv.hasStreams
                                                 ? Padding(
                                                     key: tvCubit.streamTitle,
@@ -251,13 +241,14 @@ class TvChannelScreen extends StatelessWidget {
                                                   )
                                                 : const SizedBox.shrink(),
                                             TvHorizontalVideoList(
-                                                onItemFocus:
-                                                    (video, index, focus) =>
-                                                        tvCubit.scrollTo(
+                                                onItemFocus: (video, index,
+                                                        focus) =>
+                                                    tvCubit
+                                                        .scrollTo(
                                                             tvCubit.streamTitle,
                                                             focus),
                                                 paginatedVideoList: ContinuationList<
-                                                        VideoInList>(
+                                                        Video>(
                                                     (continuation) => service
                                                             .getChannelStreams(
                                                                 channel.channel
diff --git a/lib/comments/states/comments.dart b/lib/comments/states/comments.dart
index 3e3cef28..2ac00af0 100644
--- a/lib/comments/states/comments.dart
+++ b/lib/comments/states/comments.dart
@@ -1,7 +1,7 @@
 import 'package:bloc/bloc.dart';
+import 'package:clipious/videos/models/video.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:clipious/comments/models/video_comments.dart';
-import 'package:clipious/videos/models/base_video.dart';
 
 import '../../globals.dart';
 import '../../settings/models/errors/invidious_service_error.dart';
@@ -66,7 +66,7 @@ class CommentsCubit extends Cubit<CommentsState> {
 @freezed
 class CommentsState with _$CommentsState {
   const factory CommentsState(
-      {required BaseVideo video,
+      {required Video video,
       @Default(true) bool loadingComments,
       String? continuation,
       @Default(false) bool continuationLoaded,
@@ -76,7 +76,7 @@ class CommentsState with _$CommentsState {
       String? sortBy}) = _CommentsState;
 
   static CommentsState init(
-      {required BaseVideo video,
+      {required Video video,
       bool? loadingComments,
       String? continuation,
       bool? continuationLoaded,
diff --git a/lib/comments/states/comments.freezed.dart b/lib/comments/states/comments.freezed.dart
index 857595e9..f732db0f 100644
--- a/lib/comments/states/comments.freezed.dart
+++ b/lib/comments/states/comments.freezed.dart
@@ -16,7 +16,7 @@ final _privateConstructorUsedError = UnsupportedError(
 
 /// @nodoc
 mixin _$CommentsState {
-  BaseVideo get video => throw _privateConstructorUsedError;
+  Video get video => throw _privateConstructorUsedError;
   bool get loadingComments => throw _privateConstructorUsedError;
   String? get continuation => throw _privateConstructorUsedError;
   bool get continuationLoaded => throw _privateConstructorUsedError;
@@ -39,7 +39,7 @@ abstract class $CommentsStateCopyWith<$Res> {
       _$CommentsStateCopyWithImpl<$Res, CommentsState>;
   @useResult
   $Res call(
-      {BaseVideo video,
+      {Video video,
       bool loadingComments,
       String? continuation,
       bool continuationLoaded,
@@ -47,6 +47,8 @@ abstract class $CommentsStateCopyWith<$Res> {
       String error,
       String? source,
       String? sortBy});
+
+  $VideoCopyWith<$Res> get video;
 }
 
 /// @nodoc
@@ -77,7 +79,7 @@ class _$CommentsStateCopyWithImpl<$Res, $Val extends CommentsState>
       video: null == video
           ? _value.video
           : video // ignore: cast_nullable_to_non_nullable
-              as BaseVideo,
+              as Video,
       loadingComments: null == loadingComments
           ? _value.loadingComments
           : loadingComments // ignore: cast_nullable_to_non_nullable
@@ -108,6 +110,16 @@ class _$CommentsStateCopyWithImpl<$Res, $Val extends CommentsState>
               as String?,
     ) as $Val);
   }
+
+  /// Create a copy of CommentsState
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @pragma('vm:prefer-inline')
+  $VideoCopyWith<$Res> get video {
+    return $VideoCopyWith<$Res>(_value.video, (value) {
+      return _then(_value.copyWith(video: value) as $Val);
+    });
+  }
 }
 
 /// @nodoc
@@ -119,7 +131,7 @@ abstract class _$$CommentsStateImplCopyWith<$Res>
   @override
   @useResult
   $Res call(
-      {BaseVideo video,
+      {Video video,
       bool loadingComments,
       String? continuation,
       bool continuationLoaded,
@@ -127,6 +139,9 @@ abstract class _$$CommentsStateImplCopyWith<$Res>
       String error,
       String? source,
       String? sortBy});
+
+  @override
+  $VideoCopyWith<$Res> get video;
 }
 
 /// @nodoc
@@ -155,7 +170,7 @@ class __$$CommentsStateImplCopyWithImpl<$Res>
       video: null == video
           ? _value.video
           : video // ignore: cast_nullable_to_non_nullable
-              as BaseVideo,
+              as Video,
       loadingComments: null == loadingComments
           ? _value.loadingComments
           : loadingComments // ignore: cast_nullable_to_non_nullable
@@ -202,7 +217,7 @@ class _$CommentsStateImpl implements _CommentsState {
       this.sortBy});
 
   @override
-  final BaseVideo video;
+  final Video video;
   @override
   @JsonKey()
   final bool loadingComments;
@@ -260,7 +275,7 @@ class _$CommentsStateImpl implements _CommentsState {
 
 abstract class _CommentsState implements CommentsState {
   const factory _CommentsState(
-      {required final BaseVideo video,
+      {required final Video video,
       final bool loadingComments,
       final String? continuation,
       final bool continuationLoaded,
@@ -270,7 +285,7 @@ abstract class _CommentsState implements CommentsState {
       final String? sortBy}) = _$CommentsStateImpl;
 
   @override
-  BaseVideo get video;
+  Video get video;
   @override
   bool get loadingComments;
   @override
diff --git a/lib/comments/views/components/comment.dart b/lib/comments/views/components/comment.dart
index 2cf5e4fb..de13436a 100644
--- a/lib/comments/views/components/comment.dart
+++ b/lib/comments/views/components/comment.dart
@@ -1,4 +1,5 @@
 import 'package:auto_route/auto_route.dart';
+import 'package:clipious/videos/models/video.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@@ -10,12 +11,11 @@ import 'package:clipious/videos/views/components/video_thumbnail.dart';
 
 import '../../../player/states/player.dart';
 import '../../../utils/models/image_object.dart';
-import '../../../videos/models/base_video.dart';
 import '../../models/comment.dart';
 
 class SingleCommentView extends StatelessWidget {
   final Comment comment;
-  final BaseVideo video;
+  final Video video;
 
   const SingleCommentView(
       {super.key, required this.comment, required this.video});
diff --git a/lib/comments/views/components/comments.dart b/lib/comments/views/components/comments.dart
index 22be031a..a745d090 100644
--- a/lib/comments/views/components/comments.dart
+++ b/lib/comments/views/components/comments.dart
@@ -1,13 +1,12 @@
+import 'package:clipious/videos/models/video.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:clipious/comments/states/comments.dart';
 import 'package:clipious/comments/views/components/comment.dart';
 
-import '../../../videos/models/base_video.dart';
-
 class CommentsView extends StatelessWidget {
-  final BaseVideo video;
+  final Video video;
   final String? continuation;
   final String? source;
   final String? sortBy;
diff --git a/lib/downloads/models/downloaded_video.dart b/lib/downloads/models/downloaded_video.dart
index 7386625d..bef36eba 100644
--- a/lib/downloads/models/downloaded_video.dart
+++ b/lib/downloads/models/downloaded_video.dart
@@ -1,30 +1,35 @@
 import 'dart:io';
 
-import 'package:clipious/videos/models/base_video.dart';
+import 'package:clipious/videos/models/ided_video.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:path/path.dart' as p;
 
+part 'downloaded_video.freezed.dart';
+
 part 'downloaded_video.g.dart';
 
 const String _downloadFolder = 'downloads';
 
-@JsonSerializable()
-class DownloadedVideo extends IdedVideo {
-  String title;
-  String? author;
-  String? authorUrl;
-  bool downloadComplete;
-  bool downloadFailed;
-  bool audioOnly;
-  int lengthSeconds;
-  String quality;
-
-  @override
-  set videoId(String videoId) => super.videoId = videoId;
-
-  @override
-  String get videoId => super.videoId;
+@freezed
+class DownloadedVideo with _$DownloadedVideo implements IdedVideo {
+  @Implements<IdedVideo>()
+  const factory DownloadedVideo(
+      {required String videoId,
+      required String title,
+      String? author,
+      String? authorUrl,
+      @Default(false) bool downloadComplete,
+      @Default(false) bool downloadFailed,
+      @Default(false) bool audioOnly,
+      required int lengthSeconds,
+      required String quality}) = _DownloadedVideo;
+
+  const DownloadedVideo._();
+
+  factory DownloadedVideo.fromJson(Map<String, Object?> json) =>
+      _$DownloadedVideoFromJson(json);
 
   @JsonKey(includeFromJson: false, includeToJson: false)
   Future<String> get downloadPath async {
@@ -65,21 +70,4 @@ class DownloadedVideo extends IdedVideo {
 
     return dir;
   }
-
-  DownloadedVideo(
-      {required String videoId,
-      required this.title,
-      this.author,
-      this.authorUrl,
-      this.downloadComplete = false,
-      this.downloadFailed = false,
-      this.audioOnly = false,
-      this.lengthSeconds = 1,
-      this.quality = '720p'})
-      : super(videoId);
-
-  factory DownloadedVideo.fromJson(Map<String, dynamic> json) =>
-      _$DownloadedVideoFromJson(json);
-
-  Map<String, dynamic> toJson() => _$DownloadedVideoToJson(this);
 }
diff --git a/lib/downloads/models/downloaded_video.freezed.dart b/lib/downloads/models/downloaded_video.freezed.dart
new file mode 100644
index 00000000..137d80f0
--- /dev/null
+++ b/lib/downloads/models/downloaded_video.freezed.dart
@@ -0,0 +1,349 @@
+// coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'downloaded_video.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+T _$identity<T>(T value) => value;
+
+final _privateConstructorUsedError = UnsupportedError(
+    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
+
+DownloadedVideo _$DownloadedVideoFromJson(Map<String, dynamic> json) {
+  return _DownloadedVideo.fromJson(json);
+}
+
+/// @nodoc
+mixin _$DownloadedVideo {
+  String get videoId => throw _privateConstructorUsedError;
+  String get title => throw _privateConstructorUsedError;
+  String? get author => throw _privateConstructorUsedError;
+  String? get authorUrl => throw _privateConstructorUsedError;
+  bool get downloadComplete => throw _privateConstructorUsedError;
+  bool get downloadFailed => throw _privateConstructorUsedError;
+  bool get audioOnly => throw _privateConstructorUsedError;
+  int get lengthSeconds => throw _privateConstructorUsedError;
+  String get quality => throw _privateConstructorUsedError;
+
+  /// Serializes this DownloadedVideo to a JSON map.
+  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
+
+  /// Create a copy of DownloadedVideo
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  $DownloadedVideoCopyWith<DownloadedVideo> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $DownloadedVideoCopyWith<$Res> {
+  factory $DownloadedVideoCopyWith(
+          DownloadedVideo value, $Res Function(DownloadedVideo) then) =
+      _$DownloadedVideoCopyWithImpl<$Res, DownloadedVideo>;
+  @useResult
+  $Res call(
+      {String videoId,
+      String title,
+      String? author,
+      String? authorUrl,
+      bool downloadComplete,
+      bool downloadFailed,
+      bool audioOnly,
+      int lengthSeconds,
+      String quality});
+}
+
+/// @nodoc
+class _$DownloadedVideoCopyWithImpl<$Res, $Val extends DownloadedVideo>
+    implements $DownloadedVideoCopyWith<$Res> {
+  _$DownloadedVideoCopyWithImpl(this._value, this._then);
+
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+
+  /// Create a copy of DownloadedVideo
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? videoId = null,
+    Object? title = null,
+    Object? author = freezed,
+    Object? authorUrl = freezed,
+    Object? downloadComplete = null,
+    Object? downloadFailed = null,
+    Object? audioOnly = null,
+    Object? lengthSeconds = null,
+    Object? quality = null,
+  }) {
+    return _then(_value.copyWith(
+      videoId: null == videoId
+          ? _value.videoId
+          : videoId // ignore: cast_nullable_to_non_nullable
+              as String,
+      title: null == title
+          ? _value.title
+          : title // ignore: cast_nullable_to_non_nullable
+              as String,
+      author: freezed == author
+          ? _value.author
+          : author // ignore: cast_nullable_to_non_nullable
+              as String?,
+      authorUrl: freezed == authorUrl
+          ? _value.authorUrl
+          : authorUrl // ignore: cast_nullable_to_non_nullable
+              as String?,
+      downloadComplete: null == downloadComplete
+          ? _value.downloadComplete
+          : downloadComplete // ignore: cast_nullable_to_non_nullable
+              as bool,
+      downloadFailed: null == downloadFailed
+          ? _value.downloadFailed
+          : downloadFailed // ignore: cast_nullable_to_non_nullable
+              as bool,
+      audioOnly: null == audioOnly
+          ? _value.audioOnly
+          : audioOnly // ignore: cast_nullable_to_non_nullable
+              as bool,
+      lengthSeconds: null == lengthSeconds
+          ? _value.lengthSeconds
+          : lengthSeconds // ignore: cast_nullable_to_non_nullable
+              as int,
+      quality: null == quality
+          ? _value.quality
+          : quality // ignore: cast_nullable_to_non_nullable
+              as String,
+    ) as $Val);
+  }
+}
+
+/// @nodoc
+abstract class _$$DownloadedVideoImplCopyWith<$Res>
+    implements $DownloadedVideoCopyWith<$Res> {
+  factory _$$DownloadedVideoImplCopyWith(_$DownloadedVideoImpl value,
+          $Res Function(_$DownloadedVideoImpl) then) =
+      __$$DownloadedVideoImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call(
+      {String videoId,
+      String title,
+      String? author,
+      String? authorUrl,
+      bool downloadComplete,
+      bool downloadFailed,
+      bool audioOnly,
+      int lengthSeconds,
+      String quality});
+}
+
+/// @nodoc
+class __$$DownloadedVideoImplCopyWithImpl<$Res>
+    extends _$DownloadedVideoCopyWithImpl<$Res, _$DownloadedVideoImpl>
+    implements _$$DownloadedVideoImplCopyWith<$Res> {
+  __$$DownloadedVideoImplCopyWithImpl(
+      _$DownloadedVideoImpl _value, $Res Function(_$DownloadedVideoImpl) _then)
+      : super(_value, _then);
+
+  /// Create a copy of DownloadedVideo
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? videoId = null,
+    Object? title = null,
+    Object? author = freezed,
+    Object? authorUrl = freezed,
+    Object? downloadComplete = null,
+    Object? downloadFailed = null,
+    Object? audioOnly = null,
+    Object? lengthSeconds = null,
+    Object? quality = null,
+  }) {
+    return _then(_$DownloadedVideoImpl(
+      videoId: null == videoId
+          ? _value.videoId
+          : videoId // ignore: cast_nullable_to_non_nullable
+              as String,
+      title: null == title
+          ? _value.title
+          : title // ignore: cast_nullable_to_non_nullable
+              as String,
+      author: freezed == author
+          ? _value.author
+          : author // ignore: cast_nullable_to_non_nullable
+              as String?,
+      authorUrl: freezed == authorUrl
+          ? _value.authorUrl
+          : authorUrl // ignore: cast_nullable_to_non_nullable
+              as String?,
+      downloadComplete: null == downloadComplete
+          ? _value.downloadComplete
+          : downloadComplete // ignore: cast_nullable_to_non_nullable
+              as bool,
+      downloadFailed: null == downloadFailed
+          ? _value.downloadFailed
+          : downloadFailed // ignore: cast_nullable_to_non_nullable
+              as bool,
+      audioOnly: null == audioOnly
+          ? _value.audioOnly
+          : audioOnly // ignore: cast_nullable_to_non_nullable
+              as bool,
+      lengthSeconds: null == lengthSeconds
+          ? _value.lengthSeconds
+          : lengthSeconds // ignore: cast_nullable_to_non_nullable
+              as int,
+      quality: null == quality
+          ? _value.quality
+          : quality // ignore: cast_nullable_to_non_nullable
+              as String,
+    ));
+  }
+}
+
+/// @nodoc
+@JsonSerializable()
+class _$DownloadedVideoImpl extends _DownloadedVideo {
+  const _$DownloadedVideoImpl(
+      {required this.videoId,
+      required this.title,
+      this.author,
+      this.authorUrl,
+      this.downloadComplete = false,
+      this.downloadFailed = false,
+      this.audioOnly = false,
+      required this.lengthSeconds,
+      required this.quality})
+      : super._();
+
+  factory _$DownloadedVideoImpl.fromJson(Map<String, dynamic> json) =>
+      _$$DownloadedVideoImplFromJson(json);
+
+  @override
+  final String videoId;
+  @override
+  final String title;
+  @override
+  final String? author;
+  @override
+  final String? authorUrl;
+  @override
+  @JsonKey()
+  final bool downloadComplete;
+  @override
+  @JsonKey()
+  final bool downloadFailed;
+  @override
+  @JsonKey()
+  final bool audioOnly;
+  @override
+  final int lengthSeconds;
+  @override
+  final String quality;
+
+  @override
+  String toString() {
+    return 'DownloadedVideo(videoId: $videoId, title: $title, author: $author, authorUrl: $authorUrl, downloadComplete: $downloadComplete, downloadFailed: $downloadFailed, audioOnly: $audioOnly, lengthSeconds: $lengthSeconds, quality: $quality)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$DownloadedVideoImpl &&
+            (identical(other.videoId, videoId) || other.videoId == videoId) &&
+            (identical(other.title, title) || other.title == title) &&
+            (identical(other.author, author) || other.author == author) &&
+            (identical(other.authorUrl, authorUrl) ||
+                other.authorUrl == authorUrl) &&
+            (identical(other.downloadComplete, downloadComplete) ||
+                other.downloadComplete == downloadComplete) &&
+            (identical(other.downloadFailed, downloadFailed) ||
+                other.downloadFailed == downloadFailed) &&
+            (identical(other.audioOnly, audioOnly) ||
+                other.audioOnly == audioOnly) &&
+            (identical(other.lengthSeconds, lengthSeconds) ||
+                other.lengthSeconds == lengthSeconds) &&
+            (identical(other.quality, quality) || other.quality == quality));
+  }
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  int get hashCode => Object.hash(
+      runtimeType,
+      videoId,
+      title,
+      author,
+      authorUrl,
+      downloadComplete,
+      downloadFailed,
+      audioOnly,
+      lengthSeconds,
+      quality);
+
+  /// Create a copy of DownloadedVideo
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$DownloadedVideoImplCopyWith<_$DownloadedVideoImpl> get copyWith =>
+      __$$DownloadedVideoImplCopyWithImpl<_$DownloadedVideoImpl>(
+          this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$$DownloadedVideoImplToJson(
+      this,
+    );
+  }
+}
+
+abstract class _DownloadedVideo extends DownloadedVideo implements IdedVideo {
+  const factory _DownloadedVideo(
+      {required final String videoId,
+      required final String title,
+      final String? author,
+      final String? authorUrl,
+      final bool downloadComplete,
+      final bool downloadFailed,
+      final bool audioOnly,
+      required final int lengthSeconds,
+      required final String quality}) = _$DownloadedVideoImpl;
+  const _DownloadedVideo._() : super._();
+
+  factory _DownloadedVideo.fromJson(Map<String, dynamic> json) =
+      _$DownloadedVideoImpl.fromJson;
+
+  @override
+  String get videoId;
+  @override
+  String get title;
+  @override
+  String? get author;
+  @override
+  String? get authorUrl;
+  @override
+  bool get downloadComplete;
+  @override
+  bool get downloadFailed;
+  @override
+  bool get audioOnly;
+  @override
+  int get lengthSeconds;
+  @override
+  String get quality;
+
+  /// Create a copy of DownloadedVideo
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  _$$DownloadedVideoImplCopyWith<_$DownloadedVideoImpl> get copyWith =>
+      throw _privateConstructorUsedError;
+}
diff --git a/lib/downloads/models/downloaded_video.g.dart b/lib/downloads/models/downloaded_video.g.dart
index 4f2f03f2..c41ced0e 100644
--- a/lib/downloads/models/downloaded_video.g.dart
+++ b/lib/downloads/models/downloaded_video.g.dart
@@ -6,8 +6,9 @@ part of 'downloaded_video.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-DownloadedVideo _$DownloadedVideoFromJson(Map<String, dynamic> json) =>
-    DownloadedVideo(
+_$DownloadedVideoImpl _$$DownloadedVideoImplFromJson(
+        Map<String, dynamic> json) =>
+    _$DownloadedVideoImpl(
       videoId: json['videoId'] as String,
       title: json['title'] as String,
       author: json['author'] as String?,
@@ -15,12 +16,14 @@ DownloadedVideo _$DownloadedVideoFromJson(Map<String, dynamic> json) =>
       downloadComplete: json['downloadComplete'] as bool? ?? false,
       downloadFailed: json['downloadFailed'] as bool? ?? false,
       audioOnly: json['audioOnly'] as bool? ?? false,
-      lengthSeconds: (json['lengthSeconds'] as num?)?.toInt() ?? 1,
-      quality: json['quality'] as String? ?? '720p',
+      lengthSeconds: (json['lengthSeconds'] as num).toInt(),
+      quality: json['quality'] as String,
     );
 
-Map<String, dynamic> _$DownloadedVideoToJson(DownloadedVideo instance) =>
+Map<String, dynamic> _$$DownloadedVideoImplToJson(
+        _$DownloadedVideoImpl instance) =>
     <String, dynamic>{
+      'videoId': instance.videoId,
       'title': instance.title,
       'author': instance.author,
       'authorUrl': instance.authorUrl,
@@ -29,5 +32,4 @@ Map<String, dynamic> _$DownloadedVideoToJson(DownloadedVideo instance) =>
       'audioOnly': instance.audioOnly,
       'lengthSeconds': instance.lengthSeconds,
       'quality': instance.quality,
-      'videoId': instance.videoId,
     };
diff --git a/lib/downloads/states/download_manager.dart b/lib/downloads/states/download_manager.dart
index 67335339..56a9b160 100644
--- a/lib/downloads/states/download_manager.dart
+++ b/lib/downloads/states/download_manager.dart
@@ -54,12 +54,14 @@ class DownloadManagerCubit extends Cubit<DownloadManagerState> {
   setVideos() async {
     var vids = db.getAllDownloads();
     // checking if we have any video that are not fail, not completed and not currently downloading
-    for (var v in vids) {
+    for (int i = 0; i < vids.length; i++) {
+      var v = vids[i];
       if (!v.downloadComplete &&
           !v.downloadFailed &&
           !state.downloadProgresses.containsKey(v.videoId)) {
         // this download was interrupted by app restart or crash or something else, we set it as errored
-        v.downloadFailed = true;
+        v = v.copyWith(downloadFailed: true);
+        vids[i] = v;
         await db.upsertDownload(v);
       }
     }
@@ -81,7 +83,7 @@ class DownloadManagerCubit extends Cubit<DownloadManagerState> {
           Map<String, DownloadProgress>.from(state.downloadProgresses);
       var downloadProgress = progresses[video.videoId];
       progresses.remove(video.videoId);
-      video.downloadComplete = true;
+      video = video.copyWith(downloadComplete: true);
       await db.upsertDownload(video);
       emit(state.copyWith(downloadProgresses: progresses));
       setVideos();
@@ -118,11 +120,11 @@ class DownloadManagerCubit extends Cubit<DownloadManagerState> {
 
       var downloadedVideo = DownloadedVideo(
           videoId: vid.videoId,
-          title: vid.title,
+          title: vid.title ?? '',
           author: vid.author,
           authorUrl: vid.authorUrl,
           audioOnly: audioOnly,
-          lengthSeconds: vid.lengthSeconds,
+          lengthSeconds: vid.lengthSeconds ?? 0,
           quality: quality);
       await db.upsertDownload(downloadedVideo);
 
@@ -132,14 +134,14 @@ class DownloadManagerCubit extends Cubit<DownloadManagerState> {
         // FormatStream stream = vid.formatStreams
         //     .firstWhere((element) => element.resolution == quality);
 
-        final stream = vid.adaptiveFormats.firstWhere((element) =>
+        final stream = vid.adaptiveFormats!.firstWhere((element) =>
             element.encoding == 'vp9' &&
             element.qualityLabel == quality &&
             element.type.contains('video/webm'));
 
         videoUrl = stream.url;
       }
-      AdaptiveFormat audio = vid.adaptiveFormats
+      AdaptiveFormat audio = vid.adaptiveFormats!
           .sortByReversed((e) => int.parse(e.bitrate ?? "0"))
           .firstWhere((element) => element.type.contains("audio/webm"));
       String audioUrl = audio.url;
@@ -290,8 +292,7 @@ class DownloadManagerCubit extends Cubit<DownloadManagerState> {
     } else {
       log.severe("Failed to download video ${vid.title}, removing it", err);
     }
-    vid.downloadFailed = true;
-    vid.downloadComplete = false;
+    vid = vid.copyWith(downloadComplete: false, downloadFailed: true);
     onProgress(1, 1, vid, step: 1, totalSteps: 1);
     var progresses =
         Map<String, DownloadProgress>.from(state.downloadProgresses);
diff --git a/lib/downloads/states/downloaded_video.freezed.dart b/lib/downloads/states/downloaded_video.freezed.dart
index c3748493..d5ad4e80 100644
--- a/lib/downloads/states/downloaded_video.freezed.dart
+++ b/lib/downloads/states/downloaded_video.freezed.dart
@@ -34,6 +34,8 @@ abstract class $DownloadedVideoStateCopyWith<$Res> {
       _$DownloadedVideoStateCopyWithImpl<$Res, DownloadedVideoState>;
   @useResult
   $Res call({DownloadedVideo? video, String? thumbnailPath, double progress});
+
+  $DownloadedVideoCopyWith<$Res>? get video;
 }
 
 /// @nodoc
@@ -71,6 +73,20 @@ class _$DownloadedVideoStateCopyWithImpl<$Res,
               as double,
     ) as $Val);
   }
+
+  /// Create a copy of DownloadedVideoState
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @pragma('vm:prefer-inline')
+  $DownloadedVideoCopyWith<$Res>? get video {
+    if (_value.video == null) {
+      return null;
+    }
+
+    return $DownloadedVideoCopyWith<$Res>(_value.video!, (value) {
+      return _then(_value.copyWith(video: value) as $Val);
+    });
+  }
 }
 
 /// @nodoc
@@ -82,6 +98,9 @@ abstract class _$$DownloadedVideoStateImplCopyWith<$Res>
   @override
   @useResult
   $Res call({DownloadedVideo? video, String? thumbnailPath, double progress});
+
+  @override
+  $DownloadedVideoCopyWith<$Res>? get video;
 }
 
 /// @nodoc
diff --git a/lib/home/models/db/home_layout.dart b/lib/home/models/db/home_layout.dart
index 78547800..671e57e4 100644
--- a/lib/home/models/db/home_layout.dart
+++ b/lib/home/models/db/home_layout.dart
@@ -1,11 +1,11 @@
 import 'package:auto_route/auto_route.dart';
+import 'package:clipious/videos/models/video.dart';
 import 'package:copy_with_extension/copy_with_extension.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:clipious/router.dart';
-import 'package:clipious/videos/models/video_in_list.dart';
 
 import '../../../downloads/states/download_manager.dart';
 import '../../../globals.dart';
@@ -212,15 +212,14 @@ enum HomeDataSource {
                   scrollDirection: small ? Axis.horizontal : Axis.vertical,
                   small: small,
                   animateDownload: true,
-                  paginatedVideoList: PageBasedPaginatedList<VideoInList>(
+                  paginatedVideoList: PageBasedPaginatedList<Video>(
                       getItemsFunc: (page, maxResults) =>
                           // we get the data for each video
                           service.getUserHistory(page, maxResults).then(
                               (value) => Future.wait(value
                                   .map((e) async => (await HistoryVideoCache
                                           .fromVideoIdToVideo(e))
-                                      .toBaseVideo()
-                                      .toVideoInList())
+                                      .toVideo())
                                   .toList())),
                       maxResults: 20),
                 )
diff --git a/lib/player/states/audio_player.dart b/lib/player/states/audio_player.dart
index 5c5da687..a3d75c19 100644
--- a/lib/player/states/audio_player.dart
+++ b/lib/player/states/audio_player.dart
@@ -105,7 +105,7 @@ class AudioPlayerCubit extends MediaPlayerCubit<AudioPlayerState> {
       var audioLength = Duration(
           seconds: offline
               ? state.offlineVideo!.lengthSeconds
-              : state.video!.lengthSeconds);
+              : (state.video!.lengthSeconds ?? 0));
       emit(state.copyWith(
           audioPosition: Duration.zero,
           audioLength: audioLength,
@@ -116,14 +116,15 @@ class AudioPlayerCubit extends MediaPlayerCubit<AudioPlayerState> {
         final server = await db.getCurrentlySelectedServer();
 
         if (!offline) {
+          assert(state.video!.formatStreams != null);
           if (service.useProxy()) {
             // audio only streams don't seem to work when using proxy mode, using formatted streams when proxy is enabled
             var formatStream = state
-                .video!.formatStreams[state.video!.formatStreams.length - 1];
+                .video!.formatStreams![state.video!.formatStreams!.length - 1];
             source = AudioSource.uri(Uri.parse(formatStream.url),
                 headers: server.headersForUrl(formatStream.url));
           } else {
-            AdaptiveFormat? audio = state.video?.adaptiveFormats
+            AdaptiveFormat? audio = state.video?.adaptiveFormats!
                 .where((element) => element.type.contains("audio"))
                 .sortByReversed((e) => int.parse(e.bitrate ?? "0"))
                 .first;
@@ -132,7 +133,8 @@ class AudioPlayerCubit extends MediaPlayerCubit<AudioPlayerState> {
                 double progress = db.getVideoProgress(state.video!.videoId);
                 if (progress > 0 && progress < 0.90) {
                   startAt = Duration(
-                      seconds: (state.video!.lengthSeconds * progress).floor());
+                      seconds: ((state.video!.lengthSeconds ?? 0) * progress)
+                          .floor());
                 }
               }
               emit(state);
diff --git a/lib/player/states/audio_player.freezed.dart b/lib/player/states/audio_player.freezed.dart
index 1a5fb6d5..1e083b21 100644
--- a/lib/player/states/audio_player.freezed.dart
+++ b/lib/player/states/audio_player.freezed.dart
@@ -49,6 +49,9 @@ abstract class $AudioPlayerStateCopyWith<$Res> {
       bool? disableControls,
       bool loading,
       String? error});
+
+  $VideoCopyWith<$Res>? get video;
+  $DownloadedVideoCopyWith<$Res>? get offlineVideo;
 }
 
 /// @nodoc
@@ -115,6 +118,34 @@ class _$AudioPlayerStateCopyWithImpl<$Res, $Val extends AudioPlayerState>
               as String?,
     ) as $Val);
   }
+
+  /// Create a copy of AudioPlayerState
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @pragma('vm:prefer-inline')
+  $VideoCopyWith<$Res>? get video {
+    if (_value.video == null) {
+      return null;
+    }
+
+    return $VideoCopyWith<$Res>(_value.video!, (value) {
+      return _then(_value.copyWith(video: value) as $Val);
+    });
+  }
+
+  /// Create a copy of AudioPlayerState
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @pragma('vm:prefer-inline')
+  $DownloadedVideoCopyWith<$Res>? get offlineVideo {
+    if (_value.offlineVideo == null) {
+      return null;
+    }
+
+    return $DownloadedVideoCopyWith<$Res>(_value.offlineVideo!, (value) {
+      return _then(_value.copyWith(offlineVideo: value) as $Val);
+    });
+  }
 }
 
 /// @nodoc
@@ -135,6 +166,11 @@ abstract class _$$AudioPlayerStateImplCopyWith<$Res>
       bool? disableControls,
       bool loading,
       String? error});
+
+  @override
+  $VideoCopyWith<$Res>? get video;
+  @override
+  $DownloadedVideoCopyWith<$Res>? get offlineVideo;
 }
 
 /// @nodoc
diff --git a/lib/player/states/player.dart b/lib/player/states/player.dart
index d09e2bab..3e5e9882 100644
--- a/lib/player/states/player.dart
+++ b/lib/player/states/player.dart
@@ -6,6 +6,7 @@ import 'package:audio_session/audio_session.dart';
 import 'package:back_button_interceptor/back_button_interceptor.dart';
 import 'package:bloc/bloc.dart';
 import 'package:clipious/player/models/sleep_timer.dart';
+import 'package:clipious/videos/models/ided_video.dart';
 import 'package:easy_debounce/easy_debounce.dart';
 import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
@@ -25,7 +26,6 @@ import '../../main.dart';
 import '../../media_handler.dart';
 import '../../settings/states/settings.dart';
 import '../../utils/models/pair.dart';
-import '../../videos/models/base_video.dart';
 import '../../videos/models/db/progress.dart' as db_progress;
 import '../../videos/models/sponsor_segment.dart';
 import '../../videos/models/sponsor_segment_types.dart';
@@ -158,7 +158,7 @@ class PlayerCubit extends Cubit<PlayerState> with WidgetsBindingObserver {
     switch (event.state) {
       case MediaState.completed:
         if (state.currentlyPlaying != null) {
-          saveProgress(state.currentlyPlaying!.lengthSeconds);
+          saveProgress(state.currentlyPlaying!.lengthSeconds ?? 0);
         }
         playNext();
         _setPlaying(false);
@@ -222,7 +222,7 @@ class PlayerCubit extends Cubit<PlayerState> with WidgetsBindingObserver {
     }
   }
 
-  setVideos(List<BaseVideo> videos) {
+  setVideos(List<Video> videos) {
     var newVideos = videos.where((element) => !element.filtered).toList();
     emit(state.copyWith(videos: newVideos, offlineVideos: []));
   }
@@ -279,7 +279,7 @@ class PlayerCubit extends Cubit<PlayerState> with WidgetsBindingObserver {
       int currentPosition = timeInSeconds;
       // saving progress
       var currentProgress =
-          currentPosition / state.currentlyPlaying!.lengthSeconds;
+          currentPosition / (state.currentlyPlaying!.lengthSeconds ?? 1);
       if (currentProgress >= 0.9) {
         currentProgress =
             1; // we consider a video with 90%+ progress as watched
@@ -300,8 +300,8 @@ class PlayerCubit extends Cubit<PlayerState> with WidgetsBindingObserver {
     }
   }
 
-  queueVideos(List<BaseVideo> videos) {
-    var stateVideos = List<BaseVideo>.from(state.videos);
+  queueVideos(List<Video> videos) {
+    var stateVideos = List<Video>.from(state.videos);
     if (videos.isNotEmpty) {
       //removing videos that are already in the queue
       stateVideos.addAll(videos
@@ -472,14 +472,14 @@ class PlayerCubit extends Cubit<PlayerState> with WidgetsBindingObserver {
 
       const mediaEvent = MediaEvent(state: MediaState.loading);
 
-      late List<BaseVideo> videos;
+      late List<Video> videos;
       late List<DownloadedVideo> offlineVideos;
       if (isOffline) {
         videos = [];
         offlineVideos = List<DownloadedVideo>.from(vids, growable: true).cast();
       } else {
         offlineVideos = [];
-        videos = List<BaseVideo>.from(vids, growable: true).cast();
+        videos = List<Video>.from(vids, growable: true).cast();
       }
 
       var selectedFullScreenIndex = 0;
@@ -545,7 +545,7 @@ class PlayerCubit extends Cubit<PlayerState> with WidgetsBindingObserver {
 
       const mediaEvent = MediaEvent(state: MediaState.loading);
 
-      List<BaseVideo> videos = List.from(state.videos);
+      List<Video> videos = List.from(state.videos);
       List<DownloadedVideo> offlineVideos = List.from(state.offlineVideos);
       var currentlyPlaying = state.currentlyPlaying;
       var offlineCurrentlyPlaying = state.offlineCurrentlyPlaying;
@@ -571,7 +571,9 @@ class PlayerCubit extends Cubit<PlayerState> with WidgetsBindingObserver {
       offlineCurrentlyPlaying = state.offlineCurrentlyPlaying;
       if (!isOffline) {
         late Video v;
-        if (video is Video) {
+        if (video is Video &&
+            video.formatStreams != null &&
+            video.adaptiveFormats != null) {
           v = video;
         } else {
           v = await service.getVideo(video.videoId);
@@ -620,8 +622,8 @@ class PlayerCubit extends Cubit<PlayerState> with WidgetsBindingObserver {
     await _playVideos(offlineVids);
   }
 
-  playVideo(List<BaseVideo> v, {bool? audio, Duration? startAt}) async {
-    List<BaseVideo> videos = v.where((element) => !element.filtered).toList();
+  playVideo(List<Video> v, {bool? audio, Duration? startAt}) async {
+    List<Video> videos = v.where((element) => !element.filtered).toList();
     // TODO: find how to do this with auto router
     log.fine('Playing ${videos.length} videos');
 
@@ -634,7 +636,7 @@ class PlayerCubit extends Cubit<PlayerState> with WidgetsBindingObserver {
     await _switchToVideo(video);
   }
 
-  switchToVideo(BaseVideo video, {Duration? startAt}) async {
+  switchToVideo(Video video, {Duration? startAt}) async {
     await _switchToVideo(video, startAt: startAt);
   }
 
@@ -653,7 +655,7 @@ class PlayerCubit extends Cubit<PlayerState> with WidgetsBindingObserver {
   }
 
   removeVideoFromQueue(String videoId) {
-    var videos = List<BaseVideo>.from(state.videos);
+    var videos = List<Video>.from(state.videos);
     var offlineVideos = List<DownloadedVideo>.from(state.offlineVideos);
     var listToUpdate = videos.isNotEmpty ? videos : offlineVideos;
     if (listToUpdate.length == 1) {
@@ -714,14 +716,14 @@ class PlayerCubit extends Cubit<PlayerState> with WidgetsBindingObserver {
   }
 
   bool isVideoInQueue(Video video) {
-    return state.videos
-            .indexWhere((element) => element.videoId == video.videoId) >=
+    return state.videos.indexWhere(
+            (element) => (element.videoId ?? '') == video.videoId) >=
         0;
   }
 
   onQueueReorder(int oldItemIndex, int newItemIndex) {
     log.fine('Dragged video');
-    var videos = List<BaseVideo>.from(state.videos);
+    var videos = List<Video>.from(state.videos);
     var offlineVideos = List<DownloadedVideo>.from(state.offlineVideos);
     var listToUpdate = videos.isNotEmpty ? videos : offlineVideos;
     var movedItem = listToUpdate.removeAt(oldItemIndex);
@@ -750,11 +752,11 @@ class PlayerCubit extends Cubit<PlayerState> with WidgetsBindingObserver {
     generatePlayQueue();
   }
 
-  void playVideoNext(BaseVideo video) {
+  void playVideoNext(Video video) {
     if (state.videos.isEmpty) {
       playVideo([video]);
     } else {
-      var videos = List<BaseVideo>.from(state.videos)..add(video);
+      var videos = List<Video>.from(state.videos)..add(video);
       var playQueue = ListQueue<String>.from(state.playQueue)
         ..addFirst(video.videoId);
       emit(state.copyWith(videos: videos, playQueue: playQueue));
@@ -841,9 +843,9 @@ class PlayerCubit extends Cubit<PlayerState> with WidgetsBindingObserver {
       var e = state.videos[index];
       return MediaItem(
           id: e.videoId,
-          title: e.title,
+          title: e.title ?? '',
           artist: e.author,
-          duration: Duration(seconds: e.lengthSeconds),
+          duration: Duration(seconds: e.lengthSeconds ?? 1),
           album: '',
           artUri: Uri.parse(
               ImageObject.getBestThumbnail(e.videoThumbnails)?.url ?? ''));
@@ -1013,7 +1015,7 @@ class PlayerState with _$PlayerState {
       // videos to play
       Video? currentlyPlaying,
       DownloadedVideo? offlineCurrentlyPlaying,
-      @Default([]) List<BaseVideo> videos,
+      @Default([]) List<Video> videos,
       @Default([]) List<DownloadedVideo> offlineVideos,
 
       // playlist controls
@@ -1056,7 +1058,7 @@ class PlayerState with _$PlayerState {
   const PlayerState._();
 
 //
-  static PlayerState init(List<BaseVideo>? videos) {
+  static PlayerState init(List<Video>? videos) {
     return PlayerState(videos: videos ?? [], playQueue: ListQueue.from([]));
   }
 }
diff --git a/lib/player/states/player.freezed.dart b/lib/player/states/player.freezed.dart
index 8e5d2a41..43fea33a 100644
--- a/lib/player/states/player.freezed.dart
+++ b/lib/player/states/player.freezed.dart
@@ -35,7 +35,7 @@ mixin _$PlayerState {
   Video? get currentlyPlaying => throw _privateConstructorUsedError;
   DownloadedVideo? get offlineCurrentlyPlaying =>
       throw _privateConstructorUsedError;
-  List<BaseVideo> get videos => throw _privateConstructorUsedError;
+  List<Video> get videos => throw _privateConstructorUsedError;
   List<DownloadedVideo> get offlineVideos =>
       throw _privateConstructorUsedError; // playlist controls
   List<String> get playedVideos => throw _privateConstructorUsedError;
@@ -92,7 +92,7 @@ abstract class $PlayerStateCopyWith<$Res> {
       double aspectRatio,
       Video? currentlyPlaying,
       DownloadedVideo? offlineCurrentlyPlaying,
-      List<BaseVideo> videos,
+      List<Video> videos,
       List<DownloadedVideo> offlineVideos,
       List<String> playedVideos,
       ListQueue<String> playQueue,
@@ -113,6 +113,9 @@ abstract class $PlayerStateCopyWith<$Res> {
       int totalFastForward,
       dynamic totalRewind,
       Orientation orientation});
+
+  $VideoCopyWith<$Res>? get currentlyPlaying;
+  $DownloadedVideoCopyWith<$Res>? get offlineCurrentlyPlaying;
 }
 
 /// @nodoc
@@ -236,7 +239,7 @@ class _$PlayerStateCopyWithImpl<$Res, $Val extends PlayerState>
       videos: null == videos
           ? _value.videos
           : videos // ignore: cast_nullable_to_non_nullable
-              as List<BaseVideo>,
+              as List<Video>,
       offlineVideos: null == offlineVideos
           ? _value.offlineVideos
           : offlineVideos // ignore: cast_nullable_to_non_nullable
@@ -319,6 +322,35 @@ class _$PlayerStateCopyWithImpl<$Res, $Val extends PlayerState>
               as Orientation,
     ) as $Val);
   }
+
+  /// Create a copy of PlayerState
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @pragma('vm:prefer-inline')
+  $VideoCopyWith<$Res>? get currentlyPlaying {
+    if (_value.currentlyPlaying == null) {
+      return null;
+    }
+
+    return $VideoCopyWith<$Res>(_value.currentlyPlaying!, (value) {
+      return _then(_value.copyWith(currentlyPlaying: value) as $Val);
+    });
+  }
+
+  /// Create a copy of PlayerState
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @pragma('vm:prefer-inline')
+  $DownloadedVideoCopyWith<$Res>? get offlineCurrentlyPlaying {
+    if (_value.offlineCurrentlyPlaying == null) {
+      return null;
+    }
+
+    return $DownloadedVideoCopyWith<$Res>(_value.offlineCurrentlyPlaying!,
+        (value) {
+      return _then(_value.copyWith(offlineCurrentlyPlaying: value) as $Val);
+    });
+  }
 }
 
 /// @nodoc
@@ -346,7 +378,7 @@ abstract class _$$PlayerStateImplCopyWith<$Res>
       double aspectRatio,
       Video? currentlyPlaying,
       DownloadedVideo? offlineCurrentlyPlaying,
-      List<BaseVideo> videos,
+      List<Video> videos,
       List<DownloadedVideo> offlineVideos,
       List<String> playedVideos,
       ListQueue<String> playQueue,
@@ -367,6 +399,11 @@ abstract class _$$PlayerStateImplCopyWith<$Res>
       int totalFastForward,
       dynamic totalRewind,
       Orientation orientation});
+
+  @override
+  $VideoCopyWith<$Res>? get currentlyPlaying;
+  @override
+  $DownloadedVideoCopyWith<$Res>? get offlineCurrentlyPlaying;
 }
 
 /// @nodoc
@@ -488,7 +525,7 @@ class __$$PlayerStateImplCopyWithImpl<$Res>
       videos: null == videos
           ? _value._videos
           : videos // ignore: cast_nullable_to_non_nullable
-              as List<BaseVideo>,
+              as List<Video>,
       offlineVideos: null == offlineVideos
           ? _value._offlineVideos
           : offlineVideos // ignore: cast_nullable_to_non_nullable
@@ -587,7 +624,7 @@ class _$PlayerStateImpl extends _PlayerState {
       this.aspectRatio = 16 / 9,
       this.currentlyPlaying,
       this.offlineCurrentlyPlaying,
-      final List<BaseVideo> videos = const [],
+      final List<Video> videos = const [],
       final List<DownloadedVideo> offlineVideos = const [],
       final List<String> playedVideos = const [],
       required this.playQueue,
@@ -661,10 +698,10 @@ class _$PlayerStateImpl extends _PlayerState {
   final Video? currentlyPlaying;
   @override
   final DownloadedVideo? offlineCurrentlyPlaying;
-  final List<BaseVideo> _videos;
+  final List<Video> _videos;
   @override
   @JsonKey()
-  List<BaseVideo> get videos {
+  List<Video> get videos {
     if (_videos is EqualUnmodifiableListView) return _videos;
     // ignore: implicit_dynamic_type
     return EqualUnmodifiableListView(_videos);
@@ -901,7 +938,7 @@ abstract class _PlayerState extends PlayerState {
       final double aspectRatio,
       final Video? currentlyPlaying,
       final DownloadedVideo? offlineCurrentlyPlaying,
-      final List<BaseVideo> videos,
+      final List<Video> videos,
       final List<DownloadedVideo> offlineVideos,
       final List<String> playedVideos,
       required final ListQueue<String> playQueue,
@@ -958,7 +995,7 @@ abstract class _PlayerState extends PlayerState {
   @override
   DownloadedVideo? get offlineCurrentlyPlaying;
   @override
-  List<BaseVideo> get videos;
+  List<Video> get videos;
   @override
   List<DownloadedVideo> get offlineVideos; // playlist controls
   @override
diff --git a/lib/player/states/player_controls.freezed.dart b/lib/player/states/player_controls.freezed.dart
index 76a912a3..f5720524 100644
--- a/lib/player/states/player_controls.freezed.dart
+++ b/lib/player/states/player_controls.freezed.dart
@@ -29,7 +29,8 @@ mixin _$PlayerControlsState {
       throw _privateConstructorUsedError;
   double get doubleTapRewindedOpacity => throw _privateConstructorUsedError;
   bool get justDoubleTappedSkip => throw _privateConstructorUsedError;
-  bool get showSponsorBlocked => throw _privateConstructorUsedError;
+  bool get showSponsorBlocked =>
+      throw _privateConstructorUsedError; // system setting adjustments
   bool get showBrightnessSlider => throw _privateConstructorUsedError;
   double get systemBrightness => throw _privateConstructorUsedError;
   bool get showVolumeSlider => throw _privateConstructorUsedError;
@@ -367,6 +368,7 @@ class _$PlayercontrolsStateImpl implements _PlayercontrolsState {
   @override
   @JsonKey()
   final bool showSponsorBlocked;
+// system setting adjustments
   @override
   @JsonKey()
   final bool showBrightnessSlider;
@@ -502,7 +504,7 @@ abstract class _PlayercontrolsState implements PlayerControlsState {
   @override
   bool get justDoubleTappedSkip;
   @override
-  bool get showSponsorBlocked;
+  bool get showSponsorBlocked; // system setting adjustments
   @override
   bool get showBrightnessSlider;
   @override
diff --git a/lib/player/states/tv_player_controls.dart b/lib/player/states/tv_player_controls.dart
index b7ed46a2..dd2360e3 100644
--- a/lib/player/states/tv_player_controls.dart
+++ b/lib/player/states/tv_player_controls.dart
@@ -1,4 +1,5 @@
 import 'package:bloc/bloc.dart';
+import 'package:clipious/videos/models/video.dart';
 import 'package:easy_debounce/easy_debounce.dart';
 import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
@@ -8,7 +9,6 @@ import 'package:clipious/player/states/player.dart';
 import 'package:logging/logging.dart';
 
 import '../../utils.dart';
-import '../../videos/models/video_in_list.dart';
 import '../models/media_event.dart';
 
 part 'tv_player_controls.freezed.dart';
@@ -135,7 +135,7 @@ class TvPlayerControlsCubit extends Cubit<TvPlayerControlsState> {
     emit(state.copyWith(showQueue: true, displayControls: false));
   }
 
-  Future<void> playFromQueue(VideoInList video) async {
+  Future<void> playFromQueue(Video video) async {
     emit(state.copyWith(showQueue: false, loading: true));
     player.switchToVideo(video);
     emit(state.copyWith(loading: false));
diff --git a/lib/player/states/video_player.dart b/lib/player/states/video_player.dart
index 6cea6280..9933a853 100644
--- a/lib/player/states/video_player.dart
+++ b/lib/player/states/video_player.dart
@@ -1,3 +1,4 @@
+import 'package:clipious/videos/models/ided_video.dart';
 import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -6,7 +7,6 @@ import 'package:clipious/downloads/models/downloaded_video.dart';
 import 'package:clipious/extensions.dart';
 import 'package:clipious/player/models/media_event.dart';
 import 'package:clipious/settings/states/settings.dart';
-import 'package:clipious/videos/models/base_video.dart';
 import 'package:logging/logging.dart';
 import 'package:river_player/river_player.dart';
 import 'package:wakelock_plus/wakelock_plus.dart';
@@ -222,6 +222,7 @@ class VideoPlayerCubit extends MediaPlayerCubit<VideoPlayerState> {
       return;
     }
     var newState = state.copyWith();
+
     // only used if the player is currently close because it is onReady that will actually play the video
     // need better way of handling this
     newState = newState.copyWith(startAt: startAt);
@@ -237,7 +238,7 @@ class VideoPlayerCubit extends MediaPlayerCubit<VideoPlayerState> {
           startAt = Duration(
               seconds: (offline
                       ? newState.offlineVideo!.lengthSeconds
-                      : newState.video!.lengthSeconds * progress)
+                      : (newState.video!.lengthSeconds ?? 0) * progress)
                   .floor());
         }
       }
@@ -255,6 +256,9 @@ class VideoPlayerCubit extends MediaPlayerCubit<VideoPlayerState> {
           liveStream: false,
         );
       } else {
+        assert(newState.video!.formatStreams != null);
+        assert(newState.video!.adaptiveFormats != null);
+
         var server = await db.getCurrentlySelectedServer();
         String baseUrl = (server).url;
 
@@ -264,8 +268,8 @@ class VideoPlayerCubit extends MediaPlayerCubit<VideoPlayerState> {
 
         var formatStream = isHls
             ? null
-            : newState
-                .video!.formatStreams[newState.video!.formatStreams.length - 1];
+            : newState.video!
+                .formatStreams![newState.video!.formatStreams!.length - 1];
 
         var useProxy = service.useProxy();
 
@@ -295,7 +299,7 @@ class VideoPlayerCubit extends MediaPlayerCubit<VideoPlayerState> {
                 : BetterPlayerVideoFormat.other;
 
         if (format == BetterPlayerVideoFormat.other) {
-          for (var value in newState.video!.formatStreams) {
+          for (var value in (newState.video!.formatStreams ?? [])) {
             resolutions[value.qualityLabel] = value.url;
           }
         }
@@ -447,8 +451,9 @@ class VideoPlayerCubit extends MediaPlayerCubit<VideoPlayerState> {
                 .toList() ??
             [];
       } else {
-        return state.video?.formatStreams.map((e) => e.resolution).toList() ??
-            [];
+        return (state.video?.formatStreams ?? [])
+            .map((e) => e.resolution)
+            .toList();
       }
     }
     // for offline video we don't offer video track selection
diff --git a/lib/player/states/video_player.freezed.dart b/lib/player/states/video_player.freezed.dart
index d21a52aa..0dcb2987 100644
--- a/lib/player/states/video_player.freezed.dart
+++ b/lib/player/states/video_player.freezed.dart
@@ -52,6 +52,9 @@ abstract class $VideoPlayerStateCopyWith<$Res> {
       DownloadedVideo? offlineVideo,
       bool? playNow,
       bool? disableControls});
+
+  $VideoCopyWith<$Res>? get video;
+  $DownloadedVideoCopyWith<$Res>? get offlineVideo;
 }
 
 /// @nodoc
@@ -123,6 +126,34 @@ class _$VideoPlayerStateCopyWithImpl<$Res, $Val extends VideoPlayerState>
               as bool?,
     ) as $Val);
   }
+
+  /// Create a copy of VideoPlayerState
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @pragma('vm:prefer-inline')
+  $VideoCopyWith<$Res>? get video {
+    if (_value.video == null) {
+      return null;
+    }
+
+    return $VideoCopyWith<$Res>(_value.video!, (value) {
+      return _then(_value.copyWith(video: value) as $Val);
+    });
+  }
+
+  /// Create a copy of VideoPlayerState
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @pragma('vm:prefer-inline')
+  $DownloadedVideoCopyWith<$Res>? get offlineVideo {
+    if (_value.offlineVideo == null) {
+      return null;
+    }
+
+    return $DownloadedVideoCopyWith<$Res>(_value.offlineVideo!, (value) {
+      return _then(_value.copyWith(offlineVideo: value) as $Val);
+    });
+  }
 }
 
 /// @nodoc
@@ -144,6 +175,11 @@ abstract class _$$VideoPlayerStateImplCopyWith<$Res>
       DownloadedVideo? offlineVideo,
       bool? playNow,
       bool? disableControls});
+
+  @override
+  $VideoCopyWith<$Res>? get video;
+  @override
+  $DownloadedVideoCopyWith<$Res>? get offlineVideo;
 }
 
 /// @nodoc
diff --git a/lib/player/views/components/video_queue.dart b/lib/player/views/components/video_queue.dart
index 4430f511..0d1ba8b1 100644
--- a/lib/player/views/components/video_queue.dart
+++ b/lib/player/views/components/video_queue.dart
@@ -1,10 +1,11 @@
+import 'package:clipious/videos/models/ided_video.dart';
+import 'package:clipious/videos/models/video.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_swipe_action_cell/core/cell.dart';
 import 'package:clipious/downloads/models/downloaded_video.dart';
 import 'package:clipious/player/states/player.dart';
 import 'package:clipious/player/states/video_queue.dart';
-import 'package:clipious/videos/models/base_video.dart';
 import 'package:clipious/videos/views/components/compact_video.dart';
 
 import '../../../globals.dart';
@@ -12,7 +13,7 @@ import '../../../globals.dart';
 class VideoQueue extends StatelessWidget {
   const VideoQueue({super.key});
 
-  Widget onlineVideoQueue(BuildContext context, int index, BaseVideo video) {
+  Widget onlineVideoQueue(BuildContext context, int index, Video video) {
     var controller = context.read<PlayerCubit>();
     var state = controller.state;
     bool isPlaying = video.videoId == state.currentlyPlaying?.videoId;
diff --git a/lib/player/views/tv/components/player_controls.dart b/lib/player/views/tv/components/player_controls.dart
index bbc79af5..4e51513e 100644
--- a/lib/player/views/tv/components/player_controls.dart
+++ b/lib/player/views/tv/components/player_controls.dart
@@ -1,3 +1,4 @@
+import 'package:clipious/videos/models/video.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@@ -11,7 +12,6 @@ import '../../../../globals.dart';
 import '../../../../utils.dart';
 import '../../../../utils/models/image_object.dart';
 import '../../../../utils/models/paginated_list.dart';
-import '../../../../videos/models/video_in_list.dart';
 import '../../../../videos/views/components/video_thumbnail.dart';
 import '../../../states/player.dart';
 
@@ -19,7 +19,7 @@ class TvPlayerControls extends StatelessWidget {
   const TvPlayerControls({super.key});
 
   onVideoQueueSelected(
-      BuildContext context, TvPlayerControlsCubit cubit, VideoInList video) {
+      BuildContext context, TvPlayerControlsCubit cubit, Video video) {
     cubit.playFromQueue(video);
   }
 
@@ -383,20 +383,8 @@ class TvPlayerControls extends StatelessWidget {
                                           onSelect: (ctx, video) =>
                                               onVideoQueueSelected(
                                                   ctx, cubit, video),
-                                          paginatedVideoList: FixedItemList(
-                                              videos
-                                                  .map((e) => VideoInList(
-                                                      e.title,
-                                                      e.videoId,
-                                                      e.lengthSeconds,
-                                                      null,
-                                                      e.author,
-                                                      e.authorId,
-                                                      e.authorUrl,
-                                                      null,
-                                                      null,
-                                                      e.videoThumbnails))
-                                                  .toList())),
+                                          paginatedVideoList:
+                                              FixedItemList(videos)),
                                     ],
                                   ),
                                 ))
diff --git a/lib/player/views/tv/screens/tv_player_view.dart b/lib/player/views/tv/screens/tv_player_view.dart
index 5c30b477..3c2a7f8a 100644
--- a/lib/player/views/tv/screens/tv_player_view.dart
+++ b/lib/player/views/tv/screens/tv_player_view.dart
@@ -1,4 +1,5 @@
 import 'package:auto_route/annotations.dart';
+import 'package:clipious/videos/models/video.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:clipious/player/states/player.dart';
@@ -6,11 +7,10 @@ import 'package:clipious/player/views/components/video_player.dart';
 import 'package:clipious/settings/states/settings.dart';
 
 import '../../../../main.dart';
-import '../../../../videos/models/base_video.dart';
 
 @RoutePage()
 class TvPlayerScreen extends StatelessWidget {
-  final List<BaseVideo> videos;
+  final List<Video> videos;
 
   const TvPlayerScreen({super.key, required this.videos});
 
diff --git a/lib/playlists/models/playlist.dart b/lib/playlists/models/playlist.dart
index 4edac91c..b9a39f61 100644
--- a/lib/playlists/models/playlist.dart
+++ b/lib/playlists/models/playlist.dart
@@ -78,17 +78,43 @@
     }
  */
 
-import 'package:copy_with_extension/copy_with_extension.dart';
-import 'package:clipious/videos/models/video_in_list.dart';
-import 'package:json_annotation/json_annotation.dart';
+import 'package:clipious/videos/models/video.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
 
 import '../../utils/models/image_object.dart';
 
+part 'playlist.freezed.dart';
+
 part 'playlist.g.dart';
 
 const youtubePlaylist = "youtubePlayList";
 const invidiousPlaylist = "invidiousPlaylist";
 
+@freezed
+class Playlist with _$Playlist {
+  const factory Playlist(
+      {@Default(youtubePlaylist) String type,
+      required String title,
+      required String playlistId,
+      required String author,
+      String? authordId,
+      String? authorUrl,
+      @Default([]) List<ImageObject> authorThumbnails,
+      String? description,
+      required int videoCount,
+      int? viewCount,
+      bool? isListed,
+      int? updated,
+      @Default([]) List<Video> videos,
+      @JsonKey(includeToJson: false, includeFromJson: false)
+      @Default(0)
+      int removedByFilter}) = _Playlist;
+
+  factory Playlist.fromJson(Map<String, Object?> json) =>
+      _$PlaylistFromJson(json);
+}
+
+/*
 @JsonSerializable()
 @CopyWith(constructor: "_")
 class Playlist {
@@ -106,9 +132,6 @@ class Playlist {
   int? updated;
   List<VideoInList> videos = [];
 
-  @JsonKey(includeToJson: false, includeFromJson: false)
-  int removedByFilter = 0;
-
   Playlist(this.type, this.title, this.playlistId, this.author, this.authordId,
       this.authorUrl, this.description, this.videoCount);
 
@@ -133,3 +156,4 @@ class Playlist {
       this.videos,
       this.removedByFilter);
 }
+*/
diff --git a/lib/playlists/models/playlist.freezed.dart b/lib/playlists/models/playlist.freezed.dart
new file mode 100644
index 00000000..0e96edb7
--- /dev/null
+++ b/lib/playlists/models/playlist.freezed.dart
@@ -0,0 +1,476 @@
+// coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'playlist.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+T _$identity<T>(T value) => value;
+
+final _privateConstructorUsedError = UnsupportedError(
+    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
+
+Playlist _$PlaylistFromJson(Map<String, dynamic> json) {
+  return _Playlist.fromJson(json);
+}
+
+/// @nodoc
+mixin _$Playlist {
+  String get type => throw _privateConstructorUsedError;
+  String get title => throw _privateConstructorUsedError;
+  String get playlistId => throw _privateConstructorUsedError;
+  String get author => throw _privateConstructorUsedError;
+  String? get authordId => throw _privateConstructorUsedError;
+  String? get authorUrl => throw _privateConstructorUsedError;
+  List<ImageObject> get authorThumbnails => throw _privateConstructorUsedError;
+  String? get description => throw _privateConstructorUsedError;
+  int get videoCount => throw _privateConstructorUsedError;
+  int? get viewCount => throw _privateConstructorUsedError;
+  bool? get isListed => throw _privateConstructorUsedError;
+  int? get updated => throw _privateConstructorUsedError;
+  List<Video> get videos => throw _privateConstructorUsedError;
+  @JsonKey(includeToJson: false, includeFromJson: false)
+  int get removedByFilter => throw _privateConstructorUsedError;
+
+  /// Serializes this Playlist to a JSON map.
+  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
+
+  /// Create a copy of Playlist
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  $PlaylistCopyWith<Playlist> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $PlaylistCopyWith<$Res> {
+  factory $PlaylistCopyWith(Playlist value, $Res Function(Playlist) then) =
+      _$PlaylistCopyWithImpl<$Res, Playlist>;
+  @useResult
+  $Res call(
+      {String type,
+      String title,
+      String playlistId,
+      String author,
+      String? authordId,
+      String? authorUrl,
+      List<ImageObject> authorThumbnails,
+      String? description,
+      int videoCount,
+      int? viewCount,
+      bool? isListed,
+      int? updated,
+      List<Video> videos,
+      @JsonKey(includeToJson: false, includeFromJson: false)
+      int removedByFilter});
+}
+
+/// @nodoc
+class _$PlaylistCopyWithImpl<$Res, $Val extends Playlist>
+    implements $PlaylistCopyWith<$Res> {
+  _$PlaylistCopyWithImpl(this._value, this._then);
+
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+
+  /// Create a copy of Playlist
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? type = null,
+    Object? title = null,
+    Object? playlistId = null,
+    Object? author = null,
+    Object? authordId = freezed,
+    Object? authorUrl = freezed,
+    Object? authorThumbnails = null,
+    Object? description = freezed,
+    Object? videoCount = null,
+    Object? viewCount = freezed,
+    Object? isListed = freezed,
+    Object? updated = freezed,
+    Object? videos = null,
+    Object? removedByFilter = null,
+  }) {
+    return _then(_value.copyWith(
+      type: null == type
+          ? _value.type
+          : type // ignore: cast_nullable_to_non_nullable
+              as String,
+      title: null == title
+          ? _value.title
+          : title // ignore: cast_nullable_to_non_nullable
+              as String,
+      playlistId: null == playlistId
+          ? _value.playlistId
+          : playlistId // ignore: cast_nullable_to_non_nullable
+              as String,
+      author: null == author
+          ? _value.author
+          : author // ignore: cast_nullable_to_non_nullable
+              as String,
+      authordId: freezed == authordId
+          ? _value.authordId
+          : authordId // ignore: cast_nullable_to_non_nullable
+              as String?,
+      authorUrl: freezed == authorUrl
+          ? _value.authorUrl
+          : authorUrl // ignore: cast_nullable_to_non_nullable
+              as String?,
+      authorThumbnails: null == authorThumbnails
+          ? _value.authorThumbnails
+          : authorThumbnails // ignore: cast_nullable_to_non_nullable
+              as List<ImageObject>,
+      description: freezed == description
+          ? _value.description
+          : description // ignore: cast_nullable_to_non_nullable
+              as String?,
+      videoCount: null == videoCount
+          ? _value.videoCount
+          : videoCount // ignore: cast_nullable_to_non_nullable
+              as int,
+      viewCount: freezed == viewCount
+          ? _value.viewCount
+          : viewCount // ignore: cast_nullable_to_non_nullable
+              as int?,
+      isListed: freezed == isListed
+          ? _value.isListed
+          : isListed // ignore: cast_nullable_to_non_nullable
+              as bool?,
+      updated: freezed == updated
+          ? _value.updated
+          : updated // ignore: cast_nullable_to_non_nullable
+              as int?,
+      videos: null == videos
+          ? _value.videos
+          : videos // ignore: cast_nullable_to_non_nullable
+              as List<Video>,
+      removedByFilter: null == removedByFilter
+          ? _value.removedByFilter
+          : removedByFilter // ignore: cast_nullable_to_non_nullable
+              as int,
+    ) as $Val);
+  }
+}
+
+/// @nodoc
+abstract class _$$PlaylistImplCopyWith<$Res>
+    implements $PlaylistCopyWith<$Res> {
+  factory _$$PlaylistImplCopyWith(
+          _$PlaylistImpl value, $Res Function(_$PlaylistImpl) then) =
+      __$$PlaylistImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call(
+      {String type,
+      String title,
+      String playlistId,
+      String author,
+      String? authordId,
+      String? authorUrl,
+      List<ImageObject> authorThumbnails,
+      String? description,
+      int videoCount,
+      int? viewCount,
+      bool? isListed,
+      int? updated,
+      List<Video> videos,
+      @JsonKey(includeToJson: false, includeFromJson: false)
+      int removedByFilter});
+}
+
+/// @nodoc
+class __$$PlaylistImplCopyWithImpl<$Res>
+    extends _$PlaylistCopyWithImpl<$Res, _$PlaylistImpl>
+    implements _$$PlaylistImplCopyWith<$Res> {
+  __$$PlaylistImplCopyWithImpl(
+      _$PlaylistImpl _value, $Res Function(_$PlaylistImpl) _then)
+      : super(_value, _then);
+
+  /// Create a copy of Playlist
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? type = null,
+    Object? title = null,
+    Object? playlistId = null,
+    Object? author = null,
+    Object? authordId = freezed,
+    Object? authorUrl = freezed,
+    Object? authorThumbnails = null,
+    Object? description = freezed,
+    Object? videoCount = null,
+    Object? viewCount = freezed,
+    Object? isListed = freezed,
+    Object? updated = freezed,
+    Object? videos = null,
+    Object? removedByFilter = null,
+  }) {
+    return _then(_$PlaylistImpl(
+      type: null == type
+          ? _value.type
+          : type // ignore: cast_nullable_to_non_nullable
+              as String,
+      title: null == title
+          ? _value.title
+          : title // ignore: cast_nullable_to_non_nullable
+              as String,
+      playlistId: null == playlistId
+          ? _value.playlistId
+          : playlistId // ignore: cast_nullable_to_non_nullable
+              as String,
+      author: null == author
+          ? _value.author
+          : author // ignore: cast_nullable_to_non_nullable
+              as String,
+      authordId: freezed == authordId
+          ? _value.authordId
+          : authordId // ignore: cast_nullable_to_non_nullable
+              as String?,
+      authorUrl: freezed == authorUrl
+          ? _value.authorUrl
+          : authorUrl // ignore: cast_nullable_to_non_nullable
+              as String?,
+      authorThumbnails: null == authorThumbnails
+          ? _value._authorThumbnails
+          : authorThumbnails // ignore: cast_nullable_to_non_nullable
+              as List<ImageObject>,
+      description: freezed == description
+          ? _value.description
+          : description // ignore: cast_nullable_to_non_nullable
+              as String?,
+      videoCount: null == videoCount
+          ? _value.videoCount
+          : videoCount // ignore: cast_nullable_to_non_nullable
+              as int,
+      viewCount: freezed == viewCount
+          ? _value.viewCount
+          : viewCount // ignore: cast_nullable_to_non_nullable
+              as int?,
+      isListed: freezed == isListed
+          ? _value.isListed
+          : isListed // ignore: cast_nullable_to_non_nullable
+              as bool?,
+      updated: freezed == updated
+          ? _value.updated
+          : updated // ignore: cast_nullable_to_non_nullable
+              as int?,
+      videos: null == videos
+          ? _value._videos
+          : videos // ignore: cast_nullable_to_non_nullable
+              as List<Video>,
+      removedByFilter: null == removedByFilter
+          ? _value.removedByFilter
+          : removedByFilter // ignore: cast_nullable_to_non_nullable
+              as int,
+    ));
+  }
+}
+
+/// @nodoc
+@JsonSerializable()
+class _$PlaylistImpl implements _Playlist {
+  const _$PlaylistImpl(
+      {this.type = youtubePlaylist,
+      required this.title,
+      required this.playlistId,
+      required this.author,
+      this.authordId,
+      this.authorUrl,
+      final List<ImageObject> authorThumbnails = const [],
+      this.description,
+      required this.videoCount,
+      this.viewCount,
+      this.isListed,
+      this.updated,
+      final List<Video> videos = const [],
+      @JsonKey(includeToJson: false, includeFromJson: false)
+      this.removedByFilter = 0})
+      : _authorThumbnails = authorThumbnails,
+        _videos = videos;
+
+  factory _$PlaylistImpl.fromJson(Map<String, dynamic> json) =>
+      _$$PlaylistImplFromJson(json);
+
+  @override
+  @JsonKey()
+  final String type;
+  @override
+  final String title;
+  @override
+  final String playlistId;
+  @override
+  final String author;
+  @override
+  final String? authordId;
+  @override
+  final String? authorUrl;
+  final List<ImageObject> _authorThumbnails;
+  @override
+  @JsonKey()
+  List<ImageObject> get authorThumbnails {
+    if (_authorThumbnails is EqualUnmodifiableListView)
+      return _authorThumbnails;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_authorThumbnails);
+  }
+
+  @override
+  final String? description;
+  @override
+  final int videoCount;
+  @override
+  final int? viewCount;
+  @override
+  final bool? isListed;
+  @override
+  final int? updated;
+  final List<Video> _videos;
+  @override
+  @JsonKey()
+  List<Video> get videos {
+    if (_videos is EqualUnmodifiableListView) return _videos;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_videos);
+  }
+
+  @override
+  @JsonKey(includeToJson: false, includeFromJson: false)
+  final int removedByFilter;
+
+  @override
+  String toString() {
+    return 'Playlist(type: $type, title: $title, playlistId: $playlistId, author: $author, authordId: $authordId, authorUrl: $authorUrl, authorThumbnails: $authorThumbnails, description: $description, videoCount: $videoCount, viewCount: $viewCount, isListed: $isListed, updated: $updated, videos: $videos, removedByFilter: $removedByFilter)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$PlaylistImpl &&
+            (identical(other.type, type) || other.type == type) &&
+            (identical(other.title, title) || other.title == title) &&
+            (identical(other.playlistId, playlistId) ||
+                other.playlistId == playlistId) &&
+            (identical(other.author, author) || other.author == author) &&
+            (identical(other.authordId, authordId) ||
+                other.authordId == authordId) &&
+            (identical(other.authorUrl, authorUrl) ||
+                other.authorUrl == authorUrl) &&
+            const DeepCollectionEquality()
+                .equals(other._authorThumbnails, _authorThumbnails) &&
+            (identical(other.description, description) ||
+                other.description == description) &&
+            (identical(other.videoCount, videoCount) ||
+                other.videoCount == videoCount) &&
+            (identical(other.viewCount, viewCount) ||
+                other.viewCount == viewCount) &&
+            (identical(other.isListed, isListed) ||
+                other.isListed == isListed) &&
+            (identical(other.updated, updated) || other.updated == updated) &&
+            const DeepCollectionEquality().equals(other._videos, _videos) &&
+            (identical(other.removedByFilter, removedByFilter) ||
+                other.removedByFilter == removedByFilter));
+  }
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  int get hashCode => Object.hash(
+      runtimeType,
+      type,
+      title,
+      playlistId,
+      author,
+      authordId,
+      authorUrl,
+      const DeepCollectionEquality().hash(_authorThumbnails),
+      description,
+      videoCount,
+      viewCount,
+      isListed,
+      updated,
+      const DeepCollectionEquality().hash(_videos),
+      removedByFilter);
+
+  /// Create a copy of Playlist
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$PlaylistImplCopyWith<_$PlaylistImpl> get copyWith =>
+      __$$PlaylistImplCopyWithImpl<_$PlaylistImpl>(this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$$PlaylistImplToJson(
+      this,
+    );
+  }
+}
+
+abstract class _Playlist implements Playlist {
+  const factory _Playlist(
+      {final String type,
+      required final String title,
+      required final String playlistId,
+      required final String author,
+      final String? authordId,
+      final String? authorUrl,
+      final List<ImageObject> authorThumbnails,
+      final String? description,
+      required final int videoCount,
+      final int? viewCount,
+      final bool? isListed,
+      final int? updated,
+      final List<Video> videos,
+      @JsonKey(includeToJson: false, includeFromJson: false)
+      final int removedByFilter}) = _$PlaylistImpl;
+
+  factory _Playlist.fromJson(Map<String, dynamic> json) =
+      _$PlaylistImpl.fromJson;
+
+  @override
+  String get type;
+  @override
+  String get title;
+  @override
+  String get playlistId;
+  @override
+  String get author;
+  @override
+  String? get authordId;
+  @override
+  String? get authorUrl;
+  @override
+  List<ImageObject> get authorThumbnails;
+  @override
+  String? get description;
+  @override
+  int get videoCount;
+  @override
+  int? get viewCount;
+  @override
+  bool? get isListed;
+  @override
+  int? get updated;
+  @override
+  List<Video> get videos;
+  @override
+  @JsonKey(includeToJson: false, includeFromJson: false)
+  int get removedByFilter;
+
+  /// Create a copy of Playlist
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  _$$PlaylistImplCopyWith<_$PlaylistImpl> get copyWith =>
+      throw _privateConstructorUsedError;
+}
diff --git a/lib/playlists/models/playlist.g.dart b/lib/playlists/models/playlist.g.dart
index 4b6d822b..4dfaa8b1 100644
--- a/lib/playlists/models/playlist.g.dart
+++ b/lib/playlists/models/playlist.g.dart
@@ -2,229 +2,35 @@
 
 part of 'playlist.dart';
 
-// **************************************************************************
-// CopyWithGenerator
-// **************************************************************************
-
-abstract class _$PlaylistCWProxy {
-  Playlist type(String type);
-
-  Playlist title(String title);
-
-  Playlist playlistId(String playlistId);
-
-  Playlist author(String author);
-
-  Playlist authordId(String? authordId);
-
-  Playlist authorUrl(String? authorUrl);
-
-  Playlist authorThumbnails(List<ImageObject>? authorThumbnails);
-
-  Playlist description(String? description);
-
-  Playlist videoCount(int videoCount);
-
-  Playlist viewCount(int? viewCount);
-
-  Playlist isListed(bool? isListed);
-
-  Playlist updated(int? updated);
-
-  Playlist videos(List<VideoInList> videos);
-
-  Playlist removedByFilter(int removedByFilter);
-
-  /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `Playlist(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
-  ///
-  /// Usage
-  /// ```dart
-  /// Playlist(...).copyWith(id: 12, name: "My name")
-  /// ````
-  Playlist call({
-    String? type,
-    String? title,
-    String? playlistId,
-    String? author,
-    String? authordId,
-    String? authorUrl,
-    List<ImageObject>? authorThumbnails,
-    String? description,
-    int? videoCount,
-    int? viewCount,
-    bool? isListed,
-    int? updated,
-    List<VideoInList>? videos,
-    int? removedByFilter,
-  });
-}
-
-/// Proxy class for `copyWith` functionality. This is a callable class and can be used as follows: `instanceOfPlaylist.copyWith(...)`. Additionally contains functions for specific fields e.g. `instanceOfPlaylist.copyWith.fieldName(...)`
-class _$PlaylistCWProxyImpl implements _$PlaylistCWProxy {
-  const _$PlaylistCWProxyImpl(this._value);
-
-  final Playlist _value;
-
-  @override
-  Playlist type(String type) => this(type: type);
-
-  @override
-  Playlist title(String title) => this(title: title);
-
-  @override
-  Playlist playlistId(String playlistId) => this(playlistId: playlistId);
-
-  @override
-  Playlist author(String author) => this(author: author);
-
-  @override
-  Playlist authordId(String? authordId) => this(authordId: authordId);
-
-  @override
-  Playlist authorUrl(String? authorUrl) => this(authorUrl: authorUrl);
-
-  @override
-  Playlist authorThumbnails(List<ImageObject>? authorThumbnails) =>
-      this(authorThumbnails: authorThumbnails);
-
-  @override
-  Playlist description(String? description) => this(description: description);
-
-  @override
-  Playlist videoCount(int videoCount) => this(videoCount: videoCount);
-
-  @override
-  Playlist viewCount(int? viewCount) => this(viewCount: viewCount);
-
-  @override
-  Playlist isListed(bool? isListed) => this(isListed: isListed);
-
-  @override
-  Playlist updated(int? updated) => this(updated: updated);
-
-  @override
-  Playlist videos(List<VideoInList> videos) => this(videos: videos);
-
-  @override
-  Playlist removedByFilter(int removedByFilter) =>
-      this(removedByFilter: removedByFilter);
-
-  @override
-
-  /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `Playlist(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
-  ///
-  /// Usage
-  /// ```dart
-  /// Playlist(...).copyWith(id: 12, name: "My name")
-  /// ````
-  Playlist call({
-    Object? type = const $CopyWithPlaceholder(),
-    Object? title = const $CopyWithPlaceholder(),
-    Object? playlistId = const $CopyWithPlaceholder(),
-    Object? author = const $CopyWithPlaceholder(),
-    Object? authordId = const $CopyWithPlaceholder(),
-    Object? authorUrl = const $CopyWithPlaceholder(),
-    Object? authorThumbnails = const $CopyWithPlaceholder(),
-    Object? description = const $CopyWithPlaceholder(),
-    Object? videoCount = const $CopyWithPlaceholder(),
-    Object? viewCount = const $CopyWithPlaceholder(),
-    Object? isListed = const $CopyWithPlaceholder(),
-    Object? updated = const $CopyWithPlaceholder(),
-    Object? videos = const $CopyWithPlaceholder(),
-    Object? removedByFilter = const $CopyWithPlaceholder(),
-  }) {
-    return Playlist._(
-      type == const $CopyWithPlaceholder() || type == null
-          ? _value.type
-          // ignore: cast_nullable_to_non_nullable
-          : type as String,
-      title == const $CopyWithPlaceholder() || title == null
-          ? _value.title
-          // ignore: cast_nullable_to_non_nullable
-          : title as String,
-      playlistId == const $CopyWithPlaceholder() || playlistId == null
-          ? _value.playlistId
-          // ignore: cast_nullable_to_non_nullable
-          : playlistId as String,
-      author == const $CopyWithPlaceholder() || author == null
-          ? _value.author
-          // ignore: cast_nullable_to_non_nullable
-          : author as String,
-      authordId == const $CopyWithPlaceholder()
-          ? _value.authordId
-          // ignore: cast_nullable_to_non_nullable
-          : authordId as String?,
-      authorUrl == const $CopyWithPlaceholder()
-          ? _value.authorUrl
-          // ignore: cast_nullable_to_non_nullable
-          : authorUrl as String?,
-      authorThumbnails == const $CopyWithPlaceholder()
-          ? _value.authorThumbnails
-          // ignore: cast_nullable_to_non_nullable
-          : authorThumbnails as List<ImageObject>?,
-      description == const $CopyWithPlaceholder()
-          ? _value.description
-          // ignore: cast_nullable_to_non_nullable
-          : description as String?,
-      videoCount == const $CopyWithPlaceholder() || videoCount == null
-          ? _value.videoCount
-          // ignore: cast_nullable_to_non_nullable
-          : videoCount as int,
-      viewCount == const $CopyWithPlaceholder()
-          ? _value.viewCount
-          // ignore: cast_nullable_to_non_nullable
-          : viewCount as int?,
-      isListed == const $CopyWithPlaceholder()
-          ? _value.isListed
-          // ignore: cast_nullable_to_non_nullable
-          : isListed as bool?,
-      updated == const $CopyWithPlaceholder()
-          ? _value.updated
-          // ignore: cast_nullable_to_non_nullable
-          : updated as int?,
-      videos == const $CopyWithPlaceholder() || videos == null
-          ? _value.videos
-          // ignore: cast_nullable_to_non_nullable
-          : videos as List<VideoInList>,
-      removedByFilter == const $CopyWithPlaceholder() || removedByFilter == null
-          ? _value.removedByFilter
-          // ignore: cast_nullable_to_non_nullable
-          : removedByFilter as int,
-    );
-  }
-}
-
-extension $PlaylistCopyWith on Playlist {
-  /// Returns a callable class that can be used as follows: `instanceOfPlaylist.copyWith(...)` or like so:`instanceOfPlaylist.copyWith.fieldName(...)`.
-  // ignore: library_private_types_in_public_api
-  _$PlaylistCWProxy get copyWith => _$PlaylistCWProxyImpl(this);
-}
-
 // **************************************************************************
 // JsonSerializableGenerator
 // **************************************************************************
 
-Playlist _$PlaylistFromJson(Map<String, dynamic> json) => Playlist(
-      json['type'] as String,
-      json['title'] as String,
-      json['playlistId'] as String,
-      json['author'] as String,
-      json['authordId'] as String?,
-      json['authorUrl'] as String?,
-      json['description'] as String?,
-      (json['videoCount'] as num).toInt(),
-    )
-      ..authorThumbnails = (json['authorThumbnails'] as List<dynamic>?)
-          ?.map((e) => ImageObject.fromJson(e as Map<String, dynamic>))
-          .toList()
-      ..viewCount = (json['viewCount'] as num?)?.toInt()
-      ..isListed = json['isListed'] as bool?
-      ..updated = (json['updated'] as num?)?.toInt()
-      ..videos = (json['videos'] as List<dynamic>)
-          .map((e) => VideoInList.fromJson(e as Map<String, dynamic>))
-          .toList();
+_$PlaylistImpl _$$PlaylistImplFromJson(Map<String, dynamic> json) =>
+    _$PlaylistImpl(
+      type: json['type'] as String? ?? youtubePlaylist,
+      title: json['title'] as String,
+      playlistId: json['playlistId'] as String,
+      author: json['author'] as String,
+      authordId: json['authordId'] as String?,
+      authorUrl: json['authorUrl'] as String?,
+      authorThumbnails: (json['authorThumbnails'] as List<dynamic>?)
+              ?.map((e) => ImageObject.fromJson(e as Map<String, dynamic>))
+              .toList() ??
+          const [],
+      description: json['description'] as String?,
+      videoCount: (json['videoCount'] as num).toInt(),
+      viewCount: (json['viewCount'] as num?)?.toInt(),
+      isListed: json['isListed'] as bool?,
+      updated: (json['updated'] as num?)?.toInt(),
+      videos: (json['videos'] as List<dynamic>?)
+              ?.map((e) => Video.fromJson(e as Map<String, dynamic>))
+              .toList() ??
+          const [],
+    );
 
-Map<String, dynamic> _$PlaylistToJson(Playlist instance) => <String, dynamic>{
+Map<String, dynamic> _$$PlaylistImplToJson(_$PlaylistImpl instance) =>
+    <String, dynamic>{
       'type': instance.type,
       'title': instance.title,
       'playlistId': instance.playlistId,
diff --git a/lib/playlists/states/playlist.dart b/lib/playlists/states/playlist.dart
index db670f15..fe10a751 100644
--- a/lib/playlists/states/playlist.dart
+++ b/lib/playlists/states/playlist.dart
@@ -1,11 +1,11 @@
 import 'package:bloc/bloc.dart';
+import 'package:clipious/videos/models/video.dart';
 import 'package:flutter/material.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:clipious/player/states/player.dart';
 import 'package:logging/logging.dart';
 
 import '../../globals.dart';
-import '../../videos/models/video_in_list.dart';
 import '../models/playlist.dart';
 
 part 'playlist.freezed.dart';
@@ -36,11 +36,11 @@ class PlaylistCubit extends Cubit<PlaylistState> {
     await service.deleteUserPlaylist(state.playlist.playlistId);
   }
 
-  Future<bool> removeVideoFromPlayList(VideoInList v) async {
+  Future<bool> removeVideoFromPlayList(Video v) async {
     emit(state.copyWith(loading: true));
     await service.deleteUserPlaylistVideo(
         state.playlist.playlistId, v.indexId ?? '');
-    var videos = List<VideoInList>.from(state.playlist.videos);
+    var videos = List<Video>.from(state.playlist.videos);
     videos.remove(v);
     var playlist = state.playlist.copyWith(videos: videos);
     emit(state.copyWith(playlist: playlist, loading: false));
@@ -75,7 +75,9 @@ class PlaylistCubit extends Cubit<PlaylistState> {
             .toList();
 
         var playlist = state.playlist;
-        playlist.videos.addAll(toAdd);
+        List<Video> videos = List.from(playlist.videos);
+        videos.addAll(toAdd);
+        playlist = playlist.copyWith(videos: videos);
 
         totalFiltered += pl.removedByFilter;
         log.fine(
diff --git a/lib/playlists/states/playlist.freezed.dart b/lib/playlists/states/playlist.freezed.dart
index 8f464ba2..ab309bc2 100644
--- a/lib/playlists/states/playlist.freezed.dart
+++ b/lib/playlists/states/playlist.freezed.dart
@@ -41,6 +41,8 @@ abstract class $PlaylistStateCopyWith<$Res> {
       bool loading,
       double playlistItemHeight,
       bool showImage});
+
+  $PlaylistCopyWith<$Res> get playlist;
 }
 
 /// @nodoc
@@ -87,6 +89,16 @@ class _$PlaylistStateCopyWithImpl<$Res, $Val extends PlaylistState>
               as bool,
     ) as $Val);
   }
+
+  /// Create a copy of PlaylistState
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @pragma('vm:prefer-inline')
+  $PlaylistCopyWith<$Res> get playlist {
+    return $PlaylistCopyWith<$Res>(_value.playlist, (value) {
+      return _then(_value.copyWith(playlist: value) as $Val);
+    });
+  }
 }
 
 /// @nodoc
@@ -103,6 +115,9 @@ abstract class _$$PlaylistStateImplCopyWith<$Res>
       bool loading,
       double playlistItemHeight,
       bool showImage});
+
+  @override
+  $PlaylistCopyWith<$Res> get playlist;
 }
 
 /// @nodoc
diff --git a/lib/playlists/views/components/playlist_inner_view.dart b/lib/playlists/views/components/playlist_inner_view.dart
index 53606a4d..1e25a50d 100644
--- a/lib/playlists/views/components/playlist_inner_view.dart
+++ b/lib/playlists/views/components/playlist_inner_view.dart
@@ -1,10 +1,10 @@
+import 'package:clipious/videos/models/video.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_swipe_action_cell/core/cell.dart';
 import 'package:clipious/playlists/views/components/playlist_thumbnail.dart';
 import 'package:clipious/utils.dart';
 import 'package:clipious/utils/views/components/placeholders.dart';
-import 'package:clipious/videos/models/video_in_list.dart';
 import 'package:clipious/videos/views/components/compact_video.dart';
 
 import '../../../globals.dart';
@@ -14,8 +14,7 @@ import '../../states/playlist.dart';
 
 class PlaylistInnerView extends StatelessWidget {
   final bool canDeleteVideos;
-  final Function(BuildContext context, VideoInList video)
-      removeVideoFromPlaylist;
+  final Function(BuildContext context, Video video) removeVideoFromPlaylist;
   final Function(BuildContext context, String videoId) openVideo;
   const PlaylistInnerView(
       {super.key,
diff --git a/lib/playlists/views/components/playlist_thumbnail.dart b/lib/playlists/views/components/playlist_thumbnail.dart
index 0d1fe598..27a5d689 100644
--- a/lib/playlists/views/components/playlist_thumbnail.dart
+++ b/lib/playlists/views/components/playlist_thumbnail.dart
@@ -1,13 +1,13 @@
+import 'package:clipious/videos/models/video.dart';
 import 'package:flutter/material.dart';
 import 'package:clipious/globals.dart';
 import 'package:clipious/utils/views/components/placeholders.dart';
 
 import '../../../utils/models/image_object.dart';
-import '../../../videos/models/base_video.dart';
 import '../../../videos/views/components/video_thumbnail.dart';
 
 class PlaylistThumbnails extends StatelessWidget {
-  final List<BaseVideo> videos;
+  final List<Video> videos;
   final List<Widget>? children;
   final bool bestThumbnails;
   final double scale = 0.7;
diff --git a/lib/playlists/views/screens/playlist.dart b/lib/playlists/views/screens/playlist.dart
index ec5b4a59..abfb0bf2 100644
--- a/lib/playlists/views/screens/playlist.dart
+++ b/lib/playlists/views/screens/playlist.dart
@@ -1,4 +1,5 @@
 import 'package:auto_route/auto_route.dart';
+import 'package:clipious/videos/models/video.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@@ -9,7 +10,6 @@ import 'package:clipious/playlists/views/tablet/playlist_inner_view.dart';
 import 'package:clipious/router.dart';
 import 'package:clipious/settings/models/errors/invidious_service_error.dart';
 import 'package:clipious/utils.dart';
-import 'package:clipious/videos/models/video_in_list.dart';
 
 import '../../../utils/views/components/device_widget.dart';
 import '../../models/playlist.dart';
@@ -44,7 +44,7 @@ class PlaylistViewScreen extends StatelessWidget {
     });
   }
 
-  removeVideoFromPlayList(BuildContext context, VideoInList v) async {
+  removeVideoFromPlayList(BuildContext context, Video v) async {
     if (canDeleteVideos) {
       var locals = AppLocalizations.of(context)!;
       var cubit = context.read<PlaylistCubit>();
diff --git a/lib/playlists/views/tablet/playlist_inner_view.dart b/lib/playlists/views/tablet/playlist_inner_view.dart
index ad071f8d..00582733 100644
--- a/lib/playlists/views/tablet/playlist_inner_view.dart
+++ b/lib/playlists/views/tablet/playlist_inner_view.dart
@@ -1,3 +1,4 @@
+import 'package:clipious/videos/models/video.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@@ -5,7 +6,6 @@ import 'package:clipious/playlists/views/components/playlist_thumbnail.dart';
 import 'package:clipious/utils.dart';
 import 'package:clipious/utils/models/paginated_list.dart';
 import 'package:clipious/utils/views/components/placeholders.dart';
-import 'package:clipious/videos/models/video_in_list.dart';
 import 'package:clipious/videos/views/components/video_list.dart';
 
 import '../../../globals.dart';
@@ -15,8 +15,7 @@ import '../../states/playlist.dart';
 
 class TabletPlaylistInnerView extends StatelessWidget {
   final bool canDeleteVideos;
-  final Function(BuildContext context, VideoInList video)
-      removeVideoFromPlaylist;
+  final Function(BuildContext context, Video video) removeVideoFromPlaylist;
   final Function(BuildContext context, String videoId) openVideo;
 
   const TabletPlaylistInnerView(
@@ -25,7 +24,7 @@ class TabletPlaylistInnerView extends StatelessWidget {
       required this.removeVideoFromPlaylist,
       required this.openVideo});
 
-  void showVideoModalSheet(BuildContext parentContext, VideoInList video) {
+  void showVideoModalSheet(BuildContext parentContext, Video video) {
     showModalBottomSheet<void>(
         context: parentContext,
         showDragHandle: true,
diff --git a/lib/playlists/views/tv/screens/playlist.dart b/lib/playlists/views/tv/screens/playlist.dart
index ce6e2e5c..a9a6b6ef 100644
--- a/lib/playlists/views/tv/screens/playlist.dart
+++ b/lib/playlists/views/tv/screens/playlist.dart
@@ -2,6 +2,7 @@ import 'dart:ui';
 
 import 'package:auto_route/auto_route.dart';
 import 'package:carousel_slider/carousel_slider.dart';
+import 'package:clipious/videos/models/video.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@@ -17,7 +18,6 @@ import 'package:clipious/videos/views/tv/components/video_item.dart';
 
 import '../../../../player/states/player.dart';
 import '../../../../utils/models/image_object.dart';
-import '../../../../videos/models/base_video.dart';
 import '../../../../videos/views/components/video_thumbnail.dart';
 
 @RoutePage()
@@ -52,7 +52,7 @@ class TvPlaylistScreen extends PlaylistViewScreen {
                         itemCount: playlistState.playlist.videos.length,
                         itemBuilder: (BuildContext context, int itemIndex,
                             int pageViewIndex) {
-                          BaseVideo video =
+                          Video video =
                               playlistState.playlist.videos[itemIndex];
                           return VideoThumbnailView(
                               videoId: video.videoId,
diff --git a/lib/router.dart b/lib/router.dart
index cb8a9cba..a697a389 100644
--- a/lib/router.dart
+++ b/lib/router.dart
@@ -48,9 +48,7 @@ import 'package:clipious/utils/views/tv/components/select_from_list.dart';
 import 'package:clipious/utils/views/tv/components/tv_plain_text.dart';
 import 'package:clipious/utils/views/tv/components/tv_text_field.dart';
 import 'package:clipious/utils/views/tv/components/tv_time_picker.dart';
-import 'package:clipious/videos/models/base_video.dart';
 import 'package:clipious/videos/models/video.dart';
-import 'package:clipious/videos/models/video_in_list.dart';
 import 'package:clipious/videos/views/screens/comments_tab.dart';
 import 'package:clipious/videos/views/screens/info_tab.dart';
 import 'package:clipious/videos/views/screens/recommended_tab.dart';
diff --git a/lib/router.gr.dart b/lib/router.gr.dart
index fc8f59a6..125c33a9 100644
--- a/lib/router.gr.dart
+++ b/lib/router.gr.dart
@@ -1234,7 +1234,7 @@ class TvFilterListSettingsRoute extends PageRouteInfo<void> {
 class TvGridRoute extends PageRouteInfo<TvGridRouteArgs> {
   TvGridRoute({
     Key? key,
-    required PaginatedList<VideoInList> paginatedVideoList,
+    required PaginatedList<Video> paginatedVideoList,
     String? tags,
     required String title,
     List<PageRouteInfo>? children,
@@ -1275,7 +1275,7 @@ class TvGridRouteArgs {
 
   final Key? key;
 
-  final PaginatedList<VideoInList> paginatedVideoList;
+  final PaginatedList<Video> paginatedVideoList;
 
   final String? tags;
 
@@ -1404,7 +1404,7 @@ class TvPlainTextRouteArgs {
 class TvPlayerRoute extends PageRouteInfo<TvPlayerRouteArgs> {
   TvPlayerRoute({
     Key? key,
-    required List<BaseVideo> videos,
+    required List<Video> videos,
     List<PageRouteInfo>? children,
   }) : super(
           TvPlayerRoute.name,
@@ -1437,7 +1437,7 @@ class TvPlayerRouteArgs {
 
   final Key? key;
 
-  final List<BaseVideo> videos;
+  final List<Video> videos;
 
   @override
   String toString() {
diff --git a/lib/search/models/search_results.dart b/lib/search/models/search_results.dart
index 038afab6..25ffd5a9 100644
--- a/lib/search/models/search_results.dart
+++ b/lib/search/models/search_results.dart
@@ -1,11 +1,12 @@
 import 'dart:core';
 
+import 'package:clipious/videos/models/video.dart';
+
 import '../../channels/models/channel.dart';
 import '../../playlists/models/playlist.dart';
-import '../../videos/models/video_in_list.dart';
 
 class SearchResults {
-  List<VideoInList> videos = [];
+  List<Video> videos = [];
   List<Playlist> playlists = [];
   List<Channel> channels = [];
 }
diff --git a/lib/search/states/search.dart b/lib/search/states/search.dart
index 551f7092..6de6e61e 100644
--- a/lib/search/states/search.dart
+++ b/lib/search/states/search.dart
@@ -1,4 +1,5 @@
 import 'package:bloc/bloc.dart';
+import 'package:clipious/videos/models/video.dart';
 import 'package:easy_debounce/easy_debounce.dart';
 import 'package:flutter/material.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
@@ -10,7 +11,6 @@ import 'package:clipious/search/states/search_filter.dart';
 import '../../channels/models/channel.dart';
 import '../../playlists/models/playlist.dart';
 import '../../settings/states/settings.dart';
-import '../../videos/models/video_in_list.dart';
 
 part 'search.freezed.dart';
 
@@ -118,7 +118,7 @@ class SearchState with _$SearchState {
   static SearchState init(
       {TextEditingController? queryController,
       int? selectedIndex,
-      List<VideoInList>? videos,
+      List<Video>? videos,
       List<Channel>? channels,
       List<Playlist>? playlists,
       bool? useHistory,
diff --git a/lib/search/views/screens/video_tab.dart b/lib/search/views/screens/video_tab.dart
index 1a12dcb5..1ea46a58 100644
--- a/lib/search/views/screens/video_tab.dart
+++ b/lib/search/views/screens/video_tab.dart
@@ -1,4 +1,5 @@
 import 'package:auto_route/annotations.dart';
+import 'package:clipious/videos/models/video.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:clipious/globals.dart';
@@ -6,7 +7,6 @@ import 'package:clipious/search/models/search_type.dart';
 import 'package:clipious/search/states/search.dart';
 import 'package:clipious/search/views/screens/search.dart';
 import 'package:clipious/utils/models/paginated_list.dart';
-import 'package:clipious/videos/models/video_in_list.dart';
 import 'package:clipious/videos/views/components/video_list.dart';
 
 @RoutePage()
@@ -25,7 +25,7 @@ class SearchVideoTab extends StatelessWidget {
 
       return VideoList(
         key: UniqueKey(),
-        paginatedVideoList: PageBasedPaginatedList<VideoInList>(
+        paginatedVideoList: PageBasedPaginatedList<Video>(
           getItemsFunc: (page, maxResults) => service
               .search(query,
                   page: page,
diff --git a/lib/search/views/tv/screens/search.dart b/lib/search/views/tv/screens/search.dart
index ad7bcadc..63cfb5e2 100644
--- a/lib/search/views/tv/screens/search.dart
+++ b/lib/search/views/tv/screens/search.dart
@@ -1,4 +1,5 @@
 import 'package:auto_route/auto_route.dart';
+import 'package:clipious/videos/models/video.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@@ -17,7 +18,6 @@ import 'package:clipious/utils/views/tv/components/tv_text_field.dart';
 import '../../../../channels/models/channel.dart';
 import '../../../../globals.dart';
 import '../../../../settings/states/settings.dart';
-import '../../../../videos/models/video_in_list.dart';
 import '../../../states/search.dart';
 import '../../../states/tv_search.dart';
 import '../../screens/search.dart';
@@ -172,7 +172,7 @@ class TvSearchScreen extends StatelessWidget {
                                                           TvHorizontalVideoList(
                                                               paginatedVideoList:
                                                                   PageBasedPaginatedList<
-                                                                      VideoInList>(
+                                                                      Video>(
                                                         getItemsFunc: (page,
                                                                 maxResults) =>
                                                             service
diff --git a/lib/service.dart b/lib/service.dart
index e67b2a40..b6e4a24c 100644
--- a/lib/service.dart
+++ b/lib/service.dart
@@ -26,7 +26,6 @@ import 'package:clipious/videos/models/dislike.dart';
 import 'package:clipious/videos/models/sponsor_segment.dart';
 import 'package:clipious/videos/models/user_feed.dart';
 import 'package:clipious/videos/models/video.dart';
-import 'package:clipious/videos/models/video_in_list.dart';
 import 'package:logging/logging.dart';
 
 import 'channels/models/channel.dart';
@@ -183,9 +182,10 @@ class Service {
     final response = await httpClient.get(req.uri, headers: req.headers);
 
     var video = Video.fromJson(handleResponse(response));
-    await DeArrow.processVideos([video]);
-    video.recommendedVideos =
-        (await postProcessVideos(video.recommendedVideos)).cast();
+    video = (await DeArrow.processVideos([video]))[0];
+    video = video.copyWith(
+        recommendedVideos:
+            (await postProcessVideos(video.recommendedVideos)).cast());
     return video;
   }
 
@@ -254,7 +254,7 @@ class Service {
     }
   }
 
-  Future<List<VideoInList>> getTrending({String? type}) async {
+  Future<List<Video>> getTrending({String? type}) async {
     String countryCode = db.getSettings(browsingCountry)?.value ?? 'US';
     // parse.queryParameters['region'] = countryCode;
     Map<String, String>? query = {'region': countryCode};
@@ -267,16 +267,16 @@ class Service {
     final response = await httpClient.get(req.uri, headers: req.headers);
 
     Iterable i = handleResponse(response);
-    var list = List<VideoInList>.from(i.map((e) => VideoInList.fromJson(e)));
-    list = (await postProcessVideos(list)).cast();
+    var list = List<Video>.from(i.map((e) => Video.fromJson(e)));
+    list = (await postProcessVideos(list));
     return list;
   }
 
-  Future<List<VideoInList>> getPopular() async {
+  Future<List<Video>> getPopular() async {
     var req = await buildRequest(urlGetPopular);
     final response = await httpClient.get(req.uri, headers: req.headers);
     Iterable i = handleResponse(response);
-    var list = List<VideoInList>.from(i.map((e) => VideoInList.fromJson(e)));
+    var list = List<Video>.from(i.map((e) => Video.fromJson(e)));
     list = (await postProcessVideos(list)).cast();
     return list;
   }
@@ -305,7 +305,7 @@ class Service {
       for (var e in i) {
         switch (e['type']) {
           case 'video':
-            results.videos.add(VideoInList.fromJson(e));
+            results.videos.add(Video.fromJson(e));
             break;
           case 'playlist':
             results.playlists.add(Playlist.fromJson(e));
@@ -595,8 +595,10 @@ class Service {
       Iterable i = handleResponse(response);
       var list = List<Playlist>.from(i.map((e) => Playlist.fromJson(e)));
       if (postProcessing) {
-        for (var pl in list) {
-          pl.videos = (await postProcessVideos(pl.videos)).cast();
+        for (int i = 0; i < list.length; i++) {
+          var pl = list[i];
+          pl = pl.copyWith(videos: await postProcessVideos(pl.videos));
+          list[i] = pl;
         }
       }
       return list.sortByReversed((e) => e.updated ?? 0).toList();
@@ -612,8 +614,10 @@ class Service {
 
     final response = await httpClient.get(req.uri, headers: req.headers);
     var channelPlaylists = ChannelPlaylists.fromJson(handleResponse(response));
-    for (var pl in channelPlaylists.playlists) {
-      pl.videos = (await postProcessVideos(pl.videos)).cast();
+    for (int i = 0; i < channelPlaylists.playlists.length; i++) {
+      var pl = channelPlaylists.playlists[i];
+      pl = pl.copyWith(videos: await postProcessVideos(pl.videos));
+      channelPlaylists.playlists[i] = pl;
     }
     return channelPlaylists;
   }
@@ -761,8 +765,9 @@ class Service {
     final response = await httpClient.get(req.uri, headers: req.headers);
     var playlist = Playlist.fromJson(handleResponse(response));
     var oldLength = playlist.videos.length;
-    playlist.videos = (await postProcessVideos(playlist.videos)).cast();
-    playlist.removedByFilter = oldLength - playlist.videos.length;
+    playlist = playlist.copyWith(
+        videos: await postProcessVideos(playlist.videos),
+        removedByFilter: oldLength - playlist.videos.length);
 
     if (saveLastSeen) {
       await fileDb.setPlaylistNotificationLastViewedVideo(
@@ -779,8 +784,9 @@ class Service {
     final response = await httpClient.get(req.uri, headers: req.headers);
     var playlist = Playlist.fromJson(handleResponse(response));
     var oldLength = playlist.videos.length;
-    playlist.videos = (await postProcessVideos(playlist.videos)).cast();
-    playlist.removedByFilter = oldLength - playlist.videos.length;
+    playlist = playlist.copyWith(
+        videos: await postProcessVideos(playlist.videos),
+        removedByFilter: oldLength - playlist.videos.length);
 
     return playlist;
   }
diff --git a/lib/settings/models/db/video_filter.dart b/lib/settings/models/db/video_filter.dart
index e6be273f..c87abbe7 100644
--- a/lib/settings/models/db/video_filter.dart
+++ b/lib/settings/models/db/video_filter.dart
@@ -1,9 +1,9 @@
+import 'package:clipious/videos/models/video.dart';
 import 'package:copy_with_extension/copy_with_extension.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:clipious/globals.dart';
 import 'package:clipious/utils.dart';
-import 'package:clipious/videos/models/base_video.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:logging/logging.dart';
 
@@ -117,17 +117,19 @@ class VideoFilter {
         .firstOrNull;
   }
 
-  static BaseVideo _innerFilterVideo(BaseVideo v, List<VideoFilter> filters) {
+  static Video _innerFilterVideo(Video v, List<VideoFilter> filters) {
     var matches = filters.where((element) => element.filterVideo(v)).toList();
-    v.matchedFilters = matches;
-    v.filtered = matches.isNotEmpty;
     // log.fine('Video ${v.title} filtered ? ${v.filtered}');
-    v.filterHide = v.filtered && matches.any((element) => element.hideFromFeed);
-    return v;
+    final filterHide = matches.any((element) => element.hideFromFeed);
+
+    return v.copyWith(
+        matchedFilters: matches,
+        filtered: matches.isNotEmpty,
+        filterHide: filterHide);
   }
 
   /// Returns the number of videos removed
-  static Future<List<BaseVideo>> filterVideos(List<BaseVideo>? videos) async {
+  static Future<List<Video>> filterVideos(List<Video>? videos) async {
     List<VideoFilter> filters = db.getAllFilters();
 
     log.fine('filtering videos, we have ${filters.length} filters');
@@ -148,7 +150,7 @@ class VideoFilter {
     return videos;
   }
 
-  bool filterVideo(BaseVideo video) {
+  bool filterVideo(Video video) {
     String videoChannel = video.authorId?.replaceAll("/channel/", '') ?? '';
 
     if (channelId != null && channelId != videoChannel) {
@@ -167,14 +169,19 @@ class VideoFilter {
     switch (type) {
       // string base operation
       case FilterType.title:
-        filter = filterVideoStringOperation(video.title);
+        filter = filterVideoStringOperation(video.title ?? '');
+        break;
       case FilterType.channelName:
         filter = video.author != null
             ? filterVideoStringOperation(video.author!)
             : true;
+        break;
       // int base operation
       case FilterType.length:
-        filter = filterVideoNumberOperation(video.lengthSeconds);
+        if (video.lengthSeconds != null) {
+          filter = filterVideoNumberOperation(video.lengthSeconds!);
+        }
+        break;
       default:
         filter = false;
     }
diff --git a/lib/utils.dart b/lib/utils.dart
index 4eef528f..63c97939 100644
--- a/lib/utils.dart
+++ b/lib/utils.dart
@@ -12,11 +12,11 @@ import 'package:clipious/settings/states/settings.dart';
 import 'package:clipious/utils/models/sharelink.dart';
 import 'package:clipious/utils/views/tv/components/tv_button.dart';
 import 'package:clipious/utils/views/tv/components/tv_overscan.dart';
-import 'package:clipious/videos/models/base_video.dart';
 import 'package:logging/logging.dart';
 import 'package:share_plus/share_plus.dart';
 
 import 'utils/models/country.dart';
+import 'videos/models/video.dart';
 
 const phoneMax = 600;
 const tabletPortraitMax = 900;
@@ -353,7 +353,7 @@ SystemUiOverlayStyle getUiOverlayStyle(BuildContext context,
           : Brightness.dark);
 }
 
-List<T> filteredVideos<T extends BaseVideo>(List<T> videos) =>
+List<Video> filteredVideos(List<Video> videos) =>
     videos.where((element) => !element.filterHide).toList();
 
 String getWeekdayName(int weekday) {
diff --git a/lib/utils/models/image_object.dart b/lib/utils/models/image_object.dart
index 08cbfddb..c602207e 100644
--- a/lib/utils/models/image_object.dart
+++ b/lib/utils/models/image_object.dart
@@ -18,11 +18,12 @@ class ImageObject {
 
   static ImageObject? getBestThumbnail(List<ImageObject>? images) {
     if (images != null && images.isNotEmpty) {
-      images.sort((a, b) {
+      List<ImageObject> imgs = List.from(images);
+      imgs.sort((a, b) {
         return (b.width * b.height).compareTo(a.width * a.height);
       });
 
-      return images[0];
+      return imgs[0];
     } else {
       return null;
     }
@@ -30,11 +31,12 @@ class ImageObject {
 
   static ImageObject? getWorstThumbnail(List<ImageObject>? images) {
     if (images != null && images.isNotEmpty) {
-      images.sort((a, b) {
+      List<ImageObject> imgs = List.from(images);
+      imgs.sort((a, b) {
         return (a.width * a.height).compareTo(b.width * b.height);
       });
 
-      return images[0];
+      return imgs[0];
     } else {
       return null;
     }
diff --git a/lib/utils/models/paginated_list.dart b/lib/utils/models/paginated_list.dart
index 798544e3..5fa57841 100644
--- a/lib/utils/models/paginated_list.dart
+++ b/lib/utils/models/paginated_list.dart
@@ -5,7 +5,7 @@ import 'package:clipious/search/models/search_type.dart';
 import 'package:clipious/utils/extensions/list_unique.dart';
 import 'package:clipious/utils/models/item_with_continuation.dart';
 import 'package:clipious/videos/models/user_feed.dart';
-import 'package:clipious/videos/models/video_in_list.dart';
+import 'package:clipious/videos/models/video.dart';
 
 import '../../globals.dart';
 
@@ -23,7 +23,7 @@ abstract class PaginatedList<T> {
   bool getHasMore();
 }
 
-abstract class PaginatedVideoList extends PaginatedList<VideoInList> {}
+abstract class PaginatedVideoList extends PaginatedList<Video> {}
 
 /// Paginated video list that uses the continuation concept
 class ContinuationList<T> extends PaginatedList<T> {
@@ -135,10 +135,10 @@ class SubscriptionVideoList extends PaginatedVideoList {
   Map<String, String> continuations = {};
 
   @override
-  Future<List<VideoInList>> getItems() async {
+  Future<List<Video>> getItems() async {
     final isLoggedIn = await service.isLoggedIn();
 
-    List<VideoInList> videos = [];
+    List<Video> videos = [];
 
     if (isLoggedIn) {
       UserFeed feed =
@@ -184,7 +184,7 @@ class SubscriptionVideoList extends PaginatedVideoList {
   }
 
   @override
-  Future<List<VideoInList>> getMoreItems() async {
+  Future<List<Video>> getMoreItems() async {
     if (hasMoreOnline) {
       page = page + 1;
     }
@@ -192,7 +192,7 @@ class SubscriptionVideoList extends PaginatedVideoList {
   }
 
   @override
-  Future<List<VideoInList>> refresh() async {
+  Future<List<Video>> refresh() async {
     page = 1;
     continuations = {};
     return getItems();
diff --git a/lib/utils/sembast_sqflite_database.dart b/lib/utils/sembast_sqflite_database.dart
index 31495461..99e6f55f 100644
--- a/lib/utils/sembast_sqflite_database.dart
+++ b/lib/utils/sembast_sqflite_database.dart
@@ -157,7 +157,7 @@ class SembastSqfDb extends IDbClient {
     var records = downloadedVideosStore.findSync(db);
     return records.map((e) {
       var d = DownloadedVideo.fromJson(e.value);
-      d.videoId = e.key;
+      d = d.copyWith(videoId: e.key);
       return d;
     }).toList();
   }
diff --git a/lib/utils/video_post_processing.dart b/lib/utils/video_post_processing.dart
index 4b7d6bdf..17f201e1 100644
--- a/lib/utils/video_post_processing.dart
+++ b/lib/utils/video_post_processing.dart
@@ -2,15 +2,15 @@ import 'package:clipious/settings/models/db/video_filter.dart';
 import 'package:clipious/videos/models/dearrow.dart';
 import 'package:logging/logging.dart';
 
-import '../videos/models/base_video.dart';
+import '../videos/models/video.dart';
 
 var log = Logger('Video post process');
 const privateVideoString = "[Private video]";
 
-Future<List<BaseVideo>> postProcessVideos(List<BaseVideo> toProcess) async {
+Future<List<Video>> postProcessVideos(List<Video> toProcess) async {
   try {
     int start = DateTime.now().millisecondsSinceEpoch;
-    List<BaseVideo> videos = toProcess
+    List<Video> videos = toProcess
         .where((element) => element.title != privateVideoString)
         .toList();
 
diff --git a/lib/utils/views/components/text_linkified.dart b/lib/utils/views/components/text_linkified.dart
index 346c6611..7a552296 100644
--- a/lib/utils/views/components/text_linkified.dart
+++ b/lib/utils/views/components/text_linkified.dart
@@ -1,4 +1,5 @@
 import 'package:auto_route/auto_route.dart';
+import 'package:clipious/videos/models/video.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_linkify/flutter_linkify.dart';
 import 'package:clipious/player/states/player.dart';
@@ -6,12 +7,11 @@ import 'package:clipious/router.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 import '../../../globals.dart';
-import '../../../videos/models/base_video.dart';
 import '../../models/timestamp_linkifier.dart';
 
 class TextLinkified extends StatelessWidget {
   final String text;
-  final BaseVideo? video;
+  final Video? video;
   final PlayerCubit player;
 
   const TextLinkified(
diff --git a/lib/utils/views/tv/components/tv_horizontal_item_list.dart b/lib/utils/views/tv/components/tv_horizontal_item_list.dart
index 9ae3a213..5af7b1bc 100644
--- a/lib/utils/views/tv/components/tv_horizontal_item_list.dart
+++ b/lib/utils/views/tv/components/tv_horizontal_item_list.dart
@@ -1,12 +1,11 @@
+import 'package:clipious/videos/models/video.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:clipious/utils/states/item_list.dart';
 import 'package:clipious/utils/views/components/placeholders.dart';
-import 'package:clipious/videos/models/base_video.dart';
 import 'package:clipious/videos/views/tv/components/video_item.dart';
 
 import '../../../../utils.dart';
-import '../../../../videos/models/video_in_list.dart';
 import '../../../models/paginated_list.dart';
 
 class TvHorizontalItemList<T> extends StatelessWidget {
@@ -32,8 +31,8 @@ class TvHorizontalItemList<T> extends StatelessWidget {
           var cubit = context.read<ItemListCubit<T>>();
           // filter items if possible
           List<T> items = state.items;
-          if (items.isNotEmpty && items[0] is BaseVideo) {
-            items = filteredVideos<BaseVideo>(state.items.cast()).cast();
+          if (items.isNotEmpty && items[0] is Video) {
+            items = filteredVideos(state.items.cast()).cast();
           }
 
           return Stack(
@@ -68,11 +67,11 @@ class TvHorizontalItemList<T> extends StatelessWidget {
 }
 
 class TvHorizontalVideoList extends StatelessWidget {
-  final PaginatedList<VideoInList> paginatedVideoList;
-  final Function(BuildContext context, VideoInList video)? onSelect;
+  final PaginatedList<Video> paginatedVideoList;
+  final Function(BuildContext context, Video video)? onSelect;
   final String? tags;
   final int autoFocusedIndex;
-  final void Function(VideoInList video, int index, bool focus)? onItemFocus;
+  final void Function(Video video, int index, bool focus)? onItemFocus;
 
   const TvHorizontalVideoList(
       {super.key,
@@ -84,7 +83,7 @@ class TvHorizontalVideoList extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return TvHorizontalItemList<VideoInList>(
+    return TvHorizontalItemList<Video>(
       getPlaceholder: () => const TvVideoItemPlaceHolder(),
       paginatedList: paginatedVideoList,
       buildItem: (context, index, e) => TvVideoItem(
diff --git a/lib/utils/views/tv/components/tv_horizontal_paginated_list.dart b/lib/utils/views/tv/components/tv_horizontal_paginated_list.dart
index 8461f6fe..53fced7b 100644
--- a/lib/utils/views/tv/components/tv_horizontal_paginated_list.dart
+++ b/lib/utils/views/tv/components/tv_horizontal_paginated_list.dart
@@ -1,8 +1,8 @@
+import 'package:clipious/videos/models/video.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
 import '../../../../utils.dart';
-import '../../../../videos/models/base_video.dart';
 import '../../../models/paginated_list.dart';
 import '../../../states/paginated_list_view.dart';
 
@@ -30,8 +30,8 @@ class TvHorizontalPaginatedListView<T> extends StatelessWidget {
         var cubit = context.read<PaginatedListCubit<T>>();
         // filter items if possible
         List<T> items = state.items;
-        if (items.isNotEmpty && items[0] is BaseVideo) {
-          items = filteredVideos<BaseVideo>(state.items.cast()).cast();
+        if (items.isNotEmpty && items[0] is Video) {
+          items = filteredVideos(state.items.cast()).cast();
         }
         return Stack(
           children: [
diff --git a/lib/videos/models/base_video.dart b/lib/videos/models/base_video.dart
deleted file mode 100644
index 86f05969..00000000
--- a/lib/videos/models/base_video.dart
+++ /dev/null
@@ -1,90 +0,0 @@
-import 'package:copy_with_extension/copy_with_extension.dart';
-import 'package:clipious/videos/models/video_in_list.dart';
-import 'package:json_annotation/json_annotation.dart';
-
-import '../../settings/models/db/server.dart';
-import '../../settings/models/db/video_filter.dart';
-import '../../utils/models/image_object.dart';
-import '../../utils/models/sharelink.dart';
-
-part 'base_video.g.dart';
-
-abstract class IdedVideo {
-  String videoId;
-
-  IdedVideo(this.videoId);
-}
-
-@CopyWith(constructor: '_')
-class BaseVideo extends IdedVideo implements ShareLinks {
-  String title;
-  int lengthSeconds;
-  String? author;
-  String? authorId;
-  String? authorUrl;
-  List<ImageObject> videoThumbnails;
-
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  bool filtered = false;
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  List<VideoFilter> matchedFilters = [];
-
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  bool filterHide = false;
-
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  bool deArrowed = false;
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  String? deArrowThumbnailUrl;
-
-  BaseVideo(this.title, String videoId, this.lengthSeconds, this.author,
-      this.authorId, this.authorUrl, this.videoThumbnails)
-      : super(videoId);
-
-  BaseVideo._(
-      super.videoId,
-      this.title,
-      this.lengthSeconds,
-      this.author,
-      this.authorId,
-      this.authorUrl,
-      this.videoThumbnails,
-      this.filtered,
-      this.matchedFilters,
-      this.filterHide,
-      this.deArrowed,
-      this.deArrowThumbnailUrl);
-
-  @override
-  String getInvidiousLink(Server server, int? timestamp) {
-    String link = '${server.url}/watch?v=$videoId';
-
-    if (timestamp != null) link += '&t=$timestamp';
-
-    return link;
-  }
-
-  @override
-  String getRedirectLink(int? timestamp) {
-    String link = 'https://redirect.invidious.io/watch?v=$videoId';
-
-    if (timestamp != null) link += '&t=$timestamp';
-
-    return link;
-  }
-
-  @override
-  String getYoutubeLink(int? timestamp) {
-    String link = 'https://youtu.be/$videoId';
-
-    if (timestamp != null) link += '?t=$timestamp';
-
-    return link;
-  }
-
-  VideoInList toVideoInList() {
-    return VideoInList(title, videoId, lengthSeconds, 0, author, authorId,
-        authorUrl, null, null, videoThumbnails)
-      ..filtered = filtered;
-  }
-}
diff --git a/lib/videos/models/base_video.g.dart b/lib/videos/models/base_video.g.dart
deleted file mode 100644
index 551cec51..00000000
--- a/lib/videos/models/base_video.g.dart
+++ /dev/null
@@ -1,181 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'base_video.dart';
-
-// **************************************************************************
-// CopyWithGenerator
-// **************************************************************************
-
-abstract class _$BaseVideoCWProxy {
-  BaseVideo videoId(String videoId);
-
-  BaseVideo title(String title);
-
-  BaseVideo lengthSeconds(int lengthSeconds);
-
-  BaseVideo author(String? author);
-
-  BaseVideo authorId(String? authorId);
-
-  BaseVideo authorUrl(String? authorUrl);
-
-  BaseVideo videoThumbnails(List<ImageObject> videoThumbnails);
-
-  BaseVideo filtered(bool filtered);
-
-  BaseVideo matchedFilters(List<VideoFilter> matchedFilters);
-
-  BaseVideo filterHide(bool filterHide);
-
-  BaseVideo deArrowed(bool deArrowed);
-
-  BaseVideo deArrowThumbnailUrl(String? deArrowThumbnailUrl);
-
-  /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `BaseVideo(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
-  ///
-  /// Usage
-  /// ```dart
-  /// BaseVideo(...).copyWith(id: 12, name: "My name")
-  /// ````
-  BaseVideo call({
-    String? videoId,
-    String? title,
-    int? lengthSeconds,
-    String? author,
-    String? authorId,
-    String? authorUrl,
-    List<ImageObject>? videoThumbnails,
-    bool? filtered,
-    List<VideoFilter>? matchedFilters,
-    bool? filterHide,
-    bool? deArrowed,
-    String? deArrowThumbnailUrl,
-  });
-}
-
-/// Proxy class for `copyWith` functionality. This is a callable class and can be used as follows: `instanceOfBaseVideo.copyWith(...)`. Additionally contains functions for specific fields e.g. `instanceOfBaseVideo.copyWith.fieldName(...)`
-class _$BaseVideoCWProxyImpl implements _$BaseVideoCWProxy {
-  const _$BaseVideoCWProxyImpl(this._value);
-
-  final BaseVideo _value;
-
-  @override
-  BaseVideo videoId(String videoId) => this(videoId: videoId);
-
-  @override
-  BaseVideo title(String title) => this(title: title);
-
-  @override
-  BaseVideo lengthSeconds(int lengthSeconds) =>
-      this(lengthSeconds: lengthSeconds);
-
-  @override
-  BaseVideo author(String? author) => this(author: author);
-
-  @override
-  BaseVideo authorId(String? authorId) => this(authorId: authorId);
-
-  @override
-  BaseVideo authorUrl(String? authorUrl) => this(authorUrl: authorUrl);
-
-  @override
-  BaseVideo videoThumbnails(List<ImageObject> videoThumbnails) =>
-      this(videoThumbnails: videoThumbnails);
-
-  @override
-  BaseVideo filtered(bool filtered) => this(filtered: filtered);
-
-  @override
-  BaseVideo matchedFilters(List<VideoFilter> matchedFilters) =>
-      this(matchedFilters: matchedFilters);
-
-  @override
-  BaseVideo filterHide(bool filterHide) => this(filterHide: filterHide);
-
-  @override
-  BaseVideo deArrowed(bool deArrowed) => this(deArrowed: deArrowed);
-
-  @override
-  BaseVideo deArrowThumbnailUrl(String? deArrowThumbnailUrl) =>
-      this(deArrowThumbnailUrl: deArrowThumbnailUrl);
-
-  @override
-
-  /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `BaseVideo(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
-  ///
-  /// Usage
-  /// ```dart
-  /// BaseVideo(...).copyWith(id: 12, name: "My name")
-  /// ````
-  BaseVideo call({
-    Object? videoId = const $CopyWithPlaceholder(),
-    Object? title = const $CopyWithPlaceholder(),
-    Object? lengthSeconds = const $CopyWithPlaceholder(),
-    Object? author = const $CopyWithPlaceholder(),
-    Object? authorId = const $CopyWithPlaceholder(),
-    Object? authorUrl = const $CopyWithPlaceholder(),
-    Object? videoThumbnails = const $CopyWithPlaceholder(),
-    Object? filtered = const $CopyWithPlaceholder(),
-    Object? matchedFilters = const $CopyWithPlaceholder(),
-    Object? filterHide = const $CopyWithPlaceholder(),
-    Object? deArrowed = const $CopyWithPlaceholder(),
-    Object? deArrowThumbnailUrl = const $CopyWithPlaceholder(),
-  }) {
-    return BaseVideo._(
-      videoId == const $CopyWithPlaceholder() || videoId == null
-          ? _value.videoId
-          // ignore: cast_nullable_to_non_nullable
-          : videoId as String,
-      title == const $CopyWithPlaceholder() || title == null
-          ? _value.title
-          // ignore: cast_nullable_to_non_nullable
-          : title as String,
-      lengthSeconds == const $CopyWithPlaceholder() || lengthSeconds == null
-          ? _value.lengthSeconds
-          // ignore: cast_nullable_to_non_nullable
-          : lengthSeconds as int,
-      author == const $CopyWithPlaceholder()
-          ? _value.author
-          // ignore: cast_nullable_to_non_nullable
-          : author as String?,
-      authorId == const $CopyWithPlaceholder()
-          ? _value.authorId
-          // ignore: cast_nullable_to_non_nullable
-          : authorId as String?,
-      authorUrl == const $CopyWithPlaceholder()
-          ? _value.authorUrl
-          // ignore: cast_nullable_to_non_nullable
-          : authorUrl as String?,
-      videoThumbnails == const $CopyWithPlaceholder() || videoThumbnails == null
-          ? _value.videoThumbnails
-          // ignore: cast_nullable_to_non_nullable
-          : videoThumbnails as List<ImageObject>,
-      filtered == const $CopyWithPlaceholder() || filtered == null
-          ? _value.filtered
-          // ignore: cast_nullable_to_non_nullable
-          : filtered as bool,
-      matchedFilters == const $CopyWithPlaceholder() || matchedFilters == null
-          ? _value.matchedFilters
-          // ignore: cast_nullable_to_non_nullable
-          : matchedFilters as List<VideoFilter>,
-      filterHide == const $CopyWithPlaceholder() || filterHide == null
-          ? _value.filterHide
-          // ignore: cast_nullable_to_non_nullable
-          : filterHide as bool,
-      deArrowed == const $CopyWithPlaceholder() || deArrowed == null
-          ? _value.deArrowed
-          // ignore: cast_nullable_to_non_nullable
-          : deArrowed as bool,
-      deArrowThumbnailUrl == const $CopyWithPlaceholder()
-          ? _value.deArrowThumbnailUrl
-          // ignore: cast_nullable_to_non_nullable
-          : deArrowThumbnailUrl as String?,
-    );
-  }
-}
-
-extension $BaseVideoCopyWith on BaseVideo {
-  /// Returns a callable class that can be used as follows: `instanceOfBaseVideo.copyWith(...)` or like so:`instanceOfBaseVideo.copyWith.fieldName(...)`.
-  // ignore: library_private_types_in_public_api
-  _$BaseVideoCWProxy get copyWith => _$BaseVideoCWProxyImpl(this);
-}
diff --git a/lib/videos/models/db/history_video_cache.dart b/lib/videos/models/db/history_video_cache.dart
index cf09e66f..f187a0a1 100644
--- a/lib/videos/models/db/history_video_cache.dart
+++ b/lib/videos/models/db/history_video_cache.dart
@@ -1,4 +1,4 @@
-import 'package:clipious/videos/models/base_video.dart';
+import 'package:clipious/videos/models/video.dart';
 import 'package:json_annotation/json_annotation.dart';
 
 import '../../../globals.dart';
@@ -23,16 +23,19 @@ class HistoryVideoCache {
 
   Map<String, dynamic> toJson() => _$HistoryVideoCacheToJson(this);
 
-  BaseVideo toBaseVideo() {
-    return BaseVideo(title, videoId, 0, author, null, null,
-        [ImageObject("high", thumbnail, 1280, 720)]);
+  Video toVideo() {
+    return Video(
+        title: title,
+        videoId: videoId,
+        author: author,
+        videoThumbnails: [ImageObject("high", thumbnail, 1280, 720)]);
   }
 
   static Future<HistoryVideoCache> fromVideoIdToVideo(String e) async {
     var cachedVideo = db.getHistoryVideoByVideoId(e);
     if (cachedVideo == null) {
       var vid = await service.getVideo(e);
-      cachedVideo = HistoryVideoCache(vid.videoId, vid.title, vid.author,
+      cachedVideo = HistoryVideoCache(vid.videoId, vid.title ?? '', vid.author,
           ImageObject.getBestThumbnail(vid.videoThumbnails)?.url ?? '');
       await db.upsertHistoryVideo(cachedVideo);
     }
diff --git a/lib/videos/models/dearrow.dart b/lib/videos/models/dearrow.dart
index 8eca5626..0256146b 100644
--- a/lib/videos/models/dearrow.dart
+++ b/lib/videos/models/dearrow.dart
@@ -1,6 +1,6 @@
 import 'package:clipious/globals.dart';
-import 'package:clipious/videos/models/base_video.dart';
 import 'package:clipious/videos/models/db/dearrow_cache.dart';
+import 'package:clipious/videos/models/video.dart';
 import 'package:json_annotation/json_annotation.dart';
 
 import '../../settings/models/db/settings.dart';
@@ -28,7 +28,7 @@ class DeArrow {
 
   Map<String, dynamic> toJson() => _$DeArrowToJson(this);
 
-  static Future<List<BaseVideo>> processVideos(List<BaseVideo>? videos) async {
+  static Future<List<Video>> processVideos(List<Video>? videos) async {
     var process = db.getSettings(dearrowSettingName)?.value == "true";
     if (videos != null && process) {
       bool doThumbnails =
@@ -36,31 +36,31 @@ class DeArrow {
       var futureTasks =
           videos.map((e) => _deArrowVideo(e, doThumbnails)).toList();
 
-      await Future.wait(futureTasks);
-
-      return videos;
+      return await Future.wait(futureTasks);
     } else {
       return videos ?? [];
     }
   }
 
-  static Future<void> _deArrowVideo(BaseVideo video, bool doThumbnails) async {
+  static Future<Video> _deArrowVideo(Video video, bool doThumbnails) async {
     var cache = db.getDeArrowCache(video.videoId);
 
+    var vid = video.copyWith();
+
     if (cache != null) {
       if (cache.title != null) {
-        video.title = cache.title!;
+        vid = vid.copyWith(title: cache.title!);
       }
 
       // if we just need the title, we're done
-      if (!doThumbnails) return;
+      if (!doThumbnails) return vid;
 
       if (cache.url != null) {
         // bool isThumbnailAvailable = await service.testDeArrowThumbnail(cache.url);
         // if (isThumbnailAvailable) {
-        video.deArrowThumbnailUrl = cache.url;
+        vid = vid.copyWith(deArrowThumbnailUrl: cache.url);
         // if we've set both things from cache, we stop otherwise we go through normal process
-        return;
+        return vid;
         // }
       }
     }
@@ -68,13 +68,13 @@ class DeArrow {
     var deArrow = await service.getDeArrow(video.videoId);
     var titles = deArrow?.titles ?? [];
     if (titles.isNotEmpty) {
-      video.title = deArrow!.titles.first.title ?? video.title;
+      vid = vid.copyWith(title: deArrow!.titles.first.title ?? video.title);
     }
     if (doThumbnails) {
       var thumbnail = deArrow?.thumbnailUrl;
       bool isThumbnailAvailable = await service.testDeArrowThumbnail(thumbnail);
       if (isThumbnailAvailable) {
-        video.deArrowThumbnailUrl = thumbnail;
+        vid = vid.copyWith(deArrowThumbnailUrl: thumbnail);
       }
     }
 
@@ -84,6 +84,8 @@ class DeArrow {
     if (newCache.title != null || newCache.url != null) {
       await db.upsertDeArrowCache(newCache);
     }
+
+    return vid;
   }
 }
 
diff --git a/lib/videos/models/ided_video.dart b/lib/videos/models/ided_video.dart
new file mode 100644
index 00000000..d6a1dccc
--- /dev/null
+++ b/lib/videos/models/ided_video.dart
@@ -0,0 +1,3 @@
+abstract class IdedVideo {
+  String get videoId;
+}
diff --git a/lib/videos/models/recommended_video.dart b/lib/videos/models/recommended_video.dart
deleted file mode 100644
index 15c19f16..00000000
--- a/lib/videos/models/recommended_video.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-import 'package:clipious/videos/models/base_video.dart';
-import 'package:json_annotation/json_annotation.dart';
-
-import '../../utils/models/image_object.dart';
-
-part 'recommended_video.g.dart';
-
-@JsonSerializable()
-class RecommendedVideo extends BaseVideo {
-  String viewCountText;
-
-  RecommendedVideo(
-      String videoId,
-      String title,
-      List<ImageObject> videoThumbnails,
-      String? author,
-      int lengthSeconds,
-      this.viewCountText)
-      : super(
-            title, videoId, lengthSeconds, author, null, null, videoThumbnails);
-
-  factory RecommendedVideo.fromJson(Map<String, dynamic> json) =>
-      _$RecommendedVideoFromJson(json);
-
-  Map<String, dynamic> toJson() => _$RecommendedVideoToJson(this);
-}
diff --git a/lib/videos/models/recommended_video.g.dart b/lib/videos/models/recommended_video.g.dart
deleted file mode 100644
index 3db06e7c..00000000
--- a/lib/videos/models/recommended_video.g.dart
+++ /dev/null
@@ -1,33 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'recommended_video.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-RecommendedVideo _$RecommendedVideoFromJson(Map<String, dynamic> json) =>
-    RecommendedVideo(
-      json['videoId'] as String,
-      json['title'] as String,
-      (json['videoThumbnails'] as List<dynamic>)
-          .map((e) => ImageObject.fromJson(e as Map<String, dynamic>))
-          .toList(),
-      json['author'] as String?,
-      (json['lengthSeconds'] as num).toInt(),
-      json['viewCountText'] as String,
-    )
-      ..authorId = json['authorId'] as String?
-      ..authorUrl = json['authorUrl'] as String?;
-
-Map<String, dynamic> _$RecommendedVideoToJson(RecommendedVideo instance) =>
-    <String, dynamic>{
-      'videoId': instance.videoId,
-      'title': instance.title,
-      'lengthSeconds': instance.lengthSeconds,
-      'author': instance.author,
-      'authorId': instance.authorId,
-      'authorUrl': instance.authorUrl,
-      'videoThumbnails': instance.videoThumbnails,
-      'viewCountText': instance.viewCountText,
-    };
diff --git a/lib/videos/models/user_feed.dart b/lib/videos/models/user_feed.dart
index 833d04d0..d68ecc2b 100644
--- a/lib/videos/models/user_feed.dart
+++ b/lib/videos/models/user_feed.dart
@@ -1,13 +1,12 @@
+import 'package:clipious/videos/models/video.dart';
 import 'package:json_annotation/json_annotation.dart';
 
-import 'video_in_list.dart';
-
 part 'user_feed.g.dart';
 
 @JsonSerializable()
 class UserFeed {
-  List<VideoInList>? notifications = [];
-  List<VideoInList>? videos = [];
+  List<Video>? notifications = [];
+  List<Video>? videos = [];
 
   UserFeed(this.notifications, this.videos);
 
diff --git a/lib/videos/models/user_feed.g.dart b/lib/videos/models/user_feed.g.dart
index c6d34330..da78c758 100644
--- a/lib/videos/models/user_feed.g.dart
+++ b/lib/videos/models/user_feed.g.dart
@@ -8,10 +8,10 @@ part of 'user_feed.dart';
 
 UserFeed _$UserFeedFromJson(Map<String, dynamic> json) => UserFeed(
       (json['notifications'] as List<dynamic>?)
-          ?.map((e) => VideoInList.fromJson(e as Map<String, dynamic>))
+          ?.map((e) => Video.fromJson(e as Map<String, dynamic>))
           .toList(),
       (json['videos'] as List<dynamic>?)
-          ?.map((e) => VideoInList.fromJson(e as Map<String, dynamic>))
+          ?.map((e) => Video.fromJson(e as Map<String, dynamic>))
           .toList(),
     );
 
diff --git a/lib/videos/models/video.dart b/lib/videos/models/video.dart
index 45e0e7db..2aba9999 100644
--- a/lib/videos/models/video.dart
+++ b/lib/videos/models/video.dart
@@ -1,15 +1,119 @@
-import 'package:clipious/videos/models/base_video.dart';
-import 'package:clipious/videos/models/video_in_list.dart';
+import 'package:clipious/settings/models/db/server.dart';
+import 'package:clipious/settings/models/db/video_filter.dart';
+import 'package:clipious/utils/models/sharelink.dart';
+import 'package:clipious/videos/models/ided_video.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:json_annotation/json_annotation.dart';
 
 import '../../utils/models/image_object.dart';
 import 'adaptive_format.dart';
 import 'caption.dart';
 import 'format_stream.dart';
-import 'recommended_video.dart';
 
 part 'video.g.dart';
 
+part 'video.freezed.dart';
+
+@freezed
+class Video with _$Video implements ShareLinks, IdedVideo {
+  @Implements<ShareLinks>()
+  @Implements<IdedVideo>()
+  const factory Video(
+      {required String videoId,
+      int? viewCount,
+      int? published,
+      int? index,
+      String? indexId,
+      String? publishedText,
+      bool? isUpcoming,
+      int? premiereTimestamp,
+      String? dashUrl,
+      String? description,
+      String? descriptionHtml,
+      @Default([]) List<String> keywords,
+      int? likeCount,
+      int? dislikeCount,
+      bool? paid,
+      bool? premium,
+      bool? isFamilyFriendly,
+      @Default([]) List<String> allowedRegions,
+      String? genre,
+      String? genreUrl,
+      @Default([]) List<ImageObject> authorThumbnails,
+      String? subCountText,
+      @Default(false) bool allowRatings,
+      double? rating,
+      bool? isListed,
+      bool? liveNow,
+      String? hlsUrl,
+      List<AdaptiveFormat>? adaptiveFormats,
+      List<FormatStream>? formatStreams,
+      @Default([]) List<Caption> captions,
+      @Default([]) List<Video> recommendedVideos,
+      String? title,
+      int? lengthSeconds,
+      String? author,
+      String? authorId,
+      String? authorUrl,
+      @Default([]) List<ImageObject> videoThumbnails,
+      @JsonKey(includeFromJson: false, includeToJson: false)
+      @Default(false)
+      bool filtered,
+      @JsonKey(includeFromJson: false, includeToJson: false)
+      @Default([])
+      List<VideoFilter> matchedFilters,
+      @JsonKey(includeFromJson: false, includeToJson: false)
+      @Default(false)
+      bool filterHide,
+      @JsonKey(includeFromJson: false, includeToJson: false)
+      @Default(false)
+      bool deArrowed,
+      @JsonKey(includeFromJson: false, includeToJson: false)
+      String? deArrowThumbnailUrl,
+      String? viewCountText}) = _Video;
+
+  const Video._();
+
+  factory Video.fromJson(Map<String, Object?> json) => _$VideoFromJson(json);
+
+  @override
+  String getInvidiousLink(Server server, int? timestamp) {
+    String link = '${server.url}/watch?v=$videoId';
+
+    if (timestamp != null) link += '&t=$timestamp';
+
+    return link;
+  }
+
+  @override
+  String getRedirectLink(int? timestamp) {
+    String link = 'https://redirect.invidious.io/watch?v=$videoId';
+
+    if (timestamp != null) link += '&t=$timestamp';
+
+    return link;
+  }
+
+  @override
+  String getYoutubeLink(int? timestamp) {
+    String link = 'https://youtu.be/$videoId';
+
+    if (timestamp != null) link += '?t=$timestamp';
+
+    return link;
+  }
+
+  ImageObject? getBestThumbnail() {
+    if (videoThumbnails.isNotEmpty) {
+      return videoThumbnails
+          .firstWhere((element) => element.quality == 'maxres');
+    } else {
+      return null;
+    }
+  }
+}
+
+/*
 @JsonSerializable()
 class Video extends BaseVideo {
   String dashUrl;
@@ -86,18 +190,10 @@ class Video extends BaseVideo {
 
   Map<String, dynamic> toJson() => _$VideoToJson(this);
 
-  ImageObject? getBestThumbnail() {
-    if (videoThumbnails.isNotEmpty) {
-      return videoThumbnails
-          .firstWhere((element) => element.quality == 'maxres');
-    } else {
-      return null;
-    }
-  }
-
   @override
   VideoInList toVideoInList() {
     return VideoInList(title, videoId, lengthSeconds, viewCount, author,
         authorId, authorUrl, published, publishedText, videoThumbnails);
   }
 }
+*/
diff --git a/lib/videos/models/video.freezed.dart b/lib/videos/models/video.freezed.dart
new file mode 100644
index 00000000..dbb84c7e
--- /dev/null
+++ b/lib/videos/models/video.freezed.dart
@@ -0,0 +1,1186 @@
+// coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'video.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+T _$identity<T>(T value) => value;
+
+final _privateConstructorUsedError = UnsupportedError(
+    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
+
+Video _$VideoFromJson(Map<String, dynamic> json) {
+  return _Video.fromJson(json);
+}
+
+/// @nodoc
+mixin _$Video {
+  String get videoId => throw _privateConstructorUsedError;
+  int? get viewCount => throw _privateConstructorUsedError;
+  int? get published => throw _privateConstructorUsedError;
+  int? get index => throw _privateConstructorUsedError;
+  String? get indexId => throw _privateConstructorUsedError;
+  String? get publishedText => throw _privateConstructorUsedError;
+  bool? get isUpcoming => throw _privateConstructorUsedError;
+  int? get premiereTimestamp => throw _privateConstructorUsedError;
+  String? get dashUrl => throw _privateConstructorUsedError;
+  String? get description => throw _privateConstructorUsedError;
+  String? get descriptionHtml => throw _privateConstructorUsedError;
+  List<String> get keywords => throw _privateConstructorUsedError;
+  int? get likeCount => throw _privateConstructorUsedError;
+  int? get dislikeCount => throw _privateConstructorUsedError;
+  bool? get paid => throw _privateConstructorUsedError;
+  bool? get premium => throw _privateConstructorUsedError;
+  bool? get isFamilyFriendly => throw _privateConstructorUsedError;
+  List<String> get allowedRegions => throw _privateConstructorUsedError;
+  String? get genre => throw _privateConstructorUsedError;
+  String? get genreUrl => throw _privateConstructorUsedError;
+  List<ImageObject> get authorThumbnails => throw _privateConstructorUsedError;
+  String? get subCountText => throw _privateConstructorUsedError;
+  bool get allowRatings => throw _privateConstructorUsedError;
+  double? get rating => throw _privateConstructorUsedError;
+  bool? get isListed => throw _privateConstructorUsedError;
+  bool? get liveNow => throw _privateConstructorUsedError;
+  String? get hlsUrl => throw _privateConstructorUsedError;
+  List<AdaptiveFormat>? get adaptiveFormats =>
+      throw _privateConstructorUsedError;
+  List<FormatStream>? get formatStreams => throw _privateConstructorUsedError;
+  List<Caption> get captions => throw _privateConstructorUsedError;
+  List<Video> get recommendedVideos => throw _privateConstructorUsedError;
+  String? get title => throw _privateConstructorUsedError;
+  int? get lengthSeconds => throw _privateConstructorUsedError;
+  String? get author => throw _privateConstructorUsedError;
+  String? get authorId => throw _privateConstructorUsedError;
+  String? get authorUrl => throw _privateConstructorUsedError;
+  List<ImageObject> get videoThumbnails => throw _privateConstructorUsedError;
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  bool get filtered => throw _privateConstructorUsedError;
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  List<VideoFilter> get matchedFilters => throw _privateConstructorUsedError;
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  bool get filterHide => throw _privateConstructorUsedError;
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  bool get deArrowed => throw _privateConstructorUsedError;
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  String? get deArrowThumbnailUrl => throw _privateConstructorUsedError;
+  String? get viewCountText => throw _privateConstructorUsedError;
+
+  /// Serializes this Video to a JSON map.
+  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
+
+  /// Create a copy of Video
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  $VideoCopyWith<Video> get copyWith => throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $VideoCopyWith<$Res> {
+  factory $VideoCopyWith(Video value, $Res Function(Video) then) =
+      _$VideoCopyWithImpl<$Res, Video>;
+  @useResult
+  $Res call(
+      {String videoId,
+      int? viewCount,
+      int? published,
+      int? index,
+      String? indexId,
+      String? publishedText,
+      bool? isUpcoming,
+      int? premiereTimestamp,
+      String? dashUrl,
+      String? description,
+      String? descriptionHtml,
+      List<String> keywords,
+      int? likeCount,
+      int? dislikeCount,
+      bool? paid,
+      bool? premium,
+      bool? isFamilyFriendly,
+      List<String> allowedRegions,
+      String? genre,
+      String? genreUrl,
+      List<ImageObject> authorThumbnails,
+      String? subCountText,
+      bool allowRatings,
+      double? rating,
+      bool? isListed,
+      bool? liveNow,
+      String? hlsUrl,
+      List<AdaptiveFormat>? adaptiveFormats,
+      List<FormatStream>? formatStreams,
+      List<Caption> captions,
+      List<Video> recommendedVideos,
+      String? title,
+      int? lengthSeconds,
+      String? author,
+      String? authorId,
+      String? authorUrl,
+      List<ImageObject> videoThumbnails,
+      @JsonKey(includeFromJson: false, includeToJson: false) bool filtered,
+      @JsonKey(includeFromJson: false, includeToJson: false)
+      List<VideoFilter> matchedFilters,
+      @JsonKey(includeFromJson: false, includeToJson: false) bool filterHide,
+      @JsonKey(includeFromJson: false, includeToJson: false) bool deArrowed,
+      @JsonKey(includeFromJson: false, includeToJson: false)
+      String? deArrowThumbnailUrl,
+      String? viewCountText});
+}
+
+/// @nodoc
+class _$VideoCopyWithImpl<$Res, $Val extends Video>
+    implements $VideoCopyWith<$Res> {
+  _$VideoCopyWithImpl(this._value, this._then);
+
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+
+  /// Create a copy of Video
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? videoId = null,
+    Object? viewCount = freezed,
+    Object? published = freezed,
+    Object? index = freezed,
+    Object? indexId = freezed,
+    Object? publishedText = freezed,
+    Object? isUpcoming = freezed,
+    Object? premiereTimestamp = freezed,
+    Object? dashUrl = freezed,
+    Object? description = freezed,
+    Object? descriptionHtml = freezed,
+    Object? keywords = null,
+    Object? likeCount = freezed,
+    Object? dislikeCount = freezed,
+    Object? paid = freezed,
+    Object? premium = freezed,
+    Object? isFamilyFriendly = freezed,
+    Object? allowedRegions = null,
+    Object? genre = freezed,
+    Object? genreUrl = freezed,
+    Object? authorThumbnails = null,
+    Object? subCountText = freezed,
+    Object? allowRatings = null,
+    Object? rating = freezed,
+    Object? isListed = freezed,
+    Object? liveNow = freezed,
+    Object? hlsUrl = freezed,
+    Object? adaptiveFormats = freezed,
+    Object? formatStreams = freezed,
+    Object? captions = null,
+    Object? recommendedVideos = null,
+    Object? title = freezed,
+    Object? lengthSeconds = freezed,
+    Object? author = freezed,
+    Object? authorId = freezed,
+    Object? authorUrl = freezed,
+    Object? videoThumbnails = null,
+    Object? filtered = null,
+    Object? matchedFilters = null,
+    Object? filterHide = null,
+    Object? deArrowed = null,
+    Object? deArrowThumbnailUrl = freezed,
+    Object? viewCountText = freezed,
+  }) {
+    return _then(_value.copyWith(
+      videoId: null == videoId
+          ? _value.videoId
+          : videoId // ignore: cast_nullable_to_non_nullable
+              as String,
+      viewCount: freezed == viewCount
+          ? _value.viewCount
+          : viewCount // ignore: cast_nullable_to_non_nullable
+              as int?,
+      published: freezed == published
+          ? _value.published
+          : published // ignore: cast_nullable_to_non_nullable
+              as int?,
+      index: freezed == index
+          ? _value.index
+          : index // ignore: cast_nullable_to_non_nullable
+              as int?,
+      indexId: freezed == indexId
+          ? _value.indexId
+          : indexId // ignore: cast_nullable_to_non_nullable
+              as String?,
+      publishedText: freezed == publishedText
+          ? _value.publishedText
+          : publishedText // ignore: cast_nullable_to_non_nullable
+              as String?,
+      isUpcoming: freezed == isUpcoming
+          ? _value.isUpcoming
+          : isUpcoming // ignore: cast_nullable_to_non_nullable
+              as bool?,
+      premiereTimestamp: freezed == premiereTimestamp
+          ? _value.premiereTimestamp
+          : premiereTimestamp // ignore: cast_nullable_to_non_nullable
+              as int?,
+      dashUrl: freezed == dashUrl
+          ? _value.dashUrl
+          : dashUrl // ignore: cast_nullable_to_non_nullable
+              as String?,
+      description: freezed == description
+          ? _value.description
+          : description // ignore: cast_nullable_to_non_nullable
+              as String?,
+      descriptionHtml: freezed == descriptionHtml
+          ? _value.descriptionHtml
+          : descriptionHtml // ignore: cast_nullable_to_non_nullable
+              as String?,
+      keywords: null == keywords
+          ? _value.keywords
+          : keywords // ignore: cast_nullable_to_non_nullable
+              as List<String>,
+      likeCount: freezed == likeCount
+          ? _value.likeCount
+          : likeCount // ignore: cast_nullable_to_non_nullable
+              as int?,
+      dislikeCount: freezed == dislikeCount
+          ? _value.dislikeCount
+          : dislikeCount // ignore: cast_nullable_to_non_nullable
+              as int?,
+      paid: freezed == paid
+          ? _value.paid
+          : paid // ignore: cast_nullable_to_non_nullable
+              as bool?,
+      premium: freezed == premium
+          ? _value.premium
+          : premium // ignore: cast_nullable_to_non_nullable
+              as bool?,
+      isFamilyFriendly: freezed == isFamilyFriendly
+          ? _value.isFamilyFriendly
+          : isFamilyFriendly // ignore: cast_nullable_to_non_nullable
+              as bool?,
+      allowedRegions: null == allowedRegions
+          ? _value.allowedRegions
+          : allowedRegions // ignore: cast_nullable_to_non_nullable
+              as List<String>,
+      genre: freezed == genre
+          ? _value.genre
+          : genre // ignore: cast_nullable_to_non_nullable
+              as String?,
+      genreUrl: freezed == genreUrl
+          ? _value.genreUrl
+          : genreUrl // ignore: cast_nullable_to_non_nullable
+              as String?,
+      authorThumbnails: null == authorThumbnails
+          ? _value.authorThumbnails
+          : authorThumbnails // ignore: cast_nullable_to_non_nullable
+              as List<ImageObject>,
+      subCountText: freezed == subCountText
+          ? _value.subCountText
+          : subCountText // ignore: cast_nullable_to_non_nullable
+              as String?,
+      allowRatings: null == allowRatings
+          ? _value.allowRatings
+          : allowRatings // ignore: cast_nullable_to_non_nullable
+              as bool,
+      rating: freezed == rating
+          ? _value.rating
+          : rating // ignore: cast_nullable_to_non_nullable
+              as double?,
+      isListed: freezed == isListed
+          ? _value.isListed
+          : isListed // ignore: cast_nullable_to_non_nullable
+              as bool?,
+      liveNow: freezed == liveNow
+          ? _value.liveNow
+          : liveNow // ignore: cast_nullable_to_non_nullable
+              as bool?,
+      hlsUrl: freezed == hlsUrl
+          ? _value.hlsUrl
+          : hlsUrl // ignore: cast_nullable_to_non_nullable
+              as String?,
+      adaptiveFormats: freezed == adaptiveFormats
+          ? _value.adaptiveFormats
+          : adaptiveFormats // ignore: cast_nullable_to_non_nullable
+              as List<AdaptiveFormat>?,
+      formatStreams: freezed == formatStreams
+          ? _value.formatStreams
+          : formatStreams // ignore: cast_nullable_to_non_nullable
+              as List<FormatStream>?,
+      captions: null == captions
+          ? _value.captions
+          : captions // ignore: cast_nullable_to_non_nullable
+              as List<Caption>,
+      recommendedVideos: null == recommendedVideos
+          ? _value.recommendedVideos
+          : recommendedVideos // ignore: cast_nullable_to_non_nullable
+              as List<Video>,
+      title: freezed == title
+          ? _value.title
+          : title // ignore: cast_nullable_to_non_nullable
+              as String?,
+      lengthSeconds: freezed == lengthSeconds
+          ? _value.lengthSeconds
+          : lengthSeconds // ignore: cast_nullable_to_non_nullable
+              as int?,
+      author: freezed == author
+          ? _value.author
+          : author // ignore: cast_nullable_to_non_nullable
+              as String?,
+      authorId: freezed == authorId
+          ? _value.authorId
+          : authorId // ignore: cast_nullable_to_non_nullable
+              as String?,
+      authorUrl: freezed == authorUrl
+          ? _value.authorUrl
+          : authorUrl // ignore: cast_nullable_to_non_nullable
+              as String?,
+      videoThumbnails: null == videoThumbnails
+          ? _value.videoThumbnails
+          : videoThumbnails // ignore: cast_nullable_to_non_nullable
+              as List<ImageObject>,
+      filtered: null == filtered
+          ? _value.filtered
+          : filtered // ignore: cast_nullable_to_non_nullable
+              as bool,
+      matchedFilters: null == matchedFilters
+          ? _value.matchedFilters
+          : matchedFilters // ignore: cast_nullable_to_non_nullable
+              as List<VideoFilter>,
+      filterHide: null == filterHide
+          ? _value.filterHide
+          : filterHide // ignore: cast_nullable_to_non_nullable
+              as bool,
+      deArrowed: null == deArrowed
+          ? _value.deArrowed
+          : deArrowed // ignore: cast_nullable_to_non_nullable
+              as bool,
+      deArrowThumbnailUrl: freezed == deArrowThumbnailUrl
+          ? _value.deArrowThumbnailUrl
+          : deArrowThumbnailUrl // ignore: cast_nullable_to_non_nullable
+              as String?,
+      viewCountText: freezed == viewCountText
+          ? _value.viewCountText
+          : viewCountText // ignore: cast_nullable_to_non_nullable
+              as String?,
+    ) as $Val);
+  }
+}
+
+/// @nodoc
+abstract class _$$VideoImplCopyWith<$Res> implements $VideoCopyWith<$Res> {
+  factory _$$VideoImplCopyWith(
+          _$VideoImpl value, $Res Function(_$VideoImpl) then) =
+      __$$VideoImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call(
+      {String videoId,
+      int? viewCount,
+      int? published,
+      int? index,
+      String? indexId,
+      String? publishedText,
+      bool? isUpcoming,
+      int? premiereTimestamp,
+      String? dashUrl,
+      String? description,
+      String? descriptionHtml,
+      List<String> keywords,
+      int? likeCount,
+      int? dislikeCount,
+      bool? paid,
+      bool? premium,
+      bool? isFamilyFriendly,
+      List<String> allowedRegions,
+      String? genre,
+      String? genreUrl,
+      List<ImageObject> authorThumbnails,
+      String? subCountText,
+      bool allowRatings,
+      double? rating,
+      bool? isListed,
+      bool? liveNow,
+      String? hlsUrl,
+      List<AdaptiveFormat>? adaptiveFormats,
+      List<FormatStream>? formatStreams,
+      List<Caption> captions,
+      List<Video> recommendedVideos,
+      String? title,
+      int? lengthSeconds,
+      String? author,
+      String? authorId,
+      String? authorUrl,
+      List<ImageObject> videoThumbnails,
+      @JsonKey(includeFromJson: false, includeToJson: false) bool filtered,
+      @JsonKey(includeFromJson: false, includeToJson: false)
+      List<VideoFilter> matchedFilters,
+      @JsonKey(includeFromJson: false, includeToJson: false) bool filterHide,
+      @JsonKey(includeFromJson: false, includeToJson: false) bool deArrowed,
+      @JsonKey(includeFromJson: false, includeToJson: false)
+      String? deArrowThumbnailUrl,
+      String? viewCountText});
+}
+
+/// @nodoc
+class __$$VideoImplCopyWithImpl<$Res>
+    extends _$VideoCopyWithImpl<$Res, _$VideoImpl>
+    implements _$$VideoImplCopyWith<$Res> {
+  __$$VideoImplCopyWithImpl(
+      _$VideoImpl _value, $Res Function(_$VideoImpl) _then)
+      : super(_value, _then);
+
+  /// Create a copy of Video
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? videoId = null,
+    Object? viewCount = freezed,
+    Object? published = freezed,
+    Object? index = freezed,
+    Object? indexId = freezed,
+    Object? publishedText = freezed,
+    Object? isUpcoming = freezed,
+    Object? premiereTimestamp = freezed,
+    Object? dashUrl = freezed,
+    Object? description = freezed,
+    Object? descriptionHtml = freezed,
+    Object? keywords = null,
+    Object? likeCount = freezed,
+    Object? dislikeCount = freezed,
+    Object? paid = freezed,
+    Object? premium = freezed,
+    Object? isFamilyFriendly = freezed,
+    Object? allowedRegions = null,
+    Object? genre = freezed,
+    Object? genreUrl = freezed,
+    Object? authorThumbnails = null,
+    Object? subCountText = freezed,
+    Object? allowRatings = null,
+    Object? rating = freezed,
+    Object? isListed = freezed,
+    Object? liveNow = freezed,
+    Object? hlsUrl = freezed,
+    Object? adaptiveFormats = freezed,
+    Object? formatStreams = freezed,
+    Object? captions = null,
+    Object? recommendedVideos = null,
+    Object? title = freezed,
+    Object? lengthSeconds = freezed,
+    Object? author = freezed,
+    Object? authorId = freezed,
+    Object? authorUrl = freezed,
+    Object? videoThumbnails = null,
+    Object? filtered = null,
+    Object? matchedFilters = null,
+    Object? filterHide = null,
+    Object? deArrowed = null,
+    Object? deArrowThumbnailUrl = freezed,
+    Object? viewCountText = freezed,
+  }) {
+    return _then(_$VideoImpl(
+      videoId: null == videoId
+          ? _value.videoId
+          : videoId // ignore: cast_nullable_to_non_nullable
+              as String,
+      viewCount: freezed == viewCount
+          ? _value.viewCount
+          : viewCount // ignore: cast_nullable_to_non_nullable
+              as int?,
+      published: freezed == published
+          ? _value.published
+          : published // ignore: cast_nullable_to_non_nullable
+              as int?,
+      index: freezed == index
+          ? _value.index
+          : index // ignore: cast_nullable_to_non_nullable
+              as int?,
+      indexId: freezed == indexId
+          ? _value.indexId
+          : indexId // ignore: cast_nullable_to_non_nullable
+              as String?,
+      publishedText: freezed == publishedText
+          ? _value.publishedText
+          : publishedText // ignore: cast_nullable_to_non_nullable
+              as String?,
+      isUpcoming: freezed == isUpcoming
+          ? _value.isUpcoming
+          : isUpcoming // ignore: cast_nullable_to_non_nullable
+              as bool?,
+      premiereTimestamp: freezed == premiereTimestamp
+          ? _value.premiereTimestamp
+          : premiereTimestamp // ignore: cast_nullable_to_non_nullable
+              as int?,
+      dashUrl: freezed == dashUrl
+          ? _value.dashUrl
+          : dashUrl // ignore: cast_nullable_to_non_nullable
+              as String?,
+      description: freezed == description
+          ? _value.description
+          : description // ignore: cast_nullable_to_non_nullable
+              as String?,
+      descriptionHtml: freezed == descriptionHtml
+          ? _value.descriptionHtml
+          : descriptionHtml // ignore: cast_nullable_to_non_nullable
+              as String?,
+      keywords: null == keywords
+          ? _value._keywords
+          : keywords // ignore: cast_nullable_to_non_nullable
+              as List<String>,
+      likeCount: freezed == likeCount
+          ? _value.likeCount
+          : likeCount // ignore: cast_nullable_to_non_nullable
+              as int?,
+      dislikeCount: freezed == dislikeCount
+          ? _value.dislikeCount
+          : dislikeCount // ignore: cast_nullable_to_non_nullable
+              as int?,
+      paid: freezed == paid
+          ? _value.paid
+          : paid // ignore: cast_nullable_to_non_nullable
+              as bool?,
+      premium: freezed == premium
+          ? _value.premium
+          : premium // ignore: cast_nullable_to_non_nullable
+              as bool?,
+      isFamilyFriendly: freezed == isFamilyFriendly
+          ? _value.isFamilyFriendly
+          : isFamilyFriendly // ignore: cast_nullable_to_non_nullable
+              as bool?,
+      allowedRegions: null == allowedRegions
+          ? _value._allowedRegions
+          : allowedRegions // ignore: cast_nullable_to_non_nullable
+              as List<String>,
+      genre: freezed == genre
+          ? _value.genre
+          : genre // ignore: cast_nullable_to_non_nullable
+              as String?,
+      genreUrl: freezed == genreUrl
+          ? _value.genreUrl
+          : genreUrl // ignore: cast_nullable_to_non_nullable
+              as String?,
+      authorThumbnails: null == authorThumbnails
+          ? _value._authorThumbnails
+          : authorThumbnails // ignore: cast_nullable_to_non_nullable
+              as List<ImageObject>,
+      subCountText: freezed == subCountText
+          ? _value.subCountText
+          : subCountText // ignore: cast_nullable_to_non_nullable
+              as String?,
+      allowRatings: null == allowRatings
+          ? _value.allowRatings
+          : allowRatings // ignore: cast_nullable_to_non_nullable
+              as bool,
+      rating: freezed == rating
+          ? _value.rating
+          : rating // ignore: cast_nullable_to_non_nullable
+              as double?,
+      isListed: freezed == isListed
+          ? _value.isListed
+          : isListed // ignore: cast_nullable_to_non_nullable
+              as bool?,
+      liveNow: freezed == liveNow
+          ? _value.liveNow
+          : liveNow // ignore: cast_nullable_to_non_nullable
+              as bool?,
+      hlsUrl: freezed == hlsUrl
+          ? _value.hlsUrl
+          : hlsUrl // ignore: cast_nullable_to_non_nullable
+              as String?,
+      adaptiveFormats: freezed == adaptiveFormats
+          ? _value._adaptiveFormats
+          : adaptiveFormats // ignore: cast_nullable_to_non_nullable
+              as List<AdaptiveFormat>?,
+      formatStreams: freezed == formatStreams
+          ? _value._formatStreams
+          : formatStreams // ignore: cast_nullable_to_non_nullable
+              as List<FormatStream>?,
+      captions: null == captions
+          ? _value._captions
+          : captions // ignore: cast_nullable_to_non_nullable
+              as List<Caption>,
+      recommendedVideos: null == recommendedVideos
+          ? _value._recommendedVideos
+          : recommendedVideos // ignore: cast_nullable_to_non_nullable
+              as List<Video>,
+      title: freezed == title
+          ? _value.title
+          : title // ignore: cast_nullable_to_non_nullable
+              as String?,
+      lengthSeconds: freezed == lengthSeconds
+          ? _value.lengthSeconds
+          : lengthSeconds // ignore: cast_nullable_to_non_nullable
+              as int?,
+      author: freezed == author
+          ? _value.author
+          : author // ignore: cast_nullable_to_non_nullable
+              as String?,
+      authorId: freezed == authorId
+          ? _value.authorId
+          : authorId // ignore: cast_nullable_to_non_nullable
+              as String?,
+      authorUrl: freezed == authorUrl
+          ? _value.authorUrl
+          : authorUrl // ignore: cast_nullable_to_non_nullable
+              as String?,
+      videoThumbnails: null == videoThumbnails
+          ? _value._videoThumbnails
+          : videoThumbnails // ignore: cast_nullable_to_non_nullable
+              as List<ImageObject>,
+      filtered: null == filtered
+          ? _value.filtered
+          : filtered // ignore: cast_nullable_to_non_nullable
+              as bool,
+      matchedFilters: null == matchedFilters
+          ? _value._matchedFilters
+          : matchedFilters // ignore: cast_nullable_to_non_nullable
+              as List<VideoFilter>,
+      filterHide: null == filterHide
+          ? _value.filterHide
+          : filterHide // ignore: cast_nullable_to_non_nullable
+              as bool,
+      deArrowed: null == deArrowed
+          ? _value.deArrowed
+          : deArrowed // ignore: cast_nullable_to_non_nullable
+              as bool,
+      deArrowThumbnailUrl: freezed == deArrowThumbnailUrl
+          ? _value.deArrowThumbnailUrl
+          : deArrowThumbnailUrl // ignore: cast_nullable_to_non_nullable
+              as String?,
+      viewCountText: freezed == viewCountText
+          ? _value.viewCountText
+          : viewCountText // ignore: cast_nullable_to_non_nullable
+              as String?,
+    ));
+  }
+}
+
+/// @nodoc
+@JsonSerializable()
+class _$VideoImpl extends _Video {
+  const _$VideoImpl(
+      {required this.videoId,
+      this.viewCount,
+      this.published,
+      this.index,
+      this.indexId,
+      this.publishedText,
+      this.isUpcoming,
+      this.premiereTimestamp,
+      this.dashUrl,
+      this.description,
+      this.descriptionHtml,
+      final List<String> keywords = const [],
+      this.likeCount,
+      this.dislikeCount,
+      this.paid,
+      this.premium,
+      this.isFamilyFriendly,
+      final List<String> allowedRegions = const [],
+      this.genre,
+      this.genreUrl,
+      final List<ImageObject> authorThumbnails = const [],
+      this.subCountText,
+      this.allowRatings = false,
+      this.rating,
+      this.isListed,
+      this.liveNow,
+      this.hlsUrl,
+      final List<AdaptiveFormat>? adaptiveFormats,
+      final List<FormatStream>? formatStreams,
+      final List<Caption> captions = const [],
+      final List<Video> recommendedVideos = const [],
+      this.title,
+      this.lengthSeconds,
+      this.author,
+      this.authorId,
+      this.authorUrl,
+      final List<ImageObject> videoThumbnails = const [],
+      @JsonKey(includeFromJson: false, includeToJson: false)
+      this.filtered = false,
+      @JsonKey(includeFromJson: false, includeToJson: false)
+      final List<VideoFilter> matchedFilters = const [],
+      @JsonKey(includeFromJson: false, includeToJson: false)
+      this.filterHide = false,
+      @JsonKey(includeFromJson: false, includeToJson: false)
+      this.deArrowed = false,
+      @JsonKey(includeFromJson: false, includeToJson: false)
+      this.deArrowThumbnailUrl,
+      this.viewCountText})
+      : _keywords = keywords,
+        _allowedRegions = allowedRegions,
+        _authorThumbnails = authorThumbnails,
+        _adaptiveFormats = adaptiveFormats,
+        _formatStreams = formatStreams,
+        _captions = captions,
+        _recommendedVideos = recommendedVideos,
+        _videoThumbnails = videoThumbnails,
+        _matchedFilters = matchedFilters,
+        super._();
+
+  factory _$VideoImpl.fromJson(Map<String, dynamic> json) =>
+      _$$VideoImplFromJson(json);
+
+  @override
+  final String videoId;
+  @override
+  final int? viewCount;
+  @override
+  final int? published;
+  @override
+  final int? index;
+  @override
+  final String? indexId;
+  @override
+  final String? publishedText;
+  @override
+  final bool? isUpcoming;
+  @override
+  final int? premiereTimestamp;
+  @override
+  final String? dashUrl;
+  @override
+  final String? description;
+  @override
+  final String? descriptionHtml;
+  final List<String> _keywords;
+  @override
+  @JsonKey()
+  List<String> get keywords {
+    if (_keywords is EqualUnmodifiableListView) return _keywords;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_keywords);
+  }
+
+  @override
+  final int? likeCount;
+  @override
+  final int? dislikeCount;
+  @override
+  final bool? paid;
+  @override
+  final bool? premium;
+  @override
+  final bool? isFamilyFriendly;
+  final List<String> _allowedRegions;
+  @override
+  @JsonKey()
+  List<String> get allowedRegions {
+    if (_allowedRegions is EqualUnmodifiableListView) return _allowedRegions;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_allowedRegions);
+  }
+
+  @override
+  final String? genre;
+  @override
+  final String? genreUrl;
+  final List<ImageObject> _authorThumbnails;
+  @override
+  @JsonKey()
+  List<ImageObject> get authorThumbnails {
+    if (_authorThumbnails is EqualUnmodifiableListView)
+      return _authorThumbnails;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_authorThumbnails);
+  }
+
+  @override
+  final String? subCountText;
+  @override
+  @JsonKey()
+  final bool allowRatings;
+  @override
+  final double? rating;
+  @override
+  final bool? isListed;
+  @override
+  final bool? liveNow;
+  @override
+  final String? hlsUrl;
+  final List<AdaptiveFormat>? _adaptiveFormats;
+  @override
+  List<AdaptiveFormat>? get adaptiveFormats {
+    final value = _adaptiveFormats;
+    if (value == null) return null;
+    if (_adaptiveFormats is EqualUnmodifiableListView) return _adaptiveFormats;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(value);
+  }
+
+  final List<FormatStream>? _formatStreams;
+  @override
+  List<FormatStream>? get formatStreams {
+    final value = _formatStreams;
+    if (value == null) return null;
+    if (_formatStreams is EqualUnmodifiableListView) return _formatStreams;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(value);
+  }
+
+  final List<Caption> _captions;
+  @override
+  @JsonKey()
+  List<Caption> get captions {
+    if (_captions is EqualUnmodifiableListView) return _captions;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_captions);
+  }
+
+  final List<Video> _recommendedVideos;
+  @override
+  @JsonKey()
+  List<Video> get recommendedVideos {
+    if (_recommendedVideos is EqualUnmodifiableListView)
+      return _recommendedVideos;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_recommendedVideos);
+  }
+
+  @override
+  final String? title;
+  @override
+  final int? lengthSeconds;
+  @override
+  final String? author;
+  @override
+  final String? authorId;
+  @override
+  final String? authorUrl;
+  final List<ImageObject> _videoThumbnails;
+  @override
+  @JsonKey()
+  List<ImageObject> get videoThumbnails {
+    if (_videoThumbnails is EqualUnmodifiableListView) return _videoThumbnails;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_videoThumbnails);
+  }
+
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  final bool filtered;
+  final List<VideoFilter> _matchedFilters;
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  List<VideoFilter> get matchedFilters {
+    if (_matchedFilters is EqualUnmodifiableListView) return _matchedFilters;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_matchedFilters);
+  }
+
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  final bool filterHide;
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  final bool deArrowed;
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  final String? deArrowThumbnailUrl;
+  @override
+  final String? viewCountText;
+
+  @override
+  String toString() {
+    return 'Video(videoId: $videoId, viewCount: $viewCount, published: $published, index: $index, indexId: $indexId, publishedText: $publishedText, isUpcoming: $isUpcoming, premiereTimestamp: $premiereTimestamp, dashUrl: $dashUrl, description: $description, descriptionHtml: $descriptionHtml, keywords: $keywords, likeCount: $likeCount, dislikeCount: $dislikeCount, paid: $paid, premium: $premium, isFamilyFriendly: $isFamilyFriendly, allowedRegions: $allowedRegions, genre: $genre, genreUrl: $genreUrl, authorThumbnails: $authorThumbnails, subCountText: $subCountText, allowRatings: $allowRatings, rating: $rating, isListed: $isListed, liveNow: $liveNow, hlsUrl: $hlsUrl, adaptiveFormats: $adaptiveFormats, formatStreams: $formatStreams, captions: $captions, recommendedVideos: $recommendedVideos, title: $title, lengthSeconds: $lengthSeconds, author: $author, authorId: $authorId, authorUrl: $authorUrl, videoThumbnails: $videoThumbnails, filtered: $filtered, matchedFilters: $matchedFilters, filterHide: $filterHide, deArrowed: $deArrowed, deArrowThumbnailUrl: $deArrowThumbnailUrl, viewCountText: $viewCountText)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$VideoImpl &&
+            (identical(other.videoId, videoId) || other.videoId == videoId) &&
+            (identical(other.viewCount, viewCount) ||
+                other.viewCount == viewCount) &&
+            (identical(other.published, published) ||
+                other.published == published) &&
+            (identical(other.index, index) || other.index == index) &&
+            (identical(other.indexId, indexId) || other.indexId == indexId) &&
+            (identical(other.publishedText, publishedText) ||
+                other.publishedText == publishedText) &&
+            (identical(other.isUpcoming, isUpcoming) ||
+                other.isUpcoming == isUpcoming) &&
+            (identical(other.premiereTimestamp, premiereTimestamp) ||
+                other.premiereTimestamp == premiereTimestamp) &&
+            (identical(other.dashUrl, dashUrl) || other.dashUrl == dashUrl) &&
+            (identical(other.description, description) ||
+                other.description == description) &&
+            (identical(other.descriptionHtml, descriptionHtml) ||
+                other.descriptionHtml == descriptionHtml) &&
+            const DeepCollectionEquality().equals(other._keywords, _keywords) &&
+            (identical(other.likeCount, likeCount) ||
+                other.likeCount == likeCount) &&
+            (identical(other.dislikeCount, dislikeCount) ||
+                other.dislikeCount == dislikeCount) &&
+            (identical(other.paid, paid) || other.paid == paid) &&
+            (identical(other.premium, premium) || other.premium == premium) &&
+            (identical(other.isFamilyFriendly, isFamilyFriendly) ||
+                other.isFamilyFriendly == isFamilyFriendly) &&
+            const DeepCollectionEquality()
+                .equals(other._allowedRegions, _allowedRegions) &&
+            (identical(other.genre, genre) || other.genre == genre) &&
+            (identical(other.genreUrl, genreUrl) ||
+                other.genreUrl == genreUrl) &&
+            const DeepCollectionEquality()
+                .equals(other._authorThumbnails, _authorThumbnails) &&
+            (identical(other.subCountText, subCountText) ||
+                other.subCountText == subCountText) &&
+            (identical(other.allowRatings, allowRatings) ||
+                other.allowRatings == allowRatings) &&
+            (identical(other.rating, rating) || other.rating == rating) &&
+            (identical(other.isListed, isListed) ||
+                other.isListed == isListed) &&
+            (identical(other.liveNow, liveNow) || other.liveNow == liveNow) &&
+            (identical(other.hlsUrl, hlsUrl) || other.hlsUrl == hlsUrl) &&
+            const DeepCollectionEquality()
+                .equals(other._adaptiveFormats, _adaptiveFormats) &&
+            const DeepCollectionEquality()
+                .equals(other._formatStreams, _formatStreams) &&
+            const DeepCollectionEquality().equals(other._captions, _captions) &&
+            const DeepCollectionEquality()
+                .equals(other._recommendedVideos, _recommendedVideos) &&
+            (identical(other.title, title) || other.title == title) &&
+            (identical(other.lengthSeconds, lengthSeconds) ||
+                other.lengthSeconds == lengthSeconds) &&
+            (identical(other.author, author) || other.author == author) &&
+            (identical(other.authorId, authorId) ||
+                other.authorId == authorId) &&
+            (identical(other.authorUrl, authorUrl) ||
+                other.authorUrl == authorUrl) &&
+            const DeepCollectionEquality()
+                .equals(other._videoThumbnails, _videoThumbnails) &&
+            (identical(other.filtered, filtered) ||
+                other.filtered == filtered) &&
+            const DeepCollectionEquality()
+                .equals(other._matchedFilters, _matchedFilters) &&
+            (identical(other.filterHide, filterHide) ||
+                other.filterHide == filterHide) &&
+            (identical(other.deArrowed, deArrowed) ||
+                other.deArrowed == deArrowed) &&
+            (identical(other.deArrowThumbnailUrl, deArrowThumbnailUrl) ||
+                other.deArrowThumbnailUrl == deArrowThumbnailUrl) &&
+            (identical(other.viewCountText, viewCountText) ||
+                other.viewCountText == viewCountText));
+  }
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  int get hashCode => Object.hashAll([
+        runtimeType,
+        videoId,
+        viewCount,
+        published,
+        index,
+        indexId,
+        publishedText,
+        isUpcoming,
+        premiereTimestamp,
+        dashUrl,
+        description,
+        descriptionHtml,
+        const DeepCollectionEquality().hash(_keywords),
+        likeCount,
+        dislikeCount,
+        paid,
+        premium,
+        isFamilyFriendly,
+        const DeepCollectionEquality().hash(_allowedRegions),
+        genre,
+        genreUrl,
+        const DeepCollectionEquality().hash(_authorThumbnails),
+        subCountText,
+        allowRatings,
+        rating,
+        isListed,
+        liveNow,
+        hlsUrl,
+        const DeepCollectionEquality().hash(_adaptiveFormats),
+        const DeepCollectionEquality().hash(_formatStreams),
+        const DeepCollectionEquality().hash(_captions),
+        const DeepCollectionEquality().hash(_recommendedVideos),
+        title,
+        lengthSeconds,
+        author,
+        authorId,
+        authorUrl,
+        const DeepCollectionEquality().hash(_videoThumbnails),
+        filtered,
+        const DeepCollectionEquality().hash(_matchedFilters),
+        filterHide,
+        deArrowed,
+        deArrowThumbnailUrl,
+        viewCountText
+      ]);
+
+  /// Create a copy of Video
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$VideoImplCopyWith<_$VideoImpl> get copyWith =>
+      __$$VideoImplCopyWithImpl<_$VideoImpl>(this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$$VideoImplToJson(
+      this,
+    );
+  }
+}
+
+abstract class _Video extends Video implements ShareLinks, IdedVideo {
+  const factory _Video(
+      {required final String videoId,
+      final int? viewCount,
+      final int? published,
+      final int? index,
+      final String? indexId,
+      final String? publishedText,
+      final bool? isUpcoming,
+      final int? premiereTimestamp,
+      final String? dashUrl,
+      final String? description,
+      final String? descriptionHtml,
+      final List<String> keywords,
+      final int? likeCount,
+      final int? dislikeCount,
+      final bool? paid,
+      final bool? premium,
+      final bool? isFamilyFriendly,
+      final List<String> allowedRegions,
+      final String? genre,
+      final String? genreUrl,
+      final List<ImageObject> authorThumbnails,
+      final String? subCountText,
+      final bool allowRatings,
+      final double? rating,
+      final bool? isListed,
+      final bool? liveNow,
+      final String? hlsUrl,
+      final List<AdaptiveFormat>? adaptiveFormats,
+      final List<FormatStream>? formatStreams,
+      final List<Caption> captions,
+      final List<Video> recommendedVideos,
+      final String? title,
+      final int? lengthSeconds,
+      final String? author,
+      final String? authorId,
+      final String? authorUrl,
+      final List<ImageObject> videoThumbnails,
+      @JsonKey(includeFromJson: false, includeToJson: false)
+      final bool filtered,
+      @JsonKey(includeFromJson: false, includeToJson: false)
+      final List<VideoFilter> matchedFilters,
+      @JsonKey(includeFromJson: false, includeToJson: false)
+      final bool filterHide,
+      @JsonKey(includeFromJson: false, includeToJson: false)
+      final bool deArrowed,
+      @JsonKey(includeFromJson: false, includeToJson: false)
+      final String? deArrowThumbnailUrl,
+      final String? viewCountText}) = _$VideoImpl;
+  const _Video._() : super._();
+
+  factory _Video.fromJson(Map<String, dynamic> json) = _$VideoImpl.fromJson;
+
+  @override
+  String get videoId;
+  @override
+  int? get viewCount;
+  @override
+  int? get published;
+  @override
+  int? get index;
+  @override
+  String? get indexId;
+  @override
+  String? get publishedText;
+  @override
+  bool? get isUpcoming;
+  @override
+  int? get premiereTimestamp;
+  @override
+  String? get dashUrl;
+  @override
+  String? get description;
+  @override
+  String? get descriptionHtml;
+  @override
+  List<String> get keywords;
+  @override
+  int? get likeCount;
+  @override
+  int? get dislikeCount;
+  @override
+  bool? get paid;
+  @override
+  bool? get premium;
+  @override
+  bool? get isFamilyFriendly;
+  @override
+  List<String> get allowedRegions;
+  @override
+  String? get genre;
+  @override
+  String? get genreUrl;
+  @override
+  List<ImageObject> get authorThumbnails;
+  @override
+  String? get subCountText;
+  @override
+  bool get allowRatings;
+  @override
+  double? get rating;
+  @override
+  bool? get isListed;
+  @override
+  bool? get liveNow;
+  @override
+  String? get hlsUrl;
+  @override
+  List<AdaptiveFormat>? get adaptiveFormats;
+  @override
+  List<FormatStream>? get formatStreams;
+  @override
+  List<Caption> get captions;
+  @override
+  List<Video> get recommendedVideos;
+  @override
+  String? get title;
+  @override
+  int? get lengthSeconds;
+  @override
+  String? get author;
+  @override
+  String? get authorId;
+  @override
+  String? get authorUrl;
+  @override
+  List<ImageObject> get videoThumbnails;
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  bool get filtered;
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  List<VideoFilter> get matchedFilters;
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  bool get filterHide;
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  bool get deArrowed;
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  String? get deArrowThumbnailUrl;
+  @override
+  String? get viewCountText;
+
+  /// Create a copy of Video
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  _$$VideoImplCopyWith<_$VideoImpl> get copyWith =>
+      throw _privateConstructorUsedError;
+}
diff --git a/lib/videos/models/video.g.dart b/lib/videos/models/video.g.dart
index 76a7d486..5ac3ebdc 100644
--- a/lib/videos/models/video.g.dart
+++ b/lib/videos/models/video.g.dart
@@ -6,73 +6,83 @@ part of 'video.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-Video _$VideoFromJson(Map<String, dynamic> json) => Video(
-      json['title'] as String,
-      json['videoId'] as String,
-      (json['videoThumbnails'] as List<dynamic>)
-          .map((e) => ImageObject.fromJson(e as Map<String, dynamic>))
+_$VideoImpl _$$VideoImplFromJson(Map<String, dynamic> json) => _$VideoImpl(
+      videoId: json['videoId'] as String,
+      viewCount: (json['viewCount'] as num?)?.toInt(),
+      published: (json['published'] as num?)?.toInt(),
+      index: (json['index'] as num?)?.toInt(),
+      indexId: json['indexId'] as String?,
+      publishedText: json['publishedText'] as String?,
+      isUpcoming: json['isUpcoming'] as bool?,
+      premiereTimestamp: (json['premiereTimestamp'] as num?)?.toInt(),
+      dashUrl: json['dashUrl'] as String?,
+      description: json['description'] as String?,
+      descriptionHtml: json['descriptionHtml'] as String?,
+      keywords: (json['keywords'] as List<dynamic>?)
+              ?.map((e) => e as String)
+              .toList() ??
+          const [],
+      likeCount: (json['likeCount'] as num?)?.toInt(),
+      dislikeCount: (json['dislikeCount'] as num?)?.toInt(),
+      paid: json['paid'] as bool?,
+      premium: json['premium'] as bool?,
+      isFamilyFriendly: json['isFamilyFriendly'] as bool?,
+      allowedRegions: (json['allowedRegions'] as List<dynamic>?)
+              ?.map((e) => e as String)
+              .toList() ??
+          const [],
+      genre: json['genre'] as String?,
+      genreUrl: json['genreUrl'] as String?,
+      authorThumbnails: (json['authorThumbnails'] as List<dynamic>?)
+              ?.map((e) => ImageObject.fromJson(e as Map<String, dynamic>))
+              .toList() ??
+          const [],
+      subCountText: json['subCountText'] as String?,
+      allowRatings: json['allowRatings'] as bool? ?? false,
+      rating: (json['rating'] as num?)?.toDouble(),
+      isListed: json['isListed'] as bool?,
+      liveNow: json['liveNow'] as bool?,
+      hlsUrl: json['hlsUrl'] as String?,
+      adaptiveFormats: (json['adaptiveFormats'] as List<dynamic>?)
+          ?.map((e) => AdaptiveFormat.fromJson(e as Map<String, dynamic>))
           .toList(),
-      json['description'] as String,
-      json['descriptionHtml'] as String,
-      (json['published'] as num).toInt(),
-      json['publishedText'] as String,
-      (json['keywords'] as List<dynamic>).map((e) => e as String).toList(),
-      (json['viewCount'] as num).toInt(),
-      (json['likeCount'] as num).toInt(),
-      (json['dislikeCount'] as num).toInt(),
-      json['paid'] as bool,
-      json['premium'] as bool,
-      json['isFamilyFriendly'] as bool,
-      (json['allowedRegions'] as List<dynamic>)
-          .map((e) => e as String)
-          .toList(),
-      json['genre'] as String,
-      json['genreUrl'] as String?,
-      json['dashUrl'] as String,
-      json['author'] as String?,
-      json['authorUrl'] as String?,
-      (json['authorThumbnails'] as List<dynamic>)
-          .map((e) => ImageObject.fromJson(e as Map<String, dynamic>))
-          .toList(),
-      json['subCountText'] as String,
-      (json['lengthSeconds'] as num).toInt(),
-      json['allowRatings'] as bool,
-      (json['rating'] as num).toDouble(),
-      json['isListed'] as bool,
-      json['liveNow'] as bool,
-      json['isUpcoming'] as bool,
-      (json['premiereTimestamp'] as num?)?.toInt(),
-      json['hlsUrl'] as String?,
-      (json['adaptiveFormats'] as List<dynamic>)
-          .map((e) => AdaptiveFormat.fromJson(e as Map<String, dynamic>))
-          .toList(),
-      (json['formatStreams'] as List<dynamic>)
-          .map((e) => FormatStream.fromJson(e as Map<String, dynamic>))
-          .toList(),
-      json['authorId'] as String?,
-      (json['captions'] as List<dynamic>)
-          .map((e) => Caption.fromJson(e as Map<String, dynamic>))
-          .toList(),
-      (json['recommendedVideos'] as List<dynamic>)
-          .map((e) => RecommendedVideo.fromJson(e as Map<String, dynamic>))
+      formatStreams: (json['formatStreams'] as List<dynamic>?)
+          ?.map((e) => FormatStream.fromJson(e as Map<String, dynamic>))
           .toList(),
+      captions: (json['captions'] as List<dynamic>?)
+              ?.map((e) => Caption.fromJson(e as Map<String, dynamic>))
+              .toList() ??
+          const [],
+      recommendedVideos: (json['recommendedVideos'] as List<dynamic>?)
+              ?.map((e) => Video.fromJson(e as Map<String, dynamic>))
+              .toList() ??
+          const [],
+      title: json['title'] as String?,
+      lengthSeconds: (json['lengthSeconds'] as num?)?.toInt(),
+      author: json['author'] as String?,
+      authorId: json['authorId'] as String?,
+      authorUrl: json['authorUrl'] as String?,
+      videoThumbnails: (json['videoThumbnails'] as List<dynamic>?)
+              ?.map((e) => ImageObject.fromJson(e as Map<String, dynamic>))
+              .toList() ??
+          const [],
+      viewCountText: json['viewCountText'] as String?,
     );
 
-Map<String, dynamic> _$VideoToJson(Video instance) => <String, dynamic>{
+Map<String, dynamic> _$$VideoImplToJson(_$VideoImpl instance) =>
+    <String, dynamic>{
       'videoId': instance.videoId,
-      'title': instance.title,
-      'lengthSeconds': instance.lengthSeconds,
-      'author': instance.author,
-      'authorId': instance.authorId,
-      'authorUrl': instance.authorUrl,
-      'videoThumbnails': instance.videoThumbnails,
+      'viewCount': instance.viewCount,
+      'published': instance.published,
+      'index': instance.index,
+      'indexId': instance.indexId,
+      'publishedText': instance.publishedText,
+      'isUpcoming': instance.isUpcoming,
+      'premiereTimestamp': instance.premiereTimestamp,
       'dashUrl': instance.dashUrl,
       'description': instance.description,
       'descriptionHtml': instance.descriptionHtml,
-      'published': instance.published,
-      'publishedText': instance.publishedText,
       'keywords': instance.keywords,
-      'viewCount': instance.viewCount,
       'likeCount': instance.likeCount,
       'dislikeCount': instance.dislikeCount,
       'paid': instance.paid,
@@ -87,11 +97,16 @@ Map<String, dynamic> _$VideoToJson(Video instance) => <String, dynamic>{
       'rating': instance.rating,
       'isListed': instance.isListed,
       'liveNow': instance.liveNow,
-      'isUpcoming': instance.isUpcoming,
-      'premiereTimestamp': instance.premiereTimestamp,
       'hlsUrl': instance.hlsUrl,
       'adaptiveFormats': instance.adaptiveFormats,
       'formatStreams': instance.formatStreams,
       'captions': instance.captions,
       'recommendedVideos': instance.recommendedVideos,
+      'title': instance.title,
+      'lengthSeconds': instance.lengthSeconds,
+      'author': instance.author,
+      'authorId': instance.authorId,
+      'authorUrl': instance.authorUrl,
+      'videoThumbnails': instance.videoThumbnails,
+      'viewCountText': instance.viewCountText,
     };
diff --git a/lib/videos/models/video_in_list.dart b/lib/videos/models/video_in_list.dart
deleted file mode 100644
index 2e958ea0..00000000
--- a/lib/videos/models/video_in_list.dart
+++ /dev/null
@@ -1,51 +0,0 @@
-import 'package:copy_with_extension/copy_with_extension.dart';
-import 'package:clipious/videos/models/base_video.dart';
-import 'package:json_annotation/json_annotation.dart';
-
-import '../../utils/models/image_object.dart';
-
-part 'video_in_list.g.dart';
-
-@JsonSerializable()
-@CopyWith(constructor: '_')
-class VideoInList extends BaseVideo {
-  int? viewCount;
-
-  int? published;
-  int? index;
-  String? indexId;
-  String? publishedText;
-
-  VideoInList(
-      String title,
-      String videoId,
-      int lengthSeconds,
-      this.viewCount,
-      String? author,
-      String? authorId,
-      String? authorUrl,
-      this.published,
-      this.publishedText,
-      List<ImageObject> videoThumbnails)
-      : super(title, videoId, lengthSeconds, author, authorUrl, authorId,
-            videoThumbnails);
-
-  factory VideoInList.fromJson(Map<String, dynamic> json) =>
-      _$VideoInListFromJson(json);
-
-  Map<String, dynamic> toJson() => _$VideoInListToJson(this);
-
-  VideoInList._(
-      super.videoId,
-      super.title,
-      super.lengthSeconds,
-      super.author,
-      super.authorId,
-      super.authorUrl,
-      super.videoThumbnails,
-      this.viewCount,
-      this.published,
-      this.index,
-      this.indexId,
-      this.publishedText);
-}
diff --git a/lib/videos/models/video_in_list.g.dart b/lib/videos/models/video_in_list.g.dart
deleted file mode 100644
index e01cd904..00000000
--- a/lib/videos/models/video_in_list.g.dart
+++ /dev/null
@@ -1,217 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'video_in_list.dart';
-
-// **************************************************************************
-// CopyWithGenerator
-// **************************************************************************
-
-abstract class _$VideoInListCWProxy {
-  VideoInList videoId(String videoId);
-
-  VideoInList title(String title);
-
-  VideoInList lengthSeconds(int lengthSeconds);
-
-  VideoInList author(String? author);
-
-  VideoInList authorId(String? authorId);
-
-  VideoInList authorUrl(String? authorUrl);
-
-  VideoInList videoThumbnails(List<ImageObject> videoThumbnails);
-
-  VideoInList viewCount(int? viewCount);
-
-  VideoInList published(int? published);
-
-  VideoInList index(int? index);
-
-  VideoInList indexId(String? indexId);
-
-  VideoInList publishedText(String? publishedText);
-
-  /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `VideoInList(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
-  ///
-  /// Usage
-  /// ```dart
-  /// VideoInList(...).copyWith(id: 12, name: "My name")
-  /// ````
-  VideoInList call({
-    String? videoId,
-    String? title,
-    int? lengthSeconds,
-    String? author,
-    String? authorId,
-    String? authorUrl,
-    List<ImageObject>? videoThumbnails,
-    int? viewCount,
-    int? published,
-    int? index,
-    String? indexId,
-    String? publishedText,
-  });
-}
-
-/// Proxy class for `copyWith` functionality. This is a callable class and can be used as follows: `instanceOfVideoInList.copyWith(...)`. Additionally contains functions for specific fields e.g. `instanceOfVideoInList.copyWith.fieldName(...)`
-class _$VideoInListCWProxyImpl implements _$VideoInListCWProxy {
-  const _$VideoInListCWProxyImpl(this._value);
-
-  final VideoInList _value;
-
-  @override
-  VideoInList videoId(String videoId) => this(videoId: videoId);
-
-  @override
-  VideoInList title(String title) => this(title: title);
-
-  @override
-  VideoInList lengthSeconds(int lengthSeconds) =>
-      this(lengthSeconds: lengthSeconds);
-
-  @override
-  VideoInList author(String? author) => this(author: author);
-
-  @override
-  VideoInList authorId(String? authorId) => this(authorId: authorId);
-
-  @override
-  VideoInList authorUrl(String? authorUrl) => this(authorUrl: authorUrl);
-
-  @override
-  VideoInList videoThumbnails(List<ImageObject> videoThumbnails) =>
-      this(videoThumbnails: videoThumbnails);
-
-  @override
-  VideoInList viewCount(int? viewCount) => this(viewCount: viewCount);
-
-  @override
-  VideoInList published(int? published) => this(published: published);
-
-  @override
-  VideoInList index(int? index) => this(index: index);
-
-  @override
-  VideoInList indexId(String? indexId) => this(indexId: indexId);
-
-  @override
-  VideoInList publishedText(String? publishedText) =>
-      this(publishedText: publishedText);
-
-  @override
-
-  /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `VideoInList(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
-  ///
-  /// Usage
-  /// ```dart
-  /// VideoInList(...).copyWith(id: 12, name: "My name")
-  /// ````
-  VideoInList call({
-    Object? videoId = const $CopyWithPlaceholder(),
-    Object? title = const $CopyWithPlaceholder(),
-    Object? lengthSeconds = const $CopyWithPlaceholder(),
-    Object? author = const $CopyWithPlaceholder(),
-    Object? authorId = const $CopyWithPlaceholder(),
-    Object? authorUrl = const $CopyWithPlaceholder(),
-    Object? videoThumbnails = const $CopyWithPlaceholder(),
-    Object? viewCount = const $CopyWithPlaceholder(),
-    Object? published = const $CopyWithPlaceholder(),
-    Object? index = const $CopyWithPlaceholder(),
-    Object? indexId = const $CopyWithPlaceholder(),
-    Object? publishedText = const $CopyWithPlaceholder(),
-  }) {
-    return VideoInList._(
-      videoId == const $CopyWithPlaceholder() || videoId == null
-          ? _value.videoId
-          // ignore: cast_nullable_to_non_nullable
-          : videoId as String,
-      title == const $CopyWithPlaceholder() || title == null
-          ? _value.title
-          // ignore: cast_nullable_to_non_nullable
-          : title as String,
-      lengthSeconds == const $CopyWithPlaceholder() || lengthSeconds == null
-          ? _value.lengthSeconds
-          // ignore: cast_nullable_to_non_nullable
-          : lengthSeconds as int,
-      author == const $CopyWithPlaceholder()
-          ? _value.author
-          // ignore: cast_nullable_to_non_nullable
-          : author as String?,
-      authorId == const $CopyWithPlaceholder()
-          ? _value.authorId
-          // ignore: cast_nullable_to_non_nullable
-          : authorId as String?,
-      authorUrl == const $CopyWithPlaceholder()
-          ? _value.authorUrl
-          // ignore: cast_nullable_to_non_nullable
-          : authorUrl as String?,
-      videoThumbnails == const $CopyWithPlaceholder() || videoThumbnails == null
-          ? _value.videoThumbnails
-          // ignore: cast_nullable_to_non_nullable
-          : videoThumbnails as List<ImageObject>,
-      viewCount == const $CopyWithPlaceholder()
-          ? _value.viewCount
-          // ignore: cast_nullable_to_non_nullable
-          : viewCount as int?,
-      published == const $CopyWithPlaceholder()
-          ? _value.published
-          // ignore: cast_nullable_to_non_nullable
-          : published as int?,
-      index == const $CopyWithPlaceholder()
-          ? _value.index
-          // ignore: cast_nullable_to_non_nullable
-          : index as int?,
-      indexId == const $CopyWithPlaceholder()
-          ? _value.indexId
-          // ignore: cast_nullable_to_non_nullable
-          : indexId as String?,
-      publishedText == const $CopyWithPlaceholder()
-          ? _value.publishedText
-          // ignore: cast_nullable_to_non_nullable
-          : publishedText as String?,
-    );
-  }
-}
-
-extension $VideoInListCopyWith on VideoInList {
-  /// Returns a callable class that can be used as follows: `instanceOfVideoInList.copyWith(...)` or like so:`instanceOfVideoInList.copyWith.fieldName(...)`.
-  // ignore: library_private_types_in_public_api
-  _$VideoInListCWProxy get copyWith => _$VideoInListCWProxyImpl(this);
-}
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-VideoInList _$VideoInListFromJson(Map<String, dynamic> json) => VideoInList(
-      json['title'] as String,
-      json['videoId'] as String,
-      (json['lengthSeconds'] as num).toInt(),
-      (json['viewCount'] as num?)?.toInt(),
-      json['author'] as String?,
-      json['authorId'] as String?,
-      json['authorUrl'] as String?,
-      (json['published'] as num?)?.toInt(),
-      json['publishedText'] as String?,
-      (json['videoThumbnails'] as List<dynamic>)
-          .map((e) => ImageObject.fromJson(e as Map<String, dynamic>))
-          .toList(),
-    )
-      ..index = (json['index'] as num?)?.toInt()
-      ..indexId = json['indexId'] as String?;
-
-Map<String, dynamic> _$VideoInListToJson(VideoInList instance) =>
-    <String, dynamic>{
-      'videoId': instance.videoId,
-      'title': instance.title,
-      'lengthSeconds': instance.lengthSeconds,
-      'author': instance.author,
-      'authorId': instance.authorId,
-      'authorUrl': instance.authorUrl,
-      'videoThumbnails': instance.videoThumbnails,
-      'viewCount': instance.viewCount,
-      'published': instance.published,
-      'index': instance.index,
-      'indexId': instance.indexId,
-      'publishedText': instance.publishedText,
-    };
diff --git a/lib/videos/states/add_to_playlist.dart b/lib/videos/states/add_to_playlist.dart
index 60ff2254..70edf298 100644
--- a/lib/videos/states/add_to_playlist.dart
+++ b/lib/videos/states/add_to_playlist.dart
@@ -1,7 +1,7 @@
 import 'package:bloc/bloc.dart';
+import 'package:clipious/videos/models/video.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:clipious/extensions.dart';
-import 'package:clipious/videos/models/video_in_list.dart';
 import 'package:logging/logging.dart';
 
 import '../../globals.dart';
@@ -59,7 +59,7 @@ class AddToPlaylistCubit extends Cubit<AddToPlaylistController> {
 
   checkVideoLikeStatus() async {
     Playlist? p = await likePlaylist();
-    VideoInList? video = p?.videos
+    Video? video = p?.videos
         .firstWhereOrNull((element) => element.videoId == state.videoId);
 
     bool isVideoLiked = video != null;
@@ -99,7 +99,7 @@ class AddToPlaylistCubit extends Cubit<AddToPlaylistController> {
     if (p != null) {
       if (isVideoLiked) {
         log.fine('Video is liked, unliking it');
-        VideoInList? v = p.videos
+        Video? v = p.videos
             .firstWhereOrNull((element) => element.videoId == state.videoId);
         if (v?.indexId != null) {
           await service.deleteUserPlaylistVideo(p.playlistId, v!.indexId!);
diff --git a/lib/videos/states/compact_video.freezed.dart b/lib/videos/states/compact_video.freezed.dart
index e869c84d..c7736a1f 100644
--- a/lib/videos/states/compact_video.freezed.dart
+++ b/lib/videos/states/compact_video.freezed.dart
@@ -33,6 +33,8 @@ abstract class $CompactVideoStateCopyWith<$Res> {
       _$CompactVideoStateCopyWithImpl<$Res, CompactVideoState>;
   @useResult
   $Res call({DownloadedVideo? offlineVideo, String? offlineVideoThumbnailPath});
+
+  $DownloadedVideoCopyWith<$Res>? get offlineVideo;
 }
 
 /// @nodoc
@@ -64,6 +66,20 @@ class _$CompactVideoStateCopyWithImpl<$Res, $Val extends CompactVideoState>
               as String?,
     ) as $Val);
   }
+
+  /// Create a copy of CompactVideoState
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @pragma('vm:prefer-inline')
+  $DownloadedVideoCopyWith<$Res>? get offlineVideo {
+    if (_value.offlineVideo == null) {
+      return null;
+    }
+
+    return $DownloadedVideoCopyWith<$Res>(_value.offlineVideo!, (value) {
+      return _then(_value.copyWith(offlineVideo: value) as $Val);
+    });
+  }
 }
 
 /// @nodoc
@@ -75,6 +91,9 @@ abstract class _$$CompactVideoStateImplCopyWith<$Res>
   @override
   @useResult
   $Res call({DownloadedVideo? offlineVideo, String? offlineVideoThumbnailPath});
+
+  @override
+  $DownloadedVideoCopyWith<$Res>? get offlineVideo;
 }
 
 /// @nodoc
diff --git a/lib/videos/states/download_modal_sheet.dart b/lib/videos/states/download_modal_sheet.dart
index c20cf621..2c29f348 100644
--- a/lib/videos/states/download_modal_sheet.dart
+++ b/lib/videos/states/download_modal_sheet.dart
@@ -1,15 +1,14 @@
 import 'package:bloc/bloc.dart';
+import 'package:clipious/videos/models/video.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:clipious/extensions.dart';
 import 'package:clipious/globals.dart';
 import 'package:clipious/videos/models/adaptive_format.dart';
 
-import '../models/base_video.dart';
-
 part 'download_modal_sheet.freezed.dart';
 
 class DownloadModalSheetCubit extends Cubit<DownloadModalSheetState> {
-  final BaseVideo video;
+  final Video video;
 
   DownloadModalSheetCubit(super.initialState, this.video) {
     init();
@@ -19,7 +18,7 @@ class DownloadModalSheetCubit extends Cubit<DownloadModalSheetState> {
     emit(state.copyWith(loading: true));
     final vid = await service.getVideo(video.videoId);
 
-    final qualities = vid.adaptiveFormats
+    final qualities = (vid.adaptiveFormats ?? [])
         .where((f) => f.encoding == 'vp9' && f.type.contains("video/webm"))
         .sortBy((f) => int.parse(f.resolution?.replaceAll('p', '') ?? '0'))
         .where(
diff --git a/lib/videos/states/video.dart b/lib/videos/states/video.dart
index d8ba2319..0363ffa2 100644
--- a/lib/videos/states/video.dart
+++ b/lib/videos/states/video.dart
@@ -1,7 +1,6 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:clipious/downloads/models/downloaded_video.dart';
-import 'package:clipious/videos/models/base_video.dart';
 import 'package:clipious/videos/models/dislike.dart';
 import 'package:logging/logging.dart';
 
@@ -112,7 +111,7 @@ class VideoCubit extends Cubit<VideoState> {
 
   void playVideo(bool? audio) {
     if (state.video != null) {
-      List<BaseVideo> videos = [state.video!];
+      List<Video> videos = [state.video!];
       if (!settings.state.distractionFreeMode &&
           settings.state.playRecommendedNext) {
         videos.addAll(state.video?.recommendedVideos ?? []);
diff --git a/lib/videos/states/video.freezed.dart b/lib/videos/states/video.freezed.dart
index 7ad9ebd3..6f6ba98b 100644
--- a/lib/videos/states/video.freezed.dart
+++ b/lib/videos/states/video.freezed.dart
@@ -51,6 +51,9 @@ abstract class $VideoStateCopyWith<$Res> {
       DownloadedVideo? downloadedVideo,
       double opacity,
       String error});
+
+  $VideoCopyWith<$Res>? get video;
+  $DownloadedVideoCopyWith<$Res>? get downloadedVideo;
 }
 
 /// @nodoc
@@ -122,6 +125,34 @@ class _$VideoStateCopyWithImpl<$Res, $Val extends VideoState>
               as String,
     ) as $Val);
   }
+
+  /// Create a copy of VideoState
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @pragma('vm:prefer-inline')
+  $VideoCopyWith<$Res>? get video {
+    if (_value.video == null) {
+      return null;
+    }
+
+    return $VideoCopyWith<$Res>(_value.video!, (value) {
+      return _then(_value.copyWith(video: value) as $Val);
+    });
+  }
+
+  /// Create a copy of VideoState
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @pragma('vm:prefer-inline')
+  $DownloadedVideoCopyWith<$Res>? get downloadedVideo {
+    if (_value.downloadedVideo == null) {
+      return null;
+    }
+
+    return $DownloadedVideoCopyWith<$Res>(_value.downloadedVideo!, (value) {
+      return _then(_value.copyWith(downloadedVideo: value) as $Val);
+    });
+  }
 }
 
 /// @nodoc
@@ -143,6 +174,11 @@ abstract class _$$VideoStateImplCopyWith<$Res>
       DownloadedVideo? downloadedVideo,
       double opacity,
       String error});
+
+  @override
+  $VideoCopyWith<$Res>? get video;
+  @override
+  $DownloadedVideoCopyWith<$Res>? get downloadedVideo;
 }
 
 /// @nodoc
diff --git a/lib/videos/states/video_in_list.dart b/lib/videos/states/video_in_list.dart
index c342afe7..aa20f77a 100644
--- a/lib/videos/states/video_in_list.dart
+++ b/lib/videos/states/video_in_list.dart
@@ -1,7 +1,7 @@
 import 'package:bloc/bloc.dart';
+import 'package:clipious/videos/models/video.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:clipious/downloads/models/downloaded_video.dart';
-import 'package:clipious/videos/models/base_video.dart';
 
 import '../../globals.dart';
 
@@ -42,6 +42,6 @@ class VideoInListState with _$VideoInListState {
       'cannot provide both video and offline video')
   const factory VideoInListState(
       {@Default(0) double progress,
-      BaseVideo? video,
+      Video? video,
       DownloadedVideo? offlineVideo}) = _VideoInListState;
 }
diff --git a/lib/videos/states/video_in_list.freezed.dart b/lib/videos/states/video_in_list.freezed.dart
index 40c15128..c56681da 100644
--- a/lib/videos/states/video_in_list.freezed.dart
+++ b/lib/videos/states/video_in_list.freezed.dart
@@ -17,7 +17,7 @@ final _privateConstructorUsedError = UnsupportedError(
 /// @nodoc
 mixin _$VideoInListState {
   double get progress => throw _privateConstructorUsedError;
-  BaseVideo? get video => throw _privateConstructorUsedError;
+  Video? get video => throw _privateConstructorUsedError;
   DownloadedVideo? get offlineVideo => throw _privateConstructorUsedError;
 
   /// Create a copy of VideoInListState
@@ -33,7 +33,10 @@ abstract class $VideoInListStateCopyWith<$Res> {
           VideoInListState value, $Res Function(VideoInListState) then) =
       _$VideoInListStateCopyWithImpl<$Res, VideoInListState>;
   @useResult
-  $Res call({double progress, BaseVideo? video, DownloadedVideo? offlineVideo});
+  $Res call({double progress, Video? video, DownloadedVideo? offlineVideo});
+
+  $VideoCopyWith<$Res>? get video;
+  $DownloadedVideoCopyWith<$Res>? get offlineVideo;
 }
 
 /// @nodoc
@@ -63,13 +66,41 @@ class _$VideoInListStateCopyWithImpl<$Res, $Val extends VideoInListState>
       video: freezed == video
           ? _value.video
           : video // ignore: cast_nullable_to_non_nullable
-              as BaseVideo?,
+              as Video?,
       offlineVideo: freezed == offlineVideo
           ? _value.offlineVideo
           : offlineVideo // ignore: cast_nullable_to_non_nullable
               as DownloadedVideo?,
     ) as $Val);
   }
+
+  /// Create a copy of VideoInListState
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @pragma('vm:prefer-inline')
+  $VideoCopyWith<$Res>? get video {
+    if (_value.video == null) {
+      return null;
+    }
+
+    return $VideoCopyWith<$Res>(_value.video!, (value) {
+      return _then(_value.copyWith(video: value) as $Val);
+    });
+  }
+
+  /// Create a copy of VideoInListState
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @pragma('vm:prefer-inline')
+  $DownloadedVideoCopyWith<$Res>? get offlineVideo {
+    if (_value.offlineVideo == null) {
+      return null;
+    }
+
+    return $DownloadedVideoCopyWith<$Res>(_value.offlineVideo!, (value) {
+      return _then(_value.copyWith(offlineVideo: value) as $Val);
+    });
+  }
 }
 
 /// @nodoc
@@ -80,7 +111,12 @@ abstract class _$$VideoInListStateImplCopyWith<$Res>
       __$$VideoInListStateImplCopyWithImpl<$Res>;
   @override
   @useResult
-  $Res call({double progress, BaseVideo? video, DownloadedVideo? offlineVideo});
+  $Res call({double progress, Video? video, DownloadedVideo? offlineVideo});
+
+  @override
+  $VideoCopyWith<$Res>? get video;
+  @override
+  $DownloadedVideoCopyWith<$Res>? get offlineVideo;
 }
 
 /// @nodoc
@@ -108,7 +144,7 @@ class __$$VideoInListStateImplCopyWithImpl<$Res>
       video: freezed == video
           ? _value.video
           : video // ignore: cast_nullable_to_non_nullable
-              as BaseVideo?,
+              as Video?,
       offlineVideo: freezed == offlineVideo
           ? _value.offlineVideo
           : offlineVideo // ignore: cast_nullable_to_non_nullable
@@ -129,7 +165,7 @@ class _$VideoInListStateImpl implements _VideoInListState {
   @JsonKey()
   final double progress;
   @override
-  final BaseVideo? video;
+  final Video? video;
   @override
   final DownloadedVideo? offlineVideo;
 
@@ -166,13 +202,13 @@ class _$VideoInListStateImpl implements _VideoInListState {
 abstract class _VideoInListState implements VideoInListState {
   const factory _VideoInListState(
       {final double progress,
-      final BaseVideo? video,
+      final Video? video,
       final DownloadedVideo? offlineVideo}) = _$VideoInListStateImpl;
 
   @override
   double get progress;
   @override
-  BaseVideo? get video;
+  Video? get video;
   @override
   DownloadedVideo? get offlineVideo;
 
diff --git a/lib/videos/views/components/add_to_queue_button.dart b/lib/videos/views/components/add_to_queue_button.dart
index cd645009..d6511464 100644
--- a/lib/videos/views/components/add_to_queue_button.dart
+++ b/lib/videos/views/components/add_to_queue_button.dart
@@ -1,16 +1,16 @@
+import 'package:clipious/videos/models/video.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 import '../../../player/states/player.dart';
-import '../../models/base_video.dart';
 
 class AddToQueueButton extends StatelessWidget {
-  final List<BaseVideo> videos;
+  final List<Video> videos;
 
   const AddToQueueButton({super.key, required this.videos});
 
-  static bool canAddToQueue(BuildContext context, List<BaseVideo> videos) {
+  static bool canAddToQueue(BuildContext context, List<Video> videos) {
     var state = context.read<PlayerCubit>().state;
     return (state.videos.isNotEmpty) &&
         (videos.length > 1 ||
diff --git a/lib/videos/views/components/compact_video.dart b/lib/videos/views/components/compact_video.dart
index aeb776e0..cad7a26c 100644
--- a/lib/videos/views/components/compact_video.dart
+++ b/lib/videos/views/components/compact_video.dart
@@ -1,3 +1,4 @@
+import 'package:clipious/videos/models/video.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:clipious/downloads/models/downloaded_video.dart';
@@ -6,14 +7,13 @@ import 'package:clipious/utils/models/image_object.dart';
 import 'package:clipious/videos/states/compact_video.dart';
 import 'package:clipious/videos/views/components/video_thumbnail.dart';
 
-import '../../models/base_video.dart';
 import 'offline_video_thumbnail.dart';
 
 const double compactVideoHeight = 70;
 
 class CompactVideo extends StatelessWidget {
   final Function()? onTap;
-  final BaseVideo? video;
+  final Video? video;
   final DownloadedVideo? offlineVideo;
   final bool? highlighted;
   final List<Widget>? trailing;
diff --git a/lib/videos/views/components/download_modal_sheet.dart b/lib/videos/views/components/download_modal_sheet.dart
index 1afa342f..b7450e7b 100644
--- a/lib/videos/views/components/download_modal_sheet.dart
+++ b/lib/videos/views/components/download_modal_sheet.dart
@@ -1,3 +1,4 @@
+import 'package:clipious/videos/models/video.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@@ -8,10 +9,9 @@ import 'package:clipious/utils/pretty_bytes.dart';
 import 'package:clipious/videos/states/download_modal_sheet.dart';
 
 import '../../../downloads/states/download_manager.dart';
-import '../../models/base_video.dart';
 
 class DownloadModalSheet extends StatelessWidget {
-  final BaseVideo video;
+  final Video video;
 
   // called when the download is triggerd
   final Function()? onDownload;
@@ -25,7 +25,7 @@ class DownloadModalSheet extends StatelessWidget {
       this.onDownloadStarted,
       this.onDownload});
 
-  static showVideoModalSheet(BuildContext context, BaseVideo video,
+  static showVideoModalSheet(BuildContext context, Video video,
       {Function(bool isDownloadStarted)? onDownloadStarted,
       Function()? onDownload}) {
     showModalBottomSheet<void>(
diff --git a/lib/videos/views/components/history_video.dart b/lib/videos/views/components/history_video.dart
index 6cef29a5..dfc4e5b5 100644
--- a/lib/videos/views/components/history_video.dart
+++ b/lib/videos/views/components/history_video.dart
@@ -25,7 +25,7 @@ class HistoryVideoView extends StatelessWidget {
               ? CompactVideo(
                   onTap: () => AutoRouter.of(context)
                       .push(VideoRoute(videoId: state.cachedVid!.videoId)),
-                  video: state.cachedVid?.toBaseVideo(),
+                  video: state.cachedVid?.toVideo(),
                 )
               : const CompactVideoPlaceHolder(),
           crossFadeState: state.loading
diff --git a/lib/videos/views/components/info.dart b/lib/videos/views/components/info.dart
index 4abc0eec..d9a49650 100644
--- a/lib/videos/views/components/info.dart
+++ b/lib/videos/views/components/info.dart
@@ -48,7 +48,7 @@ class VideoInfo extends StatelessWidget {
         children: [
           if (titleAndChannelInfo)
             Text(
-              video.title,
+              video.title ?? '',
               style: textTheme.titleLarge?.copyWith(color: colorScheme.primary),
               textAlign: TextAlign.start,
             ),
@@ -106,14 +106,14 @@ class VideoInfo extends StatelessWidget {
                   padding: const EdgeInsets.symmetric(vertical: 8.0),
                   child: SubscribeButton(
                     channelId: video.authorId ?? '',
-                    subCount: video.subCountText,
+                    subCount: video.subCountText ?? '',
                   ),
                 )
               ],
             ),
           if (descriptionAndTags)
             TextLinkified(
-              text: video.description,
+              text: video.description ?? '',
               video: video,
               player: player,
             ),
@@ -128,10 +128,11 @@ class VideoInfo extends StatelessWidget {
                     size: 15,
                   ),
                 ),
-                Text(
-                    video.isListed ? locals.videoListed : locals.videoUnlisted),
+                Text((video.isListed ?? true)
+                    ? locals.videoListed
+                    : locals.videoUnlisted),
                 Visibility(
-                  visible: video.isFamilyFriendly,
+                  visible: video.isFamilyFriendly ?? true,
                   child: const Padding(
                     padding: EdgeInsets.symmetric(horizontal: 4.0),
                     child: Icon(
@@ -141,7 +142,7 @@ class VideoInfo extends StatelessWidget {
                   ),
                 ),
                 Visibility(
-                    visible: video.isFamilyFriendly,
+                    visible: video.isFamilyFriendly ?? true,
                     child: Text(locals.videoIsFamilyFriendly))
               ],
             ),
@@ -169,7 +170,8 @@ class VideoInfo extends StatelessWidget {
                     ..insert(
                         0,
                         InkWell(
-                          onTap: () => showSearchWindow(context, video.genre),
+                          onTap: () =>
+                              showSearchWindow(context, video.genre ?? ''),
                           child: Container(
                             decoration: BoxDecoration(
                                 color: colorScheme.secondaryContainer,
@@ -177,7 +179,7 @@ class VideoInfo extends StatelessWidget {
                             child: Padding(
                               padding: const EdgeInsets.symmetric(
                                   horizontal: 8.0, vertical: 4),
-                              child: Text(video.genre),
+                              child: Text(video.genre ?? ''),
                             ),
                           ),
                         ))),
diff --git a/lib/videos/views/components/popular.dart b/lib/videos/views/components/popular.dart
index 93f3e8b8..51d3ca93 100644
--- a/lib/videos/views/components/popular.dart
+++ b/lib/videos/views/components/popular.dart
@@ -1,14 +1,14 @@
+import 'package:clipious/videos/models/video.dart';
 import 'package:flutter/material.dart';
 import 'package:clipious/globals.dart';
 
 import '../../../main.dart';
 import '../../../utils/models/paginated_list.dart';
 import '../../../utils/views/tv/components/tv_horizontal_item_list.dart';
-import '../../models/video_in_list.dart';
 import 'video_list.dart';
 
 class Popular extends StatelessWidget {
-  final void Function(VideoInList video, int index, bool focus)? onItemFocus;
+  final void Function(Video video, int index, bool focus)? onItemFocus;
 
   const Popular({super.key, this.onItemFocus});
 
diff --git a/lib/videos/views/components/recommended_videos.dart b/lib/videos/views/components/recommended_videos.dart
index 2b0e0295..f1e598e1 100644
--- a/lib/videos/views/components/recommended_videos.dart
+++ b/lib/videos/views/components/recommended_videos.dart
@@ -3,8 +3,6 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:clipious/videos/models/video.dart';
 import 'package:clipious/videos/views/components/video_in_list.dart';
 
-import '../../models/video_in_list.dart';
-
 class RecommendedVideos extends StatelessWidget {
   final Video video;
 
@@ -26,13 +24,8 @@ class RecommendedVideos extends StatelessWidget {
     widgets.addAll(video.recommendedVideos
         .where((element) => !element.filterHide)
         .map((e) {
-      var v = VideoInList(e.title, e.videoId, e.lengthSeconds, 0, e.author, '',
-          'authorUrl', 0, '', e.videoThumbnails);
-      v.filterHide = e.filterHide;
-      v.filtered = e.filtered;
-      v.matchedFilters = e.matchedFilters;
       return VideoListItem(
-        video: v,
+        video: e,
       );
     }).toList());
 
diff --git a/lib/videos/views/components/subscriptions.dart b/lib/videos/views/components/subscriptions.dart
index df380f7a..3546c34c 100644
--- a/lib/videos/views/components/subscriptions.dart
+++ b/lib/videos/views/components/subscriptions.dart
@@ -1,13 +1,13 @@
+import 'package:clipious/videos/models/video.dart';
 import 'package:flutter/material.dart';
 import 'package:clipious/main.dart';
 import 'package:clipious/utils/views/tv/components/tv_horizontal_item_list.dart';
 
 import '../../../utils/models/paginated_list.dart';
-import '../../models/video_in_list.dart';
 import 'video_list.dart';
 
 class Subscriptions extends StatelessWidget {
-  final void Function(VideoInList video, int index, bool focus)? onItemFocus;
+  final void Function(Video video, int index, bool focus)? onItemFocus;
 
   const Subscriptions({super.key, this.onItemFocus});
 
diff --git a/lib/videos/views/components/trending.dart b/lib/videos/views/components/trending.dart
index 65f6e4ac..a39d42a1 100644
--- a/lib/videos/views/components/trending.dart
+++ b/lib/videos/views/components/trending.dart
@@ -1,16 +1,16 @@
+import 'package:clipious/videos/models/video.dart';
 import 'package:flutter/material.dart';
 import 'package:clipious/globals.dart';
 import 'package:clipious/utils/views/tv/components/tv_horizontal_item_list.dart';
 
 import '../../../main.dart';
 import '../../../utils/models/paginated_list.dart';
-import '../../models/video_in_list.dart';
 import 'video_list.dart';
 
 const all = 'all';
 
 class Trending extends StatefulWidget {
-  final void Function(VideoInList video, int index, bool focus)? onItemFocus;
+  final void Function(Video video, int index, bool focus)? onItemFocus;
 
   const Trending({super.key, this.onItemFocus});
 
diff --git a/lib/videos/views/components/video_in_list.dart b/lib/videos/views/components/video_in_list.dart
index 44bc29fd..4e2de549 100644
--- a/lib/videos/views/components/video_in_list.dart
+++ b/lib/videos/views/components/video_in_list.dart
@@ -1,4 +1,5 @@
 import 'package:auto_route/auto_route.dart';
+import 'package:clipious/videos/models/video.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@@ -6,7 +7,6 @@ import 'package:clipious/globals.dart';
 import 'package:clipious/player/states/player.dart';
 import 'package:clipious/router.dart';
 import 'package:clipious/utils/views/components/navigation_switcher.dart';
-import 'package:clipious/videos/models/video_in_list.dart';
 import 'package:clipious/videos/states/video_in_list.dart';
 import 'package:clipious/videos/views/components/offline_video_thumbnail.dart';
 import 'package:clipious/videos/views/components/video_modal_sheet.dart';
@@ -21,12 +21,12 @@ import 'video_metrics.dart';
 final log = Logger('VideoInList');
 
 class VideoListItem extends StatelessWidget {
-  final VideoInList? video;
+  final Video? video;
   final DownloadedVideo? offlineVideo;
   final bool small;
   final bool showMetrics;
-  final Function(BuildContext context, VideoInList video)? showVideoModalSheet;
-  final Function(BuildContext context, VideoInList video)? openVideoOverride;
+  final Function(BuildContext context, Video video)? showVideoModalSheet;
+  final Function(BuildContext context, Video video)? openVideoOverride;
   final bool allowModalSheet;
 
   const VideoListItem(
diff --git a/lib/videos/views/components/video_list.dart b/lib/videos/views/components/video_list.dart
index 6ea713e5..765bedea 100644
--- a/lib/videos/views/components/video_list.dart
+++ b/lib/videos/views/components/video_list.dart
@@ -1,3 +1,5 @@
+import 'package:clipious/videos/models/ided_video.dart';
+import 'package:clipious/videos/models/video.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@@ -5,8 +7,6 @@ import 'package:clipious/utils.dart';
 import 'package:clipious/utils/states/item_list.dart';
 import 'package:clipious/utils/views/components/placeholders.dart';
 import 'package:clipious/utils/views/components/top_loading.dart';
-import 'package:clipious/videos/models/base_video.dart';
-import 'package:clipious/videos/models/video_in_list.dart';
 import 'package:clipious/videos/views/components/video_in_list.dart';
 
 // import 'package:pull_to_refresh/pull_to_refresh.dart';
@@ -24,8 +24,8 @@ class VideoList<T extends IdedVideo> extends StatelessWidget {
   final bool small;
   final bool showMetrics;
   final bool allowModalSheet;
-  final Function(BuildContext context, VideoInList video)? showVideoModalSheet;
-  final Function(BuildContext context, VideoInList video)? openVideoOverride;
+  final Function(BuildContext context, Video video)? showVideoModalSheet;
+  final Function(BuildContext context, Video video)? openVideoOverride;
 
   const VideoList(
       {super.key,
@@ -63,8 +63,8 @@ class VideoList<T extends IdedVideo> extends StatelessWidget {
           var cubit = context.read<ItemListCubit<T>>();
 
           List<IdedVideo> items = state.items;
-          if (items.isNotEmpty && items[0] is VideoInList) {
-            items = filteredVideos<VideoInList>(state.items.cast());
+          if (items.isNotEmpty && items[0] is Video) {
+            items = filteredVideos(state.items.cast());
           }
 
           var gridCount = small ? 1 : getGridCount(context);
@@ -107,10 +107,10 @@ class VideoList<T extends IdedVideo> extends StatelessWidget {
                                   : getGridAspectRatio(context),
                               children: [
                                 ...items.map((v) {
-                                  VideoInList? onlineVideo;
+                                  Video? onlineVideo;
                                   DownloadedVideo? offlineVideo;
 
-                                  if (v is VideoInList) {
+                                  if (v is Video) {
                                     onlineVideo = v;
                                   }
 
diff --git a/lib/videos/views/components/video_metrics.dart b/lib/videos/views/components/video_metrics.dart
index 745e2a81..aa01e74d 100644
--- a/lib/videos/views/components/video_metrics.dart
+++ b/lib/videos/views/components/video_metrics.dart
@@ -112,7 +112,7 @@ class VideoMetrics extends StatelessWidget {
       metrics.addAll([
         (video?.liveNow ?? false)
             ? Visibility(
-                visible: video!.liveNow,
+                visible: video!.liveNow ?? false,
                 child: Container(
                   decoration: BoxDecoration(
                     color: Colors.red,
diff --git a/lib/videos/views/components/video_modal_sheet.dart b/lib/videos/views/components/video_modal_sheet.dart
index 95487ce7..5f355afb 100644
--- a/lib/videos/views/components/video_modal_sheet.dart
+++ b/lib/videos/views/components/video_modal_sheet.dart
@@ -1,9 +1,9 @@
+import 'package:clipious/videos/models/video.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:clipious/player/states/player.dart';
 import 'package:clipious/utils.dart';
-import 'package:clipious/videos/models/base_video.dart';
 import 'package:clipious/videos/views/components/add_to_playlist_button.dart';
 import 'package:clipious/videos/views/components/download_modal_sheet.dart';
 
@@ -11,11 +11,11 @@ import '../../../main.dart';
 import 'add_to_queue_button.dart';
 
 class VideoModalSheet extends StatelessWidget {
-  final BaseVideo video;
+  final Video video;
 
   const VideoModalSheet({super.key, required this.video});
 
-  static showVideoModalSheet(BuildContext context, BaseVideo video) {
+  static showVideoModalSheet(BuildContext context, Video video) {
     showModalBottomSheet<void>(
         context: context,
         showDragHandle: true,
diff --git a/lib/videos/views/components/video_share_button.dart b/lib/videos/views/components/video_share_button.dart
index 8846b65e..87afe375 100644
--- a/lib/videos/views/components/video_share_button.dart
+++ b/lib/videos/views/components/video_share_button.dart
@@ -1,10 +1,10 @@
+import 'package:clipious/videos/models/video.dart';
 import 'package:flutter/material.dart';
 
 import '../../../utils.dart';
-import '../../models/base_video.dart';
 
 class VideoShareButton extends StatelessWidget {
-  final BaseVideo video;
+  final Video video;
   final bool showTimestampOption;
 
   const VideoShareButton(
diff --git a/lib/videos/views/tv/components/video_item.dart b/lib/videos/views/tv/components/video_item.dart
index 4a4c15c0..efbe3ae1 100644
--- a/lib/videos/views/tv/components/video_item.dart
+++ b/lib/videos/views/tv/components/video_item.dart
@@ -1,4 +1,5 @@
 import 'package:auto_route/auto_route.dart';
+import 'package:clipious/videos/models/video.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -9,14 +10,13 @@ import 'package:clipious/videos/states/video_in_list.dart';
 
 import '../../../../globals.dart';
 import '../../../../utils/models/image_object.dart';
-import '../../../models/video_in_list.dart';
 import '../../components/video_thumbnail.dart';
 
 class TvVideoItem extends StatelessWidget {
-  final VideoInList video;
+  final Video video;
   final bool autoFocus;
   final void Function(bool focus)? onFocusChange;
-  final Function(BuildContext context, VideoInList video)? onSelect;
+  final Function(BuildContext context, Video video)? onSelect;
 
   const TvVideoItem(
       {super.key,
@@ -25,8 +25,7 @@ class TvVideoItem extends StatelessWidget {
       this.onSelect,
       this.onFocusChange});
 
-  openVideo(
-      BuildContext context, VideoInList e, FocusNode node, KeyEvent event) {
+  openVideo(BuildContext context, Video e, FocusNode node, KeyEvent event) {
     if (event is KeyUpEvent &&
         isOk(event.logicalKey, physicalKeyboardKey: event.physicalKey)) {
       if (e.filtered) {
@@ -62,8 +61,8 @@ class TvVideoItem extends StatelessWidget {
             padding: const EdgeInsets.only(right: 8.0),
             child: Focus(
                 onFocusChange: onFocusChange,
-                onKeyEvent: (node, event) => openVideo(
-                    context, state.video!.toVideoInList(), node, event),
+                onKeyEvent: (node, event) =>
+                    openVideo(context, state.video!, node, event),
                 autofocus: autoFocus,
                 child: Builder(builder: (ctx) {
                   final FocusNode focusNode = Focus.of(ctx);
@@ -197,28 +196,31 @@ class TvVideoItem extends StatelessWidget {
                                                       color: colors.primary,
                                                     ),
                                                   ),
-                                                Container(
-                                                  decoration: BoxDecoration(
-                                                      color: Colors.black
-                                                          .withOpacity(0.5),
-                                                      borderRadius:
-                                                          BorderRadius.circular(
-                                                              5)),
-                                                  child: Padding(
-                                                    padding:
-                                                        const EdgeInsets.all(
-                                                            3.0),
-                                                    child: Text(
-                                                      prettyDuration(Duration(
-                                                          seconds: video
-                                                              .lengthSeconds)),
-                                                      style: textTheme.bodySmall
-                                                          ?.copyWith(
-                                                              color:
-                                                                  Colors.white),
+                                                if (video.lengthSeconds != null)
+                                                  Container(
+                                                    decoration: BoxDecoration(
+                                                        color: Colors.black
+                                                            .withOpacity(0.5),
+                                                        borderRadius:
+                                                            BorderRadius
+                                                                .circular(5)),
+                                                    child: Padding(
+                                                      padding:
+                                                          const EdgeInsets.all(
+                                                              3.0),
+                                                      child: Text(
+                                                        prettyDuration(Duration(
+                                                            seconds: video
+                                                                    .lengthSeconds ??
+                                                                0)),
+                                                        style: textTheme
+                                                            .bodySmall
+                                                            ?.copyWith(
+                                                                color: Colors
+                                                                    .white),
+                                                      ),
                                                     ),
                                                   ),
-                                                ),
                                               ],
                                             ),
                                           ),
@@ -228,7 +230,7 @@ class TvVideoItem extends StatelessWidget {
                                   child: Text(
                                     (state.video?.filtered ?? false)
                                         ? '**********'
-                                        : video.title,
+                                        : video.title ?? '',
                                     maxLines: 2,
                                     overflow: TextOverflow.ellipsis,
                                     style: TextStyle(color: colors.primary),
diff --git a/lib/videos/views/tv/screens/video.dart b/lib/videos/views/tv/screens/video.dart
index ac949164..a3145ead 100644
--- a/lib/videos/views/tv/screens/video.dart
+++ b/lib/videos/views/tv/screens/video.dart
@@ -15,7 +15,6 @@ import 'package:clipious/utils/views/tv/components/tv_button.dart';
 import 'package:clipious/utils/views/tv/components/tv_expandable_text.dart';
 import 'package:clipious/utils/views/tv/components/tv_horizontal_item_list.dart';
 import 'package:clipious/utils/views/tv/components/tv_overscan.dart';
-import 'package:clipious/videos/models/video_in_list.dart';
 import 'package:clipious/videos/views/components/video_metrics.dart';
 
 import '../../../../player/states/player.dart';
@@ -193,8 +192,9 @@ class TvVideoScreen extends StatelessWidget {
                                                               .start,
                                                       children: [
                                                         Text(
-                                                          videoState
-                                                              .video!.title,
+                                                          videoState.video!
+                                                                  .title ??
+                                                              '',
                                                           maxLines: 1,
                                                           style: textTheme
                                                               .headlineMedium!
@@ -336,32 +336,9 @@ class TvVideoScreen extends StatelessWidget {
                                                     TvHorizontalVideoList(
                                                         paginatedVideoList:
                                                             FixedItemList<
-                                                                VideoInList>(videoState
+                                                                Video>(videoState
                                                                     .video
-                                                                    ?.recommendedVideos
-                                                                    .map((e) {
-                                                                  var videoInList = VideoInList(
-                                                                      e.title,
-                                                                      e.videoId,
-                                                                      e.lengthSeconds,
-                                                                      0,
-                                                                      e.author,
-                                                                      '',
-                                                                      'authorUrl',
-                                                                      0,
-                                                                      '',
-                                                                      e.videoThumbnails);
-                                                                  videoInList
-                                                                          .filtered =
-                                                                      e.filtered;
-                                                                  videoInList
-                                                                          .filterHide =
-                                                                      e.filterHide;
-                                                                  videoInList
-                                                                          .matchedFilters =
-                                                                      e.matchedFilters;
-                                                                  return videoInList;
-                                                                }).toList() ??
+                                                                    ?.recommendedVideos ??
                                                                 []))
                                                   ]),
                                             )
diff --git a/lib/videos/views/tv/screens/video_grid_view.dart b/lib/videos/views/tv/screens/video_grid_view.dart
index 72d62dcf..9c13bcb1 100644
--- a/lib/videos/views/tv/screens/video_grid_view.dart
+++ b/lib/videos/views/tv/screens/video_grid_view.dart
@@ -1,4 +1,5 @@
 import 'package:auto_route/annotations.dart';
+import 'package:clipious/videos/models/video.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:clipious/utils/models/paginated_list.dart';
@@ -7,11 +8,10 @@ import 'package:clipious/utils/views/tv/components/tv_overscan.dart';
 import 'package:clipious/videos/views/tv/components/video_item.dart';
 
 import '../../../../utils/states/item_list.dart';
-import '../../../models/video_in_list.dart';
 
 @RoutePage()
 class TvGridScreen extends StatelessWidget {
-  final PaginatedList<VideoInList> paginatedVideoList;
+  final PaginatedList<Video> paginatedVideoList;
   final String? tags;
   final String title;
 
@@ -29,9 +29,9 @@ class TvGridScreen extends StatelessWidget {
           ItemListCubit(ItemListState(itemList: paginatedVideoList)),
       child: Scaffold(
         body: TvOverscan(
-          child: BlocBuilder<ItemListCubit<VideoInList>,
-              ItemListState<VideoInList>>(builder: (context, state) {
-            var cubit = context.read<ItemListCubit<VideoInList>>();
+          child: BlocBuilder<ItemListCubit<Video>, ItemListState<Video>>(
+              builder: (context, state) {
+            var cubit = context.read<ItemListCubit<Video>>();
             return Column(
               children: [
                 Row(
diff --git a/lib/workmanager.dart b/lib/workmanager.dart
index 1a016830..1b7a0cf7 100644
--- a/lib/workmanager.dart
+++ b/lib/workmanager.dart
@@ -8,11 +8,11 @@ import 'package:clipious/globals.dart';
 import 'package:clipious/notifications/models/db/subscription_notifications.dart';
 import 'package:clipious/settings/states/settings.dart';
 import 'package:clipious/utils/file_db.dart';
-import 'package:clipious/videos/models/video_in_list.dart';
 import 'package:logging/logging.dart';
 import 'package:workmanager/workmanager.dart';
 
 import 'notifications/notifications.dart';
+import 'videos/models/video.dart';
 
 var log = Logger('background-task');
 const taskName = "Clipious background refresh task";
@@ -166,7 +166,7 @@ _handleSubscriptionsNotifications() async {
     final lastNotification = await fileDb.getLastSubscriptionNotification();
     var feed = await service.getUserFeed(maxResults: 100, saveLastSeen: false);
 
-    List<VideoInList> videos = [];
+    List<Video> videos = [];
     videos.addAll(feed.notifications ?? []);
     videos.addAll(feed.videos ?? []);