diff --git a/ZuneHost.Wpf/MainWindow.xaml.cs b/ZuneHost.Wpf/MainWindow.xaml.cs
index 7416a3c..509a158 100644
--- a/ZuneHost.Wpf/MainWindow.xaml.cs
+++ b/ZuneHost.Wpf/MainWindow.xaml.cs
@@ -86,6 +86,7 @@ namespace ZuneHost.Wpf
                 IrisApp.Initialized += delegate
                 {
                     IrisApp.AddImportRedirect("res://ZuneShellResources!", "clr-res://ZuneShell!");
+                    UIXControls.Helpers.AddUIXControlsClrRedirect();
                 };
 
                 Microsoft.Zune.Shell.ZuneApplication.Launch(strArgs, hWnd);
diff --git a/ZuneShell.sln b/ZuneShell.sln
index 762c581..1cbd90d 100644
--- a/ZuneShell.sln
+++ b/ZuneShell.sln
@@ -23,6 +23,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Directory.Build.props = Directory.Build.props
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UIXcontrols", "libs\MicrosoftIris\UIXcontrols\UIXcontrols.csproj", "{10DA7FB0-0FFF-7580-93B3-57BA53EE8B11}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -147,6 +149,22 @@ Global
 		{90A89707-927E-48D2-BFEB-84F95F531258}.Release|x64.Build.0 = Release|Any CPU
 		{90A89707-927E-48D2-BFEB-84F95F531258}.Release|x86.ActiveCfg = Release|Any CPU
 		{90A89707-927E-48D2-BFEB-84F95F531258}.Release|x86.Build.0 = Release|Any CPU
+		{10DA7FB0-0FFF-7580-93B3-57BA53EE8B11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{10DA7FB0-0FFF-7580-93B3-57BA53EE8B11}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{10DA7FB0-0FFF-7580-93B3-57BA53EE8B11}.Debug|ARM32.ActiveCfg = Debug|Any CPU
+		{10DA7FB0-0FFF-7580-93B3-57BA53EE8B11}.Debug|ARM32.Build.0 = Debug|Any CPU
+		{10DA7FB0-0FFF-7580-93B3-57BA53EE8B11}.Debug|x64.ActiveCfg = Debug|x64
+		{10DA7FB0-0FFF-7580-93B3-57BA53EE8B11}.Debug|x64.Build.0 = Debug|x64
+		{10DA7FB0-0FFF-7580-93B3-57BA53EE8B11}.Debug|x86.ActiveCfg = Debug|x86
+		{10DA7FB0-0FFF-7580-93B3-57BA53EE8B11}.Debug|x86.Build.0 = Debug|x86
+		{10DA7FB0-0FFF-7580-93B3-57BA53EE8B11}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{10DA7FB0-0FFF-7580-93B3-57BA53EE8B11}.Release|Any CPU.Build.0 = Release|Any CPU
+		{10DA7FB0-0FFF-7580-93B3-57BA53EE8B11}.Release|ARM32.ActiveCfg = Release|Any CPU
+		{10DA7FB0-0FFF-7580-93B3-57BA53EE8B11}.Release|ARM32.Build.0 = Release|Any CPU
+		{10DA7FB0-0FFF-7580-93B3-57BA53EE8B11}.Release|x64.ActiveCfg = Release|x64
+		{10DA7FB0-0FFF-7580-93B3-57BA53EE8B11}.Release|x64.Build.0 = Release|x64
+		{10DA7FB0-0FFF-7580-93B3-57BA53EE8B11}.Release|x86.ActiveCfg = Release|x86
+		{10DA7FB0-0FFF-7580-93B3-57BA53EE8B11}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -155,6 +173,7 @@ Global
 		{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9} = {7640D6FE-600E-44BE-A59F-E90602FA7754}
 		{CB2B7609-C7B8-4E2A-82D8-DD631B70B621} = {7640D6FE-600E-44BE-A59F-E90602FA7754}
 		{90A89707-927E-48D2-BFEB-84F95F531258} = {7640D6FE-600E-44BE-A59F-E90602FA7754}
+		{10DA7FB0-0FFF-7580-93B3-57BA53EE8B11} = {7640D6FE-600E-44BE-A59F-E90602FA7754}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {6B948258-B457-4B3D-955E-05ED3F03CF36}
diff --git a/ZuneShell/ZuneShell.csproj b/ZuneShell/ZuneShell.csproj
index bfc5368..b8ca304 100644
--- a/ZuneShell/ZuneShell.csproj
+++ b/ZuneShell/ZuneShell.csproj
@@ -19,9 +19,7 @@
 
         <PackageReference Include="Vanara.PInvoke.User32" Version="3.4.17" />
 
-        <Reference Include="UIXControls">
-            <HintPath>C:\Program Files\Zune\UIXcontrols.dll</HintPath>
-        </Reference>
+        <ProjectReference Include="..\libs\MicrosoftIris\UIXcontrols\UIXcontrols.csproj" />
         <ProjectReference Include="..\libs\MicrosoftIris\UIX\UIX.csproj" />
 
         <!--
@@ -30,7 +28,7 @@
         -->
         <ProjectReference Include="..\ZuneImpl\ZuneImpl.csproj" />
         <Reference Include="ZuneDBApi">
-            <HintPath>C:\Program Files\Zune\ZuneDBApi.dll</HintPath>
+            <HintPath>.\libs\ZuneDBApi.dll</HintPath>
         </Reference>
 
         <PackageReference Include="StrixMusic.Sdk" Version="0.1.0-alpha" />
diff --git a/libs/MicrosoftIris b/libs/MicrosoftIris
index be78b55..af659f4 160000
--- a/libs/MicrosoftIris
+++ b/libs/MicrosoftIris
@@ -1 +1 @@
-Subproject commit be78b55a303fe9e6fdaea7197db3add0f17277f3
+Subproject commit af659f4bd50c7eef289100b7cb6085792461bcf4