Updated my fork!

11 files changed, 226 insertions, 43 deletions

diff --git a/Histacom2/OS/Win95/Win95.Designer.cs b/Histacom2/OS/Win95/Win95.Designer.cs
index 8f8443c..8e17941 100644
--- a/Histacom2/OS/Win95/Win95.Designer.cs
+++ b/Histacom2/OS/Win95/Win95.Designer.cs
@@ -323,7 +323,6 @@ namespace Histacom2.OS.Win95
             this.NetMeetingToolStripMenuItem.Name = "NetMeetingToolStripMenuItem";
             this.NetMeetingToolStripMenuItem.Size = new System.Drawing.Size(219, 22);
             this.NetMeetingToolStripMenuItem.Text = "NetMeeting";
-            this.NetMeetingToolStripMenuItem.Click += new System.EventHandler(this.WebChatToolStripMenuItem_Click);
             // 
             // MultimediaToolStripMenuItem
             // 
diff --git a/Histacom2/OS/Win95/Win95.cs b/Histacom2/OS/Win95/Win95.cs
index 38129ab..e330ea0 100644
--- a/Histacom2/OS/Win95/Win95.cs
+++ b/Histacom2/OS/Win95/Win95.cs
@@ -118,7 +118,7 @@ namespace Histacom2.OS.Win95
             {
                 CurrentSave.FTime95 = true;
                 SaveGame();
-                welcome = wm.Init(new WinClassicWelcome(), "Welcome", null, false, false, resize: false);
+                welcome = wm.Init(new Win95Welcome(), "Welcome", null, false, false, resize: false);
                 AddTaskBarItem(welcome, welcome.Tag.ToString(), "Welcome", null);
 
                 nonimportantapps.Add(welcome);
diff --git a/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs b/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs
index 5f71ce4..77f63b5 100644
--- a/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs
+++ b/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs
@@ -5,7 +5,6 @@ using System.Threading.Tasks;
 using System.Windows.Forms;
 using Histacom2.Engine;
 using Histacom2.Engine.Template;
-using Histacom2.OS.Win98;
 
 namespace Histacom2.OS.Win95.Win95Apps.Story
 {
diff --git a/Histacom2/OS/Win95/Win95Apps/WebChat1998.Designer.cs b/Histacom2/OS/Win95/Win95Apps/WebChat1998.Designer.cs
index ea9d0cd..314bf7b 100644
--- a/Histacom2/OS/Win95/Win95Apps/WebChat1998.Designer.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WebChat1998.Designer.cs
@@ -29,7 +29,7 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WebChat1998));
+            this.resources = new System.ComponentModel.ComponentResourceManager(typeof(WebChat1998));
             this.Chat = new System.Windows.Forms.Timer(this.components);
             this.listBox1 = new System.Windows.Forms.ListBox();
             this.label1 = new Histacom2.Engine.UI.ClassicLabel();
@@ -46,7 +46,7 @@
             this.label3 = new Histacom2.Engine.UI.ClassicLabel();
             this.label4 = new Histacom2.Engine.UI.ClassicLabel();
             this.textBox1 = new System.Windows.Forms.TextBox();
-            this.textBox2 = new System.Windows.Forms.TextBox();
+            this.textBox2 = new Histacom2.Engine.UI.ClassicLabel();
             this.label7 = new Histacom2.Engine.UI.ClassicLabel();
             this.button2 = new Histacom2.Engine.UI.ClassicButton();
             this.button3 = new Histacom2.Engine.UI.ClassicButton();
@@ -75,7 +75,7 @@
             this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.label1.Location = new System.Drawing.Point(506, 13);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(85, 13);
+            this.label1.Size = new System.Drawing.Size(96, 13);
             this.label1.TabIndex = 1;
             this.label1.Text = "Users Logged In";
             // 
@@ -106,18 +106,22 @@
             // 
             // label5
             // 
-            this.label5.Location = new System.Drawing.Point(13, 18);
+            this.label5.Location = new System.Drawing.Point(10, 18);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(84, 13);
+            this.label5.Size = new System.Drawing.Size(87, 13);
             this.label5.TabIndex = 1;
             this.label5.Text = "skin95setup.exe";
             // 
             // button5
             // 
