Merge pull request #17 from MichaelTheShifter/shiftui_integration

Shiftui integration

1 files changed, 288 insertions, 280 deletions

diff --git a/source/WindowsFormsApplication1/ShiftOS.csproj b/source/WindowsFormsApplication1/ShiftOS.csproj
index 5caa388..6004cfc 100644
--- a/source/WindowsFormsApplication1/ShiftOS.csproj
+++ b/source/WindowsFormsApplication1/ShiftOS.csproj
@@ -118,6 +118,9 @@
     <Compile Include="Controls\SyntaxHighlighter.cs">
       <SubType>Component</SubType>
     </Compile>
+    <Compile Include="Controls\WinFormsHost.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="Engine\AudioResourceClient.cs" />
     <Compile Include="Apps\BitnoteConverter.cs">
       <SubType>Form</SubType>
@@ -144,13 +147,13 @@
       <DependentUpon>Color_Picker.cs</DependentUpon>
     </Compile>
     <Compile Include="Controls\Computer.cs">
-      <SubType>UserControl</SubType>
+      <SubType>UserWidget</SubType>
     </Compile>
     <Compile Include="Controls\Computer.Designer.cs">
       <DependentUpon>Computer.cs</DependentUpon>
     </Compile>
     <Compile Include="Controls\Connection.cs">
-      <SubType>UserControl</SubType>
+      <SubType>UserWidget</SubType>
     </Compile>
     <Compile Include="Controls\Connection.Designer.cs">
       <DependentUpon>Connection.cs</DependentUpon>
@@ -168,7 +171,7 @@
       <DependentUpon>CreditScroller.cs</DependentUpon>
     </Compile>
     <Compile Include="Controls\DesktopIcon.cs">
-      <SubType>UserControl</SubType>
+      <SubType>UserWidget</SubType>
     </Compile>
     <Compile Include="Controls\DesktopIcon.Designer.cs">
       <DependentUpon>DesktopIcon.cs</DependentUpon>
@@ -186,7 +189,7 @@
       <DependentUpon>File Skimmer.cs</DependentUpon>
     </Compile>
     <Compile Include="FinalMission\ChoiceControl.cs">
-      <SubType>UserControl</SubType>
+      <SubType>UserWidget</SubType>
     </Compile>
     <Compile Include="FinalMission\ChoiceControl.Designer.cs">
       <DependentUpon>ChoiceControl.cs</DependentUpon>
@@ -242,7 +245,7 @@
       <DependentUpon>HoloChat.cs</DependentUpon>
     </Compile>
     <Compile Include="Controls\IconControl.cs">
-      <SubType>UserControl</SubType>
+      <SubType>UserWidget</SubType>
     </Compile>
     <Compile Include="Controls\IconControl.Designer.cs">
       <DependentUpon>IconControl.cs</DependentUpon>
@@ -254,17 +257,11 @@
       <DependentUpon>IconManager.cs</DependentUpon>
     </Compile>
     <Compile Include="Controls\ImageSelector.cs">
-      <SubType>UserControl</SubType>
+      <SubType>UserWidget</SubType>
     </Compile>
     <Compile Include="Controls\ImageSelector.Designer.cs">
       <DependentUpon>ImageSelector.cs</DependentUpon>
     </Compile>
-    <Compile Include="Controls\infobox.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Controls\infobox.Designer.cs">
-      <DependentUpon>infobox.cs</DependentUpon>
-    </Compile>
     <Compile Include="Apps\KnowledgeInput.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -292,7 +289,7 @@
       <DependentUpon>NetGen.cs</DependentUpon>
     </Compile>
     <Compile Include="Controls\NetModuleStatus.cs">
-      <SubType>UserControl</SubType>
+      <SubType>UserWidget</SubType>
     </Compile>
     <Compile Include="Controls\NetModuleStatus.Designer.cs">
       <DependentUpon>NetModuleStatus.cs</DependentUpon>
@@ -304,7 +301,7 @@
       <DependentUpon>NetworkBrowser.cs</DependentUpon>
     </Compile>
     <Compile Include="Controls\Notification.cs">
-      <SubType>UserControl</SubType>
+      <SubType>UserWidget</SubType>
     </Compile>
     <Compile Include="Controls\Notification.Designer.cs">
       <DependentUpon>Notification.cs</DependentUpon>
@@ -327,7 +324,7 @@
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Controls\ProgressBarEX.cs">
-      <SubType>UserControl</SubType>
+      <SubType>UserWidget</SubType>
     </Compile>
     <Compile Include="Controls\ProgressBarEX.Designer.cs">
       <DependentUpon>ProgressBarEX.cs</DependentUpon>
@@ -345,25 +342,25 @@
       <DependentUpon>Shifter.cs</DependentUpon>
     </Compile>
     <Compile Include="Controls\ShifterColorInput.cs">
-      <SubType>UserControl</SubType>
+      <SubType>UserWidget</SubType>
     </Compile>
     <Compile Include="Controls\ShifterColorInput.Designer.cs">
       <DependentUpon>ShifterColorInput.cs</DependentUpon>
     </Compile>
     <Compile Include="Controls\ShifterGraphicInput.cs">
-      <SubType>UserControl</SubType>
+      <SubType>UserWidget</SubType>
     </Compile>
     <Compile Include="Controls\ShifterGraphicInput.Designer.cs">
       <DependentUpon>ShifterGraphicInput.cs</DependentUpon>
     </Compile>
     <Compile Include="Controls\ShifterIntInput.cs">
-      <SubType>UserControl</SubType>
+      <SubType>UserWidget</SubType>
     </Compile>
     <Compile Include="Controls\ShifterIntInput.Designer.cs">
       <DependentUpon>ShifterIntInput.cs</DependentUpon>
     </Compile>
     <Compile Include="Controls\ShifterTextInput.cs">
