diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 0000000..f720be4
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+    <PropertyGroup>
+        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+        <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
+        <ApplicationVersion>4.9.0.0</ApplicationVersion>
+		<AssemblyVersion>$(ApplicationVersion)</AssemblyVersion>
+		<FileVersion>$(ApplicationVersion)</FileVersion>
+        <LangVersion>latest</LangVersion>
+
+        <TargetFrameworks>netstandard2.0;net35;net40;net6.0;net6.0-windows</TargetFrameworks>
+        <Platforms>x64;x86</Platforms>
+
+        <SignAssembly>True</SignAssembly>
+        <AssemblyOriginatorKeyFile>$(SolutionDir)\libs\MicrosoftIris\36MSApp1024.snk</AssemblyOriginatorKeyFile>
+        <DelaySign>True</DelaySign>
+
+        <UseOpenZune>False</UseOpenZune>
+    </PropertyGroup>
+
+	<ItemGroup>
+		<None Include="**\*.lg.cs" Exclude="bin\**\*.lg.cs;obj\**\*.lg.cs" />
+		<Compile Remove="**\*.lg.cs" Condition="$(UseOpenZune)" />
+		<Compile Include="**\*.lg.cs"
+                 Exclude="bin\**\*.lg.cs;obj\**\*.lg.cs"
+                 Condition="!$(UseOpenZune)" />
+
+		<None Include="**\*.oz.cs" Exclude="bin\**\*.oz.cs;obj\**\*.oz.cs" />
+		<Compile Remove="**\*.oz.cs" Condition="!$(UseOpenZune)" />
+		<Compile Include="**\*.oz.cs"
+                 Exclude="bin\**\*.oz.cs;obj\**\*.oz.cs"
+                 Condition="$(UseOpenZune)" />
+	</ItemGroup>
+
+	<Choose>
+		<When Condition=" $(TargetFramework.StartsWith('net6.0-windows')) ">
+			<PropertyGroup>
+				<UseOpenZune>True</UseOpenZune>
+
+				<DefineConstants Condition="$(TargetFramework.StartsWith('net6.0-windows10'))">$(DefineConstants);WINDOWS10</DefineConstants>
+				<DefineConstants Condition="$(TargetFramework.StartsWith('net6.0-windows8'))">$(DefineConstants);WINDOWS8</DefineConstants>
+			</PropertyGroup>
+		</When>
+
+		<When Condition=" $(TargetFramework.StartsWith('net6.0')) ">
+			<PropertyGroup>
+				<UseOpenZune>True</UseOpenZune>
+			</PropertyGroup>
+		</When>
+
+		<!--
+            .NET Core 3.1 is only used to target Windows 8/8.1
+        -->
+		<When Condition=" $(TargetFramework.StartsWith('netcoreapp')) ">
+			<PropertyGroup>
+				<UseOpenZune>True</UseOpenZune>
+			</PropertyGroup>
+		</When>
+	</Choose>
+
+    <PropertyGroup Condition="$(UseOpenZune)">
+        <ApplicationVersion>5.0.0.0</ApplicationVersion>
+        <DefineConstants>$(DefineConstants);OPENZUNE</DefineConstants>
+    </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/ZuneImpl/ZuneImpl.csproj b/ZuneImpl/ZuneImpl.csproj
index 47fa9dd..2aa6a65 100644
--- a/ZuneImpl/ZuneImpl.csproj
+++ b/ZuneImpl/ZuneImpl.csproj
@@ -1,22 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-        <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
         <OutputType>Library</OutputType>
         <AssemblyName>ZuneImpl</AssemblyName>
-        <ApplicationVersion>4.8.0.0</ApplicationVersion>
-        <LangVersion>latest</LangVersion>
-
-        <TargetFrameworks>netstandard2.0;net35;net40;net6.0;net6.0-windows</TargetFrameworks>
-        <Platforms>x64;x86</Platforms>
         <RootNamespace>Microsoft.Zune</RootNamespace>
-
-        <SignAssembly>True</SignAssembly>
-        <AssemblyOriginatorKeyFile>..\libs\MicrosoftIris\36MSApp1024.snk</AssemblyOriginatorKeyFile>
-        <DelaySign>True</DelaySign>
-
-        <UseOpenZune>False</UseOpenZune>
     </PropertyGroup>
 
     <ItemGroup>
