diff --git a/BookmarkManager.csproj b/BookmarkManager.csproj
index e0ad90d..d494b98 100644
--- a/BookmarkManager.csproj
+++ b/BookmarkManager.csproj
@@ -7,17 +7,18 @@
     <NoWin32Manifest>true</NoWin32Manifest>
     <ApplicationIcon>favicon.ico</ApplicationIcon>
     <SignAssembly>false</SignAssembly>
-    <AssemblyName>bookmarkmanager</AssemblyName>
+    <AssemblyName>bukkubuddy</AssemblyName>
     <Authors>Ray Lam</Authors>
     <Company>Hi, I'm Ray</Company>
-    <Product>Bookmark Manager</Product>
+    <Product>BukkuBuddy</Product>
     <Copyright>Ray Lam</Copyright>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
     <FileVersion>1.0.0.0</FileVersion>
     <Version>0.6.0.716</Version>
-    <PackageId>bookmarkmanager</PackageId>
+    <PackageId>bukkubuddy</PackageId>
     <RunAnalyzersDuringLiveAnalysis>True</RunAnalyzersDuringLiveAnalysis>
     <SupportedOSPlatformVersion>8.0</SupportedOSPlatformVersion>
+    <Description>BukkuBuddy Bookmark Manager</Description>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/EditBookmarkForm.cs b/EditBookmarkForm.cs
index ca5a513..653935f 100644
--- a/EditBookmarkForm.cs
+++ b/EditBookmarkForm.cs
@@ -42,6 +42,7 @@ namespace FizzyLauncher
             this.OkButton = button1;
 
             _webProvider = new WebProvider();
+            _webProvider.IgnoreSSL = true;
 
             result = model;
 
diff --git a/Models/AppOptions.cs b/Models/AppOptions.cs
index f7e84da..7483a9b 100644
--- a/Models/AppOptions.cs
+++ b/Models/AppOptions.cs
@@ -12,7 +12,7 @@ namespace FizzyLauncher.Models
 
         public string RunCommand { get; set; } = "{0}";
 
-        public bool IgnoreSSL { get; set; } = false;
+        //public bool IgnoreSSL { get; set; } = false;
 
         public Point StartPosition { get; set; } = Point.Empty;
 
diff --git a/OptionsForm.cs b/OptionsForm.cs
index ad0d6fa..3bfae83 100644
--- a/OptionsForm.cs
+++ b/OptionsForm.cs
@@ -22,8 +22,6 @@ namespace FizzyLauncher
         private Label label1;
         private ThYesNoPickerBox yesNoPickerBox2;
         private Label label3;
-        private ThYesNoPickerBox yesNoPickerBox3;
-        private Label label4;
         private RyzStudio.Windows.ThemedForms.ButtonTextBox.ThClearableTextBox textBox1;
 
         private AppOptions _appSession = null;
@@ -44,7 +42,6 @@ namespace FizzyLauncher
                 yesNoPickerBox2.Value = _appSession.AlwaysOnTop;
 
                 textBox1.Text = _appSession.RunCommand ?? string.Empty;
-                yesNoPickerBox3.Value = _appSession.IgnoreSSL;
             }
         }
 
@@ -62,8 +59,6 @@ namespace FizzyLauncher
             label1 = new Label();
             panel3 = new TTogglePanel();
             textBox1 = new RyzStudio.Windows.ThemedForms.ButtonTextBox.ThClearableTextBox();
-            yesNoPickerBox3 = new ThYesNoPickerBox();
-            label4 = new Label();
             label3 = new Label();
             flowLayoutPanel1.SuspendLayout();
             panel1.SuspendLayout();
@@ -246,8 +241,6 @@ namespace FizzyLauncher
             panel3.AutoScrollMargin = new System.Drawing.Size(0, 0);
             panel3.AutoScrollMinSize = new System.Drawing.Size(0, 0);
             panel3.Controls.Add(textBox1);
-            panel3.Controls.Add(yesNoPickerBox3);
-            panel3.Controls.Add(label4);
             panel3.Controls.Add(label3);
             panel3.ExpandedHeight = 100;
             panel3.ForeColor = System.Drawing.Color.FromArgb(99, 105, 119);
@@ -257,7 +250,7 @@ namespace FizzyLauncher
             panel3.Name = "panel3";
             panel3.PaddingBottom = 2;
             panel3.PaddingLeft = 4;
-            panel3.Size = new System.Drawing.Size(401, 121);
+            panel3.Size = new System.Drawing.Size(401, 77);
             panel3.TabIndex = 1;
             panel3.Title = "Behaviour";
             panel3.TitleContextMenuStrip = null;
@@ -282,37 +275,6 @@ namespace FizzyLauncher
             textBox1.TabStop = false;
             textBox1.UseSystemPasswordChar = false;
             //