+            this.button5.AdaptBackColorWithTheme = true;
+            this.button5.AdaptFontWithTheme = true;
+            this.button5.AdaptForeColorWithTheme = true;
             this.button5.BackColor = System.Drawing.Color.Silver;
+            this.button5.DialogResult = System.Windows.Forms.DialogResult.None;
             this.button5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
             this.button5.ForeColor = System.Drawing.Color.Black;
-            this.button5.Location = new System.Drawing.Point(101, 13);
+            this.button5.Location = new System.Drawing.Point(103, 13);
             this.button5.Name = "button5";
             this.button5.Size = new System.Drawing.Size(75, 23);
             this.button5.TabIndex = 0;
@@ -128,7 +132,7 @@
             this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.label6.Location = new System.Drawing.Point(504, 374);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(62, 13);
+            this.label6.Size = new System.Drawing.Size(70, 13);
             this.label6.TabIndex = 4;
             this.label6.Text = "File Sharing";
             // 
@@ -158,7 +162,7 @@
             // 
             this.label2.Location = new System.Drawing.Point(328, 161);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(149, 13);
+            this.label2.Size = new System.Drawing.Size(166, 13);
             this.label2.TabIndex = 6;
             this.label2.Text = "Please type in a screen name.";
             // 
@@ -171,7 +175,11 @@
             // 
             // button1
             // 
+            this.button1.AdaptBackColorWithTheme = true;
+            this.button1.AdaptFontWithTheme = true;
+            this.button1.AdaptForeColorWithTheme = true;
             this.button1.BackColor = System.Drawing.Color.Silver;
+            this.button1.DialogResult = System.Windows.Forms.DialogResult.None;
             this.button1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
             this.button1.ForeColor = System.Drawing.Color.Black;
             this.button1.Location = new System.Drawing.Point(331, 208);
@@ -183,9 +191,9 @@
             // 
             // label3
             // 
-            this.label3.Location = new System.Drawing.Point(202, 16);
+            this.label3.Location = new System.Drawing.Point(198, 16);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(112, 13);
+            this.label3.Size = new System.Drawing.Size(116, 13);
             this.label3.TabIndex = 3;
             this.label3.Text = "Welcome to WebChat";
             // 
@@ -193,7 +201,7 @@
             // 
             this.label4.Location = new System.Drawing.Point(118, 56);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(93, 13);
+            this.label4.Size = new System.Drawing.Size(100, 13);
             this.label4.TabIndex = 2;
             this.label4.Text = "Chat Room Rules:";
             // 
@@ -212,12 +220,9 @@
             // textBox2
             // 
             this.textBox2.BackColor = System.Drawing.Color.Silver;
-            this.textBox2.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            this.textBox2.Location = new System.Drawing.Point(331, 72);
-            this.textBox2.Multiline = true;
+            this.textBox2.Location = new System.Drawing.Point(328, 58);
             this.textBox2.Name = "textBox2";
-            this.textBox2.ReadOnly = true;
-            this.textBox2.Size = new System.Drawing.Size(151, 86);
+            this.textBox2.Size = new System.Drawing.Size(154, 76);
             this.textBox2.TabIndex = 0;
             this.textBox2.Text = "A screen name is a temporary name which will be displayed in place of your real n" +
     "ame. To keep your identity safe, please do not enter your real name in this chat" +
@@ -234,8 +239,12 @@
             // 
             // button2
             // 
+            this.button2.AdaptBackColorWithTheme = true;
+            this.button2.AdaptFontWithTheme = true;
+            this.button2.AdaptForeColorWithTheme = true;
             this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.button2.BackColor = System.Drawing.Color.Silver;
+            this.button2.DialogResult = System.Windows.Forms.DialogResult.None;
             this.button2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
             this.button2.ForeColor = System.Drawing.Color.Black;
             this.button2.Location = new System.Drawing.Point(422, 415);
@@ -247,7 +256,11 @@
             // 
             // button3
             // 
+            this.button3.AdaptBackColorWithTheme = true;
+            this.button3.AdaptFontWithTheme = true;
+            this.button3.AdaptForeColorWithTheme = true;
             this.button3.BackColor = System.Drawing.Color.Silver;
+            this.button3.DialogResult = System.Windows.Forms.DialogResult.None;
             this.button3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
             this.button3.ForeColor = System.Drawing.Color.Black;
             this.button3.Location = new System.Drawing.Point(149, 427);
