diff --git a/Build/Targets/RestoreSources.props b/Build/Targets/RestoreSources.props
index 42baf2aae..08403473b 100644
--- a/Build/Targets/RestoreSources.props
+++ b/Build/Targets/RestoreSources.props
@@ -1,13 +1,12 @@
 <Project>
 
     <PropertyGroup>
-        <RestoreSources>@(RestoreSource)</RestoreSources>
+        <RestoreSources>
+            https://api.nuget.org/v3/index.json;
+            https://www.myget.org/F/cosmos/api/v3/index.json;
+            https://www.myget.org/F/avalonia-ci/api/v2;
+            $(AppData)\Cosmos User Kit\packages\
+        </RestoreSources>
     </PropertyGroup>
 
-    <ItemGroup>
-        <RestoreSource Include="https://api.nuget.org/v3/index.json" />
-        <RestoreSource Include="https://www.myget.org/F/cosmos/api/v3/index.json" />
-        <RestoreSource Include="https://www.myget.org/F/avalonia-ci/api/v2" />
-    </ItemGroup>
-
 </Project>
diff --git a/Setup/Cosmos.iss b/Setup/Cosmos.iss
index 383ee725c..8ff38d8ae 100644
--- a/Setup/Cosmos.iss
+++ b/Setup/Cosmos.iss
@@ -94,8 +94,8 @@ Source: ".\Build\VSIP\Cosmos.HAL*"; DestDir: "{app}\Kernel"; Flags: ignoreversio
 Source: ".\Build\VSIP\Cosmos.System*"; DestDir: "{app}\Kernel"; Flags: ignoreversion uninsremovereadonly
 Source: ".\Build\VSIP\Cosmos.Common*"; DestDir: "{app}\Kernel"; Flags: ignoreversion uninsremovereadonly
 Source: ".\Build\VSIP\IL2CPU.API*"; DestDir: "{app}\Kernel"; Flags: ignoreversion uninsremovereadonly
-; Kernel packages
-Source: ".\Build\VSIP\Packages\*.nupkg"; DestDir: "{app}\Kernel\packages"; Flags: ignoreversion uninsremovereadonly
+; Packages
+Source: ".\Build\VSIP\Packages\*.nupkg"; DestDir: "{app}\packages\"; Flags: ignoreversion uninsremovereadonly
 ; Icon
 Source: ".\Artwork\Cosmos.ico"; DestDir: "{app}"; Flags: ignoreversion uninsremovereadonly
 ; XSharp
@@ -144,8 +144,8 @@ Root: HKCU; SubKey: Software\Cosmos; ValueType: none; ValueName: "DevKit"; Flags
 UseRelativePaths=True
 
 [Run]
-Filename: "{app}\Build\Tools\nuget.exe"; Parameters: "init ""{app}\Kernel\packages"" ""{app}\Kernel\packages"""; WorkingDir: "{app}"; Description: "Install Kernel Packages"; StatusMsg: "Installing Kernel Packages"
-Filename: "{app}\Build\Tools\nuget.exe"; Parameters: "sources Add -Name ""Cosmos Local Package Feed"" -Source ""{app}\Kernel\packages"""; WorkingDir: "{app}"; Description: "Install Kernel Packages"; StatusMsg: "Installing Kernel Packages"
+Filename: "{app}\Build\Tools\nuget.exe"; Parameters: "sources Remove -Name ""Cosmos Local Package Feed"""; WorkingDir: "{app}"; Description: "Uninstall Kernel Packages"; StatusMsg: "Uninstalling Kernel Packages"
+Filename: "{app}\Build\Tools\nuget.exe"; Parameters: "sources Add -Name ""Cosmos Local Package Feed"" -Source ""{app}\packages\"""; WorkingDir: "{app}"; Description: "Install Kernel Packages"; StatusMsg: "Installing Kernel Packages"
 
 Filename: "{app}\Build\Tools\VSIXBootstrapper.exe"; Parameters: "/q /u:Cosmos.VS.ProjectSystem"; Description: "Remove Cosmos Project System"; StatusMsg: "Removing Visual Studio Extension: Cosmos Project System"
 Filename: "{app}\Build\Tools\VSIXBootstrapper.exe"; Parameters: "/q /u:Cosmos.VS.DebugEngine"; Description: "Remove Cosmos Debug Engine"; StatusMsg: "Removing Visual Studio Extension: Cosmos Debug Engine"