-      <SubType>UserControl</SubType>
+      <SubType>UserWidget</SubType>
     </Compile>
     <Compile Include="Controls\ShifterTextInput.Designer.cs">
       <DependentUpon>ShifterTextInput.cs</DependentUpon>
@@ -401,7 +398,7 @@
       <DependentUpon>WidgetManager.cs</DependentUpon>
     </Compile>
     <Compile Include="Controls\WindowBorder.cs">
-      <SubType>UserControl</SubType>
+      <SubType>UserWidget</SubType>
     </Compile>
     <Compile Include="Controls\WindowBorder.Designer.cs">
       <DependentUpon>WindowBorder.cs</DependentUpon>
@@ -491,9 +488,6 @@
     <EmbeddedResource Include="Controls\ImageSelector.resx">
       <DependentUpon>ImageSelector.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Controls\infobox.resx">
-      <DependentUpon>infobox.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Apps\KnowledgeInput.resx">
       <DependentUpon>KnowledgeInput.cs</DependentUpon>
     </EmbeddedResource>
@@ -521,11 +515,6 @@
     <EmbeddedResource Include="Controls\ProgressBarEX.resx">
       <DependentUpon>ProgressBarEX.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <SubType>Designer</SubType>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
     <EmbeddedResource Include="Apps\Shifter.resx">
       <DependentUpon>Shifter.cs</DependentUpon>
     </EmbeddedResource>
@@ -581,6 +570,271 @@
     <None Include="Resources\Industrial.skn" />
     <None Include="Resources\LICENSE.md" />
     <None Include="Resources\Linux Mint 7.skn" />
