From 5981a5bc33fd38010a78619998114f6bbd52d4e2 Mon Sep 17 00:00:00 2001
From: SuRGeoNix <surgeonix@gmail.com>
Date: Fri, 23 Jul 2021 19:41:36 +0300
Subject: [PATCH] - Converting solution/projects to .NET 5 - Fixes .NET 5
 hanging issues - FlyleafLib.Controls.WPF: Updating MaterialDesignThemes to
 4.2.0

---
 .editorconfig                                 |   7 +-
 FlyleafLib.Controls.WPF/AssemblyInfo.cs       |  10 +
 FlyleafLib.Controls.WPF/Flyleaf.xaml          |   8 +-
 FlyleafLib.Controls.WPF/Flyleaf.xaml.cs       |  14 +-
 .../FlyleafLib.Controls.WPF.csproj            | 160 ++----
 FlyleafLib.Controls.WPF/MainDictionary.xaml   |  23 +-
 .../Properties/AssemblyInfo.cs                |  55 --
 .../Properties/Resources.Designer.cs          |  63 ---
 .../Properties/Resources.resx                 | 117 ----
 .../Properties/Settings.Designer.cs           |  26 -
 .../Properties/Settings.settings              |   7 -
 .../Properties/launchSettings.json            |   8 +
 FlyleafLib.Controls.WPF/app.config            |   2 -
 FlyleafLib.Controls.WPF/packages.config       |   7 -
 .../FlyleafLib.Plugins.BitSwarm.csproj        | 100 +---
 .../Properties/AssemblyInfo.cs                |  36 --
 FlyleafLib.Plugins.BitSwarm/app.config        |  11 -
 FlyleafLib.Plugins.BitSwarm/packages.config   |  12 -
 .../FlyleafLib.Plugins.OpenSubtitles.csproj   |  77 +--
 .../Properties/AssemblyInfo.cs                |  36 --
 FlyleafLib.Plugins.OpenSubtitles/app.config   |   2 -
 .../packages.config                           |   4 -
 .../FlyleafLib.Plugins.YoutubeDL.csproj       |  79 +--
 .../Properties/AssemblyInfo.cs                |  36 --
 FlyleafLib.Plugins.YoutubeDL/app.config       |   2 -
 FlyleafLib.Plugins.YoutubeDL/packages.config  |   4 -
 FlyleafLib.sln                                | 119 +++--
 FlyleafLib/AssemblyInfo.cs                    |  10 +
 FlyleafLib/AudioMaster.cs                     |  18 +-
 FlyleafLib/Controls/WPF/FlyleafWindow.cs      |  18 +-
 FlyleafLib/Controls/WPF/VideoView.cs          |   2 +-
 FlyleafLib/FlyleafLib.csproj                  | 192 ++-----
 FlyleafLib/FlyleafLib.xml                     | 502 ++++++++++++++++++
 FlyleafLib/Master.cs                          |   4 +-
 .../MediaContext/DecoderContext.cs            |   2 +-
 .../MediaDecoder/AudioDecoder.cs              |   2 +-
 .../MediaDecoder/DecoderBase.cs               |   7 +-
 .../MediaDecoder/SubtitlesDecoder.cs          |   2 +-
 .../MediaDecoder/VideoAcceleration.cs         |   2 +-
 .../MediaDecoder/VideoDecoder.cs              |  85 ++-
 .../MediaDemuxer/CustomIOContext.cs           |   8 +-
 .../MediaDemuxer/DemuxerBase.cs               |  47 +-
 FlyleafLib/MediaPlayer/AudioPlayer.cs         |   4 +-
 FlyleafLib/MediaPlayer/Player.cs              |  23 +-
 FlyleafLib/MediaRenderer/Renderer.cs          |  12 +-
 FlyleafLib/Properties/AssemblyInfo.cs         |  46 --
 FlyleafLib/Properties/Resources.Designer.cs   |  63 ---
 FlyleafLib/Properties/Resources.resx          | 120 -----
 FlyleafLib/Utils.cs                           |   9 +-
 FlyleafLib/app.config                         |   2 -
 FlyleafLib/packages.config                    |  11 -
 README.md                                     |   2 +-
 WinForms Sample (Basic)/App.config            |   6 -
 WinForms Sample (Basic)/BasicNaked.cs         |   2 +-
 WinForms Sample (Basic)/Program.cs            |   6 +-
 .../Properties/AssemblyInfo.cs                |  36 --
 .../Properties/Resources.Designer.cs          |  70 ---
 .../Properties/Resources.resx                 | 117 ----
 .../Properties/Settings.Designer.cs           |  29 -
 .../Properties/Settings.settings              |   7 -
 .../WinForms Sample (Basic).csproj            | 150 +-----
 WinForms Sample (Basic)/packages.config       |   7 -
 Wpf Samples/App.config                        |  11 -
 Wpf Samples/AssemblyInfo.cs                   |  10 +
 Wpf Samples/Flyleaf.png                       | Bin 4427 -> 0 bytes
 Wpf Samples/Properties/AssemblyInfo.cs        |  55 --
 Wpf Samples/Properties/Resources.Designer.cs  |  70 ---
 Wpf Samples/Properties/Resources.resx         | 117 ----
 Wpf Samples/Properties/Settings.Designer.cs   |  29 -
 Wpf Samples/Properties/Settings.settings      |   7 -
 Wpf Samples/Sample1_Basic.xaml                |   2 +-
 Wpf Samples/Sample1_Basic.xaml.cs             |   1 -
 Wpf Samples/Sample3_MultiPlayer.xaml          |   4 +-
 Wpf Samples/Wpf Samples.csproj                | 207 +-------
 74 files changed, 896 insertions(+), 2265 deletions(-)
 create mode 100644 FlyleafLib.Controls.WPF/AssemblyInfo.cs
 delete mode 100644 FlyleafLib.Controls.WPF/Properties/AssemblyInfo.cs
 delete mode 100644 FlyleafLib.Controls.WPF/Properties/Resources.Designer.cs
 delete mode 100644 FlyleafLib.Controls.WPF/Properties/Resources.resx
 delete mode 100644 FlyleafLib.Controls.WPF/Properties/Settings.Designer.cs
 delete mode 100644 FlyleafLib.Controls.WPF/Properties/Settings.settings
 create mode 100644 FlyleafLib.Controls.WPF/Properties/launchSettings.json
 delete mode 100644 FlyleafLib.Controls.WPF/app.config
 delete mode 100644 FlyleafLib.Controls.WPF/packages.config
 delete mode 100644 FlyleafLib.Plugins.BitSwarm/Properties/AssemblyInfo.cs
 delete mode 100644 FlyleafLib.Plugins.BitSwarm/app.config
 delete mode 100644 FlyleafLib.Plugins.BitSwarm/packages.config
 delete mode 100644 FlyleafLib.Plugins.OpenSubtitles/Properties/AssemblyInfo.cs
 delete mode 100644 FlyleafLib.Plugins.OpenSubtitles/app.config
 delete mode 100644 FlyleafLib.Plugins.OpenSubtitles/packages.config
 delete mode 100644 FlyleafLib.Plugins.YoutubeDL/Properties/AssemblyInfo.cs
 delete mode 100644 FlyleafLib.Plugins.YoutubeDL/app.config
 delete mode 100644 FlyleafLib.Plugins.YoutubeDL/packages.config
 create mode 100644 FlyleafLib/AssemblyInfo.cs
 create mode 100644 FlyleafLib/FlyleafLib.xml
 delete mode 100644 FlyleafLib/Properties/AssemblyInfo.cs
 delete mode 100644 FlyleafLib/Properties/Resources.Designer.cs
 delete mode 100644 FlyleafLib/Properties/Resources.resx
 delete mode 100644 FlyleafLib/app.config
 delete mode 100644 FlyleafLib/packages.config
 delete mode 100644 WinForms Sample (Basic)/App.config
 delete mode 100644 WinForms Sample (Basic)/Properties/AssemblyInfo.cs
 delete mode 100644 WinForms Sample (Basic)/Properties/Resources.Designer.cs
 delete mode 100644 WinForms Sample (Basic)/Properties/Resources.resx
 delete mode 100644 WinForms Sample (Basic)/Properties/Settings.Designer.cs
 delete mode 100644 WinForms Sample (Basic)/Properties/Settings.settings
 delete mode 100644 WinForms Sample (Basic)/packages.config
 delete mode 100644 Wpf Samples/App.config
 create mode 100644 Wpf Samples/AssemblyInfo.cs
 delete mode 100644 Wpf Samples/Flyleaf.png
 delete mode 100644 Wpf Samples/Properties/AssemblyInfo.cs
 delete mode 100644 Wpf Samples/Properties/Resources.Designer.cs
 delete mode 100644 Wpf Samples/Properties/Resources.resx
 delete mode 100644 Wpf Samples/Properties/Settings.Designer.cs
 delete mode 100644 Wpf Samples/Properties/Settings.settings

diff --git a/.editorconfig b/.editorconfig
index dd2b5504..5cb05b9f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,4 +1,7 @@
 [*.cs]
 
-# Default severity for analyzer diagnostics with category 'Style'
-dotnet_analyzer_diagnostic.category-Style.severity = none
+# CS1591: Missing XML comment for publicly visible type or member
+dotnet_diagnostic.CS1591.severity = none
+
+# IDE0055: Fix formatting
+dotnet_diagnostic.IDE0055.severity = none
\ No newline at end of file
diff --git a/FlyleafLib.Controls.WPF/AssemblyInfo.cs b/FlyleafLib.Controls.WPF/AssemblyInfo.cs
new file mode 100644
index 00000000..8b5504ec
--- /dev/null
+++ b/FlyleafLib.Controls.WPF/AssemblyInfo.cs
@@ -0,0 +1,10 @@
+using System.Windows;
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+                                     //(used if a resource is not found in the page,
+                                     // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+                                              //(used if a resource is not found in the page,
+                                              // app, or any theme specific resource dictionaries)
+)]
diff --git a/FlyleafLib.Controls.WPF/Flyleaf.xaml b/FlyleafLib.Controls.WPF/Flyleaf.xaml
index 3ed65311..c3807e23 100644
--- a/FlyleafLib.Controls.WPF/Flyleaf.xaml
+++ b/FlyleafLib.Controls.WPF/Flyleaf.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="FlyleafLib.Controls.WPF.Flyleaf"
+<UserControl x:Class="FlyleafLib.Controls.WPF.Flyleaf"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -36,7 +36,7 @@
 
                                 <!--Pop Up Dialog (Settings/Set Values)-->
                                 <materialDesign:DialogHost x:Name="PART_DialogSettings"/>
-                                
+
                                 <!--Media Info-->
                                 <TextBlock Margin="0 20 20 0" VerticalAlignment="top" HorizontalAlignment="Right" TextAlignment="Right" TextWrapping="Wrap" FontSize="16" Background="Black" Foreground="DarkOrange" FontWeight="Bold">
                                     <TextBlock.Style>
@@ -69,7 +69,7 @@
 
                                 <!--Subtitles-->
                                 <TextBlock x:Name="PART_Subtitles" Margin="0 0 0 50" VerticalAlignment="Bottom" HorizontalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" FontSize="33" Foreground="White" FontWeight="Bold" Text="{Binding Session.SubsText}"/>
-                                
+
                                 <!--Flyleaf Bar-->
                                 <materialDesign:Card TextElement.FontSize="14" TextElement.FontWeight="Medium" TextElement.Foreground="{DynamicResource MaterialDesignBody}" FontFamily="{materialDesign:MaterialDesignFont}" VerticalAlignment="Bottom" Focusable="False" Background="{StaticResource RadialBrush}">
                                     <materialDesign:Card.Style>
@@ -387,7 +387,7 @@
                                             </Button>
 
                                             <!--Volume Slider (Decibel)-->
-                                            <Slider Grid.Column="4" Style="{StaticResource MaterialDesignDiscreteSlider}" Foreground="{DynamicResource MaterialDesignBody}" Focusable="False" Margin="0,-40,6,0" Width="100" VerticalAlignment="Center" IsMoveToPointEnabled="True" Maximum="150" Value="{Binding AudioPlayer.Volume}"/>
+                                            <Slider Grid.Column="4" Style="{StaticResource MaterialDesignDiscreteSlider}" Foreground="{DynamicResource MaterialDesignBody}" Focusable="False" Margin="0,0,6,6" Width="100" VerticalAlignment="Bottom" IsMoveToPointEnabled="True" Minimum="0" Maximum="150" Value="{Binding AudioPlayer.Volume}"/>
 
                                             <!--Open Settings Button-->
                                             <Button Grid.Column="5" Style="{StaticResource IconButton}" Content="{materialDesign:PackIcon Kind=SettingsOutline}" Command="{Binding OpenSettings}"/>
diff --git a/FlyleafLib.Controls.WPF/Flyleaf.xaml.cs b/FlyleafLib.Controls.WPF/Flyleaf.xaml.cs
index d06eaaff..0044911b 100644
--- a/FlyleafLib.Controls.WPF/Flyleaf.xaml.cs
+++ b/FlyleafLib.Controls.WPF/Flyleaf.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ComponentModel;
 using System.Linq;
 using System.Runtime.CompilerServices;
@@ -123,7 +123,7 @@ public void Dispose()
             {
                 if (disposed) return;
 
-                //Console.WriteLine("Flyleaf_WPF_Dispose");
+                //System.Diagnostics.Debug.WriteLine("Flyleaf_WPF_Dispose");
                 WindowFront?.Close();
                 Player?.Dispose();
 
@@ -134,7 +134,7 @@ public void Dispose()
                 Content = null;
                 DataContext = null;
                 disposed = true;
-                //Console.WriteLine("Flyleaf_WPF_Disposed");
+                //System.Diagnostics.Debug.WriteLine("Flyleaf_WPF_Disposed");
 
                 
             }
@@ -673,11 +673,15 @@ private void Flyleaf_KeyDown(object sender, KeyEventArgs e)
             switch (e.Key)
             {
                 case Key.Up:
-                    AudioPlayer.Volume += 5;
+                    if (AudioPlayer.Volume == 150) return;
+                    AudioPlayer.Volume += AudioPlayer.Volume + 5 > 150 ? 0 : 5;
+
                     break;
 
                 case Key.Down:
-                    AudioPlayer.Volume -= 5;
+                    if (AudioPlayer.Volume == 0) return;
+                    AudioPlayer.Volume -= AudioPlayer.Volume - 5 < 0 ? 0 : 5;
+                    
                     break;
 
                 case Key.Right:
diff --git a/FlyleafLib.Controls.WPF/FlyleafLib.Controls.WPF.csproj b/FlyleafLib.Controls.WPF/FlyleafLib.Controls.WPF.csproj
index cd594f56..1ed7bb5e 100644
--- a/FlyleafLib.Controls.WPF/FlyleafLib.Controls.WPF.csproj
+++ b/FlyleafLib.Controls.WPF/FlyleafLib.Controls.WPF.csproj
@@ -1,137 +1,39 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{6FD09EC0-AECE-4534-911B-8457633A9CEB}</ProjectGuid>
-    <OutputType>library</OutputType>
-    <RootNamespace>FlyleafLib.Controls.WPF</RootNamespace>
-    <AssemblyName>FlyleafLib.Controls.WPF</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-    <Deterministic>true</Deterministic>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
+    <TargetFrameworks>net5.0-windows;net472</TargetFrameworks>
+	<UseWindowsForms>true</UseWindowsForms>
+    <UseWPF>true</UseWPF>
+    <Version>1.1.3</Version>
+    <Authors>SuRGeoNix</Authors>
+    <Copyright>SuRGeoNix © 2021</Copyright>
+    <PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/SuRGeoNix/Flyleaf</PackageProjectUrl>
+    <PackageIcon>Flyleaf.png</PackageIcon>
+    <PackageIconUrl />
+    <PackageTags>flyleaf flyleaflib video media player element control</PackageTags>
+    <Description>WPF Video Player Control/Element (based on FlyleafLib)</Description>
+    <PackageReleaseNotes>Adding .NET 5 support
+Updating MaterialDesignThemes to 4.2.0
+</PackageReleaseNotes>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Dragablz, Version=0.0.3.223, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dragablz.0.0.3.223\lib\net45\Dragablz.dll</HintPath>
-    </Reference>
-    <Reference Include="MaterialDesignColors, Version=2.0.0.2422, Culture=neutral, PublicKeyToken=df2a72020bd7962a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MaterialDesignColors.2.0.0\lib\net452\MaterialDesignColors.dll</HintPath>
-    </Reference>
-    <Reference Include="MaterialDesignThemes.Wpf, Version=4.0.0.2422, Culture=neutral, PublicKeyToken=df2a72020bd7962a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MaterialDesignThemes.4.0.0\lib\net452\MaterialDesignThemes.Wpf.dll</HintPath>
-    </Reference>
-    <Reference Include="NAudio.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=e279aa5131008a41, processorArchitecture=MSIL">
-      <HintPath>..\packages\NAudio.Core.2.0.0\lib\netstandard2.0\NAudio.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="NAudio.Wasapi, Version=2.0.0.0, Culture=neutral, PublicKeyToken=e279aa5131008a41, processorArchitecture=MSIL">
-      <HintPath>..\packages\NAudio.Wasapi.2.0.0\lib\netstandard2.0\NAudio.Wasapi.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="WindowsFormsIntegration" />
-    <Reference Include="WpfColorFontDialog, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\WpfColorFontDialog.1.0.8\lib\net40\WpfColorFontDialog.dll</HintPath>
-    </Reference>
-  </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="Converters.cs" />
-    <Compile Include="Flyleaf.xaml.cs">
-      <DependentUpon>Flyleaf.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <Compile Include="RelayCommand.cs" />
-    <Compile Include="Settings.xaml.cs">
-      <DependentUpon>Settings.xaml</DependentUpon>
-    </Compile>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <None Include="app.config" />
-    <None Include="packages.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
+    <PackageReference Include="Dragablz" Version="0.0.3.223" />
+    <PackageReference Include="MaterialDesignColors" Version="2.0.2-ci2657" />
+    <PackageReference Include="MaterialDesignThemes" Version="4.2.0-ci2657" />
+    <PackageReference Include="WpfColorFontDialog" Version="1.0.8" />
   </ItemGroup>
+
   <ItemGroup>
-    <Page Include="Flyleaf.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="MainDictionary.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="PopUpMenu.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Settings.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
+    <ProjectReference Include="..\FlyleafLib\FlyleafLib.csproj" />
   </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\FlyleafLib\FlyleafLib.csproj">
-      <Project>{31c6cbf5-1e30-475d-bc57-028eff3f0c91}</Project>
-      <Name>FlyleafLib</Name>
-    </ProjectReference>
+    <None Include="..\Images\Flyleaf.png">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\MaterialDesignThemes.4.0.0\build\MaterialDesignThemes.targets" Condition="Exists('..\packages\MaterialDesignThemes.4.0.0\build\MaterialDesignThemes.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\MaterialDesignThemes.4.0.0\build\MaterialDesignThemes.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MaterialDesignThemes.4.0.0\build\MaterialDesignThemes.targets'))" />
-  </Target>
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/FlyleafLib.Controls.WPF/MainDictionary.xaml b/FlyleafLib.Controls.WPF/MainDictionary.xaml
index a731eff5..3bef95d4 100644
--- a/FlyleafLib.Controls.WPF/MainDictionary.xaml
+++ b/FlyleafLib.Controls.WPF/MainDictionary.xaml
@@ -1,9 +1,5 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    
-                    xmlns:local="clr-namespace:FlyleafLib.Controls.WPF"
-                    xmlns:flconv="clr-namespace:FlyleafLib.Controls.WPF;assembly=FlyleafLib"
-                    >
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:fl="clr-namespace:FlyleafLib.Controls.WPF;assembly=FlyleafLib" xmlns:flwpf="clr-namespace:FlyleafLib.Controls.WPF">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Dark.xaml" />
@@ -11,7 +7,7 @@
 
         <!-- primary color -->
         <ResourceDictionary>
