diff --git a/PlixP/App.xaml b/PlixP/App.xaml
index ae2ac54..f4b9df6 100644
--- a/PlixP/App.xaml
+++ b/PlixP/App.xaml
@@ -15,7 +15,9 @@
         <ResourceDictionary>
 
             <ResourceDictionary.MergedDictionaries>
-                <hc:Theme Name="HandyTheme" Skin="Dark" />
+
+                <hc:ThemeResources />
+                <hc:Theme />
             </ResourceDictionary.MergedDictionaries>
             <ResourceDictionary x:Key="DictionaryTest">
                 <system:String x:Key="str1a">String 1A</system:String>
diff --git a/PlixP/App.xaml.cs b/PlixP/App.xaml.cs
index d2e8394..ab704ec 100644
--- a/PlixP/App.xaml.cs
+++ b/PlixP/App.xaml.cs
@@ -6,6 +6,7 @@ using Prism.Ioc;
 using PlixP.Views;
 using System.Windows;
 using AutoMapper;
+using HandyControl.Themes;
 using Microsoft.EntityFrameworkCore;
 using PlixP.Extentions;
 using PlixP.Models;
@@ -38,6 +39,8 @@ namespace PlixP
                 }
             }
 
+            ThemeManager.Current.ApplicationTheme = ApplicationTheme.Dark;
+
             AutoMapperConfig.ConfigurationMapper();
             App.Current.ConfigureExceptionHandling(AppDomain.CurrentDomain);
             MovieServiceRealTime.Instance.StartReal();
diff --git a/PlixP/PlixP.csproj b/PlixP/PlixP.csproj
index 1a187a7..d8e52ee 100644
--- a/PlixP/PlixP.csproj
+++ b/PlixP/PlixP.csproj
@@ -16,16 +16,16 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="HandyControls" Version="3.0.0-rc.1" />
-    <PackageReference Include="MaterialDesignColors" Version="2.0.0-ci2312" />
+    <PackageReference Include="HandyControls" Version="3.2.0" />
+    <PackageReference Include="MaterialDesignColors" Version="2.0.0" />
     <PackageReference Include="MaterialDesignThemes" Version="4.0.0-ci2312" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.1">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.1">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/PlixP/Services/MovieServices.cs b/PlixP/Services/MovieServices.cs
index 68a268b..b9acb8d 100644
--- a/PlixP/Services/MovieServices.cs
+++ b/PlixP/Services/MovieServices.cs
@@ -354,7 +354,7 @@ namespace PlixP.Services
                             MovieCount = 1,
                             Name = trim
                         };
-                        foreach (var movie in Movies.Where(m=>m.Genre.Contains(trim)))
+                        foreach (var movie in Movies.Where(m=>m.Genre!=null && m.Genre.Contains(trim)))
                         {
                             var poster = movie.Poster;
                             if (!genres.Any(g => g.Image == poster))
diff --git a/PlixP/Views/Dialogs/GenresDialog.xaml b/PlixP/Views/Dialogs/GenresDialog.xaml
index 3d2ad28..3f51ff2 100644
--- a/PlixP/Views/Dialogs/GenresDialog.xaml
+++ b/PlixP/Views/Dialogs/GenresDialog.xaml
@@ -31,7 +31,7 @@
                 <Button
                     Grid.Column="1"
                     Margin="0,0,0,0"
-                    Padding="9,8,0,0"
+                    Padding="0,0,0,0"
                     VerticalAlignment="Center"
                     Background="#FF5252"
                     BorderThickness="0"
diff --git a/PlixP/Views/Dialogs/MovieDialog.xaml b/PlixP/Views/Dialogs/MovieDialog.xaml
index 4e5cbd7..bbeaf87 100644
--- a/PlixP/Views/Dialogs/MovieDialog.xaml
+++ b/PlixP/Views/Dialogs/MovieDialog.xaml
@@ -243,7 +243,7 @@
                                     Width="40"
                                     Height="40"
                                     Margin="0,0,10,0"
-                                    Padding="5,7,0,0"
+                                    Padding="0,0,0,0"
                                     VerticalAlignment="Bottom"
                                     Click="Edit_OnClick"
                                     Resources="{StaticResource Material}"
@@ -252,7 +252,7 @@
                                 </Button>
                                 <Button
                                     Margin="0,5,0,0"
-                                    Padding="9,8,0,0"
+                                    Padding="0,0,0,0"
                                     Background="#FF5252"
                                     BorderThickness="0"
                                     Command="hc:ControlCommands.Close"
@@ -271,7 +271,7 @@
                                 HorizontalAlignment="Right"
                                 VerticalAlignment="Center">
                                 <Button
-                                    Padding="12,5,0,0"
+                                    Padding="0,0,0,0"
                                     Command="{Binding OpenFolderCommand}"
                                     Resources="{StaticResource Material}"
                                     Style="{StaticResource MaterialDesignIconButton}">
@@ -280,7 +280,7 @@
                                 <Button
                                     Width="60"
                                     Height="60"
-                                    Padding="22,15,0,0"
+                                    Padding="0,0,0,0"
                                     Background="#40eeeeee"
                                     Command="{Binding PlayFileCommand}"
                                     Resources="{StaticResource Material}"
diff --git a/PlixP/Views/MainWindow.xaml b/PlixP/Views/MainWindow.xaml
index 1181af4..42183ca 100644
--- a/PlixP/Views/MainWindow.xaml
+++ b/PlixP/Views/MainWindow.xaml
@@ -23,7 +23,7 @@
                     Width="50"
                     Height="50"
                     Margin="50,22,15,0"
-                    Padding="8,15,0,0"
+                    Padding="0,0,0,0"
                     HorizontalAlignment="Left"
                     VerticalAlignment="Top"
                     Command="{x:Static materialDesign:DrawerHost.OpenDrawerCommand}"
diff --git a/PlixP/Views/MovieList.xaml b/PlixP/Views/MovieList.xaml
index 13f73a7..890a86a 100644
--- a/PlixP/Views/MovieList.xaml
+++ b/PlixP/Views/MovieList.xaml
@@ -128,7 +128,7 @@
                     Margin="10,0,30,4"
                     Orientation="Horizontal">
                     <Button
-                        Padding="6,7,0,0"
+                        Padding="0,0,0,0"
                         Command="{Binding RefreshCommand}"
                         Resources="{StaticResource Material}"
                         Style="{StaticResource MaterialDesignFloatingActionMiniButton}"
@@ -137,7 +137,7 @@
                     </Button>
                     <Button
                         Margin="10,0,0,0"
-                        Padding="8,3,0,0"
+                        Padding="0,0,0,0"
                         Command="{Binding RefreshFilesCommand}"
                         Resources="{StaticResource Material}"
                         Style="{StaticResource MaterialDesignFloatingActionMiniButton}"
@@ -165,7 +165,7 @@
                 <Button
                     Grid.Column="5"
                     Margin="15,0,50,0"
-                    Padding="5,3,0,0"
+                    Padding="0,0,0,0"
                     VerticalAlignment="Center"
                     Click="SearchButtonBase_OnClick"
                     Content="{materialDesign:PackIcon Search}"