@@ -29,48 +16,31 @@
         <PackageReference Include="Zune.Xml" Version="0.1.0" />
 
         <ProjectReference Include="..\libs\MicrosoftIris\UIX\UIX.csproj" />
+    </ItemGroup>
 
-        <None Include="**\*.lg.cs" Exclude="bin\**\*.lg.cs;obj\**\*.lg.cs" />
-        <Compile Remove="**\*.lg.cs" />
-        <Compile Include="**\*.lg.cs"
+	<ItemGroup>
+		<None Include="**\*.lg.cs" Exclude="bin\**\*.lg.cs;obj\**\*.lg.cs" />
+		<Compile Remove="**\*.lg.cs" />
+		<Compile Include="**\*.lg.cs"
                  Exclude="bin\**\*.lg.cs;obj\**\*.lg.cs"
                  Condition="!$(UseOpenZune)" />
 
-        <None Include="**\*.oz.cs" Exclude="bin\**\*.oz.cs;obj\**\*.oz.cs" />
-        <Compile Remove="**\*.oz.cs" />
-        <Compile Include="**\*.oz.cs"
+		<None Include="**\*.oz.cs" Exclude="bin\**\*.oz.cs;obj\**\*.oz.cs" />
+		<Compile Remove="**\*.oz.cs" />
+		<Compile Include="**\*.oz.cs"
                  Exclude="bin\**\*.oz.cs;obj\**\*.oz.cs"
                  Condition="$(UseOpenZune)" />
-    </ItemGroup>
-
-    <Choose>
-        <When Condition=" $(TargetFramework.StartsWith('net6.0')) ">
-            <PropertyGroup>
-                <UseOpenZune>True</UseOpenZune>
-                <DefineConstants>$(DefineConstants);NETSTANDARD2_1_OR_GREATER</DefineConstants>
-            </PropertyGroup>
-        </When>
-        <When Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-            <PropertyGroup>
-                <UseOpenZune>True</UseOpenZune>
-            </PropertyGroup>
-        </When>
-    </Choose>
+	</ItemGroup>
 
     <ItemGroup Condition="$(UseOpenZune)">
-        <PackageReference Include="StrixMusic.Sdk" Version="0.0.11-alpha" />
-        <PackageReference Include="StrixMusic.Cores.LocalFiles" Version="1.0.0" />
+        <PackageReference Include="StrixMusic.Sdk" Version="0.0.12-alpha" />
+        <PackageReference Include="StrixMusic.Cores.LocalFiles" Version="0.0.12-alpha" />
 
         <PackageReference Include="LibVLCSharp" Version="3.6.6" />
 
         <PackageReference Include="Meziantou.Framework.Win32.CredentialManager" Version="1.4.2" />
     </ItemGroup>
 
-    <PropertyGroup Condition="$(UseOpenZune)">
-        <ApplicationVersion>5.0.0.0</ApplicationVersion>
-        <DefineConstants>$(DefineConstants);OPENZUNE</DefineConstants>
-    </PropertyGroup>
-
     <ItemGroup Condition="!$(UseOpenZune)">
         <ProjectReference Include="..\libs\Meziantou.Framework.Win32.CredentialManager\Meziantou.Framework.Win32.CredentialManager.csproj" />
     </ItemGroup>
diff --git a/ZuneShell.sln b/ZuneShell.sln
index be3ed2a..522f22d 100644
--- a/ZuneShell.sln
+++ b/ZuneShell.sln
@@ -20,6 +20,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZuneImpl", "ZuneImpl\ZuneIm
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meziantou.Framework.Win32.CredentialManager", "libs\Meziantou.Framework.Win32.CredentialManager\Meziantou.Framework.Win32.CredentialManager.csproj", "{90A89707-927E-48D2-BFEB-84F95F531258}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D02FE08B-4832-4822-AD7F-AF4B3D21D118}"
+	ProjectSection(SolutionItems) = preProject
+		Directory.Build.props = Directory.Build.props
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -98,10 +103,10 @@ Global
 		{4041A91F-EF2A-4C47-9EBE-F4E862532345}.Release|x86.Build.0 = Release|x86
 		{1FEAC59B-F012-4ACC-9F11-E7ADF4C77593}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1FEAC59B-F012-4ACC-9F11-E7ADF4C77593}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1FEAC59B-F012-4ACC-9F11-E7ADF4C77593}.Debug|ARM32.ActiveCfg = Debug|Any CPU
