3 files changed, 21 insertions, 5 deletions

diff --git a/ShiftOS.WinForms/Applications/Artpad.cs b/ShiftOS.WinForms/Applications/Artpad.cs
index 71a5c1a..6f147ed 100644
--- a/ShiftOS.WinForms/Applications/Artpad.cs
+++ b/ShiftOS.WinForms/Applications/Artpad.cs
@@ -54,6 +54,7 @@ namespace ShiftOS.WinForms.Applications
             try
             {
                 InitializeComponent();
+                
             }
             catch (Exception ex)
             {
@@ -1851,7 +1852,11 @@ namespace ShiftOS.WinForms.Applications
 
         public void OnLoad()
         {
-            
+            foreach (Control ctrl in flowcolours.Controls)
+            {
+                ctrl.Tag = "keepbg";
+                ctrl.BackColor = Color.Black;
+            }
         }
 
         public void OnSkinLoad()
diff --git a/ShiftOS.WinForms/Applications/ColorPicker.cs b/ShiftOS.WinForms/Applications/ColorPicker.cs
index e405944..e3b19ad 100644
--- a/ShiftOS.WinForms/Applications/ColorPicker.cs
+++ b/ShiftOS.WinForms/Applications/ColorPicker.cs
@@ -62,54 +62,65 @@ namespace ShiftOS.WinForms.Applications
             foreach (Control ctrl in pnlanycolours.Controls)
             {
                 ctrl.MouseDown += new MouseEventHandler(this.colourselctionany);
+                ctrl.Tag = "keepbg";
             }
             foreach (Control ctrl in pnlgraycolours.Controls)
             {
+                ctrl.Tag = "keepbg";
                 ctrl.MouseDown += new MouseEventHandler(this.colourselctiongray);
             }
 
             foreach (Control ctrl in pnlredcolours.Controls)
             {
+                ctrl.Tag = "keepbg";
                 ctrl.MouseDown += new MouseEventHandler(this.colourselctionred);
             }
 
             foreach (Control ctrl in pnlgreencolours.Controls)
             {
+                ctrl.Tag = "keepbg";
                 ctrl.MouseDown += new MouseEventHandler(this.colourselctiongreen);
             }
 
             foreach (Control ctrl in pnlbluecolours.Controls)
             {
+                ctrl.Tag = "keepbg";
                 ctrl.MouseDown += new MouseEventHandler(this.colourselctionblue);
             }
 
             foreach (Control ctrl in pnlorangecolours.Controls)
             {
+                ctrl.Tag = "keepbg";
                 ctrl.MouseDown += new MouseEventHandler(this.colourselctionorange);
             }
 
             foreach (Control ctrl in pnlyellowcolours.Controls)
             {
+                ctrl.Tag = "keepbg";
                 ctrl.MouseDown += new MouseEventHandler(this.colourselctionyellow);
             }
 
             foreach (Control ctrl in pnlbrowncolours.Controls)
             {
+                ctrl.Tag = "keepbg";
                 ctrl.MouseDown += new MouseEventHandler(this.colourselctionbrown);
             }
 
             foreach (Control ctrl in pnlpurplecolours.Controls)
             {
+                ctrl.Tag = "keepbg";
                 ctrl.MouseDown += new MouseEventHandler(this.colourselctionpurple);
             }
 
             foreach (Control ctrl in pnlpinkcolours.Controls)
             {
+                ctrl.Tag = "keepbg";
                 ctrl.MouseDown += new MouseEventHandler(this.colourselctionpink);
             }
-
+            pnloldcolour.Tag = "keepbg";
             pnloldcolour.Click += new EventHandler(pnloldcolour_Click);
             pnlnewcolour.Click += new EventHandler(pnlnewcolour_Click);
+            pnlnewcolour.Tag = "keepbg";
         }
 
         public int anylevel = 0;
diff --git a/ShiftOS.WinForms/Applications/Shifter.cs b/ShiftOS.WinForms/Applications/Shifter.cs
index 0cfb65b..d7dda28 100644
--- a/ShiftOS.WinForms/Applications/Shifter.cs
+++ b/ShiftOS.WinForms/Applications/Shifter.cs
@@ -379,7 +379,7 @@ namespace ShiftOS.WinForms.Applications
 
                         var f = en[style.SelectedIndex];
 
-                        c.Field.SetValue(LoadedSkin, new Font(name.Text, (float)Convert.ToInt32(size.Text), f));
+                        c.Field.SetValue(LoadedSkin, new Font(name.Text, (float)Convert.ToDouble(size.Text), f));
                         CodepointValue += 100;
                     };
 
@@ -389,7 +389,7 @@ namespace ShiftOS.WinForms.Applications
 
                         var f = en[style.SelectedIndex];
 
-                        c.Field.SetValue(LoadedSkin, new Font(name.Text, (float)Convert.ToInt32(size.Text), f));
+                        c.Field.SetValue(LoadedSkin, new Font(name.Text, (float)Convert.ToDouble(size.Text), f));
                         CodepointValue += 50;
                     };
 
@@ -401,7 +401,7 @@ namespace ShiftOS.WinForms.Applications
 
                             var f = en[style.SelectedIndex];
 
-                            c.Field.SetValue(LoadedSkin, new Font(name.Text, (float)Convert.ToInt32(size.Text), f));
+                            c.Field.SetValue(LoadedSkin, new Font(name.Text, (float)Convert.ToDouble(size.Text), f));
                         }
                         catch
                         {