-            
+
             <!-- include your primary palette -->
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/MaterialDesignColor.Orange.xaml" />
@@ -71,11 +67,12 @@
             <SolidColorBrush x:Key="SecondaryAccentForegroundBrush" Color="{StaticResource Accent200Foreground}"/>
         </ResourceDictionary>
     </ResourceDictionary.MergedDictionaries>
-
-    <flconv:StringToRationalConverter x:Key="StringToRational"/>
-    <flconv:TicksToTimeConverter x:Key="TicksToTime"/>
-    <flconv:TicksToSecondsConverter x:Key="TicksToSeconds" />
-    <flconv:TicksToMilliSecondsConverter x:Key="TicksToMilliSeconds"/>
-    <local:VolumeToLevelsConverter x:Key="VolumeToLevels"/>
-    <local:QualityToLevelsConverter x:Key="QualityToLevels"/>
+    
+    <fl:StringToRationalConverter x:Key="StringToRational"/>
+    <fl:TicksToTimeConverter x:Key="TicksToTime"/>
+    <fl:TicksToSecondsConverter x:Key="TicksToSeconds" />
+    <fl:TicksToMilliSecondsConverter x:Key="TicksToMilliSeconds"/>
+    <flwpf:VolumeToLevelsConverter x:Key="VolumeToLevels"/>
+    <flwpf:QualityToLevelsConverter x:Key="QualityToLevels"/>
+    
 </ResourceDictionary>
\ No newline at end of file
diff --git a/FlyleafLib.Controls.WPF/Properties/AssemblyInfo.cs b/FlyleafLib.Controls.WPF/Properties/AssemblyInfo.cs
deleted file mode 100644
index b44c1883..00000000
--- a/FlyleafLib.Controls.WPF/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("FlyleafLib.Controls.WPF")]
-[assembly: AssemblyDescription("WPF Video player control based on FlyleafLib")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("SuRGeoNix")]
-[assembly: AssemblyProduct("FlyleafLib.Controls.WPF")]
-[assembly: AssemblyCopyright("SuRGeoNix © 2021")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-//In order to begin building localizable applications, set
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[assembly:ThemeInfo(
-    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-                             //(used if a resource is not found in the page,
-                             // or application resource dictionaries)
-    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-                                      //(used if a resource is not found in the page,
-                                      // app, or any theme specific resource dictionaries)
-)]
-
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.1.0")]
-[assembly: AssemblyFileVersion("1.1.1.0")]
diff --git a/FlyleafLib.Controls.WPF/Properties/Resources.Designer.cs b/FlyleafLib.Controls.WPF/Properties/Resources.Designer.cs
deleted file mode 100644
index 134035c8..00000000
--- a/FlyleafLib.Controls.WPF/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace FlyleafLib.Controls.WPF.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("FlyleafLib.Controls.WPF.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-    }
-}
diff --git a/FlyleafLib.Controls.WPF/Properties/Resources.resx b/FlyleafLib.Controls.WPF/Properties/Resources.resx
deleted file mode 100644
index af7dbebb..00000000
--- a/FlyleafLib.Controls.WPF/Properties/Resources.resx
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/FlyleafLib.Controls.WPF/Properties/Settings.Designer.cs b/FlyleafLib.Controls.WPF/Properties/Settings.Designer.cs
deleted file mode 100644
index 1fcc3c3c..00000000
--- a/FlyleafLib.Controls.WPF/Properties/Settings.Designer.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace FlyleafLib.Controls.WPF.Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
-        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
-        public static Settings Default {
-            get {
-                return defaultInstance;
-            }
-        }
-    }
-}
diff --git a/FlyleafLib.Controls.WPF/Properties/Settings.settings b/FlyleafLib.Controls.WPF/Properties/Settings.settings
deleted file mode 100644
index 033d7a5e..00000000
--- a/FlyleafLib.Controls.WPF/Properties/Settings.settings
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>
\ No newline at end of file
diff --git a/FlyleafLib.Controls.WPF/Properties/launchSettings.json b/FlyleafLib.Controls.WPF/Properties/launchSettings.json
new file mode 100644
index 00000000..00f78abb
--- /dev/null
+++ b/FlyleafLib.Controls.WPF/Properties/launchSettings.json
@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "FlyleafLib.Controls.WPF": {
+      "commandName": "Project",
+      "nativeDebugging": true
+    }
+  }
+}
\ No newline at end of file
diff --git a/FlyleafLib.Controls.WPF/app.config b/FlyleafLib.Controls.WPF/app.config
deleted file mode 100644
index edf4545b..00000000
--- a/FlyleafLib.Controls.WPF/app.config
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration/>
\ No newline at end of file
diff --git a/FlyleafLib.Controls.WPF/packages.config b/FlyleafLib.Controls.WPF/packages.config
deleted file mode 100644
index e181a236..00000000
--- a/FlyleafLib.Controls.WPF/packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Dragablz" version="0.0.3.223" targetFramework="net472" />
-  <package id="MaterialDesignColors" version="2.0.0" targetFramework="net472" />
-  <package id="MaterialDesignThemes" version="4.0.0" targetFramework="net472" />
-  <package id="WpfColorFontDialog" version="1.0.8" targetFramework="net472" />
-</packages>
\ No newline at end of file
diff --git a/FlyleafLib.Plugins.BitSwarm/FlyleafLib.Plugins.BitSwarm.csproj b/FlyleafLib.Plugins.BitSwarm/FlyleafLib.Plugins.BitSwarm.csproj
index f2e61a80..8332df80 100644
--- a/FlyleafLib.Plugins.BitSwarm/FlyleafLib.Plugins.BitSwarm.csproj
+++ b/FlyleafLib.Plugins.BitSwarm/FlyleafLib.Plugins.BitSwarm.csproj
@@ -1,95 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{1D602B59-8841-424A-96CA-84AF0F87A6B9}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>FlyleafLib.Plugins.BitSwarm</RootNamespace>
-    <AssemblyName>FlyleafLib.Plugins.BitSwarm</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <Deterministic>true</Deterministic>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <TargetFramework>net5.0-windows</TargetFramework>
+	<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="BencodeNET, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\BencodeNET.4.0.0\lib\netstandard2.0\BencodeNET.dll</HintPath>
-    </Reference>
-    <Reference Include="BitSwarmLib, Version=2.3.7.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\BitSwarm.2.3.7\lib\netstandard2.0\BitSwarmLib.dll</HintPath>
-    </Reference>
-    <Reference Include="Partfiles, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\APF.1.3.0\lib\netstandard2.0\Partfiles.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Core" />
-    <Reference Include="System.IO.Pipelines, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Pipelines.4.6.0\lib\netstandard2.0\System.IO.Pipelines.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="BitSwarm.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="packages.config" />
+    <PackageReference Include="BitSwarm" Version="2.3.7" />
   </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\FlyleafLib\FlyleafLib.csproj">
-      <Project>{31c6cbf5-1e30-475d-bc57-028eff3f0c91}</Project>
-      <Name>FlyleafLib</Name>
-      <Private>False</Private>
+      <Private>false</Private>
+      <ExcludeAssets>All</ExcludeAssets>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>mkdir "$(SolutionDir)"Plugins\BitSwarm
-mkdir "$(SolutionDir)"Plugins\SharedLibs
 
