diff --git a/AppResource.Designer.cs b/AppResource.Designer.cs
index 9a1026d..6619817 100644
--- a/AppResource.Designer.cs
+++ b/AppResource.Designer.cs
@@ -89,6 +89,26 @@ namespace FizzyLauncher {
             }
         }
         
+        /// <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 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>
diff --git a/AppResource.resx b/AppResource.resx
index 1fb7627..dd727d7 100644
--- a/AppResource.resx
+++ b/AppResource.resx
@@ -127,6 +127,12 @@
   <data name="disk2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Resources\disk2.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="folder" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\folder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="folder_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Resources\folder_32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
diff --git a/MainForm.Designer.cs b/MainForm.Designer.cs
index 5dbd3f8..2ae6153 100644
--- a/MainForm.Designer.cs
+++ b/MainForm.Designer.cs
@@ -129,7 +129,7 @@ namespace FizzyLauncher
             // 
             // newToolStripMenuItem
             // 
-            this.newToolStripMenuItem.Image = global::RyzStudio.UIResource1.file;
+            this.newToolStripMenuItem.Image = 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);
@@ -138,7 +138,7 @@ namespace FizzyLauncher
             // 
             // openToolStripMenuItem
             // 
-            this.openToolStripMenuItem.Image = global::RyzStudio.UIResource1.folder;
+            this.openToolStripMenuItem.Image = 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);
diff --git a/MainForm.cs b/MainForm.cs
index ba46c4a..e5dcc0a 100644
--- a/MainForm.cs
+++ b/MainForm.cs
@@ -1,4 +1,5 @@
 using FizzyLauncher.Models;
+using RyzStudio.Drawing;
 using RyzStudio.Text.Json;
 using RyzStudio.Windows.Forms;
 using System;
diff --git a/References/Ryz3ui.dll b/References/Ryz3ui.dll
index be95657..f77c4e4 100644
Binary files a/References/Ryz3ui.dll and b/References/Ryz3ui.dll 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
new file mode 100644
index 0000000..7ec26c4
Binary files /dev/null and b/Resources/folder.png differ
diff --git a/Windows/Forms/TilePanel.cs b/Windows/Forms/TilePanel.cs
index cad3e24..57a65cb 100644
--- a/Windows/Forms/TilePanel.cs
+++ b/Windows/Forms/TilePanel.cs
@@ -5,11 +5,10 @@ using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
 using FizzyLauncher.Models;
-using RyzStudio.Windows.ThemedForms;
 
 namespace FizzyLauncher.Windows.Forms
 {
-    public partial class TilePanel : TUserControl
+    public partial class TilePanel : RyzStudio.Windows.Forms.TC1UserControl
     {
         protected bool isDragging = false;
         protected Point startPosition = new Point();
diff --git a/Windows/Forms/TilePanelLayout.cs b/Windows/Forms/TilePanelLayout.cs
index 353701b..a2b8c9a 100644
--- a/Windows/Forms/TilePanelLayout.cs
+++ b/Windows/Forms/TilePanelLayout.cs
@@ -9,11 +9,10 @@ using System.Threading.Tasks;
 using System.Windows.Forms;
 using FizzyLauncher.Models;
 using RyzStudio.Windows.Forms;
-using RyzStudio.Windows.ThemedForms;
 
 namespace FizzyLauncher.Windows.Forms
 {
-    public partial class TilePanelLayout : TUserControl
+    public partial class TilePanelLayout : RyzStudio.Windows.Forms.TC1UserControl
     {
         public static int CalcWidth(int tileCount) => (tileCount * tileSize) + ((tileCount - 1) * margin);
 
diff --git a/skye.sln b/skye.sln
index 28e22b4..94d918f 100644
--- a/skye.sln
+++ b/skye.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31410.357
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.33205.214
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FizzyLauncher", "FizzyLauncher.csproj", "{4833FB27-0817-4720-A54B-180369B0C374}"
 EndProject