diff --git a/MusicX.Core/Models/Block.cs b/MusicX.Core/Models/Block.cs
index fc8a75b7..7ef418bd 100644
--- a/MusicX.Core/Models/Block.cs
+++ b/MusicX.Core/Models/Block.cs
@@ -1,8 +1,5 @@
 using MusicX.Shared.ListenTogether.Radio;
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Text;
 using MusicX.Core.Helpers;
 
 namespace MusicX.Core.Models
@@ -21,16 +18,16 @@ public class Block : IIdentifiable
         public Layout Layout { get; set; }
 
         [JsonProperty("catalog_banner_ids")]
-        public List<int> CatalogBannerIds { get; set; } = new List<int>();
+        public List<int> CatalogBannerIds { get; set; } = [];
 
         [JsonProperty("links_ids")]
-        public List<string> LinksIds { get; set; } = new List<string>();
+        public List<string> LinksIds { get; set; } = [];
 
         [JsonProperty("buttons")]
-        public List<Button> Buttons { get; set; }
+        public List<Button> Buttons { get; set; } = [];
 
         [JsonProperty("actions")]
-        public List<Button> Actions { get; set; } = new List<Button> { };
+        public List<Button> Actions { get; set; } = [];
 
         [JsonProperty("next_from")]
         public string NextFrom { get; set; }
@@ -39,81 +36,132 @@ public class Block : IIdentifiable
         public string Url { get; set; }
 
         [JsonProperty("listen_events")]
-        public List<string> ListenEvents { get; set; }
+        public List<string> ListenEvents { get; set; } = [];
 
         [JsonProperty("playlists_ids")]
-        public List<string> PlaylistsIds { get; set; } = new List<string>();
+        public List<string> PlaylistsIds { get; set; } = [];
 
         [JsonProperty("suggestions_ids")]
-        public List<string> SuggestionsIds { get; set; } = new List<string>();
+        public List<string> SuggestionsIds { get; set; } = [];
 
         [JsonProperty("artists_ids")]
-        public List<string> ArtistsIds { get; set; } = new List<string>();
+        public List<string> ArtistsIds { get; set; } = [];
 
         [JsonProperty("badge")]
         public Badge Badge { get; set; }
 
         [JsonProperty("audios_ids")]
-        public List<string> AudiosIds { get; set; } = new List<string>();
+        public List<string> AudiosIds { get; set; } = [];
 
         [JsonProperty("curators_ids")]
-        public List<long> CuratorsIds { get; set; } = new List<long>();
+        public List<long> CuratorsIds { get; set; } = [];
 
         [JsonProperty("group_ids")]
-        public List<long> GroupIds { get; set; } = new List<long>();
+        public List<long> GroupIds { get; set; } = [];
 
         [JsonProperty("text_ids")]
-        public List<string> TextIds { get; set; } = new List<string>();
+        public List<string> TextIds { get; set; } = [];
 
         [JsonProperty("podcast_episodes_ids")]
-        public List<string> PodcastEpisodesIds { get; set; } = new List<string>();
+        public List<string> PodcastEpisodesIds { get; set; } = [];
 
         [JsonProperty("podcast_slider_items_ids")]
-        public List<string> PodcastSliderItemsIds { get; set; } = new List<string>();
+        public List<string> PodcastSliderItemsIds { get; set; } = [];
 
         [JsonProperty("longreads_ids")]
-        public List<string> LongreadsIds { get; set; } = new List<string>();
+        public List<string> LongreadsIds { get; set; } = [];
 
         [JsonProperty("videos_ids")]
-        public List<string> VideosIds { get; set; } = new List<string>();
+        public List<string> VideosIds { get; set; } = [];
 
         [JsonProperty("artist_videos_ids")]
-        public List<string> ArtistVideosIds { get; set; } = new List<string>();
+        public List<string> ArtistVideosIds { get; set; } = [];
 
         [JsonProperty("placeholder_ids")]
-        public List<string> PlaceholdersIds { get; set; } = new List<string>();
+        public List<string> PlaceholdersIds { get; set; } = [];
 
         [JsonProperty("music_owners_ids")]
-        public List<string> MusicOwnerIds { get; set; } = new List<string>();
+        public List<string> MusicOwnerIds { get; set; } = [];
 
         [JsonProperty("audio_followings_update_info_ids")]
-        public List<string> FollowingUpdateInfoIds { get; set; } = new List<string>();
+        public List<string> FollowingUpdateInfoIds { get; set; } = [];
 
         [JsonProperty("group_items")]
-        public List<CuratorGroup> GroupsItemsIds { get; set; } = new List<CuratorGroup>();
-
-        public List<Curator> Curators { get; set; } = new List<Curator>();
-        public List<Text> Texts { get; set; } = new List<Text>();
-        public List<Audio> Audios { get; set; } = new List<Audio>();
-        public List<Playlist> Playlists { get; set; } = new List<Playlist>();
-        public List<CatalogBanner> Banners { get; set; } = new List<CatalogBanner>();
-        public List<Link> Links { get; set; } = new List<Link>();
-        public List<Suggestion> Suggestions { get; set; } = new List<Suggestion>();
-        public List<Artist> Artists { get; set; } = new List<Artist>();
-        public List<Group> Groups { get; set; } = new List<Group>();
-        public List<PodcastSliderItem> PodcastSliderItems { get; set; } = new List<PodcastSliderItem>();
-        public List<PodcastEpisode> PodcastEpisodes { get; set; } = new List<PodcastEpisode>();
-        public List<Longread> Longreads { get; set; } = new List<Longread>();
-        public List<RecommendedPlaylist> RecommendedPlaylists { get; set; } = new List<RecommendedPlaylist>();
-        public List<Video> Videos { get; set; } = new List<Video>();
-        public List<Video> ArtistVideos { get; set; } = new List<Video>();
-
-        public List<Placeholder> Placeholders { get; set; } = new List<Placeholder>();
-
-        public List<MusicOwner> MusicOwners { get; set; } = new List<MusicOwner>();
+        public List<CuratorGroup> GroupsItemsIds { get; set; } = [];
+
+        public List<Curator> Curators { get; set; } = [];
+        public List<Text> Texts { get; set; } = [];
+        public List<Audio> Audios { get; set; } = [];
+        public List<Playlist> Playlists { get; set; } = [];
+        public List<CatalogBanner> Banners { get; set; } = [];
+        public List<Link> Links { get; set; } = [];
+        public List<Suggestion> Suggestions { get; set; } = [];
+        public List<Artist> Artists { get; set; } = [];
+        public List<Group> Groups { get; set; } = [];
+        public List<PodcastSliderItem> PodcastSliderItems { get; set; } = [];
+        public List<PodcastEpisode> PodcastEpisodes { get; set; } = [];
+        public List<Longread> Longreads { get; set; } = [];
+        public List<RecommendedPlaylist> RecommendedPlaylists { get; set; } = [];
+        public List<Video> Videos { get; set; } = [];
+        public List<Video> ArtistVideos { get; set; } = [];
+
+        public List<Placeholder> Placeholders { get; set; } = [];
+
+        public List<MusicOwner> MusicOwners { get; set; } = [];
         
-        public List<AudioFollowingsUpdateInfo> FollowingsUpdateInfos { get; set; } = new List<AudioFollowingsUpdateInfo>();
-
-        public List<Station> Stations { get; set; } = new List<Station>();
+        public List<AudioFollowingsUpdateInfo> FollowingsUpdateInfos { get; set; } = [];
+
+        public List<Station> Stations { get; set; } = [];
+
+        public Block Clone()
+        {
+            return (Block)MemberwiseClone();
+        }
+
+        public void Merge(Block block)
+        {
+            CatalogBannerIds.AddRange(block.CatalogBannerIds);
+            LinksIds.AddRange(block.LinksIds);
+            Buttons.AddRange(block.Buttons);
+            Actions.AddRange(block.Actions);
+            NextFrom = block.NextFrom;
+            Url = block.Url;
+            ListenEvents.AddRange(block.ListenEvents);
+            PlaylistsIds.AddRange(block.PlaylistsIds);
+            ArtistsIds.AddRange(block.ArtistsIds);
+            Badge = block.Badge;
+            AudiosIds.AddRange(block.AudiosIds);
+            CuratorsIds.AddRange(block.CuratorsIds);
+            GroupIds.AddRange(block.GroupIds);
+            TextIds.AddRange(block.TextIds);
+            PodcastEpisodesIds.AddRange(block.PodcastEpisodesIds);
+            PodcastSliderItemsIds.AddRange(block.PodcastSliderItemsIds);
+            LongreadsIds.AddRange(block.LongreadsIds);
+            VideosIds.AddRange(block.VideosIds);
+            ArtistVideosIds.AddRange(block.ArtistVideosIds);
+            PlaceholdersIds.AddRange(block.PlaceholdersIds);
+            MusicOwnerIds.AddRange(block.MusicOwnerIds);
+            FollowingUpdateInfoIds.AddRange(block.FollowingUpdateInfoIds);
+            GroupsItemsIds.AddRange(block.GroupsItemsIds);
+            Curators.AddRange(block.Curators);
+            Texts.AddRange(block.Texts);
+            Audios.AddRange(block.Audios);
+            Playlists.AddRange(block.Playlists);
+            Banners.AddRange(block.Banners);
+            Links.AddRange(block.Links);
+            Suggestions.AddRange(block.Suggestions);
+            Artists.AddRange(block.Artists);
+            Groups.AddRange(block.Groups);
+            PodcastSliderItems.AddRange(block.PodcastSliderItems);
+            PodcastEpisodes.AddRange(block.PodcastEpisodes);
+            Longreads.AddRange(block.Longreads);
+            Videos.AddRange(block.Videos);
+            ArtistVideos.AddRange(block.ArtistVideos);
+            Placeholders.AddRange(block.Placeholders);
+            MusicOwners.AddRange(block.MusicOwners);
+            FollowingsUpdateInfos.AddRange(block.FollowingsUpdateInfos);
+            RecommendedPlaylists.AddRange(block.RecommendedPlaylists);
+            Stations.AddRange(block.Stations);
+        }
     }
 }
diff --git a/MusicX.Core/Models/Video.cs b/MusicX.Core/Models/Video.cs
index c2ff12a5..db522ca3 100644
--- a/MusicX.Core/Models/Video.cs
+++ b/MusicX.Core/Models/Video.cs
@@ -10,7 +10,7 @@ namespace MusicX.Core.Models
 {
     public class Video : IIdentifiable
     {
-        string IIdentifiable.Identifier => Id.ToString();
+        string IIdentifiable.Identifier => $"{OwnerId}_{Id}";
 
         [JsonProperty("is_explicit")]
         public int IsExplicit { get; set; }
diff --git a/MusicX.Core/Services/VkService.cs b/MusicX.Core/Services/VkService.cs
index 6b7b80f4..e06833d9 100644
--- a/MusicX.Core/Services/VkService.cs
+++ b/MusicX.Core/Services/VkService.cs
@@ -543,7 +543,7 @@ public async Task DeletePlaylistAsync(long playlistId, long ownerId)
             }
         }
 
-        public async Task<ResponseData> AudioGetAsync(long? playlistId, long? ownerId, string? assessKey, long offset = 0, long count = 100)
+        public async Task<ResponseData> AudioGetAsync(long? playlistId, long? ownerId, string? assessKey, long offset = 0, long count = 100, int? shuffleSeed = null)
         {
             try
             {
@@ -573,6 +573,10 @@ public async Task<ResponseData> AudioGetAsync(long? playlistId, long? ownerId, s
                     parameters.Add("access_key", assessKey);
                 }
 
+                if (shuffleSeed != null)
+                {
+                    parameters.Add("shuffle_seed", shuffleSeed);
+                }
 
                 var model = await apiInvoke.CallAsync<ResponseData>("audio.get", parameters);
 
diff --git a/MusicX/App.xaml.cs b/MusicX/App.xaml.cs
index e48b7e9c..8e439381 100644
--- a/MusicX/App.xaml.cs
+++ b/MusicX/App.xaml.cs
@@ -4,6 +4,7 @@
 using Microsoft.AppCenter;
 using Microsoft.AppCenter.Analytics;
 using Microsoft.AppCenter.Crashes;
+using MusicX.Patches;
 using MusicX.Services;
 using MusicX.Views;
 
@@ -41,6 +42,8 @@ protected async override void OnStartup(StartupEventArgs e)
                     {"Version", StaticService.Version }
                 };
             Analytics.TrackEvent("StartApp", properties);
+            
+            ItemContainerGeneratorIndexHook.Apply();
 
             var window = new StartingWindow(e.Args);
             window.Show();
diff --git a/MusicX/Controls/ActionButtonControl.xaml.cs b/MusicX/Controls/ActionButtonControl.xaml.cs
index 82b139b8..97f3ed1e 100644
--- a/MusicX/Controls/ActionButtonControl.xaml.cs
+++ b/MusicX/Controls/ActionButtonControl.xaml.cs
@@ -13,6 +13,7 @@
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 using MusicX.Core.Models;
+using MusicX.ViewModels;
 using MusicX.ViewModels.Controls;
 using Block = MusicX.Core.Models.Block;
 using Button = MusicX.Core.Models.Button;
@@ -42,11 +43,11 @@ public Artist? Artist
         get => (Artist?)GetValue(ArtistProperty);
         set => SetValue(ArtistProperty, value);
     }
-    public static readonly DependencyProperty ParentBlockProperty = DependencyProperty.Register(nameof(ParentBlock), typeof(Block), typeof(ActionButtonControl), new(null, OnChanged));
+    public static readonly DependencyProperty ParentBlockProperty = DependencyProperty.Register(nameof(ParentBlock), typeof(BlockViewModel), typeof(ActionButtonControl), new(null, OnChanged));
 
-    public Block? ParentBlock
+    public BlockViewModel? ParentBlock
     {
-        get => (Block?)GetValue(ParentBlockProperty);
+        get => (BlockViewModel?)GetValue(ParentBlockProperty);
         set => SetValue(ParentBlockProperty, value);
     }
 