+    <Compile Include="Controls\infobox.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Controls\infobox.Designer.cs">
+      <DependentUpon>infobox.cs</DependentUpon>
+    </Compile>
+    <EmbeddedResource Include="Controls\infobox.resx">
+      <DependentUpon>infobox.cs</DependentUpon>
+    </EmbeddedResource>
+    <None Include="Resources\appscape\appscapeaudioplayerbox.png" />
+    <None Include="Resources\appscape\appscapeaudioplayerprice.png" />
+    <None Include="Resources\appscape\appscapeaudioplayerpricepressed.png" />
+    <None Include="Resources\appscape\appscapecalculator.png" />
+    <None Include="Resources\appscape\appscapecalculatorprice.png" />
+    <None Include="Resources\appscape\appscapecalculatorpricepressed.png" />
+    <None Include="Resources\appscape\appscapedepositbitnotewalletscreenshot.png" />
+    <None Include="Resources\appscape\appscapedepositinfo.png" />
+    <None Include="Resources\appscape\appscapedepositnowbutton.png" />
+    <None Include="Resources\appscape\appscapedownloadbutton.png" />
+    <None Include="Resources\appscape\appscapeinfoaudioplayertext.png" />
+    <None Include="Resources\appscape\appscapeinfoaudioplayervisualpreview.png" />
+    <None Include="Resources\appscape\appscapeinfobackbutton.png" />
+    <None Include="Resources\appscape\appscapeinfobutton.png" />
+    <None Include="Resources\appscape\appscapeinfobuttonpressed.png" />
+    <None Include="Resources\appscape\appscapeinfobuybutton.png" />
+    <None Include="Resources\appscape\appscapeinfocalculatortext.png" />
+    <None Include="Resources\appscape\appscapeinfocalculatorvisualpreview.png" />
+    <None Include="Resources\appscape\appscapeinfoorcwritetext.png" />
+    <None Include="Resources\appscape\appscapeinfoorcwritevisualpreview.png" />
+    <None Include="Resources\appscape\appscapeinfovideoplayertext.png" />
+    <None Include="Resources\appscape\appscapeinfovideoplayervisualpreview.png" />
+    <None Include="Resources\appscape\appscapeinfowebbrowsertext.png" />
+    <None Include="Resources\appscape\appscapeinfowebbrowservisualpreview.png" />
+    <None Include="Resources\appscape\appscapemoresoftware.png" />
+    <None Include="Resources\appscape\appscapeorcwrite.png" />
+    <None Include="Resources\appscape\appscapetitlebanner.png" />
+    <None Include="Resources\appscape\appscapeundefinedprice.png" />
+    <None Include="Resources\appscape\appscapeundefinedpricepressed.png" />
+    <None Include="Resources\appscape\appscapevideoplayer.png" />
+    <None Include="Resources\appscape\appscapevideoplayerprice.png" />
+    <None Include="Resources\appscape\appscapevideoplayerpricepressed.png" />
+    <None Include="Resources\appscape\appscapewebbrowser.png" />
+    <None Include="Resources\appscape\appscapewebbrowserprice.png" />
+    <None Include="Resources\appscape\appscapewebbrowserpricepressed.png" />
+    <None Include="Resources\appscape\appscapewelcometoappscape.png" />
+    <None Include="Resources\artpad\ArtPadcirclerubber.png" />
+    <None Include="Resources\artpad\ArtPadcirclerubberselected.png" />
+    <None Include="Resources\artpad\ArtPaderacer.png" />
+    <None Include="Resources\artpad\ArtPadfloodfill.png" />
+    <None Include="Resources\artpad\ArtPadlinetool.png" />
+    <None Include="Resources\artpad\ArtPadmagnify.png" />
+    <None Include="Resources\artpad\ArtPadnew.png" />
+    <None Include="Resources\artpad\ArtPadopen.png" />
+    <None Include="Resources\artpad\ArtPadOval.png" />
+    <None Include="Resources\artpad\ArtPadpaintbrush.png" />
+    <None Include="Resources\artpad\ArtPadpencil.png" />
+    <None Include="Resources\artpad\ArtPadpixelplacer.png" />
+    <None Include="Resources\artpad\ArtPadRectangle.png" />
+    <None Include="Resources\artpad\ArtPadredo.png" />
+    <None Include="Resources\artpad\ArtPadsave.png" />
+    <None Include="Resources\artpad\ArtPadsquarerubber.png" />
+    <None Include="Resources\artpad\ArtPadsquarerubberselected.png" />
+    <None Include="Resources\artpad\ArtPadtexttool.png" />
+    <None Include="Resources\artpad\ArtPadundo.png" />
+    <None Include="Resources\bitnote\bitnotediggergradetable.png" />
+    <None Include="Resources\bitnote\BitnotesAcceptedHereLogo.bmp" />
+    <None Include="Resources\bitnote\bitnoteswebsidepnl.png" />
+    <None Include="Resources\bitnote\bitnotewalletdownload.png" />
+    <None Include="Resources\bitnote\bitnotewalletpreviewscreenshot.png" />
+    <None Include="Resources\bitnote\bitnotewebsitetitle.png" />
+    <None Include="Resources\appicons\iconArtpad.png" />
+    <None Include="Resources\appicons\iconAudioPlayer.png" />
+    <None Include="Resources\appicons\iconBitnoteDigger.png" />
+    <None Include="Resources\appicons\iconBitnoteWallet.png" />
+    <None Include="Resources\appicons\iconCalculator.png" />
+    <None Include="Resources\appicons\iconClock.png" />
+    <None Include="Resources\appicons\iconColourPicker.fw.png" />
+    <None Include="Resources\appicons\iconDodge.png" />
+    <None Include="Resources\appicons\iconDownloader.png" />
+    <None Include="Resources\appicons\iconFileOpener.fw.png" />
+    <None Include="Resources\appicons\iconFileSaver.fw.png" />
+    <None Include="Resources\appicons\iconFileSkimmer.png" />
+    <None Include="Resources\appicons\iconfloodgate.png" />
+    <None Include="Resources\appicons\icongraphicpicker.png" />
+    <None Include="Resources\appicons\iconIconManager.png" />
+    <None Include="Resources\appicons\iconInfoBox.fw.png" />
+    <None Include="Resources\appicons\iconKnowledgeInput.png" />
+    <None Include="Resources\appicons\iconmaze.png" />
+    <None Include="Resources\appicons\iconNameChanger.png" />
+    <None Include="Resources\appicons\iconorcwrite.png" />
+    <None Include="Resources\appicons\iconPong.png" />
+    <None Include="Resources\appicons\iconShifter.png" />
+    <None Include="Resources\appicons\iconShiftnet.png" />
+    <None Include="Resources\appicons\iconShiftorium.png" />
+    <None Include="Resources\appicons\iconshutdown.png" />
+    <None Include="Resources\appicons\iconSkinLoader.png" />
+    <None Include="Resources\appicons\iconSkinShifter.png" />
+    <None Include="Resources\appicons\iconSnakey.png" />
+    <None Include="Resources\appicons\iconSysinfo.png" />
+    <None Include="Resources\appicons\iconTerminal.png" />
+    <None Include="Resources\appicons\iconTextPad.png" />
+    <None Include="Resources\appicons\iconunitytoggle.png" />
+    <None Include="Resources\appicons\iconVideoPlayer.png" />
+    <None Include="Resources\appicons\iconvirusscanner.png" />
+    <None Include="Resources\appicons\iconWebBrowser.png" />
+    <None Include="Resources\upgrades\updatecustomcolourpallets.png" />
+    <None Include="Resources\upgrades\upgradeadvancedshifter.png" />
+    <None Include="Resources\upgrades\upgradealartpad.png" />
+    <None Include="Resources\upgrades\upgradealclock.png" />
+    <None Include="Resources\upgrades\upgradealfileskimmer.png" />
+    <None Include="Resources\upgrades\upgradealpong.png" />
+    <None Include="Resources\upgrades\upgradealshifter.png" />
+    <None Include="Resources\upgrades\upgradealshiftorium.png" />
+    <None Include="Resources\upgrades\upgradealtextpad.png" />
+    <None Include="Resources\upgrades\upgradealunitymode.png" />
+    <None Include="Resources\upgrades\upgradeamandpm.png" />
+    <None Include="Resources\upgrades\upgradeapplaunchermenu.png" />
+    <None Include="Resources\upgrades\upgradeapplaunchershutdown.png" />
+    <None Include="Resources\upgrades\upgradeartpad.png" />
+    <None Include="Resources\upgrades\upgradeartpad128colorpallets.png" />
+    <None Include="Resources\upgrades\upgradeartpad16colorpallets.png" />
+    <None Include="Resources\upgrades\upgradeartpad32colorpallets.png" />
+    <None Include="Resources\upgrades\upgradeartpad4colorpallets.png" />
+    <None Include="Resources\upgrades\upgradeartpad64colorpallets.png" />
+    <None Include="Resources\upgrades\upgradeartpad8colorpallets.png" />
+    <None Include="Resources\upgrades\upgradeartpaderaser.png" />
+    <None Include="Resources\upgrades\upgradeartpadfilltool.png" />
+    <None Include="Resources\upgrades\upgradeartpadicon.png" />
+    <None Include="Resources\upgrades\upgradeartpadlimitlesspixels.png" />
+    <None Include="Resources\upgrades\upgradeartpadlinetool.png" />
+    <None Include="Resources\upgrades\upgradeartpadload.png" />
+    <None Include="Resources\upgrades\upgradeartpadnew.png" />
+    <None Include="Resources\upgrades\upgradeartpadovaltool.png" />
+    <None Include="Resources\upgrades\upgradeartpadpaintbrushtool.png" />
+    <None Include="Resources\upgrades\upgradeartpadpenciltool.png" />
+    <None Include="Resources\upgrades\upgradeartpadpixellimit1024.png" />
+    <None Include="Resources\upgrades\upgradeartpadpixellimit16.png" />
+    <None Include="Resources\upgrades\upgradeartpadpixellimit16384.png" />
+    <None Include="Resources\upgrades\upgradeartpadpixellimit256.png" />
+    <None Include="Resources\upgrades\upgradeartpadpixellimit4.png" />
+    <None Include="Resources\upgrades\upgradeartpadpixellimit4096.png" />
+    <None Include="Resources\upgrades\upgradeartpadpixellimit64.png" />
+    <None Include="Resources\upgrades\upgradeartpadpixellimit65536.png" />
+    <None Include="Resources\upgrades\upgradeartpadpixellimit8.png" />
+    <None Include="Resources\upgrades\upgradeartpadpixelplacer.png" />
+    <None Include="Resources\upgrades\upgradeartpadpixelplacermovementmode.png" />
+    <None Include="Resources\upgrades\upgradeartpadrectangletool.png" />
+    <None Include="Resources\upgrades\upgradeartpadredo.png" />
+    <None Include="Resources\upgrades\upgradeartpadsave.png" />
+    <None Include="Resources\upgrades\upgradeartpadtexttool.png" />
+    <None Include="Resources\upgrades\upgradeartpadundo.png" />
+    <None Include="Resources\upgrades\upgradeautoscrollterminal.png" />
+    <None Include="Resources\upgrades\upgradeblue.png" />
+    <None Include="Resources\upgrades\upgradebluecustom.png" />
+    <None Include="Resources\upgrades\upgradeblueshades.png" />
+    <None Include="Resources\upgrades\upgradeblueshadeset.png" />
+    <None Include="Resources\upgrades\upgradebrown.png" />
+    <None Include="Resources\upgrades\upgradebrowncustom.png" />
+    <None Include="Resources\upgrades\upgradebrownshades.png" />
+    <None Include="Resources\upgrades\upgradebrownshadeset.png" />
+    <None Include="Resources\upgrades\upgradeclock.png" />
+    <None Include="Resources\upgrades\upgradeclockicon.png" />
+    <None Include="Resources\upgrades\upgradeclosebutton.gif" />
+    <None Include="Resources\upgrades\upgradecolourpickericon.png" />
+    <None Include="Resources\upgrades\upgradecustomusername.png" />
+    <None Include="Resources\upgrades\upgradedesktoppanel.png" />
+    <None Include="Resources\upgrades\upgradedesktoppanelclock.png" />
+    <None Include="Resources\upgrades\upgradedraggablewindows.gif" />
+    <None Include="Resources\upgrades\upgradefileskimmer.png" />
+    <None Include="Resources\upgrades\upgradefileskimmerdelete.png" />
+    <None Include="Resources\upgrades\upgradefileskimmericon.png" />
+    <None Include="Resources\upgrades\upgradefileskimmernew.png" />
+    <None Include="Resources\upgrades\upgradegray.png" />
+    <None Include="Resources\upgrades\upgradegraycustom.png" />
+    <None Include="Resources\upgrades\upgradegrayshades.png" />
+    <None Include="Resources\upgrades\upgradegrayshadeset.png" />
+    <None Include="Resources\upgrades\upgradegreen.png" />
+    <None Include="Resources\upgrades\upgradegreencustom.png" />
+    <None Include="Resources\upgrades\upgradegreenshades.png" />
+    <None Include="Resources\upgrades\upgradegreenshadeset.png" />
+    <None Include="Resources\upgrades\upgradehoursssincemidnight.png" />
+    <None Include="Resources\upgrades\upgradeiconunitymode.png" />
+    <None Include="Resources\upgrades\upgradeinfoboxicon.png" />
+    <None Include="Resources\upgrades\upgradekiaddons.png" />
+    <None Include="Resources\upgrades\upgradekielements.png" />
+    <None Include="Resources\upgrades\upgradeknowledgeinput.png" />
+    <None Include="Resources\upgrades\upgradeknowledgeinputicon.png" />
+    <None Include="Resources\upgrades\upgrademinimizebutton.png" />
+    <None Include="Resources\upgrades\upgrademinimizecommand.png" />
+    <None Include="Resources\upgrades\upgrademinuteaccuracytime.png" />
+    <None Include="Resources\upgrades\upgrademinutesssincemidnight.png" />
+    <None Include="Resources\upgrades\upgrademoveablewindows.gif" />
+    <None Include="Resources\upgrades\upgrademultitasking.png" />
+    <None Include="Resources\upgrades\upgradeorange.png" />
+    <None Include="Resources\upgrades\upgradeorangecustom.png" />
+    <None Include="Resources\upgrades\upgradeorangeshades.png" />
+    <None Include="Resources\upgrades\upgradeorangeshadeset.png" />
+    <None Include="Resources\upgrades\upgradeosname.png" />
+    <None Include="Resources\upgrades\upgradepanelbuttons.png" />
+    <None Include="Resources\upgrades\upgradepink.png" />
+    <None Include="Resources\upgrades\upgradepinkcustom.png" />
+    <None Include="Resources\upgrades\upgradepinkshades.png" />
+    <None Include="Resources\upgrades\upgradepinkshadeset.png" />
+    <None Include="Resources\upgrades\upgradepong.png" />
+    <None Include="Resources\upgrades\upgradepongicon.png" />
+    <None Include="Resources\upgrades\upgradepurple.png" />
+    <None Include="Resources\upgrades\upgradepurplecustom.png" />
+    <None Include="Resources\upgrades\upgradepurpleshades.png" />
+    <None Include="Resources\upgrades\upgradepurpleshadeset.png" />
+    <None Include="Resources\upgrades\upgradered.png" />
+    <None Include="Resources\upgrades\upgraderedcustom.png" />
+    <None Include="Resources\upgrades\upgraderedshades.png" />
+    <None Include="Resources\upgrades\upgraderedshadeset.png" />
+    <None Include="Resources\upgrades\upgraderemoveth1.png" />
+    <None Include="Resources\upgrades\upgraderemoveth2.png" />
+    <None Include="Resources\upgrades\upgraderemoveth3.png" />
+    <None Include="Resources\upgrades\upgraderemoveth4.png" />
+    <None Include="Resources\upgrades\upgraderesize.png" />
+    <None Include="Resources\upgrades\upgraderollupbutton.gif" />
+    <None Include="Resources\upgrades\upgraderollupcommand.png" />
+    <None Include="Resources\upgrades\upgradesecondssincemidnight.png" />
+    <None Include="Resources\upgrades\upgradesgameconsoles.png" />
+    <None Include="Resources\upgrades\upgradeshiftapplauncher.png" />
+    <None Include="Resources\upgrades\upgradeshiftborders.png" />
+    <None Include="Resources\upgrades\upgradeshiftbuttons.png" />
+    <None Include="Resources\upgrades\upgradeshiftdesktop.png" />
+    <None Include="Resources\upgrades\upgradeshiftdesktoppanel.png" />
+    <None Include="Resources\upgrades\upgradeshifter.png" />
+    <None Include="Resources\upgrades\upgradeshiftericon.png" />
+    <None Include="Resources\upgrades\upgradeshiftitems.png" />
+    <None Include="Resources\upgrades\upgradeshiftoriumicon.png" />
+    <None Include="Resources\upgrades\upgradeshiftpanelbuttons.png" />
+    <None Include="Resources\upgrades\upgradeshiftpanelclock.png" />
+    <None Include="Resources\upgrades\upgradeshifttitlebar.png" />
+    <None Include="Resources\upgrades\upgradeshifttitletext.png" />
+    <None Include="Resources\upgrades\upgradeshutdownicon.png" />
+    <None Include="Resources\upgrades\upgradeskicarbrands.png" />
+    <None Include="Resources\upgrades\upgradeskinning.png" />
+    <None Include="Resources\upgrades\upgradesplitsecondaccuracy.png" />
+    <None Include="Resources\upgrades\upgradesysinfo.png" />
+    <None Include="Resources\upgrades\upgradeterminalicon.png" />
+    <None Include="Resources\upgrades\upgradeterminalscrollbar.png" />
+    <None Include="Resources\upgrades\upgradetextpad.png" />
+    <None Include="Resources\upgrades\upgradetextpadicon.png" />
+    <None Include="Resources\upgrades\upgradetextpadnew.png" />
+    <None Include="Resources\upgrades\upgradetextpadopen.png" />
+    <None Include="Resources\upgrades\upgradetextpadsave.png" />
+    <None Include="Resources\upgrades\upgradetitlebar.png" />
+    <None Include="Resources\upgrades\upgradetitletext.png" />
+    <None Include="Resources\upgrades\upgradetrm.png" />
+    <None Include="Resources\upgrades\upgradeunitymode.png" />
+    <None Include="Resources\upgrades\upgradeusefulpanelbuttons.png" />
+    <None Include="Resources\upgrades\upgradevirusscanner.png" />
+    <None Include="Resources\upgrades\upgradewindowborders.png" />
+    <None Include="Resources\upgrades\upgradewindowedterminal.png" />
+    <None Include="Resources\upgrades\upgradewindowsanywhere.png" />
+    <None Include="Resources\upgrades\upgradeyellow.png" />
+    <None Include="Resources\upgrades\upgradeyellowcustom.png" />
+    <None Include="Resources\upgrades\upgradeyellowshades.png" />
+    <None Include="Resources\upgrades\upgradeyellowshadeset.png" />
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <SubType>Designer</SubType>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
@@ -596,68 +850,7 @@
     <None Include="Resources\anycolourshade2.png" />
     <None Include="Resources\anycolourshade3.png" />
     <None Include="Resources\anycolourshade4.png" />