-            // yesNoPickerBox3
-            //
-            yesNoPickerBox3.AcceptButton = null;
-            yesNoPickerBox3.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            yesNoPickerBox3.BackColor = System.Drawing.Color.Transparent;
-            yesNoPickerBox3.EnableReactiveVisual = true;
-            yesNoPickerBox3.Font = new System.Drawing.Font("Segoe UI", 9F);
-            yesNoPickerBox3.Location = new System.Drawing.Point(307, 66);
-            yesNoPickerBox3.Margin = new Padding(10, 10, 10, 0);
-            yesNoPickerBox3.Name = "yesNoPickerBox3";
-            yesNoPickerBox3.Padding = new Padding(4, 4, 3, 3);
-            yesNoPickerBox3.SelectedIndex = 1;
-            yesNoPickerBox3.Size = new System.Drawing.Size(84, 34);
-            yesNoPickerBox3.TabIndex = 202;
-            yesNoPickerBox3.TabStop = false;
-            yesNoPickerBox3.Value = true;
-            //
-            // label4
-            //
-            label4.AutoSize = true;
-            label4.BackColor = System.Drawing.Color.Transparent;
-            label4.ForeColor = System.Drawing.SystemColors.ControlText;
-            label4.Location = new System.Drawing.Point(1, 66);
-            label4.Margin = new Padding(0);
-            label4.Name = "label4";
-            label4.Padding = new Padding(0, 8, 0, 0);
-            label4.Size = new System.Drawing.Size(95, 23);
-            label4.TabIndex = 201;
-            label4.Text = "Ignore SSL Errors";
-            label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            //
             // label3
             //
             label3.AutoSize = true;
@@ -379,7 +341,6 @@ namespace FizzyLauncher
                 _appSession.AlwaysOnTop = yesNoPickerBox2.Value;
 
                 _appSession.RunCommand = textBox1.Text ?? string.Empty;
-                _appSession.IgnoreSSL = yesNoPickerBox3.Value;
 
                 return _appSession;
             }
diff --git a/Services/WebProvider.cs b/Services/WebProvider.cs
index 9a556fa..766db94 100644
--- a/Services/WebProvider.cs
+++ b/Services/WebProvider.cs
@@ -18,6 +18,17 @@ namespace BookmarkManager.Services
             _webClientProvider.Timeout = 4;
         }
 
+
+        public bool IgnoreSSL
+        {
+            get => _webClientProvider.IgnoreSSL;
+            set
+            {
+                _webClientProvider.IgnoreSSL = value;
+            }
+        }
+
+
         public async Task<HtmlAgilityPack.HtmlDocument> RetrieveHtmlDocument(string url)
         {
             var sourceCode = await this.RetrieveSourceCode(url);
diff --git a/UpdateIconsForm.cs b/UpdateIconsForm.cs
index bda9729..f4cf5ac 100644
--- a/UpdateIconsForm.cs
+++ b/UpdateIconsForm.cs
@@ -41,6 +41,7 @@ namespace FizzyLauncher
             this.OkButton = button1;
 
             _webProvider = new WebProvider();
+            _webProvider.IgnoreSSL = true;
 
             _treeView = treeView;
         }
diff --git a/build-installer.iss b/build-installer.iss
index b938179..ce48110 100644
--- a/build-installer.iss
+++ b/build-installer.iss
@@ -1,15 +1,15 @@
 ; Script generated by the Inno Setup Script Wizard.
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
-#define MyAppName "Bookmark Manager"
+#define MyAppName "BukkuBuddy Bookmark Manager"
 #define MyAppVersion "0.6.0.716"
 #define MyAppPublisher "Hi, I'm Ray"
 #define MyAppURL "https://www.hiimray.co.uk/software-bookmark-manager"
-#define MyAppExeName "bookmarkmanager.exe"
+#define MyAppExeName "bukkubuddy.exe"
 
 #define AppSourcePath "L:\gitea-hiimray\bookmark-manager-r4\bin"
 #define AppReleasePath "L:\gitea-hiimray\bookmark-manager-r4\bin"
-#define AppReleaseName "bookmark-manager"
+#define AppReleaseName "bukkubuddy-installer"
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
@@ -39,7 +39,7 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "{#AppSourcePath}\bookmarkmanager.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#AppSourcePath}\bukkubuddy.exe"; DestDir: "{app}"; Flags: ignoreversion
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]
diff --git a/build.bat b/build.bat
index 4d5c801..f6cc459 100644
--- a/build.bat
+++ b/build.bat
@@ -8,7 +8,7 @@ dotnet publish skye.sln -r win-x64 -c Release /p:PublishSingleFile=true /p:SelfC
 
 "C:\B\Portable Files (dev)\Inno Setup\v6.0.4-2\app\ISCC.exe" "build-installer.iss"
 
-"C:\B\Portable Files\7-Zip (Portable)\23.01\App\7-Zip64\7z.exe" a -t7z "bin\bookmarkmanager.7z" ".\bin\bookmarkmanager.exe" -mx9
+"C:\B\Portable Files\7-Zip (Portable)\23.01\App\7-Zip64\7z.exe" a -t7z "bin\bukkubuddy.7z" ".\bin\bukkubuddy.exe" -mx9
 
 RMDIR /s /q "bin\debug"
 RMDIR /s /q "bin\release"