diff --git a/source/WindowsFormsApplication1/API.cs b/source/WindowsFormsApplication1/API.cs
index 4199223..27625bd 100644
--- a/source/WindowsFormsApplication1/API.cs
+++ b/source/WindowsFormsApplication1/API.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Media;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 using System.IO.Compression;
 using System.Drawing;
 using Newtonsoft.Json;
@@ -83,7 +83,7 @@ namespace ShiftOS
     public class API
     {
         public static Dictionary<Form, string> OpenGUIDs = new Dictionary<Form, string>();
-        public static Dictionary<string, Control> DEF_PanelGUIDs = new Dictionary<string, Control>();
+        public static Dictionary<string, Widget> DEF_PanelGUIDs = new Dictionary<string, Widget>();
 
 
         /// <summary>
@@ -119,7 +119,7 @@ namespace ShiftOS
 
         public static bool InfoboxesPlaySounds = true;
 
-        public static void SkinControl(Control c)
+        public static void SkinWidget(Widget c)
         {
             if(c is Button)
             {
@@ -128,9 +128,9 @@ namespace ShiftOS
             }
             if(c is Panel || c is FlowLayoutPanel)
             {
-                foreach(Control child in c.Controls)
+                foreach(Widget child in c.Widgets)
                 {
-                    SkinControl(child);
+                    SkinWidget(child);
                 }
             }
         }
@@ -1070,136 +1070,25 @@ namespace ShiftOS
             {
                 API.CurrentSession = new ShiftOSDesktop();
             }
-            try
+
+            formToCreate.Text = AppName;
+            formToCreate.TopMost = true;
+            formToCreate.Show();
+            var brdr = new WindowBorder(AppName, AppIcon);
+            brdr.Tag = "api_brdr";
+            formToCreate.Widgets.Add(brdr);
+            brdr.Show();
+            foreach(Widget widget in formToCreate.Body.Widgets)
             {
-                if (Upgrades["multitasking"] == false && formToCreate.Name != "infobox")
+                if(widget != brdr)
                 {
-                    CloseEverything();
+                    brdr.pgcontents.Widgets.Add(widget);
+                    widget.Show();
                 }
-                var bw = new BackgroundWorker();
-                bw.DoWork += (object sen, DoWorkEventArgs eva) =>
-                {
-                    WindowComposition.SafeToAddControls = false;
-                //bugfix: Close any terminal if WindowedTerminal isn't installed.
-                if (Upgrades["windowedterminal"] == false)
-                    {
-                        API.CurrentSession.Invoke(new Action(() =>
-                        {
-                            foreach (Form frm in OpenPrograms)
-                            {
-                                if (frm.Name.ToLower() == "terminal")
-                                {
-                                    API.CurrentSession.Invoke(new Action(() =>
-                                    {
-                                        frm.Close();
-                                    }));
-                                }
-                            }
-                        }));
-                    }
-                    WindowBorder brdr = new WindowBorder(AppName, AppIcon);
-                    brdr.Name = "api_brdr";
-                    formToCreate.Controls.Add(brdr);
-                    formToCreate.ShowInTaskbar = false;
-                    brdr.Show();
-                    formToCreate.FormBorderStyle = FormBorderStyle.None;
-                    brdr.Dock = DockStyle.Fill;
-                    BordersToUpdate.Add(brdr);
-                    List<Control> duplicates = new List<Control>();
-                    foreach (Control ctrl in formToCreate.Controls)
-                    {
-                        if (ctrl.Name != "api_brdr")
-                        {
-                            ctrl.Hide();
-                            brdr.pgcontents.Controls.Add(ctrl);
-                            duplicates.Add(ctrl);
-                        }
-                    }
-                    foreach (Control ctrl in duplicates)
-                    {
-                        try
-                        {
-                            formToCreate.Controls.Remove(ctrl);
-                            ctrl.Show();
-                            SkinControl(ctrl);
-                        }
-                        catch
-                        {
-                            API.CurrentSession.Invoke(new Action(() =>
-                            {
-                                ctrl.Show();
-                                SkinControl(ctrl);
-                            }));
-                        }
-                    }
-                    WindowComposition.ShowForm(formToCreate, CurrentSkin.WindowOpenAnimation);
-                    API.CurrentSession.Invoke(new Action(() =>
-                    {
-                        brdr.justopened = true;
-                        formToCreate.TopMost = true;
-
-                    //Open terminal on CTRL+T press on any form.
-                    formToCreate.KeyDown += (object sender, KeyEventArgs e) =>
-                        {
-                            if (e.KeyCode == Keys.T && e.Control && formToCreate.Name != "Terminal")
-                            {
-                                CurrentSession.InvokeCTRLT();
-                            }
-                            if (formToCreate.Name != "Terminal" || Upgrades["windowedterminal"] == true)
-                            {
-                            //Movable Windows
-                            if (API.Upgrades["movablewindows"] == true)
-                                {
-                                    if (e.KeyCode == Keys.A && e.Control)
-                                    {
-                                        e.Handled = true;
-                                        formToCreate.Location = new Point(formToCreate.Location.X - 30, formToCreate.Location.Y);
-                                    }
-                                    if (e.KeyCode == Keys.D && e.Control)
-                                    {
-                                        e.Handled = true;
-                                        formToCreate.Location = new Point(formToCreate.Location.X + 30, formToCreate.Location.Y);
-                                    }
-                                    if (e.KeyCode == Keys.W && e.Control)
-                                    {
-                                        e.Handled = true;
-                                        formToCreate.Location = new Point(formToCreate.Location.X, formToCreate.Location.Y - 30);
-                                    }
-                                    if (e.KeyCode == Keys.S && e.Control)
-                                    {
-                                        e.Handled = true;
-                                        formToCreate.Location = new Point(formToCreate.Location.X, formToCreate.Location.Y + 30);
-                                    }
-                                }
-                            }
-                        };
-                        formToCreate.TransparencyKey = Skinning.Utilities.globaltransparencycolour;
-                        OpenPrograms.Add(formToCreate);
-                        if (AppName == "Enemy Hacker")
-                        {
-                            API.CurrentSession.Invoke(new Action(() =>
-                            {
-                                formToCreate.Left = Screen.PrimaryScreen.Bounds.Width - formToCreate.Width;
-                            }));
-                        }
-                        else if (AppName == "You")
-                        {
-                            API.CurrentSession.Invoke(new Action(() =>
-                            {
-                                formToCreate.Left = 0;
-                            }));
-                        }
-                    }));
-                    WindowComposition.SafeToAddControls = true;
-                    API.OpenGUIDs.Add(formToCreate, Guid.NewGuid().ToString());
-                    API.CurrentSession.Invoke(new Action(() => { CurrentSession.InvokeWindowOp("open", formToCreate); }));
-                };
-                bw.RunWorkerAsync();
-            }
-            catch
-            {
-
             }
+            brdr.Dock = DockStyle.Fill;
+            formToCreate.Body.BorderStyle = BorderStyle.None;
+            brdr.setupall();
         }
 
         /// <summary>
diff --git a/source/WindowsFormsApplication1/Apps/Appscape.Designer.cs b/source/WindowsFormsApplication1/Apps/Appscape.Designer.cs
index e8ef295..3ba0488 100644
--- a/source/WindowsFormsApplication1/Apps/Appscape.Designer.cs
+++ b/source/WindowsFormsApplication1/Apps/Appscape.Designer.cs
@@ -30,68 +30,68 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Appscape));
-            this.panel3 = new System.Windows.Forms.Panel();
-            this.pnlchoosenetwork = new System.Windows.Forms.Panel();
-            this.btnrequest = new System.Windows.Forms.Button();
-            this.label14 = new System.Windows.Forms.Label();
-            this.label13 = new System.Windows.Forms.Label();
-            this.lvnets = new System.Windows.Forms.ListView();
-            this.clhostnameheader = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.pnlpackageeditor = new System.Windows.Forms.Panel();
-            this.label12 = new System.Windows.Forms.Label();
-            this.btndonecustomizing = new System.Windows.Forms.Button();
-            this.btnsaa = new System.Windows.Forms.Button();
-            this.txtprice = new System.Windows.Forms.TextBox();
-            this.lbprice = new System.Windows.Forms.Label();
-            this.lbaddress = new System.Windows.Forms.Label();
-            this.cbsell = new System.Windows.Forms.CheckBox();
-            this.txtpackagedescription = new System.Windows.Forms.TextBox();
-            this.label10 = new System.Windows.Forms.Label();
-            this.txtpackagename = new System.Windows.Forms.TextBox();
-            this.label11 = new System.Windows.Forms.Label();
-            this.label9 = new System.Windows.Forms.Label();
-            this.pnllounge = new System.Windows.Forms.Panel();
-            this.btnedit = new System.Windows.Forms.Button();
-            this.btnupload = new System.Windows.Forms.Button();
-            this.btnsave = new System.Windows.Forms.Button();
-            this.txtbitnoteaddress = new System.Windows.Forms.TextBox();
-            this.label8 = new System.Windows.Forms.Label();
-            this.txtbio = new System.Windows.Forms.TextBox();
-            this.label7 = new System.Windows.Forms.Label();
-            this.txtmoddername = new System.Windows.Forms.TextBox();
-            this.label6 = new System.Windows.Forms.Label();
-            this.label5 = new System.Windows.Forms.Label();
-            this.label4 = new System.Windows.Forms.Label();
-            this.lbmybio = new System.Windows.Forms.Label();
-            this.label3 = new System.Windows.Forms.Label();
-            this.lbmyname = new System.Windows.Forms.Label();
-            this.lvmypackages = new System.Windows.Forms.ListView();
-            this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.pnlpackageinfo = new System.Windows.Forms.Panel();
-            this.pnlauthordetails = new System.Windows.Forms.Panel();
-            this.lbauthordescription = new System.Windows.Forms.Label();
-            this.lbauthorname = new System.Windows.Forms.Label();
-            this.pbappicon = new System.Windows.Forms.PictureBox();
-            this.pbappscreenshot = new System.Windows.Forms.PictureBox();
-            this.pnldownload = new System.Windows.Forms.Panel();
-            this.lbdownloadpath = new System.Windows.Forms.Label();
-            this.btndownload = new System.Windows.Forms.Button();
-            this.lbpkgdescription = new System.Windows.Forms.Label();
-            this.lbpkgname = new System.Windows.Forms.Label();
-            this.pnllist = new System.Windows.Forms.Panel();
-            this.lvpackages = new System.Windows.Forms.ListView();
-            this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.pnlsearch = new System.Windows.Forms.Panel();
-            this.btnlounge = new System.Windows.Forms.Button();
-            this.label2 = new System.Windows.Forms.Label();
-            this.btngetkey = new System.Windows.Forms.Button();
-            this.label1 = new System.Windows.Forms.Label();
-            this.txtsearch = new System.Windows.Forms.TextBox();
-            this.btnskins = new System.Windows.Forms.Button();
-            this.btnapps = new System.Windows.Forms.Button();
-            this.imgpackageicons = new System.Windows.Forms.ImageList(this.components);
+            this.panel3 = new ShiftUI.Panel();
+            this.pnlchoosenetwork = new ShiftUI.Panel();
+            this.btnrequest = new ShiftUI.Button();
+            this.label14 = new ShiftUI.Label();
+            this.label13 = new ShiftUI.Label();
+            this.lvnets = new ShiftUI.ListView();
+            this.clhostnameheader = ((ShiftUI.ColumnHeader)(new ShiftUI.ColumnHeader()));
+            this.pnlpackageeditor = new ShiftUI.Panel();
+            this.label12 = new ShiftUI.Label();
+            this.btndonecustomizing = new ShiftUI.Button();
+            this.btnsaa = new ShiftUI.Button();
+            this.txtprice = new ShiftUI.TextBox();
+            this.lbprice = new ShiftUI.Label();
+            this.lbaddress = new ShiftUI.Label();
+            this.cbsell = new ShiftUI.CheckBox();
+            this.txtpackagedescription = new ShiftUI.TextBox();
+            this.label10 = new ShiftUI.Label();
+            this.txtpackagename = new ShiftUI.TextBox();
+            this.label11 = new ShiftUI.Label();
+            this.label9 = new ShiftUI.Label();
+            this.pnllounge = new ShiftUI.Panel();
+            this.btnedit = new ShiftUI.Button();
+            this.btnupload = new ShiftUI.Button();
+            this.btnsave = new ShiftUI.Button();
+            this.txtbitnoteaddress = new ShiftUI.TextBox();
+            this.label8 = new ShiftUI.Label();
+            this.txtbio = new ShiftUI.TextBox();
+            this.label7 = new ShiftUI.Label();
+            this.txtmoddername = new ShiftUI.TextBox();
+            this.label6 = new ShiftUI.Label();
+            this.label5 = new ShiftUI.Label();
+            this.label4 = new ShiftUI.Label();
+            this.lbmybio = new ShiftUI.Label();
+            this.label3 = new ShiftUI.Label();
+            this.lbmyname = new ShiftUI.Label();
+            this.lvmypackages = new ShiftUI.ListView();
+            this.columnHeader4 = ((ShiftUI.ColumnHeader)(new ShiftUI.ColumnHeader()));
+            this.pnlpackageinfo = new ShiftUI.Panel();
+            this.pnlauthordetails = new ShiftUI.Panel();
+            this.lbauthordescription = new ShiftUI.Label();
+            this.lbauthorname = new ShiftUI.Label();
+            this.pbappicon = new ShiftUI.PictureBox();
+            this.pbappscreenshot = new ShiftUI.PictureBox();
+            this.pnldownload = new ShiftUI.Panel();
+            this.lbdownloadpath = new ShiftUI.Label();
+            this.btndownload = new ShiftUI.Button();
+            this.lbpkgdescription = new ShiftUI.Label();
+            this.lbpkgname = new ShiftUI.Label();
+            this.pnllist = new ShiftUI.Panel();
+            this.lvpackages = new ShiftUI.ListView();
+            this.columnHeader1 = ((ShiftUI.ColumnHeader)(new ShiftUI.ColumnHeader()));
+            this.columnHeader2 = ((ShiftUI.ColumnHeader)(new ShiftUI.ColumnHeader()));
+            this.columnHeader3 = ((ShiftUI.ColumnHeader)(new ShiftUI.ColumnHeader()));
+            this.pnlsearch = new ShiftUI.Panel();
+            this.btnlounge = new ShiftUI.Button();
+            this.label2 = new ShiftUI.Label();
+            this.btngetkey = new ShiftUI.Button();
+            this.label1 = new ShiftUI.Label();
+            this.txtsearch = new ShiftUI.TextBox();
+            this.btnskins = new ShiftUI.Button();
+            this.btnapps = new ShiftUI.Button();
+            this.imgpackageicons = new ShiftUI.ImageList(this.components);
             this.panel3.SuspendLayout();
             this.pnlchoosenetwork.SuspendLayout();
             this.pnlpackageeditor.SuspendLayout();
@@ -107,13 +107,13 @@
             // 
             // panel3
             // 
-            this.panel3.Controls.Add(this.pnlchoosenetwork);
-            this.panel3.Controls.Add(this.pnlpackageeditor);
-            this.panel3.Controls.Add(this.pnllounge);
-            this.panel3.Controls.Add(this.pnlpackageinfo);
-            this.panel3.Controls.Add(this.pnllist);
-            this.panel3.Controls.Add(this.pnlsearch);
-            this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel3.Widgets.Add(this.pnlchoosenetwork);
+            this.panel3.Widgets.Add(this.pnlpackageeditor);
+            this.panel3.Widgets.Add(this.pnllounge);
+            this.panel3.Widgets.Add(this.pnlpackageinfo);
+            this.panel3.Widgets.Add(this.pnllist);
+            this.panel3.Widgets.Add(this.pnlsearch);
+            this.panel3.Dock = ShiftUI.DockStyle.Fill;
             this.panel3.Location = new System.Drawing.Point(0, 0);
             this.panel3.Name = "panel3";
             this.panel3.Size = new System.Drawing.Size(886, 469);
@@ -121,11 +121,11 @@
             // 
             // pnlchoosenetwork
             // 
-            this.pnlchoosenetwork.Controls.Add(this.lvnets);
-            this.pnlchoosenetwork.Controls.Add(this.btnrequest);
-            this.pnlchoosenetwork.Controls.Add(this.label14);
-            this.pnlchoosenetwork.Controls.Add(this.label13);
-            this.pnlchoosenetwork.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pnlchoosenetwork.Widgets.Add(this.lvnets);
+            this.pnlchoosenetwork.Widgets.Add(this.btnrequest);
+            this.pnlchoosenetwork.Widgets.Add(this.label14);
+            this.pnlchoosenetwork.Widgets.Add(this.label13);
+            this.pnlchoosenetwork.Dock = ShiftUI.DockStyle.Fill;
             this.pnlchoosenetwork.Location = new System.Drawing.Point(0, 47);
             this.pnlchoosenetwork.Name = "pnlchoosenetwork";
             this.pnlchoosenetwork.Size = new System.Drawing.Size(886, 422);
@@ -133,8 +133,8 @@
             // 
             // btnrequest
             // 
-            this.btnrequest.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnrequest.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnrequest.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
+            this.btnrequest.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnrequest.Font = new System.Drawing.Font("Times New Roman", 8.25F);
             this.btnrequest.Location = new System.Drawing.Point(799, 385);
             this.btnrequest.Name = "btnrequest";
@@ -146,8 +146,8 @@
             // 
             // label14
             // 
-            this.label14.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.label14.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.label14.Location = new System.Drawing.Point(17, 31);
             this.label14.Name = "label14";
             this.label14.Size = new System.Drawing.Size(857, 30);
@@ -166,19 +166,19 @@
             // 
             // lvnets
             // 
-            this.lvnets.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.lvnets.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.lvnets.Anchor = ((ShiftUI.AnchorStyles)((((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
+            this.lvnets.Columns.AddRange(new ShiftUI.ColumnHeader[] {
             this.clhostnameheader});
             this.lvnets.FullRowSelect = true;
-            this.lvnets.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
+            this.lvnets.HeaderStyle = ShiftUI.ColumnHeaderStyle.Nonclickable;
             this.lvnets.Location = new System.Drawing.Point(12, 64);
             this.lvnets.Name = "lvnets";
             this.lvnets.Size = new System.Drawing.Size(868, 307);
             this.lvnets.TabIndex = 0;
             this.lvnets.UseCompatibleStateImageBehavior = false;
-            this.lvnets.View = System.Windows.Forms.View.Details;
+            this.lvnets.View = ShiftUI.View.Details;
             // 
             // clhostnameheader
             // 
@@ -186,19 +186,19 @@
             // 
             // pnlpackageeditor
             // 
-            this.pnlpackageeditor.Controls.Add(this.label12);
-            this.pnlpackageeditor.Controls.Add(this.btndonecustomizing);
-            this.pnlpackageeditor.Controls.Add(this.btnsaa);
-            this.pnlpackageeditor.Controls.Add(this.txtprice);
-            this.pnlpackageeditor.Controls.Add(this.lbprice);
-            this.pnlpackageeditor.Controls.Add(this.lbaddress);
-            this.pnlpackageeditor.Controls.Add(this.cbsell);
-            this.pnlpackageeditor.Controls.Add(this.txtpackagedescription);
-            this.pnlpackageeditor.Controls.Add(this.label10);
-            this.pnlpackageeditor.Controls.Add(this.txtpackagename);
-            this.pnlpackageeditor.Controls.Add(this.label11);
-            this.pnlpackageeditor.Controls.Add(this.label9);
-            this.pnlpackageeditor.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pnlpackageeditor.Widgets.Add(this.label12);
+            this.pnlpackageeditor.Widgets.Add(this.btndonecustomizing);
+            this.pnlpackageeditor.Widgets.Add(this.btnsaa);
+            this.pnlpackageeditor.Widgets.Add(this.txtprice);
+            this.pnlpackageeditor.Widgets.Add(this.lbprice);
+            this.pnlpackageeditor.Widgets.Add(this.lbaddress);
+            this.pnlpackageeditor.Widgets.Add(this.cbsell);
+            this.pnlpackageeditor.Widgets.Add(this.txtpackagedescription);
+            this.pnlpackageeditor.Widgets.Add(this.label10);
+            this.pnlpackageeditor.Widgets.Add(this.txtpackagename);
+            this.pnlpackageeditor.Widgets.Add(this.label11);
+            this.pnlpackageeditor.Widgets.Add(this.label9);
+            this.pnlpackageeditor.Dock = ShiftUI.DockStyle.Fill;
             this.pnlpackageeditor.Location = new System.Drawing.Point(0, 47);
             this.pnlpackageeditor.Name = "pnlpackageeditor";
             this.pnlpackageeditor.Size = new System.Drawing.Size(886, 422);
@@ -215,10 +215,10 @@
             // 
             // btndonecustomizing
             // 
-            this.btndonecustomizing.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btndonecustomizing.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
             this.btndonecustomizing.AutoSize = true;
-            this.btndonecustomizing.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btndonecustomizing.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btndonecustomizing.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.btndonecustomizing.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btndonecustomizing.Font = new System.Drawing.Font("Times New Roman", 10F);
             this.btndonecustomizing.Location = new System.Drawing.Point(824, 385);
             this.btndonecustomizing.Name = "btndonecustomizing";
@@ -231,8 +231,8 @@
             // btnsaa
             // 
             this.btnsaa.AutoSize = true;
-            this.btnsaa.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btnsaa.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnsaa.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.btnsaa.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnsaa.Font = new System.Drawing.Font("Times New Roman", 10F);
             this.btnsaa.Location = new System.Drawing.Point(99, 318);
             this.btnsaa.Name = "btnsaa";
@@ -272,9 +272,9 @@
             // 
             // cbsell
             // 
-            this.cbsell.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbsell.Appearance = ShiftUI.Appearance.Button;
             this.cbsell.AutoSize = true;
-            this.cbsell.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.cbsell.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.cbsell.Font = new System.Drawing.Font("Times New Roman", 8.25F);
             this.cbsell.Location = new System.Drawing.Point(97, 263);
             this.cbsell.Name = "cbsell";
@@ -286,8 +286,8 @@
             // 
             // txtpackagedescription
             // 
-            this.txtpackagedescription.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtpackagedescription.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.txtpackagedescription.Location = new System.Drawing.Point(99, 72);
             this.txtpackagedescription.Multiline = true;
             this.txtpackagedescription.Name = "txtpackagedescription";
@@ -331,22 +331,22 @@
             // 
             // pnllounge
             // 
-            this.pnllounge.Controls.Add(this.btnedit);
-            this.pnllounge.Controls.Add(this.btnupload);
-            this.pnllounge.Controls.Add(this.btnsave);
-            this.pnllounge.Controls.Add(this.txtbitnoteaddress);
-            this.pnllounge.Controls.Add(this.label8);
-            this.pnllounge.Controls.Add(this.txtbio);
-            this.pnllounge.Controls.Add(this.label7);
-            this.pnllounge.Controls.Add(this.txtmoddername);
-            this.pnllounge.Controls.Add(this.label6);
-            this.pnllounge.Controls.Add(this.label5);
-            this.pnllounge.Controls.Add(this.label4);
-            this.pnllounge.Controls.Add(this.lbmybio);
-            this.pnllounge.Controls.Add(this.label3);
-            this.pnllounge.Controls.Add(this.lbmyname);
-            this.pnllounge.Controls.Add(this.lvmypackages);
-            this.pnllounge.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pnllounge.Widgets.Add(this.btnedit);
+            this.pnllounge.Widgets.Add(this.btnupload);
+            this.pnllounge.Widgets.Add(this.btnsave);
+            this.pnllounge.Widgets.Add(this.txtbitnoteaddress);
+            this.pnllounge.Widgets.Add(this.label8);
+            this.pnllounge.Widgets.Add(this.txtbio);
+            this.pnllounge.Widgets.Add(this.label7);
+            this.pnllounge.Widgets.Add(this.txtmoddername);
+            this.pnllounge.Widgets.Add(this.label6);
+            this.pnllounge.Widgets.Add(this.label5);
+            this.pnllounge.Widgets.Add(this.label4);
+            this.pnllounge.Widgets.Add(this.lbmybio);
+            this.pnllounge.Widgets.Add(this.label3);
+            this.pnllounge.Widgets.Add(this.lbmyname);
+            this.pnllounge.Widgets.Add(this.lvmypackages);
+            this.pnllounge.Dock = ShiftUI.DockStyle.Fill;
             this.pnllounge.Location = new System.Drawing.Point(0, 47);
             this.pnllounge.Name = "pnllounge";
             this.pnllounge.Size = new System.Drawing.Size(886, 422);
@@ -354,8 +354,8 @@
             // 
             // btnedit
             // 
-            this.btnedit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.btnedit.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnedit.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left)));
+            this.btnedit.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnedit.Location = new System.Drawing.Point(239, 377);
             this.btnedit.Name = "btnedit";
             this.btnedit.Size = new System.Drawing.Size(75, 23);
@@ -366,8 +366,8 @@
             // 
             // btnupload
             // 
-            this.btnupload.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.btnupload.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnupload.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left)));
+            this.btnupload.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnupload.Location = new System.Drawing.Point(320, 377);
             this.btnupload.Name = "btnupload";
             this.btnupload.Size = new System.Drawing.Size(75, 23);
@@ -378,8 +378,8 @@
             // 
             // btnsave
             // 
-            this.btnsave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnsave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnsave.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
+            this.btnsave.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnsave.Font = new System.Drawing.Font("Times New Roman", 8.25F);
             this.btnsave.Location = new System.Drawing.Point(799, 390);
             this.btnsave.Name = "btnsave";
@@ -391,7 +391,7 @@
             // 
             // txtbitnoteaddress
             // 
-            this.txtbitnoteaddress.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtbitnoteaddress.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Right)));
             this.txtbitnoteaddress.Location = new System.Drawing.Point(490, 333);
             this.txtbitnoteaddress.Name = "txtbitnoteaddress";
             this.txtbitnoteaddress.Size = new System.Drawing.Size(384, 20);
@@ -400,7 +400,7 @@
             // 
             // label8
             // 
-            this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label8.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Right)));
             this.label8.AutoSize = true;
             this.label8.Location = new System.Drawing.Point(407, 339);
             this.label8.Name = "label8";
@@ -410,7 +410,7 @@
             // 
             // txtbio
             // 
-            this.txtbio.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtbio.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Right)));
             this.txtbio.Location = new System.Drawing.Point(490, 110);
             this.txtbio.Multiline = true;
             this.txtbio.Name = "txtbio";
@@ -429,7 +429,7 @@
             // 
             // txtmoddername
             // 
-            this.txtmoddername.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtmoddername.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Right)));
             this.txtmoddername.Location = new System.Drawing.Point(490, 84);
             this.txtmoddername.Name = "txtmoddername";
             this.txtmoddername.Size = new System.Drawing.Size(384, 20);
@@ -438,7 +438,7 @@
             // 
             // label6
             // 
-            this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label6.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Right)));
             this.label6.AutoSize = true;
             this.label6.Location = new System.Drawing.Point(407, 90);
             this.label6.Name = "label6";
@@ -448,7 +448,7 @@
             // 
             // label5
             // 
-            this.label5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label5.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Right)));
             this.label5.Location = new System.Drawing.Point(404, 31);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(378, 32);
@@ -458,7 +458,7 @@
             // 
             // label4
             // 
-            this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label4.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Right)));
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("Times New Roman", 13F);
             this.label4.Location = new System.Drawing.Point(403, 11);
@@ -469,8 +469,8 @@
             // 
             // lbmybio
             // 
-            this.lbmybio.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
+            this.lbmybio.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left)));
             this.lbmybio.Location = new System.Drawing.Point(17, 46);
             this.lbmybio.Name = "lbmybio";
             this.lbmybio.Size = new System.Drawing.Size(378, 110);
@@ -479,7 +479,7 @@
             // 
             // label3
             // 
-            this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.label3.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left)));
             this.label3.AutoSize = true;
             this.label3.Location = new System.Drawing.Point(17, 156);
             this.label3.Name = "label3";
@@ -499,16 +499,16 @@
             // 
             // lvmypackages
             // 
-            this.lvmypackages.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.lvmypackages.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.lvmypackages.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left)));
+            this.lvmypackages.Columns.AddRange(new ShiftUI.ColumnHeader[] {
             this.columnHeader4});
-            this.lvmypackages.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
+            this.lvmypackages.HeaderStyle = ShiftUI.ColumnHeaderStyle.Nonclickable;
             this.lvmypackages.Location = new System.Drawing.Point(20, 172);
             this.lvmypackages.Name = "lvmypackages";
             this.lvmypackages.Size = new System.Drawing.Size(375, 199);
             this.lvmypackages.TabIndex = 0;
             this.lvmypackages.UseCompatibleStateImageBehavior = false;
-            this.lvmypackages.View = System.Windows.Forms.View.Details;
+            this.lvmypackages.View = ShiftUI.View.Details;
             // 
             // columnHeader4
             // 
@@ -516,13 +516,13 @@
             // 
             // pnlpackageinfo
             // 
-            this.pnlpackageinfo.Controls.Add(this.pnlauthordetails);
-            this.pnlpackageinfo.Controls.Add(this.pbappicon);
-            this.pnlpackageinfo.Controls.Add(this.pbappscreenshot);
-            this.pnlpackageinfo.Controls.Add(this.pnldownload);
-            this.pnlpackageinfo.Controls.Add(this.lbpkgdescription);
-            this.pnlpackageinfo.Controls.Add(this.lbpkgname);
-            this.pnlpackageinfo.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pnlpackageinfo.Widgets.Add(this.pnlauthordetails);
+            this.pnlpackageinfo.Widgets.Add(this.pbappicon);
+            this.pnlpackageinfo.Widgets.Add(this.pbappscreenshot);
+            this.pnlpackageinfo.Widgets.Add(this.pnldownload);
+            this.pnlpackageinfo.Widgets.Add(this.lbpkgdescription);
+            this.pnlpackageinfo.Widgets.Add(this.lbpkgname);
+            this.pnlpackageinfo.Dock = ShiftUI.DockStyle.Fill;
             this.pnlpackageinfo.Location = new System.Drawing.Point(0, 47);
             this.pnlpackageinfo.Name = "pnlpackageinfo";
             this.pnlpackageinfo.Size = new System.Drawing.Size(886, 422);
@@ -530,9 +530,9 @@
             // 
             // pnlauthordetails
             // 
-            this.pnlauthordetails.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.pnlauthordetails.Controls.Add(this.lbauthordescription);
-            this.pnlauthordetails.Controls.Add(this.lbauthorname);
+            this.pnlauthordetails.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left)));
+            this.pnlauthordetails.Widgets.Add(this.lbauthordescription);
+            this.pnlauthordetails.Widgets.Add(this.lbauthorname);
             this.pnlauthordetails.Location = new System.Drawing.Point(12, 213);
             this.pnlauthordetails.Name = "pnlauthordetails";
             this.pnlauthordetails.Size = new System.Drawing.Size(468, 197);
@@ -561,25 +561,25 @@
             this.pbappicon.Location = new System.Drawing.Point(12, 11);
             this.pbappicon.Name = "pbappicon";
             this.pbappicon.Size = new System.Drawing.Size(32, 32);
-            this.pbappicon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+            this.pbappicon.SizeMode = ShiftUI.PictureBoxSizeMode.StretchImage;
             this.pbappicon.TabIndex = 4;
             this.pbappicon.TabStop = false;
             // 
             // pbappscreenshot
             // 
-            this.pbappscreenshot.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.pbappscreenshot.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
             this.pbappscreenshot.Location = new System.Drawing.Point(500, 213);
             this.pbappscreenshot.Name = "pbappscreenshot";
             this.pbappscreenshot.Size = new System.Drawing.Size(374, 197);
-            this.pbappscreenshot.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+            this.pbappscreenshot.SizeMode = ShiftUI.PictureBoxSizeMode.StretchImage;
             this.pbappscreenshot.TabIndex = 3;
             this.pbappscreenshot.TabStop = false;
             // 
             // pnldownload
             // 
-            this.pnldownload.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnldownload.Controls.Add(this.lbdownloadpath);
-            this.pnldownload.Controls.Add(this.btndownload);
+            this.pnldownload.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Right)));
+            this.pnldownload.Widgets.Add(this.lbdownloadpath);
+            this.pnldownload.Widgets.Add(this.btndownload);
             this.pnldownload.Location = new System.Drawing.Point(646, 7);
             this.pnldownload.Name = "pnldownload";
             this.pnldownload.Size = new System.Drawing.Size(237, 97);
@@ -596,7 +596,7 @@
             // 
             // btndownload
             // 
-            this.btndownload.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btndownload.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btndownload.Font = new System.Drawing.Font("Times New Roman", 8.25F);
             this.btndownload.Location = new System.Drawing.Point(112, 13);
             this.btndownload.Name = "btndownload";
@@ -608,8 +608,8 @@
             // 
             // lbpkgdescription
             // 
-            this.lbpkgdescription.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
+            this.lbpkgdescription.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left)));
             this.lbpkgdescription.Location = new System.Drawing.Point(17, 47);
             this.lbpkgdescription.Name = "lbpkgdescription";
             this.lbpkgdescription.Size = new System.Drawing.Size(347, 156);
@@ -628,8 +628,8 @@
             // 
             // pnllist
             // 
-            this.pnllist.Controls.Add(this.lvpackages);
-            this.pnllist.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pnllist.Widgets.Add(this.lvpackages);
+            this.pnllist.Dock = ShiftUI.DockStyle.Fill;
             this.pnllist.Location = new System.Drawing.Point(0, 47);
             this.pnllist.Name = "pnllist";
             this.pnllist.Size = new System.Drawing.Size(886, 422);
@@ -637,19 +637,19 @@
             // 
             // lvpackages
             // 
-            this.lvpackages.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.lvpackages.Columns.AddRange(new ShiftUI.ColumnHeader[] {
             this.columnHeader1,
             this.columnHeader2,
             this.columnHeader3});
-            this.lvpackages.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.lvpackages.Dock = ShiftUI.DockStyle.Fill;
             this.lvpackages.FullRowSelect = true;
-            this.lvpackages.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
+            this.lvpackages.HeaderStyle = ShiftUI.ColumnHeaderStyle.Nonclickable;
             this.lvpackages.Location = new System.Drawing.Point(0, 0);
             this.lvpackages.Name = "lvpackages";
             this.lvpackages.Size = new System.Drawing.Size(886, 422);
             this.lvpackages.TabIndex = 0;
             this.lvpackages.UseCompatibleStateImageBehavior = false;
-            this.lvpackages.View = System.Windows.Forms.View.Details;
+            this.lvpackages.View = ShiftUI.View.Details;
             this.lvpackages.SelectedIndexChanged += new System.EventHandler(this.lvpackages_SelectedIndexChanged);
             this.lvpackages.DoubleClick += new System.EventHandler(this.lvpackages_DoubleClick);
             // 
@@ -668,14 +668,14 @@
             // pnlsearch
             // 
             this.pnlsearch.BackColor = System.Drawing.Color.Gray;
-            this.pnlsearch.Controls.Add(this.btnlounge);
-            this.pnlsearch.Controls.Add(this.label2);
-            this.pnlsearch.Controls.Add(this.btngetkey);
-            this.pnlsearch.Controls.Add(this.label1);
-            this.pnlsearch.Controls.Add(this.txtsearch);
-            this.pnlsearch.Controls.Add(this.btnskins);
-            this.pnlsearch.Controls.Add(this.btnapps);
-            this.pnlsearch.Dock = System.Windows.Forms.DockStyle.Top;
+            this.pnlsearch.Widgets.Add(this.btnlounge);
+            this.pnlsearch.Widgets.Add(this.label2);
+            this.pnlsearch.Widgets.Add(this.btngetkey);
+            this.pnlsearch.Widgets.Add(this.label1);
+            this.pnlsearch.Widgets.Add(this.txtsearch);
+            this.pnlsearch.Widgets.Add(this.btnskins);
+            this.pnlsearch.Widgets.Add(this.btnapps);
+            this.pnlsearch.Dock = ShiftUI.DockStyle.Top;
             this.pnlsearch.ForeColor = System.Drawing.Color.White;
             this.pnlsearch.Location = new System.Drawing.Point(0, 0);
             this.pnlsearch.Name = "pnlsearch";
@@ -684,7 +684,7 @@
             // 
             // btnlounge
             // 
-            this.btnlounge.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnlounge.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnlounge.Font = new System.Drawing.Font("Times New Roman", 8.25F);
             this.btnlounge.Location = new System.Drawing.Point(377, 14);
             this.btnlounge.Name = "btnlounge";
@@ -696,7 +696,7 @@
             // 
             // label2
             // 
-            this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label2.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Right)));
             this.label2.AutoSize = true;
             this.label2.Location = new System.Drawing.Point(643, 16);
             this.label2.Name = "label2";
@@ -706,7 +706,7 @@
             // 
             // btngetkey
             // 
-            this.btngetkey.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btngetkey.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btngetkey.Font = new System.Drawing.Font("Times New Roman", 8.25F);
             this.btngetkey.Location = new System.Drawing.Point(296, 14);
             this.btngetkey.Name = "btngetkey";
@@ -727,7 +727,7 @@
             // 
             // txtsearch
             // 
-            this.txtsearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtsearch.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Right)));
             this.txtsearch.Location = new System.Drawing.Point(721, 13);
             this.txtsearch.Name = "txtsearch";
             this.txtsearch.Size = new System.Drawing.Size(153, 20);
@@ -736,7 +736,7 @@
             // 
             // btnskins
             // 
-            this.btnskins.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnskins.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnskins.Font = new System.Drawing.Font("Times New Roman", 10F);
             this.btnskins.Location = new System.Drawing.Point(86, 4);
             this.btnskins.Name = "btnskins";
@@ -748,7 +748,7 @@
             // 
             // btnapps
             // 
-            this.btnapps.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnapps.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnapps.Font = new System.Drawing.Font("Times New Roman", 10F);
             this.btnapps.Location = new System.Drawing.Point(4, 4);
             this.btnapps.Name = "btnapps";
@@ -760,17 +760,17 @@
             // 
             // imgpackageicons
             // 
-            this.imgpackageicons.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit;
+            this.imgpackageicons.ColorDepth = ShiftUI.ColorDepth.Depth8Bit;
             this.imgpackageicons.ImageSize = new System.Drawing.Size(16, 16);
             this.imgpackageicons.TransparentColor = System.Drawing.Color.Transparent;
             // 
             // Appscape
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.Control;
             this.ClientSize = new System.Drawing.Size(886, 469);
-            this.Controls.Add(this.panel3);
+            this.Widgets.Add(this.panel3);
             this.Name = "Appscape";
             this.Text = "Form1";
             this.Load += new System.EventHandler(this.Form1_Load);
@@ -796,67 +796,67 @@
         }
 
         #endregion
-        private System.Windows.Forms.Panel panel3;
-        private System.Windows.Forms.ImageList imgpackageicons;
-        private System.Windows.Forms.Panel pnlsearch;
-        private System.Windows.Forms.Button btnskins;
-        private System.Windows.Forms.Button btnapps;
-        private System.Windows.Forms.Panel pnlpackageinfo;
-        private System.Windows.Forms.Label lbpkgname;
-        private System.Windows.Forms.Label lbpkgdescription;
-        private System.Windows.Forms.Panel pnldownload;
-        private System.Windows.Forms.Label lbdownloadpath;
-        private System.Windows.Forms.Button btndownload;
-        private System.Windows.Forms.Panel pnllist;
-        private System.Windows.Forms.ListView lvpackages;
-        private System.Windows.Forms.ColumnHeader columnHeader1;
-        private System.Windows.Forms.ColumnHeader columnHeader2;
-        private System.Windows.Forms.ColumnHeader columnHeader3;
-        private System.Windows.Forms.PictureBox pbappscreenshot;
-        private System.Windows.Forms.PictureBox pbappicon;
-        private System.Windows.Forms.TextBox txtsearch;
-        private System.Windows.Forms.Button btnlounge;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Button btngetkey;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Panel pnllounge;
-        private System.Windows.Forms.ListView lvmypackages;
-        private System.Windows.Forms.ColumnHeader columnHeader4;
-        private System.Windows.Forms.Label lbmyname;
-        private System.Windows.Forms.Label lbmybio;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.TextBox txtbitnoteaddress;
-        private System.Windows.Forms.Label label8;
-        private System.Windows.Forms.TextBox txtbio;
-        private System.Windows.Forms.Label label7;
-        private System.Windows.Forms.TextBox txtmoddername;
-        private System.Windows.Forms.Label label6;
-        private System.Windows.Forms.Label label5;
-        private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.Button btnsave;
-        private System.Windows.Forms.Button btnupload;
-        private System.Windows.Forms.Button btnedit;
-        private System.Windows.Forms.Panel pnlpackageeditor;
-        private System.Windows.Forms.Label label9;
-        private System.Windows.Forms.TextBox txtprice;
-        private System.Windows.Forms.Label lbprice;
-        private System.Windows.Forms.Label lbaddress;
-        private System.Windows.Forms.CheckBox cbsell;
-        private System.Windows.Forms.TextBox txtpackagedescription;
-        private System.Windows.Forms.Label label10;
-        private System.Windows.Forms.TextBox txtpackagename;
-        private System.Windows.Forms.Label label11;
-        private System.Windows.Forms.Label label12;
-        private System.Windows.Forms.Button btndonecustomizing;
-        private System.Windows.Forms.Button btnsaa;
-        private System.Windows.Forms.Panel pnlauthordetails;
-        private System.Windows.Forms.Label lbauthordescription;
-        private System.Windows.Forms.Label lbauthorname;
-        private System.Windows.Forms.Panel pnlchoosenetwork;
-        private System.Windows.Forms.Button btnrequest;
-        private System.Windows.Forms.Label label14;
-        private System.Windows.Forms.Label label13;
-        private System.Windows.Forms.ListView lvnets;
-        private System.Windows.Forms.ColumnHeader clhostnameheader;
+        private ShiftUI.Panel panel3;
+        private ShiftUI.ImageList imgpackageicons;
+        private ShiftUI.Panel pnlsearch;
+        private ShiftUI.Button btnskins;
+        private ShiftUI.Button btnapps;
+        private ShiftUI.Panel pnlpackageinfo;
+        private ShiftUI.Label lbpkgname;
+        private ShiftUI.Label lbpkgdescription;
+        private ShiftUI.Panel pnldownload;
+        private ShiftUI.Label lbdownloadpath;
+        private ShiftUI.Button btndownload;
+        private ShiftUI.Panel pnllist;
+        private ShiftUI.ListView lvpackages;
+        private ShiftUI.ColumnHeader columnHeader1;
+        private ShiftUI.ColumnHeader columnHeader2;
+        private ShiftUI.ColumnHeader columnHeader3;
+        private ShiftUI.PictureBox pbappscreenshot;
+        private ShiftUI.PictureBox pbappicon;
+        private ShiftUI.TextBox txtsearch;
+        private ShiftUI.Button btnlounge;
+        private ShiftUI.Label label2;
+        private ShiftUI.Button btngetkey;
+        private ShiftUI.Label label1;
+        private ShiftUI.Panel pnllounge;
+        private ShiftUI.ListView lvmypackages;
+        private ShiftUI.ColumnHeader columnHeader4;
+        private ShiftUI.Label lbmyname;
+        private ShiftUI.Label lbmybio;
+        private ShiftUI.Label label3;
+        private ShiftUI.TextBox txtbitnoteaddress;
+        private ShiftUI.Label label8;
+        private ShiftUI.TextBox txtbio;
+        private ShiftUI.Label label7;
+        private ShiftUI.TextBox txtmoddername;
+        private ShiftUI.Label label6;
+        private ShiftUI.Label label5;
+        private ShiftUI.Label label4;
+        private ShiftUI.Button btnsave;
+        private ShiftUI.Button btnupload;
+        private ShiftUI.Button btnedit;
+        private ShiftUI.Panel pnlpackageeditor;
+        private ShiftUI.Label label9;
+        private ShiftUI.TextBox txtprice;
+        private ShiftUI.Label lbprice;
+        private ShiftUI.Label lbaddress;
+        private ShiftUI.CheckBox cbsell;
+        private ShiftUI.TextBox txtpackagedescription;
+        private ShiftUI.Label label10;
+        private ShiftUI.TextBox txtpackagename;
+        private ShiftUI.Label label11;
+        private ShiftUI.Label label12;
+        private ShiftUI.Button btndonecustomizing;
+        private ShiftUI.Button btnsaa;
+        private ShiftUI.Panel pnlauthordetails;
+        private ShiftUI.Label lbauthordescription;
+        private ShiftUI.Label lbauthorname;
+        private ShiftUI.Panel pnlchoosenetwork;
+        private ShiftUI.Button btnrequest;
+        private ShiftUI.Label label14;
+        private ShiftUI.Label label13;
+        private ShiftUI.ListView lvnets;
+        private ShiftUI.ColumnHeader clhostnameheader;
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Apps/Appscape.cs b/source/WindowsFormsApplication1/Apps/Appscape.cs
index 92171d9..81025f0 100644
--- a/source/WindowsFormsApplication1/Apps/Appscape.cs
+++ b/source/WindowsFormsApplication1/Apps/Appscape.cs
@@ -11,7 +11,7 @@ using System.Linq;
 using System.Net;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
diff --git a/source/WindowsFormsApplication1/Apps/Appscape.resx b/source/WindowsFormsApplication1/Apps/Appscape.resx
index 524af34..e79e162 100644
--- a/source/WindowsFormsApplication1/Apps/Appscape.resx
+++ b/source/WindowsFormsApplication1/Apps/Appscape.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="label14.Text" xml:space="preserve">
     <value>Please choose a repository you would like your developer key to be associated with. Any uploads made using the new key will be sent to this repository and viewers of this repository will see your new package.</value>
diff --git a/source/WindowsFormsApplication1/Apps/AppscapeUploader.Designer.cs b/source/WindowsFormsApplication1/Apps/AppscapeUploader.Designer.cs
index e23ef2d..e246978 100644
--- a/source/WindowsFormsApplication1/Apps/AppscapeUploader.Designer.cs
+++ b/source/WindowsFormsApplication1/Apps/AppscapeUploader.Designer.cs
@@ -28,31 +28,31 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.lbtitle = new System.Windows.Forms.Label();
-            this.pnlmain = new System.Windows.Forms.Panel();
-            this.Page0 = new System.Windows.Forms.Panel();
-            this.txtprice = new System.Windows.Forms.TextBox();
-            this.lbprice = new System.Windows.Forms.Label();
-            this.lbaddress = new System.Windows.Forms.Label();
-            this.cbsell = new System.Windows.Forms.CheckBox();
-            this.txtpackagedescription = new System.Windows.Forms.TextBox();
-            this.label2 = new System.Windows.Forms.Label();
-            this.txtpackagename = new System.Windows.Forms.TextBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.Page1 = new System.Windows.Forms.Panel();
-            this.btncompilesaa = new System.Windows.Forms.Button();
-            this.btnscreenshot = new System.Windows.Forms.Button();
-            this.btnicon = new System.Windows.Forms.Button();
-            this.btnsaa = new System.Windows.Forms.Button();
-            this.Page2 = new System.Windows.Forms.Panel();
-            this.txtconfirm = new System.Windows.Forms.TextBox();
-            this.label3 = new System.Windows.Forms.Label();
-            this.lbldescription = new System.Windows.Forms.Label();
-            this.pnlactions = new System.Windows.Forms.FlowLayoutPanel();
-            this.btndone = new System.Windows.Forms.Button();
-            this.btnnext = new System.Windows.Forms.Button();
-            this.btnback = new System.Windows.Forms.Button();
-            this.btncancel = new System.Windows.Forms.Button();
+            this.lbtitle = new ShiftUI.Label();
+            this.pnlmain = new ShiftUI.Panel();
+            this.Page0 = new ShiftUI.Panel();
+            this.txtprice = new ShiftUI.TextBox();
+            this.lbprice = new ShiftUI.Label();
+            this.lbaddress = new ShiftUI.Label();
+            this.cbsell = new ShiftUI.CheckBox();
+            this.txtpackagedescription = new ShiftUI.TextBox();
+            this.label2 = new ShiftUI.Label();
+            this.txtpackagename = new ShiftUI.TextBox();
+            this.label1 = new ShiftUI.Label();
+            this.Page1 = new ShiftUI.Panel();
+            this.btncompilesaa = new ShiftUI.Button();
+            this.btnscreenshot = new ShiftUI.Button();
+            this.btnicon = new ShiftUI.Button();
+            this.btnsaa = new ShiftUI.Button();
+            this.Page2 = new ShiftUI.Panel();
+            this.txtconfirm = new ShiftUI.TextBox();
+            this.label3 = new ShiftUI.Label();
+            this.lbldescription = new ShiftUI.Label();
+            this.pnlactions = new ShiftUI.FlowLayoutPanel();
+            this.btndone = new ShiftUI.Button();
+            this.btnnext = new ShiftUI.Button();
+            this.btnback = new ShiftUI.Button();
+            this.btncancel = new ShiftUI.Button();
             this.pnlmain.SuspendLayout();
             this.Page0.SuspendLayout();
             this.Page1.SuspendLayout();
@@ -63,12 +63,12 @@
             // lbtitle
             // 
             this.lbtitle.BackColor = System.Drawing.Color.Gray;
-            this.lbtitle.Dock = System.Windows.Forms.DockStyle.Top;
+            this.lbtitle.Dock = ShiftUI.DockStyle.Top;
             this.lbtitle.Font = new System.Drawing.Font("Microsoft Sans Serif", 13F);
             this.lbtitle.ForeColor = System.Drawing.Color.White;
             this.lbtitle.Location = new System.Drawing.Point(0, 0);
             this.lbtitle.Name = "lbtitle";
-            this.lbtitle.Padding = new System.Windows.Forms.Padding(15, 0, 0, 0);
+            this.lbtitle.Padding = new ShiftUI.Padding(15, 0, 0, 0);
             this.lbtitle.Size = new System.Drawing.Size(711, 49);
             this.lbtitle.TabIndex = 0;
             this.lbtitle.Text = "Welcome!";
@@ -77,13 +77,13 @@
             // pnlmain
             // 
             this.pnlmain.BackColor = System.Drawing.Color.Gray;
-            this.pnlmain.Controls.Add(this.Page0);
-            this.pnlmain.Controls.Add(this.Page1);
-            this.pnlmain.Controls.Add(this.Page2);
-            this.pnlmain.Controls.Add(this.lbldescription);
-            this.pnlmain.Controls.Add(this.pnlactions);
-            this.pnlmain.Controls.Add(this.lbtitle);
-            this.pnlmain.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pnlmain.Widgets.Add(this.Page0);
+            this.pnlmain.Widgets.Add(this.Page1);
+            this.pnlmain.Widgets.Add(this.Page2);
+            this.pnlmain.Widgets.Add(this.lbldescription);
+            this.pnlmain.Widgets.Add(this.pnlactions);
+            this.pnlmain.Widgets.Add(this.lbtitle);
+            this.pnlmain.Dock = ShiftUI.DockStyle.Fill;
             this.pnlmain.Location = new System.Drawing.Point(0, 0);
             this.pnlmain.Name = "pnlmain";
             this.pnlmain.Size = new System.Drawing.Size(711, 485);
@@ -91,15 +91,15 @@
             // 
             // Page0
             // 
-            this.Page0.Controls.Add(this.txtprice);
-            this.Page0.Controls.Add(this.lbprice);
-            this.Page0.Controls.Add(this.lbaddress);
-            this.Page0.Controls.Add(this.cbsell);
-            this.Page0.Controls.Add(this.txtpackagedescription);
-            this.Page0.Controls.Add(this.label2);
-            this.Page0.Controls.Add(this.txtpackagename);
-            this.Page0.Controls.Add(this.label1);
-            this.Page0.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.Page0.Widgets.Add(this.txtprice);
+            this.Page0.Widgets.Add(this.lbprice);
+            this.Page0.Widgets.Add(this.lbaddress);
+            this.Page0.Widgets.Add(this.cbsell);
+            this.Page0.Widgets.Add(this.txtpackagedescription);
+            this.Page0.Widgets.Add(this.label2);
+            this.Page0.Widgets.Add(this.txtpackagename);
+            this.Page0.Widgets.Add(this.label1);
+            this.Page0.Dock = ShiftUI.DockStyle.Fill;
             this.Page0.Location = new System.Drawing.Point(0, 135);
             this.Page0.Name = "Page0";
             this.Page0.Size = new System.Drawing.Size(711, 314);
@@ -138,9 +138,9 @@
             // 
             // cbsell
             // 
-            this.cbsell.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbsell.Appearance = ShiftUI.Appearance.Button;
             this.cbsell.AutoSize = true;
-            this.cbsell.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.cbsell.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.cbsell.Font = new System.Drawing.Font("Times New Roman", 8.25F);
             this.cbsell.Location = new System.Drawing.Point(98, 235);
             this.cbsell.Name = "cbsell";
@@ -152,8 +152,8 @@
             // 
             // txtpackagedescription
             // 
-            this.txtpackagedescription.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtpackagedescription.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.txtpackagedescription.Location = new System.Drawing.Point(100, 44);
             this.txtpackagedescription.Multiline = true;
             this.txtpackagedescription.Name = "txtpackagedescription";
@@ -191,11 +191,11 @@
             // 
             // Page1
             // 
-            this.Page1.Controls.Add(this.btncompilesaa);
-            this.Page1.Controls.Add(this.btnscreenshot);
-            this.Page1.Controls.Add(this.btnicon);
-            this.Page1.Controls.Add(this.btnsaa);
-            this.Page1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.Page1.Widgets.Add(this.btncompilesaa);
+            this.Page1.Widgets.Add(this.btnscreenshot);
+            this.Page1.Widgets.Add(this.btnicon);
+            this.Page1.Widgets.Add(this.btnsaa);
+            this.Page1.Dock = ShiftUI.DockStyle.Fill;
             this.Page1.Location = new System.Drawing.Point(0, 135);
             this.Page1.Name = "Page1";
             this.Page1.Size = new System.Drawing.Size(711, 314);
@@ -203,10 +203,10 @@
             // 
             // btncompilesaa
             // 
-            this.btncompilesaa.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.btncompilesaa.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left)));
             this.btncompilesaa.AutoSize = true;
-            this.btncompilesaa.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btncompilesaa.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btncompilesaa.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.btncompilesaa.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btncompilesaa.Font = new System.Drawing.Font("Times New Roman", 8.25F);
             this.btncompilesaa.Location = new System.Drawing.Point(4, 282);
             this.btncompilesaa.Name = "btncompilesaa";
@@ -219,8 +219,8 @@
             // btnscreenshot
             // 
             this.btnscreenshot.AutoSize = true;
-            this.btnscreenshot.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btnscreenshot.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnscreenshot.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.btnscreenshot.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnscreenshot.Font = new System.Drawing.Font("Times New Roman", 8.25F);
             this.btnscreenshot.Location = new System.Drawing.Point(12, 76);
             this.btnscreenshot.Name = "btnscreenshot";
@@ -233,8 +233,8 @@
             // btnicon
             // 
             this.btnicon.AutoSize = true;
-            this.btnicon.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btnicon.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnicon.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.btnicon.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnicon.Font = new System.Drawing.Font("Times New Roman", 8.25F);
             this.btnicon.Location = new System.Drawing.Point(12, 44);
             this.btnicon.Name = "btnicon";
@@ -247,8 +247,8 @@
             // btnsaa
             // 
             this.btnsaa.AutoSize = true;
-            this.btnsaa.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btnsaa.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnsaa.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.btnsaa.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnsaa.Font = new System.Drawing.Font("Times New Roman", 8.25F);
             this.btnsaa.Location = new System.Drawing.Point(12, 9);
             this.btnsaa.Name = "btnsaa";
@@ -260,9 +260,9 @@
             // 
             // Page2
             // 
-            this.Page2.Controls.Add(this.txtconfirm);
-            this.Page2.Controls.Add(this.label3);
-            this.Page2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.Page2.Widgets.Add(this.txtconfirm);
+            this.Page2.Widgets.Add(this.label3);
+            this.Page2.Dock = ShiftUI.DockStyle.Fill;
             this.Page2.Location = new System.Drawing.Point(0, 135);
             this.Page2.Name = "Page2";
             this.Page2.Size = new System.Drawing.Size(711, 314);
@@ -270,9 +270,9 @@
             // 
             // txtconfirm
             // 
-            this.txtconfirm.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtconfirm.Anchor = ((ShiftUI.AnchorStyles)((((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.txtconfirm.Location = new System.Drawing.Point(19, 49);
             this.txtconfirm.Multiline = true;
             this.txtconfirm.Name = "txtconfirm";
@@ -290,24 +290,24 @@
             // 
             // lbldescription
             // 
-            this.lbldescription.Dock = System.Windows.Forms.DockStyle.Top;
+            this.lbldescription.Dock = ShiftUI.DockStyle.Top;
             this.lbldescription.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
             this.lbldescription.ForeColor = System.Drawing.Color.White;
             this.lbldescription.Location = new System.Drawing.Point(0, 49);
             this.lbldescription.Name = "lbldescription";
-            this.lbldescription.Padding = new System.Windows.Forms.Padding(15, 0, 0, 0);
+            this.lbldescription.Padding = new ShiftUI.Padding(15, 0, 0, 0);
             this.lbldescription.Size = new System.Drawing.Size(711, 86);
             this.lbldescription.TabIndex = 2;
             this.lbldescription.Text = "label1";
             // 
             // pnlactions
             // 
-            this.pnlactions.Controls.Add(this.btndone);
-            this.pnlactions.Controls.Add(this.btnnext);
-            this.pnlactions.Controls.Add(this.btnback);
-            this.pnlactions.Controls.Add(this.btncancel);
-            this.pnlactions.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pnlactions.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft;
+            this.pnlactions.Widgets.Add(this.btndone);
+            this.pnlactions.Widgets.Add(this.btnnext);
+            this.pnlactions.Widgets.Add(this.btnback);
+            this.pnlactions.Widgets.Add(this.btncancel);
+            this.pnlactions.Dock = ShiftUI.DockStyle.Bottom;
+            this.pnlactions.FlowDirection = ShiftUI.FlowDirection.RightToLeft;
             this.pnlactions.ForeColor = System.Drawing.Color.White;
             this.pnlactions.Location = new System.Drawing.Point(0, 449);
             this.pnlactions.Name = "pnlactions";
@@ -317,8 +317,8 @@
             // btndone
             // 
             this.btndone.AutoSize = true;
-            this.btndone.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btndone.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btndone.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.btndone.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btndone.Font = new System.Drawing.Font("Times New Roman", 8.25F);
             this.btndone.Location = new System.Drawing.Point(660, 3);
             this.btndone.Name = "btndone";
@@ -331,8 +331,8 @@
             // btnnext
             // 
             this.btnnext.AutoSize = true;
-            this.btnnext.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btnnext.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnnext.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.btnnext.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnnext.Font = new System.Drawing.Font("Times New Roman", 8.25F);
             this.btnnext.Location = new System.Drawing.Point(612, 3);
             this.btnnext.Name = "btnnext";
@@ -345,8 +345,8 @@
             // btnback
             // 
             this.btnback.AutoSize = true;
-            this.btnback.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btnback.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnback.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.btnback.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnback.Font = new System.Drawing.Font("Times New Roman", 8.25F);
             this.btnback.Location = new System.Drawing.Point(564, 3);
             this.btnback.Name = "btnback";
@@ -359,8 +359,8 @@
             // btncancel
             // 
             this.btncancel.AutoSize = true;
-            this.btncancel.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btncancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btncancel.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.btncancel.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btncancel.Font = new System.Drawing.Font("Times New Roman", 8.25F);
             this.btncancel.Location = new System.Drawing.Point(508, 3);
             this.btncancel.Name = "btncancel";
@@ -373,9 +373,9 @@
             // AppscapeUploader
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(711, 485);
-            this.Controls.Add(this.pnlmain);
+            this.Widgets.Add(this.pnlmain);
             this.Name = "AppscapeUploader";
             this.Text = "AppscapeUploader";
             this.Load += new System.EventHandler(this.AppscapeUploader_Load);
@@ -394,30 +394,30 @@
 
         #endregion
 
-        private System.Windows.Forms.Label lbtitle;
-        private System.Windows.Forms.Panel pnlmain;
-        private System.Windows.Forms.FlowLayoutPanel pnlactions;
-        private System.Windows.Forms.Button btndone;
-        private System.Windows.Forms.Button btnnext;
-        private System.Windows.Forms.Button btnback;
-        private System.Windows.Forms.Button btncancel;
-        private System.Windows.Forms.Label lbldescription;
-        private System.Windows.Forms.Panel Page0;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.TextBox txtpackagedescription;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.TextBox txtpackagename;
-        private System.Windows.Forms.Panel Page1;
-        private System.Windows.Forms.Button btnsaa;
-        private System.Windows.Forms.Button btnscreenshot;
-        private System.Windows.Forms.Button btnicon;
-        private System.Windows.Forms.Panel Page2;
-        private System.Windows.Forms.TextBox txtconfirm;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.Button btncompilesaa;
-        private System.Windows.Forms.TextBox txtprice;
-        private System.Windows.Forms.Label lbprice;
-        private System.Windows.Forms.Label lbaddress;
-        private System.Windows.Forms.CheckBox cbsell;
+        private ShiftUI.Label lbtitle;
+        private ShiftUI.Panel pnlmain;
+        private ShiftUI.FlowLayoutPanel pnlactions;
+        private ShiftUI.Button btndone;
+        private ShiftUI.Button btnnext;
+        private ShiftUI.Button btnback;
+        private ShiftUI.Button btncancel;
+        private ShiftUI.Label lbldescription;
+        private ShiftUI.Panel Page0;
+        private ShiftUI.Label label1;
+        private ShiftUI.TextBox txtpackagedescription;
+        private ShiftUI.Label label2;
+        private ShiftUI.TextBox txtpackagename;
+        private ShiftUI.Panel Page1;
+        private ShiftUI.Button btnsaa;
+        private ShiftUI.Button btnscreenshot;
+        private ShiftUI.Button btnicon;
+        private ShiftUI.Panel Page2;
+        private ShiftUI.TextBox txtconfirm;
+        private ShiftUI.Label label3;
+        private ShiftUI.Button btncompilesaa;
+        private ShiftUI.TextBox txtprice;
+        private ShiftUI.Label lbprice;
+        private ShiftUI.Label lbaddress;
+        private ShiftUI.CheckBox cbsell;
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Apps/AppscapeUploader.cs b/source/WindowsFormsApplication1/Apps/AppscapeUploader.cs
index 5cc8560..8b50450 100644
--- a/source/WindowsFormsApplication1/Apps/AppscapeUploader.cs
+++ b/source/WindowsFormsApplication1/Apps/AppscapeUploader.cs
@@ -10,7 +10,7 @@ using System.Linq;
 using System.Net;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
@@ -121,16 +121,16 @@ namespace ShiftOS
         /// Makes the specified control and ALL of it's children, grand children, great grand children, and so on, appear "dark".
         /// </summary>
         /// <param name="ctrl">The top of the hierarchy; the start of it all.</param>
-        private void RecursiveControlSetup(Control ctrl)
+        private void RecursiveWidgetSetup(Widget ctrl)
         {
             ctrl.BackColor = API.CurrentSkin.titlebarcolour;
             ctrl.ForeColor = API.CurrentSkin.titletextcolour;
             try
             {
                 var pnl = (Panel)ctrl;
-                foreach(Control c in pnl.Controls)
+                foreach(Widget c in pnl.Widgets)
                 {
-                    RecursiveControlSetup(c);
+                    RecursiveWidgetSetup(c);
                 }
             }
             catch {
@@ -143,7 +143,7 @@ namespace ShiftOS
         /// </summary>
         private void SetupUI()
         {
-            RecursiveControlSetup(pnlmain);
+            RecursiveWidgetSetup(pnlmain);
             switch (page)
             {
                 case 0:
diff --git a/source/WindowsFormsApplication1/Apps/AppscapeUploader.resx b/source/WindowsFormsApplication1/Apps/AppscapeUploader.resx
index 1af7de1..ffb4fb5 100644
--- a/source/WindowsFormsApplication1/Apps/AppscapeUploader.resx
+++ b/source/WindowsFormsApplication1/Apps/AppscapeUploader.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Apps/Artpad.Designer.cs b/source/WindowsFormsApplication1/Apps/Artpad.Designer.cs
index 13bfba1..dead4c0 100644
--- a/source/WindowsFormsApplication1/Apps/Artpad.Designer.cs
+++ b/source/WindowsFormsApplication1/Apps/Artpad.Designer.cs
@@ -23,269 +23,269 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            this.pgcontents = new System.Windows.Forms.Panel();
-            this.pnldrawingbackground = new System.Windows.Forms.Panel();
-            this.pnlinitialcanvassettings = new System.Windows.Forms.Panel();
-            this.btncancel = new System.Windows.Forms.Button();
-            this.btncreate = new System.Windows.Forms.Button();
-            this.Label11 = new System.Windows.Forms.Label();
-            this.lbltotalpixels = new System.Windows.Forms.Label();
-            this.txtnewcanvasheight = new System.Windows.Forms.TextBox();
-            this.Label10 = new System.Windows.Forms.Label();
-            this.txtnewcanvaswidth = new System.Windows.Forms.TextBox();
-            this.Label9 = new System.Windows.Forms.Label();
-            this.pnlpalletsize = new System.Windows.Forms.Panel();
-            this.txttopspace = new System.Windows.Forms.TextBox();
-            this.Label40 = new System.Windows.Forms.Label();
-            this.txtsidespace = new System.Windows.Forms.TextBox();
-            this.Label41 = new System.Windows.Forms.Label();
-            this.btnchangesizecancel = new System.Windows.Forms.Button();
-            this.btnsetsize = new System.Windows.Forms.Button();
-            this.txtcolorpalletheight = new System.Windows.Forms.TextBox();
-            this.Label42 = new System.Windows.Forms.Label();
-            this.txtcolorpalletwidth = new System.Windows.Forms.TextBox();
-            this.Label43 = new System.Windows.Forms.Label();
-            this.picdrawingdisplay = new System.Windows.Forms.PictureBox();
-            this.pnlbottompanel = new System.Windows.Forms.Panel();
-            this.pnlpallet = new System.Windows.Forms.Panel();
-            this.flowcolours = new System.Windows.Forms.FlowLayoutPanel();
-            this.colourpallet1 = new System.Windows.Forms.Panel();
-            this.colourpallet2 = new System.Windows.Forms.Panel();
-            this.colourpallet3 = new System.Windows.Forms.Panel();
-            this.colourpallet4 = new System.Windows.Forms.Panel();
-            this.colourpallet5 = new System.Windows.Forms.Panel();
-            this.colourpallet6 = new System.Windows.Forms.Panel();
-            this.colourpallet7 = new System.Windows.Forms.Panel();
-            this.colourpallet8 = new System.Windows.Forms.Panel();
-            this.colourpallet9 = new System.Windows.Forms.Panel();
-            this.colourpallet10 = new System.Windows.Forms.Panel();
-            this.colourpallet11 = new System.Windows.Forms.Panel();
-            this.colourpallet12 = new System.Windows.Forms.Panel();
-            this.colourpallet13 = new System.Windows.Forms.Panel();
-            this.colourpallet14 = new System.Windows.Forms.Panel();
-            this.colourpallet15 = new System.Windows.Forms.Panel();
-            this.colourpallet16 = new System.Windows.Forms.Panel();
-            this.colourpallet17 = new System.Windows.Forms.Panel();
-            this.colourpallet18 = new System.Windows.Forms.Panel();
-            this.colourpallet19 = new System.Windows.Forms.Panel();
-            this.colourpallet20 = new System.Windows.Forms.Panel();
-            this.colourpallet21 = new System.Windows.Forms.Panel();
-            this.colourpallet22 = new System.Windows.Forms.Panel();
-            this.colourpallet23 = new System.Windows.Forms.Panel();
-            this.colourpallet24 = new System.Windows.Forms.Panel();
-            this.colourpallet25 = new System.Windows.Forms.Panel();
-            this.colourpallet26 = new System.Windows.Forms.Panel();
-            this.colourpallet27 = new System.Windows.Forms.Panel();
-            this.colourpallet28 = new System.Windows.Forms.Panel();
-            this.colourpallet29 = new System.Windows.Forms.Panel();
-            this.colourpallet30 = new System.Windows.Forms.Panel();
-            this.colourpallet31 = new System.Windows.Forms.Panel();
-            this.colourpallet32 = new System.Windows.Forms.Panel();
-            this.colourpallet33 = new System.Windows.Forms.Panel();
-            this.colourpallet34 = new System.Windows.Forms.Panel();
-            this.colourpallet35 = new System.Windows.Forms.Panel();
-            this.colourpallet36 = new System.Windows.Forms.Panel();
-            this.colourpallet37 = new System.Windows.Forms.Panel();
-            this.colourpallet38 = new System.Windows.Forms.Panel();
-            this.colourpallet39 = new System.Windows.Forms.Panel();
-            this.colourpallet40 = new System.Windows.Forms.Panel();
-            this.colourpallet41 = new System.Windows.Forms.Panel();
-            this.colourpallet42 = new System.Windows.Forms.Panel();
-            this.colourpallet43 = new System.Windows.Forms.Panel();
-            this.colourpallet44 = new System.Windows.Forms.Panel();
-            this.colourpallet45 = new System.Windows.Forms.Panel();
-            this.colourpallet46 = new System.Windows.Forms.Panel();
-            this.colourpallet47 = new System.Windows.Forms.Panel();
-            this.colourpallet48 = new System.Windows.Forms.Panel();
-            this.colourpallet49 = new System.Windows.Forms.Panel();
-            this.colourpallet50 = new System.Windows.Forms.Panel();
-            this.colourpallet51 = new System.Windows.Forms.Panel();
-            this.colourpallet52 = new System.Windows.Forms.Panel();
-            this.colourpallet53 = new System.Windows.Forms.Panel();
-            this.colourpallet54 = new System.Windows.Forms.Panel();
-            this.colourpallet55 = new System.Windows.Forms.Panel();
-            this.colourpallet56 = new System.Windows.Forms.Panel();
-            this.colourpallet57 = new System.Windows.Forms.Panel();
-            this.colourpallet58 = new System.Windows.Forms.Panel();
-            this.colourpallet59 = new System.Windows.Forms.Panel();
-            this.colourpallet60 = new System.Windows.Forms.Panel();
-            this.colourpallet61 = new System.Windows.Forms.Panel();
-            this.colourpallet62 = new System.Windows.Forms.Panel();
-            this.colourpallet63 = new System.Windows.Forms.Panel();
-            this.colourpallet64 = new System.Windows.Forms.Panel();
-            this.colourpallet65 = new System.Windows.Forms.Panel();
-            this.colourpallet66 = new System.Windows.Forms.Panel();
-            this.colourpallet67 = new System.Windows.Forms.Panel();
-            this.colourpallet68 = new System.Windows.Forms.Panel();
-            this.colourpallet69 = new System.Windows.Forms.Panel();
-            this.colourpallet70 = new System.Windows.Forms.Panel();
-            this.colourpallet71 = new System.Windows.Forms.Panel();
-            this.colourpallet72 = new System.Windows.Forms.Panel();
-            this.colourpallet73 = new System.Windows.Forms.Panel();
-            this.colourpallet74 = new System.Windows.Forms.Panel();
-            this.colourpallet75 = new System.Windows.Forms.Panel();
-            this.colourpallet76 = new System.Windows.Forms.Panel();
-            this.colourpallet77 = new System.Windows.Forms.Panel();
-            this.colourpallet78 = new System.Windows.Forms.Panel();
-            this.colourpallet79 = new System.Windows.Forms.Panel();
-            this.colourpallet80 = new System.Windows.Forms.Panel();
-            this.colourpallet81 = new System.Windows.Forms.Panel();
-            this.colourpallet82 = new System.Windows.Forms.Panel();
-            this.colourpallet83 = new System.Windows.Forms.Panel();
-            this.colourpallet84 = new System.Windows.Forms.Panel();
-            this.colourpallet85 = new System.Windows.Forms.Panel();
-            this.colourpallet86 = new System.Windows.Forms.Panel();
-            this.colourpallet87 = new System.Windows.Forms.Panel();
-            this.colourpallet88 = new System.Windows.Forms.Panel();
-            this.colourpallet89 = new System.Windows.Forms.Panel();
-            this.colourpallet90 = new System.Windows.Forms.Panel();
-            this.colourpallet91 = new System.Windows.Forms.Panel();
-            this.colourpallet92 = new System.Windows.Forms.Panel();
-            this.colourpallet93 = new System.Windows.Forms.Panel();
-            this.colourpallet94 = new System.Windows.Forms.Panel();
-            this.colourpallet95 = new System.Windows.Forms.Panel();
-            this.colourpallet96 = new System.Windows.Forms.Panel();
-            this.colourpallet97 = new System.Windows.Forms.Panel();
-            this.colourpallet98 = new System.Windows.Forms.Panel();
-            this.colourpallet99 = new System.Windows.Forms.Panel();
-            this.colourpallet100 = new System.Windows.Forms.Panel();
-            this.colourpallet101 = new System.Windows.Forms.Panel();
-            this.colourpallet102 = new System.Windows.Forms.Panel();
-            this.colourpallet103 = new System.Windows.Forms.Panel();
-            this.colourpallet104 = new System.Windows.Forms.Panel();
-            this.colourpallet105 = new System.Windows.Forms.Panel();
-            this.colourpallet106 = new System.Windows.Forms.Panel();
-            this.colourpallet107 = new System.Windows.Forms.Panel();
-            this.colourpallet108 = new System.Windows.Forms.Panel();
-            this.colourpallet109 = new System.Windows.Forms.Panel();
-            this.colourpallet110 = new System.Windows.Forms.Panel();
-            this.colourpallet111 = new System.Windows.Forms.Panel();
-            this.colourpallet112 = new System.Windows.Forms.Panel();
-            this.colourpallet113 = new System.Windows.Forms.Panel();
-            this.colourpallet114 = new System.Windows.Forms.Panel();
-            this.colourpallet115 = new System.Windows.Forms.Panel();
-            this.colourpallet116 = new System.Windows.Forms.Panel();
-            this.colourpallet117 = new System.Windows.Forms.Panel();
-            this.colourpallet118 = new System.Windows.Forms.Panel();
-            this.colourpallet119 = new System.Windows.Forms.Panel();
-            this.colourpallet120 = new System.Windows.Forms.Panel();
-            this.colourpallet121 = new System.Windows.Forms.Panel();
-            this.colourpallet122 = new System.Windows.Forms.Panel();
-            this.colourpallet123 = new System.Windows.Forms.Panel();
-            this.colourpallet124 = new System.Windows.Forms.Panel();
-            this.colourpallet125 = new System.Windows.Forms.Panel();
-            this.colourpallet126 = new System.Windows.Forms.Panel();
-            this.colourpallet127 = new System.Windows.Forms.Panel();
-            this.colourpallet128 = new System.Windows.Forms.Panel();
-            this.Label4 = new System.Windows.Forms.Label();
-            this.line6 = new System.Windows.Forms.Panel();
-            this.pnltoolproperties = new System.Windows.Forms.Panel();
-            this.pnlovaltoolsettings = new System.Windows.Forms.Panel();
-            this.Label20 = new System.Windows.Forms.Label();
-            this.btnovalfillonoff = new System.Windows.Forms.Button();
-            this.pnlovalfillcolour = new System.Windows.Forms.Panel();
-            this.txtovalborderwidth = new System.Windows.Forms.TextBox();
-            this.Label21 = new System.Windows.Forms.Label();
-            this.Label22 = new System.Windows.Forms.Label();
-            this.Label23 = new System.Windows.Forms.Label();
-            this.pnleracertoolsettings = new System.Windows.Forms.Panel();
-            this.Label28 = new System.Windows.Forms.Label();
-            this.btneracersquare = new System.Windows.Forms.Button();
-            this.btneracercircle = new System.Windows.Forms.Button();
-            this.Label24 = new System.Windows.Forms.Label();
-            this.txteracersize = new System.Windows.Forms.TextBox();
-            this.Label26 = new System.Windows.Forms.Label();
-            this.Label27 = new System.Windows.Forms.Label();
-            this.pnllinetoolsettings = new System.Windows.Forms.Panel();
-            this.Label29 = new System.Windows.Forms.Label();
-            this.txtlinewidth = new System.Windows.Forms.TextBox();
-            this.Label30 = new System.Windows.Forms.Label();
-            this.Label31 = new System.Windows.Forms.Label();
-            this.pnlpaintbrushtoolsettings = new System.Windows.Forms.Panel();
-            this.Label36 = new System.Windows.Forms.Label();
-            this.btnpaintsquareshape = new System.Windows.Forms.Button();
-            this.btnpaintcircleshape = new System.Windows.Forms.Button();
-            this.Label37 = new System.Windows.Forms.Label();
-            this.txtpaintbrushsize = new System.Windows.Forms.TextBox();
-            this.Label38 = new System.Windows.Forms.Label();
-            this.Label39 = new System.Windows.Forms.Label();
-            this.pnltexttoolsettings = new System.Windows.Forms.Panel();
-            this.Label35 = new System.Windows.Forms.Label();
-            this.combofontstyle = new System.Windows.Forms.ComboBox();
-            this.txtdrawstringtext = new System.Windows.Forms.TextBox();
-            this.combodrawtextfont = new System.Windows.Forms.ComboBox();
-            this.Label25 = new System.Windows.Forms.Label();
-            this.txtdrawtextsize = new System.Windows.Forms.TextBox();
-            this.Label32 = new System.Windows.Forms.Label();
-            this.Label33 = new System.Windows.Forms.Label();
-            this.Label34 = new System.Windows.Forms.Label();
-            this.pnlpixelsettersettings = new System.Windows.Forms.Panel();
-            this.btnpixelsettersetpixel = new System.Windows.Forms.Button();
-            this.txtpixelsetterycoordinate = new System.Windows.Forms.TextBox();
-            this.txtpixelsetterxcoordinate = new System.Windows.Forms.TextBox();
-            this.Label3 = new System.Windows.Forms.Label();
-            this.Label2 = new System.Windows.Forms.Label();
-            this.Label1 = new System.Windows.Forms.Label();
-            this.pnlmagnifiersettings = new System.Windows.Forms.Panel();
-            this.btnzoomout = new System.Windows.Forms.Button();
-            this.btnzoomin = new System.Windows.Forms.Button();
-            this.lblzoomlevel = new System.Windows.Forms.Label();
-            this.Label7 = new System.Windows.Forms.Label();
-            this.pnlfloodfillsettings = new System.Windows.Forms.Panel();
-            this.Label12 = new System.Windows.Forms.Label();
-            this.Label15 = new System.Windows.Forms.Label();
-            this.pnlsquaretoolsettings = new System.Windows.Forms.Panel();
-            this.Label19 = new System.Windows.Forms.Label();
-            this.btnsquarefillonoff = new System.Windows.Forms.Button();
-            this.pnlsquarefillcolour = new System.Windows.Forms.Panel();
-            this.txtsquareborderwidth = new System.Windows.Forms.TextBox();
-            this.Label16 = new System.Windows.Forms.Label();
-            this.Label18 = new System.Windows.Forms.Label();
-            this.Label17 = new System.Windows.Forms.Label();
-            this.pnlpixelplacersettings = new System.Windows.Forms.Panel();
-            this.lblpixelplacerhelp = new System.Windows.Forms.Label();
-            this.btnpixelplacermovementmode = new System.Windows.Forms.Button();
-            this.Label8 = new System.Windows.Forms.Label();
-            this.pnlpencilsettings = new System.Windows.Forms.Panel();
-            this.btnpencilsize3 = new System.Windows.Forms.Button();
-            this.btnpencilsize2 = new System.Windows.Forms.Button();
-            this.btnpencilsize1 = new System.Windows.Forms.Button();
-            this.Label14 = new System.Windows.Forms.Label();
-            this.Label6 = new System.Windows.Forms.Label();
-            this.Label5 = new System.Windows.Forms.Label();
-            this.line5 = new System.Windows.Forms.Panel();
-            this.line3 = new System.Windows.Forms.Panel();
-            this.pnltools = new System.Windows.Forms.Panel();
-            this.pnltoolpositioner = new System.Windows.Forms.FlowLayoutPanel();
-            this.btnpixelsetter = new System.Windows.Forms.Button();
-            this.btnpixelplacer = new System.Windows.Forms.Button();
-            this.btnpencil = new System.Windows.Forms.Button();
-            this.btnfloodfill = new System.Windows.Forms.Button();
-            this.btnoval = new System.Windows.Forms.Button();
-            this.btnsquare = new System.Windows.Forms.Button();
-            this.btnlinetool = new System.Windows.Forms.Button();
-            this.btnpaintbrush = new System.Windows.Forms.Button();
-            this.btntexttool = new System.Windows.Forms.Button();
-            this.btneracer = new System.Windows.Forms.Button();
-            this.btnnew = new System.Windows.Forms.Button();
-            this.btnmagnify = new System.Windows.Forms.Button();
-            this.btnopen = new System.Windows.Forms.Button();
-            this.btnsave = new System.Windows.Forms.Button();
-            this.btnundo = new System.Windows.Forms.Button();
-            this.btnredo = new System.Windows.Forms.Button();
-            this.line1 = new System.Windows.Forms.Panel();
-            this.pnltoolpreview = new System.Windows.Forms.Panel();
-            this.Label13 = new System.Windows.Forms.Label();
-            this.picpreview = new System.Windows.Forms.PictureBox();
-            this.lbltoolselected = new System.Windows.Forms.Label();
-            this.line4 = new System.Windows.Forms.Panel();
-            this.line2 = new System.Windows.Forms.Panel();
-            this.tmrcodepointcooldown = new System.Windows.Forms.Timer(this.components);
-            this.tmrshowearnedcodepoints = new System.Windows.Forms.Timer(this.components);
-            this.pullbs = new System.Windows.Forms.Timer(this.components);
-            this.pullbottom = new System.Windows.Forms.Timer(this.components);
-            this.pullside = new System.Windows.Forms.Timer(this.components);
-            this.tmrsetupui = new System.Windows.Forms.Timer(this.components);
+            this.pgcontents = new ShiftUI.Panel();
+            this.pnldrawingbackground = new ShiftUI.Panel();
+            this.pnlinitialcanvassettings = new ShiftUI.Panel();
+            this.btncancel = new ShiftUI.Button();
+            this.btncreate = new ShiftUI.Button();
+            this.Label11 = new ShiftUI.Label();
+            this.lbltotalpixels = new ShiftUI.Label();
+            this.txtnewcanvasheight = new ShiftUI.TextBox();
+            this.Label10 = new ShiftUI.Label();
+            this.txtnewcanvaswidth = new ShiftUI.TextBox();
+            this.Label9 = new ShiftUI.Label();
+            this.pnlpalletsize = new ShiftUI.Panel();
+            this.txttopspace = new ShiftUI.TextBox();
+            this.Label40 = new ShiftUI.Label();
+            this.txtsidespace = new ShiftUI.TextBox();
+            this.Label41 = new ShiftUI.Label();
+            this.btnchangesizecancel = new ShiftUI.Button();
+            this.btnsetsize = new ShiftUI.Button();
+            this.txtcolorpalletheight = new ShiftUI.TextBox();
+            this.Label42 = new ShiftUI.Label();
+            this.txtcolorpalletwidth = new ShiftUI.TextBox();
+            this.Label43 = new ShiftUI.Label();
+            this.picdrawingdisplay = new ShiftUI.PictureBox();
+            this.pnlbottompanel = new ShiftUI.Panel();
+            this.pnlpallet = new ShiftUI.Panel();
+            this.flowcolours = new ShiftUI.FlowLayoutPanel();
+            this.colourpallet1 = new ShiftUI.Panel();
+            this.colourpallet2 = new ShiftUI.Panel();
+            this.colourpallet3 = new ShiftUI.Panel();
+            this.colourpallet4 = new ShiftUI.Panel();
+            this.colourpallet5 = new ShiftUI.Panel();
+            this.colourpallet6 = new ShiftUI.Panel();
+            this.colourpallet7 = new ShiftUI.Panel();
+            this.colourpallet8 = new ShiftUI.Panel();
+            this.colourpallet9 = new ShiftUI.Panel();
+            this.colourpallet10 = new ShiftUI.Panel();
+            this.colourpallet11 = new ShiftUI.Panel();
+            this.colourpallet12 = new ShiftUI.Panel();
+            this.colourpallet13 = new ShiftUI.Panel();
+            this.colourpallet14 = new ShiftUI.Panel();
+            this.colourpallet15 = new ShiftUI.Panel();
+            this.colourpallet16 = new ShiftUI.Panel();
+            this.colourpallet17 = new ShiftUI.Panel();
+            this.colourpallet18 = new ShiftUI.Panel();
+            this.colourpallet19 = new ShiftUI.Panel();
+            this.colourpallet20 = new ShiftUI.Panel();
+            this.colourpallet21 = new ShiftUI.Panel();
+            this.colourpallet22 = new ShiftUI.Panel();
+            this.colourpallet23 = new ShiftUI.Panel();
+            this.colourpallet24 = new ShiftUI.Panel();
+            this.colourpallet25 = new ShiftUI.Panel();
+            this.colourpallet26 = new ShiftUI.Panel();
+            this.colourpallet27 = new ShiftUI.Panel();
+            this.colourpallet28 = new ShiftUI.Panel();
+            this.colourpallet29 = new ShiftUI.Panel();
+            this.colourpallet30 = new ShiftUI.Panel();
+            this.colourpallet31 = new ShiftUI.Panel();
+            this.colourpallet32 = new ShiftUI.Panel();
+            this.colourpallet33 = new ShiftUI.Panel();
+            this.colourpallet34 = new ShiftUI.Panel();
+            this.colourpallet35 = new ShiftUI.Panel();
+            this.colourpallet36 = new ShiftUI.Panel();
+            this.colourpallet37 = new ShiftUI.Panel();
+            this.colourpallet38 = new ShiftUI.Panel();
+            this.colourpallet39 = new ShiftUI.Panel();
+            this.colourpallet40 = new ShiftUI.Panel();
+            this.colourpallet41 = new ShiftUI.Panel();
+            this.colourpallet42 = new ShiftUI.Panel();
+            this.colourpallet43 = new ShiftUI.Panel();
+            this.colourpallet44 = new ShiftUI.Panel();
+            this.colourpallet45 = new ShiftUI.Panel();
+            this.colourpallet46 = new ShiftUI.Panel();
+            this.colourpallet47 = new ShiftUI.Panel();
+            this.colourpallet48 = new ShiftUI.Panel();
+            this.colourpallet49 = new ShiftUI.Panel();
+            this.colourpallet50 = new ShiftUI.Panel();
+            this.colourpallet51 = new ShiftUI.Panel();
+            this.colourpallet52 = new ShiftUI.Panel();
+            this.colourpallet53 = new ShiftUI.Panel();
+            this.colourpallet54 = new ShiftUI.Panel();
+            this.colourpallet55 = new ShiftUI.Panel();
+            this.colourpallet56 = new ShiftUI.Panel();
+            this.colourpallet57 = new ShiftUI.Panel();
+            this.colourpallet58 = new ShiftUI.Panel();
+            this.colourpallet59 = new ShiftUI.Panel();
+            this.colourpallet60 = new ShiftUI.Panel();
+            this.colourpallet61 = new ShiftUI.Panel();
+            this.colourpallet62 = new ShiftUI.Panel();
+            this.colourpallet63 = new ShiftUI.Panel();
+            this.colourpallet64 = new ShiftUI.Panel();
+            this.colourpallet65 = new ShiftUI.Panel();
+            this.colourpallet66 = new ShiftUI.Panel();
+            this.colourpallet67 = new ShiftUI.Panel();
+            this.colourpallet68 = new ShiftUI.Panel();
+            this.colourpallet69 = new ShiftUI.Panel();
+            this.colourpallet70 = new ShiftUI.Panel();
+            this.colourpallet71 = new ShiftUI.Panel();
+            this.colourpallet72 = new ShiftUI.Panel();
+            this.colourpallet73 = new ShiftUI.Panel();
+            this.colourpallet74 = new ShiftUI.Panel();
+            this.colourpallet75 = new ShiftUI.Panel();
+            this.colourpallet76 = new ShiftUI.Panel();
+            this.colourpallet77 = new ShiftUI.Panel();
+            this.colourpallet78 = new ShiftUI.Panel();
+            this.colourpallet79 = new ShiftUI.Panel();
+            this.colourpallet80 = new ShiftUI.Panel();
+            this.colourpallet81 = new ShiftUI.Panel();
+            this.colourpallet82 = new ShiftUI.Panel();
+            this.colourpallet83 = new ShiftUI.Panel();
+            this.colourpallet84 = new ShiftUI.Panel();
+            this.colourpallet85 = new ShiftUI.Panel();
+            this.colourpallet86 = new ShiftUI.Panel();
+            this.colourpallet87 = new ShiftUI.Panel();
+            this.colourpallet88 = new ShiftUI.Panel();
+            this.colourpallet89 = new ShiftUI.Panel();
+            this.colourpallet90 = new ShiftUI.Panel();
+            this.colourpallet91 = new ShiftUI.Panel();
+            this.colourpallet92 = new ShiftUI.Panel();
+            this.colourpallet93 = new ShiftUI.Panel();
+            this.colourpallet94 = new ShiftUI.Panel();
+            this.colourpallet95 = new ShiftUI.Panel();
+            this.colourpallet96 = new ShiftUI.Panel();
+            this.colourpallet97 = new ShiftUI.Panel();
+            this.colourpallet98 = new ShiftUI.Panel();
+            this.colourpallet99 = new ShiftUI.Panel();
+            this.colourpallet100 = new ShiftUI.Panel();
+            this.colourpallet101 = new ShiftUI.Panel();
+            this.colourpallet102 = new ShiftUI.Panel();
+            this.colourpallet103 = new ShiftUI.Panel();
+            this.colourpallet104 = new ShiftUI.Panel();
+            this.colourpallet105 = new ShiftUI.Panel();
+            this.colourpallet106 = new ShiftUI.Panel();
+            this.colourpallet107 = new ShiftUI.Panel();
+            this.colourpallet108 = new ShiftUI.Panel();
+            this.colourpallet109 = new ShiftUI.Panel();
+            this.colourpallet110 = new ShiftUI.Panel();
+            this.colourpallet111 = new ShiftUI.Panel();
+            this.colourpallet112 = new ShiftUI.Panel();
+            this.colourpallet113 = new ShiftUI.Panel();
+            this.colourpallet114 = new ShiftUI.Panel();
+            this.colourpallet115 = new ShiftUI.Panel();
+            this.colourpallet116 = new ShiftUI.Panel();
+            this.colourpallet117 = new ShiftUI.Panel();
+            this.colourpallet118 = new ShiftUI.Panel();
+            this.colourpallet119 = new ShiftUI.Panel();
+            this.colourpallet120 = new ShiftUI.Panel();
+            this.colourpallet121 = new ShiftUI.Panel();
+            this.colourpallet122 = new ShiftUI.Panel();
+            this.colourpallet123 = new ShiftUI.Panel();
+            this.colourpallet124 = new ShiftUI.Panel();
+            this.colourpallet125 = new ShiftUI.Panel();
+            this.colourpallet126 = new ShiftUI.Panel();
+            this.colourpallet127 = new ShiftUI.Panel();
+            this.colourpallet128 = new ShiftUI.Panel();
+            this.Label4 = new ShiftUI.Label();
+            this.line6 = new ShiftUI.Panel();
+            this.pnltoolproperties = new ShiftUI.Panel();
+            this.pnlovaltoolsettings = new ShiftUI.Panel();
+            this.Label20 = new ShiftUI.Label();
+            this.btnovalfillonoff = new ShiftUI.Button();
+            this.pnlovalfillcolour = new ShiftUI.Panel();
+            this.txtovalborderwidth = new ShiftUI.TextBox();
+            this.Label21 = new ShiftUI.Label();
+            this.Label22 = new ShiftUI.Label();
+            this.Label23 = new ShiftUI.Label();
+            this.pnleracertoolsettings = new ShiftUI.Panel();
+            this.Label28 = new ShiftUI.Label();
+            this.btneracersquare = new ShiftUI.Button();
+            this.btneracercircle = new ShiftUI.Button();
+            this.Label24 = new ShiftUI.Label();
+            this.txteracersize = new ShiftUI.TextBox();
+            this.Label26 = new ShiftUI.Label();
+            this.Label27 = new ShiftUI.Label();
+            this.pnllinetoolsettings = new ShiftUI.Panel();
+            this.Label29 = new ShiftUI.Label();
+            this.txtlinewidth = new ShiftUI.TextBox();
+            this.Label30 = new ShiftUI.Label();
+            this.Label31 = new ShiftUI.Label();
+            this.pnlpaintbrushtoolsettings = new ShiftUI.Panel();
+            this.Label36 = new ShiftUI.Label();
+            this.btnpaintsquareshape = new ShiftUI.Button();
+            this.btnpaintcircleshape = new ShiftUI.Button();
+            this.Label37 = new ShiftUI.Label();
+            this.txtpaintbrushsize = new ShiftUI.TextBox();
+            this.Label38 = new ShiftUI.Label();
+            this.Label39 = new ShiftUI.Label();
+            this.pnltexttoolsettings = new ShiftUI.Panel();
+            this.Label35 = new ShiftUI.Label();
+            this.combofontstyle = new ShiftUI.ComboBox();
+            this.txtdrawstringtext = new ShiftUI.TextBox();
+            this.combodrawtextfont = new ShiftUI.ComboBox();
+            this.Label25 = new ShiftUI.Label();
+            this.txtdrawtextsize = new ShiftUI.TextBox();
+            this.Label32 = new ShiftUI.Label();
+            this.Label33 = new ShiftUI.Label();
+            this.Label34 = new ShiftUI.Label();
+            this.pnlpixelsettersettings = new ShiftUI.Panel();
+            this.btnpixelsettersetpixel = new ShiftUI.Button();
+            this.txtpixelsetterycoordinate = new ShiftUI.TextBox();
+            this.txtpixelsetterxcoordinate = new ShiftUI.TextBox();
+            this.Label3 = new ShiftUI.Label();
+            this.Label2 = new ShiftUI.Label();
+            this.Label1 = new ShiftUI.Label();
+            this.pnlmagnifiersettings = new ShiftUI.Panel();
+            this.btnzoomout = new ShiftUI.Button();
+            this.btnzoomin = new ShiftUI.Button();
+            this.lblzoomlevel = new ShiftUI.Label();
+            this.Label7 = new ShiftUI.Label();
+            this.pnlfloodfillsettings = new ShiftUI.Panel();
+            this.Label12 = new ShiftUI.Label();
+            this.Label15 = new ShiftUI.Label();
+            this.pnlsquaretoolsettings = new ShiftUI.Panel();
+            this.Label19 = new ShiftUI.Label();
+            this.btnsquarefillonoff = new ShiftUI.Button();
+            this.pnlsquarefillcolour = new ShiftUI.Panel();
+            this.txtsquareborderwidth = new ShiftUI.TextBox();
+            this.Label16 = new ShiftUI.Label();
+            this.Label18 = new ShiftUI.Label();
+            this.Label17 = new ShiftUI.Label();
+            this.pnlpixelplacersettings = new ShiftUI.Panel();
+            this.lblpixelplacerhelp = new ShiftUI.Label();
+            this.btnpixelplacermovementmode = new ShiftUI.Button();
+            this.Label8 = new ShiftUI.Label();
+            this.pnlpencilsettings = new ShiftUI.Panel();
+            this.btnpencilsize3 = new ShiftUI.Button();
+            this.btnpencilsize2 = new ShiftUI.Button();
+            this.btnpencilsize1 = new ShiftUI.Button();
+            this.Label14 = new ShiftUI.Label();
+            this.Label6 = new ShiftUI.Label();
+            this.Label5 = new ShiftUI.Label();
+            this.line5 = new ShiftUI.Panel();
+            this.line3 = new ShiftUI.Panel();
+            this.pnltools = new ShiftUI.Panel();
+            this.pnltoolpositioner = new ShiftUI.FlowLayoutPanel();
+            this.btnpixelsetter = new ShiftUI.Button();
+            this.btnpixelplacer = new ShiftUI.Button();
+            this.btnpencil = new ShiftUI.Button();
+            this.btnfloodfill = new ShiftUI.Button();
+            this.btnoval = new ShiftUI.Button();
+            this.btnsquare = new ShiftUI.Button();
+            this.btnlinetool = new ShiftUI.Button();
+            this.btnpaintbrush = new ShiftUI.Button();
+            this.btntexttool = new ShiftUI.Button();
+            this.btneracer = new ShiftUI.Button();
+            this.btnnew = new ShiftUI.Button();
+            this.btnmagnify = new ShiftUI.Button();
+            this.btnopen = new ShiftUI.Button();
+            this.btnsave = new ShiftUI.Button();
+            this.btnundo = new ShiftUI.Button();
+            this.btnredo = new ShiftUI.Button();
+            this.line1 = new ShiftUI.Panel();
+            this.pnltoolpreview = new ShiftUI.Panel();
+            this.Label13 = new ShiftUI.Label();
+            this.picpreview = new ShiftUI.PictureBox();
+            this.lbltoolselected = new ShiftUI.Label();
+            this.line4 = new ShiftUI.Panel();
+            this.line2 = new ShiftUI.Panel();
+            this.tmrcodepointcooldown = new ShiftUI.Timer(this.components);
+            this.tmrshowearnedcodepoints = new ShiftUI.Timer(this.components);
+            this.pullbs = new ShiftUI.Timer(this.components);
+            this.pullbottom = new ShiftUI.Timer(this.components);
+            this.pullside = new ShiftUI.Timer(this.components);
+            this.tmrsetupui = new ShiftUI.Timer(this.components);
             this.pgcontents.SuspendLayout();
             this.pnldrawingbackground.SuspendLayout();
             this.pnlinitialcanvassettings.SuspendLayout();
@@ -315,10 +315,10 @@
             // pgcontents
             // 
             this.pgcontents.BackColor = System.Drawing.Color.White;
-            this.pgcontents.Controls.Add(this.pnldrawingbackground);
-            this.pgcontents.Controls.Add(this.pnlbottompanel);
-            this.pgcontents.Controls.Add(this.pnltools);
-            this.pgcontents.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pgcontents.Widgets.Add(this.pnldrawingbackground);
+            this.pgcontents.Widgets.Add(this.pnlbottompanel);
+            this.pgcontents.Widgets.Add(this.pnltools);
+            this.pgcontents.Dock = ShiftUI.DockStyle.Fill;
             this.pgcontents.Location = new System.Drawing.Point(0, 0);
             this.pgcontents.Name = "pgcontents";
             this.pgcontents.Size = new System.Drawing.Size(802, 598);
@@ -328,10 +328,10 @@
             // 
             this.pnldrawingbackground.AutoScroll = true;
             this.pnldrawingbackground.BackColor = System.Drawing.Color.Gray;
-            this.pnldrawingbackground.Controls.Add(this.pnlinitialcanvassettings);
-            this.pnldrawingbackground.Controls.Add(this.pnlpalletsize);
-            this.pnldrawingbackground.Controls.Add(this.picdrawingdisplay);
-            this.pnldrawingbackground.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pnldrawingbackground.Widgets.Add(this.pnlinitialcanvassettings);
+            this.pnldrawingbackground.Widgets.Add(this.pnlpalletsize);
+            this.pnldrawingbackground.Widgets.Add(this.picdrawingdisplay);
+            this.pnldrawingbackground.Dock = ShiftUI.DockStyle.Fill;
             this.pnldrawingbackground.Location = new System.Drawing.Point(120, 0);
             this.pnldrawingbackground.Name = "pnldrawingbackground";
             this.pnldrawingbackground.Size = new System.Drawing.Size(682, 498);
@@ -340,14 +340,14 @@
             // pnlinitialcanvassettings
             // 
             this.pnlinitialcanvassettings.BackColor = System.Drawing.Color.White;
-            this.pnlinitialcanvassettings.Controls.Add(this.btncancel);
-            this.pnlinitialcanvassettings.Controls.Add(this.btncreate);
-            this.pnlinitialcanvassettings.Controls.Add(this.Label11);
-            this.pnlinitialcanvassettings.Controls.Add(this.lbltotalpixels);
-            this.pnlinitialcanvassettings.Controls.Add(this.txtnewcanvasheight);
-            this.pnlinitialcanvassettings.Controls.Add(this.Label10);
-            this.pnlinitialcanvassettings.Controls.Add(this.txtnewcanvaswidth);
-            this.pnlinitialcanvassettings.Controls.Add(this.Label9);
+            this.pnlinitialcanvassettings.Widgets.Add(this.btncancel);
+            this.pnlinitialcanvassettings.Widgets.Add(this.btncreate);
+            this.pnlinitialcanvassettings.Widgets.Add(this.Label11);
+            this.pnlinitialcanvassettings.Widgets.Add(this.lbltotalpixels);
+            this.pnlinitialcanvassettings.Widgets.Add(this.txtnewcanvasheight);
+            this.pnlinitialcanvassettings.Widgets.Add(this.Label10);
+            this.pnlinitialcanvassettings.Widgets.Add(this.txtnewcanvaswidth);
+            this.pnlinitialcanvassettings.Widgets.Add(this.Label9);
             this.pnlinitialcanvassettings.Location = new System.Drawing.Point(223, 178);
             this.pnlinitialcanvassettings.Name = "pnlinitialcanvassettings";
             this.pnlinitialcanvassettings.Size = new System.Drawing.Size(223, 100);
@@ -355,7 +355,7 @@
             // 
             // btncancel
             // 
-            this.btncancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btncancel.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btncancel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btncancel.Location = new System.Drawing.Point(7, 66);
             this.btncancel.Name = "btncancel";
@@ -367,7 +367,7 @@
             // 
             // btncreate
             // 
-            this.btncreate.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btncreate.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btncreate.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btncreate.Location = new System.Drawing.Point(114, 66);
             this.btncreate.Name = "btncreate";
@@ -400,7 +400,7 @@
             // txtnewcanvasheight
             // 
             this.txtnewcanvasheight.BackColor = System.Drawing.Color.White;
-            this.txtnewcanvasheight.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtnewcanvasheight.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtnewcanvasheight.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtnewcanvasheight.Location = new System.Drawing.Point(59, 37);
             this.txtnewcanvasheight.MaxLength = 4;
@@ -422,7 +422,7 @@
             // txtnewcanvaswidth
             // 
             this.txtnewcanvaswidth.BackColor = System.Drawing.Color.White;
-            this.txtnewcanvaswidth.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtnewcanvaswidth.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtnewcanvaswidth.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtnewcanvaswidth.Location = new System.Drawing.Point(59, 9);
             this.txtnewcanvaswidth.MaxLength = 4;
@@ -444,16 +444,16 @@
             // pnlpalletsize
             // 
             this.pnlpalletsize.BackColor = System.Drawing.Color.White;
-            this.pnlpalletsize.Controls.Add(this.txttopspace);
-            this.pnlpalletsize.Controls.Add(this.Label40);
-            this.pnlpalletsize.Controls.Add(this.txtsidespace);
-            this.pnlpalletsize.Controls.Add(this.Label41);
-            this.pnlpalletsize.Controls.Add(this.btnchangesizecancel);
-            this.pnlpalletsize.Controls.Add(this.btnsetsize);
-            this.pnlpalletsize.Controls.Add(this.txtcolorpalletheight);
-            this.pnlpalletsize.Controls.Add(this.Label42);
-            this.pnlpalletsize.Controls.Add(this.txtcolorpalletwidth);
-            this.pnlpalletsize.Controls.Add(this.Label43);
+            this.pnlpalletsize.Widgets.Add(this.txttopspace);
+            this.pnlpalletsize.Widgets.Add(this.Label40);
+            this.pnlpalletsize.Widgets.Add(this.txtsidespace);
+            this.pnlpalletsize.Widgets.Add(this.Label41);
+            this.pnlpalletsize.Widgets.Add(this.btnchangesizecancel);
+            this.pnlpalletsize.Widgets.Add(this.btnsetsize);
+            this.pnlpalletsize.Widgets.Add(this.txtcolorpalletheight);
+            this.pnlpalletsize.Widgets.Add(this.Label42);
+            this.pnlpalletsize.Widgets.Add(this.txtcolorpalletwidth);
+            this.pnlpalletsize.Widgets.Add(this.Label43);
             this.pnlpalletsize.Location = new System.Drawing.Point(207, 178);
             this.pnlpalletsize.Name = "pnlpalletsize";
             this.pnlpalletsize.Size = new System.Drawing.Size(259, 100);
@@ -463,7 +463,7 @@
             // txttopspace
             // 
             this.txttopspace.BackColor = System.Drawing.Color.White;
-            this.txttopspace.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txttopspace.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txttopspace.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txttopspace.Location = new System.Drawing.Point(198, 38);
             this.txttopspace.Name = "txttopspace";
@@ -483,7 +483,7 @@
             // txtsidespace
             // 
             this.txtsidespace.BackColor = System.Drawing.Color.White;
-            this.txtsidespace.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtsidespace.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtsidespace.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtsidespace.Location = new System.Drawing.Point(198, 10);
             this.txtsidespace.Name = "txtsidespace";
@@ -502,7 +502,7 @@
             // 
             // btnchangesizecancel
             // 
-            this.btnchangesizecancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnchangesizecancel.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnchangesizecancel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnchangesizecancel.Location = new System.Drawing.Point(7, 66);
             this.btnchangesizecancel.Name = "btnchangesizecancel";
@@ -513,7 +513,7 @@
             // 
             // btnsetsize
             // 
-            this.btnsetsize.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnsetsize.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnsetsize.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnsetsize.Location = new System.Drawing.Point(133, 66);
             this.btnsetsize.Name = "btnsetsize";
@@ -525,7 +525,7 @@
             // txtcolorpalletheight
             // 
             this.txtcolorpalletheight.BackColor = System.Drawing.Color.White;
-            this.txtcolorpalletheight.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtcolorpalletheight.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtcolorpalletheight.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtcolorpalletheight.Location = new System.Drawing.Point(59, 37);
             this.txtcolorpalletheight.Name = "txtcolorpalletheight";
@@ -545,7 +545,7 @@
             // txtcolorpalletwidth
             // 
             this.txtcolorpalletwidth.BackColor = System.Drawing.Color.White;
-            this.txtcolorpalletwidth.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtcolorpalletwidth.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtcolorpalletwidth.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtcolorpalletwidth.Location = new System.Drawing.Point(59, 9);
             this.txtcolorpalletwidth.Name = "txtcolorpalletwidth";
@@ -571,16 +571,16 @@
             this.picdrawingdisplay.TabIndex = 0;
             this.picdrawingdisplay.TabStop = false;
             this.picdrawingdisplay.Visible = false;
-            this.picdrawingdisplay.Paint += new System.Windows.Forms.PaintEventHandler(this.picdrawingdisplay_Paint);
-            this.picdrawingdisplay.MouseDown += new System.Windows.Forms.MouseEventHandler(this.picdrawingdisplay_MouseDown);
-            this.picdrawingdisplay.MouseMove += new System.Windows.Forms.MouseEventHandler(this.picdrawingdisplay_MouseMove);
-            this.picdrawingdisplay.MouseUp += new System.Windows.Forms.MouseEventHandler(this.picdrawingdisplay_MouseUp);
+            this.picdrawingdisplay.Paint += new ShiftUI.PaintEventHandler(this.picdrawingdisplay_Paint);
+            this.picdrawingdisplay.MouseDown += new ShiftUI.MouseEventHandler(this.picdrawingdisplay_MouseDown);
+            this.picdrawingdisplay.MouseMove += new ShiftUI.MouseEventHandler(this.picdrawingdisplay_MouseMove);
+            this.picdrawingdisplay.MouseUp += new ShiftUI.MouseEventHandler(this.picdrawingdisplay_MouseUp);
             // 
             // pnlbottompanel
             // 
-            this.pnlbottompanel.Controls.Add(this.pnlpallet);
-            this.pnlbottompanel.Controls.Add(this.pnltoolproperties);
-            this.pnlbottompanel.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.pnlbottompanel.Widgets.Add(this.pnlpallet);
+            this.pnlbottompanel.Widgets.Add(this.pnltoolproperties);
+            this.pnlbottompanel.Dock = ShiftUI.DockStyle.Bottom;
             this.pnlbottompanel.Location = new System.Drawing.Point(120, 498);
             this.pnlbottompanel.Name = "pnlbottompanel";
             this.pnlbottompanel.Size = new System.Drawing.Size(682, 100);
@@ -588,12 +588,12 @@
             // 
             // pnlpallet
             // 
-            this.pnlpallet.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnlpallet.Controls.Add(this.flowcolours);
-            this.pnlpallet.Controls.Add(this.Label4);
-            this.pnlpallet.Controls.Add(this.line6);
+            this.pnlpallet.Anchor = ((ShiftUI.AnchorStyles)((((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
+            this.pnlpallet.Widgets.Add(this.flowcolours);
+            this.pnlpallet.Widgets.Add(this.Label4);
+            this.pnlpallet.Widgets.Add(this.line6);
             this.pnlpallet.Location = new System.Drawing.Point(457, 0);
             this.pnlpallet.Name = "pnlpallet";
             this.pnlpallet.Size = new System.Drawing.Size(225, 100);
@@ -601,138 +601,138 @@
             // 
             // flowcolours
             // 
-            this.flowcolours.Controls.Add(this.colourpallet1);
-            this.flowcolours.Controls.Add(this.colourpallet2);
-            this.flowcolours.Controls.Add(this.colourpallet3);
-            this.flowcolours.Controls.Add(this.colourpallet4);
-            this.flowcolours.Controls.Add(this.colourpallet5);
-            this.flowcolours.Controls.Add(this.colourpallet6);
-            this.flowcolours.Controls.Add(this.colourpallet7);
-            this.flowcolours.Controls.Add(this.colourpallet8);
-            this.flowcolours.Controls.Add(this.colourpallet9);
-            this.flowcolours.Controls.Add(this.colourpallet10);
-            this.flowcolours.Controls.Add(this.colourpallet11);
-            this.flowcolours.Controls.Add(this.colourpallet12);
-            this.flowcolours.Controls.Add(this.colourpallet13);
-            this.flowcolours.Controls.Add(this.colourpallet14);
-            this.flowcolours.Controls.Add(this.colourpallet15);
-            this.flowcolours.Controls.Add(this.colourpallet16);
-            this.flowcolours.Controls.Add(this.colourpallet17);
-            this.flowcolours.Controls.Add(this.colourpallet18);
-            this.flowcolours.Controls.Add(this.colourpallet19);
-            this.flowcolours.Controls.Add(this.colourpallet20);
-            this.flowcolours.Controls.Add(this.colourpallet21);
-            this.flowcolours.Controls.Add(this.colourpallet22);
-            this.flowcolours.Controls.Add(this.colourpallet23);
-            this.flowcolours.Controls.Add(this.colourpallet24);
-            this.flowcolours.Controls.Add(this.colourpallet25);
-            this.flowcolours.Controls.Add(this.colourpallet26);
-            this.flowcolours.Controls.Add(this.colourpallet27);
-            this.flowcolours.Controls.Add(this.colourpallet28);
-            this.flowcolours.Controls.Add(this.colourpallet29);
-            this.flowcolours.Controls.Add(this.colourpallet30);
-            this.flowcolours.Controls.Add(this.colourpallet31);
-            this.flowcolours.Controls.Add(this.colourpallet32);
-            this.flowcolours.Controls.Add(this.colourpallet33);
-            this.flowcolours.Controls.Add(this.colourpallet34);
-            this.flowcolours.Controls.Add(this.colourpallet35);
-            this.flowcolours.Controls.Add(this.colourpallet36);
-            this.flowcolours.Controls.Add(this.colourpallet37);
-            this.flowcolours.Controls.Add(this.colourpallet38);
-            this.flowcolours.Controls.Add(this.colourpallet39);
-            this.flowcolours.Controls.Add(this.colourpallet40);
-            this.flowcolours.Controls.Add(this.colourpallet41);
-            this.flowcolours.Controls.Add(this.colourpallet42);
-            this.flowcolours.Controls.Add(this.colourpallet43);
-            this.flowcolours.Controls.Add(this.colourpallet44);
-            this.flowcolours.Controls.Add(this.colourpallet45);
-            this.flowcolours.Controls.Add(this.colourpallet46);
-            this.flowcolours.Controls.Add(this.colourpallet47);
-            this.flowcolours.Controls.Add(this.colourpallet48);
-            this.flowcolours.Controls.Add(this.colourpallet49);
-            this.flowcolours.Controls.Add(this.colourpallet50);
-            this.flowcolours.Controls.Add(this.colourpallet51);
-            this.flowcolours.Controls.Add(this.colourpallet52);
-            this.flowcolours.Controls.Add(this.colourpallet53);
-            this.flowcolours.Controls.Add(this.colourpallet54);
-            this.flowcolours.Controls.Add(this.colourpallet55);
-            this.flowcolours.Controls.Add(this.colourpallet56);
-            this.flowcolours.Controls.Add(this.colourpallet57);
-            this.flowcolours.Controls.Add(this.colourpallet58);
-            this.flowcolours.Controls.Add(this.colourpallet59);
-            this.flowcolours.Controls.Add(this.colourpallet60);
-            this.flowcolours.Controls.Add(this.colourpallet61);
-            this.flowcolours.Controls.Add(this.colourpallet62);
-            this.flowcolours.Controls.Add(this.colourpallet63);
-            this.flowcolours.Controls.Add(this.colourpallet64);
-            this.flowcolours.Controls.Add(this.colourpallet65);
-            this.flowcolours.Controls.Add(this.colourpallet66);
-            this.flowcolours.Controls.Add(this.colourpallet67);
-            this.flowcolours.Controls.Add(this.colourpallet68);
-            this.flowcolours.Controls.Add(this.colourpallet69);
-            this.flowcolours.Controls.Add(this.colourpallet70);
-            this.flowcolours.Controls.Add(this.colourpallet71);
-            this.flowcolours.Controls.Add(this.colourpallet72);
-            this.flowcolours.Controls.Add(this.colourpallet73);
-            this.flowcolours.Controls.Add(this.colourpallet74);
-            this.flowcolours.Controls.Add(this.colourpallet75);
-            this.flowcolours.Controls.Add(this.colourpallet76);
-            this.flowcolours.Controls.Add(this.colourpallet77);
-            this.flowcolours.Controls.Add(this.colourpallet78);
-            this.flowcolours.Controls.Add(this.colourpallet79);
-            this.flowcolours.Controls.Add(this.colourpallet80);
-            this.flowcolours.Controls.Add(this.colourpallet81);
-            this.flowcolours.Controls.Add(this.colourpallet82);
-            this.flowcolours.Controls.Add(this.colourpallet83);
-            this.flowcolours.Controls.Add(this.colourpallet84);
-            this.flowcolours.Controls.Add(this.colourpallet85);
-            this.flowcolours.Controls.Add(this.colourpallet86);
-            this.flowcolours.Controls.Add(this.colourpallet87);
-            this.flowcolours.Controls.Add(this.colourpallet88);
-            this.flowcolours.Controls.Add(this.colourpallet89);
-            this.flowcolours.Controls.Add(this.colourpallet90);
-            this.flowcolours.Controls.Add(this.colourpallet91);
-            this.flowcolours.Controls.Add(this.colourpallet92);
-            this.flowcolours.Controls.Add(this.colourpallet93);
-            this.flowcolours.Controls.Add(this.colourpallet94);
-            this.flowcolours.Controls.Add(this.colourpallet95);
-            this.flowcolours.Controls.Add(this.colourpallet96);
-            this.flowcolours.Controls.Add(this.colourpallet97);
-            this.flowcolours.Controls.Add(this.colourpallet98);
-            this.flowcolours.Controls.Add(this.colourpallet99);
-            this.flowcolours.Controls.Add(this.colourpallet100);
-            this.flowcolours.Controls.Add(this.colourpallet101);
-            this.flowcolours.Controls.Add(this.colourpallet102);
-            this.flowcolours.Controls.Add(this.colourpallet103);
-            this.flowcolours.Controls.Add(this.colourpallet104);
-            this.flowcolours.Controls.Add(this.colourpallet105);
-            this.flowcolours.Controls.Add(this.colourpallet106);
-            this.flowcolours.Controls.Add(this.colourpallet107);
-            this.flowcolours.Controls.Add(this.colourpallet108);
-            this.flowcolours.Controls.Add(this.colourpallet109);
-            this.flowcolours.Controls.Add(this.colourpallet110);
-            this.flowcolours.Controls.Add(this.colourpallet111);
-            this.flowcolours.Controls.Add(this.colourpallet112);
-            this.flowcolours.Controls.Add(this.colourpallet113);
-            this.flowcolours.Controls.Add(this.colourpallet114);
-            this.flowcolours.Controls.Add(this.colourpallet115);
-            this.flowcolours.Controls.Add(this.colourpallet116);
-            this.flowcolours.Controls.Add(this.colourpallet117);
-            this.flowcolours.Controls.Add(this.colourpallet118);
-            this.flowcolours.Controls.Add(this.colourpallet119);
-            this.flowcolours.Controls.Add(this.colourpallet120);
-            this.flowcolours.Controls.Add(this.colourpallet121);
-            this.flowcolours.Controls.Add(this.colourpallet122);
-            this.flowcolours.Controls.Add(this.colourpallet123);
-            this.flowcolours.Controls.Add(this.colourpallet124);
-            this.flowcolours.Controls.Add(this.colourpallet125);
-            this.flowcolours.Controls.Add(this.colourpallet126);
-            this.flowcolours.Controls.Add(this.colourpallet127);
-            this.flowcolours.Controls.Add(this.colourpallet128);
-            this.flowcolours.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.flowcolours.Widgets.Add(this.colourpallet1);
+            this.flowcolours.Widgets.Add(this.colourpallet2);
+            this.flowcolours.Widgets.Add(this.colourpallet3);
+            this.flowcolours.Widgets.Add(this.colourpallet4);
+            this.flowcolours.Widgets.Add(this.colourpallet5);
+            this.flowcolours.Widgets.Add(this.colourpallet6);
+            this.flowcolours.Widgets.Add(this.colourpallet7);
+            this.flowcolours.Widgets.Add(this.colourpallet8);
+            this.flowcolours.Widgets.Add(this.colourpallet9);
+            this.flowcolours.Widgets.Add(this.colourpallet10);
+            this.flowcolours.Widgets.Add(this.colourpallet11);
+            this.flowcolours.Widgets.Add(this.colourpallet12);
+            this.flowcolours.Widgets.Add(this.colourpallet13);
+            this.flowcolours.Widgets.Add(this.colourpallet14);
+            this.flowcolours.Widgets.Add(this.colourpallet15);
+            this.flowcolours.Widgets.Add(this.colourpallet16);
+            this.flowcolours.Widgets.Add(this.colourpallet17);
+            this.flowcolours.Widgets.Add(this.colourpallet18);
+            this.flowcolours.Widgets.Add(this.colourpallet19);
+            this.flowcolours.Widgets.Add(this.colourpallet20);
+            this.flowcolours.Widgets.Add(this.colourpallet21);
+            this.flowcolours.Widgets.Add(this.colourpallet22);
+            this.flowcolours.Widgets.Add(this.colourpallet23);
+            this.flowcolours.Widgets.Add(this.colourpallet24);
+            this.flowcolours.Widgets.Add(this.colourpallet25);
+            this.flowcolours.Widgets.Add(this.colourpallet26);
+            this.flowcolours.Widgets.Add(this.colourpallet27);
+            this.flowcolours.Widgets.Add(this.colourpallet28);
+            this.flowcolours.Widgets.Add(this.colourpallet29);
+            this.flowcolours.Widgets.Add(this.colourpallet30);
+            this.flowcolours.Widgets.Add(this.colourpallet31);
+            this.flowcolours.Widgets.Add(this.colourpallet32);
+            this.flowcolours.Widgets.Add(this.colourpallet33);
+            this.flowcolours.Widgets.Add(this.colourpallet34);
+            this.flowcolours.Widgets.Add(this.colourpallet35);
+            this.flowcolours.Widgets.Add(this.colourpallet36);
+            this.flowcolours.Widgets.Add(this.colourpallet37);
+            this.flowcolours.Widgets.Add(this.colourpallet38);
+            this.flowcolours.Widgets.Add(this.colourpallet39);
+            this.flowcolours.Widgets.Add(this.colourpallet40);
+            this.flowcolours.Widgets.Add(this.colourpallet41);
+            this.flowcolours.Widgets.Add(this.colourpallet42);
+            this.flowcolours.Widgets.Add(this.colourpallet43);
+            this.flowcolours.Widgets.Add(this.colourpallet44);
+            this.flowcolours.Widgets.Add(this.colourpallet45);
+            this.flowcolours.Widgets.Add(this.colourpallet46);
+            this.flowcolours.Widgets.Add(this.colourpallet47);
+            this.flowcolours.Widgets.Add(this.colourpallet48);
+            this.flowcolours.Widgets.Add(this.colourpallet49);
+            this.flowcolours.Widgets.Add(this.colourpallet50);
+            this.flowcolours.Widgets.Add(this.colourpallet51);
+            this.flowcolours.Widgets.Add(this.colourpallet52);
+            this.flowcolours.Widgets.Add(this.colourpallet53);
+            this.flowcolours.Widgets.Add(this.colourpallet54);
+            this.flowcolours.Widgets.Add(this.colourpallet55);
+            this.flowcolours.Widgets.Add(this.colourpallet56);
+            this.flowcolours.Widgets.Add(this.colourpallet57);
+            this.flowcolours.Widgets.Add(this.colourpallet58);
+            this.flowcolours.Widgets.Add(this.colourpallet59);
+            this.flowcolours.Widgets.Add(this.colourpallet60);
+            this.flowcolours.Widgets.Add(this.colourpallet61);
+            this.flowcolours.Widgets.Add(this.colourpallet62);
+            this.flowcolours.Widgets.Add(this.colourpallet63);
+            this.flowcolours.Widgets.Add(this.colourpallet64);
+            this.flowcolours.Widgets.Add(this.colourpallet65);
+            this.flowcolours.Widgets.Add(this.colourpallet66);
+            this.flowcolours.Widgets.Add(this.colourpallet67);
+            this.flowcolours.Widgets.Add(this.colourpallet68);
+            this.flowcolours.Widgets.Add(this.colourpallet69);
+            this.flowcolours.Widgets.Add(this.colourpallet70);
+            this.flowcolours.Widgets.Add(this.colourpallet71);
+            this.flowcolours.Widgets.Add(this.colourpallet72);
+            this.flowcolours.Widgets.Add(this.colourpallet73);
+            this.flowcolours.Widgets.Add(this.colourpallet74);
+            this.flowcolours.Widgets.Add(this.colourpallet75);
+            this.flowcolours.Widgets.Add(this.colourpallet76);
+            this.flowcolours.Widgets.Add(this.colourpallet77);
+            this.flowcolours.Widgets.Add(this.colourpallet78);
+            this.flowcolours.Widgets.Add(this.colourpallet79);
+            this.flowcolours.Widgets.Add(this.colourpallet80);
+            this.flowcolours.Widgets.Add(this.colourpallet81);
+            this.flowcolours.Widgets.Add(this.colourpallet82);
+            this.flowcolours.Widgets.Add(this.colourpallet83);
+            this.flowcolours.Widgets.Add(this.colourpallet84);
+            this.flowcolours.Widgets.Add(this.colourpallet85);
+            this.flowcolours.Widgets.Add(this.colourpallet86);
+            this.flowcolours.Widgets.Add(this.colourpallet87);
+            this.flowcolours.Widgets.Add(this.colourpallet88);
+            this.flowcolours.Widgets.Add(this.colourpallet89);
+            this.flowcolours.Widgets.Add(this.colourpallet90);
+            this.flowcolours.Widgets.Add(this.colourpallet91);
+            this.flowcolours.Widgets.Add(this.colourpallet92);
+            this.flowcolours.Widgets.Add(this.colourpallet93);
+            this.flowcolours.Widgets.Add(this.colourpallet94);
+            this.flowcolours.Widgets.Add(this.colourpallet95);
+            this.flowcolours.Widgets.Add(this.colourpallet96);
+            this.flowcolours.Widgets.Add(this.colourpallet97);
+            this.flowcolours.Widgets.Add(this.colourpallet98);
+            this.flowcolours.Widgets.Add(this.colourpallet99);
+            this.flowcolours.Widgets.Add(this.colourpallet100);
+            this.flowcolours.Widgets.Add(this.colourpallet101);
+            this.flowcolours.Widgets.Add(this.colourpallet102);
+            this.flowcolours.Widgets.Add(this.colourpallet103);
+            this.flowcolours.Widgets.Add(this.colourpallet104);
+            this.flowcolours.Widgets.Add(this.colourpallet105);
+            this.flowcolours.Widgets.Add(this.colourpallet106);
+            this.flowcolours.Widgets.Add(this.colourpallet107);
+            this.flowcolours.Widgets.Add(this.colourpallet108);
+            this.flowcolours.Widgets.Add(this.colourpallet109);
+            this.flowcolours.Widgets.Add(this.colourpallet110);
+            this.flowcolours.Widgets.Add(this.colourpallet111);
+            this.flowcolours.Widgets.Add(this.colourpallet112);
+            this.flowcolours.Widgets.Add(this.colourpallet113);
+            this.flowcolours.Widgets.Add(this.colourpallet114);
+            this.flowcolours.Widgets.Add(this.colourpallet115);
+            this.flowcolours.Widgets.Add(this.colourpallet116);
+            this.flowcolours.Widgets.Add(this.colourpallet117);
+            this.flowcolours.Widgets.Add(this.colourpallet118);
+            this.flowcolours.Widgets.Add(this.colourpallet119);
+            this.flowcolours.Widgets.Add(this.colourpallet120);
+            this.flowcolours.Widgets.Add(this.colourpallet121);
+            this.flowcolours.Widgets.Add(this.colourpallet122);
+            this.flowcolours.Widgets.Add(this.colourpallet123);
+            this.flowcolours.Widgets.Add(this.colourpallet124);
+            this.flowcolours.Widgets.Add(this.colourpallet125);
+            this.flowcolours.Widgets.Add(this.colourpallet126);
+            this.flowcolours.Widgets.Add(this.colourpallet127);
+            this.flowcolours.Widgets.Add(this.colourpallet128);
+            this.flowcolours.Dock = ShiftUI.DockStyle.Bottom;
             this.flowcolours.Location = new System.Drawing.Point(0, 27);
             this.flowcolours.Name = "flowcolours";
-            this.flowcolours.Padding = new System.Windows.Forms.Padding(1, 1, 0, 0);
+            this.flowcolours.Padding = new ShiftUI.Padding(1, 1, 0, 0);
             this.flowcolours.Size = new System.Drawing.Size(225, 73);
             this.flowcolours.TabIndex = 12;
             // 
@@ -740,7 +740,7 @@
             // 
             this.colourpallet1.BackColor = System.Drawing.Color.Black;
             this.colourpallet1.Location = new System.Drawing.Point(2, 1);
-            this.colourpallet1.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet1.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet1.Name = "colourpallet1";
             this.colourpallet1.Size = new System.Drawing.Size(12, 8);
             this.colourpallet1.TabIndex = 5;
@@ -750,7 +750,7 @@
             // 
             this.colourpallet2.BackColor = System.Drawing.Color.Black;
             this.colourpallet2.Location = new System.Drawing.Point(15, 1);
-            this.colourpallet2.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet2.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet2.Name = "colourpallet2";
             this.colourpallet2.Size = new System.Drawing.Size(12, 8);
             this.colourpallet2.TabIndex = 9;
@@ -760,7 +760,7 @@
             // 
             this.colourpallet3.BackColor = System.Drawing.Color.Black;
             this.colourpallet3.Location = new System.Drawing.Point(28, 1);
-            this.colourpallet3.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet3.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet3.Name = "colourpallet3";
             this.colourpallet3.Size = new System.Drawing.Size(12, 8);
             this.colourpallet3.TabIndex = 13;
@@ -770,7 +770,7 @@
             // 
             this.colourpallet4.BackColor = System.Drawing.Color.Black;
             this.colourpallet4.Location = new System.Drawing.Point(41, 1);
-            this.colourpallet4.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet4.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet4.Name = "colourpallet4";
             this.colourpallet4.Size = new System.Drawing.Size(12, 8);
             this.colourpallet4.TabIndex = 9;
@@ -780,7 +780,7 @@
             // 
             this.colourpallet5.BackColor = System.Drawing.Color.Black;
             this.colourpallet5.Location = new System.Drawing.Point(54, 1);
-            this.colourpallet5.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet5.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet5.Name = "colourpallet5";
             this.colourpallet5.Size = new System.Drawing.Size(12, 8);
             this.colourpallet5.TabIndex = 18;
@@ -790,7 +790,7 @@
             // 
             this.colourpallet6.BackColor = System.Drawing.Color.Black;
             this.colourpallet6.Location = new System.Drawing.Point(67, 1);
-            this.colourpallet6.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet6.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet6.Name = "colourpallet6";
             this.colourpallet6.Size = new System.Drawing.Size(12, 8);
             this.colourpallet6.TabIndex = 17;
@@ -800,7 +800,7 @@
             // 
             this.colourpallet7.BackColor = System.Drawing.Color.Black;
             this.colourpallet7.Location = new System.Drawing.Point(80, 1);
-            this.colourpallet7.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet7.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet7.Name = "colourpallet7";
             this.colourpallet7.Size = new System.Drawing.Size(12, 8);
             this.colourpallet7.TabIndex = 14;
@@ -810,7 +810,7 @@
             // 
             this.colourpallet8.BackColor = System.Drawing.Color.Black;
             this.colourpallet8.Location = new System.Drawing.Point(93, 1);
-            this.colourpallet8.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet8.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet8.Name = "colourpallet8";
             this.colourpallet8.Size = new System.Drawing.Size(12, 8);
             this.colourpallet8.TabIndex = 13;
@@ -820,7 +820,7 @@
             // 
             this.colourpallet9.BackColor = System.Drawing.Color.Black;
             this.colourpallet9.Location = new System.Drawing.Point(106, 1);
-            this.colourpallet9.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet9.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet9.Name = "colourpallet9";
             this.colourpallet9.Size = new System.Drawing.Size(12, 8);
             this.colourpallet9.TabIndex = 15;
@@ -830,7 +830,7 @@
             // 
             this.colourpallet10.BackColor = System.Drawing.Color.Black;
             this.colourpallet10.Location = new System.Drawing.Point(119, 1);
-            this.colourpallet10.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet10.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet10.Name = "colourpallet10";
             this.colourpallet10.Size = new System.Drawing.Size(12, 8);
             this.colourpallet10.TabIndex = 11;
@@ -840,7 +840,7 @@
             // 
             this.colourpallet11.BackColor = System.Drawing.Color.Black;
             this.colourpallet11.Location = new System.Drawing.Point(132, 1);
-            this.colourpallet11.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet11.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet11.Name = "colourpallet11";
             this.colourpallet11.Size = new System.Drawing.Size(12, 8);
             this.colourpallet11.TabIndex = 12;
@@ -850,7 +850,7 @@
             // 
             this.colourpallet12.BackColor = System.Drawing.Color.Black;
             this.colourpallet12.Location = new System.Drawing.Point(145, 1);
-            this.colourpallet12.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet12.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet12.Name = "colourpallet12";
             this.colourpallet12.Size = new System.Drawing.Size(12, 8);
             this.colourpallet12.TabIndex = 16;
@@ -860,7 +860,7 @@
             // 
             this.colourpallet13.BackColor = System.Drawing.Color.Black;
             this.colourpallet13.Location = new System.Drawing.Point(158, 1);
-            this.colourpallet13.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet13.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet13.Name = "colourpallet13";
             this.colourpallet13.Size = new System.Drawing.Size(12, 8);
             this.colourpallet13.TabIndex = 10;
@@ -870,7 +870,7 @@
             // 
             this.colourpallet14.BackColor = System.Drawing.Color.Black;
             this.colourpallet14.Location = new System.Drawing.Point(171, 1);
-            this.colourpallet14.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet14.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet14.Name = "colourpallet14";
             this.colourpallet14.Size = new System.Drawing.Size(12, 8);
             this.colourpallet14.TabIndex = 20;
@@ -880,7 +880,7 @@
             // 
             this.colourpallet15.BackColor = System.Drawing.Color.Black;
             this.colourpallet15.Location = new System.Drawing.Point(184, 1);
-            this.colourpallet15.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet15.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet15.Name = "colourpallet15";
             this.colourpallet15.Size = new System.Drawing.Size(12, 8);
             this.colourpallet15.TabIndex = 14;
@@ -890,7 +890,7 @@
             // 
             this.colourpallet16.BackColor = System.Drawing.Color.Black;
             this.colourpallet16.Location = new System.Drawing.Point(197, 1);
-            this.colourpallet16.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet16.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet16.Name = "colourpallet16";
             this.colourpallet16.Size = new System.Drawing.Size(12, 8);
             this.colourpallet16.TabIndex = 16;
@@ -900,7 +900,7 @@
             // 
             this.colourpallet17.BackColor = System.Drawing.Color.Black;
             this.colourpallet17.Location = new System.Drawing.Point(210, 1);
-            this.colourpallet17.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet17.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet17.Name = "colourpallet17";
             this.colourpallet17.Size = new System.Drawing.Size(12, 8);
             this.colourpallet17.TabIndex = 11;
@@ -910,7 +910,7 @@
             // 
             this.colourpallet18.BackColor = System.Drawing.Color.Black;
             this.colourpallet18.Location = new System.Drawing.Point(2, 10);
-            this.colourpallet18.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet18.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet18.Name = "colourpallet18";
             this.colourpallet18.Size = new System.Drawing.Size(12, 8);
             this.colourpallet18.TabIndex = 8;
@@ -920,7 +920,7 @@
             // 
             this.colourpallet19.BackColor = System.Drawing.Color.Black;
             this.colourpallet19.Location = new System.Drawing.Point(15, 10);
-            this.colourpallet19.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet19.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet19.Name = "colourpallet19";
             this.colourpallet19.Size = new System.Drawing.Size(12, 8);
             this.colourpallet19.TabIndex = 24;
@@ -930,7 +930,7 @@
             // 
             this.colourpallet20.BackColor = System.Drawing.Color.Black;
             this.colourpallet20.Location = new System.Drawing.Point(28, 10);
-            this.colourpallet20.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet20.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet20.Name = "colourpallet20";
             this.colourpallet20.Size = new System.Drawing.Size(12, 8);
             this.colourpallet20.TabIndex = 12;
@@ -940,7 +940,7 @@
             // 
             this.colourpallet21.BackColor = System.Drawing.Color.Black;
             this.colourpallet21.Location = new System.Drawing.Point(41, 10);
-            this.colourpallet21.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet21.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet21.Name = "colourpallet21";
             this.colourpallet21.Size = new System.Drawing.Size(12, 8);
             this.colourpallet21.TabIndex = 20;
@@ -950,7 +950,7 @@
             // 
             this.colourpallet22.BackColor = System.Drawing.Color.Black;
             this.colourpallet22.Location = new System.Drawing.Point(54, 10);
-            this.colourpallet22.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet22.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet22.Name = "colourpallet22";
             this.colourpallet22.Size = new System.Drawing.Size(12, 8);
             this.colourpallet22.TabIndex = 8;
@@ -960,7 +960,7 @@
             // 
             this.colourpallet23.BackColor = System.Drawing.Color.Black;
             this.colourpallet23.Location = new System.Drawing.Point(67, 10);
-            this.colourpallet23.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet23.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet23.Name = "colourpallet23";
             this.colourpallet23.Size = new System.Drawing.Size(12, 8);
             this.colourpallet23.TabIndex = 19;
@@ -970,7 +970,7 @@
             // 
             this.colourpallet24.BackColor = System.Drawing.Color.Black;
             this.colourpallet24.Location = new System.Drawing.Point(80, 10);
-            this.colourpallet24.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet24.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet24.Name = "colourpallet24";
             this.colourpallet24.Size = new System.Drawing.Size(12, 8);
             this.colourpallet24.TabIndex = 10;
@@ -980,7 +980,7 @@
             // 
             this.colourpallet25.BackColor = System.Drawing.Color.Black;
             this.colourpallet25.Location = new System.Drawing.Point(93, 10);
-            this.colourpallet25.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet25.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet25.Name = "colourpallet25";
             this.colourpallet25.Size = new System.Drawing.Size(12, 8);
             this.colourpallet25.TabIndex = 15;
@@ -990,7 +990,7 @@
             // 
             this.colourpallet26.BackColor = System.Drawing.Color.Black;
             this.colourpallet26.Location = new System.Drawing.Point(106, 10);
-            this.colourpallet26.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet26.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet26.Name = "colourpallet26";
             this.colourpallet26.Size = new System.Drawing.Size(12, 8);
             this.colourpallet26.TabIndex = 23;
@@ -1000,7 +1000,7 @@
             // 
             this.colourpallet27.BackColor = System.Drawing.Color.Black;
             this.colourpallet27.Location = new System.Drawing.Point(119, 10);
-            this.colourpallet27.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet27.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet27.Name = "colourpallet27";
             this.colourpallet27.Size = new System.Drawing.Size(12, 8);
             this.colourpallet27.TabIndex = 6;
@@ -1010,7 +1010,7 @@
             // 
             this.colourpallet28.BackColor = System.Drawing.Color.Black;
             this.colourpallet28.Location = new System.Drawing.Point(132, 10);
-            this.colourpallet28.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet28.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet28.Name = "colourpallet28";
             this.colourpallet28.Size = new System.Drawing.Size(12, 8);
             this.colourpallet28.TabIndex = 19;
@@ -1020,7 +1020,7 @@
             // 
             this.colourpallet29.BackColor = System.Drawing.Color.Black;
             this.colourpallet29.Location = new System.Drawing.Point(145, 10);
-            this.colourpallet29.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet29.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet29.Name = "colourpallet29";
             this.colourpallet29.Size = new System.Drawing.Size(12, 8);
             this.colourpallet29.TabIndex = 22;
@@ -1030,7 +1030,7 @@
             // 
             this.colourpallet30.BackColor = System.Drawing.Color.Black;
             this.colourpallet30.Location = new System.Drawing.Point(158, 10);
-            this.colourpallet30.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet30.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet30.Name = "colourpallet30";
             this.colourpallet30.Size = new System.Drawing.Size(12, 8);
             this.colourpallet30.TabIndex = 18;
@@ -1040,7 +1040,7 @@
             // 
             this.colourpallet31.BackColor = System.Drawing.Color.Black;
             this.colourpallet31.Location = new System.Drawing.Point(171, 10);
-            this.colourpallet31.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet31.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet31.Name = "colourpallet31";
             this.colourpallet31.Size = new System.Drawing.Size(12, 8);
             this.colourpallet31.TabIndex = 21;
@@ -1050,7 +1050,7 @@
             // 
             this.colourpallet32.BackColor = System.Drawing.Color.Black;
             this.colourpallet32.Location = new System.Drawing.Point(184, 10);
-            this.colourpallet32.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet32.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet32.Name = "colourpallet32";
             this.colourpallet32.Size = new System.Drawing.Size(12, 8);
             this.colourpallet32.TabIndex = 17;
@@ -1060,7 +1060,7 @@
             // 
             this.colourpallet33.BackColor = System.Drawing.Color.Black;
             this.colourpallet33.Location = new System.Drawing.Point(197, 10);
-            this.colourpallet33.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet33.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet33.Name = "colourpallet33";
             this.colourpallet33.Size = new System.Drawing.Size(12, 8);
             this.colourpallet33.TabIndex = 50;
@@ -1070,7 +1070,7 @@
             // 
             this.colourpallet34.BackColor = System.Drawing.Color.Black;
             this.colourpallet34.Location = new System.Drawing.Point(210, 10);
-            this.colourpallet34.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet34.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet34.Name = "colourpallet34";
             this.colourpallet34.Size = new System.Drawing.Size(12, 8);
             this.colourpallet34.TabIndex = 46;
@@ -1080,7 +1080,7 @@
             // 
             this.colourpallet35.BackColor = System.Drawing.Color.Black;
             this.colourpallet35.Location = new System.Drawing.Point(2, 19);
-            this.colourpallet35.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet35.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet35.Name = "colourpallet35";
             this.colourpallet35.Size = new System.Drawing.Size(12, 8);
             this.colourpallet35.TabIndex = 53;
@@ -1090,7 +1090,7 @@
             // 
             this.colourpallet36.BackColor = System.Drawing.Color.Black;
             this.colourpallet36.Location = new System.Drawing.Point(15, 19);
-            this.colourpallet36.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet36.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet36.Name = "colourpallet36";
             this.colourpallet36.Size = new System.Drawing.Size(12, 8);
             this.colourpallet36.TabIndex = 48;
@@ -1100,7 +1100,7 @@
             // 
             this.colourpallet37.BackColor = System.Drawing.Color.Black;
             this.colourpallet37.Location = new System.Drawing.Point(28, 19);
-            this.colourpallet37.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet37.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet37.Name = "colourpallet37";
             this.colourpallet37.Size = new System.Drawing.Size(12, 8);
             this.colourpallet37.TabIndex = 54;
@@ -1110,7 +1110,7 @@
             // 
             this.colourpallet38.BackColor = System.Drawing.Color.Black;
             this.colourpallet38.Location = new System.Drawing.Point(41, 19);
-            this.colourpallet38.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet38.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet38.Name = "colourpallet38";
             this.colourpallet38.Size = new System.Drawing.Size(12, 8);
             this.colourpallet38.TabIndex = 26;
@@ -1120,7 +1120,7 @@
             // 
             this.colourpallet39.BackColor = System.Drawing.Color.Black;
             this.colourpallet39.Location = new System.Drawing.Point(54, 19);
-            this.colourpallet39.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet39.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet39.Name = "colourpallet39";
             this.colourpallet39.Size = new System.Drawing.Size(12, 8);
             this.colourpallet39.TabIndex = 55;
@@ -1130,7 +1130,7 @@
             // 
             this.colourpallet40.BackColor = System.Drawing.Color.Black;
             this.colourpallet40.Location = new System.Drawing.Point(67, 19);
-            this.colourpallet40.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet40.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet40.Name = "colourpallet40";
             this.colourpallet40.Size = new System.Drawing.Size(12, 8);
             this.colourpallet40.TabIndex = 41;
@@ -1140,7 +1140,7 @@
             // 
             this.colourpallet41.BackColor = System.Drawing.Color.Black;
             this.colourpallet41.Location = new System.Drawing.Point(80, 19);
-            this.colourpallet41.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet41.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet41.Name = "colourpallet41";
             this.colourpallet41.Size = new System.Drawing.Size(12, 8);
             this.colourpallet41.TabIndex = 31;
@@ -1150,7 +1150,7 @@
             // 
             this.colourpallet42.BackColor = System.Drawing.Color.Black;
             this.colourpallet42.Location = new System.Drawing.Point(93, 19);
-            this.colourpallet42.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet42.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet42.Name = "colourpallet42";
             this.colourpallet42.Size = new System.Drawing.Size(12, 8);
             this.colourpallet42.TabIndex = 49;
@@ -1160,7 +1160,7 @@
             // 
             this.colourpallet43.BackColor = System.Drawing.Color.Black;
             this.colourpallet43.Location = new System.Drawing.Point(106, 19);
-            this.colourpallet43.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet43.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet43.Name = "colourpallet43";
             this.colourpallet43.Size = new System.Drawing.Size(12, 8);
             this.colourpallet43.TabIndex = 27;
@@ -1170,7 +1170,7 @@
             // 
             this.colourpallet44.BackColor = System.Drawing.Color.Black;
             this.colourpallet44.Location = new System.Drawing.Point(119, 19);
-            this.colourpallet44.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet44.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet44.Name = "colourpallet44";
             this.colourpallet44.Size = new System.Drawing.Size(12, 8);
             this.colourpallet44.TabIndex = 51;
@@ -1180,7 +1180,7 @@
             // 
             this.colourpallet45.BackColor = System.Drawing.Color.Black;
             this.colourpallet45.Location = new System.Drawing.Point(132, 19);
-            this.colourpallet45.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet45.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet45.Name = "colourpallet45";
             this.colourpallet45.Size = new System.Drawing.Size(12, 8);
             this.colourpallet45.TabIndex = 36;
@@ -1190,7 +1190,7 @@
             // 
             this.colourpallet46.BackColor = System.Drawing.Color.Black;
             this.colourpallet46.Location = new System.Drawing.Point(145, 19);
-            this.colourpallet46.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet46.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet46.Name = "colourpallet46";
             this.colourpallet46.Size = new System.Drawing.Size(12, 8);
             this.colourpallet46.TabIndex = 56;
@@ -1200,7 +1200,7 @@
             // 
             this.colourpallet47.BackColor = System.Drawing.Color.Black;
             this.colourpallet47.Location = new System.Drawing.Point(158, 19);
-            this.colourpallet47.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet47.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet47.Name = "colourpallet47";
             this.colourpallet47.Size = new System.Drawing.Size(12, 8);
             this.colourpallet47.TabIndex = 28;
@@ -1210,7 +1210,7 @@
             // 
             this.colourpallet48.BackColor = System.Drawing.Color.Black;
             this.colourpallet48.Location = new System.Drawing.Point(171, 19);
-            this.colourpallet48.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet48.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet48.Name = "colourpallet48";
             this.colourpallet48.Size = new System.Drawing.Size(12, 8);
             this.colourpallet48.TabIndex = 33;
@@ -1220,7 +1220,7 @@
             // 
             this.colourpallet49.BackColor = System.Drawing.Color.Black;
             this.colourpallet49.Location = new System.Drawing.Point(184, 19);
-            this.colourpallet49.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet49.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet49.Name = "colourpallet49";
             this.colourpallet49.Size = new System.Drawing.Size(12, 8);
             this.colourpallet49.TabIndex = 43;
@@ -1230,7 +1230,7 @@
             // 
             this.colourpallet50.BackColor = System.Drawing.Color.Black;
             this.colourpallet50.Location = new System.Drawing.Point(197, 19);
-            this.colourpallet50.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet50.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet50.Name = "colourpallet50";
             this.colourpallet50.Size = new System.Drawing.Size(12, 8);
             this.colourpallet50.TabIndex = 40;
@@ -1240,7 +1240,7 @@
             // 
             this.colourpallet51.BackColor = System.Drawing.Color.Black;
             this.colourpallet51.Location = new System.Drawing.Point(210, 19);
-            this.colourpallet51.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet51.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet51.Name = "colourpallet51";
             this.colourpallet51.Size = new System.Drawing.Size(12, 8);
             this.colourpallet51.TabIndex = 52;
@@ -1250,7 +1250,7 @@
             // 
             this.colourpallet52.BackColor = System.Drawing.Color.Black;
             this.colourpallet52.Location = new System.Drawing.Point(2, 28);
-            this.colourpallet52.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet52.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet52.Name = "colourpallet52";
             this.colourpallet52.Size = new System.Drawing.Size(12, 8);
             this.colourpallet52.TabIndex = 32;
@@ -1260,7 +1260,7 @@
             // 
             this.colourpallet53.BackColor = System.Drawing.Color.Black;
             this.colourpallet53.Location = new System.Drawing.Point(15, 28);
-            this.colourpallet53.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet53.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet53.Name = "colourpallet53";
             this.colourpallet53.Size = new System.Drawing.Size(12, 8);
             this.colourpallet53.TabIndex = 44;
@@ -1270,7 +1270,7 @@
             // 
             this.colourpallet54.BackColor = System.Drawing.Color.Black;
             this.colourpallet54.Location = new System.Drawing.Point(28, 28);
-            this.colourpallet54.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet54.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet54.Name = "colourpallet54";
             this.colourpallet54.Size = new System.Drawing.Size(12, 8);
             this.colourpallet54.TabIndex = 35;
@@ -1280,7 +1280,7 @@
             // 
             this.colourpallet55.BackColor = System.Drawing.Color.Black;
             this.colourpallet55.Location = new System.Drawing.Point(41, 28);
-            this.colourpallet55.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet55.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet55.Name = "colourpallet55";
             this.colourpallet55.Size = new System.Drawing.Size(12, 8);
             this.colourpallet55.TabIndex = 34;
@@ -1290,7 +1290,7 @@
             // 
             this.colourpallet56.BackColor = System.Drawing.Color.Black;
             this.colourpallet56.Location = new System.Drawing.Point(54, 28);
-            this.colourpallet56.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet56.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet56.Name = "colourpallet56";
             this.colourpallet56.Size = new System.Drawing.Size(12, 8);
             this.colourpallet56.TabIndex = 42;
@@ -1300,7 +1300,7 @@
             // 
             this.colourpallet57.BackColor = System.Drawing.Color.Black;
             this.colourpallet57.Location = new System.Drawing.Point(67, 28);
-            this.colourpallet57.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet57.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet57.Name = "colourpallet57";
             this.colourpallet57.Size = new System.Drawing.Size(12, 8);
             this.colourpallet57.TabIndex = 38;
@@ -1310,7 +1310,7 @@
             // 
             this.colourpallet58.BackColor = System.Drawing.Color.Black;
             this.colourpallet58.Location = new System.Drawing.Point(80, 28);
-            this.colourpallet58.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet58.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet58.Name = "colourpallet58";
             this.colourpallet58.Size = new System.Drawing.Size(12, 8);
             this.colourpallet58.TabIndex = 39;
@@ -1320,7 +1320,7 @@
             // 
             this.colourpallet59.BackColor = System.Drawing.Color.Black;
             this.colourpallet59.Location = new System.Drawing.Point(93, 28);
-            this.colourpallet59.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet59.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet59.Name = "colourpallet59";
             this.colourpallet59.Size = new System.Drawing.Size(12, 8);
             this.colourpallet59.TabIndex = 45;
@@ -1330,7 +1330,7 @@
             // 
             this.colourpallet60.BackColor = System.Drawing.Color.Black;
             this.colourpallet60.Location = new System.Drawing.Point(106, 28);
-            this.colourpallet60.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet60.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet60.Name = "colourpallet60";
             this.colourpallet60.Size = new System.Drawing.Size(12, 8);
             this.colourpallet60.TabIndex = 47;
@@ -1340,7 +1340,7 @@
             // 
             this.colourpallet61.BackColor = System.Drawing.Color.Black;
             this.colourpallet61.Location = new System.Drawing.Point(119, 28);
-            this.colourpallet61.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet61.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet61.Name = "colourpallet61";
             this.colourpallet61.Size = new System.Drawing.Size(12, 8);
             this.colourpallet61.TabIndex = 30;
@@ -1350,7 +1350,7 @@
             // 
             this.colourpallet62.BackColor = System.Drawing.Color.Black;
             this.colourpallet62.Location = new System.Drawing.Point(132, 28);
-            this.colourpallet62.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet62.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet62.Name = "colourpallet62";
             this.colourpallet62.Size = new System.Drawing.Size(12, 8);
             this.colourpallet62.TabIndex = 37;
@@ -1360,7 +1360,7 @@
             // 
             this.colourpallet63.BackColor = System.Drawing.Color.Black;
             this.colourpallet63.Location = new System.Drawing.Point(145, 28);
-            this.colourpallet63.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet63.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet63.Name = "colourpallet63";
             this.colourpallet63.Size = new System.Drawing.Size(12, 8);
             this.colourpallet63.TabIndex = 29;
@@ -1370,7 +1370,7 @@
             // 
             this.colourpallet64.BackColor = System.Drawing.Color.Black;
             this.colourpallet64.Location = new System.Drawing.Point(158, 28);
-            this.colourpallet64.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet64.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet64.Name = "colourpallet64";
             this.colourpallet64.Size = new System.Drawing.Size(12, 8);
             this.colourpallet64.TabIndex = 25;
@@ -1380,7 +1380,7 @@
             // 
             this.colourpallet65.BackColor = System.Drawing.Color.Black;
             this.colourpallet65.Location = new System.Drawing.Point(171, 28);
-            this.colourpallet65.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet65.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet65.Name = "colourpallet65";
             this.colourpallet65.Size = new System.Drawing.Size(12, 8);
             this.colourpallet65.TabIndex = 57;
@@ -1390,7 +1390,7 @@
             // 
             this.colourpallet66.BackColor = System.Drawing.Color.Black;
             this.colourpallet66.Location = new System.Drawing.Point(184, 28);
-            this.colourpallet66.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet66.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet66.Name = "colourpallet66";
             this.colourpallet66.Size = new System.Drawing.Size(12, 8);
             this.colourpallet66.TabIndex = 61;
@@ -1400,7 +1400,7 @@
             // 
             this.colourpallet67.BackColor = System.Drawing.Color.Black;
             this.colourpallet67.Location = new System.Drawing.Point(197, 28);
-            this.colourpallet67.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet67.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet67.Name = "colourpallet67";
             this.colourpallet67.Size = new System.Drawing.Size(12, 8);
             this.colourpallet67.TabIndex = 69;
@@ -1410,7 +1410,7 @@
             // 
             this.colourpallet68.BackColor = System.Drawing.Color.Black;
             this.colourpallet68.Location = new System.Drawing.Point(210, 28);
-            this.colourpallet68.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet68.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet68.Name = "colourpallet68";
             this.colourpallet68.Size = new System.Drawing.Size(12, 8);
             this.colourpallet68.TabIndex = 62;
@@ -1420,7 +1420,7 @@
             // 
             this.colourpallet69.BackColor = System.Drawing.Color.Black;
             this.colourpallet69.Location = new System.Drawing.Point(2, 37);
-            this.colourpallet69.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet69.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet69.Name = "colourpallet69";
             this.colourpallet69.Size = new System.Drawing.Size(12, 8);
             this.colourpallet69.TabIndex = 79;
@@ -1430,7 +1430,7 @@
             // 
             this.colourpallet70.BackColor = System.Drawing.Color.Black;
             this.colourpallet70.Location = new System.Drawing.Point(15, 37);
-            this.colourpallet70.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet70.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet70.Name = "colourpallet70";
             this.colourpallet70.Size = new System.Drawing.Size(12, 8);
             this.colourpallet70.TabIndex = 77;
@@ -1440,7 +1440,7 @@
             // 
             this.colourpallet71.BackColor = System.Drawing.Color.Black;
             this.colourpallet71.Location = new System.Drawing.Point(28, 37);
-            this.colourpallet71.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet71.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet71.Name = "colourpallet71";
             this.colourpallet71.Size = new System.Drawing.Size(12, 8);
             this.colourpallet71.TabIndex = 71;
@@ -1450,7 +1450,7 @@
             // 
             this.colourpallet72.BackColor = System.Drawing.Color.Black;
             this.colourpallet72.Location = new System.Drawing.Point(41, 37);
-            this.colourpallet72.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet72.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet72.Name = "colourpallet72";
             this.colourpallet72.Size = new System.Drawing.Size(12, 8);
             this.colourpallet72.TabIndex = 70;
@@ -1460,7 +1460,7 @@
             // 
             this.colourpallet73.BackColor = System.Drawing.Color.Black;
             this.colourpallet73.Location = new System.Drawing.Point(54, 37);
-            this.colourpallet73.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet73.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet73.Name = "colourpallet73";
             this.colourpallet73.Size = new System.Drawing.Size(12, 8);
             this.colourpallet73.TabIndex = 74;
@@ -1470,7 +1470,7 @@
             // 
             this.colourpallet74.BackColor = System.Drawing.Color.Black;
             this.colourpallet74.Location = new System.Drawing.Point(67, 37);
-            this.colourpallet74.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet74.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet74.Name = "colourpallet74";
             this.colourpallet74.Size = new System.Drawing.Size(12, 8);
             this.colourpallet74.TabIndex = 66;
@@ -1480,7 +1480,7 @@
             // 
             this.colourpallet75.BackColor = System.Drawing.Color.Black;
             this.colourpallet75.Location = new System.Drawing.Point(80, 37);
-            this.colourpallet75.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet75.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet75.Name = "colourpallet75";
             this.colourpallet75.Size = new System.Drawing.Size(12, 8);
             this.colourpallet75.TabIndex = 67;
@@ -1490,7 +1490,7 @@
             // 
             this.colourpallet76.BackColor = System.Drawing.Color.Black;
             this.colourpallet76.Location = new System.Drawing.Point(93, 37);
-            this.colourpallet76.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet76.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet76.Name = "colourpallet76";
             this.colourpallet76.Size = new System.Drawing.Size(12, 8);
             this.colourpallet76.TabIndex = 76;
@@ -1500,7 +1500,7 @@
             // 
             this.colourpallet77.BackColor = System.Drawing.Color.Black;
             this.colourpallet77.Location = new System.Drawing.Point(106, 37);
-            this.colourpallet77.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet77.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet77.Name = "colourpallet77";
             this.colourpallet77.Size = new System.Drawing.Size(12, 8);
             this.colourpallet77.TabIndex = 64;
@@ -1510,7 +1510,7 @@
             // 
             this.colourpallet78.BackColor = System.Drawing.Color.Black;
             this.colourpallet78.Location = new System.Drawing.Point(119, 37);
-            this.colourpallet78.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet78.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet78.Name = "colourpallet78";
             this.colourpallet78.Size = new System.Drawing.Size(12, 8);
             this.colourpallet78.TabIndex = 84;
@@ -1520,7 +1520,7 @@
             // 
             this.colourpallet79.BackColor = System.Drawing.Color.Black;
             this.colourpallet79.Location = new System.Drawing.Point(132, 37);
-            this.colourpallet79.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet79.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet79.Name = "colourpallet79";
             this.colourpallet79.Size = new System.Drawing.Size(12, 8);
             this.colourpallet79.TabIndex = 72;
@@ -1530,7 +1530,7 @@
             // 
             this.colourpallet80.BackColor = System.Drawing.Color.Black;
             this.colourpallet80.Location = new System.Drawing.Point(145, 37);
-            this.colourpallet80.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet80.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet80.Name = "colourpallet80";
             this.colourpallet80.Size = new System.Drawing.Size(12, 8);
             this.colourpallet80.TabIndex = 75;
@@ -1540,7 +1540,7 @@
             // 
             this.colourpallet81.BackColor = System.Drawing.Color.Black;
             this.colourpallet81.Location = new System.Drawing.Point(158, 37);
-            this.colourpallet81.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet81.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet81.Name = "colourpallet81";
             this.colourpallet81.Size = new System.Drawing.Size(12, 8);
             this.colourpallet81.TabIndex = 65;
@@ -1550,7 +1550,7 @@
             // 
             this.colourpallet82.BackColor = System.Drawing.Color.Black;
             this.colourpallet82.Location = new System.Drawing.Point(171, 37);
-            this.colourpallet82.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet82.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet82.Name = "colourpallet82";
             this.colourpallet82.Size = new System.Drawing.Size(12, 8);
             this.colourpallet82.TabIndex = 60;
@@ -1560,7 +1560,7 @@
             // 
             this.colourpallet83.BackColor = System.Drawing.Color.Black;
             this.colourpallet83.Location = new System.Drawing.Point(184, 37);
-            this.colourpallet83.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet83.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet83.Name = "colourpallet83";
             this.colourpallet83.Size = new System.Drawing.Size(12, 8);
             this.colourpallet83.TabIndex = 88;
@@ -1570,7 +1570,7 @@
             // 
             this.colourpallet84.BackColor = System.Drawing.Color.Black;
             this.colourpallet84.Location = new System.Drawing.Point(197, 37);
-            this.colourpallet84.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet84.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet84.Name = "colourpallet84";
             this.colourpallet84.Size = new System.Drawing.Size(12, 8);
             this.colourpallet84.TabIndex = 68;
@@ -1580,7 +1580,7 @@
             // 
             this.colourpallet85.BackColor = System.Drawing.Color.Black;
             this.colourpallet85.Location = new System.Drawing.Point(210, 37);
-            this.colourpallet85.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet85.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet85.Name = "colourpallet85";
             this.colourpallet85.Size = new System.Drawing.Size(12, 8);
             this.colourpallet85.TabIndex = 83;
@@ -1590,7 +1590,7 @@
             // 
             this.colourpallet86.BackColor = System.Drawing.Color.Black;
             this.colourpallet86.Location = new System.Drawing.Point(2, 46);
-            this.colourpallet86.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet86.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet86.Name = "colourpallet86";
             this.colourpallet86.Size = new System.Drawing.Size(12, 8);
             this.colourpallet86.TabIndex = 59;
@@ -1600,7 +1600,7 @@
             // 
             this.colourpallet87.BackColor = System.Drawing.Color.Black;
             this.colourpallet87.Location = new System.Drawing.Point(15, 46);
-            this.colourpallet87.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet87.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet87.Name = "colourpallet87";
             this.colourpallet87.Size = new System.Drawing.Size(12, 8);
             this.colourpallet87.TabIndex = 81;
@@ -1610,7 +1610,7 @@
             // 
             this.colourpallet88.BackColor = System.Drawing.Color.Black;
             this.colourpallet88.Location = new System.Drawing.Point(28, 46);
-            this.colourpallet88.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet88.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet88.Name = "colourpallet88";
             this.colourpallet88.Size = new System.Drawing.Size(12, 8);
             this.colourpallet88.TabIndex = 63;
@@ -1620,7 +1620,7 @@
             // 
             this.colourpallet89.BackColor = System.Drawing.Color.Black;
             this.colourpallet89.Location = new System.Drawing.Point(41, 46);
-            this.colourpallet89.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet89.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet89.Name = "colourpallet89";
             this.colourpallet89.Size = new System.Drawing.Size(12, 8);
             this.colourpallet89.TabIndex = 73;
@@ -1630,7 +1630,7 @@
             // 
             this.colourpallet90.BackColor = System.Drawing.Color.Black;
             this.colourpallet90.Location = new System.Drawing.Point(54, 46);
-            this.colourpallet90.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet90.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet90.Name = "colourpallet90";
             this.colourpallet90.Size = new System.Drawing.Size(12, 8);
             this.colourpallet90.TabIndex = 87;
@@ -1640,7 +1640,7 @@
             // 
             this.colourpallet91.BackColor = System.Drawing.Color.Black;
             this.colourpallet91.Location = new System.Drawing.Point(67, 46);
-            this.colourpallet91.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet91.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet91.Name = "colourpallet91";
             this.colourpallet91.Size = new System.Drawing.Size(12, 8);
             this.colourpallet91.TabIndex = 58;
@@ -1650,7 +1650,7 @@
             // 
             this.colourpallet92.BackColor = System.Drawing.Color.Black;
             this.colourpallet92.Location = new System.Drawing.Point(80, 46);
-            this.colourpallet92.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet92.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet92.Name = "colourpallet92";
             this.colourpallet92.Size = new System.Drawing.Size(12, 8);
             this.colourpallet92.TabIndex = 82;
@@ -1660,7 +1660,7 @@
             // 
             this.colourpallet93.BackColor = System.Drawing.Color.Black;
             this.colourpallet93.Location = new System.Drawing.Point(93, 46);
-            this.colourpallet93.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet93.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet93.Name = "colourpallet93";
             this.colourpallet93.Size = new System.Drawing.Size(12, 8);
             this.colourpallet93.TabIndex = 86;
@@ -1670,7 +1670,7 @@
             // 
             this.colourpallet94.BackColor = System.Drawing.Color.Black;
             this.colourpallet94.Location = new System.Drawing.Point(106, 46);
-            this.colourpallet94.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet94.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet94.Name = "colourpallet94";
             this.colourpallet94.Size = new System.Drawing.Size(12, 8);
             this.colourpallet94.TabIndex = 80;
@@ -1680,7 +1680,7 @@
             // 
             this.colourpallet95.BackColor = System.Drawing.Color.Black;
             this.colourpallet95.Location = new System.Drawing.Point(119, 46);
-            this.colourpallet95.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet95.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet95.Name = "colourpallet95";
             this.colourpallet95.Size = new System.Drawing.Size(12, 8);
             this.colourpallet95.TabIndex = 85;
@@ -1690,7 +1690,7 @@
             // 
             this.colourpallet96.BackColor = System.Drawing.Color.Black;
             this.colourpallet96.Location = new System.Drawing.Point(132, 46);
-            this.colourpallet96.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet96.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet96.Name = "colourpallet96";
             this.colourpallet96.Size = new System.Drawing.Size(12, 8);
             this.colourpallet96.TabIndex = 78;
@@ -1700,7 +1700,7 @@
             // 
             this.colourpallet97.BackColor = System.Drawing.Color.Black;
             this.colourpallet97.Location = new System.Drawing.Point(145, 46);
-            this.colourpallet97.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet97.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet97.Name = "colourpallet97";
             this.colourpallet97.Size = new System.Drawing.Size(12, 8);
             this.colourpallet97.TabIndex = 89;
@@ -1710,7 +1710,7 @@
             // 
             this.colourpallet98.BackColor = System.Drawing.Color.Black;
             this.colourpallet98.Location = new System.Drawing.Point(158, 46);
-            this.colourpallet98.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet98.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet98.Name = "colourpallet98";
             this.colourpallet98.Size = new System.Drawing.Size(12, 8);
             this.colourpallet98.TabIndex = 93;
@@ -1720,7 +1720,7 @@
             // 
             this.colourpallet99.BackColor = System.Drawing.Color.Black;
             this.colourpallet99.Location = new System.Drawing.Point(171, 46);
-            this.colourpallet99.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet99.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet99.Name = "colourpallet99";
             this.colourpallet99.Size = new System.Drawing.Size(12, 8);
             this.colourpallet99.TabIndex = 101;
@@ -1730,7 +1730,7 @@
             // 
             this.colourpallet100.BackColor = System.Drawing.Color.Black;
             this.colourpallet100.Location = new System.Drawing.Point(184, 46);
-            this.colourpallet100.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet100.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet100.Name = "colourpallet100";
             this.colourpallet100.Size = new System.Drawing.Size(12, 8);
             this.colourpallet100.TabIndex = 94;
@@ -1740,7 +1740,7 @@
             // 
             this.colourpallet101.BackColor = System.Drawing.Color.Black;
             this.colourpallet101.Location = new System.Drawing.Point(197, 46);
-            this.colourpallet101.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet101.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet101.Name = "colourpallet101";
             this.colourpallet101.Size = new System.Drawing.Size(12, 8);
             this.colourpallet101.TabIndex = 111;
@@ -1750,7 +1750,7 @@
             // 
             this.colourpallet102.BackColor = System.Drawing.Color.Black;
             this.colourpallet102.Location = new System.Drawing.Point(210, 46);
-            this.colourpallet102.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet102.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet102.Name = "colourpallet102";
             this.colourpallet102.Size = new System.Drawing.Size(12, 8);
             this.colourpallet102.TabIndex = 110;
@@ -1760,7 +1760,7 @@
             // 
             this.colourpallet103.BackColor = System.Drawing.Color.Black;
             this.colourpallet103.Location = new System.Drawing.Point(2, 55);
-            this.colourpallet103.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet103.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet103.Name = "colourpallet103";
             this.colourpallet103.Size = new System.Drawing.Size(12, 8);
             this.colourpallet103.TabIndex = 117;
@@ -1770,7 +1770,7 @@
             // 
             this.colourpallet104.BackColor = System.Drawing.Color.Black;
             this.colourpallet104.Location = new System.Drawing.Point(15, 55);
-            this.colourpallet104.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet104.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet104.Name = "colourpallet104";
             this.colourpallet104.Size = new System.Drawing.Size(12, 8);
             this.colourpallet104.TabIndex = 112;
@@ -1780,7 +1780,7 @@
             // 
             this.colourpallet105.BackColor = System.Drawing.Color.Black;
             this.colourpallet105.Location = new System.Drawing.Point(28, 55);
-            this.colourpallet105.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet105.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet105.Name = "colourpallet105";
             this.colourpallet105.Size = new System.Drawing.Size(12, 8);
             this.colourpallet105.TabIndex = 109;
@@ -1790,7 +1790,7 @@
             // 
             this.colourpallet106.BackColor = System.Drawing.Color.Black;
             this.colourpallet106.Location = new System.Drawing.Point(41, 55);
-            this.colourpallet106.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet106.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet106.Name = "colourpallet106";
             this.colourpallet106.Size = new System.Drawing.Size(12, 8);
             this.colourpallet106.TabIndex = 103;
@@ -1800,7 +1800,7 @@
             // 
             this.colourpallet107.BackColor = System.Drawing.Color.Black;
             this.colourpallet107.Location = new System.Drawing.Point(54, 55);
-            this.colourpallet107.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet107.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet107.Name = "colourpallet107";
             this.colourpallet107.Size = new System.Drawing.Size(12, 8);
             this.colourpallet107.TabIndex = 102;
@@ -1810,7 +1810,7 @@
             // 
             this.colourpallet108.BackColor = System.Drawing.Color.Black;
             this.colourpallet108.Location = new System.Drawing.Point(67, 55);
-            this.colourpallet108.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet108.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet108.Name = "colourpallet108";
             this.colourpallet108.Size = new System.Drawing.Size(12, 8);
             this.colourpallet108.TabIndex = 106;
@@ -1820,7 +1820,7 @@
             // 
             this.colourpallet109.BackColor = System.Drawing.Color.Black;
             this.colourpallet109.Location = new System.Drawing.Point(80, 55);
-            this.colourpallet109.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet109.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet109.Name = "colourpallet109";
             this.colourpallet109.Size = new System.Drawing.Size(12, 8);
             this.colourpallet109.TabIndex = 98;
@@ -1830,7 +1830,7 @@
             // 
             this.colourpallet110.BackColor = System.Drawing.Color.Black;
             this.colourpallet110.Location = new System.Drawing.Point(93, 55);
-            this.colourpallet110.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet110.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet110.Name = "colourpallet110";
             this.colourpallet110.Size = new System.Drawing.Size(12, 8);
             this.colourpallet110.TabIndex = 99;
@@ -1840,7 +1840,7 @@
             // 
             this.colourpallet111.BackColor = System.Drawing.Color.Black;
             this.colourpallet111.Location = new System.Drawing.Point(106, 55);
-            this.colourpallet111.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet111.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet111.Name = "colourpallet111";
             this.colourpallet111.Size = new System.Drawing.Size(12, 8);
             this.colourpallet111.TabIndex = 108;
@@ -1850,7 +1850,7 @@
             // 
             this.colourpallet112.BackColor = System.Drawing.Color.Black;
             this.colourpallet112.Location = new System.Drawing.Point(119, 55);
-            this.colourpallet112.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet112.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet112.Name = "colourpallet112";
             this.colourpallet112.Size = new System.Drawing.Size(12, 8);
             this.colourpallet112.TabIndex = 96;
@@ -1860,7 +1860,7 @@
             // 
             this.colourpallet113.BackColor = System.Drawing.Color.Black;
             this.colourpallet113.Location = new System.Drawing.Point(132, 55);
-            this.colourpallet113.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet113.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet113.Name = "colourpallet113";
             this.colourpallet113.Size = new System.Drawing.Size(12, 8);
             this.colourpallet113.TabIndex = 116;
@@ -1870,7 +1870,7 @@
             // 
             this.colourpallet114.BackColor = System.Drawing.Color.Black;
             this.colourpallet114.Location = new System.Drawing.Point(145, 55);
-            this.colourpallet114.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet114.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet114.Name = "colourpallet114";
             this.colourpallet114.Size = new System.Drawing.Size(12, 8);
             this.colourpallet114.TabIndex = 104;
@@ -1880,7 +1880,7 @@
             // 
             this.colourpallet115.BackColor = System.Drawing.Color.Black;
             this.colourpallet115.Location = new System.Drawing.Point(158, 55);
-            this.colourpallet115.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet115.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet115.Name = "colourpallet115";
             this.colourpallet115.Size = new System.Drawing.Size(12, 8);
             this.colourpallet115.TabIndex = 107;
@@ -1890,7 +1890,7 @@
             // 
             this.colourpallet116.BackColor = System.Drawing.Color.Black;
             this.colourpallet116.Location = new System.Drawing.Point(171, 55);
-            this.colourpallet116.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet116.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet116.Name = "colourpallet116";
             this.colourpallet116.Size = new System.Drawing.Size(12, 8);
             this.colourpallet116.TabIndex = 97;
@@ -1900,7 +1900,7 @@
             // 
             this.colourpallet117.BackColor = System.Drawing.Color.Black;
             this.colourpallet117.Location = new System.Drawing.Point(184, 55);
-            this.colourpallet117.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet117.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet117.Name = "colourpallet117";
             this.colourpallet117.Size = new System.Drawing.Size(12, 8);
             this.colourpallet117.TabIndex = 92;
@@ -1910,7 +1910,7 @@
             // 
             this.colourpallet118.BackColor = System.Drawing.Color.Black;
             this.colourpallet118.Location = new System.Drawing.Point(197, 55);
-            this.colourpallet118.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet118.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet118.Name = "colourpallet118";
             this.colourpallet118.Size = new System.Drawing.Size(12, 8);
             this.colourpallet118.TabIndex = 120;
@@ -1920,7 +1920,7 @@
             // 
             this.colourpallet119.BackColor = System.Drawing.Color.Black;
             this.colourpallet119.Location = new System.Drawing.Point(210, 55);
-            this.colourpallet119.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet119.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet119.Name = "colourpallet119";
             this.colourpallet119.Size = new System.Drawing.Size(12, 8);
             this.colourpallet119.TabIndex = 100;
@@ -1930,7 +1930,7 @@
             // 
             this.colourpallet120.BackColor = System.Drawing.Color.Black;
             this.colourpallet120.Location = new System.Drawing.Point(2, 64);
-            this.colourpallet120.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet120.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet120.Name = "colourpallet120";
             this.colourpallet120.Size = new System.Drawing.Size(12, 8);
             this.colourpallet120.TabIndex = 115;
@@ -1940,7 +1940,7 @@
             // 
             this.colourpallet121.BackColor = System.Drawing.Color.Black;
             this.colourpallet121.Location = new System.Drawing.Point(15, 64);
-            this.colourpallet121.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet121.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet121.Name = "colourpallet121";
             this.colourpallet121.Size = new System.Drawing.Size(12, 8);
             this.colourpallet121.TabIndex = 91;
@@ -1950,7 +1950,7 @@
             // 
             this.colourpallet122.BackColor = System.Drawing.Color.Black;
             this.colourpallet122.Location = new System.Drawing.Point(28, 64);
-            this.colourpallet122.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet122.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet122.Name = "colourpallet122";
             this.colourpallet122.Size = new System.Drawing.Size(12, 8);
             this.colourpallet122.TabIndex = 113;
@@ -1960,7 +1960,7 @@
             // 
             this.colourpallet123.BackColor = System.Drawing.Color.Black;
             this.colourpallet123.Location = new System.Drawing.Point(41, 64);
-            this.colourpallet123.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet123.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet123.Name = "colourpallet123";
             this.colourpallet123.Size = new System.Drawing.Size(12, 8);
             this.colourpallet123.TabIndex = 95;
@@ -1970,7 +1970,7 @@
             // 
             this.colourpallet124.BackColor = System.Drawing.Color.Black;
             this.colourpallet124.Location = new System.Drawing.Point(54, 64);
-            this.colourpallet124.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet124.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet124.Name = "colourpallet124";
             this.colourpallet124.Size = new System.Drawing.Size(12, 8);
             this.colourpallet124.TabIndex = 105;
@@ -1980,7 +1980,7 @@
             // 
             this.colourpallet125.BackColor = System.Drawing.Color.Black;
             this.colourpallet125.Location = new System.Drawing.Point(67, 64);
-            this.colourpallet125.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet125.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet125.Name = "colourpallet125";
             this.colourpallet125.Size = new System.Drawing.Size(12, 8);
             this.colourpallet125.TabIndex = 119;
@@ -1990,7 +1990,7 @@
             // 
             this.colourpallet126.BackColor = System.Drawing.Color.Black;
             this.colourpallet126.Location = new System.Drawing.Point(80, 64);
-            this.colourpallet126.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet126.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet126.Name = "colourpallet126";
             this.colourpallet126.Size = new System.Drawing.Size(12, 8);
             this.colourpallet126.TabIndex = 90;
@@ -2000,7 +2000,7 @@
             // 
             this.colourpallet127.BackColor = System.Drawing.Color.Black;
             this.colourpallet127.Location = new System.Drawing.Point(93, 64);
-            this.colourpallet127.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet127.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet127.Name = "colourpallet127";
             this.colourpallet127.Size = new System.Drawing.Size(12, 8);
             this.colourpallet127.TabIndex = 114;
@@ -2010,7 +2010,7 @@
             // 
             this.colourpallet128.BackColor = System.Drawing.Color.Black;
             this.colourpallet128.Location = new System.Drawing.Point(106, 64);
-            this.colourpallet128.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1);
+            this.colourpallet128.Margin = new ShiftUI.Padding(1, 0, 0, 1);
             this.colourpallet128.Name = "colourpallet128";
             this.colourpallet128.Size = new System.Drawing.Size(12, 8);
             this.colourpallet128.TabIndex = 118;
@@ -2018,8 +2018,8 @@
             // 
             // Label4
             // 
-            this.Label4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.Label4.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.Label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.Label4.Location = new System.Drawing.Point(11, 2);
             this.Label4.Name = "Label4";
@@ -2031,7 +2031,7 @@
             // line6
             // 
             this.line6.BackColor = System.Drawing.Color.Black;
-            this.line6.Dock = System.Windows.Forms.DockStyle.Top;
+            this.line6.Dock = ShiftUI.DockStyle.Top;
             this.line6.Location = new System.Drawing.Point(0, 0);
             this.line6.Name = "line6";
             this.line6.Size = new System.Drawing.Size(225, 1);
@@ -2039,21 +2039,21 @@
             // 
             // pnltoolproperties
             // 
-            this.pnltoolproperties.Controls.Add(this.pnlpixelplacersettings);
-            this.pnltoolproperties.Controls.Add(this.pnlovaltoolsettings);
-            this.pnltoolproperties.Controls.Add(this.pnleracertoolsettings);
-            this.pnltoolproperties.Controls.Add(this.pnllinetoolsettings);
-            this.pnltoolproperties.Controls.Add(this.pnlpaintbrushtoolsettings);
-            this.pnltoolproperties.Controls.Add(this.pnltexttoolsettings);
-            this.pnltoolproperties.Controls.Add(this.pnlpixelsettersettings);
-            this.pnltoolproperties.Controls.Add(this.pnlmagnifiersettings);
-            this.pnltoolproperties.Controls.Add(this.pnlfloodfillsettings);
-            this.pnltoolproperties.Controls.Add(this.pnlsquaretoolsettings);
-            this.pnltoolproperties.Controls.Add(this.pnlpencilsettings);
-            this.pnltoolproperties.Controls.Add(this.Label6);
-            this.pnltoolproperties.Controls.Add(this.Label5);
-            this.pnltoolproperties.Controls.Add(this.line5);
-            this.pnltoolproperties.Controls.Add(this.line3);
+            this.pnltoolproperties.Widgets.Add(this.pnlpixelplacersettings);
+            this.pnltoolproperties.Widgets.Add(this.pnlovaltoolsettings);
+            this.pnltoolproperties.Widgets.Add(this.pnleracertoolsettings);
+            this.pnltoolproperties.Widgets.Add(this.pnllinetoolsettings);
+            this.pnltoolproperties.Widgets.Add(this.pnlpaintbrushtoolsettings);
+            this.pnltoolproperties.Widgets.Add(this.pnltexttoolsettings);
+            this.pnltoolproperties.Widgets.Add(this.pnlpixelsettersettings);
+            this.pnltoolproperties.Widgets.Add(this.pnlmagnifiersettings);
+            this.pnltoolproperties.Widgets.Add(this.pnlfloodfillsettings);
+            this.pnltoolproperties.Widgets.Add(this.pnlsquaretoolsettings);
+            this.pnltoolproperties.Widgets.Add(this.pnlpencilsettings);
+            this.pnltoolproperties.Widgets.Add(this.Label6);
+            this.pnltoolproperties.Widgets.Add(this.Label5);
+            this.pnltoolproperties.Widgets.Add(this.line5);
+            this.pnltoolproperties.Widgets.Add(this.line3);
             this.pnltoolproperties.Location = new System.Drawing.Point(0, 0);
             this.pnltoolproperties.Name = "pnltoolproperties";
             this.pnltoolproperties.Size = new System.Drawing.Size(457, 100);
@@ -2061,13 +2061,13 @@
             // 
             // pnlovaltoolsettings
             // 
-            this.pnlovaltoolsettings.Controls.Add(this.Label20);
-            this.pnlovaltoolsettings.Controls.Add(this.btnovalfillonoff);
-            this.pnlovaltoolsettings.Controls.Add(this.pnlovalfillcolour);
-            this.pnlovaltoolsettings.Controls.Add(this.txtovalborderwidth);
-            this.pnlovaltoolsettings.Controls.Add(this.Label21);
-            this.pnlovaltoolsettings.Controls.Add(this.Label22);
-            this.pnlovaltoolsettings.Controls.Add(this.Label23);
+            this.pnlovaltoolsettings.Widgets.Add(this.Label20);
+            this.pnlovaltoolsettings.Widgets.Add(this.btnovalfillonoff);
+            this.pnlovaltoolsettings.Widgets.Add(this.pnlovalfillcolour);
+            this.pnlovaltoolsettings.Widgets.Add(this.txtovalborderwidth);
+            this.pnlovaltoolsettings.Widgets.Add(this.Label21);
+            this.pnlovaltoolsettings.Widgets.Add(this.Label22);
+            this.pnlovaltoolsettings.Widgets.Add(this.Label23);
             this.pnlovaltoolsettings.Location = new System.Drawing.Point(0, 1);
             this.pnlovaltoolsettings.Name = "pnlovaltoolsettings";
             this.pnlovaltoolsettings.Size = new System.Drawing.Size(459, 96);
@@ -2088,7 +2088,7 @@
             // btnovalfillonoff
             // 
             this.btnovalfillonoff.FlatAppearance.BorderColor = System.Drawing.Color.Black;
-            this.btnovalfillonoff.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnovalfillonoff.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnovalfillonoff.Location = new System.Drawing.Point(150, 64);
             this.btnovalfillonoff.Name = "btnovalfillonoff";
             this.btnovalfillonoff.Size = new System.Drawing.Size(56, 28);
@@ -2099,7 +2099,7 @@
             // 
             // pnlovalfillcolour
             // 
-            this.pnlovalfillcolour.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlovalfillcolour.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlovalfillcolour.Location = new System.Drawing.Point(109, 64);
             this.pnlovalfillcolour.Name = "pnlovalfillcolour";
             this.pnlovalfillcolour.Size = new System.Drawing.Size(34, 28);
@@ -2109,7 +2109,7 @@
             // txtovalborderwidth
             // 
             this.txtovalborderwidth.BackColor = System.Drawing.Color.White;
-            this.txtovalborderwidth.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtovalborderwidth.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtovalborderwidth.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtovalborderwidth.ForeColor = System.Drawing.Color.Black;
             this.txtovalborderwidth.Location = new System.Drawing.Point(133, 33);
@@ -2150,13 +2150,13 @@
             // 
             // pnleracertoolsettings
             // 
-            this.pnleracertoolsettings.Controls.Add(this.Label28);
-            this.pnleracertoolsettings.Controls.Add(this.btneracersquare);
-            this.pnleracertoolsettings.Controls.Add(this.btneracercircle);
-            this.pnleracertoolsettings.Controls.Add(this.Label24);
-            this.pnleracertoolsettings.Controls.Add(this.txteracersize);
-            this.pnleracertoolsettings.Controls.Add(this.Label26);
-            this.pnleracertoolsettings.Controls.Add(this.Label27);
+            this.pnleracertoolsettings.Widgets.Add(this.Label28);
+            this.pnleracertoolsettings.Widgets.Add(this.btneracersquare);
+            this.pnleracertoolsettings.Widgets.Add(this.btneracercircle);
+            this.pnleracertoolsettings.Widgets.Add(this.Label24);
+            this.pnleracertoolsettings.Widgets.Add(this.txteracersize);
+            this.pnleracertoolsettings.Widgets.Add(this.Label26);
+            this.pnleracertoolsettings.Widgets.Add(this.Label27);
             this.pnleracertoolsettings.Location = new System.Drawing.Point(0, 1);
             this.pnleracertoolsettings.Name = "pnleracertoolsettings";
             this.pnleracertoolsettings.Size = new System.Drawing.Size(459, 96);
@@ -2177,10 +2177,10 @@
             // 
             this.btneracersquare.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadsquarerubberselected;
             this.btneracersquare.FlatAppearance.BorderSize = 0;
-            this.btneracersquare.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btneracersquare.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btneracersquare.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btneracersquare.Location = new System.Drawing.Point(75, 21);
-            this.btneracersquare.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0);
+            this.btneracersquare.Margin = new ShiftUI.Padding(6, 6, 0, 0);
             this.btneracersquare.Name = "btneracersquare";
             this.btneracersquare.Size = new System.Drawing.Size(60, 50);
             this.btneracersquare.TabIndex = 17;
@@ -2192,10 +2192,10 @@
             // 
             this.btneracercircle.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadcirclerubber;
             this.btneracercircle.FlatAppearance.BorderSize = 0;
-            this.btneracercircle.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btneracercircle.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btneracercircle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btneracercircle.Location = new System.Drawing.Point(9, 21);
-            this.btneracercircle.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0);
+            this.btneracercircle.Margin = new ShiftUI.Padding(6, 6, 0, 0);
             this.btneracercircle.Name = "btneracercircle";
             this.btneracercircle.Size = new System.Drawing.Size(60, 50);
             this.btneracercircle.TabIndex = 16;
@@ -2216,7 +2216,7 @@
             // txteracersize
             // 
             this.txteracersize.BackColor = System.Drawing.Color.White;
-            this.txteracersize.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txteracersize.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txteracersize.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txteracersize.ForeColor = System.Drawing.Color.Black;
             this.txteracersize.Location = new System.Drawing.Point(198, 70);
@@ -2247,10 +2247,10 @@
             // 
             // pnllinetoolsettings
             // 
-            this.pnllinetoolsettings.Controls.Add(this.Label29);
-            this.pnllinetoolsettings.Controls.Add(this.txtlinewidth);
-            this.pnllinetoolsettings.Controls.Add(this.Label30);
-            this.pnllinetoolsettings.Controls.Add(this.Label31);
+            this.pnllinetoolsettings.Widgets.Add(this.Label29);
+            this.pnllinetoolsettings.Widgets.Add(this.txtlinewidth);
+            this.pnllinetoolsettings.Widgets.Add(this.Label30);
+            this.pnllinetoolsettings.Widgets.Add(this.Label31);
             this.pnllinetoolsettings.Location = new System.Drawing.Point(168, 32);
             this.pnllinetoolsettings.Name = "pnllinetoolsettings";
             this.pnllinetoolsettings.Size = new System.Drawing.Size(60, 28);
@@ -2269,7 +2269,7 @@
             // txtlinewidth
             // 
             this.txtlinewidth.BackColor = System.Drawing.Color.White;
-            this.txtlinewidth.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtlinewidth.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtlinewidth.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtlinewidth.ForeColor = System.Drawing.Color.Black;
             this.txtlinewidth.Location = new System.Drawing.Point(114, 33);
@@ -2300,13 +2300,13 @@
             // 
             // pnlpaintbrushtoolsettings
             // 
-            this.pnlpaintbrushtoolsettings.Controls.Add(this.Label36);
-            this.pnlpaintbrushtoolsettings.Controls.Add(this.btnpaintsquareshape);
-            this.pnlpaintbrushtoolsettings.Controls.Add(this.btnpaintcircleshape);
-            this.pnlpaintbrushtoolsettings.Controls.Add(this.Label37);
-            this.pnlpaintbrushtoolsettings.Controls.Add(this.txtpaintbrushsize);
-            this.pnlpaintbrushtoolsettings.Controls.Add(this.Label38);
-            this.pnlpaintbrushtoolsettings.Controls.Add(this.Label39);
+            this.pnlpaintbrushtoolsettings.Widgets.Add(this.Label36);
+            this.pnlpaintbrushtoolsettings.Widgets.Add(this.btnpaintsquareshape);
+            this.pnlpaintbrushtoolsettings.Widgets.Add(this.btnpaintcircleshape);
+            this.pnlpaintbrushtoolsettings.Widgets.Add(this.Label37);
+            this.pnlpaintbrushtoolsettings.Widgets.Add(this.txtpaintbrushsize);
+            this.pnlpaintbrushtoolsettings.Widgets.Add(this.Label38);
+            this.pnlpaintbrushtoolsettings.Widgets.Add(this.Label39);
             this.pnlpaintbrushtoolsettings.Location = new System.Drawing.Point(0, 1);
             this.pnlpaintbrushtoolsettings.Name = "pnlpaintbrushtoolsettings";
             this.pnlpaintbrushtoolsettings.Size = new System.Drawing.Size(457, 97);
@@ -2326,12 +2326,12 @@
             // btnpaintsquareshape
             // 
             this.btnpaintsquareshape.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadsquarerubber;
-            this.btnpaintsquareshape.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.btnpaintsquareshape.BackgroundImageLayout = ShiftUI.ImageLayout.Stretch;
             this.btnpaintsquareshape.FlatAppearance.BorderSize = 0;
-            this.btnpaintsquareshape.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnpaintsquareshape.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnpaintsquareshape.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnpaintsquareshape.Location = new System.Drawing.Point(69, 27);
-            this.btnpaintsquareshape.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0);
+            this.btnpaintsquareshape.Margin = new ShiftUI.Padding(6, 6, 0, 0);
             this.btnpaintsquareshape.Name = "btnpaintsquareshape";
             this.btnpaintsquareshape.Size = new System.Drawing.Size(48, 40);
             this.btnpaintsquareshape.TabIndex = 17;
@@ -2342,12 +2342,12 @@
             // btnpaintcircleshape
             // 
             this.btnpaintcircleshape.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadcirclerubberselected;
-            this.btnpaintcircleshape.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.btnpaintcircleshape.BackgroundImageLayout = ShiftUI.ImageLayout.Stretch;
             this.btnpaintcircleshape.FlatAppearance.BorderSize = 0;
-            this.btnpaintcircleshape.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnpaintcircleshape.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnpaintcircleshape.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnpaintcircleshape.Location = new System.Drawing.Point(16, 27);
-            this.btnpaintcircleshape.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0);
+            this.btnpaintcircleshape.Margin = new ShiftUI.Padding(6, 6, 0, 0);
             this.btnpaintcircleshape.Name = "btnpaintcircleshape";
             this.btnpaintcircleshape.Size = new System.Drawing.Size(48, 40);
             this.btnpaintcircleshape.TabIndex = 16;
@@ -2368,7 +2368,7 @@
             // txtpaintbrushsize
             // 
             this.txtpaintbrushsize.BackColor = System.Drawing.Color.White;
-            this.txtpaintbrushsize.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtpaintbrushsize.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtpaintbrushsize.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtpaintbrushsize.ForeColor = System.Drawing.Color.Black;
             this.txtpaintbrushsize.Location = new System.Drawing.Point(194, 68);
@@ -2399,16 +2399,16 @@
             // 
             // pnltexttoolsettings
             // 
-            this.pnltexttoolsettings.Controls.Add(this.Label35);
-            this.pnltexttoolsettings.Controls.Add(this.combofontstyle);
-            this.pnltexttoolsettings.Controls.Add(this.txtdrawstringtext);
-            this.pnltexttoolsettings.Controls.Add(this.combodrawtextfont);
-            this.pnltexttoolsettings.Controls.Add(this.Label25);
-            this.pnltexttoolsettings.Controls.Add(this.txtdrawtextsize);
-            this.pnltexttoolsettings.Controls.Add(this.Label32);
-            this.pnltexttoolsettings.Controls.Add(this.Label33);
-            this.pnltexttoolsettings.Controls.Add(this.Label34);
-            this.pnltexttoolsettings.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pnltexttoolsettings.Widgets.Add(this.Label35);
+            this.pnltexttoolsettings.Widgets.Add(this.combofontstyle);
+            this.pnltexttoolsettings.Widgets.Add(this.txtdrawstringtext);
+            this.pnltexttoolsettings.Widgets.Add(this.combodrawtextfont);
+            this.pnltexttoolsettings.Widgets.Add(this.Label25);
+            this.pnltexttoolsettings.Widgets.Add(this.txtdrawtextsize);
+            this.pnltexttoolsettings.Widgets.Add(this.Label32);
+            this.pnltexttoolsettings.Widgets.Add(this.Label33);
+            this.pnltexttoolsettings.Widgets.Add(this.Label34);
+            this.pnltexttoolsettings.Dock = ShiftUI.DockStyle.Fill;
             this.pnltexttoolsettings.Location = new System.Drawing.Point(0, 1);
             this.pnltexttoolsettings.Name = "pnltexttoolsettings";
             this.pnltexttoolsettings.Size = new System.Drawing.Size(456, 99);
@@ -2427,7 +2427,7 @@
             // 
             // combofontstyle
             // 
-            this.combofontstyle.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.combofontstyle.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.combofontstyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.combofontstyle.FormattingEnabled = true;
             this.combofontstyle.Items.AddRange(new object[] {
@@ -2444,7 +2444,7 @@
             // 
             // txtdrawstringtext
             // 
-            this.txtdrawstringtext.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtdrawstringtext.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtdrawstringtext.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtdrawstringtext.Location = new System.Drawing.Point(265, 52);
             this.txtdrawstringtext.Multiline = true;
@@ -2456,7 +2456,7 @@
             // 
             // combodrawtextfont
             // 
-            this.combodrawtextfont.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.combodrawtextfont.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.combodrawtextfont.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.combodrawtextfont.FormattingEnabled = true;
             this.combodrawtextfont.Location = new System.Drawing.Point(64, 68);
@@ -2478,7 +2478,7 @@
             // txtdrawtextsize
             // 
             this.txtdrawtextsize.BackColor = System.Drawing.Color.White;
-            this.txtdrawtextsize.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtdrawtextsize.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtdrawtextsize.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtdrawtextsize.ForeColor = System.Drawing.Color.Black;
             this.txtdrawtextsize.Location = new System.Drawing.Point(61, 33);
@@ -2519,12 +2519,12 @@
             // 
             // pnlpixelsettersettings
             // 
-            this.pnlpixelsettersettings.Controls.Add(this.btnpixelsettersetpixel);
-            this.pnlpixelsettersettings.Controls.Add(this.txtpixelsetterycoordinate);
-            this.pnlpixelsettersettings.Controls.Add(this.txtpixelsetterxcoordinate);
-            this.pnlpixelsettersettings.Controls.Add(this.Label3);
-            this.pnlpixelsettersettings.Controls.Add(this.Label2);
-            this.pnlpixelsettersettings.Controls.Add(this.Label1);
+            this.pnlpixelsettersettings.Widgets.Add(this.btnpixelsettersetpixel);
+            this.pnlpixelsettersettings.Widgets.Add(this.txtpixelsetterycoordinate);
+            this.pnlpixelsettersettings.Widgets.Add(this.txtpixelsetterxcoordinate);
+            this.pnlpixelsettersettings.Widgets.Add(this.Label3);
+            this.pnlpixelsettersettings.Widgets.Add(this.Label2);
+            this.pnlpixelsettersettings.Widgets.Add(this.Label1);
             this.pnlpixelsettersettings.Location = new System.Drawing.Point(0, 1);
             this.pnlpixelsettersettings.Name = "pnlpixelsettersettings";
             this.pnlpixelsettersettings.Size = new System.Drawing.Size(457, 99);
@@ -2533,7 +2533,7 @@
             // 
             // btnpixelsettersetpixel
             // 
-            this.btnpixelsettersetpixel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnpixelsettersetpixel.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnpixelsettersetpixel.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnpixelsettersetpixel.Location = new System.Drawing.Point(215, 34);
             this.btnpixelsettersetpixel.Name = "btnpixelsettersetpixel";
@@ -2546,7 +2546,7 @@
             // txtpixelsetterycoordinate
             // 
             this.txtpixelsetterycoordinate.BackColor = System.Drawing.Color.White;
-            this.txtpixelsetterycoordinate.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtpixelsetterycoordinate.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtpixelsetterycoordinate.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtpixelsetterycoordinate.ForeColor = System.Drawing.Color.Black;
             this.txtpixelsetterycoordinate.Location = new System.Drawing.Point(136, 64);
@@ -2557,7 +2557,7 @@
             // txtpixelsetterxcoordinate
             // 
             this.txtpixelsetterxcoordinate.BackColor = System.Drawing.Color.White;
-            this.txtpixelsetterxcoordinate.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtpixelsetterxcoordinate.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtpixelsetterxcoordinate.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtpixelsetterxcoordinate.ForeColor = System.Drawing.Color.Black;
             this.txtpixelsetterxcoordinate.Location = new System.Drawing.Point(136, 34);
@@ -2597,10 +2597,10 @@
             // 
             // pnlmagnifiersettings
             // 
-            this.pnlmagnifiersettings.Controls.Add(this.btnzoomout);
-            this.pnlmagnifiersettings.Controls.Add(this.btnzoomin);
-            this.pnlmagnifiersettings.Controls.Add(this.lblzoomlevel);
-            this.pnlmagnifiersettings.Controls.Add(this.Label7);
+            this.pnlmagnifiersettings.Widgets.Add(this.btnzoomout);
+            this.pnlmagnifiersettings.Widgets.Add(this.btnzoomin);
+            this.pnlmagnifiersettings.Widgets.Add(this.lblzoomlevel);
+            this.pnlmagnifiersettings.Widgets.Add(this.Label7);
             this.pnlmagnifiersettings.Location = new System.Drawing.Point(78, 50);
             this.pnlmagnifiersettings.Name = "pnlmagnifiersettings";
             this.pnlmagnifiersettings.Size = new System.Drawing.Size(67, 44);
@@ -2609,7 +2609,7 @@
             // 
             // btnzoomout
             // 
-            this.btnzoomout.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnzoomout.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnzoomout.Font = new System.Drawing.Font("Microsoft Sans Serif", 27.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnzoomout.Location = new System.Drawing.Point(16, 33);
             this.btnzoomout.Name = "btnzoomout";
@@ -2621,7 +2621,7 @@
             // 
             // btnzoomin
             // 
-            this.btnzoomin.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnzoomin.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnzoomin.Font = new System.Drawing.Font("Microsoft Sans Serif", 27.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnzoomin.Location = new System.Drawing.Point(313, 33);
             this.btnzoomin.Name = "btnzoomin";
@@ -2653,8 +2653,8 @@
             // 
             // pnlfloodfillsettings
             // 
-            this.pnlfloodfillsettings.Controls.Add(this.Label12);
-            this.pnlfloodfillsettings.Controls.Add(this.Label15);
+            this.pnlfloodfillsettings.Widgets.Add(this.Label12);
+            this.pnlfloodfillsettings.Widgets.Add(this.Label15);
             this.pnlfloodfillsettings.Location = new System.Drawing.Point(162, 65);
             this.pnlfloodfillsettings.Name = "pnlfloodfillsettings";
             this.pnlfloodfillsettings.Size = new System.Drawing.Size(71, 31);
@@ -2682,13 +2682,13 @@
             // 
             // pnlsquaretoolsettings
             // 
-            this.pnlsquaretoolsettings.Controls.Add(this.Label19);
-            this.pnlsquaretoolsettings.Controls.Add(this.btnsquarefillonoff);
-            this.pnlsquaretoolsettings.Controls.Add(this.pnlsquarefillcolour);
-            this.pnlsquaretoolsettings.Controls.Add(this.txtsquareborderwidth);
-            this.pnlsquaretoolsettings.Controls.Add(this.Label16);
-            this.pnlsquaretoolsettings.Controls.Add(this.Label18);
-            this.pnlsquaretoolsettings.Controls.Add(this.Label17);
+            this.pnlsquaretoolsettings.Widgets.Add(this.Label19);
+            this.pnlsquaretoolsettings.Widgets.Add(this.btnsquarefillonoff);
+            this.pnlsquaretoolsettings.Widgets.Add(this.pnlsquarefillcolour);
+            this.pnlsquaretoolsettings.Widgets.Add(this.txtsquareborderwidth);
+            this.pnlsquaretoolsettings.Widgets.Add(this.Label16);
+            this.pnlsquaretoolsettings.Widgets.Add(this.Label18);
+            this.pnlsquaretoolsettings.Widgets.Add(this.Label17);
             this.pnlsquaretoolsettings.Location = new System.Drawing.Point(16, 39);
             this.pnlsquaretoolsettings.Name = "pnlsquaretoolsettings";
             this.pnlsquaretoolsettings.Size = new System.Drawing.Size(42, 31);
@@ -2709,7 +2709,7 @@
             // btnsquarefillonoff
             // 
             this.btnsquarefillonoff.FlatAppearance.BorderColor = System.Drawing.Color.Black;
-            this.btnsquarefillonoff.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnsquarefillonoff.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnsquarefillonoff.Location = new System.Drawing.Point(150, 64);
             this.btnsquarefillonoff.Name = "btnsquarefillonoff";
             this.btnsquarefillonoff.Size = new System.Drawing.Size(56, 28);
@@ -2720,7 +2720,7 @@
             // 
             // pnlsquarefillcolour
             // 
-            this.pnlsquarefillcolour.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlsquarefillcolour.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlsquarefillcolour.Location = new System.Drawing.Point(109, 64);
             this.pnlsquarefillcolour.Name = "pnlsquarefillcolour";
             this.pnlsquarefillcolour.Size = new System.Drawing.Size(34, 28);
@@ -2730,7 +2730,7 @@
             // txtsquareborderwidth
             // 
             this.txtsquareborderwidth.BackColor = System.Drawing.Color.White;
-            this.txtsquareborderwidth.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtsquareborderwidth.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtsquareborderwidth.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtsquareborderwidth.ForeColor = System.Drawing.Color.Black;
             this.txtsquareborderwidth.Location = new System.Drawing.Point(133, 33);
@@ -2771,9 +2771,9 @@
             // 
             // pnlpixelplacersettings
             // 
-            this.pnlpixelplacersettings.Controls.Add(this.lblpixelplacerhelp);
-            this.pnlpixelplacersettings.Controls.Add(this.btnpixelplacermovementmode);
-            this.pnlpixelplacersettings.Controls.Add(this.Label8);
+            this.pnlpixelplacersettings.Widgets.Add(this.lblpixelplacerhelp);
+            this.pnlpixelplacersettings.Widgets.Add(this.btnpixelplacermovementmode);
+            this.pnlpixelplacersettings.Widgets.Add(this.Label8);
             this.pnlpixelplacersettings.Location = new System.Drawing.Point(0, 1);
             this.pnlpixelplacersettings.Name = "pnlpixelplacersettings";
             this.pnlpixelplacersettings.Size = new System.Drawing.Size(454, 98);
@@ -2793,7 +2793,7 @@
             // 
             // btnpixelplacermovementmode
             // 
-            this.btnpixelplacermovementmode.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnpixelplacermovementmode.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnpixelplacermovementmode.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnpixelplacermovementmode.Location = new System.Drawing.Point(312, 26);
             this.btnpixelplacermovementmode.Name = "btnpixelplacermovementmode";
@@ -2815,10 +2815,10 @@
             // 
             // pnlpencilsettings
             // 
-            this.pnlpencilsettings.Controls.Add(this.btnpencilsize3);
-            this.pnlpencilsettings.Controls.Add(this.btnpencilsize2);
-            this.pnlpencilsettings.Controls.Add(this.btnpencilsize1);
-            this.pnlpencilsettings.Controls.Add(this.Label14);
+            this.pnlpencilsettings.Widgets.Add(this.btnpencilsize3);
+            this.pnlpencilsettings.Widgets.Add(this.btnpencilsize2);
+            this.pnlpencilsettings.Widgets.Add(this.btnpencilsize1);
+            this.pnlpencilsettings.Widgets.Add(this.Label14);
             this.pnlpencilsettings.Location = new System.Drawing.Point(422, 13);
             this.pnlpencilsettings.Name = "pnlpencilsettings";
             this.pnlpencilsettings.Size = new System.Drawing.Size(28, 22);
@@ -2827,7 +2827,7 @@
             // 
             // btnpencilsize3
             // 
-            this.btnpencilsize3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnpencilsize3.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnpencilsize3.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnpencilsize3.Location = new System.Drawing.Point(298, 30);
             this.btnpencilsize3.Name = "btnpencilsize3";
@@ -2839,7 +2839,7 @@
             // 
             // btnpencilsize2
             // 
-            this.btnpencilsize2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnpencilsize2.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnpencilsize2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnpencilsize2.Location = new System.Drawing.Point(165, 30);
             this.btnpencilsize2.Name = "btnpencilsize2";
@@ -2851,7 +2851,7 @@
             // 
             // btnpencilsize1
             // 
-            this.btnpencilsize1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnpencilsize1.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnpencilsize1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnpencilsize1.Location = new System.Drawing.Point(30, 30);
             this.btnpencilsize1.Name = "btnpencilsize1";
@@ -2893,7 +2893,7 @@
             // line5
             // 
             this.line5.BackColor = System.Drawing.Color.Black;
-            this.line5.Dock = System.Windows.Forms.DockStyle.Top;
+            this.line5.Dock = ShiftUI.DockStyle.Top;
             this.line5.Location = new System.Drawing.Point(0, 0);
             this.line5.Name = "line5";
             this.line5.Size = new System.Drawing.Size(456, 1);
@@ -2902,7 +2902,7 @@
             // line3
             // 
             this.line3.BackColor = System.Drawing.Color.Black;
-            this.line3.Dock = System.Windows.Forms.DockStyle.Right;
+            this.line3.Dock = ShiftUI.DockStyle.Right;
             this.line3.Location = new System.Drawing.Point(456, 0);
             this.line3.Name = "line3";
             this.line3.Size = new System.Drawing.Size(1, 100);
@@ -2911,10 +2911,10 @@
             // pnltools
             // 
             this.pnltools.BackColor = System.Drawing.Color.White;
-            this.pnltools.Controls.Add(this.pnltoolpositioner);
-            this.pnltools.Controls.Add(this.line1);
-            this.pnltools.Controls.Add(this.pnltoolpreview);
-            this.pnltools.Dock = System.Windows.Forms.DockStyle.Left;
+            this.pnltools.Widgets.Add(this.pnltoolpositioner);
+            this.pnltools.Widgets.Add(this.line1);
+            this.pnltools.Widgets.Add(this.pnltoolpreview);
+            this.pnltools.Dock = ShiftUI.DockStyle.Left;
             this.pnltools.Location = new System.Drawing.Point(0, 0);
             this.pnltools.Name = "pnltools";
             this.pnltools.Size = new System.Drawing.Size(120, 598);
@@ -2922,23 +2922,23 @@
             // 
             // pnltoolpositioner
             // 
-            this.pnltoolpositioner.Controls.Add(this.btnpixelsetter);
-            this.pnltoolpositioner.Controls.Add(this.btnpixelplacer);
-            this.pnltoolpositioner.Controls.Add(this.btnpencil);
-            this.pnltoolpositioner.Controls.Add(this.btnfloodfill);
-            this.pnltoolpositioner.Controls.Add(this.btnoval);
-            this.pnltoolpositioner.Controls.Add(this.btnsquare);
-            this.pnltoolpositioner.Controls.Add(this.btnlinetool);
-            this.pnltoolpositioner.Controls.Add(this.btnpaintbrush);
-            this.pnltoolpositioner.Controls.Add(this.btntexttool);
-            this.pnltoolpositioner.Controls.Add(this.btneracer);
-            this.pnltoolpositioner.Controls.Add(this.btnnew);
-            this.pnltoolpositioner.Controls.Add(this.btnmagnify);
-            this.pnltoolpositioner.Controls.Add(this.btnopen);
-            this.pnltoolpositioner.Controls.Add(this.btnsave);
-            this.pnltoolpositioner.Controls.Add(this.btnundo);
-            this.pnltoolpositioner.Controls.Add(this.btnredo);
-            this.pnltoolpositioner.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pnltoolpositioner.Widgets.Add(this.btnpixelsetter);
+            this.pnltoolpositioner.Widgets.Add(this.btnpixelplacer);
+            this.pnltoolpositioner.Widgets.Add(this.btnpencil);
+            this.pnltoolpositioner.Widgets.Add(this.btnfloodfill);
+            this.pnltoolpositioner.Widgets.Add(this.btnoval);
+            this.pnltoolpositioner.Widgets.Add(this.btnsquare);
+            this.pnltoolpositioner.Widgets.Add(this.btnlinetool);
+            this.pnltoolpositioner.Widgets.Add(this.btnpaintbrush);
+            this.pnltoolpositioner.Widgets.Add(this.btntexttool);
+            this.pnltoolpositioner.Widgets.Add(this.btneracer);
+            this.pnltoolpositioner.Widgets.Add(this.btnnew);
+            this.pnltoolpositioner.Widgets.Add(this.btnmagnify);
+            this.pnltoolpositioner.Widgets.Add(this.btnopen);
+            this.pnltoolpositioner.Widgets.Add(this.btnsave);
+            this.pnltoolpositioner.Widgets.Add(this.btnundo);
+            this.pnltoolpositioner.Widgets.Add(this.btnredo);
+            this.pnltoolpositioner.Dock = ShiftUI.DockStyle.Fill;
             this.pnltoolpositioner.Location = new System.Drawing.Point(0, 0);
             this.pnltoolpositioner.Name = "pnltoolpositioner";
             this.pnltoolpositioner.Size = new System.Drawing.Size(119, 498);
@@ -2947,10 +2947,10 @@
             // btnpixelsetter
             // 
             this.btnpixelsetter.FlatAppearance.BorderSize = 0;
-            this.btnpixelsetter.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnpixelsetter.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnpixelsetter.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnpixelsetter.Location = new System.Drawing.Point(6, 6);
-            this.btnpixelsetter.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0);
+            this.btnpixelsetter.Margin = new ShiftUI.Padding(6, 6, 0, 0);
             this.btnpixelsetter.Name = "btnpixelsetter";
             this.btnpixelsetter.Size = new System.Drawing.Size(50, 50);
             this.btnpixelsetter.TabIndex = 2;
@@ -2961,10 +2961,10 @@
             // 
             this.btnpixelplacer.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadpixelplacer;
             this.btnpixelplacer.FlatAppearance.BorderSize = 0;
-            this.btnpixelplacer.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnpixelplacer.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnpixelplacer.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnpixelplacer.Location = new System.Drawing.Point(62, 6);
-            this.btnpixelplacer.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0);
+            this.btnpixelplacer.Margin = new ShiftUI.Padding(6, 6, 0, 0);
             this.btnpixelplacer.Name = "btnpixelplacer";
             this.btnpixelplacer.Size = new System.Drawing.Size(50, 50);
             this.btnpixelplacer.TabIndex = 4;
@@ -2975,10 +2975,10 @@
             // 
             this.btnpencil.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadpencil;
             this.btnpencil.FlatAppearance.BorderSize = 0;
-            this.btnpencil.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnpencil.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnpencil.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnpencil.Location = new System.Drawing.Point(6, 62);
-            this.btnpencil.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0);
+            this.btnpencil.Margin = new ShiftUI.Padding(6, 6, 0, 0);
             this.btnpencil.Name = "btnpencil";
             this.btnpencil.Size = new System.Drawing.Size(50, 50);
             this.btnpencil.TabIndex = 7;
@@ -2990,10 +2990,10 @@
             // 
             this.btnfloodfill.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadfloodfill;
             this.btnfloodfill.FlatAppearance.BorderSize = 0;
-            this.btnfloodfill.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnfloodfill.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnfloodfill.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnfloodfill.Location = new System.Drawing.Point(62, 62);
-            this.btnfloodfill.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0);
+            this.btnfloodfill.Margin = new ShiftUI.Padding(6, 6, 0, 0);
             this.btnfloodfill.Name = "btnfloodfill";
             this.btnfloodfill.Size = new System.Drawing.Size(50, 50);
             this.btnfloodfill.TabIndex = 11;
@@ -3004,10 +3004,10 @@
             // 
             this.btnoval.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadOval;
             this.btnoval.FlatAppearance.BorderSize = 0;
-            this.btnoval.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnoval.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnoval.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnoval.Location = new System.Drawing.Point(6, 118);
-            this.btnoval.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0);
+            this.btnoval.Margin = new ShiftUI.Padding(6, 6, 0, 0);
             this.btnoval.Name = "btnoval";
             this.btnoval.Size = new System.Drawing.Size(50, 50);
             this.btnoval.TabIndex = 13;
@@ -3019,10 +3019,10 @@
             // 
             this.btnsquare.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadRectangle;
             this.btnsquare.FlatAppearance.BorderSize = 0;
-            this.btnsquare.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnsquare.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnsquare.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnsquare.Location = new System.Drawing.Point(62, 118);
-            this.btnsquare.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0);
+            this.btnsquare.Margin = new ShiftUI.Padding(6, 6, 0, 0);
             this.btnsquare.Name = "btnsquare";
             this.btnsquare.Size = new System.Drawing.Size(50, 50);
             this.btnsquare.TabIndex = 12;
@@ -3034,10 +3034,10 @@
             // 
             this.btnlinetool.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadlinetool;
             this.btnlinetool.FlatAppearance.BorderSize = 0;
-            this.btnlinetool.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnlinetool.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnlinetool.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnlinetool.Location = new System.Drawing.Point(6, 174);
-            this.btnlinetool.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0);
+            this.btnlinetool.Margin = new ShiftUI.Padding(6, 6, 0, 0);
             this.btnlinetool.Name = "btnlinetool";
             this.btnlinetool.Size = new System.Drawing.Size(50, 50);
             this.btnlinetool.TabIndex = 15;
@@ -3049,10 +3049,10 @@
             // 
             this.btnpaintbrush.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadpaintbrush;
             this.btnpaintbrush.FlatAppearance.BorderSize = 0;
-            this.btnpaintbrush.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnpaintbrush.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnpaintbrush.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnpaintbrush.Location = new System.Drawing.Point(62, 174);
-            this.btnpaintbrush.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0);
+            this.btnpaintbrush.Margin = new ShiftUI.Padding(6, 6, 0, 0);
             this.btnpaintbrush.Name = "btnpaintbrush";
             this.btnpaintbrush.Size = new System.Drawing.Size(50, 50);
             this.btnpaintbrush.TabIndex = 17;
@@ -3064,10 +3064,10 @@
             // 
             this.btntexttool.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadtexttool;
             this.btntexttool.FlatAppearance.BorderSize = 0;
-            this.btntexttool.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btntexttool.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btntexttool.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btntexttool.Location = new System.Drawing.Point(6, 230);
-            this.btntexttool.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0);
+            this.btntexttool.Margin = new ShiftUI.Padding(6, 6, 0, 0);
             this.btntexttool.Name = "btntexttool";
             this.btntexttool.Size = new System.Drawing.Size(50, 50);
             this.btntexttool.TabIndex = 16;
@@ -3079,10 +3079,10 @@
             // 
             this.btneracer.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPaderacer;
             this.btneracer.FlatAppearance.BorderSize = 0;
-            this.btneracer.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btneracer.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btneracer.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btneracer.Location = new System.Drawing.Point(62, 230);
-            this.btneracer.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0);
+            this.btneracer.Margin = new ShiftUI.Padding(6, 6, 0, 0);
             this.btneracer.Name = "btneracer";
             this.btneracer.Size = new System.Drawing.Size(50, 50);
             this.btneracer.TabIndex = 14;
@@ -3094,10 +3094,10 @@
             // 
             this.btnnew.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadnew;
             this.btnnew.FlatAppearance.BorderSize = 0;
-            this.btnnew.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnnew.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnnew.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnnew.Location = new System.Drawing.Point(6, 286);
-            this.btnnew.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0);
+            this.btnnew.Margin = new ShiftUI.Padding(6, 6, 0, 0);
             this.btnnew.Name = "btnnew";
             this.btnnew.Size = new System.Drawing.Size(50, 50);
             this.btnnew.TabIndex = 6;
@@ -3109,10 +3109,10 @@
             // 
             this.btnmagnify.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadmagnify;
             this.btnmagnify.FlatAppearance.BorderSize = 0;
-            this.btnmagnify.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnmagnify.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnmagnify.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnmagnify.Location = new System.Drawing.Point(62, 286);
-            this.btnmagnify.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0);
+            this.btnmagnify.Margin = new ShiftUI.Padding(6, 6, 0, 0);
             this.btnmagnify.Name = "btnmagnify";
             this.btnmagnify.Size = new System.Drawing.Size(50, 50);
             this.btnmagnify.TabIndex = 3;
@@ -3124,10 +3124,10 @@
             // 
             this.btnopen.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadopen;
             this.btnopen.FlatAppearance.BorderSize = 0;
-            this.btnopen.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnopen.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnopen.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnopen.Location = new System.Drawing.Point(6, 342);
-            this.btnopen.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0);
+            this.btnopen.Margin = new ShiftUI.Padding(6, 6, 0, 0);
             this.btnopen.Name = "btnopen";
             this.btnopen.Size = new System.Drawing.Size(50, 50);
             this.btnopen.TabIndex = 10;
@@ -3139,10 +3139,10 @@
             // 
             this.btnsave.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadsave;
             this.btnsave.FlatAppearance.BorderSize = 0;
-            this.btnsave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnsave.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnsave.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnsave.Location = new System.Drawing.Point(62, 342);
-            this.btnsave.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0);
+            this.btnsave.Margin = new ShiftUI.Padding(6, 6, 0, 0);
             this.btnsave.Name = "btnsave";
             this.btnsave.Size = new System.Drawing.Size(50, 50);
             this.btnsave.TabIndex = 5;
@@ -3154,10 +3154,10 @@
             // 
             this.btnundo.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadundo;
             this.btnundo.FlatAppearance.BorderSize = 0;
-            this.btnundo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnundo.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnundo.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnundo.Location = new System.Drawing.Point(6, 398);
-            this.btnundo.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0);
+            this.btnundo.Margin = new ShiftUI.Padding(6, 6, 0, 0);
             this.btnundo.Name = "btnundo";
             this.btnundo.Size = new System.Drawing.Size(50, 50);
             this.btnundo.TabIndex = 8;
@@ -3169,10 +3169,10 @@
             // 
             this.btnredo.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadredo;
             this.btnredo.FlatAppearance.BorderSize = 0;
-            this.btnredo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnredo.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnredo.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnredo.Location = new System.Drawing.Point(62, 398);
-            this.btnredo.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0);
+            this.btnredo.Margin = new ShiftUI.Padding(6, 6, 0, 0);
             this.btnredo.Name = "btnredo";
             this.btnredo.Size = new System.Drawing.Size(50, 50);
             this.btnredo.TabIndex = 9;
@@ -3183,7 +3183,7 @@
             // line1
             // 
             this.line1.BackColor = System.Drawing.Color.Black;
-            this.line1.Dock = System.Windows.Forms.DockStyle.Right;
+            this.line1.Dock = ShiftUI.DockStyle.Right;
             this.line1.Location = new System.Drawing.Point(119, 0);
             this.line1.Name = "line1";
             this.line1.Size = new System.Drawing.Size(1, 498);
@@ -3191,12 +3191,12 @@
             // 
             // pnltoolpreview
             // 
-            this.pnltoolpreview.Controls.Add(this.Label13);
-            this.pnltoolpreview.Controls.Add(this.picpreview);
-            this.pnltoolpreview.Controls.Add(this.lbltoolselected);
-            this.pnltoolpreview.Controls.Add(this.line4);
-            this.pnltoolpreview.Controls.Add(this.line2);
-            this.pnltoolpreview.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.pnltoolpreview.Widgets.Add(this.Label13);
+            this.pnltoolpreview.Widgets.Add(this.picpreview);
+            this.pnltoolpreview.Widgets.Add(this.lbltoolselected);
+            this.pnltoolpreview.Widgets.Add(this.line4);
+            this.pnltoolpreview.Widgets.Add(this.line2);
+            this.pnltoolpreview.Dock = ShiftUI.DockStyle.Bottom;
             this.pnltoolpreview.Location = new System.Drawing.Point(0, 498);
             this.pnltoolpreview.Name = "pnltoolpreview";
             this.pnltoolpreview.Size = new System.Drawing.Size(120, 100);
@@ -3234,7 +3234,7 @@
             // line4
             // 
             this.line4.BackColor = System.Drawing.Color.Black;
-            this.line4.Dock = System.Windows.Forms.DockStyle.Top;
+            this.line4.Dock = ShiftUI.DockStyle.Top;
             this.line4.Location = new System.Drawing.Point(0, 0);
             this.line4.Name = "line4";
             this.line4.Size = new System.Drawing.Size(119, 1);
@@ -3243,7 +3243,7 @@
             // line2
             // 
             this.line2.BackColor = System.Drawing.Color.Black;
-            this.line2.Dock = System.Windows.Forms.DockStyle.Right;
+            this.line2.Dock = ShiftUI.DockStyle.Right;
             this.line2.Location = new System.Drawing.Point(119, 0);
             this.line2.Name = "line2";
             this.line2.Size = new System.Drawing.Size(1, 100);
@@ -3276,10 +3276,10 @@
             // Artpad
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(802, 598);
-            this.Controls.Add(this.pgcontents);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Widgets.Add(this.pgcontents);
+            this.FormBorderStyle = ShiftUI.FormBorderStyle.None;
             this.MinimumSize = new System.Drawing.Size(502, 398);
             this.Name = "Artpad";
             this.Text = "ArtPad";
@@ -3322,268 +3322,268 @@
             this.ResumeLayout(false);
 
         }
-        internal System.Windows.Forms.Panel pgcontents;
-        internal System.Windows.Forms.Panel pnlbottompanel;
-        internal System.Windows.Forms.Panel pnltoolproperties;
-        internal System.Windows.Forms.Panel pnlpallet;
-        internal System.Windows.Forms.Panel line3;
-        internal System.Windows.Forms.Panel line5;
-        internal System.Windows.Forms.Panel line6;
-        internal System.Windows.Forms.Panel pnldrawingbackground;
-        internal System.Windows.Forms.PictureBox picdrawingdisplay;
-        internal System.Windows.Forms.Button btnpixelsetter;
-        internal System.Windows.Forms.Panel pnlpixelsettersettings;
-        internal System.Windows.Forms.Label Label3;
-        internal System.Windows.Forms.Label Label2;
-        internal System.Windows.Forms.Label Label1;
-        internal System.Windows.Forms.Button btnpixelsettersetpixel;
-        internal System.Windows.Forms.TextBox txtpixelsetterycoordinate;
-        internal System.Windows.Forms.TextBox txtpixelsetterxcoordinate;
-        internal System.Windows.Forms.Button btnmagnify;
-        internal System.Windows.Forms.Panel colourpallet32;
-        internal System.Windows.Forms.Panel colourpallet31;
-        internal System.Windows.Forms.Panel colourpallet30;
-        internal System.Windows.Forms.Panel colourpallet29;
-        internal System.Windows.Forms.Panel colourpallet28;
-        internal System.Windows.Forms.Panel colourpallet26;
-        internal System.Windows.Forms.Panel colourpallet25;
-        internal System.Windows.Forms.Panel colourpallet23;
-        internal System.Windows.Forms.Panel colourpallet21;
-        internal System.Windows.Forms.Panel colourpallet19;
-        internal System.Windows.Forms.Panel colourpallet8;
-        internal System.Windows.Forms.Panel colourpallet6;
-        internal System.Windows.Forms.Panel colourpallet16;
-        internal System.Windows.Forms.Panel colourpallet14;
-        internal System.Windows.Forms.Panel colourpallet7;
-        internal System.Windows.Forms.Panel colourpallet5;
-        internal System.Windows.Forms.Panel colourpallet10;
-        internal System.Windows.Forms.Panel colourpallet9;
-        internal System.Windows.Forms.Panel colourpallet11;
-        internal System.Windows.Forms.Panel colourpallet12;
-        internal System.Windows.Forms.Panel colourpallet13;
-        internal System.Windows.Forms.Panel colourpallet15;
-        internal System.Windows.Forms.Panel colourpallet4;
-        internal System.Windows.Forms.Panel colourpallet3;
-        internal System.Windows.Forms.Panel colourpallet17;
-        internal System.Windows.Forms.Panel colourpallet18;
-        internal System.Windows.Forms.Panel colourpallet20;
-        internal System.Windows.Forms.Panel colourpallet22;
-        internal System.Windows.Forms.Panel colourpallet24;
-        internal System.Windows.Forms.Panel colourpallet2;
-        internal System.Windows.Forms.Panel colourpallet27;
-        internal System.Windows.Forms.Label Label4;
-        internal System.Windows.Forms.Panel colourpallet1;
-        internal System.Windows.Forms.Panel pnlmagnifiersettings;
-        internal System.Windows.Forms.Button btnzoomin;
-        internal System.Windows.Forms.Label lblzoomlevel;
-        internal System.Windows.Forms.Label Label7;
-        internal System.Windows.Forms.Button btnzoomout;
-        internal System.Windows.Forms.Button btnpixelplacer;
-        internal System.Windows.Forms.Panel pnlpixelplacersettings;
-        internal System.Windows.Forms.Button btnpixelplacermovementmode;
-        internal System.Windows.Forms.Label Label8;
-        internal System.Windows.Forms.Label lblpixelplacerhelp;
-        internal System.Windows.Forms.Label Label6;
-        internal System.Windows.Forms.Label Label5;
-        internal System.Windows.Forms.Button btnnew;
-        internal System.Windows.Forms.FlowLayoutPanel flowcolours;
-        internal System.Windows.Forms.Button btnpencil;
-        internal System.Windows.Forms.Panel pnlpencilsettings;
-        internal System.Windows.Forms.Button btnpencilsize3;
-        internal System.Windows.Forms.Button btnpencilsize2;
-        internal System.Windows.Forms.Button btnpencilsize1;
-        internal System.Windows.Forms.Label Label14;
-        internal System.Windows.Forms.Button btnfloodfill;
-        internal System.Windows.Forms.Panel pnlfloodfillsettings;
-        internal System.Windows.Forms.Label Label12;
-        internal System.Windows.Forms.Label Label15;
-        internal System.Windows.Forms.Button btnsquare;
-        internal System.Windows.Forms.Panel pnlsquaretoolsettings;
-        internal System.Windows.Forms.TextBox txtsquareborderwidth;
-        internal System.Windows.Forms.Label Label16;
-        internal System.Windows.Forms.Label Label18;
-        internal System.Windows.Forms.Label Label17;
-        internal System.Windows.Forms.Button btnsquarefillonoff;
-        internal System.Windows.Forms.Panel pnlsquarefillcolour;
-        internal System.Windows.Forms.Label Label19;
-        internal System.Windows.Forms.Button btnoval;
-        internal System.Windows.Forms.Panel pnlovaltoolsettings;
-        internal System.Windows.Forms.Label Label20;
-        internal System.Windows.Forms.Button btnovalfillonoff;
-        internal System.Windows.Forms.Panel pnlovalfillcolour;
-        internal System.Windows.Forms.TextBox txtovalborderwidth;
-        internal System.Windows.Forms.Label Label21;
-        internal System.Windows.Forms.Label Label22;
-        internal System.Windows.Forms.Label Label23;
-        internal System.Windows.Forms.Panel pnltools;
-        internal System.Windows.Forms.FlowLayoutPanel pnltoolpositioner;
-        internal System.Windows.Forms.Panel line1;
-        internal System.Windows.Forms.Panel pnltoolpreview;
-        internal System.Windows.Forms.Label Label13;
-        internal System.Windows.Forms.PictureBox picpreview;
-        internal System.Windows.Forms.Label lbltoolselected;
-        internal System.Windows.Forms.Panel line4;
-        internal System.Windows.Forms.Panel line2;
-        internal System.Windows.Forms.Button btnopen;
-        internal System.Windows.Forms.Button btnsave;
-        internal System.Windows.Forms.Button btnundo;
-        internal System.Windows.Forms.Button btnredo;
-        internal System.Windows.Forms.Button btneracer;
-        internal System.Windows.Forms.Button btnlinetool;
-        internal System.Windows.Forms.Panel pnllinetoolsettings;
-        internal System.Windows.Forms.Label Label29;
-        internal System.Windows.Forms.TextBox txtlinewidth;
-        internal System.Windows.Forms.Label Label30;
-        internal System.Windows.Forms.Label Label31;
-        internal System.Windows.Forms.Panel pnleracertoolsettings;
-        internal System.Windows.Forms.Label Label28;
-        internal System.Windows.Forms.Button btneracersquare;
-        internal System.Windows.Forms.Button btneracercircle;
-        internal System.Windows.Forms.Label Label24;
-        internal System.Windows.Forms.TextBox txteracersize;
-        internal System.Windows.Forms.Label Label26;
-        internal System.Windows.Forms.Label Label27;
-        internal System.Windows.Forms.Button btntexttool;
-        internal System.Windows.Forms.Button btnpaintbrush;
-        internal System.Windows.Forms.Panel pnltexttoolsettings;
-        internal System.Windows.Forms.Label Label25;
-        internal System.Windows.Forms.TextBox txtdrawtextsize;
-        internal System.Windows.Forms.Label Label32;
-        internal System.Windows.Forms.Label Label33;
-        internal System.Windows.Forms.Label Label34;
-        internal System.Windows.Forms.ComboBox combodrawtextfont;
-        internal System.Windows.Forms.TextBox txtdrawstringtext;
-        internal System.Windows.Forms.ComboBox combofontstyle;
-        internal System.Windows.Forms.Label Label35;
-        internal System.Windows.Forms.Panel pnlpaintbrushtoolsettings;
-        internal System.Windows.Forms.Label Label36;
-        internal System.Windows.Forms.Button btnpaintsquareshape;
-        internal System.Windows.Forms.Button btnpaintcircleshape;
-        internal System.Windows.Forms.Label Label37;
-        internal System.Windows.Forms.TextBox txtpaintbrushsize;
-        internal System.Windows.Forms.Label Label38;
-        internal System.Windows.Forms.Label Label39;
-        internal System.Windows.Forms.Timer tmrcodepointcooldown;
-        internal System.Windows.Forms.Timer tmrshowearnedcodepoints;
-        internal System.Windows.Forms.Panel pnlpalletsize;
-        internal System.Windows.Forms.Button btnchangesizecancel;
-        internal System.Windows.Forms.Button btnsetsize;
-        internal System.Windows.Forms.TextBox txtcolorpalletheight;
-        internal System.Windows.Forms.Label Label42;
-        internal System.Windows.Forms.TextBox txtcolorpalletwidth;
-        internal System.Windows.Forms.Label Label43;
-        internal System.Windows.Forms.Panel pnlinitialcanvassettings;
-        internal System.Windows.Forms.Button btncancel;
-        internal System.Windows.Forms.Button btncreate;
-        internal System.Windows.Forms.Label Label11;
-        internal System.Windows.Forms.Label lbltotalpixels;
-        internal System.Windows.Forms.TextBox txtnewcanvasheight;
-        internal System.Windows.Forms.Label Label10;
-        internal System.Windows.Forms.TextBox txtnewcanvaswidth;
-        internal System.Windows.Forms.Label Label9;
-        internal System.Windows.Forms.Panel colourpallet33;
-        internal System.Windows.Forms.Panel colourpallet34;
-        internal System.Windows.Forms.Panel colourpallet35;
-        internal System.Windows.Forms.Panel colourpallet36;
-        internal System.Windows.Forms.Panel colourpallet37;
-        internal System.Windows.Forms.Panel colourpallet38;
-        internal System.Windows.Forms.Panel colourpallet39;
-        internal System.Windows.Forms.Panel colourpallet40;
-        internal System.Windows.Forms.Panel colourpallet41;
-        internal System.Windows.Forms.Panel colourpallet42;
-        internal System.Windows.Forms.Panel colourpallet43;
-        internal System.Windows.Forms.Panel colourpallet44;
-        internal System.Windows.Forms.Panel colourpallet45;
-        internal System.Windows.Forms.Panel colourpallet46;
-        internal System.Windows.Forms.Panel colourpallet47;
-        internal System.Windows.Forms.Panel colourpallet48;
-        internal System.Windows.Forms.Panel colourpallet49;
-        internal System.Windows.Forms.Panel colourpallet50;
-        internal System.Windows.Forms.Panel colourpallet51;
-        internal System.Windows.Forms.Panel colourpallet52;
-        internal System.Windows.Forms.Panel colourpallet53;
-        internal System.Windows.Forms.Panel colourpallet54;
-        internal System.Windows.Forms.Panel colourpallet55;
-        internal System.Windows.Forms.Panel colourpallet56;
-        internal System.Windows.Forms.Panel colourpallet57;
-        internal System.Windows.Forms.Panel colourpallet58;
-        internal System.Windows.Forms.Panel colourpallet59;
-        internal System.Windows.Forms.Panel colourpallet60;
-        internal System.Windows.Forms.Panel colourpallet61;
-        internal System.Windows.Forms.Panel colourpallet62;
-        internal System.Windows.Forms.Panel colourpallet63;
-        internal System.Windows.Forms.Panel colourpallet64;
-        internal System.Windows.Forms.Panel colourpallet65;
-        internal System.Windows.Forms.Panel colourpallet66;
-        internal System.Windows.Forms.Panel colourpallet67;
-        internal System.Windows.Forms.Panel colourpallet68;
-        internal System.Windows.Forms.Panel colourpallet69;
-        internal System.Windows.Forms.Panel colourpallet70;
-        internal System.Windows.Forms.Panel colourpallet71;
-        internal System.Windows.Forms.Panel colourpallet72;
-        internal System.Windows.Forms.Panel colourpallet73;
-        internal System.Windows.Forms.Panel colourpallet74;
-        internal System.Windows.Forms.Panel colourpallet75;
-        internal System.Windows.Forms.Panel colourpallet76;
-        internal System.Windows.Forms.Panel colourpallet77;
-        internal System.Windows.Forms.Panel colourpallet78;
-        internal System.Windows.Forms.Panel colourpallet79;
-        internal System.Windows.Forms.Panel colourpallet80;
-        internal System.Windows.Forms.Panel colourpallet81;
-        internal System.Windows.Forms.Panel colourpallet82;
-        internal System.Windows.Forms.Panel colourpallet83;
-        internal System.Windows.Forms.Panel colourpallet84;
-        internal System.Windows.Forms.Panel colourpallet85;
-        internal System.Windows.Forms.Panel colourpallet86;
-        internal System.Windows.Forms.Panel colourpallet87;
-        internal System.Windows.Forms.Panel colourpallet88;
-        internal System.Windows.Forms.Panel colourpallet89;
-        internal System.Windows.Forms.Panel colourpallet90;
-        internal System.Windows.Forms.Panel colourpallet91;
-        internal System.Windows.Forms.Panel colourpallet92;
-        internal System.Windows.Forms.Panel colourpallet93;
-        internal System.Windows.Forms.Panel colourpallet94;
-        internal System.Windows.Forms.Panel colourpallet95;
-        internal System.Windows.Forms.Panel colourpallet96;
-        internal System.Windows.Forms.Panel colourpallet97;
-        internal System.Windows.Forms.Panel colourpallet98;
-        internal System.Windows.Forms.Panel colourpallet99;
-        internal System.Windows.Forms.Panel colourpallet100;
-        internal System.Windows.Forms.Panel colourpallet101;
-        internal System.Windows.Forms.Panel colourpallet102;
-        internal System.Windows.Forms.Panel colourpallet103;
-        internal System.Windows.Forms.Panel colourpallet104;
-        internal System.Windows.Forms.Panel colourpallet105;
-        internal System.Windows.Forms.Panel colourpallet106;
-        internal System.Windows.Forms.Panel colourpallet107;
-        internal System.Windows.Forms.Panel colourpallet108;
-        internal System.Windows.Forms.Panel colourpallet109;
-        internal System.Windows.Forms.Panel colourpallet110;
-        internal System.Windows.Forms.Panel colourpallet111;
-        internal System.Windows.Forms.Panel colourpallet112;
-        internal System.Windows.Forms.Panel colourpallet113;
-        internal System.Windows.Forms.Panel colourpallet114;
-        internal System.Windows.Forms.Panel colourpallet115;
-        internal System.Windows.Forms.Panel colourpallet116;
-        internal System.Windows.Forms.Panel colourpallet117;
-        internal System.Windows.Forms.Panel colourpallet118;
-        internal System.Windows.Forms.Panel colourpallet119;
-        internal System.Windows.Forms.Panel colourpallet120;
-        internal System.Windows.Forms.Panel colourpallet121;
-        internal System.Windows.Forms.Panel colourpallet122;
-        internal System.Windows.Forms.Panel colourpallet123;
-        internal System.Windows.Forms.Panel colourpallet124;
-        internal System.Windows.Forms.Panel colourpallet125;
-        internal System.Windows.Forms.Panel colourpallet126;
-        internal System.Windows.Forms.Panel colourpallet127;
-        internal System.Windows.Forms.Panel colourpallet128;
-        internal System.Windows.Forms.TextBox txttopspace;
-        internal System.Windows.Forms.Label Label40;
-        internal System.Windows.Forms.TextBox txtsidespace;
-        internal System.Windows.Forms.Label Label41;
-        internal System.Windows.Forms.Timer pullbs;
-        internal System.Windows.Forms.Timer pullbottom;
-        internal System.Windows.Forms.Timer pullside;
-        private System.Windows.Forms.Timer tmrsetupui;
+        internal ShiftUI.Panel pgcontents;
+        internal ShiftUI.Panel pnlbottompanel;
+        internal ShiftUI.Panel pnltoolproperties;
+        internal ShiftUI.Panel pnlpallet;
+        internal ShiftUI.Panel line3;
+        internal ShiftUI.Panel line5;
+        internal ShiftUI.Panel line6;
+        internal ShiftUI.Panel pnldrawingbackground;
+        internal ShiftUI.PictureBox picdrawingdisplay;
+        internal ShiftUI.Button btnpixelsetter;
+        internal ShiftUI.Panel pnlpixelsettersettings;
+        internal ShiftUI.Label Label3;
+        internal ShiftUI.Label Label2;
+        internal ShiftUI.Label Label1;
+        internal ShiftUI.Button btnpixelsettersetpixel;
+        internal ShiftUI.TextBox txtpixelsetterycoordinate;
+        internal ShiftUI.TextBox txtpixelsetterxcoordinate;
+        internal ShiftUI.Button btnmagnify;
+        internal ShiftUI.Panel colourpallet32;
+        internal ShiftUI.Panel colourpallet31;
+        internal ShiftUI.Panel colourpallet30;
+        internal ShiftUI.Panel colourpallet29;
+        internal ShiftUI.Panel colourpallet28;
+        internal ShiftUI.Panel colourpallet26;
+        internal ShiftUI.Panel colourpallet25;
+        internal ShiftUI.Panel colourpallet23;
+        internal ShiftUI.Panel colourpallet21;
+        internal ShiftUI.Panel colourpallet19;
+        internal ShiftUI.Panel colourpallet8;
+        internal ShiftUI.Panel colourpallet6;
+        internal ShiftUI.Panel colourpallet16;
+        internal ShiftUI.Panel colourpallet14;
+        internal ShiftUI.Panel colourpallet7;
+        internal ShiftUI.Panel colourpallet5;
+        internal ShiftUI.Panel colourpallet10;
+        internal ShiftUI.Panel colourpallet9;
+        internal ShiftUI.Panel colourpallet11;
+        internal ShiftUI.Panel colourpallet12;
+        internal ShiftUI.Panel colourpallet13;
+        internal ShiftUI.Panel colourpallet15;
+        internal ShiftUI.Panel colourpallet4;
+        internal ShiftUI.Panel colourpallet3;
+        internal ShiftUI.Panel colourpallet17;
+        internal ShiftUI.Panel colourpallet18;
+        internal ShiftUI.Panel colourpallet20;
+        internal ShiftUI.Panel colourpallet22;
+        internal ShiftUI.Panel colourpallet24;
+        internal ShiftUI.Panel colourpallet2;
+        internal ShiftUI.Panel colourpallet27;
+        internal ShiftUI.Label Label4;
+        internal ShiftUI.Panel colourpallet1;
+        internal ShiftUI.Panel pnlmagnifiersettings;
+        internal ShiftUI.Button btnzoomin;
+        internal ShiftUI.Label lblzoomlevel;
+        internal ShiftUI.Label Label7;
+        internal ShiftUI.Button btnzoomout;
+        internal ShiftUI.Button btnpixelplacer;
+        internal ShiftUI.Panel pnlpixelplacersettings;
+        internal ShiftUI.Button btnpixelplacermovementmode;
+        internal ShiftUI.Label Label8;
+        internal ShiftUI.Label lblpixelplacerhelp;
+        internal ShiftUI.Label Label6;
+        internal ShiftUI.Label Label5;
+        internal ShiftUI.Button btnnew;
+        internal ShiftUI.FlowLayoutPanel flowcolours;
+        internal ShiftUI.Button btnpencil;
+        internal ShiftUI.Panel pnlpencilsettings;
+        internal ShiftUI.Button btnpencilsize3;
+        internal ShiftUI.Button btnpencilsize2;
+        internal ShiftUI.Button btnpencilsize1;
+        internal ShiftUI.Label Label14;
+        internal ShiftUI.Button btnfloodfill;
+        internal ShiftUI.Panel pnlfloodfillsettings;
+        internal ShiftUI.Label Label12;
+        internal ShiftUI.Label Label15;
+        internal ShiftUI.Button btnsquare;
+        internal ShiftUI.Panel pnlsquaretoolsettings;
+        internal ShiftUI.TextBox txtsquareborderwidth;
+        internal ShiftUI.Label Label16;
+        internal ShiftUI.Label Label18;
+        internal ShiftUI.Label Label17;
+        internal ShiftUI.Button btnsquarefillonoff;
+        internal ShiftUI.Panel pnlsquarefillcolour;
+        internal ShiftUI.Label Label19;
+        internal ShiftUI.Button btnoval;
+        internal ShiftUI.Panel pnlovaltoolsettings;
+        internal ShiftUI.Label Label20;
+        internal ShiftUI.Button btnovalfillonoff;
+        internal ShiftUI.Panel pnlovalfillcolour;
+        internal ShiftUI.TextBox txtovalborderwidth;
+        internal ShiftUI.Label Label21;
+        internal ShiftUI.Label Label22;
+        internal ShiftUI.Label Label23;
+        internal ShiftUI.Panel pnltools;
+        internal ShiftUI.FlowLayoutPanel pnltoolpositioner;
+        internal ShiftUI.Panel line1;
+        internal ShiftUI.Panel pnltoolpreview;
+        internal ShiftUI.Label Label13;
+        internal ShiftUI.PictureBox picpreview;
+        internal ShiftUI.Label lbltoolselected;
+        internal ShiftUI.Panel line4;
+        internal ShiftUI.Panel line2;
+        internal ShiftUI.Button btnopen;
+        internal ShiftUI.Button btnsave;
+        internal ShiftUI.Button btnundo;
+        internal ShiftUI.Button btnredo;
+        internal ShiftUI.Button btneracer;
+        internal ShiftUI.Button btnlinetool;
+        internal ShiftUI.Panel pnllinetoolsettings;
+        internal ShiftUI.Label Label29;
+        internal ShiftUI.TextBox txtlinewidth;
+        internal ShiftUI.Label Label30;
+        internal ShiftUI.Label Label31;
+        internal ShiftUI.Panel pnleracertoolsettings;
+        internal ShiftUI.Label Label28;
+        internal ShiftUI.Button btneracersquare;
+        internal ShiftUI.Button btneracercircle;
+        internal ShiftUI.Label Label24;
+        internal ShiftUI.TextBox txteracersize;
+        internal ShiftUI.Label Label26;
+        internal ShiftUI.Label Label27;
+        internal ShiftUI.Button btntexttool;
+        internal ShiftUI.Button btnpaintbrush;
+        internal ShiftUI.Panel pnltexttoolsettings;
+        internal ShiftUI.Label Label25;
+        internal ShiftUI.TextBox txtdrawtextsize;
+        internal ShiftUI.Label Label32;
+        internal ShiftUI.Label Label33;
+        internal ShiftUI.Label Label34;
+        internal ShiftUI.ComboBox combodrawtextfont;
+        internal ShiftUI.TextBox txtdrawstringtext;
+        internal ShiftUI.ComboBox combofontstyle;
+        internal ShiftUI.Label Label35;
+        internal ShiftUI.Panel pnlpaintbrushtoolsettings;
+        internal ShiftUI.Label Label36;
+        internal ShiftUI.Button btnpaintsquareshape;
+        internal ShiftUI.Button btnpaintcircleshape;
+        internal ShiftUI.Label Label37;
+        internal ShiftUI.TextBox txtpaintbrushsize;
+        internal ShiftUI.Label Label38;
+        internal ShiftUI.Label Label39;
+        internal ShiftUI.Timer tmrcodepointcooldown;
+        internal ShiftUI.Timer tmrshowearnedcodepoints;
+        internal ShiftUI.Panel pnlpalletsize;
+        internal ShiftUI.Button btnchangesizecancel;
+        internal ShiftUI.Button btnsetsize;
+        internal ShiftUI.TextBox txtcolorpalletheight;
+        internal ShiftUI.Label Label42;
+        internal ShiftUI.TextBox txtcolorpalletwidth;
+        internal ShiftUI.Label Label43;
+        internal ShiftUI.Panel pnlinitialcanvassettings;
+        internal ShiftUI.Button btncancel;
+        internal ShiftUI.Button btncreate;
+        internal ShiftUI.Label Label11;
+        internal ShiftUI.Label lbltotalpixels;
+        internal ShiftUI.TextBox txtnewcanvasheight;
+        internal ShiftUI.Label Label10;
+        internal ShiftUI.TextBox txtnewcanvaswidth;
+        internal ShiftUI.Label Label9;
+        internal ShiftUI.Panel colourpallet33;
+        internal ShiftUI.Panel colourpallet34;
+        internal ShiftUI.Panel colourpallet35;
+        internal ShiftUI.Panel colourpallet36;
+        internal ShiftUI.Panel colourpallet37;
+        internal ShiftUI.Panel colourpallet38;
+        internal ShiftUI.Panel colourpallet39;
+        internal ShiftUI.Panel colourpallet40;
+        internal ShiftUI.Panel colourpallet41;
+        internal ShiftUI.Panel colourpallet42;
+        internal ShiftUI.Panel colourpallet43;
+        internal ShiftUI.Panel colourpallet44;
+        internal ShiftUI.Panel colourpallet45;
+        internal ShiftUI.Panel colourpallet46;
+        internal ShiftUI.Panel colourpallet47;
+        internal ShiftUI.Panel colourpallet48;
+        internal ShiftUI.Panel colourpallet49;
+        internal ShiftUI.Panel colourpallet50;
+        internal ShiftUI.Panel colourpallet51;
+        internal ShiftUI.Panel colourpallet52;
+        internal ShiftUI.Panel colourpallet53;
+        internal ShiftUI.Panel colourpallet54;
+        internal ShiftUI.Panel colourpallet55;
+        internal ShiftUI.Panel colourpallet56;
+        internal ShiftUI.Panel colourpallet57;
+        internal ShiftUI.Panel colourpallet58;
+        internal ShiftUI.Panel colourpallet59;
+        internal ShiftUI.Panel colourpallet60;
+        internal ShiftUI.Panel colourpallet61;
+        internal ShiftUI.Panel colourpallet62;
+        internal ShiftUI.Panel colourpallet63;
+        internal ShiftUI.Panel colourpallet64;
+        internal ShiftUI.Panel colourpallet65;
+        internal ShiftUI.Panel colourpallet66;
+        internal ShiftUI.Panel colourpallet67;
+        internal ShiftUI.Panel colourpallet68;
+        internal ShiftUI.Panel colourpallet69;
+        internal ShiftUI.Panel colourpallet70;
+        internal ShiftUI.Panel colourpallet71;
+        internal ShiftUI.Panel colourpallet72;
+        internal ShiftUI.Panel colourpallet73;
+        internal ShiftUI.Panel colourpallet74;
+        internal ShiftUI.Panel colourpallet75;
+        internal ShiftUI.Panel colourpallet76;
+        internal ShiftUI.Panel colourpallet77;
+        internal ShiftUI.Panel colourpallet78;
+        internal ShiftUI.Panel colourpallet79;
+        internal ShiftUI.Panel colourpallet80;
+        internal ShiftUI.Panel colourpallet81;
+        internal ShiftUI.Panel colourpallet82;
+        internal ShiftUI.Panel colourpallet83;
+        internal ShiftUI.Panel colourpallet84;
+        internal ShiftUI.Panel colourpallet85;
+        internal ShiftUI.Panel colourpallet86;
+        internal ShiftUI.Panel colourpallet87;
+        internal ShiftUI.Panel colourpallet88;
+        internal ShiftUI.Panel colourpallet89;
+        internal ShiftUI.Panel colourpallet90;
+        internal ShiftUI.Panel colourpallet91;
+        internal ShiftUI.Panel colourpallet92;
+        internal ShiftUI.Panel colourpallet93;
+        internal ShiftUI.Panel colourpallet94;
+        internal ShiftUI.Panel colourpallet95;
+        internal ShiftUI.Panel colourpallet96;
+        internal ShiftUI.Panel colourpallet97;
+        internal ShiftUI.Panel colourpallet98;
+        internal ShiftUI.Panel colourpallet99;
+        internal ShiftUI.Panel colourpallet100;
+        internal ShiftUI.Panel colourpallet101;
+        internal ShiftUI.Panel colourpallet102;
+        internal ShiftUI.Panel colourpallet103;
+        internal ShiftUI.Panel colourpallet104;
+        internal ShiftUI.Panel colourpallet105;
+        internal ShiftUI.Panel colourpallet106;
+        internal ShiftUI.Panel colourpallet107;
+        internal ShiftUI.Panel colourpallet108;
+        internal ShiftUI.Panel colourpallet109;
+        internal ShiftUI.Panel colourpallet110;
+        internal ShiftUI.Panel colourpallet111;
+        internal ShiftUI.Panel colourpallet112;
+        internal ShiftUI.Panel colourpallet113;
+        internal ShiftUI.Panel colourpallet114;
+        internal ShiftUI.Panel colourpallet115;
+        internal ShiftUI.Panel colourpallet116;
+        internal ShiftUI.Panel colourpallet117;
+        internal ShiftUI.Panel colourpallet118;
+        internal ShiftUI.Panel colourpallet119;
+        internal ShiftUI.Panel colourpallet120;
+        internal ShiftUI.Panel colourpallet121;
+        internal ShiftUI.Panel colourpallet122;
+        internal ShiftUI.Panel colourpallet123;
+        internal ShiftUI.Panel colourpallet124;
+        internal ShiftUI.Panel colourpallet125;
+        internal ShiftUI.Panel colourpallet126;
+        internal ShiftUI.Panel colourpallet127;
+        internal ShiftUI.Panel colourpallet128;
+        internal ShiftUI.TextBox txttopspace;
+        internal ShiftUI.Label Label40;
+        internal ShiftUI.TextBox txtsidespace;
+        internal ShiftUI.Label Label41;
+        internal ShiftUI.Timer pullbs;
+        internal ShiftUI.Timer pullbottom;
+        internal ShiftUI.Timer pullside;
+        private ShiftUI.Timer tmrsetupui;
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Apps/Artpad.cs b/source/WindowsFormsApplication1/Apps/Artpad.cs
index c393ae0..79b2653 100644
--- a/source/WindowsFormsApplication1/Apps/Artpad.cs
+++ b/source/WindowsFormsApplication1/Apps/Artpad.cs
@@ -6,7 +6,7 @@ using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 using System.Drawing.Text;
 using System.Drawing.Imaging;
 using System.Drawing.Drawing2D;
@@ -247,7 +247,7 @@ namespace ShiftOS
         #region Drawing Display
 
         // ERROR: Handles clauses are not supported in C#
-        private void picdrawingdisplay_Paint(object sender, System.Windows.Forms.PaintEventArgs e)
+        private void picdrawingdisplay_Paint(object sender, ShiftUI.PaintEventArgs e)
         {
             e.Graphics.FillRectangle(Brushes.White, 0, 0, canvaswidth * magnificationlevel, canvasheight * magnificationlevel);
             e.Graphics.InterpolationMode = InterpolationMode.NearestNeighbor;
@@ -353,7 +353,7 @@ namespace ShiftOS
 
 
         // ERROR: Handles clauses are not supported in C#
-        private void picdrawingdisplay_MouseDown(object sender, System.Windows.Forms.MouseEventArgs e)
+        private void picdrawingdisplay_MouseDown(object sender, ShiftUI.MouseEventArgs e)
         {
             undo.undoStack.Push((Image)canvasbitmap.Clone());
             undo.redoStack.Clear();
@@ -478,7 +478,7 @@ namespace ShiftOS
         }
 
         // ERROR: Handles clauses are not supported in C#
-        private void picdrawingdisplay_MouseMove(object sender, System.Windows.Forms.MouseEventArgs e)
+        private void picdrawingdisplay_MouseMove(object sender, ShiftUI.MouseEventArgs e)
         {
             Point lastpoint;
 
@@ -621,7 +621,7 @@ namespace ShiftOS
         // ERROR: Handles clauses are not supported in C#
         private void colourpallet1_MouseClick(object sender, MouseEventArgs e)
         {
-            var s = (Control)sender;
+            var s = (Widget)sender;
             if (e.Button == MouseButtons.Left)
             {
                 drawingcolour = s.BackColor;
@@ -1265,7 +1265,7 @@ namespace ShiftOS
         // ERROR: Handles clauses are not supported in C#
         private void ChangePencilSize(object sender, EventArgs e)
         {
-            var s = (Control)sender;
+            var s = (Widget)sender;
             switch (s.Name.ToString())
             {
                 case "btnpencilsize1":
@@ -1735,13 +1735,13 @@ namespace ShiftOS
             {
                 panelstoadd = 128;
             }
-            flowcolours.Controls.Clear();
+            flowcolours.Widgets.Clear();
             for(int i = 0; i < panelstoadd; i++)
             {
                 Panel pnl = new Panel();
                 pnl.BackColor = Color.Black;
                 pnl.Size = new Size(12, 8);
-                flowcolours.Controls.Add(pnl);
+                flowcolours.Widgets.Add(pnl);
                 pnl.Margin = new Padding(1, 0, 0, 1);
                 pnl.MouseClick += new MouseEventHandler(this.colourpallet1_MouseClick);
                 pnl.Show();
diff --git a/source/WindowsFormsApplication1/Apps/Artpad.resx b/source/WindowsFormsApplication1/Apps/Artpad.resx
index 4175077..8595894 100644
--- a/source/WindowsFormsApplication1/Apps/Artpad.resx
+++ b/source/WindowsFormsApplication1/Apps/Artpad.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="tmrcodepointcooldown.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
diff --git a/source/WindowsFormsApplication1/Apps/BitnoteConverter.Designer.cs b/source/WindowsFormsApplication1/Apps/BitnoteConverter.Designer.cs
index 2ad4885..11e1ddc 100644
--- a/source/WindowsFormsApplication1/Apps/BitnoteConverter.Designer.cs
+++ b/source/WindowsFormsApplication1/Apps/BitnoteConverter.Designer.cs
@@ -28,16 +28,16 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.txtcodepoints = new System.Windows.Forms.TextBox();
-            this.lbstatus = new System.Windows.Forms.Label();
-            this.btnconvert = new System.Windows.Forms.Button();
-            this.panel1 = new System.Windows.Forms.Panel();
+            this.txtcodepoints = new ShiftUI.TextBox();
+            this.lbstatus = new ShiftUI.Label();
+            this.btnconvert = new ShiftUI.Button();
+            this.panel1 = new ShiftUI.Panel();
             this.panel1.SuspendLayout();
             this.SuspendLayout();
             // 
             // txtcodepoints
             // 
-            this.txtcodepoints.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtcodepoints.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtcodepoints.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
             this.txtcodepoints.Location = new System.Drawing.Point(28, 12);
             this.txtcodepoints.Name = "txtcodepoints";
@@ -47,8 +47,8 @@
             // 
             // lbstatus
             // 
-            this.lbstatus.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.lbstatus.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.lbstatus.AutoSize = true;
             this.lbstatus.Font = new System.Drawing.Font("Microsoft Sans Serif", 13F);
             this.lbstatus.Location = new System.Drawing.Point(78, 16);
@@ -59,8 +59,8 @@
             // 
             // btnconvert
             // 
-            this.btnconvert.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.btnconvert.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnconvert.Dock = ShiftUI.DockStyle.Bottom;
+            this.btnconvert.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnconvert.Location = new System.Drawing.Point(0, 76);
             this.btnconvert.Name = "btnconvert";
             this.btnconvert.Size = new System.Drawing.Size(229, 23);
@@ -72,10 +72,10 @@
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.White;
-            this.panel1.Controls.Add(this.btnconvert);
-            this.panel1.Controls.Add(this.lbstatus);
-            this.panel1.Controls.Add(this.txtcodepoints);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel1.Widgets.Add(this.btnconvert);
+            this.panel1.Widgets.Add(this.lbstatus);
+            this.panel1.Widgets.Add(this.txtcodepoints);
+            this.panel1.Dock = ShiftUI.DockStyle.Fill;
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
             this.panel1.Size = new System.Drawing.Size(229, 99);
@@ -84,9 +84,9 @@
             // BitnoteConverter
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(229, 99);
-            this.Controls.Add(this.panel1);
+            this.Widgets.Add(this.panel1);
             this.Name = "BitnoteConverter";
             this.Text = "BitnoteConverter";
             this.Load += new System.EventHandler(this.BitnoteConverter_Load);
@@ -98,9 +98,9 @@
 
         #endregion
 
-        private System.Windows.Forms.TextBox txtcodepoints;
-        private System.Windows.Forms.Label lbstatus;
-        private System.Windows.Forms.Button btnconvert;
-        private System.Windows.Forms.Panel panel1;
+        private ShiftUI.TextBox txtcodepoints;
+        private ShiftUI.Label lbstatus;
+        private ShiftUI.Button btnconvert;
+        private ShiftUI.Panel panel1;
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Apps/BitnoteConverter.cs b/source/WindowsFormsApplication1/Apps/BitnoteConverter.cs
index d28b970..8f64415 100644
--- a/source/WindowsFormsApplication1/Apps/BitnoteConverter.cs
+++ b/source/WindowsFormsApplication1/Apps/BitnoteConverter.cs
@@ -6,7 +6,7 @@ using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
diff --git a/source/WindowsFormsApplication1/Apps/BitnoteConverter.resx b/source/WindowsFormsApplication1/Apps/BitnoteConverter.resx
index 1af7de1..ffb4fb5 100644
--- a/source/WindowsFormsApplication1/Apps/BitnoteConverter.resx
+++ b/source/WindowsFormsApplication1/Apps/BitnoteConverter.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Apps/BitnoteDigger.Designer.cs b/source/WindowsFormsApplication1/Apps/BitnoteDigger.Designer.cs
index b1fa081..e6489c9 100644
--- a/source/WindowsFormsApplication1/Apps/BitnoteDigger.Designer.cs
+++ b/source/WindowsFormsApplication1/Apps/BitnoteDigger.Designer.cs
@@ -25,28 +25,28 @@ namespace ShiftOS
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            this.pgcontents = new System.Windows.Forms.Panel();
-            this.Label10 = new System.Windows.Forms.Label();
-            this.btnsend = new System.Windows.Forms.Button();
-            this.txtsendaddress = new System.Windows.Forms.TextBox();
-            this.Label7 = new System.Windows.Forms.Label();
-            this.lbltotalbitcoinsmined = new System.Windows.Forms.Label();
-            this.Panel1 = new System.Windows.Forms.Panel();
-            this.Label6 = new System.Windows.Forms.Label();
-            this.Label8 = new System.Windows.Forms.Label();
-            this.turbomodespeed = new System.Windows.Forms.Label();
-            this.Label5 = new System.Windows.Forms.Label();
-            this.lbldiggerstatsspeed = new System.Windows.Forms.Label();
-            this.lbldiggerstatsgrade = new System.Windows.Forms.Label();
-            this.lbldiggerstatsname = new System.Windows.Forms.Label();
-            this.btnturbomode = new System.Windows.Forms.Button();
-            this.btnstop = new System.Windows.Forms.Button();
-            this.btnstart = new System.Windows.Forms.Button();
-            this.PictureBox1 = new System.Windows.Forms.PictureBox();
-            this.Label1 = new System.Windows.Forms.Label();
-            this.tmrcalcbitnotesmined = new System.Windows.Forms.Timer(this.components);
-            this.tmrturbomode = new System.Windows.Forms.Timer(this.components);
-            this.btnupgrade = new System.Windows.Forms.Button();
+            this.pgcontents = new ShiftUI.Panel();
+            this.Label10 = new ShiftUI.Label();
+            this.btnsend = new ShiftUI.Button();
+            this.txtsendaddress = new ShiftUI.TextBox();
+            this.Label7 = new ShiftUI.Label();
+            this.lbltotalbitcoinsmined = new ShiftUI.Label();
+            this.Panel1 = new ShiftUI.Panel();
+            this.Label6 = new ShiftUI.Label();
+            this.Label8 = new ShiftUI.Label();
+            this.turbomodespeed = new ShiftUI.Label();
+            this.Label5 = new ShiftUI.Label();
+            this.lbldiggerstatsspeed = new ShiftUI.Label();
+            this.lbldiggerstatsgrade = new ShiftUI.Label();
+            this.lbldiggerstatsname = new ShiftUI.Label();
+            this.btnturbomode = new ShiftUI.Button();
+            this.btnstop = new ShiftUI.Button();
+            this.btnstart = new ShiftUI.Button();
+            this.PictureBox1 = new ShiftUI.PictureBox();
+            this.Label1 = new ShiftUI.Label();
+            this.tmrcalcbitnotesmined = new ShiftUI.Timer(this.components);
+            this.tmrturbomode = new ShiftUI.Timer(this.components);
+            this.btnupgrade = new ShiftUI.Button();
             this.pgcontents.SuspendLayout();
             this.Panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).BeginInit();
@@ -55,14 +55,14 @@ namespace ShiftOS
             // pgcontents
             // 
             this.pgcontents.BackColor = System.Drawing.Color.White;
-            this.pgcontents.Controls.Add(this.Label10);
-            this.pgcontents.Controls.Add(this.btnsend);
-            this.pgcontents.Controls.Add(this.txtsendaddress);
-            this.pgcontents.Controls.Add(this.Label7);
-            this.pgcontents.Controls.Add(this.lbltotalbitcoinsmined);
-            this.pgcontents.Controls.Add(this.Panel1);
-            this.pgcontents.Controls.Add(this.Label1);
-            this.pgcontents.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pgcontents.Widgets.Add(this.Label10);
+            this.pgcontents.Widgets.Add(this.btnsend);
+            this.pgcontents.Widgets.Add(this.txtsendaddress);
+            this.pgcontents.Widgets.Add(this.Label7);
+            this.pgcontents.Widgets.Add(this.lbltotalbitcoinsmined);
+            this.pgcontents.Widgets.Add(this.Panel1);
+            this.pgcontents.Widgets.Add(this.Label1);
+            this.pgcontents.Dock = ShiftUI.DockStyle.Fill;
             this.pgcontents.Location = new System.Drawing.Point(0, 0);
             this.pgcontents.Name = "pgcontents";
             this.pgcontents.Size = new System.Drawing.Size(560, 297);
@@ -82,7 +82,7 @@ namespace ShiftOS
             // btnsend
             // 
             this.btnsend.FlatAppearance.BorderColor = System.Drawing.Color.Black;
-            this.btnsend.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnsend.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnsend.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnsend.Location = new System.Drawing.Point(472, 181);
             this.btnsend.Name = "btnsend";
@@ -95,14 +95,14 @@ namespace ShiftOS
             // txtsendaddress
             // 
             this.txtsendaddress.BackColor = System.Drawing.Color.White;
-            this.txtsendaddress.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtsendaddress.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtsendaddress.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtsendaddress.Location = new System.Drawing.Point(205, 155);
             this.txtsendaddress.Multiline = true;
             this.txtsendaddress.Name = "txtsendaddress";
             this.txtsendaddress.Size = new System.Drawing.Size(340, 21);
             this.txtsendaddress.TabIndex = 4;
-            this.txtsendaddress.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtsendaddress.TextAlign = ShiftUI.HorizontalAlignment.Center;
             // 
             // Label7
             // 
@@ -126,19 +126,19 @@ namespace ShiftOS
             // 
             // Panel1
             // 
-            this.Panel1.Controls.Add(this.btnupgrade);
-            this.Panel1.Controls.Add(this.Label6);
-            this.Panel1.Controls.Add(this.Label8);
-            this.Panel1.Controls.Add(this.turbomodespeed);
-            this.Panel1.Controls.Add(this.Label5);
-            this.Panel1.Controls.Add(this.lbldiggerstatsspeed);
-            this.Panel1.Controls.Add(this.lbldiggerstatsgrade);
-            this.Panel1.Controls.Add(this.lbldiggerstatsname);
-            this.Panel1.Controls.Add(this.btnturbomode);
-            this.Panel1.Controls.Add(this.btnstop);
-            this.Panel1.Controls.Add(this.btnstart);
-            this.Panel1.Controls.Add(this.PictureBox1);
-            this.Panel1.Dock = System.Windows.Forms.DockStyle.Left;
+            this.Panel1.Widgets.Add(this.btnupgrade);
+            this.Panel1.Widgets.Add(this.Label6);
+            this.Panel1.Widgets.Add(this.Label8);
+            this.Panel1.Widgets.Add(this.turbomodespeed);
+            this.Panel1.Widgets.Add(this.Label5);
+            this.Panel1.Widgets.Add(this.lbldiggerstatsspeed);
+            this.Panel1.Widgets.Add(this.lbldiggerstatsgrade);
+            this.Panel1.Widgets.Add(this.lbldiggerstatsname);
+            this.Panel1.Widgets.Add(this.btnturbomode);
+            this.Panel1.Widgets.Add(this.btnstop);
+            this.Panel1.Widgets.Add(this.btnstart);
+            this.Panel1.Widgets.Add(this.PictureBox1);
+            this.Panel1.Dock = ShiftUI.DockStyle.Left;
             this.Panel1.Location = new System.Drawing.Point(0, 0);
             this.Panel1.Name = "Panel1";
             this.Panel1.Size = new System.Drawing.Size(199, 297);
@@ -216,7 +216,7 @@ namespace ShiftOS
             // 
             // btnturbomode
             // 
-            this.btnturbomode.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnturbomode.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnturbomode.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnturbomode.Location = new System.Drawing.Point(6, 188);
             this.btnturbomode.Name = "btnturbomode";
@@ -228,7 +228,7 @@ namespace ShiftOS
             // 
             // btnstop
             // 
-            this.btnstop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnstop.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnstop.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnstop.Location = new System.Drawing.Point(101, 156);
             this.btnstop.Name = "btnstop";
@@ -240,7 +240,7 @@ namespace ShiftOS
             // 
             // btnstart
             // 
-            this.btnstart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnstart.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnstart.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnstart.Location = new System.Drawing.Point(6, 156);
             this.btnstart.Name = "btnstart";
@@ -253,7 +253,7 @@ namespace ShiftOS
             // PictureBox1
             // 
             this.PictureBox1.BackColor = System.Drawing.Color.Black;
-            this.PictureBox1.Dock = System.Windows.Forms.DockStyle.Right;
+            this.PictureBox1.Dock = ShiftUI.DockStyle.Right;
             this.PictureBox1.Location = new System.Drawing.Point(198, 0);
             this.PictureBox1.Name = "PictureBox1";
             this.PictureBox1.Size = new System.Drawing.Size(1, 297);
@@ -282,7 +282,7 @@ namespace ShiftOS
             // 
             // btnupgrade
             // 
-            this.btnupgrade.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnupgrade.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnupgrade.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnupgrade.Location = new System.Drawing.Point(6, 223);
             this.btnupgrade.Name = "btnupgrade";
@@ -295,10 +295,10 @@ namespace ShiftOS
             // BitnoteDigger
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(560, 297);
-            this.Controls.Add(this.pgcontents);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Widgets.Add(this.pgcontents);
+            this.FormBorderStyle = ShiftUI.FormBorderStyle.None;
             this.Name = "BitnoteDigger";
             this.Text = "Bitnote_Digger";
             this.TopMost = true;
@@ -311,27 +311,27 @@ namespace ShiftOS
             this.ResumeLayout(false);
 
         }
-        internal System.Windows.Forms.Panel pgcontents;
-        internal System.Windows.Forms.Panel Panel1;
-        internal System.Windows.Forms.PictureBox PictureBox1;
-        internal System.Windows.Forms.Label Label1;
-        internal System.Windows.Forms.Label lbltotalbitcoinsmined;
-        internal System.Windows.Forms.Button btnturbomode;
-        internal System.Windows.Forms.Button btnstop;
-        internal System.Windows.Forms.Button btnstart;
-        internal System.Windows.Forms.Label Label6;
-        internal System.Windows.Forms.Label Label8;
-        internal System.Windows.Forms.Label turbomodespeed;
-        internal System.Windows.Forms.Label Label5;
-        internal System.Windows.Forms.Label lbldiggerstatsspeed;
-        internal System.Windows.Forms.Label lbldiggerstatsgrade;
-        internal System.Windows.Forms.Label lbldiggerstatsname;
-        internal System.Windows.Forms.Label Label10;
-        internal System.Windows.Forms.Button btnsend;
-        internal System.Windows.Forms.TextBox txtsendaddress;
-        internal System.Windows.Forms.Label Label7;
-        internal System.Windows.Forms.Timer tmrcalcbitnotesmined;
-        internal System.Windows.Forms.Timer tmrturbomode;
-        internal System.Windows.Forms.Button btnupgrade;
+        internal ShiftUI.Panel pgcontents;
+        internal ShiftUI.Panel Panel1;
+        internal ShiftUI.PictureBox PictureBox1;
+        internal ShiftUI.Label Label1;
+        internal ShiftUI.Label lbltotalbitcoinsmined;
+        internal ShiftUI.Button btnturbomode;
+        internal ShiftUI.Button btnstop;
+        internal ShiftUI.Button btnstart;
+        internal ShiftUI.Label Label6;
+        internal ShiftUI.Label Label8;
+        internal ShiftUI.Label turbomodespeed;
+        internal ShiftUI.Label Label5;
+        internal ShiftUI.Label lbldiggerstatsspeed;
+        internal ShiftUI.Label lbldiggerstatsgrade;
+        internal ShiftUI.Label lbldiggerstatsname;
+        internal ShiftUI.Label Label10;
+        internal ShiftUI.Button btnsend;
+        internal ShiftUI.TextBox txtsendaddress;
+        internal ShiftUI.Label Label7;
+        internal ShiftUI.Timer tmrcalcbitnotesmined;
+        internal ShiftUI.Timer tmrturbomode;
+        internal ShiftUI.Button btnupgrade;
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Apps/BitnoteDigger.cs b/source/WindowsFormsApplication1/Apps/BitnoteDigger.cs
index df0b124..4a3fe75 100644
--- a/source/WindowsFormsApplication1/Apps/BitnoteDigger.cs
+++ b/source/WindowsFormsApplication1/Apps/BitnoteDigger.cs
@@ -6,7 +6,7 @@ using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 using System.IO;
 using Newtonsoft.Json;
 
diff --git a/source/WindowsFormsApplication1/Apps/BitnoteDigger.resx b/source/WindowsFormsApplication1/Apps/BitnoteDigger.resx
index 7beae4d..fa974dd 100644
--- a/source/WindowsFormsApplication1/Apps/BitnoteDigger.resx
+++ b/source/WindowsFormsApplication1/Apps/BitnoteDigger.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="tmrcalcbitnotesmined.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
diff --git a/source/WindowsFormsApplication1/Apps/BitnoteWallet.Designer.cs b/source/WindowsFormsApplication1/Apps/BitnoteWallet.Designer.cs
index df0b7d8..f9eb9b1 100644
--- a/source/WindowsFormsApplication1/Apps/BitnoteWallet.Designer.cs
+++ b/source/WindowsFormsApplication1/Apps/BitnoteWallet.Designer.cs
@@ -29,21 +29,21 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            this.fltopbar = new System.Windows.Forms.FlowLayoutPanel();
-            this.btnsend = new System.Windows.Forms.Button();
-            this.btnsync = new System.Windows.Forms.Button();
-            this.sendpanel = new System.Windows.Forms.Panel();
-            this.txtamount = new System.Windows.Forms.TextBox();
-            this.txtrecipient = new System.Windows.Forms.TextBox();
-            this.label2 = new System.Windows.Forms.Label();
-            this.label1 = new System.Windows.Forms.Label();
-            this.btnconfirmsend = new System.Windows.Forms.PictureBox();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.lbmybitnotes = new System.Windows.Forms.Label();
-            this.label4 = new System.Windows.Forms.Label();
-            this.txtmyaddress = new System.Windows.Forms.TextBox();
-            this.label3 = new System.Windows.Forms.Label();
-            this.tmrrefresh = new System.Windows.Forms.Timer(this.components);
+            this.fltopbar = new ShiftUI.FlowLayoutPanel();
+            this.btnsend = new ShiftUI.Button();
+            this.btnsync = new ShiftUI.Button();
+            this.sendpanel = new ShiftUI.Panel();
+            this.txtamount = new ShiftUI.TextBox();
+            this.txtrecipient = new ShiftUI.TextBox();
+            this.label2 = new ShiftUI.Label();
+            this.label1 = new ShiftUI.Label();
+            this.btnconfirmsend = new ShiftUI.PictureBox();
+            this.panel1 = new ShiftUI.Panel();
+            this.lbmybitnotes = new ShiftUI.Label();
+            this.label4 = new ShiftUI.Label();
+            this.txtmyaddress = new ShiftUI.TextBox();
+            this.label3 = new ShiftUI.Label();
+            this.tmrrefresh = new ShiftUI.Timer(this.components);
             this.fltopbar.SuspendLayout();
             this.sendpanel.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.btnconfirmsend)).BeginInit();
@@ -53,9 +53,9 @@
             // fltopbar
             // 
             this.fltopbar.BackColor = System.Drawing.Color.Gray;
-            this.fltopbar.Controls.Add(this.btnsend);
-            this.fltopbar.Controls.Add(this.btnsync);
-            this.fltopbar.Dock = System.Windows.Forms.DockStyle.Top;
+            this.fltopbar.Widgets.Add(this.btnsend);
+            this.fltopbar.Widgets.Add(this.btnsync);
+            this.fltopbar.Dock = ShiftUI.DockStyle.Top;
             this.fltopbar.ForeColor = System.Drawing.Color.White;
             this.fltopbar.Location = new System.Drawing.Point(0, 0);
             this.fltopbar.Name = "fltopbar";
@@ -64,8 +64,8 @@
             // 
             // btnsend
             // 
-            this.btnsend.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
-            this.btnsend.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnsend.BackgroundImageLayout = ShiftUI.ImageLayout.None;
+            this.btnsend.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnsend.Font = new System.Drawing.Font("Times New Roman", 8.25F);
             this.btnsend.Location = new System.Drawing.Point(3, 3);
             this.btnsend.Name = "btnsend";
@@ -77,7 +77,7 @@
             // 
             // btnsync
             // 
-            this.btnsync.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnsync.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnsync.Font = new System.Drawing.Font("Times New Roman", 8.25F);
             this.btnsync.Location = new System.Drawing.Point(84, 3);
             this.btnsync.Name = "btnsync";
@@ -89,12 +89,12 @@
             // 
             // sendpanel
             // 
-            this.sendpanel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.sendpanel.Controls.Add(this.txtamount);
-            this.sendpanel.Controls.Add(this.txtrecipient);
-            this.sendpanel.Controls.Add(this.label2);
-            this.sendpanel.Controls.Add(this.label1);
-            this.sendpanel.Controls.Add(this.btnconfirmsend);
+            this.sendpanel.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
+            this.sendpanel.Widgets.Add(this.txtamount);
+            this.sendpanel.Widgets.Add(this.txtrecipient);
+            this.sendpanel.Widgets.Add(this.label2);
+            this.sendpanel.Widgets.Add(this.label1);
+            this.sendpanel.Widgets.Add(this.btnconfirmsend);
             this.sendpanel.Location = new System.Drawing.Point(306, 143);
             this.sendpanel.Name = "sendpanel";
             this.sendpanel.Size = new System.Drawing.Size(233, 105);
@@ -141,7 +141,7 @@
             this.btnconfirmsend.Location = new System.Drawing.Point(129, 75);
             this.btnconfirmsend.Name = "btnconfirmsend";
             this.btnconfirmsend.Size = new System.Drawing.Size(101, 27);
-            this.btnconfirmsend.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
+            this.btnconfirmsend.SizeMode = ShiftUI.PictureBoxSizeMode.AutoSize;
             this.btnconfirmsend.TabIndex = 0;
             this.btnconfirmsend.TabStop = false;
             this.btnconfirmsend.Click += new System.EventHandler(this.btnconfirmsend_Click);
@@ -149,13 +149,13 @@
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.White;
-            this.panel1.Controls.Add(this.lbmybitnotes);
-            this.panel1.Controls.Add(this.label4);
-            this.panel1.Controls.Add(this.txtmyaddress);
-            this.panel1.Controls.Add(this.label3);
-            this.panel1.Controls.Add(this.fltopbar);
-            this.panel1.Controls.Add(this.sendpanel);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel1.Widgets.Add(this.lbmybitnotes);
+            this.panel1.Widgets.Add(this.label4);
+            this.panel1.Widgets.Add(this.txtmyaddress);
+            this.panel1.Widgets.Add(this.label3);
+            this.panel1.Widgets.Add(this.fltopbar);
+            this.panel1.Widgets.Add(this.sendpanel);
+            this.panel1.Dock = ShiftUI.DockStyle.Fill;
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
             this.panel1.Size = new System.Drawing.Size(551, 260);
@@ -206,9 +206,9 @@
             // BitnoteWallet
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(551, 260);
-            this.Controls.Add(this.panel1);
+            this.Widgets.Add(this.panel1);
             this.Name = "BitnoteWallet";
             this.Text = "BitnoteWallet";
             this.Load += new System.EventHandler(this.BitnoteWallet_Load);
@@ -224,20 +224,20 @@
 
         #endregion
 
-        private System.Windows.Forms.FlowLayoutPanel fltopbar;
-        private System.Windows.Forms.Button btnsend;
-        private System.Windows.Forms.Button btnsync;
-        private System.Windows.Forms.Panel sendpanel;
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.PictureBox btnconfirmsend;
-        private System.Windows.Forms.TextBox txtamount;
-        private System.Windows.Forms.TextBox txtrecipient;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Label lbmybitnotes;
-        private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.TextBox txtmyaddress;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.Timer tmrrefresh;
+        private ShiftUI.FlowLayoutPanel fltopbar;
+        private ShiftUI.Button btnsend;
+        private ShiftUI.Button btnsync;
+        private ShiftUI.Panel sendpanel;
+        private ShiftUI.Panel panel1;
+        private ShiftUI.PictureBox btnconfirmsend;
+        private ShiftUI.TextBox txtamount;
+        private ShiftUI.TextBox txtrecipient;
+        private ShiftUI.Label label2;
+        private ShiftUI.Label label1;
+        private ShiftUI.Label lbmybitnotes;
+        private ShiftUI.Label label4;
+        private ShiftUI.TextBox txtmyaddress;
+        private ShiftUI.Label label3;
+        private ShiftUI.Timer tmrrefresh;
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Apps/BitnoteWallet.cs b/source/WindowsFormsApplication1/Apps/BitnoteWallet.cs
index 6d5cb9f..7b19c70 100644
--- a/source/WindowsFormsApplication1/Apps/BitnoteWallet.cs
+++ b/source/WindowsFormsApplication1/Apps/BitnoteWallet.cs
@@ -10,7 +10,7 @@ using System.Linq;
 using System.Net;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
diff --git a/source/WindowsFormsApplication1/Apps/BitnoteWallet.resx b/source/WindowsFormsApplication1/Apps/BitnoteWallet.resx
index 09c4313..3a9814f 100644
--- a/source/WindowsFormsApplication1/Apps/BitnoteWallet.resx
+++ b/source/WindowsFormsApplication1/Apps/BitnoteWallet.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="tmrrefresh.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
diff --git a/source/WindowsFormsApplication1/Apps/Dodge.Designer.cs b/source/WindowsFormsApplication1/Apps/Dodge.Designer.cs
index 46fce33..7a6d544 100644
--- a/source/WindowsFormsApplication1/Apps/Dodge.Designer.cs
+++ b/source/WindowsFormsApplication1/Apps/Dodge.Designer.cs
@@ -25,19 +25,19 @@ namespace ShiftOS
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            this.pgcontents = new System.Windows.Forms.Panel();
-            this.player = new System.Windows.Forms.PictureBox();
-            this.QuitButton = new System.Windows.Forms.PictureBox();
-            this.BeginButton = new System.Windows.Forms.PictureBox();
-            this.DescriptionLabel = new System.Windows.Forms.Label();
-            this.object_small2 = new System.Windows.Forms.PictureBox();
-            this.object_mid2 = new System.Windows.Forms.PictureBox();
-            this.object_large = new System.Windows.Forms.PictureBox();
-            this.object_small = new System.Windows.Forms.PictureBox();
-            this.object_mid = new System.Windows.Forms.PictureBox();
-            this.scorelabel = new System.Windows.Forms.Label();
-            this.PicBonus = new System.Windows.Forms.PictureBox();
-            this.clock = new System.Windows.Forms.Timer(this.components);
+            this.pgcontents = new ShiftUI.Panel();
+            this.player = new ShiftUI.PictureBox();
+            this.QuitButton = new ShiftUI.PictureBox();
+            this.BeginButton = new ShiftUI.PictureBox();
+            this.DescriptionLabel = new ShiftUI.Label();
+            this.object_small2 = new ShiftUI.PictureBox();
+            this.object_mid2 = new ShiftUI.PictureBox();
+            this.object_large = new ShiftUI.PictureBox();
+            this.object_small = new ShiftUI.PictureBox();
+            this.object_mid = new ShiftUI.PictureBox();
+            this.scorelabel = new ShiftUI.Label();
+            this.PicBonus = new ShiftUI.PictureBox();
+            this.clock = new ShiftUI.Timer(this.components);
             this.pgcontents.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.player)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.QuitButton)).BeginInit();
@@ -53,18 +53,18 @@ namespace ShiftOS
             // pgcontents
             // 
             this.pgcontents.BackColor = System.Drawing.Color.White;
-            this.pgcontents.Controls.Add(this.player);
-            this.pgcontents.Controls.Add(this.QuitButton);
-            this.pgcontents.Controls.Add(this.BeginButton);
-            this.pgcontents.Controls.Add(this.DescriptionLabel);
-            this.pgcontents.Controls.Add(this.object_small2);
-            this.pgcontents.Controls.Add(this.object_mid2);
-            this.pgcontents.Controls.Add(this.object_large);
-            this.pgcontents.Controls.Add(this.object_small);
-            this.pgcontents.Controls.Add(this.object_mid);
-            this.pgcontents.Controls.Add(this.scorelabel);
-            this.pgcontents.Controls.Add(this.PicBonus);
-            this.pgcontents.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pgcontents.Widgets.Add(this.player);
+            this.pgcontents.Widgets.Add(this.QuitButton);
+            this.pgcontents.Widgets.Add(this.BeginButton);
+            this.pgcontents.Widgets.Add(this.DescriptionLabel);
+            this.pgcontents.Widgets.Add(this.object_small2);
+            this.pgcontents.Widgets.Add(this.object_mid2);
+            this.pgcontents.Widgets.Add(this.object_large);
+            this.pgcontents.Widgets.Add(this.object_small);
+            this.pgcontents.Widgets.Add(this.object_mid);
+            this.pgcontents.Widgets.Add(this.scorelabel);
+            this.pgcontents.Widgets.Add(this.PicBonus);
+            this.pgcontents.Dock = ShiftUI.DockStyle.Fill;
             this.pgcontents.Location = new System.Drawing.Point(0, 0);
             this.pgcontents.Name = "pgcontents";
             this.pgcontents.Size = new System.Drawing.Size(418, 478);
@@ -72,7 +72,7 @@ namespace ShiftOS
             // 
             // player
             // 
-            this.player.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
+            this.player.Anchor = ShiftUI.AnchorStyles.Bottom;
             this.player.BackColor = System.Drawing.Color.Transparent;
             this.player.Image = global::ShiftOS.Properties.Resources.player_Image;
             this.player.Location = new System.Drawing.Point(192, 445);
@@ -83,7 +83,7 @@ namespace ShiftOS
             // 
             // QuitButton
             // 
-            this.QuitButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.QuitButton.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
             this.QuitButton.Image = global::ShiftOS.Properties.Resources.QuitButton_Image;
             this.QuitButton.InitialImage = global::ShiftOS.Properties.Resources.QuitButton_Image;
             this.QuitButton.Location = new System.Drawing.Point(216, 424);
@@ -95,7 +95,7 @@ namespace ShiftOS
             // 
             // BeginButton
             // 
-            this.BeginButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.BeginButton.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left)));
             this.BeginButton.Image = global::ShiftOS.Properties.Resources.BeginButton1;
             this.BeginButton.InitialImage = global::ShiftOS.Properties.Resources.BeginButton_Image;
             this.BeginButton.Location = new System.Drawing.Point(3, 424);
@@ -188,17 +188,17 @@ namespace ShiftOS
             // Dodge
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(418, 478);
-            this.Controls.Add(this.pgcontents);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Widgets.Add(this.pgcontents);
+            this.FormBorderStyle = ShiftUI.FormBorderStyle.None;
             this.MaximizeBox = false;
             this.Name = "Dodge";
             this.Text = "Dodge";
             this.TopMost = true;
             this.Load += new System.EventHandler(this.Form1_Load);
-            this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Form1_keydown);
-            this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.Form1_KeyUp);
+            this.KeyDown += new ShiftUI.KeyEventHandler(this.Form1_keydown);
+            this.KeyUp += new ShiftUI.KeyEventHandler(this.Form1_KeyUp);
             this.pgcontents.ResumeLayout(false);
             this.pgcontents.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.player)).EndInit();
@@ -213,18 +213,18 @@ namespace ShiftOS
             this.ResumeLayout(false);
 
         }
-        internal System.Windows.Forms.Panel pgcontents;
-        internal System.Windows.Forms.PictureBox player;
-        internal System.Windows.Forms.PictureBox QuitButton;
-        internal System.Windows.Forms.PictureBox BeginButton;
-        internal System.Windows.Forms.Label DescriptionLabel;
-        internal System.Windows.Forms.PictureBox object_small2;
-        internal System.Windows.Forms.PictureBox object_mid2;
-        internal System.Windows.Forms.PictureBox object_large;
-        internal System.Windows.Forms.PictureBox object_small;
-        internal System.Windows.Forms.PictureBox object_mid;
-        internal System.Windows.Forms.Label scorelabel;
-        internal System.Windows.Forms.Timer clock;
-        internal System.Windows.Forms.PictureBox PicBonus;
+        internal ShiftUI.Panel pgcontents;
+        internal ShiftUI.PictureBox player;
+        internal ShiftUI.PictureBox QuitButton;
+        internal ShiftUI.PictureBox BeginButton;
+        internal ShiftUI.Label DescriptionLabel;
+        internal ShiftUI.PictureBox object_small2;
+        internal ShiftUI.PictureBox object_mid2;
+        internal ShiftUI.PictureBox object_large;
+        internal ShiftUI.PictureBox object_small;
+        internal ShiftUI.PictureBox object_mid;
+        internal ShiftUI.Label scorelabel;
+        internal ShiftUI.Timer clock;
+        internal ShiftUI.PictureBox PicBonus;
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Apps/Dodge.cs b/source/WindowsFormsApplication1/Apps/Dodge.cs
index 320347d..2e85d12 100644
--- a/source/WindowsFormsApplication1/Apps/Dodge.cs
+++ b/source/WindowsFormsApplication1/Apps/Dodge.cs
@@ -6,7 +6,7 @@ using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
@@ -105,7 +105,7 @@ namespace ShiftOS
             return new Random().Next(0, pgcontents.Width);
         }
 
-        public void Form1_keydown(System.Object sender, System.Windows.Forms.KeyEventArgs e)
+        public void Form1_keydown(System.Object sender, ShiftUI.KeyEventArgs e)
         {
             switch (e.KeyCode)
             {
diff --git a/source/WindowsFormsApplication1/Apps/Dodge.resx b/source/WindowsFormsApplication1/Apps/Dodge.resx
index f6e2b3b..ed6f87c 100644
--- a/source/WindowsFormsApplication1/Apps/Dodge.resx
+++ b/source/WindowsFormsApplication1/Apps/Dodge.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="clock.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
diff --git a/source/WindowsFormsApplication1/Apps/File Skimmer.Designer.cs b/source/WindowsFormsApplication1/Apps/File Skimmer.Designer.cs
index 30d41d8..3484096 100644
--- a/source/WindowsFormsApplication1/Apps/File Skimmer.Designer.cs	
+++ b/source/WindowsFormsApplication1/Apps/File Skimmer.Designer.cs	
@@ -30,20 +30,20 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(File_Skimmer));
-            this.toolStripContainer1 = new System.Windows.Forms.ToolStripContainer();
-            this.toolStrip2 = new System.Windows.Forms.ToolStrip();
-            this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
-            this.txtfilename = new System.Windows.Forms.ToolStripTextBox();
-            this.cbfiletypes = new System.Windows.Forms.ToolStripComboBox();
-            this.btnperformaction = new System.Windows.Forms.ToolStripButton();
-            this.btncancel = new System.Windows.Forms.ToolStripButton();
-            this.lvfiles = new System.Windows.Forms.ListView();
-            this.menuStrip1 = new System.Windows.Forms.MenuStrip();
-            this.newFolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.deleteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStrip1 = new System.Windows.Forms.ToolStrip();
-            this.lbcurrentfolder = new System.Windows.Forms.ToolStripLabel();
-            this.imgtypes = new System.Windows.Forms.ImageList(this.components);
+            this.toolStripContainer1 = new ShiftUI.ToolStripContainer();
+            this.toolStrip2 = new ShiftUI.ToolStrip();
+            this.toolStripLabel1 = new ShiftUI.ToolStripLabel();
+            this.txtfilename = new ShiftUI.ToolStripTextBox();
+            this.cbfiletypes = new ShiftUI.ToolStripComboBox();
+            this.btnperformaction = new ShiftUI.ToolStripButton();
+            this.btncancel = new ShiftUI.ToolStripButton();
+            this.lvfiles = new ShiftUI.ListView();
+            this.menuStrip1 = new ShiftUI.MenuStrip();
+            this.newFolderToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.deleteToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.toolStrip1 = new ShiftUI.ToolStrip();
+            this.lbcurrentfolder = new ShiftUI.ToolStripLabel();
+            this.imgtypes = new ShiftUI.ImageList(this.components);
             this.toolStripContainer1.BottomToolStripPanel.SuspendLayout();
             this.toolStripContainer1.ContentPanel.SuspendLayout();
             this.toolStripContainer1.TopToolStripPanel.SuspendLayout();
@@ -58,13 +58,13 @@
             // 
             // toolStripContainer1.BottomToolStripPanel
             // 
-            this.toolStripContainer1.BottomToolStripPanel.Controls.Add(this.toolStrip2);
+            this.toolStripContainer1.BottomToolStripPanel.Widgets.Add(this.toolStrip2);
             // 
             // toolStripContainer1.ContentPanel
             // 
-            this.toolStripContainer1.ContentPanel.Controls.Add(this.lvfiles);
+            this.toolStripContainer1.ContentPanel.Widgets.Add(this.lvfiles);
             this.toolStripContainer1.ContentPanel.Size = new System.Drawing.Size(763, 348);
-            this.toolStripContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.toolStripContainer1.Dock = ShiftUI.DockStyle.Fill;
             this.toolStripContainer1.Location = new System.Drawing.Point(0, 0);
             this.toolStripContainer1.Name = "toolStripContainer1";
             this.toolStripContainer1.Size = new System.Drawing.Size(763, 413);
@@ -73,21 +73,21 @@
             // 
             // toolStripContainer1.TopToolStripPanel
             // 
-            this.toolStripContainer1.TopToolStripPanel.Controls.Add(this.menuStrip1);
-            this.toolStripContainer1.TopToolStripPanel.Controls.Add(this.toolStrip1);
+            this.toolStripContainer1.TopToolStripPanel.Widgets.Add(this.menuStrip1);
+            this.toolStripContainer1.TopToolStripPanel.Widgets.Add(this.toolStrip1);
             // 
             // toolStrip2
             // 
             this.toolStrip2.AutoSize = false;
-            this.toolStrip2.Dock = System.Windows.Forms.DockStyle.None;
-            this.toolStrip2.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
-            this.toolStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStrip2.Dock = ShiftUI.DockStyle.None;
+            this.toolStrip2.GripStyle = ShiftUI.ToolStripGripStyle.Hidden;
+            this.toolStrip2.Items.AddRange(new ShiftUI.ToolStripItem[] {
             this.toolStripLabel1,
             this.txtfilename,
             this.cbfiletypes,
             this.btnperformaction,
             this.btncancel});
-            this.toolStrip2.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow;
+            this.toolStrip2.LayoutStyle = ShiftUI.ToolStripLayoutStyle.Flow;
             this.toolStrip2.Location = new System.Drawing.Point(0, 0);
             this.toolStrip2.Name = "toolStrip2";
             this.toolStrip2.Size = new System.Drawing.Size(763, 23);
@@ -114,7 +114,7 @@
             // 
             // btnperformaction
             // 
-            this.btnperformaction.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+            this.btnperformaction.DisplayStyle = ShiftUI.ToolStripItemDisplayStyle.Text;
             this.btnperformaction.Image = ((System.Drawing.Image)(resources.GetObject("btnperformaction.Image")));
             this.btnperformaction.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.btnperformaction.Name = "btnperformaction";
@@ -124,7 +124,7 @@
             // 
             // btncancel
             // 
-            this.btncancel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+            this.btncancel.DisplayStyle = ShiftUI.ToolStripItemDisplayStyle.Text;
             this.btncancel.Image = ((System.Drawing.Image)(resources.GetObject("btncancel.Image")));
             this.btncancel.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.btncancel.Name = "btncancel";
@@ -134,7 +134,7 @@
             // 
             // lvfiles
             // 
-            this.lvfiles.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.lvfiles.Dock = ShiftUI.DockStyle.Fill;
             this.lvfiles.Location = new System.Drawing.Point(0, 0);
             this.lvfiles.Name = "lvfiles";
             this.lvfiles.Size = new System.Drawing.Size(763, 348);
@@ -144,8 +144,8 @@
             // 
             // menuStrip1
             // 
-            this.menuStrip1.Dock = System.Windows.Forms.DockStyle.None;
-            this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.menuStrip1.Dock = ShiftUI.DockStyle.None;
+            this.menuStrip1.Items.AddRange(new ShiftUI.ToolStripItem[] {
             this.newFolderToolStripMenuItem,
             this.deleteToolStripMenuItem});
             this.menuStrip1.Location = new System.Drawing.Point(0, 0);
@@ -171,11 +171,11 @@
             // toolStrip1
             // 
             this.toolStrip1.AutoSize = false;
-            this.toolStrip1.Dock = System.Windows.Forms.DockStyle.None;
-            this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
-            this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStrip1.Dock = ShiftUI.DockStyle.None;
+            this.toolStrip1.GripStyle = ShiftUI.ToolStripGripStyle.Hidden;
+            this.toolStrip1.Items.AddRange(new ShiftUI.ToolStripItem[] {
             this.lbcurrentfolder});
-            this.toolStrip1.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Table;
+            this.toolStrip1.LayoutStyle = ShiftUI.ToolStripLayoutStyle.Table;
             this.toolStrip1.Location = new System.Drawing.Point(0, 24);
             this.toolStrip1.Name = "toolStrip1";
             this.toolStrip1.ShowItemToolTips = false;
@@ -191,21 +191,20 @@
             // 
             // imgtypes
             // 
-            this.imgtypes.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imgtypes.ImageStream")));
             this.imgtypes.TransparentColor = System.Drawing.Color.Transparent;
-            this.imgtypes.Images.SetKeyName(0, "application");
-            this.imgtypes.Images.SetKeyName(1, "package");
-            this.imgtypes.Images.SetKeyName(2, "none");
-            this.imgtypes.Images.SetKeyName(3, "doc");
-            this.imgtypes.Images.SetKeyName(4, "dir");
-            this.imgtypes.Images.SetKeyName(5, "skin");
+            //this.imgtypes.Images.SetKeyName(0, "application");
+            //this.imgtypes.Images.SetKeyName(1, "package");
+            //this.imgtypes.Images.SetKeyName(2, "none");
+            //this.imgtypes.Images.SetKeyName(3, "doc");
+            //this.imgtypes.Images.SetKeyName(4, "dir");
+            //this.imgtypes.Images.SetKeyName(5, "skin");
             // 
             // File_Skimmer
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(763, 413);
-            this.Controls.Add(this.toolStripContainer1);
+            this.Widgets.Add(this.toolStripContainer1);
             this.Name = "File_Skimmer";
             this.Text = "File_Skimmer";
             this.Load += new System.EventHandler(this.File_Skimmer_Load);
@@ -227,19 +226,19 @@
 
         #endregion
 
-        private System.Windows.Forms.ToolStripContainer toolStripContainer1;
-        private System.Windows.Forms.MenuStrip menuStrip1;
-        private System.Windows.Forms.ToolStripMenuItem newFolderToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem deleteToolStripMenuItem;
-        private System.Windows.Forms.ToolStrip toolStrip1;
-        private System.Windows.Forms.ListView lvfiles;
-        private System.Windows.Forms.ToolStripLabel lbcurrentfolder;
-        private System.Windows.Forms.ImageList imgtypes;
-        private System.Windows.Forms.ToolStrip toolStrip2;
-        private System.Windows.Forms.ToolStripLabel toolStripLabel1;
-        private System.Windows.Forms.ToolStripTextBox txtfilename;
-        private System.Windows.Forms.ToolStripComboBox cbfiletypes;
-        private System.Windows.Forms.ToolStripButton btnperformaction;
-        private System.Windows.Forms.ToolStripButton btncancel;
+        private ShiftUI.ToolStripContainer toolStripContainer1;
+        private ShiftUI.MenuStrip menuStrip1;
+        private ShiftUI.ToolStripMenuItem newFolderToolStripMenuItem;
+        private ShiftUI.ToolStripMenuItem deleteToolStripMenuItem;
+        private ShiftUI.ToolStrip toolStrip1;
+        private ShiftUI.ListView lvfiles;
+        private ShiftUI.ToolStripLabel lbcurrentfolder;
+        private ShiftUI.ImageList imgtypes;
+        private ShiftUI.ToolStrip toolStrip2;
+        private ShiftUI.ToolStripLabel toolStripLabel1;
+        private ShiftUI.ToolStripTextBox txtfilename;
+        private ShiftUI.ToolStripComboBox cbfiletypes;
+        private ShiftUI.ToolStripButton btnperformaction;
+        private ShiftUI.ToolStripButton btncancel;
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Apps/File Skimmer.cs b/source/WindowsFormsApplication1/Apps/File Skimmer.cs
index 4ee8531..56295f2 100644
--- a/source/WindowsFormsApplication1/Apps/File Skimmer.cs	
+++ b/source/WindowsFormsApplication1/Apps/File Skimmer.cs	
@@ -7,7 +7,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
diff --git a/source/WindowsFormsApplication1/Apps/File Skimmer.resx b/source/WindowsFormsApplication1/Apps/File Skimmer.resx
index 2d817a4..68481ca 100644
--- a/source/WindowsFormsApplication1/Apps/File Skimmer.resx	
+++ b/source/WindowsFormsApplication1/Apps/File Skimmer.resx	
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="toolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>339, 17</value>
diff --git a/source/WindowsFormsApplication1/Apps/HoloChat.Designer.cs b/source/WindowsFormsApplication1/Apps/HoloChat.Designer.cs
index 6f040ec..f141556 100644
--- a/source/WindowsFormsApplication1/Apps/HoloChat.Designer.cs
+++ b/source/WindowsFormsApplication1/Apps/HoloChat.Designer.cs
@@ -30,21 +30,21 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HoloChat));
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.pnlintro = new System.Windows.Forms.Panel();
-            this.flintrobuttons = new System.Windows.Forms.FlowLayoutPanel();
-            this.btnconnect = new System.Windows.Forms.Button();
-            this.btnrefresh = new System.Windows.Forms.Button();
-            this.lbrooms = new System.Windows.Forms.ListBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.lblintro = new System.Windows.Forms.Label();
-            this.lblheader = new System.Windows.Forms.Label();
-            this.txtchat = new System.Windows.Forms.RichTextBox();
-            this.txtsend = new System.Windows.Forms.TextBox();
-            this.pnlusers = new System.Windows.Forms.Panel();
-            this.lbusers = new System.Windows.Forms.ListBox();
-            this.lbtopic = new System.Windows.Forms.Label();
-            this.tmrui = new System.Windows.Forms.Timer(this.components);
+            this.panel1 = new ShiftUI.Panel();
+            this.pnlintro = new ShiftUI.Panel();
+            this.flintrobuttons = new ShiftUI.FlowLayoutPanel();
+            this.btnconnect = new ShiftUI.Button();
+            this.btnrefresh = new ShiftUI.Button();
+            this.lbrooms = new ShiftUI.ListBox();
+            this.label1 = new ShiftUI.Label();
+            this.lblintro = new ShiftUI.Label();
+            this.lblheader = new ShiftUI.Label();
+            this.txtchat = new ShiftUI.RichTextBox();
+            this.txtsend = new ShiftUI.TextBox();
+            this.pnlusers = new ShiftUI.Panel();
+            this.lbusers = new ShiftUI.ListBox();
+            this.lbtopic = new ShiftUI.Label();
+            this.tmrui = new ShiftUI.Timer(this.components);
             this.panel1.SuspendLayout();
             this.pnlintro.SuspendLayout();
             this.flintrobuttons.SuspendLayout();
@@ -54,12 +54,12 @@
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.White;
-            this.panel1.Controls.Add(this.pnlintro);
-            this.panel1.Controls.Add(this.txtchat);
-            this.panel1.Controls.Add(this.txtsend);
-            this.panel1.Controls.Add(this.pnlusers);
-            this.panel1.Controls.Add(this.lbtopic);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel1.Widgets.Add(this.pnlintro);
+            this.panel1.Widgets.Add(this.txtchat);
+            this.panel1.Widgets.Add(this.txtsend);
+            this.panel1.Widgets.Add(this.pnlusers);
+            this.panel1.Widgets.Add(this.lbtopic);
+            this.panel1.Dock = ShiftUI.DockStyle.Fill;
             this.panel1.ForeColor = System.Drawing.Color.Black;
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
@@ -68,14 +68,14 @@
             // 
             // pnlintro
             // 
-            this.pnlintro.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnlintro.Controls.Add(this.flintrobuttons);
-            this.pnlintro.Controls.Add(this.lbrooms);
-            this.pnlintro.Controls.Add(this.label1);
-            this.pnlintro.Controls.Add(this.lblintro);
-            this.pnlintro.Controls.Add(this.lblheader);
+            this.pnlintro.Anchor = ((ShiftUI.AnchorStyles)((((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
+            this.pnlintro.Widgets.Add(this.flintrobuttons);
+            this.pnlintro.Widgets.Add(this.lbrooms);
+            this.pnlintro.Widgets.Add(this.label1);
+            this.pnlintro.Widgets.Add(this.lblintro);
+            this.pnlintro.Widgets.Add(this.lblheader);
             this.pnlintro.Location = new System.Drawing.Point(36, 35);
             this.pnlintro.Name = "pnlintro";
             this.pnlintro.Size = new System.Drawing.Size(706, 341);
@@ -83,11 +83,11 @@
             // 
             // flintrobuttons
             // 
-            this.flintrobuttons.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.flintrobuttons.Controls.Add(this.btnconnect);
-            this.flintrobuttons.Controls.Add(this.btnrefresh);
-            this.flintrobuttons.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft;
+            this.flintrobuttons.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
+            this.flintrobuttons.Widgets.Add(this.btnconnect);
+            this.flintrobuttons.Widgets.Add(this.btnrefresh);
+            this.flintrobuttons.FlowDirection = ShiftUI.FlowDirection.RightToLeft;
             this.flintrobuttons.Location = new System.Drawing.Point(337, 284);
             this.flintrobuttons.Name = "flintrobuttons";
             this.flintrobuttons.Size = new System.Drawing.Size(350, 42);
@@ -95,7 +95,7 @@
             // 
             // btnconnect
             // 
-            this.btnconnect.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnconnect.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnconnect.Location = new System.Drawing.Point(272, 3);
             this.btnconnect.Name = "btnconnect";
             this.btnconnect.Size = new System.Drawing.Size(75, 33);
@@ -106,7 +106,7 @@
             // 
             // btnrefresh
             // 
-            this.btnrefresh.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnrefresh.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnrefresh.Location = new System.Drawing.Point(191, 3);
             this.btnrefresh.Name = "btnrefresh";
             this.btnrefresh.Size = new System.Drawing.Size(75, 33);
@@ -117,8 +117,8 @@
             // 
             // lbrooms
             // 
-            this.lbrooms.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.lbrooms.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Right)));
             this.lbrooms.FormattingEnabled = true;
             this.lbrooms.Location = new System.Drawing.Point(337, 75);
             this.lbrooms.Name = "lbrooms";
@@ -127,8 +127,8 @@
             // 
             // label1
             // 
-            this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.label1.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 13F);
             this.label1.Location = new System.Drawing.Point(342, 38);
             this.label1.Name = "label1";
@@ -139,8 +139,8 @@
             // 
             // lblintro
             // 
-            this.lblintro.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
+            this.lblintro.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left)));
             this.lblintro.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
             this.lblintro.Location = new System.Drawing.Point(4, 38);
             this.lblintro.Name = "lblintro";
@@ -151,8 +151,8 @@
             // 
             // lblheader
             // 
-            this.lblheader.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.lblheader.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.lblheader.Font = new System.Drawing.Font("Microsoft Sans Serif", 14F);
             this.lblheader.Location = new System.Drawing.Point(4, 4);
             this.lblheader.Name = "lblheader";
@@ -163,7 +163,7 @@
             // 
             // txtchat
             // 
-            this.txtchat.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.txtchat.Dock = ShiftUI.DockStyle.Fill;
             this.txtchat.Location = new System.Drawing.Point(0, 23);
             this.txtchat.Name = "txtchat";
             this.txtchat.ReadOnly = true;
@@ -174,17 +174,17 @@
             // 
             // txtsend
             // 
-            this.txtsend.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.txtsend.Dock = ShiftUI.DockStyle.Bottom;
             this.txtsend.Location = new System.Drawing.Point(0, 411);
             this.txtsend.Name = "txtsend";
             this.txtsend.Size = new System.Drawing.Size(641, 20);
             this.txtsend.TabIndex = 1;
-            this.txtsend.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtsend_KeyDown);
+            this.txtsend.KeyDown += new ShiftUI.KeyEventHandler(this.txtsend_KeyDown);
             // 
             // pnlusers
             // 
-            this.pnlusers.Controls.Add(this.lbusers);
-            this.pnlusers.Dock = System.Windows.Forms.DockStyle.Right;
+            this.pnlusers.Widgets.Add(this.lbusers);
+            this.pnlusers.Dock = ShiftUI.DockStyle.Right;
             this.pnlusers.Location = new System.Drawing.Point(641, 23);
             this.pnlusers.Name = "pnlusers";
             this.pnlusers.Size = new System.Drawing.Size(131, 408);
@@ -192,7 +192,7 @@
             // 
             // lbusers
             // 
-            this.lbusers.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.lbusers.Dock = ShiftUI.DockStyle.Fill;
             this.lbusers.FormattingEnabled = true;
             this.lbusers.Location = new System.Drawing.Point(0, 0);
             this.lbusers.Name = "lbusers";
@@ -201,7 +201,7 @@
             // 
             // lbtopic
             // 
-            this.lbtopic.Dock = System.Windows.Forms.DockStyle.Top;
+            this.lbtopic.Dock = ShiftUI.DockStyle.Top;
             this.lbtopic.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
             this.lbtopic.Location = new System.Drawing.Point(0, 0);
             this.lbtopic.Name = "lbtopic";
@@ -217,12 +217,12 @@
             // HoloChat
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(772, 431);
-            this.Controls.Add(this.panel1);
+            this.Widgets.Add(this.panel1);
             this.Name = "HoloChat";
             this.Text = "HoloChat";
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.me_Closing);
+            this.FormClosing += new ShiftUI.FormClosingEventHandler(this.me_Closing);
             this.Load += new System.EventHandler(this.HoloChat_Load);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
@@ -235,20 +235,20 @@
 
         #endregion
 
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.RichTextBox txtchat;
-        private System.Windows.Forms.TextBox txtsend;
-        private System.Windows.Forms.Panel pnlusers;
-        private System.Windows.Forms.ListBox lbusers;
-        private System.Windows.Forms.Panel pnlintro;
-        private System.Windows.Forms.FlowLayoutPanel flintrobuttons;
-        private System.Windows.Forms.Button btnconnect;
-        private System.Windows.Forms.Button btnrefresh;
-        private System.Windows.Forms.ListBox lbrooms;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Label lblintro;
-        private System.Windows.Forms.Label lblheader;
-        private System.Windows.Forms.Timer tmrui;
-        private System.Windows.Forms.Label lbtopic;
+        private ShiftUI.Panel panel1;
+        private ShiftUI.RichTextBox txtchat;
+        private ShiftUI.TextBox txtsend;
+        private ShiftUI.Panel pnlusers;
+        private ShiftUI.ListBox lbusers;
+        private ShiftUI.Panel pnlintro;
+        private ShiftUI.FlowLayoutPanel flintrobuttons;
+        private ShiftUI.Button btnconnect;
+        private ShiftUI.Button btnrefresh;
+        private ShiftUI.ListBox lbrooms;
+        private ShiftUI.Label label1;
+        private ShiftUI.Label lblintro;
+        private ShiftUI.Label lblheader;
+        private ShiftUI.Timer tmrui;
+        private ShiftUI.Label lbtopic;
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Apps/HoloChat.cs b/source/WindowsFormsApplication1/Apps/HoloChat.cs
index 1795d7b..2ca6264 100644
--- a/source/WindowsFormsApplication1/Apps/HoloChat.cs
+++ b/source/WindowsFormsApplication1/Apps/HoloChat.cs
@@ -9,7 +9,7 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
@@ -240,7 +240,7 @@ namespace ShiftOS
         public void SetupFakeClient(FakeChatClient fClient)
         {
             lbtopic.Text = fClient.Topic;
-            var t = new System.Windows.Forms.Timer();
+            var t = new ShiftUI.Timer();
             t.Interval = 500;
             t.Tick += (object s, EventArgs a) =>
             {
@@ -255,7 +255,7 @@ namespace ShiftOS
 
             int m = 0;
             //message buffer
-            var mb = new System.Windows.Forms.Timer();
+            var mb = new ShiftUI.Timer();
             mb.Tick += (object s, EventArgs a) =>
             {
                 string message = fClient.Messages.Keys.ElementAt(m);
diff --git a/source/WindowsFormsApplication1/Apps/HoloChat.resx b/source/WindowsFormsApplication1/Apps/HoloChat.resx
index 53f34aa..d9a54c6 100644
--- a/source/WindowsFormsApplication1/Apps/HoloChat.resx
+++ b/source/WindowsFormsApplication1/Apps/HoloChat.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="lblintro.Text" xml:space="preserve">
     <value>HoloChat is a revolutionary new program made only for ShiftOS.
diff --git a/source/WindowsFormsApplication1/Apps/IconManager.Designer.cs b/source/WindowsFormsApplication1/Apps/IconManager.Designer.cs
index 3203088..d933a96 100644
--- a/source/WindowsFormsApplication1/Apps/IconManager.Designer.cs
+++ b/source/WindowsFormsApplication1/Apps/IconManager.Designer.cs
@@ -28,12 +28,12 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.pnlactions = new System.Windows.Forms.Panel();
-            this.pnlicons = new System.Windows.Forms.FlowLayoutPanel();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.btnsave = new System.Windows.Forms.Button();
-            this.button1 = new System.Windows.Forms.Button();
-            this.button2 = new System.Windows.Forms.Button();
+            this.pnlactions = new ShiftUI.Panel();
+            this.pnlicons = new ShiftUI.FlowLayoutPanel();
+            this.panel1 = new ShiftUI.Panel();
+            this.btnsave = new ShiftUI.Button();
+            this.button1 = new ShiftUI.Button();
+            this.button2 = new ShiftUI.Button();
             this.pnlactions.SuspendLayout();
             this.panel1.SuspendLayout();
             this.SuspendLayout();
@@ -41,10 +41,10 @@
             // pnlactions
             // 
             this.pnlactions.BackColor = System.Drawing.Color.Gray;
-            this.pnlactions.Controls.Add(this.button2);
-            this.pnlactions.Controls.Add(this.button1);
-            this.pnlactions.Controls.Add(this.btnsave);
-            this.pnlactions.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.pnlactions.Widgets.Add(this.button2);
+            this.pnlactions.Widgets.Add(this.button1);
+            this.pnlactions.Widgets.Add(this.btnsave);
+            this.pnlactions.Dock = ShiftUI.DockStyle.Bottom;
             this.pnlactions.ForeColor = System.Drawing.Color.White;
             this.pnlactions.Location = new System.Drawing.Point(0, 511);
             this.pnlactions.Name = "pnlactions";
@@ -54,8 +54,8 @@
             // pnlicons
             // 
             this.pnlicons.BackColor = System.Drawing.Color.White;
-            this.pnlicons.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pnlicons.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
+            this.pnlicons.Dock = ShiftUI.DockStyle.Fill;
+            this.pnlicons.FlowDirection = ShiftUI.FlowDirection.TopDown;
             this.pnlicons.ForeColor = System.Drawing.Color.Black;
             this.pnlicons.Location = new System.Drawing.Point(0, 0);
             this.pnlicons.Name = "pnlicons";
@@ -64,9 +64,9 @@
             // 
             // panel1
             // 
-            this.panel1.Controls.Add(this.pnlicons);
-            this.panel1.Controls.Add(this.pnlactions);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel1.Widgets.Add(this.pnlicons);
+            this.panel1.Widgets.Add(this.pnlactions);
+            this.panel1.Dock = ShiftUI.DockStyle.Fill;
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
             this.panel1.Size = new System.Drawing.Size(720, 552);
@@ -74,8 +74,8 @@
             // 
             // btnsave
             // 
-            this.btnsave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)));
-            this.btnsave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnsave.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom)));
+            this.btnsave.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnsave.Location = new System.Drawing.Point(3, 3);
             this.btnsave.Name = "btnsave";
             this.btnsave.Size = new System.Drawing.Size(75, 35);
@@ -86,8 +86,8 @@
             // 
             // button1
             // 
-            this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)));
-            this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.button1.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom)));
+            this.button1.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.button1.Location = new System.Drawing.Point(84, 3);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(75, 35);
@@ -98,8 +98,8 @@
             // 
             // button2
             // 
-            this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)));
-            this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.button2.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom)));
+            this.button2.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.button2.Location = new System.Drawing.Point(165, 3);
             this.button2.Name = "button2";
             this.button2.Size = new System.Drawing.Size(75, 35);
@@ -111,9 +111,9 @@
             // IconManager
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(720, 552);
-            this.Controls.Add(this.panel1);
+            this.Widgets.Add(this.panel1);
             this.Name = "IconManager";
             this.Text = "IconManager";
             this.Load += new System.EventHandler(this.IconManager_Load);
@@ -125,11 +125,11 @@
 
         #endregion
 
-        private System.Windows.Forms.Panel pnlactions;
-        private System.Windows.Forms.FlowLayoutPanel pnlicons;
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.Button button2;
-        private System.Windows.Forms.Button button1;
-        private System.Windows.Forms.Button btnsave;
+        private ShiftUI.Panel pnlactions;
+        private ShiftUI.FlowLayoutPanel pnlicons;
+        private ShiftUI.Panel panel1;
+        private ShiftUI.Button button2;
+        private ShiftUI.Button button1;
+        private ShiftUI.Button btnsave;
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Apps/IconManager.cs b/source/WindowsFormsApplication1/Apps/IconManager.cs
index 2ffa24a..b33d373 100644
--- a/source/WindowsFormsApplication1/Apps/IconManager.cs
+++ b/source/WindowsFormsApplication1/Apps/IconManager.cs
@@ -8,7 +8,7 @@ using System.IO.Compression;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
@@ -26,31 +26,31 @@ namespace ShiftOS
 
         public void GetAllIcons()
         {
-            pnlicons.Controls.Clear();
+            pnlicons.Widgets.Clear();
             pnlicons.Margin = new Padding(0);
             foreach(var kv in API.IconRegistry)
             {
-                var ctrl = new IconControl();
+                var ctrl = new IconWidget();
                 ctrl.Margin = new Padding(0);
                 ctrl.IconName = kv.Key;
                 ctrl.LargeImage = kv.Value;
-                pnlicons.Controls.Add(ctrl);
+                pnlicons.Widgets.Add(ctrl);
                 ctrl.Show();
             }
         }
 
         private void btnsave_Click(object sender, EventArgs e)
         {
-            foreach (Control ctrl in pnlicons.Controls)
+            foreach (Widget ctrl in pnlicons.Widgets)
             {
                 try
                 {
-                    IconControl ic = (IconControl)ctrl;
+                    IconWidget ic = (IconWidget)ctrl;
                     Skinning.Utilities.IconRegistry[ic.IconName] = ic.LargeImage;
                 }
                 catch
                 {
-                    IconControl ic = (IconControl)ctrl;
+                    IconWidget ic = (IconWidget)ctrl;
                     Skinning.Utilities.IconRegistry.Add(ic.IconName, ic.LargeImage);
                 }
             }
diff --git a/source/WindowsFormsApplication1/Apps/IconManager.resx b/source/WindowsFormsApplication1/Apps/IconManager.resx
index 1af7de1..ffb4fb5 100644
--- a/source/WindowsFormsApplication1/Apps/IconManager.resx
+++ b/source/WindowsFormsApplication1/Apps/IconManager.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Apps/KnowledgeInput.Designer.cs b/source/WindowsFormsApplication1/Apps/KnowledgeInput.Designer.cs
index 3fc5f81..89fc0b5 100644
--- a/source/WindowsFormsApplication1/Apps/KnowledgeInput.Designer.cs
+++ b/source/WindowsFormsApplication1/Apps/KnowledgeInput.Designer.cs
@@ -31,27 +31,27 @@ namespace ShiftOS
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(KnowledgeInput));
-            this.ListBox1 = new System.Windows.Forms.ListBox();
-            this.pnlintro = new System.Windows.Forms.Panel();
-            this.pnlcategorydisplay = new System.Windows.Forms.Panel();
-            this.lblnextreward = new System.Windows.Forms.Label();
-            this.guessbox = new System.Windows.Forms.TextBox();
-            this.lblcurrentlevel = new System.Windows.Forms.Label();
-            this.Label5 = new System.Windows.Forms.Label();
-            this.listblistedstuff = new System.Windows.Forms.ListBox();
-            this.lbltillnextlevel = new System.Windows.Forms.Label();
-            this.lbltotal = new System.Windows.Forms.Label();
-            this.btnstart = new System.Windows.Forms.Button();
-            this.lblcatedescription = new System.Windows.Forms.Label();
-            this.lblcategory = new System.Windows.Forms.Label();
-            this.Label4 = new System.Windows.Forms.Label();
-            this.Label3 = new System.Windows.Forms.Label();
-            this.Label2 = new System.Windows.Forms.Label();
-            this.Label1 = new System.Windows.Forms.Label();
-            this.decider = new System.Windows.Forms.Timer(this.components);
-            this.Label6 = new System.Windows.Forms.Label();
-            this.pgcontents = new System.Windows.Forms.Panel();
-            this.tmrstoryline = new System.Windows.Forms.Timer(this.components);
+            this.ListBox1 = new ShiftUI.ListBox();
+            this.pnlintro = new ShiftUI.Panel();
+            this.pnlcategorydisplay = new ShiftUI.Panel();
+            this.lblnextreward = new ShiftUI.Label();
+            this.guessbox = new ShiftUI.TextBox();
+            this.lblcurrentlevel = new ShiftUI.Label();
+            this.Label5 = new ShiftUI.Label();
+            this.listblistedstuff = new ShiftUI.ListBox();
+            this.lbltillnextlevel = new ShiftUI.Label();
+            this.lbltotal = new ShiftUI.Label();
+            this.btnstart = new ShiftUI.Button();
+            this.lblcatedescription = new ShiftUI.Label();
+            this.lblcategory = new ShiftUI.Label();
+            this.Label4 = new ShiftUI.Label();
+            this.Label3 = new ShiftUI.Label();
+            this.Label2 = new ShiftUI.Label();
+            this.Label1 = new ShiftUI.Label();
+            this.decider = new ShiftUI.Timer(this.components);
+            this.Label6 = new ShiftUI.Label();
+            this.pgcontents = new ShiftUI.Panel();
+            this.tmrstoryline = new ShiftUI.Timer(this.components);
             this.pnlintro.SuspendLayout();
             this.pnlcategorydisplay.SuspendLayout();
             this.pgcontents.SuspendLayout();
@@ -59,12 +59,12 @@ namespace ShiftOS
             // 
             // ListBox1
             // 
-            this.ListBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.ListBox1.Anchor = ((ShiftUI.AnchorStyles)((((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.ListBox1.BackColor = System.Drawing.Color.White;
-            this.ListBox1.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            this.ListBox1.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
+            this.ListBox1.BorderStyle = ShiftUI.BorderStyle.None;
+            this.ListBox1.DrawMode = ShiftUI.DrawMode.OwnerDrawFixed;
             this.ListBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.ListBox1.ForeColor = System.Drawing.Color.Black;
             this.ListBox1.FormattingEnabled = true;
@@ -77,16 +77,16 @@ namespace ShiftOS
             this.ListBox1.Name = "ListBox1";
             this.ListBox1.Size = new System.Drawing.Size(179, 240);
             this.ListBox1.TabIndex = 0;
-            this.ListBox1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.ListBox1_DrawItem);
+            this.ListBox1.DrawItem += new ShiftUI.DrawItemEventHandler(this.ListBox1_DrawItem);
             this.ListBox1.SelectedIndexChanged += new System.EventHandler(this.ListBox1_SelectedIndexChanged);
             // 
             // pnlintro
             // 
-            this.pnlintro.Controls.Add(this.pnlcategorydisplay);
-            this.pnlintro.Controls.Add(this.Label4);
-            this.pnlintro.Controls.Add(this.Label3);
-            this.pnlintro.Controls.Add(this.Label2);
-            this.pnlintro.Controls.Add(this.Label1);
+            this.pnlintro.Widgets.Add(this.pnlcategorydisplay);
+            this.pnlintro.Widgets.Add(this.Label4);
+            this.pnlintro.Widgets.Add(this.Label3);
+            this.pnlintro.Widgets.Add(this.Label2);
+            this.pnlintro.Widgets.Add(this.Label1);
             this.pnlintro.Location = new System.Drawing.Point(190, 0);
             this.pnlintro.Name = "pnlintro";
             this.pnlintro.Size = new System.Drawing.Size(479, 272);
@@ -94,17 +94,17 @@ namespace ShiftOS
             // 
             // pnlcategorydisplay
             // 
-            this.pnlcategorydisplay.Controls.Add(this.lblnextreward);
-            this.pnlcategorydisplay.Controls.Add(this.guessbox);
-            this.pnlcategorydisplay.Controls.Add(this.lblcurrentlevel);
-            this.pnlcategorydisplay.Controls.Add(this.Label5);
-            this.pnlcategorydisplay.Controls.Add(this.listblistedstuff);
-            this.pnlcategorydisplay.Controls.Add(this.lbltillnextlevel);
-            this.pnlcategorydisplay.Controls.Add(this.lbltotal);
-            this.pnlcategorydisplay.Controls.Add(this.btnstart);
-            this.pnlcategorydisplay.Controls.Add(this.lblcatedescription);
-            this.pnlcategorydisplay.Controls.Add(this.lblcategory);
-            this.pnlcategorydisplay.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pnlcategorydisplay.Widgets.Add(this.lblnextreward);
+            this.pnlcategorydisplay.Widgets.Add(this.guessbox);
+            this.pnlcategorydisplay.Widgets.Add(this.lblcurrentlevel);
+            this.pnlcategorydisplay.Widgets.Add(this.Label5);
+            this.pnlcategorydisplay.Widgets.Add(this.listblistedstuff);
+            this.pnlcategorydisplay.Widgets.Add(this.lbltillnextlevel);
+            this.pnlcategorydisplay.Widgets.Add(this.lbltotal);
+            this.pnlcategorydisplay.Widgets.Add(this.btnstart);
+            this.pnlcategorydisplay.Widgets.Add(this.lblcatedescription);
+            this.pnlcategorydisplay.Widgets.Add(this.lblcategory);
+            this.pnlcategorydisplay.Dock = ShiftUI.DockStyle.Fill;
             this.pnlcategorydisplay.ForeColor = System.Drawing.Color.Black;
             this.pnlcategorydisplay.Location = new System.Drawing.Point(0, 0);
             this.pnlcategorydisplay.Name = "pnlcategorydisplay";
@@ -125,7 +125,7 @@ namespace ShiftOS
             // guessbox
             // 
             this.guessbox.BackColor = System.Drawing.Color.White;
-            this.guessbox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.guessbox.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.guessbox.Font = new System.Drawing.Font("Microsoft Sans Serif", 24F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.guessbox.ForeColor = System.Drawing.Color.Black;
             this.guessbox.Location = new System.Drawing.Point(11, 147);
@@ -134,9 +134,9 @@ namespace ShiftOS
             this.guessbox.Size = new System.Drawing.Size(297, 45);
             this.guessbox.TabIndex = 9;
             this.guessbox.Text = "Enter Guess Here";
-            this.guessbox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.guessbox.TextAlign = ShiftUI.HorizontalAlignment.Center;
             this.guessbox.Click += new System.EventHandler(this.guessbox_click);
-            this.guessbox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.guessbox_keydown);
+            this.guessbox.KeyDown += new ShiftUI.KeyEventHandler(this.guessbox_keydown);
             // 
             // lblcurrentlevel
             // 
@@ -161,8 +161,8 @@ namespace ShiftOS
             // listblistedstuff
             // 
             this.listblistedstuff.BackColor = System.Drawing.Color.Black;
-            this.listblistedstuff.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            this.listblistedstuff.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
+            this.listblistedstuff.BorderStyle = ShiftUI.BorderStyle.None;
+            this.listblistedstuff.DrawMode = ShiftUI.DrawMode.OwnerDrawFixed;
             this.listblistedstuff.ForeColor = System.Drawing.Color.White;
             this.listblistedstuff.FormattingEnabled = true;
             this.listblistedstuff.Location = new System.Drawing.Point(340, 41);
@@ -170,7 +170,7 @@ namespace ShiftOS
             this.listblistedstuff.ScrollAlwaysVisible = true;
             this.listblistedstuff.Size = new System.Drawing.Size(129, 221);
             this.listblistedstuff.TabIndex = 6;
-            this.listblistedstuff.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.listblistedstuff_DrawItem);
+            this.listblistedstuff.DrawItem += new ShiftUI.DrawItemEventHandler(this.listblistedstuff_DrawItem);
             // 
             // lbltillnextlevel
             // 
@@ -194,7 +194,7 @@ namespace ShiftOS
             // 
             // btnstart
             // 
-            this.btnstart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnstart.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnstart.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnstart.Location = new System.Drawing.Point(11, 198);
             this.btnstart.Name = "btnstart";
@@ -284,10 +284,10 @@ namespace ShiftOS
             // pgcontents
             // 
             this.pgcontents.BackColor = System.Drawing.Color.White;
-            this.pgcontents.Controls.Add(this.pnlintro);
-            this.pgcontents.Controls.Add(this.Label6);
-            this.pgcontents.Controls.Add(this.ListBox1);
-            this.pgcontents.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pgcontents.Widgets.Add(this.pnlintro);
+            this.pgcontents.Widgets.Add(this.Label6);
+            this.pgcontents.Widgets.Add(this.ListBox1);
+            this.pgcontents.Dock = ShiftUI.DockStyle.Fill;
             this.pgcontents.Location = new System.Drawing.Point(0, 0);
             this.pgcontents.Name = "pgcontents";
             this.pgcontents.Size = new System.Drawing.Size(673, 304);
@@ -301,11 +301,11 @@ namespace ShiftOS
             // 
             this.AcceptButton = this.btnstart;
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.Control;
             this.ClientSize = new System.Drawing.Size(673, 304);
-            this.Controls.Add(this.pgcontents);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Widgets.Add(this.pgcontents);
+            this.FormBorderStyle = ShiftUI.FormBorderStyle.None;
             this.KeyPreview = true;
             this.Name = "KnowledgeInput";
             this.Text = "Knowledge_Input";
@@ -320,26 +320,26 @@ namespace ShiftOS
             this.ResumeLayout(false);
 
         }
-        internal System.Windows.Forms.ListBox ListBox1;
-        internal System.Windows.Forms.Panel pnlintro;
-        internal System.Windows.Forms.Label Label4;
-        internal System.Windows.Forms.Label Label3;
-        internal System.Windows.Forms.Label Label2;
-        internal System.Windows.Forms.Label Label1;
-        internal System.Windows.Forms.Panel pnlcategorydisplay;
-        internal System.Windows.Forms.Label lblcategory;
-        internal System.Windows.Forms.Button btnstart;
-        internal System.Windows.Forms.Label lblcatedescription;
-        internal System.Windows.Forms.Label lbltillnextlevel;
-        internal System.Windows.Forms.Label lbltotal;
-        internal System.Windows.Forms.ListBox listblistedstuff;
-        internal System.Windows.Forms.Label Label5;
-        internal System.Windows.Forms.TextBox guessbox;
-        internal System.Windows.Forms.Label lblcurrentlevel;
-        internal System.Windows.Forms.Timer decider;
-        internal System.Windows.Forms.Label lblnextreward;
-        internal System.Windows.Forms.Label Label6;
-        internal System.Windows.Forms.Panel pgcontents;
-        internal System.Windows.Forms.Timer tmrstoryline;
+        internal ShiftUI.ListBox ListBox1;
+        internal ShiftUI.Panel pnlintro;
+        internal ShiftUI.Label Label4;
+        internal ShiftUI.Label Label3;
+        internal ShiftUI.Label Label2;
+        internal ShiftUI.Label Label1;
+        internal ShiftUI.Panel pnlcategorydisplay;
+        internal ShiftUI.Label lblcategory;
+        internal ShiftUI.Button btnstart;
+        internal ShiftUI.Label lblcatedescription;
+        internal ShiftUI.Label lbltillnextlevel;
+        internal ShiftUI.Label lbltotal;
+        internal ShiftUI.ListBox listblistedstuff;
+        internal ShiftUI.Label Label5;
+        internal ShiftUI.TextBox guessbox;
+        internal ShiftUI.Label lblcurrentlevel;
+        internal ShiftUI.Timer decider;
+        internal ShiftUI.Label lblnextreward;
+        internal ShiftUI.Label Label6;
+        internal ShiftUI.Panel pgcontents;
+        internal ShiftUI.Timer tmrstoryline;
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Apps/KnowledgeInput.cs b/source/WindowsFormsApplication1/Apps/KnowledgeInput.cs
index a494a93..2a5ef7f 100644
--- a/source/WindowsFormsApplication1/Apps/KnowledgeInput.cs
+++ b/source/WindowsFormsApplication1/Apps/KnowledgeInput.cs
@@ -7,7 +7,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
@@ -67,7 +67,7 @@ namespace ShiftOS
         }
 
         // ERROR: Handles clauses are not supported in C#
-        private void ListBox1_DrawItem(object sender, System.Windows.Forms.DrawItemEventArgs e)
+        private void ListBox1_DrawItem(object sender, ShiftUI.DrawItemEventArgs e)
         {
             e.DrawBackground();
             if ((e.State & DrawItemState.Selected) == DrawItemState.Selected)
@@ -84,7 +84,7 @@ namespace ShiftOS
         }
 
         // ERROR: Handles clauses are not supported in C#
-        private void listblistedstuff_DrawItem(object sender, System.Windows.Forms.DrawItemEventArgs e)
+        private void listblistedstuff_DrawItem(object sender, ShiftUI.DrawItemEventArgs e)
         {
             e.DrawBackground();
             if ((e.State & DrawItemState.Selected) == DrawItemState.Selected)
@@ -203,7 +203,7 @@ namespace ShiftOS
         }
 
         // ERROR: Handles clauses are not supported in C#
-        private void guessbox_keydown(object sender, System.Windows.Forms.KeyEventArgs e)
+        private void guessbox_keydown(object sender, ShiftUI.KeyEventArgs e)
         {
             if (e.KeyCode == Keys.Enter)
             {
diff --git a/source/WindowsFormsApplication1/Apps/KnowledgeInput.resx b/source/WindowsFormsApplication1/Apps/KnowledgeInput.resx
index 7310dd5..d6df952 100644
--- a/source/WindowsFormsApplication1/Apps/KnowledgeInput.resx
+++ b/source/WindowsFormsApplication1/Apps/KnowledgeInput.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Label2.Text" xml:space="preserve">
     <value> - Select a category on the left to begin playing.
diff --git a/source/WindowsFormsApplication1/Apps/Labyrinth.Designer.cs b/source/WindowsFormsApplication1/Apps/Labyrinth.Designer.cs
index 8efe097..578d3b4 100644
--- a/source/WindowsFormsApplication1/Apps/Labyrinth.Designer.cs
+++ b/source/WindowsFormsApplication1/Apps/Labyrinth.Designer.cs
@@ -29,7 +29,7 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.Text = "Labyrinth";
         }
 
diff --git a/source/WindowsFormsApplication1/Apps/Labyrinth.cs b/source/WindowsFormsApplication1/Apps/Labyrinth.cs
index ade5495..67eb35d 100644
--- a/source/WindowsFormsApplication1/Apps/Labyrinth.cs
+++ b/source/WindowsFormsApplication1/Apps/Labyrinth.cs
@@ -6,7 +6,7 @@ using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
diff --git a/source/WindowsFormsApplication1/Apps/NameChanger.Designer.cs b/source/WindowsFormsApplication1/Apps/NameChanger.Designer.cs
index c9380a8..cc092e0 100644
--- a/source/WindowsFormsApplication1/Apps/NameChanger.Designer.cs
+++ b/source/WindowsFormsApplication1/Apps/NameChanger.Designer.cs
@@ -28,13 +28,13 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.propertyGrid1 = new System.Windows.Forms.PropertyGrid();
-            this.pnlactions = new System.Windows.Forms.FlowLayoutPanel();
-            this.btnapply = new System.Windows.Forms.Button();
-            this.btnload = new System.Windows.Forms.Button();
-            this.btnsave = new System.Windows.Forms.Button();
-            this.label1 = new System.Windows.Forms.Label();
-            this.panel1 = new System.Windows.Forms.Panel();
+            this.propertyGrid1 = new ShiftUI.PropertyGrid();
+            this.pnlactions = new ShiftUI.FlowLayoutPanel();
+            this.btnapply = new ShiftUI.Button();
+            this.btnload = new ShiftUI.Button();
+            this.btnsave = new ShiftUI.Button();
+            this.label1 = new ShiftUI.Label();
+            this.panel1 = new ShiftUI.Panel();
             this.pnlactions.SuspendLayout();
             this.panel1.SuspendLayout();
             this.SuspendLayout();
@@ -43,37 +43,31 @@
             // 
             this.propertyGrid1.BackColor = System.Drawing.Color.White;
             this.propertyGrid1.CategoryForeColor = System.Drawing.Color.Black;
-            this.propertyGrid1.CategorySplitterColor = System.Drawing.Color.Gray;
             this.propertyGrid1.CommandsActiveLinkColor = System.Drawing.Color.Black;
             this.propertyGrid1.CommandsBackColor = System.Drawing.Color.White;
-            this.propertyGrid1.CommandsBorderColor = System.Drawing.Color.White;
             this.propertyGrid1.CommandsDisabledLinkColor = System.Drawing.Color.Gray;
             this.propertyGrid1.CommandsForeColor = System.Drawing.Color.Black;
             this.propertyGrid1.CommandsLinkColor = System.Drawing.Color.Gray;
-            this.propertyGrid1.DisabledItemForeColor = System.Drawing.Color.Gray;
-            this.propertyGrid1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.propertyGrid1.Dock = ShiftUI.DockStyle.Fill;
             this.propertyGrid1.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
             this.propertyGrid1.HelpVisible = false;
             this.propertyGrid1.LineColor = System.Drawing.Color.White;
             this.propertyGrid1.Location = new System.Drawing.Point(0, 28);
             this.propertyGrid1.Name = "propertyGrid1";
-            this.propertyGrid1.PropertySort = System.Windows.Forms.PropertySort.Alphabetical;
-            this.propertyGrid1.SelectedItemWithFocusBackColor = System.Drawing.Color.Gray;
-            this.propertyGrid1.SelectedItemWithFocusForeColor = System.Drawing.Color.White;
+            this.propertyGrid1.PropertySort = ShiftUI.PropertySort.Alphabetical;
             this.propertyGrid1.Size = new System.Drawing.Size(403, 400);
             this.propertyGrid1.TabIndex = 0;
             this.propertyGrid1.ToolbarVisible = false;
             this.propertyGrid1.ViewBackColor = System.Drawing.Color.White;
-            this.propertyGrid1.ViewBorderColor = System.Drawing.Color.White;
             this.propertyGrid1.ViewForeColor = System.Drawing.Color.Black;
             // 
             // pnlactions
             // 
             this.pnlactions.BackColor = System.Drawing.Color.Gray;
-            this.pnlactions.Controls.Add(this.btnapply);
-            this.pnlactions.Controls.Add(this.btnload);
-            this.pnlactions.Controls.Add(this.btnsave);
-            this.pnlactions.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.pnlactions.Widgets.Add(this.btnapply);
+            this.pnlactions.Widgets.Add(this.btnload);
+            this.pnlactions.Widgets.Add(this.btnsave);
+            this.pnlactions.Dock = ShiftUI.DockStyle.Bottom;
             this.pnlactions.Location = new System.Drawing.Point(0, 428);
             this.pnlactions.Name = "pnlactions";
             this.pnlactions.Size = new System.Drawing.Size(403, 39);
@@ -81,7 +75,7 @@
             // 
             // btnapply
             // 
-            this.btnapply.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnapply.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnapply.ForeColor = System.Drawing.Color.White;
             this.btnapply.Location = new System.Drawing.Point(3, 3);
             this.btnapply.Name = "btnapply";
@@ -93,7 +87,7 @@
             // 
             // btnload
             // 
-            this.btnload.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnload.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnload.ForeColor = System.Drawing.Color.White;
             this.btnload.Location = new System.Drawing.Point(84, 3);
             this.btnload.Name = "btnload";
@@ -105,7 +99,7 @@
             // 
             // btnsave
             // 
-            this.btnsave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnsave.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnsave.ForeColor = System.Drawing.Color.White;
             this.btnsave.Location = new System.Drawing.Point(165, 3);
             this.btnsave.Name = "btnsave";
@@ -117,7 +111,7 @@
             // 
             // label1
             // 
-            this.label1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.label1.Dock = ShiftUI.DockStyle.Top;
             this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 13F);
             this.label1.Location = new System.Drawing.Point(0, 0);
             this.label1.Name = "label1";
@@ -129,10 +123,10 @@
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.White;
-            this.panel1.Controls.Add(this.propertyGrid1);
-            this.panel1.Controls.Add(this.label1);
-            this.panel1.Controls.Add(this.pnlactions);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel1.Widgets.Add(this.propertyGrid1);
+            this.panel1.Widgets.Add(this.label1);
+            this.panel1.Widgets.Add(this.pnlactions);
+            this.panel1.Dock = ShiftUI.DockStyle.Fill;
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
             this.panel1.Size = new System.Drawing.Size(403, 467);
@@ -141,9 +135,9 @@
             // NameChanger
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(403, 467);
-            this.Controls.Add(this.panel1);
+            this.Widgets.Add(this.panel1);
             this.Name = "NameChanger";
             this.Text = "NameChanger";
             this.Load += new System.EventHandler(this.NameChanger_Load);
@@ -154,12 +148,12 @@
         }
 
         #endregion
-        private System.Windows.Forms.FlowLayoutPanel pnlactions;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Button btnapply;
-        private System.Windows.Forms.Button btnload;
-        private System.Windows.Forms.Button btnsave;
-        private System.Windows.Forms.Panel panel1;
-        public System.Windows.Forms.PropertyGrid propertyGrid1;
+        private ShiftUI.FlowLayoutPanel pnlactions;
+        private ShiftUI.Label label1;
+        private ShiftUI.Button btnapply;
+        private ShiftUI.Button btnload;
+        private ShiftUI.Button btnsave;
+        private ShiftUI.Panel panel1;
+        public ShiftUI.PropertyGrid propertyGrid1;
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Apps/NameChanger.cs b/source/WindowsFormsApplication1/Apps/NameChanger.cs
index 0dcac90..2c1014c 100644
--- a/source/WindowsFormsApplication1/Apps/NameChanger.cs
+++ b/source/WindowsFormsApplication1/Apps/NameChanger.cs
@@ -8,7 +8,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
diff --git a/source/WindowsFormsApplication1/Apps/NameChanger.resx b/source/WindowsFormsApplication1/Apps/NameChanger.resx
index 1af7de1..ffb4fb5 100644
--- a/source/WindowsFormsApplication1/Apps/NameChanger.resx
+++ b/source/WindowsFormsApplication1/Apps/NameChanger.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Apps/NetGen.Designer.cs b/source/WindowsFormsApplication1/Apps/NetGen.Designer.cs
index b596cdb..5f52096 100644
--- a/source/WindowsFormsApplication1/Apps/NetGen.Designer.cs
+++ b/source/WindowsFormsApplication1/Apps/NetGen.Designer.cs
@@ -29,47 +29,47 @@
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(NetGen));
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.pnlnetdesign = new System.Windows.Forms.Panel();
-            this.pnlpcinfo = new System.Windows.Forms.Panel();
-            this.btndelete = new System.Windows.Forms.Button();
-            this.lbpcinfo = new System.Windows.Forms.Label();
-            this.lbmoduletitle = new System.Windows.Forms.Label();
-            this.btncloseinfo = new System.Windows.Forms.Button();
-            this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
-            this.btnaddmodule = new System.Windows.Forms.Button();
-            this.pnlbuy = new System.Windows.Forms.Panel();
-            this.txthostname = new System.Windows.Forms.TextBox();
-            this.lbhostname = new System.Windows.Forms.Label();
-            this.txtgrade = new System.Windows.Forms.TextBox();
-            this.lbgrade = new System.Windows.Forms.Label();
-            this.lbmoduleinfo = new System.Windows.Forms.Label();
-            this.cmbbuyable = new System.Windows.Forms.ComboBox();
-            this.label4 = new System.Windows.Forms.Label();
-            this.btndonebuying = new System.Windows.Forms.Button();
-            this.pnlnetinf = new System.Windows.Forms.Panel();
-            this.label6 = new System.Windows.Forms.Label();
-            this.cbdifficulty = new System.Windows.Forms.ComboBox();
-            this.txtfspeed = new System.Windows.Forms.TextBox();
-            this.label5 = new System.Windows.Forms.Label();
-            this.txtfskill = new System.Windows.Forms.TextBox();
-            this.label3 = new System.Windows.Forms.Label();
-            this.txtnetdesc = new System.Windows.Forms.TextBox();
-            this.label2 = new System.Windows.Forms.Label();
-            this.txtnetname = new System.Windows.Forms.TextBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.flbuttons = new System.Windows.Forms.FlowLayoutPanel();
-            this.btnnext = new System.Windows.Forms.Button();
-            this.btnback = new System.Windows.Forms.Button();
-            this.pnlnetinfo = new System.Windows.Forms.Panel();
-            this.lbdescription = new System.Windows.Forms.Label();
-            this.lbtitle = new System.Windows.Forms.Label();
-            this.btnloadfromtemplate = new System.Windows.Forms.Button();
-            this.pnltemplates = new System.Windows.Forms.Panel();
-            this.label9 = new System.Windows.Forms.Label();
-            this.cbnets = new System.Windows.Forms.ComboBox();
-            this.label10 = new System.Windows.Forms.Label();
-            this.btnrecreate = new System.Windows.Forms.Button();
+            this.panel1 = new ShiftUI.Panel();
+            this.pnlnetdesign = new ShiftUI.Panel();
+            this.pnlpcinfo = new ShiftUI.Panel();
+            this.btndelete = new ShiftUI.Button();
+            this.lbpcinfo = new ShiftUI.Label();
+            this.lbmoduletitle = new ShiftUI.Label();
+            this.btncloseinfo = new ShiftUI.Button();
+            this.flowLayoutPanel1 = new ShiftUI.FlowLayoutPanel();
+            this.btnaddmodule = new ShiftUI.Button();
+            this.pnlbuy = new ShiftUI.Panel();
+            this.txthostname = new ShiftUI.TextBox();
+            this.lbhostname = new ShiftUI.Label();
+            this.txtgrade = new ShiftUI.TextBox();
+            this.lbgrade = new ShiftUI.Label();
+            this.lbmoduleinfo = new ShiftUI.Label();
+            this.cmbbuyable = new ShiftUI.ComboBox();
+            this.label4 = new ShiftUI.Label();
+            this.btndonebuying = new ShiftUI.Button();
+            this.pnlnetinf = new ShiftUI.Panel();
+            this.label6 = new ShiftUI.Label();
+            this.cbdifficulty = new ShiftUI.ComboBox();
+            this.txtfspeed = new ShiftUI.TextBox();
+            this.label5 = new ShiftUI.Label();
+            this.txtfskill = new ShiftUI.TextBox();
+            this.label3 = new ShiftUI.Label();
+            this.txtnetdesc = new ShiftUI.TextBox();
+            this.label2 = new ShiftUI.Label();
+            this.txtnetname = new ShiftUI.TextBox();
+            this.label1 = new ShiftUI.Label();
+            this.flbuttons = new ShiftUI.FlowLayoutPanel();
+            this.btnnext = new ShiftUI.Button();
+            this.btnback = new ShiftUI.Button();
+            this.pnlnetinfo = new ShiftUI.Panel();
+            this.lbdescription = new ShiftUI.Label();
+            this.lbtitle = new ShiftUI.Label();
+            this.btnloadfromtemplate = new ShiftUI.Button();
+            this.pnltemplates = new ShiftUI.Panel();
+            this.label9 = new ShiftUI.Label();
+            this.cbnets = new ShiftUI.ComboBox();
+            this.label10 = new ShiftUI.Label();
+            this.btnrecreate = new ShiftUI.Button();
             this.panel1.SuspendLayout();
             this.pnlnetdesign.SuspendLayout();
             this.pnlpcinfo.SuspendLayout();
@@ -83,37 +83,37 @@
             // 
             // panel1
             // 
-            this.panel1.Controls.Add(this.pnltemplates);
-            this.panel1.Controls.Add(this.pnlnetdesign);
-            this.panel1.Controls.Add(this.pnlnetinf);
-            this.panel1.Controls.Add(this.flbuttons);
-            this.panel1.Controls.Add(this.pnlnetinfo);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel1.Widgets.Add(this.pnltemplates);
+            this.panel1.Widgets.Add(this.pnlnetdesign);
+            this.panel1.Widgets.Add(this.pnlnetinf);
+            this.panel1.Widgets.Add(this.flbuttons);
+            this.panel1.Widgets.Add(this.pnlnetinfo);
+            this.panel1.Dock = ShiftUI.DockStyle.Fill;
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
             this.panel1.Size = new System.Drawing.Size(894, 591);
             this.panel1.TabIndex = 0;
-            this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint);
+            this.panel1.Paint += new ShiftUI.PaintEventHandler(this.panel1_Paint);
             // 
             // pnlnetdesign
             // 
-            this.pnlnetdesign.Controls.Add(this.pnlpcinfo);
-            this.pnlnetdesign.Controls.Add(this.flowLayoutPanel1);
-            this.pnlnetdesign.Controls.Add(this.pnlbuy);
-            this.pnlnetdesign.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pnlnetdesign.Widgets.Add(this.pnlpcinfo);
+            this.pnlnetdesign.Widgets.Add(this.flowLayoutPanel1);
+            this.pnlnetdesign.Widgets.Add(this.pnlbuy);
+            this.pnlnetdesign.Dock = ShiftUI.DockStyle.Fill;
             this.pnlnetdesign.Location = new System.Drawing.Point(0, 76);
             this.pnlnetdesign.Name = "pnlnetdesign";
             this.pnlnetdesign.Size = new System.Drawing.Size(894, 484);
             this.pnlnetdesign.TabIndex = 6;
-            this.pnlnetdesign.MouseDown += new System.Windows.Forms.MouseEventHandler(this.place_module);
+            this.pnlnetdesign.MouseDown += new ShiftUI.MouseEventHandler(this.place_module);
             // 
             // pnlpcinfo
             // 
-            this.pnlpcinfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnlpcinfo.Controls.Add(this.btndelete);
-            this.pnlpcinfo.Controls.Add(this.lbpcinfo);
-            this.pnlpcinfo.Controls.Add(this.lbmoduletitle);
-            this.pnlpcinfo.Controls.Add(this.btncloseinfo);
+            this.pnlpcinfo.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
+            this.pnlpcinfo.Widgets.Add(this.btndelete);
+            this.pnlpcinfo.Widgets.Add(this.lbpcinfo);
+            this.pnlpcinfo.Widgets.Add(this.lbmoduletitle);
+            this.pnlpcinfo.Widgets.Add(this.btncloseinfo);
             this.pnlpcinfo.Location = new System.Drawing.Point(43, 167);
             this.pnlpcinfo.Name = "pnlpcinfo";
             this.pnlpcinfo.Size = new System.Drawing.Size(382, 280);
@@ -122,10 +122,10 @@
             // 
             // btndelete
             // 
-            this.btndelete.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btndelete.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
             this.btndelete.AutoSize = true;
-            this.btndelete.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btndelete.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btndelete.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.btndelete.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btndelete.Location = new System.Drawing.Point(106, 254);
             this.btndelete.Name = "btndelete";
             this.btndelete.Size = new System.Drawing.Size(59, 23);
@@ -153,10 +153,10 @@
             // 
             // btncloseinfo
             // 
-            this.btncloseinfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btncloseinfo.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
             this.btncloseinfo.AutoSize = true;
-            this.btncloseinfo.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btncloseinfo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btncloseinfo.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.btncloseinfo.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btncloseinfo.Location = new System.Drawing.Point(327, 254);
             this.btncloseinfo.Name = "btncloseinfo";
             this.btncloseinfo.Size = new System.Drawing.Size(52, 23);
@@ -167,8 +167,8 @@
             // 
             // flowLayoutPanel1
             // 
-            this.flowLayoutPanel1.Controls.Add(this.btnaddmodule);
-            this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.flowLayoutPanel1.Widgets.Add(this.btnaddmodule);
+            this.flowLayoutPanel1.Dock = ShiftUI.DockStyle.Bottom;
             this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 453);
             this.flowLayoutPanel1.Name = "flowLayoutPanel1";
             this.flowLayoutPanel1.Size = new System.Drawing.Size(894, 31);
@@ -177,8 +177,8 @@
             // btnaddmodule
             // 
             this.btnaddmodule.AutoSize = true;
-            this.btnaddmodule.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btnaddmodule.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnaddmodule.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.btnaddmodule.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnaddmodule.Location = new System.Drawing.Point(3, 3);
             this.btnaddmodule.Name = "btnaddmodule";
             this.btnaddmodule.Size = new System.Drawing.Size(87, 23);
@@ -189,15 +189,15 @@
             // 
             // pnlbuy
             // 
-            this.pnlbuy.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.pnlbuy.Controls.Add(this.txthostname);
-            this.pnlbuy.Controls.Add(this.lbhostname);
-            this.pnlbuy.Controls.Add(this.txtgrade);
-            this.pnlbuy.Controls.Add(this.lbgrade);
-            this.pnlbuy.Controls.Add(this.lbmoduleinfo);
-            this.pnlbuy.Controls.Add(this.cmbbuyable);
-            this.pnlbuy.Controls.Add(this.label4);
-            this.pnlbuy.Controls.Add(this.btndonebuying);
+            this.pnlbuy.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left)));
+            this.pnlbuy.Widgets.Add(this.txthostname);
+            this.pnlbuy.Widgets.Add(this.lbhostname);
+            this.pnlbuy.Widgets.Add(this.txtgrade);
+            this.pnlbuy.Widgets.Add(this.lbgrade);
+            this.pnlbuy.Widgets.Add(this.lbmoduleinfo);
+            this.pnlbuy.Widgets.Add(this.cmbbuyable);
+            this.pnlbuy.Widgets.Add(this.label4);
+            this.pnlbuy.Widgets.Add(this.btndonebuying);
             this.pnlbuy.Location = new System.Drawing.Point(3, 148);
             this.pnlbuy.Name = "pnlbuy";
             this.pnlbuy.Size = new System.Drawing.Size(382, 299);
@@ -207,7 +207,7 @@
             // txthostname
             // 
             this.txthostname.BackColor = System.Drawing.Color.Black;
-            this.txthostname.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txthostname.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txthostname.ForeColor = System.Drawing.Color.White;
             this.txthostname.Location = new System.Drawing.Point(186, 236);
             this.txthostname.Name = "txthostname";
@@ -226,7 +226,7 @@
             // txtgrade
             // 
             this.txtgrade.BackColor = System.Drawing.Color.Black;
-            this.txtgrade.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtgrade.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtgrade.ForeColor = System.Drawing.Color.White;
             this.txtgrade.Location = new System.Drawing.Point(65, 236);
             this.txtgrade.Name = "txtgrade";
@@ -254,8 +254,8 @@
             // cmbbuyable
             // 
             this.cmbbuyable.BackColor = System.Drawing.Color.Black;
-            this.cmbbuyable.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbbuyable.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.cmbbuyable.DropDownStyle = ShiftUI.ComboBoxStyle.DropDownList;
+            this.cmbbuyable.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.cmbbuyable.ForeColor = System.Drawing.Color.White;
             this.cmbbuyable.FormattingEnabled = true;
             this.cmbbuyable.Location = new System.Drawing.Point(12, 38);
@@ -275,10 +275,10 @@
             // 
             // btndonebuying
             // 
-            this.btndonebuying.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btndonebuying.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
             this.btndonebuying.AutoSize = true;
-            this.btndonebuying.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btndonebuying.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btndonebuying.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.btndonebuying.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btndonebuying.Location = new System.Drawing.Point(341, 273);
             this.btndonebuying.Name = "btndonebuying";
             this.btndonebuying.Size = new System.Drawing.Size(38, 23);
@@ -289,17 +289,17 @@
             // 
             // pnlnetinf
             // 
-            this.pnlnetinf.Controls.Add(this.label6);
-            this.pnlnetinf.Controls.Add(this.cbdifficulty);
-            this.pnlnetinf.Controls.Add(this.txtfspeed);
-            this.pnlnetinf.Controls.Add(this.label5);
-            this.pnlnetinf.Controls.Add(this.txtfskill);
-            this.pnlnetinf.Controls.Add(this.label3);
-            this.pnlnetinf.Controls.Add(this.txtnetdesc);
-            this.pnlnetinf.Controls.Add(this.label2);
-            this.pnlnetinf.Controls.Add(this.txtnetname);
-            this.pnlnetinf.Controls.Add(this.label1);
-            this.pnlnetinf.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pnlnetinf.Widgets.Add(this.label6);
+            this.pnlnetinf.Widgets.Add(this.cbdifficulty);
+            this.pnlnetinf.Widgets.Add(this.txtfspeed);
+            this.pnlnetinf.Widgets.Add(this.label5);
+            this.pnlnetinf.Widgets.Add(this.txtfskill);
+            this.pnlnetinf.Widgets.Add(this.label3);
+            this.pnlnetinf.Widgets.Add(this.txtnetdesc);
+            this.pnlnetinf.Widgets.Add(this.label2);
+            this.pnlnetinf.Widgets.Add(this.txtnetname);
+            this.pnlnetinf.Widgets.Add(this.label1);
+            this.pnlnetinf.Dock = ShiftUI.DockStyle.Fill;
             this.pnlnetinf.Location = new System.Drawing.Point(0, 76);
             this.pnlnetinf.Name = "pnlnetinf";
             this.pnlnetinf.Size = new System.Drawing.Size(894, 484);
@@ -317,8 +317,8 @@
             // cbdifficulty
             // 
             this.cbdifficulty.BackColor = System.Drawing.Color.Black;
-            this.cbdifficulty.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cbdifficulty.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.cbdifficulty.DropDownStyle = ShiftUI.ComboBoxStyle.DropDownList;
+            this.cbdifficulty.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.cbdifficulty.ForeColor = System.Drawing.Color.Green;
             this.cbdifficulty.FormattingEnabled = true;
             this.cbdifficulty.Items.AddRange(new object[] {
@@ -333,7 +333,7 @@
             // txtfspeed
             // 
             this.txtfspeed.BackColor = System.Drawing.Color.Black;
-            this.txtfspeed.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtfspeed.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtfspeed.ForeColor = System.Drawing.Color.Green;
             this.txtfspeed.Location = new System.Drawing.Point(142, 172);
             this.txtfspeed.Name = "txtfspeed";
@@ -353,7 +353,7 @@
             // txtfskill
             // 
             this.txtfskill.BackColor = System.Drawing.Color.Black;
-            this.txtfskill.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtfskill.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtfskill.ForeColor = System.Drawing.Color.Green;
             this.txtfskill.Location = new System.Drawing.Point(142, 146);
             this.txtfskill.Name = "txtfskill";
@@ -373,7 +373,7 @@
             // txtnetdesc
             // 
             this.txtnetdesc.BackColor = System.Drawing.Color.Black;
-            this.txtnetdesc.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtnetdesc.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtnetdesc.ForeColor = System.Drawing.Color.Green;
             this.txtnetdesc.Location = new System.Drawing.Point(142, 80);
             this.txtnetdesc.Name = "txtnetdesc";
@@ -392,7 +392,7 @@
             // txtnetname
             // 
             this.txtnetname.BackColor = System.Drawing.Color.Black;
-            this.txtnetname.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtnetname.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtnetname.ForeColor = System.Drawing.Color.Green;
             this.txtnetname.Location = new System.Drawing.Point(142, 56);
             this.txtnetname.Name = "txtnetname";
@@ -410,10 +410,10 @@
             // 
             // flbuttons
             // 
-            this.flbuttons.Controls.Add(this.btnnext);
-            this.flbuttons.Controls.Add(this.btnback);
-            this.flbuttons.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.flbuttons.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft;
+            this.flbuttons.Widgets.Add(this.btnnext);
+            this.flbuttons.Widgets.Add(this.btnback);
+            this.flbuttons.Dock = ShiftUI.DockStyle.Bottom;
+            this.flbuttons.FlowDirection = ShiftUI.FlowDirection.RightToLeft;
             this.flbuttons.Location = new System.Drawing.Point(0, 560);
             this.flbuttons.Name = "flbuttons";
             this.flbuttons.Size = new System.Drawing.Size(894, 31);
@@ -422,8 +422,8 @@
             // btnnext
             // 
             this.btnnext.AutoSize = true;
-            this.btnnext.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btnnext.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnnext.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.btnnext.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnnext.Location = new System.Drawing.Point(846, 3);
             this.btnnext.Name = "btnnext";
             this.btnnext.Size = new System.Drawing.Size(45, 23);
@@ -435,8 +435,8 @@
             // btnback
             // 
             this.btnback.AutoSize = true;
-            this.btnback.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btnback.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnback.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.btnback.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnback.Location = new System.Drawing.Point(795, 3);
             this.btnback.Name = "btnback";
             this.btnback.Size = new System.Drawing.Size(45, 23);
@@ -447,10 +447,10 @@
             // 
             // pnlnetinfo
             // 
-            this.pnlnetinfo.Controls.Add(this.btnloadfromtemplate);
-            this.pnlnetinfo.Controls.Add(this.lbdescription);
-            this.pnlnetinfo.Controls.Add(this.lbtitle);
-            this.pnlnetinfo.Dock = System.Windows.Forms.DockStyle.Top;
+            this.pnlnetinfo.Widgets.Add(this.btnloadfromtemplate);
+            this.pnlnetinfo.Widgets.Add(this.lbdescription);
+            this.pnlnetinfo.Widgets.Add(this.lbtitle);
+            this.pnlnetinfo.Dock = ShiftUI.DockStyle.Top;
             this.pnlnetinfo.Location = new System.Drawing.Point(0, 0);
             this.pnlnetinfo.Name = "pnlnetinfo";
             this.pnlnetinfo.Size = new System.Drawing.Size(894, 76);
@@ -458,8 +458,8 @@
             // 
             // lbdescription
             // 
-            this.lbdescription.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.lbdescription.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.lbdescription.Location = new System.Drawing.Point(15, 31);
             this.lbdescription.Name = "lbdescription";
             this.lbdescription.Size = new System.Drawing.Size(867, 36);
@@ -478,10 +478,10 @@
             // 
             // btnloadfromtemplate
             // 
-            this.btnloadfromtemplate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnloadfromtemplate.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
             this.btnloadfromtemplate.AutoSize = true;
-            this.btnloadfromtemplate.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btnloadfromtemplate.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnloadfromtemplate.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.btnloadfromtemplate.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnloadfromtemplate.Location = new System.Drawing.Point(683, 47);
             this.btnloadfromtemplate.Name = "btnloadfromtemplate";
             this.btnloadfromtemplate.Size = new System.Drawing.Size(199, 23);
@@ -493,11 +493,11 @@
             // 
             // pnltemplates
             // 
-            this.pnltemplates.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.pnltemplates.Controls.Add(this.label9);
-            this.pnltemplates.Controls.Add(this.cbnets);
-            this.pnltemplates.Controls.Add(this.label10);
-            this.pnltemplates.Controls.Add(this.btnrecreate);
+            this.pnltemplates.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left)));
+            this.pnltemplates.Widgets.Add(this.label9);
+            this.pnltemplates.Widgets.Add(this.cbnets);
+            this.pnltemplates.Widgets.Add(this.label10);
+            this.pnltemplates.Widgets.Add(this.btnrecreate);
             this.pnltemplates.Location = new System.Drawing.Point(256, 146);
             this.pnltemplates.Name = "pnltemplates";
             this.pnltemplates.Size = new System.Drawing.Size(382, 299);
@@ -516,8 +516,8 @@
             // cbnets
             // 
             this.cbnets.BackColor = System.Drawing.Color.Black;
-            this.cbnets.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cbnets.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.cbnets.DropDownStyle = ShiftUI.ComboBoxStyle.DropDownList;
+            this.cbnets.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.cbnets.ForeColor = System.Drawing.Color.White;
             this.cbnets.FormattingEnabled = true;
             this.cbnets.Location = new System.Drawing.Point(12, 38);
@@ -536,10 +536,10 @@
             // 
             // btnrecreate
             // 
-            this.btnrecreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnrecreate.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
             this.btnrecreate.AutoSize = true;
-            this.btnrecreate.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btnrecreate.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnrecreate.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.btnrecreate.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnrecreate.Location = new System.Drawing.Point(334, 273);
             this.btnrecreate.Name = "btnrecreate";
             this.btnrecreate.Size = new System.Drawing.Size(45, 23);
@@ -551,13 +551,13 @@
             // NetGen
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 11F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.Black;
             this.ClientSize = new System.Drawing.Size(894, 591);
-            this.Controls.Add(this.panel1);
+            this.Widgets.Add(this.panel1);
             this.Font = new System.Drawing.Font("Lucida Console", 8.25F);
             this.ForeColor = System.Drawing.Color.LightGreen;
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.FormBorderStyle = ShiftUI.FormBorderStyle.None;
             this.Name = "NetGen";
             this.Text = "NetGen";
             this.Load += new System.EventHandler(this.NetGen_Load);
@@ -583,46 +583,46 @@
 
         #endregion
 
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.FlowLayoutPanel flbuttons;
-        private System.Windows.Forms.TextBox txtnetname;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Panel pnlnetinfo;
-        private System.Windows.Forms.Label lbdescription;
-        private System.Windows.Forms.Label lbtitle;
-        private System.Windows.Forms.TextBox txtnetdesc;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Button btnnext;
-        private System.Windows.Forms.Button btnback;
-        private System.Windows.Forms.Panel pnlnetdesign;
-        private System.Windows.Forms.Panel pnlnetinf;
-        private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
-        private System.Windows.Forms.Button btnaddmodule;
-        private System.Windows.Forms.Panel pnlbuy;
-        private System.Windows.Forms.TextBox txthostname;
-        private System.Windows.Forms.Label lbhostname;
-        private System.Windows.Forms.TextBox txtgrade;
-        private System.Windows.Forms.Label lbgrade;
-        private System.Windows.Forms.Label lbmoduleinfo;
-        private System.Windows.Forms.ComboBox cmbbuyable;
-        private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.Button btndonebuying;
-        private System.Windows.Forms.Panel pnlpcinfo;
-        private System.Windows.Forms.Button btndelete;
-        private System.Windows.Forms.Label lbpcinfo;
-        private System.Windows.Forms.Label lbmoduletitle;
-        private System.Windows.Forms.Button btncloseinfo;
-        private System.Windows.Forms.Label label6;
-        private System.Windows.Forms.ComboBox cbdifficulty;
-        private System.Windows.Forms.TextBox txtfspeed;
-        private System.Windows.Forms.Label label5;
-        private System.Windows.Forms.TextBox txtfskill;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.Button btnloadfromtemplate;
-        private System.Windows.Forms.Panel pnltemplates;
-        private System.Windows.Forms.Label label9;
-        private System.Windows.Forms.ComboBox cbnets;
-        private System.Windows.Forms.Label label10;
-        private System.Windows.Forms.Button btnrecreate;
+        private ShiftUI.Panel panel1;
+        private ShiftUI.FlowLayoutPanel flbuttons;
+        private ShiftUI.TextBox txtnetname;
+        private ShiftUI.Label label1;
+        private ShiftUI.Panel pnlnetinfo;
+        private ShiftUI.Label lbdescription;
+        private ShiftUI.Label lbtitle;
+        private ShiftUI.TextBox txtnetdesc;
+        private ShiftUI.Label label2;
+        private ShiftUI.Button btnnext;
+        private ShiftUI.Button btnback;
+        private ShiftUI.Panel pnlnetdesign;
+        private ShiftUI.Panel pnlnetinf;
+        private ShiftUI.FlowLayoutPanel flowLayoutPanel1;
+        private ShiftUI.Button btnaddmodule;
+        private ShiftUI.Panel pnlbuy;
+        private ShiftUI.TextBox txthostname;
+        private ShiftUI.Label lbhostname;
+        private ShiftUI.TextBox txtgrade;
+        private ShiftUI.Label lbgrade;
+        private ShiftUI.Label lbmoduleinfo;
+        private ShiftUI.ComboBox cmbbuyable;
+        private ShiftUI.Label label4;
+        private ShiftUI.Button btndonebuying;
+        private ShiftUI.Panel pnlpcinfo;
+        private ShiftUI.Button btndelete;
+        private ShiftUI.Label lbpcinfo;
+        private ShiftUI.Label lbmoduletitle;
+        private ShiftUI.Button btncloseinfo;
+        private ShiftUI.Label label6;
+        private ShiftUI.ComboBox cbdifficulty;
+        private ShiftUI.TextBox txtfspeed;
+        private ShiftUI.Label label5;
+        private ShiftUI.TextBox txtfskill;
+        private ShiftUI.Label label3;
+        private ShiftUI.Button btnloadfromtemplate;
+        private ShiftUI.Panel pnltemplates;
+        private ShiftUI.Label label9;
+        private ShiftUI.ComboBox cbnets;
+        private ShiftUI.Label label10;
+        private ShiftUI.Button btnrecreate;
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Apps/NetGen.cs b/source/WindowsFormsApplication1/Apps/NetGen.cs
index 616505d..679ad51 100644
--- a/source/WindowsFormsApplication1/Apps/NetGen.cs
+++ b/source/WindowsFormsApplication1/Apps/NetGen.cs
@@ -7,7 +7,7 @@ using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
@@ -51,7 +51,7 @@ namespace ShiftOS
                     {
                         foreach(var p in potentialModules)
                         {
-                            pnlnetdesign.Controls.Remove(p);
+                            pnlnetdesign.Widgets.Remove(p);
                             p.Hide();
                             
                         }
@@ -71,7 +71,7 @@ namespace ShiftOS
                     var c = network.Network[0].Deploy();
                     c.Left = (pnlnetdesign.Width - 64) / 2;
                     c.Top = (pnlnetdesign.Height - 64) / 2;
-                    pnlnetdesign.Controls.Add(c);
+                    pnlnetdesign.Widgets.Add(c);
                     c.Select += (s, a) =>
                     {
                         ShowSysInf(c);
@@ -236,7 +236,7 @@ namespace ShiftOS
                     fmod.HP = fmod.GetTotalHP();
                     var computerToPlace = fmod.Deploy();
                     computerToPlace.Location = new Point(x, y);
-                    pnlnetdesign.Controls.Add(computerToPlace);
+                    pnlnetdesign.Widgets.Add(computerToPlace);
                     potentialModules.Add(computerToPlace);
                     computerToPlace.Select += (s, a) =>
                     {
@@ -270,7 +270,7 @@ namespace ShiftOS
             if(SelectedSystem != null)
             {
                 potentialModules.Remove(SelectedSystem);
-                pnlnetdesign.Controls.Remove(SelectedSystem);
+                pnlnetdesign.Widgets.Remove(SelectedSystem);
                 SelectedSystem.Dispose();
             }
             SelectedSystem = null;
diff --git a/source/WindowsFormsApplication1/Apps/NetGen.resx b/source/WindowsFormsApplication1/Apps/NetGen.resx
index c6bdcd8..5e12a5c 100644
--- a/source/WindowsFormsApplication1/Apps/NetGen.resx
+++ b/source/WindowsFormsApplication1/Apps/NetGen.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="lbpcinfo.Text" xml:space="preserve">
     <value>When you press 'Done', simply click where you'd like to place the new module. You can right-click the playing field to cancel the deployment.
diff --git a/source/WindowsFormsApplication1/Apps/NetworkBrowser.Designer.cs b/source/WindowsFormsApplication1/Apps/NetworkBrowser.Designer.cs
index 04683ac..498d57a 100644
--- a/source/WindowsFormsApplication1/Apps/NetworkBrowser.Designer.cs
+++ b/source/WindowsFormsApplication1/Apps/NetworkBrowser.Designer.cs
@@ -30,33 +30,33 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(NetworkBrowser));
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.pnlonline = new System.Windows.Forms.Panel();
-            this.btnjoinlobby = new System.Windows.Forms.Button();
-            this.lbonlineservers = new System.Windows.Forms.ListBox();
-            this.lbonlinedesc = new System.Windows.Forms.Label();
-            this.lbonlineheader = new System.Windows.Forms.Label();
-            this.button1 = new System.Windows.Forms.Button();
-            this.label3 = new System.Windows.Forms.Label();
-            this.btnscreen = new System.Windows.Forms.Button();
-            this.pnlmynet = new System.Windows.Forms.Panel();
-            this.flmodules = new System.Windows.Forms.FlowLayoutPanel();
-            this.label5 = new System.Windows.Forms.Label();
-            this.label4 = new System.Windows.Forms.Label();
-            this.btntier = new System.Windows.Forms.Button();
-            this.label2 = new System.Windows.Forms.Label();
-            this.label1 = new System.Windows.Forms.Label();
-            this.btnstartbattle = new System.Windows.Forms.Button();
-            this.lbnets = new System.Windows.Forms.ListBox();
-            this.panel2 = new System.Windows.Forms.Panel();
-            this.lbnetdesc = new System.Windows.Forms.Label();
-            this.lbtitle = new System.Windows.Forms.Label();
-            this.tmrcalctotal = new System.Windows.Forms.Timer(this.components);
+            this.panel1 = new ShiftUI.Panel();
+            this.pnlonline = new ShiftUI.Panel();
+            this.btnjoinlobby = new ShiftUI.Button();
+            this.lbonlineservers = new ShiftUI.ListBox();
+            this.lbonlinedesc = new ShiftUI.Label();
+            this.lbonlineheader = new ShiftUI.Label();
+            this.button1 = new ShiftUI.Button();
+            this.label3 = new ShiftUI.Label();
+            this.btnscreen = new ShiftUI.Button();
+            this.pnlmynet = new ShiftUI.Panel();
+            this.flmodules = new ShiftUI.FlowLayoutPanel();
+            this.label5 = new ShiftUI.Label();
+            this.label4 = new ShiftUI.Label();
+            this.btntier = new ShiftUI.Button();
+            this.label2 = new ShiftUI.Label();
+            this.label1 = new ShiftUI.Label();
+            this.btnstartbattle = new ShiftUI.Button();
+            this.lbnets = new ShiftUI.ListBox();
+            this.panel2 = new ShiftUI.Panel();
+            this.lbnetdesc = new ShiftUI.Label();
+            this.lbtitle = new ShiftUI.Label();
+            this.tmrcalctotal = new ShiftUI.Timer(this.components);
             this.pgtotalhealth = new ShiftOS.ProgressBarEX();
-            this.label6 = new System.Windows.Forms.Label();
-            this.label7 = new System.Windows.Forms.Label();
-            this.txtmyname = new System.Windows.Forms.TextBox();
-            this.txtmydescription = new System.Windows.Forms.TextBox();
+            this.label6 = new ShiftUI.Label();
+            this.label7 = new ShiftUI.Label();
+            this.txtmyname = new ShiftUI.TextBox();
+            this.txtmydescription = new ShiftUI.TextBox();
             this.panel1.SuspendLayout();
             this.pnlonline.SuspendLayout();
             this.pnlmynet.SuspendLayout();
@@ -65,18 +65,18 @@
             // 
             // panel1
             // 
-            this.panel1.Controls.Add(this.pnlmynet);
-            this.panel1.Controls.Add(this.pnlonline);
-            this.panel1.Controls.Add(this.button1);
-            this.panel1.Controls.Add(this.label3);
-            this.panel1.Controls.Add(this.btnscreen);
-            this.panel1.Controls.Add(this.btntier);
-            this.panel1.Controls.Add(this.label2);
-            this.panel1.Controls.Add(this.label1);
-            this.panel1.Controls.Add(this.btnstartbattle);
-            this.panel1.Controls.Add(this.lbnets);
-            this.panel1.Controls.Add(this.panel2);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel1.Widgets.Add(this.pnlmynet);
+            this.panel1.Widgets.Add(this.pnlonline);
+            this.panel1.Widgets.Add(this.button1);
+            this.panel1.Widgets.Add(this.label3);
+            this.panel1.Widgets.Add(this.btnscreen);
+            this.panel1.Widgets.Add(this.btntier);
+            this.panel1.Widgets.Add(this.label2);
+            this.panel1.Widgets.Add(this.label1);
+            this.panel1.Widgets.Add(this.btnstartbattle);
+            this.panel1.Widgets.Add(this.lbnets);
+            this.panel1.Widgets.Add(this.panel2);
+            this.panel1.Dock = ShiftUI.DockStyle.Fill;
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
             this.panel1.Size = new System.Drawing.Size(725, 495);
@@ -84,10 +84,10 @@
             // 
             // pnlonline
             // 
-            this.pnlonline.Controls.Add(this.btnjoinlobby);
-            this.pnlonline.Controls.Add(this.lbonlineservers);
-            this.pnlonline.Controls.Add(this.lbonlinedesc);
-            this.pnlonline.Controls.Add(this.lbonlineheader);
+            this.pnlonline.Widgets.Add(this.btnjoinlobby);
+            this.pnlonline.Widgets.Add(this.lbonlineservers);
+            this.pnlonline.Widgets.Add(this.lbonlinedesc);
+            this.pnlonline.Widgets.Add(this.lbonlineheader);
             this.pnlonline.Location = new System.Drawing.Point(12, 12);
             this.pnlonline.Name = "pnlonline";
             this.pnlonline.Size = new System.Drawing.Size(404, 447);
@@ -95,9 +95,9 @@
             // 
             // btnjoinlobby
             // 
-            this.btnjoinlobby.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.btnjoinlobby.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left)));
             this.btnjoinlobby.Enabled = false;
-            this.btnjoinlobby.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnjoinlobby.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnjoinlobby.Location = new System.Drawing.Point(306, 415);
             this.btnjoinlobby.Name = "btnjoinlobby";
             this.btnjoinlobby.Size = new System.Drawing.Size(84, 23);
@@ -108,9 +108,9 @@
             // 
             // lbonlineservers
             // 
-            this.lbonlineservers.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.lbonlineservers.Anchor = ((ShiftUI.AnchorStyles)((((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.lbonlineservers.BackColor = System.Drawing.Color.Black;
             this.lbonlineservers.ForeColor = System.Drawing.Color.White;
             this.lbonlineservers.FormattingEnabled = true;
@@ -141,8 +141,8 @@
             // 
             // button1
             // 
-            this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.button1.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
+            this.button1.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.button1.Location = new System.Drawing.Point(549, 465);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(83, 23);
@@ -153,7 +153,7 @@
             // 
             // label3
             // 
-            this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.label3.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left)));
             this.label3.AutoSize = true;
             this.label3.Location = new System.Drawing.Point(282, 470);
             this.label3.Name = "label3";
@@ -163,8 +163,8 @@
             // 
             // btnscreen
             // 
-            this.btnscreen.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.btnscreen.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnscreen.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left)));
+            this.btnscreen.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnscreen.Location = new System.Drawing.Point(332, 465);
             this.btnscreen.Name = "btnscreen";
             this.btnscreen.Size = new System.Drawing.Size(84, 23);
@@ -175,17 +175,17 @@
             // 
             // pnlmynet
             // 
-            this.pnlmynet.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnlmynet.Controls.Add(this.txtmydescription);
-            this.pnlmynet.Controls.Add(this.txtmyname);
-            this.pnlmynet.Controls.Add(this.label7);
-            this.pnlmynet.Controls.Add(this.label6);
-            this.pnlmynet.Controls.Add(this.pgtotalhealth);
-            this.pnlmynet.Controls.Add(this.flmodules);
-            this.pnlmynet.Controls.Add(this.label5);
-            this.pnlmynet.Controls.Add(this.label4);
+            this.pnlmynet.Anchor = ((ShiftUI.AnchorStyles)((((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
+            this.pnlmynet.Widgets.Add(this.txtmydescription);
+            this.pnlmynet.Widgets.Add(this.txtmyname);
+            this.pnlmynet.Widgets.Add(this.label7);
+            this.pnlmynet.Widgets.Add(this.label6);
+            this.pnlmynet.Widgets.Add(this.pgtotalhealth);
+            this.pnlmynet.Widgets.Add(this.flmodules);
+            this.pnlmynet.Widgets.Add(this.label5);
+            this.pnlmynet.Widgets.Add(this.label4);
             this.pnlmynet.Location = new System.Drawing.Point(12, 12);
             this.pnlmynet.Name = "pnlmynet";
             this.pnlmynet.Size = new System.Drawing.Size(404, 447);
@@ -193,10 +193,10 @@
             // 
             // flmodules
             // 
-            this.flmodules.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.flmodules.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
+            this.flmodules.Anchor = ((ShiftUI.AnchorStyles)((((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
+            this.flmodules.FlowDirection = ShiftUI.FlowDirection.TopDown;
             this.flmodules.Location = new System.Drawing.Point(7, 140);
             this.flmodules.Name = "flmodules";
             this.flmodules.Size = new System.Drawing.Size(394, 219);
@@ -225,8 +225,8 @@
             // 
             // btntier
             // 
-            this.btntier.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.btntier.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btntier.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left)));
+            this.btntier.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btntier.Location = new System.Drawing.Point(47, 465);
             this.btntier.Name = "btntier";
             this.btntier.Size = new System.Drawing.Size(75, 23);
@@ -237,7 +237,7 @@
             // 
             // label2
             // 
-            this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.label2.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left)));
             this.label2.AutoSize = true;
             this.label2.Location = new System.Drawing.Point(13, 470);
             this.label2.Name = "label2";
@@ -247,7 +247,7 @@
             // 
             // label1
             // 
-            this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.label1.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
             this.label1.Location = new System.Drawing.Point(419, 354);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(294, 71);
@@ -256,8 +256,8 @@
             // 
             // btnstartbattle
             // 
-            this.btnstartbattle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnstartbattle.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnstartbattle.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
+            this.btnstartbattle.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnstartbattle.Location = new System.Drawing.Point(638, 465);
             this.btnstartbattle.Name = "btnstartbattle";
             this.btnstartbattle.Size = new System.Drawing.Size(75, 23);
@@ -268,9 +268,9 @@
             // 
             // lbnets
             // 
-            this.lbnets.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.lbnets.Anchor = ((ShiftUI.AnchorStyles)((((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.lbnets.BackColor = System.Drawing.Color.Black;
             this.lbnets.ForeColor = System.Drawing.Color.White;
             this.lbnets.FormattingEnabled = true;
@@ -282,9 +282,9 @@
             // 
             // panel2
             // 
-            this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.panel2.Controls.Add(this.lbnetdesc);
-            this.panel2.Controls.Add(this.lbtitle);
+            this.panel2.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Right)));
+            this.panel2.Widgets.Add(this.lbnetdesc);
+            this.panel2.Widgets.Add(this.lbtitle);
             this.panel2.Location = new System.Drawing.Point(422, 13);
             this.panel2.Name = "panel2";
             this.panel2.Size = new System.Drawing.Size(291, 326);
@@ -315,8 +315,8 @@
             // 
             // pgtotalhealth
             // 
-            this.pgtotalhealth.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.pgtotalhealth.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.pgtotalhealth.BackColor = System.Drawing.Color.Black;
             this.pgtotalhealth.BlockSeparation = 3;
             this.pgtotalhealth.BlockWidth = 5;
@@ -364,8 +364,8 @@
             // 
             // txtmydescription
             // 
-            this.txtmydescription.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtmydescription.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.txtmydescription.Location = new System.Drawing.Point(74, 397);
             this.txtmydescription.Name = "txtmydescription";
             this.txtmydescription.Size = new System.Drawing.Size(316, 20);
@@ -375,14 +375,14 @@
             // NetworkBrowser
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.White;
             this.ClientSize = new System.Drawing.Size(725, 495);
-            this.Controls.Add(this.panel1);
+            this.Widgets.Add(this.panel1);
             this.ForeColor = System.Drawing.Color.Black;
             this.Name = "NetworkBrowser";
             this.Text = "NetworkBrowser";
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.stop_matchmake);
+            this.FormClosing += new ShiftUI.FormClosingEventHandler(this.stop_matchmake);
             this.Load += new System.EventHandler(this.NetworkBrowser_Load);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
@@ -398,32 +398,32 @@
 
         #endregion
 
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Button btnstartbattle;
-        private System.Windows.Forms.ListBox lbnets;
-        private System.Windows.Forms.Panel panel2;
-        private System.Windows.Forms.Label lbnetdesc;
-        private System.Windows.Forms.Label lbtitle;
-        private System.Windows.Forms.Button btntier;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.Button btnscreen;
-        private System.Windows.Forms.Panel pnlmynet;
-        private System.Windows.Forms.FlowLayoutPanel flmodules;
-        private System.Windows.Forms.Label label5;
-        private System.Windows.Forms.Label label4;
+        private ShiftUI.Panel panel1;
+        private ShiftUI.Label label1;
+        private ShiftUI.Button btnstartbattle;
+        private ShiftUI.ListBox lbnets;
+        private ShiftUI.Panel panel2;
+        private ShiftUI.Label lbnetdesc;
+        private ShiftUI.Label lbtitle;
+        private ShiftUI.Button btntier;
+        private ShiftUI.Label label2;
+        private ShiftUI.Label label3;
+        private ShiftUI.Button btnscreen;
+        private ShiftUI.Panel pnlmynet;
+        private ShiftUI.FlowLayoutPanel flmodules;
+        private ShiftUI.Label label5;
+        private ShiftUI.Label label4;
         private ProgressBarEX pgtotalhealth;
-        private System.Windows.Forms.Timer tmrcalctotal;
-        private System.Windows.Forms.Panel pnlonline;
-        private System.Windows.Forms.Label lbonlinedesc;
-        private System.Windows.Forms.Label lbonlineheader;
-        private System.Windows.Forms.Button button1;
-        private System.Windows.Forms.ListBox lbonlineservers;
-        private System.Windows.Forms.Button btnjoinlobby;
-        private System.Windows.Forms.TextBox txtmydescription;
-        private System.Windows.Forms.TextBox txtmyname;
-        private System.Windows.Forms.Label label7;
-        private System.Windows.Forms.Label label6;
+        private ShiftUI.Timer tmrcalctotal;
+        private ShiftUI.Panel pnlonline;
+        private ShiftUI.Label lbonlinedesc;
+        private ShiftUI.Label lbonlineheader;
+        private ShiftUI.Button button1;
+        private ShiftUI.ListBox lbonlineservers;
+        private ShiftUI.Button btnjoinlobby;
+        private ShiftUI.TextBox txtmydescription;
+        private ShiftUI.TextBox txtmyname;
+        private ShiftUI.Label label7;
+        private ShiftUI.Label label6;
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Apps/NetworkBrowser.cs b/source/WindowsFormsApplication1/Apps/NetworkBrowser.cs
index 58dd811..d7aed28 100644
--- a/source/WindowsFormsApplication1/Apps/NetworkBrowser.cs
+++ b/source/WindowsFormsApplication1/Apps/NetworkBrowser.cs
@@ -8,7 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 using ShiftOS.Online.Hacking;
 
 namespace ShiftOS
@@ -308,11 +308,11 @@ Those above values only matter if the leader decides to become a friend. If they
 
         public void SetupMyNet()
         {
-            flmodules.Controls.Clear();
+            flmodules.Widgets.Clear();
             foreach(var m in Hacking.MyNetwork)
             {
                 var mStatus = new NetModuleStatus(m);
-                flmodules.Controls.Add(mStatus);
+                flmodules.Widgets.Add(mStatus);
                 mStatus.Show();
             }
         }
@@ -389,7 +389,7 @@ Those above values only matter if the leader decides to become a friend. If they
             API.CurrentSave.MyOnlineNetwork.Codepoints = API.Codepoints;
             Package_Grabber.SendMessage(selected_server.IPAddress, $"join_lobby {JsonConvert.SerializeObject(API.CurrentSave.MyOnlineNetwork)}");
             Online.Hacking.Matchmaker.Matchmake(selected_server);
-            var t = new System.Windows.Forms.Timer();
+            var t = new ShiftUI.Timer();
             t.Interval = 5000;
             int sindex = 0;
             t.Tick += (o, a) =>
diff --git a/source/WindowsFormsApplication1/Apps/NetworkBrowser.resx b/source/WindowsFormsApplication1/Apps/NetworkBrowser.resx
index e5cb9b1..4665259 100644
--- a/source/WindowsFormsApplication1/Apps/NetworkBrowser.resx
+++ b/source/WindowsFormsApplication1/Apps/NetworkBrowser.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="lbnetdesc.Text" xml:space="preserve">
     <value>Welcome to the Network Browser. Here, you can choose various enemy networks to battle and conquer. On the left is the network selection panel, and it will let you choose what network you'd like to fight. When you beat a network, it's removed from the list.
diff --git a/source/WindowsFormsApplication1/Apps/PanelManager.Designer.cs b/source/WindowsFormsApplication1/Apps/PanelManager.Designer.cs
index 2ae44a8..12d808b 100644
--- a/source/WindowsFormsApplication1/Apps/PanelManager.Designer.cs
+++ b/source/WindowsFormsApplication1/Apps/PanelManager.Designer.cs
@@ -28,24 +28,24 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.pnlmain = new System.Windows.Forms.Panel();
-            this.btndone = new System.Windows.Forms.Button();
-            this.pnlbgcolor = new System.Windows.Forms.Panel();
-            this.Label40 = new System.Windows.Forms.Label();
-            this.Label36 = new System.Windows.Forms.Label();
-            this.txtheight = new System.Windows.Forms.TextBox();
+            this.pnlmain = new ShiftUI.Panel();
+            this.btndone = new ShiftUI.Button();
+            this.pnlbgcolor = new ShiftUI.Panel();
+            this.Label40 = new ShiftUI.Label();
+            this.Label36 = new ShiftUI.Label();
+            this.txtheight = new ShiftUI.TextBox();
             this.pnlmain.SuspendLayout();
             this.SuspendLayout();
             // 
             // pnlmain
             // 
             this.pnlmain.BackColor = System.Drawing.Color.White;
-            this.pnlmain.Controls.Add(this.txtheight);
-            this.pnlmain.Controls.Add(this.Label36);
-            this.pnlmain.Controls.Add(this.pnlbgcolor);
-            this.pnlmain.Controls.Add(this.Label40);
-            this.pnlmain.Controls.Add(this.btndone);
-            this.pnlmain.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pnlmain.Widgets.Add(this.txtheight);
+            this.pnlmain.Widgets.Add(this.Label36);
+            this.pnlmain.Widgets.Add(this.pnlbgcolor);
+            this.pnlmain.Widgets.Add(this.Label40);
+            this.pnlmain.Widgets.Add(this.btndone);
+            this.pnlmain.Dock = ShiftUI.DockStyle.Fill;
             this.pnlmain.ForeColor = System.Drawing.Color.Black;
             this.pnlmain.Location = new System.Drawing.Point(0, 0);
             this.pnlmain.Name = "pnlmain";
@@ -54,8 +54,8 @@
             // 
             // btndone
             // 
-            this.btndone.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btndone.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btndone.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
+            this.btndone.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btndone.Location = new System.Drawing.Point(273, 343);
             this.btndone.Name = "btndone";
             this.btndone.Size = new System.Drawing.Size(75, 23);
@@ -66,12 +66,12 @@
             // 
             // pnlbgcolor
             // 
-            this.pnlbgcolor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlbgcolor.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlbgcolor.Location = new System.Drawing.Point(307, 101);
             this.pnlbgcolor.Name = "pnlbgcolor";
             this.pnlbgcolor.Size = new System.Drawing.Size(41, 20);
             this.pnlbgcolor.TabIndex = 22;
-            this.pnlbgcolor.MouseDown += new System.Windows.Forms.MouseEventHandler(this.setbgcolor);
+            this.pnlbgcolor.MouseDown += new ShiftUI.MouseEventHandler(this.setbgcolor);
             // 
             // Label40
             // 
@@ -96,7 +96,7 @@
             // txtheight
             // 
             this.txtheight.BackColor = System.Drawing.Color.White;
-            this.txtheight.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtheight.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtheight.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtheight.ForeColor = System.Drawing.Color.Black;
             this.txtheight.Location = new System.Drawing.Point(325, 134);
@@ -108,9 +108,9 @@
             // PanelManager
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(360, 378);
-            this.Controls.Add(this.pnlmain);
+            this.Widgets.Add(this.pnlmain);
             this.Name = "PanelManager";
             this.Text = "PanelManager";
             this.Load += new System.EventHandler(this.PanelManager_Load);
@@ -122,11 +122,11 @@
 
         #endregion
 
-        private System.Windows.Forms.Panel pnlmain;
-        private System.Windows.Forms.Button btndone;
-        private System.Windows.Forms.Panel pnlbgcolor;
-        private System.Windows.Forms.Label Label40;
-        private System.Windows.Forms.Label Label36;
-        private System.Windows.Forms.TextBox txtheight;
+        private ShiftUI.Panel pnlmain;
+        private ShiftUI.Button btndone;
+        private ShiftUI.Panel pnlbgcolor;
+        private ShiftUI.Label Label40;
+        private ShiftUI.Label Label36;
+        private ShiftUI.TextBox txtheight;
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Apps/PanelManager.cs b/source/WindowsFormsApplication1/Apps/PanelManager.cs
index d347fb5..241cfd7 100644
--- a/source/WindowsFormsApplication1/Apps/PanelManager.cs
+++ b/source/WindowsFormsApplication1/Apps/PanelManager.cs
@@ -6,7 +6,7 @@ using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
diff --git a/source/WindowsFormsApplication1/Apps/PanelManager.resx b/source/WindowsFormsApplication1/Apps/PanelManager.resx
index 1af7de1..ffb4fb5 100644
--- a/source/WindowsFormsApplication1/Apps/PanelManager.resx
+++ b/source/WindowsFormsApplication1/Apps/PanelManager.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Apps/Pong.Designer.cs b/source/WindowsFormsApplication1/Apps/Pong.Designer.cs
index d7d7bdb..4f75e30 100644
--- a/source/WindowsFormsApplication1/Apps/Pong.Designer.cs
+++ b/source/WindowsFormsApplication1/Apps/Pong.Designer.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
@@ -27,48 +27,48 @@ namespace ShiftOS
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Pong));
-            this.pgcontents = new System.Windows.Forms.Panel();
-            this.pnlgamestats = new System.Windows.Forms.Panel();
-            this.lblnextstats = new System.Windows.Forms.Label();
-            this.Label7 = new System.Windows.Forms.Label();
-            this.lblpreviousstats = new System.Windows.Forms.Label();
-            this.Label4 = new System.Windows.Forms.Label();
-            this.btnplayon = new System.Windows.Forms.Button();
-            this.Label3 = new System.Windows.Forms.Label();
-            this.btncashout = new System.Windows.Forms.Button();
-            this.Label2 = new System.Windows.Forms.Label();
-            this.lbllevelreached = new System.Windows.Forms.Label();
-            this.pnllose = new System.Windows.Forms.Panel();
-            this.lblmissedout = new System.Windows.Forms.Label();
-            this.btnlosetryagain = new System.Windows.Forms.Button();
-            this.Label5 = new System.Windows.Forms.Label();
-            this.Label1 = new System.Windows.Forms.Label();
-            this.pnlintro = new System.Windows.Forms.Panel();
-            this.Label6 = new System.Windows.Forms.Label();
-            this.btnstartgame = new System.Windows.Forms.Button();
-            this.Label8 = new System.Windows.Forms.Label();
-            this.pnlfinalstats = new System.Windows.Forms.Panel();
-            this.btnplayagain = new System.Windows.Forms.Button();
-            this.lblfinalcodepoints = new System.Windows.Forms.Label();
-            this.Label11 = new System.Windows.Forms.Label();
-            this.lblfinalcomputerreward = new System.Windows.Forms.Label();
-            this.Label9 = new System.Windows.Forms.Label();
-            this.lblfinallevelreward = new System.Windows.Forms.Label();
-            this.lblfinallevelreached = new System.Windows.Forms.Label();
-            this.lblfinalcodepointswithtext = new System.Windows.Forms.Label();
-            this.lblbeatai = new System.Windows.Forms.Label();
-            this.lblcountdown = new System.Windows.Forms.Label();
-            this.ball = new System.Windows.Forms.Panel();
-            this.paddleHuman = new System.Windows.Forms.PictureBox();
-            this.paddleComputer = new System.Windows.Forms.Panel();
-            this.lbllevelandtime = new System.Windows.Forms.Label();
-            this.lblstatscodepoints = new System.Windows.Forms.Label();
-            this.lblstatsY = new System.Windows.Forms.Label();
-            this.lblstatsX = new System.Windows.Forms.Label();
-            this.gameTimer = new System.Windows.Forms.Timer(this.components);
-            this.counter = new System.Windows.Forms.Timer(this.components);
-            this.tmrcountdown = new System.Windows.Forms.Timer(this.components);
-            this.tmrstoryline = new System.Windows.Forms.Timer(this.components);
+            this.pgcontents = new ShiftUI.Panel();
+            this.pnlgamestats = new ShiftUI.Panel();
+            this.lblnextstats = new ShiftUI.Label();
+            this.Label7 = new ShiftUI.Label();
+            this.lblpreviousstats = new ShiftUI.Label();
+            this.Label4 = new ShiftUI.Label();
+            this.btnplayon = new ShiftUI.Button();
+            this.Label3 = new ShiftUI.Label();
+            this.btncashout = new ShiftUI.Button();
+            this.Label2 = new ShiftUI.Label();
+            this.lbllevelreached = new ShiftUI.Label();
+            this.pnllose = new ShiftUI.Panel();
+            this.lblmissedout = new ShiftUI.Label();
+            this.btnlosetryagain = new ShiftUI.Button();
+            this.Label5 = new ShiftUI.Label();
+            this.Label1 = new ShiftUI.Label();
+            this.pnlintro = new ShiftUI.Panel();
+            this.Label6 = new ShiftUI.Label();
+            this.btnstartgame = new ShiftUI.Button();
+            this.Label8 = new ShiftUI.Label();
+            this.pnlfinalstats = new ShiftUI.Panel();
+            this.btnplayagain = new ShiftUI.Button();
+            this.lblfinalcodepoints = new ShiftUI.Label();
+            this.Label11 = new ShiftUI.Label();
+            this.lblfinalcomputerreward = new ShiftUI.Label();
+            this.Label9 = new ShiftUI.Label();
+            this.lblfinallevelreward = new ShiftUI.Label();
+            this.lblfinallevelreached = new ShiftUI.Label();
+            this.lblfinalcodepointswithtext = new ShiftUI.Label();
+            this.lblbeatai = new ShiftUI.Label();
+            this.lblcountdown = new ShiftUI.Label();
+            this.ball = new ShiftUI.Panel();
+            this.paddleHuman = new ShiftUI.PictureBox();
+            this.paddleComputer = new ShiftUI.Panel();
+            this.lbllevelandtime = new ShiftUI.Label();
+            this.lblstatscodepoints = new ShiftUI.Label();
+            this.lblstatsY = new ShiftUI.Label();
+            this.lblstatsX = new ShiftUI.Label();
+            this.gameTimer = new ShiftUI.Timer(this.components);
+            this.counter = new ShiftUI.Timer(this.components);
+            this.tmrcountdown = new ShiftUI.Timer(this.components);
+            this.tmrstoryline = new ShiftUI.Timer(this.components);
             this.pgcontents.SuspendLayout();
             this.pnlgamestats.SuspendLayout();
             this.pnllose.SuspendLayout();
@@ -80,37 +80,37 @@ namespace ShiftOS
             // pgcontents
             // 
             this.pgcontents.BackColor = System.Drawing.Color.White;
-            this.pgcontents.Controls.Add(this.pnlgamestats);
-            this.pgcontents.Controls.Add(this.pnllose);
-            this.pgcontents.Controls.Add(this.pnlintro);
-            this.pgcontents.Controls.Add(this.pnlfinalstats);
-            this.pgcontents.Controls.Add(this.lblbeatai);
-            this.pgcontents.Controls.Add(this.lblcountdown);
-            this.pgcontents.Controls.Add(this.ball);
-            this.pgcontents.Controls.Add(this.paddleHuman);
-            this.pgcontents.Controls.Add(this.paddleComputer);
-            this.pgcontents.Controls.Add(this.lbllevelandtime);
-            this.pgcontents.Controls.Add(this.lblstatscodepoints);
-            this.pgcontents.Controls.Add(this.lblstatsY);
-            this.pgcontents.Controls.Add(this.lblstatsX);
-            this.pgcontents.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pgcontents.Widgets.Add(this.pnlgamestats);
+            this.pgcontents.Widgets.Add(this.pnllose);
+            this.pgcontents.Widgets.Add(this.pnlintro);
+            this.pgcontents.Widgets.Add(this.pnlfinalstats);
+            this.pgcontents.Widgets.Add(this.lblbeatai);
+            this.pgcontents.Widgets.Add(this.lblcountdown);
+            this.pgcontents.Widgets.Add(this.ball);
+            this.pgcontents.Widgets.Add(this.paddleHuman);
+            this.pgcontents.Widgets.Add(this.paddleComputer);
+            this.pgcontents.Widgets.Add(this.lbllevelandtime);
+            this.pgcontents.Widgets.Add(this.lblstatscodepoints);
+            this.pgcontents.Widgets.Add(this.lblstatsY);
+            this.pgcontents.Widgets.Add(this.lblstatsX);
+            this.pgcontents.Dock = ShiftUI.DockStyle.Fill;
             this.pgcontents.Location = new System.Drawing.Point(0, 0);
             this.pgcontents.Name = "pgcontents";
             this.pgcontents.Size = new System.Drawing.Size(700, 400);
             this.pgcontents.TabIndex = 20;
-            this.pgcontents.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pongMain_MouseMove);
+            this.pgcontents.MouseMove += new ShiftUI.MouseEventHandler(this.pongMain_MouseMove);
             // 
             // pnlgamestats
             // 
-            this.pnlgamestats.Controls.Add(this.lblnextstats);
-            this.pnlgamestats.Controls.Add(this.Label7);
-            this.pnlgamestats.Controls.Add(this.lblpreviousstats);
-            this.pnlgamestats.Controls.Add(this.Label4);
-            this.pnlgamestats.Controls.Add(this.btnplayon);
-            this.pnlgamestats.Controls.Add(this.Label3);
-            this.pnlgamestats.Controls.Add(this.btncashout);
-            this.pnlgamestats.Controls.Add(this.Label2);
-            this.pnlgamestats.Controls.Add(this.lbllevelreached);
+            this.pnlgamestats.Widgets.Add(this.lblnextstats);
+            this.pnlgamestats.Widgets.Add(this.Label7);
+            this.pnlgamestats.Widgets.Add(this.lblpreviousstats);
+            this.pnlgamestats.Widgets.Add(this.Label4);
+            this.pnlgamestats.Widgets.Add(this.btnplayon);
+            this.pnlgamestats.Widgets.Add(this.Label3);
+            this.pnlgamestats.Widgets.Add(this.btncashout);
+            this.pnlgamestats.Widgets.Add(this.Label2);
+            this.pnlgamestats.Widgets.Add(this.lbllevelreached);
             this.pnlgamestats.Location = new System.Drawing.Point(56, 76);
             this.pnlgamestats.Name = "pnlgamestats";
             this.pnlgamestats.Size = new System.Drawing.Size(466, 206);
@@ -155,7 +155,7 @@ namespace ShiftOS
             // 
             // btnplayon
             // 
-            this.btnplayon.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnplayon.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnplayon.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnplayon.Location = new System.Drawing.Point(32, 162);
             this.btnplayon.Name = "btnplayon";
@@ -177,7 +177,7 @@ namespace ShiftOS
             // 
             // btncashout
             // 
-            this.btncashout.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btncashout.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btncashout.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btncashout.Location = new System.Drawing.Point(32, 73);
             this.btncashout.Name = "btncashout";
@@ -209,10 +209,10 @@ namespace ShiftOS
             // 
             // pnllose
             // 
-            this.pnllose.Controls.Add(this.lblmissedout);
-            this.pnllose.Controls.Add(this.btnlosetryagain);
-            this.pnllose.Controls.Add(this.Label5);
-            this.pnllose.Controls.Add(this.Label1);
+            this.pnllose.Widgets.Add(this.lblmissedout);
+            this.pnllose.Widgets.Add(this.btnlosetryagain);
+            this.pnllose.Widgets.Add(this.Label5);
+            this.pnllose.Widgets.Add(this.Label1);
             this.pnllose.Location = new System.Drawing.Point(209, 71);
             this.pnllose.Name = "pnllose";
             this.pnllose.Size = new System.Drawing.Size(266, 214);
@@ -231,7 +231,7 @@ namespace ShiftOS
             // 
             // btnlosetryagain
             // 
-            this.btnlosetryagain.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnlosetryagain.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnlosetryagain.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnlosetryagain.Location = new System.Drawing.Point(155, 176);
             this.btnlosetryagain.Name = "btnlosetryagain";
@@ -250,7 +250,7 @@ namespace ShiftOS
             // 
             // Label1
             // 
-            this.Label1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.Label1.Dock = ShiftUI.DockStyle.Top;
             this.Label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.Label1.Location = new System.Drawing.Point(0, 0);
             this.Label1.Name = "Label1";
@@ -261,9 +261,9 @@ namespace ShiftOS
             // 
             // pnlintro
             // 
-            this.pnlintro.Controls.Add(this.Label6);
-            this.pnlintro.Controls.Add(this.btnstartgame);
-            this.pnlintro.Controls.Add(this.Label8);
+            this.pnlintro.Widgets.Add(this.Label6);
+            this.pnlintro.Widgets.Add(this.btnstartgame);
+            this.pnlintro.Widgets.Add(this.Label8);
             this.pnlintro.Location = new System.Drawing.Point(52, 29);
             this.pnlintro.Name = "pnlintro";
             this.pnlintro.Size = new System.Drawing.Size(595, 303);
@@ -281,7 +281,7 @@ namespace ShiftOS
             // 
             // btnstartgame
             // 
-            this.btnstartgame.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnstartgame.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnstartgame.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnstartgame.Location = new System.Drawing.Point(186, 273);
             this.btnstartgame.Name = "btnstartgame";
@@ -304,14 +304,14 @@ namespace ShiftOS
             // 
             // pnlfinalstats
             // 
-            this.pnlfinalstats.Controls.Add(this.btnplayagain);
-            this.pnlfinalstats.Controls.Add(this.lblfinalcodepoints);
-            this.pnlfinalstats.Controls.Add(this.Label11);
-            this.pnlfinalstats.Controls.Add(this.lblfinalcomputerreward);
-            this.pnlfinalstats.Controls.Add(this.Label9);
-            this.pnlfinalstats.Controls.Add(this.lblfinallevelreward);
-            this.pnlfinalstats.Controls.Add(this.lblfinallevelreached);
-            this.pnlfinalstats.Controls.Add(this.lblfinalcodepointswithtext);
+            this.pnlfinalstats.Widgets.Add(this.btnplayagain);
+            this.pnlfinalstats.Widgets.Add(this.lblfinalcodepoints);
+            this.pnlfinalstats.Widgets.Add(this.Label11);
+            this.pnlfinalstats.Widgets.Add(this.lblfinalcomputerreward);
+            this.pnlfinalstats.Widgets.Add(this.Label9);
+            this.pnlfinalstats.Widgets.Add(this.lblfinallevelreward);
+            this.pnlfinalstats.Widgets.Add(this.lblfinallevelreached);
+            this.pnlfinalstats.Widgets.Add(this.lblfinalcodepointswithtext);
             this.pnlfinalstats.Location = new System.Drawing.Point(172, 74);
             this.pnlfinalstats.Name = "pnlfinalstats";
             this.pnlfinalstats.Size = new System.Drawing.Size(362, 226);
@@ -320,7 +320,7 @@ namespace ShiftOS
             // 
             // btnplayagain
             // 
-            this.btnplayagain.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnplayagain.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnplayagain.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnplayagain.Location = new System.Drawing.Point(5, 194);
             this.btnplayagain.Name = "btnplayagain";
@@ -440,8 +440,8 @@ namespace ShiftOS
             // 
             // paddleComputer
             // 
-            this.paddleComputer.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.paddleComputer.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Right)));
             this.paddleComputer.BackColor = System.Drawing.Color.Black;
             this.paddleComputer.Location = new System.Drawing.Point(666, 134);
             this.paddleComputer.MaximumSize = new System.Drawing.Size(20, 100);
@@ -451,7 +451,7 @@ namespace ShiftOS
             // 
             // lbllevelandtime
             // 
-            this.lbllevelandtime.Dock = System.Windows.Forms.DockStyle.Top;
+            this.lbllevelandtime.Dock = ShiftUI.DockStyle.Top;
             this.lbllevelandtime.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.lbllevelandtime.Location = new System.Drawing.Point(0, 0);
             this.lbllevelandtime.Name = "lbllevelandtime";
@@ -462,8 +462,8 @@ namespace ShiftOS
             // 
             // lblstatscodepoints
             // 
-            this.lblstatscodepoints.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.lblstatscodepoints.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.lblstatscodepoints.Font = new System.Drawing.Font("Georgia", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.lblstatscodepoints.Location = new System.Drawing.Point(239, 356);
             this.lblstatscodepoints.Name = "lblstatscodepoints";
@@ -474,7 +474,7 @@ namespace ShiftOS
             // 
             // lblstatsY
             // 
-            this.lblstatsY.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.lblstatsY.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
             this.lblstatsY.Font = new System.Drawing.Font("Georgia", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.lblstatsY.Location = new System.Drawing.Point(542, 356);
             this.lblstatsY.Name = "lblstatsY";
@@ -485,7 +485,7 @@ namespace ShiftOS
             // 
             // lblstatsX
             // 
-            this.lblstatsX.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.lblstatsX.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left)));
             this.lblstatsX.Font = new System.Drawing.Font("Georgia", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.lblstatsX.Location = new System.Drawing.Point(3, 356);
             this.lblstatsX.Name = "lblstatsX";
@@ -517,18 +517,18 @@ namespace ShiftOS
             // Pong
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.White;
             this.ClientSize = new System.Drawing.Size(700, 400);
-            this.Controls.Add(this.pgcontents);
+            this.Widgets.Add(this.pgcontents);
             this.DoubleBuffered = true;
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.FormBorderStyle = ShiftUI.FormBorderStyle.None;
             this.Name = "Pong";
             this.Text = "Pong";
             this.TopMost = true;
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.me_closing);
+            this.FormClosing += new ShiftUI.FormClosingEventHandler(this.me_closing);
             this.Load += new System.EventHandler(this.Pong_Load);
-            this.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pongMain_MouseMove);
+            this.MouseMove += new ShiftUI.MouseEventHandler(this.pongMain_MouseMove);
             this.pgcontents.ResumeLayout(false);
             this.pnlgamestats.ResumeLayout(false);
             this.pnlgamestats.PerformLayout();
@@ -541,48 +541,48 @@ namespace ShiftOS
             this.ResumeLayout(false);
 
         }
-        internal System.Windows.Forms.Panel pgcontents;
-        internal System.Windows.Forms.Panel ball;
-        internal System.Windows.Forms.Panel paddleComputer;
-        internal System.Windows.Forms.Timer gameTimer;
-        internal System.Windows.Forms.PictureBox paddleHuman;
-        internal System.Windows.Forms.Label lbllevelandtime;
-        internal System.Windows.Forms.Label lblstatsX;
-        internal System.Windows.Forms.Timer counter;
-        internal System.Windows.Forms.Panel pnlgamestats;
-        internal System.Windows.Forms.Label lblnextstats;
-        internal System.Windows.Forms.Label Label7;
-        internal System.Windows.Forms.Label lblpreviousstats;
-        internal System.Windows.Forms.Label Label4;
-        internal System.Windows.Forms.Button btnplayon;
-        internal System.Windows.Forms.Label Label3;
-        internal System.Windows.Forms.Button btncashout;
-        internal System.Windows.Forms.Label Label2;
-        internal System.Windows.Forms.Label lbllevelreached;
-        internal System.Windows.Forms.Label lblcountdown;
-        internal System.Windows.Forms.Timer tmrcountdown;
-        internal System.Windows.Forms.Label lblbeatai;
-        internal System.Windows.Forms.Panel pnlfinalstats;
-        internal System.Windows.Forms.Button btnplayagain;
-        internal System.Windows.Forms.Label lblfinalcodepoints;
-        internal System.Windows.Forms.Label Label11;
-        internal System.Windows.Forms.Label lblfinalcomputerreward;
-        internal System.Windows.Forms.Label Label9;
-        internal System.Windows.Forms.Label lblfinallevelreward;
-        internal System.Windows.Forms.Label lblfinallevelreached;
-        internal System.Windows.Forms.Label lblfinalcodepointswithtext;
-        internal System.Windows.Forms.Panel pnllose;
-        internal System.Windows.Forms.Label lblmissedout;
-        internal System.Windows.Forms.Button btnlosetryagain;
-        internal System.Windows.Forms.Label Label5;
-        internal System.Windows.Forms.Label Label1;
-        internal System.Windows.Forms.Label lblstatscodepoints;
-        internal System.Windows.Forms.Label lblstatsY;
-        internal System.Windows.Forms.Panel pnlintro;
-        internal System.Windows.Forms.Label Label6;
-        internal System.Windows.Forms.Button btnstartgame;
-        internal System.Windows.Forms.Label Label8;
-        internal System.Windows.Forms.Timer tmrstoryline;
+        internal ShiftUI.Panel pgcontents;
+        internal ShiftUI.Panel ball;
+        internal ShiftUI.Panel paddleComputer;
+        internal ShiftUI.Timer gameTimer;
+        internal ShiftUI.PictureBox paddleHuman;
+        internal ShiftUI.Label lbllevelandtime;
+        internal ShiftUI.Label lblstatsX;
+        internal ShiftUI.Timer counter;
+        internal ShiftUI.Panel pnlgamestats;
+        internal ShiftUI.Label lblnextstats;
+        internal ShiftUI.Label Label7;
+        internal ShiftUI.Label lblpreviousstats;
+        internal ShiftUI.Label Label4;
+        internal ShiftUI.Button btnplayon;
+        internal ShiftUI.Label Label3;
+        internal ShiftUI.Button btncashout;
+        internal ShiftUI.Label Label2;
+        internal ShiftUI.Label lbllevelreached;
+        internal ShiftUI.Label lblcountdown;
+        internal ShiftUI.Timer tmrcountdown;
+        internal ShiftUI.Label lblbeatai;
+        internal ShiftUI.Panel pnlfinalstats;
+        internal ShiftUI.Button btnplayagain;
+        internal ShiftUI.Label lblfinalcodepoints;
+        internal ShiftUI.Label Label11;
+        internal ShiftUI.Label lblfinalcomputerreward;
+        internal ShiftUI.Label Label9;
+        internal ShiftUI.Label lblfinallevelreward;
+        internal ShiftUI.Label lblfinallevelreached;
+        internal ShiftUI.Label lblfinalcodepointswithtext;
+        internal ShiftUI.Panel pnllose;
+        internal ShiftUI.Label lblmissedout;
+        internal ShiftUI.Button btnlosetryagain;
+        internal ShiftUI.Label Label5;
+        internal ShiftUI.Label Label1;
+        internal ShiftUI.Label lblstatscodepoints;
+        internal ShiftUI.Label lblstatsY;
+        internal ShiftUI.Panel pnlintro;
+        internal ShiftUI.Label Label6;
+        internal ShiftUI.Button btnstartgame;
+        internal ShiftUI.Label Label8;
+        internal ShiftUI.Timer tmrstoryline;
 
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Apps/Pong.cs b/source/WindowsFormsApplication1/Apps/Pong.cs
index c685100..fb14dde 100644
--- a/source/WindowsFormsApplication1/Apps/Pong.cs
+++ b/source/WindowsFormsApplication1/Apps/Pong.cs
@@ -7,7 +7,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
@@ -50,7 +50,7 @@ namespace ShiftOS
         }
 
         // Move the paddle according to the mouse position.
-        private void pongMain_MouseMove(object sender, System.Windows.Forms.MouseEventArgs e)
+        private void pongMain_MouseMove(object sender, ShiftUI.MouseEventArgs e)
         {
             paddleHuman.Location = new Point(paddleHuman.Location.X, (MousePosition.Y - this.Location.Y) - (paddleHuman.Height / 2));
         }
diff --git a/source/WindowsFormsApplication1/Apps/Pong.resx b/source/WindowsFormsApplication1/Apps/Pong.resx
index cedb787..b50b452 100644
--- a/source/WindowsFormsApplication1/Apps/Pong.resx
+++ b/source/WindowsFormsApplication1/Apps/Pong.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Label6.Text" xml:space="preserve">
     <value>Pong is a classic arcade game from the late 20th century, ported over to ShiftOS.
diff --git a/source/WindowsFormsApplication1/Apps/Shifter.Designer.cs b/source/WindowsFormsApplication1/Apps/Shifter.Designer.cs
index d49294e..03398e3 100644
--- a/source/WindowsFormsApplication1/Apps/Shifter.Designer.cs
+++ b/source/WindowsFormsApplication1/Apps/Shifter.Designer.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
@@ -17,8 +17,7 @@ namespace ShiftOS
         protected override void Dispose(bool disposing)
         {
             if (disposing && (components != null))
-            {
-                components.Dispose();
+            {                components.Dispose();
             }
             base.Dispose(disposing);
         }
@@ -27,420 +26,419 @@ namespace ShiftOS
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Shifter));
-            this.ColorDialog1 = new System.Windows.Forms.ColorDialog();
-            this.clocktick = new System.Windows.Forms.Timer(this.components);
-            this.customizationtime = new System.Windows.Forms.Timer(this.components);
-            this.timerearned = new System.Windows.Forms.Timer(this.components);
-            this.Label1 = new System.Windows.Forms.Label();
-            this.btnapply = new System.Windows.Forms.Button();
-            this.catholder = new System.Windows.Forms.Panel();
-            this.btnmore = new System.Windows.Forms.Button();
-            this.btnreset = new System.Windows.Forms.Button();
-            this.btnwindowcomposition = new System.Windows.Forms.Button();
-            this.btndesktopicons = new System.Windows.Forms.Button();
-            this.btnmenus = new System.Windows.Forms.Button();
-            this.btnwindows = new System.Windows.Forms.Button();
-            this.btndesktop = new System.Windows.Forms.Button();
-            this.pnlshifterintro = new System.Windows.Forms.Panel();
-            this.Label66 = new System.Windows.Forms.Label();
-            this.Label65 = new System.Windows.Forms.Label();
-            this.Label64 = new System.Windows.Forms.Label();
-            this.Label63 = new System.Windows.Forms.Label();
-            this.pnldesktopoptions = new System.Windows.Forms.Panel();
-            this.pnldesktoppaneloptions = new System.Windows.Forms.Panel();
-            this.btnpanelbuttons = new System.Windows.Forms.Button();
-            this.lbwarning = new System.Windows.Forms.Label();
-            this.combodesktoppanelposition = new System.Windows.Forms.ComboBox();
-            this.lbposition = new System.Windows.Forms.Label();
-            this.Label47 = new System.Windows.Forms.Label();
-            this.txtdesktoppanelheight = new System.Windows.Forms.NumericUpDown();
-            this.lbheight = new System.Windows.Forms.Label();
-            this.pnldesktoppanelcolour = new System.Windows.Forms.Panel();
-            this.lbpanelcolor = new System.Windows.Forms.Label();
-            this.pnlapplauncheroptions = new System.Windows.Forms.Panel();
-            this.pnlalhover = new System.Windows.Forms.Panel();
-            this.label119 = new System.Windows.Forms.Label();
-            this.Label71 = new System.Windows.Forms.Label();
-            this.txtapplauncherwidth = new System.Windows.Forms.TextBox();
-            this.Label72 = new System.Windows.Forms.Label();
-            this.txtappbuttonlabel = new System.Windows.Forms.TextBox();
-            this.Label51 = new System.Windows.Forms.Label();
-            this.Label50 = new System.Windows.Forms.Label();
-            this.pnlmaintextcolour = new System.Windows.Forms.Panel();
-            this.comboappbuttontextstyle = new System.Windows.Forms.ComboBox();
-            this.comboappbuttontextfont = new System.Windows.Forms.ComboBox();
-            this.Label37 = new System.Windows.Forms.Label();
-            this.Label38 = new System.Windows.Forms.Label();
-            this.txtappbuttontextsize = new System.Windows.Forms.TextBox();
-            this.Label39 = new System.Windows.Forms.Label();
-            this.Label40 = new System.Windows.Forms.Label();
-            this.pnlmainbuttonactivated = new System.Windows.Forms.Panel();
-            this.Label28 = new System.Windows.Forms.Label();
-            this.Label35 = new System.Windows.Forms.Label();
-            this.txtapplicationsbuttonheight = new System.Windows.Forms.TextBox();
-            this.Label36 = new System.Windows.Forms.Label();
-            this.pnlmainbuttoncolour = new System.Windows.Forms.Panel();
-            this.Label43 = new System.Windows.Forms.Label();
-            this.pnldesktopintro = new System.Windows.Forms.Panel();
-            this.Label69 = new System.Windows.Forms.Label();
-            this.Label70 = new System.Windows.Forms.Label();
-            this.pnlpanelbuttonsoptions = new System.Windows.Forms.Panel();
-            this.pnlpanelbuttontextcolour = new System.Windows.Forms.Panel();
-            this.Label101 = new System.Windows.Forms.Label();
-            this.txtpanelbuttontexttop = new System.Windows.Forms.TextBox();
-            this.Label104 = new System.Windows.Forms.Label();
-            this.txtpanelbuttontextside = new System.Windows.Forms.TextBox();
-            this.Label106 = new System.Windows.Forms.Label();
-            this.Label93 = new System.Windows.Forms.Label();
-            this.txtpanelbuttontop = new System.Windows.Forms.TextBox();
-            this.Label94 = new System.Windows.Forms.Label();
-            this.txtpanelbuttoninitalgap = new System.Windows.Forms.TextBox();
-            this.Label108 = new System.Windows.Forms.Label();
-            this.txtpanelbuttonicontop = new System.Windows.Forms.TextBox();
-            this.Label110 = new System.Windows.Forms.Label();
-            this.txtpanelbuttoniconside = new System.Windows.Forms.TextBox();
-            this.Label112 = new System.Windows.Forms.Label();
-            this.txtpanelbuttoniconsize = new System.Windows.Forms.TextBox();
-            this.Label105 = new System.Windows.Forms.Label();
-            this.cbpanelbuttontextstyle = new System.Windows.Forms.ComboBox();
-            this.cbpanelbuttonfont = new System.Windows.Forms.ComboBox();
-            this.Label100 = new System.Windows.Forms.Label();
-            this.txtpaneltextbuttonsize = new System.Windows.Forms.TextBox();
-            this.Label102 = new System.Windows.Forms.Label();
-            this.Label103 = new System.Windows.Forms.Label();
-            this.Label98 = new System.Windows.Forms.Label();
-            this.txtpanelbuttongap = new System.Windows.Forms.TextBox();
-            this.Label99 = new System.Windows.Forms.Label();
-            this.Label96 = new System.Windows.Forms.Label();
-            this.txtpanelbuttonheight = new System.Windows.Forms.TextBox();
-            this.Label97 = new System.Windows.Forms.Label();
-            this.Label92 = new System.Windows.Forms.Label();
-            this.txtpanelbuttonwidth = new System.Windows.Forms.TextBox();
-            this.Label91 = new System.Windows.Forms.Label();
-            this.pnlpanelbuttoncolour = new System.Windows.Forms.Panel();
-            this.Label95 = new System.Windows.Forms.Label();
-            this.pnldesktopbackgroundoptions = new System.Windows.Forms.Panel();
-            this.pnldesktopcolour = new System.Windows.Forms.Panel();
-            this.Label45 = new System.Windows.Forms.Label();
-            this.pnlpanelclockoptions = new System.Windows.Forms.Panel();
-            this.pnlclockbackgroundcolour = new System.Windows.Forms.Panel();
-            this.Label44 = new System.Windows.Forms.Label();
-            this.comboclocktextstyle = new System.Windows.Forms.ComboBox();
-            this.comboclocktextfont = new System.Windows.Forms.ComboBox();
-            this.Label26 = new System.Windows.Forms.Label();
-            this.Label29 = new System.Windows.Forms.Label();
-            this.txtclocktextfromtop = new System.Windows.Forms.TextBox();
-            this.Label30 = new System.Windows.Forms.Label();
-            this.Label31 = new System.Windows.Forms.Label();
-            this.txtclocktextsize = new System.Windows.Forms.TextBox();
-            this.Label32 = new System.Windows.Forms.Label();
-            this.Label33 = new System.Windows.Forms.Label();
-            this.pnlpanelclocktextcolour = new System.Windows.Forms.Panel();
-            this.Label34 = new System.Windows.Forms.Label();
-            this.pnldesktoppreview = new System.Windows.Forms.Panel();
-            this.predesktoppanel = new System.Windows.Forms.Panel();
-            this.prepnlpanelbuttonholder = new System.Windows.Forms.FlowLayoutPanel();
-            this.prepnlpanelbutton = new System.Windows.Forms.Panel();
-            this.pretbicon = new System.Windows.Forms.PictureBox();
-            this.pretbctext = new System.Windows.Forms.Label();
-            this.pretimepanel = new System.Windows.Forms.Panel();
-            this.prepaneltimetext = new System.Windows.Forms.Label();
-            this.preapplaunchermenuholder = new System.Windows.Forms.Panel();
-            this.predesktopappmenu = new System.Windows.Forms.MenuStrip();
-            this.ApplicationsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.KnowledgeInputToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ShiftoriumToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ClockToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.TerminalToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ShifterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ToolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
-            this.ShutdownToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.Panel10 = new System.Windows.Forms.Panel();
-            this.btndesktopitself = new System.Windows.Forms.Button();
-            this.btnpanelclock = new System.Windows.Forms.Button();
-            this.btnapplauncher = new System.Windows.Forms.Button();
-            this.btndesktoppanel = new System.Windows.Forms.Button();
-            this.txtpanelbuttoniconheight = new System.Windows.Forms.TextBox();
-            this.pnlwindowsoptions = new System.Windows.Forms.Panel();
-            this.pnlwindowsintro = new System.Windows.Forms.Panel();
-            this.Label68 = new System.Windows.Forms.Label();
-            this.Label67 = new System.Windows.Forms.Label();
-            this.pnlbuttonoptions = new System.Windows.Forms.Panel();
-            this.pnlclosebuttonoptions = new System.Windows.Forms.Panel();
-            this.Label8 = new System.Windows.Forms.Label();
-            this.Label11 = new System.Windows.Forms.Label();
-            this.pnlclosebuttoncolour = new System.Windows.Forms.Panel();
-            this.txtclosebuttonfromside = new System.Windows.Forms.TextBox();
-            this.Label7 = new System.Windows.Forms.Label();
-            this.Label12 = new System.Windows.Forms.Label();
-            this.txtclosebuttonheight = new System.Windows.Forms.TextBox();
-            this.Label13 = new System.Windows.Forms.Label();
-            this.Label6 = new System.Windows.Forms.Label();
-            this.txtclosebuttonfromtop = new System.Windows.Forms.TextBox();
-            this.Label10 = new System.Windows.Forms.Label();
-            this.Label14 = new System.Windows.Forms.Label();
-            this.txtclosebuttonwidth = new System.Windows.Forms.TextBox();
-            this.Label9 = new System.Windows.Forms.Label();
-            this.pnlrollupbuttonoptions = new System.Windows.Forms.Panel();
-            this.Label54 = new System.Windows.Forms.Label();
-            this.Label55 = new System.Windows.Forms.Label();
-            this.pnlrollupbuttoncolour = new System.Windows.Forms.Panel();
-            this.txtrollupbuttonside = new System.Windows.Forms.TextBox();
-            this.Label56 = new System.Windows.Forms.Label();
-            this.Label57 = new System.Windows.Forms.Label();
-            this.txtrollupbuttonheight = new System.Windows.Forms.TextBox();
-            this.Label58 = new System.Windows.Forms.Label();
-            this.Label59 = new System.Windows.Forms.Label();
-            this.txtrollupbuttontop = new System.Windows.Forms.TextBox();
-            this.Label60 = new System.Windows.Forms.Label();
-            this.Label61 = new System.Windows.Forms.Label();
-            this.txtrollupbuttonwidth = new System.Windows.Forms.TextBox();
-            this.Label62 = new System.Windows.Forms.Label();
-            this.pnlminimizebuttonoptions = new System.Windows.Forms.Panel();
-            this.Label82 = new System.Windows.Forms.Label();
-            this.Label83 = new System.Windows.Forms.Label();
-            this.pnlminimizebuttoncolour = new System.Windows.Forms.Panel();
-            this.txtminimizebuttonside = new System.Windows.Forms.TextBox();
-            this.Label84 = new System.Windows.Forms.Label();
-            this.Label85 = new System.Windows.Forms.Label();
-            this.txtminimizebuttonheight = new System.Windows.Forms.TextBox();
-            this.Label86 = new System.Windows.Forms.Label();
-            this.Label87 = new System.Windows.Forms.Label();
-            this.txtminimizebuttontop = new System.Windows.Forms.TextBox();
-            this.Label88 = new System.Windows.Forms.Label();
-            this.Label89 = new System.Windows.Forms.Label();
-            this.txtminimizebuttonwidth = new System.Windows.Forms.TextBox();
-            this.Label90 = new System.Windows.Forms.Label();
-            this.combobuttonoption = new System.Windows.Forms.ComboBox();
-            this.Label52 = new System.Windows.Forms.Label();
-            this.pnltitlebaroptions = new System.Windows.Forms.Panel();
-            this.Label80 = new System.Windows.Forms.Label();
-            this.txticonfromtop = new System.Windows.Forms.TextBox();
-            this.Label81 = new System.Windows.Forms.Label();
-            this.Label78 = new System.Windows.Forms.Label();
-            this.txticonfromside = new System.Windows.Forms.TextBox();
-            this.Label79 = new System.Windows.Forms.Label();
-            this.lbcornerwidthpx = new System.Windows.Forms.Label();
-            this.txttitlebarcornerwidth = new System.Windows.Forms.TextBox();
-            this.lbcornerwidth = new System.Windows.Forms.Label();
-            this.pnltitlebarrightcornercolour = new System.Windows.Forms.Panel();
-            this.pnltitlebarleftcornercolour = new System.Windows.Forms.Panel();
-            this.lbrightcornercolor = new System.Windows.Forms.Label();
-            this.lbleftcornercolor = new System.Windows.Forms.Label();
-            this.cboxtitlebarcorners = new System.Windows.Forms.CheckBox();
-            this.Label5 = new System.Windows.Forms.Label();
-            this.txttitlebarheight = new System.Windows.Forms.TextBox();
-            this.Label4 = new System.Windows.Forms.Label();
-            this.pnltitlebarcolour = new System.Windows.Forms.Panel();
-            this.Label2 = new System.Windows.Forms.Label();
-            this.pnlborderoptions = new System.Windows.Forms.Panel();
-            this.cbindividualbordercolours = new System.Windows.Forms.CheckBox();
-            this.pnlborderbottomrightcolour = new System.Windows.Forms.Panel();
-            this.lbbright = new System.Windows.Forms.Label();
-            this.pnlborderbottomcolour = new System.Windows.Forms.Panel();
-            this.lbbottom = new System.Windows.Forms.Label();
-            this.pnlborderbottomleftcolour = new System.Windows.Forms.Panel();
-            this.lbbleft = new System.Windows.Forms.Label();
-            this.pnlborderrightcolour = new System.Windows.Forms.Panel();
-            this.lbright = new System.Windows.Forms.Label();
-            this.pnlborderleftcolour = new System.Windows.Forms.Panel();
-            this.lbleft = new System.Windows.Forms.Label();
-            this.Label15 = new System.Windows.Forms.Label();
-            this.pnlbordercolour = new System.Windows.Forms.Panel();
-            this.txtbordersize = new System.Windows.Forms.TextBox();
-            this.Label3 = new System.Windows.Forms.Label();
-            this.Label16 = new System.Windows.Forms.Label();
-            this.pnltitletextoptions = new System.Windows.Forms.Panel();
-            this.combotitletextposition = new System.Windows.Forms.ComboBox();
-            this.Label53 = new System.Windows.Forms.Label();
-            this.combotitletextstyle = new System.Windows.Forms.ComboBox();
-            this.combotitletextfont = new System.Windows.Forms.ComboBox();
-            this.Label23 = new System.Windows.Forms.Label();
-            this.Label17 = new System.Windows.Forms.Label();
-            this.txttitletextside = new System.Windows.Forms.TextBox();
-            this.Label18 = new System.Windows.Forms.Label();
-            this.Label19 = new System.Windows.Forms.Label();
-            this.txttitletexttop = new System.Windows.Forms.TextBox();
-            this.Label20 = new System.Windows.Forms.Label();
-            this.Label21 = new System.Windows.Forms.Label();
-            this.txttitletextsize = new System.Windows.Forms.TextBox();
-            this.Label22 = new System.Windows.Forms.Label();
-            this.Label24 = new System.Windows.Forms.Label();
-            this.pnltitletextcolour = new System.Windows.Forms.Panel();
-            this.Label25 = new System.Windows.Forms.Label();
-            this.pnlwindowsobjects = new System.Windows.Forms.Panel();
-            this.btnborders = new System.Windows.Forms.Button();
-            this.btnbuttons = new System.Windows.Forms.Button();
-            this.btntitletext = new System.Windows.Forms.Button();
-            this.btntitlebar = new System.Windows.Forms.Button();
-            this.pnlwindowpreview = new System.Windows.Forms.Panel();
-            this.prepgcontent = new System.Windows.Forms.Panel();
-            this.prepgbottom = new System.Windows.Forms.Panel();
-            this.prepgleft = new System.Windows.Forms.Panel();
-            this.prepgbottomlcorner = new System.Windows.Forms.Panel();
-            this.prepgright = new System.Windows.Forms.Panel();
-            this.prepgbottomrcorner = new System.Windows.Forms.Panel();
-            this.pretitlebar = new System.Windows.Forms.Panel();
-            this.preminimizebutton = new System.Windows.Forms.Panel();
-            this.prepnlicon = new System.Windows.Forms.PictureBox();
-            this.prerollupbutton = new System.Windows.Forms.Panel();
-            this.preclosebutton = new System.Windows.Forms.Panel();
-            this.pretitletext = new System.Windows.Forms.Label();
-            this.prepgtoplcorner = new System.Windows.Forms.Panel();
-            this.prepgtoprcorner = new System.Windows.Forms.Panel();
-            this.pnlreset = new System.Windows.Forms.Panel();
-            this.Label113 = new System.Windows.Forms.Label();
-            this.btnresetallsettings = new System.Windows.Forms.Button();
-            this.Label109 = new System.Windows.Forms.Label();
-            this.Label111 = new System.Windows.Forms.Label();
-            this.pgcontents = new System.Windows.Forms.Panel();
-            this.pnldesktopcomposition = new System.Windows.Forms.Panel();
-            this.pnlfancywindows = new System.Windows.Forms.Panel();
-            this.txtwinfadedec = new System.Windows.Forms.TextBox();
-            this.label150 = new System.Windows.Forms.Label();
-            this.txtwinfadespeed = new System.Windows.Forms.TextBox();
-            this.label151 = new System.Windows.Forms.Label();
-            this.cbdrageffect = new System.Windows.Forms.ComboBox();
-            this.label141 = new System.Windows.Forms.Label();
-            this.cbcloseanim = new System.Windows.Forms.ComboBox();
-            this.label128 = new System.Windows.Forms.Label();
-            this.cbopenanim = new System.Windows.Forms.ComboBox();
-            this.label127 = new System.Windows.Forms.Label();
-            this.label149 = new System.Windows.Forms.Label();
-            this.pnlfancydragging = new System.Windows.Forms.Panel();
-            this.txtshakeminoffset = new System.Windows.Forms.TextBox();
-            this.label148 = new System.Windows.Forms.Label();
-            this.txtshakemax = new System.Windows.Forms.TextBox();
-            this.label146 = new System.Windows.Forms.Label();
-            this.txtdragopacitydec = new System.Windows.Forms.TextBox();
-            this.label144 = new System.Windows.Forms.Label();
-            this.txtdragfadedec = new System.Windows.Forms.TextBox();
-            this.label143 = new System.Windows.Forms.Label();
-            this.txtfadespeed = new System.Windows.Forms.TextBox();
-            this.label155 = new System.Windows.Forms.Label();
-            this.label156 = new System.Windows.Forms.Label();
-            this.pnlfancyintro = new System.Windows.Forms.Panel();
-            this.label174 = new System.Windows.Forms.Label();
-            this.label175 = new System.Windows.Forms.Label();
-            this.panel18 = new System.Windows.Forms.Panel();
-            this.panel19 = new System.Windows.Forms.Panel();
-            this.label157 = new System.Windows.Forms.Label();
-            this.panel20 = new System.Windows.Forms.Panel();
-            this.label158 = new System.Windows.Forms.Label();
-            this.panel21 = new System.Windows.Forms.Panel();
-            this.label159 = new System.Windows.Forms.Label();
-            this.panel22 = new System.Windows.Forms.Panel();
-            this.label160 = new System.Windows.Forms.Label();
-            this.panel23 = new System.Windows.Forms.Panel();
-            this.label161 = new System.Windows.Forms.Label();
-            this.panel24 = new System.Windows.Forms.Panel();
-            this.label162 = new System.Windows.Forms.Label();
-            this.label163 = new System.Windows.Forms.Label();
-            this.panel25 = new System.Windows.Forms.Panel();
-            this.panel26 = new System.Windows.Forms.Panel();
-            this.label164 = new System.Windows.Forms.Label();
-            this.panel27 = new System.Windows.Forms.Panel();
-            this.label165 = new System.Windows.Forms.Label();
-            this.panel28 = new System.Windows.Forms.Panel();
-            this.label166 = new System.Windows.Forms.Label();
-            this.panel29 = new System.Windows.Forms.Panel();
-            this.label167 = new System.Windows.Forms.Label();
-            this.panel30 = new System.Windows.Forms.Panel();
-            this.label168 = new System.Windows.Forms.Label();
-            this.panel31 = new System.Windows.Forms.Panel();
-            this.label169 = new System.Windows.Forms.Label();
-            this.panel32 = new System.Windows.Forms.Panel();
-            this.label170 = new System.Windows.Forms.Label();
-            this.panel33 = new System.Windows.Forms.Panel();
-            this.label171 = new System.Windows.Forms.Label();
-            this.panel34 = new System.Windows.Forms.Panel();
-            this.label172 = new System.Windows.Forms.Label();
-            this.label173 = new System.Windows.Forms.Label();
-            this.panel36 = new System.Windows.Forms.Panel();
-            this.btnfancydragging = new System.Windows.Forms.Button();
-            this.btnfancywindows = new System.Windows.Forms.Button();
-            this.label176 = new System.Windows.Forms.Label();
-            this.pnlmenus = new System.Windows.Forms.Panel();
-            this.pnladvanced = new System.Windows.Forms.Panel();
-            this.btnmorebuttons = new System.Windows.Forms.Button();
-            this.pnlbuttonchecked = new System.Windows.Forms.Panel();
-            this.label136 = new System.Windows.Forms.Label();
-            this.pnlitemselectedend = new System.Windows.Forms.Panel();
-            this.label129 = new System.Windows.Forms.Label();
-            this.pnlbuttonpressed = new System.Windows.Forms.Panel();
-            this.label130 = new System.Windows.Forms.Label();
-            this.pnlitemselectedbegin = new System.Windows.Forms.Panel();
-            this.label131 = new System.Windows.Forms.Label();
-            this.pnlitemselected = new System.Windows.Forms.Panel();
-            this.label132 = new System.Windows.Forms.Label();
-            this.pnlbuttonselected = new System.Windows.Forms.Panel();
-            this.label133 = new System.Windows.Forms.Label();
-            this.pnlcheckbg = new System.Windows.Forms.Panel();
-            this.label134 = new System.Windows.Forms.Label();
-            this.label135 = new System.Windows.Forms.Label();
-            this.pnlmore = new System.Windows.Forms.Panel();
-            this.pnlpressedbegin = new System.Windows.Forms.Panel();
-            this.btnback = new System.Windows.Forms.Button();
-            this.label138 = new System.Windows.Forms.Label();
-            this.pnlselectedbegin = new System.Windows.Forms.Panel();
-            this.pnlpressedend = new System.Windows.Forms.Panel();
-            this.label137 = new System.Windows.Forms.Label();
-            this.label139 = new System.Windows.Forms.Label();
-            this.pnlselectedend = new System.Windows.Forms.Panel();
-            this.pnlpressedmiddle = new System.Windows.Forms.Panel();
-            this.label140 = new System.Windows.Forms.Label();
-            this.label142 = new System.Windows.Forms.Label();
-            this.pnlselectedmiddle = new System.Windows.Forms.Panel();
-            this.label145 = new System.Windows.Forms.Label();
-            this.label147 = new System.Windows.Forms.Label();
-            this.pnldropdown = new System.Windows.Forms.Panel();
-            this.pnlddborder = new System.Windows.Forms.Panel();
-            this.label117 = new System.Windows.Forms.Label();
-            this.pnlmarginend = new System.Windows.Forms.Panel();
-            this.label120 = new System.Windows.Forms.Label();
-            this.pnlmarginmiddle = new System.Windows.Forms.Panel();
-            this.label121 = new System.Windows.Forms.Label();
-            this.pnlmarginbegin = new System.Windows.Forms.Panel();
-            this.label122 = new System.Windows.Forms.Label();
-            this.pnlhcolor = new System.Windows.Forms.Panel();
-            this.label123 = new System.Windows.Forms.Label();
-            this.pnlhborder = new System.Windows.Forms.Panel();
-            this.label125 = new System.Windows.Forms.Label();
-            this.label126 = new System.Windows.Forms.Label();
-            this.pnlbasic = new System.Windows.Forms.Panel();
-            this.pnlmenutextcolor = new System.Windows.Forms.Panel();
-            this.label118 = new System.Windows.Forms.Label();
-            this.pnldropdownbg = new System.Windows.Forms.Panel();
-            this.label115 = new System.Windows.Forms.Label();
-            this.pnlstatusend = new System.Windows.Forms.Panel();
-            this.label114 = new System.Windows.Forms.Label();
-            this.pnlstatusbegin = new System.Windows.Forms.Panel();
-            this.label107 = new System.Windows.Forms.Label();
-            this.pnltoolbarend = new System.Windows.Forms.Panel();
-            this.label77 = new System.Windows.Forms.Label();
-            this.pnltoolbarmiddle = new System.Windows.Forms.Panel();
-            this.label76 = new System.Windows.Forms.Label();
-            this.pnltoolbarbegin = new System.Windows.Forms.Panel();
-            this.label75 = new System.Windows.Forms.Label();
-            this.pnlmenubarend = new System.Windows.Forms.Panel();
-            this.label73 = new System.Windows.Forms.Label();
-            this.pnlmenubarbegin = new System.Windows.Forms.Panel();
-            this.label42 = new System.Windows.Forms.Label();
-            this.label41 = new System.Windows.Forms.Label();
-            this.pnlmenusintro = new System.Windows.Forms.Panel();
-            this.label116 = new System.Windows.Forms.Label();
-            this.label124 = new System.Windows.Forms.Label();
-            this.pnlmenucategories = new System.Windows.Forms.Panel();
-            this.btnmisc = new System.Windows.Forms.Button();
-            this.btnadvanced = new System.Windows.Forms.Button();
-            this.btndropdown = new System.Windows.Forms.Button();
-            this.btnbasic = new System.Windows.Forms.Button();
-            this.label74 = new System.Windows.Forms.Label();
-            this.tmrfix = new System.Windows.Forms.Timer(this.components);
-            this.tmrdelay = new System.Windows.Forms.Timer(this.components);
-            this.pnlluaoptions = new System.Windows.Forms.Panel();
-            this.flmorebuttons = new System.Windows.Forms.FlowLayoutPanel();
-            this.pnlluafield = new System.Windows.Forms.Panel();
+            this.clocktick = new ShiftUI.Timer(this.components);
+            this.customizationtime = new ShiftUI.Timer(this.components);
+            this.timerearned = new ShiftUI.Timer(this.components);
+            this.Label1 = new ShiftUI.Label();
+            this.btnapply = new ShiftUI.Button();
+            this.catholder = new ShiftUI.Panel();
+            this.btnmore = new ShiftUI.Button();
+            this.btnreset = new ShiftUI.Button();
+            this.btnwindowcomposition = new ShiftUI.Button();
+            this.btndesktopicons = new ShiftUI.Button();
+            this.btnmenus = new ShiftUI.Button();
+            this.btnwindows = new ShiftUI.Button();
+            this.btndesktop = new ShiftUI.Button();
+            this.pnlshifterintro = new ShiftUI.Panel();
+            this.Label66 = new ShiftUI.Label();
+            this.Label65 = new ShiftUI.Label();
+            this.Label64 = new ShiftUI.Label();
+            this.Label63 = new ShiftUI.Label();
+            this.pnldesktopoptions = new ShiftUI.Panel();
+            this.pnldesktoppaneloptions = new ShiftUI.Panel();
+            this.btnpanelbuttons = new ShiftUI.Button();
+            this.lbwarning = new ShiftUI.Label();
+            this.combodesktoppanelposition = new ShiftUI.ComboBox();
+            this.lbposition = new ShiftUI.Label();
+            this.Label47 = new ShiftUI.Label();
+            this.txtdesktoppanelheight = new ShiftUI.TextBox();
+            this.lbheight = new ShiftUI.Label();
+            this.pnldesktoppanelcolour = new ShiftUI.Panel();
+            this.lbpanelcolor = new ShiftUI.Label();
+            this.pnlapplauncheroptions = new ShiftUI.Panel();
+            this.pnlalhover = new ShiftUI.Panel();
+            this.label119 = new ShiftUI.Label();
+            this.Label71 = new ShiftUI.Label();
+            this.txtapplauncherwidth = new ShiftUI.TextBox();
+            this.Label72 = new ShiftUI.Label();
+            this.txtappbuttonlabel = new ShiftUI.TextBox();
+            this.Label51 = new ShiftUI.Label();
+            this.Label50 = new ShiftUI.Label();
+            this.pnlmaintextcolour = new ShiftUI.Panel();
+            this.comboappbuttontextstyle = new ShiftUI.ComboBox();
+            this.comboappbuttontextfont = new ShiftUI.ComboBox();
+            this.Label37 = new ShiftUI.Label();
+            this.Label38 = new ShiftUI.Label();
+            this.txtappbuttontextsize = new ShiftUI.TextBox();
+            this.Label39 = new ShiftUI.Label();
+            this.Label40 = new ShiftUI.Label();
+            this.pnlmainbuttonactivated = new ShiftUI.Panel();
+            this.Label28 = new ShiftUI.Label();
+            this.Label35 = new ShiftUI.Label();
+            this.txtapplicationsbuttonheight = new ShiftUI.TextBox();
+            this.Label36 = new ShiftUI.Label();
+            this.pnlmainbuttoncolour = new ShiftUI.Panel();
+            this.Label43 = new ShiftUI.Label();
+            this.pnldesktopintro = new ShiftUI.Panel();
+            this.Label69 = new ShiftUI.Label();
+            this.Label70 = new ShiftUI.Label();
+            this.pnlpanelbuttonsoptions = new ShiftUI.Panel();
+            this.pnlpanelbuttontextcolour = new ShiftUI.Panel();
+            this.Label101 = new ShiftUI.Label();
+            this.txtpanelbuttontexttop = new ShiftUI.TextBox();
+            this.Label104 = new ShiftUI.Label();
+            this.txtpanelbuttontextside = new ShiftUI.TextBox();
+            this.Label106 = new ShiftUI.Label();
+            this.Label93 = new ShiftUI.Label();
+            this.txtpanelbuttontop = new ShiftUI.TextBox();
+            this.Label94 = new ShiftUI.Label();
+            this.txtpanelbuttoninitalgap = new ShiftUI.TextBox();
+            this.Label108 = new ShiftUI.Label();
+            this.txtpanelbuttonicontop = new ShiftUI.TextBox();
+            this.Label110 = new ShiftUI.Label();
+            this.txtpanelbuttoniconside = new ShiftUI.TextBox();
+            this.Label112 = new ShiftUI.Label();
+            this.txtpanelbuttoniconsize = new ShiftUI.TextBox();
+            this.Label105 = new ShiftUI.Label();
+            this.cbpanelbuttontextstyle = new ShiftUI.ComboBox();
+            this.cbpanelbuttonfont = new ShiftUI.ComboBox();
+            this.Label100 = new ShiftUI.Label();
+            this.txtpaneltextbuttonsize = new ShiftUI.TextBox();
+            this.Label102 = new ShiftUI.Label();
+            this.Label103 = new ShiftUI.Label();
+            this.Label98 = new ShiftUI.Label();
+            this.txtpanelbuttongap = new ShiftUI.TextBox();
+            this.Label99 = new ShiftUI.Label();
+            this.Label96 = new ShiftUI.Label();
+            this.txtpanelbuttonheight = new ShiftUI.TextBox();
+            this.Label97 = new ShiftUI.Label();
+            this.Label92 = new ShiftUI.Label();
+            this.txtpanelbuttonwidth = new ShiftUI.TextBox();
+            this.Label91 = new ShiftUI.Label();
+            this.pnlpanelbuttoncolour = new ShiftUI.Panel();
+            this.Label95 = new ShiftUI.Label();
+            this.pnldesktopbackgroundoptions = new ShiftUI.Panel();
+            this.pnldesktopcolour = new ShiftUI.Panel();
+            this.Label45 = new ShiftUI.Label();
+            this.pnlpanelclockoptions = new ShiftUI.Panel();
+            this.pnlclockbackgroundcolour = new ShiftUI.Panel();
+            this.Label44 = new ShiftUI.Label();
+            this.comboclocktextstyle = new ShiftUI.ComboBox();
+            this.comboclocktextfont = new ShiftUI.ComboBox();
+            this.Label26 = new ShiftUI.Label();
+            this.Label29 = new ShiftUI.Label();
+            this.txtclocktextfromtop = new ShiftUI.TextBox();
+            this.Label30 = new ShiftUI.Label();
+            this.Label31 = new ShiftUI.Label();
+            this.txtclocktextsize = new ShiftUI.TextBox();
+            this.Label32 = new ShiftUI.Label();
+            this.Label33 = new ShiftUI.Label();
+            this.pnlpanelclocktextcolour = new ShiftUI.Panel();
+            this.Label34 = new ShiftUI.Label();
+            this.pnldesktoppreview = new ShiftUI.Panel();
+            this.predesktoppanel = new ShiftUI.Panel();
+            this.prepnlpanelbuttonholder = new ShiftUI.FlowLayoutPanel();
+            this.prepnlpanelbutton = new ShiftUI.Panel();
+            this.pretbicon = new ShiftUI.PictureBox();
+            this.pretbctext = new ShiftUI.Label();
+            this.pretimepanel = new ShiftUI.Panel();
+            this.prepaneltimetext = new ShiftUI.Label();
+            this.preapplaunchermenuholder = new ShiftUI.Panel();
+            this.predesktopappmenu = new ShiftUI.MenuStrip();
+            this.ApplicationsToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.KnowledgeInputToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.ShiftoriumToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.ClockToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.TerminalToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.ShifterToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.ToolStripSeparator1 = new ShiftUI.ToolStripSeparator();
+            this.ShutdownToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.Panel10 = new ShiftUI.Panel();
+            this.btndesktopitself = new ShiftUI.Button();
+            this.btnpanelclock = new ShiftUI.Button();
+            this.btnapplauncher = new ShiftUI.Button();
+            this.btndesktoppanel = new ShiftUI.Button();
+            this.txtpanelbuttoniconheight = new ShiftUI.TextBox();
+            this.pnlwindowsoptions = new ShiftUI.Panel();
+            this.pnlwindowsintro = new ShiftUI.Panel();
+            this.Label68 = new ShiftUI.Label();
+            this.Label67 = new ShiftUI.Label();
+            this.pnlbuttonoptions = new ShiftUI.Panel();
+            this.pnlclosebuttonoptions = new ShiftUI.Panel();
+            this.Label8 = new ShiftUI.Label();
+            this.Label11 = new ShiftUI.Label();
+            this.pnlclosebuttoncolour = new ShiftUI.Panel();
+            this.txtclosebuttonfromside = new ShiftUI.TextBox();
+            this.Label7 = new ShiftUI.Label();
+            this.Label12 = new ShiftUI.Label();
+            this.txtclosebuttonheight = new ShiftUI.TextBox();
+            this.Label13 = new ShiftUI.Label();
+            this.Label6 = new ShiftUI.Label();
+            this.txtclosebuttonfromtop = new ShiftUI.TextBox();
+            this.Label10 = new ShiftUI.Label();
+            this.Label14 = new ShiftUI.Label();
+            this.txtclosebuttonwidth = new ShiftUI.TextBox();
+            this.Label9 = new ShiftUI.Label();
+            this.pnlrollupbuttonoptions = new ShiftUI.Panel();
+            this.Label54 = new ShiftUI.Label();
+            this.Label55 = new ShiftUI.Label();
+            this.pnlrollupbuttoncolour = new ShiftUI.Panel();
+            this.txtrollupbuttonside = new ShiftUI.TextBox();
+            this.Label56 = new ShiftUI.Label();
+            this.Label57 = new ShiftUI.Label();
+            this.txtrollupbuttonheight = new ShiftUI.TextBox();
+            this.Label58 = new ShiftUI.Label();
+            this.Label59 = new ShiftUI.Label();
+            this.txtrollupbuttontop = new ShiftUI.TextBox();
+            this.Label60 = new ShiftUI.Label();
+            this.Label61 = new ShiftUI.Label();
+            this.txtrollupbuttonwidth = new ShiftUI.TextBox();
+            this.Label62 = new ShiftUI.Label();
+            this.pnlminimizebuttonoptions = new ShiftUI.Panel();
+            this.Label82 = new ShiftUI.Label();
+            this.Label83 = new ShiftUI.Label();
+            this.pnlminimizebuttoncolour = new ShiftUI.Panel();
+            this.txtminimizebuttonside = new ShiftUI.TextBox();
+            this.Label84 = new ShiftUI.Label();
+            this.Label85 = new ShiftUI.Label();
+            this.txtminimizebuttonheight = new ShiftUI.TextBox();
+            this.Label86 = new ShiftUI.Label();
+            this.Label87 = new ShiftUI.Label();
+            this.txtminimizebuttontop = new ShiftUI.TextBox();
+            this.Label88 = new ShiftUI.Label();
+            this.Label89 = new ShiftUI.Label();
+            this.txtminimizebuttonwidth = new ShiftUI.TextBox();
+            this.Label90 = new ShiftUI.Label();
+            this.combobuttonoption = new ShiftUI.ComboBox();
+            this.Label52 = new ShiftUI.Label();
+            this.pnltitlebaroptions = new ShiftUI.Panel();
+            this.Label80 = new ShiftUI.Label();
+            this.txticonfromtop = new ShiftUI.TextBox();
+            this.Label81 = new ShiftUI.Label();
+            this.Label78 = new ShiftUI.Label();
+            this.txticonfromside = new ShiftUI.TextBox();
+            this.Label79 = new ShiftUI.Label();
+            this.lbcornerwidthpx = new ShiftUI.Label();
+            this.txttitlebarcornerwidth = new ShiftUI.TextBox();
+            this.lbcornerwidth = new ShiftUI.Label();
+            this.pnltitlebarrightcornercolour = new ShiftUI.Panel();
+            this.pnltitlebarleftcornercolour = new ShiftUI.Panel();
+            this.lbrightcornercolor = new ShiftUI.Label();
+            this.lbleftcornercolor = new ShiftUI.Label();
+            this.cboxtitlebarcorners = new ShiftUI.CheckBox();
+            this.Label5 = new ShiftUI.Label();
+            this.txttitlebarheight = new ShiftUI.TextBox();
+            this.Label4 = new ShiftUI.Label();
+            this.pnltitlebarcolour = new ShiftUI.Panel();
+            this.Label2 = new ShiftUI.Label();
+            this.pnlborderoptions = new ShiftUI.Panel();
+            this.cbindividualbordercolours = new ShiftUI.CheckBox();
+            this.pnlborderbottomrightcolour = new ShiftUI.Panel();
+            this.lbbright = new ShiftUI.Label();
+            this.pnlborderbottomcolour = new ShiftUI.Panel();
+            this.lbbottom = new ShiftUI.Label();
+            this.pnlborderbottomleftcolour = new ShiftUI.Panel();
+            this.lbbleft = new ShiftUI.Label();
+            this.pnlborderrightcolour = new ShiftUI.Panel();
+            this.lbright = new ShiftUI.Label();
+            this.pnlborderleftcolour = new ShiftUI.Panel();
+            this.lbleft = new ShiftUI.Label();
+            this.Label15 = new ShiftUI.Label();
+            this.pnlbordercolour = new ShiftUI.Panel();
+            this.txtbordersize = new ShiftUI.TextBox();
+            this.Label3 = new ShiftUI.Label();
+            this.Label16 = new ShiftUI.Label();
+            this.pnltitletextoptions = new ShiftUI.Panel();
+            this.combotitletextposition = new ShiftUI.ComboBox();
+            this.Label53 = new ShiftUI.Label();
+            this.combotitletextstyle = new ShiftUI.ComboBox();
+            this.combotitletextfont = new ShiftUI.ComboBox();
+            this.Label23 = new ShiftUI.Label();
+            this.Label17 = new ShiftUI.Label();
+            this.txttitletextside = new ShiftUI.TextBox();
+            this.Label18 = new ShiftUI.Label();
+            this.Label19 = new ShiftUI.Label();
+            this.txttitletexttop = new ShiftUI.TextBox();
+            this.Label20 = new ShiftUI.Label();
+            this.Label21 = new ShiftUI.Label();
+            this.txttitletextsize = new ShiftUI.TextBox();
+            this.Label22 = new ShiftUI.Label();
+            this.Label24 = new ShiftUI.Label();
+            this.pnltitletextcolour = new ShiftUI.Panel();
+            this.Label25 = new ShiftUI.Label();
+            this.pnlwindowsobjects = new ShiftUI.Panel();
+            this.btnborders = new ShiftUI.Button();
+            this.btnbuttons = new ShiftUI.Button();
+            this.btntitletext = new ShiftUI.Button();
+            this.btntitlebar = new ShiftUI.Button();
+            this.pnlwindowpreview = new ShiftUI.Panel();
+            this.prepgcontent = new ShiftUI.Panel();
+            this.prepgbottom = new ShiftUI.Panel();
+            this.prepgleft = new ShiftUI.Panel();
+            this.prepgbottomlcorner = new ShiftUI.Panel();
+            this.prepgright = new ShiftUI.Panel();
+            this.prepgbottomrcorner = new ShiftUI.Panel();
+            this.pretitlebar = new ShiftUI.Panel();
+            this.preminimizebutton = new ShiftUI.Panel();
+            this.prepnlicon = new ShiftUI.PictureBox();
+            this.prerollupbutton = new ShiftUI.Panel();
+            this.preclosebutton = new ShiftUI.Panel();
+            this.pretitletext = new ShiftUI.Label();
+            this.prepgtoplcorner = new ShiftUI.Panel();
+            this.prepgtoprcorner = new ShiftUI.Panel();
+            this.pnlreset = new ShiftUI.Panel();
+            this.Label113 = new ShiftUI.Label();
+            this.btnresetallsettings = new ShiftUI.Button();
+            this.Label109 = new ShiftUI.Label();
+            this.Label111 = new ShiftUI.Label();
+            this.pgcontents = new ShiftUI.Panel();
+            this.pnldesktopcomposition = new ShiftUI.Panel();
+            this.pnlfancywindows = new ShiftUI.Panel();
+            this.txtwinfadedec = new ShiftUI.TextBox();
+            this.label150 = new ShiftUI.Label();
+            this.txtwinfadespeed = new ShiftUI.TextBox();
+            this.label151 = new ShiftUI.Label();
+            this.cbdrageffect = new ShiftUI.ComboBox();
+            this.label141 = new ShiftUI.Label();
+            this.cbcloseanim = new ShiftUI.ComboBox();
+            this.label128 = new ShiftUI.Label();
+            this.cbopenanim = new ShiftUI.ComboBox();
+            this.label127 = new ShiftUI.Label();
+            this.label149 = new ShiftUI.Label();
+            this.pnlfancydragging = new ShiftUI.Panel();
+            this.txtshakeminoffset = new ShiftUI.TextBox();
+            this.label148 = new ShiftUI.Label();
+            this.txtshakemax = new ShiftUI.TextBox();
+            this.label146 = new ShiftUI.Label();
+            this.txtdragopacitydec = new ShiftUI.TextBox();
+            this.label144 = new ShiftUI.Label();
+            this.txtdragfadedec = new ShiftUI.TextBox();
+            this.label143 = new ShiftUI.Label();
+            this.txtfadespeed = new ShiftUI.TextBox();
+            this.label155 = new ShiftUI.Label();
+            this.label156 = new ShiftUI.Label();
+            this.pnlfancyintro = new ShiftUI.Panel();
+            this.label174 = new ShiftUI.Label();
+            this.label175 = new ShiftUI.Label();
+            this.panel18 = new ShiftUI.Panel();
+            this.panel19 = new ShiftUI.Panel();
+            this.label157 = new ShiftUI.Label();
+            this.panel20 = new ShiftUI.Panel();
+            this.label158 = new ShiftUI.Label();
+            this.panel21 = new ShiftUI.Panel();
+            this.label159 = new ShiftUI.Label();
+            this.panel22 = new ShiftUI.Panel();
+            this.label160 = new ShiftUI.Label();
+            this.panel23 = new ShiftUI.Panel();
+            this.label161 = new ShiftUI.Label();
+            this.panel24 = new ShiftUI.Panel();
+            this.label162 = new ShiftUI.Label();
+            this.label163 = new ShiftUI.Label();
+            this.panel25 = new ShiftUI.Panel();
+            this.panel26 = new ShiftUI.Panel();
+            this.label164 = new ShiftUI.Label();
+            this.panel27 = new ShiftUI.Panel();
+            this.label165 = new ShiftUI.Label();
+            this.panel28 = new ShiftUI.Panel();
+            this.label166 = new ShiftUI.Label();
+            this.panel29 = new ShiftUI.Panel();
+            this.label167 = new ShiftUI.Label();
+            this.panel30 = new ShiftUI.Panel();
+            this.label168 = new ShiftUI.Label();
+            this.panel31 = new ShiftUI.Panel();
+            this.label169 = new ShiftUI.Label();
+            this.panel32 = new ShiftUI.Panel();
+            this.label170 = new ShiftUI.Label();
+            this.panel33 = new ShiftUI.Panel();
+            this.label171 = new ShiftUI.Label();
+            this.panel34 = new ShiftUI.Panel();
+            this.label172 = new ShiftUI.Label();
+            this.label173 = new ShiftUI.Label();
+            this.panel36 = new ShiftUI.Panel();
+            this.btnfancydragging = new ShiftUI.Button();
+            this.btnfancywindows = new ShiftUI.Button();
+            this.label176 = new ShiftUI.Label();
+            this.pnlmenus = new ShiftUI.Panel();
+            this.pnladvanced = new ShiftUI.Panel();
+            this.btnmorebuttons = new ShiftUI.Button();
+            this.pnlbuttonchecked = new ShiftUI.Panel();
+            this.label136 = new ShiftUI.Label();
+            this.pnlitemselectedend = new ShiftUI.Panel();
+            this.label129 = new ShiftUI.Label();
+            this.pnlbuttonpressed = new ShiftUI.Panel();
+            this.label130 = new ShiftUI.Label();
+            this.pnlitemselectedbegin = new ShiftUI.Panel();
+            this.label131 = new ShiftUI.Label();
+            this.pnlitemselected = new ShiftUI.Panel();
+            this.label132 = new ShiftUI.Label();
+            this.pnlbuttonselected = new ShiftUI.Panel();
+            this.label133 = new ShiftUI.Label();
+            this.pnlcheckbg = new ShiftUI.Panel();
+            this.label134 = new ShiftUI.Label();
+            this.label135 = new ShiftUI.Label();
+            this.pnlmore = new ShiftUI.Panel();
+            this.pnlpressedbegin = new ShiftUI.Panel();
+            this.btnback = new ShiftUI.Button();
+            this.label138 = new ShiftUI.Label();
+            this.pnlselectedbegin = new ShiftUI.Panel();
+            this.pnlpressedend = new ShiftUI.Panel();
+            this.label137 = new ShiftUI.Label();
+            this.label139 = new ShiftUI.Label();
+            this.pnlselectedend = new ShiftUI.Panel();
+            this.pnlpressedmiddle = new ShiftUI.Panel();
+            this.label140 = new ShiftUI.Label();
+            this.label142 = new ShiftUI.Label();
+            this.pnlselectedmiddle = new ShiftUI.Panel();
+            this.label145 = new ShiftUI.Label();
+            this.label147 = new ShiftUI.Label();
+            this.pnldropdown = new ShiftUI.Panel();
+            this.pnlddborder = new ShiftUI.Panel();
+            this.label117 = new ShiftUI.Label();
+            this.pnlmarginend = new ShiftUI.Panel();
+            this.label120 = new ShiftUI.Label();
+            this.pnlmarginmiddle = new ShiftUI.Panel();
+            this.label121 = new ShiftUI.Label();
+            this.pnlmarginbegin = new ShiftUI.Panel();
+            this.label122 = new ShiftUI.Label();
+            this.pnlhcolor = new ShiftUI.Panel();
+            this.label123 = new ShiftUI.Label();
+            this.pnlhborder = new ShiftUI.Panel();
+            this.label125 = new ShiftUI.Label();
+            this.label126 = new ShiftUI.Label();
+            this.pnlbasic = new ShiftUI.Panel();
+            this.pnlmenutextcolor = new ShiftUI.Panel();
+            this.label118 = new ShiftUI.Label();
+            this.pnldropdownbg = new ShiftUI.Panel();
+            this.label115 = new ShiftUI.Label();
+            this.pnlstatusend = new ShiftUI.Panel();
+            this.label114 = new ShiftUI.Label();
+            this.pnlstatusbegin = new ShiftUI.Panel();
+            this.label107 = new ShiftUI.Label();
+            this.pnltoolbarend = new ShiftUI.Panel();
+            this.label77 = new ShiftUI.Label();
+            this.pnltoolbarmiddle = new ShiftUI.Panel();
+            this.label76 = new ShiftUI.Label();
+            this.pnltoolbarbegin = new ShiftUI.Panel();
+            this.label75 = new ShiftUI.Label();
+            this.pnlmenubarend = new ShiftUI.Panel();
+            this.label73 = new ShiftUI.Label();
+            this.pnlmenubarbegin = new ShiftUI.Panel();
+            this.label42 = new ShiftUI.Label();
+            this.label41 = new ShiftUI.Label();
+            this.pnlmenusintro = new ShiftUI.Panel();
+            this.label116 = new ShiftUI.Label();
+            this.label124 = new ShiftUI.Label();
+            this.pnlmenucategories = new ShiftUI.Panel();
+            this.btnmisc = new ShiftUI.Button();
+            this.btnadvanced = new ShiftUI.Button();
+            this.btndropdown = new ShiftUI.Button();
+            this.btnbasic = new ShiftUI.Button();
+            this.label74 = new ShiftUI.Label();
+            this.tmrfix = new ShiftUI.Timer(this.components);
+            this.tmrdelay = new ShiftUI.Timer(this.components);
+            this.pnlluaoptions = new ShiftUI.Panel();
+            this.flmorebuttons = new ShiftUI.FlowLayoutPanel();
+            this.pnlluafield = new ShiftUI.Panel();
             this.catholder.SuspendLayout();
             this.pnlshifterintro.SuspendLayout();
             this.pnldesktopoptions.SuspendLayout();
@@ -520,8 +518,8 @@ namespace ShiftOS
             // 
             // btnapply
             // 
-            this.btnapply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.btnapply.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnapply.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left)));
+            this.btnapply.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnapply.Font = new System.Drawing.Font("Cambria", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnapply.Location = new System.Drawing.Point(7, 286);
             this.btnapply.Name = "btnapply";
@@ -534,16 +532,16 @@ namespace ShiftOS
             // 
             // catholder
             // 
-            this.catholder.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
+            this.catholder.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left)));
             this.catholder.BackColor = System.Drawing.Color.White;
-            this.catholder.Controls.Add(this.btnmore);
-            this.catholder.Controls.Add(this.btnreset);
-            this.catholder.Controls.Add(this.btnwindowcomposition);
-            this.catholder.Controls.Add(this.btndesktopicons);
-            this.catholder.Controls.Add(this.btnmenus);
-            this.catholder.Controls.Add(this.btnwindows);
-            this.catholder.Controls.Add(this.btndesktop);
+            this.catholder.Widgets.Add(this.btnmore);
+            this.catholder.Widgets.Add(this.btnreset);
+            this.catholder.Widgets.Add(this.btnwindowcomposition);
+            this.catholder.Widgets.Add(this.btndesktopicons);
+            this.catholder.Widgets.Add(this.btnmenus);
+            this.catholder.Widgets.Add(this.btnwindows);
+            this.catholder.Widgets.Add(this.btndesktop);
             this.catholder.Location = new System.Drawing.Point(7, 9);
             this.catholder.Name = "catholder";
             this.catholder.Size = new System.Drawing.Size(119, 271);
@@ -552,8 +550,8 @@ namespace ShiftOS
             // btnmore
             // 
             this.btnmore.BackColor = System.Drawing.Color.White;
-            this.btnmore.Dock = System.Windows.Forms.DockStyle.Top;
-            this.btnmore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnmore.Dock = ShiftUI.DockStyle.Top;
+            this.btnmore.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnmore.Font = new System.Drawing.Font("Cambria", 12F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnmore.Location = new System.Drawing.Point(0, 174);
             this.btnmore.Name = "btnmore";
@@ -567,8 +565,8 @@ namespace ShiftOS
             // btnreset
             // 
             this.btnreset.BackColor = System.Drawing.Color.White;
-            this.btnreset.Dock = System.Windows.Forms.DockStyle.Top;
-            this.btnreset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnreset.Dock = ShiftUI.DockStyle.Top;
+            this.btnreset.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnreset.Font = new System.Drawing.Font("Cambria", 12F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnreset.Location = new System.Drawing.Point(0, 145);
             this.btnreset.Name = "btnreset";
@@ -582,8 +580,8 @@ namespace ShiftOS
             // btnwindowcomposition
             // 
             this.btnwindowcomposition.BackColor = System.Drawing.Color.White;
-            this.btnwindowcomposition.Dock = System.Windows.Forms.DockStyle.Top;
-            this.btnwindowcomposition.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnwindowcomposition.Dock = ShiftUI.DockStyle.Top;
+            this.btnwindowcomposition.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnwindowcomposition.Font = new System.Drawing.Font("Cambria", 12F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnwindowcomposition.Location = new System.Drawing.Point(0, 116);
             this.btnwindowcomposition.Name = "btnwindowcomposition";
@@ -598,8 +596,8 @@ namespace ShiftOS
             // btndesktopicons
             // 
             this.btndesktopicons.BackColor = System.Drawing.Color.White;
-            this.btndesktopicons.Dock = System.Windows.Forms.DockStyle.Top;
-            this.btndesktopicons.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btndesktopicons.Dock = ShiftUI.DockStyle.Top;
+            this.btndesktopicons.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btndesktopicons.Font = new System.Drawing.Font("Cambria", 12F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btndesktopicons.Location = new System.Drawing.Point(0, 87);
             this.btndesktopicons.Name = "btndesktopicons";
@@ -613,8 +611,8 @@ namespace ShiftOS
             // btnmenus
             // 
             this.btnmenus.BackColor = System.Drawing.Color.White;
-            this.btnmenus.Dock = System.Windows.Forms.DockStyle.Top;
-            this.btnmenus.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnmenus.Dock = ShiftUI.DockStyle.Top;
+            this.btnmenus.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnmenus.Font = new System.Drawing.Font("Cambria", 12F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnmenus.Location = new System.Drawing.Point(0, 58);
             this.btnmenus.Name = "btnmenus";
@@ -629,8 +627,8 @@ namespace ShiftOS
             // btnwindows
             // 
             this.btnwindows.BackColor = System.Drawing.Color.White;
-            this.btnwindows.Dock = System.Windows.Forms.DockStyle.Top;
-            this.btnwindows.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnwindows.Dock = ShiftUI.DockStyle.Top;
+            this.btnwindows.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnwindows.Font = new System.Drawing.Font("Cambria", 12F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnwindows.Location = new System.Drawing.Point(0, 29);
             this.btnwindows.Name = "btnwindows";
@@ -644,8 +642,8 @@ namespace ShiftOS
             // btndesktop
             // 
             this.btndesktop.BackColor = System.Drawing.Color.White;
-            this.btndesktop.Dock = System.Windows.Forms.DockStyle.Top;
-            this.btndesktop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btndesktop.Dock = ShiftUI.DockStyle.Top;
+            this.btndesktop.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btndesktop.Font = new System.Drawing.Font("Cambria", 12F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btndesktop.Location = new System.Drawing.Point(0, 0);
             this.btndesktop.Name = "btndesktop";
@@ -658,14 +656,14 @@ namespace ShiftOS
             // 
             // pnlshifterintro
             // 
-            this.pnlshifterintro.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.pnlshifterintro.Anchor = ((ShiftUI.AnchorStyles)((((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.pnlshifterintro.BackColor = System.Drawing.Color.White;
-            this.pnlshifterintro.Controls.Add(this.Label66);
-            this.pnlshifterintro.Controls.Add(this.Label65);
-            this.pnlshifterintro.Controls.Add(this.Label64);
-            this.pnlshifterintro.Controls.Add(this.Label63);
+            this.pnlshifterintro.Widgets.Add(this.Label66);
+            this.pnlshifterintro.Widgets.Add(this.Label65);
+            this.pnlshifterintro.Widgets.Add(this.Label64);
+            this.pnlshifterintro.Widgets.Add(this.Label63);
             this.pnlshifterintro.Location = new System.Drawing.Point(134, 9);
             this.pnlshifterintro.Name = "pnlshifterintro";
             this.pnlshifterintro.Size = new System.Drawing.Size(457, 306);
@@ -716,18 +714,18 @@ namespace ShiftOS
             // 
             // pnldesktopoptions
             // 
-            this.pnldesktopoptions.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.pnldesktopoptions.Anchor = ((ShiftUI.AnchorStyles)((((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.pnldesktopoptions.BackColor = System.Drawing.Color.White;
-            this.pnldesktopoptions.Controls.Add(this.pnlapplauncheroptions);
-            this.pnldesktopoptions.Controls.Add(this.pnldesktoppaneloptions);
-            this.pnldesktopoptions.Controls.Add(this.pnldesktopintro);
-            this.pnldesktopoptions.Controls.Add(this.pnlpanelbuttonsoptions);
-            this.pnldesktopoptions.Controls.Add(this.pnldesktopbackgroundoptions);
-            this.pnldesktopoptions.Controls.Add(this.pnlpanelclockoptions);
-            this.pnldesktopoptions.Controls.Add(this.pnldesktoppreview);
-            this.pnldesktopoptions.Controls.Add(this.Panel10);
+            this.pnldesktopoptions.Widgets.Add(this.pnlapplauncheroptions);
+            this.pnldesktopoptions.Widgets.Add(this.pnldesktoppaneloptions);
+            this.pnldesktopoptions.Widgets.Add(this.pnldesktopintro);
+            this.pnldesktopoptions.Widgets.Add(this.pnlpanelbuttonsoptions);
+            this.pnldesktopoptions.Widgets.Add(this.pnldesktopbackgroundoptions);
+            this.pnldesktopoptions.Widgets.Add(this.pnlpanelclockoptions);
+            this.pnldesktopoptions.Widgets.Add(this.pnldesktoppreview);
+            this.pnldesktopoptions.Widgets.Add(this.Panel10);
             this.pnldesktopoptions.Location = new System.Drawing.Point(134, 9);
             this.pnldesktopoptions.Name = "pnldesktopoptions";
             this.pnldesktopoptions.Size = new System.Drawing.Size(457, 306);
@@ -736,16 +734,16 @@ namespace ShiftOS
             // 
             // pnldesktoppaneloptions
             // 
-            this.pnldesktoppaneloptions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnldesktoppaneloptions.Controls.Add(this.btnpanelbuttons);
-            this.pnldesktoppaneloptions.Controls.Add(this.lbwarning);
-            this.pnldesktoppaneloptions.Controls.Add(this.combodesktoppanelposition);
-            this.pnldesktoppaneloptions.Controls.Add(this.lbposition);
-            this.pnldesktoppaneloptions.Controls.Add(this.Label47);
-            this.pnldesktoppaneloptions.Controls.Add(this.txtdesktoppanelheight);
-            this.pnldesktoppaneloptions.Controls.Add(this.lbheight);
-            this.pnldesktoppaneloptions.Controls.Add(this.pnldesktoppanelcolour);
-            this.pnldesktoppaneloptions.Controls.Add(this.lbpanelcolor);
+            this.pnldesktoppaneloptions.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
+            this.pnldesktoppaneloptions.Widgets.Add(this.btnpanelbuttons);
+            this.pnldesktoppaneloptions.Widgets.Add(this.lbwarning);
+            this.pnldesktoppaneloptions.Widgets.Add(this.combodesktoppanelposition);
+            this.pnldesktoppaneloptions.Widgets.Add(this.lbposition);
+            this.pnldesktoppaneloptions.Widgets.Add(this.Label47);
+            this.pnldesktoppaneloptions.Widgets.Add(this.txtdesktoppanelheight);
+            this.pnldesktoppaneloptions.Widgets.Add(this.lbheight);
+            this.pnldesktoppaneloptions.Widgets.Add(this.pnldesktoppanelcolour);
+            this.pnldesktoppaneloptions.Widgets.Add(this.lbpanelcolor);
             this.pnldesktoppaneloptions.Location = new System.Drawing.Point(135, 159);
             this.pnldesktoppaneloptions.Name = "pnldesktoppaneloptions";
             this.pnldesktoppaneloptions.Size = new System.Drawing.Size(317, 140);
@@ -755,7 +753,7 @@ namespace ShiftOS
             // btnpanelbuttons
             // 
             this.btnpanelbuttons.BackColor = System.Drawing.Color.White;
-            this.btnpanelbuttons.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnpanelbuttons.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnpanelbuttons.Font = new System.Drawing.Font("Cambria", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnpanelbuttons.Location = new System.Drawing.Point(193, 101);
             this.btnpanelbuttons.Name = "btnpanelbuttons";
@@ -811,14 +809,14 @@ namespace ShiftOS
             // txtdesktoppanelheight
             // 
             this.txtdesktoppanelheight.BackColor = System.Drawing.Color.White;
-            this.txtdesktoppanelheight.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtdesktoppanelheight.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtdesktoppanelheight.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtdesktoppanelheight.ForeColor = System.Drawing.Color.Black;
             this.txtdesktoppanelheight.Location = new System.Drawing.Point(189, 5);
             this.txtdesktoppanelheight.Name = "txtdesktoppanelheight";
             this.txtdesktoppanelheight.Size = new System.Drawing.Size(37, 22);
             this.txtdesktoppanelheight.TabIndex = 4;
-            this.txtdesktoppanelheight.ValueChanged += new System.EventHandler(this.txtdesktoppanelheight_ValueChanged);
+            this.txtdesktoppanelheight.TextChanged += new System.EventHandler(this.txtdesktoppanelheight_ValueChanged);
             // 
             // lbheight
             // 
@@ -836,7 +834,7 @@ namespace ShiftOS
             this.pnldesktoppanelcolour.Name = "pnldesktoppanelcolour";
             this.pnldesktoppanelcolour.Size = new System.Drawing.Size(41, 20);
             this.pnldesktoppanelcolour.TabIndex = 1;
-            this.pnldesktoppanelcolour.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ChangeDesktopPanelColor);
+            this.pnldesktoppanelcolour.MouseDown += new ShiftUI.MouseEventHandler(this.ChangeDesktopPanelColor);
             // 
             // lbpanelcolor
             // 
@@ -850,30 +848,30 @@ namespace ShiftOS
             // 
             // pnlapplauncheroptions
             // 
-            this.pnlapplauncheroptions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnlapplauncheroptions.Controls.Add(this.pnlalhover);
-            this.pnlapplauncheroptions.Controls.Add(this.label119);
-            this.pnlapplauncheroptions.Controls.Add(this.Label71);
-            this.pnlapplauncheroptions.Controls.Add(this.txtapplauncherwidth);
-            this.pnlapplauncheroptions.Controls.Add(this.Label72);
-            this.pnlapplauncheroptions.Controls.Add(this.txtappbuttonlabel);
-            this.pnlapplauncheroptions.Controls.Add(this.Label51);
-            this.pnlapplauncheroptions.Controls.Add(this.Label50);
-            this.pnlapplauncheroptions.Controls.Add(this.pnlmaintextcolour);
-            this.pnlapplauncheroptions.Controls.Add(this.comboappbuttontextstyle);
-            this.pnlapplauncheroptions.Controls.Add(this.comboappbuttontextfont);
-            this.pnlapplauncheroptions.Controls.Add(this.Label37);
-            this.pnlapplauncheroptions.Controls.Add(this.Label38);
-            this.pnlapplauncheroptions.Controls.Add(this.txtappbuttontextsize);
-            this.pnlapplauncheroptions.Controls.Add(this.Label39);
-            this.pnlapplauncheroptions.Controls.Add(this.Label40);
-            this.pnlapplauncheroptions.Controls.Add(this.pnlmainbuttonactivated);
-            this.pnlapplauncheroptions.Controls.Add(this.Label28);
-            this.pnlapplauncheroptions.Controls.Add(this.Label35);
-            this.pnlapplauncheroptions.Controls.Add(this.txtapplicationsbuttonheight);
-            this.pnlapplauncheroptions.Controls.Add(this.Label36);
-            this.pnlapplauncheroptions.Controls.Add(this.pnlmainbuttoncolour);
-            this.pnlapplauncheroptions.Controls.Add(this.Label43);
+            this.pnlapplauncheroptions.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
+            this.pnlapplauncheroptions.Widgets.Add(this.pnlalhover);
+            this.pnlapplauncheroptions.Widgets.Add(this.label119);
+            this.pnlapplauncheroptions.Widgets.Add(this.Label71);
+            this.pnlapplauncheroptions.Widgets.Add(this.txtapplauncherwidth);
+            this.pnlapplauncheroptions.Widgets.Add(this.Label72);
+            this.pnlapplauncheroptions.Widgets.Add(this.txtappbuttonlabel);
+            this.pnlapplauncheroptions.Widgets.Add(this.Label51);
+            this.pnlapplauncheroptions.Widgets.Add(this.Label50);
+            this.pnlapplauncheroptions.Widgets.Add(this.pnlmaintextcolour);
+            this.pnlapplauncheroptions.Widgets.Add(this.comboappbuttontextstyle);
+            this.pnlapplauncheroptions.Widgets.Add(this.comboappbuttontextfont);
+            this.pnlapplauncheroptions.Widgets.Add(this.Label37);
+            this.pnlapplauncheroptions.Widgets.Add(this.Label38);
+            this.pnlapplauncheroptions.Widgets.Add(this.txtappbuttontextsize);
+            this.pnlapplauncheroptions.Widgets.Add(this.Label39);
+            this.pnlapplauncheroptions.Widgets.Add(this.Label40);
+            this.pnlapplauncheroptions.Widgets.Add(this.pnlmainbuttonactivated);
+            this.pnlapplauncheroptions.Widgets.Add(this.Label28);
+            this.pnlapplauncheroptions.Widgets.Add(this.Label35);
+            this.pnlapplauncheroptions.Widgets.Add(this.txtapplicationsbuttonheight);
+            this.pnlapplauncheroptions.Widgets.Add(this.Label36);
+            this.pnlapplauncheroptions.Widgets.Add(this.pnlmainbuttoncolour);
+            this.pnlapplauncheroptions.Widgets.Add(this.Label43);
             this.pnlapplauncheroptions.Location = new System.Drawing.Point(135, 159);
             this.pnlapplauncheroptions.Name = "pnlapplauncheroptions";
             this.pnlapplauncheroptions.Size = new System.Drawing.Size(317, 140);
@@ -882,12 +880,12 @@ namespace ShiftOS
             // 
             // pnlalhover
             // 
-            this.pnlalhover.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlalhover.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlalhover.Location = new System.Drawing.Point(90, 29);
             this.pnlalhover.Name = "pnlalhover";
             this.pnlalhover.Size = new System.Drawing.Size(41, 20);
             this.pnlalhover.TabIndex = 3;
-            this.pnlalhover.MouseDown += new System.Windows.Forms.MouseEventHandler(this.SetALHoverColor);
+            this.pnlalhover.MouseDown += new ShiftUI.MouseEventHandler(this.SetALHoverColor);
             // 
             // label119
             // 
@@ -912,7 +910,7 @@ namespace ShiftOS
             // txtapplauncherwidth
             // 
             this.txtapplauncherwidth.BackColor = System.Drawing.Color.White;
-            this.txtapplauncherwidth.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtapplauncherwidth.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtapplauncherwidth.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtapplauncherwidth.ForeColor = System.Drawing.Color.Black;
             this.txtapplauncherwidth.Location = new System.Drawing.Point(148, 101);
@@ -934,7 +932,7 @@ namespace ShiftOS
             // txtappbuttonlabel
             // 
             this.txtappbuttonlabel.BackColor = System.Drawing.Color.White;
-            this.txtappbuttonlabel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtappbuttonlabel.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtappbuttonlabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtappbuttonlabel.ForeColor = System.Drawing.Color.Black;
             this.txtappbuttonlabel.Location = new System.Drawing.Point(53, 76);
@@ -965,12 +963,12 @@ namespace ShiftOS
             // 
             // pnlmaintextcolour
             // 
-            this.pnlmaintextcolour.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlmaintextcolour.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlmaintextcolour.Location = new System.Drawing.Point(155, 51);
             this.pnlmaintextcolour.Name = "pnlmaintextcolour";
             this.pnlmaintextcolour.Size = new System.Drawing.Size(41, 20);
             this.pnlmaintextcolour.TabIndex = 19;
-            this.pnlmaintextcolour.MouseDown += new System.Windows.Forms.MouseEventHandler(this.SetAppLauncherTextColor);
+            this.pnlmaintextcolour.MouseDown += new ShiftUI.MouseEventHandler(this.SetAppLauncherTextColor);
             // 
             // comboappbuttontextstyle
             // 
@@ -1021,7 +1019,7 @@ namespace ShiftOS
             // txtappbuttontextsize
             // 
             this.txtappbuttontextsize.BackColor = System.Drawing.Color.White;
-            this.txtappbuttontextsize.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtappbuttontextsize.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtappbuttontextsize.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtappbuttontextsize.ForeColor = System.Drawing.Color.Black;
             this.txtappbuttontextsize.Location = new System.Drawing.Point(51, 50);
@@ -1052,12 +1050,12 @@ namespace ShiftOS
             // 
             // pnlmainbuttonactivated
             // 
-            this.pnlmainbuttonactivated.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlmainbuttonactivated.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlmainbuttonactivated.Location = new System.Drawing.Point(267, 6);
             this.pnlmainbuttonactivated.Name = "pnlmainbuttonactivated";
             this.pnlmainbuttonactivated.Size = new System.Drawing.Size(41, 20);
             this.pnlmainbuttonactivated.TabIndex = 16;
-            this.pnlmainbuttonactivated.MouseClick += new System.Windows.Forms.MouseEventHandler(this.SetALButtonClickedColor);
+            this.pnlmainbuttonactivated.MouseClick += new ShiftUI.MouseEventHandler(this.SetALButtonClickedColor);
             // 
             // Label28
             // 
@@ -1082,7 +1080,7 @@ namespace ShiftOS
             // txtapplicationsbuttonheight
             // 
             this.txtapplicationsbuttonheight.BackColor = System.Drawing.Color.White;
-            this.txtapplicationsbuttonheight.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtapplicationsbuttonheight.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtapplicationsbuttonheight.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtapplicationsbuttonheight.ForeColor = System.Drawing.Color.Black;
             this.txtapplicationsbuttonheight.Location = new System.Drawing.Point(53, 101);
@@ -1103,12 +1101,12 @@ namespace ShiftOS
             // 
             // pnlmainbuttoncolour
             // 
-            this.pnlmainbuttoncolour.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlmainbuttoncolour.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlmainbuttoncolour.Location = new System.Drawing.Point(128, 4);
             this.pnlmainbuttoncolour.Name = "pnlmainbuttoncolour";
             this.pnlmainbuttoncolour.Size = new System.Drawing.Size(41, 20);
             this.pnlmainbuttoncolour.TabIndex = 1;
-            this.pnlmainbuttoncolour.MouseDown += new System.Windows.Forms.MouseEventHandler(this.SetALButtonColor);
+            this.pnlmainbuttoncolour.MouseDown += new ShiftUI.MouseEventHandler(this.SetALButtonColor);
             // 
             // Label43
             // 
@@ -1122,9 +1120,9 @@ namespace ShiftOS
             // 
             // pnldesktopintro
             // 
-            this.pnldesktopintro.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnldesktopintro.Controls.Add(this.Label69);
-            this.pnldesktopintro.Controls.Add(this.Label70);
+            this.pnldesktopintro.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
+            this.pnldesktopintro.Widgets.Add(this.Label69);
+            this.pnldesktopintro.Widgets.Add(this.Label70);
             this.pnldesktopintro.Location = new System.Drawing.Point(135, 159);
             this.pnldesktopintro.Name = "pnldesktopintro";
             this.pnldesktopintro.Size = new System.Drawing.Size(317, 140);
@@ -1153,41 +1151,41 @@ namespace ShiftOS
             // 
             // pnlpanelbuttonsoptions
             // 
-            this.pnlpanelbuttonsoptions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnlpanelbuttonsoptions.Controls.Add(this.pnlpanelbuttontextcolour);
-            this.pnlpanelbuttonsoptions.Controls.Add(this.Label101);
-            this.pnlpanelbuttonsoptions.Controls.Add(this.txtpanelbuttontexttop);
-            this.pnlpanelbuttonsoptions.Controls.Add(this.Label104);
-            this.pnlpanelbuttonsoptions.Controls.Add(this.txtpanelbuttontextside);
-            this.pnlpanelbuttonsoptions.Controls.Add(this.Label106);
-            this.pnlpanelbuttonsoptions.Controls.Add(this.Label93);
-            this.pnlpanelbuttonsoptions.Controls.Add(this.txtpanelbuttontop);
-            this.pnlpanelbuttonsoptions.Controls.Add(this.Label94);
-            this.pnlpanelbuttonsoptions.Controls.Add(this.txtpanelbuttoninitalgap);
-            this.pnlpanelbuttonsoptions.Controls.Add(this.Label108);
-            this.pnlpanelbuttonsoptions.Controls.Add(this.txtpanelbuttonicontop);
-            this.pnlpanelbuttonsoptions.Controls.Add(this.Label110);
-            this.pnlpanelbuttonsoptions.Controls.Add(this.txtpanelbuttoniconside);
-            this.pnlpanelbuttonsoptions.Controls.Add(this.Label112);
-            this.pnlpanelbuttonsoptions.Controls.Add(this.txtpanelbuttoniconsize);
-            this.pnlpanelbuttonsoptions.Controls.Add(this.Label105);
-            this.pnlpanelbuttonsoptions.Controls.Add(this.cbpanelbuttontextstyle);
-            this.pnlpanelbuttonsoptions.Controls.Add(this.cbpanelbuttonfont);
-            this.pnlpanelbuttonsoptions.Controls.Add(this.Label100);
-            this.pnlpanelbuttonsoptions.Controls.Add(this.txtpaneltextbuttonsize);
-            this.pnlpanelbuttonsoptions.Controls.Add(this.Label102);
-            this.pnlpanelbuttonsoptions.Controls.Add(this.Label103);
-            this.pnlpanelbuttonsoptions.Controls.Add(this.Label98);
-            this.pnlpanelbuttonsoptions.Controls.Add(this.txtpanelbuttongap);
-            this.pnlpanelbuttonsoptions.Controls.Add(this.Label99);
-            this.pnlpanelbuttonsoptions.Controls.Add(this.Label96);
-            this.pnlpanelbuttonsoptions.Controls.Add(this.txtpanelbuttonheight);
-            this.pnlpanelbuttonsoptions.Controls.Add(this.Label97);
-            this.pnlpanelbuttonsoptions.Controls.Add(this.Label92);
-            this.pnlpanelbuttonsoptions.Controls.Add(this.txtpanelbuttonwidth);
-            this.pnlpanelbuttonsoptions.Controls.Add(this.Label91);
-            this.pnlpanelbuttonsoptions.Controls.Add(this.pnlpanelbuttoncolour);
-            this.pnlpanelbuttonsoptions.Controls.Add(this.Label95);
+            this.pnlpanelbuttonsoptions.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
+            this.pnlpanelbuttonsoptions.Widgets.Add(this.pnlpanelbuttontextcolour);
+            this.pnlpanelbuttonsoptions.Widgets.Add(this.Label101);
+            this.pnlpanelbuttonsoptions.Widgets.Add(this.txtpanelbuttontexttop);
+            this.pnlpanelbuttonsoptions.Widgets.Add(this.Label104);
+            this.pnlpanelbuttonsoptions.Widgets.Add(this.txtpanelbuttontextside);
+            this.pnlpanelbuttonsoptions.Widgets.Add(this.Label106);
+            this.pnlpanelbuttonsoptions.Widgets.Add(this.Label93);
+            this.pnlpanelbuttonsoptions.Widgets.Add(this.txtpanelbuttontop);
+            this.pnlpanelbuttonsoptions.Widgets.Add(this.Label94);
+            this.pnlpanelbuttonsoptions.Widgets.Add(this.txtpanelbuttoninitalgap);
+            this.pnlpanelbuttonsoptions.Widgets.Add(this.Label108);
+            this.pnlpanelbuttonsoptions.Widgets.Add(this.txtpanelbuttonicontop);
+            this.pnlpanelbuttonsoptions.Widgets.Add(this.Label110);
+            this.pnlpanelbuttonsoptions.Widgets.Add(this.txtpanelbuttoniconside);
+            this.pnlpanelbuttonsoptions.Widgets.Add(this.Label112);
+            this.pnlpanelbuttonsoptions.Widgets.Add(this.txtpanelbuttoniconsize);
+            this.pnlpanelbuttonsoptions.Widgets.Add(this.Label105);
+            this.pnlpanelbuttonsoptions.Widgets.Add(this.cbpanelbuttontextstyle);
+            this.pnlpanelbuttonsoptions.Widgets.Add(this.cbpanelbuttonfont);
+            this.pnlpanelbuttonsoptions.Widgets.Add(this.Label100);
+            this.pnlpanelbuttonsoptions.Widgets.Add(this.txtpaneltextbuttonsize);
+            this.pnlpanelbuttonsoptions.Widgets.Add(this.Label102);
+            this.pnlpanelbuttonsoptions.Widgets.Add(this.Label103);
+            this.pnlpanelbuttonsoptions.Widgets.Add(this.Label98);
+            this.pnlpanelbuttonsoptions.Widgets.Add(this.txtpanelbuttongap);
+            this.pnlpanelbuttonsoptions.Widgets.Add(this.Label99);
+            this.pnlpanelbuttonsoptions.Widgets.Add(this.Label96);
+            this.pnlpanelbuttonsoptions.Widgets.Add(this.txtpanelbuttonheight);
+            this.pnlpanelbuttonsoptions.Widgets.Add(this.Label97);
+            this.pnlpanelbuttonsoptions.Widgets.Add(this.Label92);
+            this.pnlpanelbuttonsoptions.Widgets.Add(this.txtpanelbuttonwidth);
+            this.pnlpanelbuttonsoptions.Widgets.Add(this.Label91);
+            this.pnlpanelbuttonsoptions.Widgets.Add(this.pnlpanelbuttoncolour);
+            this.pnlpanelbuttonsoptions.Widgets.Add(this.Label95);
             this.pnlpanelbuttonsoptions.Location = new System.Drawing.Point(135, 159);
             this.pnlpanelbuttonsoptions.Name = "pnlpanelbuttonsoptions";
             this.pnlpanelbuttonsoptions.Size = new System.Drawing.Size(317, 140);
@@ -1196,12 +1194,12 @@ namespace ShiftOS
             // 
             // pnlpanelbuttontextcolour
             // 
-            this.pnlpanelbuttontextcolour.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpanelbuttontextcolour.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpanelbuttontextcolour.Location = new System.Drawing.Point(270, 57);
             this.pnlpanelbuttontextcolour.Name = "pnlpanelbuttontextcolour";
             this.pnlpanelbuttontextcolour.Size = new System.Drawing.Size(41, 20);
             this.pnlpanelbuttontextcolour.TabIndex = 50;
-            this.pnlpanelbuttontextcolour.MouseClick += new System.Windows.Forms.MouseEventHandler(this.SetPanelButtonTextColor);
+            this.pnlpanelbuttontextcolour.MouseClick += new ShiftUI.MouseEventHandler(this.SetPanelButtonTextColor);
             // 
             // Label101
             // 
@@ -1216,7 +1214,7 @@ namespace ShiftOS
             // txtpanelbuttontexttop
             // 
             this.txtpanelbuttontexttop.BackColor = System.Drawing.Color.White;
-            this.txtpanelbuttontexttop.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtpanelbuttontexttop.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtpanelbuttontexttop.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtpanelbuttontexttop.ForeColor = System.Drawing.Color.Black;
             this.txtpanelbuttontexttop.Location = new System.Drawing.Point(225, 82);
@@ -1238,7 +1236,7 @@ namespace ShiftOS
             // txtpanelbuttontextside
             // 
             this.txtpanelbuttontextside.BackColor = System.Drawing.Color.White;
-            this.txtpanelbuttontextside.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtpanelbuttontextside.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtpanelbuttontextside.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtpanelbuttontextside.ForeColor = System.Drawing.Color.Black;
             this.txtpanelbuttontextside.Location = new System.Drawing.Point(165, 82);
@@ -1270,7 +1268,7 @@ namespace ShiftOS
             // txtpanelbuttontop
             // 
             this.txtpanelbuttontop.BackColor = System.Drawing.Color.White;
-            this.txtpanelbuttontop.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtpanelbuttontop.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtpanelbuttontop.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtpanelbuttontop.ForeColor = System.Drawing.Color.Black;
             this.txtpanelbuttontop.Location = new System.Drawing.Point(268, 5);
@@ -1292,7 +1290,7 @@ namespace ShiftOS
             // txtpanelbuttoninitalgap
             // 
             this.txtpanelbuttoninitalgap.BackColor = System.Drawing.Color.White;
-            this.txtpanelbuttoninitalgap.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtpanelbuttoninitalgap.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtpanelbuttoninitalgap.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtpanelbuttoninitalgap.ForeColor = System.Drawing.Color.Black;
             this.txtpanelbuttoninitalgap.Location = new System.Drawing.Point(207, 5);
@@ -1314,7 +1312,7 @@ namespace ShiftOS
             // txtpanelbuttonicontop
             // 
             this.txtpanelbuttonicontop.BackColor = System.Drawing.Color.White;
-            this.txtpanelbuttonicontop.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtpanelbuttonicontop.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtpanelbuttonicontop.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtpanelbuttonicontop.ForeColor = System.Drawing.Color.Black;
             this.txtpanelbuttonicontop.Location = new System.Drawing.Point(287, 108);
@@ -1336,7 +1334,7 @@ namespace ShiftOS
             // txtpanelbuttoniconside
             // 
             this.txtpanelbuttoniconside.BackColor = System.Drawing.Color.White;
-            this.txtpanelbuttoniconside.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtpanelbuttoniconside.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtpanelbuttoniconside.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtpanelbuttoniconside.ForeColor = System.Drawing.Color.Black;
             this.txtpanelbuttoniconside.Location = new System.Drawing.Point(180, 108);
@@ -1358,7 +1356,7 @@ namespace ShiftOS
             // txtpanelbuttoniconsize
             // 
             this.txtpanelbuttoniconsize.BackColor = System.Drawing.Color.White;
-            this.txtpanelbuttoniconsize.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtpanelbuttoniconsize.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtpanelbuttoniconsize.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtpanelbuttoniconsize.ForeColor = System.Drawing.Color.Black;
             this.txtpanelbuttoniconsize.Location = new System.Drawing.Point(70, 108);
@@ -1416,7 +1414,7 @@ namespace ShiftOS
             // txtpaneltextbuttonsize
             // 
             this.txtpaneltextbuttonsize.BackColor = System.Drawing.Color.White;
-            this.txtpaneltextbuttonsize.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtpaneltextbuttonsize.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtpaneltextbuttonsize.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtpaneltextbuttonsize.ForeColor = System.Drawing.Color.Black;
             this.txtpaneltextbuttonsize.Location = new System.Drawing.Point(287, 82);
@@ -1459,7 +1457,7 @@ namespace ShiftOS
             // txtpanelbuttongap
             // 
             this.txtpanelbuttongap.BackColor = System.Drawing.Color.White;
-            this.txtpanelbuttongap.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtpanelbuttongap.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtpanelbuttongap.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtpanelbuttongap.ForeColor = System.Drawing.Color.Black;
             this.txtpanelbuttongap.Location = new System.Drawing.Point(268, 31);
@@ -1491,7 +1489,7 @@ namespace ShiftOS
             // txtpanelbuttonheight
             // 
             this.txtpanelbuttonheight.BackColor = System.Drawing.Color.White;
-            this.txtpanelbuttonheight.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtpanelbuttonheight.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtpanelbuttonheight.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtpanelbuttonheight.ForeColor = System.Drawing.Color.Black;
             this.txtpanelbuttonheight.Location = new System.Drawing.Point(185, 32);
@@ -1523,7 +1521,7 @@ namespace ShiftOS
             // txtpanelbuttonwidth
             // 
             this.txtpanelbuttonwidth.BackColor = System.Drawing.Color.White;
-            this.txtpanelbuttonwidth.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtpanelbuttonwidth.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtpanelbuttonwidth.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtpanelbuttonwidth.ForeColor = System.Drawing.Color.Black;
             this.txtpanelbuttonwidth.Location = new System.Drawing.Point(88, 31);
@@ -1544,12 +1542,12 @@ namespace ShiftOS
             // 
             // pnlpanelbuttoncolour
             // 
-            this.pnlpanelbuttoncolour.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpanelbuttoncolour.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpanelbuttoncolour.Location = new System.Drawing.Point(94, 5);
             this.pnlpanelbuttoncolour.Name = "pnlpanelbuttoncolour";
             this.pnlpanelbuttoncolour.Size = new System.Drawing.Size(41, 20);
             this.pnlpanelbuttoncolour.TabIndex = 1;
-            this.pnlpanelbuttoncolour.MouseClick += new System.Windows.Forms.MouseEventHandler(this.SetPanelButtonColor);
+            this.pnlpanelbuttoncolour.MouseClick += new ShiftUI.MouseEventHandler(this.SetPanelButtonColor);
             // 
             // Label95
             // 
@@ -1563,9 +1561,9 @@ namespace ShiftOS
             // 
             // pnldesktopbackgroundoptions
             // 
-            this.pnldesktopbackgroundoptions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnldesktopbackgroundoptions.Controls.Add(this.pnldesktopcolour);
-            this.pnldesktopbackgroundoptions.Controls.Add(this.Label45);
+            this.pnldesktopbackgroundoptions.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
+            this.pnldesktopbackgroundoptions.Widgets.Add(this.pnldesktopcolour);
+            this.pnldesktopbackgroundoptions.Widgets.Add(this.Label45);
             this.pnldesktopbackgroundoptions.Location = new System.Drawing.Point(135, 159);
             this.pnldesktopbackgroundoptions.Name = "pnldesktopbackgroundoptions";
             this.pnldesktopbackgroundoptions.Size = new System.Drawing.Size(317, 140);
@@ -1574,13 +1572,13 @@ namespace ShiftOS
             // 
             // pnldesktopcolour
             // 
-            this.pnldesktopcolour.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.pnldesktopcolour.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnldesktopcolour.BackgroundImageLayout = ShiftUI.ImageLayout.Stretch;
+            this.pnldesktopcolour.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnldesktopcolour.Location = new System.Drawing.Point(112, 5);
             this.pnldesktopcolour.Name = "pnldesktopcolour";
             this.pnldesktopcolour.Size = new System.Drawing.Size(41, 20);
             this.pnldesktopcolour.TabIndex = 3;
-            this.pnldesktopcolour.MouseClick += new System.Windows.Forms.MouseEventHandler(this.ChangeDesktopBackground);
+            this.pnldesktopcolour.MouseClick += new ShiftUI.MouseEventHandler(this.ChangeDesktopBackground);
             // 
             // Label45
             // 
@@ -1594,21 +1592,21 @@ namespace ShiftOS
             // 
             // pnlpanelclockoptions
             // 
-            this.pnlpanelclockoptions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnlpanelclockoptions.Controls.Add(this.pnlclockbackgroundcolour);
-            this.pnlpanelclockoptions.Controls.Add(this.Label44);
-            this.pnlpanelclockoptions.Controls.Add(this.comboclocktextstyle);
-            this.pnlpanelclockoptions.Controls.Add(this.comboclocktextfont);
-            this.pnlpanelclockoptions.Controls.Add(this.Label26);
-            this.pnlpanelclockoptions.Controls.Add(this.Label29);
-            this.pnlpanelclockoptions.Controls.Add(this.txtclocktextfromtop);
-            this.pnlpanelclockoptions.Controls.Add(this.Label30);
-            this.pnlpanelclockoptions.Controls.Add(this.Label31);
-            this.pnlpanelclockoptions.Controls.Add(this.txtclocktextsize);
-            this.pnlpanelclockoptions.Controls.Add(this.Label32);
-            this.pnlpanelclockoptions.Controls.Add(this.Label33);
-            this.pnlpanelclockoptions.Controls.Add(this.pnlpanelclocktextcolour);
-            this.pnlpanelclockoptions.Controls.Add(this.Label34);
+            this.pnlpanelclockoptions.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
+            this.pnlpanelclockoptions.Widgets.Add(this.pnlclockbackgroundcolour);
+            this.pnlpanelclockoptions.Widgets.Add(this.Label44);
+            this.pnlpanelclockoptions.Widgets.Add(this.comboclocktextstyle);
+            this.pnlpanelclockoptions.Widgets.Add(this.comboclocktextfont);
+            this.pnlpanelclockoptions.Widgets.Add(this.Label26);
+            this.pnlpanelclockoptions.Widgets.Add(this.Label29);
+            this.pnlpanelclockoptions.Widgets.Add(this.txtclocktextfromtop);
+            this.pnlpanelclockoptions.Widgets.Add(this.Label30);
+            this.pnlpanelclockoptions.Widgets.Add(this.Label31);
+            this.pnlpanelclockoptions.Widgets.Add(this.txtclocktextsize);
+            this.pnlpanelclockoptions.Widgets.Add(this.Label32);
+            this.pnlpanelclockoptions.Widgets.Add(this.Label33);
+            this.pnlpanelclockoptions.Widgets.Add(this.pnlpanelclocktextcolour);
+            this.pnlpanelclockoptions.Widgets.Add(this.Label34);
             this.pnlpanelclockoptions.Location = new System.Drawing.Point(135, 159);
             this.pnlpanelclockoptions.Name = "pnlpanelclockoptions";
             this.pnlpanelclockoptions.Size = new System.Drawing.Size(317, 140);
@@ -1617,12 +1615,12 @@ namespace ShiftOS
             // 
             // pnlclockbackgroundcolour
             // 
-            this.pnlclockbackgroundcolour.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlclockbackgroundcolour.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlclockbackgroundcolour.Location = new System.Drawing.Point(261, 5);
             this.pnlclockbackgroundcolour.Name = "pnlclockbackgroundcolour";
             this.pnlclockbackgroundcolour.Size = new System.Drawing.Size(41, 20);
             this.pnlclockbackgroundcolour.TabIndex = 20;
-            this.pnlclockbackgroundcolour.MouseClick += new System.Windows.Forms.MouseEventHandler(this.SetClockBG);
+            this.pnlclockbackgroundcolour.MouseClick += new ShiftUI.MouseEventHandler(this.SetClockBG);
             // 
             // Label44
             // 
@@ -1683,7 +1681,7 @@ namespace ShiftOS
             // txtclocktextfromtop
             // 
             this.txtclocktextfromtop.BackColor = System.Drawing.Color.White;
-            this.txtclocktextfromtop.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtclocktextfromtop.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtclocktextfromtop.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtclocktextfromtop.ForeColor = System.Drawing.Color.Black;
             this.txtclocktextfromtop.Location = new System.Drawing.Point(139, 80);
@@ -1715,7 +1713,7 @@ namespace ShiftOS
             // txtclocktextsize
             // 
             this.txtclocktextsize.BackColor = System.Drawing.Color.White;
-            this.txtclocktextsize.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtclocktextsize.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtclocktextsize.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtclocktextsize.ForeColor = System.Drawing.Color.Black;
             this.txtclocktextsize.Location = new System.Drawing.Point(114, 55);
@@ -1746,12 +1744,12 @@ namespace ShiftOS
             // 
             // pnlpanelclocktextcolour
             // 
-            this.pnlpanelclocktextcolour.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpanelclocktextcolour.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpanelclocktextcolour.Location = new System.Drawing.Point(121, 5);
             this.pnlpanelclocktextcolour.Name = "pnlpanelclocktextcolour";
             this.pnlpanelclocktextcolour.Size = new System.Drawing.Size(41, 20);
             this.pnlpanelclocktextcolour.TabIndex = 1;
-            this.pnlpanelclocktextcolour.MouseClick += new System.Windows.Forms.MouseEventHandler(this.SetClockTextColor);
+            this.pnlpanelclocktextcolour.MouseClick += new ShiftUI.MouseEventHandler(this.SetClockTextColor);
             // 
             // Label34
             // 
@@ -1765,10 +1763,10 @@ namespace ShiftOS
             // 
             // pnldesktoppreview
             // 
-            this.pnldesktoppreview.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnldesktoppreview.Controls.Add(this.predesktoppanel);
+            this.pnldesktoppreview.Anchor = ((ShiftUI.AnchorStyles)((((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
+            this.pnldesktoppreview.Widgets.Add(this.predesktoppanel);
             this.pnldesktoppreview.Location = new System.Drawing.Point(5, 3);
             this.pnldesktoppreview.Name = "pnldesktoppreview";
             this.pnldesktoppreview.Size = new System.Drawing.Size(448, 148);
@@ -1777,10 +1775,10 @@ namespace ShiftOS
             // predesktoppanel
             // 
             this.predesktoppanel.BackColor = System.Drawing.Color.Gray;
-            this.predesktoppanel.Controls.Add(this.prepnlpanelbuttonholder);
-            this.predesktoppanel.Controls.Add(this.pretimepanel);
-            this.predesktoppanel.Controls.Add(this.preapplaunchermenuholder);
-            this.predesktoppanel.Dock = System.Windows.Forms.DockStyle.Top;
+            this.predesktoppanel.Widgets.Add(this.prepnlpanelbuttonholder);
+            this.predesktoppanel.Widgets.Add(this.pretimepanel);
+            this.predesktoppanel.Widgets.Add(this.preapplaunchermenuholder);
+            this.predesktoppanel.Dock = ShiftUI.DockStyle.Top;
             this.predesktoppanel.Location = new System.Drawing.Point(0, 0);
             this.predesktoppanel.Name = "predesktoppanel";
             this.predesktoppanel.Size = new System.Drawing.Size(448, 25);
@@ -1789,19 +1787,19 @@ namespace ShiftOS
             // prepnlpanelbuttonholder
             // 
             this.prepnlpanelbuttonholder.BackColor = System.Drawing.Color.Transparent;
-            this.prepnlpanelbuttonholder.Controls.Add(this.prepnlpanelbutton);
-            this.prepnlpanelbuttonholder.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.prepnlpanelbuttonholder.Widgets.Add(this.prepnlpanelbutton);
+            this.prepnlpanelbuttonholder.Dock = ShiftUI.DockStyle.Fill;
             this.prepnlpanelbuttonholder.Location = new System.Drawing.Point(116, 0);
             this.prepnlpanelbuttonholder.Name = "prepnlpanelbuttonholder";
-            this.prepnlpanelbuttonholder.Padding = new System.Windows.Forms.Padding(2, 0, 0, 0);
+            this.prepnlpanelbuttonholder.Padding = new ShiftUI.Padding(2, 0, 0, 0);
             this.prepnlpanelbuttonholder.Size = new System.Drawing.Size(235, 25);
             this.prepnlpanelbuttonholder.TabIndex = 6;
             // 
             // prepnlpanelbutton
             // 
             this.prepnlpanelbutton.BackColor = System.Drawing.Color.Black;
-            this.prepnlpanelbutton.Controls.Add(this.pretbicon);
-            this.prepnlpanelbutton.Controls.Add(this.pretbctext);
+            this.prepnlpanelbutton.Widgets.Add(this.pretbicon);
+            this.prepnlpanelbutton.Widgets.Add(this.pretbctext);
             this.prepnlpanelbutton.Location = new System.Drawing.Point(5, 3);
             this.prepnlpanelbutton.Name = "prepnlpanelbutton";
             this.prepnlpanelbutton.Size = new System.Drawing.Size(126, 20);
@@ -1811,7 +1809,7 @@ namespace ShiftOS
             // pretbicon
             // 
             this.pretbicon.BackColor = System.Drawing.Color.Transparent;
-            this.pretbicon.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.pretbicon.BackgroundImageLayout = ShiftUI.ImageLayout.Stretch;
             this.pretbicon.Location = new System.Drawing.Point(4, 2);
             this.pretbicon.Name = "pretbicon";
             this.pretbicon.Size = new System.Drawing.Size(16, 16);
@@ -1832,8 +1830,8 @@ namespace ShiftOS
             // 
             // pretimepanel
             // 
-            this.pretimepanel.Controls.Add(this.prepaneltimetext);
-            this.pretimepanel.Dock = System.Windows.Forms.DockStyle.Right;
+            this.pretimepanel.Widgets.Add(this.prepaneltimetext);
+            this.pretimepanel.Dock = ShiftUI.DockStyle.Right;
             this.pretimepanel.Location = new System.Drawing.Point(351, 0);
             this.pretimepanel.Name = "pretimepanel";
             this.pretimepanel.Size = new System.Drawing.Size(97, 25);
@@ -1853,8 +1851,8 @@ namespace ShiftOS
             // 
             // preapplaunchermenuholder
             // 
-            this.preapplaunchermenuholder.Controls.Add(this.predesktopappmenu);
-            this.preapplaunchermenuholder.Dock = System.Windows.Forms.DockStyle.Left;
+            this.preapplaunchermenuholder.Widgets.Add(this.predesktopappmenu);
+            this.preapplaunchermenuholder.Dock = ShiftUI.DockStyle.Left;
             this.preapplaunchermenuholder.Location = new System.Drawing.Point(0, 0);
             this.preapplaunchermenuholder.Name = "preapplaunchermenuholder";
             this.preapplaunchermenuholder.Size = new System.Drawing.Size(116, 25);
@@ -1863,12 +1861,12 @@ namespace ShiftOS
             // predesktopappmenu
             // 
             this.predesktopappmenu.AutoSize = false;
-            this.predesktopappmenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.predesktopappmenu.Items.AddRange(new ShiftUI.ToolStripItem[] {
             this.ApplicationsToolStripMenuItem});
-            this.predesktopappmenu.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow;
+            this.predesktopappmenu.LayoutStyle = ShiftUI.ToolStripLayoutStyle.HorizontalStackWithOverflow;
             this.predesktopappmenu.Location = new System.Drawing.Point(0, 0);
             this.predesktopappmenu.Name = "predesktopappmenu";
-            this.predesktopappmenu.Padding = new System.Windows.Forms.Padding(0);
+            this.predesktopappmenu.Padding = new ShiftUI.Padding(0);
             this.predesktopappmenu.Size = new System.Drawing.Size(116, 24);
             this.predesktopappmenu.TabIndex = 0;
             this.predesktopappmenu.Text = "MenuStrip1";
@@ -1876,7 +1874,7 @@ namespace ShiftOS
             // ApplicationsToolStripMenuItem
             // 
             this.ApplicationsToolStripMenuItem.AutoSize = false;
-            this.ApplicationsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.ApplicationsToolStripMenuItem.DropDownItems.AddRange(new ShiftUI.ToolStripItem[] {
             this.KnowledgeInputToolStripMenuItem,
             this.ShiftoriumToolStripMenuItem,
             this.ClockToolStripMenuItem,
@@ -1886,12 +1884,12 @@ namespace ShiftOS
             this.ShutdownToolStripMenuItem});
             this.ApplicationsToolStripMenuItem.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.749999F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.ApplicationsToolStripMenuItem.Name = "ApplicationsToolStripMenuItem";
-            this.ApplicationsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.ApplicationsToolStripMenuItem.Padding = new ShiftUI.Padding(2, 0, 2, 0);
             this.ApplicationsToolStripMenuItem.ShowShortcutKeys = false;
             this.ApplicationsToolStripMenuItem.Size = new System.Drawing.Size(102, 24);
             this.ApplicationsToolStripMenuItem.Text = "Applications";
-            this.ApplicationsToolStripMenuItem.TextDirection = System.Windows.Forms.ToolStripTextDirection.Horizontal;
-            this.ApplicationsToolStripMenuItem.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage;
+            this.ApplicationsToolStripMenuItem.TextDirection = ShiftUI.ToolStripTextDirection.Horizontal;
+            this.ApplicationsToolStripMenuItem.TextImageRelation = ShiftUI.TextImageRelation.TextBeforeImage;
             // 
             // KnowledgeInputToolStripMenuItem
             // 
@@ -1948,11 +1946,11 @@ namespace ShiftOS
             // 
             // Panel10
             // 
-            this.Panel10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.Panel10.Controls.Add(this.btndesktopitself);
-            this.Panel10.Controls.Add(this.btnpanelclock);
-            this.Panel10.Controls.Add(this.btnapplauncher);
-            this.Panel10.Controls.Add(this.btndesktoppanel);
+            this.Panel10.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left)));
+            this.Panel10.Widgets.Add(this.btndesktopitself);
+            this.Panel10.Widgets.Add(this.btnpanelclock);
+            this.Panel10.Widgets.Add(this.btnapplauncher);
+            this.Panel10.Widgets.Add(this.btndesktoppanel);
             this.Panel10.Location = new System.Drawing.Point(1, 168);
             this.Panel10.Name = "Panel10";
             this.Panel10.Size = new System.Drawing.Size(128, 135);
@@ -1961,7 +1959,7 @@ namespace ShiftOS
             // btndesktopitself
             // 
             this.btndesktopitself.BackColor = System.Drawing.Color.White;
-            this.btndesktopitself.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btndesktopitself.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btndesktopitself.Font = new System.Drawing.Font("Cambria", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btndesktopitself.Location = new System.Drawing.Point(4, 105);
             this.btndesktopitself.Name = "btndesktopitself";
@@ -1974,7 +1972,7 @@ namespace ShiftOS
             // btnpanelclock
             // 
             this.btnpanelclock.BackColor = System.Drawing.Color.White;
-            this.btnpanelclock.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnpanelclock.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnpanelclock.Font = new System.Drawing.Font("Cambria", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnpanelclock.Location = new System.Drawing.Point(4, 70);
             this.btnpanelclock.Name = "btnpanelclock";
@@ -1987,7 +1985,7 @@ namespace ShiftOS
             // btnapplauncher
             // 
             this.btnapplauncher.BackColor = System.Drawing.Color.White;
-            this.btnapplauncher.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnapplauncher.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnapplauncher.Font = new System.Drawing.Font("Cambria", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnapplauncher.Location = new System.Drawing.Point(4, 35);
             this.btnapplauncher.Name = "btnapplauncher";
@@ -2000,7 +1998,7 @@ namespace ShiftOS
             // btndesktoppanel
             // 
             this.btndesktoppanel.BackColor = System.Drawing.Color.White;
-            this.btndesktoppanel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btndesktoppanel.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btndesktoppanel.Font = new System.Drawing.Font("Cambria", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btndesktoppanel.Location = new System.Drawing.Point(4, 0);
             this.btndesktoppanel.Name = "btndesktoppanel";
@@ -2019,17 +2017,17 @@ namespace ShiftOS
             // 
             // pnlwindowsoptions
             // 
-            this.pnlwindowsoptions.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.pnlwindowsoptions.Anchor = ((ShiftUI.AnchorStyles)((((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.pnlwindowsoptions.BackColor = System.Drawing.Color.White;
-            this.pnlwindowsoptions.Controls.Add(this.pnlwindowsintro);
-            this.pnlwindowsoptions.Controls.Add(this.pnlbuttonoptions);
-            this.pnlwindowsoptions.Controls.Add(this.pnltitlebaroptions);
-            this.pnlwindowsoptions.Controls.Add(this.pnlborderoptions);
-            this.pnlwindowsoptions.Controls.Add(this.pnltitletextoptions);
-            this.pnlwindowsoptions.Controls.Add(this.pnlwindowsobjects);
-            this.pnlwindowsoptions.Controls.Add(this.pnlwindowpreview);
+            this.pnlwindowsoptions.Widgets.Add(this.pnlwindowsintro);
+            this.pnlwindowsoptions.Widgets.Add(this.pnlbuttonoptions);
+            this.pnlwindowsoptions.Widgets.Add(this.pnltitlebaroptions);
+            this.pnlwindowsoptions.Widgets.Add(this.pnlborderoptions);
+            this.pnlwindowsoptions.Widgets.Add(this.pnltitletextoptions);
+            this.pnlwindowsoptions.Widgets.Add(this.pnlwindowsobjects);
+            this.pnlwindowsoptions.Widgets.Add(this.pnlwindowpreview);
             this.pnlwindowsoptions.Location = new System.Drawing.Point(134, 9);
             this.pnlwindowsoptions.Name = "pnlwindowsoptions";
             this.pnlwindowsoptions.Size = new System.Drawing.Size(457, 306);
@@ -2037,9 +2035,9 @@ namespace ShiftOS
             // 
             // pnlwindowsintro
             // 
-            this.pnlwindowsintro.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnlwindowsintro.Controls.Add(this.Label68);
-            this.pnlwindowsintro.Controls.Add(this.Label67);
+            this.pnlwindowsintro.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
+            this.pnlwindowsintro.Widgets.Add(this.Label68);
+            this.pnlwindowsintro.Widgets.Add(this.Label67);
             this.pnlwindowsintro.Location = new System.Drawing.Point(135, 159);
             this.pnlwindowsintro.Name = "pnlwindowsintro";
             this.pnlwindowsintro.Size = new System.Drawing.Size(325, 139);
@@ -2069,12 +2067,12 @@ namespace ShiftOS
             // 
             // pnlbuttonoptions
             // 
-            this.pnlbuttonoptions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnlbuttonoptions.Controls.Add(this.pnlclosebuttonoptions);
-            this.pnlbuttonoptions.Controls.Add(this.pnlrollupbuttonoptions);
-            this.pnlbuttonoptions.Controls.Add(this.pnlminimizebuttonoptions);
-            this.pnlbuttonoptions.Controls.Add(this.combobuttonoption);
-            this.pnlbuttonoptions.Controls.Add(this.Label52);
+            this.pnlbuttonoptions.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
+            this.pnlbuttonoptions.Widgets.Add(this.pnlclosebuttonoptions);
+            this.pnlbuttonoptions.Widgets.Add(this.pnlrollupbuttonoptions);
+            this.pnlbuttonoptions.Widgets.Add(this.pnlminimizebuttonoptions);
+            this.pnlbuttonoptions.Widgets.Add(this.combobuttonoption);
+            this.pnlbuttonoptions.Widgets.Add(this.Label52);
             this.pnlbuttonoptions.Location = new System.Drawing.Point(135, 159);
             this.pnlbuttonoptions.Name = "pnlbuttonoptions";
             this.pnlbuttonoptions.Size = new System.Drawing.Size(325, 139);
@@ -2083,22 +2081,22 @@ namespace ShiftOS
             // 
             // pnlclosebuttonoptions
             // 
-            this.pnlclosebuttonoptions.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnlclosebuttonoptions.Controls.Add(this.Label8);
-            this.pnlclosebuttonoptions.Controls.Add(this.Label11);
-            this.pnlclosebuttonoptions.Controls.Add(this.pnlclosebuttoncolour);
-            this.pnlclosebuttonoptions.Controls.Add(this.txtclosebuttonfromside);
-            this.pnlclosebuttonoptions.Controls.Add(this.Label7);
-            this.pnlclosebuttonoptions.Controls.Add(this.Label12);
-            this.pnlclosebuttonoptions.Controls.Add(this.txtclosebuttonheight);
-            this.pnlclosebuttonoptions.Controls.Add(this.Label13);
-            this.pnlclosebuttonoptions.Controls.Add(this.Label6);
-            this.pnlclosebuttonoptions.Controls.Add(this.txtclosebuttonfromtop);
-            this.pnlclosebuttonoptions.Controls.Add(this.Label10);
-            this.pnlclosebuttonoptions.Controls.Add(this.Label14);
-            this.pnlclosebuttonoptions.Controls.Add(this.txtclosebuttonwidth);
-            this.pnlclosebuttonoptions.Controls.Add(this.Label9);
+            this.pnlclosebuttonoptions.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
+            this.pnlclosebuttonoptions.Widgets.Add(this.Label8);
+            this.pnlclosebuttonoptions.Widgets.Add(this.Label11);
+            this.pnlclosebuttonoptions.Widgets.Add(this.pnlclosebuttoncolour);
+            this.pnlclosebuttonoptions.Widgets.Add(this.txtclosebuttonfromside);
+            this.pnlclosebuttonoptions.Widgets.Add(this.Label7);
+            this.pnlclosebuttonoptions.Widgets.Add(this.Label12);
+            this.pnlclosebuttonoptions.Widgets.Add(this.txtclosebuttonheight);
+            this.pnlclosebuttonoptions.Widgets.Add(this.Label13);
+            this.pnlclosebuttonoptions.Widgets.Add(this.Label6);
+            this.pnlclosebuttonoptions.Widgets.Add(this.txtclosebuttonfromtop);
+            this.pnlclosebuttonoptions.Widgets.Add(this.Label10);
+            this.pnlclosebuttonoptions.Widgets.Add(this.Label14);
+            this.pnlclosebuttonoptions.Widgets.Add(this.txtclosebuttonwidth);
+            this.pnlclosebuttonoptions.Widgets.Add(this.Label9);
             this.pnlclosebuttonoptions.Location = new System.Drawing.Point(4, 29);
             this.pnlclosebuttonoptions.Name = "pnlclosebuttonoptions";
             this.pnlclosebuttonoptions.Size = new System.Drawing.Size(311, 105);
@@ -2127,17 +2125,17 @@ namespace ShiftOS
             // 
             // pnlclosebuttoncolour
             // 
-            this.pnlclosebuttoncolour.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.pnlclosebuttoncolour.BackgroundImageLayout = ShiftUI.ImageLayout.Stretch;
             this.pnlclosebuttoncolour.Location = new System.Drawing.Point(132, 4);
             this.pnlclosebuttoncolour.Name = "pnlclosebuttoncolour";
             this.pnlclosebuttoncolour.Size = new System.Drawing.Size(41, 20);
             this.pnlclosebuttoncolour.TabIndex = 1;
-            this.pnlclosebuttoncolour.MouseClick += new System.Windows.Forms.MouseEventHandler(this.SetcloseColor);
+            this.pnlclosebuttoncolour.MouseClick += new ShiftUI.MouseEventHandler(this.SetcloseColor);
             // 
             // txtclosebuttonfromside
             // 
             this.txtclosebuttonfromside.BackColor = System.Drawing.Color.White;
-            this.txtclosebuttonfromside.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtclosebuttonfromside.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtclosebuttonfromside.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtclosebuttonfromside.ForeColor = System.Drawing.Color.Black;
             this.txtclosebuttonfromside.Location = new System.Drawing.Point(153, 80);
@@ -2169,7 +2167,7 @@ namespace ShiftOS
             // txtclosebuttonheight
             // 
             this.txtclosebuttonheight.BackColor = System.Drawing.Color.White;
-            this.txtclosebuttonheight.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtclosebuttonheight.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtclosebuttonheight.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtclosebuttonheight.ForeColor = System.Drawing.Color.Black;
             this.txtclosebuttonheight.Location = new System.Drawing.Point(132, 30);
@@ -2201,7 +2199,7 @@ namespace ShiftOS
             // txtclosebuttonfromtop
             // 
             this.txtclosebuttonfromtop.BackColor = System.Drawing.Color.White;
-            this.txtclosebuttonfromtop.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtclosebuttonfromtop.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtclosebuttonfromtop.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtclosebuttonfromtop.ForeColor = System.Drawing.Color.Black;
             this.txtclosebuttonfromtop.Location = new System.Drawing.Point(153, 55);
@@ -2233,7 +2231,7 @@ namespace ShiftOS
             // txtclosebuttonwidth
             // 
             this.txtclosebuttonwidth.BackColor = System.Drawing.Color.White;
-            this.txtclosebuttonwidth.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtclosebuttonwidth.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtclosebuttonwidth.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtclosebuttonwidth.ForeColor = System.Drawing.Color.Black;
             this.txtclosebuttonwidth.Location = new System.Drawing.Point(234, 30);
@@ -2254,22 +2252,22 @@ namespace ShiftOS
             // 
             // pnlrollupbuttonoptions
             // 
-            this.pnlrollupbuttonoptions.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnlrollupbuttonoptions.Controls.Add(this.Label54);
-            this.pnlrollupbuttonoptions.Controls.Add(this.Label55);
-            this.pnlrollupbuttonoptions.Controls.Add(this.pnlrollupbuttoncolour);
-            this.pnlrollupbuttonoptions.Controls.Add(this.txtrollupbuttonside);
-            this.pnlrollupbuttonoptions.Controls.Add(this.Label56);
-            this.pnlrollupbuttonoptions.Controls.Add(this.Label57);
-            this.pnlrollupbuttonoptions.Controls.Add(this.txtrollupbuttonheight);
-            this.pnlrollupbuttonoptions.Controls.Add(this.Label58);
-            this.pnlrollupbuttonoptions.Controls.Add(this.Label59);
-            this.pnlrollupbuttonoptions.Controls.Add(this.txtrollupbuttontop);
-            this.pnlrollupbuttonoptions.Controls.Add(this.Label60);
-            this.pnlrollupbuttonoptions.Controls.Add(this.Label61);
-            this.pnlrollupbuttonoptions.Controls.Add(this.txtrollupbuttonwidth);
-            this.pnlrollupbuttonoptions.Controls.Add(this.Label62);
+            this.pnlrollupbuttonoptions.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
+            this.pnlrollupbuttonoptions.Widgets.Add(this.Label54);
+            this.pnlrollupbuttonoptions.Widgets.Add(this.Label55);
+            this.pnlrollupbuttonoptions.Widgets.Add(this.pnlrollupbuttoncolour);
+            this.pnlrollupbuttonoptions.Widgets.Add(this.txtrollupbuttonside);
+            this.pnlrollupbuttonoptions.Widgets.Add(this.Label56);
+            this.pnlrollupbuttonoptions.Widgets.Add(this.Label57);
+            this.pnlrollupbuttonoptions.Widgets.Add(this.txtrollupbuttonheight);
+            this.pnlrollupbuttonoptions.Widgets.Add(this.Label58);
+            this.pnlrollupbuttonoptions.Widgets.Add(this.Label59);
+            this.pnlrollupbuttonoptions.Widgets.Add(this.txtrollupbuttontop);
+            this.pnlrollupbuttonoptions.Widgets.Add(this.Label60);
+            this.pnlrollupbuttonoptions.Widgets.Add(this.Label61);
+            this.pnlrollupbuttonoptions.Widgets.Add(this.txtrollupbuttonwidth);
+            this.pnlrollupbuttonoptions.Widgets.Add(this.Label62);
             this.pnlrollupbuttonoptions.Location = new System.Drawing.Point(4, 29);
             this.pnlrollupbuttonoptions.Name = "pnlrollupbuttonoptions";
             this.pnlrollupbuttonoptions.Size = new System.Drawing.Size(311, 105);
@@ -2298,18 +2296,18 @@ namespace ShiftOS
             // 
             // pnlrollupbuttoncolour
             // 
-            this.pnlrollupbuttoncolour.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.pnlrollupbuttoncolour.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlrollupbuttoncolour.BackgroundImageLayout = ShiftUI.ImageLayout.Stretch;
+            this.pnlrollupbuttoncolour.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlrollupbuttoncolour.Location = new System.Drawing.Point(143, 4);
             this.pnlrollupbuttoncolour.Name = "pnlrollupbuttoncolour";
             this.pnlrollupbuttoncolour.Size = new System.Drawing.Size(41, 20);
             this.pnlrollupbuttoncolour.TabIndex = 1;
-            this.pnlrollupbuttoncolour.MouseClick += new System.Windows.Forms.MouseEventHandler(this.SetrollupColor);
+            this.pnlrollupbuttoncolour.MouseClick += new ShiftUI.MouseEventHandler(this.SetrollupColor);
             // 
             // txtrollupbuttonside
             // 
             this.txtrollupbuttonside.BackColor = System.Drawing.Color.White;
-            this.txtrollupbuttonside.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtrollupbuttonside.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtrollupbuttonside.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtrollupbuttonside.ForeColor = System.Drawing.Color.Black;
             this.txtrollupbuttonside.Location = new System.Drawing.Point(164, 80);
@@ -2341,7 +2339,7 @@ namespace ShiftOS
             // txtrollupbuttonheight
             // 
             this.txtrollupbuttonheight.BackColor = System.Drawing.Color.White;
-            this.txtrollupbuttonheight.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtrollupbuttonheight.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtrollupbuttonheight.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtrollupbuttonheight.ForeColor = System.Drawing.Color.Black;
             this.txtrollupbuttonheight.Location = new System.Drawing.Point(143, 30);
@@ -2373,7 +2371,7 @@ namespace ShiftOS
             // txtrollupbuttontop
             // 
             this.txtrollupbuttontop.BackColor = System.Drawing.Color.White;
-            this.txtrollupbuttontop.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtrollupbuttontop.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtrollupbuttontop.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtrollupbuttontop.ForeColor = System.Drawing.Color.Black;
             this.txtrollupbuttontop.Location = new System.Drawing.Point(164, 55);
@@ -2405,7 +2403,7 @@ namespace ShiftOS
             // txtrollupbuttonwidth
             // 
             this.txtrollupbuttonwidth.BackColor = System.Drawing.Color.White;
-            this.txtrollupbuttonwidth.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtrollupbuttonwidth.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtrollupbuttonwidth.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtrollupbuttonwidth.ForeColor = System.Drawing.Color.Black;
             this.txtrollupbuttonwidth.Location = new System.Drawing.Point(245, 30);
@@ -2426,22 +2424,22 @@ namespace ShiftOS
             // 
             // pnlminimizebuttonoptions
             // 
-            this.pnlminimizebuttonoptions.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnlminimizebuttonoptions.Controls.Add(this.Label82);
-            this.pnlminimizebuttonoptions.Controls.Add(this.Label83);
-            this.pnlminimizebuttonoptions.Controls.Add(this.pnlminimizebuttoncolour);
-            this.pnlminimizebuttonoptions.Controls.Add(this.txtminimizebuttonside);
-            this.pnlminimizebuttonoptions.Controls.Add(this.Label84);
-            this.pnlminimizebuttonoptions.Controls.Add(this.Label85);
-            this.pnlminimizebuttonoptions.Controls.Add(this.txtminimizebuttonheight);
-            this.pnlminimizebuttonoptions.Controls.Add(this.Label86);
-            this.pnlminimizebuttonoptions.Controls.Add(this.Label87);
-            this.pnlminimizebuttonoptions.Controls.Add(this.txtminimizebuttontop);
-            this.pnlminimizebuttonoptions.Controls.Add(this.Label88);
-            this.pnlminimizebuttonoptions.Controls.Add(this.Label89);
-            this.pnlminimizebuttonoptions.Controls.Add(this.txtminimizebuttonwidth);
-            this.pnlminimizebuttonoptions.Controls.Add(this.Label90);
+            this.pnlminimizebuttonoptions.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
+            this.pnlminimizebuttonoptions.Widgets.Add(this.Label82);
+            this.pnlminimizebuttonoptions.Widgets.Add(this.Label83);
+            this.pnlminimizebuttonoptions.Widgets.Add(this.pnlminimizebuttoncolour);
+            this.pnlminimizebuttonoptions.Widgets.Add(this.txtminimizebuttonside);
+            this.pnlminimizebuttonoptions.Widgets.Add(this.Label84);
+            this.pnlminimizebuttonoptions.Widgets.Add(this.Label85);
+            this.pnlminimizebuttonoptions.Widgets.Add(this.txtminimizebuttonheight);
+            this.pnlminimizebuttonoptions.Widgets.Add(this.Label86);
+            this.pnlminimizebuttonoptions.Widgets.Add(this.Label87);
+            this.pnlminimizebuttonoptions.Widgets.Add(this.txtminimizebuttontop);
+            this.pnlminimizebuttonoptions.Widgets.Add(this.Label88);
+            this.pnlminimizebuttonoptions.Widgets.Add(this.Label89);
+            this.pnlminimizebuttonoptions.Widgets.Add(this.txtminimizebuttonwidth);
+            this.pnlminimizebuttonoptions.Widgets.Add(this.Label90);
             this.pnlminimizebuttonoptions.Location = new System.Drawing.Point(4, 29);
             this.pnlminimizebuttonoptions.Name = "pnlminimizebuttonoptions";
             this.pnlminimizebuttonoptions.Size = new System.Drawing.Size(311, 105);
@@ -2470,18 +2468,18 @@ namespace ShiftOS
             // 
             // pnlminimizebuttoncolour
             // 
-            this.pnlminimizebuttoncolour.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.pnlminimizebuttoncolour.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlminimizebuttoncolour.BackgroundImageLayout = ShiftUI.ImageLayout.Stretch;
+            this.pnlminimizebuttoncolour.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlminimizebuttoncolour.Location = new System.Drawing.Point(149, 4);
             this.pnlminimizebuttoncolour.Name = "pnlminimizebuttoncolour";
             this.pnlminimizebuttoncolour.Size = new System.Drawing.Size(41, 20);
             this.pnlminimizebuttoncolour.TabIndex = 1;
-            this.pnlminimizebuttoncolour.MouseClick += new System.Windows.Forms.MouseEventHandler(this.SetMinimizeColor);
+            this.pnlminimizebuttoncolour.MouseClick += new ShiftUI.MouseEventHandler(this.SetMinimizeColor);
             // 
             // txtminimizebuttonside
             // 
             this.txtminimizebuttonside.BackColor = System.Drawing.Color.White;
-            this.txtminimizebuttonside.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtminimizebuttonside.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtminimizebuttonside.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtminimizebuttonside.ForeColor = System.Drawing.Color.Black;
             this.txtminimizebuttonside.Location = new System.Drawing.Point(172, 80);
@@ -2513,7 +2511,7 @@ namespace ShiftOS
             // txtminimizebuttonheight
             // 
             this.txtminimizebuttonheight.BackColor = System.Drawing.Color.White;
-            this.txtminimizebuttonheight.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtminimizebuttonheight.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtminimizebuttonheight.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtminimizebuttonheight.ForeColor = System.Drawing.Color.Black;
             this.txtminimizebuttonheight.Location = new System.Drawing.Point(150, 30);
@@ -2545,7 +2543,7 @@ namespace ShiftOS
             // txtminimizebuttontop
             // 
             this.txtminimizebuttontop.BackColor = System.Drawing.Color.White;
-            this.txtminimizebuttontop.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtminimizebuttontop.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtminimizebuttontop.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtminimizebuttontop.ForeColor = System.Drawing.Color.Black;
             this.txtminimizebuttontop.Location = new System.Drawing.Point(172, 55);
@@ -2577,7 +2575,7 @@ namespace ShiftOS
             // txtminimizebuttonwidth
             // 
             this.txtminimizebuttonwidth.BackColor = System.Drawing.Color.White;
-            this.txtminimizebuttonwidth.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtminimizebuttonwidth.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtminimizebuttonwidth.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtminimizebuttonwidth.ForeColor = System.Drawing.Color.Black;
             this.txtminimizebuttonwidth.Location = new System.Drawing.Point(247, 30);
@@ -2621,26 +2619,26 @@ namespace ShiftOS
             // 
             // pnltitlebaroptions
             // 
-            this.pnltitlebaroptions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnltitlebaroptions.Controls.Add(this.Label80);
-            this.pnltitlebaroptions.Controls.Add(this.txticonfromtop);
-            this.pnltitlebaroptions.Controls.Add(this.Label81);
-            this.pnltitlebaroptions.Controls.Add(this.Label78);
-            this.pnltitlebaroptions.Controls.Add(this.txticonfromside);
-            this.pnltitlebaroptions.Controls.Add(this.Label79);
-            this.pnltitlebaroptions.Controls.Add(this.lbcornerwidthpx);
-            this.pnltitlebaroptions.Controls.Add(this.txttitlebarcornerwidth);
-            this.pnltitlebaroptions.Controls.Add(this.lbcornerwidth);
-            this.pnltitlebaroptions.Controls.Add(this.pnltitlebarrightcornercolour);
-            this.pnltitlebaroptions.Controls.Add(this.pnltitlebarleftcornercolour);
-            this.pnltitlebaroptions.Controls.Add(this.lbrightcornercolor);
-            this.pnltitlebaroptions.Controls.Add(this.lbleftcornercolor);
-            this.pnltitlebaroptions.Controls.Add(this.cboxtitlebarcorners);
-            this.pnltitlebaroptions.Controls.Add(this.Label5);
-            this.pnltitlebaroptions.Controls.Add(this.txttitlebarheight);
-            this.pnltitlebaroptions.Controls.Add(this.Label4);
-            this.pnltitlebaroptions.Controls.Add(this.pnltitlebarcolour);
-            this.pnltitlebaroptions.Controls.Add(this.Label2);
+            this.pnltitlebaroptions.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
+            this.pnltitlebaroptions.Widgets.Add(this.Label80);
+            this.pnltitlebaroptions.Widgets.Add(this.txticonfromtop);
+            this.pnltitlebaroptions.Widgets.Add(this.Label81);
+            this.pnltitlebaroptions.Widgets.Add(this.Label78);
+            this.pnltitlebaroptions.Widgets.Add(this.txticonfromside);
+            this.pnltitlebaroptions.Widgets.Add(this.Label79);
+            this.pnltitlebaroptions.Widgets.Add(this.lbcornerwidthpx);
+            this.pnltitlebaroptions.Widgets.Add(this.txttitlebarcornerwidth);
+            this.pnltitlebaroptions.Widgets.Add(this.lbcornerwidth);
+            this.pnltitlebaroptions.Widgets.Add(this.pnltitlebarrightcornercolour);
+            this.pnltitlebaroptions.Widgets.Add(this.pnltitlebarleftcornercolour);
+            this.pnltitlebaroptions.Widgets.Add(this.lbrightcornercolor);
+            this.pnltitlebaroptions.Widgets.Add(this.lbleftcornercolor);
+            this.pnltitlebaroptions.Widgets.Add(this.cboxtitlebarcorners);
+            this.pnltitlebaroptions.Widgets.Add(this.Label5);
+            this.pnltitlebaroptions.Widgets.Add(this.txttitlebarheight);
+            this.pnltitlebaroptions.Widgets.Add(this.Label4);
+            this.pnltitlebaroptions.Widgets.Add(this.pnltitlebarcolour);
+            this.pnltitlebaroptions.Widgets.Add(this.Label2);
             this.pnltitlebaroptions.Location = new System.Drawing.Point(135, 159);
             this.pnltitlebaroptions.Name = "pnltitlebaroptions";
             this.pnltitlebaroptions.Size = new System.Drawing.Size(325, 139);
@@ -2660,7 +2658,7 @@ namespace ShiftOS
             // txticonfromtop
             // 
             this.txticonfromtop.BackColor = System.Drawing.Color.White;
-            this.txticonfromtop.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txticonfromtop.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txticonfromtop.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txticonfromtop.ForeColor = System.Drawing.Color.Black;
             this.txticonfromtop.Location = new System.Drawing.Point(253, 103);
@@ -2692,7 +2690,7 @@ namespace ShiftOS
             // txticonfromside
             // 
             this.txticonfromside.BackColor = System.Drawing.Color.White;
-            this.txticonfromside.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txticonfromside.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txticonfromside.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txticonfromside.ForeColor = System.Drawing.Color.Black;
             this.txticonfromside.Location = new System.Drawing.Point(104, 103);
@@ -2724,7 +2722,7 @@ namespace ShiftOS
             // txttitlebarcornerwidth
             // 
             this.txttitlebarcornerwidth.BackColor = System.Drawing.Color.White;
-            this.txttitlebarcornerwidth.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txttitlebarcornerwidth.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txttitlebarcornerwidth.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txttitlebarcornerwidth.ForeColor = System.Drawing.Color.Black;
             this.txttitlebarcornerwidth.Location = new System.Drawing.Point(253, 30);
@@ -2745,23 +2743,23 @@ namespace ShiftOS
             // 
             // pnltitlebarrightcornercolour
             // 
-            this.pnltitlebarrightcornercolour.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.pnltitlebarrightcornercolour.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnltitlebarrightcornercolour.BackgroundImageLayout = ShiftUI.ImageLayout.Stretch;
+            this.pnltitlebarrightcornercolour.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnltitlebarrightcornercolour.Location = new System.Drawing.Point(136, 80);
             this.pnltitlebarrightcornercolour.Name = "pnltitlebarrightcornercolour";
             this.pnltitlebarrightcornercolour.Size = new System.Drawing.Size(41, 20);
             this.pnltitlebarrightcornercolour.TabIndex = 10;
-            this.pnltitlebarrightcornercolour.MouseClick += new System.Windows.Forms.MouseEventHandler(this.SetRightCornerColor);
+            this.pnltitlebarrightcornercolour.MouseClick += new ShiftUI.MouseEventHandler(this.SetRightCornerColor);
             // 
             // pnltitlebarleftcornercolour
             // 
-            this.pnltitlebarleftcornercolour.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.pnltitlebarleftcornercolour.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnltitlebarleftcornercolour.BackgroundImageLayout = ShiftUI.ImageLayout.Stretch;
+            this.pnltitlebarleftcornercolour.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnltitlebarleftcornercolour.Location = new System.Drawing.Point(126, 56);
             this.pnltitlebarleftcornercolour.Name = "pnltitlebarleftcornercolour";
             this.pnltitlebarleftcornercolour.Size = new System.Drawing.Size(41, 20);
             this.pnltitlebarleftcornercolour.TabIndex = 8;
-            this.pnltitlebarleftcornercolour.MouseClick += new System.Windows.Forms.MouseEventHandler(this.SetLeftCornerColor);
+            this.pnltitlebarleftcornercolour.MouseClick += new ShiftUI.MouseEventHandler(this.SetLeftCornerColor);
             // 
             // lbrightcornercolor
             // 
@@ -2788,7 +2786,7 @@ namespace ShiftOS
             this.cboxtitlebarcorners.AutoSize = true;
             this.cboxtitlebarcorners.FlatAppearance.BorderColor = System.Drawing.Color.Black;
             this.cboxtitlebarcorners.FlatAppearance.CheckedBackColor = System.Drawing.Color.Black;
-            this.cboxtitlebarcorners.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.cboxtitlebarcorners.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.cboxtitlebarcorners.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.25F);
             this.cboxtitlebarcorners.Location = new System.Drawing.Point(166, 4);
             this.cboxtitlebarcorners.Name = "cboxtitlebarcorners";
@@ -2811,7 +2809,7 @@ namespace ShiftOS
             // txttitlebarheight
             // 
             this.txttitlebarheight.BackColor = System.Drawing.Color.White;
-            this.txttitlebarheight.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txttitlebarheight.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txttitlebarheight.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txttitlebarheight.ForeColor = System.Drawing.Color.Black;
             this.txttitlebarheight.Location = new System.Drawing.Point(112, 30);
@@ -2832,13 +2830,13 @@ namespace ShiftOS
             // 
             // pnltitlebarcolour
             // 
-            this.pnltitlebarcolour.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.pnltitlebarcolour.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnltitlebarcolour.BackgroundImageLayout = ShiftUI.ImageLayout.Stretch;
+            this.pnltitlebarcolour.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnltitlebarcolour.Location = new System.Drawing.Point(112, 5);
             this.pnltitlebarcolour.Name = "pnltitlebarcolour";
             this.pnltitlebarcolour.Size = new System.Drawing.Size(41, 20);
             this.pnltitlebarcolour.TabIndex = 1;
-            this.pnltitlebarcolour.MouseClick += new System.Windows.Forms.MouseEventHandler(this.SetTitlebarColor);
+            this.pnltitlebarcolour.MouseClick += new ShiftUI.MouseEventHandler(this.SetTitlebarColor);
             // 
             // Label2
             // 
@@ -2852,26 +2850,26 @@ namespace ShiftOS
             // 
             // pnlborderoptions
             // 
-            this.pnlborderoptions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnlborderoptions.Controls.Add(this.cbindividualbordercolours);
-            this.pnlborderoptions.Controls.Add(this.pnlborderbottomrightcolour);
-            this.pnlborderoptions.Controls.Add(this.lbbright);
-            this.pnlborderoptions.Controls.Add(this.pnlborderbottomcolour);
-            this.pnlborderoptions.Controls.Add(this.lbbottom);
-            this.pnlborderoptions.Controls.Add(this.pnlborderbottomleftcolour);
-            this.pnlborderoptions.Controls.Add(this.lbbleft);
-            this.pnlborderoptions.Controls.Add(this.pnlborderrightcolour);
-            this.pnlborderoptions.Controls.Add(this.lbright);
-            this.pnlborderoptions.Controls.Add(this.pnlborderleftcolour);
-            this.pnlborderoptions.Controls.Add(this.lbleft);
-            this.pnlborderoptions.Controls.Add(this.Label15);
-            this.pnlborderoptions.Controls.Add(this.pnlbordercolour);
-            this.pnlborderoptions.Controls.Add(this.txtbordersize);
-            this.pnlborderoptions.Controls.Add(this.Label3);
-            this.pnlborderoptions.Controls.Add(this.Label16);
+            this.pnlborderoptions.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
+            this.pnlborderoptions.Widgets.Add(this.cbindividualbordercolours);
+            this.pnlborderoptions.Widgets.Add(this.pnlborderbottomrightcolour);
+            this.pnlborderoptions.Widgets.Add(this.lbbright);
+            this.pnlborderoptions.Widgets.Add(this.pnlborderbottomcolour);
+            this.pnlborderoptions.Widgets.Add(this.lbbottom);
+            this.pnlborderoptions.Widgets.Add(this.pnlborderbottomleftcolour);
+            this.pnlborderoptions.Widgets.Add(this.lbbleft);
+            this.pnlborderoptions.Widgets.Add(this.pnlborderrightcolour);
+            this.pnlborderoptions.Widgets.Add(this.lbright);
+            this.pnlborderoptions.Widgets.Add(this.pnlborderleftcolour);
+            this.pnlborderoptions.Widgets.Add(this.lbleft);
+            this.pnlborderoptions.Widgets.Add(this.Label15);
+            this.pnlborderoptions.Widgets.Add(this.pnlbordercolour);
+            this.pnlborderoptions.Widgets.Add(this.txtbordersize);
+            this.pnlborderoptions.Widgets.Add(this.Label3);
+            this.pnlborderoptions.Widgets.Add(this.Label16);
             this.pnlborderoptions.Location = new System.Drawing.Point(135, 159);
             this.pnlborderoptions.Name = "pnlborderoptions";
-            this.pnlborderoptions.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
+            this.pnlborderoptions.RightToLeft = ShiftUI.RightToLeft.Yes;
             this.pnlborderoptions.Size = new System.Drawing.Size(325, 139);
             this.pnlborderoptions.TabIndex = 10;
             this.pnlborderoptions.Visible = false;
@@ -2881,7 +2879,7 @@ namespace ShiftOS
             this.cbindividualbordercolours.AutoSize = true;
             this.cbindividualbordercolours.FlatAppearance.BorderColor = System.Drawing.Color.Black;
             this.cbindividualbordercolours.FlatAppearance.CheckedBackColor = System.Drawing.Color.Black;
-            this.cbindividualbordercolours.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.cbindividualbordercolours.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.cbindividualbordercolours.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.25F);
             this.cbindividualbordercolours.Location = new System.Drawing.Point(161, 4);
             this.cbindividualbordercolours.Name = "cbindividualbordercolours";
@@ -2893,13 +2891,13 @@ namespace ShiftOS
             // 
             // pnlborderbottomrightcolour
             // 
-            this.pnlborderbottomrightcolour.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.pnlborderbottomrightcolour.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlborderbottomrightcolour.BackgroundImageLayout = ShiftUI.ImageLayout.Stretch;
+            this.pnlborderbottomrightcolour.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlborderbottomrightcolour.Location = new System.Drawing.Point(132, 101);
             this.pnlborderbottomrightcolour.Name = "pnlborderbottomrightcolour";
             this.pnlborderbottomrightcolour.Size = new System.Drawing.Size(41, 20);
             this.pnlborderbottomrightcolour.TabIndex = 27;
-            this.pnlborderbottomrightcolour.MouseClick += new System.Windows.Forms.MouseEventHandler(this.SetBottomRBorderColor);
+            this.pnlborderbottomrightcolour.MouseClick += new ShiftUI.MouseEventHandler(this.SetBottomRBorderColor);
             // 
             // lbbright
             // 
@@ -2913,13 +2911,13 @@ namespace ShiftOS
             // 
             // pnlborderbottomcolour
             // 
-            this.pnlborderbottomcolour.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.pnlborderbottomcolour.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlborderbottomcolour.BackgroundImageLayout = ShiftUI.ImageLayout.Stretch;
+            this.pnlborderbottomcolour.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlborderbottomcolour.Location = new System.Drawing.Point(263, 31);
             this.pnlborderbottomcolour.Name = "pnlborderbottomcolour";
             this.pnlborderbottomcolour.Size = new System.Drawing.Size(41, 20);
             this.pnlborderbottomcolour.TabIndex = 25;
-            this.pnlborderbottomcolour.MouseClick += new System.Windows.Forms.MouseEventHandler(this.SetBottomBorderColor);
+            this.pnlborderbottomcolour.MouseClick += new ShiftUI.MouseEventHandler(this.SetBottomBorderColor);
             // 
             // lbbottom
             // 
@@ -2933,13 +2931,13 @@ namespace ShiftOS
             // 
             // pnlborderbottomleftcolour
             // 
-            this.pnlborderbottomleftcolour.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.pnlborderbottomleftcolour.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlborderbottomleftcolour.BackgroundImageLayout = ShiftUI.ImageLayout.Stretch;
+            this.pnlborderbottomleftcolour.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlborderbottomleftcolour.Location = new System.Drawing.Point(124, 78);
             this.pnlborderbottomleftcolour.Name = "pnlborderbottomleftcolour";
             this.pnlborderbottomleftcolour.Size = new System.Drawing.Size(41, 20);
             this.pnlborderbottomleftcolour.TabIndex = 23;
-            this.pnlborderbottomleftcolour.MouseClick += new System.Windows.Forms.MouseEventHandler(this.SetBottomLColor);
+            this.pnlborderbottomleftcolour.MouseClick += new ShiftUI.MouseEventHandler(this.SetBottomLColor);
             // 
             // lbbleft
             // 
@@ -2953,13 +2951,13 @@ namespace ShiftOS
             // 
             // pnlborderrightcolour
             // 
-            this.pnlborderrightcolour.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.pnlborderrightcolour.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlborderrightcolour.BackgroundImageLayout = ShiftUI.ImageLayout.Stretch;
+            this.pnlborderrightcolour.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlborderrightcolour.Location = new System.Drawing.Point(263, 54);
             this.pnlborderrightcolour.Name = "pnlborderrightcolour";
             this.pnlborderrightcolour.Size = new System.Drawing.Size(41, 20);
             this.pnlborderrightcolour.TabIndex = 21;
-            this.pnlborderrightcolour.MouseClick += new System.Windows.Forms.MouseEventHandler(this.SetRightBorderColor);
+            this.pnlborderrightcolour.MouseClick += new ShiftUI.MouseEventHandler(this.SetRightBorderColor);
             // 
             // lbright
             // 
@@ -2973,13 +2971,13 @@ namespace ShiftOS
             // 
             // pnlborderleftcolour
             // 
-            this.pnlborderleftcolour.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.pnlborderleftcolour.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlborderleftcolour.BackgroundImageLayout = ShiftUI.ImageLayout.Stretch;
+            this.pnlborderleftcolour.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlborderleftcolour.Location = new System.Drawing.Point(102, 54);
             this.pnlborderleftcolour.Name = "pnlborderleftcolour";
             this.pnlborderleftcolour.Size = new System.Drawing.Size(41, 20);
             this.pnlborderleftcolour.TabIndex = 19;
-            this.pnlborderleftcolour.MouseClick += new System.Windows.Forms.MouseEventHandler(this.SetLeftBorderColor);
+            this.pnlborderleftcolour.MouseClick += new ShiftUI.MouseEventHandler(this.SetLeftBorderColor);
             // 
             // lbleft
             // 
@@ -3003,17 +3001,17 @@ namespace ShiftOS
             // 
             // pnlbordercolour
             // 
-            this.pnlbordercolour.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlbordercolour.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlbordercolour.Location = new System.Drawing.Point(102, 5);
             this.pnlbordercolour.Name = "pnlbordercolour";
             this.pnlbordercolour.Size = new System.Drawing.Size(41, 20);
             this.pnlbordercolour.TabIndex = 3;
-            this.pnlbordercolour.MouseClick += new System.Windows.Forms.MouseEventHandler(this.SetMainBorderColor);
+            this.pnlbordercolour.MouseClick += new ShiftUI.MouseEventHandler(this.SetMainBorderColor);
             // 
             // txtbordersize
             // 
             this.txtbordersize.BackColor = System.Drawing.Color.White;
-            this.txtbordersize.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtbordersize.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtbordersize.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtbordersize.ForeColor = System.Drawing.Color.Black;
             this.txtbordersize.Location = new System.Drawing.Point(102, 29);
@@ -3044,24 +3042,24 @@ namespace ShiftOS
             // 
             // pnltitletextoptions
             // 
-            this.pnltitletextoptions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnltitletextoptions.Controls.Add(this.combotitletextposition);
-            this.pnltitletextoptions.Controls.Add(this.Label53);
-            this.pnltitletextoptions.Controls.Add(this.combotitletextstyle);
-            this.pnltitletextoptions.Controls.Add(this.combotitletextfont);
-            this.pnltitletextoptions.Controls.Add(this.Label23);
-            this.pnltitletextoptions.Controls.Add(this.Label17);
-            this.pnltitletextoptions.Controls.Add(this.txttitletextside);
-            this.pnltitletextoptions.Controls.Add(this.Label18);
-            this.pnltitletextoptions.Controls.Add(this.Label19);
-            this.pnltitletextoptions.Controls.Add(this.txttitletexttop);
-            this.pnltitletextoptions.Controls.Add(this.Label20);
-            this.pnltitletextoptions.Controls.Add(this.Label21);
-            this.pnltitletextoptions.Controls.Add(this.txttitletextsize);
-            this.pnltitletextoptions.Controls.Add(this.Label22);
-            this.pnltitletextoptions.Controls.Add(this.Label24);
-            this.pnltitletextoptions.Controls.Add(this.pnltitletextcolour);
-            this.pnltitletextoptions.Controls.Add(this.Label25);
+            this.pnltitletextoptions.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
+            this.pnltitletextoptions.Widgets.Add(this.combotitletextposition);
+            this.pnltitletextoptions.Widgets.Add(this.Label53);
+            this.pnltitletextoptions.Widgets.Add(this.combotitletextstyle);
+            this.pnltitletextoptions.Widgets.Add(this.combotitletextfont);
+            this.pnltitletextoptions.Widgets.Add(this.Label23);
+            this.pnltitletextoptions.Widgets.Add(this.Label17);
+            this.pnltitletextoptions.Widgets.Add(this.txttitletextside);
+            this.pnltitletextoptions.Widgets.Add(this.Label18);
+            this.pnltitletextoptions.Widgets.Add(this.Label19);
+            this.pnltitletextoptions.Widgets.Add(this.txttitletexttop);
+            this.pnltitletextoptions.Widgets.Add(this.Label20);
+            this.pnltitletextoptions.Widgets.Add(this.Label21);
+            this.pnltitletextoptions.Widgets.Add(this.txttitletextsize);
+            this.pnltitletextoptions.Widgets.Add(this.Label22);
+            this.pnltitletextoptions.Widgets.Add(this.Label24);
+            this.pnltitletextoptions.Widgets.Add(this.pnltitletextcolour);
+            this.pnltitletextoptions.Widgets.Add(this.Label25);
             this.pnltitletextoptions.Location = new System.Drawing.Point(135, 159);
             this.pnltitletextoptions.Name = "pnltitletextoptions";
             this.pnltitletextoptions.Size = new System.Drawing.Size(325, 139);
@@ -3140,7 +3138,7 @@ namespace ShiftOS
             // txttitletextside
             // 
             this.txttitletextside.BackColor = System.Drawing.Color.White;
-            this.txttitletextside.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txttitletextside.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txttitletextside.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txttitletextside.ForeColor = System.Drawing.Color.Black;
             this.txttitletextside.Location = new System.Drawing.Point(135, 105);
@@ -3172,7 +3170,7 @@ namespace ShiftOS
             // txttitletexttop
             // 
             this.txttitletexttop.BackColor = System.Drawing.Color.White;
-            this.txttitletexttop.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txttitletexttop.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txttitletexttop.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txttitletexttop.ForeColor = System.Drawing.Color.Black;
             this.txttitletexttop.Location = new System.Drawing.Point(135, 80);
@@ -3204,7 +3202,7 @@ namespace ShiftOS
             // txttitletextsize
             // 
             this.txttitletextsize.BackColor = System.Drawing.Color.White;
-            this.txttitletextsize.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txttitletextsize.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txttitletextsize.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txttitletextsize.ForeColor = System.Drawing.Color.Black;
             this.txttitletextsize.Location = new System.Drawing.Point(100, 55);
@@ -3235,12 +3233,12 @@ namespace ShiftOS
             // 
             // pnltitletextcolour
             // 
-            this.pnltitletextcolour.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnltitletextcolour.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnltitletextcolour.Location = new System.Drawing.Point(114, 5);
             this.pnltitletextcolour.Name = "pnltitletextcolour";
             this.pnltitletextcolour.Size = new System.Drawing.Size(41, 20);
             this.pnltitletextcolour.TabIndex = 1;
-            this.pnltitletextcolour.MouseClick += new System.Windows.Forms.MouseEventHandler(this.SetTitleTextColor);
+            this.pnltitletextcolour.MouseClick += new ShiftUI.MouseEventHandler(this.SetTitleTextColor);
             // 
             // Label25
             // 
@@ -3254,11 +3252,11 @@ namespace ShiftOS
             // 
             // pnlwindowsobjects
             // 
-            this.pnlwindowsobjects.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.pnlwindowsobjects.Controls.Add(this.btnborders);
-            this.pnlwindowsobjects.Controls.Add(this.btnbuttons);
-            this.pnlwindowsobjects.Controls.Add(this.btntitletext);
-            this.pnlwindowsobjects.Controls.Add(this.btntitlebar);
+            this.pnlwindowsobjects.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left)));
+            this.pnlwindowsobjects.Widgets.Add(this.btnborders);
+            this.pnlwindowsobjects.Widgets.Add(this.btnbuttons);
+            this.pnlwindowsobjects.Widgets.Add(this.btntitletext);
+            this.pnlwindowsobjects.Widgets.Add(this.btntitlebar);
             this.pnlwindowsobjects.Location = new System.Drawing.Point(1, 159);
             this.pnlwindowsobjects.Name = "pnlwindowsobjects";
             this.pnlwindowsobjects.Size = new System.Drawing.Size(128, 135);
@@ -3267,7 +3265,7 @@ namespace ShiftOS
             // btnborders
             // 
             this.btnborders.BackColor = System.Drawing.Color.White;
-            this.btnborders.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnborders.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnborders.Font = new System.Drawing.Font("Cambria", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnborders.Location = new System.Drawing.Point(4, 105);
             this.btnborders.Name = "btnborders";
@@ -3281,7 +3279,7 @@ namespace ShiftOS
             // btnbuttons
             // 
             this.btnbuttons.BackColor = System.Drawing.Color.White;
-            this.btnbuttons.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnbuttons.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnbuttons.Font = new System.Drawing.Font("Cambria", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnbuttons.Location = new System.Drawing.Point(4, 70);
             this.btnbuttons.Name = "btnbuttons";
@@ -3295,7 +3293,7 @@ namespace ShiftOS
             // btntitletext
             // 
             this.btntitletext.BackColor = System.Drawing.Color.White;
-            this.btntitletext.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btntitletext.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btntitletext.Font = new System.Drawing.Font("Cambria", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btntitletext.Location = new System.Drawing.Point(4, 35);
             this.btntitletext.Name = "btntitletext";
@@ -3309,7 +3307,7 @@ namespace ShiftOS
             // btntitlebar
             // 
             this.btntitlebar.BackColor = System.Drawing.Color.White;
-            this.btntitlebar.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btntitlebar.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btntitlebar.Font = new System.Drawing.Font("Cambria", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btntitlebar.Location = new System.Drawing.Point(4, 0);
             this.btntitlebar.Name = "btntitlebar";
@@ -3322,14 +3320,14 @@ namespace ShiftOS
             // 
             // pnlwindowpreview
             // 
-            this.pnlwindowpreview.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnlwindowpreview.Controls.Add(this.prepgcontent);
-            this.pnlwindowpreview.Controls.Add(this.prepgbottom);
-            this.pnlwindowpreview.Controls.Add(this.prepgleft);
-            this.pnlwindowpreview.Controls.Add(this.prepgright);
-            this.pnlwindowpreview.Controls.Add(this.pretitlebar);
+            this.pnlwindowpreview.Anchor = ((ShiftUI.AnchorStyles)((((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
+            this.pnlwindowpreview.Widgets.Add(this.prepgcontent);
+            this.pnlwindowpreview.Widgets.Add(this.prepgbottom);
+            this.pnlwindowpreview.Widgets.Add(this.prepgleft);
+            this.pnlwindowpreview.Widgets.Add(this.prepgright);
+            this.pnlwindowpreview.Widgets.Add(this.pretitlebar);
             this.pnlwindowpreview.Location = new System.Drawing.Point(5, 3);
             this.pnlwindowpreview.Name = "pnlwindowpreview";
             this.pnlwindowpreview.Size = new System.Drawing.Size(448, 148);
@@ -3337,7 +3335,7 @@ namespace ShiftOS
             // 
             // prepgcontent
             // 
-            this.prepgcontent.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.prepgcontent.Dock = ShiftUI.DockStyle.Fill;
             this.prepgcontent.Location = new System.Drawing.Point(2, 30);
             this.prepgcontent.Name = "prepgcontent";
             this.prepgcontent.Size = new System.Drawing.Size(444, 116);
@@ -3346,7 +3344,7 @@ namespace ShiftOS
             // prepgbottom
             // 
             this.prepgbottom.BackColor = System.Drawing.Color.Gray;
-            this.prepgbottom.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.prepgbottom.Dock = ShiftUI.DockStyle.Bottom;
             this.prepgbottom.Location = new System.Drawing.Point(2, 146);
             this.prepgbottom.Name = "prepgbottom";
             this.prepgbottom.Size = new System.Drawing.Size(444, 2);
@@ -3355,8 +3353,8 @@ namespace ShiftOS
             // prepgleft
             // 
             this.prepgleft.BackColor = System.Drawing.Color.Gray;
-            this.prepgleft.Controls.Add(this.prepgbottomlcorner);
-            this.prepgleft.Dock = System.Windows.Forms.DockStyle.Left;
+            this.prepgleft.Widgets.Add(this.prepgbottomlcorner);
+            this.prepgleft.Dock = ShiftUI.DockStyle.Left;
             this.prepgleft.Location = new System.Drawing.Point(0, 30);
             this.prepgleft.Name = "prepgleft";
             this.prepgleft.Size = new System.Drawing.Size(2, 118);
@@ -3365,7 +3363,7 @@ namespace ShiftOS
             // prepgbottomlcorner
             // 
             this.prepgbottomlcorner.BackColor = System.Drawing.Color.Red;
-            this.prepgbottomlcorner.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.prepgbottomlcorner.Dock = ShiftUI.DockStyle.Bottom;
             this.prepgbottomlcorner.Location = new System.Drawing.Point(0, 116);
             this.prepgbottomlcorner.Name = "prepgbottomlcorner";
             this.prepgbottomlcorner.Size = new System.Drawing.Size(2, 2);
@@ -3374,8 +3372,8 @@ namespace ShiftOS
             // prepgright
             // 
             this.prepgright.BackColor = System.Drawing.Color.Gray;
-            this.prepgright.Controls.Add(this.prepgbottomrcorner);
-            this.prepgright.Dock = System.Windows.Forms.DockStyle.Right;
+            this.prepgright.Widgets.Add(this.prepgbottomrcorner);
+            this.prepgright.Dock = ShiftUI.DockStyle.Right;
             this.prepgright.Location = new System.Drawing.Point(446, 30);
             this.prepgright.Name = "prepgright";
             this.prepgright.Size = new System.Drawing.Size(2, 118);
@@ -3384,7 +3382,7 @@ namespace ShiftOS
             // prepgbottomrcorner
             // 
             this.prepgbottomrcorner.BackColor = System.Drawing.Color.Red;
-            this.prepgbottomrcorner.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.prepgbottomrcorner.Dock = ShiftUI.DockStyle.Bottom;
             this.prepgbottomrcorner.Location = new System.Drawing.Point(0, 116);
             this.prepgbottomrcorner.Name = "prepgbottomrcorner";
             this.prepgbottomrcorner.Size = new System.Drawing.Size(2, 2);
@@ -3393,14 +3391,14 @@ namespace ShiftOS
             // pretitlebar
             // 
             this.pretitlebar.BackColor = System.Drawing.Color.Gray;
-            this.pretitlebar.Controls.Add(this.preminimizebutton);
-            this.pretitlebar.Controls.Add(this.prepnlicon);
-            this.pretitlebar.Controls.Add(this.prerollupbutton);
-            this.pretitlebar.Controls.Add(this.preclosebutton);
-            this.pretitlebar.Controls.Add(this.pretitletext);
-            this.pretitlebar.Controls.Add(this.prepgtoplcorner);
-            this.pretitlebar.Controls.Add(this.prepgtoprcorner);
-            this.pretitlebar.Dock = System.Windows.Forms.DockStyle.Top;
+            this.pretitlebar.Widgets.Add(this.preminimizebutton);
+            this.pretitlebar.Widgets.Add(this.prepnlicon);
+            this.pretitlebar.Widgets.Add(this.prerollupbutton);
+            this.pretitlebar.Widgets.Add(this.preclosebutton);
+            this.pretitlebar.Widgets.Add(this.pretitletext);
+            this.pretitlebar.Widgets.Add(this.prepgtoplcorner);
+            this.pretitlebar.Widgets.Add(this.prepgtoprcorner);
+            this.pretitlebar.Dock = ShiftUI.DockStyle.Top;
             this.pretitlebar.ForeColor = System.Drawing.Color.White;
             this.pretitlebar.Location = new System.Drawing.Point(0, 0);
             this.pretitlebar.Name = "pretitlebar";
@@ -3455,7 +3453,7 @@ namespace ShiftOS
             // prepgtoplcorner
             // 
             this.prepgtoplcorner.BackColor = System.Drawing.Color.Red;
-            this.prepgtoplcorner.Dock = System.Windows.Forms.DockStyle.Left;
+            this.prepgtoplcorner.Dock = ShiftUI.DockStyle.Left;
             this.prepgtoplcorner.Location = new System.Drawing.Point(0, 0);
             this.prepgtoplcorner.Name = "prepgtoplcorner";
             this.prepgtoplcorner.Size = new System.Drawing.Size(2, 30);
@@ -3464,7 +3462,7 @@ namespace ShiftOS
             // prepgtoprcorner
             // 
             this.prepgtoprcorner.BackColor = System.Drawing.Color.Red;
-            this.prepgtoprcorner.Dock = System.Windows.Forms.DockStyle.Right;
+            this.prepgtoprcorner.Dock = ShiftUI.DockStyle.Right;
             this.prepgtoprcorner.Location = new System.Drawing.Point(446, 0);
             this.prepgtoprcorner.Name = "prepgtoprcorner";
             this.prepgtoprcorner.Size = new System.Drawing.Size(2, 30);
@@ -3472,13 +3470,13 @@ namespace ShiftOS
             // 
             // pnlreset
             // 
-            this.pnlreset.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnlreset.Controls.Add(this.Label113);
-            this.pnlreset.Controls.Add(this.btnresetallsettings);
-            this.pnlreset.Controls.Add(this.Label109);
-            this.pnlreset.Controls.Add(this.Label111);
+            this.pnlreset.Anchor = ((ShiftUI.AnchorStyles)((((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
+            this.pnlreset.Widgets.Add(this.Label113);
+            this.pnlreset.Widgets.Add(this.btnresetallsettings);
+            this.pnlreset.Widgets.Add(this.Label109);
+            this.pnlreset.Widgets.Add(this.Label111);
             this.pnlreset.Location = new System.Drawing.Point(134, 9);
             this.pnlreset.Name = "pnlreset";
             this.pnlreset.Size = new System.Drawing.Size(457, 306);
@@ -3496,7 +3494,7 @@ namespace ShiftOS
             // 
             // btnresetallsettings
             // 
-            this.btnresetallsettings.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnresetallsettings.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnresetallsettings.Font = new System.Drawing.Font("Cambria", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnresetallsettings.Location = new System.Drawing.Point(101, 145);
             this.btnresetallsettings.Name = "btnresetallsettings";
@@ -3531,17 +3529,17 @@ namespace ShiftOS
             // pgcontents
             // 
             this.pgcontents.BackColor = System.Drawing.Color.White;
-            this.pgcontents.Controls.Add(this.pnldesktopoptions);
-            this.pgcontents.Controls.Add(this.pnlluaoptions);
-            this.pgcontents.Controls.Add(this.pnldesktopcomposition);
-            this.pgcontents.Controls.Add(this.pnlreset);
-            this.pgcontents.Controls.Add(this.pnlwindowsoptions);
-            this.pgcontents.Controls.Add(this.pnlmenus);
-            this.pgcontents.Controls.Add(this.pnlshifterintro);
-            this.pgcontents.Controls.Add(this.catholder);
-            this.pgcontents.Controls.Add(this.btnapply);
-            this.pgcontents.Controls.Add(this.Label1);
-            this.pgcontents.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pgcontents.Widgets.Add(this.pnldesktopoptions);
+            this.pgcontents.Widgets.Add(this.pnlluaoptions);
+            this.pgcontents.Widgets.Add(this.pnldesktopcomposition);
+            this.pgcontents.Widgets.Add(this.pnlreset);
+            this.pgcontents.Widgets.Add(this.pnlwindowsoptions);
+            this.pgcontents.Widgets.Add(this.pnlmenus);
+            this.pgcontents.Widgets.Add(this.pnlshifterintro);
+            this.pgcontents.Widgets.Add(this.catholder);
+            this.pgcontents.Widgets.Add(this.btnapply);
+            this.pgcontents.Widgets.Add(this.Label1);
+            this.pgcontents.Dock = ShiftUI.DockStyle.Fill;
             this.pgcontents.Location = new System.Drawing.Point(0, 0);
             this.pgcontents.Name = "pgcontents";
             this.pgcontents.Size = new System.Drawing.Size(600, 323);
@@ -3549,17 +3547,17 @@ namespace ShiftOS
             // 
             // pnldesktopcomposition
             // 
-            this.pnldesktopcomposition.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.pnldesktopcomposition.Anchor = ((ShiftUI.AnchorStyles)((((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.pnldesktopcomposition.BackColor = System.Drawing.Color.White;
-            this.pnldesktopcomposition.Controls.Add(this.pnlfancywindows);
-            this.pnldesktopcomposition.Controls.Add(this.pnlfancydragging);
-            this.pnldesktopcomposition.Controls.Add(this.pnlfancyintro);
-            this.pnldesktopcomposition.Controls.Add(this.panel18);
-            this.pnldesktopcomposition.Controls.Add(this.panel25);
-            this.pnldesktopcomposition.Controls.Add(this.panel36);
-            this.pnldesktopcomposition.Controls.Add(this.label176);
+            this.pnldesktopcomposition.Widgets.Add(this.pnlfancywindows);
+            this.pnldesktopcomposition.Widgets.Add(this.pnlfancydragging);
+            this.pnldesktopcomposition.Widgets.Add(this.pnlfancyintro);
+            this.pnldesktopcomposition.Widgets.Add(this.panel18);
+            this.pnldesktopcomposition.Widgets.Add(this.panel25);
+            this.pnldesktopcomposition.Widgets.Add(this.panel36);
+            this.pnldesktopcomposition.Widgets.Add(this.label176);
             this.pnldesktopcomposition.Location = new System.Drawing.Point(134, 9);
             this.pnldesktopcomposition.Name = "pnldesktopcomposition";
             this.pnldesktopcomposition.Size = new System.Drawing.Size(457, 306);
@@ -3567,17 +3565,17 @@ namespace ShiftOS
             // 
             // pnlfancywindows
             // 
-            this.pnlfancywindows.Controls.Add(this.txtwinfadedec);
-            this.pnlfancywindows.Controls.Add(this.label150);
-            this.pnlfancywindows.Controls.Add(this.txtwinfadespeed);
-            this.pnlfancywindows.Controls.Add(this.label151);
-            this.pnlfancywindows.Controls.Add(this.cbdrageffect);
-            this.pnlfancywindows.Controls.Add(this.label141);
-            this.pnlfancywindows.Controls.Add(this.cbcloseanim);
-            this.pnlfancywindows.Controls.Add(this.label128);
-            this.pnlfancywindows.Controls.Add(this.cbopenanim);
-            this.pnlfancywindows.Controls.Add(this.label127);
-            this.pnlfancywindows.Controls.Add(this.label149);
+            this.pnlfancywindows.Widgets.Add(this.txtwinfadedec);
+            this.pnlfancywindows.Widgets.Add(this.label150);
+            this.pnlfancywindows.Widgets.Add(this.txtwinfadespeed);
+            this.pnlfancywindows.Widgets.Add(this.label151);
+            this.pnlfancywindows.Widgets.Add(this.cbdrageffect);
+            this.pnlfancywindows.Widgets.Add(this.label141);
+            this.pnlfancywindows.Widgets.Add(this.cbcloseanim);
+            this.pnlfancywindows.Widgets.Add(this.label128);
+            this.pnlfancywindows.Widgets.Add(this.cbopenanim);
+            this.pnlfancywindows.Widgets.Add(this.label127);
+            this.pnlfancywindows.Widgets.Add(this.label149);
             this.pnlfancywindows.Location = new System.Drawing.Point(139, 43);
             this.pnlfancywindows.Name = "pnlfancywindows";
             this.pnlfancywindows.Size = new System.Drawing.Size(311, 256);
@@ -3585,7 +3583,7 @@ namespace ShiftOS
             // 
             // txtwinfadedec
             // 
-            this.txtwinfadedec.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtwinfadedec.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtwinfadedec.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
             this.txtwinfadedec.Location = new System.Drawing.Point(225, 189);
             this.txtwinfadedec.Name = "txtwinfadedec";
@@ -3605,7 +3603,7 @@ namespace ShiftOS
             // 
             // txtwinfadespeed
             // 
-            this.txtwinfadespeed.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtwinfadespeed.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtwinfadespeed.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
             this.txtwinfadespeed.Location = new System.Drawing.Point(109, 185);
             this.txtwinfadespeed.Name = "txtwinfadespeed";
@@ -3625,9 +3623,9 @@ namespace ShiftOS
             // 
             // cbdrageffect
             // 
-            this.cbdrageffect.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.cbdrageffect.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cbdrageffect.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
+            this.cbdrageffect.DropDownStyle = ShiftUI.ComboBoxStyle.DropDownList;
             this.cbdrageffect.FormattingEnabled = true;
             this.cbdrageffect.Location = new System.Drawing.Point(6, 153);
             this.cbdrageffect.Name = "cbdrageffect";
@@ -3647,9 +3645,9 @@ namespace ShiftOS
             // 
             // cbcloseanim
             // 
-            this.cbcloseanim.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.cbcloseanim.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cbcloseanim.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
+            this.cbcloseanim.DropDownStyle = ShiftUI.ComboBoxStyle.DropDownList;
             this.cbcloseanim.FormattingEnabled = true;
             this.cbcloseanim.Location = new System.Drawing.Point(8, 102);
             this.cbcloseanim.Name = "cbcloseanim";
@@ -3669,9 +3667,9 @@ namespace ShiftOS
             // 
             // cbopenanim
             // 
-            this.cbopenanim.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.cbopenanim.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cbopenanim.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
+            this.cbopenanim.DropDownStyle = ShiftUI.ComboBoxStyle.DropDownList;
             this.cbopenanim.FormattingEnabled = true;
             this.cbopenanim.Location = new System.Drawing.Point(9, 50);
             this.cbopenanim.Name = "cbopenanim";
@@ -3691,8 +3689,8 @@ namespace ShiftOS
             // 
             // label149
             // 
-            this.label149.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.label149.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.label149.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Bold);
             this.label149.Location = new System.Drawing.Point(6, 0);
             this.label149.Name = "label149";
@@ -3703,17 +3701,17 @@ namespace ShiftOS
             // 
             // pnlfancydragging
             // 
-            this.pnlfancydragging.Controls.Add(this.txtshakeminoffset);
-            this.pnlfancydragging.Controls.Add(this.label148);
-            this.pnlfancydragging.Controls.Add(this.txtshakemax);
-            this.pnlfancydragging.Controls.Add(this.label146);
-            this.pnlfancydragging.Controls.Add(this.txtdragopacitydec);
-            this.pnlfancydragging.Controls.Add(this.label144);
-            this.pnlfancydragging.Controls.Add(this.txtdragfadedec);
-            this.pnlfancydragging.Controls.Add(this.label143);
-            this.pnlfancydragging.Controls.Add(this.txtfadespeed);
-            this.pnlfancydragging.Controls.Add(this.label155);
-            this.pnlfancydragging.Controls.Add(this.label156);
+            this.pnlfancydragging.Widgets.Add(this.txtshakeminoffset);
+            this.pnlfancydragging.Widgets.Add(this.label148);
+            this.pnlfancydragging.Widgets.Add(this.txtshakemax);
+            this.pnlfancydragging.Widgets.Add(this.label146);
+            this.pnlfancydragging.Widgets.Add(this.txtdragopacitydec);
+            this.pnlfancydragging.Widgets.Add(this.label144);
+            this.pnlfancydragging.Widgets.Add(this.txtdragfadedec);
+            this.pnlfancydragging.Widgets.Add(this.label143);
+            this.pnlfancydragging.Widgets.Add(this.txtfadespeed);
+            this.pnlfancydragging.Widgets.Add(this.label155);
+            this.pnlfancydragging.Widgets.Add(this.label156);
             this.pnlfancydragging.Location = new System.Drawing.Point(139, 43);
             this.pnlfancydragging.Name = "pnlfancydragging";
             this.pnlfancydragging.Size = new System.Drawing.Size(311, 256);
@@ -3721,7 +3719,7 @@ namespace ShiftOS
             // 
             // txtshakeminoffset
             // 
-            this.txtshakeminoffset.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtshakeminoffset.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtshakeminoffset.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
             this.txtshakeminoffset.Location = new System.Drawing.Point(167, 189);
             this.txtshakeminoffset.Name = "txtshakeminoffset";
@@ -3741,7 +3739,7 @@ namespace ShiftOS
             // 
             // txtshakemax
             // 
-            this.txtshakemax.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtshakemax.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtshakemax.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
             this.txtshakemax.Location = new System.Drawing.Point(167, 159);
             this.txtshakemax.Name = "txtshakemax";
@@ -3761,7 +3759,7 @@ namespace ShiftOS
             // 
             // txtdragopacitydec
             // 
-            this.txtdragopacitydec.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtdragopacitydec.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtdragopacitydec.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
             this.txtdragopacitydec.Location = new System.Drawing.Point(104, 116);
             this.txtdragopacitydec.Name = "txtdragopacitydec";
@@ -3781,7 +3779,7 @@ namespace ShiftOS
             // 
             // txtdragfadedec
             // 
-            this.txtdragfadedec.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtdragfadedec.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtdragfadedec.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
             this.txtdragfadedec.Location = new System.Drawing.Point(89, 88);
             this.txtdragfadedec.Name = "txtdragfadedec";
@@ -3801,7 +3799,7 @@ namespace ShiftOS
             // 
             // txtfadespeed
             // 
-            this.txtfadespeed.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtfadespeed.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtfadespeed.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
             this.txtfadespeed.Location = new System.Drawing.Point(114, 54);
             this.txtfadespeed.Name = "txtfadespeed";
@@ -3821,8 +3819,8 @@ namespace ShiftOS
             // 
             // label156
             // 
-            this.label156.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.label156.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.label156.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Bold);
             this.label156.Location = new System.Drawing.Point(6, 0);
             this.label156.Name = "label156";
@@ -3833,8 +3831,8 @@ namespace ShiftOS
             // 
             // pnlfancyintro
             // 
-            this.pnlfancyintro.Controls.Add(this.label174);
-            this.pnlfancyintro.Controls.Add(this.label175);
+            this.pnlfancyintro.Widgets.Add(this.label174);
+            this.pnlfancyintro.Widgets.Add(this.label175);
             this.pnlfancyintro.Location = new System.Drawing.Point(139, 43);
             this.pnlfancyintro.Name = "pnlfancyintro";
             this.pnlfancyintro.Size = new System.Drawing.Size(311, 256);
@@ -3842,8 +3840,8 @@ namespace ShiftOS
             // 
             // label174
             // 
-            this.label174.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.label174.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.label174.BackColor = System.Drawing.Color.Transparent;
             this.label174.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label174.Location = new System.Drawing.Point(6, 29);
@@ -3856,8 +3854,8 @@ namespace ShiftOS
             // 
             // label175
             // 
-            this.label175.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.label175.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.label175.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Bold);
             this.label175.Location = new System.Drawing.Point(6, 0);
             this.label175.Name = "label175";
@@ -3868,19 +3866,19 @@ namespace ShiftOS
             // 
             // panel18
             // 
-            this.panel18.Controls.Add(this.panel19);
-            this.panel18.Controls.Add(this.label157);
-            this.panel18.Controls.Add(this.panel20);
-            this.panel18.Controls.Add(this.label158);
-            this.panel18.Controls.Add(this.panel21);
-            this.panel18.Controls.Add(this.label159);
-            this.panel18.Controls.Add(this.panel22);
-            this.panel18.Controls.Add(this.label160);
-            this.panel18.Controls.Add(this.panel23);
-            this.panel18.Controls.Add(this.label161);
-            this.panel18.Controls.Add(this.panel24);
-            this.panel18.Controls.Add(this.label162);
-            this.panel18.Controls.Add(this.label163);
+            this.panel18.Widgets.Add(this.panel19);
+            this.panel18.Widgets.Add(this.label157);
+            this.panel18.Widgets.Add(this.panel20);
+            this.panel18.Widgets.Add(this.label158);
+            this.panel18.Widgets.Add(this.panel21);
+            this.panel18.Widgets.Add(this.label159);
+            this.panel18.Widgets.Add(this.panel22);
+            this.panel18.Widgets.Add(this.label160);
+            this.panel18.Widgets.Add(this.panel23);
+            this.panel18.Widgets.Add(this.label161);
+            this.panel18.Widgets.Add(this.panel24);
+            this.panel18.Widgets.Add(this.label162);
+            this.panel18.Widgets.Add(this.label163);
             this.panel18.Location = new System.Drawing.Point(139, 43);
             this.panel18.Name = "panel18";
             this.panel18.Size = new System.Drawing.Size(311, 256);
@@ -3888,7 +3886,7 @@ namespace ShiftOS
             // 
             // panel19
             // 
-            this.panel19.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel19.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.panel19.Location = new System.Drawing.Point(216, 80);
             this.panel19.Name = "panel19";
             this.panel19.Size = new System.Drawing.Size(41, 20);
@@ -3906,7 +3904,7 @@ namespace ShiftOS
             // 
             // panel20
             // 
-            this.panel20.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel20.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.panel20.Location = new System.Drawing.Point(224, 55);
             this.panel20.Name = "panel20";
             this.panel20.Size = new System.Drawing.Size(41, 20);
@@ -3924,7 +3922,7 @@ namespace ShiftOS
             // 
             // panel21
             // 
-            this.panel21.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel21.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.panel21.Location = new System.Drawing.Point(117, 80);
             this.panel21.Name = "panel21";
             this.panel21.Size = new System.Drawing.Size(41, 20);
@@ -3942,7 +3940,7 @@ namespace ShiftOS
             // 
             // panel22
             // 
-            this.panel22.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel22.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.panel22.Location = new System.Drawing.Point(101, 55);
             this.panel22.Name = "panel22";
             this.panel22.Size = new System.Drawing.Size(41, 20);
@@ -3960,7 +3958,7 @@ namespace ShiftOS
             // 
             // panel23
             // 
-            this.panel23.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel23.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.panel23.Location = new System.Drawing.Point(249, 29);
             this.panel23.Name = "panel23";
             this.panel23.Size = new System.Drawing.Size(41, 20);
@@ -3978,7 +3976,7 @@ namespace ShiftOS
             // 
             // panel24
             // 
-            this.panel24.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel24.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.panel24.Location = new System.Drawing.Point(115, 29);
             this.panel24.Name = "panel24";
             this.panel24.Size = new System.Drawing.Size(41, 20);
@@ -3996,8 +3994,8 @@ namespace ShiftOS
             // 
             // label163
             // 
-            this.label163.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.label163.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.label163.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Bold);
             this.label163.Location = new System.Drawing.Point(6, 0);
             this.label163.Name = "label163";
@@ -4008,25 +4006,25 @@ namespace ShiftOS
             // 
             // panel25
             // 
-            this.panel25.Controls.Add(this.panel26);
-            this.panel25.Controls.Add(this.label164);
-            this.panel25.Controls.Add(this.panel27);
-            this.panel25.Controls.Add(this.label165);
-            this.panel25.Controls.Add(this.panel28);
-            this.panel25.Controls.Add(this.label166);
-            this.panel25.Controls.Add(this.panel29);
-            this.panel25.Controls.Add(this.label167);
-            this.panel25.Controls.Add(this.panel30);
-            this.panel25.Controls.Add(this.label168);
-            this.panel25.Controls.Add(this.panel31);
-            this.panel25.Controls.Add(this.label169);
-            this.panel25.Controls.Add(this.panel32);
-            this.panel25.Controls.Add(this.label170);
-            this.panel25.Controls.Add(this.panel33);
-            this.panel25.Controls.Add(this.label171);
-            this.panel25.Controls.Add(this.panel34);
-            this.panel25.Controls.Add(this.label172);
-            this.panel25.Controls.Add(this.label173);
+            this.panel25.Widgets.Add(this.panel26);
+            this.panel25.Widgets.Add(this.label164);
+            this.panel25.Widgets.Add(this.panel27);
+            this.panel25.Widgets.Add(this.label165);
+            this.panel25.Widgets.Add(this.panel28);
+            this.panel25.Widgets.Add(this.label166);
+            this.panel25.Widgets.Add(this.panel29);
+            this.panel25.Widgets.Add(this.label167);
+            this.panel25.Widgets.Add(this.panel30);
+            this.panel25.Widgets.Add(this.label168);
+            this.panel25.Widgets.Add(this.panel31);
+            this.panel25.Widgets.Add(this.label169);
+            this.panel25.Widgets.Add(this.panel32);
+            this.panel25.Widgets.Add(this.label170);
+            this.panel25.Widgets.Add(this.panel33);
+            this.panel25.Widgets.Add(this.label171);
+            this.panel25.Widgets.Add(this.panel34);
+            this.panel25.Widgets.Add(this.label172);
+            this.panel25.Widgets.Add(this.label173);
             this.panel25.Location = new System.Drawing.Point(139, 43);
             this.panel25.Name = "panel25";
             this.panel25.Size = new System.Drawing.Size(311, 256);
@@ -4034,7 +4032,7 @@ namespace ShiftOS
             // 
             // panel26
             // 
-            this.panel26.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel26.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.panel26.Location = new System.Drawing.Point(85, 129);
             this.panel26.Name = "panel26";
             this.panel26.Size = new System.Drawing.Size(41, 20);
@@ -4052,7 +4050,7 @@ namespace ShiftOS
             // 
             // panel27
             // 
-            this.panel27.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel27.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.panel27.Location = new System.Drawing.Point(228, 104);
             this.panel27.Name = "panel27";
             this.panel27.Size = new System.Drawing.Size(41, 20);
@@ -4070,7 +4068,7 @@ namespace ShiftOS
             // 
             // panel28
             // 
-            this.panel28.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel28.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.panel28.Location = new System.Drawing.Point(84, 104);
             this.panel28.Name = "panel28";
             this.panel28.Size = new System.Drawing.Size(41, 20);
@@ -4088,7 +4086,7 @@ namespace ShiftOS
             // 
             // panel29
             // 
-            this.panel29.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel29.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.panel29.Location = new System.Drawing.Point(254, 81);
             this.panel29.Name = "panel29";
             this.panel29.Size = new System.Drawing.Size(41, 20);
@@ -4106,7 +4104,7 @@ namespace ShiftOS
             // 
             // panel30
             // 
-            this.panel30.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel30.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.panel30.Location = new System.Drawing.Point(254, 55);
             this.panel30.Name = "panel30";
             this.panel30.Size = new System.Drawing.Size(41, 20);
@@ -4124,7 +4122,7 @@ namespace ShiftOS
             // 
             // panel31
             // 
-            this.panel31.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel31.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.panel31.Location = new System.Drawing.Point(117, 80);
             this.panel31.Name = "panel31";
             this.panel31.Size = new System.Drawing.Size(41, 20);
@@ -4142,7 +4140,7 @@ namespace ShiftOS
             // 
             // panel32
             // 
-            this.panel32.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel32.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.panel32.Location = new System.Drawing.Point(117, 55);
             this.panel32.Name = "panel32";
             this.panel32.Size = new System.Drawing.Size(41, 20);
@@ -4160,7 +4158,7 @@ namespace ShiftOS
             // 
             // panel33
             // 
-            this.panel33.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel33.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.panel33.Location = new System.Drawing.Point(249, 29);
             this.panel33.Name = "panel33";
             this.panel33.Size = new System.Drawing.Size(41, 20);
@@ -4178,7 +4176,7 @@ namespace ShiftOS
             // 
             // panel34
             // 
-            this.panel34.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel34.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.panel34.Location = new System.Drawing.Point(115, 29);
             this.panel34.Name = "panel34";
             this.panel34.Size = new System.Drawing.Size(41, 20);
@@ -4196,8 +4194,8 @@ namespace ShiftOS
             // 
             // label173
             // 
-            this.label173.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.label173.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.label173.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Bold);
             this.label173.Location = new System.Drawing.Point(6, 0);
             this.label173.Name = "label173";
@@ -4208,10 +4206,10 @@ namespace ShiftOS
             // 
             // panel36
             // 
-            this.panel36.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
-            this.panel36.Controls.Add(this.btnfancydragging);
-            this.panel36.Controls.Add(this.btnfancywindows);
+            this.panel36.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left)));
+            this.panel36.Widgets.Add(this.btnfancydragging);
+            this.panel36.Widgets.Add(this.btnfancywindows);
             this.panel36.Location = new System.Drawing.Point(6, 42);
             this.panel36.Name = "panel36";
             this.panel36.Size = new System.Drawing.Size(128, 257);
@@ -4220,7 +4218,7 @@ namespace ShiftOS
             // btnfancydragging
             // 
             this.btnfancydragging.BackColor = System.Drawing.Color.White;
-            this.btnfancydragging.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnfancydragging.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnfancydragging.Font = new System.Drawing.Font("Cambria", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnfancydragging.Location = new System.Drawing.Point(4, 35);
             this.btnfancydragging.Name = "btnfancydragging";
@@ -4233,7 +4231,7 @@ namespace ShiftOS
             // btnfancywindows
             // 
             this.btnfancywindows.BackColor = System.Drawing.Color.White;
-            this.btnfancywindows.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnfancywindows.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnfancywindows.Font = new System.Drawing.Font("Cambria", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnfancywindows.Location = new System.Drawing.Point(4, 0);
             this.btnfancywindows.Name = "btnfancywindows";
@@ -4254,17 +4252,17 @@ namespace ShiftOS
             // 
             // pnlmenus
             // 
-            this.pnlmenus.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.pnlmenus.Anchor = ((ShiftUI.AnchorStyles)((((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.pnlmenus.BackColor = System.Drawing.Color.White;
-            this.pnlmenus.Controls.Add(this.pnladvanced);
-            this.pnlmenus.Controls.Add(this.pnlmore);
-            this.pnlmenus.Controls.Add(this.pnldropdown);
-            this.pnlmenus.Controls.Add(this.pnlbasic);
-            this.pnlmenus.Controls.Add(this.pnlmenusintro);
-            this.pnlmenus.Controls.Add(this.pnlmenucategories);
-            this.pnlmenus.Controls.Add(this.label74);
+            this.pnlmenus.Widgets.Add(this.pnladvanced);
+            this.pnlmenus.Widgets.Add(this.pnlmore);
+            this.pnlmenus.Widgets.Add(this.pnldropdown);
+            this.pnlmenus.Widgets.Add(this.pnlbasic);
+            this.pnlmenus.Widgets.Add(this.pnlmenusintro);
+            this.pnlmenus.Widgets.Add(this.pnlmenucategories);
+            this.pnlmenus.Widgets.Add(this.label74);
             this.pnlmenus.Location = new System.Drawing.Point(134, 9);
             this.pnlmenus.Name = "pnlmenus";
             this.pnlmenus.Size = new System.Drawing.Size(457, 306);
@@ -4272,22 +4270,22 @@ namespace ShiftOS
             // 
             // pnladvanced
             // 
-            this.pnladvanced.Controls.Add(this.btnmorebuttons);
-            this.pnladvanced.Controls.Add(this.pnlbuttonchecked);
-            this.pnladvanced.Controls.Add(this.label136);
-            this.pnladvanced.Controls.Add(this.pnlitemselectedend);
-            this.pnladvanced.Controls.Add(this.label129);
-            this.pnladvanced.Controls.Add(this.pnlbuttonpressed);
-            this.pnladvanced.Controls.Add(this.label130);
-            this.pnladvanced.Controls.Add(this.pnlitemselectedbegin);
-            this.pnladvanced.Controls.Add(this.label131);
-            this.pnladvanced.Controls.Add(this.pnlitemselected);
-            this.pnladvanced.Controls.Add(this.label132);
-            this.pnladvanced.Controls.Add(this.pnlbuttonselected);
-            this.pnladvanced.Controls.Add(this.label133);
-            this.pnladvanced.Controls.Add(this.pnlcheckbg);
-            this.pnladvanced.Controls.Add(this.label134);
-            this.pnladvanced.Controls.Add(this.label135);
+            this.pnladvanced.Widgets.Add(this.btnmorebuttons);
+            this.pnladvanced.Widgets.Add(this.pnlbuttonchecked);
+            this.pnladvanced.Widgets.Add(this.label136);
+            this.pnladvanced.Widgets.Add(this.pnlitemselectedend);
+            this.pnladvanced.Widgets.Add(this.label129);
+            this.pnladvanced.Widgets.Add(this.pnlbuttonpressed);
+            this.pnladvanced.Widgets.Add(this.label130);
+            this.pnladvanced.Widgets.Add(this.pnlitemselectedbegin);
+            this.pnladvanced.Widgets.Add(this.label131);
+            this.pnladvanced.Widgets.Add(this.pnlitemselected);
+            this.pnladvanced.Widgets.Add(this.label132);
+            this.pnladvanced.Widgets.Add(this.pnlbuttonselected);
+            this.pnladvanced.Widgets.Add(this.label133);
+            this.pnladvanced.Widgets.Add(this.pnlcheckbg);
+            this.pnladvanced.Widgets.Add(this.label134);
+            this.pnladvanced.Widgets.Add(this.label135);
             this.pnladvanced.Location = new System.Drawing.Point(139, 43);
             this.pnladvanced.Name = "pnladvanced";
             this.pnladvanced.Size = new System.Drawing.Size(311, 256);
@@ -4295,7 +4293,7 @@ namespace ShiftOS
             // 
             // btnmorebuttons
             // 
-            this.btnmorebuttons.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnmorebuttons.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnmorebuttons.Font = new System.Drawing.Font("Cambria", 11.25F);
             this.btnmorebuttons.Location = new System.Drawing.Point(216, 195);
             this.btnmorebuttons.Name = "btnmorebuttons";
@@ -4307,12 +4305,12 @@ namespace ShiftOS
             // 
             // pnlbuttonchecked
             // 
-            this.pnlbuttonchecked.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlbuttonchecked.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlbuttonchecked.Location = new System.Drawing.Point(115, 153);
             this.pnlbuttonchecked.Name = "pnlbuttonchecked";
             this.pnlbuttonchecked.Size = new System.Drawing.Size(41, 20);
             this.pnlbuttonchecked.TabIndex = 11;
-            this.pnlbuttonchecked.MouseDown += new System.Windows.Forms.MouseEventHandler(this.SetButtonCheckBG);
+            this.pnlbuttonchecked.MouseDown += new ShiftUI.MouseEventHandler(this.SetButtonCheckBG);
             // 
             // label136
             // 
@@ -4326,12 +4324,12 @@ namespace ShiftOS
             // 
             // pnlitemselectedend
             // 
-            this.pnlitemselectedend.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlitemselectedend.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlitemselectedend.Location = new System.Drawing.Point(134, 83);
             this.pnlitemselectedend.Name = "pnlitemselectedend";
             this.pnlitemselectedend.Size = new System.Drawing.Size(41, 20);
             this.pnlitemselectedend.TabIndex = 11;
-            this.pnlitemselectedend.MouseDown += new System.Windows.Forms.MouseEventHandler(this.SetItemSelectedEnd);
+            this.pnlitemselectedend.MouseDown += new ShiftUI.MouseEventHandler(this.SetItemSelectedEnd);
             // 
             // label129
             // 
@@ -4345,12 +4343,12 @@ namespace ShiftOS
             // 
             // pnlbuttonpressed
             // 
-            this.pnlbuttonpressed.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlbuttonpressed.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlbuttonpressed.Location = new System.Drawing.Point(117, 207);
             this.pnlbuttonpressed.Name = "pnlbuttonpressed";
             this.pnlbuttonpressed.Size = new System.Drawing.Size(41, 20);
             this.pnlbuttonpressed.TabIndex = 9;
-            this.pnlbuttonpressed.MouseDown += new System.Windows.Forms.MouseEventHandler(this.SetButtonPressedBG);
+            this.pnlbuttonpressed.MouseDown += new ShiftUI.MouseEventHandler(this.SetButtonPressedBG);
             // 
             // label130
             // 
@@ -4364,12 +4362,12 @@ namespace ShiftOS
             // 
             // pnlitemselectedbegin
             // 
-            this.pnlitemselectedbegin.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlitemselectedbegin.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlitemselectedbegin.Location = new System.Drawing.Point(143, 56);
             this.pnlitemselectedbegin.Name = "pnlitemselectedbegin";
             this.pnlitemselectedbegin.Size = new System.Drawing.Size(41, 20);
             this.pnlitemselectedbegin.TabIndex = 7;
-            this.pnlitemselectedbegin.MouseDown += new System.Windows.Forms.MouseEventHandler(this.SetItemSelectedBegin);
+            this.pnlitemselectedbegin.MouseDown += new ShiftUI.MouseEventHandler(this.SetItemSelectedBegin);
             // 
             // label131
             // 
@@ -4383,12 +4381,12 @@ namespace ShiftOS
             // 
             // pnlitemselected
             // 
-            this.pnlitemselected.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlitemselected.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlitemselected.Location = new System.Drawing.Point(240, 29);
             this.pnlitemselected.Name = "pnlitemselected";
             this.pnlitemselected.Size = new System.Drawing.Size(41, 20);
             this.pnlitemselected.TabIndex = 5;
-            this.pnlitemselected.MouseDown += new System.Windows.Forms.MouseEventHandler(this.SetItemSelected);
+            this.pnlitemselected.MouseDown += new ShiftUI.MouseEventHandler(this.SetItemSelected);
             // 
             // label132
             // 
@@ -4402,12 +4400,12 @@ namespace ShiftOS
             // 
             // pnlbuttonselected
             // 
-            this.pnlbuttonselected.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlbuttonselected.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlbuttonselected.Location = new System.Drawing.Point(110, 181);
             this.pnlbuttonselected.Name = "pnlbuttonselected";
             this.pnlbuttonselected.Size = new System.Drawing.Size(41, 20);
             this.pnlbuttonselected.TabIndex = 5;
-            this.pnlbuttonselected.MouseDown += new System.Windows.Forms.MouseEventHandler(this.SetButtonSelectedBG);
+            this.pnlbuttonselected.MouseDown += new ShiftUI.MouseEventHandler(this.SetButtonSelectedBG);
             // 
             // label133
             // 
@@ -4421,12 +4419,12 @@ namespace ShiftOS
             // 
             // pnlcheckbg
             // 
-            this.pnlcheckbg.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlcheckbg.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlcheckbg.Location = new System.Drawing.Point(79, 29);
             this.pnlcheckbg.Name = "pnlcheckbg";
             this.pnlcheckbg.Size = new System.Drawing.Size(41, 20);
             this.pnlcheckbg.TabIndex = 3;
-            this.pnlcheckbg.MouseDown += new System.Windows.Forms.MouseEventHandler(this.SetCheckBG);
+            this.pnlcheckbg.MouseDown += new ShiftUI.MouseEventHandler(this.SetCheckBG);
             // 
             // label134
             // 
@@ -4440,8 +4438,8 @@ namespace ShiftOS
             // 
             // label135
             // 
-            this.label135.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.label135.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.label135.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Bold);
             this.label135.Location = new System.Drawing.Point(6, 0);
             this.label135.Name = "label135";
@@ -4452,20 +4450,20 @@ namespace ShiftOS
             // 
             // pnlmore
             // 
-            this.pnlmore.Controls.Add(this.pnlpressedbegin);
-            this.pnlmore.Controls.Add(this.btnback);
-            this.pnlmore.Controls.Add(this.label138);
-            this.pnlmore.Controls.Add(this.pnlselectedbegin);
-            this.pnlmore.Controls.Add(this.pnlpressedend);
-            this.pnlmore.Controls.Add(this.label137);
-            this.pnlmore.Controls.Add(this.label139);
-            this.pnlmore.Controls.Add(this.pnlselectedend);
-            this.pnlmore.Controls.Add(this.pnlpressedmiddle);
-            this.pnlmore.Controls.Add(this.label140);
-            this.pnlmore.Controls.Add(this.label142);
-            this.pnlmore.Controls.Add(this.pnlselectedmiddle);
-            this.pnlmore.Controls.Add(this.label145);
-            this.pnlmore.Controls.Add(this.label147);
+            this.pnlmore.Widgets.Add(this.pnlpressedbegin);
+            this.pnlmore.Widgets.Add(this.btnback);
+            this.pnlmore.Widgets.Add(this.label138);
+            this.pnlmore.Widgets.Add(this.pnlselectedbegin);
+            this.pnlmore.Widgets.Add(this.pnlpressedend);
+            this.pnlmore.Widgets.Add(this.label137);
+            this.pnlmore.Widgets.Add(this.label139);
+            this.pnlmore.Widgets.Add(this.pnlselectedend);
+            this.pnlmore.Widgets.Add(this.pnlpressedmiddle);
+            this.pnlmore.Widgets.Add(this.label140);
+            this.pnlmore.Widgets.Add(this.label142);
+            this.pnlmore.Widgets.Add(this.pnlselectedmiddle);
+            this.pnlmore.Widgets.Add(this.label145);
+            this.pnlmore.Widgets.Add(this.label147);
             this.pnlmore.Location = new System.Drawing.Point(139, 43);
             this.pnlmore.Name = "pnlmore";
             this.pnlmore.Size = new System.Drawing.Size(311, 256);
@@ -4473,17 +4471,17 @@ namespace ShiftOS
             // 
             // pnlpressedbegin
             // 
-            this.pnlpressedbegin.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpressedbegin.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpressedbegin.Location = new System.Drawing.Point(170, 107);
             this.pnlpressedbegin.Name = "pnlpressedbegin";
             this.pnlpressedbegin.Size = new System.Drawing.Size(41, 20);
             this.pnlpressedbegin.TabIndex = 17;
-            this.pnlpressedbegin.MouseDown += new System.Windows.Forms.MouseEventHandler(this.SetPressedBegin);
+            this.pnlpressedbegin.MouseDown += new ShiftUI.MouseEventHandler(this.SetPressedBegin);
             // 
             // btnback
             // 
-            this.btnback.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.btnback.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnback.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left)));
+            this.btnback.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnback.Font = new System.Drawing.Font("Cambria", 11.25F);
             this.btnback.Location = new System.Drawing.Point(6, 184);
             this.btnback.Name = "btnback";
@@ -4505,21 +4503,21 @@ namespace ShiftOS
             // 
             // pnlselectedbegin
             // 
-            this.pnlselectedbegin.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlselectedbegin.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlselectedbegin.Location = new System.Drawing.Point(169, 29);
             this.pnlselectedbegin.Name = "pnlselectedbegin";
             this.pnlselectedbegin.Size = new System.Drawing.Size(41, 20);
             this.pnlselectedbegin.TabIndex = 11;
-            this.pnlselectedbegin.MouseDown += new System.Windows.Forms.MouseEventHandler(this.SetSelectedBegin);
+            this.pnlselectedbegin.MouseDown += new ShiftUI.MouseEventHandler(this.SetSelectedBegin);
             // 
             // pnlpressedend
             // 
-            this.pnlpressedend.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpressedend.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpressedend.Location = new System.Drawing.Point(162, 159);
             this.pnlpressedend.Name = "pnlpressedend";
             this.pnlpressedend.Size = new System.Drawing.Size(41, 20);
             this.pnlpressedend.TabIndex = 15;
-            this.pnlpressedend.MouseDown += new System.Windows.Forms.MouseEventHandler(this.SetPressedEnd);
+            this.pnlpressedend.MouseDown += new ShiftUI.MouseEventHandler(this.SetPressedEnd);
             // 
             // label137
             // 
@@ -4543,21 +4541,21 @@ namespace ShiftOS
             // 
             // pnlselectedend
             // 
-            this.pnlselectedend.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlselectedend.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlselectedend.Location = new System.Drawing.Point(161, 81);
             this.pnlselectedend.Name = "pnlselectedend";
             this.pnlselectedend.Size = new System.Drawing.Size(41, 20);
             this.pnlselectedend.TabIndex = 9;
-            this.pnlselectedend.MouseDown += new System.Windows.Forms.MouseEventHandler(this.SetSelectedEnd);
+            this.pnlselectedend.MouseDown += new ShiftUI.MouseEventHandler(this.SetSelectedEnd);
             // 
             // pnlpressedmiddle
             // 
-            this.pnlpressedmiddle.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpressedmiddle.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpressedmiddle.Location = new System.Drawing.Point(179, 134);
             this.pnlpressedmiddle.Name = "pnlpressedmiddle";
             this.pnlpressedmiddle.Size = new System.Drawing.Size(41, 20);
             this.pnlpressedmiddle.TabIndex = 13;
-            this.pnlpressedmiddle.MouseDown += new System.Windows.Forms.MouseEventHandler(this.SetPressedMiddle);
+            this.pnlpressedmiddle.MouseDown += new ShiftUI.MouseEventHandler(this.SetPressedMiddle);
             // 
             // label140
             // 
@@ -4581,12 +4579,12 @@ namespace ShiftOS
             // 
             // pnlselectedmiddle
             // 
-            this.pnlselectedmiddle.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlselectedmiddle.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlselectedmiddle.Location = new System.Drawing.Point(182, 56);
             this.pnlselectedmiddle.Name = "pnlselectedmiddle";
             this.pnlselectedmiddle.Size = new System.Drawing.Size(41, 20);
             this.pnlselectedmiddle.TabIndex = 5;
-            this.pnlselectedmiddle.MouseDown += new System.Windows.Forms.MouseEventHandler(this.SetSelectedMiddle);
+            this.pnlselectedmiddle.MouseDown += new ShiftUI.MouseEventHandler(this.SetSelectedMiddle);
             // 
             // label145
             // 
@@ -4600,8 +4598,8 @@ namespace ShiftOS
             // 
             // label147
             // 
-            this.label147.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.label147.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.label147.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Bold);
             this.label147.Location = new System.Drawing.Point(6, 0);
             this.label147.Name = "label147";
@@ -4612,19 +4610,19 @@ namespace ShiftOS
             // 
             // pnldropdown
             // 
-            this.pnldropdown.Controls.Add(this.pnlddborder);
-            this.pnldropdown.Controls.Add(this.label117);
-            this.pnldropdown.Controls.Add(this.pnlmarginend);
-            this.pnldropdown.Controls.Add(this.label120);
-            this.pnldropdown.Controls.Add(this.pnlmarginmiddle);
-            this.pnldropdown.Controls.Add(this.label121);
-            this.pnldropdown.Controls.Add(this.pnlmarginbegin);
-            this.pnldropdown.Controls.Add(this.label122);
-            this.pnldropdown.Controls.Add(this.pnlhcolor);
-            this.pnldropdown.Controls.Add(this.label123);
-            this.pnldropdown.Controls.Add(this.pnlhborder);
-            this.pnldropdown.Controls.Add(this.label125);
-            this.pnldropdown.Controls.Add(this.label126);
+            this.pnldropdown.Widgets.Add(this.pnlddborder);
+            this.pnldropdown.Widgets.Add(this.label117);
+            this.pnldropdown.Widgets.Add(this.pnlmarginend);
+            this.pnldropdown.Widgets.Add(this.label120);
+            this.pnldropdown.Widgets.Add(this.pnlmarginmiddle);
+            this.pnldropdown.Widgets.Add(this.label121);
+            this.pnldropdown.Widgets.Add(this.pnlmarginbegin);
+            this.pnldropdown.Widgets.Add(this.label122);
+            this.pnldropdown.Widgets.Add(this.pnlhcolor);
+            this.pnldropdown.Widgets.Add(this.label123);
+            this.pnldropdown.Widgets.Add(this.pnlhborder);
+            this.pnldropdown.Widgets.Add(this.label125);
+            this.pnldropdown.Widgets.Add(this.label126);
             this.pnldropdown.Location = new System.Drawing.Point(139, 43);
             this.pnldropdown.Name = "pnldropdown";
             this.pnldropdown.Size = new System.Drawing.Size(311, 256);
@@ -4632,12 +4630,12 @@ namespace ShiftOS
             // 
             // pnlddborder
             // 
-            this.pnlddborder.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlddborder.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlddborder.Location = new System.Drawing.Point(216, 80);
             this.pnlddborder.Name = "pnlddborder";
             this.pnlddborder.Size = new System.Drawing.Size(41, 20);
             this.pnlddborder.TabIndex = 11;
-            this.pnlddborder.MouseDown += new System.Windows.Forms.MouseEventHandler(this.MenuBorder);
+            this.pnlddborder.MouseDown += new ShiftUI.MouseEventHandler(this.MenuBorder);
             // 
             // label117
             // 
@@ -4651,12 +4649,12 @@ namespace ShiftOS
             // 
             // pnlmarginend
             // 
-            this.pnlmarginend.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlmarginend.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlmarginend.Location = new System.Drawing.Point(224, 55);
             this.pnlmarginend.Name = "pnlmarginend";
             this.pnlmarginend.Size = new System.Drawing.Size(41, 20);
             this.pnlmarginend.TabIndex = 9;
-            this.pnlmarginend.MouseDown += new System.Windows.Forms.MouseEventHandler(this.MarginEnd);
+            this.pnlmarginend.MouseDown += new ShiftUI.MouseEventHandler(this.MarginEnd);
             // 
             // label120
             // 
@@ -4670,12 +4668,12 @@ namespace ShiftOS
             // 
             // pnlmarginmiddle
             // 
-            this.pnlmarginmiddle.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlmarginmiddle.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlmarginmiddle.Location = new System.Drawing.Point(117, 80);
             this.pnlmarginmiddle.Name = "pnlmarginmiddle";
             this.pnlmarginmiddle.Size = new System.Drawing.Size(41, 20);
             this.pnlmarginmiddle.TabIndex = 7;
-            this.pnlmarginmiddle.MouseDown += new System.Windows.Forms.MouseEventHandler(this.MarginMiddle);
+            this.pnlmarginmiddle.MouseDown += new ShiftUI.MouseEventHandler(this.MarginMiddle);
             // 
             // label121
             // 
@@ -4689,12 +4687,12 @@ namespace ShiftOS
             // 
             // pnlmarginbegin
             // 
-            this.pnlmarginbegin.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlmarginbegin.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlmarginbegin.Location = new System.Drawing.Point(101, 55);
             this.pnlmarginbegin.Name = "pnlmarginbegin";
             this.pnlmarginbegin.Size = new System.Drawing.Size(41, 20);
             this.pnlmarginbegin.TabIndex = 5;
-            this.pnlmarginbegin.MouseDown += new System.Windows.Forms.MouseEventHandler(this.MarginBegin);
+            this.pnlmarginbegin.MouseDown += new ShiftUI.MouseEventHandler(this.MarginBegin);
             // 
             // label122
             // 
@@ -4708,12 +4706,12 @@ namespace ShiftOS
             // 
             // pnlhcolor
             // 
-            this.pnlhcolor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlhcolor.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlhcolor.Location = new System.Drawing.Point(249, 29);
             this.pnlhcolor.Name = "pnlhcolor";
             this.pnlhcolor.Size = new System.Drawing.Size(41, 20);
             this.pnlhcolor.TabIndex = 5;
-            this.pnlhcolor.MouseDown += new System.Windows.Forms.MouseEventHandler(this.HighlightColor);
+            this.pnlhcolor.MouseDown += new ShiftUI.MouseEventHandler(this.HighlightColor);
             // 
             // label123
             // 
@@ -4727,12 +4725,12 @@ namespace ShiftOS
             // 
             // pnlhborder
             // 
-            this.pnlhborder.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlhborder.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlhborder.Location = new System.Drawing.Point(115, 29);
             this.pnlhborder.Name = "pnlhborder";
             this.pnlhborder.Size = new System.Drawing.Size(41, 20);
             this.pnlhborder.TabIndex = 3;
-            this.pnlhborder.MouseDown += new System.Windows.Forms.MouseEventHandler(this.HighlightBorder);
+            this.pnlhborder.MouseDown += new ShiftUI.MouseEventHandler(this.HighlightBorder);
             // 
             // label125
             // 
@@ -4746,8 +4744,8 @@ namespace ShiftOS
             // 
             // label126
             // 
-            this.label126.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.label126.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.label126.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Bold);
             this.label126.Location = new System.Drawing.Point(6, 0);
             this.label126.Name = "label126";
@@ -4758,25 +4756,25 @@ namespace ShiftOS
             // 
             // pnlbasic
             // 
-            this.pnlbasic.Controls.Add(this.pnlmenutextcolor);
-            this.pnlbasic.Controls.Add(this.label118);
-            this.pnlbasic.Controls.Add(this.pnldropdownbg);
-            this.pnlbasic.Controls.Add(this.label115);
-            this.pnlbasic.Controls.Add(this.pnlstatusend);
-            this.pnlbasic.Controls.Add(this.label114);
-            this.pnlbasic.Controls.Add(this.pnlstatusbegin);
-            this.pnlbasic.Controls.Add(this.label107);
-            this.pnlbasic.Controls.Add(this.pnltoolbarend);
-            this.pnlbasic.Controls.Add(this.label77);
-            this.pnlbasic.Controls.Add(this.pnltoolbarmiddle);
-            this.pnlbasic.Controls.Add(this.label76);
-            this.pnlbasic.Controls.Add(this.pnltoolbarbegin);
-            this.pnlbasic.Controls.Add(this.label75);
-            this.pnlbasic.Controls.Add(this.pnlmenubarend);
-            this.pnlbasic.Controls.Add(this.label73);
-            this.pnlbasic.Controls.Add(this.pnlmenubarbegin);
-            this.pnlbasic.Controls.Add(this.label42);
-            this.pnlbasic.Controls.Add(this.label41);
+            this.pnlbasic.Widgets.Add(this.pnlmenutextcolor);
+            this.pnlbasic.Widgets.Add(this.label118);
+            this.pnlbasic.Widgets.Add(this.pnldropdownbg);
+            this.pnlbasic.Widgets.Add(this.label115);
+            this.pnlbasic.Widgets.Add(this.pnlstatusend);
+            this.pnlbasic.Widgets.Add(this.label114);
+            this.pnlbasic.Widgets.Add(this.pnlstatusbegin);
+            this.pnlbasic.Widgets.Add(this.label107);
+            this.pnlbasic.Widgets.Add(this.pnltoolbarend);
+            this.pnlbasic.Widgets.Add(this.label77);
+            this.pnlbasic.Widgets.Add(this.pnltoolbarmiddle);
+            this.pnlbasic.Widgets.Add(this.label76);
+            this.pnlbasic.Widgets.Add(this.pnltoolbarbegin);
+            this.pnlbasic.Widgets.Add(this.label75);
+            this.pnlbasic.Widgets.Add(this.pnlmenubarend);
+            this.pnlbasic.Widgets.Add(this.label73);
+            this.pnlbasic.Widgets.Add(this.pnlmenubarbegin);
+            this.pnlbasic.Widgets.Add(this.label42);
+            this.pnlbasic.Widgets.Add(this.label41);
             this.pnlbasic.Location = new System.Drawing.Point(139, 43);
             this.pnlbasic.Name = "pnlbasic";
             this.pnlbasic.Size = new System.Drawing.Size(311, 256);
@@ -4784,12 +4782,12 @@ namespace ShiftOS
             // 
             // pnlmenutextcolor
             // 
-            this.pnlmenutextcolor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlmenutextcolor.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlmenutextcolor.Location = new System.Drawing.Point(85, 129);
             this.pnlmenutextcolor.Name = "pnlmenutextcolor";
             this.pnlmenutextcolor.Size = new System.Drawing.Size(41, 20);
             this.pnlmenutextcolor.TabIndex = 17;
-            this.pnlmenutextcolor.MouseDown += new System.Windows.Forms.MouseEventHandler(this.SetMenuTextColor);
+            this.pnlmenutextcolor.MouseDown += new ShiftUI.MouseEventHandler(this.SetMenuTextColor);
             // 
             // label118
             // 
@@ -4803,12 +4801,12 @@ namespace ShiftOS
             // 
             // pnldropdownbg
             // 
-            this.pnldropdownbg.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnldropdownbg.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnldropdownbg.Location = new System.Drawing.Point(228, 104);
             this.pnldropdownbg.Name = "pnldropdownbg";
             this.pnldropdownbg.Size = new System.Drawing.Size(41, 20);
             this.pnldropdownbg.TabIndex = 15;
-            this.pnldropdownbg.MouseDown += new System.Windows.Forms.MouseEventHandler(this.DropDownBG);
+            this.pnldropdownbg.MouseDown += new ShiftUI.MouseEventHandler(this.DropDownBG);
             // 
             // label115
             // 
@@ -4822,12 +4820,12 @@ namespace ShiftOS
             // 
             // pnlstatusend
             // 
-            this.pnlstatusend.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlstatusend.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlstatusend.Location = new System.Drawing.Point(84, 104);
             this.pnlstatusend.Name = "pnlstatusend";
             this.pnlstatusend.Size = new System.Drawing.Size(41, 20);
             this.pnlstatusend.TabIndex = 13;
-            this.pnlstatusend.MouseDown += new System.Windows.Forms.MouseEventHandler(this.StatusEnd);
+            this.pnlstatusend.MouseDown += new ShiftUI.MouseEventHandler(this.StatusEnd);
             // 
             // label114
             // 
@@ -4841,12 +4839,12 @@ namespace ShiftOS
             // 
             // pnlstatusbegin
             // 
-            this.pnlstatusbegin.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlstatusbegin.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlstatusbegin.Location = new System.Drawing.Point(254, 81);
             this.pnlstatusbegin.Name = "pnlstatusbegin";
             this.pnlstatusbegin.Size = new System.Drawing.Size(41, 20);
             this.pnlstatusbegin.TabIndex = 11;
-            this.pnlstatusbegin.MouseDown += new System.Windows.Forms.MouseEventHandler(this.StatusBegin);
+            this.pnlstatusbegin.MouseDown += new ShiftUI.MouseEventHandler(this.StatusBegin);
             // 
             // label107
             // 
@@ -4860,12 +4858,12 @@ namespace ShiftOS
             // 
             // pnltoolbarend
             // 
-            this.pnltoolbarend.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnltoolbarend.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnltoolbarend.Location = new System.Drawing.Point(254, 55);
             this.pnltoolbarend.Name = "pnltoolbarend";
             this.pnltoolbarend.Size = new System.Drawing.Size(41, 20);
             this.pnltoolbarend.TabIndex = 9;
-            this.pnltoolbarend.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ToolBarEnd);
+            this.pnltoolbarend.MouseDown += new ShiftUI.MouseEventHandler(this.ToolBarEnd);
             // 
             // label77
             // 
@@ -4879,12 +4877,12 @@ namespace ShiftOS
             // 
             // pnltoolbarmiddle
             // 
-            this.pnltoolbarmiddle.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnltoolbarmiddle.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnltoolbarmiddle.Location = new System.Drawing.Point(117, 80);
             this.pnltoolbarmiddle.Name = "pnltoolbarmiddle";
             this.pnltoolbarmiddle.Size = new System.Drawing.Size(41, 20);
             this.pnltoolbarmiddle.TabIndex = 7;
-            this.pnltoolbarmiddle.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ToolBarMiddle);
+            this.pnltoolbarmiddle.MouseDown += new ShiftUI.MouseEventHandler(this.ToolBarMiddle);
             // 
             // label76
             // 
@@ -4898,12 +4896,12 @@ namespace ShiftOS
             // 
             // pnltoolbarbegin
             // 
-            this.pnltoolbarbegin.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnltoolbarbegin.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnltoolbarbegin.Location = new System.Drawing.Point(117, 55);
             this.pnltoolbarbegin.Name = "pnltoolbarbegin";
             this.pnltoolbarbegin.Size = new System.Drawing.Size(41, 20);
             this.pnltoolbarbegin.TabIndex = 5;
-            this.pnltoolbarbegin.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ToolBarBegin);
+            this.pnltoolbarbegin.MouseDown += new ShiftUI.MouseEventHandler(this.ToolBarBegin);
             // 
             // label75
             // 
@@ -4917,12 +4915,12 @@ namespace ShiftOS
             // 
             // pnlmenubarend
             // 
-            this.pnlmenubarend.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlmenubarend.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlmenubarend.Location = new System.Drawing.Point(249, 29);
             this.pnlmenubarend.Name = "pnlmenubarend";
             this.pnlmenubarend.Size = new System.Drawing.Size(41, 20);
             this.pnlmenubarend.TabIndex = 5;
-            this.pnlmenubarend.MouseDown += new System.Windows.Forms.MouseEventHandler(this.MenuEnd);
+            this.pnlmenubarend.MouseDown += new ShiftUI.MouseEventHandler(this.MenuEnd);
             // 
             // label73
             // 
@@ -4936,12 +4934,12 @@ namespace ShiftOS
             // 
             // pnlmenubarbegin
             // 
-            this.pnlmenubarbegin.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlmenubarbegin.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlmenubarbegin.Location = new System.Drawing.Point(115, 29);
             this.pnlmenubarbegin.Name = "pnlmenubarbegin";
             this.pnlmenubarbegin.Size = new System.Drawing.Size(41, 20);
             this.pnlmenubarbegin.TabIndex = 3;
-            this.pnlmenubarbegin.MouseDown += new System.Windows.Forms.MouseEventHandler(this.MenuBegin);
+            this.pnlmenubarbegin.MouseDown += new ShiftUI.MouseEventHandler(this.MenuBegin);
             // 
             // label42
             // 
@@ -4955,8 +4953,8 @@ namespace ShiftOS
             // 
             // label41
             // 
-            this.label41.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.label41.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.label41.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Bold);
             this.label41.Location = new System.Drawing.Point(6, 0);
             this.label41.Name = "label41";
@@ -4967,8 +4965,8 @@ namespace ShiftOS
             // 
             // pnlmenusintro
             // 
-            this.pnlmenusintro.Controls.Add(this.label116);
-            this.pnlmenusintro.Controls.Add(this.label124);
+            this.pnlmenusintro.Widgets.Add(this.label116);
+            this.pnlmenusintro.Widgets.Add(this.label124);
             this.pnlmenusintro.Location = new System.Drawing.Point(139, 43);
             this.pnlmenusintro.Name = "pnlmenusintro";
             this.pnlmenusintro.Size = new System.Drawing.Size(311, 256);
@@ -4976,8 +4974,8 @@ namespace ShiftOS
             // 
             // label116
             // 
-            this.label116.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.label116.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.label116.BackColor = System.Drawing.Color.Transparent;
             this.label116.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label116.Location = new System.Drawing.Point(6, 29);
@@ -4989,8 +4987,8 @@ namespace ShiftOS
             // 
             // label124
             // 
-            this.label124.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.label124.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.label124.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Bold);
             this.label124.Location = new System.Drawing.Point(6, 0);
             this.label124.Name = "label124";
@@ -5001,12 +4999,12 @@ namespace ShiftOS
             // 
             // pnlmenucategories
             // 
-            this.pnlmenucategories.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
-            this.pnlmenucategories.Controls.Add(this.btnmisc);
-            this.pnlmenucategories.Controls.Add(this.btnadvanced);
-            this.pnlmenucategories.Controls.Add(this.btndropdown);
-            this.pnlmenucategories.Controls.Add(this.btnbasic);
+            this.pnlmenucategories.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left)));
+            this.pnlmenucategories.Widgets.Add(this.btnmisc);
+            this.pnlmenucategories.Widgets.Add(this.btnadvanced);
+            this.pnlmenucategories.Widgets.Add(this.btndropdown);
+            this.pnlmenucategories.Widgets.Add(this.btnbasic);
             this.pnlmenucategories.Location = new System.Drawing.Point(6, 42);
             this.pnlmenucategories.Name = "pnlmenucategories";
             this.pnlmenucategories.Size = new System.Drawing.Size(128, 257);
@@ -5015,7 +5013,7 @@ namespace ShiftOS
             // btnmisc
             // 
             this.btnmisc.BackColor = System.Drawing.Color.White;
-            this.btnmisc.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnmisc.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnmisc.Font = new System.Drawing.Font("Cambria", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnmisc.Location = new System.Drawing.Point(4, 105);
             this.btnmisc.Name = "btnmisc";
@@ -5027,7 +5025,7 @@ namespace ShiftOS
             // btnadvanced
             // 
             this.btnadvanced.BackColor = System.Drawing.Color.White;
-            this.btnadvanced.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnadvanced.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnadvanced.Font = new System.Drawing.Font("Cambria", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnadvanced.Location = new System.Drawing.Point(4, 70);
             this.btnadvanced.Name = "btnadvanced";
@@ -5040,7 +5038,7 @@ namespace ShiftOS
             // btndropdown
             // 
             this.btndropdown.BackColor = System.Drawing.Color.White;
-            this.btndropdown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btndropdown.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btndropdown.Font = new System.Drawing.Font("Cambria", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btndropdown.Location = new System.Drawing.Point(4, 35);
             this.btndropdown.Name = "btndropdown";
@@ -5053,7 +5051,7 @@ namespace ShiftOS
             // btnbasic
             // 
             this.btnbasic.BackColor = System.Drawing.Color.White;
-            this.btnbasic.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnbasic.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnbasic.Font = new System.Drawing.Font("Cambria", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnbasic.Location = new System.Drawing.Point(4, 0);
             this.btnbasic.Name = "btnbasic";
@@ -5078,12 +5076,12 @@ namespace ShiftOS
             // 
             // pnlluaoptions
             // 
-            this.pnlluaoptions.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.pnlluaoptions.Anchor = ((ShiftUI.AnchorStyles)((((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.pnlluaoptions.BackColor = System.Drawing.Color.White;
-            this.pnlluaoptions.Controls.Add(this.pnlluafield);
-            this.pnlluaoptions.Controls.Add(this.flmorebuttons);
+            this.pnlluaoptions.Widgets.Add(this.pnlluafield);
+            this.pnlluaoptions.Widgets.Add(this.flmorebuttons);
             this.pnlluaoptions.Location = new System.Drawing.Point(139, 9);
             this.pnlluaoptions.Name = "pnlluaoptions";
             this.pnlluaoptions.Size = new System.Drawing.Size(457, 306);
@@ -5093,8 +5091,8 @@ namespace ShiftOS
             // flmorebuttons
             // 
             this.flmorebuttons.AutoSize = true;
-            this.flmorebuttons.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.flmorebuttons.Dock = System.Windows.Forms.DockStyle.Top;
+            this.flmorebuttons.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.flmorebuttons.Dock = ShiftUI.DockStyle.Top;
             this.flmorebuttons.Location = new System.Drawing.Point(0, 0);
             this.flmorebuttons.Name = "flmorebuttons";
             this.flmorebuttons.Size = new System.Drawing.Size(457, 0);
@@ -5102,7 +5100,7 @@ namespace ShiftOS
             // 
             // pnlluafield
             // 
-            this.pnlluafield.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pnlluafield.Dock = ShiftUI.DockStyle.Fill;
             this.pnlluafield.Location = new System.Drawing.Point(0, 0);
             this.pnlluafield.Name = "pnlluafield";
             this.pnlluafield.Size = new System.Drawing.Size(457, 306);
@@ -5111,10 +5109,10 @@ namespace ShiftOS
             // Shifter
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(600, 323);
-            this.Controls.Add(this.pgcontents);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Widgets.Add(this.pgcontents);
+            this.FormBorderStyle = ShiftUI.FormBorderStyle.None;
             this.Name = "Shifter";
             this.Text = "Shifter";
             this.TopMost = true;
@@ -5202,270 +5200,269 @@ namespace ShiftOS
             this.ResumeLayout(false);
 
         }
-        private System.Windows.Forms.ColorDialog ColorDialog1;
-        private System.Windows.Forms.Timer clocktick;
-        private System.Windows.Forms.Timer customizationtime;
-        private System.Windows.Forms.Timer timerearned;
-        private System.Windows.Forms.Label Label1;
-        private System.Windows.Forms.Button btnapply;
-        private System.Windows.Forms.Panel catholder;
-        private System.Windows.Forms.Button btnreset;
-        private System.Windows.Forms.Button btnmenus;
-        private System.Windows.Forms.Button btnwindows;
-        private System.Windows.Forms.Button btndesktop;
-        private System.Windows.Forms.Panel pnlshifterintro;
-        private System.Windows.Forms.Label Label66;
-        private System.Windows.Forms.Label Label65;
-        private System.Windows.Forms.Label Label64;
-        private System.Windows.Forms.Label Label63;
-        private System.Windows.Forms.Panel pnldesktopoptions;
-        private System.Windows.Forms.Panel pnlpanelbuttonsoptions;
-        private System.Windows.Forms.Panel pnlpanelbuttontextcolour;
-        private System.Windows.Forms.Label Label101;
-        private System.Windows.Forms.TextBox txtpanelbuttontexttop;
-        private System.Windows.Forms.Label Label104;
-        private System.Windows.Forms.TextBox txtpanelbuttontextside;
-        private System.Windows.Forms.Label Label106;
-        private System.Windows.Forms.Label Label93;
-        private System.Windows.Forms.TextBox txtpanelbuttontop;
-        private System.Windows.Forms.Label Label94;
-        private System.Windows.Forms.TextBox txtpanelbuttoninitalgap;
-        private System.Windows.Forms.Label Label108;
-        private System.Windows.Forms.TextBox txtpanelbuttonicontop;
-        private System.Windows.Forms.Label Label110;
-        private System.Windows.Forms.TextBox txtpanelbuttoniconside;
-        private System.Windows.Forms.Label Label112;
-        private System.Windows.Forms.TextBox txtpanelbuttoniconsize;
-        private System.Windows.Forms.TextBox txtpanelbuttoniconheight;
-        private System.Windows.Forms.Label Label105;
-        private System.Windows.Forms.ComboBox cbpanelbuttontextstyle;
-        private System.Windows.Forms.ComboBox cbpanelbuttonfont;
-        private System.Windows.Forms.Label Label100;
-        private System.Windows.Forms.TextBox txtpaneltextbuttonsize;
-        private System.Windows.Forms.Label Label102;
-        private System.Windows.Forms.Label Label103;
-        private System.Windows.Forms.Label Label98;
-        private System.Windows.Forms.TextBox txtpanelbuttongap;
-        private System.Windows.Forms.Label Label99;
-        private System.Windows.Forms.Label Label96;
-        private System.Windows.Forms.TextBox txtpanelbuttonheight;
-        private System.Windows.Forms.Label Label97;
-        private System.Windows.Forms.Label Label92;
-        private System.Windows.Forms.TextBox txtpanelbuttonwidth;
-        private System.Windows.Forms.Label Label91;
-        private System.Windows.Forms.Panel pnlpanelbuttoncolour;
-        private System.Windows.Forms.Label Label95;
-        private System.Windows.Forms.Panel pnldesktoppaneloptions;
-        private System.Windows.Forms.Button btnpanelbuttons;
-        private System.Windows.Forms.Label lbwarning;
-        private System.Windows.Forms.ComboBox combodesktoppanelposition;
-        private System.Windows.Forms.Label lbposition;
-        private System.Windows.Forms.Label Label47;
-        private System.Windows.Forms.NumericUpDown txtdesktoppanelheight;
-        private System.Windows.Forms.Label lbheight;
-        private System.Windows.Forms.Panel pnldesktoppanelcolour;
-        private System.Windows.Forms.Label lbpanelcolor;
-        private System.Windows.Forms.Panel pnlapplauncheroptions;
-        private System.Windows.Forms.Label Label71;
-        private System.Windows.Forms.TextBox txtapplauncherwidth;
-        private System.Windows.Forms.Label Label72;
-        private System.Windows.Forms.TextBox txtappbuttonlabel;
-        private System.Windows.Forms.Label Label51;
-        private System.Windows.Forms.Label Label50;
-        private System.Windows.Forms.Panel pnlmaintextcolour;
-        private System.Windows.Forms.ComboBox comboappbuttontextstyle;
-        private System.Windows.Forms.ComboBox comboappbuttontextfont;
-        private System.Windows.Forms.Label Label37;
-        private System.Windows.Forms.Label Label38;
-        private System.Windows.Forms.TextBox txtappbuttontextsize;
-        private System.Windows.Forms.Label Label39;
-        private System.Windows.Forms.Label Label40;
-        private System.Windows.Forms.Panel pnlmainbuttonactivated;
-        private System.Windows.Forms.Label Label28;
-        private System.Windows.Forms.Label Label35;
-        private System.Windows.Forms.TextBox txtapplicationsbuttonheight;
-        private System.Windows.Forms.Label Label36;
-        private System.Windows.Forms.Panel pnlmainbuttoncolour;
-        private System.Windows.Forms.Label Label43;
-        private System.Windows.Forms.Panel pnldesktopintro;
-        private System.Windows.Forms.Label Label69;
-        private System.Windows.Forms.Label Label70;
-        private System.Windows.Forms.Panel pnlpanelclockoptions;
-        private System.Windows.Forms.Panel pnlclockbackgroundcolour;
-        private System.Windows.Forms.Label Label44;
-        private System.Windows.Forms.ComboBox comboclocktextstyle;
-        private System.Windows.Forms.ComboBox comboclocktextfont;
-        private System.Windows.Forms.Label Label26;
-        private System.Windows.Forms.Label Label29;
-        private System.Windows.Forms.TextBox txtclocktextfromtop;
-        private System.Windows.Forms.Label Label30;
-        private System.Windows.Forms.Label Label31;
-        private System.Windows.Forms.TextBox txtclocktextsize;
-        private System.Windows.Forms.Label Label32;
-        private System.Windows.Forms.Label Label33;
-        private System.Windows.Forms.Panel pnlpanelclocktextcolour;
-        private System.Windows.Forms.Label Label34;
-        private System.Windows.Forms.Panel pnldesktopbackgroundoptions;
-        private System.Windows.Forms.Panel pnldesktopcolour;
-        private System.Windows.Forms.Label Label45;
-        private System.Windows.Forms.Panel Panel10;
-        private System.Windows.Forms.Button btndesktopitself;
-        private System.Windows.Forms.Button btnpanelclock;
-        private System.Windows.Forms.Button btnapplauncher;
-        private System.Windows.Forms.Button btndesktoppanel;
-        private System.Windows.Forms.Panel pnldesktoppreview;
-        private System.Windows.Forms.Panel predesktoppanel;
-        private System.Windows.Forms.FlowLayoutPanel prepnlpanelbuttonholder;
-        private System.Windows.Forms.Panel prepnlpanelbutton;
-        private System.Windows.Forms.PictureBox pretbicon;
-        private System.Windows.Forms.Label pretbctext;
-        private System.Windows.Forms.Panel pretimepanel;
-        private System.Windows.Forms.Label prepaneltimetext;
-        private System.Windows.Forms.Panel preapplaunchermenuholder;
-        private System.Windows.Forms.MenuStrip predesktopappmenu;
-        private System.Windows.Forms.ToolStripMenuItem ApplicationsToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem KnowledgeInputToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem ShiftoriumToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem ClockToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem TerminalToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem ShifterToolStripMenuItem;
-        private System.Windows.Forms.ToolStripSeparator ToolStripSeparator1;
-        private System.Windows.Forms.ToolStripMenuItem ShutdownToolStripMenuItem;
-        private System.Windows.Forms.Panel pnlwindowsoptions;
-        private System.Windows.Forms.Panel pnlbuttonoptions;
-        private System.Windows.Forms.Panel pnlminimizebuttonoptions;
-        private System.Windows.Forms.Label Label82;
-        private System.Windows.Forms.Label Label83;
-        private System.Windows.Forms.Panel pnlminimizebuttoncolour;
-        private System.Windows.Forms.TextBox txtminimizebuttonside;
-        private System.Windows.Forms.Label Label84;
-        private System.Windows.Forms.Label Label85;
-        private System.Windows.Forms.TextBox txtminimizebuttonheight;
-        private System.Windows.Forms.Label Label86;
-        private System.Windows.Forms.Label Label87;
-        private System.Windows.Forms.TextBox txtminimizebuttontop;
-        private System.Windows.Forms.Label Label88;
-        private System.Windows.Forms.Label Label89;
-        private System.Windows.Forms.TextBox txtminimizebuttonwidth;
-        private System.Windows.Forms.Label Label90;
-        private System.Windows.Forms.Panel pnlrollupbuttonoptions;
-        private System.Windows.Forms.Label Label54;
-        private System.Windows.Forms.Label Label55;
-        private System.Windows.Forms.Panel pnlrollupbuttoncolour;
-        private System.Windows.Forms.TextBox txtrollupbuttonside;
-        private System.Windows.Forms.Label Label56;
-        private System.Windows.Forms.Label Label57;
-        private System.Windows.Forms.TextBox txtrollupbuttonheight;
-        private System.Windows.Forms.Label Label58;
-        private System.Windows.Forms.Label Label59;
-        private System.Windows.Forms.TextBox txtrollupbuttontop;
-        private System.Windows.Forms.Label Label60;
-        private System.Windows.Forms.Label Label61;
-        private System.Windows.Forms.TextBox txtrollupbuttonwidth;
-        private System.Windows.Forms.Label Label62;
-        private System.Windows.Forms.ComboBox combobuttonoption;
-        private System.Windows.Forms.Label Label52;
-        private System.Windows.Forms.Panel pnlclosebuttonoptions;
-        private System.Windows.Forms.Label Label8;
-        private System.Windows.Forms.Label Label11;
-        private System.Windows.Forms.Panel pnlclosebuttoncolour;
-        private System.Windows.Forms.TextBox txtclosebuttonfromside;
-        private System.Windows.Forms.Label Label7;
-        private System.Windows.Forms.Label Label12;
-        private System.Windows.Forms.TextBox txtclosebuttonheight;
-        private System.Windows.Forms.Label Label13;
-        private System.Windows.Forms.Label Label6;
-        private System.Windows.Forms.TextBox txtclosebuttonfromtop;
-        private System.Windows.Forms.Label Label10;
-        private System.Windows.Forms.Label Label14;
-        private System.Windows.Forms.TextBox txtclosebuttonwidth;
-        private System.Windows.Forms.Label Label9;
-        private System.Windows.Forms.Panel pnltitlebaroptions;
-        private System.Windows.Forms.Label Label80;
-        private System.Windows.Forms.TextBox txticonfromtop;
-        private System.Windows.Forms.Label Label81;
-        private System.Windows.Forms.Label Label78;
-        private System.Windows.Forms.TextBox txticonfromside;
-        private System.Windows.Forms.Label Label79;
-        private System.Windows.Forms.Label lbcornerwidthpx;
-        private System.Windows.Forms.TextBox txttitlebarcornerwidth;
-        private System.Windows.Forms.Label lbcornerwidth;
-        private System.Windows.Forms.Panel pnltitlebarrightcornercolour;
-        private System.Windows.Forms.Panel pnltitlebarleftcornercolour;
-        private System.Windows.Forms.Label lbrightcornercolor;
-        private System.Windows.Forms.Label lbleftcornercolor;
-        private System.Windows.Forms.CheckBox cboxtitlebarcorners;
-        private System.Windows.Forms.Label Label5;
-        private System.Windows.Forms.TextBox txttitlebarheight;
-        private System.Windows.Forms.Label Label4;
-        private System.Windows.Forms.Panel pnltitlebarcolour;
-        private System.Windows.Forms.Label Label2;
-        private System.Windows.Forms.Panel pnlborderoptions;
-        private System.Windows.Forms.CheckBox cbindividualbordercolours;
-        private System.Windows.Forms.Panel pnlborderbottomrightcolour;
-        private System.Windows.Forms.Label lbbright;
-        private System.Windows.Forms.Panel pnlborderbottomcolour;
-        private System.Windows.Forms.Label lbbottom;
-        private System.Windows.Forms.Panel pnlborderbottomleftcolour;
-        private System.Windows.Forms.Label lbbleft;
-        private System.Windows.Forms.Panel pnlborderrightcolour;
-        private System.Windows.Forms.Label lbright;
-        private System.Windows.Forms.Panel pnlborderleftcolour;
-        private System.Windows.Forms.Label lbleft;
-        private System.Windows.Forms.Label Label15;
-        private System.Windows.Forms.Panel pnlbordercolour;
-        private System.Windows.Forms.TextBox txtbordersize;
-        private System.Windows.Forms.Label Label3;
-        private System.Windows.Forms.Label Label16;
-        private System.Windows.Forms.Panel pnltitletextoptions;
-        private System.Windows.Forms.ComboBox combotitletextposition;
-        private System.Windows.Forms.Label Label53;
-        private System.Windows.Forms.ComboBox combotitletextstyle;
-        private System.Windows.Forms.ComboBox combotitletextfont;
-        private System.Windows.Forms.Label Label23;
-        private System.Windows.Forms.Label Label17;
-        private System.Windows.Forms.TextBox txttitletextside;
-        private System.Windows.Forms.Label Label18;
-        private System.Windows.Forms.Label Label19;
-        private System.Windows.Forms.TextBox txttitletexttop;
-        private System.Windows.Forms.Label Label20;
-        private System.Windows.Forms.Label Label21;
-        private System.Windows.Forms.TextBox txttitletextsize;
-        private System.Windows.Forms.Label Label22;
-        private System.Windows.Forms.Label Label24;
-        private System.Windows.Forms.Panel pnltitletextcolour;
-        private System.Windows.Forms.Label Label25;
-        private System.Windows.Forms.Panel pnlwindowsintro;
-        private System.Windows.Forms.Label Label68;
-        private System.Windows.Forms.Label Label67;
-        private System.Windows.Forms.Panel pnlwindowsobjects;
-        private System.Windows.Forms.Button btnborders;
-        private System.Windows.Forms.Button btnbuttons;
-        private System.Windows.Forms.Button btntitletext;
-        private System.Windows.Forms.Button btntitlebar;
-        private System.Windows.Forms.Panel pnlwindowpreview;
-        private System.Windows.Forms.Panel prepgcontent;
-        private System.Windows.Forms.Panel prepgbottom;
-        private System.Windows.Forms.Panel prepgleft;
-        private System.Windows.Forms.Panel prepgbottomlcorner;
-        private System.Windows.Forms.Panel prepgright;
-        private System.Windows.Forms.Panel prepgbottomrcorner;
-        private System.Windows.Forms.Panel pretitlebar;
-        private System.Windows.Forms.Panel preminimizebutton;
-        private System.Windows.Forms.PictureBox prepnlicon;
-        private System.Windows.Forms.Panel prerollupbutton;
-        private System.Windows.Forms.Panel preclosebutton;
-        private System.Windows.Forms.Label pretitletext;
-        private System.Windows.Forms.Panel prepgtoplcorner;
-        private System.Windows.Forms.Panel prepgtoprcorner;
-        private System.Windows.Forms.Panel pnlreset;
-        private System.Windows.Forms.Label Label113;
-        private System.Windows.Forms.Button btnresetallsettings;
-        private System.Windows.Forms.Label Label109;
-        private System.Windows.Forms.Label Label111;
-        private System.Windows.Forms.Panel pgcontents;
-        private System.Windows.Forms.Timer tmrfix;
-        private System.Windows.Forms.Timer tmrdelay;
+        private ShiftUI.Timer clocktick;
+        private ShiftUI.Timer customizationtime;
+        private ShiftUI.Timer timerearned;
+        private ShiftUI.Label Label1;
+        private ShiftUI.Button btnapply;
+        private ShiftUI.Panel catholder;
+        private ShiftUI.Button btnreset;
+        private ShiftUI.Button btnmenus;
+        private ShiftUI.Button btnwindows;
+        private ShiftUI.Button btndesktop;
+        private ShiftUI.Panel pnlshifterintro;
+        private ShiftUI.Label Label66;
+        private ShiftUI.Label Label65;
+        private ShiftUI.Label Label64;
+        private ShiftUI.Label Label63;
+        private ShiftUI.Panel pnldesktopoptions;
+        private ShiftUI.Panel pnlpanelbuttonsoptions;
+        private ShiftUI.Panel pnlpanelbuttontextcolour;
+        private ShiftUI.Label Label101;
+        private ShiftUI.TextBox txtpanelbuttontexttop;
+        private ShiftUI.Label Label104;
+        private ShiftUI.TextBox txtpanelbuttontextside;
+        private ShiftUI.Label Label106;
+        private ShiftUI.Label Label93;
+        private ShiftUI.TextBox txtpanelbuttontop;
+        private ShiftUI.Label Label94;
+        private ShiftUI.TextBox txtpanelbuttoninitalgap;
+        private ShiftUI.Label Label108;
+        private ShiftUI.TextBox txtpanelbuttonicontop;
+        private ShiftUI.Label Label110;
+        private ShiftUI.TextBox txtpanelbuttoniconside;
+        private ShiftUI.Label Label112;
+        private ShiftUI.TextBox txtpanelbuttoniconsize;
+        private ShiftUI.TextBox txtpanelbuttoniconheight;
+        private ShiftUI.Label Label105;
+        private ShiftUI.ComboBox cbpanelbuttontextstyle;
+        private ShiftUI.ComboBox cbpanelbuttonfont;
+        private ShiftUI.Label Label100;
+        private ShiftUI.TextBox txtpaneltextbuttonsize;
+        private ShiftUI.Label Label102;
+        private ShiftUI.Label Label103;
+        private ShiftUI.Label Label98;
+        private ShiftUI.TextBox txtpanelbuttongap;
+        private ShiftUI.Label Label99;
+        private ShiftUI.Label Label96;
+        private ShiftUI.TextBox txtpanelbuttonheight;
+        private ShiftUI.Label Label97;
+        private ShiftUI.Label Label92;
+        private ShiftUI.TextBox txtpanelbuttonwidth;
+        private ShiftUI.Label Label91;
+        private ShiftUI.Panel pnlpanelbuttoncolour;
+        private ShiftUI.Label Label95;
+        private ShiftUI.Panel pnldesktoppaneloptions;
+        private ShiftUI.Button btnpanelbuttons;
+        private ShiftUI.Label lbwarning;
+        private ShiftUI.ComboBox combodesktoppanelposition;
+        private ShiftUI.Label lbposition;
+        private ShiftUI.Label Label47;
+        private ShiftUI.TextBox txtdesktoppanelheight;
+        private ShiftUI.Label lbheight;
+        private ShiftUI.Panel pnldesktoppanelcolour;
+        private ShiftUI.Label lbpanelcolor;
+        private ShiftUI.Panel pnlapplauncheroptions;
+        private ShiftUI.Label Label71;
+        private ShiftUI.TextBox txtapplauncherwidth;
+        private ShiftUI.Label Label72;
+        private ShiftUI.TextBox txtappbuttonlabel;
+        private ShiftUI.Label Label51;
+        private ShiftUI.Label Label50;
+        private ShiftUI.Panel pnlmaintextcolour;
+        private ShiftUI.ComboBox comboappbuttontextstyle;
+        private ShiftUI.ComboBox comboappbuttontextfont;
+        private ShiftUI.Label Label37;
+        private ShiftUI.Label Label38;
+        private ShiftUI.TextBox txtappbuttontextsize;
+        private ShiftUI.Label Label39;
+        private ShiftUI.Label Label40;
+        private ShiftUI.Panel pnlmainbuttonactivated;
+        private ShiftUI.Label Label28;
+        private ShiftUI.Label Label35;
+        private ShiftUI.TextBox txtapplicationsbuttonheight;
+        private ShiftUI.Label Label36;
+        private ShiftUI.Panel pnlmainbuttoncolour;
+        private ShiftUI.Label Label43;
+        private ShiftUI.Panel pnldesktopintro;
+        private ShiftUI.Label Label69;
+        private ShiftUI.Label Label70;
+        private ShiftUI.Panel pnlpanelclockoptions;
+        private ShiftUI.Panel pnlclockbackgroundcolour;
+        private ShiftUI.Label Label44;
+        private ShiftUI.ComboBox comboclocktextstyle;
+        private ShiftUI.ComboBox comboclocktextfont;
+        private ShiftUI.Label Label26;
+        private ShiftUI.Label Label29;
+        private ShiftUI.TextBox txtclocktextfromtop;
+        private ShiftUI.Label Label30;
+        private ShiftUI.Label Label31;
+        private ShiftUI.TextBox txtclocktextsize;
+        private ShiftUI.Label Label32;
+        private ShiftUI.Label Label33;
+        private ShiftUI.Panel pnlpanelclocktextcolour;
+        private ShiftUI.Label Label34;
+        private ShiftUI.Panel pnldesktopbackgroundoptions;
+        private ShiftUI.Panel pnldesktopcolour;
+        private ShiftUI.Label Label45;
+        private ShiftUI.Panel Panel10;
+        private ShiftUI.Button btndesktopitself;
+        private ShiftUI.Button btnpanelclock;
+        private ShiftUI.Button btnapplauncher;
+        private ShiftUI.Button btndesktoppanel;
+        private ShiftUI.Panel pnldesktoppreview;
+        private ShiftUI.Panel predesktoppanel;
+        private ShiftUI.FlowLayoutPanel prepnlpanelbuttonholder;
+        private ShiftUI.Panel prepnlpanelbutton;
+        private ShiftUI.PictureBox pretbicon;
+        private ShiftUI.Label pretbctext;
+        private ShiftUI.Panel pretimepanel;
+        private ShiftUI.Label prepaneltimetext;
+        private ShiftUI.Panel preapplaunchermenuholder;
+        private ShiftUI.MenuStrip predesktopappmenu;
+        private ShiftUI.ToolStripMenuItem ApplicationsToolStripMenuItem;
+        private ShiftUI.ToolStripMenuItem KnowledgeInputToolStripMenuItem;
+        private ShiftUI.ToolStripMenuItem ShiftoriumToolStripMenuItem;
+        private ShiftUI.ToolStripMenuItem ClockToolStripMenuItem;
+        private ShiftUI.ToolStripMenuItem TerminalToolStripMenuItem;
+        private ShiftUI.ToolStripMenuItem ShifterToolStripMenuItem;
+        private ShiftUI.ToolStripSeparator ToolStripSeparator1;
+        private ShiftUI.ToolStripMenuItem ShutdownToolStripMenuItem;
+        private ShiftUI.Panel pnlwindowsoptions;
+        private ShiftUI.Panel pnlbuttonoptions;
+        private ShiftUI.Panel pnlminimizebuttonoptions;
+        private ShiftUI.Label Label82;
+        private ShiftUI.Label Label83;
+        private ShiftUI.Panel pnlminimizebuttoncolour;
+        private ShiftUI.TextBox txtminimizebuttonside;
+        private ShiftUI.Label Label84;
+        private ShiftUI.Label Label85;
+        private ShiftUI.TextBox txtminimizebuttonheight;
+        private ShiftUI.Label Label86;
+        private ShiftUI.Label Label87;
+        private ShiftUI.TextBox txtminimizebuttontop;
+        private ShiftUI.Label Label88;
+        private ShiftUI.Label Label89;
+        private ShiftUI.TextBox txtminimizebuttonwidth;
+        private ShiftUI.Label Label90;
+        private ShiftUI.Panel pnlrollupbuttonoptions;
+        private ShiftUI.Label Label54;
+        private ShiftUI.Label Label55;
+        private ShiftUI.Panel pnlrollupbuttoncolour;
+        private ShiftUI.TextBox txtrollupbuttonside;
+        private ShiftUI.Label Label56;
+        private ShiftUI.Label Label57;
+        private ShiftUI.TextBox txtrollupbuttonheight;
+        private ShiftUI.Label Label58;
+        private ShiftUI.Label Label59;
+        private ShiftUI.TextBox txtrollupbuttontop;
+        private ShiftUI.Label Label60;
+        private ShiftUI.Label Label61;
+        private ShiftUI.TextBox txtrollupbuttonwidth;
+        private ShiftUI.Label Label62;
+        private ShiftUI.ComboBox combobuttonoption;
+        private ShiftUI.Label Label52;
+        private ShiftUI.Panel pnlclosebuttonoptions;
+        private ShiftUI.Label Label8;
+        private ShiftUI.Label Label11;
+        private ShiftUI.Panel pnlclosebuttoncolour;
+        private ShiftUI.TextBox txtclosebuttonfromside;
+        private ShiftUI.Label Label7;
+        private ShiftUI.Label Label12;
+        private ShiftUI.TextBox txtclosebuttonheight;
+        private ShiftUI.Label Label13;
+        private ShiftUI.Label Label6;
+        private ShiftUI.TextBox txtclosebuttonfromtop;
+        private ShiftUI.Label Label10;
+        private ShiftUI.Label Label14;
+        private ShiftUI.TextBox txtclosebuttonwidth;
+        private ShiftUI.Label Label9;
+        private ShiftUI.Panel pnltitlebaroptions;
+        private ShiftUI.Label Label80;
+        private ShiftUI.TextBox txticonfromtop;
+        private ShiftUI.Label Label81;
+        private ShiftUI.Label Label78;
+        private ShiftUI.TextBox txticonfromside;
+        private ShiftUI.Label Label79;
+        private ShiftUI.Label lbcornerwidthpx;
+        private ShiftUI.TextBox txttitlebarcornerwidth;
+        private ShiftUI.Label lbcornerwidth;
+        private ShiftUI.Panel pnltitlebarrightcornercolour;
+        private ShiftUI.Panel pnltitlebarleftcornercolour;
+        private ShiftUI.Label lbrightcornercolor;
+        private ShiftUI.Label lbleftcornercolor;
+        private ShiftUI.CheckBox cboxtitlebarcorners;
+        private ShiftUI.Label Label5;
+        private ShiftUI.TextBox txttitlebarheight;
+        private ShiftUI.Label Label4;
+        private ShiftUI.Panel pnltitlebarcolour;
+        private ShiftUI.Label Label2;
+        private ShiftUI.Panel pnlborderoptions;
+        private ShiftUI.CheckBox cbindividualbordercolours;
+        private ShiftUI.Panel pnlborderbottomrightcolour;
+        private ShiftUI.Label lbbright;
+        private ShiftUI.Panel pnlborderbottomcolour;
+        private ShiftUI.Label lbbottom;
+        private ShiftUI.Panel pnlborderbottomleftcolour;
+        private ShiftUI.Label lbbleft;
+        private ShiftUI.Panel pnlborderrightcolour;
+        private ShiftUI.Label lbright;
+        private ShiftUI.Panel pnlborderleftcolour;
+        private ShiftUI.Label lbleft;
+        private ShiftUI.Label Label15;
+        private ShiftUI.Panel pnlbordercolour;
+        private ShiftUI.TextBox txtbordersize;
+        private ShiftUI.Label Label3;
+        private ShiftUI.Label Label16;
+        private ShiftUI.Panel pnltitletextoptions;
+        private ShiftUI.ComboBox combotitletextposition;
+        private ShiftUI.Label Label53;
+        private ShiftUI.ComboBox combotitletextstyle;
+        private ShiftUI.ComboBox combotitletextfont;
+        private ShiftUI.Label Label23;
+        private ShiftUI.Label Label17;
+        private ShiftUI.TextBox txttitletextside;
+        private ShiftUI.Label Label18;
+        private ShiftUI.Label Label19;
+        private ShiftUI.TextBox txttitletexttop;
+        private ShiftUI.Label Label20;
+        private ShiftUI.Label Label21;
+        private ShiftUI.TextBox txttitletextsize;
+        private ShiftUI.Label Label22;
+        private ShiftUI.Label Label24;
+        private ShiftUI.Panel pnltitletextcolour;
+        private ShiftUI.Label Label25;
+        private ShiftUI.Panel pnlwindowsintro;
+        private ShiftUI.Label Label68;
+        private ShiftUI.Label Label67;
+        private ShiftUI.Panel pnlwindowsobjects;
+        private ShiftUI.Button btnborders;
+        private ShiftUI.Button btnbuttons;
+        private ShiftUI.Button btntitletext;
+        private ShiftUI.Button btntitlebar;
+        private ShiftUI.Panel pnlwindowpreview;
+        private ShiftUI.Panel prepgcontent;
+        private ShiftUI.Panel prepgbottom;
+        private ShiftUI.Panel prepgleft;
+        private ShiftUI.Panel prepgbottomlcorner;
+        private ShiftUI.Panel prepgright;
+        private ShiftUI.Panel prepgbottomrcorner;
+        private ShiftUI.Panel pretitlebar;
+        private ShiftUI.Panel preminimizebutton;
+        private ShiftUI.PictureBox prepnlicon;
+        private ShiftUI.Panel prerollupbutton;
+        private ShiftUI.Panel preclosebutton;
+        private ShiftUI.Label pretitletext;
+        private ShiftUI.Panel prepgtoplcorner;
+        private ShiftUI.Panel prepgtoprcorner;
+        private ShiftUI.Panel pnlreset;
+        private ShiftUI.Label Label113;
+        private ShiftUI.Button btnresetallsettings;
+        private ShiftUI.Label Label109;
+        private ShiftUI.Label Label111;
+        private ShiftUI.Panel pgcontents;
+        private ShiftUI.Timer tmrfix;
+        private ShiftUI.Timer tmrdelay;
         private Panel pnlmenus;
         private Label label74;
         private Panel pnlmenucategories;
diff --git a/source/WindowsFormsApplication1/Apps/Shifter.cs b/source/WindowsFormsApplication1/Apps/Shifter.cs
index 3aad889..bef33c7 100644
--- a/source/WindowsFormsApplication1/Apps/Shifter.cs
+++ b/source/WindowsFormsApplication1/Apps/Shifter.cs
@@ -8,7 +8,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
@@ -2999,8 +2999,8 @@ namespace ShiftOS
 
         public void SetupLuaUI()
         {
-            pnlluafield.Controls.Clear();
-            flmorebuttons.Controls.Clear();
+            pnlluafield.Widgets.Clear();
+            flmorebuttons.Widgets.Clear();
             if (API.LuaShifterRegistry == null)
             {
                 var l = new Label();
@@ -3012,7 +3012,7 @@ namespace ShiftOS
 There are no options to show here yet.
 
 You can add options in the Lua interpreter using the shifter_add_category(string name), shifter_add_value(string category, string name, value), and shifter_remove_category(string name) methods. Applications may also add their own values.";
-                pnlluafield.Controls.Add(l);
+                pnlluafield.Widgets.Add(l);
                 l.Show();
             }
             else
@@ -3024,7 +3024,7 @@ You can add options in the Lua interpreter using the shifter_add_category(string
                     b.FlatStyle = FlatStyle.Flat;
                     b.AutoSize = true;
                     b.AutoSizeMode = AutoSizeMode.GrowAndShrink;
-                    flmorebuttons.Controls.Add(b);
+                    flmorebuttons.Widgets.Add(b);
                     b.Show();
                     b.Click += (object s, EventArgs a) =>
                     {
@@ -3036,7 +3036,7 @@ You can add options in the Lua interpreter using the shifter_add_category(string
 
         public void SetupLuaForm(Dictionary<string, object> d)
         {
-            pnlluafield.Controls.Clear();
+            pnlluafield.Widgets.Clear();
             foreach(var kv in d)
             {
                 IShifterSetting l = new ShifterTextInput();
@@ -3056,9 +3056,9 @@ You can add options in the Lua interpreter using the shifter_add_category(string
                     else
                         i.NoDecimal = false;
                 }
-                if (pnlluafield.Controls.Count > 0)
+                if (pnlluafield.Widgets.Count > 0)
                 {
-                    var ctrl = pnlluafield.Controls[pnlluafield.Controls.Count - 1];
+                    var ctrl = pnlluafield.Widgets[pnlluafield.Widgets.Count - 1];
                     l.Location = new Point(ctrl.Left + ctrl.Width + 5, ctrl.Top);
                     if(l.Left + l.Width > pnlluafield.Width)
                     {
@@ -3071,7 +3071,7 @@ You can add options in the Lua interpreter using the shifter_add_category(string
                     l.Location = new Point(2, 2);
                 }
 
-                pnlluafield.Controls.Add(l);
+                pnlluafield.Widgets.Add(l);
                 l.Show();
                 l.Font = new Font("Microsoft Sans Serif", 9);
                 l.Text = kv.Key;
diff --git a/source/WindowsFormsApplication1/Apps/Shifter.resx b/source/WindowsFormsApplication1/Apps/Shifter.resx
index 2b9e8c1..620551b 100644
--- a/source/WindowsFormsApplication1/Apps/Shifter.resx
+++ b/source/WindowsFormsApplication1/Apps/Shifter.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="ColorDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
diff --git a/source/WindowsFormsApplication1/Apps/Shiftnet.Designer.cs b/source/WindowsFormsApplication1/Apps/Shiftnet.Designer.cs
index 5d20f14..876f57a 100644
--- a/source/WindowsFormsApplication1/Apps/Shiftnet.Designer.cs
+++ b/source/WindowsFormsApplication1/Apps/Shiftnet.Designer.cs
@@ -1,4 +1,6 @@
-namespace ShiftOS
+using System;
+
+namespace ShiftOS
 {
     partial class Shiftnet
     {
@@ -28,12 +30,12 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.pnlcontrols = new System.Windows.Forms.Panel();
-            this.btngo = new System.Windows.Forms.Button();
-            this.btnhome = new System.Windows.Forms.Button();
-            this.txtaddress = new System.Windows.Forms.TextBox();
-            this.wbshiftnet = new System.Windows.Forms.WebBrowser();
-            this.panel1 = new System.Windows.Forms.Panel();
+            this.pnlcontrols = new ShiftUI.Panel();
+            this.btngo = new ShiftUI.Button();
+            this.btnhome = new ShiftUI.Button();
+            this.txtaddress = new ShiftUI.TextBox();
+            this.wbshiftnet = new Gecko.GeckoWebBrowser();
+            this.panel1 = new ShiftUI.Panel();
             this.pnlcontrols.SuspendLayout();
             this.panel1.SuspendLayout();
             this.SuspendLayout();
@@ -41,10 +43,10 @@
             // pnlcontrols
             // 
             this.pnlcontrols.BackColor = System.Drawing.Color.Gray;
-            this.pnlcontrols.Controls.Add(this.btngo);
-            this.pnlcontrols.Controls.Add(this.btnhome);
-            this.pnlcontrols.Controls.Add(this.txtaddress);
-            this.pnlcontrols.Dock = System.Windows.Forms.DockStyle.Top;
+            this.pnlcontrols.Widgets.Add(this.btngo);
+            this.pnlcontrols.Widgets.Add(this.btnhome);
+            this.pnlcontrols.Widgets.Add(this.txtaddress);
+            this.pnlcontrols.Dock = ShiftUI.DockStyle.Top;
             this.pnlcontrols.Location = new System.Drawing.Point(0, 0);
             this.pnlcontrols.Name = "pnlcontrols";
             this.pnlcontrols.Size = new System.Drawing.Size(792, 42);
@@ -52,9 +54,9 @@
             // 
             // btngo
             // 
-            this.btngo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btngo.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.btngo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btngo.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Right)));
+            this.btngo.DialogResult = ShiftUI.DialogResult.Cancel;
+            this.btngo.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btngo.Font = new System.Drawing.Font("Times New Roman", 8.25F);
             this.btngo.ForeColor = System.Drawing.Color.White;
             this.btngo.Location = new System.Drawing.Point(731, 9);
@@ -67,8 +69,8 @@
             // 
             // btnhome
             // 
-            this.btnhome.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.btnhome.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnhome.DialogResult = ShiftUI.DialogResult.Cancel;
+            this.btnhome.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnhome.Font = new System.Drawing.Font("Times New Roman", 8.25F);
             this.btnhome.ForeColor = System.Drawing.Color.White;
             this.btnhome.Location = new System.Drawing.Point(4, 12);
@@ -81,9 +83,9 @@
             // 
             // txtaddress
             // 
-            this.txtaddress.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtaddress.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.txtaddress.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
+            this.txtaddress.BorderStyle = ShiftUI.BorderStyle.None;
             this.txtaddress.Font = new System.Drawing.Font("Times New Roman", 13F);
             this.txtaddress.Location = new System.Drawing.Point(85, 12);
             this.txtaddress.Name = "txtaddress";
@@ -93,21 +95,19 @@
             // 
             // wbshiftnet
             // 
-            this.wbshiftnet.AllowWebBrowserDrop = false;
-            this.wbshiftnet.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.wbshiftnet.IsWebBrowserContextMenuEnabled = false;
+            this.wbshiftnet.Dock = (System.Windows.Forms.DockStyle)ShiftUI.DockStyle.Fill;
             this.wbshiftnet.Location = new System.Drawing.Point(0, 42);
             this.wbshiftnet.MinimumSize = new System.Drawing.Size(20, 20);
             this.wbshiftnet.Name = "wbshiftnet";
             this.wbshiftnet.Size = new System.Drawing.Size(792, 463);
             this.wbshiftnet.TabIndex = 1;
-            this.wbshiftnet.Navigating += new System.Windows.Forms.WebBrowserNavigatingEventHandler(this.LinkInterceptor);
+            this.wbshiftnet.Navigating += new EventHandler<Gecko.Events.GeckoNavigatingEventArgs>(this.LinkInterceptor);
             // 
             // panel1
             // 
-            this.panel1.Controls.Add(this.wbshiftnet);
-            this.panel1.Controls.Add(this.pnlcontrols);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel1.Widgets.Add(this.wbshiftnet.ToWidget());
+            this.panel1.Widgets.Add(this.pnlcontrols);
+            this.panel1.Dock = ShiftUI.DockStyle.Fill;
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
             this.panel1.Size = new System.Drawing.Size(792, 505);
@@ -117,10 +117,10 @@
             // 
             this.AcceptButton = this.btngo;
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.CancelButton = this.btnhome;
             this.ClientSize = new System.Drawing.Size(792, 505);
-            this.Controls.Add(this.panel1);
+            this.Widgets.Add(this.panel1);
             this.Name = "Shiftnet";
             this.Text = "MainForm";
             this.Load += new System.EventHandler(this.MainForm_Load);
@@ -133,12 +133,12 @@
 
         #endregion
 
-        private System.Windows.Forms.Panel pnlcontrols;
-        private System.Windows.Forms.WebBrowser wbshiftnet;
-        private System.Windows.Forms.Button btngo;
-        private System.Windows.Forms.Button btnhome;
-        private System.Windows.Forms.TextBox txtaddress;
-        private System.Windows.Forms.Panel panel1;
+        private ShiftUI.Panel pnlcontrols;
+        private Gecko.GeckoWebBrowser wbshiftnet;
+        private ShiftUI.Button btngo;
+        private ShiftUI.Button btnhome;
+        private ShiftUI.TextBox txtaddress;
+        private ShiftUI.Panel panel1;
 
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Apps/Shiftnet.cs b/source/WindowsFormsApplication1/Apps/Shiftnet.cs
index cbcab1b..8e9a818 100644
--- a/source/WindowsFormsApplication1/Apps/Shiftnet.cs
+++ b/source/WindowsFormsApplication1/Apps/Shiftnet.cs
@@ -6,7 +6,7 @@ using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 using System.Net;
 
 namespace ShiftOS
@@ -26,17 +26,18 @@ namespace ShiftOS
         public void InitialSetup()
         {
             pnlcontrols.BackColor = API.CurrentSkin.titlebarcolour;
-            wbshiftnet.DocumentText = WebLayer.VisitSite("shiftnet://main");
+            wbshiftnet.Document.TextContent = WebLayer.VisitSite("shiftnet://main");
             txtaddress.Text = WebLayer.LastUrl;
         }
 
-        private void LinkInterceptor(object sender, WebBrowserNavigatingEventArgs e)
+        private void LinkInterceptor(object sender, Gecko.Events.GeckoNavigatingEventArgs e)
         {
-            var url = e.Url.OriginalString;
+            
+            var url = e.Uri.OriginalString;
             if (url != "about:blank")
             {
                 var surl = url.Replace("http://", "shiftnet://");
-                wbshiftnet.DocumentText = WebLayer.VisitSite(surl);
+                wbshiftnet.Document.TextContent = WebLayer.VisitSite(surl);
                 txtaddress.Text = WebLayer.LastUrl;
             }
         }
@@ -45,19 +46,19 @@ namespace ShiftOS
         {
             if (txtaddress.Text.ToLower().StartsWith("shiftnet://"))
             {
-                wbshiftnet.DocumentText = WebLayer.VisitSite(txtaddress.Text);
+                wbshiftnet.Document.TextContent = WebLayer.VisitSite(txtaddress.Text);
                 txtaddress.Text = WebLayer.LastUrl;
             }
             else
             {
-                wbshiftnet.DocumentText = WebLayer.VisitSite("shiftnet://not_found");
+                wbshiftnet.Document.TextContent = WebLayer.VisitSite("shiftnet://not_found");
                 txtaddress.Text = WebLayer.LastUrl;
             }
         }
 
         private void btnhome_Click(object sender, EventArgs e)
         {
-            wbshiftnet.DocumentText = WebLayer.VisitSite("shiftnet://main");
+            wbshiftnet.Document.TextContent = WebLayer.VisitSite("shiftnet://main");
             txtaddress.Text = WebLayer.LastUrl;
         }
     }
diff --git a/source/WindowsFormsApplication1/Apps/Shiftnet.resx b/source/WindowsFormsApplication1/Apps/Shiftnet.resx
index 1af7de1..ffb4fb5 100644
--- a/source/WindowsFormsApplication1/Apps/Shiftnet.resx
+++ b/source/WindowsFormsApplication1/Apps/Shiftnet.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Apps/ShiftnetDecryptor.Designer.cs b/source/WindowsFormsApplication1/Apps/ShiftnetDecryptor.Designer.cs
index 3f7d4a7..23e2245 100644
--- a/source/WindowsFormsApplication1/Apps/ShiftnetDecryptor.Designer.cs
+++ b/source/WindowsFormsApplication1/Apps/ShiftnetDecryptor.Designer.cs
@@ -29,21 +29,21 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            this.label1 = new System.Windows.Forms.Label();
-            this.txtstatus = new System.Windows.Forms.RichTextBox();
-            this.txtaddress = new System.Windows.Forms.TextBox();
-            this.label2 = new System.Windows.Forms.Label();
-            this.btnstart = new System.Windows.Forms.Button();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.tmrdecrypt = new System.Windows.Forms.Timer(this.components);
+            this.label1 = new ShiftUI.Label();
+            this.txtstatus = new ShiftUI.RichTextBox();
+            this.txtaddress = new ShiftUI.TextBox();
+            this.label2 = new ShiftUI.Label();
+            this.btnstart = new ShiftUI.Button();
+            this.panel1 = new ShiftUI.Panel();
+            this.tmrdecrypt = new ShiftUI.Timer(this.components);
             this.pgstatus = new ShiftOS.ProgressBarEX();
             this.panel1.SuspendLayout();
             this.SuspendLayout();
             // 
             // label1
             // 
-            this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.label1.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 13F);
             this.label1.Location = new System.Drawing.Point(13, 13);
             this.label1.Name = "label1";
@@ -54,11 +54,11 @@
             // 
             // txtstatus
             // 
-            this.txtstatus.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtstatus.Anchor = ((ShiftUI.AnchorStyles)((((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.txtstatus.BackColor = System.Drawing.Color.Black;
-            this.txtstatus.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.txtstatus.BorderStyle = ShiftUI.BorderStyle.None;
             this.txtstatus.ForeColor = System.Drawing.Color.White;
             this.txtstatus.Location = new System.Drawing.Point(17, 151);
             this.txtstatus.Name = "txtstatus";
@@ -69,10 +69,10 @@
             // 
             // txtaddress
             // 
-            this.txtaddress.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtaddress.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.txtaddress.BackColor = System.Drawing.Color.Gray;
-            this.txtaddress.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.txtaddress.BorderStyle = ShiftUI.BorderStyle.None;
             this.txtaddress.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
             this.txtaddress.Location = new System.Drawing.Point(100, 121);
             this.txtaddress.Name = "txtaddress";
@@ -90,8 +90,8 @@
             // 
             // btnstart
             // 
-            this.btnstart.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnstart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnstart.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Right)));
+            this.btnstart.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnstart.Location = new System.Drawing.Point(697, 119);
             this.btnstart.Name = "btnstart";
             this.btnstart.Size = new System.Drawing.Size(60, 23);
@@ -103,13 +103,13 @@
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.White;
-            this.panel1.Controls.Add(this.btnstart);
-            this.panel1.Controls.Add(this.label2);
-            this.panel1.Controls.Add(this.txtaddress);
-            this.panel1.Controls.Add(this.txtstatus);
-            this.panel1.Controls.Add(this.label1);
-            this.panel1.Controls.Add(this.pgstatus);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel1.Widgets.Add(this.btnstart);
+            this.panel1.Widgets.Add(this.label2);
+            this.panel1.Widgets.Add(this.txtaddress);
+            this.panel1.Widgets.Add(this.txtstatus);
+            this.panel1.Widgets.Add(this.label1);
+            this.panel1.Widgets.Add(this.pgstatus);
+            this.panel1.Dock = ShiftUI.DockStyle.Fill;
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
             this.panel1.Size = new System.Drawing.Size(769, 443);
@@ -121,8 +121,8 @@
             // 
             // pgstatus
             // 
-            this.pgstatus.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.pgstatus.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.pgstatus.BackColor = System.Drawing.Color.Black;
             this.pgstatus.BlockSeparation = 3;
             this.pgstatus.BlockWidth = 5;
@@ -144,9 +144,9 @@
             // 
             this.AcceptButton = this.btnstart;
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(769, 443);
-            this.Controls.Add(this.panel1);
+            this.Widgets.Add(this.panel1);
             this.Name = "ShiftnetDecryptor";
             this.Text = "ShiftnetDecryptor";
             this.Load += new System.EventHandler(this.ShiftnetDecryptor_Load);
@@ -159,12 +159,12 @@
         #endregion
 
         private ProgressBarEX pgstatus;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.RichTextBox txtstatus;
-        private System.Windows.Forms.TextBox txtaddress;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Button btnstart;
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.Timer tmrdecrypt;
+        private ShiftUI.Label label1;
+        private ShiftUI.RichTextBox txtstatus;
+        private ShiftUI.TextBox txtaddress;
+        private ShiftUI.Label label2;
+        private ShiftUI.Button btnstart;
+        private ShiftUI.Panel panel1;
+        private ShiftUI.Timer tmrdecrypt;
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Apps/ShiftnetDecryptor.cs b/source/WindowsFormsApplication1/Apps/ShiftnetDecryptor.cs
index dbf086e..c73a567 100644
--- a/source/WindowsFormsApplication1/Apps/ShiftnetDecryptor.cs
+++ b/source/WindowsFormsApplication1/Apps/ShiftnetDecryptor.cs
@@ -8,7 +8,7 @@ using System.Linq;
 using System.Net;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
@@ -35,15 +35,15 @@ namespace ShiftOS
             }
         }
 
-        private void RecursiveControlSetup(Control ctrl)
+        private void RecursiveWidgetSetup(Widget ctrl)
         {
             ctrl.Font = new Font(OSInfo.GetMonospaceFont(), ctrl.Font.Size);
             try
             {
                 var pnl = (Panel)ctrl;
-                foreach (Control c in pnl.Controls)
+                foreach (Widget c in pnl.Widgets)
                 {
-                    RecursiveControlSetup(c);
+                    RecursiveWidgetSetup(c);
                 }
             }
             catch 
@@ -150,7 +150,7 @@ namespace ShiftOS
 
         private void ShiftnetDecryptor_Load(object sender, EventArgs e)
         {
-            RecursiveControlSetup(panel1);
+            RecursiveWidgetSetup(panel1);
         }
     }
 }
diff --git a/source/WindowsFormsApplication1/Apps/ShiftnetDecryptor.resx b/source/WindowsFormsApplication1/Apps/ShiftnetDecryptor.resx
index 34bb249..1b1b823 100644
--- a/source/WindowsFormsApplication1/Apps/ShiftnetDecryptor.resx
+++ b/source/WindowsFormsApplication1/Apps/ShiftnetDecryptor.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="tmrdecrypt.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
diff --git a/source/WindowsFormsApplication1/Apps/Shiftorium.Designer.cs b/source/WindowsFormsApplication1/Apps/Shiftorium.Designer.cs
index e5b4498..9edf69b 100644
--- a/source/WindowsFormsApplication1/Apps/Shiftorium.Designer.cs
+++ b/source/WindowsFormsApplication1/Apps/Shiftorium.Designer.cs
@@ -26,25 +26,25 @@ namespace Shiftorium
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frontend));
-            this.pgcontents = new System.Windows.Forms.Panel();
-            this.lbcodepoints = new System.Windows.Forms.Label();
-            this.lbupgrades = new System.Windows.Forms.ListView();
-            this.Label1 = new System.Windows.Forms.Label();
-            this.pnlinfo = new System.Windows.Forms.Panel();
-            this.pnlintro = new System.Windows.Forms.Panel();
-            this.Label4 = new System.Windows.Forms.Label();
-            this.Label2 = new System.Windows.Forms.Label();
-            this.Label5 = new System.Windows.Forms.Label();
-            this.btnbuy = new System.Windows.Forms.Button();
-            this.lbprice = new System.Windows.Forms.Label();
-            this.picpreview = new System.Windows.Forms.PictureBox();
-            this.lbudescription = new System.Windows.Forms.Label();
-            this.lbupgradename = new System.Windows.Forms.Label();
-            this.tmrcodepointsupdate = new System.Windows.Forms.Timer(this.components);
-            this.btnback = new System.Windows.Forms.Button();
-            this.btnforward = new System.Windows.Forms.Button();
-            this.lbcategory = new System.Windows.Forms.Label();
-            this.btnhack = new System.Windows.Forms.Button();
+            this.pgcontents = new ShiftUI.Panel();
+            this.lbcodepoints = new ShiftUI.Label();
+            this.lbupgrades = new ShiftUI.ListView();
+            this.Label1 = new ShiftUI.Label();
+            this.pnlinfo = new ShiftUI.Panel();
+            this.pnlintro = new ShiftUI.Panel();
+            this.Label4 = new ShiftUI.Label();
+            this.Label2 = new ShiftUI.Label();
+            this.Label5 = new ShiftUI.Label();
+            this.btnbuy = new ShiftUI.Button();
+            this.lbprice = new ShiftUI.Label();
+            this.picpreview = new ShiftUI.PictureBox();
+            this.lbudescription = new ShiftUI.Label();
+            this.lbupgradename = new ShiftUI.Label();
+            this.tmrcodepointsupdate = new ShiftUI.Timer(this.components);
+            this.btnback = new ShiftUI.Button();
+            this.btnforward = new ShiftUI.Button();
+            this.lbcategory = new ShiftUI.Label();
+            this.btnhack = new ShiftUI.Button();
             this.pgcontents.SuspendLayout();
             this.pnlinfo.SuspendLayout();
             this.pnlintro.SuspendLayout();
@@ -54,15 +54,15 @@ namespace Shiftorium
             // pgcontents
             // 
             this.pgcontents.BackColor = System.Drawing.Color.White;
-            this.pgcontents.Controls.Add(this.btnhack);
-            this.pgcontents.Controls.Add(this.lbcategory);
-            this.pgcontents.Controls.Add(this.btnforward);
-            this.pgcontents.Controls.Add(this.btnback);
-            this.pgcontents.Controls.Add(this.lbcodepoints);
-            this.pgcontents.Controls.Add(this.lbupgrades);
-            this.pgcontents.Controls.Add(this.Label1);
-            this.pgcontents.Controls.Add(this.pnlinfo);
-            this.pgcontents.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pgcontents.Widgets.Add(this.btnhack);
+            this.pgcontents.Widgets.Add(this.lbcategory);
+            this.pgcontents.Widgets.Add(this.btnforward);
+            this.pgcontents.Widgets.Add(this.btnback);
+            this.pgcontents.Widgets.Add(this.lbcodepoints);
+            this.pgcontents.Widgets.Add(this.lbupgrades);
+            this.pgcontents.Widgets.Add(this.Label1);
+            this.pgcontents.Widgets.Add(this.pnlinfo);
+            this.pgcontents.Dock = ShiftUI.DockStyle.Fill;
             this.pgcontents.Location = new System.Drawing.Point(0, 0);
             this.pgcontents.Name = "pgcontents";
             this.pgcontents.Size = new System.Drawing.Size(701, 462);
@@ -83,7 +83,7 @@ namespace Shiftorium
             // lbupgrades
             // 
             this.lbupgrades.BackColor = System.Drawing.Color.White;
-            this.lbupgrades.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.lbupgrades.BorderStyle = ShiftUI.BorderStyle.None;
             this.lbupgrades.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.lbupgrades.ForeColor = System.Drawing.Color.Black;
             this.lbupgrades.Location = new System.Drawing.Point(21, 101);
@@ -92,7 +92,7 @@ namespace Shiftorium
             this.lbupgrades.Size = new System.Drawing.Size(304, 254);
             this.lbupgrades.TabIndex = 0;
             this.lbupgrades.UseCompatibleStateImageBehavior = false;
-            this.lbupgrades.View = System.Windows.Forms.View.Details;
+            this.lbupgrades.View = ShiftUI.View.Details;
             this.lbupgrades.SelectedIndexChanged += new System.EventHandler(this.lbupgrades_SelectedIndexChanged);
             // 
             // Label1
@@ -108,13 +108,13 @@ namespace Shiftorium
             // 
             // pnlinfo
             // 
-            this.pnlinfo.Controls.Add(this.pnlintro);
-            this.pnlinfo.Controls.Add(this.btnbuy);
-            this.pnlinfo.Controls.Add(this.lbprice);
-            this.pnlinfo.Controls.Add(this.picpreview);
-            this.pnlinfo.Controls.Add(this.lbudescription);
-            this.pnlinfo.Controls.Add(this.lbupgradename);
-            this.pnlinfo.Dock = System.Windows.Forms.DockStyle.Right;
+            this.pnlinfo.Widgets.Add(this.pnlintro);
+            this.pnlinfo.Widgets.Add(this.btnbuy);
+            this.pnlinfo.Widgets.Add(this.lbprice);
+            this.pnlinfo.Widgets.Add(this.picpreview);
+            this.pnlinfo.Widgets.Add(this.lbudescription);
+            this.pnlinfo.Widgets.Add(this.lbupgradename);
+            this.pnlinfo.Dock = ShiftUI.DockStyle.Right;
             this.pnlinfo.Location = new System.Drawing.Point(332, 0);
             this.pnlinfo.Name = "pnlinfo";
             this.pnlinfo.Size = new System.Drawing.Size(369, 462);
@@ -122,10 +122,10 @@ namespace Shiftorium
             // 
             // pnlintro
             // 
-            this.pnlintro.Controls.Add(this.Label4);
-            this.pnlintro.Controls.Add(this.Label2);
-            this.pnlintro.Controls.Add(this.Label5);
-            this.pnlintro.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pnlintro.Widgets.Add(this.Label4);
+            this.pnlintro.Widgets.Add(this.Label2);
+            this.pnlintro.Widgets.Add(this.Label5);
+            this.pnlintro.Dock = ShiftUI.DockStyle.Fill;
             this.pnlintro.Location = new System.Drawing.Point(0, 0);
             this.pnlintro.Name = "pnlintro";
             this.pnlintro.Size = new System.Drawing.Size(369, 462);
@@ -165,8 +165,8 @@ namespace Shiftorium
             // 
             // btnbuy
             // 
-            this.btnbuy.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnbuy.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnbuy.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
+            this.btnbuy.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnbuy.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnbuy.ForeColor = System.Drawing.Color.Black;
             this.btnbuy.Location = new System.Drawing.Point(160, 362);
@@ -179,7 +179,7 @@ namespace Shiftorium
             // 
             // lbprice
             // 
-            this.lbprice.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.lbprice.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left)));
             this.lbprice.Font = new System.Drawing.Font("Microsoft Sans Serif", 14F, System.Drawing.FontStyle.Bold);
             this.lbprice.ForeColor = System.Drawing.Color.Black;
             this.lbprice.Location = new System.Drawing.Point(15, 362);
@@ -227,7 +227,7 @@ namespace Shiftorium
             // 
             // btnback
             // 
-            this.btnback.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnback.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnback.Location = new System.Drawing.Point(22, 72);
             this.btnback.Name = "btnback";
             this.btnback.Size = new System.Drawing.Size(36, 23);
@@ -238,8 +238,8 @@ namespace Shiftorium
             // 
             // btnforward
             // 
-            this.btnforward.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnforward.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnforward.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Right)));
+            this.btnforward.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnforward.Location = new System.Drawing.Point(289, 72);
             this.btnforward.Name = "btnforward";
             this.btnforward.Size = new System.Drawing.Size(36, 23);
@@ -250,8 +250,8 @@ namespace Shiftorium
             // 
             // lbcategory
             // 
-            this.lbcategory.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.lbcategory.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.lbcategory.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Bold);
             this.lbcategory.ForeColor = System.Drawing.Color.Black;
             this.lbcategory.Location = new System.Drawing.Point(64, 72);
@@ -263,11 +263,11 @@ namespace Shiftorium
             // 
             // btnhack
             // 
-            this.btnhack.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnhack.Anchor = ((ShiftUI.AnchorStyles)((((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.btnhack.AutoSize = true;
-            this.btnhack.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnhack.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnhack.Location = new System.Drawing.Point(143, 218);
             this.btnhack.Name = "btnhack";
             this.btnhack.Size = new System.Drawing.Size(68, 25);
@@ -280,11 +280,11 @@ namespace Shiftorium
             // Frontend
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.White;
             this.ClientSize = new System.Drawing.Size(701, 462);
-            this.Controls.Add(this.pgcontents);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Widgets.Add(this.pgcontents);
+            this.FormBorderStyle = ShiftUI.FormBorderStyle.None;
             this.KeyPreview = true;
             this.Name = "Frontend";
             this.Text = "Shiftorium";
@@ -299,24 +299,24 @@ namespace Shiftorium
             this.ResumeLayout(false);
 
         }
-        internal System.Windows.Forms.Panel pgcontents;
-        internal System.Windows.Forms.ListView lbupgrades;
-        internal System.Windows.Forms.Label Label1;
-        internal System.Windows.Forms.Panel pnlinfo;
-        internal System.Windows.Forms.Label lbcodepoints;
-        internal System.Windows.Forms.Button btnbuy;
-        internal System.Windows.Forms.Label lbprice;
-        internal System.Windows.Forms.PictureBox picpreview;
-        internal System.Windows.Forms.Label lbudescription;
-        internal System.Windows.Forms.Label lbupgradename;
-        internal System.Windows.Forms.Panel pnlintro;
-        internal System.Windows.Forms.Label Label4;
-        internal System.Windows.Forms.Label Label2;
-        internal System.Windows.Forms.Label Label5;
-        internal System.Windows.Forms.Timer tmrcodepointsupdate;
-        internal System.Windows.Forms.Label lbcategory;
-        private System.Windows.Forms.Button btnforward;
-        private System.Windows.Forms.Button btnback;
-        private System.Windows.Forms.Button btnhack;
+        internal ShiftUI.Panel pgcontents;
+        internal ShiftUI.ListView lbupgrades;
+        internal ShiftUI.Label Label1;
+        internal ShiftUI.Panel pnlinfo;
+        internal ShiftUI.Label lbcodepoints;
+        internal ShiftUI.Button btnbuy;
+        internal ShiftUI.Label lbprice;
+        internal ShiftUI.PictureBox picpreview;
+        internal ShiftUI.Label lbudescription;
+        internal ShiftUI.Label lbupgradename;
+        internal ShiftUI.Panel pnlintro;
+        internal ShiftUI.Label Label4;
+        internal ShiftUI.Label Label2;
+        internal ShiftUI.Label Label5;
+        internal ShiftUI.Timer tmrcodepointsupdate;
+        internal ShiftUI.Label lbcategory;
+        private ShiftUI.Button btnforward;
+        private ShiftUI.Button btnback;
+        private ShiftUI.Button btnhack;
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Apps/Shiftorium.cs b/source/WindowsFormsApplication1/Apps/Shiftorium.cs
index ce9dbfc..de6749f 100644
--- a/source/WindowsFormsApplication1/Apps/Shiftorium.cs
+++ b/source/WindowsFormsApplication1/Apps/Shiftorium.cs
@@ -6,7 +6,7 @@ using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 using ShiftOS;
 using SaveSystem;
 
diff --git a/source/WindowsFormsApplication1/Apps/Shiftorium.resx b/source/WindowsFormsApplication1/Apps/Shiftorium.resx
index c732bd4..3c36ff8 100644
--- a/source/WindowsFormsApplication1/Apps/Shiftorium.resx
+++ b/source/WindowsFormsApplication1/Apps/Shiftorium.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Label2.Text" xml:space="preserve">
     <value>Welcome to the Shiftorium. The Shiftorium is a place where you can spend Codepoints to upgrade the operating system and buy new applications.
diff --git a/source/WindowsFormsApplication1/Apps/SkinLoader.Designer.cs b/source/WindowsFormsApplication1/Apps/SkinLoader.Designer.cs
index 72561f6..35b2f2d 100644
--- a/source/WindowsFormsApplication1/Apps/SkinLoader.Designer.cs
+++ b/source/WindowsFormsApplication1/Apps/SkinLoader.Designer.cs
@@ -25,57 +25,57 @@ namespace ShiftOS
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SkinLoader));
-            this.pgcontents = new System.Windows.Forms.Panel();
-            this.label3 = new System.Windows.Forms.Label();
-            this.btnapplyskin = new System.Windows.Forms.Button();
-            this.btnsaveskin = new System.Windows.Forms.Button();
-            this.btnloadskin = new System.Windows.Forms.Button();
-            this.Label2 = new System.Windows.Forms.Label();
-            this.btnclose = new System.Windows.Forms.Button();
-            this.pnldesktoppreview = new System.Windows.Forms.Panel();
-            this.predesktoppanel = new System.Windows.Forms.Panel();
-            this.prepnlpanelbuttonholder = new System.Windows.Forms.FlowLayoutPanel();
-            this.prepnlpanelbutton = new System.Windows.Forms.Panel();
-            this.pretbicon = new System.Windows.Forms.PictureBox();
-            this.pretbctext = new System.Windows.Forms.Label();
-            this.pretimepanel = new System.Windows.Forms.Panel();
-            this.prepaneltimetext = new System.Windows.Forms.Label();
-            this.preapplaunchermenuholder = new System.Windows.Forms.Panel();
-            this.predesktopappmenu = new System.Windows.Forms.MenuStrip();
-            this.ApplicationsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.KnowledgeInputToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ShiftoriumToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ClockToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.TerminalToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ShifterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ToolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
-            this.ShutdownToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.Label1 = new System.Windows.Forms.Label();
-            this.pnlwindowpreview = new System.Windows.Forms.Panel();
-            this.prepgcontent = new System.Windows.Forms.Panel();
-            this.prepgbottom = new System.Windows.Forms.Panel();
-            this.prepgleft = new System.Windows.Forms.Panel();
-            this.prepgbottomlcorner = new System.Windows.Forms.Panel();
-            this.prepgright = new System.Windows.Forms.Panel();
-            this.prepgbottomrcorner = new System.Windows.Forms.Panel();
-            this.pretitlebar = new System.Windows.Forms.Panel();
-            this.preminimizebutton = new System.Windows.Forms.Panel();
-            this.prepnlicon = new System.Windows.Forms.PictureBox();
-            this.prerollupbutton = new System.Windows.Forms.Panel();
-            this.preclosebutton = new System.Windows.Forms.Panel();
-            this.pretitletext = new System.Windows.Forms.Label();
-            this.prepgtoplcorner = new System.Windows.Forms.Panel();
-            this.prepgtoprcorner = new System.Windows.Forms.Panel();
-            this.pnlskinpacks = new System.Windows.Forms.Panel();
-            this.btnapplypackskin = new System.Windows.Forms.Button();
-            this.label6 = new System.Windows.Forms.Label();
-            this.cbpackfiles = new System.Windows.Forms.ComboBox();
-            this.btnbrowse = new System.Windows.Forms.Button();
-            this.txtpackpath = new System.Windows.Forms.TextBox();
-            this.btnbacktoskinloader = new System.Windows.Forms.Button();
-            this.label5 = new System.Windows.Forms.Label();
-            this.label4 = new System.Windows.Forms.Label();
-            this.panel1 = new System.Windows.Forms.Panel();
+            this.pgcontents = new ShiftUI.Panel();
+            this.label3 = new ShiftUI.Label();
+            this.btnapplyskin = new ShiftUI.Button();
+            this.btnsaveskin = new ShiftUI.Button();
+            this.btnloadskin = new ShiftUI.Button();
+            this.Label2 = new ShiftUI.Label();
+            this.btnclose = new ShiftUI.Button();
+            this.pnldesktoppreview = new ShiftUI.Panel();
+            this.predesktoppanel = new ShiftUI.Panel();
+            this.prepnlpanelbuttonholder = new ShiftUI.FlowLayoutPanel();
+            this.prepnlpanelbutton = new ShiftUI.Panel();
+            this.pretbicon = new ShiftUI.PictureBox();
+            this.pretbctext = new ShiftUI.Label();
+            this.pretimepanel = new ShiftUI.Panel();
+            this.prepaneltimetext = new ShiftUI.Label();
+            this.preapplaunchermenuholder = new ShiftUI.Panel();
+            this.predesktopappmenu = new ShiftUI.MenuStrip();
+            this.ApplicationsToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.KnowledgeInputToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.ShiftoriumToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.ClockToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.TerminalToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.ShifterToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.ToolStripSeparator1 = new ShiftUI.ToolStripSeparator();
+            this.ShutdownToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.Label1 = new ShiftUI.Label();
+            this.pnlwindowpreview = new ShiftUI.Panel();
+            this.prepgcontent = new ShiftUI.Panel();
+            this.prepgbottom = new ShiftUI.Panel();
+            this.prepgleft = new ShiftUI.Panel();
+            this.prepgbottomlcorner = new ShiftUI.Panel();
+            this.prepgright = new ShiftUI.Panel();
+            this.prepgbottomrcorner = new ShiftUI.Panel();
+            this.pretitlebar = new ShiftUI.Panel();
+            this.preminimizebutton = new ShiftUI.Panel();
+            this.prepnlicon = new ShiftUI.PictureBox();
+            this.prerollupbutton = new ShiftUI.Panel();
+            this.preclosebutton = new ShiftUI.Panel();
+            this.pretitletext = new ShiftUI.Label();
+            this.prepgtoplcorner = new ShiftUI.Panel();
+            this.prepgtoprcorner = new ShiftUI.Panel();
+            this.pnlskinpacks = new ShiftUI.Panel();
+            this.btnapplypackskin = new ShiftUI.Button();
+            this.label6 = new ShiftUI.Label();
+            this.cbpackfiles = new ShiftUI.ComboBox();
+            this.btnbrowse = new ShiftUI.Button();
+            this.txtpackpath = new ShiftUI.TextBox();
+            this.btnbacktoskinloader = new ShiftUI.Button();
+            this.label5 = new ShiftUI.Label();
+            this.label4 = new ShiftUI.Label();
+            this.panel1 = new ShiftUI.Panel();
             this.pgcontents.SuspendLayout();
             this.pnldesktoppreview.SuspendLayout();
             this.predesktoppanel.SuspendLayout();
@@ -97,16 +97,16 @@ namespace ShiftOS
             // pgcontents
             // 
             this.pgcontents.BackColor = System.Drawing.Color.White;
-            this.pgcontents.Controls.Add(this.label3);
-            this.pgcontents.Controls.Add(this.btnapplyskin);
-            this.pgcontents.Controls.Add(this.btnsaveskin);
-            this.pgcontents.Controls.Add(this.btnloadskin);
-            this.pgcontents.Controls.Add(this.Label2);
-            this.pgcontents.Controls.Add(this.btnclose);
-            this.pgcontents.Controls.Add(this.pnldesktoppreview);
-            this.pgcontents.Controls.Add(this.Label1);
-            this.pgcontents.Controls.Add(this.pnlwindowpreview);
-            this.pgcontents.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pgcontents.Widgets.Add(this.label3);
+            this.pgcontents.Widgets.Add(this.btnapplyskin);
+            this.pgcontents.Widgets.Add(this.btnsaveskin);
+            this.pgcontents.Widgets.Add(this.btnloadskin);
+            this.pgcontents.Widgets.Add(this.Label2);
+            this.pgcontents.Widgets.Add(this.btnclose);
+            this.pgcontents.Widgets.Add(this.pnldesktoppreview);
+            this.pgcontents.Widgets.Add(this.Label1);
+            this.pgcontents.Widgets.Add(this.pnlwindowpreview);
+            this.pgcontents.Dock = ShiftUI.DockStyle.Fill;
             this.pgcontents.Location = new System.Drawing.Point(0, 0);
             this.pgcontents.Name = "pgcontents";
             this.pgcontents.Size = new System.Drawing.Size(476, 462);
@@ -114,8 +114,8 @@ namespace ShiftOS
             // 
             // label3
             // 
-            this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.label3.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.label3.Location = new System.Drawing.Point(10, 384);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(454, 31);
@@ -126,8 +126,8 @@ namespace ShiftOS
             // 
             // btnapplyskin
             // 
-            this.btnapplyskin.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnapplyskin.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnapplyskin.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
+            this.btnapplyskin.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnapplyskin.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnapplyskin.Location = new System.Drawing.Point(352, 418);
             this.btnapplyskin.Name = "btnapplyskin";
@@ -139,8 +139,8 @@ namespace ShiftOS
             // 
             // btnsaveskin
             // 
-            this.btnsaveskin.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnsaveskin.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnsaveskin.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
+            this.btnsaveskin.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnsaveskin.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnsaveskin.Location = new System.Drawing.Point(239, 418);
             this.btnsaveskin.Name = "btnsaveskin";
@@ -152,8 +152,8 @@ namespace ShiftOS
             // 
             // btnloadskin
             // 
-            this.btnloadskin.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.btnloadskin.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnloadskin.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left)));
+            this.btnloadskin.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnloadskin.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnloadskin.Location = new System.Drawing.Point(126, 418);
             this.btnloadskin.Name = "btnloadskin";
@@ -165,8 +165,8 @@ namespace ShiftOS
             // 
             // Label2
             // 
-            this.Label2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.Label2.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.Label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.Label2.Location = new System.Drawing.Point(4, 200);
             this.Label2.Name = "Label2";
@@ -177,8 +177,8 @@ namespace ShiftOS
             // 
             // btnclose
             // 
-            this.btnclose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.btnclose.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnclose.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left)));
+            this.btnclose.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnclose.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnclose.Location = new System.Drawing.Point(13, 418);
             this.btnclose.Name = "btnclose";
@@ -190,10 +190,10 @@ namespace ShiftOS
             // 
             // pnldesktoppreview
             // 
-            this.pnldesktoppreview.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnldesktoppreview.Controls.Add(this.predesktoppanel);
+            this.pnldesktoppreview.Anchor = ((ShiftUI.AnchorStyles)((((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
+            this.pnldesktoppreview.Widgets.Add(this.predesktoppanel);
             this.pnldesktoppreview.Location = new System.Drawing.Point(13, 233);
             this.pnldesktoppreview.Name = "pnldesktoppreview";
             this.pnldesktoppreview.Size = new System.Drawing.Size(448, 148);
@@ -202,10 +202,10 @@ namespace ShiftOS
             // predesktoppanel
             // 
             this.predesktoppanel.BackColor = System.Drawing.Color.Gray;
-            this.predesktoppanel.Controls.Add(this.prepnlpanelbuttonholder);
-            this.predesktoppanel.Controls.Add(this.pretimepanel);
-            this.predesktoppanel.Controls.Add(this.preapplaunchermenuholder);
-            this.predesktoppanel.Dock = System.Windows.Forms.DockStyle.Top;
+            this.predesktoppanel.Widgets.Add(this.prepnlpanelbuttonholder);
+            this.predesktoppanel.Widgets.Add(this.pretimepanel);
+            this.predesktoppanel.Widgets.Add(this.preapplaunchermenuholder);
+            this.predesktoppanel.Dock = ShiftUI.DockStyle.Top;
             this.predesktoppanel.Location = new System.Drawing.Point(0, 0);
             this.predesktoppanel.Name = "predesktoppanel";
             this.predesktoppanel.Size = new System.Drawing.Size(448, 25);
@@ -214,19 +214,19 @@ namespace ShiftOS
             // prepnlpanelbuttonholder
             // 
             this.prepnlpanelbuttonholder.BackColor = System.Drawing.Color.Transparent;
-            this.prepnlpanelbuttonholder.Controls.Add(this.prepnlpanelbutton);
-            this.prepnlpanelbuttonholder.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.prepnlpanelbuttonholder.Widgets.Add(this.prepnlpanelbutton);
+            this.prepnlpanelbuttonholder.Dock = ShiftUI.DockStyle.Fill;
             this.prepnlpanelbuttonholder.Location = new System.Drawing.Point(116, 0);
             this.prepnlpanelbuttonholder.Name = "prepnlpanelbuttonholder";
-            this.prepnlpanelbuttonholder.Padding = new System.Windows.Forms.Padding(2, 0, 0, 0);
+            this.prepnlpanelbuttonholder.Padding = new ShiftUI.Padding(2, 0, 0, 0);
             this.prepnlpanelbuttonholder.Size = new System.Drawing.Size(235, 25);
             this.prepnlpanelbuttonholder.TabIndex = 7;
             // 
             // prepnlpanelbutton
             // 
             this.prepnlpanelbutton.BackColor = System.Drawing.Color.Black;
-            this.prepnlpanelbutton.Controls.Add(this.pretbicon);
-            this.prepnlpanelbutton.Controls.Add(this.pretbctext);
+            this.prepnlpanelbutton.Widgets.Add(this.pretbicon);
+            this.prepnlpanelbutton.Widgets.Add(this.pretbctext);
             this.prepnlpanelbutton.Location = new System.Drawing.Point(5, 3);
             this.prepnlpanelbutton.Name = "prepnlpanelbutton";
             this.prepnlpanelbutton.Size = new System.Drawing.Size(126, 20);
@@ -236,7 +236,7 @@ namespace ShiftOS
             // pretbicon
             // 
             this.pretbicon.BackColor = System.Drawing.Color.Transparent;
-            this.pretbicon.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.pretbicon.BackgroundImageLayout = ShiftUI.ImageLayout.Stretch;
             this.pretbicon.Image = global::ShiftOS.Properties.Resources.iconShifter;
             this.pretbicon.Location = new System.Drawing.Point(4, 2);
             this.pretbicon.Name = "pretbicon";
@@ -258,8 +258,8 @@ namespace ShiftOS
             // 
             // pretimepanel
             // 
-            this.pretimepanel.Controls.Add(this.prepaneltimetext);
-            this.pretimepanel.Dock = System.Windows.Forms.DockStyle.Right;
+            this.pretimepanel.Widgets.Add(this.prepaneltimetext);
+            this.pretimepanel.Dock = ShiftUI.DockStyle.Right;
             this.pretimepanel.Location = new System.Drawing.Point(351, 0);
             this.pretimepanel.Name = "pretimepanel";
             this.pretimepanel.Size = new System.Drawing.Size(97, 25);
@@ -279,8 +279,8 @@ namespace ShiftOS
             // 
             // preapplaunchermenuholder
             // 
-            this.preapplaunchermenuholder.Controls.Add(this.predesktopappmenu);
-            this.preapplaunchermenuholder.Dock = System.Windows.Forms.DockStyle.Left;
+            this.preapplaunchermenuholder.Widgets.Add(this.predesktopappmenu);
+            this.preapplaunchermenuholder.Dock = ShiftUI.DockStyle.Left;
             this.preapplaunchermenuholder.Location = new System.Drawing.Point(0, 0);
             this.preapplaunchermenuholder.Name = "preapplaunchermenuholder";
             this.preapplaunchermenuholder.Size = new System.Drawing.Size(116, 25);
@@ -289,12 +289,12 @@ namespace ShiftOS
             // predesktopappmenu
             // 
             this.predesktopappmenu.AutoSize = false;
-            this.predesktopappmenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.predesktopappmenu.Items.AddRange(new ShiftUI.ToolStripItem[] {
             this.ApplicationsToolStripMenuItem});
-            this.predesktopappmenu.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow;
+            this.predesktopappmenu.LayoutStyle = ShiftUI.ToolStripLayoutStyle.HorizontalStackWithOverflow;
             this.predesktopappmenu.Location = new System.Drawing.Point(0, 0);
             this.predesktopappmenu.Name = "predesktopappmenu";
-            this.predesktopappmenu.Padding = new System.Windows.Forms.Padding(0);
+            this.predesktopappmenu.Padding = new ShiftUI.Padding(0);
             this.predesktopappmenu.Size = new System.Drawing.Size(116, 24);
             this.predesktopappmenu.TabIndex = 0;
             this.predesktopappmenu.Text = "MenuStrip1";
@@ -302,7 +302,7 @@ namespace ShiftOS
             // ApplicationsToolStripMenuItem
             // 
             this.ApplicationsToolStripMenuItem.AutoSize = false;
-            this.ApplicationsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.ApplicationsToolStripMenuItem.DropDownItems.AddRange(new ShiftUI.ToolStripItem[] {
             this.KnowledgeInputToolStripMenuItem,
             this.ShiftoriumToolStripMenuItem,
             this.ClockToolStripMenuItem,
@@ -312,12 +312,12 @@ namespace ShiftOS
             this.ShutdownToolStripMenuItem});
             this.ApplicationsToolStripMenuItem.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.749999F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.ApplicationsToolStripMenuItem.Name = "ApplicationsToolStripMenuItem";
-            this.ApplicationsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.ApplicationsToolStripMenuItem.Padding = new ShiftUI.Padding(2, 0, 2, 0);
             this.ApplicationsToolStripMenuItem.ShowShortcutKeys = false;
             this.ApplicationsToolStripMenuItem.Size = new System.Drawing.Size(102, 24);
             this.ApplicationsToolStripMenuItem.Text = "Applications";
-            this.ApplicationsToolStripMenuItem.TextDirection = System.Windows.Forms.ToolStripTextDirection.Horizontal;
-            this.ApplicationsToolStripMenuItem.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage;
+            this.ApplicationsToolStripMenuItem.TextDirection = ShiftUI.ToolStripTextDirection.Horizontal;
+            this.ApplicationsToolStripMenuItem.TextImageRelation = ShiftUI.TextImageRelation.TextBeforeImage;
             // 
             // KnowledgeInputToolStripMenuItem
             // 
@@ -374,8 +374,8 @@ namespace ShiftOS
             // 
             // Label1
             // 
-            this.Label1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.Label1.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.Label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.Label1.Location = new System.Drawing.Point(4, 6);
             this.Label1.Name = "Label1";
@@ -386,13 +386,13 @@ namespace ShiftOS
             // 
             // pnlwindowpreview
             // 
-            this.pnlwindowpreview.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnlwindowpreview.Controls.Add(this.prepgcontent);
-            this.pnlwindowpreview.Controls.Add(this.prepgbottom);
-            this.pnlwindowpreview.Controls.Add(this.prepgleft);
-            this.pnlwindowpreview.Controls.Add(this.prepgright);
-            this.pnlwindowpreview.Controls.Add(this.pretitlebar);
+            this.pnlwindowpreview.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
+            this.pnlwindowpreview.Widgets.Add(this.prepgcontent);
+            this.pnlwindowpreview.Widgets.Add(this.prepgbottom);
+            this.pnlwindowpreview.Widgets.Add(this.prepgleft);
+            this.pnlwindowpreview.Widgets.Add(this.prepgright);
+            this.pnlwindowpreview.Widgets.Add(this.pretitlebar);
             this.pnlwindowpreview.Location = new System.Drawing.Point(13, 39);
             this.pnlwindowpreview.Name = "pnlwindowpreview";
             this.pnlwindowpreview.Size = new System.Drawing.Size(448, 148);
@@ -400,7 +400,7 @@ namespace ShiftOS
             // 
             // prepgcontent
             // 
-            this.prepgcontent.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.prepgcontent.Dock = ShiftUI.DockStyle.Fill;
             this.prepgcontent.Location = new System.Drawing.Point(2, 30);
             this.prepgcontent.Name = "prepgcontent";
             this.prepgcontent.Size = new System.Drawing.Size(444, 116);
@@ -409,7 +409,7 @@ namespace ShiftOS
             // prepgbottom
             // 
             this.prepgbottom.BackColor = System.Drawing.Color.Gray;
-            this.prepgbottom.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.prepgbottom.Dock = ShiftUI.DockStyle.Bottom;
             this.prepgbottom.Location = new System.Drawing.Point(2, 146);
             this.prepgbottom.Name = "prepgbottom";
             this.prepgbottom.Size = new System.Drawing.Size(444, 2);
@@ -418,8 +418,8 @@ namespace ShiftOS
             // prepgleft
             // 
             this.prepgleft.BackColor = System.Drawing.Color.Gray;
-            this.prepgleft.Controls.Add(this.prepgbottomlcorner);
-            this.prepgleft.Dock = System.Windows.Forms.DockStyle.Left;
+            this.prepgleft.Widgets.Add(this.prepgbottomlcorner);
+            this.prepgleft.Dock = ShiftUI.DockStyle.Left;
             this.prepgleft.Location = new System.Drawing.Point(0, 30);
             this.prepgleft.Name = "prepgleft";
             this.prepgleft.Size = new System.Drawing.Size(2, 118);
@@ -428,7 +428,7 @@ namespace ShiftOS
             // prepgbottomlcorner
             // 
             this.prepgbottomlcorner.BackColor = System.Drawing.Color.Red;
-            this.prepgbottomlcorner.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.prepgbottomlcorner.Dock = ShiftUI.DockStyle.Bottom;
             this.prepgbottomlcorner.Location = new System.Drawing.Point(0, 116);
             this.prepgbottomlcorner.Name = "prepgbottomlcorner";
             this.prepgbottomlcorner.Size = new System.Drawing.Size(2, 2);
@@ -437,8 +437,8 @@ namespace ShiftOS
             // prepgright
             // 
             this.prepgright.BackColor = System.Drawing.Color.Gray;
-            this.prepgright.Controls.Add(this.prepgbottomrcorner);
-            this.prepgright.Dock = System.Windows.Forms.DockStyle.Right;
+            this.prepgright.Widgets.Add(this.prepgbottomrcorner);
+            this.prepgright.Dock = ShiftUI.DockStyle.Right;
             this.prepgright.Location = new System.Drawing.Point(446, 30);
             this.prepgright.Name = "prepgright";
             this.prepgright.Size = new System.Drawing.Size(2, 118);
@@ -447,7 +447,7 @@ namespace ShiftOS
             // prepgbottomrcorner
             // 
             this.prepgbottomrcorner.BackColor = System.Drawing.Color.Red;
-            this.prepgbottomrcorner.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.prepgbottomrcorner.Dock = ShiftUI.DockStyle.Bottom;
             this.prepgbottomrcorner.Location = new System.Drawing.Point(0, 116);
             this.prepgbottomrcorner.Name = "prepgbottomrcorner";
             this.prepgbottomrcorner.Size = new System.Drawing.Size(2, 2);
@@ -456,14 +456,14 @@ namespace ShiftOS
             // pretitlebar
             // 
             this.pretitlebar.BackColor = System.Drawing.Color.Gray;
-            this.pretitlebar.Controls.Add(this.preminimizebutton);
-            this.pretitlebar.Controls.Add(this.prepnlicon);
-            this.pretitlebar.Controls.Add(this.prerollupbutton);
-            this.pretitlebar.Controls.Add(this.preclosebutton);
-            this.pretitlebar.Controls.Add(this.pretitletext);
-            this.pretitlebar.Controls.Add(this.prepgtoplcorner);
-            this.pretitlebar.Controls.Add(this.prepgtoprcorner);
-            this.pretitlebar.Dock = System.Windows.Forms.DockStyle.Top;
+            this.pretitlebar.Widgets.Add(this.preminimizebutton);
+            this.pretitlebar.Widgets.Add(this.prepnlicon);
+            this.pretitlebar.Widgets.Add(this.prerollupbutton);
+            this.pretitlebar.Widgets.Add(this.preclosebutton);
+            this.pretitlebar.Widgets.Add(this.pretitletext);
+            this.pretitlebar.Widgets.Add(this.prepgtoplcorner);
+            this.pretitlebar.Widgets.Add(this.prepgtoprcorner);
+            this.pretitlebar.Dock = ShiftUI.DockStyle.Top;
             this.pretitlebar.ForeColor = System.Drawing.Color.White;
             this.pretitlebar.Location = new System.Drawing.Point(0, 0);
             this.pretitlebar.Name = "pretitlebar";
@@ -519,7 +519,7 @@ namespace ShiftOS
             // prepgtoplcorner
             // 
             this.prepgtoplcorner.BackColor = System.Drawing.Color.Red;
-            this.prepgtoplcorner.Dock = System.Windows.Forms.DockStyle.Left;
+            this.prepgtoplcorner.Dock = ShiftUI.DockStyle.Left;
             this.prepgtoplcorner.Location = new System.Drawing.Point(0, 0);
             this.prepgtoplcorner.Name = "prepgtoplcorner";
             this.prepgtoplcorner.Size = new System.Drawing.Size(2, 30);
@@ -528,7 +528,7 @@ namespace ShiftOS
             // prepgtoprcorner
             // 
             this.prepgtoprcorner.BackColor = System.Drawing.Color.Red;
-            this.prepgtoprcorner.Dock = System.Windows.Forms.DockStyle.Right;
+            this.prepgtoprcorner.Dock = ShiftUI.DockStyle.Right;
             this.prepgtoprcorner.Location = new System.Drawing.Point(446, 0);
             this.prepgtoprcorner.Name = "prepgtoprcorner";
             this.prepgtoprcorner.Size = new System.Drawing.Size(2, 30);
@@ -537,15 +537,15 @@ namespace ShiftOS
             // pnlskinpacks
             // 
             this.pnlskinpacks.BackColor = System.Drawing.Color.White;
-            this.pnlskinpacks.Controls.Add(this.btnapplypackskin);
-            this.pnlskinpacks.Controls.Add(this.label6);
-            this.pnlskinpacks.Controls.Add(this.cbpackfiles);
-            this.pnlskinpacks.Controls.Add(this.btnbrowse);
-            this.pnlskinpacks.Controls.Add(this.txtpackpath);
-            this.pnlskinpacks.Controls.Add(this.btnbacktoskinloader);
-            this.pnlskinpacks.Controls.Add(this.label5);
-            this.pnlskinpacks.Controls.Add(this.label4);
-            this.pnlskinpacks.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pnlskinpacks.Widgets.Add(this.btnapplypackskin);
+            this.pnlskinpacks.Widgets.Add(this.label6);
+            this.pnlskinpacks.Widgets.Add(this.cbpackfiles);
+            this.pnlskinpacks.Widgets.Add(this.btnbrowse);
+            this.pnlskinpacks.Widgets.Add(this.txtpackpath);
+            this.pnlskinpacks.Widgets.Add(this.btnbacktoskinloader);
+            this.pnlskinpacks.Widgets.Add(this.label5);
+            this.pnlskinpacks.Widgets.Add(this.label4);
+            this.pnlskinpacks.Dock = ShiftUI.DockStyle.Fill;
             this.pnlskinpacks.Location = new System.Drawing.Point(0, 0);
             this.pnlskinpacks.Name = "pnlskinpacks";
             this.pnlskinpacks.Size = new System.Drawing.Size(476, 462);
@@ -553,8 +553,8 @@ namespace ShiftOS
             // 
             // btnapplypackskin
             // 
-            this.btnapplypackskin.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.btnapplypackskin.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnapplypackskin.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left)));
+            this.btnapplypackskin.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnapplypackskin.Location = new System.Drawing.Point(379, 418);
             this.btnapplypackskin.Name = "btnapplypackskin";
             this.btnapplypackskin.Size = new System.Drawing.Size(94, 41);
@@ -583,8 +583,8 @@ namespace ShiftOS
             // 
             // btnbrowse
             // 
-            this.btnbrowse.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnbrowse.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnbrowse.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Right)));
+            this.btnbrowse.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnbrowse.Location = new System.Drawing.Point(389, 138);
             this.btnbrowse.Name = "btnbrowse";
             this.btnbrowse.Size = new System.Drawing.Size(75, 23);
@@ -595,9 +595,9 @@ namespace ShiftOS
             // 
             // txtpackpath
             // 
-            this.txtpackpath.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtpackpath.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtpackpath.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
+            this.txtpackpath.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtpackpath.Location = new System.Drawing.Point(13, 141);
             this.txtpackpath.Name = "txtpackpath";
             this.txtpackpath.Size = new System.Drawing.Size(370, 20);
@@ -605,8 +605,8 @@ namespace ShiftOS
             // 
             // btnbacktoskinloader
             // 
-            this.btnbacktoskinloader.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.btnbacktoskinloader.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnbacktoskinloader.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left)));
+            this.btnbacktoskinloader.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnbacktoskinloader.Location = new System.Drawing.Point(3, 418);
             this.btnbacktoskinloader.Name = "btnbacktoskinloader";
             this.btnbacktoskinloader.Size = new System.Drawing.Size(94, 41);
@@ -617,8 +617,8 @@ namespace ShiftOS
             // 
             // label5
             // 
-            this.label5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.label5.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
             this.label5.Location = new System.Drawing.Point(5, 28);
             this.label5.Name = "label5";
@@ -629,8 +629,8 @@ namespace ShiftOS
             // 
             // label4
             // 
-            this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.label4.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 13F);
             this.label4.Location = new System.Drawing.Point(3, 6);
             this.label4.Name = "label4";
@@ -641,9 +641,9 @@ namespace ShiftOS
             // 
             // panel1
             // 
-            this.panel1.Controls.Add(this.pgcontents);
-            this.panel1.Controls.Add(this.pnlskinpacks);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel1.Widgets.Add(this.pgcontents);
+            this.panel1.Widgets.Add(this.pnlskinpacks);
+            this.panel1.Dock = ShiftUI.DockStyle.Fill;
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
             this.panel1.Size = new System.Drawing.Size(476, 462);
@@ -652,10 +652,10 @@ namespace ShiftOS
             // SkinLoader
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(476, 462);
-            this.Controls.Add(this.panel1);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Widgets.Add(this.panel1);
+            this.FormBorderStyle = ShiftUI.FormBorderStyle.None;
             this.Name = "SkinLoader";
             this.Text = "Skin_Loader";
             this.TopMost = true;
@@ -684,56 +684,56 @@ namespace ShiftOS
             this.ResumeLayout(false);
 
         }
-        internal System.Windows.Forms.Panel pgcontents;
-        internal System.Windows.Forms.Label Label1;
-        internal System.Windows.Forms.Panel pnlwindowpreview;
-        internal System.Windows.Forms.Panel prepgcontent;
-        internal System.Windows.Forms.Panel prepgbottom;
-        internal System.Windows.Forms.Panel prepgleft;
-        internal System.Windows.Forms.Panel prepgbottomlcorner;
-        internal System.Windows.Forms.Panel prepgright;
-        internal System.Windows.Forms.Panel prepgbottomrcorner;
-        internal System.Windows.Forms.Panel pretitlebar;
-        internal System.Windows.Forms.PictureBox prepnlicon;
-        internal System.Windows.Forms.Panel prerollupbutton;
-        internal System.Windows.Forms.Panel preclosebutton;
-        internal System.Windows.Forms.Label pretitletext;
-        internal System.Windows.Forms.Panel prepgtoplcorner;
-        internal System.Windows.Forms.Panel prepgtoprcorner;
-        internal System.Windows.Forms.Button btnapplyskin;
-        internal System.Windows.Forms.Button btnsaveskin;
-        internal System.Windows.Forms.Button btnloadskin;
-        internal System.Windows.Forms.Label Label2;
-        internal System.Windows.Forms.Button btnclose;
-        internal System.Windows.Forms.Panel pnldesktoppreview;
-        internal System.Windows.Forms.Panel predesktoppanel;
-        internal System.Windows.Forms.Panel pretimepanel;
-        internal System.Windows.Forms.Label prepaneltimetext;
-        internal System.Windows.Forms.Panel preapplaunchermenuholder;
-        internal System.Windows.Forms.MenuStrip predesktopappmenu;
-        internal System.Windows.Forms.ToolStripMenuItem ApplicationsToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem KnowledgeInputToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem ShiftoriumToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem ClockToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem TerminalToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem ShifterToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripSeparator ToolStripSeparator1;
-        internal System.Windows.Forms.ToolStripMenuItem ShutdownToolStripMenuItem;
-        internal System.Windows.Forms.Panel preminimizebutton;
-        internal System.Windows.Forms.FlowLayoutPanel prepnlpanelbuttonholder;
-        internal System.Windows.Forms.Panel prepnlpanelbutton;
-        internal System.Windows.Forms.PictureBox pretbicon;
-        internal System.Windows.Forms.Label pretbctext;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.Panel pnlskinpacks;
-        private System.Windows.Forms.Button btnbacktoskinloader;
-        private System.Windows.Forms.Label label5;
-        private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.Button btnbrowse;
-        private System.Windows.Forms.TextBox txtpackpath;
-        private System.Windows.Forms.Label label6;
-        private System.Windows.Forms.ComboBox cbpackfiles;
-        private System.Windows.Forms.Button btnapplypackskin;
-        private System.Windows.Forms.Panel panel1;
+        internal ShiftUI.Panel pgcontents;
+        internal ShiftUI.Label Label1;
+        internal ShiftUI.Panel pnlwindowpreview;
+        internal ShiftUI.Panel prepgcontent;
+        internal ShiftUI.Panel prepgbottom;
+        internal ShiftUI.Panel prepgleft;
+        internal ShiftUI.Panel prepgbottomlcorner;
+        internal ShiftUI.Panel prepgright;
+        internal ShiftUI.Panel prepgbottomrcorner;
+        internal ShiftUI.Panel pretitlebar;
+        internal ShiftUI.PictureBox prepnlicon;
+        internal ShiftUI.Panel prerollupbutton;
+        internal ShiftUI.Panel preclosebutton;
+        internal ShiftUI.Label pretitletext;
+        internal ShiftUI.Panel prepgtoplcorner;
+        internal ShiftUI.Panel prepgtoprcorner;
+        internal ShiftUI.Button btnapplyskin;
+        internal ShiftUI.Button btnsaveskin;
+        internal ShiftUI.Button btnloadskin;
+        internal ShiftUI.Label Label2;
+        internal ShiftUI.Button btnclose;
+        internal ShiftUI.Panel pnldesktoppreview;
+        internal ShiftUI.Panel predesktoppanel;
+        internal ShiftUI.Panel pretimepanel;
+        internal ShiftUI.Label prepaneltimetext;
+        internal ShiftUI.Panel preapplaunchermenuholder;
+        internal ShiftUI.MenuStrip predesktopappmenu;
+        internal ShiftUI.ToolStripMenuItem ApplicationsToolStripMenuItem;
+        internal ShiftUI.ToolStripMenuItem KnowledgeInputToolStripMenuItem;
+        internal ShiftUI.ToolStripMenuItem ShiftoriumToolStripMenuItem;
+        internal ShiftUI.ToolStripMenuItem ClockToolStripMenuItem;
+        internal ShiftUI.ToolStripMenuItem TerminalToolStripMenuItem;
+        internal ShiftUI.ToolStripMenuItem ShifterToolStripMenuItem;
+        internal ShiftUI.ToolStripSeparator ToolStripSeparator1;
+        internal ShiftUI.ToolStripMenuItem ShutdownToolStripMenuItem;
+        internal ShiftUI.Panel preminimizebutton;
+        internal ShiftUI.FlowLayoutPanel prepnlpanelbuttonholder;
+        internal ShiftUI.Panel prepnlpanelbutton;
+        internal ShiftUI.PictureBox pretbicon;
+        internal ShiftUI.Label pretbctext;
+        private ShiftUI.Label label3;
+        private ShiftUI.Panel pnlskinpacks;
+        private ShiftUI.Button btnbacktoskinloader;
+        private ShiftUI.Label label5;
+        private ShiftUI.Label label4;
+        private ShiftUI.Button btnbrowse;
+        private ShiftUI.TextBox txtpackpath;
+        private ShiftUI.Label label6;
+        private ShiftUI.ComboBox cbpackfiles;
+        private ShiftUI.Button btnapplypackskin;
+        private ShiftUI.Panel panel1;
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Apps/SkinLoader.cs b/source/WindowsFormsApplication1/Apps/SkinLoader.cs
index e6d5328..e720561 100644
--- a/source/WindowsFormsApplication1/Apps/SkinLoader.cs
+++ b/source/WindowsFormsApplication1/Apps/SkinLoader.cs
@@ -8,7 +8,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
diff --git a/source/WindowsFormsApplication1/Apps/SkinLoader.resx b/source/WindowsFormsApplication1/Apps/SkinLoader.resx
index a4bf070..51fd996 100644
--- a/source/WindowsFormsApplication1/Apps/SkinLoader.resx
+++ b/source/WindowsFormsApplication1/Apps/SkinLoader.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="predesktopappmenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
diff --git a/source/WindowsFormsApplication1/Apps/Terminal.Designer.cs b/source/WindowsFormsApplication1/Apps/Terminal.Designer.cs
index 5f7ba27..de4e913 100644
--- a/source/WindowsFormsApplication1/Apps/Terminal.Designer.cs
+++ b/source/WindowsFormsApplication1/Apps/Terminal.Designer.cs
@@ -31,24 +31,24 @@ namespace ShiftOS
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            this.txtterm = new System.Windows.Forms.TextBox();
-            this.tmrfirstrun = new System.Windows.Forms.Timer(this.components);
-            this.tmrshutdown = new System.Windows.Forms.Timer(this.components);
-            this.pullbs = new System.Windows.Forms.Timer(this.components);
-            this.pullbottom = new System.Windows.Forms.Timer(this.components);
-            this.pullside = new System.Windows.Forms.Timer(this.components);
-            this.tmrstorylineupdate = new System.Windows.Forms.Timer(this.components);
-            this.panel2 = new System.Windows.Forms.Panel();
-            this.tmrsetfont = new System.Windows.Forms.Timer(this.components);
+            this.txtterm = new ShiftUI.TextBox();
+            this.tmrfirstrun = new ShiftUI.Timer(this.components);
+            this.tmrshutdown = new ShiftUI.Timer(this.components);
+            this.pullbs = new ShiftUI.Timer(this.components);
+            this.pullbottom = new ShiftUI.Timer(this.components);
+            this.pullside = new ShiftUI.Timer(this.components);
+            this.tmrstorylineupdate = new ShiftUI.Timer(this.components);
+            this.panel2 = new ShiftUI.Panel();
+            this.tmrsetfont = new ShiftUI.Timer(this.components);
             this.panel2.SuspendLayout();
             this.SuspendLayout();
             // 
             // txtterm
             // 
             this.txtterm.BackColor = System.Drawing.Color.Black;
-            this.txtterm.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            this.txtterm.Cursor = System.Windows.Forms.Cursors.IBeam;
-            this.txtterm.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.txtterm.BorderStyle = ShiftUI.BorderStyle.None;
+            this.txtterm.Cursor = ShiftUI.Cursors.IBeam;
+            this.txtterm.Dock = ShiftUI.DockStyle.Fill;
             this.txtterm.Font = new System.Drawing.Font("Lucida Console", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtterm.ForeColor = System.Drawing.Color.White;
             this.txtterm.Location = new System.Drawing.Point(0, 0);
@@ -56,8 +56,8 @@ namespace ShiftOS
             this.txtterm.Name = "txtterm";
             this.txtterm.Size = new System.Drawing.Size(650, 396);
             this.txtterm.TabIndex = 0;
-            this.txtterm.KeyUp += new System.Windows.Forms.KeyEventHandler(this.ScrollDeactivate);
-            this.txtterm.MouseMove += new System.Windows.Forms.MouseEventHandler(this.ScrollTerm);
+            this.txtterm.KeyUp += new ShiftUI.KeyEventHandler(this.ScrollDeactivate);
+            this.txtterm.MouseMove += new ShiftUI.MouseEventHandler(this.ScrollTerm);
             // 
             // tmrfirstrun
             // 
@@ -81,8 +81,8 @@ namespace ShiftOS
             // 
             // panel2
             // 
-            this.panel2.Controls.Add(this.txtterm);
-            this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel2.Widgets.Add(this.txtterm);
+            this.panel2.Dock = ShiftUI.DockStyle.Fill;
             this.panel2.Location = new System.Drawing.Point(0, 0);
             this.panel2.Name = "panel2";
             this.panel2.Size = new System.Drawing.Size(650, 396);
@@ -95,11 +95,11 @@ namespace ShiftOS
             // Terminal
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.Black;
             this.ClientSize = new System.Drawing.Size(650, 396);
-            this.Controls.Add(this.panel2);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Widgets.Add(this.panel2);
+            this.FormBorderStyle = ShiftUI.FormBorderStyle.None;
             this.KeyPreview = true;
             this.MinimumSize = new System.Drawing.Size(350, 200);
             this.Name = "Terminal";
@@ -111,16 +111,16 @@ namespace ShiftOS
             this.ResumeLayout(false);
 
         }
-        internal System.Windows.Forms.TextBox txtterm;
-        internal System.Windows.Forms.Timer tmrfirstrun;
-        internal System.Windows.Forms.Timer tmrshutdown;
-        internal System.Windows.Forms.Timer pullbs;
-        internal System.Windows.Forms.Timer pullbottom;
-        internal System.Windows.Forms.Timer pullside;
-        internal System.Windows.Forms.Timer tmrstorylineupdate;
+        internal ShiftUI.TextBox txtterm;
+        internal ShiftUI.Timer tmrfirstrun;
+        internal ShiftUI.Timer tmrshutdown;
+        internal ShiftUI.Timer pullbs;
+        internal ShiftUI.Timer pullbottom;
+        internal ShiftUI.Timer pullside;
+        internal ShiftUI.Timer tmrstorylineupdate;
 
         #endregion
-        private System.Windows.Forms.Panel panel2;
-        private System.Windows.Forms.Timer tmrsetfont;
+        private ShiftUI.Panel panel2;
+        private ShiftUI.Timer tmrsetfont;
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Apps/Terminal.cs b/source/WindowsFormsApplication1/Apps/Terminal.cs
index 944b333..f95025d 100644
--- a/source/WindowsFormsApplication1/Apps/Terminal.cs
+++ b/source/WindowsFormsApplication1/Apps/Terminal.cs
@@ -13,7 +13,7 @@ using System.Net;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
@@ -37,7 +37,7 @@ namespace ShiftOS
 
         public void StartOtherPlayerStory()
         {
-            var t = new System.Windows.Forms.Timer();
+            var t = new ShiftUI.Timer();
             t.Interval = 4000;
             int i = 0;
             t.Tick += (object s, EventArgs a) =>
@@ -160,7 +160,7 @@ namespace ShiftOS
         {
             if(ModLogger == true)
             {
-                var tmrlog = new System.Windows.Forms.Timer();
+                var tmrlog = new ShiftUI.Timer();
                 tmrlog.Interval = 500;
                 tmrlog.Tick += (object s, EventArgs a) =>
                 {
@@ -242,16 +242,16 @@ namespace ShiftOS
         }
 
         // ERROR: Handles clauses are not supported in C#
-        private void txtterm_KeyPress(object sender, System.Windows.Forms.KeyEventArgs e)
+        private void txtterm_KeyPress(object sender, ShiftUI.KeyEventArgs e)
         {
-            if(e.Control) {
+            if(e.Widget) {
                 if(API.Upgrades["zoomableterminal"] == true)
                 {
                     Zooming = true;
                 }
             }
 
-            if (e.KeyCode == Keys.T && e.Control && blockctrlt == false)
+            if (e.KeyCode == Keys.T && e.Widget && blockctrlt == false)
             {
                 this.Close();
                 e.SuppressKeyPress = true;
@@ -590,7 +590,7 @@ Password: z7fjsd3");
 
         internal void StartBridgeToMidGame()
         {
-            var t2 = new System.Windows.Forms.Timer();
+            var t2 = new ShiftUI.Timer();
             t2.Interval = 4000;
             int i2 = 0;
             t2.Tick += (object s, EventArgs e) =>
@@ -657,7 +657,7 @@ Password: z7fjsd3");
                 i2 += 1;
             };
 
-            var t = new System.Windows.Forms.Timer();
+            var t = new ShiftUI.Timer();
             t.Interval = 4000;
             int i = 0;
 
@@ -815,7 +815,7 @@ Password: z7fjsd3");
 
         internal void StartAidenNirhStory()
         {
-            var t = new System.Windows.Forms.Timer();
+            var t = new ShiftUI.Timer();
             t.Interval = 4000;
             int i = 0;
             t.Tick += (object s, EventArgs a) =>
@@ -853,7 +853,7 @@ Password: z7fjsd3");
 
         internal void StartHacker101Story()
         {
-            var t = new System.Windows.Forms.Timer();
+            var t = new ShiftUI.Timer();
             t.Interval = 4000;
             int i = 0;
             
@@ -943,7 +943,7 @@ Password: z7fjsd3");
 
         internal void StartOtherPlayerSysFix()
         {
-            var t = new System.Windows.Forms.Timer();
+            var t = new ShiftUI.Timer();
             t.Interval = 4000;
             int i = 0;
             t.Tick += (object s, EventArgs a) =>
@@ -1051,7 +1051,7 @@ Password: z7fjsd3");
 
         internal void StartHackerBattleIntro()
         {
-            var t = new System.Windows.Forms.Timer();
+            var t = new ShiftUI.Timer();
             t.Interval = 4000;
             int i = 0;
             t.Tick += (object s, EventArgs a) =>
@@ -1142,7 +1142,7 @@ Password: z7fjsd3");
 
         internal void StartDevXFuriousStory()
         {
-            var t = new System.Windows.Forms.Timer();
+            var t = new ShiftUI.Timer();
             t.Interval = 4000;
             int i = 0;
             t.Tick += (object s, EventArgs a) =>
@@ -1235,7 +1235,7 @@ Password: z7fjsd3");
         /// </summary>
         public void StartShiftnetStory()
         {
-            System.Windows.Forms.Timer tmrstory = new System.Windows.Forms.Timer();
+            ShiftUI.Timer tmrstory = new ShiftUI.Timer();
             tmrstory.Interval = 10000;
             WriteLine("IP <hidden@shiftnet> connecting as 'Maureen Fenn'...");
             API.PlaySound(Properties.Resources.dial_up_modem_02);
@@ -2273,7 +2273,7 @@ HIJACKER is a utility that allows you to hijack any system and install ShiftOS o
 
         private void StartChoice1EndStory()
         {
-            var t = new System.Windows.Forms.Timer();
+            var t = new ShiftUI.Timer();
             int i = 0;
             t.Interval = 4000;
             t.Tick += (object s, EventArgs a) =>
@@ -2379,7 +2379,7 @@ HIJACKER is a utility that allows you to hijack any system and install ShiftOS o
             WriteLine(Environment.NewLine);
             WriteLine("PANIC_ID: 750_15_4W3S0M3");
             WriteLine("PANIC_DESC: System became too unstable to function properly. In 5 seconds, your session will be resumed.");
-            var t = new System.Windows.Forms.Timer();
+            var t = new ShiftUI.Timer();
             t.Interval = 1000;
             int p = 0;
             t.Tick += (object s, EventArgs a) =>
@@ -2401,7 +2401,7 @@ HIJACKER is a utility that allows you to hijack any system and install ShiftOS o
 
         bool Hacking = false;
 
-        private Control objToWriteTo = null;
+        private Widget objToWriteTo = null;
         private string UpgradeToHack = null;
 
         public void StartHackingSession(string id)
diff --git a/source/WindowsFormsApplication1/Apps/Terminal.resx b/source/WindowsFormsApplication1/Apps/Terminal.resx
index d0442f6..688489a 100644
--- a/source/WindowsFormsApplication1/Apps/Terminal.resx
+++ b/source/WindowsFormsApplication1/Apps/Terminal.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="tmrfirstrun.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
diff --git a/source/WindowsFormsApplication1/Apps/TextPad.Designer.cs b/source/WindowsFormsApplication1/Apps/TextPad.Designer.cs
index 3ac11b4..69ac78d 100644
--- a/source/WindowsFormsApplication1/Apps/TextPad.Designer.cs
+++ b/source/WindowsFormsApplication1/Apps/TextPad.Designer.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
@@ -26,25 +26,25 @@ namespace ShiftOS
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            this.pgcontents = new System.Windows.Forms.Panel();
-            this.txtuserinput = new System.Windows.Forms.TextBox();
-            this.pnlbreak = new System.Windows.Forms.Panel();
-            this.pnloptions = new System.Windows.Forms.Panel();
-            this.btnsave = new System.Windows.Forms.Button();
-            this.btnopen = new System.Windows.Forms.Button();
-            this.btnnew = new System.Windows.Forms.Button();
-            this.tmrcodepointcooldown = new System.Windows.Forms.Timer(this.components);
-            this.tmrshowearnedcodepoints = new System.Windows.Forms.Timer(this.components);
+            this.pgcontents = new ShiftUI.Panel();
+            this.txtuserinput = new ShiftUI.TextBox();
+            this.pnlbreak = new ShiftUI.Panel();
+            this.pnloptions = new ShiftUI.Panel();
+            this.btnsave = new ShiftUI.Button();
+            this.btnopen = new ShiftUI.Button();
+            this.btnnew = new ShiftUI.Button();
+            this.tmrcodepointcooldown = new ShiftUI.Timer(this.components);
+            this.tmrshowearnedcodepoints = new ShiftUI.Timer(this.components);
             this.pgcontents.SuspendLayout();
             this.pnloptions.SuspendLayout();
             this.SuspendLayout();
             // 
             // pgcontents
             // 
-            this.pgcontents.Controls.Add(this.txtuserinput);
-            this.pgcontents.Controls.Add(this.pnlbreak);
-            this.pgcontents.Controls.Add(this.pnloptions);
-            this.pgcontents.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pgcontents.Widgets.Add(this.txtuserinput);
+            this.pgcontents.Widgets.Add(this.pnlbreak);
+            this.pgcontents.Widgets.Add(this.pnloptions);
+            this.pgcontents.Dock = ShiftUI.DockStyle.Fill;
             this.pgcontents.Location = new System.Drawing.Point(0, 0);
             this.pgcontents.Name = "pgcontents";
             this.pgcontents.Size = new System.Drawing.Size(530, 330);
@@ -52,17 +52,17 @@ namespace ShiftOS
             // 
             // txtuserinput
             // 
-            this.txtuserinput.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtuserinput.Anchor = ((ShiftUI.AnchorStyles)((((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.txtuserinput.BackColor = System.Drawing.Color.White;
-            this.txtuserinput.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.txtuserinput.BorderStyle = ShiftUI.BorderStyle.None;
             this.txtuserinput.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtuserinput.ForeColor = System.Drawing.Color.Black;
             this.txtuserinput.Location = new System.Drawing.Point(4, 2);
             this.txtuserinput.Multiline = true;
             this.txtuserinput.Name = "txtuserinput";
-            this.txtuserinput.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+            this.txtuserinput.ScrollBars = ShiftUI.ScrollBars.Vertical;
             this.txtuserinput.Size = new System.Drawing.Size(528, 272);
             this.txtuserinput.TabIndex = 0;
             // 
@@ -70,8 +70,8 @@ namespace ShiftOS
             // 
             this.pnlbreak.BackColor = System.Drawing.Color.White;
             this.pnlbreak.BackgroundImage = global::ShiftOS.Properties.Resources.uparrow;
-            this.pnlbreak.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
-            this.pnlbreak.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.pnlbreak.BackgroundImageLayout = ShiftUI.ImageLayout.Center;
+            this.pnlbreak.Dock = ShiftUI.DockStyle.Bottom;
             this.pnlbreak.ForeColor = System.Drawing.Color.Black;
             this.pnlbreak.Location = new System.Drawing.Point(0, 277);
             this.pnlbreak.Name = "pnlbreak";
@@ -81,10 +81,10 @@ namespace ShiftOS
             // pnloptions
             // 
             this.pnloptions.BackColor = System.Drawing.Color.White;
-            this.pnloptions.Controls.Add(this.btnsave);
-            this.pnloptions.Controls.Add(this.btnopen);
-            this.pnloptions.Controls.Add(this.btnnew);
-            this.pnloptions.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.pnloptions.Widgets.Add(this.btnsave);
+            this.pnloptions.Widgets.Add(this.btnopen);
+            this.pnloptions.Widgets.Add(this.btnnew);
+            this.pnloptions.Dock = ShiftUI.DockStyle.Bottom;
             this.pnloptions.Location = new System.Drawing.Point(0, 292);
             this.pnloptions.Name = "pnloptions";
             this.pnloptions.Size = new System.Drawing.Size(530, 38);
@@ -94,7 +94,7 @@ namespace ShiftOS
             // btnsave
             // 
             this.btnsave.BackColor = System.Drawing.Color.White;
-            this.btnsave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnsave.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnsave.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnsave.Image = global::ShiftOS.Properties.Resources.saveicon;
             this.btnsave.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -109,7 +109,7 @@ namespace ShiftOS
             // btnopen
             // 
             this.btnopen.BackColor = System.Drawing.Color.White;
-            this.btnopen.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnopen.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnopen.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnopen.Image = global::ShiftOS.Properties.Resources.openicon;
             this.btnopen.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -124,7 +124,7 @@ namespace ShiftOS
             // btnnew
             // 
             this.btnnew.BackColor = System.Drawing.Color.White;
-            this.btnnew.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnnew.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnnew.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnnew.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.btnnew.Location = new System.Drawing.Point(4, 4);
@@ -146,11 +146,11 @@ namespace ShiftOS
             // TextPad
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.White;
             this.ClientSize = new System.Drawing.Size(530, 330);
-            this.Controls.Add(this.pgcontents);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Widgets.Add(this.pgcontents);
+            this.FormBorderStyle = ShiftUI.FormBorderStyle.None;
             this.MinimumSize = new System.Drawing.Size(230, 230);
             this.Name = "TextPad";
             this.Text = "TextPad";
@@ -168,14 +168,14 @@ namespace ShiftOS
             this.tmrshowearnedcodepoints.Tick += new EventHandler(tmrshowearnedcodepoints_Tick);
             this.pnlbreak.MouseEnter += new EventHandler(this.pnlbreak_MouseEnter);
         }
-        internal System.Windows.Forms.Panel pgcontents;
-        internal System.Windows.Forms.TextBox txtuserinput;
-        internal System.Windows.Forms.Panel pnloptions;
-        internal System.Windows.Forms.Button btnnew;
-        internal System.Windows.Forms.Button btnsave;
-        internal System.Windows.Forms.Button btnopen;
-        internal System.Windows.Forms.Panel pnlbreak;
-        internal System.Windows.Forms.Timer tmrcodepointcooldown;
-        internal System.Windows.Forms.Timer tmrshowearnedcodepoints;
+        internal ShiftUI.Panel pgcontents;
+        internal ShiftUI.TextBox txtuserinput;
+        internal ShiftUI.Panel pnloptions;
+        internal ShiftUI.Button btnnew;
+        internal ShiftUI.Button btnsave;
+        internal ShiftUI.Button btnopen;
+        internal ShiftUI.Panel pnlbreak;
+        internal ShiftUI.Timer tmrcodepointcooldown;
+        internal ShiftUI.Timer tmrshowearnedcodepoints;
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Apps/TextPad.cs b/source/WindowsFormsApplication1/Apps/TextPad.cs
index 1b49129..3d1d54a 100644
--- a/source/WindowsFormsApplication1/Apps/TextPad.cs
+++ b/source/WindowsFormsApplication1/Apps/TextPad.cs
@@ -7,7 +7,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
diff --git a/source/WindowsFormsApplication1/Apps/TextPad.resx b/source/WindowsFormsApplication1/Apps/TextPad.resx
index 6994a67..42f906b 100644
--- a/source/WindowsFormsApplication1/Apps/TextPad.resx
+++ b/source/WindowsFormsApplication1/Apps/TextPad.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="tmrcodepointcooldown.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
diff --git a/source/WindowsFormsApplication1/Apps/WidgetManager.Designer.cs b/source/WindowsFormsApplication1/Apps/WidgetManager.Designer.cs
index 4140581..e375a18 100644
--- a/source/WindowsFormsApplication1/Apps/WidgetManager.Designer.cs
+++ b/source/WindowsFormsApplication1/Apps/WidgetManager.Designer.cs
@@ -29,22 +29,22 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.pnlbuttons = new System.Windows.Forms.FlowLayoutPanel();
-            this.btndone = new System.Windows.Forms.Button();
-            this.btnadd = new System.Windows.Forms.Button();
-            this.cbpanel = new System.Windows.Forms.ComboBox();
-            this.txtwidth = new System.Windows.Forms.TextBox();
-            this.lbwidth = new System.Windows.Forms.Label();
-            this.txtx = new System.Windows.Forms.TextBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.lbtitle = new System.Windows.Forms.Label();
-            this.lvwidgets = new System.Windows.Forms.ListView();
-            this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.listView1 = new System.Windows.Forms.ListView();
-            this.tmrcheckvalid = new System.Windows.Forms.Timer(this.components);
-            this.btninstallwidgets = new System.Windows.Forms.Button();
+            this.panel1 = new ShiftUI.Panel();
+            this.pnlbuttons = new ShiftUI.FlowLayoutPanel();
+            this.btndone = new ShiftUI.Button();
+            this.btnadd = new ShiftUI.Button();
+            this.cbpanel = new ShiftUI.ComboBox();
+            this.txtwidth = new ShiftUI.TextBox();
+            this.lbwidth = new ShiftUI.Label();
+            this.txtx = new ShiftUI.TextBox();
+            this.label1 = new ShiftUI.Label();
+            this.lbtitle = new ShiftUI.Label();
+            this.lvwidgets = new ShiftUI.ListView();
+            this.columnHeader1 = ((ShiftUI.ColumnHeader)(new ShiftUI.ColumnHeader()));
+            this.columnHeader2 = ((ShiftUI.ColumnHeader)(new ShiftUI.ColumnHeader()));
+            this.listView1 = new ShiftUI.ListView();
+            this.tmrcheckvalid = new ShiftUI.Timer(this.components);
+            this.btninstallwidgets = new ShiftUI.Button();
             this.panel1.SuspendLayout();
             this.pnlbuttons.SuspendLayout();
             this.SuspendLayout();
@@ -52,11 +52,11 @@
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.White;
-            this.panel1.Controls.Add(this.pnlbuttons);
-            this.panel1.Controls.Add(this.lbtitle);
-            this.panel1.Controls.Add(this.lvwidgets);
-            this.panel1.Controls.Add(this.listView1);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel1.Widgets.Add(this.pnlbuttons);
+            this.panel1.Widgets.Add(this.lbtitle);
+            this.panel1.Widgets.Add(this.lvwidgets);
+            this.panel1.Widgets.Add(this.listView1);
+            this.panel1.Dock = ShiftUI.DockStyle.Fill;
             this.panel1.ForeColor = System.Drawing.Color.Black;
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
@@ -66,16 +66,16 @@
             // pnlbuttons
             // 
             this.pnlbuttons.BackColor = System.Drawing.Color.Gray;
-            this.pnlbuttons.Controls.Add(this.btndone);
-            this.pnlbuttons.Controls.Add(this.btnadd);
-            this.pnlbuttons.Controls.Add(this.cbpanel);
-            this.pnlbuttons.Controls.Add(this.txtwidth);
-            this.pnlbuttons.Controls.Add(this.lbwidth);
-            this.pnlbuttons.Controls.Add(this.txtx);
-            this.pnlbuttons.Controls.Add(this.label1);
-            this.pnlbuttons.Controls.Add(this.btninstallwidgets);
-            this.pnlbuttons.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pnlbuttons.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft;
+            this.pnlbuttons.Widgets.Add(this.btndone);
+            this.pnlbuttons.Widgets.Add(this.btnadd);
+            this.pnlbuttons.Widgets.Add(this.cbpanel);
+            this.pnlbuttons.Widgets.Add(this.txtwidth);
+            this.pnlbuttons.Widgets.Add(this.lbwidth);
+            this.pnlbuttons.Widgets.Add(this.txtx);
+            this.pnlbuttons.Widgets.Add(this.label1);
+            this.pnlbuttons.Widgets.Add(this.btninstallwidgets);
+            this.pnlbuttons.Dock = ShiftUI.DockStyle.Bottom;
+            this.pnlbuttons.FlowDirection = ShiftUI.FlowDirection.RightToLeft;
             this.pnlbuttons.ForeColor = System.Drawing.Color.White;
             this.pnlbuttons.Location = new System.Drawing.Point(0, 429);
             this.pnlbuttons.Name = "pnlbuttons";
@@ -85,8 +85,8 @@
             // btndone
             // 
             this.btndone.AutoSize = true;
-            this.btndone.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btndone.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btndone.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.btndone.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btndone.Location = new System.Drawing.Point(649, 3);
             this.btndone.Name = "btndone";
             this.btndone.Size = new System.Drawing.Size(45, 25);
@@ -98,8 +98,8 @@
             // btnadd
             // 
             this.btnadd.AutoSize = true;
-            this.btnadd.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btnadd.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnadd.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.btnadd.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnadd.Location = new System.Drawing.Point(605, 3);
             this.btnadd.Name = "btnadd";
             this.btnadd.Size = new System.Drawing.Size(38, 25);
@@ -110,8 +110,8 @@
             // 
             // cbpanel
             // 
-            this.cbpanel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cbpanel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.cbpanel.DropDownStyle = ShiftUI.ComboBoxStyle.DropDownList;
+            this.cbpanel.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.cbpanel.FormattingEnabled = true;
             this.cbpanel.Location = new System.Drawing.Point(478, 3);
             this.cbpanel.Name = "cbpanel";
@@ -152,8 +152,8 @@
             // 
             // lbtitle
             // 
-            this.lbtitle.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.lbtitle.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.lbtitle.Font = new System.Drawing.Font("Microsoft Sans Serif", 13F);
             this.lbtitle.Location = new System.Drawing.Point(12, 9);
             this.lbtitle.Name = "lbtitle";
@@ -164,20 +164,20 @@
             // 
             // lvwidgets
             // 
-            this.lvwidgets.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.lvwidgets.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.lvwidgets.Anchor = ((ShiftUI.AnchorStyles)((((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
+            this.lvwidgets.Columns.AddRange(new ShiftUI.ColumnHeader[] {
             this.columnHeader1,
             this.columnHeader2});
             this.lvwidgets.FullRowSelect = true;
-            this.lvwidgets.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
+            this.lvwidgets.HeaderStyle = ShiftUI.ColumnHeaderStyle.Nonclickable;
             this.lvwidgets.Location = new System.Drawing.Point(12, 44);
             this.lvwidgets.Name = "lvwidgets";
             this.lvwidgets.Size = new System.Drawing.Size(673, 381);
             this.lvwidgets.TabIndex = 1;
             this.lvwidgets.UseCompatibleStateImageBehavior = false;
-            this.lvwidgets.View = System.Windows.Forms.View.Details;
+            this.lvwidgets.View = ShiftUI.View.Details;
             this.lvwidgets.SelectedIndexChanged += new System.EventHandler(this.lvwidgets_SelectedIndexChanged);
             // 
             // columnHeader1
@@ -204,8 +204,8 @@
             // btninstallwidgets
             // 
             this.btninstallwidgets.AutoSize = true;
-            this.btninstallwidgets.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btninstallwidgets.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btninstallwidgets.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.btninstallwidgets.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btninstallwidgets.Location = new System.Drawing.Point(152, 3);
             this.btninstallwidgets.Name = "btninstallwidgets";
             this.btninstallwidgets.Size = new System.Drawing.Size(88, 25);
@@ -217,9 +217,9 @@
             // WidgetManager
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(697, 459);
-            this.Controls.Add(this.panel1);
+            this.Widgets.Add(this.panel1);
             this.Name = "WidgetManager";
             this.Text = "WidgetManager";
             this.Load += new System.EventHandler(this.WidgetManager_Load);
@@ -232,21 +232,21 @@
 
         #endregion
 
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.ListView listView1;
-        private System.Windows.Forms.FlowLayoutPanel pnlbuttons;
-        private System.Windows.Forms.Button btndone;
-        private System.Windows.Forms.Button btnadd;
-        private System.Windows.Forms.ComboBox cbpanel;
-        private System.Windows.Forms.Label lbtitle;
-        private System.Windows.Forms.ListView lvwidgets;
-        private System.Windows.Forms.ColumnHeader columnHeader1;
-        private System.Windows.Forms.ColumnHeader columnHeader2;
-        private System.Windows.Forms.TextBox txtwidth;
-        private System.Windows.Forms.Label lbwidth;
-        private System.Windows.Forms.TextBox txtx;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Timer tmrcheckvalid;
-        private System.Windows.Forms.Button btninstallwidgets;
+        private ShiftUI.Panel panel1;
+        private ShiftUI.ListView listView1;
+        private ShiftUI.FlowLayoutPanel pnlbuttons;
+        private ShiftUI.Button btndone;
+        private ShiftUI.Button btnadd;
+        private ShiftUI.ComboBox cbpanel;
+        private ShiftUI.Label lbtitle;
+        private ShiftUI.ListView lvwidgets;
+        private ShiftUI.ColumnHeader columnHeader1;
+        private ShiftUI.ColumnHeader columnHeader2;
+        private ShiftUI.TextBox txtwidth;
+        private ShiftUI.Label lbwidth;
+        private ShiftUI.TextBox txtx;
+        private ShiftUI.Label label1;
+        private ShiftUI.Timer tmrcheckvalid;
+        private ShiftUI.Button btninstallwidgets;
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Apps/WidgetManager.cs b/source/WindowsFormsApplication1/Apps/WidgetManager.cs
index 2a3954f..b04d799 100644
--- a/source/WindowsFormsApplication1/Apps/WidgetManager.cs
+++ b/source/WindowsFormsApplication1/Apps/WidgetManager.cs
@@ -9,7 +9,7 @@ using System.IO.Compression;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
diff --git a/source/WindowsFormsApplication1/Apps/WidgetManager.resx b/source/WindowsFormsApplication1/Apps/WidgetManager.resx
index 27fa601..306ed8c 100644
--- a/source/WindowsFormsApplication1/Apps/WidgetManager.resx
+++ b/source/WindowsFormsApplication1/Apps/WidgetManager.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="tmrcheckvalid.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
diff --git a/source/WindowsFormsApplication1/Controls/Computer.Designer.cs b/source/WindowsFormsApplication1/Controls/Computer.Designer.cs
index 4157592..0a37bc1 100644
--- a/source/WindowsFormsApplication1/Controls/Computer.Designer.cs
+++ b/source/WindowsFormsApplication1/Controls/Computer.Designer.cs
@@ -32,12 +32,12 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.lbstats = new System.Windows.Forms.Label();
+            this.lbstats = new ShiftUI.Label();
             this.SuspendLayout();
             // 
             // lbstats
             // 
-            this.lbstats.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.lbstats.Dock = ShiftUI.DockStyle.Fill;
             this.lbstats.ForeColor = System.Drawing.Color.Black;
             this.lbstats.Location = new System.Drawing.Point(0, 0);
             this.lbstats.Name = "lbstats";
@@ -49,9 +49,9 @@
             // 
             // Computer
             // 
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.None;
             this.BackColor = System.Drawing.Color.White;
-            this.Controls.Add(this.lbstats);
+            this.Widgets.Add(this.lbstats);
             this.Name = "Computer";
             this.Size = new System.Drawing.Size(64, 64);
             this.Load += new System.EventHandler(this.Computer_Load);
@@ -61,6 +61,6 @@
 
         #endregion
 
-        private System.Windows.Forms.Label lbstats;
+        private ShiftUI.Label lbstats;
     }
 }
diff --git a/source/WindowsFormsApplication1/Controls/Computer.cs b/source/WindowsFormsApplication1/Controls/Computer.cs
index ad33a58..a9bfda0 100644
--- a/source/WindowsFormsApplication1/Controls/Computer.cs
+++ b/source/WindowsFormsApplication1/Controls/Computer.cs
@@ -6,11 +6,11 @@ using System.Data;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
-    public partial class Computer : UserControl
+    public partial class Computer : UserWidget
     {
         public int TotalHP = 100;
 
diff --git a/source/WindowsFormsApplication1/Controls/Computer.resx b/source/WindowsFormsApplication1/Controls/Computer.resx
index 1af7de1..ffb4fb5 100644
--- a/source/WindowsFormsApplication1/Controls/Computer.resx
+++ b/source/WindowsFormsApplication1/Controls/Computer.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Controls/Connection.Designer.cs b/source/WindowsFormsApplication1/Controls/Connection.Designer.cs
index 071ff4a..a6ab301 100644
--- a/source/WindowsFormsApplication1/Controls/Connection.Designer.cs
+++ b/source/WindowsFormsApplication1/Controls/Connection.Designer.cs
@@ -33,7 +33,7 @@
             // Connection
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.Name = "Connection";
             this.Size = new System.Drawing.Size(150, 10);
             this.ResumeLayout(false);
diff --git a/source/WindowsFormsApplication1/Controls/Connection.cs b/source/WindowsFormsApplication1/Controls/Connection.cs
index b322581..6829a50 100644
--- a/source/WindowsFormsApplication1/Controls/Connection.cs
+++ b/source/WindowsFormsApplication1/Controls/Connection.cs
@@ -6,11 +6,11 @@ using System.Data;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
-    public partial class Connection : UserControl
+    public partial class Connection : UserWidget
     {
         public Connection()
         {
diff --git a/source/WindowsFormsApplication1/Controls/Connection.resx b/source/WindowsFormsApplication1/Controls/Connection.resx
index 1af7de1..ffb4fb5 100644
--- a/source/WindowsFormsApplication1/Controls/Connection.resx
+++ b/source/WindowsFormsApplication1/Controls/Connection.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Controls/DesktopIcon.Designer.cs b/source/WindowsFormsApplication1/Controls/DesktopIcon.Designer.cs
index 98369ab..48f90a9 100644
--- a/source/WindowsFormsApplication1/Controls/DesktopIcon.Designer.cs
+++ b/source/WindowsFormsApplication1/Controls/DesktopIcon.Designer.cs
@@ -28,8 +28,8 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.pbicon = new System.Windows.Forms.PictureBox();
-            this.lbiconname = new System.Windows.Forms.Label();
+            this.pbicon = new ShiftUI.PictureBox();
+            this.lbiconname = new ShiftUI.Label();
             ((System.ComponentModel.ISupportInitialize)(this.pbicon)).BeginInit();
             this.SuspendLayout();
             // 
@@ -38,7 +38,7 @@
             this.pbicon.Location = new System.Drawing.Point(4, 4);
             this.pbicon.Name = "pbicon";
             this.pbicon.Size = new System.Drawing.Size(78, 50);
-            this.pbicon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+            this.pbicon.SizeMode = ShiftUI.PictureBoxSizeMode.CenterImage;
             this.pbicon.TabIndex = 0;
             this.pbicon.TabStop = false;
             this.pbicon.DoubleClick += new System.EventHandler(this.Icon_Click);
@@ -57,10 +57,10 @@
             // DesktopIcon
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.Transparent;
-            this.Controls.Add(this.lbiconname);
-            this.Controls.Add(this.pbicon);
+            this.Widgets.Add(this.lbiconname);
+            this.Widgets.Add(this.pbicon);
             this.Name = "DesktopIcon";
             this.Size = new System.Drawing.Size(85, 85);
             this.Load += new System.EventHandler(this.DesktopIcon_Load);
@@ -72,7 +72,7 @@
 
         #endregion
 
-        private System.Windows.Forms.PictureBox pbicon;
-        private System.Windows.Forms.Label lbiconname;
+        private ShiftUI.PictureBox pbicon;
+        private ShiftUI.Label lbiconname;
     }
 }
diff --git a/source/WindowsFormsApplication1/Controls/DesktopIcon.cs b/source/WindowsFormsApplication1/Controls/DesktopIcon.cs
index bfb0940..175ccdb 100644
--- a/source/WindowsFormsApplication1/Controls/DesktopIcon.cs
+++ b/source/WindowsFormsApplication1/Controls/DesktopIcon.cs
@@ -6,12 +6,12 @@ using System.Data;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 using System.IO;
 
 namespace ShiftOS
 {
-    public partial class DesktopIcon : UserControl
+    public partial class DesktopIcon : UserWidget
     {
         /// <summary>
         /// User control for a desktop icon.
diff --git a/source/WindowsFormsApplication1/Controls/DesktopIcon.resx b/source/WindowsFormsApplication1/Controls/DesktopIcon.resx
index 1af7de1..ffb4fb5 100644
--- a/source/WindowsFormsApplication1/Controls/DesktopIcon.resx
+++ b/source/WindowsFormsApplication1/Controls/DesktopIcon.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Controls/IconControl.Designer.cs b/source/WindowsFormsApplication1/Controls/IconControl.Designer.cs
index b86f908..62a3cca 100644
--- a/source/WindowsFormsApplication1/Controls/IconControl.Designer.cs
+++ b/source/WindowsFormsApplication1/Controls/IconControl.Designer.cs
@@ -1,6 +1,6 @@
 namespace ShiftOS
 {
-    partial class IconControl
+    partial class IconWidget
     {
         /// <summary> 
         /// Required designer variable.
@@ -28,19 +28,19 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.pblarge = new System.Windows.Forms.PictureBox();
-            this.lbname = new System.Windows.Forms.Label();
+            this.panel1 = new ShiftUI.Panel();
+            this.pblarge = new ShiftUI.PictureBox();
+            this.lbname = new ShiftUI.Label();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pblarge)).BeginInit();
             this.SuspendLayout();
             // 
             // panel1
             // 
-            this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.panel1.Controls.Add(this.pblarge);
-            this.panel1.Controls.Add(this.lbname);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel1.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
+            this.panel1.Widgets.Add(this.pblarge);
+            this.panel1.Widgets.Add(this.lbname);
+            this.panel1.Dock = ShiftUI.DockStyle.Fill;
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
             this.panel1.Size = new System.Drawing.Size(171, 56);
@@ -48,19 +48,19 @@
             // 
             // pblarge
             // 
-            this.pblarge.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pblarge.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pblarge.Location = new System.Drawing.Point(135, 3);
             this.pblarge.Name = "pblarge";
             this.pblarge.Size = new System.Drawing.Size(32, 32);
-            this.pblarge.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+            this.pblarge.SizeMode = ShiftUI.PictureBoxSizeMode.CenterImage;
             this.pblarge.TabIndex = 2;
             this.pblarge.TabStop = false;
             this.pblarge.Click += new System.EventHandler(this.pblarge_Click);
             // 
             // lbname
             // 
-            this.lbname.Cursor = System.Windows.Forms.Cursors.IBeam;
-            this.lbname.Dock = System.Windows.Forms.DockStyle.Left;
+            this.lbname.Cursor = ShiftUI.Cursors.IBeam;
+            this.lbname.Dock = ShiftUI.DockStyle.Left;
             this.lbname.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
             this.lbname.Location = new System.Drawing.Point(0, 0);
             this.lbname.Name = "lbname";
@@ -69,14 +69,14 @@
             this.lbname.Text = "Icon Name";
             this.lbname.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
-            // IconControl
+            // IconWidget
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.panel1);
-            this.Name = "IconControl";
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
+            this.Widgets.Add(this.panel1);
+            this.Name = "IconWidget";
             this.Size = new System.Drawing.Size(171, 56);
-            this.Load += new System.EventHandler(this.IconControl_Load);
+            this.Load += new System.EventHandler(this.IconWidget_Load);
             this.panel1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.pblarge)).EndInit();
             this.ResumeLayout(false);
@@ -85,8 +85,8 @@
 
         #endregion
 
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.Label lbname;
-        private System.Windows.Forms.PictureBox pblarge;
+        private ShiftUI.Panel panel1;
+        private ShiftUI.Label lbname;
+        private ShiftUI.PictureBox pblarge;
     }
 }
diff --git a/source/WindowsFormsApplication1/Controls/IconControl.cs b/source/WindowsFormsApplication1/Controls/IconControl.cs
index e103ced..5971744 100644
--- a/source/WindowsFormsApplication1/Controls/IconControl.cs
+++ b/source/WindowsFormsApplication1/Controls/IconControl.cs
@@ -6,21 +6,21 @@ using System.Data;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 using System.Drawing.Imaging;
 using Newtonsoft.Json;
 using System.IO;
 
 namespace ShiftOS
 {
-    public partial class IconControl : UserControl
+    public partial class IconWidget : UserWidget
     {
-        public IconControl()
+        public IconWidget()
         {
             InitializeComponent();
         }
 
-        private void IconControl_Load(object sender, EventArgs e)
+        private void IconWidget_Load(object sender, EventArgs e)
         {
             pblarge.Top = (this.Height - pblarge.Height) / 2;
         }
diff --git a/source/WindowsFormsApplication1/Controls/IconControl.resx b/source/WindowsFormsApplication1/Controls/IconControl.resx
index 1af7de1..ffb4fb5 100644
--- a/source/WindowsFormsApplication1/Controls/IconControl.resx
+++ b/source/WindowsFormsApplication1/Controls/IconControl.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Controls/ImageSelector.Designer.cs b/source/WindowsFormsApplication1/Controls/ImageSelector.Designer.cs
index 7340ceb..df1ed0c 100644
--- a/source/WindowsFormsApplication1/Controls/ImageSelector.Designer.cs
+++ b/source/WindowsFormsApplication1/Controls/ImageSelector.Designer.cs
@@ -28,14 +28,14 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.label1 = new System.Windows.Forms.Label();
-            this.btnselect = new System.Windows.Forms.Button();
+            this.label1 = new ShiftUI.Label();
+            this.btnselect = new ShiftUI.Button();
             this.SuspendLayout();
             // 
             // label1
             // 
             this.label1.BackColor = System.Drawing.Color.White;
-            this.label1.Dock = System.Windows.Forms.DockStyle.Left;
+            this.label1.Dock = ShiftUI.DockStyle.Left;
             this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
             this.label1.ForeColor = System.Drawing.Color.Black;
             this.label1.Location = new System.Drawing.Point(0, 0);
@@ -47,8 +47,8 @@
             // 
             // btnselect
             // 
-            this.btnselect.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnselect.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnselect.Dock = ShiftUI.DockStyle.Fill;
+            this.btnselect.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnselect.Location = new System.Drawing.Point(186, 0);
             this.btnselect.Name = "btnselect";
             this.btnselect.Size = new System.Drawing.Size(40, 33);
@@ -59,9 +59,9 @@
             // ImageSelector
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.btnselect);
-            this.Controls.Add(this.label1);
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
+            this.Widgets.Add(this.btnselect);
+            this.Widgets.Add(this.label1);
             this.Name = "ImageSelector";
             this.Size = new System.Drawing.Size(226, 33);
             this.ResumeLayout(false);
@@ -70,7 +70,7 @@
 
         #endregion
 
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Button btnselect;
+        private ShiftUI.Label label1;
+        private ShiftUI.Button btnselect;
     }
 }
diff --git a/source/WindowsFormsApplication1/Controls/ImageSelector.cs b/source/WindowsFormsApplication1/Controls/ImageSelector.cs
index b1aa4d2..f912ec8 100644
--- a/source/WindowsFormsApplication1/Controls/ImageSelector.cs
+++ b/source/WindowsFormsApplication1/Controls/ImageSelector.cs
@@ -6,12 +6,12 @@ using System.Data;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 using System.IO;
 
 namespace ShiftOS
 {
-    public partial class ImageSelector : UserControl
+    public partial class ImageSelector : UserWidget
     {
         public ImageSelector()
         {
diff --git a/source/WindowsFormsApplication1/Controls/ImageSelector.resx b/source/WindowsFormsApplication1/Controls/ImageSelector.resx
index 1af7de1..ffb4fb5 100644
--- a/source/WindowsFormsApplication1/Controls/ImageSelector.resx
+++ b/source/WindowsFormsApplication1/Controls/ImageSelector.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Controls/NetModuleStatus.Designer.cs b/source/WindowsFormsApplication1/Controls/NetModuleStatus.Designer.cs
index 31608d4..3770b37 100644
--- a/source/WindowsFormsApplication1/Controls/NetModuleStatus.Designer.cs
+++ b/source/WindowsFormsApplication1/Controls/NetModuleStatus.Designer.cs
@@ -28,14 +28,14 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.lbinfo = new System.Windows.Forms.Label();
+            this.lbinfo = new ShiftUI.Label();
             this.pghealth = new ShiftOS.ProgressBarEX();
             this.SuspendLayout();
             // 
             // lbinfo
             // 
-            this.lbinfo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
+            this.lbinfo.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left)));
             this.lbinfo.Location = new System.Drawing.Point(4, 4);
             this.lbinfo.Name = "lbinfo";
             this.lbinfo.Size = new System.Drawing.Size(102, 22);
@@ -44,9 +44,9 @@
             // 
             // pghealth
             // 
-            this.pghealth.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.pghealth.Anchor = ((ShiftUI.AnchorStyles)((((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.pghealth.BackColor = System.Drawing.Color.Black;
             this.pghealth.BlockSeparation = 3;
             this.pghealth.BlockWidth = 5;
@@ -67,9 +67,9 @@
             // NetModuleStatus
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.lbinfo);
-            this.Controls.Add(this.pghealth);
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
+            this.Widgets.Add(this.lbinfo);
+            this.Widgets.Add(this.pghealth);
             this.Name = "NetModuleStatus";
             this.Size = new System.Drawing.Size(352, 26);
             this.ResumeLayout(false);
@@ -79,6 +79,6 @@
         #endregion
 
         private ProgressBarEX pghealth;
-        private System.Windows.Forms.Label lbinfo;
+        private ShiftUI.Label lbinfo;
     }
 }
diff --git a/source/WindowsFormsApplication1/Controls/NetModuleStatus.cs b/source/WindowsFormsApplication1/Controls/NetModuleStatus.cs
index 037f73a..947bd46 100644
--- a/source/WindowsFormsApplication1/Controls/NetModuleStatus.cs
+++ b/source/WindowsFormsApplication1/Controls/NetModuleStatus.cs
@@ -6,11 +6,11 @@ using System.Data;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
-    public partial class NetModuleStatus : UserControl
+    public partial class NetModuleStatus : UserWidget
     {
         private Module _module = null;
 
diff --git a/source/WindowsFormsApplication1/Controls/NetModuleStatus.resx b/source/WindowsFormsApplication1/Controls/NetModuleStatus.resx
index 1af7de1..ffb4fb5 100644
--- a/source/WindowsFormsApplication1/Controls/NetModuleStatus.resx
+++ b/source/WindowsFormsApplication1/Controls/NetModuleStatus.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Controls/Notification.Designer.cs b/source/WindowsFormsApplication1/Controls/Notification.Designer.cs
index 57b6416..614550c 100644
--- a/source/WindowsFormsApplication1/Controls/Notification.Designer.cs
+++ b/source/WindowsFormsApplication1/Controls/Notification.Designer.cs
@@ -28,8 +28,8 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.lbtitle = new System.Windows.Forms.Label();
-            this.lbmessage = new System.Windows.Forms.Label();
+            this.lbtitle = new ShiftUI.Label();
+            this.lbmessage = new ShiftUI.Label();
             this.SuspendLayout();
             // 
             // lbtitle
@@ -44,9 +44,9 @@
             // 
             // lbmessage
             // 
-            this.lbmessage.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.lbmessage.Anchor = ((ShiftUI.AnchorStyles)((((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.lbmessage.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
             this.lbmessage.Location = new System.Drawing.Point(7, 33);
             this.lbmessage.Name = "lbmessage";
@@ -57,10 +57,10 @@
             // Notification
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.Gray;
-            this.Controls.Add(this.lbmessage);
-            this.Controls.Add(this.lbtitle);
+            this.Widgets.Add(this.lbmessage);
+            this.Widgets.Add(this.lbtitle);
             this.ForeColor = System.Drawing.Color.White;
             this.Name = "Notification";
             this.Size = new System.Drawing.Size(355, 100);
@@ -72,7 +72,7 @@
 
         #endregion
 
-        private System.Windows.Forms.Label lbtitle;
-        private System.Windows.Forms.Label lbmessage;
+        private ShiftUI.Label lbtitle;
+        private ShiftUI.Label lbmessage;
     }
 }
diff --git a/source/WindowsFormsApplication1/Controls/Notification.cs b/source/WindowsFormsApplication1/Controls/Notification.cs
index b5e1693..7fd5574 100644
--- a/source/WindowsFormsApplication1/Controls/Notification.cs
+++ b/source/WindowsFormsApplication1/Controls/Notification.cs
@@ -6,11 +6,11 @@ using System.Data;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
-    public partial class Notification : UserControl
+    public partial class Notification : UserWidget
     {
         public Notification(string title, string text)
         {
diff --git a/source/WindowsFormsApplication1/Controls/Notification.resx b/source/WindowsFormsApplication1/Controls/Notification.resx
index 1af7de1..ffb4fb5 100644
--- a/source/WindowsFormsApplication1/Controls/Notification.resx
+++ b/source/WindowsFormsApplication1/Controls/Notification.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Controls/ProgressBarEX.Designer.cs b/source/WindowsFormsApplication1/Controls/ProgressBarEX.Designer.cs
index 219fb73..847868a 100644
--- a/source/WindowsFormsApplication1/Controls/ProgressBarEX.Designer.cs
+++ b/source/WindowsFormsApplication1/Controls/ProgressBarEX.Designer.cs
@@ -27,7 +27,7 @@
             // ProgressBarEX
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.Name = "ProgressBarEX";
             this.Size = new System.Drawing.Size(340, 32);
             this.ResumeLayout(false);
diff --git a/source/WindowsFormsApplication1/Controls/ProgressBarEX.cs b/source/WindowsFormsApplication1/Controls/ProgressBarEX.cs
index 4896292..d89969e 100644
--- a/source/WindowsFormsApplication1/Controls/ProgressBarEX.cs
+++ b/source/WindowsFormsApplication1/Controls/ProgressBarEX.cs
@@ -6,11 +6,11 @@ using System.Data;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
-    public partial class ProgressBarEX : UserControl
+    public partial class ProgressBarEX : UserWidget
     {
         public ProgressBarEX()
         {
@@ -279,7 +279,7 @@ namespace ShiftOS
 
 #region " Drawing "
 
-        protected override void OnPaint(System.Windows.Forms.PaintEventArgs e)
+        protected override void OnPaint(ShiftUI.PaintEventArgs e)
         {
             base.OnPaint(e);
             DoPaintBackground(e.Graphics);
diff --git a/source/WindowsFormsApplication1/Controls/ProgressBarEX.resx b/source/WindowsFormsApplication1/Controls/ProgressBarEX.resx
index 1af7de1..ffb4fb5 100644
--- a/source/WindowsFormsApplication1/Controls/ProgressBarEX.resx
+++ b/source/WindowsFormsApplication1/Controls/ProgressBarEX.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Controls/ShifterColorInput.Designer.cs b/source/WindowsFormsApplication1/Controls/ShifterColorInput.Designer.cs
index 47cf0a1..3703960 100644
--- a/source/WindowsFormsApplication1/Controls/ShifterColorInput.Designer.cs
+++ b/source/WindowsFormsApplication1/Controls/ShifterColorInput.Designer.cs
@@ -28,15 +28,15 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.pnlmainbuttoncolour = new System.Windows.Forms.Panel();
-            this.lblabel = new System.Windows.Forms.Label();
+            this.pnlmainbuttoncolour = new ShiftUI.Panel();
+            this.lblabel = new ShiftUI.Label();
             this.SuspendLayout();
             // 
             // pnlmainbuttoncolour
             // 
-            this.pnlmainbuttoncolour.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnlmainbuttoncolour.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlmainbuttoncolour.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Right)));
+            this.pnlmainbuttoncolour.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlmainbuttoncolour.Location = new System.Drawing.Point(128, 3);
             this.pnlmainbuttoncolour.MaximumSize = new System.Drawing.Size(41, 20);
             this.pnlmainbuttoncolour.Name = "pnlmainbuttoncolour";
@@ -45,9 +45,9 @@
             // 
             // lblabel
             // 
-            this.lblabel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.lblabel.Anchor = ((ShiftUI.AnchorStyles)((((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.lblabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.lblabel.Location = new System.Drawing.Point(3, 6);
             this.lblabel.Name = "lblabel";
@@ -59,9 +59,9 @@
             // ShifterColorInput
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.pnlmainbuttoncolour);
-            this.Controls.Add(this.lblabel);
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
+            this.Widgets.Add(this.pnlmainbuttoncolour);
+            this.Widgets.Add(this.lblabel);
             this.Name = "ShifterColorInput";
             this.Size = new System.Drawing.Size(173, 28);
             this.ResumeLayout(false);
@@ -70,8 +70,8 @@
 
         #endregion
 
-        private System.Windows.Forms.Panel pnlmainbuttoncolour;
-        private System.Windows.Forms.Label lblabel;
+        private ShiftUI.Panel pnlmainbuttoncolour;
+        private ShiftUI.Label lblabel;
 
     }
 }
diff --git a/source/WindowsFormsApplication1/Controls/ShifterColorInput.cs b/source/WindowsFormsApplication1/Controls/ShifterColorInput.cs
index 11bedf0..67d18f4 100644
--- a/source/WindowsFormsApplication1/Controls/ShifterColorInput.cs
+++ b/source/WindowsFormsApplication1/Controls/ShifterColorInput.cs
@@ -6,7 +6,7 @@ using System.Data;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
diff --git a/source/WindowsFormsApplication1/Controls/ShifterColorInput.resx b/source/WindowsFormsApplication1/Controls/ShifterColorInput.resx
index 1af7de1..ffb4fb5 100644
--- a/source/WindowsFormsApplication1/Controls/ShifterColorInput.resx
+++ b/source/WindowsFormsApplication1/Controls/ShifterColorInput.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Controls/ShifterGraphicInput.Designer.cs b/source/WindowsFormsApplication1/Controls/ShifterGraphicInput.Designer.cs
index b09416f..4b9f262 100644
--- a/source/WindowsFormsApplication1/Controls/ShifterGraphicInput.Designer.cs
+++ b/source/WindowsFormsApplication1/Controls/ShifterGraphicInput.Designer.cs
@@ -28,15 +28,15 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.pnlmainbuttoncolour = new System.Windows.Forms.Panel();
-            this.lblabel = new System.Windows.Forms.Label();
+            this.pnlmainbuttoncolour = new ShiftUI.Panel();
+            this.lblabel = new ShiftUI.Label();
             this.SuspendLayout();
             // 
             // pnlmainbuttoncolour
             // 
-            this.pnlmainbuttoncolour.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnlmainbuttoncolour.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlmainbuttoncolour.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Right)));
+            this.pnlmainbuttoncolour.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlmainbuttoncolour.Location = new System.Drawing.Point(129, 3);
             this.pnlmainbuttoncolour.MaximumSize = new System.Drawing.Size(41, 20);
             this.pnlmainbuttoncolour.Name = "pnlmainbuttoncolour";
@@ -45,9 +45,9 @@
             // 
             // lblabel
             // 
-            this.lblabel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.lblabel.Anchor = ((ShiftUI.AnchorStyles)((((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.lblabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.lblabel.Location = new System.Drawing.Point(3, 6);
             this.lblabel.Name = "lblabel";
@@ -59,9 +59,9 @@
             // ShifterGraphicInput
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.pnlmainbuttoncolour);
-            this.Controls.Add(this.lblabel);
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
+            this.Widgets.Add(this.pnlmainbuttoncolour);
+            this.Widgets.Add(this.lblabel);
             this.Name = "ShifterGraphicInput";
             this.Size = new System.Drawing.Size(174, 27);
             this.ResumeLayout(false);
@@ -70,7 +70,7 @@
 
         #endregion
 
-        private System.Windows.Forms.Panel pnlmainbuttoncolour;
-        private System.Windows.Forms.Label lblabel;
+        private ShiftUI.Panel pnlmainbuttoncolour;
+        private ShiftUI.Label lblabel;
     }
 }
diff --git a/source/WindowsFormsApplication1/Controls/ShifterGraphicInput.cs b/source/WindowsFormsApplication1/Controls/ShifterGraphicInput.cs
index 8e15e07..d0c9310 100644
--- a/source/WindowsFormsApplication1/Controls/ShifterGraphicInput.cs
+++ b/source/WindowsFormsApplication1/Controls/ShifterGraphicInput.cs
@@ -6,7 +6,7 @@ using System.Data;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
diff --git a/source/WindowsFormsApplication1/Controls/ShifterGraphicInput.resx b/source/WindowsFormsApplication1/Controls/ShifterGraphicInput.resx
index 1af7de1..ffb4fb5 100644
--- a/source/WindowsFormsApplication1/Controls/ShifterGraphicInput.resx
+++ b/source/WindowsFormsApplication1/Controls/ShifterGraphicInput.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Controls/ShifterIntInput.Designer.cs b/source/WindowsFormsApplication1/Controls/ShifterIntInput.Designer.cs
index 130db0c..365786c 100644
--- a/source/WindowsFormsApplication1/Controls/ShifterIntInput.Designer.cs
+++ b/source/WindowsFormsApplication1/Controls/ShifterIntInput.Designer.cs
@@ -28,16 +28,16 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.txttext = new System.Windows.Forms.TextBox();
-            this.Label51 = new System.Windows.Forms.Label();
+            this.txttext = new ShiftUI.TextBox();
+            this.Label51 = new ShiftUI.Label();
             this.SuspendLayout();
             // 
             // txttext
             // 
-            this.txttext.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.txttext.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Right)));
             this.txttext.BackColor = System.Drawing.Color.White;
-            this.txttext.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txttext.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txttext.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txttext.ForeColor = System.Drawing.Color.Black;
             this.txttext.Location = new System.Drawing.Point(174, 3);
@@ -49,9 +49,9 @@
             // 
             // Label51
             // 
-            this.Label51.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.Label51.Anchor = ((ShiftUI.AnchorStyles)((((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.Label51.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.Label51.Location = new System.Drawing.Point(0, 0);
             this.Label51.Name = "Label51";
@@ -63,10 +63,10 @@
             // ShifterIntInput
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.Controls.Add(this.txttext);
-            this.Controls.Add(this.Label51);
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
+            this.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.Widgets.Add(this.txttext);
+            this.Widgets.Add(this.Label51);
             this.Name = "ShifterIntInput";
             this.Size = new System.Drawing.Size(213, 29);
             this.ResumeLayout(false);
@@ -76,8 +76,8 @@
 
         #endregion
 
-        private System.Windows.Forms.TextBox txttext;
-        private System.Windows.Forms.Label Label51;
+        private ShiftUI.TextBox txttext;
+        private ShiftUI.Label Label51;
 
     }
 }
diff --git a/source/WindowsFormsApplication1/Controls/ShifterIntInput.cs b/source/WindowsFormsApplication1/Controls/ShifterIntInput.cs
index 782d265..7c438a5 100644
--- a/source/WindowsFormsApplication1/Controls/ShifterIntInput.cs
+++ b/source/WindowsFormsApplication1/Controls/ShifterIntInput.cs
@@ -6,7 +6,7 @@ using System.Data;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
diff --git a/source/WindowsFormsApplication1/Controls/ShifterIntInput.resx b/source/WindowsFormsApplication1/Controls/ShifterIntInput.resx
index 1af7de1..ffb4fb5 100644
--- a/source/WindowsFormsApplication1/Controls/ShifterIntInput.resx
+++ b/source/WindowsFormsApplication1/Controls/ShifterIntInput.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Controls/ShifterTextInput.Designer.cs b/source/WindowsFormsApplication1/Controls/ShifterTextInput.Designer.cs
index 9da62c6..db028b1 100644
--- a/source/WindowsFormsApplication1/Controls/ShifterTextInput.Designer.cs
+++ b/source/WindowsFormsApplication1/Controls/ShifterTextInput.Designer.cs
@@ -28,15 +28,15 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.txttext = new System.Windows.Forms.TextBox();
-            this.Label51 = new System.Windows.Forms.Label();
+            this.txttext = new ShiftUI.TextBox();
+            this.Label51 = new ShiftUI.Label();
             this.SuspendLayout();
             // 
             // txttext
             // 
-            this.txttext.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.txttext.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Right)));
             this.txttext.BackColor = System.Drawing.Color.White;
-            this.txttext.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txttext.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txttext.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txttext.ForeColor = System.Drawing.Color.Black;
             this.txttext.Location = new System.Drawing.Point(106, 7);
@@ -47,7 +47,7 @@
             // 
             // Label51
             // 
-            this.Label51.Dock = System.Windows.Forms.DockStyle.Left;
+            this.Label51.Dock = ShiftUI.DockStyle.Left;
             this.Label51.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.Label51.Location = new System.Drawing.Point(0, 0);
             this.Label51.Name = "Label51";
@@ -59,10 +59,10 @@
             // ShifterTextInput
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.Controls.Add(this.txttext);
-            this.Controls.Add(this.Label51);
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
+            this.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.Widgets.Add(this.txttext);
+            this.Widgets.Add(this.Label51);
             this.Name = "ShifterTextInput";
             this.Size = new System.Drawing.Size(222, 29);
             this.ResumeLayout(false);
@@ -72,7 +72,7 @@
 
         #endregion
 
-        private System.Windows.Forms.TextBox txttext;
-        private System.Windows.Forms.Label Label51;
+        private ShiftUI.TextBox txttext;
+        private ShiftUI.Label Label51;
     }
 }
diff --git a/source/WindowsFormsApplication1/Controls/ShifterTextInput.cs b/source/WindowsFormsApplication1/Controls/ShifterTextInput.cs
index 6e59649..24dbf8d 100644
--- a/source/WindowsFormsApplication1/Controls/ShifterTextInput.cs
+++ b/source/WindowsFormsApplication1/Controls/ShifterTextInput.cs
@@ -6,7 +6,7 @@ using System.Data;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
@@ -50,7 +50,7 @@ namespace ShiftOS
         
     }
 
-    public class IShifterSetting : UserControl
+    public class IShifterSetting : UserWidget
     {
         public virtual string Text { get; set; }
         public virtual object Value { get; set; }
diff --git a/source/WindowsFormsApplication1/Controls/ShifterTextInput.resx b/source/WindowsFormsApplication1/Controls/ShifterTextInput.resx
index 1af7de1..ffb4fb5 100644
--- a/source/WindowsFormsApplication1/Controls/ShifterTextInput.resx
+++ b/source/WindowsFormsApplication1/Controls/ShifterTextInput.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Controls/SyntaxHighlighter.cs b/source/WindowsFormsApplication1/Controls/SyntaxHighlighter.cs
index d973303..8a5e123 100644
--- a/source/WindowsFormsApplication1/Controls/SyntaxHighlighter.cs
+++ b/source/WindowsFormsApplication1/Controls/SyntaxHighlighter.cs
@@ -4,14 +4,14 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using System.IO;
-using System.Windows.Forms;
+using ShiftUI;
 using System.ComponentModel;
 using System.Text.RegularExpressions;
 using System.Drawing;
 
 namespace ShiftOS
 {
-    public class SyntaxRichTextBox : System.Windows.Forms.RichTextBox
+    public class SyntaxRichTextBox : ShiftUI.RichTextBox
     {
         private SyntaxSettings m_settings = new SyntaxSettings();
         private static bool m_bPaint = true;
@@ -35,7 +35,7 @@ namespace ShiftOS
         /// WndProc
         /// </summary>
         /// <param name="m"></param>
-        protected override void WndProc(ref System.Windows.Forms.Message m)
+        protected override void WndProc(ref ShiftUI.Message m)
         {
             if (m.Msg == 0x00f)
             {
diff --git a/source/WindowsFormsApplication1/Controls/WindowBorder.Designer.cs b/source/WindowsFormsApplication1/Controls/WindowBorder.Designer.cs
index 6e0970e..01161eb 100644
--- a/source/WindowsFormsApplication1/Controls/WindowBorder.Designer.cs
+++ b/source/WindowsFormsApplication1/Controls/WindowBorder.Designer.cs
@@ -25,23 +25,23 @@ namespace ShiftOS
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            this.pgleft = new System.Windows.Forms.Panel();
-            this.pgbottomlcorner = new System.Windows.Forms.Panel();
-            this.pgright = new System.Windows.Forms.Panel();
-            this.pgbottomrcorner = new System.Windows.Forms.Panel();
-            this.titlebar = new System.Windows.Forms.Panel();
-            this.minimizebutton = new System.Windows.Forms.Panel();
-            this.pnlicon = new System.Windows.Forms.PictureBox();
-            this.rollupbutton = new System.Windows.Forms.Panel();
-            this.closebutton = new System.Windows.Forms.Panel();
-            this.lbtitletext = new System.Windows.Forms.Label();
-            this.pgtoplcorner = new System.Windows.Forms.Panel();
-            this.pgtoprcorner = new System.Windows.Forms.Panel();
-            this.pgbottom = new System.Windows.Forms.Panel();
-            this.pgcontents = new System.Windows.Forms.Panel();
-            this.pullbs = new System.Windows.Forms.Timer(this.components);
-            this.pullbottom = new System.Windows.Forms.Timer(this.components);
-            this.pullside = new System.Windows.Forms.Timer(this.components);
+            this.pgleft = new ShiftUI.Panel();
+            this.pgbottomlcorner = new ShiftUI.Panel();
+            this.pgright = new ShiftUI.Panel();
+            this.pgbottomrcorner = new ShiftUI.Panel();
+            this.titlebar = new ShiftUI.Panel();
+            this.minimizebutton = new ShiftUI.Panel();
+            this.pnlicon = new ShiftUI.PictureBox();
+            this.rollupbutton = new ShiftUI.Panel();
+            this.closebutton = new ShiftUI.Panel();
+            this.lbtitletext = new ShiftUI.Label();
+            this.pgtoplcorner = new ShiftUI.Panel();
+            this.pgtoprcorner = new ShiftUI.Panel();
+            this.pgbottom = new ShiftUI.Panel();
+            this.pgcontents = new ShiftUI.Panel();
+            this.pullbs = new ShiftUI.Timer(this.components);
+            this.pullbottom = new ShiftUI.Timer(this.components);
+            this.pullside = new ShiftUI.Timer(this.components);
             this.pgleft.SuspendLayout();
             this.pgright.SuspendLayout();
             this.titlebar.SuspendLayout();
@@ -51,76 +51,76 @@ namespace ShiftOS
             // pgleft
             // 
             this.pgleft.BackColor = System.Drawing.Color.Gray;
-            this.pgleft.Controls.Add(this.pgbottomlcorner);
-            this.pgleft.Dock = System.Windows.Forms.DockStyle.Left;
+            this.pgleft.Widgets.Add(this.pgbottomlcorner);
+            this.pgleft.Dock = ShiftUI.DockStyle.Left;
             this.pgleft.Location = new System.Drawing.Point(0, 30);
             this.pgleft.Name = "pgleft";
             this.pgleft.Size = new System.Drawing.Size(2, 345);
             this.pgleft.TabIndex = 16;
-            this.pgleft.MouseDown += new System.Windows.Forms.MouseEventHandler(this.Rightpull_MouseDown);
+            this.pgleft.MouseDown += new ShiftUI.MouseEventHandler(this.Rightpull_MouseDown);
             this.pgleft.MouseEnter += new System.EventHandler(this.RightCursorOn_MouseDown);
             this.pgleft.MouseLeave += new System.EventHandler(this.SizeCursoroff_MouseDown);
-            this.pgleft.MouseUp += new System.Windows.Forms.MouseEventHandler(this.rightpull_MouseUp);
+            this.pgleft.MouseUp += new ShiftUI.MouseEventHandler(this.rightpull_MouseUp);
             // 
             // pgbottomlcorner
             // 
             this.pgbottomlcorner.BackColor = System.Drawing.Color.Red;
-            this.pgbottomlcorner.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.pgbottomlcorner.Dock = ShiftUI.DockStyle.Bottom;
             this.pgbottomlcorner.Location = new System.Drawing.Point(0, 343);
             this.pgbottomlcorner.Name = "pgbottomlcorner";
             this.pgbottomlcorner.Size = new System.Drawing.Size(2, 2);
             this.pgbottomlcorner.TabIndex = 14;
-            this.pgbottomlcorner.MouseDown += new System.Windows.Forms.MouseEventHandler(this.bspull_MouseDown);
+            this.pgbottomlcorner.MouseDown += new ShiftUI.MouseEventHandler(this.bspull_MouseDown);
             this.pgbottomlcorner.MouseEnter += new System.EventHandler(this.CornerCursorOn_MouseDown);
             this.pgbottomlcorner.MouseLeave += new System.EventHandler(this.SizeCursoroff_MouseDown);
-            this.pgbottomlcorner.MouseUp += new System.Windows.Forms.MouseEventHandler(this.bspull_MouseUp);
+            this.pgbottomlcorner.MouseUp += new ShiftUI.MouseEventHandler(this.bspull_MouseUp);
             // 
             // pgright
             // 
             this.pgright.BackColor = System.Drawing.Color.Gray;
-            this.pgright.Controls.Add(this.pgbottomrcorner);
-            this.pgright.Dock = System.Windows.Forms.DockStyle.Right;
+            this.pgright.Widgets.Add(this.pgbottomrcorner);
+            this.pgright.Dock = ShiftUI.DockStyle.Right;
             this.pgright.Location = new System.Drawing.Point(545, 30);
             this.pgright.Name = "pgright";
             this.pgright.Size = new System.Drawing.Size(2, 345);
             this.pgright.TabIndex = 17;
-            this.pgright.MouseDown += new System.Windows.Forms.MouseEventHandler(this.Rightpull_MouseDown);
+            this.pgright.MouseDown += new ShiftUI.MouseEventHandler(this.Rightpull_MouseDown);
             this.pgright.MouseEnter += new System.EventHandler(this.RightCursorOn_MouseDown);
             this.pgright.MouseLeave += new System.EventHandler(this.SizeCursoroff_MouseDown);
-            this.pgright.MouseUp += new System.Windows.Forms.MouseEventHandler(this.rightpull_MouseUp);
+            this.pgright.MouseUp += new ShiftUI.MouseEventHandler(this.rightpull_MouseUp);
             // 
             // pgbottomrcorner
             // 
             this.pgbottomrcorner.BackColor = System.Drawing.Color.Red;
-            this.pgbottomrcorner.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.pgbottomrcorner.Dock = ShiftUI.DockStyle.Bottom;
             this.pgbottomrcorner.Location = new System.Drawing.Point(0, 343);
             this.pgbottomrcorner.Name = "pgbottomrcorner";
             this.pgbottomrcorner.Size = new System.Drawing.Size(2, 2);
             this.pgbottomrcorner.TabIndex = 15;
-            this.pgbottomrcorner.MouseDown += new System.Windows.Forms.MouseEventHandler(this.bspull_MouseDown);
+            this.pgbottomrcorner.MouseDown += new ShiftUI.MouseEventHandler(this.bspull_MouseDown);
             this.pgbottomrcorner.MouseEnter += new System.EventHandler(this.CornerCursorOn_MouseDown);
             this.pgbottomrcorner.MouseLeave += new System.EventHandler(this.SizeCursoroff_MouseDown);
-            this.pgbottomrcorner.MouseUp += new System.Windows.Forms.MouseEventHandler(this.bspull_MouseUp);
+            this.pgbottomrcorner.MouseUp += new ShiftUI.MouseEventHandler(this.bspull_MouseUp);
             // 
             // titlebar
             // 
             this.titlebar.BackColor = System.Drawing.Color.Gray;
-            this.titlebar.Controls.Add(this.minimizebutton);
-            this.titlebar.Controls.Add(this.pnlicon);
-            this.titlebar.Controls.Add(this.rollupbutton);
-            this.titlebar.Controls.Add(this.closebutton);
-            this.titlebar.Controls.Add(this.lbtitletext);
-            this.titlebar.Controls.Add(this.pgtoplcorner);
-            this.titlebar.Controls.Add(this.pgtoprcorner);
-            this.titlebar.Dock = System.Windows.Forms.DockStyle.Top;
+            this.titlebar.Widgets.Add(this.minimizebutton);
+            this.titlebar.Widgets.Add(this.pnlicon);
+            this.titlebar.Widgets.Add(this.rollupbutton);
+            this.titlebar.Widgets.Add(this.closebutton);
+            this.titlebar.Widgets.Add(this.lbtitletext);
+            this.titlebar.Widgets.Add(this.pgtoplcorner);
+            this.titlebar.Widgets.Add(this.pgtoprcorner);
+            this.titlebar.Dock = ShiftUI.DockStyle.Top;
             this.titlebar.ForeColor = System.Drawing.Color.White;
             this.titlebar.Location = new System.Drawing.Point(0, 0);
             this.titlebar.Name = "titlebar";
             this.titlebar.Size = new System.Drawing.Size(547, 30);
             this.titlebar.TabIndex = 14;
-            this.titlebar.MouseDown += new System.Windows.Forms.MouseEventHandler(this.titlebar_MouseDown);
-            this.titlebar.MouseMove += new System.Windows.Forms.MouseEventHandler(this.titlebar_MouseMove);
-            this.titlebar.MouseUp += new System.Windows.Forms.MouseEventHandler(this.titlebar_MouseUp);
+            this.titlebar.MouseDown += new ShiftUI.MouseEventHandler(this.titlebar_MouseDown);
+            this.titlebar.MouseMove += new ShiftUI.MouseEventHandler(this.titlebar_MouseMove);
+            this.titlebar.MouseUp += new ShiftUI.MouseEventHandler(this.titlebar_MouseUp);
             // 
             // minimizebutton
             // 
@@ -137,7 +137,7 @@ namespace ShiftOS
             this.pnlicon.Location = new System.Drawing.Point(8, 8);
             this.pnlicon.Name = "pnlicon";
             this.pnlicon.Size = new System.Drawing.Size(16, 16);
-            this.pnlicon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+            this.pnlicon.SizeMode = ShiftUI.PictureBoxSizeMode.StretchImage;
             this.pnlicon.TabIndex = 24;
             this.pnlicon.TabStop = false;
             this.pnlicon.Visible = false;
@@ -170,14 +170,14 @@ namespace ShiftOS
             this.lbtitletext.Size = new System.Drawing.Size(77, 18);
             this.lbtitletext.TabIndex = 19;
             this.lbtitletext.Text = "Template";
-            this.lbtitletext.MouseDown += new System.Windows.Forms.MouseEventHandler(this.titlebar_MouseDown);
-            this.lbtitletext.MouseMove += new System.Windows.Forms.MouseEventHandler(this.titlebar_MouseMove);
-            this.lbtitletext.MouseUp += new System.Windows.Forms.MouseEventHandler(this.titlebar_MouseUp);
+            this.lbtitletext.MouseDown += new ShiftUI.MouseEventHandler(this.titlebar_MouseDown);
+            this.lbtitletext.MouseMove += new ShiftUI.MouseEventHandler(this.titlebar_MouseMove);
+            this.lbtitletext.MouseUp += new ShiftUI.MouseEventHandler(this.titlebar_MouseUp);
             // 
             // pgtoplcorner
             // 
             this.pgtoplcorner.BackColor = System.Drawing.Color.Red;
-            this.pgtoplcorner.Dock = System.Windows.Forms.DockStyle.Left;
+            this.pgtoplcorner.Dock = ShiftUI.DockStyle.Left;
             this.pgtoplcorner.Location = new System.Drawing.Point(0, 0);
             this.pgtoplcorner.Name = "pgtoplcorner";
             this.pgtoplcorner.Size = new System.Drawing.Size(2, 30);
@@ -186,7 +186,7 @@ namespace ShiftOS
             // pgtoprcorner
             // 
             this.pgtoprcorner.BackColor = System.Drawing.Color.Red;
-            this.pgtoprcorner.Dock = System.Windows.Forms.DockStyle.Right;
+            this.pgtoprcorner.Dock = ShiftUI.DockStyle.Right;
             this.pgtoprcorner.Location = new System.Drawing.Point(545, 0);
             this.pgtoprcorner.Name = "pgtoprcorner";
             this.pgtoprcorner.Size = new System.Drawing.Size(2, 30);
@@ -195,19 +195,19 @@ namespace ShiftOS
             // pgbottom
             // 
             this.pgbottom.BackColor = System.Drawing.Color.Gray;
-            this.pgbottom.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.pgbottom.Dock = ShiftUI.DockStyle.Bottom;
             this.pgbottom.Location = new System.Drawing.Point(2, 373);
             this.pgbottom.Name = "pgbottom";
             this.pgbottom.Size = new System.Drawing.Size(543, 2);
             this.pgbottom.TabIndex = 18;
-            this.pgbottom.MouseDown += new System.Windows.Forms.MouseEventHandler(this.bottompull_MouseDown);
+            this.pgbottom.MouseDown += new ShiftUI.MouseEventHandler(this.bottompull_MouseDown);
             this.pgbottom.MouseEnter += new System.EventHandler(this.bottomCursorOn_MouseDown);
             this.pgbottom.MouseLeave += new System.EventHandler(this.SizeCursoroff_MouseDown);
-            this.pgbottom.MouseUp += new System.Windows.Forms.MouseEventHandler(this.bottompull_MouseUp);
+            this.pgbottom.MouseUp += new ShiftUI.MouseEventHandler(this.bottompull_MouseUp);
             // 
             // pgcontents
             // 
-            this.pgcontents.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pgcontents.Dock = ShiftUI.DockStyle.Fill;
             this.pgcontents.Location = new System.Drawing.Point(2, 30);
             this.pgcontents.Name = "pgcontents";
             this.pgcontents.Size = new System.Drawing.Size(543, 343);
@@ -231,12 +231,12 @@ namespace ShiftOS
             // WindowBorder
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.pgcontents);
-            this.Controls.Add(this.pgbottom);
-            this.Controls.Add(this.pgright);
-            this.Controls.Add(this.pgleft);
-            this.Controls.Add(this.titlebar);
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
+            this.Widgets.Add(this.pgcontents);
+            this.Widgets.Add(this.pgbottom);
+            this.Widgets.Add(this.pgright);
+            this.Widgets.Add(this.pgleft);
+            this.Widgets.Add(this.titlebar);
             this.Name = "WindowBorder";
             this.Size = new System.Drawing.Size(547, 375);
             this.Load += new System.EventHandler(this.Template_Load);
@@ -248,23 +248,23 @@ namespace ShiftOS
             this.ResumeLayout(false);
 
         }
-        internal System.Windows.Forms.Panel pgleft;
-        internal System.Windows.Forms.Panel pgbottomlcorner;
-        internal System.Windows.Forms.Panel pgright;
-        internal System.Windows.Forms.Panel pgbottomrcorner;
-        internal System.Windows.Forms.Panel titlebar;
-        internal System.Windows.Forms.Panel pgtoplcorner;
-        internal System.Windows.Forms.Panel pgtoprcorner;
-        internal System.Windows.Forms.Panel pgbottom;
-        internal System.Windows.Forms.Panel pgcontents;
-        internal System.Windows.Forms.Label lbtitletext;
-        internal System.Windows.Forms.Panel closebutton;
-        internal System.Windows.Forms.Panel rollupbutton;
-        internal System.Windows.Forms.PictureBox pnlicon;
-        internal System.Windows.Forms.Panel minimizebutton;
-        internal System.Windows.Forms.Timer pullbs;
-        internal System.Windows.Forms.Timer pullbottom;
-        internal System.Windows.Forms.Timer pullside;
+        internal ShiftUI.Panel pgleft;
+        internal ShiftUI.Panel pgbottomlcorner;
+        internal ShiftUI.Panel pgright;
+        internal ShiftUI.Panel pgbottomrcorner;
+        internal ShiftUI.Panel titlebar;
+        internal ShiftUI.Panel pgtoplcorner;
+        internal ShiftUI.Panel pgtoprcorner;
+        internal ShiftUI.Panel pgbottom;
+        internal ShiftUI.Panel pgcontents;
+        internal ShiftUI.Label lbtitletext;
+        internal ShiftUI.Panel closebutton;
+        internal ShiftUI.Panel rollupbutton;
+        internal ShiftUI.PictureBox pnlicon;
+        internal ShiftUI.Panel minimizebutton;
+        internal ShiftUI.Timer pullbs;
+        internal ShiftUI.Timer pullbottom;
+        internal ShiftUI.Timer pullside;
 
     }
 }
diff --git a/source/WindowsFormsApplication1/Controls/WindowBorder.cs b/source/WindowsFormsApplication1/Controls/WindowBorder.cs
index 50f245d..fec7eea 100644
--- a/source/WindowsFormsApplication1/Controls/WindowBorder.cs
+++ b/source/WindowsFormsApplication1/Controls/WindowBorder.cs
@@ -6,11 +6,11 @@ using System.Data;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
-    public partial class WindowBorder : UserControl
+    public partial class WindowBorder : UserWidget
     {
         public Timer updater = new Timer();
 
@@ -18,20 +18,20 @@ namespace ShiftOS
 
         //Lua Methods
 
-        public void RegisterWidget(string ident, Control ctrl)
+        public void RegisterWidget(string ident, Widget ctrl)
         {
-            _widgets.Add(new BorderWidget { Identifier = ident, Control = ctrl });
+            _widgets.Add(new BorderWidget { Identifier = ident, Widget = ctrl });
             resettitlebar();
         }
 
-        public Control GetWidget(string ident)
+        public Widget GetWidget(string ident)
         {
-            Control ctrl = null;
+            Widget ctrl = null;
             foreach(var widget in _widgets)
             {
                 if(widget.Identifier == ident)
                 {
-                    ctrl = widget.Control;
+                    ctrl = widget.Widget;
                 }
             }
             if (ctrl == null)
@@ -51,11 +51,11 @@ namespace ShiftOS
             }
             if (ctrl == null)
                 throw new Exception($"The identifier {ident} was not found.");
-            var wControl = ctrl.Control;
-            wControl.Parent.Controls.Remove(wControl);
-            wControl.Hide();
+            var wWidget = ctrl.Widget;
+            wWidget.Parent.Widgets.Remove(wWidget);
+            wWidget.Hide();
             _widgets.Remove(ctrl);
-            wControl.Dispose();
+            wWidget.Dispose();
         }
 
 
@@ -596,7 +596,7 @@ namespace ShiftOS
 
         //delete this for non-resizable windows
         // ERROR: Handles clauses are not supported in C#
-        private void Rightpull_MouseDown(object sender, System.Windows.Forms.MouseEventArgs e)
+        private void Rightpull_MouseDown(object sender, ShiftUI.MouseEventArgs e)
         {
             if (API.Upgrades["resizablewindows"] == true)
             {
@@ -641,7 +641,7 @@ namespace ShiftOS
         }
 
         // ERROR: Handles clauses are not supported in C#
-        private void rightpull_MouseUp(object sender, System.Windows.Forms.MouseEventArgs e)
+        private void rightpull_MouseUp(object sender, ShiftUI.MouseEventArgs e)
         {
             if (API.Upgrades["resizablewindows"] == true)
             {
@@ -650,7 +650,7 @@ namespace ShiftOS
         }
 
         // ERROR: Handles clauses are not supported in C#
-        private void bottompull_MouseDown(object sender, System.Windows.Forms.MouseEventArgs e)
+        private void bottompull_MouseDown(object sender, ShiftUI.MouseEventArgs e)
         {
             if (API.Upgrades["resizablewindows"] == true)
             {
@@ -659,7 +659,7 @@ namespace ShiftOS
         }
 
         // ERROR: Handles clauses are not supported in C#
-        private void bottompull_MouseUp(object sender, System.Windows.Forms.MouseEventArgs e)
+        private void bottompull_MouseUp(object sender, ShiftUI.MouseEventArgs e)
         {
             if (API.Upgrades["resizablewindows"] == true)
             {
@@ -668,7 +668,7 @@ namespace ShiftOS
         }
 
         // ERROR: Handles clauses are not supported in C#
-        private void bspull_MouseDown(object sender, System.Windows.Forms.MouseEventArgs e)
+        private void bspull_MouseDown(object sender, ShiftUI.MouseEventArgs e)
         {
             if (API.Upgrades["resizablewindows"] == true)
             {
@@ -677,7 +677,7 @@ namespace ShiftOS
         }
 
         // ERROR: Handles clauses are not supported in C#
-        private void bspull_MouseUp(object sender, System.Windows.Forms.MouseEventArgs e)
+        private void bspull_MouseUp(object sender, ShiftUI.MouseEventArgs e)
         {
             if (API.Upgrades["resizablewindows"] == true)
             {
@@ -793,7 +793,7 @@ namespace ShiftOS
     public class BorderWidget
     {
         public string Identifier { get; set; }
-        public Control Control { get; set; }
+        public Widget Widget { get; set; }
     }
 }
 
diff --git a/source/WindowsFormsApplication1/Controls/WindowBorder.resx b/source/WindowsFormsApplication1/Controls/WindowBorder.resx
index 8bf59aa..a651f01 100644
--- a/source/WindowsFormsApplication1/Controls/WindowBorder.resx
+++ b/source/WindowsFormsApplication1/Controls/WindowBorder.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="pullbs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
diff --git a/source/WindowsFormsApplication1/Controls/infobox.Designer.cs b/source/WindowsFormsApplication1/Controls/infobox.Designer.cs
index 1472a09..7c4ddb5 100644
--- a/source/WindowsFormsApplication1/Controls/infobox.Designer.cs
+++ b/source/WindowsFormsApplication1/Controls/infobox.Designer.cs
@@ -24,15 +24,15 @@ namespace ShiftOS
 
         private void InitializeComponent()
         {
-            this.pgcontents = new System.Windows.Forms.Panel();
-            this.txtuserinput = new System.Windows.Forms.TextBox();
-            this.btnok = new System.Windows.Forms.Button();
-            this.txtmessage = new System.Windows.Forms.Label();
-            this.pboximage = new System.Windows.Forms.PictureBox();
-            this.lblintructtext = new System.Windows.Forms.Label();
-            this.pnlyesno = new System.Windows.Forms.Panel();
-            this.btnno = new System.Windows.Forms.Button();
-            this.btnyes = new System.Windows.Forms.Button();
+            this.pgcontents = new ShiftUI.Panel();
+            this.txtuserinput = new ShiftUI.TextBox();
+            this.btnok = new ShiftUI.Button();
+            this.txtmessage = new ShiftUI.Label();
+            this.pboximage = new ShiftUI.PictureBox();
+            this.lblintructtext = new ShiftUI.Label();
+            this.pnlyesno = new ShiftUI.Panel();
+            this.btnno = new ShiftUI.Button();
+            this.btnyes = new ShiftUI.Button();
             this.pgcontents.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pboximage)).BeginInit();
             this.pnlyesno.SuspendLayout();
@@ -41,13 +41,13 @@ namespace ShiftOS
             // pgcontents
             // 
             this.pgcontents.BackColor = System.Drawing.Color.White;
-            this.pgcontents.Controls.Add(this.txtuserinput);
-            this.pgcontents.Controls.Add(this.btnok);
-            this.pgcontents.Controls.Add(this.txtmessage);
-            this.pgcontents.Controls.Add(this.pboximage);
-            this.pgcontents.Controls.Add(this.lblintructtext);
-            this.pgcontents.Controls.Add(this.pnlyesno);
-            this.pgcontents.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pgcontents.Widgets.Add(this.txtuserinput);
+            this.pgcontents.Widgets.Add(this.btnok);
+            this.pgcontents.Widgets.Add(this.txtmessage);
+            this.pgcontents.Widgets.Add(this.pboximage);
+            this.pgcontents.Widgets.Add(this.lblintructtext);
+            this.pgcontents.Widgets.Add(this.pnlyesno);
+            this.pgcontents.Dock = ShiftUI.DockStyle.Fill;
             this.pgcontents.Location = new System.Drawing.Point(0, 0);
             this.pgcontents.Name = "pgcontents";
             this.pgcontents.Size = new System.Drawing.Size(371, 154);
@@ -55,22 +55,22 @@ namespace ShiftOS
             // 
             // txtuserinput
             // 
-            this.txtuserinput.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
-            this.txtuserinput.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtuserinput.Anchor = ShiftUI.AnchorStyles.Bottom;
+            this.txtuserinput.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtuserinput.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtuserinput.Location = new System.Drawing.Point(103, 86);
             this.txtuserinput.Multiline = true;
             this.txtuserinput.Name = "txtuserinput";
             this.txtuserinput.Size = new System.Drawing.Size(256, 23);
             this.txtuserinput.TabIndex = 8;
-            this.txtuserinput.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtuserinput.TextAlign = ShiftUI.HorizontalAlignment.Center;
             this.txtuserinput.Visible = false;
             // 
             // btnok
             // 
-            this.btnok.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnok.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnok.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
+            this.btnok.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnok.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnok.ForeColor = System.Drawing.Color.Black;
             this.btnok.Location = new System.Drawing.Point(134, 118);
@@ -84,8 +84,8 @@ namespace ShiftOS
             // 
             // txtmessage
             // 
-            this.txtmessage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtmessage.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Right)));
             this.txtmessage.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtmessage.Location = new System.Drawing.Point(102, 7);
             this.txtmessage.Name = "txtmessage";
@@ -104,8 +104,8 @@ namespace ShiftOS
             // 
             // lblintructtext
             // 
-            this.lblintructtext.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.lblintructtext.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Right)));
             this.lblintructtext.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
             this.lblintructtext.Location = new System.Drawing.Point(105, 7);
             this.lblintructtext.Name = "lblintructtext";
@@ -116,10 +116,10 @@ namespace ShiftOS
             // 
             // pnlyesno
             // 
-            this.pnlyesno.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnlyesno.Controls.Add(this.btnno);
-            this.pnlyesno.Controls.Add(this.btnyes);
+            this.pnlyesno.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
+            this.pnlyesno.Widgets.Add(this.btnno);
+            this.pnlyesno.Widgets.Add(this.btnyes);
             this.pnlyesno.Location = new System.Drawing.Point(57, 115);
             this.pnlyesno.Name = "pnlyesno";
             this.pnlyesno.Size = new System.Drawing.Size(269, 33);
@@ -128,7 +128,7 @@ namespace ShiftOS
             // 
             // btnno
             // 
-            this.btnno.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnno.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnno.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnno.ForeColor = System.Drawing.Color.Black;
             this.btnno.Location = new System.Drawing.Point(142, 2);
@@ -142,7 +142,7 @@ namespace ShiftOS
             // 
             // btnyes
             // 
-            this.btnyes.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnyes.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnyes.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnyes.ForeColor = System.Drawing.Color.Black;
             this.btnyes.Location = new System.Drawing.Point(29, 2);
@@ -157,11 +157,11 @@ namespace ShiftOS
             // infobox
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(371, 154);
-            this.Controls.Add(this.pgcontents);
+            this.Widgets.Add(this.pgcontents);
             this.DoubleBuffered = true;
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.FormBorderStyle = ShiftUI.FormBorderStyle.None;
             this.KeyPreview = true;
             this.Name = "infobox";
             this.Text = "infobox";
@@ -174,14 +174,14 @@ namespace ShiftOS
             this.ResumeLayout(false);
 
         }
-        internal System.Windows.Forms.Panel pgcontents;
-        internal System.Windows.Forms.Button btnok;
-        internal System.Windows.Forms.Label txtmessage;
-        internal System.Windows.Forms.PictureBox pboximage;
-        internal System.Windows.Forms.Label lblintructtext;
-        internal System.Windows.Forms.TextBox txtuserinput;
-        internal System.Windows.Forms.Panel pnlyesno;
-        internal System.Windows.Forms.Button btnno;
-        internal System.Windows.Forms.Button btnyes;
+        internal ShiftUI.Panel pgcontents;
+        internal ShiftUI.Button btnok;
+        internal ShiftUI.Label txtmessage;
+        internal ShiftUI.PictureBox pboximage;
+        internal ShiftUI.Label lblintructtext;
+        internal ShiftUI.TextBox txtuserinput;
+        internal ShiftUI.Panel pnlyesno;
+        internal ShiftUI.Button btnno;
+        internal ShiftUI.Button btnyes;
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Controls/infobox.cs b/source/WindowsFormsApplication1/Controls/infobox.cs
index 2f706d2..77d4d2a 100644
--- a/source/WindowsFormsApplication1/Controls/infobox.cs
+++ b/source/WindowsFormsApplication1/Controls/infobox.cs
@@ -6,7 +6,7 @@ using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
diff --git a/source/WindowsFormsApplication1/Controls/infobox.resx b/source/WindowsFormsApplication1/Controls/infobox.resx
index 1af7de1..ffb4fb5 100644
--- a/source/WindowsFormsApplication1/Controls/infobox.resx
+++ b/source/WindowsFormsApplication1/Controls/infobox.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/CreditScroller.Designer.cs b/source/WindowsFormsApplication1/CreditScroller.Designer.cs
index f453b50..785e9e4 100644
--- a/source/WindowsFormsApplication1/CreditScroller.Designer.cs
+++ b/source/WindowsFormsApplication1/CreditScroller.Designer.cs
@@ -29,23 +29,23 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.pnlscroll = new System.Windows.Forms.Panel();
-            this.btnclose = new System.Windows.Forms.Button();
-            this.lbcreditstext = new System.Windows.Forms.Label();
-            this.lbgametitle = new System.Windows.Forms.Label();
-            this.tmrredraw = new System.Windows.Forms.Timer(this.components);
-            this.pgcontents = new System.Windows.Forms.Panel();
-            this.lblcountdown = new System.Windows.Forms.Label();
-            this.ball = new System.Windows.Forms.Panel();
-            this.paddleHuman = new System.Windows.Forms.PictureBox();
-            this.paddleComputer = new System.Windows.Forms.Panel();
-            this.lbllevelandtime = new System.Windows.Forms.Label();
-            this.lblstatsY = new System.Windows.Forms.Label();
-            this.lblstatsX = new System.Windows.Forms.Label();
-            this.pongGameTimer = new System.Windows.Forms.Timer(this.components);
-            this.counter = new System.Windows.Forms.Timer(this.components);
-            this.tmrcountdown = new System.Windows.Forms.Timer(this.components);
+            this.panel1 = new ShiftUI.Panel();
+            this.pnlscroll = new ShiftUI.Panel();
+            this.btnclose = new ShiftUI.Button();
+            this.lbcreditstext = new ShiftUI.Label();
+            this.lbgametitle = new ShiftUI.Label();
+            this.tmrredraw = new ShiftUI.Timer(this.components);
+            this.pgcontents = new ShiftUI.Panel();
+            this.lblcountdown = new ShiftUI.Label();
+            this.ball = new ShiftUI.Panel();
+            this.paddleHuman = new ShiftUI.PictureBox();
+            this.paddleComputer = new ShiftUI.Panel();
+            this.lbllevelandtime = new ShiftUI.Label();
+            this.lblstatsY = new ShiftUI.Label();
+            this.lblstatsX = new ShiftUI.Label();
+            this.pongGameTimer = new ShiftUI.Timer(this.components);
+            this.counter = new ShiftUI.Timer(this.components);
+            this.tmrcountdown = new ShiftUI.Timer(this.components);
             this.panel1.SuspendLayout();
             this.pnlscroll.SuspendLayout();
             this.pgcontents.SuspendLayout();
@@ -54,9 +54,9 @@
             // 
             // panel1
             // 
-            this.panel1.Controls.Add(this.pnlscroll);
-            this.panel1.Controls.Add(this.lbgametitle);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel1.Widgets.Add(this.pnlscroll);
+            this.panel1.Widgets.Add(this.lbgametitle);
+            this.panel1.Dock = ShiftUI.DockStyle.Fill;
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
             this.panel1.Size = new System.Drawing.Size(916, 528);
@@ -64,10 +64,10 @@
             // 
             // pnlscroll
             // 
-            this.pnlscroll.Controls.Add(this.btnclose);
-            this.pnlscroll.Controls.Add(this.lbcreditstext);
-            this.pnlscroll.Controls.Add(this.pgcontents);
-            this.pnlscroll.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pnlscroll.Widgets.Add(this.btnclose);
+            this.pnlscroll.Widgets.Add(this.lbcreditstext);
+            this.pnlscroll.Widgets.Add(this.pgcontents);
+            this.pnlscroll.Dock = ShiftUI.DockStyle.Fill;
             this.pnlscroll.Location = new System.Drawing.Point(0, 66);
             this.pnlscroll.Name = "pnlscroll";
             this.pnlscroll.Size = new System.Drawing.Size(916, 462);
@@ -75,10 +75,10 @@
             // 
             // btnclose
             // 
-            this.btnclose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnclose.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
             this.btnclose.AutoSize = true;
-            this.btnclose.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btnclose.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnclose.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.btnclose.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnclose.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
             this.btnclose.Location = new System.Drawing.Point(843, 418);
             this.btnclose.Name = "btnclose";
@@ -102,7 +102,7 @@
             // 
             // lbgametitle
             // 
-            this.lbgametitle.Dock = System.Windows.Forms.DockStyle.Top;
+            this.lbgametitle.Dock = ShiftUI.DockStyle.Top;
             this.lbgametitle.Font = new System.Drawing.Font("Microsoft Sans Serif", 25F);
             this.lbgametitle.Location = new System.Drawing.Point(0, 0);
             this.lbgametitle.Name = "lbgametitle";
@@ -118,15 +118,15 @@
             // 
             // pgcontents
             // 
-            this.pgcontents.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.pgcontents.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left)));
             this.pgcontents.BackColor = System.Drawing.Color.Black;
-            this.pgcontents.Controls.Add(this.lblcountdown);
-            this.pgcontents.Controls.Add(this.ball);
-            this.pgcontents.Controls.Add(this.paddleHuman);
-            this.pgcontents.Controls.Add(this.paddleComputer);
-            this.pgcontents.Controls.Add(this.lbllevelandtime);
-            this.pgcontents.Controls.Add(this.lblstatsY);
-            this.pgcontents.Controls.Add(this.lblstatsX);
+            this.pgcontents.Widgets.Add(this.lblcountdown);
+            this.pgcontents.Widgets.Add(this.ball);
+            this.pgcontents.Widgets.Add(this.paddleHuman);
+            this.pgcontents.Widgets.Add(this.paddleComputer);
+            this.pgcontents.Widgets.Add(this.lbllevelandtime);
+            this.pgcontents.Widgets.Add(this.lblstatsY);
+            this.pgcontents.Widgets.Add(this.lblstatsX);
             this.pgcontents.ForeColor = System.Drawing.Color.Gray;
             this.pgcontents.Location = new System.Drawing.Point(0, 0);
             this.pgcontents.Name = "pgcontents";
@@ -163,8 +163,8 @@
             // 
             // paddleComputer
             // 
-            this.paddleComputer.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.paddleComputer.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Right)));
             this.paddleComputer.BackColor = System.Drawing.Color.Gray;
             this.paddleComputer.Location = new System.Drawing.Point(666, 134);
             this.paddleComputer.MaximumSize = new System.Drawing.Size(20, 100);
@@ -174,7 +174,7 @@
             // 
             // lbllevelandtime
             // 
-            this.lbllevelandtime.Dock = System.Windows.Forms.DockStyle.Top;
+            this.lbllevelandtime.Dock = ShiftUI.DockStyle.Top;
             this.lbllevelandtime.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.lbllevelandtime.Location = new System.Drawing.Point(0, 0);
             this.lbllevelandtime.Name = "lbllevelandtime";
@@ -185,7 +185,7 @@
             // 
             // lblstatsY
             // 
-            this.lblstatsY.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.lblstatsY.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
             this.lblstatsY.Font = new System.Drawing.Font("Georgia", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.lblstatsY.Location = new System.Drawing.Point(542, 356);
             this.lblstatsY.Name = "lblstatsY";
@@ -196,7 +196,7 @@
             // 
             // lblstatsX
             // 
-            this.lblstatsX.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.lblstatsX.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left)));
             this.lblstatsX.Font = new System.Drawing.Font("Georgia", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.lblstatsX.Location = new System.Drawing.Point(3, 356);
             this.lblstatsX.Name = "lblstatsX";
@@ -223,10 +223,10 @@
             // CreditScroller
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.Black;
             this.ClientSize = new System.Drawing.Size(916, 528);
-            this.Controls.Add(this.panel1);
+            this.Widgets.Add(this.panel1);
             this.ForeColor = System.Drawing.Color.White;
             this.Name = "CreditScroller";
             this.Text = "CreditScroller";
@@ -242,22 +242,22 @@
 
         #endregion
 
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.Panel pnlscroll;
-        private System.Windows.Forms.Label lbcreditstext;
-        private System.Windows.Forms.Label lbgametitle;
-        private System.Windows.Forms.Timer tmrredraw;
-        private System.Windows.Forms.Button btnclose;
-        internal System.Windows.Forms.Panel pgcontents;
-        internal System.Windows.Forms.Label lblcountdown;
-        internal System.Windows.Forms.Panel ball;
-        internal System.Windows.Forms.PictureBox paddleHuman;
-        internal System.Windows.Forms.Panel paddleComputer;
-        internal System.Windows.Forms.Label lbllevelandtime;
-        internal System.Windows.Forms.Label lblstatsY;
-        internal System.Windows.Forms.Label lblstatsX;
-        internal System.Windows.Forms.Timer pongGameTimer;
-        internal System.Windows.Forms.Timer counter;
-        internal System.Windows.Forms.Timer tmrcountdown;
+        private ShiftUI.Panel panel1;
+        private ShiftUI.Panel pnlscroll;
+        private ShiftUI.Label lbcreditstext;
+        private ShiftUI.Label lbgametitle;
+        private ShiftUI.Timer tmrredraw;
+        private ShiftUI.Button btnclose;
+        internal ShiftUI.Panel pgcontents;
+        internal ShiftUI.Label lblcountdown;
+        internal ShiftUI.Panel ball;
+        internal ShiftUI.PictureBox paddleHuman;
+        internal ShiftUI.Panel paddleComputer;
+        internal ShiftUI.Label lbllevelandtime;
+        internal ShiftUI.Label lblstatsY;
+        internal ShiftUI.Label lblstatsX;
+        internal ShiftUI.Timer pongGameTimer;
+        internal ShiftUI.Timer counter;
+        internal ShiftUI.Timer tmrcountdown;
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/CreditScroller.cs b/source/WindowsFormsApplication1/CreditScroller.cs
index ff0a206..b190f26 100644
--- a/source/WindowsFormsApplication1/CreditScroller.cs
+++ b/source/WindowsFormsApplication1/CreditScroller.cs
@@ -6,7 +6,7 @@ using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
diff --git a/source/WindowsFormsApplication1/CreditScroller.resx b/source/WindowsFormsApplication1/CreditScroller.resx
index 42cc80f..a5f0e20 100644
--- a/source/WindowsFormsApplication1/CreditScroller.resx
+++ b/source/WindowsFormsApplication1/CreditScroller.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="tmrredraw.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
diff --git a/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.Designer.cs b/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.Designer.cs
index 0116fc9..ff599a5 100644
--- a/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.Designer.cs
+++ b/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.Designer.cs
@@ -23,154 +23,154 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            this.desktoppanel = new System.Windows.Forms.Panel();
-            this.pnlnotifications = new System.Windows.Forms.FlowLayoutPanel();
-            this.pnlpanelbuttonholder = new System.Windows.Forms.FlowLayoutPanel();
-            this.applaunchermenuholder = new System.Windows.Forms.Panel();
-            this.desktopappmenu = new System.Windows.Forms.MenuStrip();
-            this.ApplicationsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ArtpadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.AudioplayerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.BitnoteDiggerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.BitnoteWalletToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.CalculatorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.CatalystToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.ClockToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.DodgeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.downloadmanagerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.FileSkimmerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.FloodGateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.IconManagerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.InstallerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.KnowledgeInputToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.MazeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.NameChangerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.orcwriteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.PongToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ShifterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ShiftnetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ShiftoriumToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SkinLoaderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SkinShifterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SnakeyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.sysinfoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.TerminalToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.TextPadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.WebBrowserToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.VideoplayerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.VirusScannerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.unitySeperator = new System.Windows.Forms.ToolStripSeparator();
-            this.UnityToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ShutdownToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.timepanel = new System.Windows.Forms.Panel();
-            this.paneltimetext = new System.Windows.Forms.Label();
-            this.tbclockicon = new System.Windows.Forms.PictureBox();
-            this.tbclocktext = new System.Windows.Forms.Label();
-            this.tbsysinfoicon = new System.Windows.Forms.PictureBox();
-            this.tbsysinfotext = new System.Windows.Forms.Label();
-            this.tbskinloadericon = new System.Windows.Forms.PictureBox();
-            this.tbskinloadertext = new System.Windows.Forms.Label();
-            this.tbfileskimmericon = new System.Windows.Forms.PictureBox();
-            this.tbfileskimmertext = new System.Windows.Forms.Label();
-            this.tbfileopenericon = new System.Windows.Forms.PictureBox();
-            this.tbfileopenertext = new System.Windows.Forms.Label();
-            this.tbinfoboxicon = new System.Windows.Forms.PictureBox();
-            this.tbinfoboxtext = new System.Windows.Forms.Label();
-            this.tbknowledgeinputicon = new System.Windows.Forms.PictureBox();
-            this.tbknowledgeinputtext = new System.Windows.Forms.Label();
-            this.tbcolourpickericon = new System.Windows.Forms.PictureBox();
-            this.tbcolourpickertext = new System.Windows.Forms.Label();
-            this.tbshiftoriumicon = new System.Windows.Forms.PictureBox();
-            this.tbshiftoriumtext = new System.Windows.Forms.Label();
-            this.tbpongicon = new System.Windows.Forms.PictureBox();
-            this.tbpongtext = new System.Windows.Forms.Label();
-            this.tbterminalicon = new System.Windows.Forms.PictureBox();
-            this.tbterminaltext = new System.Windows.Forms.Label();
-            this.tbtextpadicon = new System.Windows.Forms.PictureBox();
-            this.tbtextpadtext = new System.Windows.Forms.Label();
-            this.tbgraphicpickericon = new System.Windows.Forms.PictureBox();
-            this.tbgraphicpickertext = new System.Windows.Forms.Label();
-            this.tbartpadicon = new System.Windows.Forms.PictureBox();
-            this.tbartpadtext = new System.Windows.Forms.Label();
-            this.tbcalculatoricon = new System.Windows.Forms.PictureBox();
-            this.tbcalculatortext = new System.Windows.Forms.Label();
-            this.tbaudioplayericon = new System.Windows.Forms.PictureBox();
-            this.tbaudioplayertext = new System.Windows.Forms.Label();
-            this.tbvideoplayericon = new System.Windows.Forms.PictureBox();
-            this.tbvideoplayertext = new System.Windows.Forms.Label();
-            this.tbwebbrowsericon = new System.Windows.Forms.PictureBox();
-            this.tbwebbrowsertext = new System.Windows.Forms.Label();
-            this.tbnamechangericon = new System.Windows.Forms.PictureBox();
-            this.tbnamechangertext = new System.Windows.Forms.Label();
-            this.tbiconmanagericon = new System.Windows.Forms.PictureBox();
-            this.tbiconmanagertext = new System.Windows.Forms.Label();
-            this.tbbitnotewalleticon = new System.Windows.Forms.PictureBox();
-            this.tbbitnotewallettext = new System.Windows.Forms.Label();
-            this.tbbitnotediggericon = new System.Windows.Forms.PictureBox();
-            this.tbbitnotediggertext = new System.Windows.Forms.Label();
-            this.tbskinshiftericon = new System.Windows.Forms.PictureBox();
-            this.tbskinshiftertext = new System.Windows.Forms.Label();
-            this.tbdownloadericon = new System.Windows.Forms.PictureBox();
-            this.tbdownloadertext = new System.Windows.Forms.Label();
-            this.tbshiftneticon = new System.Windows.Forms.PictureBox();
-            this.tbshiftnettext = new System.Windows.Forms.Label();
-            this.tbdodgeicon = new System.Windows.Forms.PictureBox();
-            this.tbdodgetext = new System.Windows.Forms.Label();
-            this.tbdownloadmanagericon = new System.Windows.Forms.PictureBox();
-            this.tbdownloadmanagertext = new System.Windows.Forms.Label();
-            this.tbcatalysticon = new System.Windows.Forms.PictureBox();
-            this.lbcatalystname = new System.Windows.Forms.Label();
-            this.tbinstallericon = new System.Windows.Forms.PictureBox();
-            this.tbinstallertext = new System.Windows.Forms.Label();
-            this.tbsnakeyicon = new System.Windows.Forms.PictureBox();
-            this.tbsnakeytext = new System.Windows.Forms.Label();
-            this.tborcwriteicon = new System.Windows.Forms.PictureBox();
-            this.tborcwritetext = new System.Windows.Forms.Label();
-            this.tbfloodgateicon = new System.Windows.Forms.PictureBox();
-            this.tbfloodgatetext = new System.Windows.Forms.Label();
-            this.tbmazeicon = new System.Windows.Forms.PictureBox();
-            this.tbmazetext = new System.Windows.Forms.Label();
-            this.tbvirusscannericon = new System.Windows.Forms.PictureBox();
-            this.tbvirusscannertext = new System.Windows.Forms.Label();
-            this.tbfilesavericon = new System.Windows.Forms.PictureBox();
-            this.tbfilesavertext = new System.Windows.Forms.Label();
-            this.tbshiftericon = new System.Windows.Forms.PictureBox();
-            this.tbshiftertext = new System.Windows.Forms.Label();
-            this.pnlpanelbuttonfloatybird = new System.Windows.Forms.Panel();
-            this.tbfloatybirdicon = new System.Windows.Forms.PictureBox();
-            this.tbfloatybirdtext = new System.Windows.Forms.Label();
-            this.floatybirdToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.clocktick = new System.Windows.Forms.Timer(this.components);
-            this.autosave = new System.Windows.Forms.Timer(this.components);
-            this.nocheat = new System.Windows.Forms.Timer(this.components);
-            this.tmrwindowedtest = new System.Windows.Forms.Timer(this.components);
-            this.cmbdesktopoptions = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.NewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.FolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ToolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
-            this.ArtpadPictureToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.TextDocumentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.NewSkin = new System.Windows.Forms.ToolStripMenuItem();
-            this.WebpageToolStripMenuItem = new System.Windows.Forms.ToolStripSeparator();
-            this.ShortcutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.scriptToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.addDesktopPanelToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.widgetManagerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.imgshiftnetapps = new System.Windows.Forms.ImageList(this.components);
-            this.lbldebug = new System.Windows.Forms.Label();
-            this.lblog = new System.Windows.Forms.Label();
-            this.flicons = new System.Windows.Forms.FlowLayoutPanel();
-            this.cmbfactions = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.deleteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.cbwidget = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.wlocmenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.cbdpanel = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
-            this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.placeHereToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.appLauncherToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.panelButtonsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.clockToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+            this.desktoppanel = new ShiftUI.Panel();
+            this.pnlnotifications = new ShiftUI.FlowLayoutPanel();
+            this.pnlpanelbuttonholder = new ShiftUI.FlowLayoutPanel();
+            this.applaunchermenuholder = new ShiftUI.Panel();
+            this.desktopappmenu = new ShiftUI.MenuStrip();
+            this.ApplicationsToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.ArtpadToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.AudioplayerToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.BitnoteDiggerToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.BitnoteWalletToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.CalculatorToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.CatalystToolStripMenuItem1 = new ShiftUI.ToolStripMenuItem();
+            this.ClockToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.DodgeToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.downloadmanagerToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.FileSkimmerToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.FloodGateToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.IconManagerToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.InstallerToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.KnowledgeInputToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.MazeToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.NameChangerToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.orcwriteToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.PongToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.ShifterToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.ShiftnetToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.ShiftoriumToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.SkinLoaderToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.SkinShifterToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.SnakeyToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.sysinfoToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.TerminalToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.TextPadToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.WebBrowserToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.VideoplayerToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.VirusScannerToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.unitySeperator = new ShiftUI.ToolStripSeparator();
+            this.UnityToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.ShutdownToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.timepanel = new ShiftUI.Panel();
+            this.paneltimetext = new ShiftUI.Label();
+            this.tbclockicon = new ShiftUI.PictureBox();
+            this.tbclocktext = new ShiftUI.Label();
+            this.tbsysinfoicon = new ShiftUI.PictureBox();
+            this.tbsysinfotext = new ShiftUI.Label();
+            this.tbskinloadericon = new ShiftUI.PictureBox();
+            this.tbskinloadertext = new ShiftUI.Label();
+            this.tbfileskimmericon = new ShiftUI.PictureBox();
+            this.tbfileskimmertext = new ShiftUI.Label();
+            this.tbfileopenericon = new ShiftUI.PictureBox();
+            this.tbfileopenertext = new ShiftUI.Label();
+            this.tbinfoboxicon = new ShiftUI.PictureBox();
+            this.tbinfoboxtext = new ShiftUI.Label();
+            this.tbknowledgeinputicon = new ShiftUI.PictureBox();
+            this.tbknowledgeinputtext = new ShiftUI.Label();
+            this.tbcolourpickericon = new ShiftUI.PictureBox();
+            this.tbcolourpickertext = new ShiftUI.Label();
+            this.tbshiftoriumicon = new ShiftUI.PictureBox();
+            this.tbshiftoriumtext = new ShiftUI.Label();
+            this.tbpongicon = new ShiftUI.PictureBox();
+            this.tbpongtext = new ShiftUI.Label();
+            this.tbterminalicon = new ShiftUI.PictureBox();
+            this.tbterminaltext = new ShiftUI.Label();
+            this.tbtextpadicon = new ShiftUI.PictureBox();
+            this.tbtextpadtext = new ShiftUI.Label();
+            this.tbgraphicpickericon = new ShiftUI.PictureBox();
+            this.tbgraphicpickertext = new ShiftUI.Label();
+            this.tbartpadicon = new ShiftUI.PictureBox();
+            this.tbartpadtext = new ShiftUI.Label();
+            this.tbcalculatoricon = new ShiftUI.PictureBox();
+            this.tbcalculatortext = new ShiftUI.Label();
+            this.tbaudioplayericon = new ShiftUI.PictureBox();
+            this.tbaudioplayertext = new ShiftUI.Label();
+            this.tbvideoplayericon = new ShiftUI.PictureBox();
+            this.tbvideoplayertext = new ShiftUI.Label();
+            this.tbwebbrowsericon = new ShiftUI.PictureBox();
+            this.tbwebbrowsertext = new ShiftUI.Label();
+            this.tbnamechangericon = new ShiftUI.PictureBox();
+            this.tbnamechangertext = new ShiftUI.Label();
+            this.tbiconmanagericon = new ShiftUI.PictureBox();
+            this.tbiconmanagertext = new ShiftUI.Label();
+            this.tbbitnotewalleticon = new ShiftUI.PictureBox();
+            this.tbbitnotewallettext = new ShiftUI.Label();
+            this.tbbitnotediggericon = new ShiftUI.PictureBox();
+            this.tbbitnotediggertext = new ShiftUI.Label();
+            this.tbskinshiftericon = new ShiftUI.PictureBox();
+            this.tbskinshiftertext = new ShiftUI.Label();
+            this.tbdownloadericon = new ShiftUI.PictureBox();
+            this.tbdownloadertext = new ShiftUI.Label();
+            this.tbshiftneticon = new ShiftUI.PictureBox();
+            this.tbshiftnettext = new ShiftUI.Label();
+            this.tbdodgeicon = new ShiftUI.PictureBox();
+            this.tbdodgetext = new ShiftUI.Label();
+            this.tbdownloadmanagericon = new ShiftUI.PictureBox();
+            this.tbdownloadmanagertext = new ShiftUI.Label();
+            this.tbcatalysticon = new ShiftUI.PictureBox();
+            this.lbcatalystname = new ShiftUI.Label();
+            this.tbinstallericon = new ShiftUI.PictureBox();
+            this.tbinstallertext = new ShiftUI.Label();
+            this.tbsnakeyicon = new ShiftUI.PictureBox();
+            this.tbsnakeytext = new ShiftUI.Label();
+            this.tborcwriteicon = new ShiftUI.PictureBox();
+            this.tborcwritetext = new ShiftUI.Label();
+            this.tbfloodgateicon = new ShiftUI.PictureBox();
+            this.tbfloodgatetext = new ShiftUI.Label();
+            this.tbmazeicon = new ShiftUI.PictureBox();
+            this.tbmazetext = new ShiftUI.Label();
+            this.tbvirusscannericon = new ShiftUI.PictureBox();
+            this.tbvirusscannertext = new ShiftUI.Label();
+            this.tbfilesavericon = new ShiftUI.PictureBox();
+            this.tbfilesavertext = new ShiftUI.Label();
+            this.tbshiftericon = new ShiftUI.PictureBox();
+            this.tbshiftertext = new ShiftUI.Label();
+            this.pnlpanelbuttonfloatybird = new ShiftUI.Panel();
+            this.tbfloatybirdicon = new ShiftUI.PictureBox();
+            this.tbfloatybirdtext = new ShiftUI.Label();
+            this.floatybirdToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.clocktick = new ShiftUI.Timer(this.components);
+            this.autosave = new ShiftUI.Timer(this.components);
+            this.nocheat = new ShiftUI.Timer(this.components);
+            this.tmrwindowedtest = new ShiftUI.Timer(this.components);
+            this.cmbdesktopoptions = new ShiftUI.ContextMenuStrip(this.components);
+            this.NewToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.FolderToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.ToolStripMenuItem2 = new ShiftUI.ToolStripSeparator();
+            this.ArtpadPictureToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.TextDocumentToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.NewSkin = new ShiftUI.ToolStripMenuItem();
+            this.WebpageToolStripMenuItem = new ShiftUI.ToolStripSeparator();
+            this.ShortcutToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.scriptToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.addDesktopPanelToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.widgetManagerToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.imgshiftnetapps = new ShiftUI.ImageList(this.components);
+            this.lbldebug = new ShiftUI.Label();
+            this.lblog = new ShiftUI.Label();
+            this.flicons = new ShiftUI.FlowLayoutPanel();
+            this.cmbfactions = new ShiftUI.ContextMenuStrip(this.components);
+            this.deleteToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.cbwidget = new ShiftUI.ContextMenuStrip(this.components);
+            this.wlocmenu = new ShiftUI.ToolStripMenuItem();
+            this.cbdpanel = new ShiftUI.ContextMenuStrip(this.components);
+            this.toolStripMenuItem3 = new ShiftUI.ToolStripMenuItem();
+            this.optionsToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.placeHereToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.appLauncherToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.panelButtonsToolStripMenuItem = new ShiftUI.ToolStripMenuItem();
+            this.clockToolStripMenuItem1 = new ShiftUI.ToolStripMenuItem();
             this.desktoppanel.SuspendLayout();
             this.applaunchermenuholder.SuspendLayout();
             this.desktopappmenu.SuspendLayout();
@@ -222,11 +222,11 @@
             // desktoppanel
             // 
             this.desktoppanel.BackColor = System.Drawing.Color.Gray;
-            this.desktoppanel.Controls.Add(this.pnlnotifications);
-            this.desktoppanel.Controls.Add(this.pnlpanelbuttonholder);
-            this.desktoppanel.Controls.Add(this.applaunchermenuholder);
-            this.desktoppanel.Controls.Add(this.timepanel);
-            this.desktoppanel.Dock = System.Windows.Forms.DockStyle.Top;
+            this.desktoppanel.Widgets.Add(this.pnlnotifications);
+            this.desktoppanel.Widgets.Add(this.pnlpanelbuttonholder);
+            this.desktoppanel.Widgets.Add(this.applaunchermenuholder);
+            this.desktoppanel.Widgets.Add(this.timepanel);
+            this.desktoppanel.Dock = ShiftUI.DockStyle.Top;
             this.desktoppanel.Location = new System.Drawing.Point(0, 0);
             this.desktoppanel.Name = "desktoppanel";
             this.desktoppanel.Size = new System.Drawing.Size(1268, 24);
@@ -235,8 +235,8 @@
             // 
             // pnlnotifications
             // 
-            this.pnlnotifications.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pnlnotifications.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft;
+            this.pnlnotifications.Dock = ShiftUI.DockStyle.Fill;
+            this.pnlnotifications.FlowDirection = ShiftUI.FlowDirection.RightToLeft;
             this.pnlnotifications.Location = new System.Drawing.Point(132, 0);
             this.pnlnotifications.Name = "pnlnotifications";
             this.pnlnotifications.Size = new System.Drawing.Size(1039, 24);
@@ -245,19 +245,19 @@
             // pnlpanelbuttonholder
             // 
             this.pnlpanelbuttonholder.AutoSize = true;
-            this.pnlpanelbuttonholder.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+            this.pnlpanelbuttonholder.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
             this.pnlpanelbuttonholder.BackColor = System.Drawing.Color.Transparent;
-            this.pnlpanelbuttonholder.Dock = System.Windows.Forms.DockStyle.Left;
+            this.pnlpanelbuttonholder.Dock = ShiftUI.DockStyle.Left;
             this.pnlpanelbuttonholder.Location = new System.Drawing.Point(130, 0);
             this.pnlpanelbuttonholder.Name = "pnlpanelbuttonholder";
-            this.pnlpanelbuttonholder.Padding = new System.Windows.Forms.Padding(2, 0, 0, 0);
+            this.pnlpanelbuttonholder.Padding = new ShiftUI.Padding(2, 0, 0, 0);
             this.pnlpanelbuttonholder.Size = new System.Drawing.Size(2, 24);
             this.pnlpanelbuttonholder.TabIndex = 1;
             // 
             // applaunchermenuholder
             // 
-            this.applaunchermenuholder.Controls.Add(this.desktopappmenu);
-            this.applaunchermenuholder.Dock = System.Windows.Forms.DockStyle.Left;
+            this.applaunchermenuholder.Widgets.Add(this.desktopappmenu);
+            this.applaunchermenuholder.Dock = ShiftUI.DockStyle.Left;
             this.applaunchermenuholder.Location = new System.Drawing.Point(0, 0);
             this.applaunchermenuholder.Name = "applaunchermenuholder";
             this.applaunchermenuholder.Size = new System.Drawing.Size(130, 24);
@@ -267,14 +267,14 @@
             // 
             this.desktopappmenu.AutoSize = false;
             this.desktopappmenu.BackColor = System.Drawing.Color.Transparent;
-            this.desktopappmenu.GripMargin = new System.Windows.Forms.Padding(0);
+            this.desktopappmenu.GripMargin = new ShiftUI.Padding(0);
             this.desktopappmenu.ImageScalingSize = new System.Drawing.Size(32, 32);
-            this.desktopappmenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.desktopappmenu.Items.AddRange(new ShiftUI.ToolStripItem[] {
             this.ApplicationsToolStripMenuItem});
-            this.desktopappmenu.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow;
+            this.desktopappmenu.LayoutStyle = ShiftUI.ToolStripLayoutStyle.HorizontalStackWithOverflow;
             this.desktopappmenu.Location = new System.Drawing.Point(0, 0);
             this.desktopappmenu.Name = "desktopappmenu";
-            this.desktopappmenu.Padding = new System.Windows.Forms.Padding(0);
+            this.desktopappmenu.Padding = new ShiftUI.Padding(0);
             this.desktopappmenu.Size = new System.Drawing.Size(130, 24);
             this.desktopappmenu.TabIndex = 0;
             this.desktopappmenu.TabStop = true;
@@ -284,8 +284,8 @@
             // 
             this.ApplicationsToolStripMenuItem.AutoSize = false;
             this.ApplicationsToolStripMenuItem.BackColor = System.Drawing.Color.Transparent;
-            this.ApplicationsToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.ApplicationsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.ApplicationsToolStripMenuItem.BackgroundImageLayout = ShiftUI.ImageLayout.Stretch;
+            this.ApplicationsToolStripMenuItem.DropDownItems.AddRange(new ShiftUI.ToolStripItem[] {
             this.ArtpadToolStripMenuItem,
             this.AudioplayerToolStripMenuItem,
             this.BitnoteDiggerToolStripMenuItem,
@@ -321,13 +321,13 @@
             this.ShutdownToolStripMenuItem});
             this.ApplicationsToolStripMenuItem.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.749999F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.ApplicationsToolStripMenuItem.Name = "ApplicationsToolStripMenuItem";
-            this.ApplicationsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.ApplicationsToolStripMenuItem.Padding = new ShiftUI.Padding(2, 0, 2, 0);
             this.ApplicationsToolStripMenuItem.ShowShortcutKeys = false;
             this.ApplicationsToolStripMenuItem.Size = new System.Drawing.Size(94, 24);
             this.ApplicationsToolStripMenuItem.Text = "Applications";
-            this.ApplicationsToolStripMenuItem.TextDirection = System.Windows.Forms.ToolStripTextDirection.Horizontal;
-            this.ApplicationsToolStripMenuItem.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage;
-            this.ApplicationsToolStripMenuItem.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ALClick);
+            this.ApplicationsToolStripMenuItem.TextDirection = ShiftUI.ToolStripTextDirection.Horizontal;
+            this.ApplicationsToolStripMenuItem.TextImageRelation = ShiftUI.TextImageRelation.TextBeforeImage;
+            this.ApplicationsToolStripMenuItem.MouseDown += new ShiftUI.MouseEventHandler(this.ALClick);
             this.ApplicationsToolStripMenuItem.MouseEnter += new System.EventHandler(this.ALHover);
             this.ApplicationsToolStripMenuItem.MouseLeave += new System.EventHandler(this.ALReset);
             // 
@@ -542,8 +542,8 @@
             // 
             // timepanel
             // 
-            this.timepanel.Controls.Add(this.paneltimetext);
-            this.timepanel.Dock = System.Windows.Forms.DockStyle.Right;
+            this.timepanel.Widgets.Add(this.paneltimetext);
+            this.timepanel.Dock = ShiftUI.DockStyle.Right;
             this.timepanel.Location = new System.Drawing.Point(1171, 0);
             this.timepanel.Name = "timepanel";
             this.timepanel.Size = new System.Drawing.Size(97, 24);
@@ -1104,8 +1104,8 @@
             // pnlpanelbuttonfloatybird
             // 
             this.pnlpanelbuttonfloatybird.BackColor = System.Drawing.Color.Black;
-            this.pnlpanelbuttonfloatybird.Controls.Add(this.tbfloatybirdicon);
-            this.pnlpanelbuttonfloatybird.Controls.Add(this.tbfloatybirdtext);
+            this.pnlpanelbuttonfloatybird.Widgets.Add(this.tbfloatybirdicon);
+            this.pnlpanelbuttonfloatybird.Widgets.Add(this.tbfloatybirdtext);
             this.pnlpanelbuttonfloatybird.Location = new System.Drawing.Point(5, 29);
             this.pnlpanelbuttonfloatybird.Name = "pnlpanelbuttonfloatybird";
             this.pnlpanelbuttonfloatybird.Size = new System.Drawing.Size(52, 20);
@@ -1115,11 +1115,11 @@
             // tbfloatybirdicon
             // 
             this.tbfloatybirdicon.BackColor = System.Drawing.Color.Transparent;
-            this.tbfloatybirdicon.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.tbfloatybirdicon.BackgroundImageLayout = ShiftUI.ImageLayout.Stretch;
             this.tbfloatybirdicon.Location = new System.Drawing.Point(4, 2);
             this.tbfloatybirdicon.Name = "tbfloatybirdicon";
             this.tbfloatybirdicon.Size = new System.Drawing.Size(16, 16);
-            this.tbfloatybirdicon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+            this.tbfloatybirdicon.SizeMode = ShiftUI.PictureBoxSizeMode.StretchImage;
             this.tbfloatybirdicon.TabIndex = 1;
             this.tbfloatybirdicon.TabStop = false;
             // 
@@ -1154,7 +1154,7 @@
             // 
             // cmbdesktopoptions
             // 
-            this.cmbdesktopoptions.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.cmbdesktopoptions.Items.AddRange(new ShiftUI.ToolStripItem[] {
             this.NewToolStripMenuItem,
             this.addDesktopPanelToolStripMenuItem,
             this.widgetManagerToolStripMenuItem});
@@ -1163,7 +1163,7 @@
             // 
             // NewToolStripMenuItem
             // 
-            this.NewToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.NewToolStripMenuItem.DropDownItems.AddRange(new ShiftUI.ToolStripItem[] {
             this.FolderToolStripMenuItem,
             this.ToolStripMenuItem2,
             this.ArtpadPictureToolStripMenuItem,
@@ -1245,7 +1245,7 @@
             // 
             // imgshiftnetapps
             // 
-            this.imgshiftnetapps.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit;
+            this.imgshiftnetapps.ColorDepth = ShiftUI.ColorDepth.Depth8Bit;
             this.imgshiftnetapps.ImageSize = new System.Drawing.Size(16, 16);
             this.imgshiftnetapps.TransparentColor = System.Drawing.Color.Transparent;
             // 
@@ -1275,8 +1275,8 @@
             // flicons
             // 
             this.flicons.BackColor = System.Drawing.Color.Transparent;
-            this.flicons.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.flicons.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
+            this.flicons.Dock = ShiftUI.DockStyle.Fill;
+            this.flicons.FlowDirection = ShiftUI.FlowDirection.TopDown;
             this.flicons.Location = new System.Drawing.Point(0, 24);
             this.flicons.Name = "flicons";
             this.flicons.Size = new System.Drawing.Size(1268, 661);
@@ -1284,7 +1284,7 @@
             // 
             // cmbfactions
             // 
-            this.cmbfactions.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.cmbfactions.Items.AddRange(new ShiftUI.ToolStripItem[] {
             this.deleteToolStripMenuItem});
             this.cmbfactions.Name = "cmbfactions";
             this.cmbfactions.Size = new System.Drawing.Size(108, 26);
@@ -1298,7 +1298,7 @@
             // 
             // cbwidget
             // 
-            this.cbwidget.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.cbwidget.Items.AddRange(new ShiftUI.ToolStripItem[] {
             this.wlocmenu});
             this.cbwidget.Name = "cbwidget";
             this.cbwidget.Size = new System.Drawing.Size(121, 26);
@@ -1311,7 +1311,7 @@
             // 
             // cbdpanel
             // 
-            this.cbdpanel.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.cbdpanel.Items.AddRange(new ShiftUI.ToolStripItem[] {
             this.toolStripMenuItem3,
             this.optionsToolStripMenuItem,
             this.placeHereToolStripMenuItem});
@@ -1334,7 +1334,7 @@
             // 
             // placeHereToolStripMenuItem
             // 
-            this.placeHereToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.placeHereToolStripMenuItem.DropDownItems.AddRange(new ShiftUI.ToolStripItem[] {
             this.appLauncherToolStripMenuItem,
             this.panelButtonsToolStripMenuItem,
             this.clockToolStripMenuItem1});
@@ -1366,13 +1366,13 @@
             // ShiftOSDesktop
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.Black;
             this.ClientSize = new System.Drawing.Size(1268, 685);
-            this.Controls.Add(this.flicons);
-            this.Controls.Add(this.lblog);
-            this.Controls.Add(this.lbldebug);
-            this.Controls.Add(this.desktoppanel);
+            this.Widgets.Add(this.flicons);
+            this.Widgets.Add(this.lblog);
+            this.Widgets.Add(this.lbldebug);
+            this.Widgets.Add(this.desktoppanel);
             this.KeyPreview = true;
             this.MainMenuStrip = this.desktopappmenu;
             this.Name = "ShiftOSDesktop";
@@ -1431,153 +1431,153 @@
             this.ResumeLayout(false);
 
         }
-        internal System.Windows.Forms.MenuStrip desktopappmenu;
-        internal System.Windows.Forms.ToolStripMenuItem KnowledgeInputToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem ShiftoriumToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem ClockToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem TerminalToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripSeparator unitySeperator;
-        internal System.Windows.Forms.ToolStripMenuItem ShutdownToolStripMenuItem;
-        internal System.Windows.Forms.Label paneltimetext;
-        internal System.Windows.Forms.Timer clocktick;
-        internal System.Windows.Forms.Panel timepanel;
-        internal System.Windows.Forms.ToolStripMenuItem ShifterToolStripMenuItem;
-        internal System.Windows.Forms.Panel applaunchermenuholder;
-        internal System.Windows.Forms.ToolStripMenuItem PongToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem FileSkimmerToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem TextPadToolStripMenuItem;
-        internal System.Windows.Forms.Timer autosave;
-        internal System.Windows.Forms.ToolStripMenuItem SkinLoaderToolStripMenuItem;
-        internal System.Windows.Forms.PictureBox tbtextpadicon;
-        internal System.Windows.Forms.Label tbtextpadtext;
-        internal System.Windows.Forms.PictureBox tbclockicon;
-        internal System.Windows.Forms.Label tbclocktext;
-        internal System.Windows.Forms.PictureBox tbcolourpickericon;
-        internal System.Windows.Forms.Label tbcolourpickertext;
-        internal System.Windows.Forms.PictureBox tbgraphicpickericon;
-        internal System.Windows.Forms.Label tbgraphicpickertext;
-        internal System.Windows.Forms.PictureBox tbfileopenericon;
-        internal System.Windows.Forms.Label tbfileopenertext;
-        internal System.Windows.Forms.PictureBox tbfileskimmericon;
-        internal System.Windows.Forms.Label tbfileskimmertext;
-        internal System.Windows.Forms.PictureBox tbknowledgeinputicon;
-        internal System.Windows.Forms.Label tbknowledgeinputtext;
-        internal System.Windows.Forms.PictureBox tbinfoboxicon;
-        internal System.Windows.Forms.Label tbinfoboxtext;
-        internal System.Windows.Forms.PictureBox tbpongicon;
-        internal System.Windows.Forms.Label tbpongtext;
-        internal System.Windows.Forms.PictureBox tbshiftoriumicon;
-        internal System.Windows.Forms.Label tbshiftoriumtext;
-        internal System.Windows.Forms.PictureBox tbskinloadericon;
-        internal System.Windows.Forms.Label tbskinloadertext;
-        internal System.Windows.Forms.PictureBox tbterminalicon;
-        internal System.Windows.Forms.Label tbterminaltext;
-        internal System.Windows.Forms.FlowLayoutPanel pnlpanelbuttonholder;
-        internal System.Windows.Forms.PictureBox tbartpadicon;
-        internal System.Windows.Forms.Label tbartpadtext;
-        internal System.Windows.Forms.ToolStripMenuItem ArtpadToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem CalculatorToolStripMenuItem;
-        internal System.Windows.Forms.PictureBox tbcalculatoricon;
-        internal System.Windows.Forms.Label tbcalculatortext;
-        internal System.Windows.Forms.PictureBox tbaudioplayericon;
-        internal System.Windows.Forms.Label tbaudioplayertext;
-        internal System.Windows.Forms.ToolStripMenuItem AudioplayerToolStripMenuItem;
-        internal System.Windows.Forms.PictureBox tbwebbrowsericon;
-        internal System.Windows.Forms.Label tbwebbrowsertext;
-        internal System.Windows.Forms.ToolStripMenuItem WebBrowserToolStripMenuItem;
-        internal System.Windows.Forms.PictureBox tbvideoplayericon;
-        internal System.Windows.Forms.Label tbvideoplayertext;
-        internal System.Windows.Forms.ToolStripMenuItem VideoplayerToolStripMenuItem;
-        internal System.Windows.Forms.PictureBox tbnamechangericon;
-        internal System.Windows.Forms.Label tbnamechangertext;
-        internal System.Windows.Forms.ToolStripMenuItem NameChangerToolStripMenuItem;
-        internal System.Windows.Forms.PictureBox tbiconmanagericon;
-        internal System.Windows.Forms.Label tbiconmanagertext;
-        internal System.Windows.Forms.ToolStripMenuItem IconManagerToolStripMenuItem;
-        internal System.Windows.Forms.PictureBox tbbitnotewalleticon;
-        internal System.Windows.Forms.Label tbbitnotewallettext;
-        internal System.Windows.Forms.PictureBox tbbitnotediggericon;
-        internal System.Windows.Forms.Label tbbitnotediggertext;
-        internal System.Windows.Forms.ToolStripMenuItem BitnoteWalletToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem BitnoteDiggerToolStripMenuItem;
-        internal System.Windows.Forms.PictureBox tbskinshiftericon;
-        internal System.Windows.Forms.Label tbskinshiftertext;
-        internal System.Windows.Forms.ToolStripMenuItem SkinShifterToolStripMenuItem;
-        internal System.Windows.Forms.PictureBox tbshiftneticon;
-        internal System.Windows.Forms.Label tbshiftnettext;
-        internal System.Windows.Forms.PictureBox tbdownloadericon;
-        internal System.Windows.Forms.Label tbdownloadertext;
-        internal System.Windows.Forms.ToolStripMenuItem ShiftnetToolStripMenuItem;
-        internal System.Windows.Forms.PictureBox tbdodgeicon;
-        internal System.Windows.Forms.Label tbdodgetext;
-        internal System.Windows.Forms.ToolStripMenuItem DodgeToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem sysinfoToolStripMenuItem;
-        internal System.Windows.Forms.PictureBox tbdownloadmanagericon;
-        internal System.Windows.Forms.Label tbdownloadmanagertext;
-        internal System.Windows.Forms.PictureBox tbinstallericon;
-        internal System.Windows.Forms.Label tbinstallertext;
-        internal System.Windows.Forms.ToolStripMenuItem InstallerToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem downloadmanagerToolStripMenuItem;
-        internal System.Windows.Forms.PictureBox tbsnakeyicon;
-        internal System.Windows.Forms.Label tbsnakeytext;
-        internal System.Windows.Forms.PictureBox tborcwriteicon;
-        internal System.Windows.Forms.Label tborcwritetext;
-        internal System.Windows.Forms.ToolStripMenuItem orcwriteToolStripMenuItem;
-        internal System.Windows.Forms.PictureBox tbfloodgateicon;
-        internal System.Windows.Forms.Label tbfloodgatetext;
-        internal System.Windows.Forms.ToolStripMenuItem FloodGateToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem UnityToolStripMenuItem;
-        internal System.Windows.Forms.PictureBox tbsysinfoicon;
-        internal System.Windows.Forms.Label tbsysinfotext;
-        internal System.Windows.Forms.ToolStripMenuItem SnakeyToolStripMenuItem;
-        internal System.Windows.Forms.PictureBox tbmazeicon;
-        internal System.Windows.Forms.Label tbmazetext;
-        internal System.Windows.Forms.ToolStripMenuItem MazeToolStripMenuItem;
-        internal System.Windows.Forms.PictureBox tbvirusscannericon;
-        internal System.Windows.Forms.Label tbvirusscannertext;
-        internal System.Windows.Forms.ToolStripMenuItem VirusScannerToolStripMenuItem;
-        internal System.Windows.Forms.Timer nocheat;
-        internal System.Windows.Forms.PictureBox tbfilesavericon;
-        internal System.Windows.Forms.Label tbfilesavertext;
-        internal System.Windows.Forms.PictureBox tbshiftericon;
-        internal System.Windows.Forms.Label tbshiftertext;
-        internal System.Windows.Forms.Panel pnlpanelbuttonfloatybird;
-        internal System.Windows.Forms.PictureBox tbfloatybirdicon;
-        internal System.Windows.Forms.Label tbfloatybirdtext;
-        internal System.Windows.Forms.ToolStripMenuItem floatybirdToolStripMenuItem;
-        internal System.Windows.Forms.Timer tmrwindowedtest;
-        internal System.Windows.Forms.ContextMenuStrip cmbdesktopoptions;
-        internal System.Windows.Forms.ToolStripMenuItem NewToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem FolderToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripSeparator ToolStripMenuItem2;
-        internal System.Windows.Forms.ToolStripMenuItem ArtpadPictureToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem TextDocumentToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripSeparator WebpageToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem ShortcutToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem NewSkin;
-        internal System.Windows.Forms.PictureBox tbcatalysticon;
-        internal System.Windows.Forms.Label lbcatalystname;
-        internal System.Windows.Forms.ToolStripMenuItem CatalystToolStripMenuItem1;
-        public System.Windows.Forms.ImageList imgshiftnetapps;
-        private System.Windows.Forms.Label lbldebug;
-        private System.Windows.Forms.Label lblog;
-        public System.Windows.Forms.FlowLayoutPanel flicons;
-        private System.Windows.Forms.ToolStripMenuItem scriptToolStripMenuItem;
-        private System.Windows.Forms.ContextMenuStrip cmbfactions;
-        private System.Windows.Forms.ToolStripMenuItem deleteToolStripMenuItem;
-        private System.Windows.Forms.FlowLayoutPanel pnlnotifications;
-        public System.Windows.Forms.Panel desktoppanel;
-        public System.Windows.Forms.ToolStripMenuItem ApplicationsToolStripMenuItem;
-        private System.Windows.Forms.ContextMenuStrip cbwidget;
-        private System.Windows.Forms.ToolStripMenuItem wlocmenu;
-        private System.Windows.Forms.ContextMenuStrip cbdpanel;
-        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem3;
-        private System.Windows.Forms.ToolStripMenuItem optionsToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem addDesktopPanelToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem placeHereToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem appLauncherToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem panelButtonsToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem clockToolStripMenuItem1;
-        private System.Windows.Forms.ToolStripMenuItem widgetManagerToolStripMenuItem;
+        internal ShiftUI.MenuStrip desktopappmenu;
+        internal ShiftUI.ToolStripMenuItem KnowledgeInputToolStripMenuItem;
+        internal ShiftUI.ToolStripMenuItem ShiftoriumToolStripMenuItem;
+        internal ShiftUI.ToolStripMenuItem ClockToolStripMenuItem;
+        internal ShiftUI.ToolStripMenuItem TerminalToolStripMenuItem;
+        internal ShiftUI.ToolStripSeparator unitySeperator;
+        internal ShiftUI.ToolStripMenuItem ShutdownToolStripMenuItem;
+        internal ShiftUI.Label paneltimetext;
+        internal ShiftUI.Timer clocktick;
+        internal ShiftUI.Panel timepanel;
+        internal ShiftUI.ToolStripMenuItem ShifterToolStripMenuItem;
+        internal ShiftUI.Panel applaunchermenuholder;
+        internal ShiftUI.ToolStripMenuItem PongToolStripMenuItem;
+        internal ShiftUI.ToolStripMenuItem FileSkimmerToolStripMenuItem;
+        internal ShiftUI.ToolStripMenuItem TextPadToolStripMenuItem;
+        internal ShiftUI.Timer autosave;
+        internal ShiftUI.ToolStripMenuItem SkinLoaderToolStripMenuItem;
+        internal ShiftUI.PictureBox tbtextpadicon;
+        internal ShiftUI.Label tbtextpadtext;
+        internal ShiftUI.PictureBox tbclockicon;
+        internal ShiftUI.Label tbclocktext;
+        internal ShiftUI.PictureBox tbcolourpickericon;
+        internal ShiftUI.Label tbcolourpickertext;
+        internal ShiftUI.PictureBox tbgraphicpickericon;
+        internal ShiftUI.Label tbgraphicpickertext;
+        internal ShiftUI.PictureBox tbfileopenericon;
+        internal ShiftUI.Label tbfileopenertext;
+        internal ShiftUI.PictureBox tbfileskimmericon;
+        internal ShiftUI.Label tbfileskimmertext;
+        internal ShiftUI.PictureBox tbknowledgeinputicon;
+        internal ShiftUI.Label tbknowledgeinputtext;
+        internal ShiftUI.PictureBox tbinfoboxicon;
+        internal ShiftUI.Label tbinfoboxtext;
+        internal ShiftUI.PictureBox tbpongicon;
+        internal ShiftUI.Label tbpongtext;
+        internal ShiftUI.PictureBox tbshiftoriumicon;
+        internal ShiftUI.Label tbshiftoriumtext;
+        internal ShiftUI.PictureBox tbskinloadericon;
+        internal ShiftUI.Label tbskinloadertext;
+        internal ShiftUI.PictureBox tbterminalicon;
+        internal ShiftUI.Label tbterminaltext;
+        internal ShiftUI.FlowLayoutPanel pnlpanelbuttonholder;
+        internal ShiftUI.PictureBox tbartpadicon;
+        internal ShiftUI.Label tbartpadtext;
+        internal ShiftUI.ToolStripMenuItem ArtpadToolStripMenuItem;
+        internal ShiftUI.ToolStripMenuItem CalculatorToolStripMenuItem;
+        internal ShiftUI.PictureBox tbcalculatoricon;
+        internal ShiftUI.Label tbcalculatortext;
+        internal ShiftUI.PictureBox tbaudioplayericon;
+        internal ShiftUI.Label tbaudioplayertext;
+        internal ShiftUI.ToolStripMenuItem AudioplayerToolStripMenuItem;
+        internal ShiftUI.PictureBox tbwebbrowsericon;
+        internal ShiftUI.Label tbwebbrowsertext;
+        internal ShiftUI.ToolStripMenuItem WebBrowserToolStripMenuItem;
+        internal ShiftUI.PictureBox tbvideoplayericon;
+        internal ShiftUI.Label tbvideoplayertext;
+        internal ShiftUI.ToolStripMenuItem VideoplayerToolStripMenuItem;
+        internal ShiftUI.PictureBox tbnamechangericon;
+        internal ShiftUI.Label tbnamechangertext;
+        internal ShiftUI.ToolStripMenuItem NameChangerToolStripMenuItem;
+        internal ShiftUI.PictureBox tbiconmanagericon;
+        internal ShiftUI.Label tbiconmanagertext;
+        internal ShiftUI.ToolStripMenuItem IconManagerToolStripMenuItem;
+        internal ShiftUI.PictureBox tbbitnotewalleticon;
+        internal ShiftUI.Label tbbitnotewallettext;
+        internal ShiftUI.PictureBox tbbitnotediggericon;
+        internal ShiftUI.Label tbbitnotediggertext;
+        internal ShiftUI.ToolStripMenuItem BitnoteWalletToolStripMenuItem;
+        internal ShiftUI.ToolStripMenuItem BitnoteDiggerToolStripMenuItem;
+        internal ShiftUI.PictureBox tbskinshiftericon;
+        internal ShiftUI.Label tbskinshiftertext;
+        internal ShiftUI.ToolStripMenuItem SkinShifterToolStripMenuItem;
+        internal ShiftUI.PictureBox tbshiftneticon;
+        internal ShiftUI.Label tbshiftnettext;
+        internal ShiftUI.PictureBox tbdownloadericon;
+        internal ShiftUI.Label tbdownloadertext;
+        internal ShiftUI.ToolStripMenuItem ShiftnetToolStripMenuItem;
+        internal ShiftUI.PictureBox tbdodgeicon;
+        internal ShiftUI.Label tbdodgetext;
+        internal ShiftUI.ToolStripMenuItem DodgeToolStripMenuItem;
+        internal ShiftUI.ToolStripMenuItem sysinfoToolStripMenuItem;
+        internal ShiftUI.PictureBox tbdownloadmanagericon;
+        internal ShiftUI.Label tbdownloadmanagertext;
+        internal ShiftUI.PictureBox tbinstallericon;
+        internal ShiftUI.Label tbinstallertext;
+        internal ShiftUI.ToolStripMenuItem InstallerToolStripMenuItem;
+        internal ShiftUI.ToolStripMenuItem downloadmanagerToolStripMenuItem;
+        internal ShiftUI.PictureBox tbsnakeyicon;
+        internal ShiftUI.Label tbsnakeytext;
+        internal ShiftUI.PictureBox tborcwriteicon;
+        internal ShiftUI.Label tborcwritetext;
+        internal ShiftUI.ToolStripMenuItem orcwriteToolStripMenuItem;
+        internal ShiftUI.PictureBox tbfloodgateicon;
+        internal ShiftUI.Label tbfloodgatetext;
+        internal ShiftUI.ToolStripMenuItem FloodGateToolStripMenuItem;
+        internal ShiftUI.ToolStripMenuItem UnityToolStripMenuItem;
+        internal ShiftUI.PictureBox tbsysinfoicon;
+        internal ShiftUI.Label tbsysinfotext;
+        internal ShiftUI.ToolStripMenuItem SnakeyToolStripMenuItem;
+        internal ShiftUI.PictureBox tbmazeicon;
+        internal ShiftUI.Label tbmazetext;
+        internal ShiftUI.ToolStripMenuItem MazeToolStripMenuItem;
+        internal ShiftUI.PictureBox tbvirusscannericon;
+        internal ShiftUI.Label tbvirusscannertext;
+        internal ShiftUI.ToolStripMenuItem VirusScannerToolStripMenuItem;
+        internal ShiftUI.Timer nocheat;
+        internal ShiftUI.PictureBox tbfilesavericon;
+        internal ShiftUI.Label tbfilesavertext;
+        internal ShiftUI.PictureBox tbshiftericon;
+        internal ShiftUI.Label tbshiftertext;
+        internal ShiftUI.Panel pnlpanelbuttonfloatybird;
+        internal ShiftUI.PictureBox tbfloatybirdicon;
+        internal ShiftUI.Label tbfloatybirdtext;
+        internal ShiftUI.ToolStripMenuItem floatybirdToolStripMenuItem;
+        internal ShiftUI.Timer tmrwindowedtest;
+        internal ShiftUI.ContextMenuStrip cmbdesktopoptions;
+        internal ShiftUI.ToolStripMenuItem NewToolStripMenuItem;
+        internal ShiftUI.ToolStripMenuItem FolderToolStripMenuItem;
+        internal ShiftUI.ToolStripSeparator ToolStripMenuItem2;
+        internal ShiftUI.ToolStripMenuItem ArtpadPictureToolStripMenuItem;
+        internal ShiftUI.ToolStripMenuItem TextDocumentToolStripMenuItem;
+        internal ShiftUI.ToolStripSeparator WebpageToolStripMenuItem;
+        internal ShiftUI.ToolStripMenuItem ShortcutToolStripMenuItem;
+        internal ShiftUI.ToolStripMenuItem NewSkin;
+        internal ShiftUI.PictureBox tbcatalysticon;
+        internal ShiftUI.Label lbcatalystname;
+        internal ShiftUI.ToolStripMenuItem CatalystToolStripMenuItem1;
+        public ShiftUI.ImageList imgshiftnetapps;
+        private ShiftUI.Label lbldebug;
+        private ShiftUI.Label lblog;
+        public ShiftUI.FlowLayoutPanel flicons;
+        private ShiftUI.ToolStripMenuItem scriptToolStripMenuItem;
+        private ShiftUI.ContextMenuStrip cmbfactions;
+        private ShiftUI.ToolStripMenuItem deleteToolStripMenuItem;
+        private ShiftUI.FlowLayoutPanel pnlnotifications;
+        public ShiftUI.Panel desktoppanel;
+        public ShiftUI.ToolStripMenuItem ApplicationsToolStripMenuItem;
+        private ShiftUI.ContextMenuStrip cbwidget;
+        private ShiftUI.ToolStripMenuItem wlocmenu;
+        private ShiftUI.ContextMenuStrip cbdpanel;
+        private ShiftUI.ToolStripMenuItem toolStripMenuItem3;
+        private ShiftUI.ToolStripMenuItem optionsToolStripMenuItem;
+        private ShiftUI.ToolStripMenuItem addDesktopPanelToolStripMenuItem;
+        private ShiftUI.ToolStripMenuItem placeHereToolStripMenuItem;
+        private ShiftUI.ToolStripMenuItem appLauncherToolStripMenuItem;
+        private ShiftUI.ToolStripMenuItem panelButtonsToolStripMenuItem;
+        private ShiftUI.ToolStripMenuItem clockToolStripMenuItem1;
+        private ShiftUI.ToolStripMenuItem widgetManagerToolStripMenuItem;
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.cs b/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.cs
index 19a641d..d8be8a0 100644
--- a/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.cs
+++ b/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.cs
@@ -6,7 +6,7 @@ using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 using SaveSystem;
 using System.Threading;
 using Newtonsoft.Json;
@@ -33,7 +33,7 @@ namespace ShiftOS
         public delegate void WindowDrawEventHandler(Form win);
 
         //Event handler for passing a single control (e.g, a desktop panel) to the Lua API.
-        public delegate void ControlDrawEventHandler(string ControlGUID);
+        public delegate void WidgetDrawEventHandler(string WidgetGUID);
 
         //Lua events.
         public event EmptyEventHandler OnDesktopReload;
@@ -49,7 +49,7 @@ namespace ShiftOS
         public event WindowDrawEventHandler BorderReset;
         public event ListEventHandler<DesktopIcon> DesktopIconsPopulated;
         public event EmptyEventHandler OnUnityToggle;
-        public event ControlDrawEventHandler OnDesktopPanelDraw;
+        public event WidgetDrawEventHandler OnDesktopPanelDraw;
 
         public void InvokeWindowOp(string operation, Form win)
         {
@@ -97,7 +97,7 @@ namespace ShiftOS
 
         public ToolStripMenuItem AppLauncher { get { return this.ApplicationsToolStripMenuItem; } }
 
-        public List<Control> CurrentWidgets = null;
+        public List<Widget> CurrentWidgets = null;
 
         public void SetUnityMode()
         {
@@ -133,7 +133,7 @@ namespace ShiftOS
                 switch (FinalMission.EndGameHandler.CurrentChoice)
                 {
                     case Choice.SideWithDevX:
-                        var t = new System.Windows.Forms.Timer();
+                        var t = new ShiftUI.Timer();
                         t.Interval = 10000;
                         t.Tick += (object se, EventArgs ea) =>
                         {
@@ -176,11 +176,11 @@ namespace ShiftOS
             this.WindowState = FormWindowState.Maximized;
             this.KeyDown += (object s, KeyEventArgs ea) =>
             {
-                if (ea.KeyCode == Keys.T && ea.Control)
+                if (ea.KeyCode == Keys.T && ea.Widget)
                 {
                     InvokeCTRLT();
                 }
-                else if (ea.KeyCode == Keys.D && ea.Control)
+                else if (ea.KeyCode == Keys.D && ea.Widget)
                 {
                     if (API.DeveloperMode == true)
                     {
@@ -198,9 +198,10 @@ namespace ShiftOS
             CheckIfNew();
 
             API.CurrentSession = this;
+            this.Location = new Point(0, 0);
 
 
-            System.Windows.Forms.Timer clocktick = new System.Windows.Forms.Timer();
+            ShiftUI.Timer clocktick = new ShiftUI.Timer();
             clocktick.Interval = 2;
             clocktick.Tick += (object s, EventArgs a) =>
             {
@@ -311,7 +312,7 @@ namespace ShiftOS
         public FlowLayoutPanel PanelButtonHolder { get { return pnlpanelbuttonholder; } }
         public Panel AppLauncherPanel { get { return applaunchermenuholder; } }
         public Panel Clock { get { return timepanel; } }
-        public Control SelectedObject = null;
+        public Widget SelectedObject = null;
 
         private string SelectedIconName = null;
 
@@ -382,8 +383,8 @@ namespace ShiftOS
                     wid.Dispose();
                 }
             }
-            WidgetsToMaintain = new List<Control>();
-            Control ctrl = null;
+            WidgetsToMaintain = new List<Widget>();
+            Widget ctrl = null;
             switch(w.Type)
             {
                 case WidgetType.FreePanel:
@@ -401,7 +402,7 @@ namespace ShiftOS
             }
             if(ctrl != null)
             {
-                p.Controls.Add(ctrl);
+                p.Widgets.Add(ctrl);
                 ctrl.Show();
                 ctrl.BringToFront();
                 ctrl.Left = w.XLocation;
@@ -445,7 +446,7 @@ namespace ShiftOS
                     move.Click += (object s, EventArgs e) =>
                     {
                         ctrl.Tag = w;
-                        MovingControl = ctrl;
+                        MovingWidget = ctrl;
                     };
                     ToolStripMenuItem move_to = (ToolStripMenuItem)cb_thiswidget.Items.Add("Move to...");
                     foreach(var dp in DesktopPanels)
@@ -493,9 +494,9 @@ namespace ShiftOS
 
         }
 
-        public List<Control> WidgetsToMaintain = null;
+        public List<Widget> WidgetsToMaintain = null;
 
-        public Control MovingControl = null;
+        public Widget MovingWidget = null;
 
         public bool WidgetContains(string Name)
         {
@@ -533,7 +534,7 @@ namespace ShiftOS
             {
                 flicons.ContextMenuStrip = cmbdesktopoptions;
                 DesktopIconManager.GetIcons();
-                   flicons.Controls.Clear();
+                   flicons.Widgets.Clear();
                 foreach (DesktopIcon dl in DesktopIconManager.Icons)
                 {
                     dl.ContextMenuStrip = cmbfactions;
@@ -544,7 +545,7 @@ namespace ShiftOS
                             SelectedIconName = dl.IconName;
                         }
                     };
-                    flicons.Controls.Add(dl);
+                    flicons.Widgets.Add(dl);
                 }
                 DesktopIconsPopulated?.Invoke(DesktopIconManager.Icons);
             }
@@ -563,41 +564,27 @@ namespace ShiftOS
 
         public void SetupDesktopPanel()
         {
-            if (DesktopPanels != null)
+            if(API.Upgrades["desktoppanel"])
             {
-                foreach (var pnl in DesktopPanels)
+                desktoppanel.BackColor = API.CurrentSkin.desktoppanelcolour;
+                desktoppanel.Height = API.CurrentSkin.desktoppanelheight;
+                switch(API.CurrentSkin.desktoppanelposition)
                 {
-                    if (this.Controls.Contains(pnl))
-                    {
-                        pnl.Hide();
-                        this.Controls.Remove(pnl);
-                    }
+                    case "Top":
+                        desktoppanel.Dock = DockStyle.Top;
+                        break;
+                    case "Bottom":
+                        desktoppanel.Dock = DockStyle.Bottom;
+                        break;
                 }
-            }
-            var old_list = new List<Skinning.DesktopPanel>();
-            var dp = new Skinning.DesktopPanel();
-            dp.Position = API.CurrentSkin.desktoppanelposition;
-            dp.Height = API.CurrentSkin.desktoppanelheight;
-            dp.BackgroundColor = API.CurrentSkin.desktoppanelcolour;
-            dp.BackgroundImage = API.CurrentSkinImages.desktoppanel;
-            old_list.Add(dp);
+                desktoppanel.BackgroundImageLayout = (ImageLayout)API.CurrentSkin.desktoppanellayout;
+                desktoppanel.BackgroundImage = API.CurrentSkinImages.desktoppanel;
 
-            if (API.CurrentSkin.DesktopPanels.Count == 0)
-            {
-                API.CurrentSkin.DesktopPanels = old_list;
-            }
-            if(API.Upgrades["advanceddesktop"])
-            {
-                SetupPanels(API.CurrentSkin.DesktopPanels);
             }
             else
             {
-                if(API.Upgrades["desktoppanel"])
-                {
-                    SetupPanels(old_list);
-                }
+                desktoppanel.Hide();
             }
-            desktopappmenu.BackgroundImageLayout = (ImageLayout)API.CurrentSkin.applauncherlayout;
         }
 
         public void SetupPanels(List<Skinning.DesktopPanel> lst)
@@ -621,31 +608,31 @@ namespace ShiftOS
                 pnl.Height = dp.Height;
                 pnl.MouseMove += (object s, MouseEventArgs a) =>
                 {
-                    if (MovingControl != null)
+                    if (MovingWidget != null)
                     {
                         var newloc = new Point(a.X + 15, 0);
                         var proper = pnl.PointToClient(newloc);
-                        MovingControl.Location = proper;
+                        MovingWidget.Location = proper;
                     }
                 };
                 pnl.MouseDown += (object s, MouseEventArgs a) =>
                 {
-                    if (MovingControl != null)
+                    if (MovingWidget != null)
                     {
                         if (a.Button == MouseButtons.Left)
                         {
-                            var w = (Skinning.DesktopWidget)MovingControl.Tag;
-                            w.XLocation = MovingControl.Left;
+                            var w = (Skinning.DesktopWidget)MovingWidget.Tag;
+                            w.XLocation = MovingWidget.Left;
                             Skinning.Utilities.saveskin();
                         }
                         else if (a.Button == MouseButtons.Left)
                         {
-                            var w = (Skinning.DesktopWidget)MovingControl.Tag;
-                            MovingControl.Left = w.XLocation;
+                            var w = (Skinning.DesktopWidget)MovingWidget.Tag;
+                            MovingWidget.Left = w.XLocation;
                             Skinning.Utilities.saveskin();
 
                         }
-                        MovingControl = null;
+                        MovingWidget = null;
                     }
                 };
                 DesktopPanels.Add(pnl);
@@ -698,13 +685,13 @@ namespace ShiftOS
                         pnl.ContextMenuStrip = null;
                     }
                     pnl.Size = new Size(desktoppanel.Size.Width, dp.Height);
-                    this.Controls.Add(pnl);
+                    this.Widgets.Add(pnl);
                     pnl.Show();
                 }
                 else
                 {
                     pnl.Hide();
-                    this.Controls.Remove(pnl);
+                    this.Widgets.Remove(pnl);
                 }
                 string guid = Guid.NewGuid().ToString();
                 API.DEF_PanelGUIDs.Add(guid, pnl);
@@ -893,7 +880,7 @@ namespace ShiftOS
                             {
                                 API.CurrentSkin.PanelButtonPosition = itm.Text;
                             }
-                            SelectedObject.Parent.Controls.Remove(SelectedObject);
+                            SelectedObject.Parent.Widgets.Remove(SelectedObject);
                             SetupDesktopPanel();
                             Skinning.Utilities.saveskin();
                         }
@@ -980,22 +967,22 @@ namespace ShiftOS
             }
         }
 
-        public void ChangePosition(Control ctrl, Panel newPanel)
+        public void ChangePosition(Widget ctrl, Panel newPanel)
         {
             try {
-                ctrl.Parent.Controls.Remove(ctrl);
-                newPanel.Controls.Add(ctrl);
+                ctrl.Parent.Widgets.Remove(ctrl);
+                newPanel.Widgets.Add(ctrl);
             }
             catch
             {
-                newPanel.Controls.Add(ctrl);
+                newPanel.Widgets.Add(ctrl);
             }
             ctrl.BringToFront();
         }
 
         public void SetupPanelButtons()
         {
-            pnlpanelbuttonholder.Controls.Clear();
+            pnlpanelbuttonholder.Widgets.Clear();
             if (API.Upgrades["panelbuttons"] == true)
             {
                 foreach (PanelButton pbtn in API.PanelButtons)
@@ -1015,7 +1002,7 @@ namespace ShiftOS
 
                     setuppanelbuttonicons(ref pb, pbtn.Icon);
 
-                    pnlpanelbuttonholder.Controls.Add(pnl);
+                    pnlpanelbuttonholder.Widgets.Add(pnl);
                     pnl.ContextMenuStrip = null;
                     pnl.Show();
                     pnl.Click += new EventHandler(this.PanelButton_Click);
@@ -1039,8 +1026,8 @@ namespace ShiftOS
 
         public void setpanelbuttonappearnce(ref Panel panelbutton, ref PictureBox icon, ref Label text)
         {
-            panelbutton.Controls.Add(text);
-            panelbutton.Controls.Add(icon);
+            panelbutton.Widgets.Add(text);
+            panelbutton.Widgets.Add(icon);
             text.Show();
             if (API.Upgrades["appicons"] == true)
             {
@@ -1075,7 +1062,7 @@ namespace ShiftOS
         {
             if (API.Upgrades["usefulpanelbuttons"])
             {
-                Control ctrl = (Control)sender;
+                Widget ctrl = (Widget)sender;
                 try
                 {
                     PanelButton pbtn = (PanelButton)ctrl.Tag;
@@ -1138,7 +1125,7 @@ namespace ShiftOS
                     n.Location = new Point(this.Width - n.Width, this.Height - n.Height - desktoppanel.Height);
                     break;
             }
-            this.Controls.Add(n);
+            this.Widgets.Add(n);
             n.Show();
             n.BringToFront();
         }
diff --git a/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.resx b/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.resx
index 1ee550a..3877945 100644
--- a/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.resx
+++ b/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="desktopappmenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
diff --git a/source/WindowsFormsApplication1/Dialogs/Color_Picker.Designer.cs b/source/WindowsFormsApplication1/Dialogs/Color_Picker.Designer.cs
index bc68a96..484a0ef 100644
--- a/source/WindowsFormsApplication1/Dialogs/Color_Picker.Designer.cs
+++ b/source/WindowsFormsApplication1/Dialogs/Color_Picker.Designer.cs
@@ -24,283 +24,283 @@ namespace ShiftOS
 
         private void InitializeComponent()
         {
-            this.pgcontents = new System.Windows.Forms.Panel();
-            this.pnlpinkcolours = new System.Windows.Forms.Panel();
-            this.pnlpinkoptions = new System.Windows.Forms.Panel();
-            this.Label35 = new System.Windows.Forms.Label();
-            this.txtpinksgreen = new System.Windows.Forms.TextBox();
-            this.txtpinksred = new System.Windows.Forms.TextBox();
-            this.Label36 = new System.Windows.Forms.Label();
-            this.Label37 = new System.Windows.Forms.Label();
-            this.txtpinksblue = new System.Windows.Forms.TextBox();
-            this.pnlpinkcustomcolour = new System.Windows.Forms.Panel();
-            this.pnlpink16 = new System.Windows.Forms.Panel();
-            this.pnlpink12 = new System.Windows.Forms.Panel();
-            this.pnlpink14 = new System.Windows.Forms.Panel();
-            this.pnlpink10 = new System.Windows.Forms.Panel();
-            this.pnlpink8 = new System.Windows.Forms.Panel();
-            this.pnlpink4 = new System.Windows.Forms.Panel();
-            this.pnlpink6 = new System.Windows.Forms.Panel();
-            this.pnlpink15 = new System.Windows.Forms.Panel();
-            this.pnlpink2 = new System.Windows.Forms.Panel();
-            this.pnlpink13 = new System.Windows.Forms.Panel();
-            this.pnlpink11 = new System.Windows.Forms.Panel();
-            this.pnlpink7 = new System.Windows.Forms.Panel();
-            this.pnlpink9 = new System.Windows.Forms.Panel();
-            this.pnlpink5 = new System.Windows.Forms.Panel();
-            this.pnlpink3 = new System.Windows.Forms.Panel();
-            this.pnlpink1 = new System.Windows.Forms.Panel();
-            this.lblpinklevel = new System.Windows.Forms.Label();
-            this.Label23 = new System.Windows.Forms.Label();
-            this.pnlredcolours = new System.Windows.Forms.Panel();
-            this.pnlredoptions = new System.Windows.Forms.Panel();
-            this.Label32 = new System.Windows.Forms.Label();
-            this.txtredsblue = new System.Windows.Forms.TextBox();
-            this.txtredsred = new System.Windows.Forms.TextBox();
-            this.Label33 = new System.Windows.Forms.Label();
-            this.Label34 = new System.Windows.Forms.Label();
-            this.txtredsgreen = new System.Windows.Forms.TextBox();
-            this.pnlredcustomcolour = new System.Windows.Forms.Panel();
-            this.pnlred16 = new System.Windows.Forms.Panel();
-            this.pnlred12 = new System.Windows.Forms.Panel();
-            this.pnlred14 = new System.Windows.Forms.Panel();
-            this.pnlred10 = new System.Windows.Forms.Panel();
-            this.pnlred8 = new System.Windows.Forms.Panel();
-            this.pnlred4 = new System.Windows.Forms.Panel();
-            this.pnlred6 = new System.Windows.Forms.Panel();
-            this.pnlred15 = new System.Windows.Forms.Panel();
-            this.pnlred2 = new System.Windows.Forms.Panel();
-            this.pnlred13 = new System.Windows.Forms.Panel();
-            this.pnlred11 = new System.Windows.Forms.Panel();
-            this.pnlred7 = new System.Windows.Forms.Panel();
-            this.pnlred9 = new System.Windows.Forms.Panel();
-            this.pnlred5 = new System.Windows.Forms.Panel();
-            this.pnlred3 = new System.Windows.Forms.Panel();
-            this.pnlred1 = new System.Windows.Forms.Panel();
-            this.lblredlevel = new System.Windows.Forms.Label();
-            this.Label21 = new System.Windows.Forms.Label();
-            this.pnlbrowncolours = new System.Windows.Forms.Panel();
-            this.pnlbrownoptions = new System.Windows.Forms.Panel();
-            this.Label29 = new System.Windows.Forms.Label();
-            this.txtbrownsblue = new System.Windows.Forms.TextBox();
-            this.txtbrownsred = new System.Windows.Forms.TextBox();
-            this.Label30 = new System.Windows.Forms.Label();
-            this.Label31 = new System.Windows.Forms.Label();
-            this.txtbrownsgreen = new System.Windows.Forms.TextBox();
-            this.pnlbrowncustomcolour = new System.Windows.Forms.Panel();
-            this.pnlbrown16 = new System.Windows.Forms.Panel();
-            this.pnlbrown12 = new System.Windows.Forms.Panel();
-            this.pnlbrown14 = new System.Windows.Forms.Panel();
-            this.pnlbrown10 = new System.Windows.Forms.Panel();
-            this.pnlbrown8 = new System.Windows.Forms.Panel();
-            this.pnlbrown4 = new System.Windows.Forms.Panel();
-            this.pnlbrown6 = new System.Windows.Forms.Panel();
-            this.pnlbrown15 = new System.Windows.Forms.Panel();
-            this.pnlbrown2 = new System.Windows.Forms.Panel();
-            this.pnlbrown13 = new System.Windows.Forms.Panel();
-            this.pnlbrown11 = new System.Windows.Forms.Panel();
-            this.pnlbrown7 = new System.Windows.Forms.Panel();
-            this.pnlbrown9 = new System.Windows.Forms.Panel();
-            this.pnlbrown5 = new System.Windows.Forms.Panel();
-            this.pnlbrown3 = new System.Windows.Forms.Panel();
-            this.pnlbrown1 = new System.Windows.Forms.Panel();
-            this.lblbrownlevel = new System.Windows.Forms.Label();
-            this.Label19 = new System.Windows.Forms.Label();
-            this.pnlorangecolours = new System.Windows.Forms.Panel();
-            this.pnlorangeoptions = new System.Windows.Forms.Panel();
-            this.Label25 = new System.Windows.Forms.Label();
-            this.txtorangesblue = new System.Windows.Forms.TextBox();
-            this.txtorangesred = new System.Windows.Forms.TextBox();
-            this.Label27 = new System.Windows.Forms.Label();
-            this.Label28 = new System.Windows.Forms.Label();
-            this.txtorangesgreen = new System.Windows.Forms.TextBox();
-            this.pnlorangecustomcolour = new System.Windows.Forms.Panel();
-            this.pnlorange16 = new System.Windows.Forms.Panel();
-            this.pnlorange12 = new System.Windows.Forms.Panel();
-            this.pnlorange14 = new System.Windows.Forms.Panel();
-            this.pnlorange10 = new System.Windows.Forms.Panel();
-            this.pnlorange8 = new System.Windows.Forms.Panel();
-            this.pnlorange4 = new System.Windows.Forms.Panel();
-            this.pnlorange6 = new System.Windows.Forms.Panel();
-            this.pnlorange15 = new System.Windows.Forms.Panel();
-            this.pnlorange2 = new System.Windows.Forms.Panel();
-            this.pnlorange13 = new System.Windows.Forms.Panel();
-            this.pnlorange11 = new System.Windows.Forms.Panel();
-            this.pnlorange7 = new System.Windows.Forms.Panel();
-            this.pnlorange9 = new System.Windows.Forms.Panel();
-            this.pnlorange5 = new System.Windows.Forms.Panel();
-            this.pnlorange3 = new System.Windows.Forms.Panel();
-            this.pnlorange1 = new System.Windows.Forms.Panel();
-            this.lblorangelevel = new System.Windows.Forms.Label();
-            this.Label13 = new System.Windows.Forms.Label();
-            this.pnlyellowcolours = new System.Windows.Forms.Panel();
-            this.pnlyellowoptions = new System.Windows.Forms.Panel();
-            this.Label20 = new System.Windows.Forms.Label();
-            this.txtyellowsblue = new System.Windows.Forms.TextBox();
-            this.txtyellowsred = new System.Windows.Forms.TextBox();
-            this.Label22 = new System.Windows.Forms.Label();
-            this.Label24 = new System.Windows.Forms.Label();
-            this.txtyellowsgreen = new System.Windows.Forms.TextBox();
-            this.pnlyellowcustomcolour = new System.Windows.Forms.Panel();
-            this.pnlyellow16 = new System.Windows.Forms.Panel();
-            this.pnlyellow12 = new System.Windows.Forms.Panel();
-            this.pnlyellow14 = new System.Windows.Forms.Panel();
-            this.pnlyellow10 = new System.Windows.Forms.Panel();
-            this.pnlyellow8 = new System.Windows.Forms.Panel();
-            this.pnlyellow4 = new System.Windows.Forms.Panel();
-            this.pnlyellow6 = new System.Windows.Forms.Panel();
-            this.pnlyellow15 = new System.Windows.Forms.Panel();
-            this.pnlyellow2 = new System.Windows.Forms.Panel();
-            this.pnlyellow13 = new System.Windows.Forms.Panel();
-            this.pnlyellow11 = new System.Windows.Forms.Panel();
-            this.pnlyellow7 = new System.Windows.Forms.Panel();
-            this.pnlyellow9 = new System.Windows.Forms.Panel();
-            this.pnlyellow5 = new System.Windows.Forms.Panel();
-            this.pnlyellow3 = new System.Windows.Forms.Panel();
-            this.pnlyellow1 = new System.Windows.Forms.Panel();
-            this.lblyellowlevel = new System.Windows.Forms.Label();
-            this.Label11 = new System.Windows.Forms.Label();
-            this.pnlgreencolours = new System.Windows.Forms.Panel();
-            this.pnlgreenoptions = new System.Windows.Forms.Panel();
-            this.Label15 = new System.Windows.Forms.Label();
-            this.txtgreensred = new System.Windows.Forms.TextBox();
-            this.txtgreensgreen = new System.Windows.Forms.TextBox();
-            this.Label16 = new System.Windows.Forms.Label();
-            this.Label18 = new System.Windows.Forms.Label();
-            this.txtgreensblue = new System.Windows.Forms.TextBox();
-            this.pnlgreencustomcolour = new System.Windows.Forms.Panel();
-            this.pnlgreen16 = new System.Windows.Forms.Panel();
-            this.pnlgreen12 = new System.Windows.Forms.Panel();
-            this.pnlgreen14 = new System.Windows.Forms.Panel();
-            this.pnlgreen10 = new System.Windows.Forms.Panel();
-            this.pnlgreen8 = new System.Windows.Forms.Panel();
-            this.pnlgreen4 = new System.Windows.Forms.Panel();
-            this.pnlgreen6 = new System.Windows.Forms.Panel();
-            this.pnlgreen15 = new System.Windows.Forms.Panel();
-            this.pnlgreen2 = new System.Windows.Forms.Panel();
-            this.pnlgreen13 = new System.Windows.Forms.Panel();
-            this.pnlgreen11 = new System.Windows.Forms.Panel();
-            this.pnlgreen7 = new System.Windows.Forms.Panel();
-            this.pnlgreen9 = new System.Windows.Forms.Panel();
-            this.pnlgreen5 = new System.Windows.Forms.Panel();
-            this.pnlgreen3 = new System.Windows.Forms.Panel();
-            this.pnlgreen1 = new System.Windows.Forms.Panel();
-            this.lblgreenlevel = new System.Windows.Forms.Label();
-            this.Label9 = new System.Windows.Forms.Label();
-            this.pnlbluecolours = new System.Windows.Forms.Panel();
-            this.pnlblueoptions = new System.Windows.Forms.Panel();
-            this.Label6 = new System.Windows.Forms.Label();
-            this.txtbluesred = new System.Windows.Forms.TextBox();
-            this.txtbluesblue = new System.Windows.Forms.TextBox();
-            this.Label4 = new System.Windows.Forms.Label();
-            this.Label2 = new System.Windows.Forms.Label();
-            this.txtbluesgreen = new System.Windows.Forms.TextBox();
-            this.pnlbluecustomcolour = new System.Windows.Forms.Panel();
-            this.pnlblue16 = new System.Windows.Forms.Panel();
-            this.pnlblue12 = new System.Windows.Forms.Panel();
-            this.pnlblue14 = new System.Windows.Forms.Panel();
-            this.pnlblue10 = new System.Windows.Forms.Panel();
-            this.pnlblue8 = new System.Windows.Forms.Panel();
-            this.pnlblue4 = new System.Windows.Forms.Panel();
-            this.pnlblue6 = new System.Windows.Forms.Panel();
-            this.pnlblue15 = new System.Windows.Forms.Panel();
-            this.pnlblue2 = new System.Windows.Forms.Panel();
-            this.pnlblue13 = new System.Windows.Forms.Panel();
-            this.pnlblue11 = new System.Windows.Forms.Panel();
-            this.pnlblue7 = new System.Windows.Forms.Panel();
-            this.pnlblue9 = new System.Windows.Forms.Panel();
-            this.pnlblue5 = new System.Windows.Forms.Panel();
-            this.pnlblue3 = new System.Windows.Forms.Panel();
-            this.pnlblue1 = new System.Windows.Forms.Panel();
-            this.lblbluelevel = new System.Windows.Forms.Label();
-            this.Label7 = new System.Windows.Forms.Label();
-            this.pnlpurplecolours = new System.Windows.Forms.Panel();
-            this.pnlpurpleoptions = new System.Windows.Forms.Panel();
-            this.Label8 = new System.Windows.Forms.Label();
-            this.txtpurplesgreen = new System.Windows.Forms.TextBox();
-            this.txtpurplesblue = new System.Windows.Forms.TextBox();
-            this.Label10 = new System.Windows.Forms.Label();
-            this.Label12 = new System.Windows.Forms.Label();
-            this.txtpurplesred = new System.Windows.Forms.TextBox();
-            this.pnlpurplecustomcolour = new System.Windows.Forms.Panel();
-            this.pnlpurple16 = new System.Windows.Forms.Panel();
-            this.pnlpurple12 = new System.Windows.Forms.Panel();
-            this.pnlpurple14 = new System.Windows.Forms.Panel();
-            this.pnlpurple10 = new System.Windows.Forms.Panel();
-            this.pnlpurple8 = new System.Windows.Forms.Panel();
-            this.pnlpurple4 = new System.Windows.Forms.Panel();
-            this.pnlpurple6 = new System.Windows.Forms.Panel();
-            this.pnlpurple15 = new System.Windows.Forms.Panel();
-            this.pnlpurple2 = new System.Windows.Forms.Panel();
-            this.pnlpurple13 = new System.Windows.Forms.Panel();
-            this.pnlpurple11 = new System.Windows.Forms.Panel();
-            this.pnlpurple7 = new System.Windows.Forms.Panel();
-            this.pnlpurple9 = new System.Windows.Forms.Panel();
-            this.pnlpurple5 = new System.Windows.Forms.Panel();
-            this.pnlpurple3 = new System.Windows.Forms.Panel();
-            this.pnlpurple1 = new System.Windows.Forms.Panel();
-            this.lblpurplelevel = new System.Windows.Forms.Label();
-            this.Label5 = new System.Windows.Forms.Label();
-            this.pnlgraycolours = new System.Windows.Forms.Panel();
-            this.lblcustomshadetut = new System.Windows.Forms.Label();
-            this.txtcustomgrayshade = new System.Windows.Forms.TextBox();
-            this.pnlgraycustomcolour = new System.Windows.Forms.Panel();
-            this.pnlgray16 = new System.Windows.Forms.Panel();
-            this.pnlgray12 = new System.Windows.Forms.Panel();
-            this.pnlgray14 = new System.Windows.Forms.Panel();
-            this.pnlgray10 = new System.Windows.Forms.Panel();
-            this.pnlgray8 = new System.Windows.Forms.Panel();
-            this.pnlgray4 = new System.Windows.Forms.Panel();
-            this.pnlgray6 = new System.Windows.Forms.Panel();
-            this.pnlgray15 = new System.Windows.Forms.Panel();
-            this.pnlgray2 = new System.Windows.Forms.Panel();
-            this.pnlgray13 = new System.Windows.Forms.Panel();
-            this.pnlgray11 = new System.Windows.Forms.Panel();
-            this.pnlgray7 = new System.Windows.Forms.Panel();
-            this.pnlgray9 = new System.Windows.Forms.Panel();
-            this.pnlgray5 = new System.Windows.Forms.Panel();
-            this.pnlgray3 = new System.Windows.Forms.Panel();
-            this.pnlgray1 = new System.Windows.Forms.Panel();
-            this.lblgraylevel = new System.Windows.Forms.Label();
-            this.Label3 = new System.Windows.Forms.Label();
-            this.pnlanycolours = new System.Windows.Forms.Panel();
-            this.pnlanyoptions = new System.Windows.Forms.Panel();
-            this.Label38 = new System.Windows.Forms.Label();
-            this.txtanysgreen = new System.Windows.Forms.TextBox();
-            this.txtanysred = new System.Windows.Forms.TextBox();
-            this.Label39 = new System.Windows.Forms.Label();
-            this.Label40 = new System.Windows.Forms.Label();
-            this.txtanysblue = new System.Windows.Forms.TextBox();
-            this.pnlanycustomcolour = new System.Windows.Forms.Panel();
-            this.pnlany16 = new System.Windows.Forms.Panel();
-            this.pnlany12 = new System.Windows.Forms.Panel();
-            this.pnlany14 = new System.Windows.Forms.Panel();
-            this.pnlany10 = new System.Windows.Forms.Panel();
-            this.pnlany8 = new System.Windows.Forms.Panel();
-            this.pnlany4 = new System.Windows.Forms.Panel();
-            this.pnlany6 = new System.Windows.Forms.Panel();
-            this.pnlany15 = new System.Windows.Forms.Panel();
-            this.pnlany2 = new System.Windows.Forms.Panel();
-            this.pnlany13 = new System.Windows.Forms.Panel();
-            this.pnlany11 = new System.Windows.Forms.Panel();
-            this.pnlany7 = new System.Windows.Forms.Panel();
-            this.pnlany9 = new System.Windows.Forms.Panel();
-            this.pnlany5 = new System.Windows.Forms.Panel();
-            this.pnlany3 = new System.Windows.Forms.Panel();
-            this.pnlany1 = new System.Windows.Forms.Panel();
-            this.lblanylevel = new System.Windows.Forms.Label();
-            this.Label1 = new System.Windows.Forms.Label();
-            this.Panel1 = new System.Windows.Forms.Panel();
-            this.lblnewcolourrgb = new System.Windows.Forms.Label();
-            this.lblnewcolourname = new System.Windows.Forms.Label();
-            this.Label26 = new System.Windows.Forms.Label();
-            this.Label17 = new System.Windows.Forms.Label();
-            this.lbloldcolourrgb = new System.Windows.Forms.Label();
-            this.lbloldcolourname = new System.Windows.Forms.Label();
-            this.Label14 = new System.Windows.Forms.Label();
-            this.pnlnewcolour = new System.Windows.Forms.Panel();
-            this.pnloldcolour = new System.Windows.Forms.Panel();
-            this.lblobjecttocolour = new System.Windows.Forms.Label();
+            this.pgcontents = new ShiftUI.Panel();
+            this.pnlpinkcolours = new ShiftUI.Panel();
+            this.pnlpinkoptions = new ShiftUI.Panel();
+            this.Label35 = new ShiftUI.Label();
+            this.txtpinksgreen = new ShiftUI.TextBox();
+            this.txtpinksred = new ShiftUI.TextBox();
+            this.Label36 = new ShiftUI.Label();
+            this.Label37 = new ShiftUI.Label();
+            this.txtpinksblue = new ShiftUI.TextBox();
+            this.pnlpinkcustomcolour = new ShiftUI.Panel();
+            this.pnlpink16 = new ShiftUI.Panel();
+            this.pnlpink12 = new ShiftUI.Panel();
+            this.pnlpink14 = new ShiftUI.Panel();
+            this.pnlpink10 = new ShiftUI.Panel();
+            this.pnlpink8 = new ShiftUI.Panel();
+            this.pnlpink4 = new ShiftUI.Panel();
+            this.pnlpink6 = new ShiftUI.Panel();
+            this.pnlpink15 = new ShiftUI.Panel();
+            this.pnlpink2 = new ShiftUI.Panel();
+            this.pnlpink13 = new ShiftUI.Panel();
+            this.pnlpink11 = new ShiftUI.Panel();
+            this.pnlpink7 = new ShiftUI.Panel();
+            this.pnlpink9 = new ShiftUI.Panel();
+            this.pnlpink5 = new ShiftUI.Panel();
+            this.pnlpink3 = new ShiftUI.Panel();
+            this.pnlpink1 = new ShiftUI.Panel();
+            this.lblpinklevel = new ShiftUI.Label();
+            this.Label23 = new ShiftUI.Label();
+            this.pnlredcolours = new ShiftUI.Panel();
+            this.pnlredoptions = new ShiftUI.Panel();
+            this.Label32 = new ShiftUI.Label();
+            this.txtredsblue = new ShiftUI.TextBox();
+            this.txtredsred = new ShiftUI.TextBox();
+            this.Label33 = new ShiftUI.Label();
+            this.Label34 = new ShiftUI.Label();
+            this.txtredsgreen = new ShiftUI.TextBox();
+            this.pnlredcustomcolour = new ShiftUI.Panel();
+            this.pnlred16 = new ShiftUI.Panel();
+            this.pnlred12 = new ShiftUI.Panel();
+            this.pnlred14 = new ShiftUI.Panel();
+            this.pnlred10 = new ShiftUI.Panel();
+            this.pnlred8 = new ShiftUI.Panel();
+            this.pnlred4 = new ShiftUI.Panel();
+            this.pnlred6 = new ShiftUI.Panel();
+            this.pnlred15 = new ShiftUI.Panel();
+            this.pnlred2 = new ShiftUI.Panel();
+            this.pnlred13 = new ShiftUI.Panel();
+            this.pnlred11 = new ShiftUI.Panel();
+            this.pnlred7 = new ShiftUI.Panel();
+            this.pnlred9 = new ShiftUI.Panel();
+            this.pnlred5 = new ShiftUI.Panel();
+            this.pnlred3 = new ShiftUI.Panel();
+            this.pnlred1 = new ShiftUI.Panel();
+            this.lblredlevel = new ShiftUI.Label();
+            this.Label21 = new ShiftUI.Label();
+            this.pnlbrowncolours = new ShiftUI.Panel();
+            this.pnlbrownoptions = new ShiftUI.Panel();
+            this.Label29 = new ShiftUI.Label();
+            this.txtbrownsblue = new ShiftUI.TextBox();
+            this.txtbrownsred = new ShiftUI.TextBox();
+            this.Label30 = new ShiftUI.Label();
+            this.Label31 = new ShiftUI.Label();
+            this.txtbrownsgreen = new ShiftUI.TextBox();
+            this.pnlbrowncustomcolour = new ShiftUI.Panel();
+            this.pnlbrown16 = new ShiftUI.Panel();
+            this.pnlbrown12 = new ShiftUI.Panel();
+            this.pnlbrown14 = new ShiftUI.Panel();
+            this.pnlbrown10 = new ShiftUI.Panel();
+            this.pnlbrown8 = new ShiftUI.Panel();
+            this.pnlbrown4 = new ShiftUI.Panel();
+            this.pnlbrown6 = new ShiftUI.Panel();
+            this.pnlbrown15 = new ShiftUI.Panel();
+            this.pnlbrown2 = new ShiftUI.Panel();
+            this.pnlbrown13 = new ShiftUI.Panel();
+            this.pnlbrown11 = new ShiftUI.Panel();
+            this.pnlbrown7 = new ShiftUI.Panel();
+            this.pnlbrown9 = new ShiftUI.Panel();
+            this.pnlbrown5 = new ShiftUI.Panel();
+            this.pnlbrown3 = new ShiftUI.Panel();
+            this.pnlbrown1 = new ShiftUI.Panel();
+            this.lblbrownlevel = new ShiftUI.Label();
+            this.Label19 = new ShiftUI.Label();
+            this.pnlorangecolours = new ShiftUI.Panel();
+            this.pnlorangeoptions = new ShiftUI.Panel();
+            this.Label25 = new ShiftUI.Label();
+            this.txtorangesblue = new ShiftUI.TextBox();
+            this.txtorangesred = new ShiftUI.TextBox();
+            this.Label27 = new ShiftUI.Label();
+            this.Label28 = new ShiftUI.Label();
+            this.txtorangesgreen = new ShiftUI.TextBox();
+            this.pnlorangecustomcolour = new ShiftUI.Panel();
+            this.pnlorange16 = new ShiftUI.Panel();
+            this.pnlorange12 = new ShiftUI.Panel();
+            this.pnlorange14 = new ShiftUI.Panel();
+            this.pnlorange10 = new ShiftUI.Panel();
+            this.pnlorange8 = new ShiftUI.Panel();
+            this.pnlorange4 = new ShiftUI.Panel();
+            this.pnlorange6 = new ShiftUI.Panel();
+            this.pnlorange15 = new ShiftUI.Panel();
+            this.pnlorange2 = new ShiftUI.Panel();
+            this.pnlorange13 = new ShiftUI.Panel();
+            this.pnlorange11 = new ShiftUI.Panel();
+            this.pnlorange7 = new ShiftUI.Panel();
+            this.pnlorange9 = new ShiftUI.Panel();
+            this.pnlorange5 = new ShiftUI.Panel();
+            this.pnlorange3 = new ShiftUI.Panel();
+            this.pnlorange1 = new ShiftUI.Panel();
+            this.lblorangelevel = new ShiftUI.Label();
+            this.Label13 = new ShiftUI.Label();
+            this.pnlyellowcolours = new ShiftUI.Panel();
+            this.pnlyellowoptions = new ShiftUI.Panel();
+            this.Label20 = new ShiftUI.Label();
+            this.txtyellowsblue = new ShiftUI.TextBox();
+            this.txtyellowsred = new ShiftUI.TextBox();
+            this.Label22 = new ShiftUI.Label();
+            this.Label24 = new ShiftUI.Label();
+            this.txtyellowsgreen = new ShiftUI.TextBox();
+            this.pnlyellowcustomcolour = new ShiftUI.Panel();
+            this.pnlyellow16 = new ShiftUI.Panel();
+            this.pnlyellow12 = new ShiftUI.Panel();
+            this.pnlyellow14 = new ShiftUI.Panel();
+            this.pnlyellow10 = new ShiftUI.Panel();
+            this.pnlyellow8 = new ShiftUI.Panel();
+            this.pnlyellow4 = new ShiftUI.Panel();
+            this.pnlyellow6 = new ShiftUI.Panel();
+            this.pnlyellow15 = new ShiftUI.Panel();
+            this.pnlyellow2 = new ShiftUI.Panel();
+            this.pnlyellow13 = new ShiftUI.Panel();
+            this.pnlyellow11 = new ShiftUI.Panel();
+            this.pnlyellow7 = new ShiftUI.Panel();
+            this.pnlyellow9 = new ShiftUI.Panel();
+            this.pnlyellow5 = new ShiftUI.Panel();
+            this.pnlyellow3 = new ShiftUI.Panel();
+            this.pnlyellow1 = new ShiftUI.Panel();
+            this.lblyellowlevel = new ShiftUI.Label();
+            this.Label11 = new ShiftUI.Label();
+            this.pnlgreencolours = new ShiftUI.Panel();
+            this.pnlgreenoptions = new ShiftUI.Panel();
+            this.Label15 = new ShiftUI.Label();
+            this.txtgreensred = new ShiftUI.TextBox();
+            this.txtgreensgreen = new ShiftUI.TextBox();
+            this.Label16 = new ShiftUI.Label();
+            this.Label18 = new ShiftUI.Label();
+            this.txtgreensblue = new ShiftUI.TextBox();
+            this.pnlgreencustomcolour = new ShiftUI.Panel();
+            this.pnlgreen16 = new ShiftUI.Panel();
+            this.pnlgreen12 = new ShiftUI.Panel();
+            this.pnlgreen14 = new ShiftUI.Panel();
+            this.pnlgreen10 = new ShiftUI.Panel();
+            this.pnlgreen8 = new ShiftUI.Panel();
+            this.pnlgreen4 = new ShiftUI.Panel();
+            this.pnlgreen6 = new ShiftUI.Panel();
+            this.pnlgreen15 = new ShiftUI.Panel();
+            this.pnlgreen2 = new ShiftUI.Panel();
+            this.pnlgreen13 = new ShiftUI.Panel();
+            this.pnlgreen11 = new ShiftUI.Panel();
+            this.pnlgreen7 = new ShiftUI.Panel();
+            this.pnlgreen9 = new ShiftUI.Panel();
+            this.pnlgreen5 = new ShiftUI.Panel();
+            this.pnlgreen3 = new ShiftUI.Panel();
+            this.pnlgreen1 = new ShiftUI.Panel();
+            this.lblgreenlevel = new ShiftUI.Label();
+            this.Label9 = new ShiftUI.Label();
+            this.pnlbluecolours = new ShiftUI.Panel();
+            this.pnlblueoptions = new ShiftUI.Panel();
+            this.Label6 = new ShiftUI.Label();
+            this.txtbluesred = new ShiftUI.TextBox();
+            this.txtbluesblue = new ShiftUI.TextBox();
+            this.Label4 = new ShiftUI.Label();
+            this.Label2 = new ShiftUI.Label();
+            this.txtbluesgreen = new ShiftUI.TextBox();
+            this.pnlbluecustomcolour = new ShiftUI.Panel();
+            this.pnlblue16 = new ShiftUI.Panel();
+            this.pnlblue12 = new ShiftUI.Panel();
+            this.pnlblue14 = new ShiftUI.Panel();
+            this.pnlblue10 = new ShiftUI.Panel();
+            this.pnlblue8 = new ShiftUI.Panel();
+            this.pnlblue4 = new ShiftUI.Panel();
+            this.pnlblue6 = new ShiftUI.Panel();
+            this.pnlblue15 = new ShiftUI.Panel();
+            this.pnlblue2 = new ShiftUI.Panel();
+            this.pnlblue13 = new ShiftUI.Panel();
+            this.pnlblue11 = new ShiftUI.Panel();
+            this.pnlblue7 = new ShiftUI.Panel();
+            this.pnlblue9 = new ShiftUI.Panel();
+            this.pnlblue5 = new ShiftUI.Panel();
+            this.pnlblue3 = new ShiftUI.Panel();
+            this.pnlblue1 = new ShiftUI.Panel();
+            this.lblbluelevel = new ShiftUI.Label();
+            this.Label7 = new ShiftUI.Label();
+            this.pnlpurplecolours = new ShiftUI.Panel();
+            this.pnlpurpleoptions = new ShiftUI.Panel();
+            this.Label8 = new ShiftUI.Label();
+            this.txtpurplesgreen = new ShiftUI.TextBox();
+            this.txtpurplesblue = new ShiftUI.TextBox();
+            this.Label10 = new ShiftUI.Label();
+            this.Label12 = new ShiftUI.Label();
+            this.txtpurplesred = new ShiftUI.TextBox();
+            this.pnlpurplecustomcolour = new ShiftUI.Panel();
+            this.pnlpurple16 = new ShiftUI.Panel();
+            this.pnlpurple12 = new ShiftUI.Panel();
+            this.pnlpurple14 = new ShiftUI.Panel();
+            this.pnlpurple10 = new ShiftUI.Panel();
+            this.pnlpurple8 = new ShiftUI.Panel();
+            this.pnlpurple4 = new ShiftUI.Panel();
+            this.pnlpurple6 = new ShiftUI.Panel();
+            this.pnlpurple15 = new ShiftUI.Panel();
+            this.pnlpurple2 = new ShiftUI.Panel();
+            this.pnlpurple13 = new ShiftUI.Panel();
+            this.pnlpurple11 = new ShiftUI.Panel();
+            this.pnlpurple7 = new ShiftUI.Panel();
+            this.pnlpurple9 = new ShiftUI.Panel();
+            this.pnlpurple5 = new ShiftUI.Panel();
+            this.pnlpurple3 = new ShiftUI.Panel();
+            this.pnlpurple1 = new ShiftUI.Panel();
+            this.lblpurplelevel = new ShiftUI.Label();
+            this.Label5 = new ShiftUI.Label();
+            this.pnlgraycolours = new ShiftUI.Panel();
+            this.lblcustomshadetut = new ShiftUI.Label();
+            this.txtcustomgrayshade = new ShiftUI.TextBox();
+            this.pnlgraycustomcolour = new ShiftUI.Panel();
+            this.pnlgray16 = new ShiftUI.Panel();
+            this.pnlgray12 = new ShiftUI.Panel();
+            this.pnlgray14 = new ShiftUI.Panel();
+            this.pnlgray10 = new ShiftUI.Panel();
+            this.pnlgray8 = new ShiftUI.Panel();
+            this.pnlgray4 = new ShiftUI.Panel();
+            this.pnlgray6 = new ShiftUI.Panel();
+            this.pnlgray15 = new ShiftUI.Panel();
+            this.pnlgray2 = new ShiftUI.Panel();
+            this.pnlgray13 = new ShiftUI.Panel();
+            this.pnlgray11 = new ShiftUI.Panel();
+            this.pnlgray7 = new ShiftUI.Panel();
+            this.pnlgray9 = new ShiftUI.Panel();
+            this.pnlgray5 = new ShiftUI.Panel();
+            this.pnlgray3 = new ShiftUI.Panel();
+            this.pnlgray1 = new ShiftUI.Panel();
+            this.lblgraylevel = new ShiftUI.Label();
+            this.Label3 = new ShiftUI.Label();
+            this.pnlanycolours = new ShiftUI.Panel();
+            this.pnlanyoptions = new ShiftUI.Panel();
+            this.Label38 = new ShiftUI.Label();
+            this.txtanysgreen = new ShiftUI.TextBox();
+            this.txtanysred = new ShiftUI.TextBox();
+            this.Label39 = new ShiftUI.Label();
+            this.Label40 = new ShiftUI.Label();
+            this.txtanysblue = new ShiftUI.TextBox();
+            this.pnlanycustomcolour = new ShiftUI.Panel();
+            this.pnlany16 = new ShiftUI.Panel();
+            this.pnlany12 = new ShiftUI.Panel();
+            this.pnlany14 = new ShiftUI.Panel();
+            this.pnlany10 = new ShiftUI.Panel();
+            this.pnlany8 = new ShiftUI.Panel();
+            this.pnlany4 = new ShiftUI.Panel();
+            this.pnlany6 = new ShiftUI.Panel();
+            this.pnlany15 = new ShiftUI.Panel();
+            this.pnlany2 = new ShiftUI.Panel();
+            this.pnlany13 = new ShiftUI.Panel();
+            this.pnlany11 = new ShiftUI.Panel();
+            this.pnlany7 = new ShiftUI.Panel();
+            this.pnlany9 = new ShiftUI.Panel();
+            this.pnlany5 = new ShiftUI.Panel();
+            this.pnlany3 = new ShiftUI.Panel();
+            this.pnlany1 = new ShiftUI.Panel();
+            this.lblanylevel = new ShiftUI.Label();
+            this.Label1 = new ShiftUI.Label();
+            this.Panel1 = new ShiftUI.Panel();
+            this.lblnewcolourrgb = new ShiftUI.Label();
+            this.lblnewcolourname = new ShiftUI.Label();
+            this.Label26 = new ShiftUI.Label();
+            this.Label17 = new ShiftUI.Label();
+            this.lbloldcolourrgb = new ShiftUI.Label();
+            this.lbloldcolourname = new ShiftUI.Label();
+            this.Label14 = new ShiftUI.Label();
+            this.pnlnewcolour = new ShiftUI.Panel();
+            this.pnloldcolour = new ShiftUI.Panel();
+            this.lblobjecttocolour = new ShiftUI.Label();
             this.pgcontents.SuspendLayout();
             this.pnlpinkcolours.SuspendLayout();
             this.pnlpinkoptions.SuspendLayout();
@@ -326,18 +326,18 @@ namespace ShiftOS
             // 
             // pgcontents
             // 
-            this.pgcontents.Controls.Add(this.pnlpinkcolours);
-            this.pgcontents.Controls.Add(this.pnlredcolours);
-            this.pgcontents.Controls.Add(this.pnlbrowncolours);
-            this.pgcontents.Controls.Add(this.pnlorangecolours);
-            this.pgcontents.Controls.Add(this.pnlyellowcolours);
-            this.pgcontents.Controls.Add(this.pnlgreencolours);
-            this.pgcontents.Controls.Add(this.pnlbluecolours);
-            this.pgcontents.Controls.Add(this.pnlpurplecolours);
-            this.pgcontents.Controls.Add(this.pnlgraycolours);
-            this.pgcontents.Controls.Add(this.pnlanycolours);
-            this.pgcontents.Controls.Add(this.Panel1);
-            this.pgcontents.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pgcontents.Widgets.Add(this.pnlpinkcolours);
+            this.pgcontents.Widgets.Add(this.pnlredcolours);
+            this.pgcontents.Widgets.Add(this.pnlbrowncolours);
+            this.pgcontents.Widgets.Add(this.pnlorangecolours);
+            this.pgcontents.Widgets.Add(this.pnlyellowcolours);
+            this.pgcontents.Widgets.Add(this.pnlgreencolours);
+            this.pgcontents.Widgets.Add(this.pnlbluecolours);
+            this.pgcontents.Widgets.Add(this.pnlpurplecolours);
+            this.pgcontents.Widgets.Add(this.pnlgraycolours);
+            this.pgcontents.Widgets.Add(this.pnlanycolours);
+            this.pgcontents.Widgets.Add(this.Panel1);
+            this.pgcontents.Dock = ShiftUI.DockStyle.Fill;
             this.pgcontents.Location = new System.Drawing.Point(0, 0);
             this.pgcontents.Name = "pgcontents";
             this.pgcontents.Size = new System.Drawing.Size(447, 600);
@@ -346,27 +346,27 @@ namespace ShiftOS
             // pnlpinkcolours
             // 
             this.pnlpinkcolours.BackColor = System.Drawing.Color.White;
-            this.pnlpinkcolours.Controls.Add(this.pnlpinkoptions);
-            this.pnlpinkcolours.Controls.Add(this.pnlpinkcustomcolour);
-            this.pnlpinkcolours.Controls.Add(this.pnlpink16);
-            this.pnlpinkcolours.Controls.Add(this.pnlpink12);
-            this.pnlpinkcolours.Controls.Add(this.pnlpink14);
-            this.pnlpinkcolours.Controls.Add(this.pnlpink10);
-            this.pnlpinkcolours.Controls.Add(this.pnlpink8);
-            this.pnlpinkcolours.Controls.Add(this.pnlpink4);
-            this.pnlpinkcolours.Controls.Add(this.pnlpink6);
-            this.pnlpinkcolours.Controls.Add(this.pnlpink15);
-            this.pnlpinkcolours.Controls.Add(this.pnlpink2);
-            this.pnlpinkcolours.Controls.Add(this.pnlpink13);
-            this.pnlpinkcolours.Controls.Add(this.pnlpink11);
-            this.pnlpinkcolours.Controls.Add(this.pnlpink7);
-            this.pnlpinkcolours.Controls.Add(this.pnlpink9);
-            this.pnlpinkcolours.Controls.Add(this.pnlpink5);
-            this.pnlpinkcolours.Controls.Add(this.pnlpink3);
-            this.pnlpinkcolours.Controls.Add(this.pnlpink1);
-            this.pnlpinkcolours.Controls.Add(this.lblpinklevel);
-            this.pnlpinkcolours.Controls.Add(this.Label23);
-            this.pnlpinkcolours.Dock = System.Windows.Forms.DockStyle.Top;
+            this.pnlpinkcolours.Widgets.Add(this.pnlpinkoptions);
+            this.pnlpinkcolours.Widgets.Add(this.pnlpinkcustomcolour);
+            this.pnlpinkcolours.Widgets.Add(this.pnlpink16);
+            this.pnlpinkcolours.Widgets.Add(this.pnlpink12);
+            this.pnlpinkcolours.Widgets.Add(this.pnlpink14);
+            this.pnlpinkcolours.Widgets.Add(this.pnlpink10);
+            this.pnlpinkcolours.Widgets.Add(this.pnlpink8);
+            this.pnlpinkcolours.Widgets.Add(this.pnlpink4);
+            this.pnlpinkcolours.Widgets.Add(this.pnlpink6);
+            this.pnlpinkcolours.Widgets.Add(this.pnlpink15);
+            this.pnlpinkcolours.Widgets.Add(this.pnlpink2);
+            this.pnlpinkcolours.Widgets.Add(this.pnlpink13);
+            this.pnlpinkcolours.Widgets.Add(this.pnlpink11);
+            this.pnlpinkcolours.Widgets.Add(this.pnlpink7);
+            this.pnlpinkcolours.Widgets.Add(this.pnlpink9);
+            this.pnlpinkcolours.Widgets.Add(this.pnlpink5);
+            this.pnlpinkcolours.Widgets.Add(this.pnlpink3);
+            this.pnlpinkcolours.Widgets.Add(this.pnlpink1);
+            this.pnlpinkcolours.Widgets.Add(this.lblpinklevel);
+            this.pnlpinkcolours.Widgets.Add(this.Label23);
+            this.pnlpinkcolours.Dock = ShiftUI.DockStyle.Top;
             this.pnlpinkcolours.Location = new System.Drawing.Point(0, 521);
             this.pnlpinkcolours.Name = "pnlpinkcolours";
             this.pnlpinkcolours.Size = new System.Drawing.Size(447, 46);
@@ -375,12 +375,12 @@ namespace ShiftOS
             // 
             // pnlpinkoptions
             // 
-            this.pnlpinkoptions.Controls.Add(this.Label35);
-            this.pnlpinkoptions.Controls.Add(this.txtpinksgreen);
-            this.pnlpinkoptions.Controls.Add(this.txtpinksred);
-            this.pnlpinkoptions.Controls.Add(this.Label36);
-            this.pnlpinkoptions.Controls.Add(this.Label37);
-            this.pnlpinkoptions.Controls.Add(this.txtpinksblue);
+            this.pnlpinkoptions.Widgets.Add(this.Label35);
+            this.pnlpinkoptions.Widgets.Add(this.txtpinksgreen);
+            this.pnlpinkoptions.Widgets.Add(this.txtpinksred);
+            this.pnlpinkoptions.Widgets.Add(this.Label36);
+            this.pnlpinkoptions.Widgets.Add(this.Label37);
+            this.pnlpinkoptions.Widgets.Add(this.txtpinksblue);
             this.pnlpinkoptions.Location = new System.Drawing.Point(282, 2);
             this.pnlpinkoptions.Name = "pnlpinkoptions";
             this.pnlpinkoptions.Size = new System.Drawing.Size(120, 40);
@@ -400,27 +400,27 @@ namespace ShiftOS
             // txtpinksgreen
             // 
             this.txtpinksgreen.BackColor = System.Drawing.Color.White;
-            this.txtpinksgreen.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtpinksgreen.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtpinksgreen.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtpinksgreen.Location = new System.Drawing.Point(95, 22);
             this.txtpinksgreen.Multiline = true;
             this.txtpinksgreen.Name = "txtpinksgreen";
             this.txtpinksgreen.Size = new System.Drawing.Size(23, 17);
             this.txtpinksgreen.TabIndex = 25;
-            this.txtpinksgreen.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtpinksgreen.TextAlign = ShiftUI.HorizontalAlignment.Center;
             this.txtpinksgreen.TextChanged += new System.EventHandler(this.txtpinksred_TextChanged);
             // 
             // txtpinksred
             // 
             this.txtpinksred.BackColor = System.Drawing.Color.White;
-            this.txtpinksred.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtpinksred.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtpinksred.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtpinksred.Location = new System.Drawing.Point(64, 2);
             this.txtpinksred.Multiline = true;
             this.txtpinksred.Name = "txtpinksred";
             this.txtpinksred.Size = new System.Drawing.Size(23, 17);
             this.txtpinksred.TabIndex = 21;
-            this.txtpinksred.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtpinksred.TextAlign = ShiftUI.HorizontalAlignment.Center;
             this.txtpinksred.TextChanged += new System.EventHandler(this.txtpinksred_TextChanged);
             // 
             // Label36
@@ -446,19 +446,19 @@ namespace ShiftOS
             // txtpinksblue
             // 
             this.txtpinksblue.BackColor = System.Drawing.Color.White;
-            this.txtpinksblue.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtpinksblue.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtpinksblue.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtpinksblue.Location = new System.Drawing.Point(32, 22);
             this.txtpinksblue.Multiline = true;
             this.txtpinksblue.Name = "txtpinksblue";
             this.txtpinksblue.Size = new System.Drawing.Size(23, 17);
             this.txtpinksblue.TabIndex = 23;
-            this.txtpinksblue.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtpinksblue.TextAlign = ShiftUI.HorizontalAlignment.Center;
             this.txtpinksblue.TextChanged += new System.EventHandler(this.txtpinksred_TextChanged);
             // 
             // pnlpinkcustomcolour
             // 
-            this.pnlpinkcustomcolour.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpinkcustomcolour.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpinkcustomcolour.Location = new System.Drawing.Point(406, 8);
             this.pnlpinkcustomcolour.Name = "pnlpinkcustomcolour";
             this.pnlpinkcustomcolour.Size = new System.Drawing.Size(32, 30);
@@ -467,7 +467,7 @@ namespace ShiftOS
             // 
             // pnlpink16
             // 
-            this.pnlpink16.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpink16.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpink16.Location = new System.Drawing.Point(259, 25);
             this.pnlpink16.Name = "pnlpink16";
             this.pnlpink16.Size = new System.Drawing.Size(20, 13);
@@ -476,7 +476,7 @@ namespace ShiftOS
             // 
             // pnlpink12
             // 
-            this.pnlpink12.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpink12.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpink12.Location = new System.Drawing.Point(155, 25);
             this.pnlpink12.Name = "pnlpink12";
             this.pnlpink12.Size = new System.Drawing.Size(20, 13);
@@ -485,7 +485,7 @@ namespace ShiftOS
             // 
             // pnlpink14
             // 
-            this.pnlpink14.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpink14.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpink14.Location = new System.Drawing.Point(207, 25);
             this.pnlpink14.Name = "pnlpink14";
             this.pnlpink14.Size = new System.Drawing.Size(20, 13);
@@ -494,7 +494,7 @@ namespace ShiftOS
             // 
             // pnlpink10
             // 
-            this.pnlpink10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpink10.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpink10.Location = new System.Drawing.Point(103, 25);
             this.pnlpink10.Name = "pnlpink10";
             this.pnlpink10.Size = new System.Drawing.Size(20, 13);
@@ -503,7 +503,7 @@ namespace ShiftOS
             // 
             // pnlpink8
             // 
-            this.pnlpink8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpink8.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpink8.Location = new System.Drawing.Point(259, 8);
             this.pnlpink8.Name = "pnlpink8";
             this.pnlpink8.Size = new System.Drawing.Size(20, 13);
@@ -512,7 +512,7 @@ namespace ShiftOS
             // 
             // pnlpink4
             // 
-            this.pnlpink4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpink4.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpink4.Location = new System.Drawing.Point(155, 8);
             this.pnlpink4.Name = "pnlpink4";
             this.pnlpink4.Size = new System.Drawing.Size(20, 13);
@@ -521,7 +521,7 @@ namespace ShiftOS
             // 
             // pnlpink6
             // 
-            this.pnlpink6.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpink6.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpink6.Location = new System.Drawing.Point(207, 8);
             this.pnlpink6.Name = "pnlpink6";
             this.pnlpink6.Size = new System.Drawing.Size(20, 13);
@@ -530,7 +530,7 @@ namespace ShiftOS
             // 
             // pnlpink15
             // 
-            this.pnlpink15.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpink15.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpink15.Location = new System.Drawing.Point(233, 25);
             this.pnlpink15.Name = "pnlpink15";
             this.pnlpink15.Size = new System.Drawing.Size(20, 13);
@@ -539,7 +539,7 @@ namespace ShiftOS
             // 
             // pnlpink2
             // 
-            this.pnlpink2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpink2.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpink2.Location = new System.Drawing.Point(103, 8);
             this.pnlpink2.Name = "pnlpink2";
             this.pnlpink2.Size = new System.Drawing.Size(20, 13);
@@ -548,7 +548,7 @@ namespace ShiftOS
             // 
             // pnlpink13
             // 
-            this.pnlpink13.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpink13.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpink13.Location = new System.Drawing.Point(181, 25);
             this.pnlpink13.Name = "pnlpink13";
             this.pnlpink13.Size = new System.Drawing.Size(20, 13);
@@ -557,7 +557,7 @@ namespace ShiftOS
             // 
             // pnlpink11
             // 
-            this.pnlpink11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpink11.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpink11.Location = new System.Drawing.Point(129, 25);
             this.pnlpink11.Name = "pnlpink11";
             this.pnlpink11.Size = new System.Drawing.Size(20, 13);
@@ -566,7 +566,7 @@ namespace ShiftOS
             // 
             // pnlpink7
             // 
-            this.pnlpink7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpink7.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpink7.Location = new System.Drawing.Point(233, 8);
             this.pnlpink7.Name = "pnlpink7";
             this.pnlpink7.Size = new System.Drawing.Size(20, 13);
@@ -575,7 +575,7 @@ namespace ShiftOS
             // 
             // pnlpink9
             // 
-            this.pnlpink9.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpink9.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpink9.Location = new System.Drawing.Point(77, 25);
             this.pnlpink9.Name = "pnlpink9";
             this.pnlpink9.Size = new System.Drawing.Size(20, 13);
@@ -584,7 +584,7 @@ namespace ShiftOS
             // 
             // pnlpink5
             // 
-            this.pnlpink5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpink5.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpink5.Location = new System.Drawing.Point(181, 8);
             this.pnlpink5.Name = "pnlpink5";
             this.pnlpink5.Size = new System.Drawing.Size(20, 13);
@@ -593,7 +593,7 @@ namespace ShiftOS
             // 
             // pnlpink3
             // 
-            this.pnlpink3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpink3.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpink3.Location = new System.Drawing.Point(129, 8);
             this.pnlpink3.Name = "pnlpink3";
             this.pnlpink3.Size = new System.Drawing.Size(20, 13);
@@ -602,7 +602,7 @@ namespace ShiftOS
             // 
             // pnlpink1
             // 
-            this.pnlpink1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpink1.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpink1.Location = new System.Drawing.Point(77, 8);
             this.pnlpink1.Name = "pnlpink1";
             this.pnlpink1.Size = new System.Drawing.Size(20, 13);
@@ -632,27 +632,27 @@ namespace ShiftOS
             // pnlredcolours
             // 
             this.pnlredcolours.BackColor = System.Drawing.Color.White;
-            this.pnlredcolours.Controls.Add(this.pnlredoptions);
-            this.pnlredcolours.Controls.Add(this.pnlredcustomcolour);
-            this.pnlredcolours.Controls.Add(this.pnlred16);
-            this.pnlredcolours.Controls.Add(this.pnlred12);
-            this.pnlredcolours.Controls.Add(this.pnlred14);
-            this.pnlredcolours.Controls.Add(this.pnlred10);
-            this.pnlredcolours.Controls.Add(this.pnlred8);
-            this.pnlredcolours.Controls.Add(this.pnlred4);
-            this.pnlredcolours.Controls.Add(this.pnlred6);
-            this.pnlredcolours.Controls.Add(this.pnlred15);
-            this.pnlredcolours.Controls.Add(this.pnlred2);
-            this.pnlredcolours.Controls.Add(this.pnlred13);
-            this.pnlredcolours.Controls.Add(this.pnlred11);
-            this.pnlredcolours.Controls.Add(this.pnlred7);
-            this.pnlredcolours.Controls.Add(this.pnlred9);
-            this.pnlredcolours.Controls.Add(this.pnlred5);
-            this.pnlredcolours.Controls.Add(this.pnlred3);
-            this.pnlredcolours.Controls.Add(this.pnlred1);
-            this.pnlredcolours.Controls.Add(this.lblredlevel);
-            this.pnlredcolours.Controls.Add(this.Label21);
-            this.pnlredcolours.Dock = System.Windows.Forms.DockStyle.Top;
+            this.pnlredcolours.Widgets.Add(this.pnlredoptions);
+            this.pnlredcolours.Widgets.Add(this.pnlredcustomcolour);
+            this.pnlredcolours.Widgets.Add(this.pnlred16);
+            this.pnlredcolours.Widgets.Add(this.pnlred12);
+            this.pnlredcolours.Widgets.Add(this.pnlred14);
+            this.pnlredcolours.Widgets.Add(this.pnlred10);
+            this.pnlredcolours.Widgets.Add(this.pnlred8);
+            this.pnlredcolours.Widgets.Add(this.pnlred4);
+            this.pnlredcolours.Widgets.Add(this.pnlred6);
+            this.pnlredcolours.Widgets.Add(this.pnlred15);
+            this.pnlredcolours.Widgets.Add(this.pnlred2);
+            this.pnlredcolours.Widgets.Add(this.pnlred13);
+            this.pnlredcolours.Widgets.Add(this.pnlred11);
+            this.pnlredcolours.Widgets.Add(this.pnlred7);
+            this.pnlredcolours.Widgets.Add(this.pnlred9);
+            this.pnlredcolours.Widgets.Add(this.pnlred5);
+            this.pnlredcolours.Widgets.Add(this.pnlred3);
+            this.pnlredcolours.Widgets.Add(this.pnlred1);
+            this.pnlredcolours.Widgets.Add(this.lblredlevel);
+            this.pnlredcolours.Widgets.Add(this.Label21);
+            this.pnlredcolours.Dock = ShiftUI.DockStyle.Top;
             this.pnlredcolours.Location = new System.Drawing.Point(0, 475);
             this.pnlredcolours.Name = "pnlredcolours";
             this.pnlredcolours.Size = new System.Drawing.Size(447, 46);
@@ -661,12 +661,12 @@ namespace ShiftOS
             // 
             // pnlredoptions
             // 
-            this.pnlredoptions.Controls.Add(this.Label32);
-            this.pnlredoptions.Controls.Add(this.txtredsblue);
-            this.pnlredoptions.Controls.Add(this.txtredsred);
-            this.pnlredoptions.Controls.Add(this.Label33);
-            this.pnlredoptions.Controls.Add(this.Label34);
-            this.pnlredoptions.Controls.Add(this.txtredsgreen);
+            this.pnlredoptions.Widgets.Add(this.Label32);
+            this.pnlredoptions.Widgets.Add(this.txtredsblue);
+            this.pnlredoptions.Widgets.Add(this.txtredsred);
+            this.pnlredoptions.Widgets.Add(this.Label33);
+            this.pnlredoptions.Widgets.Add(this.Label34);
+            this.pnlredoptions.Widgets.Add(this.txtredsgreen);
             this.pnlredoptions.Location = new System.Drawing.Point(282, 2);
             this.pnlredoptions.Name = "pnlredoptions";
             this.pnlredoptions.Size = new System.Drawing.Size(120, 40);
@@ -686,26 +686,26 @@ namespace ShiftOS
             // txtredsblue
             // 
             this.txtredsblue.BackColor = System.Drawing.Color.White;
-            this.txtredsblue.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtredsblue.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtredsblue.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtredsblue.Location = new System.Drawing.Point(95, 22);
             this.txtredsblue.Multiline = true;
             this.txtredsblue.Name = "txtredsblue";
             this.txtredsblue.Size = new System.Drawing.Size(23, 17);
             this.txtredsblue.TabIndex = 25;
-            this.txtredsblue.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtredsblue.TextAlign = ShiftUI.HorizontalAlignment.Center;
             // 
             // txtredsred
             // 
             this.txtredsred.BackColor = System.Drawing.Color.White;
-            this.txtredsred.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtredsred.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtredsred.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtredsred.Location = new System.Drawing.Point(64, 2);
             this.txtredsred.Multiline = true;
             this.txtredsred.Name = "txtredsred";
             this.txtredsred.Size = new System.Drawing.Size(23, 17);
             this.txtredsred.TabIndex = 21;
-            this.txtredsred.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtredsred.TextAlign = ShiftUI.HorizontalAlignment.Center;
             // 
             // Label33
             // 
@@ -730,18 +730,18 @@ namespace ShiftOS
             // txtredsgreen
             // 
             this.txtredsgreen.BackColor = System.Drawing.Color.White;
-            this.txtredsgreen.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtredsgreen.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtredsgreen.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtredsgreen.Location = new System.Drawing.Point(40, 22);
             this.txtredsgreen.Multiline = true;
             this.txtredsgreen.Name = "txtredsgreen";
             this.txtredsgreen.Size = new System.Drawing.Size(23, 17);
             this.txtredsgreen.TabIndex = 23;
-            this.txtredsgreen.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtredsgreen.TextAlign = ShiftUI.HorizontalAlignment.Center;
             // 
             // pnlredcustomcolour
             // 
-            this.pnlredcustomcolour.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlredcustomcolour.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlredcustomcolour.Location = new System.Drawing.Point(406, 8);
             this.pnlredcustomcolour.Name = "pnlredcustomcolour";
             this.pnlredcustomcolour.Size = new System.Drawing.Size(32, 30);
@@ -750,7 +750,7 @@ namespace ShiftOS
             // 
             // pnlred16
             // 
-            this.pnlred16.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlred16.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlred16.Location = new System.Drawing.Point(259, 25);
             this.pnlred16.Name = "pnlred16";
             this.pnlred16.Size = new System.Drawing.Size(20, 13);
@@ -759,7 +759,7 @@ namespace ShiftOS
             // 
             // pnlred12
             // 
-            this.pnlred12.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlred12.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlred12.Location = new System.Drawing.Point(155, 25);
             this.pnlred12.Name = "pnlred12";
             this.pnlred12.Size = new System.Drawing.Size(20, 13);
@@ -768,7 +768,7 @@ namespace ShiftOS
             // 
             // pnlred14
             // 
-            this.pnlred14.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlred14.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlred14.Location = new System.Drawing.Point(207, 25);
             this.pnlred14.Name = "pnlred14";
             this.pnlred14.Size = new System.Drawing.Size(20, 13);
@@ -777,7 +777,7 @@ namespace ShiftOS
             // 
             // pnlred10
             // 
-            this.pnlred10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlred10.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlred10.Location = new System.Drawing.Point(103, 25);
             this.pnlred10.Name = "pnlred10";
             this.pnlred10.Size = new System.Drawing.Size(20, 13);
@@ -786,7 +786,7 @@ namespace ShiftOS
             // 
             // pnlred8
             // 
-            this.pnlred8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlred8.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlred8.Location = new System.Drawing.Point(259, 8);
             this.pnlred8.Name = "pnlred8";
             this.pnlred8.Size = new System.Drawing.Size(20, 13);
@@ -795,7 +795,7 @@ namespace ShiftOS
             // 
             // pnlred4
             // 
-            this.pnlred4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlred4.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlred4.Location = new System.Drawing.Point(155, 8);
             this.pnlred4.Name = "pnlred4";
             this.pnlred4.Size = new System.Drawing.Size(20, 13);
@@ -804,7 +804,7 @@ namespace ShiftOS
             // 
             // pnlred6
             // 
-            this.pnlred6.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlred6.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlred6.Location = new System.Drawing.Point(207, 8);
             this.pnlred6.Name = "pnlred6";
             this.pnlred6.Size = new System.Drawing.Size(20, 13);
@@ -813,7 +813,7 @@ namespace ShiftOS
             // 
             // pnlred15
             // 
-            this.pnlred15.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlred15.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlred15.Location = new System.Drawing.Point(233, 25);
             this.pnlred15.Name = "pnlred15";
             this.pnlred15.Size = new System.Drawing.Size(20, 13);
@@ -822,7 +822,7 @@ namespace ShiftOS
             // 
             // pnlred2
             // 
-            this.pnlred2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlred2.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlred2.Location = new System.Drawing.Point(103, 8);
             this.pnlred2.Name = "pnlred2";
             this.pnlred2.Size = new System.Drawing.Size(20, 13);
@@ -831,7 +831,7 @@ namespace ShiftOS
             // 
             // pnlred13
             // 
-            this.pnlred13.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlred13.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlred13.Location = new System.Drawing.Point(181, 25);
             this.pnlred13.Name = "pnlred13";
             this.pnlred13.Size = new System.Drawing.Size(20, 13);
@@ -840,7 +840,7 @@ namespace ShiftOS
             // 
             // pnlred11
             // 
-            this.pnlred11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlred11.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlred11.Location = new System.Drawing.Point(129, 25);
             this.pnlred11.Name = "pnlred11";
             this.pnlred11.Size = new System.Drawing.Size(20, 13);
@@ -849,7 +849,7 @@ namespace ShiftOS
             // 
             // pnlred7
             // 
-            this.pnlred7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlred7.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlred7.Location = new System.Drawing.Point(233, 8);
             this.pnlred7.Name = "pnlred7";
             this.pnlred7.Size = new System.Drawing.Size(20, 13);
@@ -858,7 +858,7 @@ namespace ShiftOS
             // 
             // pnlred9
             // 
-            this.pnlred9.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlred9.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlred9.Location = new System.Drawing.Point(77, 25);
             this.pnlred9.Name = "pnlred9";
             this.pnlred9.Size = new System.Drawing.Size(20, 13);
@@ -867,7 +867,7 @@ namespace ShiftOS
             // 
             // pnlred5
             // 
-            this.pnlred5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlred5.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlred5.Location = new System.Drawing.Point(181, 8);
             this.pnlred5.Name = "pnlred5";
             this.pnlred5.Size = new System.Drawing.Size(20, 13);
@@ -876,7 +876,7 @@ namespace ShiftOS
             // 
             // pnlred3
             // 
-            this.pnlred3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlred3.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlred3.Location = new System.Drawing.Point(129, 8);
             this.pnlred3.Name = "pnlred3";
             this.pnlred3.Size = new System.Drawing.Size(20, 13);
@@ -885,7 +885,7 @@ namespace ShiftOS
             // 
             // pnlred1
             // 
-            this.pnlred1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlred1.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlred1.Location = new System.Drawing.Point(77, 8);
             this.pnlred1.Name = "pnlred1";
             this.pnlred1.Size = new System.Drawing.Size(20, 13);
@@ -915,27 +915,27 @@ namespace ShiftOS
             // pnlbrowncolours
             // 
             this.pnlbrowncolours.BackColor = System.Drawing.Color.White;
-            this.pnlbrowncolours.Controls.Add(this.pnlbrownoptions);
-            this.pnlbrowncolours.Controls.Add(this.pnlbrowncustomcolour);
-            this.pnlbrowncolours.Controls.Add(this.pnlbrown16);
-            this.pnlbrowncolours.Controls.Add(this.pnlbrown12);
-            this.pnlbrowncolours.Controls.Add(this.pnlbrown14);
-            this.pnlbrowncolours.Controls.Add(this.pnlbrown10);
-            this.pnlbrowncolours.Controls.Add(this.pnlbrown8);
-            this.pnlbrowncolours.Controls.Add(this.pnlbrown4);
-            this.pnlbrowncolours.Controls.Add(this.pnlbrown6);
-            this.pnlbrowncolours.Controls.Add(this.pnlbrown15);
-            this.pnlbrowncolours.Controls.Add(this.pnlbrown2);
-            this.pnlbrowncolours.Controls.Add(this.pnlbrown13);
-            this.pnlbrowncolours.Controls.Add(this.pnlbrown11);
-            this.pnlbrowncolours.Controls.Add(this.pnlbrown7);
-            this.pnlbrowncolours.Controls.Add(this.pnlbrown9);
-            this.pnlbrowncolours.Controls.Add(this.pnlbrown5);
-            this.pnlbrowncolours.Controls.Add(this.pnlbrown3);
-            this.pnlbrowncolours.Controls.Add(this.pnlbrown1);
-            this.pnlbrowncolours.Controls.Add(this.lblbrownlevel);
-            this.pnlbrowncolours.Controls.Add(this.Label19);
-            this.pnlbrowncolours.Dock = System.Windows.Forms.DockStyle.Top;
+            this.pnlbrowncolours.Widgets.Add(this.pnlbrownoptions);
+            this.pnlbrowncolours.Widgets.Add(this.pnlbrowncustomcolour);
+            this.pnlbrowncolours.Widgets.Add(this.pnlbrown16);
+            this.pnlbrowncolours.Widgets.Add(this.pnlbrown12);
+            this.pnlbrowncolours.Widgets.Add(this.pnlbrown14);
+            this.pnlbrowncolours.Widgets.Add(this.pnlbrown10);
+            this.pnlbrowncolours.Widgets.Add(this.pnlbrown8);
+            this.pnlbrowncolours.Widgets.Add(this.pnlbrown4);
+            this.pnlbrowncolours.Widgets.Add(this.pnlbrown6);
+            this.pnlbrowncolours.Widgets.Add(this.pnlbrown15);
+            this.pnlbrowncolours.Widgets.Add(this.pnlbrown2);
+            this.pnlbrowncolours.Widgets.Add(this.pnlbrown13);
+            this.pnlbrowncolours.Widgets.Add(this.pnlbrown11);
+            this.pnlbrowncolours.Widgets.Add(this.pnlbrown7);
+            this.pnlbrowncolours.Widgets.Add(this.pnlbrown9);
+            this.pnlbrowncolours.Widgets.Add(this.pnlbrown5);
+            this.pnlbrowncolours.Widgets.Add(this.pnlbrown3);
+            this.pnlbrowncolours.Widgets.Add(this.pnlbrown1);
+            this.pnlbrowncolours.Widgets.Add(this.lblbrownlevel);
+            this.pnlbrowncolours.Widgets.Add(this.Label19);
+            this.pnlbrowncolours.Dock = ShiftUI.DockStyle.Top;
             this.pnlbrowncolours.Location = new System.Drawing.Point(0, 429);
             this.pnlbrowncolours.Name = "pnlbrowncolours";
             this.pnlbrowncolours.Size = new System.Drawing.Size(447, 46);
@@ -944,12 +944,12 @@ namespace ShiftOS
             // 
             // pnlbrownoptions
             // 
-            this.pnlbrownoptions.Controls.Add(this.Label29);
-            this.pnlbrownoptions.Controls.Add(this.txtbrownsblue);
-            this.pnlbrownoptions.Controls.Add(this.txtbrownsred);
-            this.pnlbrownoptions.Controls.Add(this.Label30);
-            this.pnlbrownoptions.Controls.Add(this.Label31);
-            this.pnlbrownoptions.Controls.Add(this.txtbrownsgreen);
+            this.pnlbrownoptions.Widgets.Add(this.Label29);
+            this.pnlbrownoptions.Widgets.Add(this.txtbrownsblue);
+            this.pnlbrownoptions.Widgets.Add(this.txtbrownsred);
+            this.pnlbrownoptions.Widgets.Add(this.Label30);
+            this.pnlbrownoptions.Widgets.Add(this.Label31);
+            this.pnlbrownoptions.Widgets.Add(this.txtbrownsgreen);
             this.pnlbrownoptions.Location = new System.Drawing.Point(282, 3);
             this.pnlbrownoptions.Name = "pnlbrownoptions";
             this.pnlbrownoptions.Size = new System.Drawing.Size(120, 40);
@@ -969,26 +969,26 @@ namespace ShiftOS
             // txtbrownsblue
             // 
             this.txtbrownsblue.BackColor = System.Drawing.Color.White;
-            this.txtbrownsblue.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtbrownsblue.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtbrownsblue.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtbrownsblue.Location = new System.Drawing.Point(95, 22);
             this.txtbrownsblue.Multiline = true;
             this.txtbrownsblue.Name = "txtbrownsblue";
             this.txtbrownsblue.Size = new System.Drawing.Size(23, 17);
             this.txtbrownsblue.TabIndex = 25;
-            this.txtbrownsblue.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtbrownsblue.TextAlign = ShiftUI.HorizontalAlignment.Center;
             // 
             // txtbrownsred
             // 
             this.txtbrownsred.BackColor = System.Drawing.Color.White;
-            this.txtbrownsred.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtbrownsred.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtbrownsred.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtbrownsred.Location = new System.Drawing.Point(64, 2);
             this.txtbrownsred.Multiline = true;
             this.txtbrownsred.Name = "txtbrownsred";
             this.txtbrownsred.Size = new System.Drawing.Size(23, 17);
             this.txtbrownsred.TabIndex = 21;
-            this.txtbrownsred.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtbrownsred.TextAlign = ShiftUI.HorizontalAlignment.Center;
             // 
             // Label30
             // 
@@ -1013,18 +1013,18 @@ namespace ShiftOS
             // txtbrownsgreen
             // 
             this.txtbrownsgreen.BackColor = System.Drawing.Color.White;
-            this.txtbrownsgreen.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtbrownsgreen.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtbrownsgreen.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtbrownsgreen.Location = new System.Drawing.Point(40, 22);
             this.txtbrownsgreen.Multiline = true;
             this.txtbrownsgreen.Name = "txtbrownsgreen";
             this.txtbrownsgreen.Size = new System.Drawing.Size(23, 17);
             this.txtbrownsgreen.TabIndex = 23;
-            this.txtbrownsgreen.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtbrownsgreen.TextAlign = ShiftUI.HorizontalAlignment.Center;
             // 
             // pnlbrowncustomcolour
             // 
-            this.pnlbrowncustomcolour.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlbrowncustomcolour.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlbrowncustomcolour.Location = new System.Drawing.Point(406, 8);
             this.pnlbrowncustomcolour.Name = "pnlbrowncustomcolour";
             this.pnlbrowncustomcolour.Size = new System.Drawing.Size(32, 30);
@@ -1033,7 +1033,7 @@ namespace ShiftOS
             // 
             // pnlbrown16
             // 
-            this.pnlbrown16.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlbrown16.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlbrown16.Location = new System.Drawing.Point(259, 25);
             this.pnlbrown16.Name = "pnlbrown16";
             this.pnlbrown16.Size = new System.Drawing.Size(20, 13);
@@ -1042,7 +1042,7 @@ namespace ShiftOS
             // 
             // pnlbrown12
             // 
-            this.pnlbrown12.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlbrown12.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlbrown12.Location = new System.Drawing.Point(155, 25);
             this.pnlbrown12.Name = "pnlbrown12";
             this.pnlbrown12.Size = new System.Drawing.Size(20, 13);
@@ -1051,7 +1051,7 @@ namespace ShiftOS
             // 
             // pnlbrown14
             // 
-            this.pnlbrown14.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlbrown14.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlbrown14.Location = new System.Drawing.Point(207, 25);
             this.pnlbrown14.Name = "pnlbrown14";
             this.pnlbrown14.Size = new System.Drawing.Size(20, 13);
@@ -1060,7 +1060,7 @@ namespace ShiftOS
             // 
             // pnlbrown10
             // 
-            this.pnlbrown10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlbrown10.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlbrown10.Location = new System.Drawing.Point(103, 25);
             this.pnlbrown10.Name = "pnlbrown10";
             this.pnlbrown10.Size = new System.Drawing.Size(20, 13);
@@ -1069,7 +1069,7 @@ namespace ShiftOS
             // 
             // pnlbrown8
             // 
-            this.pnlbrown8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlbrown8.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlbrown8.Location = new System.Drawing.Point(259, 8);
             this.pnlbrown8.Name = "pnlbrown8";
             this.pnlbrown8.Size = new System.Drawing.Size(20, 13);
@@ -1078,7 +1078,7 @@ namespace ShiftOS
             // 
             // pnlbrown4
             // 
-            this.pnlbrown4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlbrown4.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlbrown4.Location = new System.Drawing.Point(155, 8);
             this.pnlbrown4.Name = "pnlbrown4";
             this.pnlbrown4.Size = new System.Drawing.Size(20, 13);
@@ -1087,7 +1087,7 @@ namespace ShiftOS
             // 
             // pnlbrown6
             // 
-            this.pnlbrown6.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlbrown6.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlbrown6.Location = new System.Drawing.Point(207, 8);
             this.pnlbrown6.Name = "pnlbrown6";
             this.pnlbrown6.Size = new System.Drawing.Size(20, 13);
@@ -1096,7 +1096,7 @@ namespace ShiftOS
             // 
             // pnlbrown15
             // 
-            this.pnlbrown15.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlbrown15.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlbrown15.Location = new System.Drawing.Point(233, 25);
             this.pnlbrown15.Name = "pnlbrown15";
             this.pnlbrown15.Size = new System.Drawing.Size(20, 13);
@@ -1105,7 +1105,7 @@ namespace ShiftOS
             // 
             // pnlbrown2
             // 
-            this.pnlbrown2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlbrown2.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlbrown2.Location = new System.Drawing.Point(103, 8);
             this.pnlbrown2.Name = "pnlbrown2";
             this.pnlbrown2.Size = new System.Drawing.Size(20, 13);
@@ -1114,7 +1114,7 @@ namespace ShiftOS
             // 
             // pnlbrown13
             // 
-            this.pnlbrown13.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlbrown13.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlbrown13.Location = new System.Drawing.Point(181, 25);
             this.pnlbrown13.Name = "pnlbrown13";
             this.pnlbrown13.Size = new System.Drawing.Size(20, 13);
@@ -1123,7 +1123,7 @@ namespace ShiftOS
             // 
             // pnlbrown11
             // 
-            this.pnlbrown11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlbrown11.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlbrown11.Location = new System.Drawing.Point(129, 25);
             this.pnlbrown11.Name = "pnlbrown11";
             this.pnlbrown11.Size = new System.Drawing.Size(20, 13);
@@ -1132,7 +1132,7 @@ namespace ShiftOS
             // 
             // pnlbrown7
             // 
-            this.pnlbrown7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlbrown7.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlbrown7.Location = new System.Drawing.Point(233, 8);
             this.pnlbrown7.Name = "pnlbrown7";
             this.pnlbrown7.Size = new System.Drawing.Size(20, 13);
@@ -1141,7 +1141,7 @@ namespace ShiftOS
             // 
             // pnlbrown9
             // 
-            this.pnlbrown9.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlbrown9.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlbrown9.Location = new System.Drawing.Point(77, 25);
             this.pnlbrown9.Name = "pnlbrown9";
             this.pnlbrown9.Size = new System.Drawing.Size(20, 13);
@@ -1150,7 +1150,7 @@ namespace ShiftOS
             // 
             // pnlbrown5
             // 
-            this.pnlbrown5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlbrown5.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlbrown5.Location = new System.Drawing.Point(181, 8);
             this.pnlbrown5.Name = "pnlbrown5";
             this.pnlbrown5.Size = new System.Drawing.Size(20, 13);
@@ -1159,7 +1159,7 @@ namespace ShiftOS
             // 
             // pnlbrown3
             // 
-            this.pnlbrown3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlbrown3.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlbrown3.Location = new System.Drawing.Point(129, 8);
             this.pnlbrown3.Name = "pnlbrown3";
             this.pnlbrown3.Size = new System.Drawing.Size(20, 13);
@@ -1168,7 +1168,7 @@ namespace ShiftOS
             // 
             // pnlbrown1
             // 
-            this.pnlbrown1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlbrown1.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlbrown1.Location = new System.Drawing.Point(77, 8);
             this.pnlbrown1.Name = "pnlbrown1";
             this.pnlbrown1.Size = new System.Drawing.Size(20, 13);
@@ -1198,27 +1198,27 @@ namespace ShiftOS
             // pnlorangecolours
             // 
             this.pnlorangecolours.BackColor = System.Drawing.Color.White;
-            this.pnlorangecolours.Controls.Add(this.pnlorangeoptions);
-            this.pnlorangecolours.Controls.Add(this.pnlorangecustomcolour);
-            this.pnlorangecolours.Controls.Add(this.pnlorange16);
-            this.pnlorangecolours.Controls.Add(this.pnlorange12);
-            this.pnlorangecolours.Controls.Add(this.pnlorange14);
-            this.pnlorangecolours.Controls.Add(this.pnlorange10);
-            this.pnlorangecolours.Controls.Add(this.pnlorange8);
-            this.pnlorangecolours.Controls.Add(this.pnlorange4);
-            this.pnlorangecolours.Controls.Add(this.pnlorange6);
-            this.pnlorangecolours.Controls.Add(this.pnlorange15);
-            this.pnlorangecolours.Controls.Add(this.pnlorange2);
-            this.pnlorangecolours.Controls.Add(this.pnlorange13);
-            this.pnlorangecolours.Controls.Add(this.pnlorange11);
-            this.pnlorangecolours.Controls.Add(this.pnlorange7);
-            this.pnlorangecolours.Controls.Add(this.pnlorange9);
-            this.pnlorangecolours.Controls.Add(this.pnlorange5);
-            this.pnlorangecolours.Controls.Add(this.pnlorange3);
-            this.pnlorangecolours.Controls.Add(this.pnlorange1);
-            this.pnlorangecolours.Controls.Add(this.lblorangelevel);
-            this.pnlorangecolours.Controls.Add(this.Label13);
-            this.pnlorangecolours.Dock = System.Windows.Forms.DockStyle.Top;
+            this.pnlorangecolours.Widgets.Add(this.pnlorangeoptions);
+            this.pnlorangecolours.Widgets.Add(this.pnlorangecustomcolour);
+            this.pnlorangecolours.Widgets.Add(this.pnlorange16);
+            this.pnlorangecolours.Widgets.Add(this.pnlorange12);
+            this.pnlorangecolours.Widgets.Add(this.pnlorange14);
+            this.pnlorangecolours.Widgets.Add(this.pnlorange10);
+            this.pnlorangecolours.Widgets.Add(this.pnlorange8);
+            this.pnlorangecolours.Widgets.Add(this.pnlorange4);
+            this.pnlorangecolours.Widgets.Add(this.pnlorange6);
+            this.pnlorangecolours.Widgets.Add(this.pnlorange15);
+            this.pnlorangecolours.Widgets.Add(this.pnlorange2);
+            this.pnlorangecolours.Widgets.Add(this.pnlorange13);
+            this.pnlorangecolours.Widgets.Add(this.pnlorange11);
+            this.pnlorangecolours.Widgets.Add(this.pnlorange7);
+            this.pnlorangecolours.Widgets.Add(this.pnlorange9);
+            this.pnlorangecolours.Widgets.Add(this.pnlorange5);
+            this.pnlorangecolours.Widgets.Add(this.pnlorange3);
+            this.pnlorangecolours.Widgets.Add(this.pnlorange1);
+            this.pnlorangecolours.Widgets.Add(this.lblorangelevel);
+            this.pnlorangecolours.Widgets.Add(this.Label13);
+            this.pnlorangecolours.Dock = ShiftUI.DockStyle.Top;
             this.pnlorangecolours.Location = new System.Drawing.Point(0, 383);
             this.pnlorangecolours.Name = "pnlorangecolours";
             this.pnlorangecolours.Size = new System.Drawing.Size(447, 46);
@@ -1227,12 +1227,12 @@ namespace ShiftOS
             // 
             // pnlorangeoptions
             // 
-            this.pnlorangeoptions.Controls.Add(this.Label25);
-            this.pnlorangeoptions.Controls.Add(this.txtorangesblue);
-            this.pnlorangeoptions.Controls.Add(this.txtorangesred);
-            this.pnlorangeoptions.Controls.Add(this.Label27);
-            this.pnlorangeoptions.Controls.Add(this.Label28);
-            this.pnlorangeoptions.Controls.Add(this.txtorangesgreen);
+            this.pnlorangeoptions.Widgets.Add(this.Label25);
+            this.pnlorangeoptions.Widgets.Add(this.txtorangesblue);
+            this.pnlorangeoptions.Widgets.Add(this.txtorangesred);
+            this.pnlorangeoptions.Widgets.Add(this.Label27);
+            this.pnlorangeoptions.Widgets.Add(this.Label28);
+            this.pnlorangeoptions.Widgets.Add(this.txtorangesgreen);
             this.pnlorangeoptions.Location = new System.Drawing.Point(282, 3);
             this.pnlorangeoptions.Name = "pnlorangeoptions";
             this.pnlorangeoptions.Size = new System.Drawing.Size(120, 40);
@@ -1252,26 +1252,26 @@ namespace ShiftOS
             // txtorangesblue
             // 
             this.txtorangesblue.BackColor = System.Drawing.Color.White;
-            this.txtorangesblue.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtorangesblue.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtorangesblue.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtorangesblue.Location = new System.Drawing.Point(95, 22);
             this.txtorangesblue.Multiline = true;
             this.txtorangesblue.Name = "txtorangesblue";
             this.txtorangesblue.Size = new System.Drawing.Size(23, 17);
             this.txtorangesblue.TabIndex = 25;
-            this.txtorangesblue.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtorangesblue.TextAlign = ShiftUI.HorizontalAlignment.Center;
             // 
             // txtorangesred
             // 
             this.txtorangesred.BackColor = System.Drawing.Color.White;
-            this.txtorangesred.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtorangesred.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtorangesred.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtorangesred.Location = new System.Drawing.Point(64, 2);
             this.txtorangesred.Multiline = true;
             this.txtorangesred.Name = "txtorangesred";
             this.txtorangesred.Size = new System.Drawing.Size(23, 17);
             this.txtorangesred.TabIndex = 21;
-            this.txtorangesred.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtorangesred.TextAlign = ShiftUI.HorizontalAlignment.Center;
             // 
             // Label27
             // 
@@ -1296,18 +1296,18 @@ namespace ShiftOS
             // txtorangesgreen
             // 
             this.txtorangesgreen.BackColor = System.Drawing.Color.White;
-            this.txtorangesgreen.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtorangesgreen.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtorangesgreen.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtorangesgreen.Location = new System.Drawing.Point(40, 22);
             this.txtorangesgreen.Multiline = true;
             this.txtorangesgreen.Name = "txtorangesgreen";
             this.txtorangesgreen.Size = new System.Drawing.Size(23, 17);
             this.txtorangesgreen.TabIndex = 23;
-            this.txtorangesgreen.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtorangesgreen.TextAlign = ShiftUI.HorizontalAlignment.Center;
             // 
             // pnlorangecustomcolour
             // 
-            this.pnlorangecustomcolour.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlorangecustomcolour.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlorangecustomcolour.Location = new System.Drawing.Point(406, 8);
             this.pnlorangecustomcolour.Name = "pnlorangecustomcolour";
             this.pnlorangecustomcolour.Size = new System.Drawing.Size(32, 30);
@@ -1316,7 +1316,7 @@ namespace ShiftOS
             // 
             // pnlorange16
             // 
-            this.pnlorange16.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlorange16.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlorange16.Location = new System.Drawing.Point(259, 25);
             this.pnlorange16.Name = "pnlorange16";
             this.pnlorange16.Size = new System.Drawing.Size(20, 13);
@@ -1325,7 +1325,7 @@ namespace ShiftOS
             // 
             // pnlorange12
             // 
-            this.pnlorange12.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlorange12.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlorange12.Location = new System.Drawing.Point(155, 25);
             this.pnlorange12.Name = "pnlorange12";
             this.pnlorange12.Size = new System.Drawing.Size(20, 13);
@@ -1334,7 +1334,7 @@ namespace ShiftOS
             // 
             // pnlorange14
             // 
-            this.pnlorange14.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlorange14.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlorange14.Location = new System.Drawing.Point(207, 25);
             this.pnlorange14.Name = "pnlorange14";
             this.pnlorange14.Size = new System.Drawing.Size(20, 13);
@@ -1343,7 +1343,7 @@ namespace ShiftOS
             // 
             // pnlorange10
             // 
-            this.pnlorange10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlorange10.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlorange10.Location = new System.Drawing.Point(103, 25);
             this.pnlorange10.Name = "pnlorange10";
             this.pnlorange10.Size = new System.Drawing.Size(20, 13);
@@ -1352,7 +1352,7 @@ namespace ShiftOS
             // 
             // pnlorange8
             // 
-            this.pnlorange8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlorange8.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlorange8.Location = new System.Drawing.Point(259, 8);
             this.pnlorange8.Name = "pnlorange8";
             this.pnlorange8.Size = new System.Drawing.Size(20, 13);
@@ -1361,7 +1361,7 @@ namespace ShiftOS
             // 
             // pnlorange4
             // 
-            this.pnlorange4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlorange4.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlorange4.Location = new System.Drawing.Point(155, 8);
             this.pnlorange4.Name = "pnlorange4";
             this.pnlorange4.Size = new System.Drawing.Size(20, 13);
@@ -1370,7 +1370,7 @@ namespace ShiftOS
             // 
             // pnlorange6
             // 
-            this.pnlorange6.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlorange6.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlorange6.Location = new System.Drawing.Point(207, 8);
             this.pnlorange6.Name = "pnlorange6";
             this.pnlorange6.Size = new System.Drawing.Size(20, 13);
@@ -1379,7 +1379,7 @@ namespace ShiftOS
             // 
             // pnlorange15
             // 
-            this.pnlorange15.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlorange15.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlorange15.Location = new System.Drawing.Point(233, 25);
             this.pnlorange15.Name = "pnlorange15";
             this.pnlorange15.Size = new System.Drawing.Size(20, 13);
@@ -1388,7 +1388,7 @@ namespace ShiftOS
             // 
             // pnlorange2
             // 
-            this.pnlorange2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlorange2.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlorange2.Location = new System.Drawing.Point(103, 8);
             this.pnlorange2.Name = "pnlorange2";
             this.pnlorange2.Size = new System.Drawing.Size(20, 13);
@@ -1397,7 +1397,7 @@ namespace ShiftOS
             // 
             // pnlorange13
             // 
-            this.pnlorange13.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlorange13.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlorange13.Location = new System.Drawing.Point(181, 25);
             this.pnlorange13.Name = "pnlorange13";
             this.pnlorange13.Size = new System.Drawing.Size(20, 13);
@@ -1406,7 +1406,7 @@ namespace ShiftOS
             // 
             // pnlorange11
             // 
-            this.pnlorange11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlorange11.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlorange11.Location = new System.Drawing.Point(129, 25);
             this.pnlorange11.Name = "pnlorange11";
             this.pnlorange11.Size = new System.Drawing.Size(20, 13);
@@ -1415,7 +1415,7 @@ namespace ShiftOS
             // 
             // pnlorange7
             // 
-            this.pnlorange7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlorange7.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlorange7.Location = new System.Drawing.Point(233, 8);
             this.pnlorange7.Name = "pnlorange7";
             this.pnlorange7.Size = new System.Drawing.Size(20, 13);
@@ -1424,7 +1424,7 @@ namespace ShiftOS
             // 
             // pnlorange9
             // 
-            this.pnlorange9.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlorange9.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlorange9.Location = new System.Drawing.Point(77, 25);
             this.pnlorange9.Name = "pnlorange9";
             this.pnlorange9.Size = new System.Drawing.Size(20, 13);
@@ -1433,7 +1433,7 @@ namespace ShiftOS
             // 
             // pnlorange5
             // 
-            this.pnlorange5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlorange5.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlorange5.Location = new System.Drawing.Point(181, 8);
             this.pnlorange5.Name = "pnlorange5";
             this.pnlorange5.Size = new System.Drawing.Size(20, 13);
@@ -1442,7 +1442,7 @@ namespace ShiftOS
             // 
             // pnlorange3
             // 
-            this.pnlorange3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlorange3.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlorange3.Location = new System.Drawing.Point(129, 8);
             this.pnlorange3.Name = "pnlorange3";
             this.pnlorange3.Size = new System.Drawing.Size(20, 13);
@@ -1451,7 +1451,7 @@ namespace ShiftOS
             // 
             // pnlorange1
             // 
-            this.pnlorange1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlorange1.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlorange1.Location = new System.Drawing.Point(77, 8);
             this.pnlorange1.Name = "pnlorange1";
             this.pnlorange1.Size = new System.Drawing.Size(20, 13);
@@ -1481,27 +1481,27 @@ namespace ShiftOS
             // pnlyellowcolours
             // 
             this.pnlyellowcolours.BackColor = System.Drawing.Color.White;
-            this.pnlyellowcolours.Controls.Add(this.pnlyellowoptions);
-            this.pnlyellowcolours.Controls.Add(this.pnlyellowcustomcolour);
-            this.pnlyellowcolours.Controls.Add(this.pnlyellow16);
-            this.pnlyellowcolours.Controls.Add(this.pnlyellow12);
-            this.pnlyellowcolours.Controls.Add(this.pnlyellow14);
-            this.pnlyellowcolours.Controls.Add(this.pnlyellow10);
-            this.pnlyellowcolours.Controls.Add(this.pnlyellow8);
-            this.pnlyellowcolours.Controls.Add(this.pnlyellow4);
-            this.pnlyellowcolours.Controls.Add(this.pnlyellow6);
-            this.pnlyellowcolours.Controls.Add(this.pnlyellow15);
-            this.pnlyellowcolours.Controls.Add(this.pnlyellow2);
-            this.pnlyellowcolours.Controls.Add(this.pnlyellow13);
-            this.pnlyellowcolours.Controls.Add(this.pnlyellow11);
-            this.pnlyellowcolours.Controls.Add(this.pnlyellow7);
-            this.pnlyellowcolours.Controls.Add(this.pnlyellow9);
-            this.pnlyellowcolours.Controls.Add(this.pnlyellow5);
-            this.pnlyellowcolours.Controls.Add(this.pnlyellow3);
-            this.pnlyellowcolours.Controls.Add(this.pnlyellow1);
-            this.pnlyellowcolours.Controls.Add(this.lblyellowlevel);
-            this.pnlyellowcolours.Controls.Add(this.Label11);
-            this.pnlyellowcolours.Dock = System.Windows.Forms.DockStyle.Top;
+            this.pnlyellowcolours.Widgets.Add(this.pnlyellowoptions);
+            this.pnlyellowcolours.Widgets.Add(this.pnlyellowcustomcolour);
+            this.pnlyellowcolours.Widgets.Add(this.pnlyellow16);
+            this.pnlyellowcolours.Widgets.Add(this.pnlyellow12);
+            this.pnlyellowcolours.Widgets.Add(this.pnlyellow14);
+            this.pnlyellowcolours.Widgets.Add(this.pnlyellow10);
+            this.pnlyellowcolours.Widgets.Add(this.pnlyellow8);
+            this.pnlyellowcolours.Widgets.Add(this.pnlyellow4);
+            this.pnlyellowcolours.Widgets.Add(this.pnlyellow6);
+            this.pnlyellowcolours.Widgets.Add(this.pnlyellow15);
+            this.pnlyellowcolours.Widgets.Add(this.pnlyellow2);
+            this.pnlyellowcolours.Widgets.Add(this.pnlyellow13);
+            this.pnlyellowcolours.Widgets.Add(this.pnlyellow11);
+            this.pnlyellowcolours.Widgets.Add(this.pnlyellow7);
+            this.pnlyellowcolours.Widgets.Add(this.pnlyellow9);
+            this.pnlyellowcolours.Widgets.Add(this.pnlyellow5);
+            this.pnlyellowcolours.Widgets.Add(this.pnlyellow3);
+            this.pnlyellowcolours.Widgets.Add(this.pnlyellow1);
+            this.pnlyellowcolours.Widgets.Add(this.lblyellowlevel);
+            this.pnlyellowcolours.Widgets.Add(this.Label11);
+            this.pnlyellowcolours.Dock = ShiftUI.DockStyle.Top;
             this.pnlyellowcolours.Location = new System.Drawing.Point(0, 337);
             this.pnlyellowcolours.Name = "pnlyellowcolours";
             this.pnlyellowcolours.Size = new System.Drawing.Size(447, 46);
@@ -1510,12 +1510,12 @@ namespace ShiftOS
             // 
             // pnlyellowoptions
             // 
-            this.pnlyellowoptions.Controls.Add(this.Label20);
-            this.pnlyellowoptions.Controls.Add(this.txtyellowsblue);
-            this.pnlyellowoptions.Controls.Add(this.txtyellowsred);
-            this.pnlyellowoptions.Controls.Add(this.Label22);
-            this.pnlyellowoptions.Controls.Add(this.Label24);
-            this.pnlyellowoptions.Controls.Add(this.txtyellowsgreen);
+            this.pnlyellowoptions.Widgets.Add(this.Label20);
+            this.pnlyellowoptions.Widgets.Add(this.txtyellowsblue);
+            this.pnlyellowoptions.Widgets.Add(this.txtyellowsred);
+            this.pnlyellowoptions.Widgets.Add(this.Label22);
+            this.pnlyellowoptions.Widgets.Add(this.Label24);
+            this.pnlyellowoptions.Widgets.Add(this.txtyellowsgreen);
             this.pnlyellowoptions.Location = new System.Drawing.Point(282, 3);
             this.pnlyellowoptions.Name = "pnlyellowoptions";
             this.pnlyellowoptions.Size = new System.Drawing.Size(120, 40);
@@ -1535,26 +1535,26 @@ namespace ShiftOS
             // txtyellowsblue
             // 
             this.txtyellowsblue.BackColor = System.Drawing.Color.White;
-            this.txtyellowsblue.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtyellowsblue.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtyellowsblue.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtyellowsblue.Location = new System.Drawing.Point(95, 22);
             this.txtyellowsblue.Multiline = true;
             this.txtyellowsblue.Name = "txtyellowsblue";
             this.txtyellowsblue.Size = new System.Drawing.Size(23, 17);
             this.txtyellowsblue.TabIndex = 25;
-            this.txtyellowsblue.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtyellowsblue.TextAlign = ShiftUI.HorizontalAlignment.Center;
             // 
             // txtyellowsred
             // 
             this.txtyellowsred.BackColor = System.Drawing.Color.White;
-            this.txtyellowsred.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtyellowsred.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtyellowsred.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtyellowsred.Location = new System.Drawing.Point(64, 2);
             this.txtyellowsred.Multiline = true;
             this.txtyellowsred.Name = "txtyellowsred";
             this.txtyellowsred.Size = new System.Drawing.Size(23, 17);
             this.txtyellowsred.TabIndex = 21;
-            this.txtyellowsred.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtyellowsred.TextAlign = ShiftUI.HorizontalAlignment.Center;
             // 
             // Label22
             // 
@@ -1579,18 +1579,18 @@ namespace ShiftOS
             // txtyellowsgreen
             // 
             this.txtyellowsgreen.BackColor = System.Drawing.Color.White;
-            this.txtyellowsgreen.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtyellowsgreen.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtyellowsgreen.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtyellowsgreen.Location = new System.Drawing.Point(40, 22);
             this.txtyellowsgreen.Multiline = true;
             this.txtyellowsgreen.Name = "txtyellowsgreen";
             this.txtyellowsgreen.Size = new System.Drawing.Size(23, 17);
             this.txtyellowsgreen.TabIndex = 23;
-            this.txtyellowsgreen.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtyellowsgreen.TextAlign = ShiftUI.HorizontalAlignment.Center;
             // 
             // pnlyellowcustomcolour
             // 
-            this.pnlyellowcustomcolour.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlyellowcustomcolour.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlyellowcustomcolour.Location = new System.Drawing.Point(406, 8);
             this.pnlyellowcustomcolour.Name = "pnlyellowcustomcolour";
             this.pnlyellowcustomcolour.Size = new System.Drawing.Size(32, 30);
@@ -1599,7 +1599,7 @@ namespace ShiftOS
             // 
             // pnlyellow16
             // 
-            this.pnlyellow16.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlyellow16.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlyellow16.Location = new System.Drawing.Point(259, 25);
             this.pnlyellow16.Name = "pnlyellow16";
             this.pnlyellow16.Size = new System.Drawing.Size(20, 13);
@@ -1608,7 +1608,7 @@ namespace ShiftOS
             // 
             // pnlyellow12
             // 
-            this.pnlyellow12.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlyellow12.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlyellow12.Location = new System.Drawing.Point(155, 25);
             this.pnlyellow12.Name = "pnlyellow12";
             this.pnlyellow12.Size = new System.Drawing.Size(20, 13);
@@ -1617,7 +1617,7 @@ namespace ShiftOS
             // 
             // pnlyellow14
             // 
-            this.pnlyellow14.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlyellow14.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlyellow14.Location = new System.Drawing.Point(207, 25);
             this.pnlyellow14.Name = "pnlyellow14";
             this.pnlyellow14.Size = new System.Drawing.Size(20, 13);
@@ -1626,7 +1626,7 @@ namespace ShiftOS
             // 
             // pnlyellow10
             // 
-            this.pnlyellow10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlyellow10.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlyellow10.Location = new System.Drawing.Point(103, 25);
             this.pnlyellow10.Name = "pnlyellow10";
             this.pnlyellow10.Size = new System.Drawing.Size(20, 13);
@@ -1635,7 +1635,7 @@ namespace ShiftOS
             // 
             // pnlyellow8
             // 
-            this.pnlyellow8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlyellow8.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlyellow8.Location = new System.Drawing.Point(259, 8);
             this.pnlyellow8.Name = "pnlyellow8";
             this.pnlyellow8.Size = new System.Drawing.Size(20, 13);
@@ -1644,7 +1644,7 @@ namespace ShiftOS
             // 
             // pnlyellow4
             // 
-            this.pnlyellow4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlyellow4.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlyellow4.Location = new System.Drawing.Point(155, 8);
             this.pnlyellow4.Name = "pnlyellow4";
             this.pnlyellow4.Size = new System.Drawing.Size(20, 13);
@@ -1653,7 +1653,7 @@ namespace ShiftOS
             // 
             // pnlyellow6
             // 
-            this.pnlyellow6.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlyellow6.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlyellow6.Location = new System.Drawing.Point(207, 8);
             this.pnlyellow6.Name = "pnlyellow6";
             this.pnlyellow6.Size = new System.Drawing.Size(20, 13);
@@ -1662,7 +1662,7 @@ namespace ShiftOS
             // 
             // pnlyellow15
             // 
-            this.pnlyellow15.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlyellow15.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlyellow15.Location = new System.Drawing.Point(233, 25);
             this.pnlyellow15.Name = "pnlyellow15";
             this.pnlyellow15.Size = new System.Drawing.Size(20, 13);
@@ -1671,7 +1671,7 @@ namespace ShiftOS
             // 
             // pnlyellow2
             // 
-            this.pnlyellow2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlyellow2.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlyellow2.Location = new System.Drawing.Point(103, 8);
             this.pnlyellow2.Name = "pnlyellow2";
             this.pnlyellow2.Size = new System.Drawing.Size(20, 13);
@@ -1680,7 +1680,7 @@ namespace ShiftOS
             // 
             // pnlyellow13
             // 
-            this.pnlyellow13.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlyellow13.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlyellow13.Location = new System.Drawing.Point(181, 25);
             this.pnlyellow13.Name = "pnlyellow13";
             this.pnlyellow13.Size = new System.Drawing.Size(20, 13);
@@ -1689,7 +1689,7 @@ namespace ShiftOS
             // 
             // pnlyellow11
             // 
-            this.pnlyellow11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlyellow11.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlyellow11.Location = new System.Drawing.Point(129, 25);
             this.pnlyellow11.Name = "pnlyellow11";
             this.pnlyellow11.Size = new System.Drawing.Size(20, 13);
@@ -1698,7 +1698,7 @@ namespace ShiftOS
             // 
             // pnlyellow7
             // 
-            this.pnlyellow7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlyellow7.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlyellow7.Location = new System.Drawing.Point(233, 8);
             this.pnlyellow7.Name = "pnlyellow7";
             this.pnlyellow7.Size = new System.Drawing.Size(20, 13);
@@ -1707,7 +1707,7 @@ namespace ShiftOS
             // 
             // pnlyellow9
             // 
-            this.pnlyellow9.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlyellow9.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlyellow9.Location = new System.Drawing.Point(77, 25);
             this.pnlyellow9.Name = "pnlyellow9";
             this.pnlyellow9.Size = new System.Drawing.Size(20, 13);
@@ -1716,7 +1716,7 @@ namespace ShiftOS
             // 
             // pnlyellow5
             // 
-            this.pnlyellow5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlyellow5.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlyellow5.Location = new System.Drawing.Point(181, 8);
             this.pnlyellow5.Name = "pnlyellow5";
             this.pnlyellow5.Size = new System.Drawing.Size(20, 13);
@@ -1725,7 +1725,7 @@ namespace ShiftOS
             // 
             // pnlyellow3
             // 
-            this.pnlyellow3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlyellow3.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlyellow3.Location = new System.Drawing.Point(129, 8);
             this.pnlyellow3.Name = "pnlyellow3";
             this.pnlyellow3.Size = new System.Drawing.Size(20, 13);
@@ -1734,7 +1734,7 @@ namespace ShiftOS
             // 
             // pnlyellow1
             // 
-            this.pnlyellow1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlyellow1.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlyellow1.Location = new System.Drawing.Point(77, 8);
             this.pnlyellow1.Name = "pnlyellow1";
             this.pnlyellow1.Size = new System.Drawing.Size(20, 13);
@@ -1764,27 +1764,27 @@ namespace ShiftOS
             // pnlgreencolours
             // 
             this.pnlgreencolours.BackColor = System.Drawing.Color.White;
-            this.pnlgreencolours.Controls.Add(this.pnlgreenoptions);
-            this.pnlgreencolours.Controls.Add(this.pnlgreencustomcolour);
-            this.pnlgreencolours.Controls.Add(this.pnlgreen16);
-            this.pnlgreencolours.Controls.Add(this.pnlgreen12);
-            this.pnlgreencolours.Controls.Add(this.pnlgreen14);
-            this.pnlgreencolours.Controls.Add(this.pnlgreen10);
-            this.pnlgreencolours.Controls.Add(this.pnlgreen8);
-            this.pnlgreencolours.Controls.Add(this.pnlgreen4);
-            this.pnlgreencolours.Controls.Add(this.pnlgreen6);
-            this.pnlgreencolours.Controls.Add(this.pnlgreen15);
-            this.pnlgreencolours.Controls.Add(this.pnlgreen2);
-            this.pnlgreencolours.Controls.Add(this.pnlgreen13);
-            this.pnlgreencolours.Controls.Add(this.pnlgreen11);
-            this.pnlgreencolours.Controls.Add(this.pnlgreen7);
-            this.pnlgreencolours.Controls.Add(this.pnlgreen9);
-            this.pnlgreencolours.Controls.Add(this.pnlgreen5);
-            this.pnlgreencolours.Controls.Add(this.pnlgreen3);
-            this.pnlgreencolours.Controls.Add(this.pnlgreen1);
-            this.pnlgreencolours.Controls.Add(this.lblgreenlevel);
-            this.pnlgreencolours.Controls.Add(this.Label9);
-            this.pnlgreencolours.Dock = System.Windows.Forms.DockStyle.Top;
+            this.pnlgreencolours.Widgets.Add(this.pnlgreenoptions);
+            this.pnlgreencolours.Widgets.Add(this.pnlgreencustomcolour);
+            this.pnlgreencolours.Widgets.Add(this.pnlgreen16);
+            this.pnlgreencolours.Widgets.Add(this.pnlgreen12);
+            this.pnlgreencolours.Widgets.Add(this.pnlgreen14);
+            this.pnlgreencolours.Widgets.Add(this.pnlgreen10);
+            this.pnlgreencolours.Widgets.Add(this.pnlgreen8);
+            this.pnlgreencolours.Widgets.Add(this.pnlgreen4);
+            this.pnlgreencolours.Widgets.Add(this.pnlgreen6);
+            this.pnlgreencolours.Widgets.Add(this.pnlgreen15);
+            this.pnlgreencolours.Widgets.Add(this.pnlgreen2);
+            this.pnlgreencolours.Widgets.Add(this.pnlgreen13);
+            this.pnlgreencolours.Widgets.Add(this.pnlgreen11);
+            this.pnlgreencolours.Widgets.Add(this.pnlgreen7);
+            this.pnlgreencolours.Widgets.Add(this.pnlgreen9);
+            this.pnlgreencolours.Widgets.Add(this.pnlgreen5);
+            this.pnlgreencolours.Widgets.Add(this.pnlgreen3);
+            this.pnlgreencolours.Widgets.Add(this.pnlgreen1);
+            this.pnlgreencolours.Widgets.Add(this.lblgreenlevel);
+            this.pnlgreencolours.Widgets.Add(this.Label9);
+            this.pnlgreencolours.Dock = ShiftUI.DockStyle.Top;
             this.pnlgreencolours.Location = new System.Drawing.Point(0, 291);
             this.pnlgreencolours.Name = "pnlgreencolours";
             this.pnlgreencolours.Size = new System.Drawing.Size(447, 46);
@@ -1793,12 +1793,12 @@ namespace ShiftOS
             // 
             // pnlgreenoptions
             // 
-            this.pnlgreenoptions.Controls.Add(this.Label15);
-            this.pnlgreenoptions.Controls.Add(this.txtgreensred);
-            this.pnlgreenoptions.Controls.Add(this.txtgreensgreen);
-            this.pnlgreenoptions.Controls.Add(this.Label16);
-            this.pnlgreenoptions.Controls.Add(this.Label18);
-            this.pnlgreenoptions.Controls.Add(this.txtgreensblue);
+            this.pnlgreenoptions.Widgets.Add(this.Label15);
+            this.pnlgreenoptions.Widgets.Add(this.txtgreensred);
+            this.pnlgreenoptions.Widgets.Add(this.txtgreensgreen);
+            this.pnlgreenoptions.Widgets.Add(this.Label16);
+            this.pnlgreenoptions.Widgets.Add(this.Label18);
+            this.pnlgreenoptions.Widgets.Add(this.txtgreensblue);
             this.pnlgreenoptions.Location = new System.Drawing.Point(282, 3);
             this.pnlgreenoptions.Name = "pnlgreenoptions";
             this.pnlgreenoptions.Size = new System.Drawing.Size(120, 40);
@@ -1818,26 +1818,26 @@ namespace ShiftOS
             // txtgreensred
             // 
             this.txtgreensred.BackColor = System.Drawing.Color.White;
-            this.txtgreensred.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtgreensred.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtgreensred.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtgreensred.Location = new System.Drawing.Point(92, 22);
             this.txtgreensred.Multiline = true;
             this.txtgreensred.Name = "txtgreensred";
             this.txtgreensred.Size = new System.Drawing.Size(23, 17);
             this.txtgreensred.TabIndex = 25;
-            this.txtgreensred.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtgreensred.TextAlign = ShiftUI.HorizontalAlignment.Center;
             // 
             // txtgreensgreen
             // 
             this.txtgreensgreen.BackColor = System.Drawing.Color.White;
-            this.txtgreensgreen.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtgreensgreen.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtgreensgreen.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtgreensgreen.Location = new System.Drawing.Point(66, 2);
             this.txtgreensgreen.Multiline = true;
             this.txtgreensgreen.Name = "txtgreensgreen";
             this.txtgreensgreen.Size = new System.Drawing.Size(23, 17);
             this.txtgreensgreen.TabIndex = 21;
-            this.txtgreensgreen.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtgreensgreen.TextAlign = ShiftUI.HorizontalAlignment.Center;
             // 
             // Label16
             // 
@@ -1862,18 +1862,18 @@ namespace ShiftOS
             // txtgreensblue
             // 
             this.txtgreensblue.BackColor = System.Drawing.Color.White;
-            this.txtgreensblue.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtgreensblue.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtgreensblue.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtgreensblue.Location = new System.Drawing.Point(33, 22);
             this.txtgreensblue.Multiline = true;
             this.txtgreensblue.Name = "txtgreensblue";
             this.txtgreensblue.Size = new System.Drawing.Size(23, 17);
             this.txtgreensblue.TabIndex = 23;
-            this.txtgreensblue.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtgreensblue.TextAlign = ShiftUI.HorizontalAlignment.Center;
             // 
             // pnlgreencustomcolour
             // 
-            this.pnlgreencustomcolour.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlgreencustomcolour.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlgreencustomcolour.Location = new System.Drawing.Point(406, 8);
             this.pnlgreencustomcolour.Name = "pnlgreencustomcolour";
             this.pnlgreencustomcolour.Size = new System.Drawing.Size(32, 30);
@@ -1882,7 +1882,7 @@ namespace ShiftOS
             // 
             // pnlgreen16
             // 
-            this.pnlgreen16.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlgreen16.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlgreen16.Location = new System.Drawing.Point(259, 25);
             this.pnlgreen16.Name = "pnlgreen16";
             this.pnlgreen16.Size = new System.Drawing.Size(20, 13);
@@ -1891,7 +1891,7 @@ namespace ShiftOS
             // 
             // pnlgreen12
             // 
-            this.pnlgreen12.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlgreen12.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlgreen12.Location = new System.Drawing.Point(155, 25);
             this.pnlgreen12.Name = "pnlgreen12";
             this.pnlgreen12.Size = new System.Drawing.Size(20, 13);
@@ -1900,7 +1900,7 @@ namespace ShiftOS
             // 
             // pnlgreen14
             // 
-            this.pnlgreen14.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlgreen14.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlgreen14.Location = new System.Drawing.Point(207, 25);
             this.pnlgreen14.Name = "pnlgreen14";
             this.pnlgreen14.Size = new System.Drawing.Size(20, 13);
@@ -1909,7 +1909,7 @@ namespace ShiftOS
             // 
             // pnlgreen10
             // 
-            this.pnlgreen10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlgreen10.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlgreen10.Location = new System.Drawing.Point(103, 25);
             this.pnlgreen10.Name = "pnlgreen10";
             this.pnlgreen10.Size = new System.Drawing.Size(20, 13);
@@ -1918,7 +1918,7 @@ namespace ShiftOS
             // 
             // pnlgreen8
             // 
-            this.pnlgreen8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlgreen8.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlgreen8.Location = new System.Drawing.Point(259, 8);
             this.pnlgreen8.Name = "pnlgreen8";
             this.pnlgreen8.Size = new System.Drawing.Size(20, 13);
@@ -1927,7 +1927,7 @@ namespace ShiftOS
             // 
             // pnlgreen4
             // 
-            this.pnlgreen4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlgreen4.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlgreen4.Location = new System.Drawing.Point(155, 8);
             this.pnlgreen4.Name = "pnlgreen4";
             this.pnlgreen4.Size = new System.Drawing.Size(20, 13);
@@ -1936,7 +1936,7 @@ namespace ShiftOS
             // 
             // pnlgreen6
             // 
-            this.pnlgreen6.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlgreen6.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlgreen6.Location = new System.Drawing.Point(207, 8);
             this.pnlgreen6.Name = "pnlgreen6";
             this.pnlgreen6.Size = new System.Drawing.Size(20, 13);
@@ -1945,7 +1945,7 @@ namespace ShiftOS
             // 
             // pnlgreen15
             // 
-            this.pnlgreen15.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlgreen15.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlgreen15.Location = new System.Drawing.Point(233, 25);
             this.pnlgreen15.Name = "pnlgreen15";
             this.pnlgreen15.Size = new System.Drawing.Size(20, 13);
@@ -1954,7 +1954,7 @@ namespace ShiftOS
             // 
             // pnlgreen2
             // 
-            this.pnlgreen2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlgreen2.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlgreen2.Location = new System.Drawing.Point(103, 8);
             this.pnlgreen2.Name = "pnlgreen2";
             this.pnlgreen2.Size = new System.Drawing.Size(20, 13);
@@ -1963,7 +1963,7 @@ namespace ShiftOS
             // 
             // pnlgreen13
             // 
-            this.pnlgreen13.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlgreen13.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlgreen13.Location = new System.Drawing.Point(181, 25);
             this.pnlgreen13.Name = "pnlgreen13";
             this.pnlgreen13.Size = new System.Drawing.Size(20, 13);
@@ -1972,7 +1972,7 @@ namespace ShiftOS
             // 
             // pnlgreen11
             // 
-            this.pnlgreen11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlgreen11.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlgreen11.Location = new System.Drawing.Point(129, 25);
             this.pnlgreen11.Name = "pnlgreen11";
             this.pnlgreen11.Size = new System.Drawing.Size(20, 13);
@@ -1981,7 +1981,7 @@ namespace ShiftOS
             // 
             // pnlgreen7
             // 
-            this.pnlgreen7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlgreen7.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlgreen7.Location = new System.Drawing.Point(233, 8);
             this.pnlgreen7.Name = "pnlgreen7";
             this.pnlgreen7.Size = new System.Drawing.Size(20, 13);
@@ -1990,7 +1990,7 @@ namespace ShiftOS
             // 
             // pnlgreen9
             // 
-            this.pnlgreen9.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlgreen9.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlgreen9.Location = new System.Drawing.Point(77, 25);
             this.pnlgreen9.Name = "pnlgreen9";
             this.pnlgreen9.Size = new System.Drawing.Size(20, 13);
@@ -1999,7 +1999,7 @@ namespace ShiftOS
             // 
             // pnlgreen5
             // 
-            this.pnlgreen5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlgreen5.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlgreen5.Location = new System.Drawing.Point(181, 8);
             this.pnlgreen5.Name = "pnlgreen5";
             this.pnlgreen5.Size = new System.Drawing.Size(20, 13);
@@ -2008,7 +2008,7 @@ namespace ShiftOS
             // 
             // pnlgreen3
             // 
-            this.pnlgreen3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlgreen3.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlgreen3.Location = new System.Drawing.Point(129, 8);
             this.pnlgreen3.Name = "pnlgreen3";
             this.pnlgreen3.Size = new System.Drawing.Size(20, 13);
@@ -2017,7 +2017,7 @@ namespace ShiftOS
             // 
             // pnlgreen1
             // 
-            this.pnlgreen1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlgreen1.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlgreen1.Location = new System.Drawing.Point(77, 8);
             this.pnlgreen1.Name = "pnlgreen1";
             this.pnlgreen1.Size = new System.Drawing.Size(20, 13);
@@ -2047,27 +2047,27 @@ namespace ShiftOS
             // pnlbluecolours
             // 
             this.pnlbluecolours.BackColor = System.Drawing.Color.White;
-            this.pnlbluecolours.Controls.Add(this.pnlblueoptions);
-            this.pnlbluecolours.Controls.Add(this.pnlbluecustomcolour);
-            this.pnlbluecolours.Controls.Add(this.pnlblue16);
-            this.pnlbluecolours.Controls.Add(this.pnlblue12);
-            this.pnlbluecolours.Controls.Add(this.pnlblue14);
-            this.pnlbluecolours.Controls.Add(this.pnlblue10);
-            this.pnlbluecolours.Controls.Add(this.pnlblue8);
-            this.pnlbluecolours.Controls.Add(this.pnlblue4);
-            this.pnlbluecolours.Controls.Add(this.pnlblue6);
-            this.pnlbluecolours.Controls.Add(this.pnlblue15);
-            this.pnlbluecolours.Controls.Add(this.pnlblue2);
-            this.pnlbluecolours.Controls.Add(this.pnlblue13);
-            this.pnlbluecolours.Controls.Add(this.pnlblue11);
-            this.pnlbluecolours.Controls.Add(this.pnlblue7);
-            this.pnlbluecolours.Controls.Add(this.pnlblue9);
-            this.pnlbluecolours.Controls.Add(this.pnlblue5);
-            this.pnlbluecolours.Controls.Add(this.pnlblue3);
-            this.pnlbluecolours.Controls.Add(this.pnlblue1);
-            this.pnlbluecolours.Controls.Add(this.lblbluelevel);
-            this.pnlbluecolours.Controls.Add(this.Label7);
-            this.pnlbluecolours.Dock = System.Windows.Forms.DockStyle.Top;
+            this.pnlbluecolours.Widgets.Add(this.pnlblueoptions);
+            this.pnlbluecolours.Widgets.Add(this.pnlbluecustomcolour);
+            this.pnlbluecolours.Widgets.Add(this.pnlblue16);
+            this.pnlbluecolours.Widgets.Add(this.pnlblue12);
+            this.pnlbluecolours.Widgets.Add(this.pnlblue14);
+            this.pnlbluecolours.Widgets.Add(this.pnlblue10);
+            this.pnlbluecolours.Widgets.Add(this.pnlblue8);
+            this.pnlbluecolours.Widgets.Add(this.pnlblue4);
+            this.pnlbluecolours.Widgets.Add(this.pnlblue6);
+            this.pnlbluecolours.Widgets.Add(this.pnlblue15);
+            this.pnlbluecolours.Widgets.Add(this.pnlblue2);
+            this.pnlbluecolours.Widgets.Add(this.pnlblue13);
+            this.pnlbluecolours.Widgets.Add(this.pnlblue11);
+            this.pnlbluecolours.Widgets.Add(this.pnlblue7);
+            this.pnlbluecolours.Widgets.Add(this.pnlblue9);
+            this.pnlbluecolours.Widgets.Add(this.pnlblue5);
+            this.pnlbluecolours.Widgets.Add(this.pnlblue3);
+            this.pnlbluecolours.Widgets.Add(this.pnlblue1);
+            this.pnlbluecolours.Widgets.Add(this.lblbluelevel);
+            this.pnlbluecolours.Widgets.Add(this.Label7);
+            this.pnlbluecolours.Dock = ShiftUI.DockStyle.Top;
             this.pnlbluecolours.Location = new System.Drawing.Point(0, 245);
             this.pnlbluecolours.Name = "pnlbluecolours";
             this.pnlbluecolours.Size = new System.Drawing.Size(447, 46);
@@ -2076,12 +2076,12 @@ namespace ShiftOS
             // 
             // pnlblueoptions
             // 
-            this.pnlblueoptions.Controls.Add(this.Label6);
-            this.pnlblueoptions.Controls.Add(this.txtbluesred);
-            this.pnlblueoptions.Controls.Add(this.txtbluesblue);
-            this.pnlblueoptions.Controls.Add(this.Label4);
-            this.pnlblueoptions.Controls.Add(this.Label2);
-            this.pnlblueoptions.Controls.Add(this.txtbluesgreen);
+            this.pnlblueoptions.Widgets.Add(this.Label6);
+            this.pnlblueoptions.Widgets.Add(this.txtbluesred);
+            this.pnlblueoptions.Widgets.Add(this.txtbluesblue);
+            this.pnlblueoptions.Widgets.Add(this.Label4);
+            this.pnlblueoptions.Widgets.Add(this.Label2);
+            this.pnlblueoptions.Widgets.Add(this.txtbluesgreen);
             this.pnlblueoptions.Location = new System.Drawing.Point(282, 3);
             this.pnlblueoptions.Name = "pnlblueoptions";
             this.pnlblueoptions.Size = new System.Drawing.Size(120, 40);
@@ -2101,26 +2101,26 @@ namespace ShiftOS
             // txtbluesred
             // 
             this.txtbluesred.BackColor = System.Drawing.Color.White;
-            this.txtbluesred.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtbluesred.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtbluesred.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtbluesred.Location = new System.Drawing.Point(95, 22);
             this.txtbluesred.Multiline = true;
             this.txtbluesred.Name = "txtbluesred";
             this.txtbluesred.Size = new System.Drawing.Size(23, 17);
             this.txtbluesred.TabIndex = 25;
-            this.txtbluesred.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtbluesred.TextAlign = ShiftUI.HorizontalAlignment.Center;
             // 
             // txtbluesblue
             // 
             this.txtbluesblue.BackColor = System.Drawing.Color.White;
-            this.txtbluesblue.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtbluesblue.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtbluesblue.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtbluesblue.Location = new System.Drawing.Point(65, 2);
             this.txtbluesblue.Multiline = true;
             this.txtbluesblue.Name = "txtbluesblue";
             this.txtbluesblue.Size = new System.Drawing.Size(23, 17);
             this.txtbluesblue.TabIndex = 21;
-            this.txtbluesblue.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtbluesblue.TextAlign = ShiftUI.HorizontalAlignment.Center;
             // 
             // Label4
             // 
@@ -2145,18 +2145,18 @@ namespace ShiftOS
             // txtbluesgreen
             // 
             this.txtbluesgreen.BackColor = System.Drawing.Color.White;
-            this.txtbluesgreen.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtbluesgreen.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtbluesgreen.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtbluesgreen.Location = new System.Drawing.Point(41, 22);
             this.txtbluesgreen.Multiline = true;
             this.txtbluesgreen.Name = "txtbluesgreen";
             this.txtbluesgreen.Size = new System.Drawing.Size(23, 17);
             this.txtbluesgreen.TabIndex = 23;
-            this.txtbluesgreen.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtbluesgreen.TextAlign = ShiftUI.HorizontalAlignment.Center;
             // 
             // pnlbluecustomcolour
             // 
-            this.pnlbluecustomcolour.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlbluecustomcolour.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlbluecustomcolour.Location = new System.Drawing.Point(406, 8);
             this.pnlbluecustomcolour.Name = "pnlbluecustomcolour";
             this.pnlbluecustomcolour.Size = new System.Drawing.Size(32, 30);
@@ -2165,7 +2165,7 @@ namespace ShiftOS
             // 
             // pnlblue16
             // 
-            this.pnlblue16.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlblue16.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlblue16.Location = new System.Drawing.Point(259, 25);
             this.pnlblue16.Name = "pnlblue16";
             this.pnlblue16.Size = new System.Drawing.Size(20, 13);
@@ -2174,7 +2174,7 @@ namespace ShiftOS
             // 
             // pnlblue12
             // 
-            this.pnlblue12.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlblue12.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlblue12.Location = new System.Drawing.Point(155, 25);
             this.pnlblue12.Name = "pnlblue12";
             this.pnlblue12.Size = new System.Drawing.Size(20, 13);
@@ -2183,7 +2183,7 @@ namespace ShiftOS
             // 
             // pnlblue14
             // 
-            this.pnlblue14.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlblue14.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlblue14.Location = new System.Drawing.Point(207, 25);
             this.pnlblue14.Name = "pnlblue14";
             this.pnlblue14.Size = new System.Drawing.Size(20, 13);
@@ -2192,7 +2192,7 @@ namespace ShiftOS
             // 
             // pnlblue10
             // 
-            this.pnlblue10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlblue10.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlblue10.Location = new System.Drawing.Point(103, 25);
             this.pnlblue10.Name = "pnlblue10";
             this.pnlblue10.Size = new System.Drawing.Size(20, 13);
@@ -2201,7 +2201,7 @@ namespace ShiftOS
             // 
             // pnlblue8
             // 
-            this.pnlblue8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlblue8.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlblue8.Location = new System.Drawing.Point(259, 8);
             this.pnlblue8.Name = "pnlblue8";
             this.pnlblue8.Size = new System.Drawing.Size(20, 13);
@@ -2210,7 +2210,7 @@ namespace ShiftOS
             // 
             // pnlblue4
             // 
-            this.pnlblue4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlblue4.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlblue4.Location = new System.Drawing.Point(155, 8);
             this.pnlblue4.Name = "pnlblue4";
             this.pnlblue4.Size = new System.Drawing.Size(20, 13);
@@ -2219,7 +2219,7 @@ namespace ShiftOS
             // 
             // pnlblue6
             // 
-            this.pnlblue6.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlblue6.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlblue6.Location = new System.Drawing.Point(207, 8);
             this.pnlblue6.Name = "pnlblue6";
             this.pnlblue6.Size = new System.Drawing.Size(20, 13);
@@ -2228,7 +2228,7 @@ namespace ShiftOS
             // 
             // pnlblue15
             // 
-            this.pnlblue15.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlblue15.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlblue15.Location = new System.Drawing.Point(233, 25);
             this.pnlblue15.Name = "pnlblue15";
             this.pnlblue15.Size = new System.Drawing.Size(20, 13);
@@ -2237,7 +2237,7 @@ namespace ShiftOS
             // 
             // pnlblue2
             // 
-            this.pnlblue2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlblue2.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlblue2.Location = new System.Drawing.Point(103, 8);
             this.pnlblue2.Name = "pnlblue2";
             this.pnlblue2.Size = new System.Drawing.Size(20, 13);
@@ -2246,7 +2246,7 @@ namespace ShiftOS
             // 
             // pnlblue13
             // 
-            this.pnlblue13.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlblue13.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlblue13.Location = new System.Drawing.Point(181, 25);
             this.pnlblue13.Name = "pnlblue13";
             this.pnlblue13.Size = new System.Drawing.Size(20, 13);
@@ -2255,7 +2255,7 @@ namespace ShiftOS
             // 
             // pnlblue11
             // 
-            this.pnlblue11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlblue11.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlblue11.Location = new System.Drawing.Point(129, 25);
             this.pnlblue11.Name = "pnlblue11";
             this.pnlblue11.Size = new System.Drawing.Size(20, 13);
@@ -2264,7 +2264,7 @@ namespace ShiftOS
             // 
             // pnlblue7
             // 
-            this.pnlblue7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlblue7.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlblue7.Location = new System.Drawing.Point(233, 8);
             this.pnlblue7.Name = "pnlblue7";
             this.pnlblue7.Size = new System.Drawing.Size(20, 13);
@@ -2273,7 +2273,7 @@ namespace ShiftOS
             // 
             // pnlblue9
             // 
-            this.pnlblue9.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlblue9.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlblue9.Location = new System.Drawing.Point(77, 25);
             this.pnlblue9.Name = "pnlblue9";
             this.pnlblue9.Size = new System.Drawing.Size(20, 13);
@@ -2282,7 +2282,7 @@ namespace ShiftOS
             // 
             // pnlblue5
             // 
-            this.pnlblue5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlblue5.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlblue5.Location = new System.Drawing.Point(181, 8);
             this.pnlblue5.Name = "pnlblue5";
             this.pnlblue5.Size = new System.Drawing.Size(20, 13);
@@ -2291,7 +2291,7 @@ namespace ShiftOS
             // 
             // pnlblue3
             // 
-            this.pnlblue3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlblue3.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlblue3.Location = new System.Drawing.Point(129, 8);
             this.pnlblue3.Name = "pnlblue3";
             this.pnlblue3.Size = new System.Drawing.Size(20, 13);
@@ -2300,7 +2300,7 @@ namespace ShiftOS
             // 
             // pnlblue1
             // 
-            this.pnlblue1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlblue1.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlblue1.Location = new System.Drawing.Point(77, 8);
             this.pnlblue1.Name = "pnlblue1";
             this.pnlblue1.Size = new System.Drawing.Size(20, 13);
@@ -2330,27 +2330,27 @@ namespace ShiftOS
             // pnlpurplecolours
             // 
             this.pnlpurplecolours.BackColor = System.Drawing.Color.White;
-            this.pnlpurplecolours.Controls.Add(this.pnlpurpleoptions);
-            this.pnlpurplecolours.Controls.Add(this.pnlpurplecustomcolour);
-            this.pnlpurplecolours.Controls.Add(this.pnlpurple16);
-            this.pnlpurplecolours.Controls.Add(this.pnlpurple12);
-            this.pnlpurplecolours.Controls.Add(this.pnlpurple14);
-            this.pnlpurplecolours.Controls.Add(this.pnlpurple10);
-            this.pnlpurplecolours.Controls.Add(this.pnlpurple8);
-            this.pnlpurplecolours.Controls.Add(this.pnlpurple4);
-            this.pnlpurplecolours.Controls.Add(this.pnlpurple6);
-            this.pnlpurplecolours.Controls.Add(this.pnlpurple15);
-            this.pnlpurplecolours.Controls.Add(this.pnlpurple2);
-            this.pnlpurplecolours.Controls.Add(this.pnlpurple13);
-            this.pnlpurplecolours.Controls.Add(this.pnlpurple11);
-            this.pnlpurplecolours.Controls.Add(this.pnlpurple7);
-            this.pnlpurplecolours.Controls.Add(this.pnlpurple9);
-            this.pnlpurplecolours.Controls.Add(this.pnlpurple5);
-            this.pnlpurplecolours.Controls.Add(this.pnlpurple3);
-            this.pnlpurplecolours.Controls.Add(this.pnlpurple1);
-            this.pnlpurplecolours.Controls.Add(this.lblpurplelevel);
-            this.pnlpurplecolours.Controls.Add(this.Label5);
-            this.pnlpurplecolours.Dock = System.Windows.Forms.DockStyle.Top;
+            this.pnlpurplecolours.Widgets.Add(this.pnlpurpleoptions);
+            this.pnlpurplecolours.Widgets.Add(this.pnlpurplecustomcolour);
+            this.pnlpurplecolours.Widgets.Add(this.pnlpurple16);
+            this.pnlpurplecolours.Widgets.Add(this.pnlpurple12);
+            this.pnlpurplecolours.Widgets.Add(this.pnlpurple14);
+            this.pnlpurplecolours.Widgets.Add(this.pnlpurple10);
+            this.pnlpurplecolours.Widgets.Add(this.pnlpurple8);
+            this.pnlpurplecolours.Widgets.Add(this.pnlpurple4);
+            this.pnlpurplecolours.Widgets.Add(this.pnlpurple6);
+            this.pnlpurplecolours.Widgets.Add(this.pnlpurple15);
+            this.pnlpurplecolours.Widgets.Add(this.pnlpurple2);
+            this.pnlpurplecolours.Widgets.Add(this.pnlpurple13);
+            this.pnlpurplecolours.Widgets.Add(this.pnlpurple11);
+            this.pnlpurplecolours.Widgets.Add(this.pnlpurple7);
+            this.pnlpurplecolours.Widgets.Add(this.pnlpurple9);
+            this.pnlpurplecolours.Widgets.Add(this.pnlpurple5);
+            this.pnlpurplecolours.Widgets.Add(this.pnlpurple3);
+            this.pnlpurplecolours.Widgets.Add(this.pnlpurple1);
+            this.pnlpurplecolours.Widgets.Add(this.lblpurplelevel);
+            this.pnlpurplecolours.Widgets.Add(this.Label5);
+            this.pnlpurplecolours.Dock = ShiftUI.DockStyle.Top;
             this.pnlpurplecolours.Location = new System.Drawing.Point(0, 199);
             this.pnlpurplecolours.Name = "pnlpurplecolours";
             this.pnlpurplecolours.Size = new System.Drawing.Size(447, 46);
@@ -2359,12 +2359,12 @@ namespace ShiftOS
             // 
             // pnlpurpleoptions
             // 
-            this.pnlpurpleoptions.Controls.Add(this.Label8);
-            this.pnlpurpleoptions.Controls.Add(this.txtpurplesgreen);
-            this.pnlpurpleoptions.Controls.Add(this.txtpurplesblue);
-            this.pnlpurpleoptions.Controls.Add(this.Label10);
-            this.pnlpurpleoptions.Controls.Add(this.Label12);
-            this.pnlpurpleoptions.Controls.Add(this.txtpurplesred);
+            this.pnlpurpleoptions.Widgets.Add(this.Label8);
+            this.pnlpurpleoptions.Widgets.Add(this.txtpurplesgreen);
+            this.pnlpurpleoptions.Widgets.Add(this.txtpurplesblue);
+            this.pnlpurpleoptions.Widgets.Add(this.Label10);
+            this.pnlpurpleoptions.Widgets.Add(this.Label12);
+            this.pnlpurpleoptions.Widgets.Add(this.txtpurplesred);
             this.pnlpurpleoptions.Location = new System.Drawing.Point(282, 3);
             this.pnlpurpleoptions.Name = "pnlpurpleoptions";
             this.pnlpurpleoptions.Size = new System.Drawing.Size(120, 40);
@@ -2384,26 +2384,26 @@ namespace ShiftOS
             // txtpurplesgreen
             // 
             this.txtpurplesgreen.BackColor = System.Drawing.Color.White;
-            this.txtpurplesgreen.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtpurplesgreen.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtpurplesgreen.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtpurplesgreen.Location = new System.Drawing.Point(95, 22);
             this.txtpurplesgreen.Multiline = true;
             this.txtpurplesgreen.Name = "txtpurplesgreen";
             this.txtpurplesgreen.Size = new System.Drawing.Size(23, 17);
             this.txtpurplesgreen.TabIndex = 25;
-            this.txtpurplesgreen.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtpurplesgreen.TextAlign = ShiftUI.HorizontalAlignment.Center;
             // 
             // txtpurplesblue
             // 
             this.txtpurplesblue.BackColor = System.Drawing.Color.White;
-            this.txtpurplesblue.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtpurplesblue.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtpurplesblue.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtpurplesblue.Location = new System.Drawing.Point(65, 2);
             this.txtpurplesblue.Multiline = true;
             this.txtpurplesblue.Name = "txtpurplesblue";
             this.txtpurplesblue.Size = new System.Drawing.Size(23, 17);
             this.txtpurplesblue.TabIndex = 21;
-            this.txtpurplesblue.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtpurplesblue.TextAlign = ShiftUI.HorizontalAlignment.Center;
             // 
             // Label10
             // 
@@ -2428,18 +2428,18 @@ namespace ShiftOS
             // txtpurplesred
             // 
             this.txtpurplesred.BackColor = System.Drawing.Color.White;
-            this.txtpurplesred.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtpurplesred.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtpurplesred.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtpurplesred.Location = new System.Drawing.Point(32, 22);
             this.txtpurplesred.Multiline = true;
             this.txtpurplesred.Name = "txtpurplesred";
             this.txtpurplesred.Size = new System.Drawing.Size(23, 17);
             this.txtpurplesred.TabIndex = 23;
-            this.txtpurplesred.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtpurplesred.TextAlign = ShiftUI.HorizontalAlignment.Center;
             // 
             // pnlpurplecustomcolour
             // 
-            this.pnlpurplecustomcolour.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpurplecustomcolour.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpurplecustomcolour.Location = new System.Drawing.Point(406, 8);
             this.pnlpurplecustomcolour.Name = "pnlpurplecustomcolour";
             this.pnlpurplecustomcolour.Size = new System.Drawing.Size(32, 30);
@@ -2448,7 +2448,7 @@ namespace ShiftOS
             // 
             // pnlpurple16
             // 
-            this.pnlpurple16.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpurple16.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpurple16.Location = new System.Drawing.Point(259, 25);
             this.pnlpurple16.Name = "pnlpurple16";
             this.pnlpurple16.Size = new System.Drawing.Size(20, 13);
@@ -2457,7 +2457,7 @@ namespace ShiftOS
             // 
             // pnlpurple12
             // 
-            this.pnlpurple12.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpurple12.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpurple12.Location = new System.Drawing.Point(155, 25);
             this.pnlpurple12.Name = "pnlpurple12";
             this.pnlpurple12.Size = new System.Drawing.Size(20, 13);
@@ -2466,7 +2466,7 @@ namespace ShiftOS
             // 
             // pnlpurple14
             // 
-            this.pnlpurple14.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpurple14.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpurple14.Location = new System.Drawing.Point(207, 25);
             this.pnlpurple14.Name = "pnlpurple14";
             this.pnlpurple14.Size = new System.Drawing.Size(20, 13);
@@ -2475,7 +2475,7 @@ namespace ShiftOS
             // 
             // pnlpurple10
             // 
-            this.pnlpurple10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpurple10.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpurple10.Location = new System.Drawing.Point(103, 25);
             this.pnlpurple10.Name = "pnlpurple10";
             this.pnlpurple10.Size = new System.Drawing.Size(20, 13);
@@ -2484,7 +2484,7 @@ namespace ShiftOS
             // 
             // pnlpurple8
             // 
-            this.pnlpurple8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpurple8.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpurple8.Location = new System.Drawing.Point(259, 8);
             this.pnlpurple8.Name = "pnlpurple8";
             this.pnlpurple8.Size = new System.Drawing.Size(20, 13);
@@ -2493,7 +2493,7 @@ namespace ShiftOS
             // 
             // pnlpurple4
             // 
-            this.pnlpurple4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpurple4.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpurple4.Location = new System.Drawing.Point(155, 8);
             this.pnlpurple4.Name = "pnlpurple4";
             this.pnlpurple4.Size = new System.Drawing.Size(20, 13);
@@ -2502,7 +2502,7 @@ namespace ShiftOS
             // 
             // pnlpurple6
             // 
-            this.pnlpurple6.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpurple6.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpurple6.Location = new System.Drawing.Point(207, 8);
             this.pnlpurple6.Name = "pnlpurple6";
             this.pnlpurple6.Size = new System.Drawing.Size(20, 13);
@@ -2511,7 +2511,7 @@ namespace ShiftOS
             // 
             // pnlpurple15
             // 
-            this.pnlpurple15.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpurple15.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpurple15.Location = new System.Drawing.Point(233, 25);
             this.pnlpurple15.Name = "pnlpurple15";
             this.pnlpurple15.Size = new System.Drawing.Size(20, 13);
@@ -2520,7 +2520,7 @@ namespace ShiftOS
             // 
             // pnlpurple2
             // 
-            this.pnlpurple2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpurple2.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpurple2.Location = new System.Drawing.Point(103, 8);
             this.pnlpurple2.Name = "pnlpurple2";
             this.pnlpurple2.Size = new System.Drawing.Size(20, 13);
@@ -2529,7 +2529,7 @@ namespace ShiftOS
             // 
             // pnlpurple13
             // 
-            this.pnlpurple13.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpurple13.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpurple13.Location = new System.Drawing.Point(181, 25);
             this.pnlpurple13.Name = "pnlpurple13";
             this.pnlpurple13.Size = new System.Drawing.Size(20, 13);
@@ -2538,7 +2538,7 @@ namespace ShiftOS
             // 
             // pnlpurple11
             // 
-            this.pnlpurple11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpurple11.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpurple11.Location = new System.Drawing.Point(129, 25);
             this.pnlpurple11.Name = "pnlpurple11";
             this.pnlpurple11.Size = new System.Drawing.Size(20, 13);
@@ -2547,7 +2547,7 @@ namespace ShiftOS
             // 
             // pnlpurple7
             // 
-            this.pnlpurple7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpurple7.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpurple7.Location = new System.Drawing.Point(233, 8);
             this.pnlpurple7.Name = "pnlpurple7";
             this.pnlpurple7.Size = new System.Drawing.Size(20, 13);
@@ -2556,7 +2556,7 @@ namespace ShiftOS
             // 
             // pnlpurple9
             // 
-            this.pnlpurple9.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpurple9.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpurple9.Location = new System.Drawing.Point(77, 25);
             this.pnlpurple9.Name = "pnlpurple9";
             this.pnlpurple9.Size = new System.Drawing.Size(20, 13);
@@ -2565,7 +2565,7 @@ namespace ShiftOS
             // 
             // pnlpurple5
             // 
-            this.pnlpurple5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpurple5.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpurple5.Location = new System.Drawing.Point(181, 8);
             this.pnlpurple5.Name = "pnlpurple5";
             this.pnlpurple5.Size = new System.Drawing.Size(20, 13);
@@ -2574,7 +2574,7 @@ namespace ShiftOS
             // 
             // pnlpurple3
             // 
-            this.pnlpurple3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpurple3.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpurple3.Location = new System.Drawing.Point(129, 8);
             this.pnlpurple3.Name = "pnlpurple3";
             this.pnlpurple3.Size = new System.Drawing.Size(20, 13);
@@ -2583,7 +2583,7 @@ namespace ShiftOS
             // 
             // pnlpurple1
             // 
-            this.pnlpurple1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlpurple1.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlpurple1.Location = new System.Drawing.Point(77, 8);
             this.pnlpurple1.Name = "pnlpurple1";
             this.pnlpurple1.Size = new System.Drawing.Size(20, 13);
@@ -2613,28 +2613,28 @@ namespace ShiftOS
             // pnlgraycolours
             // 
             this.pnlgraycolours.BackColor = System.Drawing.Color.White;
-            this.pnlgraycolours.Controls.Add(this.lblcustomshadetut);
-            this.pnlgraycolours.Controls.Add(this.txtcustomgrayshade);
-            this.pnlgraycolours.Controls.Add(this.pnlgraycustomcolour);
-            this.pnlgraycolours.Controls.Add(this.pnlgray16);
-            this.pnlgraycolours.Controls.Add(this.pnlgray12);
-            this.pnlgraycolours.Controls.Add(this.pnlgray14);
-            this.pnlgraycolours.Controls.Add(this.pnlgray10);
-            this.pnlgraycolours.Controls.Add(this.pnlgray8);
-            this.pnlgraycolours.Controls.Add(this.pnlgray4);
-            this.pnlgraycolours.Controls.Add(this.pnlgray6);
-            this.pnlgraycolours.Controls.Add(this.pnlgray15);
-            this.pnlgraycolours.Controls.Add(this.pnlgray2);
-            this.pnlgraycolours.Controls.Add(this.pnlgray13);
-            this.pnlgraycolours.Controls.Add(this.pnlgray11);
-            this.pnlgraycolours.Controls.Add(this.pnlgray7);
-            this.pnlgraycolours.Controls.Add(this.pnlgray9);
-            this.pnlgraycolours.Controls.Add(this.pnlgray5);
-            this.pnlgraycolours.Controls.Add(this.pnlgray3);
-            this.pnlgraycolours.Controls.Add(this.pnlgray1);
-            this.pnlgraycolours.Controls.Add(this.lblgraylevel);
-            this.pnlgraycolours.Controls.Add(this.Label3);
-            this.pnlgraycolours.Dock = System.Windows.Forms.DockStyle.Top;
+            this.pnlgraycolours.Widgets.Add(this.lblcustomshadetut);
+            this.pnlgraycolours.Widgets.Add(this.txtcustomgrayshade);
+            this.pnlgraycolours.Widgets.Add(this.pnlgraycustomcolour);
+            this.pnlgraycolours.Widgets.Add(this.pnlgray16);
+            this.pnlgraycolours.Widgets.Add(this.pnlgray12);
+            this.pnlgraycolours.Widgets.Add(this.pnlgray14);
+            this.pnlgraycolours.Widgets.Add(this.pnlgray10);
+            this.pnlgraycolours.Widgets.Add(this.pnlgray8);
+            this.pnlgraycolours.Widgets.Add(this.pnlgray4);
+            this.pnlgraycolours.Widgets.Add(this.pnlgray6);
+            this.pnlgraycolours.Widgets.Add(this.pnlgray15);
+            this.pnlgraycolours.Widgets.Add(this.pnlgray2);
+            this.pnlgraycolours.Widgets.Add(this.pnlgray13);
+            this.pnlgraycolours.Widgets.Add(this.pnlgray11);
+            this.pnlgraycolours.Widgets.Add(this.pnlgray7);
+            this.pnlgraycolours.Widgets.Add(this.pnlgray9);
+            this.pnlgraycolours.Widgets.Add(this.pnlgray5);
+            this.pnlgraycolours.Widgets.Add(this.pnlgray3);
+            this.pnlgraycolours.Widgets.Add(this.pnlgray1);
+            this.pnlgraycolours.Widgets.Add(this.lblgraylevel);
+            this.pnlgraycolours.Widgets.Add(this.Label3);
+            this.pnlgraycolours.Dock = ShiftUI.DockStyle.Top;
             this.pnlgraycolours.Location = new System.Drawing.Point(0, 153);
             this.pnlgraycolours.Name = "pnlgraycolours";
             this.pnlgraycolours.Size = new System.Drawing.Size(447, 46);
@@ -2655,20 +2655,20 @@ namespace ShiftOS
             // txtcustomgrayshade
             // 
             this.txtcustomgrayshade.BackColor = System.Drawing.Color.White;
-            this.txtcustomgrayshade.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtcustomgrayshade.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtcustomgrayshade.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtcustomgrayshade.Location = new System.Drawing.Point(317, 20);
             this.txtcustomgrayshade.Multiline = true;
             this.txtcustomgrayshade.Name = "txtcustomgrayshade";
             this.txtcustomgrayshade.Size = new System.Drawing.Size(45, 17);
             this.txtcustomgrayshade.TabIndex = 19;
-            this.txtcustomgrayshade.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtcustomgrayshade.TextAlign = ShiftUI.HorizontalAlignment.Center;
             this.txtcustomgrayshade.Visible = false;
             this.txtcustomgrayshade.TextChanged += new System.EventHandler(this.txtcustomgrayshade_TextChanged);
             // 
             // pnlgraycustomcolour
             // 
-            this.pnlgraycustomcolour.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlgraycustomcolour.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlgraycustomcolour.Location = new System.Drawing.Point(406, 8);
             this.pnlgraycustomcolour.Name = "pnlgraycustomcolour";
             this.pnlgraycustomcolour.Size = new System.Drawing.Size(32, 30);
@@ -2677,7 +2677,7 @@ namespace ShiftOS
             // 
             // pnlgray16
             // 
-            this.pnlgray16.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlgray16.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlgray16.Location = new System.Drawing.Point(259, 25);
             this.pnlgray16.Name = "pnlgray16";
             this.pnlgray16.Size = new System.Drawing.Size(20, 13);
@@ -2686,7 +2686,7 @@ namespace ShiftOS
             // 
             // pnlgray12
             // 
-            this.pnlgray12.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlgray12.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlgray12.Location = new System.Drawing.Point(155, 25);
             this.pnlgray12.Name = "pnlgray12";
             this.pnlgray12.Size = new System.Drawing.Size(20, 13);
@@ -2695,7 +2695,7 @@ namespace ShiftOS
             // 
             // pnlgray14
             // 
-            this.pnlgray14.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlgray14.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlgray14.Location = new System.Drawing.Point(207, 25);
             this.pnlgray14.Name = "pnlgray14";
             this.pnlgray14.Size = new System.Drawing.Size(20, 13);
@@ -2704,7 +2704,7 @@ namespace ShiftOS
             // 
             // pnlgray10
             // 
-            this.pnlgray10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlgray10.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlgray10.Location = new System.Drawing.Point(103, 25);
             this.pnlgray10.Name = "pnlgray10";
             this.pnlgray10.Size = new System.Drawing.Size(20, 13);
@@ -2713,7 +2713,7 @@ namespace ShiftOS
             // 
             // pnlgray8
             // 
-            this.pnlgray8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlgray8.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlgray8.Location = new System.Drawing.Point(259, 8);
             this.pnlgray8.Name = "pnlgray8";
             this.pnlgray8.Size = new System.Drawing.Size(20, 13);
@@ -2722,7 +2722,7 @@ namespace ShiftOS
             // 
             // pnlgray4
             // 
-            this.pnlgray4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlgray4.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlgray4.Location = new System.Drawing.Point(155, 8);
             this.pnlgray4.Name = "pnlgray4";
             this.pnlgray4.Size = new System.Drawing.Size(20, 13);
@@ -2731,7 +2731,7 @@ namespace ShiftOS
             // 
             // pnlgray6
             // 
-            this.pnlgray6.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlgray6.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlgray6.Location = new System.Drawing.Point(207, 8);
             this.pnlgray6.Name = "pnlgray6";
             this.pnlgray6.Size = new System.Drawing.Size(20, 13);
@@ -2740,7 +2740,7 @@ namespace ShiftOS
             // 
             // pnlgray15
             // 
-            this.pnlgray15.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlgray15.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlgray15.Location = new System.Drawing.Point(233, 25);
             this.pnlgray15.Name = "pnlgray15";
             this.pnlgray15.Size = new System.Drawing.Size(20, 13);
@@ -2749,7 +2749,7 @@ namespace ShiftOS
             // 
             // pnlgray2
             // 
-            this.pnlgray2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlgray2.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlgray2.Location = new System.Drawing.Point(103, 8);
             this.pnlgray2.Name = "pnlgray2";
             this.pnlgray2.Size = new System.Drawing.Size(20, 13);
@@ -2758,7 +2758,7 @@ namespace ShiftOS
             // 
             // pnlgray13
             // 
-            this.pnlgray13.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlgray13.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlgray13.Location = new System.Drawing.Point(181, 25);
             this.pnlgray13.Name = "pnlgray13";
             this.pnlgray13.Size = new System.Drawing.Size(20, 13);
@@ -2767,7 +2767,7 @@ namespace ShiftOS
             // 
             // pnlgray11
             // 
-            this.pnlgray11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlgray11.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlgray11.Location = new System.Drawing.Point(129, 25);
             this.pnlgray11.Name = "pnlgray11";
             this.pnlgray11.Size = new System.Drawing.Size(20, 13);
@@ -2776,7 +2776,7 @@ namespace ShiftOS
             // 
             // pnlgray7
             // 
-            this.pnlgray7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlgray7.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlgray7.Location = new System.Drawing.Point(233, 8);
             this.pnlgray7.Name = "pnlgray7";
             this.pnlgray7.Size = new System.Drawing.Size(20, 13);
@@ -2785,7 +2785,7 @@ namespace ShiftOS
             // 
             // pnlgray9
             // 
-            this.pnlgray9.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlgray9.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlgray9.Location = new System.Drawing.Point(77, 25);
             this.pnlgray9.Name = "pnlgray9";
             this.pnlgray9.Size = new System.Drawing.Size(20, 13);
@@ -2794,7 +2794,7 @@ namespace ShiftOS
             // 
             // pnlgray5
             // 
-            this.pnlgray5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlgray5.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlgray5.Location = new System.Drawing.Point(181, 8);
             this.pnlgray5.Name = "pnlgray5";
             this.pnlgray5.Size = new System.Drawing.Size(20, 13);
@@ -2803,7 +2803,7 @@ namespace ShiftOS
             // 
             // pnlgray3
             // 
-            this.pnlgray3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlgray3.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlgray3.Location = new System.Drawing.Point(129, 8);
             this.pnlgray3.Name = "pnlgray3";
             this.pnlgray3.Size = new System.Drawing.Size(20, 13);
@@ -2812,7 +2812,7 @@ namespace ShiftOS
             // 
             // pnlgray1
             // 
-            this.pnlgray1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlgray1.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlgray1.Location = new System.Drawing.Point(77, 8);
             this.pnlgray1.Name = "pnlgray1";
             this.pnlgray1.Size = new System.Drawing.Size(20, 13);
@@ -2842,27 +2842,27 @@ namespace ShiftOS
             // pnlanycolours
             // 
             this.pnlanycolours.BackColor = System.Drawing.Color.White;
-            this.pnlanycolours.Controls.Add(this.pnlanyoptions);
-            this.pnlanycolours.Controls.Add(this.pnlanycustomcolour);
-            this.pnlanycolours.Controls.Add(this.pnlany16);
-            this.pnlanycolours.Controls.Add(this.pnlany12);
-            this.pnlanycolours.Controls.Add(this.pnlany14);
-            this.pnlanycolours.Controls.Add(this.pnlany10);
-            this.pnlanycolours.Controls.Add(this.pnlany8);
-            this.pnlanycolours.Controls.Add(this.pnlany4);
-            this.pnlanycolours.Controls.Add(this.pnlany6);
-            this.pnlanycolours.Controls.Add(this.pnlany15);
-            this.pnlanycolours.Controls.Add(this.pnlany2);
-            this.pnlanycolours.Controls.Add(this.pnlany13);
-            this.pnlanycolours.Controls.Add(this.pnlany11);
-            this.pnlanycolours.Controls.Add(this.pnlany7);
-            this.pnlanycolours.Controls.Add(this.pnlany9);
-            this.pnlanycolours.Controls.Add(this.pnlany5);
-            this.pnlanycolours.Controls.Add(this.pnlany3);
-            this.pnlanycolours.Controls.Add(this.pnlany1);
-            this.pnlanycolours.Controls.Add(this.lblanylevel);
-            this.pnlanycolours.Controls.Add(this.Label1);
-            this.pnlanycolours.Dock = System.Windows.Forms.DockStyle.Top;
+            this.pnlanycolours.Widgets.Add(this.pnlanyoptions);
+            this.pnlanycolours.Widgets.Add(this.pnlanycustomcolour);
+            this.pnlanycolours.Widgets.Add(this.pnlany16);
+            this.pnlanycolours.Widgets.Add(this.pnlany12);
+            this.pnlanycolours.Widgets.Add(this.pnlany14);
+            this.pnlanycolours.Widgets.Add(this.pnlany10);
+            this.pnlanycolours.Widgets.Add(this.pnlany8);
+            this.pnlanycolours.Widgets.Add(this.pnlany4);
+            this.pnlanycolours.Widgets.Add(this.pnlany6);
+            this.pnlanycolours.Widgets.Add(this.pnlany15);
+            this.pnlanycolours.Widgets.Add(this.pnlany2);
+            this.pnlanycolours.Widgets.Add(this.pnlany13);
+            this.pnlanycolours.Widgets.Add(this.pnlany11);
+            this.pnlanycolours.Widgets.Add(this.pnlany7);
+            this.pnlanycolours.Widgets.Add(this.pnlany9);
+            this.pnlanycolours.Widgets.Add(this.pnlany5);
+            this.pnlanycolours.Widgets.Add(this.pnlany3);
+            this.pnlanycolours.Widgets.Add(this.pnlany1);
+            this.pnlanycolours.Widgets.Add(this.lblanylevel);
+            this.pnlanycolours.Widgets.Add(this.Label1);
+            this.pnlanycolours.Dock = ShiftUI.DockStyle.Top;
             this.pnlanycolours.Location = new System.Drawing.Point(0, 107);
             this.pnlanycolours.Name = "pnlanycolours";
             this.pnlanycolours.Size = new System.Drawing.Size(447, 46);
@@ -2871,12 +2871,12 @@ namespace ShiftOS
             // 
             // pnlanyoptions
             // 
-            this.pnlanyoptions.Controls.Add(this.Label38);
-            this.pnlanyoptions.Controls.Add(this.txtanysgreen);
-            this.pnlanyoptions.Controls.Add(this.txtanysred);
-            this.pnlanyoptions.Controls.Add(this.Label39);
-            this.pnlanyoptions.Controls.Add(this.Label40);
-            this.pnlanyoptions.Controls.Add(this.txtanysblue);
+            this.pnlanyoptions.Widgets.Add(this.Label38);
+            this.pnlanyoptions.Widgets.Add(this.txtanysgreen);
+            this.pnlanyoptions.Widgets.Add(this.txtanysred);
+            this.pnlanyoptions.Widgets.Add(this.Label39);
+            this.pnlanyoptions.Widgets.Add(this.Label40);
+            this.pnlanyoptions.Widgets.Add(this.txtanysblue);
             this.pnlanyoptions.Location = new System.Drawing.Point(282, 3);
             this.pnlanyoptions.Name = "pnlanyoptions";
             this.pnlanyoptions.Size = new System.Drawing.Size(120, 40);
@@ -2897,27 +2897,27 @@ namespace ShiftOS
             // txtanysgreen
             // 
             this.txtanysgreen.BackColor = System.Drawing.Color.White;
-            this.txtanysgreen.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtanysgreen.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtanysgreen.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtanysgreen.Location = new System.Drawing.Point(95, 22);
             this.txtanysgreen.Multiline = true;
             this.txtanysgreen.Name = "txtanysgreen";
             this.txtanysgreen.Size = new System.Drawing.Size(23, 17);
             this.txtanysgreen.TabIndex = 25;
-            this.txtanysgreen.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtanysgreen.TextAlign = ShiftUI.HorizontalAlignment.Center;
             this.txtanysgreen.TextChanged += new System.EventHandler(this.txtanysred_TextChanged);
             // 
             // txtanysred
             // 
             this.txtanysred.BackColor = System.Drawing.Color.White;
-            this.txtanysred.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtanysred.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtanysred.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtanysred.Location = new System.Drawing.Point(62, 2);
             this.txtanysred.Multiline = true;
             this.txtanysred.Name = "txtanysred";
             this.txtanysred.Size = new System.Drawing.Size(23, 17);
             this.txtanysred.TabIndex = 21;
-            this.txtanysred.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtanysred.TextAlign = ShiftUI.HorizontalAlignment.Center;
             this.txtanysred.TextChanged += new System.EventHandler(this.txtanysred_TextChanged);
             // 
             // Label39
@@ -2943,19 +2943,19 @@ namespace ShiftOS
             // txtanysblue
             // 
             this.txtanysblue.BackColor = System.Drawing.Color.White;
-            this.txtanysblue.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtanysblue.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtanysblue.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtanysblue.Location = new System.Drawing.Point(32, 22);
             this.txtanysblue.Multiline = true;
             this.txtanysblue.Name = "txtanysblue";
             this.txtanysblue.Size = new System.Drawing.Size(23, 17);
             this.txtanysblue.TabIndex = 23;
-            this.txtanysblue.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtanysblue.TextAlign = ShiftUI.HorizontalAlignment.Center;
             this.txtanysblue.TextChanged += new System.EventHandler(this.txtanysred_TextChanged);
             // 
             // pnlanycustomcolour
             // 
-            this.pnlanycustomcolour.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlanycustomcolour.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlanycustomcolour.Location = new System.Drawing.Point(406, 8);
             this.pnlanycustomcolour.Name = "pnlanycustomcolour";
             this.pnlanycustomcolour.Size = new System.Drawing.Size(32, 30);
@@ -2964,7 +2964,7 @@ namespace ShiftOS
             // 
             // pnlany16
             // 
-            this.pnlany16.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlany16.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlany16.Location = new System.Drawing.Point(259, 25);
             this.pnlany16.Name = "pnlany16";
             this.pnlany16.Size = new System.Drawing.Size(20, 13);
@@ -2973,7 +2973,7 @@ namespace ShiftOS
             // 
             // pnlany12
             // 
-            this.pnlany12.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlany12.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlany12.Location = new System.Drawing.Point(155, 25);
             this.pnlany12.Name = "pnlany12";
             this.pnlany12.Size = new System.Drawing.Size(20, 13);
@@ -2982,7 +2982,7 @@ namespace ShiftOS
             // 
             // pnlany14
             // 
-            this.pnlany14.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlany14.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlany14.Location = new System.Drawing.Point(207, 25);
             this.pnlany14.Name = "pnlany14";
             this.pnlany14.Size = new System.Drawing.Size(20, 13);
@@ -2991,7 +2991,7 @@ namespace ShiftOS
             // 
             // pnlany10
             // 
-            this.pnlany10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlany10.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlany10.Location = new System.Drawing.Point(103, 25);
             this.pnlany10.Name = "pnlany10";
             this.pnlany10.Size = new System.Drawing.Size(20, 13);
@@ -3000,7 +3000,7 @@ namespace ShiftOS
             // 
             // pnlany8
             // 
-            this.pnlany8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlany8.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlany8.Location = new System.Drawing.Point(259, 8);
             this.pnlany8.Name = "pnlany8";
             this.pnlany8.Size = new System.Drawing.Size(20, 13);
@@ -3009,7 +3009,7 @@ namespace ShiftOS
             // 
             // pnlany4
             // 
-            this.pnlany4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlany4.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlany4.Location = new System.Drawing.Point(155, 8);
             this.pnlany4.Name = "pnlany4";
             this.pnlany4.Size = new System.Drawing.Size(20, 13);
@@ -3018,7 +3018,7 @@ namespace ShiftOS
             // 
             // pnlany6
             // 
-            this.pnlany6.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlany6.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlany6.Location = new System.Drawing.Point(207, 8);
             this.pnlany6.Name = "pnlany6";
             this.pnlany6.Size = new System.Drawing.Size(20, 13);
@@ -3027,7 +3027,7 @@ namespace ShiftOS
             // 
             // pnlany15
             // 
-            this.pnlany15.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlany15.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlany15.Location = new System.Drawing.Point(233, 25);
             this.pnlany15.Name = "pnlany15";
             this.pnlany15.Size = new System.Drawing.Size(20, 13);
@@ -3036,7 +3036,7 @@ namespace ShiftOS
             // 
             // pnlany2
             // 
-            this.pnlany2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlany2.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlany2.Location = new System.Drawing.Point(103, 8);
             this.pnlany2.Name = "pnlany2";
             this.pnlany2.Size = new System.Drawing.Size(20, 13);
@@ -3045,7 +3045,7 @@ namespace ShiftOS
             // 
             // pnlany13
             // 
-            this.pnlany13.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlany13.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlany13.Location = new System.Drawing.Point(181, 25);
             this.pnlany13.Name = "pnlany13";
             this.pnlany13.Size = new System.Drawing.Size(20, 13);
@@ -3054,7 +3054,7 @@ namespace ShiftOS
             // 
             // pnlany11
             // 
-            this.pnlany11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlany11.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlany11.Location = new System.Drawing.Point(129, 25);
             this.pnlany11.Name = "pnlany11";
             this.pnlany11.Size = new System.Drawing.Size(20, 13);
@@ -3063,7 +3063,7 @@ namespace ShiftOS
             // 
             // pnlany7
             // 
-            this.pnlany7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlany7.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlany7.Location = new System.Drawing.Point(233, 8);
             this.pnlany7.Name = "pnlany7";
             this.pnlany7.Size = new System.Drawing.Size(20, 13);
@@ -3072,7 +3072,7 @@ namespace ShiftOS
             // 
             // pnlany9
             // 
-            this.pnlany9.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlany9.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlany9.Location = new System.Drawing.Point(77, 25);
             this.pnlany9.Name = "pnlany9";
             this.pnlany9.Size = new System.Drawing.Size(20, 13);
@@ -3081,7 +3081,7 @@ namespace ShiftOS
             // 
             // pnlany5
             // 
-            this.pnlany5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlany5.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlany5.Location = new System.Drawing.Point(181, 8);
             this.pnlany5.Name = "pnlany5";
             this.pnlany5.Size = new System.Drawing.Size(20, 13);
@@ -3090,7 +3090,7 @@ namespace ShiftOS
             // 
             // pnlany3
             // 
-            this.pnlany3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlany3.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlany3.Location = new System.Drawing.Point(129, 8);
             this.pnlany3.Name = "pnlany3";
             this.pnlany3.Size = new System.Drawing.Size(20, 13);
@@ -3099,7 +3099,7 @@ namespace ShiftOS
             // 
             // pnlany1
             // 
-            this.pnlany1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlany1.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pnlany1.Location = new System.Drawing.Point(77, 8);
             this.pnlany1.Name = "pnlany1";
             this.pnlany1.Size = new System.Drawing.Size(20, 13);
@@ -3129,17 +3129,17 @@ namespace ShiftOS
             // Panel1
             // 
             this.Panel1.BackColor = System.Drawing.Color.White;
-            this.Panel1.Controls.Add(this.lblnewcolourrgb);
-            this.Panel1.Controls.Add(this.lblnewcolourname);
-            this.Panel1.Controls.Add(this.Label26);
-            this.Panel1.Controls.Add(this.Label17);
-            this.Panel1.Controls.Add(this.lbloldcolourrgb);
-            this.Panel1.Controls.Add(this.lbloldcolourname);
-            this.Panel1.Controls.Add(this.Label14);
-            this.Panel1.Controls.Add(this.pnlnewcolour);
-            this.Panel1.Controls.Add(this.pnloldcolour);
-            this.Panel1.Controls.Add(this.lblobjecttocolour);
-            this.Panel1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.Panel1.Widgets.Add(this.lblnewcolourrgb);
+            this.Panel1.Widgets.Add(this.lblnewcolourname);
+            this.Panel1.Widgets.Add(this.Label26);
+            this.Panel1.Widgets.Add(this.Label17);
+            this.Panel1.Widgets.Add(this.lbloldcolourrgb);
+            this.Panel1.Widgets.Add(this.lbloldcolourname);
+            this.Panel1.Widgets.Add(this.Label14);
+            this.Panel1.Widgets.Add(this.pnlnewcolour);
+            this.Panel1.Widgets.Add(this.pnloldcolour);
+            this.Panel1.Widgets.Add(this.lblobjecttocolour);
+            this.Panel1.Dock = ShiftUI.DockStyle.Top;
             this.Panel1.Location = new System.Drawing.Point(0, 0);
             this.Panel1.Name = "Panel1";
             this.Panel1.Size = new System.Drawing.Size(447, 107);
@@ -3239,10 +3239,10 @@ namespace ShiftOS
             // Color_Picker
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(447, 600);
-            this.Controls.Add(this.pgcontents);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Widgets.Add(this.pgcontents);
+            this.FormBorderStyle = ShiftUI.FormBorderStyle.None;
             this.KeyPreview = true;
             this.Name = "Color_Picker";
             this.Text = "Colour_Picker";
@@ -3292,282 +3292,282 @@ namespace ShiftOS
             this.ResumeLayout(false);
 
         }
-        internal System.Windows.Forms.Panel pgcontents;
-        internal System.Windows.Forms.Panel pnlanycolours;
-        internal System.Windows.Forms.Panel pnlany16;
-        internal System.Windows.Forms.Panel pnlany12;
-        internal System.Windows.Forms.Panel pnlany14;
-        internal System.Windows.Forms.Panel pnlany10;
-        internal System.Windows.Forms.Panel pnlany4;
-        internal System.Windows.Forms.Panel pnlany6;
-        internal System.Windows.Forms.Panel pnlany15;
-        internal System.Windows.Forms.Panel pnlany2;
-        internal System.Windows.Forms.Panel pnlany13;
-        internal System.Windows.Forms.Panel pnlany11;
-        internal System.Windows.Forms.Panel pnlany7;
-        internal System.Windows.Forms.Panel pnlany9;
-        internal System.Windows.Forms.Panel pnlany5;
-        internal System.Windows.Forms.Panel pnlany3;
-        internal System.Windows.Forms.Panel pnlany1;
-        internal System.Windows.Forms.Label lblanylevel;
-        internal System.Windows.Forms.Label Label1;
-        internal System.Windows.Forms.Panel Panel1;
-        internal System.Windows.Forms.Panel pnlnewcolour;
-        internal System.Windows.Forms.Panel pnloldcolour;
-        internal System.Windows.Forms.Label lblobjecttocolour;
-        internal System.Windows.Forms.Label Label17;
-        internal System.Windows.Forms.Label lbloldcolourrgb;
-        internal System.Windows.Forms.Label lbloldcolourname;
-        internal System.Windows.Forms.Label Label14;
-        internal System.Windows.Forms.Panel pnlpinkcolours;
-        internal System.Windows.Forms.Panel pnlpink16;
-        internal System.Windows.Forms.Panel pnlpink12;
-        internal System.Windows.Forms.Panel pnlpink14;
-        internal System.Windows.Forms.Panel pnlpink10;
-        internal System.Windows.Forms.Panel pnlpink8;
-        internal System.Windows.Forms.Panel pnlpink4;
-        internal System.Windows.Forms.Panel pnlpink6;
-        internal System.Windows.Forms.Panel pnlpink15;
-        internal System.Windows.Forms.Panel pnlpink2;
-        internal System.Windows.Forms.Panel pnlpink13;
-        internal System.Windows.Forms.Panel pnlpink11;
-        internal System.Windows.Forms.Panel pnlpink7;
-        internal System.Windows.Forms.Panel pnlpink9;
-        internal System.Windows.Forms.Panel pnlpink5;
-        internal System.Windows.Forms.Panel pnlpink3;
-        internal System.Windows.Forms.Panel pnlpink1;
-        internal System.Windows.Forms.Label lblpinklevel;
-        internal System.Windows.Forms.Label Label23;
-        internal System.Windows.Forms.Panel pnlredcolours;
-        internal System.Windows.Forms.Panel pnlred16;
-        internal System.Windows.Forms.Panel pnlred12;
-        internal System.Windows.Forms.Panel pnlred14;
-        internal System.Windows.Forms.Panel pnlred10;
-        internal System.Windows.Forms.Panel pnlred8;
-        internal System.Windows.Forms.Panel pnlred4;
-        internal System.Windows.Forms.Panel pnlred6;
-        internal System.Windows.Forms.Panel pnlred15;
-        internal System.Windows.Forms.Panel pnlred2;
-        internal System.Windows.Forms.Panel pnlred13;
-        internal System.Windows.Forms.Panel pnlred11;
-        internal System.Windows.Forms.Panel pnlred7;
-        internal System.Windows.Forms.Panel pnlred9;
-        internal System.Windows.Forms.Panel pnlred5;
-        internal System.Windows.Forms.Panel pnlred3;
-        internal System.Windows.Forms.Panel pnlred1;
-        internal System.Windows.Forms.Label lblredlevel;
-        internal System.Windows.Forms.Label Label21;
-        internal System.Windows.Forms.Panel pnlbrowncolours;
-        internal System.Windows.Forms.Panel pnlbrown16;
-        internal System.Windows.Forms.Panel pnlbrown12;
-        internal System.Windows.Forms.Panel pnlbrown14;
-        internal System.Windows.Forms.Panel pnlbrown10;
-        internal System.Windows.Forms.Panel pnlbrown8;
-        internal System.Windows.Forms.Panel pnlbrown4;
-        internal System.Windows.Forms.Panel pnlbrown6;
-        internal System.Windows.Forms.Panel pnlbrown15;
-        internal System.Windows.Forms.Panel pnlbrown2;
-        internal System.Windows.Forms.Panel pnlbrown13;
-        internal System.Windows.Forms.Panel pnlbrown11;
-        internal System.Windows.Forms.Panel pnlbrown7;
-        internal System.Windows.Forms.Panel pnlbrown9;
-        internal System.Windows.Forms.Panel pnlbrown5;
-        internal System.Windows.Forms.Panel pnlbrown3;
-        internal System.Windows.Forms.Panel pnlbrown1;
-        internal System.Windows.Forms.Label lblbrownlevel;
-        internal System.Windows.Forms.Label Label19;
-        internal System.Windows.Forms.Panel pnlorangecolours;
-        internal System.Windows.Forms.Panel pnlorange16;
-        internal System.Windows.Forms.Panel pnlorange12;
-        internal System.Windows.Forms.Panel pnlorange14;
-        internal System.Windows.Forms.Panel pnlorange10;
-        internal System.Windows.Forms.Panel pnlorange8;
-        internal System.Windows.Forms.Panel pnlorange4;
-        internal System.Windows.Forms.Panel pnlorange6;
-        internal System.Windows.Forms.Panel pnlorange15;
-        internal System.Windows.Forms.Panel pnlorange2;
-        internal System.Windows.Forms.Panel pnlorange13;
-        internal System.Windows.Forms.Panel pnlorange11;
-        internal System.Windows.Forms.Panel pnlorange7;
-        internal System.Windows.Forms.Panel pnlorange9;
-        internal System.Windows.Forms.Panel pnlorange5;
-        internal System.Windows.Forms.Panel pnlorange3;
-        internal System.Windows.Forms.Panel pnlorange1;
-        internal System.Windows.Forms.Label lblorangelevel;
-        internal System.Windows.Forms.Label Label13;
-        internal System.Windows.Forms.Panel pnlyellowcolours;
-        internal System.Windows.Forms.Panel pnlyellow16;
-        internal System.Windows.Forms.Panel pnlyellow12;
-        internal System.Windows.Forms.Panel pnlyellow14;
-        internal System.Windows.Forms.Panel pnlyellow10;
-        internal System.Windows.Forms.Panel pnlyellow8;
-        internal System.Windows.Forms.Panel pnlyellow4;
-        internal System.Windows.Forms.Panel pnlyellow6;
-        internal System.Windows.Forms.Panel pnlyellow15;
-        internal System.Windows.Forms.Panel pnlyellow2;
-        internal System.Windows.Forms.Panel pnlyellow13;
-        internal System.Windows.Forms.Panel pnlyellow11;
-        internal System.Windows.Forms.Panel pnlyellow7;
-        internal System.Windows.Forms.Panel pnlyellow9;
-        internal System.Windows.Forms.Panel pnlyellow5;
-        internal System.Windows.Forms.Panel pnlyellow3;
-        internal System.Windows.Forms.Panel pnlyellow1;
-        internal System.Windows.Forms.Label lblyellowlevel;
-        internal System.Windows.Forms.Label Label11;
-        internal System.Windows.Forms.Panel pnlgreencolours;
-        internal System.Windows.Forms.Panel pnlgreen16;
-        internal System.Windows.Forms.Panel pnlgreen12;
-        internal System.Windows.Forms.Panel pnlgreen14;
-        internal System.Windows.Forms.Panel pnlgreen10;
-        internal System.Windows.Forms.Panel pnlgreen8;
-        internal System.Windows.Forms.Panel pnlgreen4;
-        internal System.Windows.Forms.Panel pnlgreen6;
-        internal System.Windows.Forms.Panel pnlgreen15;
-        internal System.Windows.Forms.Panel pnlgreen2;
-        internal System.Windows.Forms.Panel pnlgreen13;
-        internal System.Windows.Forms.Panel pnlgreen11;
-        internal System.Windows.Forms.Panel pnlgreen7;
-        internal System.Windows.Forms.Panel pnlgreen9;
-        internal System.Windows.Forms.Panel pnlgreen5;
-        internal System.Windows.Forms.Panel pnlgreen3;
-        internal System.Windows.Forms.Panel pnlgreen1;
-        internal System.Windows.Forms.Label lblgreenlevel;
-        internal System.Windows.Forms.Label Label9;
-        internal System.Windows.Forms.Panel pnlbluecolours;
-        internal System.Windows.Forms.Panel pnlblue16;
-        internal System.Windows.Forms.Panel pnlblue12;
-        internal System.Windows.Forms.Panel pnlblue14;
-        internal System.Windows.Forms.Panel pnlblue10;
-        internal System.Windows.Forms.Panel pnlblue8;
-        internal System.Windows.Forms.Panel pnlblue4;
-        internal System.Windows.Forms.Panel pnlblue6;
-        internal System.Windows.Forms.Panel pnlblue15;
-        internal System.Windows.Forms.Panel pnlblue2;
-        internal System.Windows.Forms.Panel pnlblue13;
-        internal System.Windows.Forms.Panel pnlblue11;
-        internal System.Windows.Forms.Panel pnlblue7;
-        internal System.Windows.Forms.Panel pnlblue9;
-        internal System.Windows.Forms.Panel pnlblue5;
-        internal System.Windows.Forms.Panel pnlblue3;
-        internal System.Windows.Forms.Panel pnlblue1;
-        internal System.Windows.Forms.Label lblbluelevel;
-        internal System.Windows.Forms.Label Label7;
-        internal System.Windows.Forms.Panel pnlpurplecolours;
-        internal System.Windows.Forms.Panel pnlpurple16;
-        internal System.Windows.Forms.Panel pnlpurple12;
-        internal System.Windows.Forms.Panel pnlpurple14;
-        internal System.Windows.Forms.Panel pnlpurple10;
-        internal System.Windows.Forms.Panel pnlpurple8;
-        internal System.Windows.Forms.Panel pnlpurple4;
-        internal System.Windows.Forms.Panel pnlpurple6;
-        internal System.Windows.Forms.Panel pnlpurple15;
-        internal System.Windows.Forms.Panel pnlpurple2;
-        internal System.Windows.Forms.Panel pnlpurple13;
-        internal System.Windows.Forms.Panel pnlpurple11;
-        internal System.Windows.Forms.Panel pnlpurple7;
-        internal System.Windows.Forms.Panel pnlpurple9;
-        internal System.Windows.Forms.Panel pnlpurple5;
-        internal System.Windows.Forms.Panel pnlpurple3;
-        internal System.Windows.Forms.Panel pnlpurple1;
-        internal System.Windows.Forms.Label lblpurplelevel;
-        internal System.Windows.Forms.Label Label5;
-        internal System.Windows.Forms.Panel pnlgraycolours;
-        internal System.Windows.Forms.Panel pnlgray16;
-        internal System.Windows.Forms.Panel pnlgray12;
-        internal System.Windows.Forms.Panel pnlgray14;
-        internal System.Windows.Forms.Panel pnlgray10;
-        internal System.Windows.Forms.Panel pnlgray8;
-        internal System.Windows.Forms.Panel pnlgray4;
-        internal System.Windows.Forms.Panel pnlgray6;
-        internal System.Windows.Forms.Panel pnlgray15;
-        internal System.Windows.Forms.Panel pnlgray2;
-        internal System.Windows.Forms.Panel pnlgray13;
-        internal System.Windows.Forms.Panel pnlgray11;
-        internal System.Windows.Forms.Panel pnlgray7;
-        internal System.Windows.Forms.Panel pnlgray9;
-        internal System.Windows.Forms.Panel pnlgray5;
-        internal System.Windows.Forms.Panel pnlgray3;
-        internal System.Windows.Forms.Panel pnlgray1;
-        internal System.Windows.Forms.Label lblgraylevel;
-        internal System.Windows.Forms.Label Label3;
-        internal System.Windows.Forms.Panel pnlpinkcustomcolour;
-        internal System.Windows.Forms.Panel pnlredcustomcolour;
-        internal System.Windows.Forms.Panel pnlbrowncustomcolour;
-        internal System.Windows.Forms.Panel pnlorangecustomcolour;
-        internal System.Windows.Forms.Panel pnlyellowcustomcolour;
-        internal System.Windows.Forms.Panel pnlgreencustomcolour;
-        internal System.Windows.Forms.Panel pnlbluecustomcolour;
-        internal System.Windows.Forms.Panel pnlpurplecustomcolour;
-        internal System.Windows.Forms.Panel pnlgraycustomcolour;
-        internal System.Windows.Forms.Panel pnlanycustomcolour;
-        internal System.Windows.Forms.Panel pnlany8;
-        internal System.Windows.Forms.Label lblnewcolourrgb;
-        internal System.Windows.Forms.Label lblnewcolourname;
-        internal System.Windows.Forms.Label Label26;
-        internal System.Windows.Forms.Label lblcustomshadetut;
-        internal System.Windows.Forms.TextBox txtcustomgrayshade;
-        internal System.Windows.Forms.Label Label6;
-        internal System.Windows.Forms.TextBox txtbluesred;
-        internal System.Windows.Forms.Label Label4;
-        internal System.Windows.Forms.TextBox txtbluesgreen;
-        internal System.Windows.Forms.Label Label2;
-        internal System.Windows.Forms.TextBox txtbluesblue;
-        internal System.Windows.Forms.Panel pnlblueoptions;
-        internal System.Windows.Forms.Panel pnlyellowoptions;
-        internal System.Windows.Forms.Label Label20;
-        internal System.Windows.Forms.TextBox txtyellowsblue;
-        internal System.Windows.Forms.TextBox txtyellowsred;
-        internal System.Windows.Forms.Label Label22;
-        internal System.Windows.Forms.Label Label24;
-        internal System.Windows.Forms.TextBox txtyellowsgreen;
-        internal System.Windows.Forms.Panel pnlgreenoptions;
-        internal System.Windows.Forms.Label Label15;
-        internal System.Windows.Forms.TextBox txtgreensred;
-        internal System.Windows.Forms.TextBox txtgreensgreen;
-        internal System.Windows.Forms.Label Label16;
-        internal System.Windows.Forms.Label Label18;
-        internal System.Windows.Forms.TextBox txtgreensblue;
-        internal System.Windows.Forms.Panel pnlpurpleoptions;
-        internal System.Windows.Forms.Label Label8;
-        internal System.Windows.Forms.TextBox txtpurplesgreen;
-        internal System.Windows.Forms.TextBox txtpurplesblue;
-        internal System.Windows.Forms.Label Label10;
-        internal System.Windows.Forms.Label Label12;
-        internal System.Windows.Forms.TextBox txtpurplesred;
-        internal System.Windows.Forms.Panel pnlpinkoptions;
-        internal System.Windows.Forms.Label Label35;
-        internal System.Windows.Forms.TextBox txtpinksgreen;
-        internal System.Windows.Forms.TextBox txtpinksred;
-        internal System.Windows.Forms.Label Label36;
-        internal System.Windows.Forms.Label Label37;
-        internal System.Windows.Forms.TextBox txtpinksblue;
-        internal System.Windows.Forms.Panel pnlredoptions;
-        internal System.Windows.Forms.Label Label32;
-        internal System.Windows.Forms.TextBox txtredsblue;
-        internal System.Windows.Forms.TextBox txtredsred;
-        internal System.Windows.Forms.Label Label33;
-        internal System.Windows.Forms.Label Label34;
-        internal System.Windows.Forms.TextBox txtredsgreen;
-        internal System.Windows.Forms.Panel pnlbrownoptions;
-        internal System.Windows.Forms.Label Label29;
-        internal System.Windows.Forms.TextBox txtbrownsblue;
-        internal System.Windows.Forms.TextBox txtbrownsred;
-        internal System.Windows.Forms.Label Label30;
-        internal System.Windows.Forms.Label Label31;
-        internal System.Windows.Forms.TextBox txtbrownsgreen;
-        internal System.Windows.Forms.Panel pnlorangeoptions;
-        internal System.Windows.Forms.Label Label25;
-        internal System.Windows.Forms.TextBox txtorangesblue;
-        internal System.Windows.Forms.TextBox txtorangesred;
-        internal System.Windows.Forms.Label Label27;
-        internal System.Windows.Forms.Label Label28;
-        internal System.Windows.Forms.TextBox txtorangesgreen;
-        internal System.Windows.Forms.Panel pnlanyoptions;
-        internal System.Windows.Forms.Label Label38;
-        internal System.Windows.Forms.TextBox txtanysgreen;
-        internal System.Windows.Forms.TextBox txtanysred;
-        internal System.Windows.Forms.Label Label39;
-        internal System.Windows.Forms.Label Label40;
-        internal System.Windows.Forms.TextBox txtanysblue;
+        internal ShiftUI.Panel pgcontents;
+        internal ShiftUI.Panel pnlanycolours;
+        internal ShiftUI.Panel pnlany16;
+        internal ShiftUI.Panel pnlany12;
+        internal ShiftUI.Panel pnlany14;
+        internal ShiftUI.Panel pnlany10;
+        internal ShiftUI.Panel pnlany4;
+        internal ShiftUI.Panel pnlany6;
+        internal ShiftUI.Panel pnlany15;
+        internal ShiftUI.Panel pnlany2;
+        internal ShiftUI.Panel pnlany13;
+        internal ShiftUI.Panel pnlany11;
+        internal ShiftUI.Panel pnlany7;
+        internal ShiftUI.Panel pnlany9;
+        internal ShiftUI.Panel pnlany5;
+        internal ShiftUI.Panel pnlany3;
+        internal ShiftUI.Panel pnlany1;
+        internal ShiftUI.Label lblanylevel;
+        internal ShiftUI.Label Label1;
+        internal ShiftUI.Panel Panel1;
+        internal ShiftUI.Panel pnlnewcolour;
+        internal ShiftUI.Panel pnloldcolour;
+        internal ShiftUI.Label lblobjecttocolour;
+        internal ShiftUI.Label Label17;
+        internal ShiftUI.Label lbloldcolourrgb;
+        internal ShiftUI.Label lbloldcolourname;
+        internal ShiftUI.Label Label14;
+        internal ShiftUI.Panel pnlpinkcolours;
+        internal ShiftUI.Panel pnlpink16;
+        internal ShiftUI.Panel pnlpink12;
+        internal ShiftUI.Panel pnlpink14;
+        internal ShiftUI.Panel pnlpink10;
+        internal ShiftUI.Panel pnlpink8;
+        internal ShiftUI.Panel pnlpink4;
+        internal ShiftUI.Panel pnlpink6;
+        internal ShiftUI.Panel pnlpink15;
+        internal ShiftUI.Panel pnlpink2;
+        internal ShiftUI.Panel pnlpink13;
+        internal ShiftUI.Panel pnlpink11;
+        internal ShiftUI.Panel pnlpink7;
+        internal ShiftUI.Panel pnlpink9;
+        internal ShiftUI.Panel pnlpink5;
+        internal ShiftUI.Panel pnlpink3;
+        internal ShiftUI.Panel pnlpink1;
+        internal ShiftUI.Label lblpinklevel;
+        internal ShiftUI.Label Label23;
+        internal ShiftUI.Panel pnlredcolours;
+        internal ShiftUI.Panel pnlred16;
+        internal ShiftUI.Panel pnlred12;
+        internal ShiftUI.Panel pnlred14;
+        internal ShiftUI.Panel pnlred10;
+        internal ShiftUI.Panel pnlred8;
+        internal ShiftUI.Panel pnlred4;
+        internal ShiftUI.Panel pnlred6;
+        internal ShiftUI.Panel pnlred15;
+        internal ShiftUI.Panel pnlred2;
+        internal ShiftUI.Panel pnlred13;
+        internal ShiftUI.Panel pnlred11;
+        internal ShiftUI.Panel pnlred7;
+        internal ShiftUI.Panel pnlred9;
+        internal ShiftUI.Panel pnlred5;
+        internal ShiftUI.Panel pnlred3;
+        internal ShiftUI.Panel pnlred1;
+        internal ShiftUI.Label lblredlevel;
+        internal ShiftUI.Label Label21;
+        internal ShiftUI.Panel pnlbrowncolours;
+        internal ShiftUI.Panel pnlbrown16;
+        internal ShiftUI.Panel pnlbrown12;
+        internal ShiftUI.Panel pnlbrown14;
+        internal ShiftUI.Panel pnlbrown10;
+        internal ShiftUI.Panel pnlbrown8;
+        internal ShiftUI.Panel pnlbrown4;
+        internal ShiftUI.Panel pnlbrown6;
+        internal ShiftUI.Panel pnlbrown15;
+        internal ShiftUI.Panel pnlbrown2;
+        internal ShiftUI.Panel pnlbrown13;
+        internal ShiftUI.Panel pnlbrown11;
+        internal ShiftUI.Panel pnlbrown7;
+        internal ShiftUI.Panel pnlbrown9;
+        internal ShiftUI.Panel pnlbrown5;
+        internal ShiftUI.Panel pnlbrown3;
+        internal ShiftUI.Panel pnlbrown1;
+        internal ShiftUI.Label lblbrownlevel;
+        internal ShiftUI.Label Label19;
+        internal ShiftUI.Panel pnlorangecolours;
+        internal ShiftUI.Panel pnlorange16;
+        internal ShiftUI.Panel pnlorange12;
+        internal ShiftUI.Panel pnlorange14;
+        internal ShiftUI.Panel pnlorange10;
+        internal ShiftUI.Panel pnlorange8;
+        internal ShiftUI.Panel pnlorange4;
+        internal ShiftUI.Panel pnlorange6;
+        internal ShiftUI.Panel pnlorange15;
+        internal ShiftUI.Panel pnlorange2;
+        internal ShiftUI.Panel pnlorange13;
+        internal ShiftUI.Panel pnlorange11;
+        internal ShiftUI.Panel pnlorange7;
+        internal ShiftUI.Panel pnlorange9;
+        internal ShiftUI.Panel pnlorange5;
+        internal ShiftUI.Panel pnlorange3;
+        internal ShiftUI.Panel pnlorange1;
+        internal ShiftUI.Label lblorangelevel;
+        internal ShiftUI.Label Label13;
+        internal ShiftUI.Panel pnlyellowcolours;
+        internal ShiftUI.Panel pnlyellow16;
+        internal ShiftUI.Panel pnlyellow12;
+        internal ShiftUI.Panel pnlyellow14;
+        internal ShiftUI.Panel pnlyellow10;
+        internal ShiftUI.Panel pnlyellow8;
+        internal ShiftUI.Panel pnlyellow4;
+        internal ShiftUI.Panel pnlyellow6;
+        internal ShiftUI.Panel pnlyellow15;
+        internal ShiftUI.Panel pnlyellow2;
+        internal ShiftUI.Panel pnlyellow13;
+        internal ShiftUI.Panel pnlyellow11;
+        internal ShiftUI.Panel pnlyellow7;
+        internal ShiftUI.Panel pnlyellow9;
+        internal ShiftUI.Panel pnlyellow5;
+        internal ShiftUI.Panel pnlyellow3;
+        internal ShiftUI.Panel pnlyellow1;
+        internal ShiftUI.Label lblyellowlevel;
+        internal ShiftUI.Label Label11;
+        internal ShiftUI.Panel pnlgreencolours;
+        internal ShiftUI.Panel pnlgreen16;
+        internal ShiftUI.Panel pnlgreen12;
+        internal ShiftUI.Panel pnlgreen14;
+        internal ShiftUI.Panel pnlgreen10;
+        internal ShiftUI.Panel pnlgreen8;
+        internal ShiftUI.Panel pnlgreen4;
+        internal ShiftUI.Panel pnlgreen6;
+        internal ShiftUI.Panel pnlgreen15;
+        internal ShiftUI.Panel pnlgreen2;
+        internal ShiftUI.Panel pnlgreen13;
+        internal ShiftUI.Panel pnlgreen11;
+        internal ShiftUI.Panel pnlgreen7;
+        internal ShiftUI.Panel pnlgreen9;
+        internal ShiftUI.Panel pnlgreen5;
+        internal ShiftUI.Panel pnlgreen3;
+        internal ShiftUI.Panel pnlgreen1;
+        internal ShiftUI.Label lblgreenlevel;
+        internal ShiftUI.Label Label9;
+        internal ShiftUI.Panel pnlbluecolours;
+        internal ShiftUI.Panel pnlblue16;
+        internal ShiftUI.Panel pnlblue12;
+        internal ShiftUI.Panel pnlblue14;
+        internal ShiftUI.Panel pnlblue10;
+        internal ShiftUI.Panel pnlblue8;
+        internal ShiftUI.Panel pnlblue4;
+        internal ShiftUI.Panel pnlblue6;
+        internal ShiftUI.Panel pnlblue15;
+        internal ShiftUI.Panel pnlblue2;
+        internal ShiftUI.Panel pnlblue13;
+        internal ShiftUI.Panel pnlblue11;
+        internal ShiftUI.Panel pnlblue7;
+        internal ShiftUI.Panel pnlblue9;
+        internal ShiftUI.Panel pnlblue5;
+        internal ShiftUI.Panel pnlblue3;
+        internal ShiftUI.Panel pnlblue1;
+        internal ShiftUI.Label lblbluelevel;
+        internal ShiftUI.Label Label7;
+        internal ShiftUI.Panel pnlpurplecolours;
+        internal ShiftUI.Panel pnlpurple16;
+        internal ShiftUI.Panel pnlpurple12;
+        internal ShiftUI.Panel pnlpurple14;
+        internal ShiftUI.Panel pnlpurple10;
+        internal ShiftUI.Panel pnlpurple8;
+        internal ShiftUI.Panel pnlpurple4;
+        internal ShiftUI.Panel pnlpurple6;
+        internal ShiftUI.Panel pnlpurple15;
+        internal ShiftUI.Panel pnlpurple2;
+        internal ShiftUI.Panel pnlpurple13;
+        internal ShiftUI.Panel pnlpurple11;
+        internal ShiftUI.Panel pnlpurple7;
+        internal ShiftUI.Panel pnlpurple9;
+        internal ShiftUI.Panel pnlpurple5;
+        internal ShiftUI.Panel pnlpurple3;
+        internal ShiftUI.Panel pnlpurple1;
+        internal ShiftUI.Label lblpurplelevel;
+        internal ShiftUI.Label Label5;
+        internal ShiftUI.Panel pnlgraycolours;
+        internal ShiftUI.Panel pnlgray16;
+        internal ShiftUI.Panel pnlgray12;
+        internal ShiftUI.Panel pnlgray14;
+        internal ShiftUI.Panel pnlgray10;
+        internal ShiftUI.Panel pnlgray8;
+        internal ShiftUI.Panel pnlgray4;
+        internal ShiftUI.Panel pnlgray6;
+        internal ShiftUI.Panel pnlgray15;
+        internal ShiftUI.Panel pnlgray2;
+        internal ShiftUI.Panel pnlgray13;
+        internal ShiftUI.Panel pnlgray11;
+        internal ShiftUI.Panel pnlgray7;
+        internal ShiftUI.Panel pnlgray9;
+        internal ShiftUI.Panel pnlgray5;
+        internal ShiftUI.Panel pnlgray3;
+        internal ShiftUI.Panel pnlgray1;
+        internal ShiftUI.Label lblgraylevel;
+        internal ShiftUI.Label Label3;
+        internal ShiftUI.Panel pnlpinkcustomcolour;
+        internal ShiftUI.Panel pnlredcustomcolour;
+        internal ShiftUI.Panel pnlbrowncustomcolour;
+        internal ShiftUI.Panel pnlorangecustomcolour;
+        internal ShiftUI.Panel pnlyellowcustomcolour;
+        internal ShiftUI.Panel pnlgreencustomcolour;
+        internal ShiftUI.Panel pnlbluecustomcolour;
+        internal ShiftUI.Panel pnlpurplecustomcolour;
+        internal ShiftUI.Panel pnlgraycustomcolour;
+        internal ShiftUI.Panel pnlanycustomcolour;
+        internal ShiftUI.Panel pnlany8;
+        internal ShiftUI.Label lblnewcolourrgb;
+        internal ShiftUI.Label lblnewcolourname;
+        internal ShiftUI.Label Label26;
+        internal ShiftUI.Label lblcustomshadetut;
+        internal ShiftUI.TextBox txtcustomgrayshade;
+        internal ShiftUI.Label Label6;
+        internal ShiftUI.TextBox txtbluesred;
+        internal ShiftUI.Label Label4;
+        internal ShiftUI.TextBox txtbluesgreen;
+        internal ShiftUI.Label Label2;
+        internal ShiftUI.TextBox txtbluesblue;
+        internal ShiftUI.Panel pnlblueoptions;
+        internal ShiftUI.Panel pnlyellowoptions;
+        internal ShiftUI.Label Label20;
+        internal ShiftUI.TextBox txtyellowsblue;
+        internal ShiftUI.TextBox txtyellowsred;
+        internal ShiftUI.Label Label22;
+        internal ShiftUI.Label Label24;
+        internal ShiftUI.TextBox txtyellowsgreen;
+        internal ShiftUI.Panel pnlgreenoptions;
+        internal ShiftUI.Label Label15;
+        internal ShiftUI.TextBox txtgreensred;
+        internal ShiftUI.TextBox txtgreensgreen;
+        internal ShiftUI.Label Label16;
+        internal ShiftUI.Label Label18;
+        internal ShiftUI.TextBox txtgreensblue;
+        internal ShiftUI.Panel pnlpurpleoptions;
+        internal ShiftUI.Label Label8;
+        internal ShiftUI.TextBox txtpurplesgreen;
+        internal ShiftUI.TextBox txtpurplesblue;
+        internal ShiftUI.Label Label10;
+        internal ShiftUI.Label Label12;
+        internal ShiftUI.TextBox txtpurplesred;
+        internal ShiftUI.Panel pnlpinkoptions;
+        internal ShiftUI.Label Label35;
+        internal ShiftUI.TextBox txtpinksgreen;
+        internal ShiftUI.TextBox txtpinksred;
+        internal ShiftUI.Label Label36;
+        internal ShiftUI.Label Label37;
+        internal ShiftUI.TextBox txtpinksblue;
+        internal ShiftUI.Panel pnlredoptions;
+        internal ShiftUI.Label Label32;
+        internal ShiftUI.TextBox txtredsblue;
+        internal ShiftUI.TextBox txtredsred;
+        internal ShiftUI.Label Label33;
+        internal ShiftUI.Label Label34;
+        internal ShiftUI.TextBox txtredsgreen;
+        internal ShiftUI.Panel pnlbrownoptions;
+        internal ShiftUI.Label Label29;
+        internal ShiftUI.TextBox txtbrownsblue;
+        internal ShiftUI.TextBox txtbrownsred;
+        internal ShiftUI.Label Label30;
+        internal ShiftUI.Label Label31;
+        internal ShiftUI.TextBox txtbrownsgreen;
+        internal ShiftUI.Panel pnlorangeoptions;
+        internal ShiftUI.Label Label25;
+        internal ShiftUI.TextBox txtorangesblue;
+        internal ShiftUI.TextBox txtorangesred;
+        internal ShiftUI.Label Label27;
+        internal ShiftUI.Label Label28;
+        internal ShiftUI.TextBox txtorangesgreen;
+        internal ShiftUI.Panel pnlanyoptions;
+        internal ShiftUI.Label Label38;
+        internal ShiftUI.TextBox txtanysgreen;
+        internal ShiftUI.TextBox txtanysred;
+        internal ShiftUI.Label Label39;
+        internal ShiftUI.Label Label40;
+        internal ShiftUI.TextBox txtanysblue;
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Dialogs/Color_Picker.cs b/source/WindowsFormsApplication1/Dialogs/Color_Picker.cs
index ea33415..ed4d836 100644
--- a/source/WindowsFormsApplication1/Dialogs/Color_Picker.cs
+++ b/source/WindowsFormsApplication1/Dialogs/Color_Picker.cs
@@ -6,7 +6,7 @@ using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
@@ -29,51 +29,51 @@ namespace ShiftOS
             setupboughtcolours();
             loadmemory();
 
-            foreach (Control ctrl in pnlanycolours.Controls)
+            foreach (Widget ctrl in pnlanycolours.Widgets)
             {
                 ctrl.MouseDown += new MouseEventHandler(this.colourselctionany);
             }
-            foreach (Control ctrl in pnlgraycolours.Controls)
+            foreach (Widget ctrl in pnlgraycolours.Widgets)
             {
                 ctrl.MouseDown += new MouseEventHandler(this.colourselctiongray);
             }
 
-            foreach (Control ctrl in pnlredcolours.Controls)
+            foreach (Widget ctrl in pnlredcolours.Widgets)
             {
                 ctrl.MouseDown += new MouseEventHandler(this.colourselctionred);
             }
 
-            foreach (Control ctrl in pnlgreencolours.Controls)
+            foreach (Widget ctrl in pnlgreencolours.Widgets)
             {
                 ctrl.MouseDown += new MouseEventHandler(this.colourselctiongreen);
             }
 
-            foreach (Control ctrl in pnlbluecolours.Controls)
+            foreach (Widget ctrl in pnlbluecolours.Widgets)
             {
                 ctrl.MouseDown += new MouseEventHandler(this.colourselctionblue);
             }
 
-            foreach (Control ctrl in pnlorangecolours.Controls)
+            foreach (Widget ctrl in pnlorangecolours.Widgets)
             {
                 ctrl.MouseDown += new MouseEventHandler(this.colourselctionorange);
             }
 
-            foreach (Control ctrl in pnlyellowcolours.Controls)
+            foreach (Widget ctrl in pnlyellowcolours.Widgets)
             {
                 ctrl.MouseDown += new MouseEventHandler(this.colourselctionyellow);
             }
 
-            foreach (Control ctrl in pnlbrowncolours.Controls)
+            foreach (Widget ctrl in pnlbrowncolours.Widgets)
             {
                 ctrl.MouseDown += new MouseEventHandler(this.colourselctionbrown);
             }
 
-            foreach (Control ctrl in pnlpurplecolours.Controls)
+            foreach (Widget ctrl in pnlpurplecolours.Widgets)
             {
                 ctrl.MouseDown += new MouseEventHandler(this.colourselctionpurple);
             }
 
-            foreach (Control ctrl in pnlpinkcolours.Controls)
+            foreach (Widget ctrl in pnlpinkcolours.Widgets)
             {
                 ctrl.MouseDown += new MouseEventHandler(this.colourselctionpink);
             }
diff --git a/source/WindowsFormsApplication1/Dialogs/Color_Picker.resx b/source/WindowsFormsApplication1/Dialogs/Color_Picker.resx
index 1af7de1..ffb4fb5 100644
--- a/source/WindowsFormsApplication1/Dialogs/Color_Picker.resx
+++ b/source/WindowsFormsApplication1/Dialogs/Color_Picker.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Dialogs/Graphic_Picker.Designer.cs b/source/WindowsFormsApplication1/Dialogs/Graphic_Picker.Designer.cs
index 5cc62ea..5544a56 100644
--- a/source/WindowsFormsApplication1/Dialogs/Graphic_Picker.Designer.cs
+++ b/source/WindowsFormsApplication1/Dialogs/Graphic_Picker.Designer.cs
@@ -24,31 +24,30 @@ namespace ShiftOS
 
         private void InitializeComponent()
         {
-            this.pgcontents = new System.Windows.Forms.Panel();
-            this.btncancel = new System.Windows.Forms.Button();
-            this.btnreset = new System.Windows.Forms.Button();
-            this.btnapply = new System.Windows.Forms.Button();
-            this.Label4 = new System.Windows.Forms.Label();
-            this.btnmousedownbrowse = new System.Windows.Forms.Button();
-            this.txtmousedownfile = new System.Windows.Forms.TextBox();
-            this.picmousedown = new System.Windows.Forms.PictureBox();
-            this.Label3 = new System.Windows.Forms.Label();
-            this.btnmouseoverbrowse = new System.Windows.Forms.Button();
-            this.txtmouseoverfile = new System.Windows.Forms.TextBox();
-            this.picmouseover = new System.Windows.Forms.PictureBox();
-            this.Label2 = new System.Windows.Forms.Label();
-            this.Label1 = new System.Windows.Forms.Label();
-            this.btnidlebrowse = new System.Windows.Forms.Button();
-            this.txtidlefile = new System.Windows.Forms.TextBox();
-            this.picidle = new System.Windows.Forms.PictureBox();
-            this.btnzoom = new System.Windows.Forms.Button();
-            this.btnstretch = new System.Windows.Forms.Button();
-            this.btncentre = new System.Windows.Forms.Button();
-            this.btntile = new System.Windows.Forms.Button();
-            this.pnlgraphicholder = new System.Windows.Forms.Panel();
-            this.picgraphic = new System.Windows.Forms.PictureBox();
-            this.lblobjecttoskin = new System.Windows.Forms.Label();
-            this.OpenFileDialog1 = new System.Windows.Forms.OpenFileDialog();
+            this.pgcontents = new ShiftUI.Panel();
+            this.btncancel = new ShiftUI.Button();
+            this.btnreset = new ShiftUI.Button();
+            this.btnapply = new ShiftUI.Button();
+            this.Label4 = new ShiftUI.Label();
+            this.btnmousedownbrowse = new ShiftUI.Button();
+            this.txtmousedownfile = new ShiftUI.TextBox();
+            this.picmousedown = new ShiftUI.PictureBox();
+            this.Label3 = new ShiftUI.Label();
+            this.btnmouseoverbrowse = new ShiftUI.Button();
+            this.txtmouseoverfile = new ShiftUI.TextBox();
+            this.picmouseover = new ShiftUI.PictureBox();
+            this.Label2 = new ShiftUI.Label();
+            this.Label1 = new ShiftUI.Label();
+            this.btnidlebrowse = new ShiftUI.Button();
+            this.txtidlefile = new ShiftUI.TextBox();
+            this.picidle = new ShiftUI.PictureBox();
+            this.btnzoom = new ShiftUI.Button();
+            this.btnstretch = new ShiftUI.Button();
+            this.btncentre = new ShiftUI.Button();
+            this.btntile = new ShiftUI.Button();
+            this.pnlgraphicholder = new ShiftUI.Panel();
+            this.picgraphic = new ShiftUI.PictureBox();
+            this.lblobjecttoskin = new ShiftUI.Label();
             this.pgcontents.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.picmousedown)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picmouseover)).BeginInit();
@@ -60,29 +59,29 @@ namespace ShiftOS
             // pgcontents
             // 
             this.pgcontents.BackColor = System.Drawing.Color.White;
-            this.pgcontents.Controls.Add(this.btncancel);
-            this.pgcontents.Controls.Add(this.btnreset);
-            this.pgcontents.Controls.Add(this.btnapply);
-            this.pgcontents.Controls.Add(this.Label4);
-            this.pgcontents.Controls.Add(this.btnmousedownbrowse);
-            this.pgcontents.Controls.Add(this.txtmousedownfile);
-            this.pgcontents.Controls.Add(this.picmousedown);
-            this.pgcontents.Controls.Add(this.Label3);
-            this.pgcontents.Controls.Add(this.btnmouseoverbrowse);
-            this.pgcontents.Controls.Add(this.txtmouseoverfile);
-            this.pgcontents.Controls.Add(this.picmouseover);
-            this.pgcontents.Controls.Add(this.Label2);
-            this.pgcontents.Controls.Add(this.Label1);
-            this.pgcontents.Controls.Add(this.btnidlebrowse);
-            this.pgcontents.Controls.Add(this.txtidlefile);
-            this.pgcontents.Controls.Add(this.picidle);
-            this.pgcontents.Controls.Add(this.btnzoom);
-            this.pgcontents.Controls.Add(this.btnstretch);
-            this.pgcontents.Controls.Add(this.btncentre);
-            this.pgcontents.Controls.Add(this.btntile);
-            this.pgcontents.Controls.Add(this.pnlgraphicholder);
-            this.pgcontents.Controls.Add(this.lblobjecttoskin);
-            this.pgcontents.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pgcontents.Widgets.Add(this.btncancel);
+            this.pgcontents.Widgets.Add(this.btnreset);
+            this.pgcontents.Widgets.Add(this.btnapply);
+            this.pgcontents.Widgets.Add(this.Label4);
+            this.pgcontents.Widgets.Add(this.btnmousedownbrowse);
+            this.pgcontents.Widgets.Add(this.txtmousedownfile);
+            this.pgcontents.Widgets.Add(this.picmousedown);
+            this.pgcontents.Widgets.Add(this.Label3);
+            this.pgcontents.Widgets.Add(this.btnmouseoverbrowse);
+            this.pgcontents.Widgets.Add(this.txtmouseoverfile);
+            this.pgcontents.Widgets.Add(this.picmouseover);
+            this.pgcontents.Widgets.Add(this.Label2);
+            this.pgcontents.Widgets.Add(this.Label1);
+            this.pgcontents.Widgets.Add(this.btnidlebrowse);
+            this.pgcontents.Widgets.Add(this.txtidlefile);
+            this.pgcontents.Widgets.Add(this.picidle);
+            this.pgcontents.Widgets.Add(this.btnzoom);
+            this.pgcontents.Widgets.Add(this.btnstretch);
+            this.pgcontents.Widgets.Add(this.btncentre);
+            this.pgcontents.Widgets.Add(this.btntile);
+            this.pgcontents.Widgets.Add(this.pnlgraphicholder);
+            this.pgcontents.Widgets.Add(this.lblobjecttoskin);
+            this.pgcontents.Dock = ShiftUI.DockStyle.Fill;
             this.pgcontents.Location = new System.Drawing.Point(0, 0);
             this.pgcontents.Name = "pgcontents";
             this.pgcontents.Size = new System.Drawing.Size(390, 594);
@@ -90,8 +89,8 @@ namespace ShiftOS
             // 
             // btncancel
             // 
-            this.btncancel.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
-            this.btncancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btncancel.Anchor = ShiftUI.AnchorStyles.Bottom;
+            this.btncancel.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btncancel.Location = new System.Drawing.Point(21, 546);
             this.btncancel.Name = "btncancel";
             this.btncancel.Size = new System.Drawing.Size(109, 32);
@@ -102,8 +101,8 @@ namespace ShiftOS
             // 
             // btnreset
             // 
-            this.btnreset.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
-            this.btnreset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnreset.Anchor = ShiftUI.AnchorStyles.Bottom;
+            this.btnreset.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnreset.Location = new System.Drawing.Point(136, 546);
             this.btnreset.Name = "btnreset";
             this.btnreset.Size = new System.Drawing.Size(109, 32);
@@ -114,8 +113,8 @@ namespace ShiftOS
             // 
             // btnapply
             // 
-            this.btnapply.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
-            this.btnapply.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnapply.Anchor = ShiftUI.AnchorStyles.Bottom;
+            this.btnapply.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnapply.Location = new System.Drawing.Point(251, 546);
             this.btnapply.Name = "btnapply";
             this.btnapply.Size = new System.Drawing.Size(118, 32);
@@ -136,7 +135,7 @@ namespace ShiftOS
             // 
             // btnmousedownbrowse
             // 
-            this.btnmousedownbrowse.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnmousedownbrowse.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnmousedownbrowse.Location = new System.Drawing.Point(295, 411);
             this.btnmousedownbrowse.Name = "btnmousedownbrowse";
             this.btnmousedownbrowse.Size = new System.Drawing.Size(73, 60);
@@ -148,7 +147,7 @@ namespace ShiftOS
             // txtmousedownfile
             // 
             this.txtmousedownfile.BackColor = System.Drawing.Color.White;
-            this.txtmousedownfile.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtmousedownfile.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtmousedownfile.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F);
             this.txtmousedownfile.Location = new System.Drawing.Point(125, 442);
             this.txtmousedownfile.Multiline = true;
@@ -156,12 +155,12 @@ namespace ShiftOS
             this.txtmousedownfile.Size = new System.Drawing.Size(163, 29);
             this.txtmousedownfile.TabIndex = 18;
             this.txtmousedownfile.Text = "None";
-            this.txtmousedownfile.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtmousedownfile.TextAlign = ShiftUI.HorizontalAlignment.Center;
             // 
             // picmousedown
             // 
-            this.picmousedown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.picmousedown.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.picmousedown.BackgroundImageLayout = ShiftUI.ImageLayout.Stretch;
+            this.picmousedown.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.picmousedown.Location = new System.Drawing.Point(19, 411);
             this.picmousedown.Name = "picmousedown";
             this.picmousedown.Size = new System.Drawing.Size(100, 60);
@@ -180,7 +179,7 @@ namespace ShiftOS
             // 
             // btnmouseoverbrowse
             // 
-            this.btnmouseoverbrowse.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnmouseoverbrowse.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnmouseoverbrowse.Location = new System.Drawing.Point(295, 336);
             this.btnmouseoverbrowse.Name = "btnmouseoverbrowse";
             this.btnmouseoverbrowse.Size = new System.Drawing.Size(73, 60);
@@ -192,7 +191,7 @@ namespace ShiftOS
             // txtmouseoverfile
             // 
             this.txtmouseoverfile.BackColor = System.Drawing.Color.White;
-            this.txtmouseoverfile.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtmouseoverfile.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtmouseoverfile.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F);
             this.txtmouseoverfile.Location = new System.Drawing.Point(125, 367);
             this.txtmouseoverfile.Multiline = true;
@@ -200,12 +199,12 @@ namespace ShiftOS
             this.txtmouseoverfile.Size = new System.Drawing.Size(163, 29);
             this.txtmouseoverfile.TabIndex = 14;
             this.txtmouseoverfile.Text = "None";
-            this.txtmouseoverfile.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtmouseoverfile.TextAlign = ShiftUI.HorizontalAlignment.Center;
             // 
             // picmouseover
             // 
-            this.picmouseover.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.picmouseover.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.picmouseover.BackgroundImageLayout = ShiftUI.ImageLayout.Stretch;
+            this.picmouseover.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.picmouseover.Location = new System.Drawing.Point(19, 336);
             this.picmouseover.Name = "picmouseover";
             this.picmouseover.Size = new System.Drawing.Size(100, 60);
@@ -234,7 +233,7 @@ namespace ShiftOS
             // 
             // btnidlebrowse
             // 
-            this.btnidlebrowse.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnidlebrowse.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnidlebrowse.Location = new System.Drawing.Point(295, 260);
             this.btnidlebrowse.Name = "btnidlebrowse";
             this.btnidlebrowse.Size = new System.Drawing.Size(73, 60);
@@ -246,7 +245,7 @@ namespace ShiftOS
             // txtidlefile
             // 
             this.txtidlefile.BackColor = System.Drawing.Color.White;
-            this.txtidlefile.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtidlefile.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtidlefile.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtidlefile.Location = new System.Drawing.Point(125, 291);
             this.txtidlefile.Multiline = true;
@@ -254,16 +253,16 @@ namespace ShiftOS
             this.txtidlefile.Size = new System.Drawing.Size(163, 29);
             this.txtidlefile.TabIndex = 9;
             this.txtidlefile.Text = "None";
-            this.txtidlefile.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtidlefile.TextAlign = ShiftUI.HorizontalAlignment.Center;
             // 
             // picidle
             // 
-            this.picidle.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.picidle.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.picidle.BackgroundImageLayout = ShiftUI.ImageLayout.Stretch;
+            this.picidle.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.picidle.Location = new System.Drawing.Point(19, 260);
             this.picidle.Name = "picidle";
             this.picidle.Size = new System.Drawing.Size(100, 60);
-            this.picidle.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+            this.picidle.SizeMode = ShiftUI.PictureBoxSizeMode.Zoom;
             this.picidle.TabIndex = 8;
             this.picidle.TabStop = false;
             // 
@@ -272,7 +271,7 @@ namespace ShiftOS
             this.btnzoom.BackgroundImage = global::ShiftOS.Properties.Resources.zoombutton;
             this.btnzoom.FlatAppearance.BorderColor = System.Drawing.Color.Black;
             this.btnzoom.FlatAppearance.BorderSize = 0;
-            this.btnzoom.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnzoom.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnzoom.Location = new System.Drawing.Point(286, 144);
             this.btnzoom.Name = "btnzoom";
             this.btnzoom.Size = new System.Drawing.Size(82, 65);
@@ -285,7 +284,7 @@ namespace ShiftOS
             this.btnstretch.BackgroundImage = global::ShiftOS.Properties.Resources.stretchbutton;
             this.btnstretch.FlatAppearance.BorderColor = System.Drawing.Color.Black;
             this.btnstretch.FlatAppearance.BorderSize = 0;
-            this.btnstretch.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnstretch.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnstretch.Location = new System.Drawing.Point(197, 144);
             this.btnstretch.Name = "btnstretch";
             this.btnstretch.Size = new System.Drawing.Size(82, 65);
@@ -298,7 +297,7 @@ namespace ShiftOS
             this.btncentre.BackgroundImage = global::ShiftOS.Properties.Resources.centrebutton;
             this.btncentre.FlatAppearance.BorderColor = System.Drawing.Color.Black;
             this.btncentre.FlatAppearance.BorderSize = 0;
-            this.btncentre.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btncentre.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btncentre.Location = new System.Drawing.Point(108, 144);
             this.btncentre.Name = "btncentre";
             this.btncentre.Size = new System.Drawing.Size(82, 65);
@@ -311,7 +310,7 @@ namespace ShiftOS
             this.btntile.BackgroundImage = global::ShiftOS.Properties.Resources.tilebutton;
             this.btntile.FlatAppearance.BorderColor = System.Drawing.Color.Black;
             this.btntile.FlatAppearance.BorderSize = 0;
-            this.btntile.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btntile.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btntile.Location = new System.Drawing.Point(19, 144);
             this.btntile.Name = "btntile";
             this.btntile.Size = new System.Drawing.Size(82, 65);
@@ -321,7 +320,7 @@ namespace ShiftOS
             // 
             // pnlgraphicholder
             // 
-            this.pnlgraphicholder.Controls.Add(this.picgraphic);
+            this.pnlgraphicholder.Widgets.Add(this.picgraphic);
             this.pnlgraphicholder.Location = new System.Drawing.Point(19, 38);
             this.pnlgraphicholder.Name = "pnlgraphicholder";
             this.pnlgraphicholder.Size = new System.Drawing.Size(350, 100);
@@ -329,7 +328,7 @@ namespace ShiftOS
             // 
             // picgraphic
             // 
-            this.picgraphic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
+            this.picgraphic.BackgroundImageLayout = ShiftUI.ImageLayout.Center;
             this.picgraphic.Location = new System.Drawing.Point(0, 0);
             this.picgraphic.Name = "picgraphic";
             this.picgraphic.Size = new System.Drawing.Size(350, 100);
@@ -346,17 +345,13 @@ namespace ShiftOS
             this.lblobjecttoskin.Text = "Close Button";
             this.lblobjecttoskin.TextAlign = System.Drawing.ContentAlignment.TopCenter;
             // 
-            // OpenFileDialog1
-            // 
-            this.OpenFileDialog1.FileName = "OpenFileDialog1";
-            // 
             // Graphic_Picker
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(390, 594);
-            this.Controls.Add(this.pgcontents);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Widgets.Add(this.pgcontents);
+            this.FormBorderStyle = ShiftUI.FormBorderStyle.None;
             this.Name = "Graphic_Picker";
             this.Text = "Graphic_Picker";
             this.TopMost = true;
@@ -371,30 +366,29 @@ namespace ShiftOS
             this.ResumeLayout(false);
 
         }
-        internal System.Windows.Forms.Panel pgcontents;
-        internal System.Windows.Forms.Button btncancel;
-        internal System.Windows.Forms.Button btnreset;
-        internal System.Windows.Forms.Button btnapply;
-        internal System.Windows.Forms.Label Label4;
-        internal System.Windows.Forms.Button btnmousedownbrowse;
-        internal System.Windows.Forms.TextBox txtmousedownfile;
-        internal System.Windows.Forms.PictureBox picmousedown;
-        internal System.Windows.Forms.Label Label3;
-        internal System.Windows.Forms.Button btnmouseoverbrowse;
-        internal System.Windows.Forms.TextBox txtmouseoverfile;
-        internal System.Windows.Forms.PictureBox picmouseover;
-        internal System.Windows.Forms.Label Label2;
-        internal System.Windows.Forms.Label Label1;
-        internal System.Windows.Forms.Button btnidlebrowse;
-        internal System.Windows.Forms.TextBox txtidlefile;
-        internal System.Windows.Forms.PictureBox picidle;
-        internal System.Windows.Forms.Button btnzoom;
-        internal System.Windows.Forms.Button btnstretch;
-        internal System.Windows.Forms.Button btncentre;
-        internal System.Windows.Forms.Button btntile;
-        internal System.Windows.Forms.Panel pnlgraphicholder;
-        internal System.Windows.Forms.PictureBox picgraphic;
-        internal System.Windows.Forms.Label lblobjecttoskin;
-        internal System.Windows.Forms.OpenFileDialog OpenFileDialog1;
+        internal ShiftUI.Panel pgcontents;
+        internal ShiftUI.Button btncancel;
+        internal ShiftUI.Button btnreset;
+        internal ShiftUI.Button btnapply;
+        internal ShiftUI.Label Label4;
+        internal ShiftUI.Button btnmousedownbrowse;
+        internal ShiftUI.TextBox txtmousedownfile;
+        internal ShiftUI.PictureBox picmousedown;
+        internal ShiftUI.Label Label3;
+        internal ShiftUI.Button btnmouseoverbrowse;
+        internal ShiftUI.TextBox txtmouseoverfile;
+        internal ShiftUI.PictureBox picmouseover;
+        internal ShiftUI.Label Label2;
+        internal ShiftUI.Label Label1;
+        internal ShiftUI.Button btnidlebrowse;
+        internal ShiftUI.TextBox txtidlefile;
+        internal ShiftUI.PictureBox picidle;
+        internal ShiftUI.Button btnzoom;
+        internal ShiftUI.Button btnstretch;
+        internal ShiftUI.Button btncentre;
+        internal ShiftUI.Button btntile;
+        internal ShiftUI.Panel pnlgraphicholder;
+        internal ShiftUI.PictureBox picgraphic;
+        internal ShiftUI.Label lblobjecttoskin;
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Dialogs/Graphic_Picker.cs b/source/WindowsFormsApplication1/Dialogs/Graphic_Picker.cs
index 1df302d..5bf6440 100644
--- a/source/WindowsFormsApplication1/Dialogs/Graphic_Picker.cs
+++ b/source/WindowsFormsApplication1/Dialogs/Graphic_Picker.cs
@@ -8,7 +8,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
diff --git a/source/WindowsFormsApplication1/Dialogs/Graphic_Picker.resx b/source/WindowsFormsApplication1/Dialogs/Graphic_Picker.resx
index 33c7f67..3036c86 100644
--- a/source/WindowsFormsApplication1/Dialogs/Graphic_Picker.resx
+++ b/source/WindowsFormsApplication1/Dialogs/Graphic_Picker.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="OpenFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
diff --git a/source/WindowsFormsApplication1/Engine/AudioResourceClient.cs b/source/WindowsFormsApplication1/Engine/AudioResourceClient.cs
index 717d43a..b1f5b16 100644
--- a/source/WindowsFormsApplication1/Engine/AudioResourceClient.cs
+++ b/source/WindowsFormsApplication1/Engine/AudioResourceClient.cs
@@ -9,7 +9,7 @@ using NAudio.Wave;
 using System.Threading;
 using Newtonsoft.Json;
 using AxWMPLib;
-using System.Windows.Forms;
+using ShiftUI;
 using WMPLib;
 
 namespace ShiftOS
@@ -119,7 +119,7 @@ namespace ShiftOS
             {
                 if (o == (int)WMPPlayState.wmppsMediaEnded)
                 {
-                    var t = new System.Windows.Forms.Timer();
+                    var t = new ShiftUI.Timer();
                     t.Interval = 1000;
                     t.Tick += (object s, EventArgs a) =>
                     {
diff --git a/source/WindowsFormsApplication1/Engine/Lua_Interp.cs b/source/WindowsFormsApplication1/Engine/Lua_Interp.cs
index 813bcd3..be37449 100644
--- a/source/WindowsFormsApplication1/Engine/Lua_Interp.cs
+++ b/source/WindowsFormsApplication1/Engine/Lua_Interp.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using DynamicLua;
 using System.IO;
 using System.Drawing;
-using System.Windows.Forms;
+using ShiftUI;
 using Gecko;
 using System.Net;
 using System.IO.Compression;
@@ -40,7 +40,7 @@ namespace ShiftOS
             RegisterCore();
             //Parse the file contents.
             var lua = File.ReadAllText(modfile);
-            var t = new System.Windows.Forms.Timer();
+            var t = new ShiftUI.Timer();
             ThisDirectory = Directory.GetParent(modfile).FullName;
             t.Interval = 50;
             t.Tick += (object se, EventArgs ea) =>
@@ -81,7 +81,7 @@ namespace ShiftOS
             mod = new DynamicLua.DynamicLua();
             //Register core functions with the interpreter
             RegisterCore();
-            var t = new System.Windows.Forms.Timer();
+            var t = new ShiftUI.Timer();
             t.Interval = 50;
             ThisDirectory = Paths.SaveRoot;
             t.Tick += (object se, EventArgs ea) =>
@@ -133,7 +133,7 @@ namespace ShiftOS
                     mod(func + $"(get_panel_from_guid(\"{c}\"))");
                 };
             });
-            mod.get_panel_from_guid = new Func<string, Control>((guid) =>
+            mod.get_panel_from_guid = new Func<string, Widget>((guid) =>
             {
                 foreach(var kv in API.DEF_PanelGUIDs)
                 {
@@ -208,7 +208,7 @@ namespace ShiftOS
             mod.get_border = new Func<Form, WindowBorder>((Form win) =>
             {
                 WindowBorder b = null;
-                foreach(Control c in win.Controls)
+                foreach(Widget c in win.Widgets)
                 {
                     if (c is WindowBorder)
                         b = c as WindowBorder;
@@ -374,7 +374,7 @@ end");
             mod.json_serialize = new Func<object, string>((objectToSerialize) => Newtonsoft.Json.JsonConvert.SerializeObject(objectToSerialize));
             mod.json_unserialize = new Func<string, object>((json_string) => Newtonsoft.Json.JsonConvert.DeserializeObject(json_string));
             mod.open_image = new Func<string, Image>((filename) => OpenImage(filename));
-            mod.list_add = new Action<Control, string>((lst, itm) =>
+            mod.list_add = new Action<Widget, string>((lst, itm) =>
             {
                 if(lst is ListBox)
                 {
@@ -382,7 +382,7 @@ end");
                     box.Items.Add(itm);
                 }
             });
-            mod.list_get_selected = new Func<Control, string>((lst) =>
+            mod.list_get_selected = new Func<Widget, string>((lst) =>
             {
                 if(lst is ListBox)
                 {
@@ -402,14 +402,14 @@ end");
                 return API.CurrentSkinImages;
             });
             mod.upgrades = new Func<string, bool>((id) => GetUpgrade(id));
-            mod.create_widget = new Func<string, string, int, int, int, int, bool, Control>((type, text, x, y, width, height, dark_mode) => ConstructControl(type, text, x, y, width, height, dark_mode));
+            mod.create_widget = new Func<string, string, int, int, int, int, bool, Widget>((type, text, x, y, width, height, dark_mode) => ConstructWidget(type, text, x, y, width, height, dark_mode));
             mod.screen_get_width = new Func<int>(() =>
             {
-                return System.Windows.Forms.Screen.PrimaryScreen.Bounds.Width;
+                return ShiftUI.Screen.PrimaryScreen.Bounds.Width;
             });
             mod.screen_get_height = new Func<int>(() =>
             {
-                return System.Windows.Forms.Screen.PrimaryScreen.Bounds.Height;
+                return ShiftUI.Screen.PrimaryScreen.Bounds.Height;
             });
             mod.create_window_borderless = new Func<int, int, int, int, Form>((x, y, width, height) => CreateForm(x, y, width, height));
 
@@ -487,7 +487,7 @@ end");
                     return null;
                 }
             });
-            mod.set_anchor = new Action<Control, string>((ctrl, anchorstyle) => SetAnchor(ctrl, anchorstyle));
+            mod.set_anchor = new Action<Widget, string>((ctrl, anchorstyle) => SetAnchor(ctrl, anchorstyle));
 
             //Standard API Functions
             mod.include = new Action<string>((filepath) => IncludeScript(filepath));
@@ -502,25 +502,25 @@ end");
             mod.update_ui = new Action(() => { API.UpdateWindows(); API.CurrentSession.SetupDesktop(); });
             mod.load_skin = new Action<string>((filepath) => Skinning.Utilities.loadsknfile(filepath));
             mod.save_to_skin_file = new Action<string>((filepath) => Skinning.Utilities.saveskintofile(filepath));
-            mod.on_click = new Action<Control, string>((ctrl, funcname) => RegClick(ctrl, funcname));
-            mod.add_widget_to_window = new Action<Form, Control>((win, ctrl) => AddCtrl(win, ctrl));
+            mod.on_click = new Action<Widget, string>((ctrl, funcname) => RegClick(ctrl, funcname));
+            mod.add_widget_to_window = new Action<Form, Widget>((win, ctrl) => AddCtrl(win, ctrl));
             mod.open_file = new Action<string, string>((filters, function) => OpenFile(filters, function));
-            mod.panel_add_widget = new Action<Control, Control>((ctrl, parent) =>
+            mod.panel_add_widget = new Action<Widget, Widget>((ctrl, parent) =>
             {
                 try {
                     var p = (Panel)parent;
-                    p.Controls.Add(ctrl);
+                    p.Widgets.Add(ctrl);
                 } catch(Exception ex)
                 {
                     Errors.Add(ex.Message);
                 }
             });
-            mod.flow_add_widget = new Action<Control, Control>((ctrl, parent) =>
+            mod.flow_add_widget = new Action<Widget, Widget>((ctrl, parent) =>
             {
                 try
                 {
                     var p = (FlowLayoutPanel)parent;
-                    p.Controls.Add(ctrl);
+                    p.Widgets.Add(ctrl);
                 }
                 catch (Exception ex)
                 {
@@ -539,13 +539,13 @@ end");
                     mod($"{function}()");
                 };
             });
-            mod.create_timer = new Func<int, System.Windows.Forms.Timer>((interval) =>
+            mod.create_timer = new Func<int, ShiftUI.Timer>((interval) =>
             {
-                var t = new System.Windows.Forms.Timer();
+                var t = new ShiftUI.Timer();
                 t.Interval = interval;
                 return t;
             });
-            mod.timer_on_tick = new Action<System.Windows.Forms.Timer, string>((tmr, func) =>
+            mod.timer_on_tick = new Action<ShiftUI.Timer, string>((tmr, func) =>
             {
                 try
                 {
@@ -559,8 +559,8 @@ end");
                     Errors.Add(ex.Message);
                 }
             });
-            mod.add_widget_to_desktop = new Action<Control>((ctrl) => AddToDesktop(ctrl));
-            mod.set_dock = new Action<Control, string>((ctrl, dstyle) =>
+            mod.add_widget_to_desktop = new Action<Widget>((ctrl) => AddToDesktop(ctrl));
+            mod.set_dock = new Action<Widget, string>((ctrl, dstyle) =>
             {
                 API.CurrentSession.Invoke(new Action(() =>
                 {
@@ -623,7 +623,7 @@ end");
             });
             mod.notify = new Action<string, string>((title, message) => API.CurrentSession.AddNotification(title, message));
             mod.download_file = new Action<string, string>((web_address, local) => DownloadFile(web_address, local));
-            mod.on_key_down = new Action<Control, string>((ctrl, action) => RegKeyDown(ctrl, action));
+            mod.on_key_down = new Action<Widget, string>((ctrl, action) => RegKeyDown(ctrl, action));
             mod.get_files = new Func<string, List<string>>((path) => GetFiles(path));
             mod.get_folders = new Func<string, List<string>>((path) => GetFolders(path));
             mod.zip = new Action<string, string>((source, destination) =>
@@ -770,9 +770,9 @@ end");
         /// <summary>
         /// Sends a keydown event to Lua when you press a key on the specified control.
         /// </summary>
-        /// <param name="ctrl">Control to assign the event to.</param>
+        /// <param name="ctrl">Widget to assign the event to.</param>
         /// <param name="action">Function to call on keydown.</param>
-        public void RegKeyDown(Control ctrl, string action)
+        public void RegKeyDown(Widget ctrl, string action)
         { /*                                                                                                                                                                                                                           */
             ctrl.KeyDown += (object s, KeyEventArgs a) =>
             {
@@ -918,7 +918,7 @@ end");
         /// </summary>
         /// <param name="ctrl">Target control</param>
         /// <param name="anchor">Anchor string (for example "top;left;bottom;right" or "top;left" or "top")</param>
-        public void SetAnchor(Control ctrl, string anchor)
+        public void SetAnchor(Widget ctrl, string anchor)
         {
             var a = AnchorStyles.None;
             var l = anchor.ToLower();
@@ -955,9 +955,9 @@ end");
         /// Add a control to the desktop.
         /// </summary>
         /// <param name="ctrl">The control to add.</param>
-        public void AddToDesktop(Control ctrl)
+        public void AddToDesktop(Widget ctrl)
         {
-            API.CurrentSession.Controls.Add(ctrl);
+            API.CurrentSession.Widgets.Add(ctrl);
         }
 
         /// <summary>
@@ -1088,17 +1088,17 @@ end");
         /// <summary>
         /// Constructs a WinForms control.
         /// </summary>
-        /// <param name="type">Control type.</param>
-        /// <param name="text">Control text.</param>
+        /// <param name="type">Widget type.</param>
+        /// <param name="text">Widget text.</param>
         /// <param name="x">X coordinate.</param>
         /// <param name="y">Y coordinate.</param>
         /// <param name="width">Width.</param>
         /// <param name="height">Height.</param>
         /// <param name="darkmode">Is it dark?</param>
         /// <returns>The control, all ShiftOS-ified for you.</returns>
-        public Control ConstructControl(string type, string text, int x, int y, int width, int height, bool darkmode)
+        public Widget ConstructWidget(string type, string text, int x, int y, int width, int height, bool darkmode)
         {
-            var ctrl = new Control();
+            var ctrl = new Widget();
             switch(type.ToLower())
             {
                 case "luatextbox":
@@ -1125,12 +1125,12 @@ end");
                         btn.BackColor = Color.White;
                         btn.ForeColor = Color.Black;
                     }
-                    ctrl = (Control)btn;
+                    ctrl = (Widget)btn;
                     break;
                 case "webview":
                     var g = new Gecko.GeckoWebBrowser();
                     g.NoDefaultContextMenu = true;
-                    ctrl = (Gecko.GeckoWebBrowser)g;
+                    ctrl = g.ToWidget();
                     //This control renders HTML, so therefore a dark theme is futile.
                     break;
                 case "menustrip":
@@ -1195,7 +1195,7 @@ end");
                     }
                     break;
                 default:
-                    ctrl = new Control();
+                    ctrl = new Widget();
                     if(darkmode)
                     {
                         ctrl.BackColor = API.CurrentSkin.titlebarcolour;
@@ -1232,24 +1232,24 @@ end");
         /// Adds a control to a window.
         /// </summary>
         /// <param name="win">Target window</param>
-        /// <param name="ctrl">Control to add.</param>
-        public void AddCtrl(Form win, Control ctrl)
+        /// <param name="ctrl">Widget to add.</param>
+        public void AddCtrl(Form win, Widget ctrl)
         {
             
             List<WindowBorder> borders = new List<WindowBorder>();
-            foreach(Control c in win.Controls)
+            foreach(Widget c in win.Widgets)
             {
                 if(c.Name == "api_brdr")
                 {
                     var b = (WindowBorder)c;
-                    b.pgcontents.Controls.Add(ctrl);
+                    b.pgcontents.Widgets.Add(ctrl);
                     ctrl.BringToFront();
                     borders.Add(b);
                 }
             }
             if(borders.Count == 0)
             {
-                win.Controls.Add(ctrl);
+                win.Widgets.Add(ctrl);
             }
             
         }
@@ -1259,7 +1259,7 @@ end");
         /// </summary>
         /// <param name="ctrl">Target control</param>
         /// <param name="funcname">Function to call.</param>
-        public void RegClick(Control ctrl, string funcname)
+        public void RegClick(Widget ctrl, string funcname)
         {
             ctrl.MouseDown += (object s, MouseEventArgs a) =>
             {
@@ -1449,5 +1449,13 @@ end");
         }
     }
 
-
+    public static class Extensions
+    {
+        public static Widget ToWidget(this System.Windows.Forms.Control ctrl)
+        {
+            string json = JsonConvert.SerializeObject(ctrl);
+            json = json.Replace("Control", "Widget");
+            return JsonConvert.DeserializeObject<Widget>(json);
+        }
+    }
 }
diff --git a/source/WindowsFormsApplication1/Engine/SaveSystem.cs b/source/WindowsFormsApplication1/Engine/SaveSystem.cs
index 9381d9b..ac8a8c9 100644
--- a/source/WindowsFormsApplication1/Engine/SaveSystem.cs
+++ b/source/WindowsFormsApplication1/Engine/SaveSystem.cs
@@ -7,7 +7,7 @@ using ShiftOS;
 using System.IO;
 using Newtonsoft.Json;
 using System.Drawing;
-using System.Windows.Forms; //Message boxes
+using ShiftUI; //Message boxes
 namespace SaveSystem
 {
     /// <summary>
@@ -172,7 +172,7 @@ namespace SaveSystem
                 {
                     if (!File.Exists(Paths.SystemDir + "_engineInfo.txt"))
                     {
-                        MessageBox.Show("WARNING: Older ShiftOS saves are no longer supported. This save will be converted to the new format, and will not be readable by either ShiftOS-Next or the legacy ShiftOS.");
+                        MessageBox.Show("WARNING: Older ShiftOS saves are no longer supported. This save will be converted to the new format, and will not be readable by either ShiftOS-Next or the legacy ShiftOS.", "ShiftOS saves");
                         NewGame();
                     }
                 }
diff --git a/source/WindowsFormsApplication1/Engine/Viruses.cs b/source/WindowsFormsApplication1/Engine/Viruses.cs
index 303da83..0f16023 100644
--- a/source/WindowsFormsApplication1/Engine/Viruses.cs
+++ b/source/WindowsFormsApplication1/Engine/Viruses.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
diff --git a/source/WindowsFormsApplication1/FinalMission/ChoiceControl.Designer.cs b/source/WindowsFormsApplication1/FinalMission/ChoiceControl.Designer.cs
index f055644..b890d55 100644
--- a/source/WindowsFormsApplication1/FinalMission/ChoiceControl.Designer.cs
+++ b/source/WindowsFormsApplication1/FinalMission/ChoiceControl.Designer.cs
@@ -1,6 +1,6 @@
 namespace ShiftOS.FinalMission
 {
-    partial class ChoiceControl
+    partial class ChoiceWidget
     {
         /// <summary> 
         /// Required designer variable.
@@ -28,13 +28,13 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.lbnumber = new System.Windows.Forms.Label();
-            this.lbdescription = new System.Windows.Forms.Label();
+            this.lbnumber = new ShiftUI.Label();
+            this.lbdescription = new ShiftUI.Label();
             this.SuspendLayout();
             // 
             // lbnumber
             // 
-            this.lbnumber.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.lbnumber.Dock = ShiftUI.DockStyle.Fill;
             this.lbnumber.Font = new System.Drawing.Font("Microsoft Sans Serif", 36F);
             this.lbnumber.Location = new System.Drawing.Point(0, 0);
             this.lbnumber.Name = "lbnumber";
@@ -46,7 +46,7 @@
             // 
             // lbdescription
             // 
-            this.lbdescription.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.lbdescription.Dock = ShiftUI.DockStyle.Bottom;
             this.lbdescription.Location = new System.Drawing.Point(0, 75);
             this.lbdescription.Name = "lbdescription";
             this.lbdescription.Size = new System.Drawing.Size(112, 27);
@@ -55,13 +55,13 @@
             this.lbdescription.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             this.lbdescription.Click += new System.EventHandler(this.lbdescription_Click);
             // 
-            // ChoiceControl
+            // ChoiceWidget
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.lbnumber);
-            this.Controls.Add(this.lbdescription);
-            this.Name = "ChoiceControl";
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
+            this.Widgets.Add(this.lbnumber);
+            this.Widgets.Add(this.lbdescription);
+            this.Name = "ChoiceWidget";
             this.Size = new System.Drawing.Size(112, 102);
             this.ResumeLayout(false);
 
@@ -69,7 +69,7 @@
 
         #endregion
 
-        private System.Windows.Forms.Label lbnumber;
-        private System.Windows.Forms.Label lbdescription;
+        private ShiftUI.Label lbnumber;
+        private ShiftUI.Label lbdescription;
     }
 }
diff --git a/source/WindowsFormsApplication1/FinalMission/ChoiceControl.cs b/source/WindowsFormsApplication1/FinalMission/ChoiceControl.cs
index 1230d6b..439fb73 100644
--- a/source/WindowsFormsApplication1/FinalMission/ChoiceControl.cs
+++ b/source/WindowsFormsApplication1/FinalMission/ChoiceControl.cs
@@ -6,14 +6,14 @@ using System.Data;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS.FinalMission
 {
     [DefaultEvent("Selected")]
-    public partial class ChoiceControl : UserControl
+    public partial class ChoiceWidget : UserWidget
     {
-        public ChoiceControl()
+        public ChoiceWidget()
         {
             InitializeComponent();
         }
diff --git a/source/WindowsFormsApplication1/FinalMission/ChoiceControl.resx b/source/WindowsFormsApplication1/FinalMission/ChoiceControl.resx
index 1af7de1..ffb4fb5 100644
--- a/source/WindowsFormsApplication1/FinalMission/ChoiceControl.resx
+++ b/source/WindowsFormsApplication1/FinalMission/ChoiceControl.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/FinalMission/ChooseYourApproach.Designer.cs b/source/WindowsFormsApplication1/FinalMission/ChooseYourApproach.Designer.cs
index 587093c..ebff523 100644
--- a/source/WindowsFormsApplication1/FinalMission/ChooseYourApproach.Designer.cs
+++ b/source/WindowsFormsApplication1/FinalMission/ChooseYourApproach.Designer.cs
@@ -29,26 +29,26 @@
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ChooseYourApproach));
-            this.pnlmain = new System.Windows.Forms.Panel();
-            this.lbdesc = new System.Windows.Forms.Label();
-            this.lbtitle = new System.Windows.Forms.Label();
-            this.pnldescription = new System.Windows.Forms.Panel();
-            this.choicedesc = new System.Windows.Forms.Label();
-            this.fldescbuttons = new System.Windows.Forms.FlowLayoutPanel();
-            this.btnbegin = new System.Windows.Forms.Button();
-            this.choicetitle = new System.Windows.Forms.Label();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.pnlchoices = new System.Windows.Forms.Panel();
-            this.choiceControl3 = new ShiftOS.FinalMission.ChoiceControl();
-            this.choiceControl2 = new ShiftOS.FinalMission.ChoiceControl();
-            this.cc_sidewithdevx = new ShiftOS.FinalMission.ChoiceControl();
-            this.pnlconfirm = new System.Windows.Forms.Panel();
-            this.lbconfirm = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
-            this.button1 = new System.Windows.Forms.Button();
-            this.button2 = new System.Windows.Forms.Button();
-            this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
-            this.button3 = new System.Windows.Forms.Button();
+            this.pnlmain = new ShiftUI.Panel();
+            this.lbdesc = new ShiftUI.Label();
+            this.lbtitle = new ShiftUI.Label();
+            this.pnldescription = new ShiftUI.Panel();
+            this.choicedesc = new ShiftUI.Label();
+            this.fldescbuttons = new ShiftUI.FlowLayoutPanel();
+            this.btnbegin = new ShiftUI.Button();
+            this.choicetitle = new ShiftUI.Label();
+            this.panel1 = new ShiftUI.Panel();
+            this.pnlchoices = new ShiftUI.Panel();
+            this.choiceWidget3 = new ShiftOS.FinalMission.ChoiceWidget();
+            this.choiceWidget2 = new ShiftOS.FinalMission.ChoiceWidget();
+            this.cc_sidewithdevx = new ShiftOS.FinalMission.ChoiceWidget();
+            this.pnlconfirm = new ShiftUI.Panel();
+            this.lbconfirm = new ShiftUI.Label();
+            this.label2 = new ShiftUI.Label();
+            this.button1 = new ShiftUI.Button();
+            this.button2 = new ShiftUI.Button();
+            this.flowLayoutPanel1 = new ShiftUI.FlowLayoutPanel();
+            this.button3 = new ShiftUI.Button();
             this.pnlmain.SuspendLayout();
             this.pnldescription.SuspendLayout();
             this.fldescbuttons.SuspendLayout();
@@ -59,10 +59,10 @@
             // 
             // pnlmain
             // 
-            this.pnlmain.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnlmain.Controls.Add(this.lbdesc);
-            this.pnlmain.Controls.Add(this.lbtitle);
+            this.pnlmain.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
+            this.pnlmain.Widgets.Add(this.lbdesc);
+            this.pnlmain.Widgets.Add(this.lbtitle);
             this.pnlmain.Location = new System.Drawing.Point(318, 27);
             this.pnlmain.Name = "pnlmain";
             this.pnlmain.Size = new System.Drawing.Size(692, 178);
@@ -70,7 +70,7 @@
             // 
             // lbdesc
             // 
-            this.lbdesc.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.lbdesc.Dock = ShiftUI.DockStyle.Fill;
             this.lbdesc.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
             this.lbdesc.Location = new System.Drawing.Point(0, 38);
             this.lbdesc.Name = "lbdesc";
@@ -82,7 +82,7 @@
             // 
             // lbtitle
             // 
-            this.lbtitle.Dock = System.Windows.Forms.DockStyle.Top;
+            this.lbtitle.Dock = ShiftUI.DockStyle.Top;
             this.lbtitle.Font = new System.Drawing.Font("Lucida Console", 19F);
             this.lbtitle.Location = new System.Drawing.Point(0, 0);
             this.lbtitle.Name = "lbtitle";
@@ -93,11 +93,11 @@
             // 
             // pnldescription
             // 
-            this.pnldescription.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnldescription.Controls.Add(this.choicedesc);
-            this.pnldescription.Controls.Add(this.fldescbuttons);
-            this.pnldescription.Controls.Add(this.choicetitle);
+            this.pnldescription.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
+            this.pnldescription.Widgets.Add(this.choicedesc);
+            this.pnldescription.Widgets.Add(this.fldescbuttons);
+            this.pnldescription.Widgets.Add(this.choicetitle);
             this.pnldescription.Location = new System.Drawing.Point(318, 357);
             this.pnldescription.Name = "pnldescription";
             this.pnldescription.Size = new System.Drawing.Size(692, 178);
@@ -105,7 +105,7 @@
             // 
             // choicedesc
             // 
-            this.choicedesc.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.choicedesc.Dock = ShiftUI.DockStyle.Fill;
             this.choicedesc.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
             this.choicedesc.Location = new System.Drawing.Point(0, 38);
             this.choicedesc.Name = "choicedesc";
@@ -118,8 +118,8 @@
             // 
             // fldescbuttons
             // 
-            this.fldescbuttons.Controls.Add(this.btnbegin);
-            this.fldescbuttons.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.fldescbuttons.Widgets.Add(this.btnbegin);
+            this.fldescbuttons.Dock = ShiftUI.DockStyle.Bottom;
             this.fldescbuttons.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
             this.fldescbuttons.Location = new System.Drawing.Point(0, 141);
             this.fldescbuttons.Name = "fldescbuttons";
@@ -129,8 +129,8 @@
             // btnbegin
             // 
             this.btnbegin.AutoSize = true;
-            this.btnbegin.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btnbegin.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnbegin.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.btnbegin.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnbegin.Location = new System.Drawing.Point(3, 3);
             this.btnbegin.Name = "btnbegin";
             this.btnbegin.Size = new System.Drawing.Size(62, 32);
@@ -141,7 +141,7 @@
             // 
             // choicetitle
             // 
-            this.choicetitle.Dock = System.Windows.Forms.DockStyle.Top;
+            this.choicetitle.Dock = ShiftUI.DockStyle.Top;
             this.choicetitle.Font = new System.Drawing.Font("Lucida Console", 19F);
             this.choicetitle.Location = new System.Drawing.Point(0, 0);
             this.choicetitle.Name = "choicetitle";
@@ -159,12 +159,12 @@
             // 
             // pnlchoices
             // 
-            this.pnlchoices.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnlchoices.Controls.Add(this.choiceControl3);
-            this.pnlchoices.Controls.Add(this.choiceControl2);
-            this.pnlchoices.Controls.Add(this.cc_sidewithdevx);
+            this.pnlchoices.Anchor = ((ShiftUI.AnchorStyles)((((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
+            this.pnlchoices.Widgets.Add(this.choiceWidget3);
+            this.pnlchoices.Widgets.Add(this.choiceWidget2);
+            this.pnlchoices.Widgets.Add(this.cc_sidewithdevx);
             this.pnlchoices.Location = new System.Drawing.Point(510, 228);
             this.pnlchoices.MaximumSize = new System.Drawing.Size(338, 91);
             this.pnlchoices.MinimumSize = new System.Drawing.Size(338, 91);
@@ -172,32 +172,32 @@
             this.pnlchoices.Size = new System.Drawing.Size(338, 91);
             this.pnlchoices.TabIndex = 3;
             // 
-            // choiceControl3
+            // choiceWidget3
             // 
-            this.choiceControl3.ChoiceName = "Destroy DevX";
-            this.choiceControl3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.choiceControl3.Location = new System.Drawing.Point(112, 0);
-            this.choiceControl3.Name = "choiceControl3";
-            this.choiceControl3.Number = 2;
-            this.choiceControl3.Size = new System.Drawing.Size(114, 91);
-            this.choiceControl3.TabIndex = 2;
-            this.choiceControl3.Selected += new System.EventHandler(this.cc_sidewithdevx_Selected);
+            this.choiceWidget3.ChoiceName = "Destroy DevX";
+            this.choiceWidget3.Dock = ShiftUI.DockStyle.Fill;
+            this.choiceWidget3.Location = new System.Drawing.Point(112, 0);
+            this.choiceWidget3.Name = "choiceWidget3";
+            this.choiceWidget3.Number = 2;
+            this.choiceWidget3.Size = new System.Drawing.Size(114, 91);
+            this.choiceWidget3.TabIndex = 2;
+            this.choiceWidget3.Selected += new System.EventHandler(this.cc_sidewithdevx_Selected);
             // 
-            // choiceControl2
+            // choiceWidget2
             // 
-            this.choiceControl2.ChoiceName = "End it all";
-            this.choiceControl2.Dock = System.Windows.Forms.DockStyle.Right;
-            this.choiceControl2.Location = new System.Drawing.Point(226, 0);
-            this.choiceControl2.Name = "choiceControl2";
-            this.choiceControl2.Number = 3;
-            this.choiceControl2.Size = new System.Drawing.Size(112, 91);
-            this.choiceControl2.TabIndex = 1;
-            this.choiceControl2.Selected += new System.EventHandler(this.cc_sidewithdevx_Selected);
+            this.choiceWidget2.ChoiceName = "End it all";
+            this.choiceWidget2.Dock = ShiftUI.DockStyle.Right;
+            this.choiceWidget2.Location = new System.Drawing.Point(226, 0);
+            this.choiceWidget2.Name = "choiceWidget2";
+            this.choiceWidget2.Number = 3;
+            this.choiceWidget2.Size = new System.Drawing.Size(112, 91);
+            this.choiceWidget2.TabIndex = 1;
+            this.choiceWidget2.Selected += new System.EventHandler(this.cc_sidewithdevx_Selected);
             // 
             // cc_sidewithdevx
             // 
             this.cc_sidewithdevx.ChoiceName = "Side with DevX";
-            this.cc_sidewithdevx.Dock = System.Windows.Forms.DockStyle.Left;
+            this.cc_sidewithdevx.Dock = ShiftUI.DockStyle.Left;
             this.cc_sidewithdevx.Location = new System.Drawing.Point(0, 0);
             this.cc_sidewithdevx.Name = "cc_sidewithdevx";
             this.cc_sidewithdevx.Number = 1;
@@ -207,12 +207,12 @@
             // 
             // pnlconfirm
             // 
-            this.pnlconfirm.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnlconfirm.Controls.Add(this.lbconfirm);
-            this.pnlconfirm.Controls.Add(this.flowLayoutPanel1);
-            this.pnlconfirm.Controls.Add(this.label2);
+            this.pnlconfirm.Anchor = ((ShiftUI.AnchorStyles)((((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
+            this.pnlconfirm.Widgets.Add(this.lbconfirm);
+            this.pnlconfirm.Widgets.Add(this.flowLayoutPanel1);
+            this.pnlconfirm.Widgets.Add(this.label2);
             this.pnlconfirm.Location = new System.Drawing.Point(56, 27);
             this.pnlconfirm.Name = "pnlconfirm";
             this.pnlconfirm.Size = new System.Drawing.Size(1220, 449);
@@ -221,7 +221,7 @@
             // 
             // lbconfirm
             // 
-            this.lbconfirm.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.lbconfirm.Dock = ShiftUI.DockStyle.Fill;
             this.lbconfirm.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
             this.lbconfirm.Location = new System.Drawing.Point(0, 38);
             this.lbconfirm.Name = "lbconfirm";
@@ -232,7 +232,7 @@
             // 
             // label2
             // 
-            this.label2.Dock = System.Windows.Forms.DockStyle.Top;
+            this.label2.Dock = ShiftUI.DockStyle.Top;
             this.label2.Font = new System.Drawing.Font("Lucida Console", 19F);
             this.label2.Location = new System.Drawing.Point(0, 0);
             this.label2.Name = "label2";
@@ -243,10 +243,10 @@
             // 
             // button1
             // 
-            this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.button1.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
             this.button1.AutoSize = true;
-            this.button1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.button1.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.button1.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.button1.Location = new System.Drawing.Point(1233, 510);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(83, 25);
@@ -257,10 +257,10 @@
             // 
             // button2
             // 
-            this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.button2.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Right)));
             this.button2.AutoSize = true;
-            this.button2.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.button2.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.button2.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.button2.Location = new System.Drawing.Point(1210, 12);
             this.button2.Name = "button2";
             this.button2.Size = new System.Drawing.Size(106, 25);
@@ -271,8 +271,8 @@
             // 
             // flowLayoutPanel1
             // 
-            this.flowLayoutPanel1.Controls.Add(this.button3);
-            this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.flowLayoutPanel1.Widgets.Add(this.button3);
+            this.flowLayoutPanel1.Dock = ShiftUI.DockStyle.Bottom;
             this.flowLayoutPanel1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
             this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 412);
             this.flowLayoutPanel1.Name = "flowLayoutPanel1";
@@ -282,8 +282,8 @@
             // button3
             // 
             this.button3.AutoSize = true;
-            this.button3.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.button3.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.button3.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.button3.Location = new System.Drawing.Point(3, 3);
             this.button3.Name = "button3";
             this.button3.Size = new System.Drawing.Size(71, 32);
@@ -295,21 +295,21 @@
             // ChooseYourApproach
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
             this.ClientSize = new System.Drawing.Size(1328, 547);
-            this.Controls.Add(this.button2);
-            this.Controls.Add(this.button1);
-            this.Controls.Add(this.pnlconfirm);
-            this.Controls.Add(this.pnlchoices);
-            this.Controls.Add(this.panel1);
-            this.Controls.Add(this.pnldescription);
-            this.Controls.Add(this.pnlmain);
+            this.Widgets.Add(this.button2);
+            this.Widgets.Add(this.button1);
+            this.Widgets.Add(this.pnlconfirm);
+            this.Widgets.Add(this.pnlchoices);
+            this.Widgets.Add(this.panel1);
+            this.Widgets.Add(this.pnldescription);
+            this.Widgets.Add(this.pnlmain);
             this.ForeColor = System.Drawing.Color.LightGreen;
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.FormBorderStyle = ShiftUI.FormBorderStyle.None;
             this.Name = "ChooseYourApproach";
             this.Text = "ChooseYourApproach";
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.onClose);
+            this.FormClosing += new ShiftUI.FormClosingEventHandler(this.onClose);
             this.Load += new System.EventHandler(this.ChooseYourApproach_Load);
             this.pnlmain.ResumeLayout(false);
             this.pnldescription.ResumeLayout(false);
@@ -326,25 +326,25 @@
 
         #endregion
 
-        private System.Windows.Forms.Panel pnlmain;
-        private System.Windows.Forms.Label lbdesc;
-        private System.Windows.Forms.Label lbtitle;
-        private System.Windows.Forms.Panel pnldescription;
-        private System.Windows.Forms.Label choicedesc;
-        private System.Windows.Forms.FlowLayoutPanel fldescbuttons;
-        private System.Windows.Forms.Button btnbegin;
-        private System.Windows.Forms.Label choicetitle;
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.Panel pnlchoices;
-        private ChoiceControl choiceControl3;
-        private ChoiceControl choiceControl2;
-        private ChoiceControl cc_sidewithdevx;
-        private System.Windows.Forms.Panel pnlconfirm;
-        private System.Windows.Forms.Label lbconfirm;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Button button1;
-        private System.Windows.Forms.Button button2;
-        private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
-        private System.Windows.Forms.Button button3;
+        private ShiftUI.Panel pnlmain;
+        private ShiftUI.Label lbdesc;
+        private ShiftUI.Label lbtitle;
+        private ShiftUI.Panel pnldescription;
+        private ShiftUI.Label choicedesc;
+        private ShiftUI.FlowLayoutPanel fldescbuttons;
+        private ShiftUI.Button btnbegin;
+        private ShiftUI.Label choicetitle;
+        private ShiftUI.Panel panel1;
+        private ShiftUI.Panel pnlchoices;
+        private ChoiceWidget choiceWidget3;
+        private ChoiceWidget choiceWidget2;
+        private ChoiceWidget cc_sidewithdevx;
+        private ShiftUI.Panel pnlconfirm;
+        private ShiftUI.Label lbconfirm;
+        private ShiftUI.Label label2;
+        private ShiftUI.Button button1;
+        private ShiftUI.Button button2;
+        private ShiftUI.FlowLayoutPanel flowLayoutPanel1;
+        private ShiftUI.Button button3;
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/FinalMission/ChooseYourApproach.cs b/source/WindowsFormsApplication1/FinalMission/ChooseYourApproach.cs
index c757699..4081c01 100644
--- a/source/WindowsFormsApplication1/FinalMission/ChooseYourApproach.cs
+++ b/source/WindowsFormsApplication1/FinalMission/ChooseYourApproach.cs
@@ -9,7 +9,7 @@ using System.Media;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 using NAudio;
 using NAudio.Wave;
 
@@ -47,7 +47,7 @@ namespace ShiftOS.FinalMission
 
         private void cc_sidewithdevx_Selected(object sender, EventArgs e)
         {
-            var cc = (ChoiceControl)sender;
+            var cc = (ChoiceWidget)sender;
             choice = cc.Number;
             SetupUI();
         }
diff --git a/source/WindowsFormsApplication1/FinalMission/ChooseYourApproach.resx b/source/WindowsFormsApplication1/FinalMission/ChooseYourApproach.resx
index 76cd2b7..54d4820 100644
--- a/source/WindowsFormsApplication1/FinalMission/ChooseYourApproach.resx
+++ b/source/WindowsFormsApplication1/FinalMission/ChooseYourApproach.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="lbdesc.Text" xml:space="preserve">
     <value>The time has come.
diff --git a/source/WindowsFormsApplication1/FinalMission/MissionGuide.Designer.cs b/source/WindowsFormsApplication1/FinalMission/MissionGuide.Designer.cs
index 45a51f1..8c0739e 100644
--- a/source/WindowsFormsApplication1/FinalMission/MissionGuide.Designer.cs
+++ b/source/WindowsFormsApplication1/FinalMission/MissionGuide.Designer.cs
@@ -29,21 +29,21 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.flbuttons = new System.Windows.Forms.FlowLayoutPanel();
-            this.btnstart = new System.Windows.Forms.Button();
-            this.tmr_setupui = new System.Windows.Forms.Timer(this.components);
-            this.lbprompt = new System.Windows.Forms.Label();
+            this.panel1 = new ShiftUI.Panel();
+            this.flbuttons = new ShiftUI.FlowLayoutPanel();
+            this.btnstart = new ShiftUI.Button();
+            this.tmr_setupui = new ShiftUI.Timer(this.components);
+            this.lbprompt = new ShiftUI.Label();
             this.panel1.SuspendLayout();
             this.flbuttons.SuspendLayout();
             this.SuspendLayout();
             // 
             // panel1
             // 
-            this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.panel1.Controls.Add(this.lbprompt);
-            this.panel1.Controls.Add(this.flbuttons);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel1.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
+            this.panel1.Widgets.Add(this.lbprompt);
+            this.panel1.Widgets.Add(this.flbuttons);
+            this.panel1.Dock = ShiftUI.DockStyle.Fill;
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
             this.panel1.Size = new System.Drawing.Size(520, 189);
@@ -51,9 +51,9 @@
             // 
             // flbuttons
             // 
-            this.flbuttons.Controls.Add(this.btnstart);
-            this.flbuttons.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.flbuttons.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft;
+            this.flbuttons.Widgets.Add(this.btnstart);
+            this.flbuttons.Dock = ShiftUI.DockStyle.Bottom;
+            this.flbuttons.FlowDirection = ShiftUI.FlowDirection.RightToLeft;
             this.flbuttons.Location = new System.Drawing.Point(0, 155);
             this.flbuttons.Name = "flbuttons";
             this.flbuttons.Size = new System.Drawing.Size(518, 32);
@@ -62,8 +62,8 @@
             // btnstart
             // 
             this.btnstart.AutoSize = true;
-            this.btnstart.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btnstart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnstart.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.btnstart.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnstart.Location = new System.Drawing.Point(435, 3);
             this.btnstart.Name = "btnstart";
             this.btnstart.Size = new System.Drawing.Size(80, 23);
@@ -79,11 +79,11 @@
             // 
             // lbprompt
             // 
-            this.lbprompt.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.lbprompt.Dock = ShiftUI.DockStyle.Fill;
             this.lbprompt.Location = new System.Drawing.Point(0, 0);
-            this.lbprompt.Margin = new System.Windows.Forms.Padding(50);
+            this.lbprompt.Margin = new ShiftUI.Padding(50);
             this.lbprompt.Name = "lbprompt";
-            this.lbprompt.Padding = new System.Windows.Forms.Padding(15);
+            this.lbprompt.Padding = new ShiftUI.Padding(15);
             this.lbprompt.Size = new System.Drawing.Size(518, 155);
             this.lbprompt.TabIndex = 1;
             this.lbprompt.Text = "label1";
@@ -91,13 +91,13 @@
             // MissionGuide
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 11F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.Black;
             this.ClientSize = new System.Drawing.Size(520, 189);
-            this.Controls.Add(this.panel1);
+            this.Widgets.Add(this.panel1);
             this.Font = new System.Drawing.Font("Lucida Console", 8.25F);
             this.ForeColor = System.Drawing.Color.LightGreen;
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.FormBorderStyle = ShiftUI.FormBorderStyle.None;
             this.Name = "MissionGuide";
             this.Text = "MissionGuide";
             this.panel1.ResumeLayout(false);
@@ -109,10 +109,10 @@
 
         #endregion
 
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.FlowLayoutPanel flbuttons;
-        private System.Windows.Forms.Button btnstart;
-        private System.Windows.Forms.Timer tmr_setupui;
-        private System.Windows.Forms.Label lbprompt;
+        private ShiftUI.Panel panel1;
+        private ShiftUI.FlowLayoutPanel flbuttons;
+        private ShiftUI.Button btnstart;
+        private ShiftUI.Timer tmr_setupui;
+        private ShiftUI.Label lbprompt;
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/FinalMission/MissionGuide.cs b/source/WindowsFormsApplication1/FinalMission/MissionGuide.cs
index 11f1f10..e7523cb 100644
--- a/source/WindowsFormsApplication1/FinalMission/MissionGuide.cs
+++ b/source/WindowsFormsApplication1/FinalMission/MissionGuide.cs
@@ -6,7 +6,7 @@ using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS.FinalMission
 {
diff --git a/source/WindowsFormsApplication1/FinalMission/MissionGuide.resx b/source/WindowsFormsApplication1/FinalMission/MissionGuide.resx
index 10f6fc7..326353a 100644
--- a/source/WindowsFormsApplication1/FinalMission/MissionGuide.resx
+++ b/source/WindowsFormsApplication1/FinalMission/MissionGuide.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="tmr_setupui.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
diff --git a/source/WindowsFormsApplication1/FinalMission/QuestViewer.Designer.cs b/source/WindowsFormsApplication1/FinalMission/QuestViewer.Designer.cs
index 89cfd19..fa70485 100644
--- a/source/WindowsFormsApplication1/FinalMission/QuestViewer.Designer.cs
+++ b/source/WindowsFormsApplication1/FinalMission/QuestViewer.Designer.cs
@@ -28,12 +28,12 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.lbobjectives = new System.Windows.Forms.ListBox();
+            this.lbobjectives = new ShiftUI.ListBox();
             this.SuspendLayout();
             // 
             // lbobjectives
             // 
-            this.lbobjectives.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.lbobjectives.Dock = ShiftUI.DockStyle.Fill;
             this.lbobjectives.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Italic);
             this.lbobjectives.FormattingEnabled = true;
             this.lbobjectives.ItemHeight = 16;
@@ -45,9 +45,9 @@
             // QuestViewer
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(389, 423);
-            this.Controls.Add(this.lbobjectives);
+            this.Widgets.Add(this.lbobjectives);
             this.Name = "QuestViewer";
             this.Text = "QuestViewer";
             this.Load += new System.EventHandler(this.QuestViewer_Load);
@@ -57,6 +57,6 @@
 
         #endregion
 
-        private System.Windows.Forms.ListBox lbobjectives;
+        private ShiftUI.ListBox lbobjectives;
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/FinalMission/QuestViewer.cs b/source/WindowsFormsApplication1/FinalMission/QuestViewer.cs
index 3b447f9..2a943e5 100644
--- a/source/WindowsFormsApplication1/FinalMission/QuestViewer.cs
+++ b/source/WindowsFormsApplication1/FinalMission/QuestViewer.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS.FinalMission
 {
@@ -22,7 +22,7 @@ namespace ShiftOS.FinalMission
         {
             SetupList();
             StartQuestCheckThread();
-            var tmr = new System.Windows.Forms.Timer();
+            var tmr = new ShiftUI.Timer();
             tmr.Interval = 500;
             tmr.Tick += (object s, EventArgs a) =>
             {
diff --git a/source/WindowsFormsApplication1/FinalMission/QuestViewer.resx b/source/WindowsFormsApplication1/FinalMission/QuestViewer.resx
index 1af7de1..ffb4fb5 100644
--- a/source/WindowsFormsApplication1/FinalMission/QuestViewer.resx
+++ b/source/WindowsFormsApplication1/FinalMission/QuestViewer.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/GameSettings.Designer.cs b/source/WindowsFormsApplication1/GameSettings.Designer.cs
index 809fbb0..02d73d0 100644
--- a/source/WindowsFormsApplication1/GameSettings.Designer.cs
+++ b/source/WindowsFormsApplication1/GameSettings.Designer.cs
@@ -28,21 +28,21 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.label1 = new System.Windows.Forms.Label();
-            this.lbgame = new System.Windows.Forms.Label();
+            this.panel1 = new ShiftUI.Panel();
+            this.label1 = new ShiftUI.Label();
+            this.lbgame = new ShiftUI.Label();
             this.pgsound = new ShiftOS.ProgressBarEX();
-            this.label2 = new System.Windows.Forms.Label();
+            this.label2 = new ShiftUI.Label();
             this.panel1.SuspendLayout();
             this.SuspendLayout();
             // 
             // panel1
             // 
-            this.panel1.Controls.Add(this.label2);
-            this.panel1.Controls.Add(this.pgsound);
-            this.panel1.Controls.Add(this.lbgame);
-            this.panel1.Controls.Add(this.label1);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel1.Widgets.Add(this.label2);
+            this.panel1.Widgets.Add(this.pgsound);
+            this.panel1.Widgets.Add(this.lbgame);
+            this.panel1.Widgets.Add(this.label1);
+            this.panel1.Dock = ShiftUI.DockStyle.Fill;
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
             this.panel1.Size = new System.Drawing.Size(665, 432);
@@ -59,7 +59,7 @@
             // 
             // lbgame
             // 
-            this.lbgame.Dock = System.Windows.Forms.DockStyle.Top;
+            this.lbgame.Dock = ShiftUI.DockStyle.Top;
             this.lbgame.Font = new System.Drawing.Font("Microsoft Sans Serif", 14F);
             this.lbgame.Location = new System.Drawing.Point(0, 0);
             this.lbgame.Name = "lbgame";
@@ -70,12 +70,12 @@
             // 
             // pgsound
             // 
-            this.pgsound.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.pgsound.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.pgsound.BackColor = System.Drawing.Color.White;
             this.pgsound.BlockSeparation = 3;
             this.pgsound.BlockWidth = 5;
-            this.pgsound.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pgsound.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.pgsound.Color = System.Drawing.Color.Black;
             this.pgsound.ForeColor = System.Drawing.Color.Gray;
             this.pgsound.Label = "Music Volume:";
@@ -91,13 +91,13 @@
             this.pgsound.Style = ShiftOS.ProgressBarEX.ProgressBarExStyle.Continuous;
             this.pgsound.TabIndex = 2;
             this.pgsound.Value = 0;
-            this.pgsound.MouseDown += new System.Windows.Forms.MouseEventHandler(this.set_music_volume);
+            this.pgsound.MouseDown += new ShiftUI.MouseEventHandler(this.set_music_volume);
             this.pgsound.MouseLeave += new System.EventHandler(this.pgsound_MouseLeave);
-            this.pgsound.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pgsound_MouseMove);
+            this.pgsound.MouseMove += new ShiftUI.MouseEventHandler(this.pgsound_MouseMove);
             // 
             // label2
             // 
-            this.label2.Dock = System.Windows.Forms.DockStyle.Top;
+            this.label2.Dock = ShiftUI.DockStyle.Top;
             this.label2.Location = new System.Drawing.Point(0, 23);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(665, 13);
@@ -108,9 +108,9 @@
             // GameSettings
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(665, 432);
-            this.Controls.Add(this.panel1);
+            this.Widgets.Add(this.panel1);
             this.Name = "GameSettings";
             this.Text = "GameSettings";
             this.panel1.ResumeLayout(false);
@@ -121,10 +121,10 @@
 
         #endregion
 
-        private System.Windows.Forms.Panel panel1;
+        private ShiftUI.Panel panel1;
         private ProgressBarEX pgsound;
-        private System.Windows.Forms.Label lbgame;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Label label2;
+        private ShiftUI.Label lbgame;
+        private ShiftUI.Label label1;
+        private ShiftUI.Label label2;
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/GameSettings.cs b/source/WindowsFormsApplication1/GameSettings.cs
index 0d3bdc0..c96dee7 100644
--- a/source/WindowsFormsApplication1/GameSettings.cs
+++ b/source/WindowsFormsApplication1/GameSettings.cs
@@ -6,7 +6,7 @@ using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
diff --git a/source/WindowsFormsApplication1/GameSettings.resx b/source/WindowsFormsApplication1/GameSettings.resx
index 1af7de1..ffb4fb5 100644
--- a/source/WindowsFormsApplication1/GameSettings.resx
+++ b/source/WindowsFormsApplication1/GameSettings.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Gameplay/HackUI.Designer.cs b/source/WindowsFormsApplication1/Gameplay/HackUI.Designer.cs
index 6db5640..7e426e0 100644
--- a/source/WindowsFormsApplication1/Gameplay/HackUI.Designer.cs
+++ b/source/WindowsFormsApplication1/Gameplay/HackUI.Designer.cs
@@ -30,61 +30,61 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HackUI));
-            this.tbui = new System.Windows.Forms.TableLayoutPanel();
-            this.pnlenemy = new System.Windows.Forms.Panel();
-            this.lbenemycompromised = new System.Windows.Forms.Label();
-            this.lbenemystats = new System.Windows.Forms.Label();
-            this.txtyourconsole = new System.Windows.Forms.TextBox();
-            this.pnlyou = new System.Windows.Forms.Panel();
-            this.lbcompromised = new System.Windows.Forms.Label();
-            this.lbstats = new System.Windows.Forms.Label();
-            this.txtenemyconsole = new System.Windows.Forms.TextBox();
-            this.btnnext = new System.Windows.Forms.Button();
-            this.pnlbuy = new System.Windows.Forms.Panel();
-            this.txthostname = new System.Windows.Forms.TextBox();
-            this.lbhostname = new System.Windows.Forms.Label();
-            this.txtgrade = new System.Windows.Forms.TextBox();
-            this.lbgrade = new System.Windows.Forms.Label();
-            this.lbmoduleinfo = new System.Windows.Forms.Label();
-            this.cmbbuyable = new System.Windows.Forms.ComboBox();
-            this.label4 = new System.Windows.Forms.Label();
-            this.btndonebuying = new System.Windows.Forms.Button();
-            this.pnldefensemanager = new System.Windows.Forms.Panel();
-            this.btnbuy = new System.Windows.Forms.Button();
-            this.label3 = new System.Windows.Forms.Label();
-            this.cmbmodules = new System.Windows.Forms.ComboBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.button1 = new System.Windows.Forms.Button();
-            this.pnlpcinfo = new System.Windows.Forms.Panel();
-            this.lbtargets = new System.Windows.Forms.Label();
-            this.btnpoweroff = new System.Windows.Forms.Button();
-            this.btnupgrade = new System.Windows.Forms.Button();
-            this.lbpcinfo = new System.Windows.Forms.Label();
-            this.lbmoduletitle = new System.Windows.Forms.Label();
-            this.btncloseinfo = new System.Windows.Forms.Button();
-            this.flcontrols = new System.Windows.Forms.FlowLayoutPanel();
-            this.btnaddmodule = new System.Windows.Forms.Button();
-            this.lbcodepoints = new System.Windows.Forms.Label();
-            this.btntogglemusic = new System.Windows.Forms.Button();
-            this.lbsong = new System.Windows.Forms.Label();
-            this.panel2 = new System.Windows.Forms.Panel();
-            this.pgpong = new System.Windows.Forms.Panel();
-            this.lblcountdown = new System.Windows.Forms.Label();
-            this.ball = new System.Windows.Forms.Panel();
-            this.paddleHuman = new System.Windows.Forms.PictureBox();
-            this.paddleComputer = new System.Windows.Forms.Panel();
-            this.lbllevelandtime = new System.Windows.Forms.Label();
-            this.lblstatsY = new System.Windows.Forms.Label();
-            this.lblstatsX = new System.Windows.Forms.Label();
-            this.pnltutorial = new System.Windows.Forms.Panel();
-            this.lbtutorial = new System.Windows.Forms.Label();
-            this.tmrplayerhealthdetect = new System.Windows.Forms.Timer(this.components);
-            this.tmrenemyhealthdetect = new System.Windows.Forms.Timer(this.components);
-            this.tmrredraw = new System.Windows.Forms.Timer(this.components);
-            this.tmrvisualizer = new System.Windows.Forms.Timer(this.components);
-            this.pongGameTimer = new System.Windows.Forms.Timer(this.components);
-            this.counter = new System.Windows.Forms.Timer(this.components);
-            this.tmrcountdown = new System.Windows.Forms.Timer(this.components);
+            this.tbui = new ShiftUI.TableLayoutPanel();
+            this.pnlenemy = new ShiftUI.Panel();
+            this.lbenemycompromised = new ShiftUI.Label();
+            this.lbenemystats = new ShiftUI.Label();
+            this.txtyourconsole = new ShiftUI.TextBox();
+            this.pnlyou = new ShiftUI.Panel();
+            this.lbcompromised = new ShiftUI.Label();
+            this.lbstats = new ShiftUI.Label();
+            this.txtenemyconsole = new ShiftUI.TextBox();
+            this.btnnext = new ShiftUI.Button();
+            this.pnlbuy = new ShiftUI.Panel();
+            this.txthostname = new ShiftUI.TextBox();
+            this.lbhostname = new ShiftUI.Label();
+            this.txtgrade = new ShiftUI.TextBox();
+            this.lbgrade = new ShiftUI.Label();
+            this.lbmoduleinfo = new ShiftUI.Label();
+            this.cmbbuyable = new ShiftUI.ComboBox();
+            this.label4 = new ShiftUI.Label();
+            this.btndonebuying = new ShiftUI.Button();
+            this.pnldefensemanager = new ShiftUI.Panel();
+            this.btnbuy = new ShiftUI.Button();
+            this.label3 = new ShiftUI.Label();
+            this.cmbmodules = new ShiftUI.ComboBox();
+            this.label1 = new ShiftUI.Label();
+            this.button1 = new ShiftUI.Button();
+            this.pnlpcinfo = new ShiftUI.Panel();
+            this.lbtargets = new ShiftUI.Label();
+            this.btnpoweroff = new ShiftUI.Button();
+            this.btnupgrade = new ShiftUI.Button();
+            this.lbpcinfo = new ShiftUI.Label();
+            this.lbmoduletitle = new ShiftUI.Label();
+            this.btncloseinfo = new ShiftUI.Button();
+            this.flcontrols = new ShiftUI.FlowLayoutPanel();
+            this.btnaddmodule = new ShiftUI.Button();
+            this.lbcodepoints = new ShiftUI.Label();
+            this.btntogglemusic = new ShiftUI.Button();
+            this.lbsong = new ShiftUI.Label();
+            this.panel2 = new ShiftUI.Panel();
+            this.pgpong = new ShiftUI.Panel();
+            this.lblcountdown = new ShiftUI.Label();
+            this.ball = new ShiftUI.Panel();
+            this.paddleHuman = new ShiftUI.PictureBox();
+            this.paddleComputer = new ShiftUI.Panel();
+            this.lbllevelandtime = new ShiftUI.Label();
+            this.lblstatsY = new ShiftUI.Label();
+            this.lblstatsX = new ShiftUI.Label();
+            this.pnltutorial = new ShiftUI.Panel();
+            this.lbtutorial = new ShiftUI.Label();
+            this.tmrplayerhealthdetect = new ShiftUI.Timer(this.components);
+            this.tmrenemyhealthdetect = new ShiftUI.Timer(this.components);
+            this.tmrredraw = new ShiftUI.Timer(this.components);
+            this.tmrvisualizer = new ShiftUI.Timer(this.components);
+            this.pongGameTimer = new ShiftUI.Timer(this.components);
+            this.counter = new ShiftUI.Timer(this.components);
+            this.tmrcountdown = new ShiftUI.Timer(this.components);
             this.tbui.SuspendLayout();
             this.pnlenemy.SuspendLayout();
             this.pnlyou.SuspendLayout();
@@ -100,29 +100,29 @@
             // 
             // tbui
             // 
-            this.tbui.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.Single;
+            this.tbui.CellBorderStyle = ShiftUI.TableLayoutPanelCellBorderStyle.Single;
             this.tbui.ColumnCount = 2;
-            this.tbui.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tbui.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tbui.Controls.Add(this.pnlenemy, 1, 1);
-            this.tbui.Controls.Add(this.txtyourconsole, 0, 1);
-            this.tbui.Controls.Add(this.pnlyou, 0, 0);
-            this.tbui.Controls.Add(this.txtenemyconsole, 1, 0);
-            this.tbui.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tbui.ColumnStyles.Add(new ShiftUI.ColumnStyle(ShiftUI.SizeType.Percent, 50F));
+            this.tbui.ColumnStyles.Add(new ShiftUI.ColumnStyle(ShiftUI.SizeType.Percent, 50F));
+            this.tbui.Widgets.Add(this.pnlenemy, 1, 1);
+            this.tbui.Widgets.Add(this.txtyourconsole, 0, 1);
+            this.tbui.Widgets.Add(this.pnlyou, 0, 0);
+            this.tbui.Widgets.Add(this.txtenemyconsole, 1, 0);
+            this.tbui.Dock = ShiftUI.DockStyle.Fill;
             this.tbui.Location = new System.Drawing.Point(0, 0);
             this.tbui.Name = "tbui";
             this.tbui.RowCount = 2;
-            this.tbui.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tbui.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
+            this.tbui.RowStyles.Add(new ShiftUI.RowStyle(ShiftUI.SizeType.Percent, 50F));
+            this.tbui.RowStyles.Add(new ShiftUI.RowStyle(ShiftUI.SizeType.Percent, 50F));
             this.tbui.Size = new System.Drawing.Size(1339, 710);
             this.tbui.TabIndex = 0;
             // 
             // pnlenemy
             // 
             this.pnlenemy.BackColor = System.Drawing.Color.Black;
-            this.pnlenemy.Controls.Add(this.lbenemycompromised);
-            this.pnlenemy.Controls.Add(this.lbenemystats);
-            this.pnlenemy.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pnlenemy.Widgets.Add(this.lbenemycompromised);
+            this.pnlenemy.Widgets.Add(this.lbenemystats);
+            this.pnlenemy.Dock = ShiftUI.DockStyle.Fill;
             this.pnlenemy.Font = new System.Drawing.Font("Lucida Console", 8.25F);
             this.pnlenemy.ForeColor = System.Drawing.Color.White;
             this.pnlenemy.Location = new System.Drawing.Point(673, 358);
@@ -152,8 +152,8 @@
             // txtyourconsole
             // 
             this.txtyourconsole.BackColor = System.Drawing.Color.Black;
-            this.txtyourconsole.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            this.txtyourconsole.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.txtyourconsole.BorderStyle = ShiftUI.BorderStyle.None;
+            this.txtyourconsole.Dock = ShiftUI.DockStyle.Fill;
             this.txtyourconsole.ForeColor = System.Drawing.Color.LightGreen;
             this.txtyourconsole.Location = new System.Drawing.Point(4, 358);
             this.txtyourconsole.Multiline = true;
@@ -164,16 +164,16 @@
             // pnlyou
             // 
             this.pnlyou.BackColor = System.Drawing.Color.Black;
-            this.pnlyou.Controls.Add(this.lbcompromised);
-            this.pnlyou.Controls.Add(this.lbstats);
-            this.pnlyou.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pnlyou.Widgets.Add(this.lbcompromised);
+            this.pnlyou.Widgets.Add(this.lbstats);
+            this.pnlyou.Dock = ShiftUI.DockStyle.Fill;
             this.pnlyou.Font = new System.Drawing.Font("Lucida Console", 8.25F);
             this.pnlyou.ForeColor = System.Drawing.Color.White;
             this.pnlyou.Location = new System.Drawing.Point(4, 4);
             this.pnlyou.Name = "pnlyou";
             this.pnlyou.Size = new System.Drawing.Size(662, 347);
             this.pnlyou.TabIndex = 1;
-            this.pnlyou.MouseDown += new System.Windows.Forms.MouseEventHandler(this.playfield_MouseDown);
+            this.pnlyou.MouseDown += new ShiftUI.MouseEventHandler(this.playfield_MouseDown);
             // 
             // lbcompromised
             // 
@@ -197,8 +197,8 @@
             // txtenemyconsole
             // 
             this.txtenemyconsole.BackColor = System.Drawing.Color.Black;
-            this.txtenemyconsole.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            this.txtenemyconsole.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.txtenemyconsole.BorderStyle = ShiftUI.BorderStyle.None;
+            this.txtenemyconsole.Dock = ShiftUI.DockStyle.Fill;
             this.txtenemyconsole.ForeColor = System.Drawing.Color.LightGreen;
             this.txtenemyconsole.Location = new System.Drawing.Point(673, 4);
             this.txtenemyconsole.Multiline = true;
@@ -208,10 +208,10 @@
             // 
             // btnnext
             // 
-            this.btnnext.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnnext.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Right)));
             this.btnnext.AutoSize = true;
-            this.btnnext.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btnnext.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnnext.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.btnnext.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnnext.Location = new System.Drawing.Point(294, 161);
             this.btnnext.Name = "btnnext";
             this.btnnext.Size = new System.Drawing.Size(66, 23);
@@ -223,15 +223,15 @@
             // 
             // pnlbuy
             // 
-            this.pnlbuy.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.pnlbuy.Controls.Add(this.txthostname);
-            this.pnlbuy.Controls.Add(this.lbhostname);
-            this.pnlbuy.Controls.Add(this.txtgrade);
-            this.pnlbuy.Controls.Add(this.lbgrade);
-            this.pnlbuy.Controls.Add(this.lbmoduleinfo);
-            this.pnlbuy.Controls.Add(this.cmbbuyable);
-            this.pnlbuy.Controls.Add(this.label4);
-            this.pnlbuy.Controls.Add(this.btndonebuying);
+            this.pnlbuy.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left)));
+            this.pnlbuy.Widgets.Add(this.txthostname);
+            this.pnlbuy.Widgets.Add(this.lbhostname);
+            this.pnlbuy.Widgets.Add(this.txtgrade);
+            this.pnlbuy.Widgets.Add(this.lbgrade);
+            this.pnlbuy.Widgets.Add(this.lbmoduleinfo);
+            this.pnlbuy.Widgets.Add(this.cmbbuyable);
+            this.pnlbuy.Widgets.Add(this.label4);
+            this.pnlbuy.Widgets.Add(this.btndonebuying);
             this.pnlbuy.Location = new System.Drawing.Point(7, 405);
             this.pnlbuy.Name = "pnlbuy";
             this.pnlbuy.Size = new System.Drawing.Size(382, 299);
@@ -241,7 +241,7 @@
             // txthostname
             // 
             this.txthostname.BackColor = System.Drawing.Color.Black;
-            this.txthostname.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txthostname.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txthostname.ForeColor = System.Drawing.Color.White;
             this.txthostname.Location = new System.Drawing.Point(186, 236);
             this.txthostname.Name = "txthostname";
@@ -260,7 +260,7 @@
             // txtgrade
             // 
             this.txtgrade.BackColor = System.Drawing.Color.Black;
-            this.txtgrade.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtgrade.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
             this.txtgrade.ForeColor = System.Drawing.Color.White;
             this.txtgrade.Location = new System.Drawing.Point(65, 236);
             this.txtgrade.Name = "txtgrade";
@@ -288,8 +288,8 @@
             // cmbbuyable
             // 
             this.cmbbuyable.BackColor = System.Drawing.Color.Black;
-            this.cmbbuyable.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbbuyable.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.cmbbuyable.DropDownStyle = ShiftUI.ComboBoxStyle.DropDownList;
+            this.cmbbuyable.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.cmbbuyable.ForeColor = System.Drawing.Color.White;
             this.cmbbuyable.FormattingEnabled = true;
             this.cmbbuyable.Location = new System.Drawing.Point(12, 38);
@@ -309,10 +309,10 @@
             // 
             // btndonebuying
             // 
-            this.btndonebuying.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btndonebuying.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
             this.btndonebuying.AutoSize = true;
-            this.btndonebuying.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btndonebuying.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btndonebuying.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.btndonebuying.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btndonebuying.Location = new System.Drawing.Point(341, 273);
             this.btndonebuying.Name = "btndonebuying";
             this.btndonebuying.Size = new System.Drawing.Size(38, 23);
@@ -323,12 +323,12 @@
             // 
             // pnldefensemanager
             // 
-            this.pnldefensemanager.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.pnldefensemanager.Controls.Add(this.btnbuy);
-            this.pnldefensemanager.Controls.Add(this.label3);
-            this.pnldefensemanager.Controls.Add(this.cmbmodules);
-            this.pnldefensemanager.Controls.Add(this.label1);
-            this.pnldefensemanager.Controls.Add(this.button1);
+            this.pnldefensemanager.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left)));
+            this.pnldefensemanager.Widgets.Add(this.btnbuy);
+            this.pnldefensemanager.Widgets.Add(this.label3);
+            this.pnldefensemanager.Widgets.Add(this.cmbmodules);
+            this.pnldefensemanager.Widgets.Add(this.label1);
+            this.pnldefensemanager.Widgets.Add(this.button1);
             this.pnldefensemanager.Location = new System.Drawing.Point(395, 424);
             this.pnldefensemanager.Name = "pnldefensemanager";
             this.pnldefensemanager.Size = new System.Drawing.Size(382, 280);
@@ -337,10 +337,10 @@
             // 
             // btnbuy
             // 
-            this.btnbuy.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnbuy.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
             this.btnbuy.AutoSize = true;
-            this.btnbuy.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btnbuy.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnbuy.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.btnbuy.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnbuy.Location = new System.Drawing.Point(199, 254);
             this.btnbuy.Name = "btnbuy";
             this.btnbuy.Size = new System.Drawing.Size(122, 23);
@@ -360,8 +360,8 @@
             // cmbmodules
             // 
             this.cmbmodules.BackColor = System.Drawing.Color.Black;
-            this.cmbmodules.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbmodules.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.cmbmodules.DropDownStyle = ShiftUI.ComboBoxStyle.DropDownList;
+            this.cmbmodules.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.cmbmodules.ForeColor = System.Drawing.Color.White;
             this.cmbmodules.FormattingEnabled = true;
             this.cmbmodules.Location = new System.Drawing.Point(12, 38);
@@ -380,10 +380,10 @@
             // 
             // button1
             // 
-            this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.button1.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
             this.button1.AutoSize = true;
-            this.button1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.button1.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.button1.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.button1.Location = new System.Drawing.Point(327, 254);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(52, 23);
@@ -394,13 +394,13 @@
             // 
             // pnlpcinfo
             // 
-            this.pnlpcinfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnlpcinfo.Controls.Add(this.lbtargets);
-            this.pnlpcinfo.Controls.Add(this.btnpoweroff);
-            this.pnlpcinfo.Controls.Add(this.btnupgrade);
-            this.pnlpcinfo.Controls.Add(this.lbpcinfo);
-            this.pnlpcinfo.Controls.Add(this.lbmoduletitle);
-            this.pnlpcinfo.Controls.Add(this.btncloseinfo);
+            this.pnlpcinfo.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
+            this.pnlpcinfo.Widgets.Add(this.lbtargets);
+            this.pnlpcinfo.Widgets.Add(this.btnpoweroff);
+            this.pnlpcinfo.Widgets.Add(this.btnupgrade);
+            this.pnlpcinfo.Widgets.Add(this.lbpcinfo);
+            this.pnlpcinfo.Widgets.Add(this.lbmoduletitle);
+            this.pnlpcinfo.Widgets.Add(this.btncloseinfo);
             this.pnlpcinfo.Location = new System.Drawing.Point(783, 424);
             this.pnlpcinfo.Name = "pnlpcinfo";
             this.pnlpcinfo.Size = new System.Drawing.Size(382, 280);
@@ -417,10 +417,10 @@
             // 
             // btnpoweroff
             // 
-            this.btnpoweroff.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnpoweroff.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
             this.btnpoweroff.AutoSize = true;
-            this.btnpoweroff.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btnpoweroff.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnpoweroff.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.btnpoweroff.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnpoweroff.Location = new System.Drawing.Point(85, 254);
             this.btnpoweroff.Name = "btnpoweroff";
             this.btnpoweroff.Size = new System.Drawing.Size(80, 23);
@@ -431,10 +431,10 @@
             // 
             // btnupgrade
             // 
-            this.btnupgrade.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnupgrade.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
             this.btnupgrade.AutoSize = true;
-            this.btnupgrade.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btnupgrade.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnupgrade.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.btnupgrade.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnupgrade.Location = new System.Drawing.Point(171, 254);
             this.btnupgrade.Name = "btnupgrade";
             this.btnupgrade.Size = new System.Drawing.Size(150, 23);
@@ -462,10 +462,10 @@
             // 
             // btncloseinfo
             // 
-            this.btncloseinfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btncloseinfo.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
             this.btncloseinfo.AutoSize = true;
-            this.btncloseinfo.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btncloseinfo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btncloseinfo.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.btncloseinfo.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btncloseinfo.Location = new System.Drawing.Point(327, 254);
             this.btncloseinfo.Name = "btncloseinfo";
             this.btncloseinfo.Size = new System.Drawing.Size(52, 23);
@@ -476,11 +476,11 @@
             // 
             // flcontrols
             // 
-            this.flcontrols.Controls.Add(this.btnaddmodule);
-            this.flcontrols.Controls.Add(this.lbcodepoints);
-            this.flcontrols.Controls.Add(this.btntogglemusic);
-            this.flcontrols.Controls.Add(this.lbsong);
-            this.flcontrols.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.flcontrols.Widgets.Add(this.btnaddmodule);
+            this.flcontrols.Widgets.Add(this.lbcodepoints);
+            this.flcontrols.Widgets.Add(this.btntogglemusic);
+            this.flcontrols.Widgets.Add(this.lbsong);
+            this.flcontrols.Dock = ShiftUI.DockStyle.Bottom;
             this.flcontrols.Location = new System.Drawing.Point(0, 710);
             this.flcontrols.Name = "flcontrols";
             this.flcontrols.Size = new System.Drawing.Size(1339, 31);
@@ -489,8 +489,8 @@
             // btnaddmodule
             // 
             this.btnaddmodule.AutoSize = true;
-            this.btnaddmodule.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btnaddmodule.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnaddmodule.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.btnaddmodule.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnaddmodule.Location = new System.Drawing.Point(3, 3);
             this.btnaddmodule.Name = "btnaddmodule";
             this.btnaddmodule.Size = new System.Drawing.Size(87, 23);
@@ -511,8 +511,8 @@
             // btntogglemusic
             // 
             this.btntogglemusic.AutoSize = true;
-            this.btntogglemusic.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btntogglemusic.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btntogglemusic.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.btntogglemusic.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btntogglemusic.Location = new System.Drawing.Point(229, 3);
             this.btntogglemusic.Name = "btntogglemusic";
             this.btntogglemusic.Size = new System.Drawing.Size(101, 23);
@@ -532,14 +532,14 @@
             // 
             // panel2
             // 
-            this.panel2.Controls.Add(this.pgpong);
-            this.panel2.Controls.Add(this.pnltutorial);
-            this.panel2.Controls.Add(this.pnlbuy);
-            this.panel2.Controls.Add(this.pnlpcinfo);
-            this.panel2.Controls.Add(this.pnldefensemanager);
-            this.panel2.Controls.Add(this.tbui);
-            this.panel2.Controls.Add(this.flcontrols);
-            this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel2.Widgets.Add(this.pgpong);
+            this.panel2.Widgets.Add(this.pnltutorial);
+            this.panel2.Widgets.Add(this.pnlbuy);
+            this.panel2.Widgets.Add(this.pnlpcinfo);
+            this.panel2.Widgets.Add(this.pnldefensemanager);
+            this.panel2.Widgets.Add(this.tbui);
+            this.panel2.Widgets.Add(this.flcontrols);
+            this.panel2.Dock = ShiftUI.DockStyle.Fill;
             this.panel2.Location = new System.Drawing.Point(0, 0);
             this.panel2.Name = "panel2";
             this.panel2.Size = new System.Drawing.Size(1339, 741);
@@ -548,20 +548,20 @@
             // pgpong
             // 
             this.pgpong.BackColor = System.Drawing.Color.Black;
-            this.pgpong.Controls.Add(this.lblcountdown);
-            this.pgpong.Controls.Add(this.ball);
-            this.pgpong.Controls.Add(this.paddleHuman);
-            this.pgpong.Controls.Add(this.paddleComputer);
-            this.pgpong.Controls.Add(this.lbllevelandtime);
-            this.pgpong.Controls.Add(this.lblstatsY);
-            this.pgpong.Controls.Add(this.lblstatsX);
+            this.pgpong.Widgets.Add(this.lblcountdown);
+            this.pgpong.Widgets.Add(this.ball);
+            this.pgpong.Widgets.Add(this.paddleHuman);
+            this.pgpong.Widgets.Add(this.paddleComputer);
+            this.pgpong.Widgets.Add(this.lbllevelandtime);
+            this.pgpong.Widgets.Add(this.lblstatsY);
+            this.pgpong.Widgets.Add(this.lblstatsX);
             this.pgpong.ForeColor = System.Drawing.Color.White;
             this.pgpong.Location = new System.Drawing.Point(0, 0);
             this.pgpong.Name = "pgpong";
             this.pgpong.Size = new System.Drawing.Size(700, 400);
             this.pgpong.TabIndex = 22;
             this.pgpong.Visible = false;
-            this.pgpong.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pongMain_MouseMove);
+            this.pgpong.MouseMove += new ShiftUI.MouseEventHandler(this.pongMain_MouseMove);
             // 
             // lblcountdown
             // 
@@ -593,8 +593,8 @@
             // 
             // paddleComputer
             // 
-            this.paddleComputer.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.paddleComputer.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Right)));
             this.paddleComputer.BackColor = System.Drawing.Color.Gray;
             this.paddleComputer.Location = new System.Drawing.Point(666, 134);
             this.paddleComputer.MaximumSize = new System.Drawing.Size(20, 100);
@@ -604,7 +604,7 @@
             // 
             // lbllevelandtime
             // 
-            this.lbllevelandtime.Dock = System.Windows.Forms.DockStyle.Top;
+            this.lbllevelandtime.Dock = ShiftUI.DockStyle.Top;
             this.lbllevelandtime.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.lbllevelandtime.Location = new System.Drawing.Point(0, 0);
             this.lbllevelandtime.Name = "lbllevelandtime";
@@ -615,7 +615,7 @@
             // 
             // lblstatsY
             // 
-            this.lblstatsY.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.lblstatsY.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
             this.lblstatsY.Font = new System.Drawing.Font("Georgia", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.lblstatsY.Location = new System.Drawing.Point(542, 356);
             this.lblstatsY.Name = "lblstatsY";
@@ -626,7 +626,7 @@
             // 
             // lblstatsX
             // 
-            this.lblstatsX.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.lblstatsX.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left)));
             this.lblstatsX.Font = new System.Drawing.Font("Georgia", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.lblstatsX.Location = new System.Drawing.Point(3, 356);
             this.lblstatsX.Name = "lblstatsX";
@@ -637,8 +637,8 @@
             // 
             // pnltutorial
             // 
-            this.pnltutorial.Controls.Add(this.btnnext);
-            this.pnltutorial.Controls.Add(this.lbtutorial);
+            this.pnltutorial.Widgets.Add(this.btnnext);
+            this.pnltutorial.Widgets.Add(this.lbtutorial);
             this.pnltutorial.Location = new System.Drawing.Point(174, 161);
             this.pnltutorial.Name = "pnltutorial";
             this.pnltutorial.Size = new System.Drawing.Size(363, 187);
@@ -647,7 +647,7 @@
             // 
             // lbtutorial
             // 
-            this.lbtutorial.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.lbtutorial.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Right)));
             this.lbtutorial.Location = new System.Drawing.Point(-2, 50);
             this.lbtutorial.Name = "lbtutorial";
             this.lbtutorial.Size = new System.Drawing.Size(367, 86);
@@ -690,16 +690,16 @@
             // HackUI
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 11F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.Black;
             this.ClientSize = new System.Drawing.Size(1339, 741);
-            this.Controls.Add(this.panel2);
+            this.Widgets.Add(this.panel2);
             this.Font = new System.Drawing.Font("Lucida Console", 8.25F);
             this.ForeColor = System.Drawing.Color.LightGreen;
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.FormBorderStyle = ShiftUI.FormBorderStyle.None;
             this.Name = "HackUI";
             this.Text = "HackUI";
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.this_Closing);
+            this.FormClosing += new ShiftUI.FormClosingEventHandler(this.this_Closing);
             this.Load += new System.EventHandler(this.HackUI_Load);
             this.tbui.ResumeLayout(false);
             this.tbui.PerformLayout();
@@ -726,60 +726,60 @@
 
         #endregion
 
-        private System.Windows.Forms.TableLayoutPanel tbui;
-        private System.Windows.Forms.Panel pnlyou;
-        private System.Windows.Forms.Panel pnlbuy;
-        private System.Windows.Forms.TextBox txthostname;
-        private System.Windows.Forms.Label lbhostname;
-        private System.Windows.Forms.TextBox txtgrade;
-        private System.Windows.Forms.Label lbgrade;
-        private System.Windows.Forms.Label lbmoduleinfo;
-        private System.Windows.Forms.ComboBox cmbbuyable;
-        private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.Button btndonebuying;
-        private System.Windows.Forms.Panel pnldefensemanager;
-        private System.Windows.Forms.Button btnbuy;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.ComboBox cmbmodules;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Button button1;
-        private System.Windows.Forms.Button btnnext;
-        private System.Windows.Forms.Panel pnlpcinfo;
-        private System.Windows.Forms.Label lbtargets;
-        private System.Windows.Forms.Button btnpoweroff;
-        private System.Windows.Forms.Button btnupgrade;
-        private System.Windows.Forms.Label lbpcinfo;
-        private System.Windows.Forms.Label lbmoduletitle;
-        private System.Windows.Forms.Button btncloseinfo;
-        private System.Windows.Forms.FlowLayoutPanel flcontrols;
-        private System.Windows.Forms.Button btnaddmodule;
-        private System.Windows.Forms.Label lbcompromised;
-        private System.Windows.Forms.Label lbstats;
-        private System.Windows.Forms.TextBox txtyourconsole;
-        private System.Windows.Forms.TextBox txtenemyconsole;
-        private System.Windows.Forms.Panel pnlenemy;
-        private System.Windows.Forms.Label lbenemycompromised;
-        private System.Windows.Forms.Label lbenemystats;
-        private System.Windows.Forms.Panel panel2;
-        private System.Windows.Forms.Timer tmrplayerhealthdetect;
-        private System.Windows.Forms.Timer tmrenemyhealthdetect;
-        private System.Windows.Forms.Timer tmrredraw;
-        private System.Windows.Forms.Label lbcodepoints;
-        private System.Windows.Forms.Button btntogglemusic;
-        private System.Windows.Forms.Label lbsong;
-        private System.Windows.Forms.Panel pnltutorial;
-        private System.Windows.Forms.Label lbtutorial;
-        private System.Windows.Forms.Timer tmrvisualizer;
-        internal System.Windows.Forms.Panel pgpong;
-        internal System.Windows.Forms.Label lblcountdown;
-        internal System.Windows.Forms.Panel ball;
-        internal System.Windows.Forms.PictureBox paddleHuman;
-        internal System.Windows.Forms.Panel paddleComputer;
-        internal System.Windows.Forms.Label lbllevelandtime;
-        internal System.Windows.Forms.Label lblstatsY;
-        internal System.Windows.Forms.Label lblstatsX;
-        internal System.Windows.Forms.Timer pongGameTimer;
-        internal System.Windows.Forms.Timer counter;
-        internal System.Windows.Forms.Timer tmrcountdown;
+        private ShiftUI.TableLayoutPanel tbui;
+        private ShiftUI.Panel pnlyou;
+        private ShiftUI.Panel pnlbuy;
+        private ShiftUI.TextBox txthostname;
+        private ShiftUI.Label lbhostname;
+        private ShiftUI.TextBox txtgrade;
+        private ShiftUI.Label lbgrade;
+        private ShiftUI.Label lbmoduleinfo;
+        private ShiftUI.ComboBox cmbbuyable;
+        private ShiftUI.Label label4;
+        private ShiftUI.Button btndonebuying;
+        private ShiftUI.Panel pnldefensemanager;
+        private ShiftUI.Button btnbuy;
+        private ShiftUI.Label label3;
+        private ShiftUI.ComboBox cmbmodules;
+        private ShiftUI.Label label1;
+        private ShiftUI.Button button1;
+        private ShiftUI.Button btnnext;
+        private ShiftUI.Panel pnlpcinfo;
+        private ShiftUI.Label lbtargets;
+        private ShiftUI.Button btnpoweroff;
+        private ShiftUI.Button btnupgrade;
+        private ShiftUI.Label lbpcinfo;
+        private ShiftUI.Label lbmoduletitle;
+        private ShiftUI.Button btncloseinfo;
+        private ShiftUI.FlowLayoutPanel flcontrols;
+        private ShiftUI.Button btnaddmodule;
+        private ShiftUI.Label lbcompromised;
+        private ShiftUI.Label lbstats;
+        private ShiftUI.TextBox txtyourconsole;
+        private ShiftUI.TextBox txtenemyconsole;
+        private ShiftUI.Panel pnlenemy;
+        private ShiftUI.Label lbenemycompromised;
+        private ShiftUI.Label lbenemystats;
+        private ShiftUI.Panel panel2;
+        private ShiftUI.Timer tmrplayerhealthdetect;
+        private ShiftUI.Timer tmrenemyhealthdetect;
+        private ShiftUI.Timer tmrredraw;
+        private ShiftUI.Label lbcodepoints;
+        private ShiftUI.Button btntogglemusic;
+        private ShiftUI.Label lbsong;
+        private ShiftUI.Panel pnltutorial;
+        private ShiftUI.Label lbtutorial;
+        private ShiftUI.Timer tmrvisualizer;
+        internal ShiftUI.Panel pgpong;
+        internal ShiftUI.Label lblcountdown;
+        internal ShiftUI.Panel ball;
+        internal ShiftUI.PictureBox paddleHuman;
+        internal ShiftUI.Panel paddleComputer;
+        internal ShiftUI.Label lbllevelandtime;
+        internal ShiftUI.Label lblstatsY;
+        internal ShiftUI.Label lblstatsX;
+        internal ShiftUI.Timer pongGameTimer;
+        internal ShiftUI.Timer counter;
+        internal ShiftUI.Timer tmrcountdown;
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Gameplay/HackUI.cs b/source/WindowsFormsApplication1/Gameplay/HackUI.cs
index a1c1555..9767c7c 100644
--- a/source/WindowsFormsApplication1/Gameplay/HackUI.cs
+++ b/source/WindowsFormsApplication1/Gameplay/HackUI.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
@@ -288,7 +288,7 @@ namespace ShiftOS
                 newModule.Transmitter = transmitter;
                 transmitter?.send_message(Online.Hacking.NetTransmitter.Messages.PlaceModule, new Online.Hacking.Module { Grade = newModule.Grade, Hostname = newModule.Hostname, HP = newModule.HP, Type = (int)newModule.Type, X = newModule.Left, Y = newModule.Top });
             }
-            pnlyou.Controls.Add(newModule);
+            pnlyou.Widgets.Add(newModule);
             int hp = newModule.HP;
             WriteLine($"[Network] Welcome to the network, {newModule.Hostname}!");
             TotalPlayerHP += newModule.HP;
@@ -939,7 +939,7 @@ namespace ShiftOS
         private void btnpoweroff_Click(object sender, EventArgs e)
         {
             //Remove the computer from the game.
-            pnlyou.Controls.Remove(SelectedPlayerComputer);
+            pnlyou.Widgets.Remove(SelectedPlayerComputer);
             AllPlayerComputers.Remove(SelectedPlayerComputer);
             btnpoweroff.Hide();
         }
@@ -1219,7 +1219,7 @@ namespace ShiftOS
                 newModule.Top = (pnlenemy.Height - newModule.Height) / 2;
             }
             var rnd = new Random();
-            pnlenemy.Controls.Add(newModule);
+            pnlenemy.Widgets.Add(newModule);
             foreach (var pc in AllEnemyComputers)
             {
                 while (newModule.Bounds.IntersectsWith(pc.Bounds))
@@ -1827,7 +1827,7 @@ namespace ShiftOS
             }
         }
 
-        private void pongMain_MouseMove(object sender, System.Windows.Forms.MouseEventArgs e)
+        private void pongMain_MouseMove(object sender, ShiftUI.MouseEventArgs e)
         {
             paddleHuman.Location = new Point(paddleHuman.Location.X, (MousePosition.Y - pgpong.Location.Y) - (paddleHuman.Height / 2));
         }
@@ -1938,7 +1938,7 @@ namespace ShiftOS
 
                 if(module_to_steal.Parent != pnlyou)
                 {
-                    module_to_steal.Parent.Controls.Remove(module_to_steal);
+                    module_to_steal.Parent.Widgets.Remove(module_to_steal);
                     module_to_steal.Dispose();
                 }
                 tmrcountdown.Stop();
@@ -1981,7 +1981,7 @@ namespace ShiftOS
 
                 if (module_to_steal.Parent != pnlenemy)
                 {
-                    module_to_steal.Parent.Controls.Remove(module_to_steal);
+                    module_to_steal.Parent.Widgets.Remove(module_to_steal);
                     module_to_steal.Dispose();
                 }
                 tmrcountdown.Stop();
diff --git a/source/WindowsFormsApplication1/Gameplay/HackUI.resx b/source/WindowsFormsApplication1/Gameplay/HackUI.resx
index 9def72b..c56140b 100644
--- a/source/WindowsFormsApplication1/Gameplay/HackUI.resx
+++ b/source/WindowsFormsApplication1/Gameplay/HackUI.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="lbmoduleinfo.Text" xml:space="preserve">
     <value>When you press 'Done', simply click where you'd like to place the new module. You can right-click the playing field to cancel the deployment.
diff --git a/source/WindowsFormsApplication1/Gameplay/Hacking.cs b/source/WindowsFormsApplication1/Gameplay/Hacking.cs
index 7b18852..43cd114 100644
--- a/source/WindowsFormsApplication1/Gameplay/Hacking.cs
+++ b/source/WindowsFormsApplication1/Gameplay/Hacking.cs
@@ -6,7 +6,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
@@ -154,7 +154,7 @@ namespace ShiftOS
                     break;
             }
 
-            f.Controls.Add(l);
+            f.Widgets.Add(l);
             l.Show();
             l.TextAlign = ContentAlignment.MiddleCenter;
             f.Height = 25;
@@ -245,7 +245,7 @@ namespace ShiftOS
                         break;
                 }
 
-                f.Controls.Add(l);
+                f.Widgets.Add(l);
                 l.Show();
                 l.TextAlign = ContentAlignment.MiddleCenter;
                 f.Height = 25;
diff --git a/source/WindowsFormsApplication1/Gameplay/HijackScreen.Designer.cs b/source/WindowsFormsApplication1/Gameplay/HijackScreen.Designer.cs
index 12e30ab..3fa136b 100644
--- a/source/WindowsFormsApplication1/Gameplay/HijackScreen.Designer.cs
+++ b/source/WindowsFormsApplication1/Gameplay/HijackScreen.Designer.cs
@@ -31,18 +31,18 @@ namespace ShiftOS
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            this.lblHijack = new System.Windows.Forms.Label();
-            this.conversationtimer = new System.Windows.Forms.Timer(this.components);
-            this.textgen = new System.Windows.Forms.Timer(this.components);
-            this.lblhackwords = new System.Windows.Forms.Label();
-            this.hackeffecttimer = new System.Windows.Forms.Timer(this.components);
+            this.lblHijack = new ShiftUI.Label();
+            this.conversationtimer = new ShiftUI.Timer(this.components);
+            this.textgen = new ShiftUI.Timer(this.components);
+            this.lblhackwords = new ShiftUI.Label();
+            this.hackeffecttimer = new ShiftUI.Timer(this.components);
             this.BackgroundWorker1 = new System.ComponentModel.BackgroundWorker();
-            this.btnskip = new System.Windows.Forms.Button();
+            this.btnskip = new ShiftUI.Button();
             this.SuspendLayout();
             // 
             // lblHijack
             // 
-            this.lblHijack.Anchor = System.Windows.Forms.AnchorStyles.None;
+            this.lblHijack.Anchor = ShiftUI.AnchorStyles.None;
             this.lblHijack.AutoSize = true;
             this.lblHijack.BackColor = System.Drawing.Color.WhiteSmoke;
             this.lblHijack.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -60,7 +60,7 @@ namespace ShiftOS
             // lblhackwords
             // 
             this.lblhackwords.AutoSize = true;
-            this.lblhackwords.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.lblhackwords.Dock = ShiftUI.DockStyle.Fill;
             this.lblhackwords.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.lblhackwords.ForeColor = System.Drawing.SystemColors.ButtonFace;
             this.lblhackwords.Location = new System.Drawing.Point(0, 0);
@@ -75,7 +75,7 @@ namespace ShiftOS
             // 
             // btnskip
             // 
-            this.btnskip.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnskip.FlatStyle = ShiftUI.FlatStyle.Flat;
             this.btnskip.ForeColor = System.Drawing.Color.White;
             this.btnskip.Location = new System.Drawing.Point(566, 422);
             this.btnskip.Name = "btnskip";
@@ -89,12 +89,12 @@ namespace ShiftOS
             // HijackScreen
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.Silver;
             this.ClientSize = new System.Drawing.Size(653, 457);
-            this.Controls.Add(this.btnskip);
-            this.Controls.Add(this.lblhackwords);
-            this.Controls.Add(this.lblHijack);
+            this.Widgets.Add(this.btnskip);
+            this.Widgets.Add(this.lblhackwords);
+            this.Widgets.Add(this.lblHijack);
             this.Name = "HijackScreen";
             this.Text = "ShiftOS";
             this.TransparencyKey = System.Drawing.Color.White;
@@ -103,14 +103,14 @@ namespace ShiftOS
             this.PerformLayout();
 
         }
-        internal System.Windows.Forms.Label lblHijack;
-        internal System.Windows.Forms.Timer conversationtimer;
-        internal System.Windows.Forms.Timer textgen;
-        internal System.Windows.Forms.Label lblhackwords;
-        internal System.Windows.Forms.Timer hackeffecttimer;
+        internal ShiftUI.Label lblHijack;
+        internal ShiftUI.Timer conversationtimer;
+        internal ShiftUI.Timer textgen;
+        internal ShiftUI.Label lblhackwords;
+        internal ShiftUI.Timer hackeffecttimer;
         internal System.ComponentModel.BackgroundWorker BackgroundWorker1;
         #endregion
 
-        private System.Windows.Forms.Button btnskip;
+        private ShiftUI.Button btnskip;
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Gameplay/HijackScreen.cs b/source/WindowsFormsApplication1/Gameplay/HijackScreen.cs
index e234514..7be1da5 100644
--- a/source/WindowsFormsApplication1/Gameplay/HijackScreen.cs
+++ b/source/WindowsFormsApplication1/Gameplay/HijackScreen.cs
@@ -7,7 +7,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
diff --git a/source/WindowsFormsApplication1/Gameplay/HijackScreen.resx b/source/WindowsFormsApplication1/Gameplay/HijackScreen.resx
index 89116b6..6beb458 100644
--- a/source/WindowsFormsApplication1/Gameplay/HijackScreen.resx
+++ b/source/WindowsFormsApplication1/Gameplay/HijackScreen.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="conversationtimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
diff --git a/source/WindowsFormsApplication1/HostLayer/Paths.cs b/source/WindowsFormsApplication1/HostLayer/Paths.cs
index 32e8c3a..64672e6 100644
--- a/source/WindowsFormsApplication1/HostLayer/Paths.cs
+++ b/source/WindowsFormsApplication1/HostLayer/Paths.cs
@@ -1,6 +1,6 @@
 using System;
 using System.IO;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
diff --git a/source/WindowsFormsApplication1/Online/ConnectionManager.Designer.cs b/source/WindowsFormsApplication1/Online/ConnectionManager.Designer.cs
index 89abcca..c126d85 100644
--- a/source/WindowsFormsApplication1/Online/ConnectionManager.Designer.cs
+++ b/source/WindowsFormsApplication1/Online/ConnectionManager.Designer.cs
@@ -28,21 +28,21 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.lbconnections = new System.Windows.Forms.ListBox();
-            this.flbuttons = new System.Windows.Forms.FlowLayoutPanel();
-            this.btnadd = new System.Windows.Forms.Button();
-            this.btnconnect = new System.Windows.Forms.Button();
-            this.btndisconnect = new System.Windows.Forms.Button();
+            this.panel1 = new ShiftUI.Panel();
+            this.lbconnections = new ShiftUI.ListBox();
+            this.flbuttons = new ShiftUI.FlowLayoutPanel();
+            this.btnadd = new ShiftUI.Button();
+            this.btnconnect = new ShiftUI.Button();
+            this.btndisconnect = new ShiftUI.Button();
             this.panel1.SuspendLayout();
             this.flbuttons.SuspendLayout();
             this.SuspendLayout();
             // 
             // panel1
             // 
-            this.panel1.Controls.Add(this.flbuttons);
-            this.panel1.Controls.Add(this.lbconnections);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel1.Widgets.Add(this.flbuttons);
+            this.panel1.Widgets.Add(this.lbconnections);
+            this.panel1.Dock = ShiftUI.DockStyle.Fill;
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
             this.panel1.Size = new System.Drawing.Size(684, 531);
@@ -50,9 +50,9 @@
             // 
             // lbconnections
             // 
-            this.lbconnections.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.lbconnections.Anchor = ((ShiftUI.AnchorStyles)((((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.lbconnections.FormattingEnabled = true;
             this.lbconnections.Location = new System.Drawing.Point(13, 13);
             this.lbconnections.Name = "lbconnections";
@@ -62,11 +62,11 @@
             // 
             // flbuttons
             // 
-            this.flbuttons.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.flbuttons.Controls.Add(this.btnadd);
-            this.flbuttons.Controls.Add(this.btnconnect);
-            this.flbuttons.Controls.Add(this.btndisconnect);
+            this.flbuttons.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
+            this.flbuttons.Widgets.Add(this.btnadd);
+            this.flbuttons.Widgets.Add(this.btnconnect);
+            this.flbuttons.Widgets.Add(this.btndisconnect);
             this.flbuttons.Location = new System.Drawing.Point(13, 489);
             this.flbuttons.Name = "flbuttons";
             this.flbuttons.Size = new System.Drawing.Size(659, 30);
@@ -105,9 +105,9 @@
             // ConnectionManager
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(684, 531);
-            this.Controls.Add(this.panel1);
+            this.Widgets.Add(this.panel1);
             this.Name = "ConnectionManager";
             this.Text = "ConnectionManager";
             this.Load += new System.EventHandler(this.ConnectionManager_Load);
@@ -119,11 +119,11 @@
 
         #endregion
 
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.FlowLayoutPanel flbuttons;
-        private System.Windows.Forms.Button btnadd;
-        private System.Windows.Forms.Button btnconnect;
-        private System.Windows.Forms.Button btndisconnect;
-        private System.Windows.Forms.ListBox lbconnections;
+        private ShiftUI.Panel panel1;
+        private ShiftUI.FlowLayoutPanel flbuttons;
+        private ShiftUI.Button btnadd;
+        private ShiftUI.Button btnconnect;
+        private ShiftUI.Button btndisconnect;
+        private ShiftUI.ListBox lbconnections;
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Online/ConnectionManager.cs b/source/WindowsFormsApplication1/Online/ConnectionManager.cs
index eaf2a24..af22ad2 100644
--- a/source/WindowsFormsApplication1/Online/ConnectionManager.cs
+++ b/source/WindowsFormsApplication1/Online/ConnectionManager.cs
@@ -6,7 +6,7 @@ using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
diff --git a/source/WindowsFormsApplication1/Online/ConnectionManager.resx b/source/WindowsFormsApplication1/Online/ConnectionManager.resx
index 1af7de1..ffb4fb5 100644
--- a/source/WindowsFormsApplication1/Online/ConnectionManager.resx
+++ b/source/WindowsFormsApplication1/Online/ConnectionManager.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Online/Hacking/Matchmaker.cs b/source/WindowsFormsApplication1/Online/Hacking/Matchmaker.cs
index 1fb6f1b..85e672b 100644
--- a/source/WindowsFormsApplication1/Online/Hacking/Matchmaker.cs
+++ b/source/WindowsFormsApplication1/Online/Hacking/Matchmaker.cs
@@ -18,7 +18,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS.Online.Hacking
 {
diff --git a/source/WindowsFormsApplication1/Online/Package_Grabber.cs b/source/WindowsFormsApplication1/Online/Package_Grabber.cs
index b6bbc61..addf910 100644
--- a/source/WindowsFormsApplication1/Online/Package_Grabber.cs
+++ b/source/WindowsFormsApplication1/Online/Package_Grabber.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using System.IO;
 using System.IO.Compression;
 using Newtonsoft.Json;
-using System.Windows.Forms;
+using ShiftUI;
 using System.Threading;
 using System.Drawing;
 using NetSockets;
diff --git a/source/WindowsFormsApplication1/Program.cs b/source/WindowsFormsApplication1/Program.cs
index 0cb9096..5f3f1ad 100644
--- a/source/WindowsFormsApplication1/Program.cs
+++ b/source/WindowsFormsApplication1/Program.cs
@@ -3,7 +3,7 @@ using System.IO;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 using System.Net;
 using System.IO.Compression;
 using System.ComponentModel;
@@ -178,7 +178,7 @@ namespace ShiftOS
             }
             catch 
             {
-                MessageBox.Show("Sorry to break the immersion, but we're currently downloading ShiftOS dependencies that'll make the game run MUCH better, such as the Lua engine and Gecko web renderer. Give us a moment. ShiftOS will continue to run while this happens but some things won't work right until we're finished.");
+                MessageBox.Show("Sorry to break the immersion, but we're currently downloading ShiftOS dependencies that'll make the game run MUCH better, such as the Lua engine and Gecko web renderer. Give us a moment. ShiftOS will continue to run while this happens but some things won't work right until we're finished.", "Dependency download");
                 wc.DownloadFileAsync(new Uri("http://playshiftos.ml/shiftos/dependencies/ShiftOS_Dependencies.zip"), zippath);
             }
             
diff --git a/source/WindowsFormsApplication1/Properties/Resources.Designer.cs b/source/WindowsFormsApplication1/Properties/Resources.Designer.cs
index 2c80870..7c4aed3 100644
--- a/source/WindowsFormsApplication1/Properties/Resources.Designer.cs
+++ b/source/WindowsFormsApplication1/Properties/Resources.Designer.cs
@@ -1150,10 +1150,11 @@ namespace ShiftOS.Properties {
         /// <summary>
         ///   Looks up a localized string similar to {
         ///&quot;StartURL&quot;:&quot;http://michael.playshiftos.ml/shiftos/soundtrack/&quot;,
-        ///&quot;Files&quot;:{&quot;endgame&quot;:[&quot;Tom Vanko &amp; Mark Vank - Origin&quot;], &quot;hackerbattle_ambient&quot;:[&quot;HardMix - Evolution&quot;, &quot;Lastep - NeveS&quot;, &quot;Timmo Hendriks - That Happen&quot;, &quot;Eric Rodriguez - Lion&quot;, &quot;Mark Vank &amp; Miza - Dark Generation&quot;]},
+        ///&quot;Files&quot;:{&quot;endgame&quot;:[&quot;Tom Vanko &amp; Mark Vank - Origin&quot;], &quot;hackerbattle_ambient&quot;:[&quot;HardMix - Evolution&quot;, &quot;Lastep - NeveS&quot;, &quot;Timmo Hendriks - That Happen&quot;, &quot;Mark Vank &amp; Miza - Dark Generation&quot;]},
         ///&quot;Visualizers&quot;:{
         ///		&quot;Mark Vank &amp; Miza - Dark Generation&quot;:[{&quot;R&quot;:false, &quot;G&quot;:true, &quot;B&quot;:false, &quot;type&quot;:&quot;Pulse&quot;, &quot;startTime&quot;:0, &quot;endTime&quot;:30},
-        ///											  {&quot;R&quot;:false, &quot;G&quot;:true, &quot;B&quot;:false, &quot;type&quot;:&quot;BuildUp&quot;, &quot;startTime&quot;:30, &quot;endTime&quot; [rest of string was truncated]&quot;;.
+        ///											  {&quot;R&quot;:false, &quot;G&quot;:true, &quot;B&quot;:false, &quot;type&quot;:&quot;BuildUp&quot;, &quot;startTime&quot;:30, &quot;endTime&quot;:60},
+        ///											  {&quot;R&quot;: [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string MusicData {
             get {
diff --git a/source/WindowsFormsApplication1/Properties/Resources.resx b/source/WindowsFormsApplication1/Properties/Resources.resx
index e8fecc6..20e5a5e 100644
--- a/source/WindowsFormsApplication1/Properties/Resources.resx
+++ b/source/WindowsFormsApplication1/Properties/Resources.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,961 +112,961 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="tilebuttonpressed" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <assembly alias="System.Windows.Forms" name="ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="tilebuttonpressed" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\tilebuttonpressed.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="iconDodge" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="iconDodge" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\iconDodge.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="rolldown" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="rolldown" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\rolldown.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="centrebutton" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="centrebutton" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\centrebutton.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradefileskimmerdelete" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradefileskimmerdelete" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradefileskimmerdelete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="dial_up_modem_02" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="dial_up_modem_02" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\dial-up-modem-02.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="upgraderollupcommand" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgraderollupcommand" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgraderollupcommand.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradealshiftorium" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradealshiftorium" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradealshiftorium.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="crash" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="crash" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\crash.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="crash_ofm" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="crash_ofm" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\crash_ofm.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeblueshadeset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeblueshadeset" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeblueshadeset.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="iconTerminal" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="iconTerminal" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\iconTerminal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="iconvirusscanner" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="iconvirusscanner" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\iconvirusscanner.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeautoscrollterminal" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeautoscrollterminal" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeautoscrollterminal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeartpadload" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeartpadload" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeartpadload.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeyellowshadeset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeyellowshadeset" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeyellowshadeset.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradegrayshades" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradegrayshades" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradegrayshades.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradepinkcustom" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradepinkcustom" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradepinkcustom.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="downarrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="downarrow" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\downarrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeusefulpanelbuttons" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeusefulpanelbuttons" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeusefulpanelbuttons.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="tilebutton" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="tilebutton" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\tilebutton.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradebrowncustom" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradebrowncustom" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradebrowncustom.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradewindowsanywhere" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradewindowsanywhere" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradewindowsanywhere.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeclock" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeclock" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeclock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeskinning" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeskinning" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeskinning.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradegreenshades" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradegreenshades" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradegreenshades.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeshiftbuttons" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeshiftbuttons" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeshiftbuttons.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradepong" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradepong" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradepong.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeskicarbrands" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeskicarbrands" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeskicarbrands.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icongraphicpicker" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="icongraphicpicker" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\icongraphicpicker.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="crash_force" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="crash_force" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\crash-force.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeartpadtexttool" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeartpadtexttool" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeartpadtexttool.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="shiftomizericonpreview" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="shiftomizericonpreview" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\shiftomizericonpreview.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeshiftpanelclock" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeshiftpanelclock" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeshiftpanelclock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="BeginButton_Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="BeginButton_Image" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\BeginButton.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeamandpm" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeamandpm" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeamandpm.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="skinuparrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="skinuparrow" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\skinuparrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="webforward" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="webforward" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\webforward.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradegray" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradegray" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradegray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradealtextpad" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradealtextpad" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradealtextpad.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="iconFileSaver_fw" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="iconFileSaver_fw" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\iconFileSaver.fw.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="nextbutton" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="nextbutton" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\nextbutton.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradepink" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradepink" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradepink.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="iconNameChanger" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="iconNameChanger" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\iconNameChanger.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradebrownshadeset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradebrownshadeset" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradebrownshadeset.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="anycolourshade2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="anycolourshade2" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\anycolourshade2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ArtPadcirclerubber" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="ArtPadcirclerubber" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\ArtPadcirclerubber.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeartpadfilltool" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeartpadfilltool" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeartpadfilltool.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeshiftoriumicon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeshiftoriumicon" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeshiftoriumicon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="iconTextPad" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="iconTextPad" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\iconTextPad.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgraderemoveth1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgraderemoveth1" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgraderemoveth1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Symbolinfo1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Symbolinfo1" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\Symbolinfo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="iconBitnoteWallet" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="iconBitnoteWallet" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\iconBitnoteWallet.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="TotalBalanceUnclicked" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="TotalBalanceUnclicked" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\TotalBalanceUnclicked.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradepinkshadeset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradepinkshadeset" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradepinkshadeset.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="iconShiftorium" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="iconShiftorium" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\iconShiftorium.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="iconKnowledgeInput" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="iconKnowledgeInput" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\iconKnowledgeInput.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradealclock" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradealclock" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradealclock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradetitlebar" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradetitlebar" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradetitlebar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="iconAppscape" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="iconAppscape" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\Icon.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeshiftpanelbuttons" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeshiftpanelbuttons" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeshiftpanelbuttons.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="fileiconsaa" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="fileiconsaa" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\fileiconsaa.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="iconCalculator" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="iconCalculator" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\iconCalculator.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="deletefile" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="deletefile" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\deletefile.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="QuitButton_Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="QuitButton_Image" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\QuitButton.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ArtPadnew" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="ArtPadnew" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\ArtPadnew.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeartpadpixellimit16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeartpadpixellimit16" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeartpadpixellimit16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ArtPadsave" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="ArtPadsave" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\ArtPadsave.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgrademultitasking" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgrademultitasking" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgrademultitasking.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradegraycustom" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradegraycustom" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradegraycustom.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Send" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Send" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\Send.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="playbutton" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="playbutton" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\playbutton.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="iconPong" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="iconPong" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\iconPong.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradewindowedterminal" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradewindowedterminal" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradewindowedterminal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeartpad128colorpallets" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeartpad128colorpallets" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeartpad128colorpallets.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradedesktoppanel" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradedesktoppanel" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradedesktoppanel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ArtPadsquarerubber" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="ArtPadsquarerubber" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\ArtPadsquarerubber.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="pausebutton" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="pausebutton" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\pausebutton.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradetextpadsave" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradetextpadsave" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradetextpadsave.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeyellow" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeyellow" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeyellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradegreenshadeset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradegreenshadeset" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradegreenshadeset.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="infobox" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="infobox" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\infobox.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="test" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="test" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\test.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="shiftomizerlinuxmintskinpreview" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="shiftomizerlinuxmintskinpreview" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\shiftomizerlinuxmintskinpreview.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="iconWebBrowser" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="iconWebBrowser" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\iconWebBrowser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradetextpad" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradetextpad" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradetextpad.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeblue" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeblue" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeblue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ArtPadRectangle" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="ArtPadRectangle" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\ArtPadRectangle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradealfileskimmer" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradealfileskimmer" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradealfileskimmer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="zoombutton" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="zoombutton" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\zoombutton.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeshiftdesktop" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeshiftdesktop" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeshiftdesktop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="openicon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="openicon" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\openicon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="updatecustomcolourpallets" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="updatecustomcolourpallets" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\updatecustomcolourpallets.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeapplaunchershutdown" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeapplaunchershutdown" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeapplaunchershutdown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeartpad64colorpallets" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeartpad64colorpallets" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeartpad64colorpallets.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="anycolourshade" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="anycolourshade" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\anycolourshade.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradesysinfo" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradesysinfo" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradesysinfo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradegreencustom" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradegreencustom" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradegreencustom.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="player_Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="player_Image" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\player.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="stopbutton" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="stopbutton" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\stopbutton.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradetitletext" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradetitletext" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradetitletext.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ReceiveClicked" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="ReceiveClicked" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\ReceiveClicked.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgrademinuteaccuracytime" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgrademinuteaccuracytime" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgrademinuteaccuracytime.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradealpong" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradealpong" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradealpong.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeartpadpixellimit4" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeartpadpixellimit4" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeartpadpixellimit4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeclosebutton" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeclosebutton" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeclosebutton.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ArtPadsquarerubberselected" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="ArtPadsquarerubberselected" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\ArtPadsquarerubberselected.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeorangecustom" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeorangecustom" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeorangecustom.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeartpadlinetool" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeartpadlinetool" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeartpadlinetool.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradetextpadopen" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradetextpadopen" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradetextpadopen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ArtPadopen" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="ArtPadopen" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\ArtPadopen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeshiftapplauncher" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeshiftapplauncher" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeshiftapplauncher.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeshiftericon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeshiftericon" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeshiftericon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradealshifter" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradealshifter" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradealshifter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgraderedcustom" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgraderedcustom" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgraderedcustom.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeorange" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeorange" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeorange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="shiftomizersliderleftarrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="shiftomizersliderleftarrow" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\shiftomizersliderleftarrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="iconVideoPlayer" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="iconVideoPlayer" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\iconVideoPlayer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeartpadrectangletool" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeartpadrectangletool" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeartpadrectangletool.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="iconIconManager" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="iconIconManager" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\iconIconManager.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgrademinimizecommand" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgrademinimizecommand" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgrademinimizecommand.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="anycolourshade3" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="anycolourshade3" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\anycolourshade3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeshifttitletext" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeshifttitletext" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeshifttitletext.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="rollup" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="rollup" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\rollup.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="fileiconsetup" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="fileiconsetup" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\fileiconsaa1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradedesktoppanelclock" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradedesktoppanelclock" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradedesktoppanelclock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="shiftomizernamechangerpreview" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="shiftomizernamechangerpreview" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\shiftomizernamechangerpreview.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradehoursssincemidnight" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradehoursssincemidnight" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradehoursssincemidnight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ArtPadlinetool" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="ArtPadlinetool" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\ArtPadlinetool.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="_3beepvirus" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="_3beepvirus" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\3beepvirus.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="upgradeartpadpixelplacer" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeartpadpixelplacer" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeartpadpixelplacer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ArtPadmagnify" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="ArtPadmagnify" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\ArtPadmagnify.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="iconShiftnet" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="iconShiftnet" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\iconShiftnet.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="iconAudioPlayer" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="iconAudioPlayer" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\iconAudioPlayer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradefileskimmernew" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradefileskimmernew" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradefileskimmernew.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="centrebuttonpressed" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="centrebuttonpressed" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\centrebuttonpressed.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeartpadnew" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeartpadnew" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeartpadnew.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="christmaseasteregg" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="christmaseasteregg" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\christmaseasteregg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ArtPadredo" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="ArtPadredo" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\ArtPadredo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="installericon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="installericon" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\installericon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgraderesize" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgraderesize" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgraderesize.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgraderedshades" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgraderedshades" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgraderedshades.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradefileskimmer" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradefileskimmer" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradefileskimmer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeknowledgeinput" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeknowledgeinput" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeknowledgeinput.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeknowledgeinputicon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeknowledgeinputicon" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeknowledgeinputicon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgraderemoveth4" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgraderemoveth4" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgraderemoveth4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeartpad" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeartpad" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeartpad.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="iconshutdown" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="iconshutdown" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\iconshutdown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ArtPaderacer" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="ArtPaderacer" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\ArtPaderacer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="iconSkinShifter" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="iconSkinShifter" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\iconSkinShifter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="skinfile" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="skinfile" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\skinfile.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="fileskimmericon_fw" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="fileskimmericon_fw" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\fileskimmericon.fw.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="zoombuttonpressed" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="zoombuttonpressed" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\zoombuttonpressed.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradedraggablewindows" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradedraggablewindows" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradedraggablewindows.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradecolourpickericon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradecolourpickericon" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradecolourpickericon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradetextpadicon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradetextpadicon" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradetextpadicon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeinfoboxicon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeinfoboxicon" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeinfoboxicon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradepanelbuttons" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradepanelbuttons" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradepanelbuttons.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="iconInfoBox_fw" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="iconInfoBox_fw" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\iconInfoBox.fw.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradegrayshadeset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradegrayshadeset" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradegrayshadeset.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeartpad8colorpallets" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeartpad8colorpallets" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeartpad8colorpallets.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="shiftomizerskinshifterscreenshot" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="shiftomizerskinshifterscreenshot" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\shiftomizerskinshifterscreenshot.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeblueshades" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeblueshades" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeblueshades.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="iconDownloader" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="iconDownloader" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\iconDownloader.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="object_mid2_Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="object_mid2_Image" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\object_mid2.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="fileicondirectory" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="fileicondirectory" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\fileicondirectory.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="dodge" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="dodge" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\dodge.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeartpadpaintbrushtool" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeartpadpaintbrushtool" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeartpadpaintbrushtool.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="object_small2_Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="object_small2_Image" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\object_small2.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="TotalBalanceClicked" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="TotalBalanceClicked" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\TotalBalanceClicked.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeartpad32colorpallets" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeartpad32colorpallets" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeartpad32colorpallets.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgraderollupbutton" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgraderollupbutton" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgraderollupbutton.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgrademinimizebutton" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgrademinimizebutton" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgrademinimizebutton.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeshiftitems" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeshiftitems" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeshiftitems.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="iconBitnoteDigger" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="iconBitnoteDigger" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\iconBitnoteDigger.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="iconmaze" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="iconmaze" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\iconmaze.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="webback" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="webback" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\webback.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="iconunitytoggle" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="iconunitytoggle" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\iconunitytoggle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeartpadpixellimit4096" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeartpadpixellimit4096" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeartpadpixellimit4096.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="object_large_Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="object_large_Image" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\object_large.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="anycolourshade4" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="anycolourshade4" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\anycolourshade4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="iconSkinLoader" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="iconSkinLoader" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\iconSkinLoader.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="uparrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="uparrow" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\uparrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradefileskimmericon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradefileskimmericon" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradefileskimmericon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeartpadsave" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeartpadsave" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeartpadsave.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeterminalicon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeterminalicon" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeterminalicon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeartpadpixellimit64" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeartpadpixellimit64" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeartpadpixellimit64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ArtPadOval" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="ArtPadOval" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\ArtPadOval.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ArtPadtexttool" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="ArtPadtexttool" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\ArtPadtexttool.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="transactionsUnclicked" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="transactionsUnclicked" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\transactionsUnclicked.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradecustomusername" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradecustomusername" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradecustomusername.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeartpadovaltool" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeartpadovaltool" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeartpadovaltool.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="iconFileOpener_fw" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="iconFileOpener_fw" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\iconFileOpener.fw.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ArtPadundo" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="ArtPadundo" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\ArtPadundo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ArtPadpixelplacer" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="ArtPadpixelplacer" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\ArtPadpixelplacer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="newfolder" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="newfolder" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\newfolder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="fileiconnone" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="fileiconnone" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\fileiconnone.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Receive" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Receive" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\Receive.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeyellowcustom" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeyellowcustom" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeyellowcustom.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ArtPadcirclerubberselected" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="ArtPadcirclerubberselected" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\ArtPadcirclerubberselected.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeshutdownicon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeshutdownicon" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeshutdownicon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgraderemoveth2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgraderemoveth2" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgraderemoveth2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="transactionsClicked" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="transactionsClicked" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\transactionsClicked.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradewindowborders" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradewindowborders" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradewindowborders.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradesplitsecondaccuracy" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradesplitsecondaccuracy" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradesplitsecondaccuracy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradealunitymode" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradealunitymode" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradealunitymode.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="snakeyback" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="snakeyback" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\snakeyback.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradegreen" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradegreen" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradegreen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="iconfloodgate" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="iconfloodgate" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\iconfloodgate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeyellowshades" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeyellowshades" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeyellowshades.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Gray_Shades" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Gray_Shades" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\Gray Shades.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeshifter" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeshifter" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeshifter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="iconFileSkimmer" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="iconFileSkimmer" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\iconFileSkimmer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradesgameconsoles" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradesgameconsoles" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradesgameconsoles.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradepurpleshades" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradepurpleshades" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradepurpleshades.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeterminalscrollbar" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeterminalscrollbar" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeterminalscrollbar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="textpad_fw" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="textpad_fw" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\textpad.fw.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="shiftomizerindustrialskinpreview" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="shiftomizerindustrialskinpreview" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\shiftomizerindustrialskinpreview.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="SendClicked" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="SendClicked" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\SendClicked.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeartpadpixelplacermovementmode" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeartpadpixelplacermovementmode" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeartpadpixelplacermovementmode.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="object_small_Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="object_small_Image" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\object_small.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeosname" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeosname" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeosname.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="skindownarrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="skindownarrow" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\skindownarrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ArtPadpaintbrush" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="ArtPadpaintbrush" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\ArtPadpaintbrush.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeartpadlimitlesspixels" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeartpadlimitlesspixels" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeartpadlimitlesspixels.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeadvancedshifter" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeadvancedshifter" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeadvancedshifter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradebluecustom" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradebluecustom" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradebluecustom.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeshifttitlebar" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeshifttitlebar" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeshifttitlebar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeartpadpixellimit256" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeartpadpixellimit256" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeartpadpixellimit256.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradekiaddons" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradekiaddons" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradekiaddons.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradetrm" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradetrm" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradetrm.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="DSC01042" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="DSC01042" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\DSC01042.JPG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="iconorcwrite" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="iconorcwrite" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\iconorcwrite.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeorangeshadeset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeorangeshadeset" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeorangeshadeset.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeartpadpixellimit16384" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeartpadpixellimit16384" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeartpadpixellimit16384.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradebrown" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradebrown" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradebrown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="loadbutton" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="loadbutton" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\loadbutton.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Symbolinfo" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Symbolinfo" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\Symbolinfo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="christmas_skin" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="christmas_skin" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\christmas_skin.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="stretchbuttonpressed" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="stretchbuttonpressed" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\stretchbuttonpressed.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="pixelsetter" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="pixelsetter" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\pixelsetter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="crash_cheat" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="crash_cheat" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\crash-cheat.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="webhome" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="webhome" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\webhome.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="typesound" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="typesound" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\typesound.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="upgradetextpadnew" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradetextpadnew" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradetextpadnew.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradekielements" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradekielements" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradekielements.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradealartpad" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradealartpad" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradealartpad.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="jumperplayer" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="jumperplayer" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\jumperplayer.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="stretchbutton" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="stretchbutton" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\stretchbutton.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgrademinutesssincemidnight" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgrademinutesssincemidnight" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgrademinutesssincemidnight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="object_mid_Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="object_mid_Image" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\object_mid.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeunitymode" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeunitymode" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeunitymode.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ArtPadpencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="ArtPadpencil" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\ArtPadpencil.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeartpadpixellimit1024" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeartpadpixellimit1024" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeartpadpixellimit1024.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgrademoveablewindows" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgrademoveablewindows" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgrademoveablewindows.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="BeginButton1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="BeginButton1" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\BeginButton.Image1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeartpadpenciltool" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeartpadpenciltool" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeartpadpenciltool.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="saveicon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="saveicon" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\saveicon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeclockicon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeclockicon" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeclockicon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeapplaunchermenu" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeapplaunchermenu" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeapplaunchermenu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="iconArtpad" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="iconArtpad" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\iconArtpad.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradepurplecustom" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradepurplecustom" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradepurplecustom.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradered" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradered" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradered.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradesecondssincemidnight" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradesecondssincemidnight" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradesecondssincemidnight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeorangeshades" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeorangeshades" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeorangeshades.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ArtPadfloodfill" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="ArtPadfloodfill" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\ArtPadfloodfill.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradevirusscanner" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradevirusscanner" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradevirusscanner.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeartpadpixellimit8" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeartpadpixellimit8" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeartpadpixellimit8.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="shiftomizersliderrightarrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="shiftomizersliderrightarrow" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\shiftomizersliderrightarrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="writesound" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="writesound" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\writesound.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="upgradebrownshades" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradebrownshades" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradebrownshades.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="deletefolder" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="deletefolder" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\deletefolder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="previousbutton" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="previousbutton" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\previousbutton.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeartpad16colorpallets" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeartpad16colorpallets" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeartpad16colorpallets.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgraderedshadeset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgraderedshadeset" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgraderedshadeset.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeartpadundo" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeartpadundo" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeartpadundo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeshiftdesktoppanel" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeshiftdesktoppanel" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeshiftdesktoppanel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeartpaderaser" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeartpaderaser" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeartpaderaser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeiconunitymode" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeiconunitymode" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeiconunitymode.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeartpadicon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeartpadicon" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeartpadicon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="iconShifter" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="iconShifter" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\iconShifter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgraderemoveth3" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgraderemoveth3" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgraderemoveth3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeartpadredo" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeartpadredo" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeartpadredo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeartpad4colorpallets" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeartpad4colorpallets" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeartpad4colorpallets.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="iconClock" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="iconClock" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\iconClock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradepongicon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradepongicon" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradepongicon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeshiftborders" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeshiftborders" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeshiftborders.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="floodgateicn" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="floodgateicn" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\floodgateicn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="downloadmanagericon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="downloadmanagericon" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\downloadmanagericon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="iconSysinfo" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="iconSysinfo" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\iconSysinfo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="iconSnakey" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="iconSnakey" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\iconSnakey.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="fileicondoc" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="fileicondoc" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\fileiconnone1.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradepurpleshadeset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradepurpleshadeset" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradepurpleshadeset.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradeartpadpixellimit65536" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradeartpadpixellimit65536" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradeartpadpixellimit65536.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="newicon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="newicon" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\newicon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradepurple" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradepurple" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradepurple.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upgradepinkshades" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="upgradepinkshades" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\upgradepinkshades.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="PicBonus_Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="PicBonus_Image" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\PicBonus.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="notify_generic" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="notify_generic" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\notify_generic.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="DecompiledCode" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="DecompiledCode" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\DecompiledCode.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
-  <data name="NoIconFound" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="NoIconFound" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\NoIconFound.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Choice1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Choice1" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\Choice1.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
-  <data name="Choice2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Choice2" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\Choice2.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
-  <data name="Choice3" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Choice3" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\Choice3.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
-  <data name="You_Passed" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="You_Passed" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\You_Passed.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
-  <data name="DevX_Firewall" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="DevX_Firewall" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\DevX_Primary.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
-  <data name="DevX_PrimaryNet" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="DevX_PrimaryNet" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\DevX_PrimaryNet.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
-  <data name="DevX_Secondary" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="DevX_Secondary" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\DevX_Secondary.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
-  <data name="Hacker_AustinWalker" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Hacker_AustinWalker" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\Hacker_AustinWalker.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
-  <data name="Hacker_DanaRoss" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Hacker_DanaRoss" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\Hacker_DanaRoss.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
-  <data name="Hacker_JonathanRivard" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Hacker_JonathanRivard" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\Hacker_JonathanRivard.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
-  <data name="MidGame_Holochat" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="MidGame_Holochat" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\MidGame_Holochat.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
-  <data name="NetBrowser_Enemies" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="NetBrowser_Enemies" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\NetBrowser_Enemies.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
-  <data name="iconColourPicker_fw" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="iconColourPicker_fw" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\iconColourPicker.fw.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="AustinWalkerCompletionStory" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="AustinWalkerCompletionStory" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\AustinWalkerCompletionStory.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
-  <data name="MusicData" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="MusicData" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\MusicData.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
-  <data name="Credits" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Credits" type="System.Resources.ResXFileRef, ShiftUI">
     <value>..\Resources\Credits.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/ShiftOS.csproj b/source/WindowsFormsApplication1/ShiftOS.csproj
index b835f29..8e10ef6 100644
--- a/source/WindowsFormsApplication1/ShiftOS.csproj
+++ b/source/WindowsFormsApplication1/ShiftOS.csproj
@@ -62,6 +62,9 @@
       <HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="ShiftUI">
+      <HintPath>..\..\..\Project-Circle\ShiftUI\bin\Debug\ShiftUI.dll</HintPath>
+    </Reference>
     <Reference Include="Svg, Version=2.1.0.28187, Culture=neutral, PublicKeyToken=12a0bac221edeae2, processorArchitecture=MSIL">
       <HintPath>..\packages\Svg.2.1.0\lib\Svg.dll</HintPath>
       <Private>True</Private>
@@ -132,13 +135,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>
@@ -156,7 +159,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>
@@ -174,7 +177,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>
@@ -230,7 +233,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>
@@ -242,7 +245,7 @@
       <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>
@@ -280,7 +283,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>
@@ -292,7 +295,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>
@@ -315,7 +318,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>
@@ -333,25 +336,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>
@@ -389,7 +392,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>
diff --git a/source/WindowsFormsApplication1/SkinEngine/ShiftOSColorTable.cs b/source/WindowsFormsApplication1/SkinEngine/ShiftOSColorTable.cs
index f74b7c2..fdf840b 100644
--- a/source/WindowsFormsApplication1/SkinEngine/ShiftOSColorTable.cs
+++ b/source/WindowsFormsApplication1/SkinEngine/ShiftOSColorTable.cs
@@ -4,7 +4,7 @@
 // </auto-generated>
 
 using System.Drawing;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
diff --git a/source/WindowsFormsApplication1/SkinEngine/WindowComposition.cs b/source/WindowsFormsApplication1/SkinEngine/WindowComposition.cs
index 18fe2d1..99fd813 100644
--- a/source/WindowsFormsApplication1/SkinEngine/WindowComposition.cs
+++ b/source/WindowsFormsApplication1/SkinEngine/WindowComposition.cs
@@ -5,7 +5,7 @@ using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
@@ -13,7 +13,7 @@ namespace ShiftOS
     {
         private static bool _CanClose = true;
         public static bool ShuttingDown = false;
-        public static bool SafeToAddControls = true;
+        public static bool SafeToAddWidgets = true;
 
         public static bool CanClose
         {
@@ -57,7 +57,7 @@ namespace ShiftOS
             t.Start();
         }
 
-        public static void ScaleWidget(Control ctrl, int width, int height)
+        public static void ScaleWidget(Widget ctrl, int width, int height)
         {
             ctrl.Size = new Size(0, 0);
             var t = new Timer();
diff --git a/source/WindowsFormsApplication1/SkinEngine/skins.cs b/source/WindowsFormsApplication1/SkinEngine/skins.cs
index 8dcaea2..72f5021 100644
--- a/source/WindowsFormsApplication1/SkinEngine/skins.cs
+++ b/source/WindowsFormsApplication1/SkinEngine/skins.cs
@@ -4,7 +4,7 @@ using Newtonsoft.Json;
 using System;
 using ShiftOS;
 using System.IO.Compression;
-using System.Windows.Forms;
+using ShiftUI;
 using System.Collections.Generic;
 using System.Drawing.Imaging;
 
@@ -568,9 +568,16 @@ namespace Skinning
                 loadedSkin = JsonConvert.DeserializeObject<Skin>(rawData);
                 if (File.Exists(Paths.LoadedSkin + "panels.json"))
                 {
-                    string panels = File.ReadAllText(Paths.LoadedSkin + "panels.json");
-                    loadedSkin.DesktopPanels = JsonConvert.DeserializeObject<List<DesktopPanel>>(panels);
-                    LoadPanels();
+                    try
+                    {
+                        string panels = File.ReadAllText(Paths.LoadedSkin + "panels.json");
+                        loadedSkin.DesktopPanels = JsonConvert.DeserializeObject<List<DesktopPanel>>(panels);
+                        LoadPanels();
+                    }
+                    catch
+                    {
+
+                    }
                 }
                 loadimages();
                 LoadEmbeddedNamePack();