-    <None Include="Resources\appscapeaudioplayerbox.png" />
-    <None Include="Resources\appscapeaudioplayerprice.png" />
-    <None Include="Resources\appscapeaudioplayerpricepressed.png" />
-    <None Include="Resources\appscapecalculator.png" />
-    <None Include="Resources\appscapecalculatorprice.png" />
-    <None Include="Resources\appscapecalculatorpricepressed.png" />
-    <None Include="Resources\appscapedepositbitnotewalletscreenshot.png" />
-    <None Include="Resources\appscapedepositinfo.png" />
-    <None Include="Resources\appscapedepositnowbutton.png" />
-    <None Include="Resources\appscapedownloadbutton.png" />
-    <None Include="Resources\appscapeinfoaudioplayertext.png" />
-    <None Include="Resources\appscapeinfoaudioplayervisualpreview.png" />
-    <None Include="Resources\appscapeinfobackbutton.png" />
-    <None Include="Resources\appscapeinfobutton.png" />
-    <None Include="Resources\appscapeinfobuttonpressed.png" />
-    <None Include="Resources\appscapeinfobuybutton.png" />
-    <None Include="Resources\appscapeinfocalculatortext.png" />
-    <None Include="Resources\appscapeinfocalculatorvisualpreview.png" />
-    <None Include="Resources\appscapeinfoorcwritetext.png" />
-    <None Include="Resources\appscapeinfoorcwritevisualpreview.png" />
-    <None Include="Resources\appscapeinfovideoplayertext.png" />
-    <None Include="Resources\appscapeinfovideoplayervisualpreview.png" />
-    <None Include="Resources\appscapeinfowebbrowsertext.png" />
-    <None Include="Resources\appscapeinfowebbrowservisualpreview.png" />
-    <None Include="Resources\appscapemoresoftware.png" />
-    <None Include="Resources\appscapeorcwrite.png" />
-    <None Include="Resources\appscapetitlebanner.png" />
-    <None Include="Resources\appscapeundefinedprice.png" />
-    <None Include="Resources\appscapeundefinedpricepressed.png" />
-    <None Include="Resources\appscapevideoplayer.png" />
-    <None Include="Resources\appscapevideoplayerprice.png" />
-    <None Include="Resources\appscapevideoplayerpricepressed.png" />
-    <None Include="Resources\appscapewebbrowser.png" />
-    <None Include="Resources\appscapewebbrowserprice.png" />
-    <None Include="Resources\appscapewebbrowserpricepressed.png" />
-    <None Include="Resources\appscapewelcometoappscape.png" />
-    <None Include="Resources\ArtPadcirclerubber.png" />
-    <None Include="Resources\ArtPadcirclerubberselected.png" />
-    <None Include="Resources\ArtPaderacer.png" />
-    <None Include="Resources\ArtPadfloodfill.png" />
-    <None Include="Resources\ArtPadlinetool.png" />
-    <None Include="Resources\ArtPadmagnify.png" />
-    <None Include="Resources\ArtPadnew.png" />
-    <None Include="Resources\ArtPadopen.png" />
-    <None Include="Resources\ArtPadOval.png" />
-    <None Include="Resources\ArtPadpaintbrush.png" />
-    <None Include="Resources\ArtPadpencil.png" />
-    <None Include="Resources\ArtPadpixelplacer.png" />
-    <None Include="Resources\ArtPadRectangle.png" />
-    <None Include="Resources\ArtPadredo.png" />
-    <None Include="Resources\ArtPadsave.png" />
-    <None Include="Resources\ArtPadsquarerubber.png" />
-    <None Include="Resources\ArtPadsquarerubberselected.png" />
-    <None Include="Resources\ArtPadtexttool.png" />
-    <None Include="Resources\ArtPadundo.png" />
     <None Include="Resources\AxInterop.WMPLib.dll" />
