17 files changed, 30 insertions, 34 deletions
diff --git a/Histacom2/OS/Win95/Win95Apps/IE3Sites/12padams1998.Designer.cs b/Histacom2/OS/Win95/Win95Apps/IE3Sites/Website12padams1998.Designer.cs
index dc00477..4e0f8fc 100644
--- a/Histacom2/OS/Win95/Win95Apps/IE3Sites/12padams1998.Designer.cs
+++ b/Histacom2/OS/Win95/Win95Apps/IE3Sites/Website12padams1998.Designer.cs
@@ -1,6 +1,6 @@
 namespace Histacom2.OS.Win95.Win95Apps.IE3Sites
 {
-    partial class _12padams1998
+    partial class Website12padams1998
     {
         /// <summary> 
         /// Required designer variable.
@@ -28,7 +28,7 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(_12padams1998));
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Website12padams1998));
             this.label1 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
             this.panel1 = new System.Windows.Forms.Panel();
diff --git a/Histacom2/OS/Win95/Win95Apps/IE3Sites/12padams1998.cs b/Histacom2/OS/Win95/Win95Apps/IE3Sites/Website12padams1998.cs
index f55ee45..aec122b 100644
--- a/Histacom2/OS/Win95/Win95Apps/IE3Sites/12padams1998.cs
+++ b/Histacom2/OS/Win95/Win95Apps/IE3Sites/Website12padams1998.cs
@@ -13,10 +13,10 @@ using Histacom2.GlobalPrograms;
 
 namespace Histacom2.OS.Win95.Win95Apps.IE3Sites
 {
-    public partial class _12padams1998 : UserControl
+    public partial class Website12padams1998 : UserControl
     {
         bool clicked = false;
-        public _12padams1998()
+        public Website12padams1998()
         {
             InitializeComponent();
             button1.Paint += (s, args) => Paintbrush.PaintClassicBorders(s, args, 2);
diff --git a/Histacom2/OS/Win95/Win95Apps/IE3Sites/12padams1998.resx b/Histacom2/OS/Win95/Win95Apps/IE3Sites/Website12padams1998.resx
index 6a9a4c8..6a9a4c8 100644
--- a/Histacom2/OS/Win95/Win95Apps/IE3Sites/12padams1998.resx
+++ b/Histacom2/OS/Win95/Win95Apps/IE3Sites/Website12padams1998.resx
diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicIE3.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicIE3.cs
index 34828cc..0ba3310 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicIE3.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WinClassicIE3.cs
@@ -49,10 +49,10 @@ namespace Histacom2.OS.Win95.Win95Apps
                     uc = new GooglePrototype();
                     break;
                 case "www.12padams.com":
-                    uc = new _12padams1998();
+                    uc = new Website12padams1998();
                     break;
                 case "12padams.com":
-                    uc = new _12padams1998();
+                    uc = new Website12padams1998();
                     newURL = "www.12padams.com";
                     break;
                 case "google.com":
diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicInstaller.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicInstaller.cs
index a15b1e1..0b075e0 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicInstaller.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WinClassicInstaller.cs
@@ -7,7 +7,8 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using TimeHACK.OS.Win95;
+using Histacom2.OS.Win95;
+using Histacom2;
 
 namespace TimeHACK.WinClassicForms
 {
diff --git a/Histacom2/OS/Win95/Win95.Designer.cs b/Histacom2/OS/Win95/Windows95.Designer.cs
index ed21560..ed21560 100644
--- a/Histacom2/OS/Win95/Win95.Designer.cs
+++ b/Histacom2/OS/Win95/Windows95.Designer.cs
diff --git a/Histacom2/OS/Win95/Win95.cs b/Histacom2/OS/Win95/Windows95.cs
index bf2ebb4..31e8bca 100644
--- a/Histacom2/OS/Win95/Win95.cs
+++ b/Histacom2/OS/Win95/Windows95.cs
@@ -6,7 +6,6 @@ using System.Media;
 using System.Windows.Forms;
 using Histacom2.Engine;
 using Histacom2.Engine.Template;
-using Histacom2.Engine.Template.Taskbars;
 using Histacom2.OS.Win95.Win95Apps;
 using Histacom2.OS.Win95.Win95Apps.Story;
 using static Histacom2.Engine.SaveSystem;
@@ -353,7 +352,7 @@ namespace Histacom2.OS.Win95
 
         public void AddTaskBarItem(Form Application, string ApplicationID, string ApplicationName, Image ApplicationIcon)
         {
-            taskbarItems = tb.AddTaskbarItem95(ApplicationID, ApplicationName, ApplicationIcon, (UserControl)new Win95TaskBarItem(), taskbarItems);
+            taskbarItems = tb.AddTaskbarItem95(ApplicationID, ApplicationName, ApplicationIcon, (UserControl)new Windows95TaskbarItem(), taskbarItems);
             Application.FormClosed += new FormClosedEventHandler(UpdateTaskbarFromClosedApplication);
         }
 
@@ -372,7 +371,7 @@ namespace Histacom2.OS.Win95
             foreach (Form form in tb.GetAllOpenApps())
             {
                 // Calls that "AddToTaskbar" thing
-                taskbarItems = tb.AddTaskbarItem95(form.Tag.ToString(), form.Text.ToString(), (Image)form.Icon.ToBitmap(), (UserControl)new Win95TaskBarItem(), taskbarItems);
+                taskbarItems = tb.AddTaskbarItem95(form.Tag.ToString(), form.Text.ToString(), (Image)form.Icon.ToBitmap(), (UserControl)new Windows95TaskbarItem(), taskbarItems);
             }
         }
 
diff --git a/Histacom2/OS/Win95/Win95.resx b/Histacom2/OS/Win95/Windows95.resx
index c1da639..c1da639 100644
--- a/Histacom2/OS/Win95/Win95.resx
+++ b/Histacom2/OS/Win95/Windows95.resx
diff --git a/Histacom2/OS/Win95/Win95TaskBarItem.Designer.cs b/Histacom2/OS/Win95/Windows95TaskbarItem.Designer.cs
index c6c4952..3df7a69 100644
--- a/Histacom2/OS/Win95/Win95TaskBarItem.Designer.cs
+++ b/Histacom2/OS/Win95/Windows95TaskbarItem.Designer.cs
@@ -1,6 +1,6 @@
-namespace Histacom2.Engine.Template.Taskbars
+namespace Histacom2.OS.Win95
 {
-    partial class Win95TaskBarItem
+    partial class Windows95TaskbarItem
     {
         /// <summary> 
         /// Required designer variable.
@@ -28,7 +28,7 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Win95TaskBarItem));
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Windows95TaskbarItem));
             this.progName = new System.Windows.Forms.Label();
             this.progPic = new System.Windows.Forms.PictureBox();
             this.panel1 = new System.Windows.Forms.Panel();
diff --git a/Histacom2/OS/Win95/Win95TaskBarItem.cs b/Histacom2/OS/Win95/Windows95TaskbarItem.cs
index f550497..2ba341f 100644
--- a/Histacom2/OS/Win95/Win95TaskBarItem.cs
+++ b/Histacom2/OS/Win95/Windows95TaskbarItem.cs
@@ -1,21 +1,17 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
+using Histacom2.Engine;
+using System;
 using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
-using Histacom2.Engine;
 
-namespace Histacom2.Engine.Template.Taskbars
+namespace Histacom2.OS.Win95
 {
-    public partial class Win95TaskBarItem : UserControl
+    public partial class Windows95TaskbarItem : UserControl
     {
+
         TaskBarController tb = new TaskBarController();
         public string ApplicationID;
-        public Win95TaskBarItem()
+
+        public Windows95TaskbarItem()
         {
             InitializeComponent();
             progName.Font = new Font(TitleScreen.pfc.Families[0], 16f, FontStyle.Regular, GraphicsUnit.Point, ((0)));
diff --git a/Histacom2/OS/Win95/Win95TaskBarItem.resx b/Histacom2/OS/Win95/Windows95TaskbarItem.resx
index bc8896d..bc8896d 100644
--- a/Histacom2/OS/Win95/Win95TaskBarItem.resx
+++ b/Histacom2/OS/Win95/Windows95TaskbarItem.resx
diff --git a/Histacom2/OS/Win98/Win98Apps/WinClassicTimeDistorter2.Designer.cs b/Histacom2/OS/Win98/Win98Apps/WinClassicTimeDistorter2.Designer.cs
index 9db9785..413024e 100644
--- a/Histacom2/OS/Win98/Win98Apps/WinClassicTimeDistorter2.Designer.cs
+++ b/Histacom2/OS/Win98/Win98Apps/WinClassicTimeDistorter2.Designer.cs
@@ -123,4 +123,4 @@
         private System.Windows.Forms.Timer timer1;
         public Engine.UI.ClassicLabel classicLabel2;
     }
-}
+}
+\ No newline at end of file
diff --git a/Histacom2/OS/Win98/Win98.Designer.cs b/Histacom2/OS/Win98/Windows98.Designer.cs
index b8fc6ea..b8fc6ea 100644
--- a/Histacom2/OS/Win98/Win98.Designer.cs
+++ b/Histacom2/OS/Win98/Windows98.Designer.cs
diff --git a/Histacom2/OS/Win98/Win98.cs b/Histacom2/OS/Win98/Windows98.cs
index 36939a8..820f01c 100644
--- a/Histacom2/OS/Win98/Win98.cs
+++ b/Histacom2/OS/Win98/Windows98.cs
@@ -6,12 +6,12 @@ using System.Media;
 using System.Windows.Forms;
 using Histacom2.Engine;
 using Histacom2.Engine.Template;
-using Histacom2.Engine.Template.Taskbars;
 using Histacom2.OS.Win95.Win95Apps;
 using Histacom2.OS.Win95.Win95Apps.Story;
 using static Histacom2.Engine.SaveSystem;
 using Histacom2.OS.Win98.Win98Apps;
 using Histacom2.GlobalPrograms;
+using Histacom2.OS.Win95;
 
 namespace Histacom2.OS.Win98
 {
@@ -381,7 +381,7 @@ namespace Histacom2.OS.Win98
 
         public void AddTaskBarItem(Form Application, string ApplicationID, string ApplicationName, Image ApplicationIcon)
         {
-            taskbarItems = tb.AddTaskbarItem95(ApplicationID, ApplicationName, ApplicationIcon, (UserControl)new Win95TaskBarItem(), taskbarItems);
+            taskbarItems = tb.AddTaskbarItem95(ApplicationID, ApplicationName, ApplicationIcon, (UserControl)new Windows95TaskbarItem(), taskbarItems);
             Application.FormClosed += new FormClosedEventHandler(UpdateTaskbarFromClosedApplication);
         }
 
@@ -400,7 +400,7 @@ namespace Histacom2.OS.Win98
             foreach (Form form in tb.GetAllOpenApps())
             {
                 // Calls that "AddToTaskbar" thing
-                taskbarItems = tb.AddTaskbarItem95(form.Tag.ToString(), form.Text.ToString(), (Image)form.Icon.ToBitmap(), (UserControl)new Win95TaskBarItem(), taskbarItems);
+                taskbarItems = tb.AddTaskbarItem95(form.Tag.ToString(), form.Text.ToString(), (Image)form.Icon.ToBitmap(), (UserControl)new Windows95TaskbarItem(), taskbarItems);
             }
         }
 
diff --git a/Histacom2/OS/Win98/Win98.resx b/Histacom2/OS/Win98/Windows98.resx
index 28744a3..28744a3 100644
--- a/Histacom2/OS/Win98/Win98.resx
+++ b/Histacom2/OS/Win98/Windows98.resx
diff --git a/Histacom2/OS/WinME/WinME.cs b/Histacom2/OS/WinME/WinME.cs
index 1470902..7510cf4 100644
--- a/Histacom2/OS/WinME/WinME.cs
+++ b/Histacom2/OS/WinME/WinME.cs
@@ -6,13 +6,13 @@ using System.Media;
 using System.Windows.Forms;
 using Histacom2.Engine;
 using Histacom2.Engine.Template;
-using Histacom2.Engine.Template.Taskbars;
 using Histacom2.OS.Win95.Win95Apps;
 using Histacom2.OS.Win95.Win95Apps.Story;
 using static Histacom2.Engine.SaveSystem;
 using Histacom2.OS.Win95.Win95Apps._12padamViruses;
 using Histacom2.OS.Win95.Win95Apps._12padamsViruses;
 using Histacom2.GlobalPrograms;
+using Histacom2.OS.Win95;
 
 namespace Histacom2.OS.WinME
 {
@@ -345,7 +345,7 @@ namespace Histacom2.OS.WinME
 
         public void AddTaskBarItem(Form Application, string ApplicationID, string ApplicationName, Image ApplicationIcon)
         {
-            taskbarItems = tb.AddTaskbarItem95(ApplicationID, ApplicationName, ApplicationIcon, (UserControl)new Win95TaskBarItem(), taskbarItems);
+            taskbarItems = tb.AddTaskbarItem95(ApplicationID, ApplicationName, ApplicationIcon, (UserControl)new Windows95TaskbarItem(), taskbarItems);
             Application.FormClosed += new FormClosedEventHandler(UpdateTaskbarFromClosedApplication);
         }
 
@@ -364,7 +364,7 @@ namespace Histacom2.OS.WinME
             foreach (Form form in tb.GetAllOpenApps())
             {
                 // Calls that "AddToTaskbar" thing
-                taskbarItems = tb.AddTaskbarItem95(form.Tag.ToString(), form.Text.ToString(), (Image)form.Icon.ToBitmap(), (UserControl)new Win95TaskBarItem(), taskbarItems);
+                taskbarItems = tb.AddTaskbarItem95(form.Tag.ToString(), form.Text.ToString(), (Image)form.Icon.ToBitmap(), (UserControl)new Windows95TaskbarItem(), taskbarItems);
             }
         }
 
diff --git a/Histacom2/OS/WinXPBad/WinXPBad.cs b/Histacom2/OS/WinXPBad/WinXPBad.cs
index 61c69e1..cb70009 100644
--- a/Histacom2/OS/WinXPBad/WinXPBad.cs
+++ b/Histacom2/OS/WinXPBad/WinXPBad.cs
@@ -6,7 +6,6 @@ using System.Media;
 using System.Windows.Forms;
 using Histacom2.Engine;
 using Histacom2.Engine.Template;
-using Histacom2.Engine.Template.Taskbars;
 using Histacom2.OS.Win95.Win95Apps;
 using Histacom2.OS.Win95.Win95Apps.Story;
 using static Histacom2.Engine.SaveSystem;
@@ -14,6 +13,7 @@ using Histacom2.OS.Win98.Win98Apps;
 using Histacom2.GlobalPrograms;
 using Histacom2.OS.WinXPBad.Story;
 using System.Threading.Tasks;
+using Histacom2.OS.Win95;
 
 namespace Histacom2.OS.WinXPBad
 {
@@ -197,7 +197,7 @@ namespace Histacom2.OS.WinXPBad
 
         public void AddTaskBarItem(Form Application, string ApplicationID, string ApplicationName, Image ApplicationIcon)
         {
-            taskbarItems = tb.AddTaskbarItem95(ApplicationID, ApplicationName, ApplicationIcon, (UserControl)new Win95TaskBarItem(), taskbarItems);
+            taskbarItems = tb.AddTaskbarItem95(ApplicationID, ApplicationName, ApplicationIcon, (UserControl)new Windows95TaskbarItem(), taskbarItems);
             Application.FormClosed += new FormClosedEventHandler(UpdateTaskbarFromClosedApplication);
         }
 
@@ -216,7 +216,7 @@ namespace Histacom2.OS.WinXPBad
             foreach (Form form in tb.GetAllOpenApps())
             {
                 // Calls that "AddToTaskbar" thing
-                taskbarItems = tb.AddTaskbarItem95(form.Tag.ToString(), form.Text.ToString(), form.Icon.ToBitmap(), new Win95TaskBarItem(), taskbarItems);
+                taskbarItems = tb.AddTaskbarItem95(form.Tag.ToString(), form.Text.ToString(), form.Icon.ToBitmap(), new Windows95TaskbarItem(), taskbarItems);
             }
         }