-		{1FEAC59B-F012-4ACC-9F11-E7ADF4C77593}.Debug|ARM32.Build.0 = Debug|Any CPU
-		{1FEAC59B-F012-4ACC-9F11-E7ADF4C77593}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1FEAC59B-F012-4ACC-9F11-E7ADF4C77593}.Debug|x64.Build.0 = Debug|Any CPU
+		{1FEAC59B-F012-4ACC-9F11-E7ADF4C77593}.Debug|ARM32.ActiveCfg = Debug|x64
+		{1FEAC59B-F012-4ACC-9F11-E7ADF4C77593}.Debug|ARM32.Build.0 = Debug|x64
+		{1FEAC59B-F012-4ACC-9F11-E7ADF4C77593}.Debug|x64.ActiveCfg = Debug|x64
+		{1FEAC59B-F012-4ACC-9F11-E7ADF4C77593}.Debug|x64.Build.0 = Debug|x64
 		{1FEAC59B-F012-4ACC-9F11-E7ADF4C77593}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{1FEAC59B-F012-4ACC-9F11-E7ADF4C77593}.Debug|x86.Build.0 = Debug|Any CPU
 		{1FEAC59B-F012-4ACC-9F11-E7ADF4C77593}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -116,8 +121,8 @@ Global
 		{8479F68C-4234-425E-93E7-71597AF528E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8479F68C-4234-425E-93E7-71597AF528E9}.Debug|ARM32.ActiveCfg = Debug|Any CPU
 		{8479F68C-4234-425E-93E7-71597AF528E9}.Debug|ARM32.Build.0 = Debug|Any CPU
