Changed: clean-up

FizzyLauncher.UI/FizzyLauncher.UI.csproj

@@ -47,12 +47,20 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
+    <Compile Include="Properties\Resources16.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
+      <DependentUpon>Resources16.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Resources20.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources20.resx</DependentUpon>
     </Compile>
     <Compile Include="RyzStudio\Drawing\Rectangoid.cs" />
+    <Compile Include="RyzStudio\Windows\Forms\TForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="RyzStudio\Windows\Forms\TUserControl.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -122,9 +130,16 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
+    <EmbeddedResource Include="Properties\Resources16.resx">
       <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <LastGenOutput>Resources16.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources20.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources20.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="RyzStudio\Windows\Forms\TForm.resx">
+      <DependentUpon>TForm.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="RyzStudio\Windows\ThemedForms\TButton.resx">
       <DependentUpon>TButton.cs</DependentUpon>
@@ -146,52 +161,73 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\close16_a.png" />
+    <None Include="Resources\20\close.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\close16_b.png" />
+    <None Include="Resources\20\close2.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\file16_a.png" />
+    <None Include="Resources\20\maximise.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\file16_b.png" />
+    <None Include="Resources\20\maximise2.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\folder16_a.png" />
+    <None Include="Resources\20\maximise3.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\folder16_b.png" />
+    <None Include="Resources\20\minimise.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\edit16_a.png" />
+    <None Include="Resources\20\minimise2.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\edit16_b.png" />
+    <None Include="Resources\16\arrow_down.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\arrow_down16_a.png" />
+    <None Include="Resources\16\arrow_down2.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\arrow_down16_b.png" />
+    <None Include="Resources\16\arrow_up.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\arrow_up16_a.png" />
+    <None Include="Resources\16\arrow_up2.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\arrow_up16_b.png" />
+    <None Include="Resources\16\close.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\minus16_a.png" />
+    <None Include="Resources\16\close2.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\minus16_b.png" />
+    <None Include="Resources\16\edit.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\plus16_a.png" />
+    <None Include="Resources\16\edit2.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\plus16_b.png" />
+    <None Include="Resources\16\file.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\16\file2.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\16\folder.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\16\folder2.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\16\minus.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\16\minus2.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\16\plus.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\16\plus2.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

FizzyLauncher.UI/FizzyLauncher.UI.csproj.user

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectView>ProjectFiles</ProjectView>
+  </PropertyGroup>
+</Project>

FizzyLauncher.UI/Properties/Resources16.Designer.cs