diff --git a/MusicX/Controls/BigBannerControl.xaml.cs b/MusicX/Controls/BigBannerControl.xaml.cs
index 40e58eab..f309148b 100644
--- a/MusicX/Controls/BigBannerControl.xaml.cs
+++ b/MusicX/Controls/BigBannerControl.xaml.cs
@@ -21,6 +21,15 @@ namespace MusicX.Controls
     /// </summary>
     public partial class BigBannerControl : UserControl
     {
+        public static readonly DependencyProperty BannersProperty = DependencyProperty.Register(
+            nameof(Banners), typeof(IList<CatalogBanner>), typeof(BigBannerControl), new PropertyMetadata(Array.Empty<CatalogBanner>()));
+
+        public IList<CatalogBanner> Banners
+        {
+            get => (IList<CatalogBanner>)GetValue(BannersProperty);
+            set => SetValue(BannersProperty, value);
+        }
+        
         public BigBannerControl()
         {
             InitializeComponent();
@@ -75,8 +84,6 @@ private void BannerService_ShowBannerEvent(CatalogBanner banner)
             amim.Begin();
         }
 
-        public List<CatalogBanner> Banners => ((Block)DataContext).Banners;
-
         private async void ActionButton_Click(object sender, RoutedEventArgs e)
         {
             try
diff --git a/MusicX/Controls/BlockControl.xaml b/MusicX/Controls/BlockControl.xaml
index 003c6043..b42ee43a 100644
--- a/MusicX/Controls/BlockControl.xaml
+++ b/MusicX/Controls/BlockControl.xaml
@@ -8,17 +8,16 @@
     xmlns:models="clr-namespace:MusicX.Core.Models;assembly=MusicX.Core" 
     xmlns:helpers="clr-namespace:MusicX.Helpers" 
     xmlns:blocks="clr-namespace:MusicX.Controls.Blocks" 
-    xmlns:controls="clr-namespace:MusicX.Controls" 
-    xmlns:viewModels="clr-namespace:MusicX.ViewModels.Controls" xmlns:hc="https://handyorg.github.io/handycontrol"
+    xmlns:controls="clr-namespace:MusicX.Controls"
     d:DesignHeight="450"
     d:DesignWidth="800"
-    xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
+    xmlns:viewModels="clr-namespace:MusicX.ViewModels"
     ContentTemplateSelector="{DynamicResource BlockTemplateSelector}"
     mc:Ignorable="d">
 
     <UserControl.Resources>
         <helpers:BlockTemplateSelector x:Key="BlockTemplateSelector">
-            <DataTemplate DataType="models:Block">
+            <DataTemplate DataType="{x:Type viewModels:BlockViewModel}">
                 <wpfui:Card>
                     <UniformGrid Rows="2" HorizontalAlignment="Center">
                         <TextBlock Text="{Binding DataType}"  />
@@ -27,19 +26,21 @@
                 </wpfui:Card>
             </DataTemplate>
         </helpers:BlockTemplateSelector>
+        
+        <!-- ReSharper disable InconsistentNaming -->
 
-        <DataTemplate x:Key="none" DataType="models:Block">
-            <blocks:TitleBlockControl />
+        <DataTemplate x:Key="none" DataType="{x:Type viewModels:BlockViewModel}">
+            <blocks:TitleBlockControl ViewModel="{Binding}" />
         </DataTemplate>
-        <DataTemplate x:Key="none_separator" DataType="models:Block">
+        <DataTemplate x:Key="none_separator" DataType="{x:Type viewModels:BlockViewModel}">
             <Rectangle Margin="5,5,5,10" Height="1" Fill="{DynamicResource ControlStrokeColorDefaultBrush}" />
         </DataTemplate>
 
-        <DataTemplate x:Key="loader" DataType="models:Block">
+        <DataTemplate x:Key="loader" DataType="{x:Type viewModels:BlockViewModel}">
             <blocks:LoaderBlockControl />
         </DataTemplate>
 
-        <DataTemplate x:Key="music_audios_triple_stacked_slider" DataType="models:Block">
+        <DataTemplate x:Key="music_audios_triple_stacked_slider" DataType="{x:Type viewModels:BlockViewModel}">
             <!--<hc:ScrollViewer VerticalScrollBarVisibility="Disabled" CanMouseWheel="False">
     <ItemsControl ItemsSource="{Binding Audios}">
         <ItemsControl.ItemsPanel>
@@ -56,111 +57,112 @@
 </hc:ScrollViewer>-->
             <controls:ListTracks Tracks="{Binding Audios}" ShowChart="False" />
         </DataTemplate>
-        <DataTemplate x:Key="music_audios_music_chart_triple_stacked_slider" DataType="models:Block">
+        <DataTemplate x:Key="music_audios_music_chart_triple_stacked_slider" DataType="{x:Type viewModels:BlockViewModel}">
             <controls:ListTracks Tracks="{Binding Audios}" ShowChart="True" />
         </DataTemplate>
-        <DataTemplate x:Key="music_audios_list" DataType="models:Block">
-            <blocks:AudiosListControl Audios="{Binding Audios}" />
+        <DataTemplate x:Key="music_audios_list" DataType="{x:Type viewModels:BlockViewModel}">
+            <blocks:AudiosListControl Audios="{Binding Audios}" ShowChart="False" />
         </DataTemplate>
-        <DataTemplate x:Key="music_audios_music_chart_list" DataType="models:Block">
-            <blocks:AudiosListControl Audios="{Binding Audios}" />
+        <DataTemplate x:Key="music_audios_music_chart_list" DataType="{x:Type viewModels:BlockViewModel}">
+            <blocks:AudiosListControl Audios="{Binding Audios}" ShowChart="True" />
         </DataTemplate>
 
-        <DataTemplate x:Key="music_playlists_music_chart_large_slider" DataType="models:Block">
+        <DataTemplate x:Key="music_playlists_music_chart_large_slider" DataType="{x:Type viewModels:BlockViewModel}">
             <controls:ListPlaylists Content="{Binding Playlists}" ShowFull="False" />
         </DataTemplate>
 
-        <DataTemplate x:Key="music_playlists_crop_slider" DataType="models:Block">
+        <DataTemplate x:Key="music_playlists_crop_slider" DataType="{x:Type viewModels:BlockViewModel}">
             <controls:ListPlaylists Content="{Binding Playlists}" IsCropped="True" />
         </DataTemplate>
         
-        <DataTemplate x:Key="music_playlists" DataType="models:Block">
+        <DataTemplate x:Key="music_playlists" DataType="{x:Type viewModels:BlockViewModel}">
             <controls:ListPlaylists Content="{Binding Playlists}" ShowFull="False" />
         </DataTemplate>
-        <DataTemplate x:Key="music_playlists_list" DataType="models:Block">
+        <DataTemplate x:Key="music_playlists_list" DataType="{x:Type viewModels:BlockViewModel}">
             <controls:ListPlaylists Content="{Binding Playlists}" ShowFull="True" />
         </DataTemplate>
-        <DataTemplate x:Key="music_playlists_recomms_slider" DataType="models:Block">
+        <DataTemplate x:Key="music_playlists_recomms_slider" DataType="{x:Type viewModels:BlockViewModel}">
             <blocks:RecommsPlaylistBlock Playlists="{Binding Playlists}" />
         </DataTemplate>
 
-        <DataTemplate x:Key="catalog_banners" DataType="models:Block">
-            <controls:BigBannerControl Margin="0 0 -10 0" />
+        <DataTemplate x:Key="catalog_banners" DataType="{x:Type viewModels:BlockViewModel}">
+            <controls:BigBannerControl Margin="0 0 -10 0" Banners="{Binding CatalogBanners}" />
         </DataTemplate>
 
-        <DataTemplate x:Key="links_music_newsfeed_title" DataType="models:Block">
+        <DataTemplate x:Key="links_music_newsfeed_title" DataType="{x:Type viewModels:BlockViewModel}">
             <blocks:LinksNewsfeedBlockControl Links="{Binding Links}" />
         </DataTemplate>
-        <DataTemplate x:Key="links" DataType="models:Block">
+        <DataTemplate x:Key="links" DataType="{x:Type viewModels:BlockViewModel}">
             <blocks:LinksBlockControl Block="{Binding}" />
         </DataTemplate>
-        <DataTemplate x:Key="links_categories_list" DataType="models:Block">
+        <DataTemplate x:Key="links_categories_list" DataType="{x:Type viewModels:BlockViewModel}">
             <blocks:MusicCategoryBlockControl />
         </DataTemplate>
 
-        <DataTemplate x:Key="groups_items" DataType="models:Block">
+        <DataTemplate x:Key="groups_items" DataType="{x:Type viewModels:BlockViewModel}">
             <blocks:GroupsBlockControl />
         </DataTemplate>
 
-        <DataTemplate x:Key="placeholder" DataType="models:Block">
-            <blocks:PlaceholderBlockControl />
+        <DataTemplate x:Key="placeholder" DataType="{x:Type viewModels:BlockViewModel}">
+            <blocks:PlaceholderBlockControl Block="{Binding}" />
         </DataTemplate>
 
-        <DataTemplate x:Key="texts" DataType="models:Block">
+        <DataTemplate x:Key="texts" DataType="{x:Type viewModels:BlockViewModel}">
             <blocks:TextsBlockControl />
         </DataTemplate>
 
-        <DataTemplate x:Key="artist" DataType="models:Block">
-            <blocks:ArtistBannerBlockControl />
+        <DataTemplate x:Key="artist" DataType="{x:Type viewModels:BlockViewModel}">
+            <blocks:ArtistBannerBlockControl Block="{Binding}" />
         </DataTemplate>
 
-        <DataTemplate x:Key="search_suggestions" DataType="models:Block">
+        <DataTemplate x:Key="search_suggestions" DataType="{x:Type viewModels:BlockViewModel}">
             <blocks:SearchSuggestionsBlockControl />
         </DataTemplate>
 
-        <DataTemplate x:Key="stations" DataType="models:Block">
-            <blocks:UserRadioBlockControl />
+        <DataTemplate x:Key="stations" DataType="{x:Type viewModels:BlockViewModel}">
+            <blocks:UserRadioBlockControl Block="{Binding}" />
         </DataTemplate>
 
-        <DataTemplate x:Key="audio_followings_update_info" DataType="models:Block">
-            <blocks:FollowingsUpdateInfoListBlockControl />
+        <DataTemplate x:Key="audio_followings_update_info" DataType="{x:Type viewModels:BlockViewModel}">
+            <blocks:FollowingsUpdateInfoListBlockControl Block="{Binding}" />
         </DataTemplate>
 
-        <DataTemplate x:Key="telegram" DataType="models:Block">
+        <DataTemplate x:Key="telegram" DataType="{x:Type viewModels:BlockViewModel}">
             <blocks:TelegramBlockControl />
         </DataTemplate>
 
-        <DataTemplate x:Key="music_owners" DataType="models:Block">
+        <DataTemplate x:Key="music_owners" DataType="{x:Type viewModels:BlockViewModel}">
             <blocks:MusicOwnerCellBlockControl DataContext="{Binding MusicOwners[0]}" />
         </DataTemplate>
 
-        <DataTemplate x:Key="artist_videos" DataType="models:Block">
+        <DataTemplate x:Key="artist_videos" DataType="{x:Type viewModels:BlockViewModel}">
             <blocks:VideosSliderBlockControl Content="{Binding ArtistVideos}" ShowFull="False" />
         </DataTemplate>
-        <DataTemplate x:Key="artist_videos_list" DataType="models:Block">
+        <DataTemplate x:Key="artist_videos_list" DataType="{x:Type viewModels:BlockViewModel}">
             <blocks:VideosSliderBlockControl Content="{Binding ArtistVideos}" ShowFull="True" />
         </DataTemplate>
 
-        <DataTemplate x:Key="videos" DataType="models:Block">
+        <DataTemplate x:Key="videos" DataType="{x:Type viewModels:BlockViewModel}">
             <blocks:VideosSliderBlockControl Content="{Binding Videos}" ShowFull="False" />
         </DataTemplate>
-        <DataTemplate x:Key="videos_list" DataType="models:Block">
+        <DataTemplate x:Key="videos_list" DataType="{x:Type viewModels:BlockViewModel}">
             <blocks:VideosSliderBlockControl Content="{Binding Videos}" ShowFull="True" />
         </DataTemplate>
 
-        <DataTemplate x:Key="music_recommended_playlists" DataType="models:Block">
+        <DataTemplate x:Key="music_recommended_playlists" DataType="{x:Type viewModels:BlockViewModel}">
             <blocks:RecommendedPlaylistsBlockControl Content="{Binding RecommendedPlaylists}" ShowFull="False" />
         </DataTemplate>
-        <DataTemplate x:Key="music_recommended_playlists_list" DataType="models:Block">
+        
+        <DataTemplate x:Key="music_recommended_playlists_list" DataType="{x:Type viewModels:BlockViewModel}">
             <blocks:RecommendedPlaylistsBlockControl Content="{Binding RecommendedPlaylists}" ShowFull="True" />
         </DataTemplate>
 
-        <DataTemplate x:Key="longreads" DataType="models:Block">
+        <DataTemplate x:Key="longreads" DataType="{x:Type viewModels:BlockViewModel}">
             <blocks:LongreadsSliderBlockControl DataContext="{Binding Longreads}" />
         </DataTemplate>
 
-        <DataTemplate x:Key="action" DataType="models:Block">
-            <ItemsControl ItemsSource="{Binding Actions}" Name="ActionsList">
+        <DataTemplate x:Key="action" DataType="{x:Type viewModels:BlockViewModel}">
+            <ItemsControl ItemsSource="{Binding Buttons}" Name="ActionsList">
                 <ItemsControl.ItemsPanel>
                     <ItemsPanelTemplate>
                         <controls:DynamicUniformGrid IsItemsHost="True" Rows="1" />
@@ -168,14 +170,16 @@
                 </ItemsControl.ItemsPanel>
                 <ItemsControl.ItemTemplate>
                     <DataTemplate DataType="models:Button">
-                        <controls:ActionButtonControl Action="{Binding Mode=OneTime}" Artist="{Binding Artist, RelativeSource={RelativeSource AncestorType=controls:BlockControl}}" ParentBlock="{Binding DataContext, ElementName=ActionsList}" />
+                        <controls:ActionButtonControl Action="{Binding}" Artist="{Binding Artist, RelativeSource={RelativeSource AncestorType=controls:BlockControl}}" ParentBlock="{Binding DataContext, ElementName=ActionsList}" />
                     </DataTemplate>
                 </ItemsControl.ItemTemplate>
             </ItemsControl>
         </DataTemplate>
         
-        <DataTemplate x:Key="curator_banner" DataType="models:Block">
-            <blocks:CuratorBannerBlockControl />
+        <DataTemplate x:Key="curator_banner" DataType="{x:Type viewModels:BlockViewModel}">
+            <blocks:CuratorBannerBlockControl Curators="{Binding Curators}" />
         </DataTemplate>
+        
+        <!-- ReSharper restore InconsistentNaming -->
     </UserControl.Resources>
 </UserControl>
diff --git a/MusicX/Controls/Blocks/ArtistBannerBlockControl.xaml.cs b/MusicX/Controls/Blocks/ArtistBannerBlockControl.xaml.cs
index 0c0b9712..07f4d370 100644
--- a/MusicX/Controls/Blocks/ArtistBannerBlockControl.xaml.cs
+++ b/MusicX/Controls/Blocks/ArtistBannerBlockControl.xaml.cs
@@ -21,25 +21,33 @@ namespace MusicX.Controls.Blocks
     /// </summary>
     public partial class ArtistBannerBlockControl : UserControl
     {
+        public static readonly DependencyProperty BlockProperty = DependencyProperty.Register(
+            nameof(Block), typeof(BlockViewModel), typeof(ArtistBannerBlockControl), new PropertyMetadata(BlockChangedCallback));
+
+        public BlockViewModel Block
+        {
+            get => (BlockViewModel)GetValue(BlockProperty);
+            set => SetValue(BlockProperty, value);
+        }
+        
         public ArtistBannerBlockControl()
         {
-            this.Loaded += ArtistBannerBlockControl_Loaded;
-            this.Initialized += ArtistBannerBlockControl_Initialized;
             InitializeComponent();
 
             ArtistText.Visibility = Visibility.Collapsed;
             ArtistBanner.Visibility = Visibility.Collapsed;
         }
 
-        private void ArtistBannerBlockControl_Initialized(object? sender, EventArgs e)
+        private static void BlockChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+            if (d is not ArtistBannerBlockControl control || e.NewValue is not BlockViewModel)
+                return;
             
-
+            control.Load();
         }
 
-        private void ArtistBannerBlockControl_Loaded(object sender, RoutedEventArgs e)
+        private void Load()
         {
-
             new Thread(()=>
             {
                 
@@ -57,24 +65,21 @@ private void ArtistBannerBlockControl_Loaded(object sender, RoutedEventArgs e)
                
             }).Start();
 
-            if (DataContext is not Block block || block.Actions is null)
-                return;
-
-            ArtistBannerImage.ImageSource = new BitmapImage(new Uri(block.Artists[0].Photo[2].Url));
-            ArtistText.Text = block.Artists[0].Name;
+            ArtistBannerImage.ImageSource = new BitmapImage(new Uri(Block.Artists[0].Photo[2].Url));
+            ArtistText.Text = Block.Artists[0].Name;
 
             var sectionViewModel = (SectionViewModel)this.FindAncestor<SectionView>()!.DataContext;
 
-            for (var i = 0; i < block.Actions.Count; i++)
+            for (var i = 0; i < Block.Buttons.Count; i++)
             {
-                var action = block.Actions[i];
+                var action = Block.Buttons[i];
                 
                 var text = new TextBlock();
                 var card = new CardAction()
                 {
                     Margin = new Thickness(0, 10, 15, 10),
                     Content = text,
-                    DataContext = new BlockButtonViewModel(action, sectionViewModel.Artist, block),
+                    DataContext = new BlockButtonViewModel(action, sectionViewModel.Artist, Block),
                     IsChevronVisible = false,
                     Height = 45
                 };
diff --git a/MusicX/Controls/Blocks/AudiosListControl.xaml b/MusicX/Controls/Blocks/AudiosListControl.xaml
index 1f1dfc71..b60dbfb5 100644
--- a/MusicX/Controls/Blocks/AudiosListControl.xaml
+++ b/MusicX/Controls/Blocks/AudiosListControl.xaml
@@ -6,24 +6,22 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:controls="clr-namespace:MusicX.Controls"
+    xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
     <Grid x:Name="AllTracksBlock">
-        <ItemsControl ItemsSource="{Binding Audios, ElementName=Control}">
-            <ItemsControl.ItemsPanel>
-                <ItemsPanelTemplate>
-                    <StackPanel Orientation="Vertical" IsItemsHost="True" />
-                </ItemsPanelTemplate>
-            </ItemsControl.ItemsPanel>
-            <ItemsControl.ItemTemplate>
+        <ui:ListView ItemsSource="{Binding Audios, ElementName=Control}"
+                     Style="{StaticResource ItemsListViewStyle}">
+            <ui:ListView.ItemTemplate>
                 <DataTemplate>
                     <StackPanel>
-                        <controls:TrackControl Audio="{Binding}" Margin="0,0,0,5" ShowCard="False" />
+                        <controls:TrackControl Audio="{Binding}" Margin="0,0,0,5" ShowCard="False" 
+                                               InChart="{Binding ShowChart, ElementName=Control}" />
                         <Rectangle Height="1" Fill="{DynamicResource ControlStrokeColorDefaultBrush}" Margin="5,0,5,5"/>
                     </StackPanel>
                 </DataTemplate>
-            </ItemsControl.ItemTemplate>
-        </ItemsControl>
+            </ui:ListView.ItemTemplate>
+        </ui:ListView>
     </Grid>
 </UserControl>
diff --git a/MusicX/Controls/Blocks/AudiosListControl.xaml.cs b/MusicX/Controls/Blocks/AudiosListControl.xaml.cs
index 310b7140..8e6ce49f 100644
--- a/MusicX/Controls/Blocks/AudiosListControl.xaml.cs
+++ b/MusicX/Controls/Blocks/AudiosListControl.xaml.cs
@@ -20,10 +20,19 @@ public AudiosListControl()
          DependencyProperty.Register("Audios", typeof(IEnumerable<Audio>),
              typeof(AudiosListControl), new PropertyMetadata(Enumerable.Empty<Audio>()));
 
-        public IEnumerable<Audio> Audios
+        public ICollection<Audio> Audios
         {
             get => (List<Audio>)GetValue(AudiosProperty);
             set => SetValue(AudiosProperty, value);
         }
+
+        public static readonly DependencyProperty ShowChartProperty = DependencyProperty.Register(
+            nameof(ShowChart), typeof(bool), typeof(AudiosListControl), new PropertyMetadata(default(bool)));
+
+        public bool ShowChart
+        {
+            get => (bool)GetValue(ShowChartProperty);
+            set => SetValue(ShowChartProperty, value);
+        }
     }
 }
diff --git a/MusicX/Controls/Blocks/CuratorBannerBlockControl.xaml.cs b/MusicX/Controls/Blocks/CuratorBannerBlockControl.xaml.cs
index aaee5da7..0e263357 100644
--- a/MusicX/Controls/Blocks/CuratorBannerBlockControl.xaml.cs
+++ b/MusicX/Controls/Blocks/CuratorBannerBlockControl.xaml.cs
@@ -18,7 +18,15 @@ namespace MusicX.Controls.Blocks
     /// </summary>
     public partial class CuratorBannerBlockControl : UserControl
     {
-        public Block Block => (Block)DataContext;
+        public static readonly DependencyProperty CuratorsProperty = DependencyProperty.Register(
+            nameof(Curators), typeof(IList<Curator>), typeof(CuratorBannerBlockControl), new PropertyMetadata(Array.Empty<Curator>()));
+
+        public IList<Curator> Curators
+        {
+            get => (IList<Curator>)GetValue(CuratorsProperty);
+            set => SetValue(CuratorsProperty, value);
+        }
+        
         public CuratorBannerBlockControl()
         {
             InitializeComponent();
@@ -29,17 +37,17 @@ private async void ActionCuratorButton_Click(object sender, RoutedEventArgs e)
             try
             {
                 var vkService = StaticService.Container.GetRequiredService<VkService>();
-                if (Block.Curators[0].IsFollowed)
+                if (Curators[0].IsFollowed)
                 {
                     ActionCuratorButton.IsEnabled = false;
                     ActionCuratorButton.Content = "Секунду..";
                     ActionCuratorButton.Icon = new SymbolIcon(SymbolRegular.Timer28);
 
-                    await vkService.UnfollowCurator(Block.Curators[0].Id);
+                    await vkService.UnfollowCurator(Curators[0].Id);
 
                     ActionCuratorButton.IsEnabled = true;
 
-                    Block.Curators[0].IsFollowed = false;
+                    Curators[0].IsFollowed = false;
                     ActionCuratorButton.Content = "Подписаться";
                     ActionCuratorButton.Icon = new SymbolIcon(SymbolRegular.Add24);
                 }
@@ -49,10 +57,10 @@ private async void ActionCuratorButton_Click(object sender, RoutedEventArgs e)
                     ActionCuratorButton.Content = "Секунду..";
                     ActionCuratorButton.Icon = new SymbolIcon(SymbolRegular.Timer28);
 
-                    await vkService.FollowCurator(Block.Curators[0].Id);
+                    await vkService.FollowCurator(Curators[0].Id);
 
                     ActionCuratorButton.IsEnabled = true;
-                    Block.Curators[0].IsFollowed = true;
+                    Curators[0].IsFollowed = true;
                     ActionCuratorButton.Content = "Отписаться";
                     ActionCuratorButton.Icon = new SymbolIcon(SymbolRegular.DeleteDismiss20);
                 }
@@ -81,11 +89,11 @@ private void CuratorBannerBlockControl_OnDataContextChanged(object sender, Depen
             if (e.NewValue is not Core.Models.Block)
                 return;
             
-            CuratorBannerImage.ImageSource = new BitmapImage(new Uri(Block.Curators[0].Photo[2].Url));
-            CuratorText.Text = Block.Curators[0].Name;
+            CuratorBannerImage.ImageSource = new BitmapImage(new Uri(Curators[0].Photo[2].Url));
+            CuratorText.Text = Curators[0].Name;
             //CuratorDescription.Text = Block.Curators[0].Description;
 
-            if (Block.Curators[0].IsFollowed)
+            if (Curators[0].IsFollowed)
             {
                 ActionCuratorButton.Content = "Отписаться";
                 ActionCuratorButton.Icon = new SymbolIcon(SymbolRegular.DeleteDismiss20);
diff --git a/MusicX/Controls/Blocks/FollowingsUpdateInfoListBlockControl.xaml.cs b/MusicX/Controls/Blocks/FollowingsUpdateInfoListBlockControl.xaml.cs
index c6406f35..a99ab5a4 100644
--- a/MusicX/Controls/Blocks/FollowingsUpdateInfoListBlockControl.xaml.cs
+++ b/MusicX/Controls/Blocks/FollowingsUpdateInfoListBlockControl.xaml.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
-using MusicX.Core.Models;
+using MusicX.ViewModels;
 using MusicX.ViewModels.Controls;
 
 namespace MusicX.Controls.Blocks;
@@ -9,11 +9,11 @@ namespace MusicX.Controls.Blocks;
 public partial class FollowingsUpdateInfoListBlockControl : UserControl
 {
     public static readonly DependencyProperty BlockProperty = DependencyProperty.Register(
-        nameof(Block), typeof(Block), typeof(FollowingsUpdateInfoListBlockControl));
+        nameof(Block), typeof(BlockViewModel), typeof(FollowingsUpdateInfoListBlockControl), new PropertyMetadata(BlockChangedCallback));
 
-    public Block Block
+    public BlockViewModel Block
     {
-        get => (Block)GetValue(BlockProperty);
+        get => (BlockViewModel)GetValue(BlockProperty);
         set => SetValue(BlockProperty, value);
     }
 
@@ -29,17 +29,15 @@ public BlockButtonViewModel ViewModel
     public FollowingsUpdateInfoListBlockControl()
     {
         InitializeComponent();
-        DataContextChanged += FollowingsUpdateInfoListBlockControl_DataContextChanged;
     }
-
-    private void FollowingsUpdateInfoListBlockControl_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
+    
+    private static void BlockChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        if (e.NewValue is not Block block)
+        if (d is not FollowingsUpdateInfoListBlockControl control || e.NewValue is not BlockViewModel block)
             return;
-
-        Block = block;
-        ViewModel = new BlockButtonViewModel(
-                                Block.Actions.First(b => b.RefDataType == "audio_followings_update_info"),
-                                parentBlock: Block);
+        
+        control.ViewModel = new BlockButtonViewModel(
+            block.Buttons.First(b => b.RefDataType == "audio_followings_update_info"),
+            parentBlock: block);
     }
 }
\ No newline at end of file
diff --git a/MusicX/Controls/Blocks/GroupsBlockControl.xaml.cs b/MusicX/Controls/Blocks/GroupsBlockControl.xaml.cs
index f19e889b..aec8ace3 100644
--- a/MusicX/Controls/Blocks/GroupsBlockControl.xaml.cs
+++ b/MusicX/Controls/Blocks/GroupsBlockControl.xaml.cs
@@ -9,6 +9,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using System.Collections.Generic;
 using Microsoft.AppCenter.Crashes;
+using MusicX.ViewModels;
 
 namespace MusicX.Controls.Blocks
 {
@@ -25,7 +26,7 @@ public GroupsBlockControl()
 
         private void GroupsBlockControl_Loaded(object sender, RoutedEventArgs e)
         {
-            if (DataContext is not Block block)
+            if (DataContext is not BlockViewModel block)
                 return;
             if(block.Groups[0].Photo100 != null) GroupImage.ImageSource = new BitmapImage(new Uri(block.Groups[0].Photo100));
 
@@ -35,7 +36,7 @@ private void GroupsBlockControl_Loaded(object sender, RoutedEventArgs e)
 
         private void Button_Click(object sender, RoutedEventArgs e)
         {
-            if (DataContext is not Block block)
+            if (DataContext is not BlockViewModel block)
                 return;
             try
             {
diff --git a/MusicX/Controls/Blocks/LinksBlockControl.xaml.cs b/MusicX/Controls/Blocks/LinksBlockControl.xaml.cs
index 76394033..8e0ba667 100644
--- a/MusicX/Controls/Blocks/LinksBlockControl.xaml.cs
+++ b/MusicX/Controls/Blocks/LinksBlockControl.xaml.cs
@@ -1,6 +1,7 @@
 using MusicX.Core.Models;
 using System.Windows;
 using System.Windows.Controls;
+using MusicX.ViewModels;
 
 namespace MusicX.Controls.Blocks
 {
@@ -10,14 +11,14 @@ namespace MusicX.Controls.Blocks
     public partial class LinksBlockControl : UserControl
     {
         public static readonly DependencyProperty BlockProperty = DependencyProperty.Register(
-            nameof(Block), typeof(Block), typeof(LinksBlockControl), new(default(Block), BlockChanged));
+            nameof(Block), typeof(BlockViewModel), typeof(LinksBlockControl), new(default(Block), BlockChanged));
 
         private static void BlockChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            if (d is not LinksBlockControl control || e.NewValue is not Block block)
+            if (d is not LinksBlockControl control || e.NewValue is not BlockViewModel block)
                 return;
             
-            if (block.Layout.Name == "list")
+            if (block.Layout?.Name == "list")
             {
                 foreach (var link in block.Links)
                 {
@@ -33,9 +34,9 @@ private static void BlockChanged(DependencyObject d, DependencyPropertyChangedEv
             }
         }
 
-        public Block Block
+        public BlockViewModel Block
         {
-            get => (Block)GetValue(BlockProperty);
+            get => (BlockViewModel)GetValue(BlockProperty);
             set => SetValue(BlockProperty, value);
         }
         
diff --git a/MusicX/Controls/Blocks/MusicCategoryBlockControl.xaml.cs b/MusicX/Controls/Blocks/MusicCategoryBlockControl.xaml.cs
index ed19d935..3d9b003a 100644
--- a/MusicX/Controls/Blocks/MusicCategoryBlockControl.xaml.cs
+++ b/MusicX/Controls/Blocks/MusicCategoryBlockControl.xaml.cs
@@ -9,6 +9,7 @@
 using System;
 using System.Windows.Media;
 using Microsoft.AppCenter.Crashes;
+using MusicX.ViewModels;
 using Wpf.Ui.Appearance;
 
 namespace MusicX.Controls.Blocks
@@ -53,7 +54,7 @@ private void ApplicationThemeOnChanged(ApplicationTheme currentApplicationTheme,
             AppTheme = currentApplicationTheme;
         }
         
-        public List<Link> Links => (DataContext as Block)?.Links ?? new();
+        public IList<Link> Links => (DataContext as BlockViewModel)?.Links ?? new();
 
         private async Task OpenPage(Link link)
         {
diff --git a/MusicX/Controls/Blocks/PlaceholderBlockControl.xaml.cs b/MusicX/Controls/Blocks/PlaceholderBlockControl.xaml.cs
index 4cb12517..16731ece 100644
--- a/MusicX/Controls/Blocks/PlaceholderBlockControl.xaml.cs
+++ b/MusicX/Controls/Blocks/PlaceholderBlockControl.xaml.cs
@@ -11,6 +11,7 @@
 using MusicX.Core.Services;
 using MusicX.Helpers;
 using MusicX.Services;
+using MusicX.ViewModels;
 using Wpf.Ui;
 using Button = MusicX.Core.Models.Button;
 using NavigationService = MusicX.Services.NavigationService;
@@ -22,22 +23,35 @@ namespace MusicX.Controls.Blocks
     /// </summary>
     public partial class PlaceholderBlockControl : UserControl
     {
+        public static readonly DependencyProperty BlockProperty = DependencyProperty.Register(
+            nameof(Block), typeof(BlockViewModel), typeof(PlaceholderBlockControl), new PropertyMetadata(BlockChangedCallback));
+
+        public BlockViewModel Block
+        {
+            get => (BlockViewModel)GetValue(BlockProperty);
+            set => SetValue(BlockProperty, value);
+        }
+        
         public PlaceholderBlockControl()
         {
-            this.Loaded += PlaceholderBlockControl_Loaded;
             InitializeComponent();
-            
         }
 
         private Button buttonAction;
-
-        private void PlaceholderBlockControl_Loaded(object sender, RoutedEventArgs e)
+        
+        private static void BlockChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            if (DataContext is not Block block)
+            if (d is not PlaceholderBlockControl control || e.NewValue is not BlockViewModel)
                 return;
-            if (block.Placeholders.Count == 0) return;
+            
+            control.Load();
+        }
+
+        private void Load()
+        {
+            if (Block.Placeholders.Count == 0) return;
 
-            var placeholder = block.Placeholders[0];
+            var placeholder = Block.Placeholders[0];
             if(placeholder.Icons.Count > 0)
             {
                 var image = placeholder.Icons.MaxBy(i => i.Width);
diff --git a/MusicX/Controls/Blocks/SearchSuggestionsBlockControl.xaml b/MusicX/Controls/Blocks/SearchSuggestionsBlockControl.xaml
index a3e4b639..514cfe80 100644
--- a/MusicX/Controls/Blocks/SearchSuggestionsBlockControl.xaml
+++ b/MusicX/Controls/Blocks/SearchSuggestionsBlockControl.xaml
@@ -6,10 +6,11 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:models="clr-namespace:MusicX.Core.Models;assembly=MusicX.Core"
     xmlns:controls="clr-namespace:MusicX.Controls"
+    xmlns:viewModels="clr-namespace:MusicX.ViewModels"
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d"
-    d:DataContext="{d:DesignInstance models:Block}">
+    d:DataContext="{d:DesignInstance viewModels:BlockViewModel}">
     <ItemsControl ItemsSource="{Binding Suggestions, Mode=OneTime}" HorizontalAlignment="Left">
         <ItemsControl.Style>
             <Style TargetType="ItemsControl">
diff --git a/MusicX/Controls/Blocks/TextsBlockControl.xaml.cs b/MusicX/Controls/Blocks/TextsBlockControl.xaml.cs
index 61421f4e..f95e5c1c 100644
--- a/MusicX/Controls/Blocks/TextsBlockControl.xaml.cs
+++ b/MusicX/Controls/Blocks/TextsBlockControl.xaml.cs
@@ -1,6 +1,7 @@
 using MusicX.Core.Models;
 using System.Windows;
 using System.Windows.Controls;
+using MusicX.ViewModels;
 
 namespace MusicX.Controls.Blocks
 {
@@ -17,7 +18,7 @@ public TextsBlockControl()
 
         private void TextsBlockControl_Loaded(object sender, RoutedEventArgs e)
         {
-            if (DataContext is Block block)
+            if (DataContext is BlockViewModel block)
                 TextsValue.Text = block.Texts[0].Value;
         }
     }
diff --git a/MusicX/Controls/Blocks/TitleBlockControl.xaml b/MusicX/Controls/Blocks/TitleBlockControl.xaml
index 93961d5e..7624dad5 100644
--- a/MusicX/Controls/Blocks/TitleBlockControl.xaml
+++ b/MusicX/Controls/Blocks/TitleBlockControl.xaml
@@ -7,10 +7,11 @@
     xmlns:wpfui="clr-namespace:Wpf.Ui.Controls;assembly=Wpf.Ui"
     xmlns:system="clr-namespace:System;assembly=System.Runtime"
     xmlns:models="clr-namespace:MusicX.Core.Models;assembly=MusicX.Core"
+    xmlns:viewModels="clr-namespace:MusicX.ViewModels"
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d"
-    d:DataContext="{d:DesignInstance models:Block}">
+    d:DataContext="{d:DesignInstance viewModels:BlockViewModel}">
     <UserControl.Resources>
         <ControlTemplate x:Key="RegularTitleTemplate" TargetType="ContentControl">
             <TextBlock
@@ -57,7 +58,7 @@
                         <Style.Triggers>
                             <MultiDataTrigger>
                                 <MultiDataTrigger.Conditions>
-                                    <Condition Binding="{Binding Actions.Count}" Value="1" />
+                                    <Condition Binding="{Binding Buttons.Count}" Value="1" />
                                     <Condition Binding="{Binding Visibility, ElementName=ButtonsGrid}" Value="Collapsed" />
                                 </MultiDataTrigger.Conditions>
                                 <Setter Property="Template" Value="{StaticResource ButtonTitleTemplate}" />
diff --git a/MusicX/Controls/Blocks/TitleBlockControl.xaml.cs b/MusicX/Controls/Blocks/TitleBlockControl.xaml.cs
index 83f276c1..230af267 100644
--- a/MusicX/Controls/Blocks/TitleBlockControl.xaml.cs
+++ b/MusicX/Controls/Blocks/TitleBlockControl.xaml.cs
@@ -7,6 +7,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using System.Collections.Generic;
 using Microsoft.AppCenter.Crashes;
+using MusicX.ViewModels;
 
 namespace MusicX.Controls.Blocks
 {
@@ -15,17 +16,28 @@ namespace MusicX.Controls.Blocks
     /// </summary>
     public partial class TitleBlockControl : UserControl
     {
+        public static readonly DependencyProperty ViewModelProperty = DependencyProperty.Register(
+            nameof(ViewModel), typeof(BlockViewModel), typeof(TitleBlockControl), new PropertyMetadata(PropertyChangedCallback));
+
+        public BlockViewModel ViewModel
+        {
+            get => (BlockViewModel)GetValue(ViewModelProperty);
+            set => SetValue(ViewModelProperty, value);
+        }
+        
         public TitleBlockControl()
         {
             InitializeComponent();
-            DataContextChanged += TitleBlockControl_Loaded;
         }
-
-        private void TitleBlockControl_Loaded(object sender, DependencyPropertyChangedEventArgs e)
+        
+        private static void PropertyChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            if (DataContext is not Block block)
-                return;
+            if (d is TitleBlockControl control && e.NewValue is not null)
+                control.Fill();
+        }
 
+        private void Fill()
+        {
             if(RootWindow.WinterTheme)
             {
                 var r = new Random();
@@ -38,36 +50,36 @@ private void TitleBlockControl_Loaded(object sender, DependencyPropertyChangedEv
            
             Buttons.SelectionChanged += ButtonsComboBox_SelectionChanged;
 
-            if (block.Layout.Name == "header_compact")
+            if (ViewModel.Layout.Name == "header_compact")
             {
                 Title.Opacity = 0.5;
                 Title.FontSize = 15;
             }
 
-            Title.Content = block.Layout.Title;
+            Title.Content = ViewModel.Layout.Title;
 
-            if(block.Layout.TopTitle is not null || block.Layout.Subtitle is not null)
+            if(ViewModel.Layout.TopTitle is not null || ViewModel.Layout.Subtitle is not null)
             {
-                Subtitle.Text = block.Layout.TopTitle?.Text ?? block.Layout.Subtitle;
+                Subtitle.Text = ViewModel.Layout.TopTitle?.Text ?? ViewModel.Layout.Subtitle;
                 Subtitle.Visibility = Visibility.Visible;
-                if (block.Actions.Count == 1)
+                if (ViewModel.Buttons.Count == 1)
                     Subtitle.Margin = new(11, 0, 11, 0);
             }
 
-            if (block.Badge != null)
+            if (ViewModel.Badge != null)
             {
-                BadgeHeader.Text = block.Badge.Text;
+                BadgeHeader.Text = ViewModel.Badge.Text;
                 BadgeHeader.Visibility = Visibility.Visible;
             }
 
-            if (block.Buttons is { Count: > 0 }) //ios
+            if (ViewModel.Buttons is { Count: > 0 }) //ios
             {
-                if (block.Buttons[0].Options.Count > 0)
+                if (ViewModel.Buttons[0].Options.Count > 0)
                 {
                     ButtonsGrid.Visibility = Visibility.Visible;
-                    TitleButtons.Text = block.Buttons[0].Title;
+                    TitleButtons.Text = ViewModel.Buttons[0].Title;
                     Buttons.Visibility = Visibility.Visible;
-                    foreach (var option in block.Buttons[0].Options)
+                    foreach (var option in ViewModel.Buttons[0].Options)
                     {
                         Buttons.Items.Add(new TextBlock() { Text = option.Text });
                     }
@@ -75,46 +87,15 @@ private void TitleBlockControl_Loaded(object sender, DependencyPropertyChangedEv
                     return;
                 }
             }
-            else
-            {
-                
-                if(block.Actions.Count > 0 && block.Actions[0].Options.Count > 0)
-                {
-                    //android
-                    ButtonsGrid.Visibility = Visibility.Visible;
-                    TitleButtons.Text = block.Actions[0].Title;
-                    Buttons.Visibility = Visibility.Visible;
-                        
-
-                    foreach (var option in block.Actions[0].Options)
-                    {
-                        Buttons.Items.Add(new TextBlock() { Text = option.Text });
-                    }
-                        
-                    return;
-                }
-
-                return;
-            }
         }
 
         private async void MoreButton_Click(object sender, RoutedEventArgs e)
         {
-            if (DataContext is not Block block)
-                return;
             try
             {
                 var navigationService = StaticService.Container.GetRequiredService<Services.NavigationService>();
 
-                if (block.Actions.Count > 0)
-                {
-                    var bnt = block.Actions[0];
-
-                    navigationService.OpenSection(bnt.SectionId);
-                    return;
-                }
-
-                var button = block.Buttons[0];
+                var button = ViewModel.Buttons[0];
 
                 navigationService.OpenSection(button.SectionId);
             }
@@ -140,24 +121,13 @@ private async void MoreButton_Click(object sender, RoutedEventArgs e)
 
         private async void ButtonsComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            if (DataContext is not Block block)
-                return;
             try
             {
                 var comboBox = sender as ComboBox;
 
                 var current = comboBox.SelectedIndex;
 
-                OptionButton option;
-                if(block.Buttons != null)
-                {
-                    option = block.Buttons[0].Options[current];
-
-                }else
-                {
-                    option = block.Actions[0].Options[current];
-
-                }
+                var option = ViewModel.Buttons[0].Options[current];
 
                 var navigationService = StaticService.Container.GetRequiredService<Services.NavigationService>();
 
diff --git a/MusicX/Controls/Blocks/UserRadioBlockControl.xaml.cs b/MusicX/Controls/Blocks/UserRadioBlockControl.xaml.cs
index 7eb74c3c..986c7d5f 100644
--- a/MusicX/Controls/Blocks/UserRadioBlockControl.xaml.cs
+++ b/MusicX/Controls/Blocks/UserRadioBlockControl.xaml.cs
@@ -15,23 +15,31 @@ namespace MusicX.Controls.Blocks
     /// </summary>
     public partial class UserRadioBlockControl : UserControl
     {
+        public static readonly DependencyProperty BlockProperty = DependencyProperty.Register(
+            nameof(Block), typeof(BlockViewModel), typeof(UserRadioBlockControl), new PropertyMetadata(BlockChangedCallback));
+
+        private static void BlockChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is not UserRadioBlockControl control || e.NewValue is not BlockViewModel)
+                return;
+            
+            control.Load();
+        }
+
+        public BlockViewModel Block
+        {
+            get => (BlockViewModel)GetValue(BlockProperty);
+            set => SetValue(BlockProperty, value);
+        }
+        
         public UserRadioBlockControl()
         {
-            this.DataContext = this;
-            this.Loaded += UserRadioBlockControl_Loaded;
             InitializeComponent();
         }
 
-        private void UserRadioBlockControl_Loaded(object sender, RoutedEventArgs e)
+        private void Load()
         {
-            if (DataContext is not Block block)
-                return;
-            if (block.Stations is null)
-            {
-                block.Stations = new List<Station>();
-            }
-
-            foreach (var station in block.Stations)
+            foreach (var station in Block.Stations)
             {
                 ListStations.Items.Add( new UserStationControl() { Station = station});
             }
diff --git a/MusicX/Controls/ListTracks.xaml b/MusicX/Controls/ListTracks.xaml
index a7ba9f19..9b7e6955 100644
--- a/MusicX/Controls/ListTracks.xaml
+++ b/MusicX/Controls/ListTracks.xaml
@@ -3,25 +3,28 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
+    xmlns:models="clr-namespace:MusicX.Core.Models;assembly=MusicX.Core"
+    xmlns:controls="clr-namespace:MusicX.Controls"
     d:DesignHeight="450"
     d:DesignWidth="800"
-    Loaded="UserControl_Loaded"
+    x:Name="ListTracksControl"
     mc:Ignorable="d">
 
-    <UserControl.Resources>
-    </UserControl.Resources>
-    <Grid>
-        <hc:ScrollViewer
-            hc:ScrollViewerAttach.AutoHide="True"
-            CanMouseWheel="False"
-            HorizontalScrollBarVisibility="Auto"
-            IsInertiaEnabled="True"
-            VerticalScrollBarVisibility="Hidden">
-            <StackPanel x:Name="StackPanelTracks" Orientation="Horizontal" />
-        </hc:ScrollViewer>
-
-
-    </Grid>
+    <ui:ListView Style="{StaticResource ItemsListViewStyleHorizontal}" 
+                 ItemsSource="{Binding Tracks, ElementName=ListTracksControl}">
+        <ui:ListView.ItemsPanel>
+            <ItemsPanelTemplate>
+                <controls:DynamicUniformGrid Rows="3" IsItemsHost="True" HorizontalAlignment="Left" />
+            </ItemsPanelTemplate>
+        </ui:ListView.ItemsPanel>
+        <ui:ListView.ItemTemplate>
+            <DataTemplate DataType="{x:Type models:Audio}">
+                <controls:TrackControl Width="300" Margin="0 0 10 10"
+                                       InChart="{Binding ShowChart, ElementName=ListTracksControl}" 
+                                       Audio="{Binding}" />
+            </DataTemplate>
+        </ui:ListView.ItemTemplate>
+    </ui:ListView>
 </UserControl>
diff --git a/MusicX/Controls/ListTracks.xaml.cs b/MusicX/Controls/ListTracks.xaml.cs
index 532e0eb8..fb8532f7 100644
--- a/MusicX/Controls/ListTracks.xaml.cs
+++ b/MusicX/Controls/ListTracks.xaml.cs
@@ -16,87 +16,27 @@ namespace MusicX.Controls
     /// </summary>
     public partial class ListTracks : UserControl
     {
-        private readonly Logger logger;
-
         public ListTracks()
         {
             InitializeComponent();
-            logger = StaticService.Container.GetRequiredService<Logger>();
-            this.Unloaded += ListTracks_Unloaded;
-
-        }
-
-        private void ListTracks_Unloaded(object sender, RoutedEventArgs e)
-        {
-            this.StackPanelTracks.Children.Clear();
         }
 
         public static readonly DependencyProperty TracksProperty =
-         DependencyProperty.Register("Tracks", typeof(List<Audio>), typeof(ListTracks), new PropertyMetadata(new List<Audio>()));
-
-
-
+         DependencyProperty.Register(nameof(Tracks), typeof(IList<Audio>), typeof(ListTracks), new PropertyMetadata(Array.Empty<Audio>()));
+        
         public static readonly DependencyProperty ShowChartProperty =
-          DependencyProperty.Register("ShowChart", typeof(bool), typeof(ListPlaylists), new PropertyMetadata(false));
+          DependencyProperty.Register(nameof(ShowChart), typeof(bool), typeof(ListPlaylists), new PropertyMetadata(false));
 
         public bool ShowChart
         {
-            get { return (bool)GetValue(ShowChartProperty); }
-            set
-            {
-                SetValue(ShowChartProperty, value);
-            }
-        }
-
-        public List<Audio> Tracks
-        {
-            get { return (List<Audio>)GetValue(TracksProperty); }
-            set
-            {
-                SetValue(TracksProperty, value);
-            }
+            get => (bool)GetValue(ShowChartProperty);
+            set => SetValue(ShowChartProperty, value);
         }
 
-        private void UserControl_Loaded(object sender, RoutedEventArgs e)
+        public IList<Audio> Tracks
         {
-            try
-            {
-                foreach (var audios in Tracks.Take(15).Chunk(3))
-                {
-                    var panel = new StackPanel() {Margin = new Thickness(0, 0, 10, 0)};
-
-                    foreach (var audio in audios)
-                    {
-                        var chart = 0;
-                        if (ShowChart) chart = Tracks.IndexOf(audio) + 1;
-                        
-                        panel.Children.Add(new TrackControl()
-                        {
-                            ChartPosition = chart, 
-                            Margin = new Thickness(0, 0, 0, 10), 
-                            Width = 300, 
-                            Height = 60, 
-                            Audio = audio
-                        });
-                    }
-
-                    StackPanelTracks.Children.Add(panel);
-                }
-            }catch (Exception ex)
-            {
-                var properties = new Dictionary<string, string>
-                {
-#if DEBUG
-                    { "IsDebug", "True" },
-#endif
-                    {"Version", StaticService.Version }
-                };
-                Crashes.TrackError(ex, properties);
-
-                logger.Error("Fail load list tracks");
-                logger.Error(ex, ex.Message);
-            }
-            
+            get => (IList<Audio>)GetValue(TracksProperty);
+            set => SetValue(TracksProperty, value);
         }
     }
 }
diff --git a/MusicX/Controls/PlayerControl.xaml b/MusicX/Controls/PlayerControl.xaml
index 42307ed5..a4be9b57 100644
--- a/MusicX/Controls/PlayerControl.xaml
+++ b/MusicX/Controls/PlayerControl.xaml
@@ -24,7 +24,7 @@
                         <Setter Property="OverridesDefaultStyle" Value="True" />
                         <Setter Property="Foreground">
                             <Setter.Value>
-                                <SolidColorBrush Color="{StaticResource TextFillColorPrimary}" />
+                                <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}" />
                             </Setter.Value>
                         </Setter>
                     </Style>
diff --git a/MusicX/Controls/PlayerControl.xaml.cs b/MusicX/Controls/PlayerControl.xaml.cs
index 1f97040c..f34b143b 100644
--- a/MusicX/Controls/PlayerControl.xaml.cs
+++ b/MusicX/Controls/PlayerControl.xaml.cs
@@ -1,10 +1,12 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Data;
 using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media.Animation;
@@ -15,6 +17,7 @@
 using MusicX.Core.Services;
 using MusicX.Helpers;
 using MusicX.Models;
+using MusicX.Patches;
 using MusicX.Services;
 using MusicX.Services.Player;
 using MusicX.Services.Player.Playlists;
@@ -56,7 +59,17 @@ public bool IsPlaying
             set => SetValue(IsPlayingProperty, value);
         }
 
+        public static readonly DependencyProperty TracksSourceProperty = DependencyProperty.Register(
+            nameof(TracksSource), typeof(IEnumerable), typeof(PlayerControl), new PropertyMetadata(default(IEnumerable)));
+
+        public IEnumerable TracksSource
+        {
+            get => (IEnumerable)GetValue(TracksSourceProperty);
+            set => SetValue(TracksSourceProperty, value);
+        }
+
         public PlayerService PlayerService { get; }
+        
         private readonly ListenTogetherService listenTogetherService;
         private readonly Logger logger;
         private ConfigModel config;
@@ -78,13 +91,12 @@ public PlayerControl()
             listenTogetherService.LeaveSession += ListenTogetherService_LeaveSession;
             listenTogetherService.SessionOwnerStoped += ListenTogetherService_LeaveSession;
             this.MouseWheel += PlayerControl_MouseWheel;
-            
-            Queue.ItemsSource = PlayerService.Tracks;
         }
 
         private void PlayerService_CurrentPlaylistChanged(object? sender, EventArgs e)
         {
             ShuffleButton.IsChecked = false;
+            Queue.ItemsSource = PlayerService.Tracks;
         }
 
         private Task ListenTogetherService_LeaveSession()
@@ -366,7 +378,8 @@ private async Task SaveVolume()
             conf.IsMuted = PlayerService.IsMuted;
 
             var mixerVolume = windowsAudioService.GetVolume();
-            conf.MixerVolume= (int)mixerVolume;
+            if (mixerVolume.HasValue)
+                conf.MixerVolume= (int)mixerVolume;
 
             await configService.SetConfig(conf);
         }
@@ -631,46 +644,24 @@ private void TitleScroll_Loaded(object sender, RoutedEventArgs e)
         }
         private void DeleteFromQueue_OnClick(object sender, RoutedEventArgs e)
         {
-            if (sender is FrameworkElement {DataContext: PlaylistTrack audio})
-                PlayerService.RemoveFromQueue(audio);
+            if (sender is FrameworkElement {TemplatedParent: FrameworkElement {TemplatedParent: ListBoxItem item}})
+                PlayerService.RemoveFromQueue(ItemContainerGeneratorIndexHook.GetItemContainerIndex(item));
         }
         private void ReorderButton_OnMouseDown(object sender, MouseButtonEventArgs e)
         {
             if (sender is FrameworkElement {TemplatedParent: FrameworkElement {TemplatedParent: ListBoxItem item}})
-                DragDrop.DoDragDrop(item, item.DataContext, DragDropEffects.Move);
+                DragDrop.DoDragDrop(item, ItemContainerGeneratorIndexHook.GetItemContainerIndex(item), DragDropEffects.Move);
         }
+        
         private void ListBoxItem_OnDrop(object sender, DragEventArgs e)
         {
-            var source = (PlaylistTrack)e.Data.GetData(typeof(PlaylistTrack))!;
-            var target = (PlaylistTrack)((ListBoxItem)sender).DataContext;
-
-            var list = PlayerService.Tracks;
-            
-            var removedIdx = list.IndexOf(source);
-            var targetIdx = list.IndexOf(target);
-
-            if (removedIdx < targetIdx)
-            {
-                list.Insert(targetIdx + 1, source);
-                list.RemoveAt(removedIdx);
-            }
-            else
-            {
-                if (list.Count + 1 <= ++removedIdx)
-                    return;
-                list.Insert(targetIdx, source);
-                list.RemoveAt(removedIdx);
-            }
-
-            var currentIndex = list.IndexOf(PlayerService.CurrentTrack);
+            if (sender is not FrameworkElement item)
+                return;
             
-            // insert index is next track
-            if (currentIndex + 1 == targetIdx)
-                PlayerService.NextPlayTrack = source;
-            else if (currentIndex + 1 < list.Count)
-                PlayerService.NextPlayTrack = list[currentIndex + 1];
+            var oldIndex = (int)e.Data.GetData(typeof(int))!;
+            var newIndex = ItemContainerGeneratorIndexHook.GetItemContainerIndex(item);
 
-            PlayerService.CurrentIndex = currentIndex;
+            PlayerService.MoveTrackInQueue(oldIndex, newIndex);
         }
         private void SpeakerIcon_OnClick(object sender, RoutedEventArgs e)
         {
diff --git a/MusicX/Controls/QueueTrackControl.xaml b/MusicX/Controls/QueueTrackControl.xaml
index 1f245e57..08ecc3c7 100644
--- a/MusicX/Controls/QueueTrackControl.xaml
+++ b/MusicX/Controls/QueueTrackControl.xaml
@@ -92,7 +92,7 @@
 
             <StackPanel Grid.Column="1" Margin="10,0,0,0">
                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
-                    <TextBlock Text="{Binding Title}"
+                    <TextBlock Text="{Binding Title, FallbackValue=Незагруженный трек}"
                                FontSize="16"
                                FontWeight="DemiBold"
                                TextTrimming="CharacterEllipsis" />
@@ -109,7 +109,7 @@
                         BorderThickness="1"
                         CornerRadius="2"
                         Opacity="0.4"
-                        Visibility="{Binding Data.IsExplicit, Converter={StaticResource BooleanToVisibilityConverter}}">
+                        Visibility="{Binding Data.IsExplicit, Converter={StaticResource BooleanToVisibilityConverter}, FallbackValue={x:Static Visibility.Collapsed}}">
                         <TextBlock
                             Margin="0,0,0,1"
                             HorizontalAlignment="Center"
diff --git a/MusicX/Controls/QueueTrackControl.xaml.cs b/MusicX/Controls/QueueTrackControl.xaml.cs
index 81d8ad0d..a253a276 100644
--- a/MusicX/Controls/QueueTrackControl.xaml.cs
+++ b/MusicX/Controls/QueueTrackControl.xaml.cs
@@ -6,6 +6,7 @@
 using AsyncAwaitBestPractices;
 using Microsoft.Extensions.DependencyInjection;
 using MusicX.Core.Services;
+using MusicX.Patches;
 using MusicX.Services;
 using MusicX.Services.Player;
 using MusicX.Services.Player.Playlists;
@@ -34,7 +35,7 @@ private static void PropertyChangedCallback(DependencyObject d, DependencyProper
     {
         if (d is not QueueTrackControl control) return;
 
-        var sb = (Storyboard)control.FindResource(control._player.CurrentTrack == (PlaylistTrack?)control.DataContext ? "PlayBorderFadeIn" : "PlayBorderFadeOut");
+        var sb = (Storyboard)control.FindResource(control.IsCurrentlyPlaying ? "PlayBorderFadeIn" : "PlayBorderFadeOut");
         sb.Begin();
     }
 
@@ -44,6 +45,9 @@ public bool IsCurrentlyPlaying
         set => SetValue(IsCurrentlyPlayingProperty, value);
     }
 
+    private int IndexInItemsControl =>
+        ItemContainerGeneratorIndexHook.GetItemContainerIndex(((FrameworkElement)TemplatedParent).TemplatedParent);
+
     public QueueTrackControl()
     {
         InitializeComponent();
@@ -53,16 +57,12 @@ public QueueTrackControl()
 
     private void PlayerOnPlayStateChangedEvent(object? sender, EventArgs e)
     {
-        if (DataContext is not PlaylistTrack track) return;
-
-        IsCurrentlyPlaying = _player.CurrentTrack == track;
+        IsCurrentlyPlaying = _player.CurrentIndex == IndexInItemsControl;
         IconPlay.Symbol = _player.IsPlaying && IsCurrentlyPlaying ? SymbolRegular.Pause24 : SymbolRegular.Play24;
     }
 
     private void Track_OnClick(object sender, MouseButtonEventArgs e)
     {
-        if (DataContext is not PlaylistTrack track) return;
-        
         if (IsCurrentlyPlaying)
         {
             if (_player.IsPlaying)
@@ -70,26 +70,26 @@ private void Track_OnClick(object sender, MouseButtonEventArgs e)
             else
                 _player.Play();
         }
-        else
+        
+        if (IsInPlayer)
         {
-            if (IsInPlayer)
-                _player.PlayTrackFromQueueAsync(_player.Tracks.IndexOf(track)).SafeFireAndForget();
-            else
-            {
-                var vkService = StaticService.Container.GetRequiredService<VkService>();
-                _player.PlayAsync(track.Data switch
-                {
-                    VkTrackData vkData => vkData switch
-                    {
-                        { ParentBlockId: { } blockId } => new VkBlockPlaylist(vkService, blockId),
-                        { Playlist: { } vkPlaylist } => new VkPlaylistPlaylist(vkService, new(vkPlaylist.Id, vkPlaylist.OwnerId, vkPlaylist.AccessKey)),
-                        _ => new SinglePlaylist(track)
-                    },
-                    BoomTrackData => new SinglePlaylist(track),
-                    _ => throw new ArgumentOutOfRangeException()
-                }).SafeFireAndForget();
-            }
+            _player.PlayTrackFromQueueAsync(IndexInItemsControl).SafeFireAndForget();
         }
+        
+        if (DataContext is not PlaylistTrack track) return;
+        
+        var vkService = StaticService.Container.GetRequiredService<VkService>();
+        _player.PlayAsync(track.Data switch
+        {
+            VkTrackData vkData => vkData switch
+            {
+                { ParentBlockId: { } blockId } => new VkBlockPlaylist(vkService, blockId),
+                { Playlist: { } vkPlaylist } => new VkPlaylistPlaylist(vkService, new(vkPlaylist.Id, vkPlaylist.OwnerId, vkPlaylist.AccessKey)),
+                _ => new SinglePlaylist(track)
+            },
+            BoomTrackData => new SinglePlaylist(track),
+            _ => throw new ArgumentOutOfRangeException()
+        }).SafeFireAndForget();
     }
 
     private void OnMouseEnter(object sender, MouseEventArgs e)
diff --git a/MusicX/Controls/RecommendedPlaylistControl.xaml.cs b/MusicX/Controls/RecommendedPlaylistControl.xaml.cs
index 7f595758..b61e308b 100644
--- a/MusicX/Controls/RecommendedPlaylistControl.xaml.cs
+++ b/MusicX/Controls/RecommendedPlaylistControl.xaml.cs
@@ -174,7 +174,7 @@ private async void PlayButton_MouseLeftButtonDown(object sender, MouseButtonEven
                     await playerService.PlayAsync(new VkPlaylistPlaylist(
                                                       vkService,
                                                       new(Playlist.Playlist.Id, Playlist.Playlist.OwnerId,
-                                                          Playlist.Playlist.AccessKey)), Playlist.Audios[0].ToTrack(Playlist.Playlist));
+                                                          Playlist.Playlist.AccessKey)));
 
                     Icons.Symbol = SymbolRegular.Pause24;
 
diff --git a/MusicX/Controls/TrackControl.xaml b/MusicX/Controls/TrackControl.xaml
index 9cb7fa70..d7fab7e0 100644
--- a/MusicX/Controls/TrackControl.xaml
+++ b/MusicX/Controls/TrackControl.xaml
@@ -213,7 +213,8 @@
                 </Border>
             </Grid>
             
-            <Border Grid.Row="0" Grid.RowSpan="2" Grid.Column="1" x:Name="ChartGrid" Visibility="Collapsed"
+            <Border Grid.Row="0" Grid.RowSpan="2" Grid.Column="1"
+                    Visibility="{Binding InChart, ElementName=Control, Converter={StaticResource BooleanToVisibilityConverter}}"
                     Margin="0,0,5,0"
                     Width="25"
                     Height="25"
@@ -224,10 +225,11 @@
                     <SolidColorBrush Color="Black" Opacity="0.2" />
                 </Border.Background>
                 <TextBlock
+                    x:Name="ChartTextBlock"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     FontWeight="ExtraBlack"
-                    Text="{Binding ChartPosition, ElementName=Control, Mode=OneWay}" />
+                    Text="0" />
             </Border>
             
             <TextBlock Grid.Row="0" Grid.Column="2"
diff --git a/MusicX/Controls/TrackControl.xaml.cs b/MusicX/Controls/TrackControl.xaml.cs
index 8f10b923..94e64dd0 100644
--- a/MusicX/Controls/TrackControl.xaml.cs
+++ b/MusicX/Controls/TrackControl.xaml.cs
@@ -15,6 +15,7 @@
 using MusicX.Core.Models;
 using MusicX.Core.Services;
 using MusicX.Helpers;
+using MusicX.Patches;
 using MusicX.Services;
 using MusicX.Services.Player;
 using MusicX.Services.Player.Playlists;
@@ -90,16 +91,13 @@ public bool ShowCard
             }
         }
 
-        public static readonly DependencyProperty ChartPositionProperty =
-            DependencyProperty.Register("ChartPosition", typeof(int), typeof(TrackControl), new PropertyMetadata(0));
+        public static readonly DependencyProperty InChartProperty = DependencyProperty.Register(
+            nameof(InChart), typeof(bool), typeof(TrackControl), new PropertyMetadata(default(bool)));
 
-        public int ChartPosition
+        public bool InChart
         {
-            get { return (int)GetValue(ChartPositionProperty); }
-            set
-            {
-                SetValue(ChartPositionProperty, value);
-            }
+            get { return (bool)GetValue(InChartProperty); }
+            set { SetValue(InChartProperty, value); }
         }
 
         public static readonly DependencyProperty AudioProperty =
@@ -113,7 +111,10 @@ public Audio Audio
                 SetValue(AudioProperty, value);
             }
         }
-
+        
+        private int IndexInItemsControl =>
+            ItemContainerGeneratorIndexHook.GetItemContainerIndex(((FrameworkElement?)TemplatedParent)?.TemplatedParent ?? TemplatedParent ?? this);
+        
         private async void UserControl_Loaded(object sender, RoutedEventArgs e)
         {
             try
@@ -122,7 +123,6 @@ private async void UserControl_Loaded(object sender, RoutedEventArgs e)
                 player.PlayStateChangedEvent += Player_PlayStateChangedEvent;
 
                 IconPlay.Symbol = SymbolRegular.Play24;
-                if (ChartPosition != 0) ChartGrid.Visibility = Visibility.Visible;
 
                 if(!Audio.IsAvailable || string.IsNullOrEmpty(Audio.Url))
                 {
@@ -192,6 +192,8 @@ private async void UserControl_Loaded(object sender, RoutedEventArgs e)
                     PlayButtons.Visibility = Visibility.Visible;
                     IconPlay.Symbol = SymbolRegular.Pause24;
                 }
+                
+                ChartTextBlock.Text = (IndexInItemsControl + 1).ToString();
             }
             catch (Exception ex)
             {
@@ -350,10 +352,12 @@ private async void Grid_MouseDown(object sender, MouseButtonEventArgs e)
                     return;
                 }
 
+                var index = IndexInItemsControl;
+
                 //костыль для бума, да мне лень править.
                 if (Audio.Url.EndsWith(".mp3"))
                 {
-                    await player.PlayAsync(new SinglePlaylist(Audio.ToTrack()), Audio.ToTrack());
+                    await player.PlayAsync(new SinglePlaylist(Audio.ToTrack()), index);
                     return;
                 }
 
@@ -361,12 +365,14 @@ private async void Grid_MouseDown(object sender, MouseButtonEventArgs e)
 
 
                 if (this.FindAncestor<PlaylistView>() is { DataContext: PlaylistViewModel viewModel })
-                    await player.PlayAsync(new VkPlaylistPlaylist(vkService, viewModel.PlaylistData), Audio.ToTrack());
+                    await player.PlayAsync(
+                        new VkPlaylistPlaylist(vkService, viewModel.PlaylistData with { Count = (int)viewModel.Playlist.Count }), index);
                 //костыль для реков, да мне лень править.
-                else if (Audio.ParentBlockId is "recomms" or "track_recomms_full" && this.FindAncestor<BlockControl>() is { DataContext: Block { Audios.Count: > 0 } block })
-                    await player.PlayAsync(new ListPlaylist(block.Audios.Select(TrackExtensions.ToTrack).ToImmutableList()), Audio.ToTrack());
+                else if (Audio.ParentBlockId is "recomms" or "track_recomms_full" &&
+                         this.FindAncestor<BlockControl>() is { DataContext: Block { Audios.Count: > 0 } block })
+                    await player.PlayAsync(new ListPlaylist(block.Audios.Select(TrackExtensions.ToTrack).ToImmutableList()), index);
                 else
-                    await player.PlayAsync(new VkBlockPlaylist(vkService, Audio.ParentBlockId, LoadOtherTracks), Audio.ToTrack());
+                    await player.PlayAsync(new VkBlockPlaylist(vkService, Audio.ParentBlockId, LoadOtherTracks), index);
             }catch(Exception ex)
             {
                 var properties = new Dictionary<string, string>
diff --git a/MusicX/Helpers/BlockTemplateSelector.cs b/MusicX/Helpers/BlockTemplateSelector.cs
index 703c2275..14433d96 100644
--- a/MusicX/Helpers/BlockTemplateSelector.cs
+++ b/MusicX/Helpers/BlockTemplateSelector.cs
@@ -4,6 +4,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Markup;
+using MusicX.ViewModels;
 
 namespace MusicX.Helpers;
 
@@ -17,7 +18,7 @@ public class BlockTemplateSelector : DataTemplateSelector
         if (container is not ContentPresenter { TemplatedParent: BlockControl control })
             throw new ArgumentException();
 
-        return (item is Block block
+        return (item is BlockViewModel block
             ? control.TryFindResource(string.IsNullOrEmpty(block.Layout?.Name) ? block.DataType : $"{block.DataType}_{block.Layout.Name}") ?? control.TryFindResource(block.DataType) ?? FallbackTemplate
             : FallbackTemplate) as DataTemplate;
     }
diff --git a/MusicX/MusicX.csproj b/MusicX/MusicX.csproj
index bfb9e64d..18520903 100644
--- a/MusicX/MusicX.csproj
+++ b/MusicX/MusicX.csproj
@@ -91,6 +91,7 @@
     <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
+    <PackageReference Include="MonoMod.RuntimeDetour" Version="25.1.2" />
     <PackageReference Include="Ookii.Dialogs.Wpf" Version="5.0.1" />
     <PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="All" />
     <PackageReference Include="QRCoder.Xaml" Version="1.6.0" />
diff --git a/MusicX/Patches/ItemContainerGeneratorIndexHook.cs b/MusicX/Patches/ItemContainerGeneratorIndexHook.cs
new file mode 100644
index 00000000..9a6eb72b
--- /dev/null
+++ b/MusicX/Patches/ItemContainerGeneratorIndexHook.cs
@@ -0,0 +1,149 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Windows;
+using System.Windows.Controls;
+using Mono.Cecil.Cil;
+using MonoMod.Cil;
+using MonoMod.RuntimeDetour;
+
+namespace MusicX.Patches;
+
+public static class ItemContainerGeneratorIndexHook
+{
+    public static readonly DependencyProperty ItemContainerIndexProperty = DependencyProperty.RegisterAttached(
+        "ItemContainerIndex", typeof(int), typeof(ItemContainerGeneratorIndexHook), new PropertyMetadata(default(int)));
+
+    public static void SetItemContainerIndex(DependencyObject element, int value)
+    {
+        // always set new value
+        ClearItemContainerIndex(element);
+        element.SetValue(ItemContainerIndexProperty, value);
+    }
+
+    public static int GetItemContainerIndex(DependencyObject element) =>
+        (int)element.GetValue(ItemContainerIndexProperty);
+
+    public static void ClearItemContainerIndex(DependencyObject element) =>
+        element.ClearValue(ItemContainerIndexProperty);
+
+    // required to keep hooks alive
+    // ReSharper disable once CollectionNeverQueried.Local
+    private static readonly List<IDisposable> Hooks = [];
+
+    public static void Apply()
+    {
+        var generateNextMethod = typeof(ItemContainerGenerator)
+            .GetNestedType("Generator", BindingFlags.NonPublic)!
+            .GetMethod("GenerateNext")!;
+
+        var generatorHostType = Type.GetType("MS.Internal.Controls.IGeneratorHost, PresentationFramework", true)!;
+
+        var unlinkContainerFromItemMethod = typeof(ItemContainerGenerator).GetMethod("UnlinkContainerFromItem",
+            BindingFlags.NonPublic | BindingFlags.Static,
+            [typeof(DependencyObject), typeof(object), generatorHostType])!;
+
+        var itemReplacedMethod = typeof(ItemContainerGenerator).GetMethod("OnItemReplaced",
+            BindingFlags.Instance | BindingFlags.NonPublic)!;
+        
+        var itemMovedMethod = typeof(ItemContainerGenerator).GetMethod("OnItemMoved",
+            BindingFlags.Instance | BindingFlags.NonPublic)!;
+        
+        var itemRemovedMethod = typeof(ItemContainerGenerator).GetMethod("OnItemRemoved",
+            BindingFlags.Instance | BindingFlags.NonPublic)!;
+        
+        Hooks.Add(new ILHook(generateNextMethod, GenerateNextManipulator));
+        Hooks.Add(new ILHook(unlinkContainerFromItemMethod, UnlinkContainerFromItemManipulator));
+        Hooks.Add(new ILHook(itemReplacedMethod, ItemReplacedManipulator));
+        Hooks.Add(new Hook(itemMovedMethod, ItemMovedHook));
+        Hooks.Add(new ILHook(itemMovedMethod, ItemMovedManipulator));
+        Hooks.Add(new Hook(itemRemovedMethod, ItemRemovedHook));
+    }
+
+    private static void ItemRemovedHook(Action<ItemContainerGenerator, object, int> original,
+        ItemContainerGenerator self, object item, int itemIndex)
+    {
+        original(self, item, itemIndex);
+        UpdateContainerIndices(self, itemIndex);
+    }
+
+    private static void ItemMovedHook(Action<ItemContainerGenerator, object, int, int> original, ItemContainerGenerator self, object item, int oldIndex, int newIndex)
+    {
+        original(self, item, oldIndex, newIndex);
+
+        UpdateContainerIndices(self, Math.Min(oldIndex, newIndex + 1));
+    }
+
+    private static void UpdateContainerIndices(ItemContainerGenerator self, int index)
+    {
+        while (true)
+        {
+            var container = self.ContainerFromIndex(index);
+            
+            if (container == null)
+                break;
+            
+            SetItemContainerIndex(container, index++);
+        }
+    }
+
+    private static void ItemMovedManipulator(ILContext il)
+    {
+        var cursor = new ILCursor(il);
+
+        cursor.GotoNext(b => b.MatchStloc0() && !b.Previous.Match(OpCodes.Ldnull));
+
+        cursor.EmitDup(); // container
+        cursor.EmitLdarg3(); // newIndex
+        cursor.EmitCall(SetMethod);
+    }
+
+    private static void ItemReplacedManipulator(ILContext il)
+    {
+        var cursor = new ILCursor(il);
+
+        // existing container link
+        cursor.GotoNext(MoveType.After, b => b.MatchCall(LinkMethod));
+
+        cursor.EmitLdloc(5); // container
+        cursor.EmitLdloc(3); // index
+        cursor.EmitCall(SetMethod);
+        
+        // new container link
+        cursor.GotoNext(MoveType.After, b => b.MatchCall(LinkMethod));
+        
+        cursor.EmitLdloc(6); // newContainer
+        cursor.EmitLdloc(3); // index
+        cursor.EmitCall(SetMethod);
+    }
+
+    private static void UnlinkContainerFromItemManipulator(ILContext il)
+    {
+        var cursor = new ILCursor(il);
+
+        var clearMethod = typeof(ItemContainerGeneratorIndexHook).GetMethod(nameof(ClearItemContainerIndex))!;
+
+        cursor.EmitLdarg0();
+        cursor.EmitCall(clearMethod);
+    }
+
+    private static void GenerateNextManipulator(ILContext il)
+    {
+        var cursor = new ILCursor(il);
+
+        cursor.GotoNext(MoveType.After, b => b.MatchCall(LinkMethod));
+
+        cursor.EmitLdloc(0); // container
+        cursor.EmitLdloc(3); // itemIndex
+        cursor.EmitCall(SetMethod);
+    }
+
+    private static readonly MethodInfo LinkMethod = typeof(ItemContainerGenerator).GetMethod("LinkContainerToItem",
+        BindingFlags.NonPublic | BindingFlags.Static)!;
+
+    private static readonly MethodInfo SetMethod =
+        typeof(ItemContainerGeneratorIndexHook).GetMethod(nameof(SetItemContainerIndex))!;
+    
+    private static readonly MethodInfo GetMethod =
+        typeof(ItemContainerGeneratorIndexHook).GetMethod(nameof(GetItemContainerIndex))!;
+}
\ No newline at end of file
diff --git a/MusicX/RootWindow.xaml.cs b/MusicX/RootWindow.xaml.cs
index 6ca3f228..94b97717 100644
--- a/MusicX/RootWindow.xaml.cs
+++ b/MusicX/RootWindow.xaml.cs
@@ -494,7 +494,7 @@ private void Window_KeyDown(object sender, KeyEventArgs e)
         private void Previous_OnClick(object? sender, EventArgs e)
         {
             var playerService = StaticService.Container.GetRequiredService<PlayerService>();
-            if (playerService.Tracks.Count > 0 && playerService.Tracks.IndexOf(playerService.CurrentTrack) > 0)
+            if (playerService.Tracks.Count > 0)
                 playerService.PreviousTrack().SafeFireAndForget();
         }
         private void PlayPause_OnClick(object? sender, EventArgs e)
@@ -511,7 +511,7 @@ private void PlayPause_OnClick(object? sender, EventArgs e)
         private void Next_OnClick(object? sender, EventArgs e)
         {
             var playerService = StaticService.Container.GetRequiredService<PlayerService>();
-            if (playerService.Tracks.Count > 0 && playerService.Tracks.IndexOf(playerService.CurrentTrack) < playerService.Tracks.Count)
+            if (playerService.Tracks.Count > 0)
                 playerService.NextTrack().SafeFireAndForget();
         }
 
diff --git a/MusicX/Services/Player/PlayerService.cs b/MusicX/Services/Player/PlayerService.cs
index 1f196854..1b49a87d 100644
--- a/MusicX/Services/Player/PlayerService.cs
+++ b/MusicX/Services/Player/PlayerService.cs
@@ -28,19 +28,11 @@ namespace MusicX.Services.Player;
 public class PlayerService
 {
     public int CurrentIndex;
-    private readonly TrackCollection _tracks = new();
+    private readonly TrackCollection _tracks = [];
 
-    public TrackCollectionBase Tracks => _tracks;
-    public PlaylistTrack? CurrentTrack { get; private set; }
-    public PlaylistTrack? NextPlayTrack
-    {
-        get => _nextPlayTrack;
-        set
-        {
-            _nextPlayTrack = value;
-            Application.Current.Dispatcher.BeginInvoke(() => NextTrackChanged?.Invoke(this, EventArgs.Empty));
-        }
-    }
+    public IReadOnlyList<PlaylistTrack> Tracks => _tracks;
+    public PlaylistTrack? CurrentTrack => Tracks.ElementAtOrDefault(CurrentIndex);
+    public PlaylistTrack? NextPlayTrack => Tracks.ElementAtOrDefault(NextPlayTrackIndex); 
     private DispatcherTimer _positionTimer;
     private readonly MediaPlayer player;
 
@@ -62,10 +54,19 @@ public PlaylistTrack? NextPlayTrack
     private readonly ListenTogetherService _listenTogetherService;
     private readonly ConfigService _configService;
 
-    private PlaylistTrack? _nextPlayTrack;
+    private int NextPlayTrackIndex
+    {
+        get => _nextPlayTrackIndex;
+        set
+        {
+            _nextPlayTrackIndex = value;
+            Application.Current.Dispatcher.BeginInvoke(() => NextTrackChanged?.Invoke(this, EventArgs.Empty));
+        }
+    }
+
     private CancellationTokenSource? _tokenSource;
 
-    public IPlaylist? CurrentPlaylist { get; set; }
+    public IPlaylist? CurrentPlaylist { get; private set; }
 
     public PlayerService(Logger logger, ISnackbarService snackbarService,
                          IEnumerable<ITrackMediaSource> mediaSources, IEnumerable<ITrackStatsListener> statsListeners, ListenTogetherService listenTogetherService, ConfigService configService)
@@ -89,14 +90,14 @@ public PlayerService(Logger logger, ISnackbarService snackbarService,
 
     public async Task RestoreFromStateAsync(PlayerState state)
     {
-        await PlayAsync(state.Playlist, state.Track, state.Position);
+        await PlayAsync(state.Playlist, state.CurrentIndex, state.Position);
     }
 
     public async void Play()
     {
         if (CurrentTrack is null) return;
         
-        await PlayTrackAsync(CurrentTrack);
+        await PlayTrackAsync(CurrentIndex);
         
         if (Application.Current.Dispatcher.CheckAccess())
             PlayStateChangedEvent?.Invoke(this, EventArgs.Empty);
@@ -104,8 +105,8 @@ public async void Play()
             await Application.Current.Dispatcher.InvokeAsync(
                 () => PlayStateChangedEvent?.Invoke(this, EventArgs.Empty));
         
-            await Task.WhenAll(
-                _statsListeners.Select(b => b.TrackPlayStateChangedAsync(CurrentTrack!, player.Position, false)));
+        await Task.WhenAll(
+            _statsListeners.Select(b => b.TrackPlayStateChangedAsync(CurrentTrack!, player.Position, false)));
     }
 
     public async Task PlayTrackFromQueueAsync(int index)
@@ -113,17 +114,17 @@ public async Task PlayTrackFromQueueAsync(int index)
         var previousTrack = CurrentTrack!;
         var previousPosition = player.Position;
         
-        await PlayTrackAsync(Tracks[index]);
+        await PlayTrackAsync(index);
 
         await Task.WhenAll(
                 _statsListeners.Select(b => b.TrackChangedAsync(previousTrack, CurrentTrack!, ChangeReason.TrackChange, previousPosition)));
     }
     
-    private async Task PlayTrackAsync(PlaylistTrack track, TimeSpan? position = null)
+    private async Task PlayTrackAsync(int trackIndex, TimeSpan? position = null)
     {
         try
         {
-            if (CurrentTrack == track)
+            if (trackIndex == CurrentIndex)
             {
                 if (position is not null) Seek(position.Value);
                 player.Play();
@@ -137,15 +138,17 @@ private async Task PlayTrackAsync(PlaylistTrack track, TimeSpan? position = null
             
             player.Pause();
 
+            var track = await TrackAtOrDefaultAsync(trackIndex);
+
             if (track is null) return;
 
-            CurrentTrack = track;
-            CurrentIndex = Tracks.IndexOf(track);
-            NextPlayTrack = Tracks.ElementAtOrDefault(CurrentIndex + 1);
+            CurrentIndex = trackIndex;
+            NextPlayTrackIndex = trackIndex + 1;
+            await TrackAtOrDefaultAsync(NextPlayTrackIndex);
 
             var config = await _configService.GetConfig();
 
-            if (config.IgnoredArtists is null) config.IgnoredArtists = new List<string>();
+            config.IgnoredArtists ??= [];
 
             Application.Current.Dispatcher.BeginInvoke(() =>
             {
@@ -155,18 +158,17 @@ private async Task PlayTrackAsync(PlaylistTrack track, TimeSpan? position = null
                 TrackLoadingStateChanged?.Invoke(this, new(PlayerLoadingState.Started));
             });
 
-            if (CurrentTrack.Data.Url is null) await NextTrack();
+            if (string.IsNullOrEmpty(track.Data.Url)) await NextTrack();
 
-            foreach (var ignoreArtist in config.IgnoredArtists)
+            if (config.IgnoredArtists.FirstOrDefault(b =>
+                    track.MainArtists.Any(a => a.Name == b)
+                    || (track.FeaturedArtists != null && track.FeaturedArtists.Any(a => a.Name == b))) 
+                is { } ignoreArtist)
             {
-
-                if ((CurrentTrack.MainArtists != null && CurrentTrack.MainArtists.Any(a => a.Name == ignoreArtist)) 
-                    || (CurrentTrack.FeaturedArtists != null && (CurrentTrack.FeaturedArtists.Any(a => a.Name == ignoreArtist)) ))
-                {
-                    _snackbarService.Show("Трек пропущен",
-                        $"В этом треке был артист из вашего черного списка: {ignoreArtist}. Настроить пропуск треков можно в настройках");
-                    await NextTrack();
-                }
+                _snackbarService.Show("Трек пропущен",
+                    $"В этом треке был артист из вашего черного списка: {ignoreArtist}. Настроить пропуск треков можно в настройках");
+                await NextTrack();
+                return;
             }
 
             var allSourcesTask = Task.WhenAll(_mediaSources.Select(b => b.OpenWithMediaPlayerAsync(player, track, _tokenSource.Token)));
@@ -214,12 +216,44 @@ private async Task PlayTrackAsync(PlaylistTrack track, TimeSpan? position = null
        
     }
 
-    public async Task PlayAsync(IPlaylist playlist, PlaylistTrack? firstTrack = null, TimeSpan? startPosition = null)
+    private async ValueTask<PlaylistTrack?> TrackAtOrDefaultAsync(int trackIndex)
+    {
+        var track = _tracks.ElementAtOrDefault(trackIndex);
+        if (track is not null) return track;
+
+        switch (CurrentPlaylist)
+        {
+            case null or { CanLoad: false }:
+                return null;
+            case IRandomAccessPlaylist randomAccessPlaylist:
+                var count = await randomAccessPlaylist.GetCountAsync();
+                
+                _tracks.AddRangeSequential(await randomAccessPlaylist.GetRangeAsync(Math.Max(_tracks.Count - 1, 0)..Math.Min(count - 1, trackIndex + 10)));
+                break;
+            default:
+            {
+                while (_tracks.Count - 1 < trackIndex && CurrentPlaylist.CanLoad)
+                {
+                    _tracks.AddRangeSequential(await CurrentPlaylist.LoadAsync().ToArrayAsync());
+                }
+
+                break;
+            }
+        }
+        
+        // we've loaded everything but index is still out of bounds
+        if (!CurrentPlaylist.CanLoad && trackIndex >= _tracks.Count)
+            return null;
+
+        return _tracks[trackIndex];
+    }
+
+    public async Task PlayAsync(IPlaylist playlist, int? firstIndex = null, TimeSpan? startPosition = null)
     {
         if(_listenTogetherService.PlayerMode == PlayerMode.Listener)
         {
             await _listenTogetherService.LeavePlaySessionAsync();
-            await Application.Current.Dispatcher.InvokeAsync(() => PlayAsync(playlist, firstTrack, startPosition).SafeFireAndForget());
+            await Application.Current.Dispatcher.InvokeAsync(() => PlayAsync(playlist, firstIndex, startPosition).SafeFireAndForget());
             return;
         }
 
@@ -230,61 +264,55 @@ public async Task PlayAsync(IPlaylist playlist, PlaylistTrack? firstTrack = null
         {
             if (CurrentPlaylist?.Equals(playlist) is true && Tracks.Count > 0)
             {
-                var index = Tracks.IndexOf(firstTrack ?? CurrentTrack ?? Tracks[0]);
-                await PlayTrackFromQueueAsync(index);
+                await PlayTrackFromQueueAsync(firstIndex ?? CurrentIndex);
                 return;
             }
             
             CurrentPlaylist = playlist;
+            
+            _tracks.Clear();
+            CurrentIndex = -1;
+            
             Application.Current.Dispatcher.BeginInvoke(
                 () => CurrentPlaylistChanged?.Invoke(this, EventArgs.Empty));
 
             Task? firstTrackTask = null;
-            if (firstTrack is not null)
+            if (firstIndex.HasValue)
             {
-                if (Application.Current.Dispatcher.CheckAccess())
+                var firstTrack = await TrackAtOrDefaultAsync(firstIndex.Value);
+                
+                if (firstTrack is null)
                 {
-                    Tracks.Clear();
-                    Tracks.Add(firstTrack);
-                }
-                else
-                {
-                    await Application.Current.Dispatcher.InvokeAsync(() =>
-                    {
-                        Tracks.Clear();
-                        Tracks.Add(firstTrack);
-                    });
+                    if (!CurrentPlaylist.CanLoad)
+                        throw new KeyNotFoundException("First track not found");
+                    
+                    _tracks.AddRange(await CurrentPlaylist.LoadAsync().ToArrayAsync(),
+                        NotifyCollectionChangedAction.Reset);
+                    firstTrack = _tracks[firstIndex.GetValueOrDefault()];
                 }
                 
-                firstTrackTask = PlayTrackAsync(firstTrack, startPosition);
+                firstTrackTask = PlayTrackAsync(firstIndex.Value, startPosition);
 
-                    await Task.WhenAll(
-                        _statsListeners.Select(b => b.TrackChangedAsync(CurrentTrack, firstTrack, ChangeReason.PlaylistChange, player.Position)));
+                await Task.WhenAll(_statsListeners.Select(b => b.TrackChangedAsync(CurrentTrack, firstTrack, ChangeReason.PlaylistChange, player.Position)));
             }
 
             Application.Current.Dispatcher.BeginInvoke(
                 () => QueueLoadingStateChanged?.Invoke(this, new(PlayerLoadingState.Started)));
 
-            var loadTask = playlist.LoadAsync().ToArrayAsync().AsTask();
-
             if (firstTrackTask is null)
-                await loadTask;
+            {
+                _tracks.ReplaceRange(await playlist.LoadAsync().ToArrayAsync());
+            }
             else
-                await Task.WhenAll(loadTask, firstTrackTask);
-            
-            Tracks.ReplaceRange(loadTask.Result);
-            CurrentIndex = Tracks.IndexOf(CurrentTrack!);
-            NextPlayTrack = Tracks.ElementAtOrDefault(CurrentIndex + 1);
+                await firstTrackTask;
 
-            if (firstTrack is null)
+            if (CurrentTrack is null)
             {
-                var previousTrack = CurrentTrack;
                 var previousPosition = player.Position;
-                
-                await PlayTrackAsync(Tracks[0], startPosition);
-
+                CurrentIndex = -1;
+                await PlayTrackAsync(0);
                 await Task.WhenAll(
-                        _statsListeners.Select(b => b.TrackChangedAsync(previousTrack, CurrentTrack!, ChangeReason.PlaylistChange, previousPosition)));
+                    _statsListeners.Select(b => b.TrackChangedAsync(null, CurrentTrack!, ChangeReason.PlaylistChange, previousPosition)));
             }
         }
         catch (Exception e)
@@ -363,43 +391,46 @@ async Task LoadMore()
                 var array = await CurrentPlaylist!.LoadAsync().ToArrayAsync();
                 
                 if (Application.Current.Dispatcher.CheckAccess())
-                    Tracks.AddRangeSequential(array);
+                    _tracks.AddRangeSequential(array);
                 else
-                    await Application.Current.Dispatcher.InvokeAsync(() => Tracks.AddRangeSequential(array));
+                    await Application.Current.Dispatcher.InvokeAsync(() => _tracks.AddRangeSequential(array));
             }
-            
-            PlaylistTrack? nextTrack = null;
-            if (CurrentIndex + 1 > Tracks.Count - 1)
+
+            var nextIndex = CurrentIndex + 1;
+            var nextTrack = await TrackAtOrDefaultAsync(nextIndex);
+
+            if (nextTrack is null)
             {
-                if (CurrentPlaylist?.CanLoad == true)
+                if (nextIndex > Tracks.Count - 1)
                 {
-                    await LoadMore();
-                    nextTrack = Tracks.ElementAtOrDefault(CurrentIndex + 1);
+                    if (CurrentPlaylist?.CanLoad == true)
+                    {
+                        await LoadMore();
+                        nextTrack = Tracks.ElementAtOrDefault(nextIndex);
+                    }
+                }
+                else
+                {
+                    nextTrack = Tracks[nextIndex];
                 }
-            }
-            else
-            {
-                nextTrack = Tracks[CurrentIndex + 1];
-            }
 
-            if (nextTrack is null)
-            {
-                Pause();
-                return;
-            }
-            
-            CurrentIndex = Tracks.IndexOf(nextTrack);
+                if (nextTrack is null)
+                {
+                    Pause();
+                    return;
+                }
             
-            // its last track and we can load more
-            if (CurrentIndex == Tracks.Count - 1 && CurrentPlaylist?.CanLoad == true)
-            {
-                await LoadMore();
+                // its last track and we can load more
+                if (nextIndex == Tracks.Count - 1 && CurrentPlaylist?.CanLoad == true)
+                {
+                    await LoadMore();
+                }
             }
-
+            
             var previousTrack = CurrentTrack!;
             var previousPosition = player.Position;
 
-            await PlayTrackAsync(nextTrack);
+            await PlayTrackAsync(nextIndex);
 
             await Task.WhenAll(
                     _statsListeners.Select(b => b.TrackChangedAsync(previousTrack, nextTrack, ChangeReason.NextButton, previousPosition)));
@@ -506,11 +537,11 @@ public async Task PreviousTrack()
                 var index = CurrentIndex - 1;
                 if (index < 0) index = Tracks.Count - 1;
 
-                var previousTrack = Tracks[index];
+                var previousTrack = await TrackAtOrDefaultAsync(index);
                 var prevCurrentTrack = CurrentTrack!;
                 var previousPosition = player.Position;
                 
-                await PlayTrackAsync(previousTrack);
+                await PlayTrackAsync(index);
                 
                 await Task.WhenAll(
                         _statsListeners.Select(b => b.TrackChangedAsync(prevCurrentTrack, previousTrack!, ChangeReason.PrevButton, previousPosition)));
@@ -671,7 +702,7 @@ private async void MediaPlayerOnMediaFailed(MediaPlayer sender, MediaPlayerFaile
 
                     boomService.SetToken(boomToken.AccessToken);
 
-                    await PlayTrackAsync(CurrentTrack);
+                    await PlayTrackAsync(CurrentIndex);
 
                 }
                 catch (Exception ex)
@@ -692,7 +723,7 @@ private async void MediaPlayerOnMediaFailed(MediaPlayer sender, MediaPlayerFaile
 
             if (CurrentTrack is not null)
                 //audio source url may expire
-                await PlayTrackAsync(CurrentTrack);
+                await PlayTrackAsync(CurrentIndex);
         }
         else if (args.Error == MediaPlayerError.NetworkError)
         {
@@ -703,6 +734,8 @@ private async void MediaPlayerOnMediaFailed(MediaPlayer sender, MediaPlayerFaile
     }
 
     private int positionTimerListenTogetherCouter = 0;
+    private int _nextPlayTrackIndex;
+
     private async void PositionTimerOnTick(object sender, object o)
     {
         Application.Current.Dispatcher.Invoke((() =>
@@ -722,9 +755,9 @@ private async void PositionTimerOnTick(object sender, object o)
             await _listenTogetherService.ChangePlayStateAsync(this.Position, !IsPlaying);
         }
     }
-    public async void RemoveFromQueue(PlaylistTrack audio)
+    public async void RemoveFromQueue(int index)
     {
-        if (audio == CurrentTrack)
+        if (index == CurrentIndex)
         {
             if (CurrentIndex + 1 < Tracks.Count)
                 await NextTrack();
@@ -732,37 +765,40 @@ public async void RemoveFromQueue(PlaylistTrack audio)
                 Pause();
         }
 
-        if (!Tracks.Remove(audio))
-            return;
+        _tracks.RemoveAt(index);
             
-        CurrentIndex = Tracks.IndexOf(CurrentTrack!);
+        if (index <= CurrentIndex)
+            CurrentIndex--;
             
-        if (audio == NextPlayTrack)
-            NextPlayTrack = Tracks.ElementAtOrDefault(CurrentIndex + 1);
+        if (index == CurrentIndex + 2 && await TrackAtOrDefaultAsync(index) is not null)
+        {
+            NextPlayTrackIndex = index;
+        }
     }
 
     public async void InsertToQueue(PlaylistTrack audio, bool afterCurrent)
     {
         if (Tracks.Count == 0 && !IsPlaying)
         {
-            Tracks.Add(audio);
+            _tracks.Insert(0, audio);
+            
             // so we dont had to deal with deadlocks if insertion was triggered with dispatcher context
-            await PlayTrackAsync(audio).ConfigureAwait(false);
+            await PlayTrackAsync(0).ConfigureAwait(false);
             return;
         }
             
         if (afterCurrent)
         {
-            Tracks.Insert(CurrentIndex + 1, audio);
-            NextPlayTrack = audio;
+            _tracks.Insert(CurrentIndex + 1, audio);
+            NextPlayTrackIndex = CurrentIndex + 1;
         }
         else
         {
             // if current is last track in the queue
             if (CurrentIndex == Tracks.Count - 1)
-                NextPlayTrack = audio;
+                NextPlayTrackIndex++;
                 
-            Tracks.Add(audio);
+            _tracks.Add(audio);
         }
             
         await Application.Current.Dispatcher.InvokeAsync(() => NextTrackChanged?.Invoke(this, EventArgs.Empty));
@@ -799,23 +835,20 @@ private void SubscribeToListenTogetherEvents()
     {
         _listenTogetherService.PlayStateChanged += ListenTogetherPlayStateChanged;
         _listenTogetherService.TrackChanged += ListenTogetherTrackChanged;
-        _listenTogetherService.ConnectedToSession += ListenTogetherConnectedToSession;
+        _listenTogetherService.ConnectedToSession += ListenTogetherTrackChanged;
         _listenTogetherService.SessionOwnerStoped += SessionStoped;
     }
 
     private async Task SessionStoped()
     {
         Pause();
-    }
-
-    private async Task ListenTogetherConnectedToSession(PlaylistTrack playlistTrack)
-    {
-        await this.PlayTrackAsync(playlistTrack);
+        _tracks.Clear();
     }
 
     private async Task ListenTogetherTrackChanged(PlaylistTrack playlistTrack)
     {
-        await this.PlayTrackAsync(playlistTrack);
+        _tracks.Replace(playlistTrack);
+        await PlayTrackAsync(0);
     }
 
     private async Task ListenTogetherPlayStateChanged(TimeSpan position, bool pause)
@@ -835,6 +868,24 @@ private async Task ListenTogetherPlayStateChanged(TimeSpan position, bool pause)
         }
     }
 
+    public void MoveTrackInQueue(Index oldIndex, Index newIndex)
+    {
+        var realOldIndex = oldIndex.GetOffset(_tracks.Count);
+        var realNewIndex = newIndex.GetOffset(_tracks.Count);
+        
+        _tracks.Move(realOldIndex, realNewIndex);
+
+        if (CurrentIndex != realOldIndex && NextPlayTrackIndex != realOldIndex) return;
+        
+        if (CurrentIndex == realOldIndex)
+        {
+            CurrentIndex = realNewIndex;
+            NextPlayTrackIndex = realNewIndex + 1;
+        }
+        else
+            NextPlayTrackIndex = realNewIndex;
+    }
+
     private class TrackCollection : TrackCollectionBase
     {
         private List<PlaylistTrack>? _originalTracks;
diff --git a/MusicX/Services/Player/PlayerState.cs b/MusicX/Services/Player/PlayerState.cs
index e472824c..887a5584 100644
--- a/MusicX/Services/Player/PlayerState.cs
+++ b/MusicX/Services/Player/PlayerState.cs
@@ -4,10 +4,10 @@
 
 namespace MusicX.Services.Player;
 
-public record PlayerState(IPlaylist Playlist, PlaylistTrack Track, TimeSpan Position)
+public record PlayerState(IPlaylist Playlist, int CurrentIndex, TimeSpan Position)
 {
     public static PlayerState? CreateOrNull(PlayerService service) =>
         service is { CurrentPlaylist: null } or { CurrentTrack: null }
             ? null
-            : new(service.CurrentPlaylist, service.CurrentTrack, service.Position);
+            : new(service.CurrentPlaylist, service.CurrentIndex, service.Position);
 }
\ No newline at end of file
diff --git a/MusicX/Services/Player/Playlists/IPlaylist.cs b/MusicX/Services/Player/Playlists/IPlaylist.cs
index 0a6fa622..8feee0d7 100644
--- a/MusicX/Services/Player/Playlists/IPlaylist.cs
+++ b/MusicX/Services/Player/Playlists/IPlaylist.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using MusicX.Shared.Player;
 
@@ -19,13 +20,24 @@ public interface IPlaylist : IEquatable<IPlaylist>
     IAsyncEnumerable<PlaylistTrack> LoadAsync();
 }
 
+public interface IRandomAccessPlaylist : IPlaylist
+{
+    ValueTask<int> GetCountAsync();
+    ValueTask<IEnumerable<PlaylistTrack>> GetRangeAsync(Range range);
+}
+
+public interface IShufflePlaylist : IPlaylist
+{
+    IPlaylist ShuffleWithSeed(int seed);
+}
+
 public abstract class PlaylistBase<TData> : IPlaylist<TData> where TData : class, IEquatable<TData>
 {
     public abstract IAsyncEnumerable<PlaylistTrack> LoadAsync();
     public abstract bool CanLoad { get; }
     public abstract TData Data { get; }
     
-    public bool Equals(IPlaylist? other)
+    public virtual bool Equals(IPlaylist? other)
     {
         return other is PlaylistBase<TData> { Data: { } otherData } && GetType() == other.GetType() && Data.Equals(otherData);
     }
@@ -68,7 +80,6 @@ public class PlaylistJsonConverter : JsonConverter<IPlaylist>
             "radio" => JsonSerializer.Deserialize<RadioPlaylist>(ref reader, options),
             "vkBlock" => JsonSerializer.Deserialize<VkBlockPlaylist>(ref reader, options),
             "vkPlaylist" => JsonSerializer.Deserialize<VkPlaylistPlaylist>(ref reader, options),
-            "shuffleVkPlaylist" => JsonSerializer.Deserialize<ShuffleVkPlaylistPlaylist>(ref reader, options),
             _ => throw new JsonException("Unsupported playlist type.")
         };
         
@@ -106,9 +117,6 @@ void WriteObject<T>(string type, T data)
             case VkPlaylistPlaylist playlist:
                 WriteObject("vkPlaylist", playlist);
                 break;
-            case ShuffleVkPlaylistPlaylist playlist:
-                WriteObject("shuffleVkPlaylist", playlist);
-                break;
             default:
                 throw new JsonException("Unsupported playlist type.");
         }
diff --git a/MusicX/Services/Player/Playlists/ListPlaylist.cs b/MusicX/Services/Player/Playlists/ListPlaylist.cs
index 5f74d8eb..0ced641f 100644
--- a/MusicX/Services/Player/Playlists/ListPlaylist.cs
+++ b/MusicX/Services/Player/Playlists/ListPlaylist.cs
@@ -1,13 +1,15 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.InteropServices;
 using System.Text.Json.Serialization;
+using System.Threading.Tasks;
 using MusicX.Shared.Player;
 
 namespace MusicX.Services.Player.Playlists;
 
 [JsonConverter(typeof(PlaylistJsonConverter<ListPlaylist, EquatableList<PlaylistTrack>>))]
-public class ListPlaylist : PlaylistBase<EquatableList<PlaylistTrack>>
+public class ListPlaylist : PlaylistBase<EquatableList<PlaylistTrack>>, IRandomAccessPlaylist, IShufflePlaylist
 {
     private bool _canLoad = true;
 
@@ -25,6 +27,23 @@ public override IAsyncEnumerable<PlaylistTrack> LoadAsync()
         _canLoad = false;
         return Data.ToAsyncEnumerable();
     }
+
+    public IPlaylist ShuffleWithSeed(int seed)
+    {
+        var data = Data.ToList();
+        
+        var random = new Random(seed);
+        random.Shuffle(CollectionsMarshal.AsSpan(data));
+        
+        return new ListPlaylist(data);
+    }
+
+    public ValueTask<int> GetCountAsync() => new(Data.Count);
+
+    public ValueTask<IEnumerable<PlaylistTrack>> GetRangeAsync(Range range)
+    {
+        return new(Data[range]);
+    }
 }
 
 public class EquatableList<T> : List<T>, IEquatable<EquatableList<T>> where T : IEquatable<T>
diff --git a/MusicX/Services/Player/Playlists/ShuffleVkPlaylistPlaylist.cs b/MusicX/Services/Player/Playlists/ShuffleVkPlaylistPlaylist.cs
deleted file mode 100644
index 1c3e9d82..00000000
--- a/MusicX/Services/Player/Playlists/ShuffleVkPlaylistPlaylist.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json.Serialization;
-using System.Threading.Tasks;
-using MusicX.Core.Models;
-using MusicX.Core.Services;
-using MusicX.Shared.Player;
-using MusicX.ViewModels;
-
-namespace MusicX.Services.Player.Playlists;
-
-[JsonConverter(typeof(PlaylistJsonConverter<ShuffleVkPlaylistPlaylist, PlaylistData>))]
-public class ShuffleVkPlaylistPlaylist : PlaylistBase<PlaylistData>
-{
-    private readonly VkService _vkService;
-    private int _offset;
-    private int _count;
-
-    private ChunkedCollection<PlaylistTrack>? _tracks;
-
-    private const int LoadCount = 40;
-
-    public ShuffleVkPlaylistPlaylist(VkService vkService, PlaylistData data)
-    {
-        _vkService = vkService;
-        Data = data;
-    }
-
-    public override async IAsyncEnumerable<PlaylistTrack> LoadAsync()
-    {
-        var (id, ownerId, accessKey) = Data;
-        var trackPlaylist = new Playlist
-        {
-            Id = Data.PlaylistId,
-            OwnerId = Data.OwnerId,
-            AccessKey = Data.AccessKey
-        };
-
-        if (_firstLoad)
-        {
-            var playlist = await _vkService.GetPlaylistAsync(LoadCount, id, accessKey, ownerId);
-
-            _count = (int)playlist.Playlist.Count;
-            _tracks = new(_count, async range =>
-            {
-                var (offset, length) = range.GetOffsetAndLength(_count);
-                var response = await _vkService.AudioGetAsync(id, ownerId, accessKey, offset, length);
-                return response.Items.Select(audio => audio.ToTrack(trackPlaylist));
-            });
-
-            _firstLoad = false;
-        }
-        
-        var items = await _tracks!.GetRangeAsync(_offset..Math.Min(_count - 1, _offset + LoadCount));
-
-        _offset += Math.Min(_count - _offset - 1, LoadCount);
-        
-        foreach (var item in items)
-        {
-            yield return item;
-        }
-    }
-
-    private bool _firstLoad = true;
-    public override bool CanLoad => _firstLoad || _offset < _count;
-    public override PlaylistData Data { get; }
-
-    private class ChunkedCollection<T>
-    {
-        public int Count { get; }
-
-        private readonly Func<Range, ValueTask<IEnumerable<T>>> _loader;
-        private readonly int[] _indices;
-        private readonly T?[] _items;
-
-        public ChunkedCollection(int count, Func<Range, ValueTask<IEnumerable<T>>> loader)
-        {
-            Count = count;
-            _loader = loader;
-
-            _indices = Enumerable.Range(0, count).ToArray();
-            _items = new T?[count];
-            
-            Random.Shared.Shuffle(_indices);
-        }
-
-        public async ValueTask<IEnumerable<T>> GetRangeAsync(Range range)
-        {
-            var (offset, length) = range.GetOffsetAndLength(Count);
-            
-            var indicesSegment = new ArraySegment<int>(_indices, offset, length);
-            var result = new T[length];
-            
-            for (var i = 0; i < indicesSegment.Count; i++)
-            {
-                var index = indicesSegment[i];
-
-                if (_items[index] is null)
-                {
-                    var rangeToLoad = GetLoadableRangeFromIndex(index);
-
-                    var items = await _loader(rangeToLoad);
-                    
-                    (items as T[] ?? items.ToArray()).AsSpan().CopyTo(_items.AsSpan(rangeToLoad)!);
-                }
-                
-                result[i] = _items[index] ?? throw new InvalidOperationException();
-            }
-            
-            return result;
-        }
-
-        private Range GetLoadableRangeFromIndex(int index)
-        {
-            var startIndex = Math.Min(index,
-                Array.FindIndex(_items, Math.Clamp(index - 20, 0, Count), static b => b != null));
-            int endIndex;
-
-            if (startIndex - index > 15)
-            {
-                endIndex = startIndex;
-                startIndex = index;
-            }
-            else
-            {
-                endIndex = Math.Min(index + 20, Count);
-            }
-
-            if (endIndex < 0)
-            {
-                return Math.Clamp(index - 19, 0, Count)..index;
-            }
-
-            return Math.Max(Math.Max(index - 20, 0), startIndex)..Math.Max(endIndex, Math.Clamp(index + 20, 0, Count));
-        }
-    }
-}
\ No newline at end of file
diff --git a/MusicX/Services/Player/Playlists/SinglePlaylist.cs b/MusicX/Services/Player/Playlists/SinglePlaylist.cs
index d4e73956..823ebabe 100644
--- a/MusicX/Services/Player/Playlists/SinglePlaylist.cs
+++ b/MusicX/Services/Player/Playlists/SinglePlaylist.cs
@@ -1,12 +1,14 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json.Serialization;
+using System.Threading.Tasks;
 using MusicX.Shared.Player;
 
 namespace MusicX.Services.Player.Playlists;
 
 [JsonConverter(typeof(PlaylistJsonConverter<SinglePlaylist, PlaylistTrack>))]
-public class SinglePlaylist : PlaylistBase<PlaylistTrack>
+public class SinglePlaylist : PlaylistBase<PlaylistTrack>, IRandomAccessPlaylist, IShufflePlaylist
 {
     private bool _canLoad = true;
 
@@ -24,4 +26,13 @@ public override IAsyncEnumerable<PlaylistTrack> LoadAsync()
         _canLoad = false;
         return new List<PlaylistTrack> { Data }.ToAsyncEnumerable();
     }
+
+    public IPlaylist ShuffleWithSeed(int seed) => this;
+
+    public ValueTask<int> GetCountAsync() => new(1); 
+
+    public ValueTask<IEnumerable<PlaylistTrack>> GetRangeAsync(Range range)
+    {
+        return new([Data]);
+    }
 }
\ No newline at end of file
diff --git a/MusicX/Services/Player/Playlists/VkBlockPlaylist.cs b/MusicX/Services/Player/Playlists/VkBlockPlaylist.cs
index a152bdc7..2069cf7d 100644
--- a/MusicX/Services/Player/Playlists/VkBlockPlaylist.cs
+++ b/MusicX/Services/Player/Playlists/VkBlockPlaylist.cs
@@ -1,9 +1,7 @@
 using System.Collections.Generic;
-using System.Linq;
 using System.Text.Json.Serialization;
 using Microsoft.Extensions.DependencyInjection;
 using MusicX.Core.Services;
-using MusicX.Helpers;
 using MusicX.Shared.Player;
 
 namespace MusicX.Services.Player.Playlists;
diff --git a/MusicX/Services/Player/Playlists/VkPlaylistPlaylist.cs b/MusicX/Services/Player/Playlists/VkPlaylistPlaylist.cs
index b9b7941a..2b688806 100644
--- a/MusicX/Services/Player/Playlists/VkPlaylistPlaylist.cs
+++ b/MusicX/Services/Player/Playlists/VkPlaylistPlaylist.cs
@@ -1,19 +1,23 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Text.Json.Serialization;
+using System.Threading.Tasks;
 using MusicX.Core.Models;
 using MusicX.Core.Services;
-using MusicX.Helpers;
 using MusicX.Shared.Player;
 using MusicX.ViewModels;
 
 namespace MusicX.Services.Player.Playlists;
 
 [JsonConverter(typeof(PlaylistJsonConverter<VkPlaylistPlaylist, PlaylistData>))]
-public class VkPlaylistPlaylist : PlaylistBase<PlaylistData>
+public class VkPlaylistPlaylist : PlaylistBase<PlaylistData>, IRandomAccessPlaylist, IShufflePlaylist
 {
     private readonly VkService _vkService;
     private int _offset;
     private int _count;
+
+    private int? _seed;
     
     private const int LoadCount = 40;
 
@@ -25,7 +29,7 @@ public VkPlaylistPlaylist(VkService vkService, PlaylistData data)
 
     public override async IAsyncEnumerable<PlaylistTrack> LoadAsync()
     {
-        var (id, ownerId, accessKey) = Data;
+        var (id, ownerId, accessKey, _) = Data;
         var trackPlaylist = new Playlist
         {
             Id = Data.PlaylistId,
@@ -33,23 +37,9 @@ public override async IAsyncEnumerable<PlaylistTrack> LoadAsync()
             AccessKey = Data.AccessKey
         };
         
-        if (_firstLoad)
-        {
-            var playlist = await _vkService.GetPlaylistAsync(LoadCount, id, accessKey, ownerId);
-
-            _count = (int)playlist.Playlist.Count;
-            _offset = playlist.Audios.Count;
-
-            foreach (var audio in playlist.Audios)
-            {
-                yield return audio.ToTrack(trackPlaylist);
-            }
+        await PerformFirstLoadAsync();
         
-            _firstLoad = false;
-            yield break;
-        }
-        
-        var response = await _vkService.AudioGetAsync(id, ownerId, accessKey, _offset, LoadCount);
+        var response = await _vkService.AudioGetAsync(id, ownerId, accessKey, _offset, LoadCount, _seed);
 
         _offset += response.Items.Count;
         
@@ -59,7 +49,75 @@ public override async IAsyncEnumerable<PlaylistTrack> LoadAsync()
         }
     }
 
+    public IPlaylist ShuffleWithSeed(int seed)
+    {
+        return new VkPlaylistPlaylist(_vkService, Data)
+        {
+            _seed = seed
+        };
+    }
+
+    public override int GetHashCode()
+    {
+        return HashCode.Combine(Data, _seed);
+    }
+
+    public override bool Equals(IPlaylist? other)
+    {
+        if (other is null)
+            return false;
+
+        if (ReferenceEquals(this, other))
+            return true;
+        
+        if (other is not VkPlaylistPlaylist playlist)
+            return false;
+        
+        return Data.Equals(playlist.Data) && _seed == playlist._seed;
+    }
+
+    private async ValueTask PerformFirstLoadAsync()
+    {
+        var (id, ownerId, accessKey, _) = Data;
+
+        if (_firstLoad)
+        {
+            var playlist = await _vkService.GetPlaylistAsync(LoadCount, id, accessKey, ownerId);
+
+            _count = (int)playlist.Playlist.Count;
+            _offset = 0;
+
+            _firstLoad = false;
+        }
+    }
+
     private bool _firstLoad = true;
     public override bool CanLoad => _firstLoad || _offset < _count;
     public override PlaylistData Data { get; }
+    public async ValueTask<int> GetCountAsync()
+    {
+        if (Data.Count.HasValue)
+            return Data.Count.Value;
+
+        await PerformFirstLoadAsync();
+
+        return _count;
+    }
+
+    public async ValueTask<IEnumerable<PlaylistTrack>> GetRangeAsync(Range range)
+    {
+        var (id, ownerId, accessKey, _) = Data;
+        var trackPlaylist = new Playlist
+        {
+            Id = Data.PlaylistId,
+            OwnerId = Data.OwnerId,
+            AccessKey = Data.AccessKey
+        };
+        
+        await PerformFirstLoadAsync();
+        
+        var (offset, length) = range.GetOffsetAndLength(_count);
+        var response = await _vkService.AudioGetAsync(id, ownerId, accessKey, offset, length);
+        return response.Items.Select(audio => audio.ToTrack(trackPlaylist));
+    }
 }
\ No newline at end of file
diff --git a/MusicX/ViewModels/BlockViewModel.cs b/MusicX/ViewModels/BlockViewModel.cs
new file mode 100644
index 00000000..a0ddcc3f
--- /dev/null
+++ b/MusicX/ViewModels/BlockViewModel.cs
@@ -0,0 +1,102 @@
+using System.Collections.Specialized;
+using MusicX.Core.Models;
+using MusicX.Helpers;
+using MusicX.Shared.ListenTogether.Radio;
+
+namespace MusicX.ViewModels;
+
+public class BlockViewModel : BaseViewModel
+{
+    public string Id { get; }
+    public string DataType { get; }
+    public Layout? Layout { get; }
+
+    public ObservableRangeCollection<Button> Buttons { get; }
+    
+    public Badge Badge { get; }
+    
+    public ObservableRangeCollection<Text> Texts { get; }
+    
+    public ObservableRangeCollection<Audio> Audios { get; }
+    
+    public ObservableRangeCollection<Playlist> Playlists { get; }
+    
+    public ObservableRangeCollection<CatalogBanner> CatalogBanners { get; }
+    
+    public ObservableRangeCollection<Link> Links { get; }
+    
+    public ObservableRangeCollection<Suggestion> Suggestions { get; }
+    
+    public ObservableRangeCollection<Artist> Artists { get; }
+    
+    public ObservableRangeCollection<Group> Groups { get; }
+    
+    public ObservableRangeCollection<RecommendedPlaylist> RecommendedPlaylists { get; }
+    
+    public ObservableRangeCollection<Video> Videos { get; }
+    
+    public ObservableRangeCollection<Video> ArtistVideos { get; }
+    
+    public ObservableRangeCollection<Placeholder> Placeholders { get; }
+    
+    public ObservableRangeCollection<MusicOwner> MusicOwners { get; }
+    
+    public ObservableRangeCollection<AudioFollowingsUpdateInfo> FollowingsUpdateInfos { get; }
+    
+    public ObservableRangeCollection<Station> Stations { get; }
+    
+    public ObservableRangeCollection<Curator> Curators { get; }
+    
+    public ObservableRangeCollection<Longread> Longreads { get; }
+    
+    public BlockViewModel(Block block)
+    {
+        Id = block.Id;
+        DataType = block.DataType;
+        Layout = block.Layout;
+        Buttons = new(block.Buttons);
+        Buttons.AddRange(block.Actions);
+        Badge = block.Badge;
+        Texts = new(block.Texts);
+        Audios = new(block.Audios);
+        Playlists = new(block.Playlists);
+        CatalogBanners = new(block.Banners);
+        Links = new(block.Links);
+        Suggestions = new(block.Suggestions);
+        Artists = new(block.Artists);
+        Groups = new(block.Groups);
+        RecommendedPlaylists = new(block.RecommendedPlaylists);
+        Videos = new(block.Videos);
+        ArtistVideos = new(block.ArtistVideos);
+        Placeholders = new(block.Placeholders);
+        MusicOwners = new(block.MusicOwners);
+        FollowingsUpdateInfos = new(block.FollowingsUpdateInfos);
+        Stations = new(block.Stations);
+        Curators = new(block.Curators);
+        Longreads = new(block.Longreads);
+    }
+
+    public void MergeBlock(Block block)
+    {
+        const NotifyCollectionChangedAction action = NotifyCollectionChangedAction.Reset;
+        Buttons.AddRange(block.Buttons, action);
+        Buttons.AddRange(block.Actions, action);
+        Texts.AddRange(block.Texts, action);
+        Audios.AddRange(block.Audios, action);
+        Playlists.AddRange(block.Playlists, action);
+        CatalogBanners.AddRange(block.Banners, action);
+        Links.AddRange(block.Links, action);
+        Suggestions.AddRange(block.Suggestions, action);
+        Artists.AddRange(block.Artists, action);
+        Groups.AddRange(block.Groups, action);
+        RecommendedPlaylists.AddRange(block.RecommendedPlaylists, action);
+        Videos.AddRange(block.Videos, action);
+        ArtistVideos.AddRange(block.ArtistVideos, action);
+        Placeholders.AddRange(block.Placeholders, action);
+        MusicOwners.AddRange(block.MusicOwners, action);
+        FollowingsUpdateInfos.AddRange(block.FollowingsUpdateInfos, action);
+        Stations.AddRange(block.Stations, action);
+        Curators.AddRange(block.Curators, action);
+        Longreads.AddRange(block.Longreads, action);
+    }
+}
\ No newline at end of file
diff --git a/MusicX/ViewModels/BoomViewModelBase.cs b/MusicX/ViewModels/BoomViewModelBase.cs
index dfda1ae9..12ae87bc 100644
--- a/MusicX/ViewModels/BoomViewModelBase.cs
+++ b/MusicX/ViewModels/BoomViewModelBase.cs
@@ -60,7 +60,7 @@ public virtual async Task ArtistSelected()
             IsLoadingMix = true;
             var radioByArtist = await BoomService.GetArtistMixAsync(SelectedArtist.ApiId);
 
-            await PlayerService.PlayAsync(new RadioPlaylist(BoomService, new(radioByArtist, BoomRadioType.Artist)), radioByArtist.Tracks[0].ToTrack());
+            await PlayerService.PlayAsync(new RadioPlaylist(BoomService, new(radioByArtist, BoomRadioType.Artist)));
 
             IsLoadingMix = false;
         }catch(UnauthorizedException ex)
@@ -108,7 +108,7 @@ public virtual async Task TagSelected()
 
             var radio = await BoomService.GetTagMixAsync(SelectedTag.ApiId);
 
-            await PlayerService.PlayAsync(new RadioPlaylist(BoomService, new(radio, BoomRadioType.Tag)), radio.Tracks[0].ToTrack());
+            await PlayerService.PlayAsync(new RadioPlaylist(BoomService, new(radio, BoomRadioType.Tag)));
 
             IsLoadingMix = false;
         }
diff --git a/MusicX/ViewModels/Controls/BlockButtonViewModel.cs b/MusicX/ViewModels/Controls/BlockButtonViewModel.cs
index f8b0e085..4dbfc12b 100644
--- a/MusicX/ViewModels/Controls/BlockButtonViewModel.cs
+++ b/MusicX/ViewModels/Controls/BlockButtonViewModel.cs
@@ -32,7 +32,7 @@ public Button Action
         }
     }
     public Artist? Artist { get; set; }
-    public Block? ParentBlock { get; set; }
+    public BlockViewModel? ParentBlock { get; set; }
 
     public BlockButtonViewModel()
     {
@@ -40,7 +40,7 @@ public BlockButtonViewModel()
         // Refresh();
     }
 
-    public BlockButtonViewModel(Button action, Artist? artist = null, Block? parentBlock = null) : this()
+    public BlockButtonViewModel(Button action, Artist? artist = null, BlockViewModel? parentBlock = null) : this()
     {
         Artist = artist;
         ParentBlock = parentBlock;
diff --git a/MusicX/ViewModels/PlaylistViewModel.cs b/MusicX/ViewModels/PlaylistViewModel.cs
index 1bc0a8c3..3348eb6d 100644
--- a/MusicX/ViewModels/PlaylistViewModel.cs
+++ b/MusicX/ViewModels/PlaylistViewModel.cs
@@ -13,7 +13,7 @@
 namespace MusicX.ViewModels
 {
     [Serializable]
-    public record PlaylistData(long PlaylistId, long OwnerId, string AccessKey);
+    public record PlaylistData(long PlaylistId, long OwnerId, string AccessKey, int? Count = null);
     
     public class PlaylistViewModel:BaseViewModel
     {
@@ -97,7 +97,7 @@ public async Task LoadPlaylist(Playlist playlist, bool delete = true)
             try
             {
                 logger.Info("Load playlist");
-                PlaylistData = new(playlist.Id, playlist.OwnerId, playlist.AccessKey);
+                PlaylistData = new(playlist.Id, playlist.OwnerId, playlist.AccessKey, (int)playlist.Count);
                 if (delete && Tracks.Count > 0)
                 {
                     if (Application.Current.Dispatcher.CheckAccess())
@@ -261,7 +261,7 @@ public async Task LoadPlaylistFromData(long playlistId, long ownerId, string acc
         }
         public Task LoadPlaylistFromData(PlaylistData data)
         {
-            var (playlistId, ownerId, accessKey) = data;
+            var (playlistId, ownerId, accessKey, _) = data;
             return LoadPlaylistFromData(playlistId, ownerId, accessKey);
         }
 
diff --git a/MusicX/ViewModels/SectionViewModel.cs b/MusicX/ViewModels/SectionViewModel.cs
index adeac192..307d6066 100644
--- a/MusicX/ViewModels/SectionViewModel.cs
+++ b/MusicX/ViewModels/SectionViewModel.cs
@@ -38,7 +38,7 @@ public class SectionViewModel : BaseViewModel, INotifyOnActivated
         
         public Artist? Artist { get; set; }
 
-        public ObservableRangeCollection<Block> Blocks { get; set; } = new();
+        public ObservableRangeCollection<BlockViewModel> Blocks { get; } = [];
 
         public SectionViewModel(VkService vkService, Logger logger, ISnackbarService snackbarService,
             ConfigService configService)
@@ -84,9 +84,16 @@ public async Task LoadMore()
 
                 await Application.Current.Dispatcher.InvokeAsync(() =>
                 {
+                    if (section.Section.Blocks is [var singleBlock] && Blocks[^1].DataType == singleBlock.DataType &&
+                        Blocks[^1].Layout.Name == singleBlock.Layout.Name)
+                    {
+                        Blocks[^1].MergeBlock(singleBlock);
+                        return;
+                    }
+                    
                     foreach (var block in section.Section.Blocks)
                     {
-                        Blocks.Add(block);
+                        Blocks.Add(new(block));
                     }
                 });
 
@@ -124,7 +131,8 @@ public async Task ReplaceBlocks(string replaceId)
                 await Application.Current.Dispatcher.InvokeAsync(() =>
                 {
                     Blocks.RemoveRange(Blocks.Where(b => toReplaceBlockIds.Contains(b.Id)).ToArray());
-                    Blocks.AddRangeSequential(replaces.Replacements.ReplacementsModels.SelectMany(b => b.ToBlocks));
+                    Blocks.AddRangeSequential(replaces.Replacements.ReplacementsModels.SelectMany(b => b.ToBlocks)
+                        .Select(b => new BlockViewModel(b)));
                 });
             }
             catch (Exception ex)
@@ -171,7 +179,7 @@ await Application.Current.Dispatcher.InvokeAsync(() =>
                 {
                     try
                     {
-                        Blocks.ReplaceRange(blocks);
+                        Blocks.ReplaceRange(blocks.Select(b => new BlockViewModel(b)));
                     }
                     catch (Exception ex)
                     {
@@ -221,7 +229,7 @@ private async Task LoadSection(string sectionId, bool showTitle = false)
                 await Application.Current.Dispatcher.InvokeAsync(() =>
                 {
                     Blocks.Clear();
-                    Blocks.Add(new() {DataType = "none", Layout = new() {Name = "header", Title = "Ничего не найдено"}});
+                    Blocks.Add(new(new() {DataType = "none", Layout = new() {Name = "header", Title = "Ничего не найдено"}}));
                 });
             }
             catch (Exception ex)
diff --git a/MusicX/ViewModels/VKMixViewModel.cs b/MusicX/ViewModels/VKMixViewModel.cs
index b06131a7..9ee1776e 100644
--- a/MusicX/ViewModels/VKMixViewModel.cs
+++ b/MusicX/ViewModels/VKMixViewModel.cs
@@ -132,7 +132,7 @@ private async Task PlayPersonalMixAsync()
                 IsLoadingMix = true;
                 var personalMix =  await BoomService.GetPersonalMixAsync();
 
-                await PlayerService.PlayAsync(new RadioPlaylist(BoomService, new(personalMix, BoomRadioType.Personal)), personalMix.Tracks[0].ToTrack());
+                await PlayerService.PlayAsync(new RadioPlaylist(BoomService, new(personalMix, BoomRadioType.Personal)));
 
 
                 IsLoadingMix = false;
diff --git a/MusicX/Views/PlaylistView.xaml.cs b/MusicX/Views/PlaylistView.xaml.cs
index c5b35e2f..d88c1dce 100644
--- a/MusicX/Views/PlaylistView.xaml.cs
+++ b/MusicX/Views/PlaylistView.xaml.cs
@@ -56,7 +56,7 @@ private void ViewModel_PlaylistNotLoaded(object? sender, Playlist e)
         public PlaylistView(Playlist playlist) : this()
         {
             this.playlist = playlist;
-            ViewModel.PlaylistData = new(playlist.Id, playlist.OwnerId, playlist.AccessKey);
+            ViewModel.PlaylistData = new(playlist.Id, playlist.OwnerId, playlist.AccessKey, (int)playlist.Count);
         }
 
         public PlaylistView(long playlistId, long ownerId, string accessKey) : this()
@@ -190,8 +190,7 @@ private async void PlayPlaylist_Click(object sender, RoutedEventArgs e)
                     PlayPlaylist.Icon = new SymbolIcon(SymbolRegular.Pause20);
 
                     await player.PlayAsync(
-                        new VkPlaylistPlaylist(StaticService.Container.GetRequiredService<VkService>(),
-                                               ViewModel.PlaylistData), ViewModel.Playlist.Audios[0].ToTrack());
+                        new VkPlaylistPlaylist(StaticService.Container.GetRequiredService<VkService>(), ViewModel.PlaylistData));
                 }
             }catch (Exception ex)
             {
@@ -262,7 +261,7 @@ public override void Replay(NavigationService navigationService, NavigationMode
             }
             public void GetObjectData(SerializationInfo info, StreamingContext context)
             {
-                var (id, ownerId, accessKey) = _viewModel.PlaylistData;
+                var (id, ownerId, accessKey, _) = _viewModel.PlaylistData;
                 
                 info.AddValue(IdKey, id);
                 info.AddValue(OwnerIdKey, ownerId);
@@ -307,8 +306,9 @@ private async void PlayPlaylistShuffle_Click(object sender, RoutedEventArgs e)
                 PlayPlaylist.Content = "Остановить воспроизведение";
                 PlayPlaylist.Icon = new SymbolIcon(SymbolRegular.Pause20);
 
-                await player.PlayAsync(new ShuffleVkPlaylistPlaylist(
-                    StaticService.Container.GetRequiredService<VkService>(), ViewModel.PlaylistData));
+                var vkPlaylist = new VkPlaylistPlaylist(StaticService.Container.GetRequiredService<VkService>(), ViewModel.PlaylistData);
+                
+                await player.PlayAsync(vkPlaylist.ShuffleWithSeed(Random.Shared.Next()));
             }
             catch (Exception ex)
             {
diff --git a/MusicX/packages.lock.json b/MusicX/packages.lock.json
index f0d96da3..dd3810a6 100644
--- a/MusicX/packages.lock.json
+++ b/MusicX/packages.lock.json
@@ -84,6 +84,19 @@
           "Microsoft.Windows.WDK.Win32Metadata": "0.11.4-experimental"
         }
       },
+      "MonoMod.RuntimeDetour": {
+        "type": "Direct",
+        "requested": "[25.1.2, )",
+        "resolved": "25.1.2",
+        "contentHash": "eNf/V6FqS5ErkvdA+vyVM5d7SFeKCkltn5XhT2GrjJ2xec6BG3E7lk/52qVIqDSsMrU+M6dTM8W+fl4IxKQWHw==",
+        "dependencies": {
+          "Mono.Cecil": "0.11.5",
+          "MonoMod.Backports": "1.1.2",
+          "MonoMod.Core": "1.1.2",
+          "MonoMod.ILHelpers": "1.1.0",
+          "MonoMod.Utils": "25.0.6"
+        }
+      },
       "Ookii.Dialogs.Wpf": {
         "type": "Direct",
         "requested": "[5.0.1, )",
@@ -464,6 +477,45 @@
           "Microsoft.Windows.SDK.Win32Metadata": "60.0.34-preview"
         }
       },
+      "Mono.Cecil": {
+        "type": "Transitive",
+        "resolved": "0.11.5",
+        "contentHash": "fxfX+0JGTZ8YQeu1MYjbBiK2CYTSzDyEeIixt+yqKKTn7FW8rv7JMY70qevup4ZJfD7Kk/VG/jDzQQTpfch87g=="
+      },
+      "MonoMod.Backports": {
+        "type": "Transitive",
+        "resolved": "1.1.2",
+        "contentHash": "baYlNy8n8kmaNhNvqmZ/dIPOeO1r9//dG1i2WbunMWtWZ2EKtIgmXaS+ZzphzTsikkGnoD4Jwr5g0TVdpDjgpw==",
+        "dependencies": {
+          "MonoMod.ILHelpers": "1.1.0"
+        }
+      },
+      "MonoMod.Core": {
+        "type": "Transitive",
+        "resolved": "1.1.2",
+        "contentHash": "6Yvjx2W0QFnPNyBjCKnrhYimskBE2MUKEMJz0t+2fJO67Jt4Lmams6BdZPTVudQykmEWTh5c2fwEfAMxKQtC4Q==",
+        "dependencies": {
+          "Mono.Cecil": "0.11.5",
+          "MonoMod.Backports": "1.1.2",
+          "MonoMod.ILHelpers": "1.1.0",
+          "MonoMod.Utils": "25.0.6"
+        }
+      },
+      "MonoMod.ILHelpers": {
+        "type": "Transitive",
+        "resolved": "1.1.0",
+        "contentHash": "L2FWjhTrv7tcIxshfZ+M3OcaNr4cNw0IwiVZEgwqRnZ5QAN3+RrNJ8ZwCzwXUWyPDqooJxMcjjg8PsSYUiNBjQ=="
+      },
+      "MonoMod.Utils": {
+        "type": "Transitive",
+        "resolved": "25.0.6",
+        "contentHash": "FAGqXHT4ENtg3UTA5PKBgLYcRP8w+u4zMUN2M73yfb0aYLIpCTVOcTfO1iTM2Jse0ukBxjd+ovO5KnCYt+Z0ag==",
+        "dependencies": {
+          "Mono.Cecil": "0.11.5",
+          "MonoMod.Backports": "1.1.2",
+          "MonoMod.ILHelpers": "1.1.0"
+        }
+      },
       "Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",