diff --git a/AppResource.Designer.cs b/AppResource.Designer.cs
index 502b3a3..b11e4a2 100644
--- a/AppResource.Designer.cs
+++ b/AppResource.Designer.cs
@@ -78,6 +78,26 @@ namespace BookmarkManager {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap arrow_down_circle {
+            get {
+                object obj = ResourceManager.GetObject("arrow_down_circle", 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_circle {
+            get {
+                object obj = ResourceManager.GetObject("arrow_up_circle", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -88,6 +108,16 @@ namespace BookmarkManager {
             }
         }
         
+        /// <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>
@@ -118,6 +148,16 @@ namespace BookmarkManager {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap help_circle {
+            get {
+                object obj = ResourceManager.GetObject("help_circle", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -128,6 +168,46 @@ namespace BookmarkManager {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap save {
+            get {
+                object obj = ResourceManager.GetObject("save", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap search {
+            get {
+                object obj = ResourceManager.GetObject("search", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap settings {
+            get {
+                object obj = ResourceManager.GetObject("settings", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap trash {
+            get {
+                object obj = ResourceManager.GetObject("trash", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to https://www.hiimray.co.uk/software-bookmark-manager.
         /// </summary>
diff --git a/AppResource.resx b/AppResource.resx
index 97991b2..64c474c 100644
--- a/AppResource.resx
+++ b/AppResource.resx
@@ -124,9 +124,18 @@
     <value>Bookmark Manager</value>
   </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="arrow_down_circle" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\arrow-down-circle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="arrow_up_circle" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\arrow-up-circle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="bookmark" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Resources\bookmark.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>Resources\file.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="file_text" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Resources\file-text.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -136,9 +145,24 @@
   <data name="folder_explore" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Resources\folder_explore.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="help_circle" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\help-circle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="hexagon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Resources\hexagon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="save" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="search" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="settings" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\settings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="trash" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\trash.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="url_help" xml:space="preserve">
     <value>https://www.hiimray.co.uk/software-bookmark-manager</value>
   </data>
diff --git a/BookmarkForm.cs b/BookmarkForm.cs
index 0ccd4d1..0b4ea02 100644
--- a/BookmarkForm.cs
+++ b/BookmarkForm.cs
@@ -1,6 +1,8 @@
 using BookmarkManager;
 using bzit.bomg.Models;
 using FizzyLauncher.Models;
+using RyzStudio;
+using RyzStudio.IO;
 using RyzStudio.Windows.Forms;
 using RyzStudio.Windows.ThemedForms;
 using System;
@@ -46,6 +48,7 @@ namespace FizzyLauncher
 
             textBox1.Text = model.SiteName?.Trim() ?? string.Empty;
             textBox2.Text = model.SiteAddress?.Trim() ?? string.Empty;
+            textBox2.SetIcon("search");
             memoBox1.Text = model.SiteDescription?.Trim() ?? string.Empty;
             memoBox2.Text = model.Notes?.Trim() ?? string.Empty;
             pictureBox1.Image = icon;
@@ -90,19 +93,18 @@ namespace FizzyLauncher
             //
             // button1
             //
+            this.button1.ActiveImage = null;
             this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.button1.BackColor = System.Drawing.Color.Transparent;
-            this.button1.DefaultImage = null;
-            this.button1.DownImage = null;
-            this.button1.IsSelected = false;
+            this.button1.HoverImage = null;
+            this.button1.IdleImage = null;
             this.button1.LabelText = "&Save";
             this.button1.Location = new System.Drawing.Point(241, 469);
-            this.button1.Margin = new System.Windows.Forms.Padding(10);
+            this.button1.Margin = new System.Windows.Forms.Padding(10, 0, 0, 10);
             this.button1.Name = "button1";
-            this.button1.OverImage = null;
             this.button1.Padding = new System.Windows.Forms.Padding(4, 4, 3, 3);
             this.button1.Size = new System.Drawing.Size(128, 32);
-            this.button1.TabIndex = 173;
+            this.button1.TabIndex = 4;
             this.button1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.button1_MouseClick);
             //
             // tHorizontalSeparator1
@@ -113,13 +115,14 @@ namespace FizzyLauncher
             this.tHorizontalSeparator1.AutoScrollMinSize = new System.Drawing.Size(0, 0);
             this.tHorizontalSeparator1.BackColor = System.Drawing.Color.Transparent;
             this.tHorizontalSeparator1.Location = new System.Drawing.Point(10, 437);
-            this.tHorizontalSeparator1.Margin = new System.Windows.Forms.Padding(10, 0, 10, 0);
+            this.tHorizontalSeparator1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 10);
             this.tHorizontalSeparator1.MaximumSize = new System.Drawing.Size(4920, 2);
             this.tHorizontalSeparator1.MinimumSize = new System.Drawing.Size(0, 22);
             this.tHorizontalSeparator1.Name = "tHorizontalSeparator1";
             this.tHorizontalSeparator1.Padding = new System.Windows.Forms.Padding(0, 10, 0, 10);
             this.tHorizontalSeparator1.Size = new System.Drawing.Size(364, 22);
             this.tHorizontalSeparator1.TabIndex = 188;
+            this.tHorizontalSeparator1.TabStop = false;
             //
             // tHorizontalSeparator2
             //
@@ -129,27 +132,29 @@ namespace FizzyLauncher
             this.tHorizontalSeparator2.AutoScrollMinSize = new System.Drawing.Size(0, 0);
             this.tHorizontalSeparator2.BackColor = System.Drawing.Color.Transparent;
             this.tHorizontalSeparator2.Location = new System.Drawing.Point(10, 223);
-            this.tHorizontalSeparator2.Margin = new System.Windows.Forms.Padding(10, 0, 10, 0);
+            this.tHorizontalSeparator2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 10);
             this.tHorizontalSeparator2.MaximumSize = new System.Drawing.Size(4920, 2);
             this.tHorizontalSeparator2.MinimumSize = new System.Drawing.Size(0, 22);
             this.tHorizontalSeparator2.Name = "tHorizontalSeparator2";
             this.tHorizontalSeparator2.Padding = new System.Windows.Forms.Padding(0, 10, 0, 10);
             this.tHorizontalSeparator2.Size = new System.Drawing.Size(364, 22);
             this.tHorizontalSeparator2.TabIndex = 190;
+            this.tHorizontalSeparator2.TabStop = false;
             //
             // textBox1
             //
+            this.textBox1.AcceptButton = null;
             this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
             this.textBox1.BackColor = System.Drawing.Color.Transparent;
             this.textBox1.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
             this.textBox1.Location = new System.Drawing.Point(110, 20);
-            this.textBox1.Margin = new System.Windows.Forms.Padding(10, 6, 10, 6);
+            this.textBox1.Margin = new System.Windows.Forms.Padding(10, 0, 0, 10);
             this.textBox1.Name = "textBox1";
             this.textBox1.Padding = new System.Windows.Forms.Padding(10, 10, 9, 9);
+            this.textBox1.ReadOnly = false;
             this.textBox1.Size = new System.Drawing.Size(222, 35);
-            this.textBox1.SubmitButton = null;
-            this.textBox1.TabIndex = 192;
+            this.textBox1.TabIndex = 0;
             this.textBox1.UseSystemPasswordChar = false;
             //
             // label2
@@ -185,12 +190,14 @@ namespace FizzyLauncher
             this.memoBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
             this.memoBox1.BackColor = System.Drawing.Color.Transparent;
+            this.memoBox1.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
             this.memoBox1.Location = new System.Drawing.Point(110, 112);
             this.memoBox1.Margin = new System.Windows.Forms.Padding(10, 6, 10, 6);
             this.memoBox1.Name = "memoBox1";
             this.memoBox1.Padding = new System.Windows.Forms.Padding(10, 10, 3, 9);
+            this.memoBox1.ReadOnly = false;
             this.memoBox1.Size = new System.Drawing.Size(259, 105);
-            this.memoBox1.TabIndex = 197;
+            this.memoBox1.TabIndex = 2;
             //
             // memoBox2
             //
@@ -198,12 +205,14 @@ namespace FizzyLauncher
             | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
             this.memoBox2.BackColor = System.Drawing.Color.Transparent;
+            this.memoBox2.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
             this.memoBox2.Location = new System.Drawing.Point(110, 251);
             this.memoBox2.Margin = new System.Windows.Forms.Padding(10, 6, 10, 6);
             this.memoBox2.Name = "memoBox2";
             this.memoBox2.Padding = new System.Windows.Forms.Padding(10, 10, 3, 9);
+            this.memoBox2.ReadOnly = false;
             this.memoBox2.Size = new System.Drawing.Size(259, 180);
-            this.memoBox2.TabIndex = 199;
+            this.memoBox2.TabIndex = 3;
             //
             // label4
             //
@@ -221,19 +230,19 @@ namespace FizzyLauncher
             //
             // textBox2
             //
+            this.textBox2.AcceptButton = null;
             this.textBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
             this.textBox2.BackColor = System.Drawing.Color.Transparent;
             this.textBox2.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
-            this.textBox2.HighlightImage = global::RyzStudio.UIResource.search2;
+            this.textBox2.HighlightImage = null;
             this.textBox2.Location = new System.Drawing.Point(110, 66);
-            this.textBox2.Margin = new System.Windows.Forms.Padding(10, 3, 3, 3);
+            this.textBox2.Margin = new System.Windows.Forms.Padding(10, 0, 0, 10);
             this.textBox2.Name = "textBox2";
-            this.textBox2.NormalImage = global::RyzStudio.UIResource.search;
-            this.textBox2.Padding = new System.Windows.Forms.Padding(10, 10, 9, 9);
-            this.textBox2.Size = new System.Drawing.Size(259, 35);
-            this.textBox2.SubmitButton = null;
-            this.textBox2.TabIndex = 200;
+            this.textBox2.NormalImage = null;
+            this.textBox2.Padding = new System.Windows.Forms.Padding(10, 9, 9, 9);
+            this.textBox2.Size = new System.Drawing.Size(259, 34);
+            this.textBox2.TabIndex = 1;
             this.textBox2.UseSystemPasswordChar = false;
             this.textBox2.OnButtonClick += new System.EventHandler(this.textBox2_OnButtonClick);
             //
@@ -344,7 +353,7 @@ namespace FizzyLauncher
             {
                 isBusy = value;
 
-                ThreadControl.SetValue(pictureBox2, (isBusy ? RyzStudio.UIResource.loading_block : null));
+                ThreadControl.SetValue(pictureBox2, (isBusy ? UIcon.GetImage("loading_block") : null));
 
                 ThreadControl.SetEnable(textBox1, !isBusy);
                 ThreadControl.SetEnable(textBox2, !isBusy);
@@ -386,8 +395,8 @@ namespace FizzyLauncher
 
                 if (rs.Item == null) rs.Item = new BookmarkItem();
 
-                if (!string.IsNullOrWhiteSpace(rs.Item.SiteName)) ThreadControl.SetText(textBox1.InnerTextBox, rs.Item.SiteName);
-                if (!string.IsNullOrWhiteSpace(rs.Item.SiteDescription)) ThreadControl.SetText(memoBox1.InnerTextBox, rs.Item.SiteDescription);
+                if (!string.IsNullOrWhiteSpace(rs.Item.SiteName)) ThreadControl.SetText(textBox1.TextBox, rs.Item.SiteName);
+                if (!string.IsNullOrWhiteSpace(rs.Item.SiteDescription)) ThreadControl.SetText(memoBox1.TextBox, rs.Item.SiteDescription);
 
                 if (string.IsNullOrWhiteSpace(rs.IconURL))
                 {
diff --git a/BookmarkManager.csproj b/BookmarkManager.csproj
index d57d51d..11cc7fc 100644
--- a/BookmarkManager.csproj
+++ b/BookmarkManager.csproj
@@ -12,19 +12,21 @@
     <Company>Hi, I'm Ray</Company>
     <Product>Bookmark Manager</Product>
     <Copyright>Ray Lam</Copyright>
-    <AssemblyVersion>0.4.2.008</AssemblyVersion>
-    <FileVersion>0.4.2.008</FileVersion>
-    <Version>0.4.2.008</Version>
+    <AssemblyVersion>0.4.3.030</AssemblyVersion>
+    <FileVersion>0.4.3.030</FileVersion>
+    <Version>0.4.3.030</Version>
     <PackageId>bookmarkmanager</PackageId>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <OutputPath>bin\Debug\</OutputPath>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DebugType>none</DebugType>
     <DebugSymbols>false</DebugSymbols>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
 
   <ItemGroup>
@@ -53,7 +55,6 @@
     <Compile Remove="Models\TileModel.cs" />
     <Compile Remove="NewForm.cs" />
     <Compile Remove="OpenFileForm.cs" />
-    <Compile Remove="UIResource.Designer.cs" />
     <Compile Remove="Windows\Forms\BookmarkTreeViewSNode.cs" />
     <Compile Remove="Windows\Forms\EditGroupForm.cs" />
     <Compile Remove="Windows\Forms\EditTileFolderForm.cs" />
@@ -68,7 +69,6 @@
   <ItemGroup>
     <EmbeddedResource Remove="NewForm.resx" />
     <EmbeddedResource Remove="OpenFileForm.resx" />
-    <EmbeddedResource Remove="UIResource.resx" />
     <EmbeddedResource Remove="Windows\Forms\EditGroupForm.resx" />
     <EmbeddedResource Remove="Windows\Forms\EditTileFolderForm.resx" />
     <EmbeddedResource Remove="Windows\Forms\EditTileForm.resx" />
@@ -79,9 +79,10 @@
 
   <ItemGroup>
     <None Remove=".gitignore" />
+    <None Remove="build.bat" />
+    <None Remove="build64.bat" />
     <None Remove="installer-64.iss" />
     <None Remove="installer-86.iss" />
-    <None Remove="Resources\loading-block.gif" />
   </ItemGroup>
 
   <ItemGroup>
@@ -95,18 +96,15 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>AppResource.resx</DependentUpon>
     </Compile>
-    <Compile Update="UpdateIconsForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Update="FindForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Update="BookmarkForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Update="PasswordForm.cs">
-      <SubType>Form</SubType>
+    <Compile Update="UIResource.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>UIResource.resx</DependentUpon>
     </Compile>
+    <Compile Update="UpdateIconsForm.cs" />
+    <Compile Update="FindForm.cs" />
+    <Compile Update="BookmarkForm.cs" />
+    <Compile Update="PasswordForm.cs" />
   </ItemGroup>
 
   <ItemGroup>
@@ -114,6 +112,10 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>AppResource.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <EmbeddedResource Update="UIResource.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>UIResource.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/FindForm.cs b/FindForm.cs
index 57f5c1e..56f28f6 100644
--- a/FindForm.cs
+++ b/FindForm.cs
@@ -27,7 +27,7 @@ namespace FizzyLauncher
 
             this.StartPosition = FormStartPosition.WindowsDefaultLocation;
 
-            textBox1.InnerTextBox.PreviewKeyDown += textBox1_PreviewKeyDown;
+            textBox1.PreviewKeyDown += textBox1_PreviewKeyDown;
         }
 
         private void InitializeComponent()
@@ -38,9 +38,9 @@ namespace FizzyLauncher
             this.textBox1 = new RyzStudio.Windows.ThemedForms.TTextBox();
             this.button1 = new RyzStudio.Windows.ThemedForms.TButton();
             this.SuspendLayout();
-            //
+            // 
             // label1
-            //
+            // 
             this.label1.AutoSize = true;
             this.label1.BackColor = System.Drawing.Color.Transparent;
             this.label1.ForeColor = System.Drawing.SystemColors.ControlText;
@@ -52,74 +52,74 @@ namespace FizzyLauncher
             this.label1.TabIndex = 153;
             this.label1.Text = "Find";
             this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            //
+            // 
             // button2
-            //
+            // 
+            this.button2.ActiveImage = null;
             this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.button2.BackColor = System.Drawing.Color.Transparent;
-            this.button2.DefaultImage = null;
-            this.button2.DownImage = null;
-            this.button2.IsSelected = false;
+            this.button2.HoverImage = null;
+            this.button2.IdleImage = null;
             this.button2.LabelText = "&Next";
             this.button2.Location = new System.Drawing.Point(321, 99);
-            this.button2.Margin = new System.Windows.Forms.Padding(10);
+            this.button2.Margin = new System.Windows.Forms.Padding(10, 0, 0, 10);
             this.button2.Name = "button2";
-            this.button2.OverImage = null;
             this.button2.Padding = new System.Windows.Forms.Padding(4, 4, 3, 3);
             this.button2.Size = new System.Drawing.Size(128, 32);
-            this.button2.TabIndex = 173;
+            this.button2.TabIndex = 2;
             this.button2.MouseClick += new System.Windows.Forms.MouseEventHandler(this.button2_MouseClick);
-            //
+            // 
             // tHorizontalSeparator1
-            //
-            this.tHorizontalSeparator1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+            // 
+            this.tHorizontalSeparator1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.tHorizontalSeparator1.AutoScrollMargin = new System.Drawing.Size(0, 0);
             this.tHorizontalSeparator1.AutoScrollMinSize = new System.Drawing.Size(0, 0);
             this.tHorizontalSeparator1.BackColor = System.Drawing.Color.Transparent;
             this.tHorizontalSeparator1.Location = new System.Drawing.Point(10, 67);
-            this.tHorizontalSeparator1.Margin = new System.Windows.Forms.Padding(10, 0, 10, 0);
+            this.tHorizontalSeparator1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 10);
             this.tHorizontalSeparator1.MaximumSize = new System.Drawing.Size(4920, 2);
             this.tHorizontalSeparator1.MinimumSize = new System.Drawing.Size(0, 22);
             this.tHorizontalSeparator1.Name = "tHorizontalSeparator1";
             this.tHorizontalSeparator1.Padding = new System.Windows.Forms.Padding(0, 10, 0, 10);
             this.tHorizontalSeparator1.Size = new System.Drawing.Size(444, 22);
             this.tHorizontalSeparator1.TabIndex = 188;
-            //
+            this.tHorizontalSeparator1.TabStop = false;
+            // 
             // textBox1
-            //
-            this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+            // 
+            this.textBox1.AcceptButton = this.button2;
+            this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.textBox1.BackColor = System.Drawing.Color.Transparent;
             this.textBox1.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
             this.textBox1.Location = new System.Drawing.Point(121, 20);
-            this.textBox1.Margin = new System.Windows.Forms.Padding(10, 6, 10, 6);
+            this.textBox1.Margin = new System.Windows.Forms.Padding(10, 0, 0, 10);
             this.textBox1.Name = "textBox1";
             this.textBox1.Padding = new System.Windows.Forms.Padding(10, 10, 9, 9);
+            this.textBox1.ReadOnly = false;
             this.textBox1.Size = new System.Drawing.Size(328, 35);
-            this.textBox1.SubmitButton = null;
-            this.textBox1.TabIndex = 191;
+            this.textBox1.TabIndex = 0;
             this.textBox1.UseSystemPasswordChar = false;
-            //
+            // 
             // button1
-            //
+            // 
+            this.button1.ActiveImage = null;
             this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.button1.BackColor = System.Drawing.Color.Transparent;
-            this.button1.DefaultImage = null;
-            this.button1.DownImage = null;
-            this.button1.IsSelected = false;
+            this.button1.HoverImage = null;
+            this.button1.IdleImage = null;
             this.button1.LabelText = "&First";
             this.button1.Location = new System.Drawing.Point(185, 99);
-            this.button1.Margin = new System.Windows.Forms.Padding(10);
+            this.button1.Margin = new System.Windows.Forms.Padding(10, 0, 0, 10);
             this.button1.Name = "button1";
-            this.button1.OverImage = null;
             this.button1.Padding = new System.Windows.Forms.Padding(4, 4, 3, 3);
             this.button1.Size = new System.Drawing.Size(128, 32);
-            this.button1.TabIndex = 192;
+            this.button1.TabIndex = 1;
             this.button1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.button1_MouseClick);
-            //
+            // 
             // FindForm
-            //
+            // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
             this.ClientSize = new System.Drawing.Size(464, 151);
             this.Controls.Add(this.button1);
@@ -141,7 +141,7 @@ namespace FizzyLauncher
 
             this.DialogResult = System.Windows.Forms.DialogResult.None;
 
-            textBox1.InnerTextBox.Focus();
+            textBox1.Focus();
         }
 
         protected override void OnClosing(CancelEventArgs e)
diff --git a/MainForm.Designer.cs b/MainForm.Designer.cs
index 54f0f81..55c8220 100644
--- a/MainForm.Designer.cs
+++ b/MainForm.Designer.cs
@@ -1,4 +1,8 @@
-namespace FizzyLauncher
+using RyzStudio;
+using RyzStudio.IO;
+using RyzStudio.Windows.ThemedForms;
+
+namespace FizzyLauncher
 {
     partial class MainForm
     {
@@ -137,7 +141,7 @@
             // 
             // newToolStripMenuItem
             // 
-            this.newToolStripMenuItem.Image = global::RyzStudio.UIResource.file2;
+            this.newToolStripMenuItem.Image = global::BookmarkManager.AppResource.file;
             this.newToolStripMenuItem.Name = "newToolStripMenuItem";
             this.newToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N)));
             this.newToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
@@ -146,7 +150,7 @@
             // 
             // openToolStripMenuItem
             // 
-            this.openToolStripMenuItem.Image = global::RyzStudio.UIResource.folder2;
+            this.openToolStripMenuItem.Image = global::BookmarkManager.AppResource.folder;
             this.openToolStripMenuItem.Name = "openToolStripMenuItem";
             this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
             this.openToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
@@ -172,7 +176,7 @@
             // 
             // saveToolStripMenuItem
             // 
-            this.saveToolStripMenuItem.Image = global::RyzStudio.UIResource.disk2;
+            this.saveToolStripMenuItem.Image = global::BookmarkManager.AppResource.save;
             this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
             this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));
             this.saveToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
@@ -208,7 +212,7 @@
             // 
             // findToolStripMenuItem
             // 
-            this.findToolStripMenuItem.Image = global::RyzStudio.UIResource.search2;
+            this.findToolStripMenuItem.Image = global::BookmarkManager.AppResource.search;
             this.findToolStripMenuItem.Name = "findToolStripMenuItem";
             this.findToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F)));
             this.findToolStripMenuItem.Size = new System.Drawing.Size(137, 22);
@@ -276,7 +280,7 @@
             // 
             // optionsToolStripMenuItem
             // 
-            this.optionsToolStripMenuItem.Image = global::RyzStudio.UIResource.cog2;
+            this.optionsToolStripMenuItem.Image = global::BookmarkManager.AppResource.settings;
             this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem";
             this.optionsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F12)));
             this.optionsToolStripMenuItem.Size = new System.Drawing.Size(168, 22);
@@ -295,7 +299,7 @@
             // 
             // viewHelpToolStripMenuItem1
             // 
-            this.viewHelpToolStripMenuItem1.Image = global::RyzStudio.UIResource.help2;
+            this.viewHelpToolStripMenuItem1.Image = global::BookmarkManager.AppResource.help_circle;
             this.viewHelpToolStripMenuItem1.Name = "viewHelpToolStripMenuItem1";
             this.viewHelpToolStripMenuItem1.ShortcutKeys = System.Windows.Forms.Keys.F1;
             this.viewHelpToolStripMenuItem1.Size = new System.Drawing.Size(146, 22);
@@ -424,7 +428,7 @@
             // 
             // deleteToolStripMenuItem
             // 
-            this.deleteToolStripMenuItem.Image = global::RyzStudio.UIResource.trash2;
+            this.deleteToolStripMenuItem.Image = global::BookmarkManager.AppResource.trash;
             this.deleteToolStripMenuItem.Name = "deleteToolStripMenuItem";
             this.deleteToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
             this.deleteToolStripMenuItem.Text = "&Delete";
@@ -449,7 +453,7 @@
             // 
             // moveUpToolStripMenuItem
             // 
-            this.moveUpToolStripMenuItem.Image = global::RyzStudio.UIResource.arrow_up2;
+            this.moveUpToolStripMenuItem.Image = global::BookmarkManager.AppResource.arrow_up_circle;
             this.moveUpToolStripMenuItem.Name = "moveUpToolStripMenuItem";
             this.moveUpToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
             this.moveUpToolStripMenuItem.Text = "Move &Up";
@@ -457,7 +461,7 @@
             // 
             // moveDownToolStripMenuItem
             // 
-            this.moveDownToolStripMenuItem.Image = global::RyzStudio.UIResource.arrow_down2;
+            this.moveDownToolStripMenuItem.Image = global::BookmarkManager.AppResource.arrow_down_circle;
             this.moveDownToolStripMenuItem.Name = "moveDownToolStripMenuItem";
             this.moveDownToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
             this.moveDownToolStripMenuItem.Text = "Move &Down";
@@ -498,7 +502,7 @@
             // 
             // deleteToolStripMenuItem1
             // 
-            this.deleteToolStripMenuItem1.Image = global::RyzStudio.UIResource.trash2;
+            this.deleteToolStripMenuItem1.Image = global::BookmarkManager.AppResource.trash;
             this.deleteToolStripMenuItem1.Name = "deleteToolStripMenuItem1";
             this.deleteToolStripMenuItem1.Size = new System.Drawing.Size(138, 22);
             this.deleteToolStripMenuItem1.Text = "&Delete";
@@ -511,7 +515,7 @@
             // 
             // moveUpToolStripMenuItem1
             // 
-            this.moveUpToolStripMenuItem1.Image = global::RyzStudio.UIResource.arrow_up2;
+            this.moveUpToolStripMenuItem1.Image = global::BookmarkManager.AppResource.arrow_up_circle;
             this.moveUpToolStripMenuItem1.Name = "moveUpToolStripMenuItem1";
             this.moveUpToolStripMenuItem1.Size = new System.Drawing.Size(138, 22);
             this.moveUpToolStripMenuItem1.Text = "Move &Up";
@@ -519,7 +523,7 @@
             // 
             // moveDownToolStripMenuItem1
             // 
-            this.moveDownToolStripMenuItem1.Image = global::RyzStudio.UIResource.arrow_down2;
+            this.moveDownToolStripMenuItem1.Image = global::BookmarkManager.AppResource.arrow_down_circle;
             this.moveDownToolStripMenuItem1.Name = "moveDownToolStripMenuItem1";
             this.moveDownToolStripMenuItem1.Size = new System.Drawing.Size(138, 22);
             this.moveDownToolStripMenuItem1.Text = "Move &Down";
@@ -543,7 +547,7 @@
             // toolStripButton1
             // 
             this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.toolStripButton1.Image = global::RyzStudio.UIResource.file2;
+            this.toolStripButton1.Image = global::BookmarkManager.AppResource.file;
             this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.toolStripButton1.Name = "toolStripButton1";
             this.toolStripButton1.Size = new System.Drawing.Size(23, 22);
@@ -554,7 +558,7 @@
             // toolStripButton2
             // 
             this.toolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.toolStripButton2.Image = global::RyzStudio.UIResource.folder2;
+            this.toolStripButton2.Image = global::BookmarkManager.AppResource.folder;
             this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.toolStripButton2.Name = "toolStripButton2";
             this.toolStripButton2.Size = new System.Drawing.Size(23, 22);
@@ -569,7 +573,7 @@
             // toolStripButton3
             // 
             this.toolStripButton3.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.toolStripButton3.Image = global::RyzStudio.UIResource.disk2;
+            this.toolStripButton3.Image = global::BookmarkManager.AppResource.save;
             this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.toolStripButton3.Name = "toolStripButton3";
             this.toolStripButton3.Size = new System.Drawing.Size(23, 22);
@@ -584,7 +588,7 @@
             // toolStripButton4
             // 
             this.toolStripButton4.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.toolStripButton4.Image = global::RyzStudio.UIResource.search2;
+            this.toolStripButton4.Image = global::BookmarkManager.AppResource.search;
             this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.toolStripButton4.Name = "toolStripButton4";
             this.toolStripButton4.Size = new System.Drawing.Size(23, 22);
@@ -602,7 +606,8 @@
             // 
             // MainForm
             // 
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
             this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(250)))), ((int)(((byte)(250)))), ((int)(((byte)(250)))));
             this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.ClientSize = new System.Drawing.Size(300, 580);
diff --git a/OptionsForm.cs b/OptionsForm.cs
index 73fc42c..ad52491 100644
--- a/OptionsForm.cs
+++ b/OptionsForm.cs
@@ -61,9 +61,9 @@ namespace FizzyLauncher
             this.pickerBox5 = new RyzStudio.Windows.ThemedForms.TYesNoPickerBox();
             this.label3 = new System.Windows.Forms.Label();
             this.SuspendLayout();
-            //
+            // 
             // label1
-            //
+            // 
             this.label1.AutoSize = true;
             this.label1.BackColor = System.Drawing.Color.Transparent;
             this.label1.ForeColor = System.Drawing.SystemColors.ControlText;
@@ -75,26 +75,26 @@ namespace FizzyLauncher
             this.label1.TabIndex = 153;
             this.label1.Text = "Custom Command";
             this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            //
+            // 
             // button1
-            //
+            // 
+            this.button1.ActiveImage = null;
             this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.button1.BackColor = System.Drawing.Color.Transparent;
-            this.button1.DefaultImage = null;
-            this.button1.DownImage = null;
-            this.button1.IsSelected = false;
+            this.button1.HoverImage = null;
+            this.button1.IdleImage = null;
             this.button1.LabelText = "&Save";
             this.button1.Location = new System.Drawing.Point(241, 469);
-            this.button1.Margin = new System.Windows.Forms.Padding(10);
+            this.button1.Margin = new System.Windows.Forms.Padding(10, 0, 0, 10);
             this.button1.Name = "button1";
-            this.button1.OverImage = null;
             this.button1.Padding = new System.Windows.Forms.Padding(4, 4, 3, 3);
             this.button1.Size = new System.Drawing.Size(128, 32);
-            this.button1.TabIndex = 173;
+            this.button1.TabIndex = 6;
             this.button1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.button1_MouseClick);
-            //
+            // 
             // pickerBox1
-            //
+            // 
+            this.pickerBox1.AcceptButton = null;
             this.pickerBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.pickerBox1.BackColor = System.Drawing.Color.Transparent;
             this.pickerBox1.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
@@ -102,13 +102,12 @@ namespace FizzyLauncher
             this.pickerBox1.Margin = new System.Windows.Forms.Padding(10, 4, 10, 4);
             this.pickerBox1.Name = "pickerBox1";
             this.pickerBox1.Padding = new System.Windows.Forms.Padding(10, 6, 7, 5);
-            this.pickerBox1.Size = new System.Drawing.Size(84, 34);
-            this.pickerBox1.SubmitButton = null;
-            this.pickerBox1.TabIndex = 183;
+            this.pickerBox1.Size = new System.Drawing.Size(84, 35);
+            this.pickerBox1.TabIndex = 2;
             this.pickerBox1.Value = true;
-            //
+            // 
             // label6
-            //
+            // 
             this.label6.AutoSize = true;
             this.label6.BackColor = System.Drawing.Color.Transparent;
             this.label6.ForeColor = System.Drawing.SystemColors.ControlText;
@@ -120,9 +119,10 @@ namespace FizzyLauncher
             this.label6.TabIndex = 182;
             this.label6.Text = "Auto Position On Start-Up";
             this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            //
+            // 
             // pickerBox2
-            //
+            // 
+            this.pickerBox2.AcceptButton = null;
             this.pickerBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.pickerBox2.BackColor = System.Drawing.Color.Transparent;
             this.pickerBox2.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
@@ -130,13 +130,12 @@ namespace FizzyLauncher
             this.pickerBox2.Margin = new System.Windows.Forms.Padding(10, 4, 10, 4);
             this.pickerBox2.Name = "pickerBox2";
             this.pickerBox2.Padding = new System.Windows.Forms.Padding(10, 6, 7, 5);
-            this.pickerBox2.Size = new System.Drawing.Size(84, 34);
-            this.pickerBox2.SubmitButton = null;
-            this.pickerBox2.TabIndex = 185;
+            this.pickerBox2.Size = new System.Drawing.Size(84, 35);
+            this.pickerBox2.TabIndex = 3;
             this.pickerBox2.Value = true;
-            //
+            // 
             // label7
-            //
+            // 
             this.label7.AutoSize = true;
             this.label7.BackColor = System.Drawing.Color.Transparent;
             this.label7.ForeColor = System.Drawing.SystemColors.ControlText;
@@ -148,9 +147,9 @@ namespace FizzyLauncher
             this.label7.TabIndex = 184;
             this.label7.Text = "Always-On-Top";
             this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            //
+            // 
             // label8
-            //
+            // 
             this.label8.AutoSize = true;
             this.label8.BackColor = System.Drawing.Color.Transparent;
             this.label8.ForeColor = System.Drawing.SystemColors.ControlText;
@@ -162,9 +161,10 @@ namespace FizzyLauncher
             this.label8.TabIndex = 186;
             this.label8.Text = "Auto Save";
             this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            //
+            // 
             // pickerBox3
-            //
+            // 
+            this.pickerBox3.AcceptButton = null;
             this.pickerBox3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.pickerBox3.BackColor = System.Drawing.Color.Transparent;
             this.pickerBox3.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
@@ -172,75 +172,79 @@ namespace FizzyLauncher
             this.pickerBox3.Margin = new System.Windows.Forms.Padding(10, 4, 10, 4);
             this.pickerBox3.Name = "pickerBox3";
             this.pickerBox3.Padding = new System.Windows.Forms.Padding(10, 6, 7, 5);
-            this.pickerBox3.Size = new System.Drawing.Size(84, 34);
-            this.pickerBox3.SubmitButton = null;
-            this.pickerBox3.TabIndex = 187;
-            //
+            this.pickerBox3.Size = new System.Drawing.Size(84, 35);
+            this.pickerBox3.TabIndex = 0;
+            // 
             // tHorizontalSeparator1
-            //
-            this.tHorizontalSeparator1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+            // 
+            this.tHorizontalSeparator1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.tHorizontalSeparator1.AutoScrollMargin = new System.Drawing.Size(0, 0);
             this.tHorizontalSeparator1.AutoScrollMinSize = new System.Drawing.Size(0, 0);
             this.tHorizontalSeparator1.BackColor = System.Drawing.Color.Transparent;
             this.tHorizontalSeparator1.Location = new System.Drawing.Point(10, 437);
-            this.tHorizontalSeparator1.Margin = new System.Windows.Forms.Padding(10, 0, 10, 0);
+            this.tHorizontalSeparator1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 10);
             this.tHorizontalSeparator1.MaximumSize = new System.Drawing.Size(4920, 2);
             this.tHorizontalSeparator1.MinimumSize = new System.Drawing.Size(0, 22);
             this.tHorizontalSeparator1.Name = "tHorizontalSeparator1";
             this.tHorizontalSeparator1.Padding = new System.Windows.Forms.Padding(0, 10, 0, 10);
             this.tHorizontalSeparator1.Size = new System.Drawing.Size(364, 22);
             this.tHorizontalSeparator1.TabIndex = 188;
-            //
+            this.tHorizontalSeparator1.TabStop = false;
+            // 
             // tHorizontalSeparator2
-            //
-            this.tHorizontalSeparator2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+            // 
+            this.tHorizontalSeparator2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.tHorizontalSeparator2.AutoScrollMargin = new System.Drawing.Size(0, 0);
             this.tHorizontalSeparator2.AutoScrollMinSize = new System.Drawing.Size(0, 0);
             this.tHorizontalSeparator2.BackColor = System.Drawing.Color.Transparent;
             this.tHorizontalSeparator2.Location = new System.Drawing.Point(10, 59);
-            this.tHorizontalSeparator2.Margin = new System.Windows.Forms.Padding(10, 0, 10, 0);
+            this.tHorizontalSeparator2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 10);
             this.tHorizontalSeparator2.MaximumSize = new System.Drawing.Size(4920, 2);
             this.tHorizontalSeparator2.MinimumSize = new System.Drawing.Size(0, 22);
             this.tHorizontalSeparator2.Name = "tHorizontalSeparator2";
             this.tHorizontalSeparator2.Padding = new System.Windows.Forms.Padding(0, 10, 0, 10);
             this.tHorizontalSeparator2.Size = new System.Drawing.Size(364, 22);
             this.tHorizontalSeparator2.TabIndex = 190;
-            //
+            this.tHorizontalSeparator2.TabStop = false;
+            // 
             // tHorizontalSeparator3
-            //
-            this.tHorizontalSeparator3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+            // 
+            this.tHorizontalSeparator3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.tHorizontalSeparator3.AutoScrollMargin = new System.Drawing.Size(0, 0);
             this.tHorizontalSeparator3.AutoScrollMinSize = new System.Drawing.Size(0, 0);
             this.tHorizontalSeparator3.BackColor = System.Drawing.Color.Transparent;
             this.tHorizontalSeparator3.Location = new System.Drawing.Point(10, 206);
-            this.tHorizontalSeparator3.Margin = new System.Windows.Forms.Padding(10, 0, 10, 0);
+            this.tHorizontalSeparator3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 10);
             this.tHorizontalSeparator3.MaximumSize = new System.Drawing.Size(4920, 2);
             this.tHorizontalSeparator3.MinimumSize = new System.Drawing.Size(0, 22);
             this.tHorizontalSeparator3.Name = "tHorizontalSeparator3";
             this.tHorizontalSeparator3.Padding = new System.Windows.Forms.Padding(0, 10, 0, 10);
             this.tHorizontalSeparator3.Size = new System.Drawing.Size(364, 22);
             this.tHorizontalSeparator3.TabIndex = 191;
-            //
+            this.tHorizontalSeparator3.TabStop = false;
+            // 
             // textBox1
-            //
-            this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+            // 
+            this.textBox1.AcceptButton = null;
+            this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.textBox1.BackColor = System.Drawing.Color.Transparent;
             this.textBox1.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
             this.textBox1.Location = new System.Drawing.Point(192, 234);
-            this.textBox1.Margin = new System.Windows.Forms.Padding(10, 6, 10, 6);
+            this.textBox1.Margin = new System.Windows.Forms.Padding(10, 0, 0, 10);
             this.textBox1.Name = "textBox1";
             this.textBox1.Padding = new System.Windows.Forms.Padding(10, 10, 9, 9);
+            this.textBox1.ReadOnly = false;
             this.textBox1.Size = new System.Drawing.Size(177, 35);
-            this.textBox1.SubmitButton = null;
-            this.textBox1.TabIndex = 192;
+            this.textBox1.TabIndex = 4;
             this.textBox1.UseSystemPasswordChar = false;
-            //
+            // 
             // pickerBox4
-            //
+            // 
+            this.pickerBox4.AcceptButton = null;
             this.pickerBox4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.pickerBox4.BackColor = System.Drawing.Color.Transparent;
             this.pickerBox4.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
@@ -248,13 +252,12 @@ namespace FizzyLauncher
             this.pickerBox4.Margin = new System.Windows.Forms.Padding(10, 4, 10, 4);
             this.pickerBox4.Name = "pickerBox4";
             this.pickerBox4.Padding = new System.Windows.Forms.Padding(10, 6, 7, 5);
-            this.pickerBox4.Size = new System.Drawing.Size(84, 34);
-            this.pickerBox4.SubmitButton = null;
-            this.pickerBox4.TabIndex = 194;
+            this.pickerBox4.Size = new System.Drawing.Size(84, 35);
+            this.pickerBox4.TabIndex = 5;
             this.pickerBox4.Value = true;
-            //
+            // 
             // label2
-            //
+            // 
             this.label2.AutoSize = true;
             this.label2.BackColor = System.Drawing.Color.Transparent;
             this.label2.ForeColor = System.Drawing.SystemColors.ControlText;
@@ -266,9 +269,10 @@ namespace FizzyLauncher
             this.label2.TabIndex = 193;
             this.label2.Text = "Ignore SSL Errors";
             this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            //
+            // 
             // pickerBox5
-            //
+            // 
+            this.pickerBox5.AcceptButton = null;
             this.pickerBox5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.pickerBox5.BackColor = System.Drawing.Color.Transparent;
             this.pickerBox5.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
@@ -276,13 +280,12 @@ namespace FizzyLauncher
             this.pickerBox5.Margin = new System.Windows.Forms.Padding(10, 4, 10, 4);
             this.pickerBox5.Name = "pickerBox5";
             this.pickerBox5.Padding = new System.Windows.Forms.Padding(10, 6, 7, 5);
-            this.pickerBox5.Size = new System.Drawing.Size(84, 34);
-            this.pickerBox5.SubmitButton = null;
-            this.pickerBox5.TabIndex = 196;
+            this.pickerBox5.Size = new System.Drawing.Size(84, 35);
+            this.pickerBox5.TabIndex = 1;
             this.pickerBox5.Value = true;
-            //
+            // 
             // label3
-            //
+            // 
             this.label3.AutoSize = true;
             this.label3.BackColor = System.Drawing.Color.Transparent;
             this.label3.ForeColor = System.Drawing.SystemColors.ControlText;
@@ -294,9 +297,9 @@ namespace FizzyLauncher
             this.label3.TabIndex = 195;
             this.label3.Text = "Show toolbar menu";
             this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            //
+            // 
             // OptionsForm
-            //
+            // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(384, 521);
diff --git a/PasswordForm.cs b/PasswordForm.cs
index e660d1f..50ebf31 100644
--- a/PasswordForm.cs
+++ b/PasswordForm.cs
@@ -19,8 +19,8 @@ namespace FizzyLauncher
 
             this.StartPosition = FormStartPosition.WindowsDefaultLocation;
 
-            textBox1.InnerTextBox.MaxLength = 255;
-            textBox1.InnerTextBox.PreviewKeyDown += textBox1_PreviewKeyDown;
+            textBox1.TextBox.MaxLength = 255;
+            textBox1.PreviewKeyDown += textBox1_PreviewKeyDown;
         }
 
         private void InitializeComponent()