-move System*.dll "$(SolutionDir)"Plugins\SharedLibs
-move *.dll "$(SolutionDir)"Plugins\BitSwarm</PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="if not exist &quot;$(SolutionDir)Plugins\BitSwarm&quot; mkdir &quot;$(SolutionDir)Plugins\BitSwarm&quot;&#xD;&#xA;if not exist &quot;$(SolutionDir)Plugins\SharedLibs&quot; mkdir &quot;$(SolutionDir)Plugins\SharedLibs&quot;&#xD;&#xA;move &quot;$(TargetDir)System*.dll&quot; &quot;$(SolutionDir)&quot;Plugins\SharedLibs&quot;&#xD;&#xA;move &quot;$(TargetDir)*.dll&quot; &quot;$(SolutionDir)Plugins\BitSwarm&quot;" />
+  </Target>
+
+</Project>
diff --git a/FlyleafLib.Plugins.BitSwarm/Properties/AssemblyInfo.cs b/FlyleafLib.Plugins.BitSwarm/Properties/AssemblyInfo.cs
deleted file mode 100644
index 7ca3051e..00000000
--- a/FlyleafLib.Plugins.BitSwarm/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("FlyleafLib.Plugins.BitSwarm")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("FlyleafLib.Plugins.BitSwarm")]
-[assembly: AssemblyCopyright("Copyright ©  2021")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("1d602b59-8841-424a-96ca-84af0f87a6b9")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/FlyleafLib.Plugins.BitSwarm/app.config b/FlyleafLib.Plugins.BitSwarm/app.config
deleted file mode 100644
index f6e7dca8..00000000
--- a/FlyleafLib.Plugins.BitSwarm/app.config
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
\ No newline at end of file
diff --git a/FlyleafLib.Plugins.BitSwarm/packages.config b/FlyleafLib.Plugins.BitSwarm/packages.config
deleted file mode 100644
index d5607ecc..00000000
--- a/FlyleafLib.Plugins.BitSwarm/packages.config
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="APF" version="1.3.0" targetFramework="net472" />
-  <package id="BencodeNET" version="4.0.0" targetFramework="net472" />
-  <package id="BitSwarm" version="2.3.7" targetFramework="net472" />
-  <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
-  <package id="System.IO.Pipelines" version="4.6.0" targetFramework="net472" />
-  <package id="System.Memory" version="4.5.3" targetFramework="net472" />
-  <package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net472" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net472" />
-  <package id="System.Threading.Tasks.Extensions" version="4.5.2" targetFramework="net472" />
-</packages>
\ No newline at end of file
diff --git a/FlyleafLib.Plugins.OpenSubtitles/FlyleafLib.Plugins.OpenSubtitles.csproj b/FlyleafLib.Plugins.OpenSubtitles/FlyleafLib.Plugins.OpenSubtitles.csproj
index 40d3a2a3..7cbc2d4a 100644
--- a/FlyleafLib.Plugins.OpenSubtitles/FlyleafLib.Plugins.OpenSubtitles.csproj
+++ b/FlyleafLib.Plugins.OpenSubtitles/FlyleafLib.Plugins.OpenSubtitles.csproj
@@ -1,72 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{7DD60E1F-6544-45C2-8094-5C255B3DA293}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>FlyleafLib.Plugins.OpenSubtitles</RootNamespace>
-    <AssemblyName>FlyleafLib.Plugins.OpenSubtitles</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <Deterministic>true</Deterministic>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <TargetFramework>net5.0-windows</TargetFramework>
+	<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="OpenSubtitles.cs" />
-    <Compile Include="OpenSubtitlesJson.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="packages.config" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\FlyleafLib\FlyleafLib.csproj">
-      <Project>{31c6cbf5-1e30-475d-bc57-028eff3f0c91}</Project>
-      <Name>FlyleafLib</Name>
-      <Private>False</Private>
+      <Private>false</Private>
+      <ExcludeAssets>All</ExcludeAssets>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>mkdir "$(SolutionDir)"Plugins\OpenSubtitles
-mkdir "$(SolutionDir)"Plugins\SharedLibs
 
-move Newtonsoft.Json.dll "$(SolutionDir)"Plugins\SharedLibs
-move *.dll "$(SolutionDir)"Plugins\OpenSubtitles</PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="if not exist &quot;$(SolutionDir)Plugins\OpenSubtitles&quot; mkdir &quot;$(SolutionDir)Plugins\OpenSubtitles&quot;&#xD;&#xA;if not exist &quot;$(SolutionDir)Plugins\SharedLibs&quot; mkdir &quot;$(SolutionDir)Plugins\SharedLibs&quot;&#xD;&#xA;move &quot;$(TargetDir)Newtonsoft.Json.dll&quot; &quot;$(SolutionDir)Plugins\SharedLibs&quot;&#xD;&#xA;move &quot;$(TargetDir)*.dll&quot; &quot;$(SolutionDir)Plugins\OpenSubtitles&quot;" />
+  </Target>
+
+</Project>
diff --git a/FlyleafLib.Plugins.OpenSubtitles/Properties/AssemblyInfo.cs b/FlyleafLib.Plugins.OpenSubtitles/Properties/AssemblyInfo.cs
deleted file mode 100644
index b0d47348..00000000
--- a/FlyleafLib.Plugins.OpenSubtitles/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("FlyleafLib.Plugins.OpenSubtitles")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("FlyleafLib.Plugins.OpenSubtitles")]
-[assembly: AssemblyCopyright("Copyright ©  2021")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("7dd60e1f-6544-45c2-8094-5c255b3da293")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/FlyleafLib.Plugins.OpenSubtitles/app.config b/FlyleafLib.Plugins.OpenSubtitles/app.config
deleted file mode 100644
index edf4545b..00000000
--- a/FlyleafLib.Plugins.OpenSubtitles/app.config
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration/>
\ No newline at end of file
diff --git a/FlyleafLib.Plugins.OpenSubtitles/packages.config b/FlyleafLib.Plugins.OpenSubtitles/packages.config
deleted file mode 100644
index 5eaa239b..00000000
--- a/FlyleafLib.Plugins.OpenSubtitles/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
-</packages>
\ No newline at end of file
diff --git a/FlyleafLib.Plugins.YoutubeDL/FlyleafLib.Plugins.YoutubeDL.csproj b/FlyleafLib.Plugins.YoutubeDL/FlyleafLib.Plugins.YoutubeDL.csproj
index 987ebba9..68e8e2dd 100644
--- a/FlyleafLib.Plugins.YoutubeDL/FlyleafLib.Plugins.YoutubeDL.csproj
+++ b/FlyleafLib.Plugins.YoutubeDL/FlyleafLib.Plugins.YoutubeDL.csproj
@@ -1,74 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{99DEFD52-9267-4B76-8184-FDBF62E5060C}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>FlyleafLib.Plugins.YoutubeDL</RootNamespace>
-    <AssemblyName>FlyleafLib.Plugins.YoutubeDL</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <Deterministic>true</Deterministic>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <TargetFramework>net5.0-windows</TargetFramework>
+	<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="YoutubeDL.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="YoutubeDLJson.cs" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\FlyleafLib\FlyleafLib.csproj">
-      <Project>{31c6cbf5-1e30-475d-bc57-028eff3f0c91}</Project>
-      <Name>FlyleafLib</Name>
-      <Private>False</Private>
+      <Private>false</Private>
+      <ExcludeAssets>All</ExcludeAssets>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>mkdir "$(SolutionDir)"Plugins\YoutubeDL
-mkdir "$(SolutionDir)"Plugins\SharedLibs
 
-move Newtonsoft.Json.dll "$(SolutionDir)"Plugins\SharedLibs
-move *.dll "$(SolutionDir)"Plugins\YoutubeDL
-copy /Y "$(ProjectDir)"Libs\* "$(SolutionDir)"Plugins\YoutubeDL</PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="if not exist &quot;$(SolutionDir)Plugins\YoutubeDL&quot; mkdir &quot;$(SolutionDir)Plugins\YoutubeDL&quot;&#xD;&#xA;if not exist &quot;$(SolutionDir)Plugins\SharedLibs&quot; mkdir &quot;$(SolutionDir)Plugins\SharedLibs&quot;&#xD;&#xA;move &quot;$(TargetDir)Newtonsoft.Json.dll&quot; &quot;$(SolutionDir)Plugins\SharedLibs&quot;&#xD;&#xA;move &quot;$(TargetDir)*.dll&quot; &quot;$(SolutionDir)Plugins\YoutubeDL&quot;&#xD;&#xA;copy /Y &quot;$(ProjectDir)Libs\*&quot; &quot;$(SolutionDir)Plugins\YoutubeDL&quot;" />
+  </Target>
+
+</Project>
diff --git a/FlyleafLib.Plugins.YoutubeDL/Properties/AssemblyInfo.cs b/FlyleafLib.Plugins.YoutubeDL/Properties/AssemblyInfo.cs
deleted file mode 100644
index 81544484..00000000
--- a/FlyleafLib.Plugins.YoutubeDL/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("FlyleafLib.Plugins.YoutubeDL")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("FlyleafLib.Plugins.YoutubeDL")]
-[assembly: AssemblyCopyright("Copyright ©  2021")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("99defd52-9267-4b76-8184-fdbf62e5060c")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/FlyleafLib.Plugins.YoutubeDL/app.config b/FlyleafLib.Plugins.YoutubeDL/app.config
deleted file mode 100644
index edf4545b..00000000
--- a/FlyleafLib.Plugins.YoutubeDL/app.config
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration/>
\ No newline at end of file
diff --git a/FlyleafLib.Plugins.YoutubeDL/packages.config b/FlyleafLib.Plugins.YoutubeDL/packages.config
deleted file mode 100644
index 5eaa239b..00000000
--- a/FlyleafLib.Plugins.YoutubeDL/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
-</packages>
\ No newline at end of file
diff --git a/FlyleafLib.sln b/FlyleafLib.sln
index a716695c..b4ecdd90 100644
--- a/FlyleafLib.sln
+++ b/FlyleafLib.sln
@@ -1,23 +1,23 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
-VisualStudioVersion = 16.0.31112.23
+VisualStudioVersion = 16.0.31515.178
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FlyleafLib", "FlyleafLib\FlyleafLib.csproj", "{31C6CBF5-1E30-475D-BC57-028EFF3F0C91}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FlyleafLib", "FlyleafLib\FlyleafLib.csproj", "{D262BA82-2306-4AB9-93E2-84D99869093A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FlyleafLib.Controls.WPF", "FlyleafLib.Controls.WPF\FlyleafLib.Controls.WPF.csproj", "{6FD09EC0-AECE-4534-911B-8457633A9CEB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FlyleafLib.Controls.WPF", "FlyleafLib.Controls.WPF\FlyleafLib.Controls.WPF.csproj", "{17D6A6E9-7B7A-45EA-98CF-4E381383617F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FlyleafLib.Plugins.YoutubeDL", "FlyleafLib.Plugins.YoutubeDL\FlyleafLib.Plugins.YoutubeDL.csproj", "{99DEFD52-9267-4B76-8184-FDBF62E5060C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wpf Samples", "Wpf Samples\Wpf Samples.csproj", "{077262AB-BBF7-4914-B464-0E2D3BA1C921}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FlyleafLib.Plugins.OpenSubtitles", "FlyleafLib.Plugins.OpenSubtitles\FlyleafLib.Plugins.OpenSubtitles.csproj", "{7DD60E1F-6544-45C2-8094-5C255B3DA293}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FlyleafLib.Plugins.BitSwarm", "FlyleafLib.Plugins.BitSwarm\FlyleafLib.Plugins.BitSwarm.csproj", "{DCD91C61-1243-4A9D-8567-DDDEFDD4CEF1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FlyleafLib.Plugins.BitSwarm", "FlyleafLib.Plugins.BitSwarm\FlyleafLib.Plugins.BitSwarm.csproj", "{1D602B59-8841-424A-96CA-84AF0F87A6B9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FlyleafLib.Plugins.OpenSubtitles", "FlyleafLib.Plugins.OpenSubtitles\FlyleafLib.Plugins.OpenSubtitles.csproj", "{02230750-8033-4A82-AD07-2588264F5A52}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wpf Samples", "Wpf Samples\Wpf Samples.csproj", "{DC0B8BD8-BC22-4B04-B0C6-0FEB83D8345F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FlyleafLib.Plugins.YoutubeDL", "FlyleafLib.Plugins.YoutubeDL\FlyleafLib.Plugins.YoutubeDL.csproj", "{BCE7C6B3-8EC7-44A1-84BA-89FE95A2B005}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinForms Sample (Basic)", "WinForms Sample (Basic)\WinForms Sample (Basic).csproj", "{03425BFB-EFCD-4F90-93B7-8A395ADADFF3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinForms Sample (Basic)", "WinForms Sample (Basic)\WinForms Sample (Basic).csproj", "{66BD691C-5084-4B8A-B28B-06ADC198F63B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F3659D14-F601-4A1E-BD76-96308D50BBF8}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F23B0564-E14C-412B-9536-8C886B9219C4}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 		README.md = README.md
@@ -31,60 +31,61 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{31C6CBF5-1E30-475D-BC57-028EFF3F0C91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{31C6CBF5-1E30-475D-BC57-028EFF3F0C91}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{31C6CBF5-1E30-475D-BC57-028EFF3F0C91}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{31C6CBF5-1E30-475D-BC57-028EFF3F0C91}.Debug|x64.Build.0 = Debug|Any CPU
-		{31C6CBF5-1E30-475D-BC57-028EFF3F0C91}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{31C6CBF5-1E30-475D-BC57-028EFF3F0C91}.Release|Any CPU.Build.0 = Release|Any CPU
-		{31C6CBF5-1E30-475D-BC57-028EFF3F0C91}.Release|x64.ActiveCfg = Release|Any CPU
-		{31C6CBF5-1E30-475D-BC57-028EFF3F0C91}.Release|x64.Build.0 = Release|Any CPU
-		{6FD09EC0-AECE-4534-911B-8457633A9CEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6FD09EC0-AECE-4534-911B-8457633A9CEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6FD09EC0-AECE-4534-911B-8457633A9CEB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6FD09EC0-AECE-4534-911B-8457633A9CEB}.Debug|x64.Build.0 = Debug|Any CPU
-		{6FD09EC0-AECE-4534-911B-8457633A9CEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6FD09EC0-AECE-4534-911B-8457633A9CEB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6FD09EC0-AECE-4534-911B-8457633A9CEB}.Release|x64.ActiveCfg = Release|Any CPU
-		{6FD09EC0-AECE-4534-911B-8457633A9CEB}.Release|x64.Build.0 = Release|Any CPU
-		{99DEFD52-9267-4B76-8184-FDBF62E5060C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{99DEFD52-9267-4B76-8184-FDBF62E5060C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{99DEFD52-9267-4B76-8184-FDBF62E5060C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{99DEFD52-9267-4B76-8184-FDBF62E5060C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{99DEFD52-9267-4B76-8184-FDBF62E5060C}.Release|x64.ActiveCfg = Release|Any CPU
-		{99DEFD52-9267-4B76-8184-FDBF62E5060C}.Release|x64.Build.0 = Release|Any CPU
-		{7DD60E1F-6544-45C2-8094-5C255B3DA293}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7DD60E1F-6544-45C2-8094-5C255B3DA293}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7DD60E1F-6544-45C2-8094-5C255B3DA293}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7DD60E1F-6544-45C2-8094-5C255B3DA293}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7DD60E1F-6544-45C2-8094-5C255B3DA293}.Release|x64.ActiveCfg = Release|Any CPU
-		{7DD60E1F-6544-45C2-8094-5C255B3DA293}.Release|x64.Build.0 = Release|Any CPU
-		{1D602B59-8841-424A-96CA-84AF0F87A6B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1D602B59-8841-424A-96CA-84AF0F87A6B9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1D602B59-8841-424A-96CA-84AF0F87A6B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1D602B59-8841-424A-96CA-84AF0F87A6B9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1D602B59-8841-424A-96CA-84AF0F87A6B9}.Release|x64.ActiveCfg = Release|Any CPU
-		{1D602B59-8841-424A-96CA-84AF0F87A6B9}.Release|x64.Build.0 = Release|Any CPU
-		{DC0B8BD8-BC22-4B04-B0C6-0FEB83D8345F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DC0B8BD8-BC22-4B04-B0C6-0FEB83D8345F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DC0B8BD8-BC22-4B04-B0C6-0FEB83D8345F}.Debug|x64.ActiveCfg = Debug|x64
-		{DC0B8BD8-BC22-4B04-B0C6-0FEB83D8345F}.Debug|x64.Build.0 = Debug|x64
-		{DC0B8BD8-BC22-4B04-B0C6-0FEB83D8345F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DC0B8BD8-BC22-4B04-B0C6-0FEB83D8345F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DC0B8BD8-BC22-4B04-B0C6-0FEB83D8345F}.Release|x64.ActiveCfg = Release|x64
-		{DC0B8BD8-BC22-4B04-B0C6-0FEB83D8345F}.Release|x64.Build.0 = Release|x64
-		{03425BFB-EFCD-4F90-93B7-8A395ADADFF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{03425BFB-EFCD-4F90-93B7-8A395ADADFF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{03425BFB-EFCD-4F90-93B7-8A395ADADFF3}.Debug|x64.ActiveCfg = Debug|x64
-		{03425BFB-EFCD-4F90-93B7-8A395ADADFF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{03425BFB-EFCD-4F90-93B7-8A395ADADFF3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{03425BFB-EFCD-4F90-93B7-8A395ADADFF3}.Release|x64.ActiveCfg = Release|x64
-		{03425BFB-EFCD-4F90-93B7-8A395ADADFF3}.Release|x64.Build.0 = Release|x64
+		{D262BA82-2306-4AB9-93E2-84D99869093A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D262BA82-2306-4AB9-93E2-84D99869093A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D262BA82-2306-4AB9-93E2-84D99869093A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D262BA82-2306-4AB9-93E2-84D99869093A}.Debug|x64.Build.0 = Debug|Any CPU
+		{D262BA82-2306-4AB9-93E2-84D99869093A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D262BA82-2306-4AB9-93E2-84D99869093A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D262BA82-2306-4AB9-93E2-84D99869093A}.Release|x64.ActiveCfg = Release|Any CPU
+		{D262BA82-2306-4AB9-93E2-84D99869093A}.Release|x64.Build.0 = Release|Any CPU
+		{17D6A6E9-7B7A-45EA-98CF-4E381383617F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{17D6A6E9-7B7A-45EA-98CF-4E381383617F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{17D6A6E9-7B7A-45EA-98CF-4E381383617F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{17D6A6E9-7B7A-45EA-98CF-4E381383617F}.Debug|x64.Build.0 = Debug|Any CPU
+		{17D6A6E9-7B7A-45EA-98CF-4E381383617F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{17D6A6E9-7B7A-45EA-98CF-4E381383617F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{17D6A6E9-7B7A-45EA-98CF-4E381383617F}.Release|x64.ActiveCfg = Release|Any CPU
+		{17D6A6E9-7B7A-45EA-98CF-4E381383617F}.Release|x64.Build.0 = Release|Any CPU
+		{077262AB-BBF7-4914-B464-0E2D3BA1C921}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{077262AB-BBF7-4914-B464-0E2D3BA1C921}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{077262AB-BBF7-4914-B464-0E2D3BA1C921}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{077262AB-BBF7-4914-B464-0E2D3BA1C921}.Debug|x64.Build.0 = Debug|Any CPU
+		{077262AB-BBF7-4914-B464-0E2D3BA1C921}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{077262AB-BBF7-4914-B464-0E2D3BA1C921}.Release|Any CPU.Build.0 = Release|Any CPU
+		{077262AB-BBF7-4914-B464-0E2D3BA1C921}.Release|x64.ActiveCfg = Release|x64
+		{077262AB-BBF7-4914-B464-0E2D3BA1C921}.Release|x64.Build.0 = Release|x64
+		{DCD91C61-1243-4A9D-8567-DDDEFDD4CEF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DCD91C61-1243-4A9D-8567-DDDEFDD4CEF1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DCD91C61-1243-4A9D-8567-DDDEFDD4CEF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DCD91C61-1243-4A9D-8567-DDDEFDD4CEF1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DCD91C61-1243-4A9D-8567-DDDEFDD4CEF1}.Release|x64.ActiveCfg = Release|Any CPU
+		{DCD91C61-1243-4A9D-8567-DDDEFDD4CEF1}.Release|x64.Build.0 = Release|Any CPU
+		{02230750-8033-4A82-AD07-2588264F5A52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{02230750-8033-4A82-AD07-2588264F5A52}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{02230750-8033-4A82-AD07-2588264F5A52}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{02230750-8033-4A82-AD07-2588264F5A52}.Release|Any CPU.Build.0 = Release|Any CPU
+		{02230750-8033-4A82-AD07-2588264F5A52}.Release|x64.ActiveCfg = Release|Any CPU
+		{02230750-8033-4A82-AD07-2588264F5A52}.Release|x64.Build.0 = Release|Any CPU
+		{BCE7C6B3-8EC7-44A1-84BA-89FE95A2B005}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BCE7C6B3-8EC7-44A1-84BA-89FE95A2B005}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BCE7C6B3-8EC7-44A1-84BA-89FE95A2B005}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BCE7C6B3-8EC7-44A1-84BA-89FE95A2B005}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BCE7C6B3-8EC7-44A1-84BA-89FE95A2B005}.Release|x64.ActiveCfg = Release|Any CPU
+		{BCE7C6B3-8EC7-44A1-84BA-89FE95A2B005}.Release|x64.Build.0 = Release|Any CPU
+		{66BD691C-5084-4B8A-B28B-06ADC198F63B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{66BD691C-5084-4B8A-B28B-06ADC198F63B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{66BD691C-5084-4B8A-B28B-06ADC198F63B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{66BD691C-5084-4B8A-B28B-06ADC198F63B}.Debug|x64.Build.0 = Debug|Any CPU
+		{66BD691C-5084-4B8A-B28B-06ADC198F63B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{66BD691C-5084-4B8A-B28B-06ADC198F63B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{66BD691C-5084-4B8A-B28B-06ADC198F63B}.Release|x64.ActiveCfg = Release|Any CPU
+		{66BD691C-5084-4B8A-B28B-06ADC198F63B}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {654C7868-500A-4873-B462-FC12DC3DF7E6}
+		SolutionGuid = {EA552D17-7796-4337-8E9D-A206F3AAE077}
 	EndGlobalSection
 EndGlobal
diff --git a/FlyleafLib/AssemblyInfo.cs b/FlyleafLib/AssemblyInfo.cs
new file mode 100644
index 00000000..8b5504ec
--- /dev/null
+++ b/FlyleafLib/AssemblyInfo.cs
@@ -0,0 +1,10 @@
+using System.Windows;
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+                                     //(used if a resource is not found in the page,
+                                     // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+                                              //(used if a resource is not found in the page,
+                                              // app, or any theme specific resource dictionaries)
+)]
diff --git a/FlyleafLib/AudioMaster.cs b/FlyleafLib/AudioMaster.cs
index 6fa49912..66a1c053 100644
--- a/FlyleafLib/AudioMaster.cs
+++ b/FlyleafLib/AudioMaster.cs
@@ -8,7 +8,7 @@
 
 namespace FlyleafLib
 {
-    public class AudioMaster : NotifyPropertyChanged, IMMNotificationClient, IAudioSessionEventsHandler, IDisposable
+    public class AudioMaster : NotifyPropertyChanged, IMMNotificationClient, IAudioSessionEventsHandler
     {
         #region Properties (Public)
         /// <summary>
@@ -101,6 +101,8 @@ public void Initialize()
         {
             lock (locker)
             {
+                if (device != null) device.AudioEndpointVolume.OnVolumeNotification -= OnMasterVolumeChanged;
+
                 foreach(var player in Master.Players.Values)
                     player.audioPlayer.Initialize();
 
@@ -112,7 +114,7 @@ public void Initialize()
                 device.AudioEndpointVolume.OnVolumeNotification += OnMasterVolumeChanged;
                 device.AudioSessionManager.OnSessionCreated += (o, newSession) =>
                 {
-                    if (session != null) { session.UnRegisterEventClient(this); }
+                    if (session != null) { session.UnRegisterEventClient(this); session.Dispose(); }
                     session = new AudioSessionControl(newSession);
                     session.RegisterEventClient(this);
                     session.SimpleAudioVolume.Volume = 1;
@@ -124,16 +126,6 @@ public void Initialize()
                 Raise(nameof(MuteMaster));
             }
         }
-        public void Dispose()
-        {
-            lock (locker)
-            {
-                if (device  != null) device.AudioEndpointVolume.OnVolumeNotification -= OnMasterVolumeChanged;
-                if (session != null) session.UnRegisterEventClient(this);
-                device = null;
-                session = null;
-            } 
-        }
         #endregion
 
         #region Volume / Mute
@@ -234,6 +226,6 @@ public void OnVolumeChanged(float volume2, bool isMuted2)
         public void OnSessionDisconnected(AudioSessionDisconnectReason disconnectReason) { /*Log("OnSessionDisconnected");*/ }
         #endregion
 
-        private void Log(string msg) { Console.WriteLine($"[{DateTime.Now.ToString("hh.mm.ss.fff")}] [Master] [AudioMaster] {msg}"); }
+        private void Log(string msg) { System.Diagnostics.Debug.WriteLine($"[{DateTime.Now.ToString("hh.mm.ss.fff")}] [Master] [AudioMaster] {msg}"); }
     }
 }
\ No newline at end of file
diff --git a/FlyleafLib/Controls/WPF/FlyleafWindow.cs b/FlyleafLib/Controls/WPF/FlyleafWindow.cs
index cfbb92aa..e844a729 100644
--- a/FlyleafLib/Controls/WPF/FlyleafWindow.cs
+++ b/FlyleafLib/Controls/WPF/FlyleafWindow.cs
@@ -27,7 +27,7 @@ internal void SetContent(UIElement newContent)
 
         public FlyleafWindow(WindowsFormsHost windowsFormsHost)
         {
-            //Console.WriteLine("FlyleafWindow");
+            //System.Diagnostics.Debug.WriteLine("FlyleafWindow");
 
             Title               = "FlyleafWindow";
             Height              = 300;
@@ -49,14 +49,14 @@ public FlyleafWindow(WindowsFormsHost windowsFormsHost)
 
         void WFH_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
         {
-            //Console.WriteLine("WFH_DataContextChanged"); 
+            //System.Diagnostics.Debug.WriteLine("WFH_DataContextChanged"); 
             if (e.NewValue == null) return;
             DataContext = e.NewValue;
         }
 
         void WFH_Unloaded(object sender, RoutedEventArgs e)
         {
-            //Console.WriteLine("WFH_Unloaded");
+            //System.Diagnostics.Debug.WriteLine("WFH_Unloaded");
             
             windowsFormsHost.SizeChanged    -= Wndhost_SizeChanged;
 
@@ -71,7 +71,7 @@ void WFH_Unloaded(object sender, RoutedEventArgs e)
 
         void WFH_Loaded(object sender, RoutedEventArgs e)
         {
-            //Console.WriteLine("WFH_Loaded");
+            //System.Diagnostics.Debug.WriteLine("WFH_Loaded");
 
             if (WindowBack != null)
             {
@@ -105,7 +105,7 @@ void WFH_Loaded(object sender, RoutedEventArgs e)
 
         public void Wndhost_LocationChanged(object sender, EventArgs e)
         {
-            //Console.WriteLine("Wndhost_LocationChanged");
+            //System.Diagnostics.Debug.WriteLine("Wndhost_LocationChanged");
 
             var locationFromScreen  = windowsFormsHost.PointToScreen(_zeroPoint);
             var source              = PresentationSource.FromVisual(WindowBack);
@@ -116,7 +116,7 @@ public void Wndhost_LocationChanged(object sender, EventArgs e)
 
         public void Wndhost_SizeChanged(object sender, SizeChangedEventArgs e)
         {
-            //Console.WriteLine("Wndhost_SizeChanged");
+            //System.Diagnostics.Debug.WriteLine("Wndhost_SizeChanged");
             var source = PresentationSource.FromVisual(WindowBack);
             if (source == null)
             {
@@ -134,7 +134,7 @@ public void Wndhost_SizeChanged(object sender, SizeChangedEventArgs e)
 
         void Wndhost_Closing(object sender, System.ComponentModel.CancelEventArgs e)
         {
-            //Console.WriteLine("Wndhost_Closing");
+            //System.Diagnostics.Debug.WriteLine("Wndhost_Closing");
 
             if (!Master.PreventAutoDispose) Dispose();
         }
@@ -142,7 +142,7 @@ void Wndhost_Closing(object sender, System.ComponentModel.CancelEventArgs e)
         bool disposed = false;
         internal void Dispose()
         {
-            //Console.WriteLine("FlyleafWindow_Dispose");
+            //System.Diagnostics.Debug.WriteLine("FlyleafWindow_Dispose");
 
             lock (this)
             {
@@ -182,7 +182,7 @@ internal void Dispose()
 
         private void FlyleafWindow_Closed(object sender, EventArgs e)
         {
-            //Console.WriteLine("FlyleafWindow_Closed");
+            //System.Diagnostics.Debug.WriteLine("FlyleafWindow_Closed");
 
             if (!Master.PreventAutoDispose) Dispose();
         }
diff --git a/FlyleafLib/Controls/WPF/VideoView.cs b/FlyleafLib/Controls/WPF/VideoView.cs
index 85ebe401..ce2dae13 100644
--- a/FlyleafLib/Controls/WPF/VideoView.cs
+++ b/FlyleafLib/Controls/WPF/VideoView.cs
@@ -151,7 +151,7 @@ public bool NormalScreen()
         bool disposed = false;
         internal void Dispose()
         {
-            Console.WriteLine("VideoView_Dispose");
+            //System.Diagnostics.Debug.WriteLine("VideoView_Dispose");
 
             Player?.DisposeInternal();
             Player = null;
diff --git a/FlyleafLib/FlyleafLib.csproj b/FlyleafLib/FlyleafLib.csproj
index 58ff513e..a378b450 100644
--- a/FlyleafLib/FlyleafLib.csproj
+++ b/FlyleafLib/FlyleafLib.csproj
@@ -1,152 +1,66 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{31C6CBF5-1E30-475D-BC57-028EFF3F0C91}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>FlyleafLib</RootNamespace>
-    <AssemblyName>FlyleafLib</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <Deterministic>true</Deterministic>
+    <TargetFrameworks>net5.0-windows;net472</TargetFrameworks>
+	<UseWindowsForms>true</UseWindowsForms>
+	<UseWPF>true</UseWPF>
+	<PackageIcon>Flyleaf.png</PackageIcon>
+	<PackageIconUrl />
+	<RepositoryUrl></RepositoryUrl>
+	<Description>Video Player .NET Library for WPF/WinForms (based on FFmpeg/SharpDX)</Description>
+	<Version>3.1.11</Version>
+	<Authors>SuRGeoNix</Authors>
+	<Copyright>SuRGeoNix © 2021</Copyright>
+	<PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
+	<PackageProjectUrl>https://github.com/SuRGeoNix/Flyleaf</PackageProjectUrl>
+	<PackageTags>flyleaf flyleaflib video media player engine framework ffmpeg sharpdx directx</PackageTags>
+	<IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <PackageReleaseNotes>Adding .NET 5 support
+Fixes .NET 5 hanging issues</PackageReleaseNotes>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NoWarn>1591</NoWarn>
+    <DocumentationFile>C:\root\dev\projects\_todo\FlyleafLib\FlyleafLib\FlyleafLib.xml</DocumentationFile>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DocumentationFile>bin\Release\FlyleafLib.xml</DocumentationFile>
-    <NoWarn>1591</NoWarn>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="FFmpeg.AutoGen, Version=4.4.0.0, Culture=neutral, PublicKeyToken=9b7632533a381715, processorArchitecture=MSIL">
-      <HintPath>..\packages\FFmpeg.AutoGen.4.4.0\lib\net472\FFmpeg.AutoGen.dll</HintPath>
-    </Reference>
-    <Reference Include="NAudio.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=e279aa5131008a41, processorArchitecture=MSIL">
-      <HintPath>..\packages\NAudio.Core.2.0.0\lib\netstandard2.0\NAudio.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="NAudio.Wasapi, Version=2.0.0.0, Culture=neutral, PublicKeyToken=e279aa5131008a41, processorArchitecture=MSIL">
-      <HintPath>..\packages\NAudio.Wasapi.2.0.0\lib\netstandard2.0\NAudio.Wasapi.dll</HintPath>
-    </Reference>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="SharpDX, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll</HintPath>
-    </Reference>
-    <Reference Include="SharpDX.Direct2D1, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpDX.Direct2D1.4.2.0\lib\net45\SharpDX.Direct2D1.dll</HintPath>
-    </Reference>
-    <Reference Include="SharpDX.Direct3D11, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpDX.Direct3D11.4.2.0\lib\net45\SharpDX.Direct3D11.dll</HintPath>
-    </Reference>
-    <Reference Include="SharpDX.DXGI, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll</HintPath>
-    </Reference>
-    <Reference Include="SharpDX.Mathematics, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Numerics" />
-    <Reference Include="System.Windows" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xaml" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Xml" />
-    <Reference Include="WindowsBase" />
-    <Reference Include="WindowsFormsIntegration" />
+    <PackageReference Include="FFmpeg.AutoGen" Version="4.4.0" />
+    <PackageReference Include="NAudio.Core" Version="2.0.0" />
+    <PackageReference Include="NAudio.Wasapi" Version="2.0.0" />
+    <PackageReference Include="SharpDX" Version="4.2.0" />
+    <PackageReference Include="SharpDX.Direct2D1" Version="4.2.0" />
+    <PackageReference Include="SharpDX.Direct3D11" Version="4.2.0" />
+    <PackageReference Include="SharpDX.DXGI" Version="4.2.0" />
+    <PackageReference Include="SharpDX.Mathematics" Version="4.2.0" />
   </ItemGroup>
+  
   <ItemGroup>
-    <Compile Include="AudioMaster.cs" />
-    <Compile Include="Config.cs" />
-    <Compile Include="Controls\WPF\Converters.cs" />
-    <Compile Include="Controls\WPF\FlyleafWindow.cs" />
-    <Compile Include="Controls\WPF\IVideoView.cs" />
-    <Compile Include="Controls\WPF\VideoView.cs" />
-    <Compile Include="Globals.cs" />
-    <Compile Include="Language.cs" />
-    <Compile Include="Master.cs" />
-    <Compile Include="MediaFramework\MediaContext\DecoderContext.cs" />
-    <Compile Include="MediaFramework\MediaDecoder\AudioDecoder.cs" />
-    <Compile Include="MediaFramework\MediaDecoder\DecoderBase.cs" />
-    <Compile Include="MediaFramework\MediaDecoder\SubtitlesDecoder.cs" />
-    <Compile Include="MediaFramework\MediaDecoder\VideoDecoder.cs" />
-    <Compile Include="MediaFramework\MediaDemuxer\CustomIOContext.cs" />
-    <Compile Include="MediaFramework\MediaDemuxer\AudioDemuxer.cs" />
-    <Compile Include="MediaFramework\MediaDemuxer\DemuxerBase.cs" />
-    <Compile Include="MediaStream\AudioStream.cs" />
-    <Compile Include="MediaStream\StreamBase.cs" />
-    <Compile Include="MediaStream\SubtitlesStream.cs" />
-    <Compile Include="MediaStream\VideoStream.cs" />
-    <Compile Include="MediaFramework\MediaDemuxer\SubtitlesDemuxer.cs" />
-    <Compile Include="MediaFramework\MediaDemuxer\VideoDemuxer.cs" />
-    <Compile Include="MediaFramework\MediaFrame\AudioFrame.cs" />
-    <Compile Include="MediaFramework\MediaFrame\FrameBase.cs" />
-    <Compile Include="MediaFramework\MediaFrame\SubtitlesFrame.cs" />
-    <Compile Include="MediaFramework\MediaFrame\VideoFrame.cs" />
-    <Compile Include="MediaFramework\MediaDecoder\VideoAcceleration.cs" />
-    <Compile Include="MediaPlayer\AudioPlayer.cs" />
-    <Compile Include="Controls\Flyleaf.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Controls\Flyleaf.Designer.cs">
-      <DependentUpon>Flyleaf.cs</DependentUpon>
-    </Compile>
-    <Compile Include="MediaPlayer\Player.cs" />
-    <Compile Include="MediaRenderer\Shaders_v4.cs" />
-    <Compile Include="MediaRenderer\Shaders_v5.cs" />
-    <Compile Include="Plugins\Default.cs" />
-    <Compile Include="Plugins\DefaultExternal.cs" />
-    <Compile Include="Plugins\PluginBase.cs" />
-    <Compile Include="MediaPlayer\Session.cs" />
-    <Compile Include="MediaRenderer\Renderer.cs" />
-    <Compile Include="MediaRenderer\RendererInfo.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Utils.cs" />
+	<Import Include="System" />
+    <Import Include="System.Drawing" />
+    <Import Include="System.Net.Http" />
+    <Import Include="System.Numerics" />
+    <Import Include="System.Windows" />
+    <Import Include="System.Windows.Forms" />
+    <Import Include="System.Xaml" />
+    <Import Include="System.Xml.Linq" />
+    <Import Include="Microsoft.CSharp" />
+    <Import Include="System.Xml" />
+    <Import Include="WindowsBase" />
+    <Import Include="WindowsFormsIntegration" />
   </ItemGroup>
+  
   <ItemGroup>
-    <None Include="..\.editorconfig">
-      <Link>.editorconfig</Link>
+    <None Include="..\.editorconfig" Link=".editorconfig" />
+    <None Include="..\Images\Flyleaf.png">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
     </None>
-    <None Include="app.config" />
-    <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="Themes\Generic.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/FlyleafLib/FlyleafLib.xml b/FlyleafLib/FlyleafLib.xml
new file mode 100644
index 00000000..9c175232
--- /dev/null
+++ b/FlyleafLib/FlyleafLib.xml
@@ -0,0 +1,502 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>FlyleafLib</name>
+    </assembly>
+    <members>
+        <member name="P:FlyleafLib.AudioMaster.DefaultDeviceName">
+            <summary>
+            Default audio device name
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.AudioMaster.Devices">
+            <summary>
+            List with the names of the available audio devices (use these names to change current Device for all the players or for each player seperately)
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.AudioMaster.Device">
+            <summary>
+            Audio device name which will be used for all the audio players (see Devices for valid input names)
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.AudioMaster.VolumeMaster">
+            <summary>
+            Gets or sets the master's volume (valid values 0 - 100)
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.AudioMaster.MuteMaster">
+            <summary>
+            Gets or sets the master's volume mute
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.AudioMaster.VolumeSession">
+            <summary>
+            Gets or sets the session's volume (valid values 0 - 100)
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.AudioMaster.MuteSession">
+            <summary>
+            Gets or sets the session's volume mute
+            </summary>
+        </member>
+        <member name="T:FlyleafLib.Config">
+            <summary>
+            Player's main configuration
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.Config.Demuxer.MinQueueSize">
+            <summary>
+            Minimum required demuxed packets before playing
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.Config.Demuxer.MaxQueueSize">
+            <summary>
+            Maximum allowed packets for buffering
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.Config.Demuxer.MaxErrors">
+            <summary>
+            Maximum allowed errors before stopping
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.Config.Demuxer.AudioFormatOpt">
+            <summary>
+            FFmpeg's format options for audio demuxer
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.Config.Demuxer.VideoFormatOpt">
+            <summary>
+            FFmpeg's format options for main (video) demuxer
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.Config.Demuxer.SubsFormatOpt">
+            <summary>
+            FFmpeg's format options for subtitles demuxer
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.Config.Demuxer.AudioFormatFlags">
+            <summary>
+            FFmpeg's format flags for audio demuxer (see https://ffmpeg.org/doxygen/trunk/avformat_8h.html)
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.Config.Demuxer.VideoFormatFlags">
+            <summary>
+            FFmpeg's format flags for video demuxer (see https://ffmpeg.org/doxygen/trunk/avformat_8h.html)
+            eg. config.demuxer.VideoFormatFlags |= 0x40; // For AVFMT_FLAG_NOBUFFER
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.Config.Demuxer.SubsFormatFlags">
+            <summary>
+            FFmpeg's format flags for subtitles demuxer (see https://ffmpeg.org/doxygen/trunk/avformat_8h.html)
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.Config.Decoder.HWAcceleration">
+            <summary>
+            Activates Direct3D video acceleration (decoding)
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.Config.Decoder.VideoThreads">
+            <summary>
+            Threads that will be used from the decoder
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.Config.Decoder.MinVideoFrames">
+            <summary>
+            Minimum required video frames before playing
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.Config.Decoder.MinAudioFrames">
+            <summary>
+            Minimum required audio frames before playing
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.Config.Decoder.MaxVideoFrames">
+            <summary>
+            Maximum video frames to be decoded and processed for rendering
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.Config.Decoder.MaxAudioFrames">
+            <summary>
+            Maximum audio frames to be decoded and processed for playback
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.Config.Decoder.MaxSubsFrames">
+            <summary>
+            Maximum subtitle frames to be decoded
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.Config.Decoder.MaxErrors">
+            <summary>
+            Maximum allowed errors before stopping
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.Config.Video.CustomAspectRatio">
+            <summary>
+            Custom aspect ratio (AspectRatio must be set to Custom to have an effect)
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.Config.Video.AspectRatio">
+            <summary>
+            Video aspect ratio
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.Config.Video.ClearColor">
+            <summary>
+            Backcolor of the player's surface
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.Config.Audio.Enabled">
+            <summary>
+            Whether audio should be enabled or not
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.Config.Audio.LatencyTicks">
+            <summary>
+            NAudio's latency (required buffered duration before playing)
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.Config.Audio.Languages">
+            <summary>
+            Audio languages preference by priority
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.Config.Audio.DelayTicks">
+            <summary>
+            Audio delay ticks (will be parsed in current active stream and will be resetted on each new input)
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.Config.Subs.Languages">
+            <summary>
+            Subtitle languages preference by priority
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.Config.Subs.Enabled">
+            <summary>
+            Whether subtitles should be enabled or not
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.Config.Subs.UseOnlineDatabases">
+            <summary>
+            Whether to use online search plugins or not
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.Config.Subs.DelayTicks">
+            <summary>
+            Subtitle delay ticks (will be parsed in current active stream and will be resetted on each new input)
+            </summary>
+        </member>
+        <member name="F:FlyleafLib.Controls.Flyleaf.components">
+            <summary>
+            Required designer variable.
+            </summary>
+        </member>
+        <member name="M:FlyleafLib.Controls.Flyleaf.Dispose(System.Boolean)">
+            <summary>
+            Clean up any resources being used.
+            </summary>
+            <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        </member>
+        <member name="M:FlyleafLib.Controls.Flyleaf.InitializeComponent">
+            <summary>
+            Required method for Designer support - do not modify 
+            the contents of this method with the code editor.
+            </summary>
+        </member>
+        <member name="T:FlyleafLib.Master">
+            <summary>
+            Manages library's static configuration
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.Master.AudioMaster">
+            <summary>
+            Manages audio devices, volume &amp; mute
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.Master.Players">
+            <summary>
+            Holds player instances
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.Master.PreventAutoDispose">
+            <summary>
+            Prevent auto dispose of the player during window close/unload
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.Master.Plugins">
+            <summary>
+            Holds loaded plugin types
+            </summary>
+        </member>
+        <member name="M:FlyleafLib.Master.RegisterFFmpeg(System.String,System.Int32)">
+            <summary>
+            Registers FFmpeg libraries (ensure you provide x86 or x64 based on your project)
+            </summary>
+            <param name="absolutePath">Provide your custom absolute path or :1 for current or :2 for Libs\(x86 or x64 dynamic)\FFmpeg from current to base</param>
+            <param name="verbosity">FFmpeg's verbosity (24: Warning, 64: Max offset ...) (used only in DEBUG)</param>
+        </member>
+        <member name="E:FlyleafLib.MediaFramework.MediaDemuxer.DemuxerBase.DownloadCompleted">
+            <summary>
+            Fires on partial or full download completed
+            </summary>
+        </member>
+        <member name="M:FlyleafLib.MediaFramework.MediaDemuxer.DemuxerBase.Download(System.String)">
+            <summary>
+            Downloads the currently configured AVS streams (Experimental)
+            </summary>
+            <param name="filename">The filename for the downloaded video. The file extension will let the demuxer to choose the output format (eg. mp4).</param>
+        </member>
+        <member name="P:FlyleafLib.MediaPlayer.AudioPlayer.Volume">
+            <summary>
+            Current audio player's volume / amplifier (valid values 0 - no upper limit)
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.MediaPlayer.AudioPlayer.Mute">
+            <summary>
+            Current audio player's mute
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.MediaPlayer.AudioPlayer.Device">
+            <summary>
+            Current audio player's device name (see Master.AudioMaster.Devices for valid input names)
+            Set to null to use AudioMaster's Device which handles all instances (Default)
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.MediaPlayer.Player.VideoView">
+            <summary>
+            The Content Control which hosts WindowsFormsHost (useful for airspace issues &amp; change to fullscreen mode)
+            (WinForms: not set)
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.MediaPlayer.Player.Control">
+            <summary>
+            Flyleaf Control (WinForms)
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.MediaPlayer.Player.Config">
+            <summary>
+            Player's Configuration (set once in the constructor)
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.MediaPlayer.Player.Session">
+            <summary>
+            Player's Session
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.MediaPlayer.Player.PlayerId">
+            <summary>
+            Player's Incremental Unique Id
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.MediaPlayer.Player.PlayerName">
+            <summary>
+            Player's Name
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.MediaPlayer.Player.HasEnded">
+            <summary>
+            Whether the video has ended
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.MediaPlayer.Player.HasAudio">
+            <summary>
+            Whether the video has audio and it is configured
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.MediaPlayer.Player.HasSubs">
+            <summary>
+            Whether the video has subtitles and it is configured
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.MediaPlayer.Player.Plugins">
+            <summary>
+            Dictionary of available Plugins and their AVS Streams
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.MediaPlayer.Player.FPS">
+            <summary>
+            Actual Frames rendered per second (FPS)
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.MediaPlayer.Player.DroppedFrames">
+            <summary>
+            Total Dropped Frames
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.MediaPlayer.Player.TBR">
+            <summary>
+            Total bitrate (Kbps)
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.MediaPlayer.Player.VBR">
+            <summary>
+            Video bitrate (Kbps)
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.MediaPlayer.Player.ABR">
+            <summary>
+            Audio bitrate (Kbps)
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.MediaPlayer.Player.Status">
+            <summary>
+            Player's Status
+            </summary>
+        </member>
+        <member name="M:FlyleafLib.MediaPlayer.Player.OpenFailed">
+            <summary>
+            Access this only from Plugins
+            </summary>
+        </member>
+        <member name="M:FlyleafLib.MediaPlayer.Player.Open(System.String)">
+            <summary>
+            Opens a new external Video or Subtitle url
+            </summary>
+            <param name="url"></param>
+        </member>
+        <member name="M:FlyleafLib.MediaPlayer.Player.Open(System.IO.Stream)">
+            <summary>
+            Opens a new external Video from a custom System.IO.Stream
+            </summary>
+            <param name="stream"></param>
+        </member>
+        <member name="M:FlyleafLib.MediaPlayer.Player.Open(FlyleafLib.MediaStream.StreamBase)">
+            <summary>
+            Opens an existing AVS stream from Plugins[_PLUGIN_NAME_].[AVS]Stream
+            </summary>
+            <param name="inputStream"></param>
+        </member>
+        <member name="M:FlyleafLib.MediaPlayer.Player.Play">
+            <summary>
+            Plays AVS streams
+            </summary>
+        </member>
+        <member name="M:FlyleafLib.MediaPlayer.Player.Pause">
+            <summary>
+            Pauses AVS streams
+            </summary>
+        </member>
+        <member name="M:FlyleafLib.MediaPlayer.Player.Seek(System.Int32,System.Boolean)">
+            <summary>
+            Seeks backwards or forewards based on the specified ms to the nearest keyframe
+            </summary>
+            <param name="ms"></param>
+            <param name="foreward"></param>
+        </member>
+        <member name="M:FlyleafLib.MediaPlayer.Player.Stop">
+            <summary>
+            Stops and Closes AVS streams
+            </summary>
+        </member>
+        <member name="M:FlyleafLib.MediaPlayer.Player.Dispose">
+            <summary>
+            Disposes the Player
+            (If you call this manually call it from UI-thread eg. Application.Current.Dispatcher.Invoke(() => Player.Dispose()); )
+            </summary>
+        </member>
+        <member name="E:FlyleafLib.MediaPlayer.Player.OpenCompleted">
+            <summary>
+            Fires on Audio / Video open success or failure
+            </summary>
+        </member>
+        <member name="E:FlyleafLib.MediaPlayer.Player.PlaybackCompleted">
+            <summary>
+            Fires on Playback completed
+            </summary>
+        </member>
+        <member name="T:FlyleafLib.MediaPlayer.Session">
+            <summary>
+            Player's active Session (partially notifies, should re-request attributes on OpenCompleted - raise null property)
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.MediaPlayer.Session.VideoInfo">
+            <summary>
+            Holds the decocer's current Video stream
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.MediaPlayer.Session.AudioInfo">
+            <summary>
+            Holds the decoder's current Audio stream
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.MediaPlayer.Session.SubsInfo">
+            <summary>
+            Holds the decoder's current Subtitle stream
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.MediaPlayer.Session.CurVideoStream">
+            <summary>
+            Holds the current Video stream
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.MediaPlayer.Session.CurAudioStream">
+            <summary>
+            Holds the current Audio stream
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.MediaPlayer.Session.CurSubtitleStream">
+            <summary>
+            Holds the current Subtitle stream
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.MediaPlayer.Session.LastAudioStream">
+            <summary>
+            Holds the last enabled Audio stream in case of disabling
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.MediaPlayer.Session.LastSubtitleStream">
+            <summary>
+            Holds the last enabled Subtitle stream in case of disabling
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.MediaPlayer.Session.InitialUrl">
+            <summary>
+            Holds the initial user's video input
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.MediaPlayer.Session.IsPlaylist">
+            <summary>
+            Whether the input is Single Movie or Multiple (eg. in case of torrent with multiple video files)
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.MediaPlayer.Session.Movie">
+            <summary>
+            Holds Movie's info
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.MediaPlayer.Session.CanPlay">
+            <summary>
+            Whether the player's status is capable of accepting playback commands
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.MediaPlayer.Session.SubsText">
+            <summary>
+            Subtitles text auto set for the actual displaying duration
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.MediaPlayer.Session.CurTime">
+            <summary>
+            Player's current time or user's current seek time (if set from here seek's direction will be foreward)
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.MediaStream.StreamBase.InUse">
+            <summary>
+            Whether the current stream is enabled
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.MediaStream.StreamBase.Used">
+            <summary>
+            How many times has been used
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.MediaStream.StreamBase.Tag">
+            <summary>
+            Tag/Opaque for plugins (mainly to match streams with their own streams)
+            </summary>
+        </member>
+        <member name="P:FlyleafLib.MediaStream.VideoStream.Movie">
+            <summary>
+            Stream's Movie info from the current plugin's Playlist
+            </summary>
+        </member>
+    </members>
+</doc>
diff --git a/FlyleafLib/Master.cs b/FlyleafLib/Master.cs
index 6857394b..b27ad007 100644
--- a/FlyleafLib/Master.cs
+++ b/FlyleafLib/Master.cs
@@ -18,7 +18,7 @@ public static class Master
     {
         static Master()
         {
-            AppDomain.CurrentDomain.AssemblyResolve += AssemblyResolve;
+            //AppDomain.CurrentDomain.AssemblyResolve += AssemblyResolve;
             
             Plugins     = new List<Type>();
             Players     = new Dictionary<int, Player>();
@@ -637,6 +637,6 @@ private static Assembly AssemblyResolve(object sender, ResolveEventArgs args)
             new Language("spn","sp","Spanish (EU)","1","0")
         };
 
-        private static void Log(string msg) { Console.WriteLine($"[{DateTime.Now.ToString("hh.mm.ss.fff")}] [Master] {msg}"); }
+        private static void Log(string msg) { System.Diagnostics.Debug.WriteLine($"[{DateTime.Now.ToString("hh.mm.ss.fff")}] [Master] {msg}"); }
     }
 }
diff --git a/FlyleafLib/MediaFramework/MediaContext/DecoderContext.cs b/FlyleafLib/MediaFramework/MediaContext/DecoderContext.cs
index b10d565f..1fbf552b 100644
--- a/FlyleafLib/MediaFramework/MediaContext/DecoderContext.cs
+++ b/FlyleafLib/MediaFramework/MediaContext/DecoderContext.cs
@@ -339,6 +339,6 @@ public void Dispose()
             VideoDecoder.VideoAcceleration?.Dispose();
         }
 
-        private void Log(string msg) { Console.WriteLine($"[{DateTime.Now.ToString("hh.mm.ss.fff")}] [#{player.PlayerId}] [DecoderContext] {msg}"); }
+        private void Log(string msg) { System.Diagnostics.Debug.WriteLine($"[{DateTime.Now.ToString("hh.mm.ss.fff")}] [#{player.PlayerId}] [DecoderContext] {msg}"); }
     }
 }
\ No newline at end of file
diff --git a/FlyleafLib/MediaFramework/MediaDecoder/AudioDecoder.cs b/FlyleafLib/MediaFramework/MediaDecoder/AudioDecoder.cs
index e86439ad..f7858074 100644
--- a/FlyleafLib/MediaFramework/MediaDecoder/AudioDecoder.cs
+++ b/FlyleafLib/MediaFramework/MediaDecoder/AudioDecoder.cs
@@ -121,7 +121,7 @@ protected override void DecodeInternal()
                         else if (demuxer.Status != MediaDemuxer.Status.Demuxing && demuxer.Status != MediaDemuxer.Status.QueueFull)
                         {
                             Log($"Demuxer is not running [Demuxer Status: {demuxer.Status}]");
-                            Status = demuxer.Status == MediaDemuxer.Status.Stopping || demuxer.Status == MediaDemuxer.Status.Stopped ? Status.Stopping2 : Status.Paused;
+                            Status = demuxer.Status == MediaDemuxer.Status.Stopping || demuxer.Status == MediaDemuxer.Status.Stopped ? Status.Stopping2 : Status.Pausing;
                             break;
                         }
                         
diff --git a/FlyleafLib/MediaFramework/MediaDecoder/DecoderBase.cs b/FlyleafLib/MediaFramework/MediaDecoder/DecoderBase.cs
index 65740fc1..47c1f6ff 100644
--- a/FlyleafLib/MediaFramework/MediaDecoder/DecoderBase.cs
+++ b/FlyleafLib/MediaFramework/MediaDecoder/DecoderBase.cs
@@ -10,6 +10,7 @@
 using static FFmpeg.AutoGen.AVMediaType;
 using static FFmpeg.AutoGen.ffmpeg;
 
+using FlyleafLib.MediaFramework.MediaContext;
 using FlyleafLib.MediaFramework.MediaDemuxer;
 using FlyleafLib.MediaStream;
 
@@ -34,7 +35,7 @@ public abstract unsafe class DecoderBase
         protected long              threadCounter;
 
         protected DemuxerBase       demuxer;
-        protected MediaContext.DecoderContext  decCtx;
+        protected DecoderContext    decCtx;
         protected Config            cfg => decCtx.cfg;
 
         public DecoderBase(MediaContext.DecoderContext decCtx)
@@ -185,9 +186,7 @@ protected void Decode()
 
         protected void Log(string msg)
         {
-            #if DEBUG
-                Console.WriteLine($"[{DateTime.Now.ToString("hh.mm.ss.fff")}] [#{decCtx.player.PlayerId}] [Decoder: {Type.ToString().PadLeft(5, ' ')}] {msg}");
-            #endif
+            System.Diagnostics.Debug.WriteLine($"[{DateTime.Now.ToString("hh.mm.ss.fff")}] [#{decCtx.player.PlayerId}] [Decoder: {Type.ToString().PadLeft(5, ' ')}] {msg}");
         }
     }
 
diff --git a/FlyleafLib/MediaFramework/MediaDecoder/SubtitlesDecoder.cs b/FlyleafLib/MediaFramework/MediaDecoder/SubtitlesDecoder.cs
index 454df397..cc19f41e 100644
--- a/FlyleafLib/MediaFramework/MediaDecoder/SubtitlesDecoder.cs
+++ b/FlyleafLib/MediaFramework/MediaDecoder/SubtitlesDecoder.cs
@@ -78,7 +78,7 @@ protected override void DecodeInternal()
                         else if (demuxer.Status != MediaDemuxer.Status.Demuxing && demuxer.Status != MediaDemuxer.Status.QueueFull)
                         {
                             Log($"Demuxer is not running [Demuxer Status: {demuxer.Status}]");
-                            Status = demuxer.Status == MediaDemuxer.Status.Stopping || demuxer.Status == MediaDemuxer.Status.Stopped ? Status.Stopping2 : Status.Paused;
+                            Status = demuxer.Status == MediaDemuxer.Status.Stopping || demuxer.Status == MediaDemuxer.Status.Stopped ? Status.Stopping2 : Status.Pausing;
                             break;
                         }
                         
diff --git a/FlyleafLib/MediaFramework/MediaDecoder/VideoAcceleration.cs b/FlyleafLib/MediaFramework/MediaDecoder/VideoAcceleration.cs
index d44cbb10..44c5b95a 100644
--- a/FlyleafLib/MediaFramework/MediaDecoder/VideoAcceleration.cs
+++ b/FlyleafLib/MediaFramework/MediaDecoder/VideoAcceleration.cs
@@ -76,6 +76,6 @@ private List<AVHWDeviceType> GetHWDevices()
             return hwDevices;
         }
 
-        private void Log(string msg) { Console.WriteLine($"[{DateTime.Now.ToString("hh.mm.ss.fff")}] [HWAcceleration] {msg}"); }
+        private void Log(string msg) { System.Diagnostics.Debug.WriteLine($"[{DateTime.Now.ToString("hh.mm.ss.fff")}] [HWAcceleration] {msg}"); }
     }
 }
\ No newline at end of file
diff --git a/FlyleafLib/MediaFramework/MediaDecoder/VideoDecoder.cs b/FlyleafLib/MediaFramework/MediaDecoder/VideoDecoder.cs
index 8c2aec9e..8535890c 100644
--- a/FlyleafLib/MediaFramework/MediaDecoder/VideoDecoder.cs
+++ b/FlyleafLib/MediaFramework/MediaDecoder/VideoDecoder.cs
@@ -50,61 +50,61 @@ protected override unsafe int Setup(AVCodec* codec)
         {
             lock (lockCodecCtx)
             {
-            VideoAccelerated = false;
+                VideoAccelerated = false;
 
-            if (cfg.decoder.HWAcceleration)
-            {
-                if (VideoAcceleration.CheckCodecSupport(codec))
+                if (cfg.decoder.HWAcceleration)
                 {
-                    if (VideoAcceleration.hw_device_ctx != null)
+                    if (VideoAcceleration.CheckCodecSupport(codec))
                     {
-                        codecCtx->hw_device_ctx = av_buffer_ref(VideoAcceleration.hw_device_ctx);
-                        VideoAccelerated = true;
-                        Log("[VA] Success");
+                        if (VideoAcceleration.hw_device_ctx != null)
+                        {
+                            codecCtx->hw_device_ctx = av_buffer_ref(VideoAcceleration.hw_device_ctx);
+                            VideoAccelerated = true;
+                            Log("[VA] Success");
+                        }
                     }
+                    else
+                        Log("[VA] Failed");
                 }
                 else
-                    Log("[VA] Failed");
-            }
-            else
-                Log("[VA] Disabled");
+                    Log("[VA] Disabled");
 
-            codecCtx->thread_count = Math.Min(decCtx.cfg.decoder.VideoThreads, codecCtx->codec_id == AV_CODEC_ID_HEVC ? 32 : 16);
-            codecCtx->thread_type  = 0;
+                codecCtx->thread_count = Math.Min(decCtx.cfg.decoder.VideoThreads, codecCtx->codec_id == AV_CODEC_ID_HEVC ? 32 : 16);
+                codecCtx->thread_type  = 0;
 
-            int bits = VideoStream.PixelFormatDesc->comp.ToArray()[0].depth;
+                int bits = VideoStream.PixelFormatDesc->comp.ToArray()[0].depth;
 
-            textDesc = new Texture2DDescription()
-            {
-                Usage               = ResourceUsage.Default,
-                BindFlags           = BindFlags.ShaderResource,
+                textDesc = new Texture2DDescription()
+                {
+                    Usage               = ResourceUsage.Default,
+                    BindFlags           = BindFlags.ShaderResource,
 
-                Format              = bits > 8 ? Format.R16_UNorm : Format.R8_UNorm,
-                Width               = codecCtx->width,
-                Height              = codecCtx->height,
+                    Format              = bits > 8 ? Format.R16_UNorm : Format.R8_UNorm,
+                    Width               = codecCtx->width,
+                    Height              = codecCtx->height,
 
-                SampleDescription   = new SampleDescription(1, 0),
-                ArraySize           = 1,
-                MipLevels           = 1
-            };
+                    SampleDescription   = new SampleDescription(1, 0),
+                    ArraySize           = 1,
+                    MipLevels           = 1
+                };
 
-            textDescUV = new Texture2DDescription()
-            {
-                Usage               = ResourceUsage.Default,
-                BindFlags           = BindFlags.ShaderResource,
+                textDescUV = new Texture2DDescription()
+                {
+                    Usage               = ResourceUsage.Default,
+                    BindFlags           = BindFlags.ShaderResource,
 
-                Format              = bits > 8 ? Format.R16_UNorm : Format.R8_UNorm,
-                Width               = codecCtx->width  >> VideoStream.PixelFormatDesc->log2_chroma_w,
-                Height              = codecCtx->height >> VideoStream.PixelFormatDesc->log2_chroma_h,
+                    Format              = bits > 8 ? Format.R16_UNorm : Format.R8_UNorm,
+                    Width               = codecCtx->width  >> VideoStream.PixelFormatDesc->log2_chroma_w,
+                    Height              = codecCtx->height >> VideoStream.PixelFormatDesc->log2_chroma_h,
 
-                SampleDescription   = new SampleDescription(1, 0),
-                ArraySize           = 1,
-                MipLevels           = 1
-            };
+                    SampleDescription   = new SampleDescription(1, 0),
+                    ArraySize           = 1,
+                    MipLevels           = 1
+                };
 
-            decCtx.player.renderer.FrameResized();
+                decCtx.player.renderer.FrameResized();
 
-            return 0;
+                return 0;
             }
         }
 
@@ -171,7 +171,7 @@ protected override void DecodeInternal()
                         else if (demuxer.Status != MediaDemuxer.Status.Demuxing && demuxer.Status != MediaDemuxer.Status.QueueFull)
                         {
                             Log($"Demuxer is not running [Demuxer Status: {demuxer.Status}]");
-                            Status = demuxer.Status == MediaDemuxer.Status.Stopping || demuxer.Status == MediaDemuxer.Status.Stopped ? Status.Stopping2 : Status.Paused;
+                            Status = demuxer.Status == MediaDemuxer.Status.Stopping || demuxer.Status == MediaDemuxer.Status.Stopped ? Status.Stopping2 : Status.Pausing;
                             break;
                         }
                         
@@ -369,16 +369,11 @@ internal VideoFrame ProcessVideoFrame(AVFrame* frame)
 
         public void DisposeFrames()
         {
-
             while (!Frames.IsEmpty)
             {
                 Frames.TryDequeue(out VideoFrame frame);
                 DisposeFrame(frame);
             }
-
-
-            //foreach (VideoFrame frame in Frames) DisposeFrame(frame);
-            //Frames = new ConcurrentQueue<VideoFrame>();
         }
         public static void DisposeFrame(VideoFrame frame) { if (frame != null && frame.textures != null) for (int i=0; i<frame.textures.Length; i++) Utilities.Dispose(ref frame.textures[i]); }
     }
diff --git a/FlyleafLib/MediaFramework/MediaDemuxer/CustomIOContext.cs b/FlyleafLib/MediaFramework/MediaDemuxer/CustomIOContext.cs
index 4b2b0324..bf6e1f69 100644
--- a/FlyleafLib/MediaFramework/MediaDemuxer/CustomIOContext.cs
+++ b/FlyleafLib/MediaFramework/MediaDemuxer/CustomIOContext.cs
@@ -62,11 +62,11 @@ public void Dispose()
             if (ret < 0)
             {
                 if (ret == -1)
-                    Console.WriteLine("[Stream] Cancel");
+                    System.Diagnostics.Debug.WriteLine("[Stream] Cancel");
                 else if (ret == -2)
-                    Console.WriteLine("[Stream] Error");
+                    System.Diagnostics.Debug.WriteLine("[Stream] Error");
                 else
-                    Console.WriteLine("[Stream] Interrupt 2");
+                    System.Diagnostics.Debug.WriteLine("[Stream] Interrupt 2");
 
                 return AVERROR_EXIT;
             }
@@ -81,7 +81,7 @@ public void Dispose()
             GCHandle demuxerHandle = (GCHandle)((IntPtr)opaque);
             DemuxerBase demuxer = (DemuxerBase)demuxerHandle.Target;
 
-            //Console.WriteLine($"** S | {decCtx.demuxer.fmtCtx->pb->pos} - {decCtx.demuxer.ioStream.Position}");
+            //System.Diagnostics.Debug.WriteLine($"** S | {decCtx.demuxer.fmtCtx->pb->pos} - {decCtx.demuxer.ioStream.Position}");
 
             if (wehnce == AVSEEK_SIZE) return demuxer.CustomIOContext.stream.Length;
 
diff --git a/FlyleafLib/MediaFramework/MediaDemuxer/DemuxerBase.cs b/FlyleafLib/MediaFramework/MediaDemuxer/DemuxerBase.cs
index 86999541..6cd0e587 100644
--- a/FlyleafLib/MediaFramework/MediaDemuxer/DemuxerBase.cs
+++ b/FlyleafLib/MediaFramework/MediaDemuxer/DemuxerBase.cs
@@ -51,19 +51,18 @@ public ConcurrentQueue<IntPtr>  GetPacketsPtr(MediaType type)
         public long                     VideoBytes      { get; private set; } = 0;
         public long                     AudioBytes      { get; private set; } = 0;
 
-        internal bool allowProperClose;
+        internal bool       allowProperClose;
+        internal object     lockFmtCtx      = new object();
+        internal GCHandle   handle;
 
-        internal GCHandle handle;
+        Thread              thread;
+        AutoResetEvent      threadARE = new AutoResetEvent(false);
+        long                threadCounter;
 
-        Thread          thread;
-        AutoResetEvent  threadARE = new AutoResetEvent(false);
-        long            threadCounter;
-
-        AVFormatContext*fmtCtx;
-        AVPacket*       packet;
-        internal object lockFmtCtx      = new object();
-
-        Config          cfg;
+        AVFormatContext*    fmtCtx;
+        AVPacket*           packet;
+        Config              cfg;
+        
 
         AVIOInterruptCB_callback_func   interruptClbk = new AVIOInterruptCB_callback_func();     
         AVIOInterruptCB_callback        InterruptClbk = (opaque) =>
@@ -74,9 +73,6 @@ public ConcurrentQueue<IntPtr>  GetPacketsPtr(MediaType type)
             if (demuxer.allowProperClose) return 0;
 
             int interrupt = demuxer.DemuxInterrupt != 0 || demuxer.Status == Status.Stopping || demuxer.Status == Status.Stopped ? 1 : 0;
-            
-            //if (demuxer.DemuxInterrupt == 1) demuxer.Log($"Interrupt 1 | {demuxer.Status}");
-            //if (interrupt == 1) demuxer.Log("Interrupt");
 
             return interrupt;
         };
@@ -138,7 +134,7 @@ public int Open(string url, Stream stream, Dictionary<string, string> opt, int f
                 {
                     if (Status != Status.Opening) return -1;
                     ret = avformat_find_stream_info(fmtCtx, null);
-                    if (ret < 0) { Log($"[Format] [ERROR-2] {Utils.FFmpeg.ErrorCodeToMsg(ret)} ({ret})"); avformat_close_input(&fmtCtxPtr); fmtCtx = null; return ret; }
+                    if (ret < 0) { Log($"[Format] [ERROR-2] {Utils.FFmpeg.ErrorCodeToMsg(ret)} ({ret})"); allowProperClose = true; avformat_close_input(&fmtCtxPtr); allowProperClose = false; fmtCtx = null; return ret; }
                 }
                 if (Status != Status.Opening) return -1;
 
@@ -148,11 +144,11 @@ public int Open(string url, Stream stream, Dictionary<string, string> opt, int f
                     bool hasVideo = FillInfo();
 
                     if (Type == MediaType.Video && !hasVideo) 
-                        { Log($"[Format] [ERROR-3] No video stream found");     avformat_close_input(&fmtCtxPtr); fmtCtx = null; return -3; }
+                        { Log($"[Format] [ERROR-3] No video stream found");     allowProperClose = true; avformat_close_input(&fmtCtxPtr); allowProperClose = false; fmtCtx = null; return -3; }
                     else if (Type == MediaType.Audio && AudioStreams.Count == 0)
-                        { Log($"[Format] [ERROR-4] No audio stream found");     avformat_close_input(&fmtCtxPtr); fmtCtx = null; return -4; }
+                        { Log($"[Format] [ERROR-4] No audio stream found");     allowProperClose = true; avformat_close_input(&fmtCtxPtr); allowProperClose = false; fmtCtx = null; return -4; }
                     else if (Type == MediaType.Subs && SubtitlesStreams.Count == 0)
-                        { Log($"[Format] [ERROR-5] No subtitles stream found"); avformat_close_input(&fmtCtxPtr); fmtCtx = null; return -5; }
+                        { Log($"[Format] [ERROR-5] No subtitles stream found"); allowProperClose = true; avformat_close_input(&fmtCtxPtr); allowProperClose = false; fmtCtx = null; return -5; }
 
                     StartThread();
 
@@ -402,7 +398,6 @@ private void Demux()
                     {
                         // Demux Packet
                         ret = av_read_frame(fmtCtx, packet);
-
                         // Check for Errors / End
                         if (ret != 0)
                         {
@@ -709,18 +704,8 @@ public void DisposePackets(ConcurrentQueue<IntPtr> packets)
             }
         }
 
-        private void Log2(string msg)
-        {
-            #if DEBUG
-                Console.WriteLine($"[{DateTime.Now.ToString("hh.mm.ss.fff")}] [#{UniqueId}] [Remuxer: {Type.ToString().PadLeft(5, ' ')}] {msg}");
-            #endif
-        }
-        private void Log (string msg)
-        { 
-            #if DEBUG
-                Console.WriteLine($"[{DateTime.Now.ToString("hh.mm.ss.fff")}] [#{UniqueId}] [Demuxer: {Type.ToString().PadLeft(5, ' ')}] {msg}");
-            #endif
-        }
+        private void Log2(string msg) { System.Diagnostics.Debug.WriteLine($"[{DateTime.Now.ToString("hh.mm.ss.fff")}] [#{UniqueId}] [Remuxer: {Type.ToString().PadLeft(5, ' ')}] {msg}"); }
+        private void Log (string msg) { System.Diagnostics.Debug.WriteLine($"[{DateTime.Now.ToString("hh.mm.ss.fff")}] [#{UniqueId}] [Demuxer: {Type.ToString().PadLeft(5, ' ')}] {msg}"); }
     }
 
     public enum Status
diff --git a/FlyleafLib/MediaPlayer/AudioPlayer.cs b/FlyleafLib/MediaPlayer/AudioPlayer.cs
index f1f5c2f8..04d7ca81 100644
--- a/FlyleafLib/MediaPlayer/AudioPlayer.cs
+++ b/FlyleafLib/MediaPlayer/AudioPlayer.cs
@@ -17,7 +17,7 @@ public int Volume
             get => volumeSampleProvider == null ? 50 : (int) (volumeSampleProvider.Volume * 100);
             set
             {
-                volumeSampleProvider.Volume = value / 100.0f;
+                volumeSampleProvider.Volume = Math.Max(0, value / 100.0f);
                 Raise(nameof(Volume));
 
                 if (value == 0)
@@ -165,6 +165,6 @@ public void ClearBuffer()
         }
         #endregion
 
-        private void Log(string msg) { Console.WriteLine($"[{DateTime.Now.ToString("hh.mm.ss.fff")}] [AudioPlayer] {msg}"); }
+        private void Log(string msg) { System.Diagnostics.Debug.WriteLine($"[{DateTime.Now.ToString("hh.mm.ss.fff")}] [AudioPlayer] {msg}"); }
     }
 }
\ No newline at end of file
diff --git a/FlyleafLib/MediaPlayer/Player.cs b/FlyleafLib/MediaPlayer/Player.cs
index 18617d98..f515822a 100644
--- a/FlyleafLib/MediaPlayer/Player.cs
+++ b/FlyleafLib/MediaPlayer/Player.cs
@@ -183,7 +183,7 @@ private void InitializeControl1(Flyleaf oldValue, Flyleaf newValue)
 
                 Master.Players.Add(PlayerId, this);
 
-                if (newValue.Handle != null)
+                if (newValue.Handle != IntPtr.Zero)
                     InitializeControl2(newValue);
                 else
                     newValue.HandleCreated += (o, e) => { InitializeControl2(newValue); };
@@ -728,16 +728,14 @@ public void Stop()
         }
 
         /// <summary>
-        /// Disposes the Player (might will cause issues if you call it from a UI thread)
+        /// Disposes the Player
+        /// (If you call this manually call it from UI-thread eg. Application.Current.Dispatcher.Invoke(() => Player.Dispose()); )
         /// </summary>
-        public void Dispose()
-        {
-            Master.DisposePlayer(this);
-        }
+        public void Dispose() { Master.DisposePlayer(this); }
 
         internal void DisposeInternal()
         {
-            Console.WriteLine("Player_Dispose");
+            Log("Player_Disposing");
 
             lock (this)
             {
@@ -765,7 +763,7 @@ internal void DisposeInternal()
                 GC.Collect();
             }
 
-            Console.WriteLine("Player_Disposed");
+            Log("Player_Disposed");
         }
         bool disposed = false;
         #endregion
@@ -948,7 +946,7 @@ private void Screamer()
                 aDistanceMs     = aFrame != null ? (int) ((aFrame.timestamp - elapsedTicks) / 10000) : Int32.MaxValue;
                 sDistanceMs     = sFrame != null ? (int) ((sFrame.timestamp - elapsedTicks) / 10000) : Int32.MaxValue;
                 sleepMs         = Math.Min(vDistanceMs, aDistanceMs) - 1;
-
+                
                 if (sleepMs < 0) sleepMs = 0;
                 if (sleepMs > 2)
                 {
@@ -1078,12 +1076,7 @@ public OpenCompletedArgs(MediaType type, bool success)
         protected virtual void OnPlaybackCompleted() { Task.Run(() => PlaybackCompleted?.Invoke(this, new EventArgs())); }
         #endregion
 
-        private void Log(string msg)
-        { 
-            #if DEBUG
-                Console.WriteLine($"[{DateTime.Now.ToString("hh.mm.ss.fff")}] [#{PlayerId}] [Player] {msg}");
-            #endif
-        }
+        private void Log(string msg) { System.Diagnostics.Debug.WriteLine($"[{DateTime.Now.ToString("hh.mm.ss.fff")}] [#{PlayerId}] [Player] {msg}"); }
     }
 
     public enum Status
diff --git a/FlyleafLib/MediaRenderer/Renderer.cs b/FlyleafLib/MediaRenderer/Renderer.cs
index 1092f744..c1ceb6a3 100644
--- a/FlyleafLib/MediaRenderer/Renderer.cs
+++ b/FlyleafLib/MediaRenderer/Renderer.cs
@@ -205,11 +205,12 @@ public void Dispose()
                 Utilities.Dispose(ref context);
                 Utilities.Dispose(ref swapChain);
 
-                //deviceDbg.ReportLiveDeviceObjects(ReportingLevel.Detail);
-                Utilities.Dispose(ref device);
                 if (curSRVs != null) { for (int i=0; i<curSRVs.Length; i++) { Utilities.Dispose(ref curSRVs[i]); } curSRVs = null; }
                 disposed = true;
             }
+
+            //deviceDbg.ReportLiveDeviceObjects(ReportingLevel.Detail);
+            //Utilities.Dispose(ref device); // This will cause stack overflow sometimes
             
             pixelShaders = null;
             vertexShader = null;
@@ -422,11 +423,6 @@ public void TakeSnapshot(string fileName)
             snapshotBitmap.Dispose();
         }
 
-        private void Log(string msg)
-        {
-            #if DEBUG
-                Console.WriteLine($"[{DateTime.Now.ToString("hh.mm.ss.fff")}] [#{player.PlayerId}] [Renderer] {msg}");
-            #endif
-        }
+        private void Log(string msg) { System.Diagnostics.Debug.WriteLine($"[{DateTime.Now.ToString("hh.mm.ss.fff")}] [#{player.PlayerId}] [Renderer] {msg}"); }
     }
 }
\ No newline at end of file
diff --git a/FlyleafLib/Properties/AssemblyInfo.cs b/FlyleafLib/Properties/AssemblyInfo.cs
deleted file mode 100644
index e1e7ef59..00000000
--- a/FlyleafLib/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("FlyleafLib")]
-[assembly: AssemblyDescription("Video player library for WPF/WinForms based on FFmpeg/SharpDX")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("SuRGeoNix")]
-[assembly: AssemblyProduct("FlyleafLib")]
-[assembly: AssemblyCopyright("SuRGeoNix © 2021")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("31c6cbf5-1e30-475d-bc57-028eff3f0c91")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.1.10.0")]
-[assembly: AssemblyFileVersion("3.1.10.0")]
-
-[assembly: ThemeInfo(
-    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-                                     //(used if a resource is not found in the page,
-                                     // or application resource dictionaries)
-    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-                                              //(used if a resource is not found in the page,
-                                              // app, or any theme specific resource dictionaries)
-)]
\ No newline at end of file
diff --git a/FlyleafLib/Properties/Resources.Designer.cs b/FlyleafLib/Properties/Resources.Designer.cs
deleted file mode 100644
index e8dc5c78..00000000
--- a/FlyleafLib/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace FlyleafLib.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("FlyleafLib.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-    }
-}
diff --git a/FlyleafLib/Properties/Resources.resx b/FlyleafLib/Properties/Resources.resx
deleted file mode 100644
index 1af7de15..00000000
--- a/FlyleafLib/Properties/Resources.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/FlyleafLib/Utils.cs b/FlyleafLib/Utils.cs
index 2742aaea..6d39c5db 100644
--- a/FlyleafLib/Utils.cs
+++ b/FlyleafLib/Utils.cs
@@ -89,7 +89,6 @@ public static void EnsureThreadDone(Thread t, long maxMS = 2000, int minMS = 10)
             if (t.ManagedThreadId == Thread.CurrentThread.ManagedThreadId)
                 { Log($"Thread {t.Name} is not allowed to suicide!"); return; }
 
-
             long escapeInfinity = maxMS / minMS;
 
             while (t != null && t.IsAlive && escapeInfinity > 0)
@@ -101,7 +100,7 @@ public static void EnsureThreadDone(Thread t, long maxMS = 2000, int minMS = 10)
             if (t != null && t.IsAlive)
             {
                 Log($"Thread {t.Name} did not finished properly!");
-                throw new Exception($"Thread {t.Name} did not complete in time");
+                throw new Exception($"Thread {t.Name} did not finished properly!");
             }
         }
 
@@ -193,7 +192,7 @@ public static string ToHexadecimal(byte[] bytes)
         }
         public static int GCD(int a, int b) { return b == 0 ? a : GCD(b, a % b); }
         public static string TicksToTime(long ticks) { return new TimeSpan(ticks).ToString(@"hh\:mm\:ss\:fff"); }
-        private static void Log(string msg) { try { Console.WriteLine($"[{DateTime.Now.ToString("hh.mm.ss.fff")}] [MediaEngine] {msg}"); } catch (Exception) { Console.WriteLine($"[............] [MediaFramework] {msg}"); } } // System.ArgumentOutOfRangeException ???
+        private static void Log(string msg) { try { System.Diagnostics.Debug.WriteLine($"[{DateTime.Now.ToString("hh.mm.ss.fff")}] [MediaEngine] {msg}"); } catch (Exception) { System.Diagnostics.Debug.WriteLine($"[............] [MediaFramework] {msg}"); } } // System.ArgumentOutOfRangeException ???
         #endregion
 
         public unsafe static class FFmpeg
@@ -214,7 +213,7 @@ public static string ErrorCodeToMsg(int error)
                 var line = Marshal.PtrToStringAnsi((IntPtr)buffer);
                 Log(line.Trim());
             };
-            private static void Log(string msg) { try { Console.WriteLine($"[{DateTime.Now.ToString("hh.mm.ss.fff")}] [FFmpeg] {msg}"); } catch (Exception) { Console.WriteLine($"[............] [MediaFramework] {msg}"); } } // System.ArgumentOutOfRangeException ???
+            private static void Log(string msg) { try { System.Diagnostics.Debug.WriteLine($"[{DateTime.Now.ToString("hh.mm.ss.fff")}] [FFmpeg] {msg}"); } catch (Exception) { System.Diagnostics.Debug.WriteLine($"[............] [MediaFramework] {msg}"); } } // System.ArgumentOutOfRangeException ???
         }
 
         public static class NativeMethods
@@ -297,7 +296,7 @@ public static bool Convert(string fileNameIn, string fileNameOut, Encoding input
                     sw.Close();
 
                 }
-                catch (Exception e) { Console.WriteLine($"[Subs Convert] {e.Message}"); return false; }
+                catch (Exception e) { System.Diagnostics.Debug.WriteLine($"[Subs Convert] {e.Message}"); return false; }
 
                 return true;
             }
diff --git a/FlyleafLib/app.config b/FlyleafLib/app.config
deleted file mode 100644
index edf4545b..00000000
--- a/FlyleafLib/app.config
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration/>
\ No newline at end of file
diff --git a/FlyleafLib/packages.config b/FlyleafLib/packages.config
deleted file mode 100644
index e720177d..00000000
--- a/FlyleafLib/packages.config
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="FFmpeg.AutoGen" version="4.4.0" targetFramework="net472" />
-  <package id="NAudio.Core" version="2.0.0" targetFramework="net472" />
-  <package id="NAudio.Wasapi" version="2.0.0" targetFramework="net472" />
-  <package id="SharpDX" version="4.2.0" targetFramework="net472" />
-  <package id="SharpDX.Direct2D1" version="4.2.0" targetFramework="net472" />
-  <package id="SharpDX.Direct3D11" version="4.2.0" targetFramework="net472" />
-  <package id="SharpDX.DXGI" version="4.2.0" targetFramework="net472" />
-  <package id="SharpDX.Mathematics" version="4.2.0" targetFramework="net472" />
-</packages>
\ No newline at end of file
diff --git a/README.md b/README.md
index 085d8bc4..385b64f9 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@
 * Creating library's and WPF control's NuGet packages
 
 ### [Build Requirements]
-* .NET Framework 4.7.2 (Seems to be compatible with .NET 5)
+* .NET 5 / .NET Framework 4.7.2
 * FFmpeg shared libraries (compatible with FFmpeg.Autogen)
 * Use Master.RegisterFFmpeg(*ffmpeg_path*) to register them
 * To use plugins requires at least one time to build the solution in *Release* configuration
diff --git a/WinForms Sample (Basic)/App.config b/WinForms Sample (Basic)/App.config
deleted file mode 100644
index 56efbc7b..00000000
--- a/WinForms Sample (Basic)/App.config	
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
-    </startup>
-</configuration>
\ No newline at end of file
diff --git a/WinForms Sample (Basic)/BasicNaked.cs b/WinForms Sample (Basic)/BasicNaked.cs
index b529dc65..74ce71f4 100644
--- a/WinForms Sample (Basic)/BasicNaked.cs	
+++ b/WinForms Sample (Basic)/BasicNaked.cs	
@@ -26,7 +26,7 @@ private void Form1_Load(object sender, EventArgs e)
         {
             FlyleafLib.Master.RegisterFFmpeg(":2");
             player.Control = flyleaf1;
-            player.Open(@"../../../Sample.mp4");
+            player.Open(@"../../../../Sample.mp4");
             player.OpenCompleted += (o, x) => { if (x.success && x.type == FlyleafLib.MediaType.Video) player.Play(); };
         }
     }
diff --git a/WinForms Sample (Basic)/Program.cs b/WinForms Sample (Basic)/Program.cs
index 32c8e9b9..f9e3ad2b 100644
--- a/WinForms Sample (Basic)/Program.cs	
+++ b/WinForms Sample (Basic)/Program.cs	
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -9,13 +9,15 @@ namespace WinForms_Sample__Basic_
     static class Program
     {
         /// <summary>
-        /// The main entry point for the application.
+        ///  The main entry point for the application.
         /// </summary>
         [STAThread]
         static void Main()
         {
+            Application.SetHighDpiMode(HighDpiMode.SystemAware);
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
+
             //Application.Run(new BasicNaked());
             Application.Run(new TestingWPFwithinWinForms());
         }
diff --git a/WinForms Sample (Basic)/Properties/AssemblyInfo.cs b/WinForms Sample (Basic)/Properties/AssemblyInfo.cs
deleted file mode 100644
index 14b5a832..00000000
--- a/WinForms Sample (Basic)/Properties/AssemblyInfo.cs	
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("WinForms Sample (Basic)")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("WinForms Sample (Basic)")]
-[assembly: AssemblyCopyright("Copyright ©  2021")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("03425bfb-efcd-4f90-93b7-8a395adadff3")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/WinForms Sample (Basic)/Properties/Resources.Designer.cs b/WinForms Sample (Basic)/Properties/Resources.Designer.cs
deleted file mode 100644
index 9845ee8d..00000000
--- a/WinForms Sample (Basic)/Properties/Resources.Designer.cs	
+++ /dev/null
@@ -1,70 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-
-namespace WinForms_Sample__Basic_.Properties
-{
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources
-    {
-
-        private static global::System.Resources.ResourceManager resourceMan;
-
-        private static global::System.Globalization.CultureInfo resourceCulture;
-
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources()
-        {
-        }
-
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager
-        {
-            get
-            {
-                if ((resourceMan == null))
-                {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("WinForms_Sample__Basic_.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture
-        {
-            get
-            {
-                return resourceCulture;
-            }
-            set
-            {
-                resourceCulture = value;
-            }
-        }
-    }
-}
diff --git a/WinForms Sample (Basic)/Properties/Resources.resx b/WinForms Sample (Basic)/Properties/Resources.resx
deleted file mode 100644
index af7dbebb..00000000
--- a/WinForms Sample (Basic)/Properties/Resources.resx	
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/WinForms Sample (Basic)/Properties/Settings.Designer.cs b/WinForms Sample (Basic)/Properties/Settings.Designer.cs
deleted file mode 100644
index 7fb7d2b7..00000000
--- a/WinForms Sample (Basic)/Properties/Settings.Designer.cs	
+++ /dev/null
@@ -1,29 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-
-namespace WinForms_Sample__Basic_.Properties
-{
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
-    {
-
-        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
-        public static Settings Default
-        {
-            get
-            {
-                return defaultInstance;
-            }
-        }
-    }
-}
diff --git a/WinForms Sample (Basic)/Properties/Settings.settings b/WinForms Sample (Basic)/Properties/Settings.settings
deleted file mode 100644
index 39645652..00000000
--- a/WinForms Sample (Basic)/Properties/Settings.settings	
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>
diff --git a/WinForms Sample (Basic)/WinForms Sample (Basic).csproj b/WinForms Sample (Basic)/WinForms Sample (Basic).csproj
index c87192ba..c2e0f66c 100644
--- a/WinForms Sample (Basic)/WinForms Sample (Basic).csproj	
+++ b/WinForms Sample (Basic)/WinForms Sample (Basic).csproj	
@@ -1,149 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{03425BFB-EFCD-4F90-93B7-8A395ADADFF3}</ProjectGuid>
     <OutputType>WinExe</OutputType>
+    <TargetFramework>net5.0-windows</TargetFramework>
     <RootNamespace>WinForms_Sample__Basic_</RootNamespace>
-    <AssemblyName>WinForms Sample %28Basic%29</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Deterministic>true</Deterministic>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
+    <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <LangVersion>7.3</LangVersion>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <LangVersion>7.3</LangVersion>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Dragablz, Version=0.0.3.223, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dragablz.0.0.3.223\lib\net45\Dragablz.dll</HintPath>
-    </Reference>
-    <Reference Include="MaterialDesignColors, Version=2.0.0.2422, Culture=neutral, PublicKeyToken=df2a72020bd7962a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MaterialDesignColors.2.0.0\lib\net452\MaterialDesignColors.dll</HintPath>
-    </Reference>
-    <Reference Include="MaterialDesignThemes.Wpf, Version=4.0.0.2422, Culture=neutral, PublicKeyToken=df2a72020bd7962a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MaterialDesignThemes.4.0.0\lib\net452\MaterialDesignThemes.Wpf.dll</HintPath>
-    </Reference>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xaml" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-    <Reference Include="UIAutomationProvider" />
-    <Reference Include="WindowsBase" />
-    <Reference Include="WindowsFormsIntegration" />
-    <Reference Include="WpfColorFontDialog, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\WpfColorFontDialog.1.0.8\lib\net40\WpfColorFontDialog.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="BasicNaked.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="BasicNaked.Designer.cs">
-      <DependentUpon>BasicNaked.cs</DependentUpon>
-    </Compile>
-    <Compile Include="TestingWPFwithinWinForms.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="TestingWPFwithinWinForms.Designer.cs">
-      <DependentUpon>TestingWPFwithinWinForms.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="BasicNaked.resx">
-      <DependentUpon>BasicNaked.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="TestingWPFwithinWinForms.resx">
-      <DependentUpon>TestingWPFwithinWinForms.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <None Include="packages.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\FlyleafLib.Controls.WPF\FlyleafLib.Controls.WPF.csproj">
-      <Project>{6FD09EC0-AECE-4534-911B-8457633A9CEB}</Project>
-      <Name>FlyleafLib.Controls.WPF</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\FlyleafLib\FlyleafLib.csproj">
-      <Project>{31c6cbf5-1e30-475d-bc57-028eff3f0c91}</Project>
-      <Name>FlyleafLib</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\FlyleafLib.Controls.WPF\FlyleafLib.Controls.WPF.csproj" />
+    <ProjectReference Include="..\FlyleafLib\FlyleafLib.csproj" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\MaterialDesignThemes.4.0.0\build\MaterialDesignThemes.targets" Condition="Exists('..\packages\MaterialDesignThemes.4.0.0\build\MaterialDesignThemes.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\MaterialDesignThemes.4.0.0\build\MaterialDesignThemes.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MaterialDesignThemes.4.0.0\build\MaterialDesignThemes.targets'))" />
-  </Target>
+
 </Project>
\ No newline at end of file
diff --git a/WinForms Sample (Basic)/packages.config b/WinForms Sample (Basic)/packages.config
deleted file mode 100644
index e181a236..00000000
--- a/WinForms Sample (Basic)/packages.config	
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Dragablz" version="0.0.3.223" targetFramework="net472" />
-  <package id="MaterialDesignColors" version="2.0.0" targetFramework="net472" />
-  <package id="MaterialDesignThemes" version="4.0.0" targetFramework="net472" />
-  <package id="WpfColorFontDialog" version="1.0.8" targetFramework="net472" />
-</packages>
\ No newline at end of file
diff --git a/Wpf Samples/App.config b/Wpf Samples/App.config
deleted file mode 100644
index 9c8afe08..00000000
--- a/Wpf Samples/App.config	
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
-    </startup>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <probing privatePath=".;Libs;" />
-    </assemblyBinding>
-  </runtime>
-</configuration>
\ No newline at end of file
diff --git a/Wpf Samples/AssemblyInfo.cs b/Wpf Samples/AssemblyInfo.cs
new file mode 100644
index 00000000..8b5504ec
--- /dev/null
+++ b/Wpf Samples/AssemblyInfo.cs	
@@ -0,0 +1,10 @@
+using System.Windows;
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+                                     //(used if a resource is not found in the page,
+                                     // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+                                              //(used if a resource is not found in the page,
+                                              // app, or any theme specific resource dictionaries)
+)]
diff --git a/Wpf Samples/Flyleaf.png b/Wpf Samples/Flyleaf.png
deleted file mode 100644
index 32c539553497439927e982669e63d3ed79b9cb46..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4427
zcmb7{^;=X=*v9DwX#rtbLY9{9SiohMj-?xvkPby!8l+j^3zD)Riy$3J%E}Uof?yzE
zfP{ofsf6IXyYD~nUhj3ynK|doGxt2t=RWhpxoc^TWM<%FAR{AVHbPysCXT11i;j}m
zKUHYDKt@JMW@&1JK!%#8z(Mp?U}FPn)B!pKRO^6bLr`D{uv%c`G8h&Ew-I0n2H-v*
zK_5Jp0L`+XQyLVj0h}BdgpmR?-9gM%&@BZrbU>pVh%f|q^nm;|((*A8QW!D5ULHIZ
z1Es2@_*)2&rUSCIK$0G)R0dMsz}FPS836oc&?XJ~#lZj!$a;fOQE=56VAR1gQIM|*
zWUrGlA&Q5fK)wcPBcgJ;E>Q3yi4gB$zTkm85WN8|`vDDikfsZg;iSGo8MMlPTZSOO
z7_`U$EjM6?29DOi)e;ywk<wOo2li-SYeSMM)BsgVBsDb;5M%_zeZgIA5Q+q*_N3aS
zy#WyyF^66W5P<~c%AiP{wARWN=(&&*hWZ196G`999z>1-Z&PsPI%ySg3%Cn#vjEF2
zAf5oC$H1#j@TMI^je(?5kopX)wt%HJFw+6v6Z>`&@SYy9{s>$O1Ofq|bcobCACokT
zN<n2hc=8zZNsy2dIS+_~b{Wtj3$nC<qz{QUvHW2eh&2EsVkFn9ltHf~(03sLDOVxo
zPb|Fo3W-%D0vJ1zAP{pVR{e}<+5gfmQw2^|z{?ycd67^PnX7t|tRY&Qs0Xy&K(RUy
z3;;6Tq)Lh9OZ$*`dYh4q^EDxHBhuy%1P>HIodOW^15pUlXO^P{QgunL)hK~lMIh`?
zGQB_pl&AqAe=s2o2%;nlCcA*HE3mL5!9m*scMI@X68M{d`%0ie9#ks<tRi^Q3%VbJ
z_9viv5a9Yjb05GCfT136ZwM4V1tr4(-wkp`Kqel1ZY6=eIZgr|O91n2pr#V!#()ej
zaD(c+f_Nl~Zd#k8$;`z#7#Ue9Xn2d%)oplJ(p-gt6b*f4TVL<3g!`zqW?D*Cx=#%v
zu-Y;ok&vnABkZoo@{ap-hWGESdw&vVpA2CRUSIv*s`IuWZnwkb!ARiR!F%g(&0d7l
zwxhtJ<cg1rwGnrZvp<XsZf4&8eY}|1d+2|f5b=2y)Au~dpvkC9s&IexhU5|c`Dtv~
zAG@uh0r{~_3gQv=HM**2!^8U>?}%E8rl8#mIhfIXN~M4BIxV$eEy$=?^omf*T?U4)
z^jQ}nl+}$-8l#r}>TFgH{9R7TM!~I`jxD<#u=SAvnl#(g@nsn|a1XA;?oPk_`TcwF
zz|PH_@v}Q1YE6)R;OPu4)2Q74*-Z8KoJv1?%?@-+p4C8Q|5_Tjng5)?yY{I^%ak|`
z&UF8=IOx}9$=VF=SdOpnWLm#PdtvT}P*fZ16fC+g2`<+T<6)wr#KYxSNrMM*807fg
zyE?RTu(nQ<hfSJ@O>}Syua1wlS>QKU^9q@a|MPvy7s*Apwx@>A91=R3?oeJPyl9&m
z;>gBDR-#(*KXJFK$Hg+12`kzQ?kId7hoO7v-!vt@P|RL+<rmbto~k*Ey~)pz%fAvQ
z=sjl=&X)HnCAPxYiL(<Kg%w5is%mTd#VoyR>smT+9ZXH6-0i5P)fK;RKI236)K$qt
z|BSkJk%hi(|BPK`B)USoY{npSq(oJEI(e<3tw|tn!_7RqDntD1LjmqOq(Ya?r|brm
z*h%W-My(^l9?I=x;RxIK>QAUzYI^KVTw%BL!cm<X`o&6UchAworh<Cn^H>$+=E`2v
zPc*ZT#8wv)@y>36KJS^L@dG4#xNUBhhIaiJ+j{<7rQyM>igd1QuC<Kq`s(JdI;C4E
z6&I6v4BhQ~?ulA=YzMTj!1@T2sR)5gTyw{&rL0*;pPtM`G&RNXUzCV9x5~PXoq^zX
z{NIbv*skikYGG*YRn6yZzrm$5V_h1ljZ%vHCvf8uAGP_tigab)K0tI%>MA1EW!Kr7
zHzaB`MCn_jvtE39F5=@dUkoqhHcBe)$N7D%(h_~Gc=>Hgy@$G@!RpU7A?nZCBFh_v
zRLA|i<--uj+~z&DCPVf{=?cecw#}VoC|l5%95^$3et=uGBe#DfT(Ume5tV;c<X!v}
z=THo4V))EU-I|vDmDOP~cASEK-}{QNjQt*}eS0`V-@By1=FmWhk=<nJuVrIfQAWL_
zAj2(aN7Ix$gK~h74D!SziI0ojXi4*LxQcZygdP3vrD2StEK=C^zgG;!w))||zG+Q`
z@UsQSS{4YVxth!0kYY<}gDPgdpt>Q>{C+a>S;6!{AIiHVlM=a53GZX1AN@V8UB1*d
zn1bXF<%-a^6E#g(s6#1-6H=Ns3N2ymX*Y*sIBN&_!t{(G^d(TMC!g&LjnxPf3-%O;
z%95g)4S_oPX<T7*@>gu|disk~=NDyvxo?EYS!>G)u1M#rJ*>ItAW>?d5C={KBVGD(
zDEBTOvPmjsUVJn7I*|sm1=cTkPP-$N^0G?KX*6tz@3USfGFh**ooVXp5***yS3gQ^
zehm#amEwF?K({h;M<$fq%aqdM4{xKrQ1Et*Wf_z!d_5p5!Ll$1_E-4^tL|?L@ok}d
zjNpDh14HZi?*v}0uecw|V~(he?Jrx?2B^>7{TBU9`vwYj5(>~Ni>I}xe=4Rjuba6u
zA1&TTob9FCW-(Db->Zq2`pO{8dF7F8DzBVKUhxmcW=0BLs=1T15HFq8j{F;*H4Qd|
z!rmK6!YOe5ntxVr5vc*rA8@Hi{^u3k;tF)4gfIWH8{Hkz0$K@J$$Ly)%QA*qj&EQR
zi%@2alZ*RYwa&?g1@^Of@S#diY4^RXCD^F?dM3_mR}`TwI^w*uG*qM;educy0z(vw
zvm)z*FypCZ5?Rcjx3ok4LAQS>xyCqmq#F#1Grdt7%Pi3v)f5Omf3=G^zg_Mh6cpne
z6I<a}m$=41eS@KmNj|*z(T~+zd<o~8R*uuZl&yAl0+z~|#G3io=jz+6>H}Csx^Bl?
zpbf($$%D^rUj~s8Y9*ZVy#nJarY*0pL+QJ2SLwr$fvA-avaUn?n!$HqU&Rtc=W_+F
z#|KtSd(1VmUa}qM$wlY#^yL27dr)EX;nu!X({6BM`>WbZOY4U(_!Wv?Z3%G9Zc7)d
zhX(q8<4K#j56`iV6EatR=6ag79T6C@85eu=VN}MXH-e_h!Y}aUx5KSKAN4$gy2Dvc
zc0$vq#|F5oYS_Vji!7554ew7PWi-@N(N1P6Rr%(=a=5RVrY$;Ic8Xr(GU;V(EAM~b
zp|3=fTXIYPloyBAcXNC5UVNBC)5V|Bpd>xV(~?=`BQMIuHra9s+zmA%hp$wAK%=0^
zldpP{5t3Cc4!NVKpvwCa1qKun9723_;#cAYf1a9Az)O@nCQ>(xJN3U&+3MArrcstT
z!~B?xQF_{J)>K*9--a*rC79&~5qfz$-<^`P=t)RPm$5EZ`n}S)oT2t0s7Nvw&PQFL
zd6VIFV~CsP(Jb;?tE<g&Rd<VPivmA4tZPd}Bq%62c$=X`((?RKSoXMhij8?tT76R9
zGLmYy?0g`{j-QVls_NSljM)2o?%d+&qbyvAwbM0A;>TDipBh|Ov&_0vYLy~_o@8J=
zQ<}!wq@sOKkY}7K)S{w?`QPRIL&^HWL<x=f{YeY&6Qnrb8*94A$s7^ROD#BP%d<k(
zYYbRx?wnK}Wi_3jloesASb3Q=GRs93Lq9&Wki6}C6smz~HttEsYO7UB8EeT)AO2cD
zQxmfrAMc-9(m$6-8187!gui__AaqY6v&#67=LXG~Ym=$sSG|+$fq~Aqtc959+sFo{
zIm@#)?I$<PL~<#~{)ODD@*Q{dH1wq*r0mYUPq~u0!S2d=!GudI+DJ<}s$i|4ZT5nP
zm7b_L9Yi!pn<{*dkua)XPahPFsTaI<&5)yR<`^^m#`V8%N7?85N2O*i|4vvYkArrn
z>PGDo#~^Oggb}r~zfXr>_7P0N;0%j>aR=$tIYT?VQamOJU9k`Q#x-A(8FhTxL1xH1
zuwQyvKN9-r-R=00#K#j9j&1QNFxuT^^{Jm8{ujvU5Ab9msx*W!%@lPB?hOGKvlAX@
zl9B5c&#@O1>rw3T_AK;obrP~;ctbLPoZXH3G|HYMLsP3@{Kxkr-`3L%I~Jw5Ufp#H
zisPYw8nGcs-Sf2Puqp#7T8`@Jw=6st9J>St|7q1Ql6$toea%N+kWE%e2-2n(#aA&?
zd+`^HId)a4F9>{|pZh+5_Z!5e&Ex4E)S=mC*PSE&IHT?4czj>=?r9Bk+l{;+x5~8m
z@fh;SRqM&Vker=ZXwt3HVsghWnVbPTXnLZwPR|`&-;-IFNe}TOJhNMG<}zfbZ<O(R
zq8xEXUcP+Mq7SbYx9yYqZDoZ#*>ss=cZ4~$<L-AqB|h_9!#c{l<OXtgf3eQMMmXLp
zJ{vIVfb-ZhG5IE#)@z5X;KC4pS!ZO0q6`;7lJ9Nu8>Xi&ij^I(k9&#**L5dMU_1_@
zOBoKj>FSV4jJeX|ZxI*-#Eq^G1A7cpdklfd9gnDgmis}04ab!)QJ)B3STbl`dzd%K
z6g7Cxy?ge4luX^_^d`2VSbM98`UFeeoBZ-QTHra;W;o8`m#7Tfw4s@eoJZnLzxcfZ
zPjuz=-ECCA2iKO3y#{5y=yo}isRR3;pTe<{qxcxpS+{x5Qr1VQ7*}na&_z~EbAZF^
z`#G>ruEo<_GVK_I>HMt^+5C^t+pSP?-u1<+Lu3|e_OdqaUPt0gn+2n_<tzgPe9T6F
zYq07Xg|L1Ptx8mS$wBQY#!{zn#e)sD;2#sno@`dU-JJRnPUi0y*q&J$Uc1<7>1N{)
z^_813*NJjwL%*G^)y4Ti@U@Ys##)I{1%h#(CG&)jg7Y#&Wc^aE8|9U@kp`_EWp+5c
z@#sFDoO|_vlP}x9$EnV0@@@mF?bE1##<SoLoR@+haeT!`t@j#|X`@(!a=nKl2j=}&
z5mzB9W6_Mczl}WxKRR4Xww3mmeOoaP*^z2y3VeYP|D{q$yILYyPIsX>EX!}FM=(d~
zbdiM`@56)W?oqWNTXmE~dphJFEsmFzjI&kfN;hS_jJTg4Hel@O9Lq=z9kHqk7j~eh
z*8>^b48Fc4#@<?1eX4oILI2u~nEtbAvsd_X*yL}ily<&8`K0qfhaeqmlVSq-FFF0!
zf)86G?Hm<aJ#wV3+^3*#*f4#!yY5NeDUJ{ATMV?Tkg{p^RePuS=*2?s3x3wbvZx62
z1)(M%1S{3pBO0^3<BW}=e8CDSTl(xtc>3j-v$dW5NUT`b0w;Ja`VdMc5qGwe%|C%4
z$5X+Y#qQJ_rKiw_m+j$N5d3bCYCZ0*&CCQP2N&|r;^QM3{*x363N5=m4T0IZYX<!4
zoKTi~t2L_Zx2ULD-miSz@c1C8{qGltFiS~>`{<9H1n2dLx4TM*?ab3Hjpj(Lm|yXl
z?sa*X#AW-=D6{>#5EJ3B3?nXwD0#w^&pY18<JH-^-DZBox#z5u+}`dobr;{wa#Jzf
z8^?okE>%iHJv#D$Lh7;awkg;*TS{hXRd^4h-;&7{X+WEb6JhoLY3CQuDP1(2l4E&v
SC5eB8WJU<{tF8JT$^QdzpPJGD

diff --git a/Wpf Samples/Properties/AssemblyInfo.cs b/Wpf Samples/Properties/AssemblyInfo.cs
deleted file mode 100644
index d297233a..00000000
--- a/Wpf Samples/Properties/AssemblyInfo.cs	
+++ /dev/null
@@ -1,55 +0,0 @@
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Flyleaf")]
-[assembly: AssemblyDescription("WPF Video Player Control/Element (based on FlyleafLib)")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("SuRGeoNix")]
-[assembly: AssemblyProduct("Flyleaf")]
-[assembly: AssemblyCopyright("Copyright © 2021")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-//In order to begin building localizable applications, set
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[assembly: ThemeInfo(
-    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-                                     //(used if a resource is not found in the page,
-                                     // or application resource dictionaries)
-    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-                                              //(used if a resource is not found in the page,
-                                              // app, or any theme specific resource dictionaries)
-)]
-
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.1.10.0")]
-[assembly: AssemblyFileVersion("3.1.10.0")]
diff --git a/Wpf Samples/Properties/Resources.Designer.cs b/Wpf Samples/Properties/Resources.Designer.cs
deleted file mode 100644
index c5a2e341..00000000
--- a/Wpf Samples/Properties/Resources.Designer.cs	
+++ /dev/null
@@ -1,70 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-
-namespace Wpf_Samples.Properties
-{
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources
-    {
-
-        private static global::System.Resources.ResourceManager resourceMan;
-
-        private static global::System.Globalization.CultureInfo resourceCulture;
-
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources()
-        {
-        }
-
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager
-        {
-            get
-            {
-                if ((resourceMan == null))
-                {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Wpf_Samples.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture
-        {
-            get
-            {
-                return resourceCulture;
-            }
-            set
-            {
-                resourceCulture = value;
-            }
-        }
-    }
-}
diff --git a/Wpf Samples/Properties/Resources.resx b/Wpf Samples/Properties/Resources.resx
deleted file mode 100644
index af7dbebb..00000000
--- a/Wpf Samples/Properties/Resources.resx	
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/Wpf Samples/Properties/Settings.Designer.cs b/Wpf Samples/Properties/Settings.Designer.cs
deleted file mode 100644
index 87073221..00000000
--- a/Wpf Samples/Properties/Settings.Designer.cs	
+++ /dev/null
@@ -1,29 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-
-namespace Wpf_Samples.Properties
-{
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
-    {
-
-        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
-        public static Settings Default
-        {
-            get
-            {
-                return defaultInstance;
-            }
-        }
-    }
-}
diff --git a/Wpf Samples/Properties/Settings.settings b/Wpf Samples/Properties/Settings.settings
deleted file mode 100644
index 033d7a5e..00000000
--- a/Wpf Samples/Properties/Settings.settings	
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>
\ No newline at end of file
diff --git a/Wpf Samples/Sample1_Basic.xaml b/Wpf Samples/Sample1_Basic.xaml
index 3915ae7c..e9b0cfd5 100644
--- a/Wpf Samples/Sample1_Basic.xaml	
+++ b/Wpf Samples/Sample1_Basic.xaml	
@@ -8,7 +8,7 @@
         
         xmlns:fl="clr-namespace:FlyleafLib.Controls.WPF;assembly=FlyleafLib"
         xmlns:flwpf="clr-namespace:FlyleafLib.Controls.WPF;assembly=FlyleafLib.Controls.WPF"
-        Title="Flyleaf v3.1.10" Height="450" Width="800" Background="Black" Icon="Flyleaf.png" Loaded="Window_Loaded">
+        Title="Flyleaf v3.1.11" Height="450" Width="800" Background="Black" Icon="/Flyleaf.ico" Loaded="Window_Loaded">
     <Grid>
         <fl:VideoView Player="{Binding Player}">
             <flwpf:Flyleaf x:Name="flyleafControl"/>
diff --git a/Wpf Samples/Sample1_Basic.xaml.cs b/Wpf Samples/Sample1_Basic.xaml.cs
index d9bebcbb..2cdb69cf 100644
--- a/Wpf Samples/Sample1_Basic.xaml.cs	
+++ b/Wpf Samples/Sample1_Basic.xaml.cs	
@@ -1,5 +1,4 @@
 using System;
-using System.Threading;
 using System.Windows;
 
 using FlyleafLib;
diff --git a/Wpf Samples/Sample3_MultiPlayer.xaml b/Wpf Samples/Sample3_MultiPlayer.xaml
index 577135d3..9d12acfb 100644
--- a/Wpf Samples/Sample3_MultiPlayer.xaml	
+++ b/Wpf Samples/Sample3_MultiPlayer.xaml	
@@ -3,10 +3,10 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:Wpf_Samples"
+        mc:Ignorable="d"
+        
         xmlns:fl="clr-namespace:FlyleafLib.Controls.WPF;assembly=FlyleafLib"
         xmlns:flwpf="clr-namespace:FlyleafLib.Controls.WPF;assembly=FlyleafLib.Controls.WPF"
-        mc:Ignorable="d"
         Title="Sample3_MultiPlayer" Height="450" Width="800" Background="Black" Loaded="Window_Loaded">
     <Grid x:Name="grid1">
         <Grid.ColumnDefinitions>
diff --git a/Wpf Samples/Wpf Samples.csproj b/Wpf Samples/Wpf Samples.csproj
index 52217800..3f5d7ae3 100644
--- a/Wpf Samples/Wpf Samples.csproj	
+++ b/Wpf Samples/Wpf Samples.csproj	
@@ -1,197 +1,36 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{DC0B8BD8-BC22-4B04-B0C6-0FEB83D8345F}</ProjectGuid>
     <OutputType>WinExe</OutputType>
+    <TargetFramework>net5.0-windows</TargetFramework>
     <RootNamespace>Wpf_Samples</RootNamespace>
-    <AssemblyName>Flyleaf</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Deterministic>true</Deterministic>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <LangVersion>7.3</LangVersion>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <LangVersion>7.3</LangVersion>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup>
+    <UseWPF>true</UseWPF>
+    <AssemblyName>FlyleafPlayer</AssemblyName>
     <ApplicationIcon>Flyleaf.ico</ApplicationIcon>
+    <Platforms>AnyCPU;x64</Platforms>
+    <Authors>SuRGeoNix</Authors>
+    <Company>SuRGeoNix</Company>
+    <Copyright>SuRGeoNix © 2021</Copyright>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="WindowsFormsIntegration" />
-  </ItemGroup>
-  <ItemGroup>
-    <ApplicationDefinition Include="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-    <Compile Include="Sample2_Custom.xaml.cs">
-      <DependentUpon>Sample2_Custom.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Sample2_ViewModel.cs" />
-    <Compile Include="Sample3_MultiPlayer.xaml.cs">
-      <DependentUpon>Sample3_MultiPlayer.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Sample4_Downloader.xaml.cs">
-      <DependentUpon>Sample4_Downloader.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Issue40.xaml.cs">
-      <DependentUpon>Issue40.xaml</DependentUpon>
-    </Compile>
-    <Page Include="Sample1_Basic.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sample1_Basic.xaml.cs">
-      <DependentUpon>Sample1_Basic.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Page Include="Sample2_Custom.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Sample3_MultiPlayer.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Sample4_Downloader.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Issue40.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
+    <None Remove="Flyleaf.ico" />
   </ItemGroup>
+
   <ItemGroup>
-    <Resource Include="Flyleaf.png" />
+    <ProjectReference Include="..\FlyleafLib.Controls.WPF\FlyleafLib.Controls.WPF.csproj" />
   </ItemGroup>
+
   <ItemGroup>
     <Resource Include="Flyleaf.ico" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\FlyleafLib.Controls.WPF\FlyleafLib.Controls.WPF.csproj">
-      <Project>{6fd09ec0-aece-4534-911b-8457633a9ceb}</Project>
-      <Name>FlyleafLib.Controls.WPF</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\FlyleafLib\FlyleafLib.csproj">
-      <Project>{31c6cbf5-1e30-475d-bc57-028eff3f0c91}</Project>
-      <Name>FlyleafLib</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>mkdir "$(SolutionDir)"Plugins
-xcopy "$(SolutionDir)"Plugins Plugins\ /E /Y
-
-if $(ConfigurationName) == Release (
-
-mkdir Libs\
-del /S /F /Q Libs\
 
-if $(PlatformName) == AnyCPU (
-  xcopy "$(SolutionDir)"Libs\* Libs\  /E /Y
-)
-if $(PlatformName) == x64 (
-  xcopy "$(SolutionDir)"Libs\x64\* Libs\x64\  /E /Y
-)
-
-move *.dll Libs\
-
-del *.xml
-del *.pdb
-del FlyleafLib*.config
-
-)</PostBuildEvent>
-  </PropertyGroup>
-  <PropertyGroup>
-    <PreBuildEvent>del /S /F /Q "$(TargetDir)"</PreBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="if not exist &quot;$(SolutionDir)Plugins&quot; mkdir &quot;$(SolutionDir)Plugins&quot;&#xD;&#xA;xcopy &quot;$(SolutionDir)Plugins&quot; &quot;$(TargetDir)Plugins\&quot; /E /Y&#xD;&#xA;&#xD;&#xA;if not exist &quot;$(TargetDir)Libs&quot; mkdir &quot;$(TargetDir)Libs&quot;&#xD;&#xA;&#xD;&#xA;if $(PlatformName) == AnyCPU (&#xD;&#xA;  xcopy &quot;$(SolutionDir)Libs\*&quot; &quot;$(TargetDir)Libs&quot; /E /Y&#xD;&#xA;)&#xD;&#xA;if $(PlatformName) == x64 (&#xD;&#xA;  xcopy &quot;$(SolutionDir)Libs\x64\*&quot; &quot;$(TargetDir)Libs\x64\&quot; /E /Y&#xD;&#xA;)" />
+  </Target>
+  
+  <Target Name="PostPublish" AfterTargets="Publish">
+	<Exec Command="del /S /F /Q &quot;$(PublishDir)Plugins\&quot;&#xD;&#xA;rmdir /S /Q &quot;$(PublishDir)Plugins\&quot;&#xD;&#xA;del /S /F /Q &quot;$(PublishDir)Libs\&quot;&#xD;&#xA;rmdir /S /Q &quot;$(PublishDir)Libs\&quot;&#xD;&#xA;del &quot;$(PublishDir)*.pdb&quot;&#xD;&#xA;del &quot;$(PublishDir)*.xml&quot;&#xD;&#xA;&#xD;&#xA;if not exist &quot;$(PublishDir)Plugins&quot; mkdir &quot;$(PublishDir)Plugins&quot;&#xD;&#xA;if not exist &quot;$(PublishDir)Libs&quot; mkdir &quot;$(PublishDir)Libs&quot;&#xD;&#xA;&#xD;&#xA;xcopy &quot;$(TargetDir)Libs\*&quot; &quot;$(PublishDir)Libs&quot; /E /Y&#xD;&#xA;xcopy &quot;$(SolutionDir)Plugins\*&quot; &quot;$(PublishDir)Plugins&quot; /E /Y" />
+  </Target>
+  
+</Project>