-		{8479F68C-4234-425E-93E7-71597AF528E9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8479F68C-4234-425E-93E7-71597AF528E9}.Debug|x64.Build.0 = Debug|Any CPU
+		{8479F68C-4234-425E-93E7-71597AF528E9}.Debug|x64.ActiveCfg = Debug|x64
+		{8479F68C-4234-425E-93E7-71597AF528E9}.Debug|x64.Build.0 = Debug|x64
 		{8479F68C-4234-425E-93E7-71597AF528E9}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{8479F68C-4234-425E-93E7-71597AF528E9}.Debug|x86.Build.0 = Debug|Any CPU
 		{8479F68C-4234-425E-93E7-71597AF528E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/ZuneShell/ZuneShell.csproj b/ZuneShell/ZuneShell.csproj
index c89d39d..d409a56 100644
--- a/ZuneShell/ZuneShell.csproj
+++ b/ZuneShell/ZuneShell.csproj
@@ -2,14 +2,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <!--Project was exported from assembly: C:\Program Files\Zune\ZuneShell.dll-->
     <PropertyGroup>
-        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-        <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
         <ProjectGuid>{E93CFFA3-1EEB-4E71-9E83-7377C1422119}</ProjectGuid>
         <OutputType>Library</OutputType>
         <AssemblyName>ZuneShell</AssemblyName>
-        <ApplicationVersion>4.7.0.0</ApplicationVersion>
-        <AssemblyVersion>$(ApplicationVersion)</AssemblyVersion>
-        <FileVersion>$(ApplicationVersion)</FileVersion>
 
         <TargetFrameworks>net6.0;net6.0-windows10.0.22000;net35;net40</TargetFrameworks>
         <Platforms>x64;x86</Platforms>
@@ -17,11 +12,6 @@
         <FileAlignment>512</FileAlignment>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-        <SignAssembly>True</SignAssembly>
-        <AssemblyOriginatorKeyFile>..\libs\MicrosoftIris\36MSApp1024.snk</AssemblyOriginatorKeyFile>
-        <DelaySign>True</DelaySign>
-
-        <UseOpenZune>False</UseOpenZune>
     </PropertyGroup>
 
     <ItemGroup>
@@ -40,45 +30,21 @@
         <Reference Include="ZuneDBApi">
             <HintPath>C:\Program Files\Zune\ZuneDBApi.dll</HintPath>
         </Reference>
+    </ItemGroup>
 
-        <None Include="**\*.lg.cs" Exclude="bin\**\*.lg.cs;obj\**\*.lg.cs" />
-        <Compile Remove="**\*.lg.cs" />
-        <Compile Include="**\*.lg.cs"
+	<ItemGroup>
+		<None Include="**\*.lg.cs" Exclude="bin\**\*.lg.cs;obj\**\*.lg.cs" />
+		<Compile Remove="**\*.lg.cs" />
+		<Compile Include="**\*.lg.cs"
                  Exclude="bin\**\*.lg.cs;obj\**\*.lg.cs"
                  Condition="!$(UseOpenZune)" />
 
-        <None Include="**\*.oz.cs" Exclude="bin\**\*.oz.cs;obj\**\*.oz.cs" />
-        <Compile Remove="**\*.oz.cs" />
-        <Compile Include="**\*.oz.cs"
+		<None Include="**\*.oz.cs" Exclude="bin\**\*.oz.cs;obj\**\*.oz.cs" />
+		<Compile Remove="**\*.oz.cs" />
+		<Compile Include="**\*.oz.cs"
                  Exclude="bin\**\*.oz.cs;obj\**\*.oz.cs"
                  Condition="$(UseOpenZune)" />
-    </ItemGroup>
-
-    <Choose>
-        <When Condition=" $(TargetFramework.StartsWith('net6.0-windows')) ">
-            <PropertyGroup>
-                <UseOpenZune>True</UseOpenZune>
-                
-                <DefineConstants Condition="$(TargetFramework.StartsWith('net6.0-windows10'))">$(DefineConstants);WINDOWS10</DefineConstants>
-                <DefineConstants Condition="$(TargetFramework.StartsWith('net6.0-windows8'))">$(DefineConstants);WINDOWS8</DefineConstants>
-            </PropertyGroup>
-        </When>
-
-        <When Condition=" $(TargetFramework.StartsWith('net6.0')) ">
-            <PropertyGroup>
-                <UseOpenZune>True</UseOpenZune>
-            </PropertyGroup>
-        </When>
-
-        <!--
-            .NET Core 3.1 is only used to target Windows 8/8.1
-        -->
-        <When Condition=" $(TargetFramework.StartsWith('netcoreapp')) ">
-            <PropertyGroup>
-                <UseOpenZune>True</UseOpenZune>
-            </PropertyGroup>
-        </When>
-    </Choose>
+	</ItemGroup>
 
     <PropertyGroup Condition=" '$(TargetFramework)' == 'net35' ">
         <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
@@ -101,14 +67,9 @@
 
     <ItemGroup Condition=" $(UseOpenZune) ">
         <!--<PackageReference Include="StrixMusic.Sdk" Version="0.0.3-alpha" /-->
-        <PackageReference Include="StrixMusic.Cores.LocalFiles" Version="1.0.0" />
+        <PackageReference Include="StrixMusic.Cores.LocalFiles" Version="0.0.12-alpha" />
     </ItemGroup>
 
-    <PropertyGroup Condition=" $(UseOpenZune) ">
-        <ApplicationVersion>5.0.0.0</ApplicationVersion>
-        <DefineConstants>$(DefineConstants);OPENZUNE</DefineConstants>
-    </PropertyGroup>
-
     <ItemGroup Condition=" !$(UseOpenZune) ">
         <Folder Remove="\StrixMusic\**" />
         <Compile Remove="\StrixMusic\**" />
diff --git a/libs/MicrosoftIris b/libs/MicrosoftIris
index fb81e1a..472361c 160000
--- a/libs/MicrosoftIris
+++ b/libs/MicrosoftIris
@@ -1 +1 @@
-Subproject commit fb81e1ad583547a3147d7305b252e97c1c9e2c56
+Subproject commit 472361c839328d865bd059f825bb19232137cb34