@@ -30,9 +30,9 @@ namespace FizzyLauncher
             this.tHorizontalSeparator1 = new RyzStudio.Windows.Forms.THorizontalSeparator();
             this.textBox1 = new RyzStudio.Windows.ThemedForms.TTextBox();
             this.SuspendLayout();
-            //
+            // 
             // label1
-            //
+            // 
             this.label1.AutoSize = true;
             this.label1.BackColor = System.Drawing.Color.Transparent;
             this.label1.ForeColor = System.Drawing.SystemColors.ControlText;
@@ -44,57 +44,58 @@ namespace FizzyLauncher
             this.label1.TabIndex = 153;
             this.label1.Text = "Password";
             this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            //
+            // 
             // button1
-            //
+            // 
+            this.button1.ActiveImage = null;
             this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.button1.BackColor = System.Drawing.Color.Transparent;
-            this.button1.DefaultImage = null;
-            this.button1.DownImage = null;
-            this.button1.IsSelected = false;
+            this.button1.HoverImage = null;
+            this.button1.IdleImage = null;
             this.button1.LabelText = "&OK";
             this.button1.Location = new System.Drawing.Point(321, 99);
-            this.button1.Margin = new System.Windows.Forms.Padding(10);
+            this.button1.Margin = new System.Windows.Forms.Padding(10, 0, 0, 10);
             this.button1.Name = "button1";