-    <None Include="Resources\bitnotediggergradetable.png" />
-    <None Include="Resources\BitnotesAcceptedHereLogo.bmp" />
-    <None Include="Resources\bitnoteswebsidepnl.png" />
-    <None Include="Resources\bitnotewalletdownload.png" />
-    <None Include="Resources\bitnotewalletpreviewscreenshot.png" />
-    <None Include="Resources\bitnotewebsitetitle.png" />
     <None Include="Resources\CatalystGrammar.xml" />
     <None Include="Resources\centrebutton.png" />
     <None Include="Resources\centrebuttonpressed.png" />
@@ -677,40 +870,6 @@
     <None Include="Resources\fileskimmericon.fw.png" />
     <None Include="Resources\floodgateicn.png" />
     <None Include="Resources\Gray Shades.png" />
-    <None Include="Resources\iconArtpad.png" />
-    <None Include="Resources\iconAudioPlayer.png" />
-    <None Include="Resources\iconBitnoteDigger.png" />
-    <None Include="Resources\iconBitnoteWallet.png" />
-    <None Include="Resources\iconCalculator.png" />
-    <None Include="Resources\iconClock.png" />
-    <None Include="Resources\iconDodge.png" />
-    <None Include="Resources\iconDownloader.png" />
-    <None Include="Resources\iconFileOpener.fw.png" />
-    <None Include="Resources\iconFileSaver.fw.png" />
-    <None Include="Resources\iconFileSkimmer.png" />
-    <None Include="Resources\iconfloodgate.png" />
-    <None Include="Resources\icongraphicpicker.png" />
-    <None Include="Resources\iconIconManager.png" />
-    <None Include="Resources\iconInfoBox.fw.png" />
-    <None Include="Resources\iconKnowledgeInput.png" />
-    <None Include="Resources\iconmaze.png" />
-    <None Include="Resources\iconNameChanger.png" />
-    <None Include="Resources\iconorcwrite.png" />
-    <None Include="Resources\iconPong.png" />
-    <None Include="Resources\iconShifter.png" />
-    <None Include="Resources\iconShiftnet.png" />
-    <None Include="Resources\iconShiftorium.png" />
-    <None Include="Resources\iconshutdown.png" />
-    <None Include="Resources\iconSkinLoader.png" />
-    <None Include="Resources\iconSkinShifter.png" />
-    <None Include="Resources\iconSnakey.png" />
-    <None Include="Resources\iconSysinfo.png" />
-    <None Include="Resources\iconTerminal.png" />
-    <None Include="Resources\iconTextPad.png" />
-    <None Include="Resources\iconunitytoggle.png" />
-    <None Include="Resources\iconVideoPlayer.png" />
-    <None Include="Resources\iconvirusscanner.png" />
-    <None Include="Resources\iconWebBrowser.png" />
     <None Include="Resources\infobox.wav" />
     <None Include="Resources\installericon.png" />
     <None Include="Resources\Interop.WMPLib.dll" />