@@ -22,14 +22,14 @@ namespace AppLauncher.Properties {
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
+    internal class Resources16 {
         
         private static global::System.Resources.ResourceManager resourceMan;
         
         private static global::System.Globalization.CultureInfo resourceCulture;
         
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
+        internal Resources16() {
         }
         
         /// <summary>
@@ -39,7 +39,7 @@ namespace AppLauncher.Properties {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AppLauncher.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AppLauncher.Properties.Resources16", typeof(Resources16).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
@@ -63,9 +63,9 @@ namespace AppLauncher.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap arrow_down16_a {
+        internal static System.Drawing.Bitmap arrow_down {
             get {
-                object obj = ResourceManager.GetObject("arrow_down16_a", resourceCulture);
+                object obj = ResourceManager.GetObject("arrow_down", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
@@ -73,9 +73,9 @@ namespace AppLauncher.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap arrow_down16_b {
+        internal static System.Drawing.Bitmap arrow_down2 {
             get {
-                object obj = ResourceManager.GetObject("arrow_down16_b", resourceCulture);
+                object obj = ResourceManager.GetObject("arrow_down2", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
@@ -83,9 +83,9 @@ namespace AppLauncher.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap arrow_up16_a {
+        internal static System.Drawing.Bitmap arrow_up {
             get {
-                object obj = ResourceManager.GetObject("arrow_up16_a", resourceCulture);
+                object obj = ResourceManager.GetObject("arrow_up", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
@@ -93,9 +93,9 @@ namespace AppLauncher.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap arrow_up16_b {
+        internal static System.Drawing.Bitmap arrow_up2 {
             get {
-                object obj = ResourceManager.GetObject("arrow_up16_b", resourceCulture);
+                object obj = ResourceManager.GetObject("arrow_up2", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
@@ -103,9 +103,9 @@ namespace AppLauncher.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap close16_a {
+        internal static System.Drawing.Bitmap close {
             get {
-                object obj = ResourceManager.GetObject("close16_a", resourceCulture);
+                object obj = ResourceManager.GetObject("close", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
@@ -113,9 +113,9 @@ namespace AppLauncher.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap close16_b {
+        internal static System.Drawing.Bitmap close2 {
             get {
-                object obj = ResourceManager.GetObject("close16_b", resourceCulture);
+                object obj = ResourceManager.GetObject("close2", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
@@ -123,9 +123,9 @@ namespace AppLauncher.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap edit16_a {
+        internal static System.Drawing.Bitmap edit {
             get {
-                object obj = ResourceManager.GetObject("edit16_a", resourceCulture);
+                object obj = ResourceManager.GetObject("edit", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
@@ -133,9 +133,9 @@ namespace AppLauncher.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap edit16_b {
+        internal static System.Drawing.Bitmap edit2 {
             get {
-                object obj = ResourceManager.GetObject("edit16_b", resourceCulture);
+                object obj = ResourceManager.GetObject("edit2", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
@@ -143,9 +143,9 @@ namespace AppLauncher.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap file16_a {
+        internal static System.Drawing.Bitmap file {
             get {
-                object obj = ResourceManager.GetObject("file16_a", resourceCulture);
+                object obj = ResourceManager.GetObject("file", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
@@ -153,9 +153,9 @@ namespace AppLauncher.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap file16_b {
+        internal static System.Drawing.Bitmap file2 {
             get {
-                object obj = ResourceManager.GetObject("file16_b", resourceCulture);
+                object obj = ResourceManager.GetObject("file2", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
@@ -163,9 +163,9 @@ namespace AppLauncher.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap folder16_a {
+        internal static System.Drawing.Bitmap folder {
             get {
-                object obj = ResourceManager.GetObject("folder16_a", resourceCulture);
+                object obj = ResourceManager.GetObject("folder", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
@@ -173,9 +173,9 @@ namespace AppLauncher.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap folder16_b {
+        internal static System.Drawing.Bitmap folder2 {
             get {
-                object obj = ResourceManager.GetObject("folder16_b", resourceCulture);
+                object obj = ResourceManager.GetObject("folder2", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
@@ -183,9 +183,9 @@ namespace AppLauncher.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap minus16_a {
+        internal static System.Drawing.Bitmap minus {
             get {
-                object obj = ResourceManager.GetObject("minus16_a", resourceCulture);
+                object obj = ResourceManager.GetObject("minus", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
@@ -193,9 +193,9 @@ namespace AppLauncher.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap minus16_b {
+        internal static System.Drawing.Bitmap minus2 {
             get {
-                object obj = ResourceManager.GetObject("minus16_b", resourceCulture);
+                object obj = ResourceManager.GetObject("minus2", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
@@ -203,9 +203,9 @@ namespace AppLauncher.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap plus16_a {
+        internal static System.Drawing.Bitmap plus {
             get {
-                object obj = ResourceManager.GetObject("plus16_a", resourceCulture);
+                object obj = ResourceManager.GetObject("plus", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
@@ -213,9 +213,9 @@ namespace AppLauncher.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap plus16_b {
+        internal static System.Drawing.Bitmap plus2 {
             get {
-                object obj = ResourceManager.GetObject("plus16_b", resourceCulture);
+                object obj = ResourceManager.GetObject("plus2", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }

FizzyLauncher.UI/Properties/Resources16.resx

@@ -118,52 +118,52 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, 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="arrow_down16_a" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="arrow_down" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\arrow_down16_a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\16\arrow_down.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="arrow_down16_b" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="arrow_down2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\arrow_down16_b.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\16\arrow_down2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="arrow_up16_a" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="arrow_up" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\arrow_up16_a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\16\arrow_up.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="arrow_up16_b" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="arrow_up2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\arrow_up16_b.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\16\arrow_up2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="close16_a" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="close" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\close16_a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\16\close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="close16_b" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="close2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\close16_b.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\16\close2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="edit16_a" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\edit16_a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\16\edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="edit16_b" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="edit2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\edit16_b.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\16\edit2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="file16_a" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="file" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\file16_a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\16\file.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="file16_b" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="file2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\file16_b.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\16\file2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="folder16_a" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="folder" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\folder16_a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\16\folder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="folder16_b" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="folder2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\folder16_b.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\16\folder2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="minus16_a" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="minus" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\minus16_a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\16\minus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="minus16_b" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="minus2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\minus16_b.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\16\minus2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="plus16_a" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\plus16_a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\16\plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="plus16_b" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="plus2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\plus16_b.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\16\plus2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>

FizzyLauncher.UI/Properties/Resources20.Designer.cs

@@ -0,0 +1,133 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace AppLauncher.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources20 {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources20() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AppLauncher.Properties.Resources20", typeof(Resources20).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap close {
+            get {
+                object obj = ResourceManager.GetObject("close", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap close2 {
+            get {
+                object obj = ResourceManager.GetObject("close2", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap maximise {
+            get {
+                object obj = ResourceManager.GetObject("maximise", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap maximise2 {
+            get {
+                object obj = ResourceManager.GetObject("maximise2", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap maximise3 {
+            get {
+                object obj = ResourceManager.GetObject("maximise3", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap minimise {
+            get {
+                object obj = ResourceManager.GetObject("minimise", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap minimise2 {
+            get {
+                object obj = ResourceManager.GetObject("minimise2", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+    }
+}

FizzyLauncher.UI/Properties/Resources20.resx

@@ -117,4 +117,26 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, 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="close" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\20\close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="close2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\20\close2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="maximise" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\20\maximise.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="maximise2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\20\maximise2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="maximise3" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\20\maximise3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="minimise" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\20\minimise.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="minimise2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\20\minimise2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

FizzyLauncher.UI/RyzStudio/Windows/Forms/TForm.cs

@@ -5,7 +5,7 @@ using System.Windows.Forms;
 
 namespace AppLauncher.Windows.Forms
 {
-    public class AForm : Form
+    public class TForm : Form
     {
         protected readonly Color borderColour = Color.FromArgb(232, 231, 236);
         protected readonly int borderWidth = 1;
@@ -31,7 +31,7 @@ namespace AppLauncher.Windows.Forms
         private ToolStripMenuItem exitToolStripMenuItem;
         private IContainer components;
 
-        public AForm() : base()
+        public TForm() : base()
         {
             InitializeComponent();
 
@@ -161,7 +161,7 @@ namespace AppLauncher.Windows.Forms
             g.FillRectangle(new SolidBrush(titleBarColour), area.X, area.Y, (area.Width + area.X), titleBarHeight);
             g.DrawLine(new Pen(titleBorderColour, 1), area.X, (titleBarHeight + 1), (area.Width + area.X), (titleBarHeight + 1));
 
-            if (!DesignMode) g.DrawImageUnscaled(Properties.Resources.app_icon_24, 17, 17);
+            if (!DesignMode) g.DrawImageUnscaled(this.AppIcon, 17, 17);
 
             if (!DesignMode) TextRenderer.DrawText(g, Application.ProductName, new Font(this.Font.FontFamily, 14F), new Point(58, 17), titleColour);
 
@@ -186,6 +186,9 @@ namespace AppLauncher.Windows.Forms
         [Category("Appearance")]
         public ContextMenuStrip TitleContextMenuStrip { get; set; } = null;
 
+        [Browsable(false)]
+        public Image AppIcon { get; set; } = null;
+
         protected Point DefaultLocation
         {
             get
@@ -204,7 +207,7 @@ namespace AppLauncher.Windows.Forms
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AForm));
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TForm));
             this.imageBox3 = new RyzStudio.Windows.Forms.TImageBox();
             this.imageBox2 = new RyzStudio.Windows.Forms.TImageBox();
             this.imageBox1 = new RyzStudio.Windows.Forms.TImageBox();
@@ -223,9 +226,9 @@ namespace AppLauncher.Windows.Forms
             this.imageBox3.BackColor = System.Drawing.Color.Transparent;
             this.imageBox3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.imageBox3.ErrorImage = null;
-            this.imageBox3.Image = global::AppLauncher.Resource1.close_20;
+            this.imageBox3.Image = global::AppLauncher.Properties.Resources20.close;
-            this.imageBox3.ImageHover = global::AppLauncher.Resource1.close2_20;
+            this.imageBox3.ImageHover = global::AppLauncher.Properties.Resources20.close2;
-            this.imageBox3.ImageNormal = global::AppLauncher.Resource1.close_20;
+            this.imageBox3.ImageNormal = global::AppLauncher.Properties.Resources20.close;
             this.imageBox3.ImageSelected = null;
             this.imageBox3.InitialImage = null;
             this.imageBox3.IsSelected = false;
@@ -242,10 +245,10 @@ namespace AppLauncher.Windows.Forms
             this.imageBox2.BackColor = System.Drawing.Color.Transparent;
             this.imageBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.imageBox2.ErrorImage = null;
-            this.imageBox2.Image = global::AppLauncher.Resource1.maximise_20;
+            this.imageBox2.Image = global::AppLauncher.Properties.Resources20.maximise;
-            this.imageBox2.ImageHover = global::AppLauncher.Resource1.maximise_20;
+            this.imageBox2.ImageHover = global::AppLauncher.Properties.Resources20.maximise;
-            this.imageBox2.ImageNormal = global::AppLauncher.Resource1.maximise_20;
+            this.imageBox2.ImageNormal = global::AppLauncher.Properties.Resources20.maximise;
-            this.imageBox2.ImageSelected = global::AppLauncher.Resource1.maximise2_20;
+            this.imageBox2.ImageSelected = global::AppLauncher.Properties.Resources20.maximise2;
             this.imageBox2.InitialImage = null;
             this.imageBox2.IsSelected = false;
             this.imageBox2.Location = new System.Drawing.Point(139, 12);
@@ -261,9 +264,9 @@ namespace AppLauncher.Windows.Forms
             this.imageBox1.BackColor = System.Drawing.Color.Transparent;
             this.imageBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.imageBox1.ErrorImage = null;
-            this.imageBox1.Image = global::AppLauncher.Resource1.minimise_20;
+            this.imageBox1.Image = global::AppLauncher.Properties.Resources20.minimise;
-            this.imageBox1.ImageHover = global::AppLauncher.Resource1.minimise2_20;
+            this.imageBox1.ImageHover = global::AppLauncher.Properties.Resources20.minimise2;
-            this.imageBox1.ImageNormal = global::AppLauncher.Resource1.minimise_20;
+            this.imageBox1.ImageNormal = global::AppLauncher.Properties.Resources20.minimise;
             this.imageBox1.ImageSelected = null;
             this.imageBox1.InitialImage = null;
             this.imageBox1.IsSelected = false;
@@ -351,11 +354,11 @@ namespace AppLauncher.Windows.Forms
 
                 if (this.TopMost)
                 {
-                    imageBox2.Image = imageBox2.ImageNormal = Resource1.maximise3_20;
+                    imageBox2.Image = imageBox2.ImageNormal = Properties.Resources20.maximise3;
                 }
                 else
                 {
-                    imageBox2.Image = imageBox2.ImageNormal = Resource1.maximise_20;
+                    imageBox2.Image = imageBox2.ImageNormal = Properties.Resources20.maximise;
                 }
             }
         }

FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TDialogForm.Designer.cs

@@ -50,12 +50,12 @@
             this.imgbxClose.BackColor = System.Drawing.Color.Transparent;
             this.imgbxClose.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.imgbxClose.ErrorImage = null;
-            this.imgbxClose.ImageHover = global::AppLauncher.Properties.Resources.close16_b;
+            this.imgbxClose.ImageHover = global::AppLauncher.Properties.Resources16.close2;
             this.imgbxClose.Image = null;
             this.imgbxClose.InitialImage = null;
             this.imgbxClose.Location = new System.Drawing.Point(308, 4);
             this.imgbxClose.Name = "imgbxClose";
-            this.imgbxClose.ImageNormal = global::AppLauncher.Properties.Resources.close16_a;
+            this.imgbxClose.ImageNormal = global::AppLauncher.Properties.Resources16.close;
             this.imgbxClose.Size = new System.Drawing.Size(24, 24);
             this.imgbxClose.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
             this.imgbxClose.TabIndex = 145;

FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TDialogForm.cs

@@ -3,15 +3,15 @@
     using System;
     using System.ComponentModel;
     using System.Drawing;
-    using System.Drawing.Design;
     using System.Windows.Forms;
-//    using Resources = AppLauncher.Properties.Resources;
 
     public partial class TDialogForm : System.Windows.Forms.Form
     {
-        //protected readonly Color borderColour = Color.FromArgb(232, 231, 236);
         protected readonly Color borderColour = Color.FromArgb(77, 84, 100);
         protected readonly int borderWidth = 1;
+
+        protected readonly Color backColour = Color.FromArgb(254, 254, 254);
+
         protected readonly Color titleBarColour = Color.FromArgb(152, 175, 206);
         protected readonly Color titleBarForeColour = Color.White;
         protected readonly Font titleBarFont = new Font("Segoe UI", 8.25F, FontStyle.Bold, GraphicsUnit.Point, 0);
@@ -31,6 +31,9 @@
             this.TopMost = true;
 
             imgbxClose.Click += pictureBox3_Click;
+
+            this.BackColor = backColour;
+            this.Padding = new Padding(0);
         }
 
         protected override void OnClosing(CancelEventArgs e)
@@ -101,7 +104,7 @@
         }
 
         [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
-        public override Color BackColor { get => base.BackColor; set => base.BackColor = Color.FromArgb(254, 254, 254); }
+        public override Color BackColor { get => base.BackColor; set => base.BackColor = value; }
 
         [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
         public new FormBorderStyle FormBorderStyle { get => base.FormBorderStyle; set => base.FormBorderStyle = value; }

FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TFolderTextBox.cs

@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 using System.Windows.Forms;
-using Resources = AppLauncher.Properties.Resources;
+using Resources = AppLauncher.Properties.Resources16;
 
 namespace RyzStudio.Windows.ThemedForms
 {
@@ -9,8 +9,8 @@ namespace RyzStudio.Windows.ThemedForms
     {
         public TFolderTextBox() : base()
         {
-            this.NormalImage = Resources.folder16_a;
+            this.NormalImage = Resources.folder;
-            this.HighlightImage = Resources.folder16_b;
+            this.HighlightImage = Resources.folder2;
             this.Text = string.Empty;
         }
 

FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TForm.Designer.cs

@@ -1,52 +0,0 @@
-namespace RyzStudio.Windows.ThemedForms
-{
-  partial class TForm
-  {
-    /// <summary>
-    /// Required designer variable.
-    /// </summary>
-    private System.ComponentModel.IContainer components = null;
-
-    /// <summary>
-    /// Clean up any resources being used.
-    /// </summary>
-    /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-    protected override void Dispose(bool disposing)
-    {
-      if (disposing && (components != null))
-      {
-        components.Dispose();
-      }
-      base.Dispose(disposing);
-    }
-
-    #region Windows Form Designer generated code
-
-    /// <summary>
-    /// Required method for Designer support - do not modify
-    /// the contents of this method with the code editor.
-    /// </summary>
-    private void InitializeComponent()
-    {
-			this.SuspendLayout();
-			// 
-			// Form
-			// 
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
-			this.BackColor = System.Drawing.Color.WhiteSmoke;
-			this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
-			this.ClientSize = new System.Drawing.Size(584, 381);
-			this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.ForeColor = System.Drawing.Color.Black;
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-			this.MaximizeBox = false;
-			this.MinimumSize = new System.Drawing.Size(600, 420);
-			this.Name = "Form";
-			this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
-			this.ResumeLayout(false);
-
-    }
-
-        #endregion
-    }
-}

FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TForm.cs

@@ -1,173 +0,0 @@
-namespace RyzStudio.Windows.ThemedForms
-{
-    using System;
-    using System.ComponentModel;
-    using System.Drawing;
-    using System.Windows.Forms;
-
-    public partial class TForm : System.Windows.Forms.Form
-    {
-		protected Color topFillColour = Color.FromArgb(15, 15, 15);
-		protected int topFillHeight = 52;
-
-		protected Color bottomFillColour = Color.FromArgb(15, 15, 15);
-		protected int bottomFillMargin = 19;
-
-        protected int borderWidth = 1;
-
-        public TForm()
-        {
-            this.InitializeComponent();
-
-			this.BackColor = Color.FromArgb(246, 246, 246);
-		}
-
-        protected override void OnResize(EventArgs e)
-        {
-            base.OnResize(e);
-
-            this.Invalidate();
-        }
-
-        protected override void OnPaint(PaintEventArgs e)
-        {
-            base.OnPaint(e);
-
-			Graphics g = e.Graphics;
-
-            Rectangle areaTop = new Rectangle(this.DisplayRectangle.Left, this.Padding.Top, this.DisplayRectangle.Width, topFillHeight);
-            Rectangle areaBottom = new Rectangle(this.DisplayRectangle.Left, (this.DisplayRectangle.Height - bottomFillMargin), this.DisplayRectangle.Width, bottomFillMargin);
-            Rectangle areaBorder = new Rectangle(this.ClientRectangle.X, this.ClientRectangle.Y, this.ClientRectangle.Width - borderWidth, this.ClientRectangle.Height - borderWidth);
-
-            // draw header
-            if (topFillHeight > 0)
-			{
-				g.FillRectangle(new SolidBrush(topFillColour), areaTop);
-			}
-
-            // draw footer
-			if (bottomFillMargin > 0)
-			{
-				g.FillRectangle(new SolidBrush(bottomFillColour), areaBottom);
-			}
-
-			// draw logo
-			if (this.TitleLogo != null)
-			{
-				g.DrawImageUnscaled(this.TitleLogo, this.Padding.Left, this.Padding.Top);
-			}
-
-			if (this.Banner != null)
-			{
-				g.DrawImageUnscaled(this.Banner, this.Padding.Left, (this.DisplayRectangle.Height - this.Banner.Height - bottomFillMargin), (this.DisplayRectangle.Width - (this.Padding.Left + this.Padding.Right)), this.Banner.Height);
-			}
-
-            g.DrawRectangle(new Pen(Color.Black, borderWidth), areaBorder);
-        }
-
-		[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
-		public new Color BackColor { get => base.BackColor; set { base.BackColor = value; } }
-
-        [Category("Appearance"), Browsable(true)]
-        public Image TitleLogo { get; set; }
-
-        [Category("Appearance"), Browsable(true)]
-        public Image Banner { get; set; }
-
-        public void SetValue(Label sender, string value)
-		{
-			if (sender.InvokeRequired)
-			{
-				sender.Invoke(new MethodInvoker(() => { sender.Text = value; }));
-			}
-			else
-			{
-				sender.Text = value;
-			}
-		}
-
-		public void SetValue(GroupBox sender, string value)
-		{
-			if (sender.InvokeRequired)
-			{
-				sender.Invoke(new MethodInvoker(() => { sender.Text = value; }));
-			}
-			else
-			{
-				sender.Text = value;
-			}
-		}
-
-		public void AddValue(ListBox sender, string value)
-		{
-			if (sender.InvokeRequired)
-			{
-				sender.Invoke(new MethodInvoker(() => { sender.Items.Add(value); }));
-			}
-			else
-			{
-				sender.Items.Add(value);
-			}
-		}
-
-		public void ClearValues(ListBox sender)
-		{
-			if (sender.InvokeRequired)
-			{
-				sender.Invoke(new MethodInvoker(() => { sender.Items.Clear(); }));
-			}
-			else
-			{
-				sender.Items.Clear();
-			}
-		}
-
-		public string GetValue(ListBox sender)
-		{
-			string rv = string.Empty;
-
-			if (sender.InvokeRequired)
-			{
-				sender.Invoke(new MethodInvoker(() => { rv = (sender.SelectedItem == null) ? string.Empty : sender.SelectedItem.ToString(); }));
-			}
-			else
-			{
-				rv = (sender.SelectedItem == null) ? string.Empty : sender.SelectedItem.ToString();
-			}
-
-			return rv;
-		}
-
-		public string GetValue(TTextBox sender)
-		{
-			string rv = string.Empty;
-
-			if (sender.InvokeRequired)
-			{
-				sender.Invoke(new MethodInvoker(() => { rv = sender.Text.Trim(); }));
-			}
-			else
-			{
-				rv = sender.Text.Trim();
-			}
-
-			return rv;
-		}
-
-		public int GetValue(NumericUpDown sender)
-		{
-			int rv = 0;
-
-			if (sender.InvokeRequired)
-			{
-				sender.Invoke(new MethodInvoker(() => { rv = (int)sender.Value; }));
-			}
-			else
-			{
-				rv = (int)sender.Value;
-			}
-
-			return rv;
-		}
-	}
-}

FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TListBox.designer.cs

@@ -60,12 +60,12 @@
             this.imageBox5.BackColor = System.Drawing.Color.Transparent;
             this.imageBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.imageBox5.ErrorImage = null;
-            this.imageBox5.ImageHover = global::AppLauncher.Properties.Resources.edit16_b;
+            this.imageBox5.ImageHover = global::AppLauncher.Properties.Resources16.edit2;
-            this.imageBox5.Image = global::AppLauncher.Properties.Resources.edit16_a;
+            this.imageBox5.Image = global::AppLauncher.Properties.Resources16.edit;
             this.imageBox5.InitialImage = null;
             this.imageBox5.Location = new System.Drawing.Point(52, 94);
             this.imageBox5.Name = "imageBox5";
-            this.imageBox5.ImageNormal = global::AppLauncher.Properties.Resources.edit16_a;
+            this.imageBox5.ImageNormal = global::AppLauncher.Properties.Resources16.edit;
             this.imageBox5.Size = new System.Drawing.Size(18, 25);
             this.imageBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
             this.imageBox5.TabIndex = 6;
@@ -79,12 +79,12 @@
             this.imageBox4.BackColor = System.Drawing.Color.Transparent;
             this.imageBox4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.imageBox4.ErrorImage = null;
-            this.imageBox4.ImageHover = global::AppLauncher.Properties.Resources.arrow_down16_b;
+            this.imageBox4.ImageHover = global::AppLauncher.Properties.Resources16.arrow_down2;
-            this.imageBox4.Image = global::AppLauncher.Properties.Resources.arrow_down16_a;
+            this.imageBox4.Image = global::AppLauncher.Properties.Resources16.arrow_down;
             this.imageBox4.InitialImage = null;
             this.imageBox4.Location = new System.Drawing.Point(100, 94);
             this.imageBox4.Name = "imageBox4";
-            this.imageBox4.ImageNormal = global::AppLauncher.Properties.Resources.arrow_down16_a;
+            this.imageBox4.ImageNormal = global::AppLauncher.Properties.Resources16.arrow_down;
             this.imageBox4.Size = new System.Drawing.Size(18, 25);
             this.imageBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
             this.imageBox4.TabIndex = 5;
@@ -98,12 +98,12 @@
             this.imageBox3.BackColor = System.Drawing.Color.Transparent;
             this.imageBox3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.imageBox3.ErrorImage = null;
-            this.imageBox3.ImageHover = global::AppLauncher.Properties.Resources.arrow_up16_b;
+            this.imageBox3.ImageHover = global::AppLauncher.Properties.Resources16.arrow_up2;
-            this.imageBox3.Image = global::AppLauncher.Properties.Resources.arrow_up16_a;
+            this.imageBox3.Image = global::AppLauncher.Properties.Resources16.arrow_up;
             this.imageBox3.InitialImage = null;
             this.imageBox3.Location = new System.Drawing.Point(76, 94);
             this.imageBox3.Name = "imageBox3";
-            this.imageBox3.ImageNormal = global::AppLauncher.Properties.Resources.arrow_up16_a;
+            this.imageBox3.ImageNormal = global::AppLauncher.Properties.Resources16.arrow_up;
             this.imageBox3.Size = new System.Drawing.Size(18, 25);
             this.imageBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
             this.imageBox3.TabIndex = 4;
@@ -117,12 +117,12 @@
             this.imageBox2.BackColor = System.Drawing.Color.Transparent;
             this.imageBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.imageBox2.ErrorImage = null;
-            this.imageBox2.ImageHover = global::AppLauncher.Properties.Resources.minus16_b;
+            this.imageBox2.ImageHover = global::AppLauncher.Properties.Resources16.minus2;
-            this.imageBox2.Image = global::AppLauncher.Properties.Resources.minus16_a;
+            this.imageBox2.Image = global::AppLauncher.Properties.Resources16.minus;
             this.imageBox2.InitialImage = null;
             this.imageBox2.Location = new System.Drawing.Point(28, 94);
             this.imageBox2.Name = "imageBox2";
-            this.imageBox2.ImageNormal = global::AppLauncher.Properties.Resources.minus16_a;
+            this.imageBox2.ImageNormal = global::AppLauncher.Properties.Resources16.minus;
             this.imageBox2.Size = new System.Drawing.Size(18, 25);
             this.imageBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
             this.imageBox2.TabIndex = 3;
@@ -136,12 +136,12 @@
             this.imageBox1.BackColor = System.Drawing.Color.Transparent;
             this.imageBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.imageBox1.ErrorImage = null;
-            this.imageBox1.ImageHover = global::AppLauncher.Properties.Resources.plus16_b;
+            this.imageBox1.ImageHover = global::AppLauncher.Properties.Resources16.plus2;
-            this.imageBox1.Image = global::AppLauncher.Properties.Resources.plus16_a;
+            this.imageBox1.Image = global::AppLauncher.Properties.Resources16.plus;
             this.imageBox1.InitialImage = null;
             this.imageBox1.Location = new System.Drawing.Point(4, 94);
             this.imageBox1.Name = "imageBox1";
-            this.imageBox1.ImageNormal = global::AppLauncher.Properties.Resources.plus16_a;
+            this.imageBox1.ImageNormal = global::AppLauncher.Properties.Resources16.plus;
             this.imageBox1.Size = new System.Drawing.Size(18, 25);
             this.imageBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
             this.imageBox1.TabIndex = 2;

FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TOpenFileTextBox.cs

@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 using System.Windows.Forms;
-using Resources = AppLauncher.Properties.Resources;
+using Resources = AppLauncher.Properties.Resources16;
 
 namespace RyzStudio.Windows.ThemedForms
 {
@@ -9,8 +9,8 @@ namespace RyzStudio.Windows.ThemedForms
     {
         public TOpenFileTextBox() : base()
         {
-            this.NormalImage = Resources.file16_a;
+            this.NormalImage = Resources.file;
-            this.HighlightImage = Resources.file16_b;
+            this.HighlightImage = Resources.file2;
             this.Text = string.Empty;
         }
 

FizzyLauncher.csproj

@@ -73,11 +73,6 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Include="Resource1.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resource1.resx</DependentUpon>
-    </Compile>
     <Compile Include="Windows\Forms\Tile\AddTileForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -96,9 +91,6 @@
     <Compile Include="Windows\Forms\Tile\EditTileForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Windows\Forms\AForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
     <Compile Include="Windows\Forms\Tile\TTilePanelLayout.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -118,13 +110,6 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resource1.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resource1.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Windows\Forms\AForm.resx">
-      <DependentUpon>AForm.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Windows\Forms\Tile\AddTileForm.resx">
       <DependentUpon>AddTileForm.cs</DependentUpon>
     </EmbeddedResource>

MainForm.cs

@@ -13,7 +13,7 @@ using System.Windows.Forms;
 
 namespace AppLauncher
 {
-    public partial class MainForm : AForm
+    public partial class MainForm : TForm
     {
         [DllImport("user32.dll")]
         protected static extern bool RegisterHotKey(IntPtr hWnd, int id, int fsModifiers, int vk);
@@ -34,6 +34,7 @@ namespace AppLauncher
         {
             InitializeComponent();
 
+            this.AppIcon = Properties.Resources.app_icon_24;
             this.StartPosition = FormStartPosition.WindowsDefaultBounds;
         }
 

Resource1.Designer.cs

@@ -1,293 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace AppLauncher {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resource1 {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resource1() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AppLauncher.Resource1", typeof(Resource1).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap arrow_down {
-            get {
-                object obj = ResourceManager.GetObject("arrow_down", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap arrow_down2 {
-            get {
-                object obj = ResourceManager.GetObject("arrow_down2", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap arrow_up {
-            get {
-                object obj = ResourceManager.GetObject("arrow_up", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap arrow_up2 {
-            get {
-                object obj = ResourceManager.GetObject("arrow_up2", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap close_16 {
-            get {
-                object obj = ResourceManager.GetObject("close_16", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap close_20 {
-            get {
-                object obj = ResourceManager.GetObject("close_20", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap close2_16 {
-            get {
-                object obj = ResourceManager.GetObject("close2_16", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap close2_20 {
-            get {
-                object obj = ResourceManager.GetObject("close2_20", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap edit {
-            get {
-                object obj = ResourceManager.GetObject("edit", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap edit2 {
-            get {
-                object obj = ResourceManager.GetObject("edit2", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap file {
-            get {
-                object obj = ResourceManager.GetObject("file", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap file2 {
-            get {
-                object obj = ResourceManager.GetObject("file2", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap folder {
-            get {
-                object obj = ResourceManager.GetObject("folder", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap folder2 {
-            get {
-                object obj = ResourceManager.GetObject("folder2", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap maximise_20 {
-            get {
-                object obj = ResourceManager.GetObject("maximise_20", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap maximise2_20 {
-            get {
-                object obj = ResourceManager.GetObject("maximise2_20", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap maximise3_20 {
-            get {
-                object obj = ResourceManager.GetObject("maximise3_20", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap minimise_20 {
-            get {
-                object obj = ResourceManager.GetObject("minimise_20", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap minimise2_20 {
-            get {
-                object obj = ResourceManager.GetObject("minimise2_20", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap minus {
-            get {
-                object obj = ResourceManager.GetObject("minus", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap minus2 {
-            get {
-                object obj = ResourceManager.GetObject("minus2", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap plus {
-            get {
-                object obj = ResourceManager.GetObject("plus", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap plus2 {
-            get {
-                object obj = ResourceManager.GetObject("plus2", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-    }
-}

Resource1.resx

@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... 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>
-    <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">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <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>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, 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="arrow_down" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>RyzStudio\Windows\Forms\Resources\arrow_down.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="arrow_down2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>RyzStudio\Windows\Forms\Resources\arrow_down2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="arrow_up" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>RyzStudio\Windows\Forms\Resources\arrow_up.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="arrow_up2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>RyzStudio\Windows\Forms\Resources\arrow_up2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="close2_16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>RyzStudio\Windows\Forms\Resources\close2_16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="close2_20" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>RyzStudio\Windows\Forms\Resources\close2_20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="close_16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>RyzStudio\Windows\Forms\Resources\close_16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="close_20" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>RyzStudio\Windows\Forms\Resources\close_20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>RyzStudio\Windows\Forms\Resources\edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="edit2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>RyzStudio\Windows\Forms\Resources\edit2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="file" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>RyzStudio\Windows\Forms\Resources\file.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="file2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>RyzStudio\Windows\Forms\Resources\file2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="folder" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>RyzStudio\Windows\Forms\Resources\folder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="folder2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>RyzStudio\Windows\Forms\Resources\folder2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="maximise2_20" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>RyzStudio\Windows\Forms\Resources\maximise2_20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="maximise3_20" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>RyzStudio\Windows\Forms\Resources\maximise3_20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="maximise_20" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>RyzStudio\Windows\Forms\Resources\maximise_20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="minimise2_20" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>RyzStudio\Windows\Forms\Resources\minimise2_20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="minimise_20" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>RyzStudio\Windows\Forms\Resources\minimise_20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="minus" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>RyzStudio\Windows\Forms\Resources\minus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="minus2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>RyzStudio\Windows\Forms\Resources\minus2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>RyzStudio\Windows\Forms\Resources\plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="plus2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>RyzStudio\Windows\Forms\Resources\plus2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-</root>

installer.iss

@@ -1,51 +0,0 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
-#define MyAppName "Fizzy Launcher"
-#define MyAppVersion "0.1.1.109 alpha"
-#define MyAppPublisher "Hi, I'm Ray"
-#define MyAppURL "https://www.hiimray.co.uk/software-fizzy-launcher"
-#define MyAppExeName "fizzylauncher.exe"
-
-[Setup]
-; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
-; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{472ED37C-C4FC-4B72-8BC3-C281A6E0D2F9}
-AppName={#MyAppName}
-AppVersion={#MyAppVersion}
-;AppVerName={#MyAppName} {#MyAppVersion}
-AppPublisher={#MyAppPublisher}
-AppPublisherURL={#MyAppURL}
-AppSupportURL={#MyAppURL}
-AppUpdatesURL={#MyAppURL}
-DefaultDirName={autopf}\{#MyAppName}
-DefaultGroupName={#MyAppName}
-DisableProgramGroupPage=yes
-; Remove the following line to run in administrative install mode (install for all users.)
-PrivilegesRequired=lowest
-OutputDir=L:\gitlab-hiimray\fizzy-launcher\bin
-OutputBaseFilename=fizzy-launcher
-Compression=lzma
-SolidCompression=yes
-WizardStyle=modern
-
-[Languages]
-Name: "english"; MessagesFile: "compiler:Default.isl"
-
-[Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-
-[Files]
-Source: "L:\gitlab-hiimray\fizzy-launcher\bin\Release\fizzylauncher.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "L:\gitlab-hiimray\fizzy-launcher\bin\Release\Newtonsoft.Json.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "L:\gitlab-hiimray\fizzy-launcher\bin\Release\Newtonsoft.Json.xml"; DestDir: "{app}"; Flags: ignoreversion
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-
-[Icons]
-Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
-Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
-Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
-
-[Run]
-Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
-