-            this.button1.OverImage = null;
             this.button1.Padding = new System.Windows.Forms.Padding(4, 4, 3, 3);
             this.button1.Size = new System.Drawing.Size(128, 32);
-            this.button1.TabIndex = 173;
+            this.button1.TabIndex = 1;
             this.button1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.button1_MouseClick);
-            //
+            // 
             // tHorizontalSeparator1
-            //
-            this.tHorizontalSeparator1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+            // 
+            this.tHorizontalSeparator1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.tHorizontalSeparator1.AutoScrollMargin = new System.Drawing.Size(0, 0);
             this.tHorizontalSeparator1.AutoScrollMinSize = new System.Drawing.Size(0, 0);
             this.tHorizontalSeparator1.BackColor = System.Drawing.Color.Transparent;
             this.tHorizontalSeparator1.Location = new System.Drawing.Point(10, 67);
-            this.tHorizontalSeparator1.Margin = new System.Windows.Forms.Padding(10, 0, 10, 0);
+            this.tHorizontalSeparator1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 10);
             this.tHorizontalSeparator1.MaximumSize = new System.Drawing.Size(4920, 2);
             this.tHorizontalSeparator1.MinimumSize = new System.Drawing.Size(0, 22);
             this.tHorizontalSeparator1.Name = "tHorizontalSeparator1";
             this.tHorizontalSeparator1.Padding = new System.Windows.Forms.Padding(0, 10, 0, 10);
             this.tHorizontalSeparator1.Size = new System.Drawing.Size(444, 22);
             this.tHorizontalSeparator1.TabIndex = 188;