@@ -740,7 +899,6 @@
     <None Include="Resources\shiftomizerskinshifterscreenshot.png" />
     <None Include="Resources\shiftomizersliderleftarrow.png" />
     <None Include="Resources\shiftomizersliderrightarrow.png" />
-    <None Include="Resources\ShiftOS License.txt" />
     <None Include="Resources\skindownarrow.png" />
     <None Include="Resources\skinfile.png" />
     <None Include="Resources\skinuparrow.png" />
@@ -759,160 +917,6 @@
     <None Include="Resources\transactionsUnclicked.png" />
     <None Include="Resources\typesound.wav" />
     <None Include="Resources\uparrow.png" />
-    <None Include="Resources\updatecustomcolourpallets.png" />
-    <None Include="Resources\upgradealartpad.png" />
-    <None Include="Resources\upgradealclock.png" />
-    <None Include="Resources\upgradealfileskimmer.png" />
-    <None Include="Resources\upgradealpong.png" />
-    <None Include="Resources\upgradealshifter.png" />
-    <None Include="Resources\upgradealshiftorium.png" />
-    <None Include="Resources\upgradealtextpad.png" />
-    <None Include="Resources\upgradealunitymode.png" />
-    <None Include="Resources\upgradeamandpm.png" />
-    <None Include="Resources\upgradeapplaunchermenu.png" />
-    <None Include="Resources\upgradeapplaunchershutdown.png" />
-    <None Include="Resources\upgradeartpad.png" />
-    <None Include="Resources\upgradeartpad4colorpallets.png" />
-    <None Include="Resources\upgradeartpad8colorpallets.png" />
-    <None Include="Resources\upgradeartpad16colorpallets.png" />
-    <None Include="Resources\upgradeartpad32colorpallets.png" />
-    <None Include="Resources\upgradeartpad64colorpallets.png" />
-    <None Include="Resources\upgradeartpad128colorpallets.png" />
-    <None Include="Resources\upgradeartpaderaser.png" />
-    <None Include="Resources\upgradeartpadfilltool.png" />
-    <None Include="Resources\upgradeartpadicon.png" />
-    <None Include="Resources\upgradeartpadlimitlesspixels.png" />
-    <None Include="Resources\upgradeartpadlinetool.png" />
-    <None Include="Resources\upgradeartpadload.png" />
-    <None Include="Resources\upgradeartpadnew.png" />
-    <None Include="Resources\upgradeartpadovaltool.png" />
-    <None Include="Resources\upgradeartpadpaintbrushtool.png" />
-    <None Include="Resources\upgradeartpadpenciltool.png" />
-    <None Include="Resources\upgradeartpadpixellimit4.png" />
-    <None Include="Resources\upgradeartpadpixellimit8.png" />
-    <None Include="Resources\upgradeartpadpixellimit16.png" />
-    <None Include="Resources\upgradeartpadpixellimit64.png" />
-    <None Include="Resources\upgradeartpadpixellimit256.png" />
-    <None Include="Resources\upgradeartpadpixellimit1024.png" />
-    <None Include="Resources\upgradeartpadpixellimit4096.png" />
-    <None Include="Resources\upgradeartpadpixellimit16384.png" />
-    <None Include="Resources\upgradeartpadpixellimit65536.png" />
-    <None Include="Resources\upgradeartpadpixelplacer.png" />
-    <None Include="Resources\upgradeartpadpixelplacermovementmode.png" />
-    <None Include="Resources\upgradeartpadrectangletool.png" />
-    <None Include="Resources\upgradeartpadredo.png" />
-    <None Include="Resources\upgradeartpadsave.png" />
-    <None Include="Resources\upgradeartpadtexttool.png" />
-    <None Include="Resources\upgradeartpadundo.png" />
-    <None Include="Resources\upgradeautoscrollterminal.png" />
-    <None Include="Resources\upgradeblue.png" />
-    <None Include="Resources\upgradebluecustom.png" />
-    <None Include="Resources\upgradeblueshades.png" />
-    <None Include="Resources\upgradeblueshadeset.png" />
-    <None Include="Resources\upgradebrown.png" />
-    <None Include="Resources\upgradebrowncustom.png" />
-    <None Include="Resources\upgradebrownshades.png" />
-    <None Include="Resources\upgradebrownshadeset.png" />
-    <None Include="Resources\upgradeclock.png" />
-    <None Include="Resources\upgradeclockicon.png" />
-    <None Include="Resources\upgradeclosebutton.gif" />
-    <None Include="Resources\upgradecolourpickericon.png" />
-    <None Include="Resources\upgradecustomusername.png" />
-    <None Include="Resources\upgradedesktoppanel.png" />
-    <None Include="Resources\upgradedesktoppanelclock.png" />
-    <None Include="Resources\upgradedraggablewindows.gif" />
-    <None Include="Resources\upgradefileskimmer.png" />
-    <None Include="Resources\upgradefileskimmerdelete.png" />
-    <None Include="Resources\upgradefileskimmericon.png" />
-    <None Include="Resources\upgradefileskimmernew.png" />
-    <None Include="Resources\upgradegray.png" />
-    <None Include="Resources\upgradegraycustom.png" />
-    <None Include="Resources\upgradegrayshades.png" />
-    <None Include="Resources\upgradegrayshadeset.png" />
-    <None Include="Resources\upgradegreen.png" />
-    <None Include="Resources\upgradegreencustom.png" />
-    <None Include="Resources\upgradegreenshades.png" />
-    <None Include="Resources\upgradegreenshadeset.png" />
-    <None Include="Resources\upgradehoursssincemidnight.png" />
-    <None Include="Resources\upgradeiconunitymode.png" />
-    <None Include="Resources\upgradeinfoboxicon.png" />
-    <None Include="Resources\upgradekiaddons.png" />
-    <None Include="Resources\upgradekielements.png" />
-    <None Include="Resources\upgradeknowledgeinput.png" />
-    <None Include="Resources\upgradeknowledgeinputicon.png" />
-    <None Include="Resources\upgrademinimizebutton.png" />
-    <None Include="Resources\upgrademinimizecommand.png" />
-    <None Include="Resources\upgrademinuteaccuracytime.png" />
-    <None Include="Resources\upgrademinutesssincemidnight.png" />
-    <None Include="Resources\upgrademoveablewindows.gif" />
-    <None Include="Resources\upgrademultitasking.png" />
-    <None Include="Resources\upgradeorange.png" />
-    <None Include="Resources\upgradeorangecustom.png" />
-    <None Include="Resources\upgradeorangeshades.png" />
-    <None Include="Resources\upgradeorangeshadeset.png" />
-    <None Include="Resources\upgradeosname.png" />
-    <None Include="Resources\upgradepanelbuttons.png" />
-    <None Include="Resources\upgradepink.png" />
-    <None Include="Resources\upgradepinkcustom.png" />
-    <None Include="Resources\upgradepinkshades.png" />
-    <None Include="Resources\upgradepinkshadeset.png" />
-    <None Include="Resources\upgradepong.png" />
-    <None Include="Resources\upgradepongicon.png" />
-    <None Include="Resources\upgradepurple.png" />
-    <None Include="Resources\upgradepurplecustom.png" />
-    <None Include="Resources\upgradepurpleshades.png" />
-    <None Include="Resources\upgradepurpleshadeset.png" />
-    <None Include="Resources\upgradered.png" />
-    <None Include="Resources\upgraderedcustom.png" />
-    <None Include="Resources\upgraderedshades.png" />
-    <None Include="Resources\upgraderedshadeset.png" />
-    <None Include="Resources\upgraderemoveth1.png" />
-    <None Include="Resources\upgraderemoveth2.png" />
-    <None Include="Resources\upgraderemoveth3.png" />
-    <None Include="Resources\upgraderemoveth4.png" />
-    <None Include="Resources\upgraderesize.png" />
-    <None Include="Resources\upgraderollupbutton.gif" />
-    <None Include="Resources\upgraderollupcommand.png" />
-    <None Include="Resources\upgradesecondssincemidnight.png" />
-    <None Include="Resources\upgradesgameconsoles.png" />
-    <None Include="Resources\upgradeshiftapplauncher.png" />
-    <None Include="Resources\upgradeshiftborders.png" />
-    <None Include="Resources\upgradeshiftbuttons.png" />
-    <None Include="Resources\upgradeshiftdesktop.png" />
-    <None Include="Resources\upgradeshiftdesktoppanel.png" />
-    <None Include="Resources\upgradeshifter.png" />
-    <None Include="Resources\upgradeshiftericon.png" />
-    <None Include="Resources\upgradeshiftitems.png" />
-    <None Include="Resources\upgradeshiftoriumicon.png" />
-    <None Include="Resources\upgradeshiftpanelbuttons.png" />
-    <None Include="Resources\upgradeshiftpanelclock.png" />
-    <None Include="Resources\upgradeshifttitlebar.png" />
-    <None Include="Resources\upgradeshifttitletext.png" />
-    <None Include="Resources\upgradeshutdownicon.png" />
-    <None Include="Resources\upgradeskicarbrands.png" />
-    <None Include="Resources\upgradeskinning.png" />
-    <None Include="Resources\upgradesplitsecondaccuracy.png" />
-    <None Include="Resources\upgradesysinfo.png" />
-    <None Include="Resources\upgradeterminalicon.png" />
-    <None Include="Resources\upgradeterminalscrollbar.png" />
-    <None Include="Resources\upgradetextpad.png" />
-    <None Include="Resources\upgradetextpadicon.png" />
-    <None Include="Resources\upgradetextpadnew.png" />
-    <None Include="Resources\upgradetextpadopen.png" />
-    <None Include="Resources\upgradetextpadsave.png" />
-    <None Include="Resources\upgradetitlebar.png" />
-    <None Include="Resources\upgradetitletext.png" />
-    <None Include="Resources\upgradetrm.png" />
-    <None Include="Resources\upgradeunitymode.png" />
-    <None Include="Resources\upgradeusefulpanelbuttons.png" />
-    <None Include="Resources\upgradevirusscanner.png" />
-    <None Include="Resources\upgradewindowborders.png" />
-    <None Include="Resources\upgradewindowedterminal.png" />
-    <None Include="Resources\upgradewindowsanywhere.png" />
-    <None Include="Resources\upgradeyellow.png" />
-    <None Include="Resources\upgradeyellowcustom.png" />
-    <None Include="Resources\upgradeyellowshades.png" />
-    <None Include="Resources\upgradeyellowshadeset.png" />
     <None Include="Resources\webback.png" />
     <None Include="Resources\webforward.png" />
     <None Include="Resources\webhome.png" />
