diff --git a/CrossZicMoove.Desktop/CrossZicMoove.Desktop.csproj b/CrossZicMoove.Desktop/CrossZicMoove.Desktop.csproj
index ddd86ada..7d5cd2dd 100644
--- a/CrossZicMoove.Desktop/CrossZicMoove.Desktop.csproj
+++ b/CrossZicMoove.Desktop/CrossZicMoove.Desktop.csproj
@@ -58,6 +58,11 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <None Include="packages.config" />    
+    <PackageReference Include="Eto.Forms" Version="2.2.0" />
+    <PackageReference Include="Portable.Xaml" Version="0.6.1" />
+    <PackageReference Include="Eto.Serialization.Xaml" Version="2.2.0" />
+    <PackageReference Include="Eto.Platform.Windows" Version="2.2.0" />
+    
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/CrossZicMoove/CrossZicMoove.csproj b/CrossZicMoove/CrossZicMoove.csproj
index abf79385..17ce3d01 100644
--- a/CrossZicMoove/CrossZicMoove.csproj
+++ b/CrossZicMoove/CrossZicMoove.csproj
@@ -8,6 +8,8 @@
     <RootNamespace>CrossZicMoove</RootNamespace>
     <AssemblyName>CrossZicMoove</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <PackageId>CrossZicMoove</PackageId>
+    <AppxPackageAllowDebugFrameworkReferencesInManifest>true</AppxPackageAllowDebugFrameworkReferencesInManifest>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -39,22 +41,19 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <Reference Include="Eto">
-      <HintPath>..\..\..\.config\NuGet\packages\Eto.Forms.2.2.0\lib\net45\Eto.dll</HintPath>
+      <HintPath>..\packages\Eto.Forms.2.2.0\lib\net45\Eto.dll</HintPath>
     </Reference>
     <Reference Include="Portable.Xaml">
-      <HintPath>..\..\..\.config\NuGet\packages\Portable.Xaml.0.6.1\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\Portable.Xaml.dll</HintPath>
+      <HintPath>..\NuGet\packages\Portable.Xaml.0.6.1\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\Portable.Xaml.dll</HintPath>
     </Reference>
     <Reference Include="Eto.Serialization.Xaml">
-      <HintPath>..\..\..\.config\NuGet\packages\Eto.Serialization.Xaml.2.2.0\lib\net45\Eto.Serialization.Xaml.dll</HintPath>
+      <HintPath>..\packages\Eto.Serialization.Xaml.2.2.0\lib\net45\Eto.Serialization.Xaml.dll</HintPath>
     </Reference>
+    <PackageReference Include="Eto.Forms" Version="2.2.0" />
+    <PackageReference Include="Portable.Xaml" Version="0.6.1" />
+    <PackageReference Include="Eto.Serialization.Xaml" Version="2.2.0" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\YavscLib\YavscLib.csproj">
-      <Project>{67F9D3A8-F71E-4428-913F-C37AE82CDB24}</Project>
-      <Name>YavscLib</Name>
-    </ProjectReference>
-  </ItemGroup>
 </Project>
\ No newline at end of file