-            //
+            this.tHorizontalSeparator1.TabStop = false;
+            // 
             // textBox1
-            //
-            this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+            // 
+            this.textBox1.AcceptButton = this.button1;
+            this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.textBox1.BackColor = System.Drawing.Color.Transparent;
             this.textBox1.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
             this.textBox1.Location = new System.Drawing.Point(121, 20);
-            this.textBox1.Margin = new System.Windows.Forms.Padding(10, 6, 10, 6);
+            this.textBox1.Margin = new System.Windows.Forms.Padding(10, 0, 0, 10);
             this.textBox1.Name = "textBox1";
             this.textBox1.Padding = new System.Windows.Forms.Padding(10, 10, 9, 9);
+            this.textBox1.ReadOnly = false;
             this.textBox1.Size = new System.Drawing.Size(328, 35);
-            this.textBox1.SubmitButton = null;
-            this.textBox1.TabIndex = 191;
+            this.textBox1.TabIndex = 0;
             this.textBox1.UseSystemPasswordChar = true;
-            //
+            // 
             // PasswordForm
-            //
+            // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
             this.ClientSize = new System.Drawing.Size(464, 151);
             this.Controls.Add(this.textBox1);
@@ -115,7 +116,7 @@ namespace FizzyLauncher
 
             this.DialogResult = System.Windows.Forms.DialogResult.None;
 