@@ -926,7 +930,6 @@
     <None Include="Resources\fileiconnone2.bmp" />
     <None Include="Resources\christmas_skin.jpg" />
     <None Include="Resources\jumperplayer.bmp" />
-    <None Include="Resources\upgradeadvancedshifter.png" />
     <Compile Include="Engine\SaveSystem.cs" />
     <Compile Include="Apps\Shiftorium.cs">
       <SubType>Form</SubType>
@@ -963,7 +966,6 @@
     <None Include="Resources\Hacker_DanaRoss.txt" />
     <None Include="Resources\Hacker_AustinWalker.txt" />
     <None Include="Resources\Hacker_JonathanRivard.txt" />
-    <None Include="Resources\iconColourPicker.fw.png" />
     <None Include="Resources\AustinWalkerCompletionStory.txt" />
     <Compile Include="Desktop\ShiftOSDesktop.cs">
       <SubType>Form</SubType>
@@ -998,6 +1000,12 @@
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </COMReference>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ShiftUI\ShiftUI.csproj">
+      <Project>{c56e34d0-4749-4a73-9469-bccd063569cd}</Project>
+      <Name>ShiftUI</Name>
+    </ProjectReference>
+  </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\Baseclass.Contrib.Nuget.Output.2.0.0\build\net40\Baseclass.Contrib.Nuget.Output.targets" Condition="Exists('..\packages\Baseclass.Contrib.Nuget.Output.2.0.0\build\net40\Baseclass.Contrib.Nuget.Output.targets')" />