@@ -259,7 +272,11 @@
             // 
             // button4
             // 
+            this.button4.AdaptBackColorWithTheme = true;
+            this.button4.AdaptFontWithTheme = true;
+            this.button4.AdaptForeColorWithTheme = true;
             this.button4.BackColor = System.Drawing.Color.Silver;
+            this.button4.DialogResult = System.Windows.Forms.DialogResult.None;
             this.button4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
             this.button4.ForeColor = System.Drawing.Color.Black;
             this.button4.Location = new System.Drawing.Point(235, 427);
@@ -308,7 +325,7 @@
         private Histacom2.Engine.UI.ClassicLabel label5;
         private System.Windows.Forms.TextBox typechat;
         private System.Windows.Forms.Panel login;
-        private System.Windows.Forms.TextBox textBox2;
+        private Histacom2.Engine.UI.ClassicLabel textBox2;
         private System.Windows.Forms.TextBox textBox1;
         private Histacom2.Engine.UI.ClassicLabel label4;
         private Histacom2.Engine.UI.ClassicLabel label3;
diff --git a/Histacom2/OS/Win95/Win95Apps/WebChat1998.cs b/Histacom2/OS/Win95/Win95Apps/WebChat1998.cs
index 0b2ef8a..c986b23 100644
--- a/Histacom2/OS/Win95/Win95Apps/WebChat1998.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WebChat1998.cs
@@ -34,20 +34,12 @@ namespace Histacom2.OS.Win95.Win95Apps
 
         BSODCreator bc = new BSODCreator();
         Win9XBSOD bsod = null;
-        Win9XBSOD bsod2 = null;
 
         public WebChat1998()
         {
             InitializeComponent();
             bsod = bc.throw9XBSOD(false, BSODCreator.BSODCauses.WimpEnding);
-            bsod2 = bc.throw9XBSOD(false, BSODCreator.BSODCauses.PiracyEnding);
             bsod.Hide();
-            bsod2.Hide();
-
-            this.button1.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2);
-            this.button2.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2);
-            this.button3.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2);
-            this.button4.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2);
 
             textBox1.Text = "If you do not agree to the following rules below DO NOT log into the chat:\n\nNo Bullying\nNo Swearing\nNo Hacking\nNo Illegal Files / Piracy\n\nFailure to follow these rules will result in serious irreversible consequences.";
         }
@@ -205,9 +197,13 @@ namespace Histacom2.OS.Win95.Win95Apps
                     case "type":
                         history.ReadOnly = false;
                         break;
-                    case "notyper":
-                        history.ReadOnly = true;
-                        break; // TODO: Add ending here
+                    case "pixel":
+                        history.Font = new Font(TitleScreen.pfc.Families[1], 16, FontStyle.Regular);
+                        break;
+                    case ".cmd-end":
+                        Chat.Stop();
+                        endingActivate();
+                        break;
                     default:
                         if (msgsound) receive.Play();
                         break;
@@ -232,6 +228,23 @@ namespace Histacom2.OS.Win95.Win95Apps
             chat_index++;
         }
 
+        private async void endingActivate()
+        {
+            history.ReadOnly = true;
+            history.Text = "";
+            await Task.Delay(1500);
+            history.Text = "Starting MS-DOS...";
+            await Task.Delay(1000);
+            history.Text = "Starting MS-DOS...\n\nC:\\>";
+            history.ReadOnly = false;
+            await Task.Delay(5000);
+            history.ReadOnly = true;
+            history.Text = "GAME OVER. Your computer has been locked down to MS-DOS because you pirated software. Seriously, what were you thinking?";
+            await Task.Delay(2000);
+            SaveSystem.SaveAchievement(0);
+            new AchievementBox(0);
+        }
+
         private void WebChatClosing(object sender, FormClosingEventArgs e)
         {
             if (wimponclose)
@@ -239,7 +252,6 @@ namespace Histacom2.OS.Win95.Win95Apps
                 bsod.FormClosing += new FormClosingEventHandler(Program.title.BSODRewind);
                 bsod.Show();
                 bsod.BringToFront();
-                bsod2.Close();
             }
         }
 
diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.Designer.cs b/Histacom2/OS/Win95/Win95Apps/Win95Welcome.Designer.cs
index 8c1f84a..d9110f7 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.Designer.cs
+++ b/Histacom2/OS/Win95/Win95Apps/Win95Welcome.Designer.cs
@@ -1,6 +1,6 @@
 namespace Histacom2.OS.Win95.Win95Apps
 {
-    partial class WinClassicWelcome
+    partial class Win95Welcome
     {
         /// <summary> 
         /// Required designer variable.
diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.cs b/Histacom2/OS/Win95/Win95Apps/Win95Welcome.cs
index 6ec79a4..9b7280b 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.cs
+++ b/Histacom2/OS/Win95/Win95Apps/Win95Welcome.cs
@@ -10,9 +10,9 @@ using System.Windows.Forms;
 
 namespace Histacom2.OS.Win95.Win95Apps
 {
-    public partial class WinClassicWelcome : UserControl
+    public partial class Win95Welcome : UserControl
     {
-        public WinClassicWelcome()
+        public Win95Welcome()
         {
             InitializeComponent();
         }
diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.resx b/Histacom2/OS/Win95/Win95Apps/Win95Welcome.resx
index 1af7de1..1af7de1 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.resx
+++ b/Histacom2/OS/Win95/Win95Apps/Win95Welcome.resx
diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicTerminal.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicTerminal.cs
index 668078e..d87dc4e 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicTerminal.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WinClassicTerminal.cs
@@ -28,7 +28,7 @@ namespace Histacom2.OS.Win95.Win95Apps
         public static string prefix = @"C:\WINDOWS>";
         public static string workingDir = $"{SaveSystem.ProfileWindowsDirectory}";
         public string output = "";
-
+        public bool cls = false;
         public WinClassicTerminal(bool readOnly)
         {
             InitializeComponent();
@@ -107,9 +107,10 @@ namespace Histacom2.OS.Win95.Win95Apps
         {
             //TODO: Add font UC(?)
         }
-
+        
         private void richTextBox1_KeyUp(object sender, KeyEventArgs e)
         {
+
             if (e.KeyData == Keys.Return)
             {
                 string[] cmd = cmdPrompt.Lines[currentLine].Substring(prefix.Length).Split(' ');
@@ -152,6 +153,12 @@ namespace Histacom2.OS.Win95.Win95Apps
                         output += dline;
 
                         break;
+                    case "cls":
+                        currentLine = 0;
+                        cmdPrompt.Clear();
+                        cls = true;
+                        output = prefix;
+                        break;
                     default:
                         // Temporary CMD redirect
                         /*
@@ -174,11 +181,18 @@ namespace Histacom2.OS.Win95.Win95Apps
 
                 cmdPrompt.Focus();
                 cmdPrompt.AppendText($"\n{output}"); // Append the command output
-
-                int numLines = output.Split('\n').Length; // Get the number of lines from the command output
-                currentLine = currentLine + 2 + numLines; // Set the current line to equals the previous line plus 2 plus the number of lines from the command
-
-                cmdPrompt.AppendText($"\n\n{prefix}"); // Append the text to the RichTextBox
+                string[] stringSeparators = new string[] { "\n" };
+                string[] lines = output.Split(stringSeparators, StringSplitOptions.None);
+                foreach (string s in lines)
+                {
+                    currentLine++;
+                }
+                if (!cls)
+                {
+                    cmdPrompt.AppendText($"\n\n{prefix}"); // Append the text to the RichTextBox
+                    currentLine = currentLine + 3;
+                }
+                cls = false;
             }  
         }
     }
diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs
index 6b92d11..5caf02f 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs
@@ -53,8 +53,18 @@
             this.comboBox1.FormattingEnabled = true;
             this.comboBox1.Items.AddRange(new object[] {
             "Default",
+            "Windows 95 Default Plus",
             "Dangerous Creatures",
-            "Inside Your Computer"});
+            "Inside Your Computer",
+            "Leonardo da Vinci",
+            "More Windows",
+            "Mystery",
+            "Nature",
+            "Science",
+            "Sports",
+            "The 60\'s USA",
+            "The Golden Era",
+            "Travel"});
             this.comboBox1.Location = new System.Drawing.Point(15, 201);
             this.comboBox1.Name = "comboBox1";
             this.comboBox1.Size = new System.Drawing.Size(269, 21);
@@ -73,6 +83,13 @@
             // 
             // applyButton
             // 
+            this.applyButton.AdaptBackColorWithTheme = true;
+            this.applyButton.AdaptFontWithTheme = true;
+            this.applyButton.AdaptForeColorWithTheme = true;
+            this.applyButton.BackColor = System.Drawing.Color.Silver;
+            this.applyButton.DialogResult = System.Windows.Forms.DialogResult.None;
+            this.applyButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
+            this.applyButton.ForeColor = System.Drawing.Color.Black;
             this.applyButton.Location = new System.Drawing.Point(209, 245);
             this.applyButton.Name = "applyButton";
             this.applyButton.Size = new System.Drawing.Size(75, 23);
@@ -82,6 +99,13 @@
             // 
             // cancelButton
             // 
+            this.cancelButton.AdaptBackColorWithTheme = true;
+            this.cancelButton.AdaptFontWithTheme = true;
+            this.cancelButton.AdaptForeColorWithTheme = true;
+            this.cancelButton.BackColor = System.Drawing.Color.Silver;
+            this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.None;
+            this.cancelButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
+            this.cancelButton.ForeColor = System.Drawing.Color.Black;
             this.cancelButton.Location = new System.Drawing.Point(128, 245);
             this.cancelButton.Name = "cancelButton";
             this.cancelButton.Size = new System.Drawing.Size(75, 23);
@@ -91,6 +115,13 @@
             // 
             // okButton
             // 
+            this.okButton.AdaptBackColorWithTheme = true;
+            this.okButton.AdaptFontWithTheme = true;
+            this.okButton.AdaptForeColorWithTheme = true;
+            this.okButton.BackColor = System.Drawing.Color.Silver;
+            this.okButton.DialogResult = System.Windows.Forms.DialogResult.None;
+            this.okButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
+            this.okButton.ForeColor = System.Drawing.Color.Black;
             this.okButton.Location = new System.Drawing.Point(47, 245);
             this.okButton.Name = "okButton";
             this.okButton.Size = new System.Drawing.Size(75, 23);
diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs
index 2529e10..cac1bb1 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs
@@ -35,6 +35,36 @@ namespace Histacom2.OS.Win95.Win95Apps
                 case "Inside Your Computer":
                     pictureBox2.BackgroundImage = Properties.Resources.ICTheme_BG;
                     break;
+                case "Windows 95 Default Plus":
+                    pictureBox2.BackgroundImage = Properties.Resources.Win95PlusDefaultWallpaper;
+                    break;
+                case "The Golden Era":
+                    pictureBox2.BackgroundImage = Properties.Resources.Win95PlusGoldenEraWallpaper;
+                    break;
+                case "Leonardo da Vinci":
+                    pictureBox2.BackgroundImage = Properties.Resources.Win95PlusLeoWallpaper;
+                    break;
+                case "Mystery":
+                    pictureBox2.BackgroundImage = Properties.Resources.Win95PlusMysteryWallpaper;
+                    break;
+                case "Nature":
+                    pictureBox2.BackgroundImage = Properties.Resources.Win95PlusNatureWallpaper;
+                    break;
+                case "Science":
+                    pictureBox2.BackgroundImage = Properties.Resources.Win95PlusScienceWallpaper;
+                    break;
+                case "Sports":
+                    pictureBox2.BackgroundImage = Properties.Resources.Win95PlusSportsWallpaper;
+                    break;
+                case "The 60's USA":
+                    pictureBox2.BackgroundImage = Properties.Resources.Win95PlusThe60Wallpaper;
+                    break;
+                case "Travel":
+                    pictureBox2.BackgroundImage = Properties.Resources.Win95PlusTravelWallpaper;
+                    break;
+                case "More Windows":
+                    pictureBox2.BackgroundImage = Properties.Resources.Win95PlusMoreWin;
+                    break;
             }
         }
 
@@ -51,6 +81,37 @@ namespace Histacom2.OS.Win95.Win95Apps
                 case "insidepc":
                     comboBox1.SelectedItem = "Inside Your Computer";
                     break;
+                case "default95plus":
+                    comboBox1.SelectedItem = "Windows 95 Default Plus";
+                    break;
+                case "goldenera":
+                    comboBox1.SelectedItem = "The Golden Era";
+                    break;
+                case "Leo":
+                    comboBox1.SelectedItem = "Leonardo da Vinci";
+                    break;
+                case "Mystery":
+                    comboBox1.SelectedItem = "Mystery";
+                    break;
+                case "Nature":
+                    comboBox1.SelectedItem = "Nature";
+                    break;
+                case "Science":
+                    comboBox1.SelectedItem = "Science";
+                    break;
+                case "Sports":
+                    comboBox1.SelectedItem = "Sports";
+                    break;
+                case "The60":
+                    comboBox1.SelectedItem = "The 60's USA";
+                    break;
+                case "Travel":
+                    comboBox1.SelectedItem = "Travel";
+                    break;
+                case "MoreWin":
+                    comboBox1.SelectedItem = "More Windows";
+                    break;
+
             }
         }
 
@@ -89,6 +150,56 @@ namespace Histacom2.OS.Win95.Win95Apps
                     SaveSystem.currentTheme = new InsideComputerTheme();
                     TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.ICTheme_BG, TitleScreen.frm95.Width, TitleScreen.frm95.Height);
                     break;
+                case "Windows 95 Default Plus":
+                    SaveSystem.CurrentSave.ThemeName = "default95plus";
+                    SaveSystem.currentTheme = new Default95PlusTheme();
+                    TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.Win95PlusDefaultWallpaper, TitleScreen.frm95.Width, TitleScreen.frm95.Height);
+                    break;
+                case "The Golden Era":
+                    SaveSystem.CurrentSave.ThemeName = "goldenera";
+                    SaveSystem.currentTheme = new GoldenEraTheme();
+                    TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.Win95PlusGoldenEraWallpaper, TitleScreen.frm95.Width, TitleScreen.frm95.Height);
+                    break;
+                case "Leonardo da Vinci":
+                    SaveSystem.CurrentSave.ThemeName = "Leo";
+                    SaveSystem.currentTheme = new LeoTheme();
+                    TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.Win95PlusLeoWallpaper, TitleScreen.frm95.Width, TitleScreen.frm95.Height);
+                    break;
+                case "Mystery":
+                    SaveSystem.CurrentSave.ThemeName = "Mystery";
+                    SaveSystem.currentTheme = new MysteryTheme();
+                    TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.Win95PlusMysteryWallpaper, TitleScreen.frm95.Width, TitleScreen.frm95.Height);
+                    break;
+                case "Nature":
+                    SaveSystem.CurrentSave.ThemeName = "Nature";
+                    SaveSystem.currentTheme = new NatureTheme();
+                    TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.Win95PlusNatureWallpaper, TitleScreen.frm95.Width, TitleScreen.frm95.Height);
+                    break;
+                case "Science":
+                    SaveSystem.CurrentSave.ThemeName = "Science";
+                    SaveSystem.currentTheme = new ScienceTheme();
+                    TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.Win95PlusScienceWallpaper, TitleScreen.frm95.Width, TitleScreen.frm95.Height);
+                    break;
+                case "Sports":
+                    SaveSystem.CurrentSave.ThemeName = "Sports";
+                    SaveSystem.currentTheme = new SportsTheme();
+                    TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.Win95PlusSportsWallpaper, TitleScreen.frm95.Width, TitleScreen.frm95.Height);
+                    break;
+                case "The 60's USA":
+                    SaveSystem.CurrentSave.ThemeName = "The60";
+                    SaveSystem.currentTheme = new The60Theme();
+                    TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.Win95PlusThe60Wallpaper, TitleScreen.frm95.Width, TitleScreen.frm95.Height);
+                    break;
+                case "Travel":
+                    SaveSystem.CurrentSave.ThemeName = "Travel";
+                    SaveSystem.currentTheme = new TravelTheme();
+                    TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.Win95PlusTravelWallpaper, TitleScreen.frm95.Width, TitleScreen.frm95.Height);
+                    break;
+                case "More Windows":
+                    SaveSystem.CurrentSave.ThemeName = "MoreWin";
+                    SaveSystem.currentTheme = new MoreWinTheme();
+                    TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.Win95PlusMoreWin, TitleScreen.frm95.Width, TitleScreen.frm95.Height);
+                    break;
             }
             foreach (Form f in Application.OpenForms)
             {