-            textBox1.InnerTextBox.Focus();
+            textBox1.Focus();
         }
 
 
diff --git a/Program.cs b/Program.cs
index 71f4564..2a25f06 100644
--- a/Program.cs
+++ b/Program.cs
@@ -1,7 +1,6 @@
+using BookmarkManager;
+using RyzStudio.IO;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace FizzyLauncher
@@ -14,10 +13,13 @@ namespace FizzyLauncher
         [STAThread]
         static void Main()
         {
+            UIcon.UIResource = typeof(UIResource);
+
             Application.SetHighDpiMode(HighDpiMode.SystemAware);
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
             Application.Run(new MainForm());
         }
+
     }
 }
diff --git a/References/RyzStudio3.dll b/References/RyzStudio3.dll
index 64c8303..98ff0cd 100644
Binary files a/References/RyzStudio3.dll and b/References/RyzStudio3.dll differ
diff --git a/Resources/arrow-down-circle.png b/Resources/arrow-down-circle.png
new file mode 100644
index 0000000..08dd857
Binary files /dev/null and b/Resources/arrow-down-circle.png differ
diff --git a/Resources/arrow-up-circle.png b/Resources/arrow-up-circle.png
new file mode 100644
index 0000000..a4dd233
Binary files /dev/null and b/Resources/arrow-up-circle.png differ
diff --git a/Resources/file.png b/Resources/file.png
new file mode 100644
index 0000000..c4b89eb
Binary files /dev/null and b/Resources/file.png differ
diff --git a/Resources/folder.png b/Resources/folder.png
index d3ea8ab..7ec26c4 100644
Binary files a/Resources/folder.png and b/Resources/folder.png differ
diff --git a/Resources/help-circle.png b/Resources/help-circle.png
new file mode 100644
index 0000000..67ebb12
Binary files /dev/null and b/Resources/help-circle.png differ
diff --git a/Resources/loading-block.gif b/Resources/loading-block.gif
new file mode 100644
index 0000000..a5aa827
Binary files /dev/null and b/Resources/loading-block.gif differ
diff --git a/Resources/save.png b/Resources/save.png
new file mode 100644
index 0000000..32a78fa
Binary files /dev/null and b/Resources/save.png differ
diff --git a/Resources/search-2.png b/Resources/search-2.png
new file mode 100644
index 0000000..d934a57
Binary files /dev/null and b/Resources/search-2.png differ
diff --git a/Resources/search.png b/Resources/search.png
new file mode 100644
index 0000000..99c44ae
Binary files /dev/null and b/Resources/search.png differ
diff --git a/Resources/settings.png b/Resources/settings.png
new file mode 100644
index 0000000..e0d4aa4
Binary files /dev/null and b/Resources/settings.png differ
diff --git a/Resources/trash.png b/Resources/trash.png
new file mode 100644
index 0000000..14a137e
Binary files /dev/null and b/Resources/trash.png differ
diff --git a/UIResource.Designer.cs b/UIResource.Designer.cs
new file mode 100644
index 0000000..b31ddd3
--- /dev/null
+++ b/UIResource.Designer.cs
@@ -0,0 +1,93 @@
+//------------------------------------------------------------------------------
+// <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 BookmarkManager {
+    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()]
+    public class UIResource {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal UIResource() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("BookmarkManager.UIResource", typeof(UIResource).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)]
+        public static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap loading_block {
+            get {
+                object obj = ResourceManager.GetObject("loading_block", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap search {
+            get {
+                object obj = ResourceManager.GetObject("search", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap search_2 {
+            get {
+                object obj = ResourceManager.GetObject("search_2", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+    }
+}
diff --git a/UIResource.resx b/UIResource.resx
new file mode 100644
index 0000000..6cf1146
--- /dev/null
+++ b/UIResource.resx
@@ -0,0 +1,130 @@
+<?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=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="loading_block" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\loading-block.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="search" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="search_2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\search-2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/UpdateIconsForm.cs b/UpdateIconsForm.cs
index 860c8c2..58aae8d 100644
--- a/UpdateIconsForm.cs
+++ b/UpdateIconsForm.cs
@@ -1,6 +1,7 @@
 using BookmarkManager;
 using bzit.bomg.Models;
 using FizzyLauncher.Models;
+using RyzStudio.IO;
 using RyzStudio.Windows.Forms;
 using RyzStudio.Windows.ThemedForms;
 using System;
@@ -10,7 +11,7 @@ using System.Drawing;
 using System.Net;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using TProgressBar = RyzStudio.Windows.Forms.TCustomProgressBar;
+using TProgressBar = RyzStudio.Windows.ThemedForms.TProgressBar;
 
 namespace FizzyLauncher
 {
@@ -49,7 +50,7 @@ namespace FizzyLauncher
             iconDatabase = database;
             appSession = session;
 
-            pickerBox1.InnerControl.SelectedIndexChanged += comboBox1_SelectedIndexChanged;
+            pickerBox1.ComboBox.SelectedIndexChanged += comboBox1_SelectedIndexChanged;
 
         }
 
@@ -68,9 +69,9 @@ namespace FizzyLauncher
             this.progressBar1 = new RyzStudio.Windows.ThemedForms.TProgressBar();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
             this.SuspendLayout();
-            //
+            // 
             // label1
-            //
+            // 
             this.label1.AutoSize = true;
             this.label1.BackColor = System.Drawing.Color.Transparent;
             this.label1.ForeColor = System.Drawing.SystemColors.ControlText;
@@ -82,58 +83,59 @@ namespace FizzyLauncher
             this.label1.TabIndex = 153;
             this.label1.Text = "Find outstanding icons only";
             this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            //
+            // 
             // button1
-            //
+            // 
+            this.button1.ActiveImage = null;
             this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.button1.BackColor = System.Drawing.Color.Transparent;
-            this.button1.DefaultImage = null;
-            this.button1.DownImage = null;
-            this.button1.IsSelected = false;
+            this.button1.HoverImage = null;
+            this.button1.IdleImage = null;
             this.button1.LabelText = "&Close";
             this.button1.Location = new System.Drawing.Point(241, 469);
-            this.button1.Margin = new System.Windows.Forms.Padding(10);
+            this.button1.Margin = new System.Windows.Forms.Padding(10, 0, 0, 10);
             this.button1.Name = "button1";
-            this.button1.OverImage = null;
             this.button1.Padding = new System.Windows.Forms.Padding(4, 4, 3, 3);
             this.button1.Size = new System.Drawing.Size(128, 32);
-            this.button1.TabIndex = 173;
+            this.button1.TabIndex = 2;
             this.button1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.button1_MouseClick);
-            //
+            // 
             // tHorizontalSeparator1
-            //
-            this.tHorizontalSeparator1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+            // 
+            this.tHorizontalSeparator1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.tHorizontalSeparator1.AutoScrollMargin = new System.Drawing.Size(0, 0);
             this.tHorizontalSeparator1.AutoScrollMinSize = new System.Drawing.Size(0, 0);
             this.tHorizontalSeparator1.BackColor = System.Drawing.Color.Transparent;
             this.tHorizontalSeparator1.Location = new System.Drawing.Point(10, 437);
-            this.tHorizontalSeparator1.Margin = new System.Windows.Forms.Padding(10, 0, 10, 0);
+            this.tHorizontalSeparator1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 10);
             this.tHorizontalSeparator1.MaximumSize = new System.Drawing.Size(4920, 2);
             this.tHorizontalSeparator1.MinimumSize = new System.Drawing.Size(0, 22);
             this.tHorizontalSeparator1.Name = "tHorizontalSeparator1";
             this.tHorizontalSeparator1.Padding = new System.Windows.Forms.Padding(0, 10, 0, 10);
             this.tHorizontalSeparator1.Size = new System.Drawing.Size(364, 22);
             this.tHorizontalSeparator1.TabIndex = 188;
-            //
+            this.tHorizontalSeparator1.TabStop = false;
+            // 
             // tHorizontalSeparator2
-            //
-            this.tHorizontalSeparator2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+            // 
+            this.tHorizontalSeparator2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.tHorizontalSeparator2.AutoScrollMargin = new System.Drawing.Size(0, 0);
             this.tHorizontalSeparator2.AutoScrollMinSize = new System.Drawing.Size(0, 0);
             this.tHorizontalSeparator2.BackColor = System.Drawing.Color.Transparent;
             this.tHorizontalSeparator2.Location = new System.Drawing.Point(10, 59);
-            this.tHorizontalSeparator2.Margin = new System.Windows.Forms.Padding(10, 0, 10, 0);
+            this.tHorizontalSeparator2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 10);
             this.tHorizontalSeparator2.MaximumSize = new System.Drawing.Size(4920, 2);
             this.tHorizontalSeparator2.MinimumSize = new System.Drawing.Size(0, 22);
             this.tHorizontalSeparator2.Name = "tHorizontalSeparator2";
             this.tHorizontalSeparator2.Padding = new System.Windows.Forms.Padding(0, 10, 0, 10);
             this.tHorizontalSeparator2.Size = new System.Drawing.Size(364, 22);
             this.tHorizontalSeparator2.TabIndex = 190;
-            //
+            this.tHorizontalSeparator2.TabStop = false;
+            // 
             // label2
-            //
+            // 
             this.label2.AutoSize = true;
             this.label2.BackColor = System.Drawing.Color.Transparent;
             this.label2.ForeColor = System.Drawing.SystemColors.ControlText;
@@ -145,9 +147,9 @@ namespace FizzyLauncher
             this.label2.TabIndex = 195;
             this.label2.Text = "Progress";
             this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            //
+            // 
             // pictureBox2
-            //
+            // 
             this.pictureBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.pictureBox2.BackColor = System.Drawing.Color.Transparent;
             this.pictureBox2.ErrorImage = null;
@@ -158,9 +160,10 @@ namespace FizzyLauncher
             this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
             this.pictureBox2.TabIndex = 202;
             this.pictureBox2.TabStop = false;
-            //
+            // 
             // pickerBox1
-            //
+            // 
+            this.pickerBox1.AcceptButton = null;
             this.pickerBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.pickerBox1.BackColor = System.Drawing.Color.Transparent;
             this.pickerBox1.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
@@ -168,31 +171,29 @@ namespace FizzyLauncher
             this.pickerBox1.Margin = new System.Windows.Forms.Padding(10, 4, 10, 4);
             this.pickerBox1.Name = "pickerBox1";
             this.pickerBox1.Padding = new System.Windows.Forms.Padding(10, 6, 7, 5);
-            this.pickerBox1.Size = new System.Drawing.Size(84, 34);
-            this.pickerBox1.SubmitButton = null;
-            this.pickerBox1.TabIndex = 203;
+            this.pickerBox1.Size = new System.Drawing.Size(84, 35);
+            this.pickerBox1.TabIndex = 0;
             this.pickerBox1.Value = true;
-            //
+            // 
             // button2
-            //
+            // 
+            this.button2.ActiveImage = null;
             this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.button2.BackColor = System.Drawing.Color.Transparent;
-            this.button2.DefaultImage = null;
-            this.button2.DownImage = null;
-            this.button2.IsSelected = false;
+            this.button2.HoverImage = null;
+            this.button2.IdleImage = null;
             this.button2.LabelText = "&Run";
             this.button2.Location = new System.Drawing.Point(241, 168);
-            this.button2.Margin = new System.Windows.Forms.Padding(10);
+            this.button2.Margin = new System.Windows.Forms.Padding(10, 0, 0, 10);
             this.button2.Name = "button2";
-            this.button2.OverImage = null;
             this.button2.Padding = new System.Windows.Forms.Padding(4, 4, 3, 3);
             this.button2.Size = new System.Drawing.Size(128, 32);
-            this.button2.TabIndex = 205;
+            this.button2.TabIndex = 1;
             this.button2.MouseClick += new System.Windows.Forms.MouseEventHandler(this.button2_MouseClick);
-            //
+            // 
             // progressBar1
-            //
-            this.progressBar1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+            // 
+            this.progressBar1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.progressBar1.BackColor = System.Drawing.Color.Transparent;
             this.progressBar1.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
@@ -202,9 +203,10 @@ namespace FizzyLauncher
             this.progressBar1.Padding = new System.Windows.Forms.Padding(6, 6, 5, 5);
             this.progressBar1.Size = new System.Drawing.Size(359, 33);
             this.progressBar1.TabIndex = 206;
-            //
+            this.progressBar1.TabStop = false;
+            // 
             // UpdateIconsForm
-            //
+            // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(384, 521);
@@ -272,7 +274,7 @@ namespace FizzyLauncher
             {
                 isBusy = value;
 
-                ThreadControl.SetValue(pictureBox2, (isBusy ? RyzStudio.UIResource.loading_block : null));
+                ThreadControl.SetValue(pictureBox2, (isBusy ? UIcon.GetImage("loading_block") : null));
 
                 ThreadControl.SetEnable(pickerBox1, !isBusy);
                 button2.LabelText = (isBusy ? "&Stop" : "&Run");
@@ -289,7 +291,7 @@ namespace FizzyLauncher
 
             List<BookmarkItem> bookmarkList = GetBookmarkFilteredList();
 
-            progressBar1.InnerControl.Reset(bookmarkList.Count);
+            progressBar1.ProgressBar.Reset(bookmarkList.Count);
         }
 
         private async void button2_MouseClick(object sender, MouseEventArgs e)
@@ -307,11 +309,11 @@ namespace FizzyLauncher
                 WebParser webParser = new WebParser();
                 List<BookmarkItem> bookmarkList = GetBookmarkFilteredList();
 
-                progressBar1.InnerControl.Reset(bookmarkList.Count);
+                progressBar1.ProgressBar.Reset(bookmarkList.Count);
 
                 for (int i=0; i<bookmarkList.Count; i++)
                 {
-                    progressBar1.InnerControl.Value = (i + 1);
+                    progressBar1.ProgressBar.Value = (i + 1);
 
                     if (requestCancellation) break;
 
diff --git a/build.bat b/build.bat
deleted file mode 100644
index f18db46..0000000
--- a/build.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-rmdir /s /q "bin\Release\64\"
-dotnet publish skye.sln -r win-x64 -c Release /p:PublishSingleFile=true /p:SelfContained=false /p:PublishReadyToRunfalse=true /p:PublishDir="bin\Release\64\"
-
-rmdir /s /q "bin\Release\86\"
-dotnet publish skye.sln -r win-x86 -c Release /p:PublishSingleFile=true /p:SelfContained=false /p:PublishReadyToRunfalse=true /p:PublishDir="bin\Release\86\"
\ No newline at end of file
diff --git a/installer-64.iss b/installer-64.iss
index a08e9d8..a2448cd 100644
--- a/installer-64.iss
+++ b/installer-64.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Bookmark Manager"
-#define MyAppVersion "0.4.2.008"
+#define MyAppVersion "0.4.3.030"
 #define MyAppPublisher "Hi, I'm Ray"
 #define MyAppURL "https://www.hiimray.co.uk/software-bookmark-manager"
 #define MyAppExeName "bookmarkmanager.exe"
@@ -23,7 +23,7 @@ DisableProgramGroupPage=yes
 ; Remove the following line to run in administrative install mode (install for all users.)
 PrivilegesRequired=lowest
 OutputDir=L:\gitlab-hiimray\bookmark-manager-r4\bin
-OutputBaseFilename=bookmark-manager-64
+OutputBaseFilename=bookmark-manager
 Compression=lzma
 SolidCompression=yes
 WizardStyle=modern
diff --git a/installer-86.iss b/installer-86.iss
deleted file mode 100644
index 7ea977f..0000000
--- a/installer-86.iss
+++ /dev/null
@@ -1,50 +0,0 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
-#define MyAppName "Bookmark Manager"
-#define MyAppVersion "0.4.2.008"
-#define MyAppPublisher "Hi, I'm Ray"
-#define MyAppURL "https://www.hiimray.co.uk/software-bookmark-manager"
-#define MyAppExeName "bookmarkmanager.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\bookmark-manager-r4\bin
-OutputBaseFilename=bookmark-manager-86
-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\bookmark-manager-r4\bin\Release\86\bookmarkmanager.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "L:\gitlab-hiimray\bookmark-manager-r4\bin\Release\86\e_sqlite3.dll"; 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
-