Win98 Designer Finished! At least for me...

14 files changed, 257 insertions, 192 deletions

diff --git a/TimeHACK.Engine/SaveSystem.cs b/TimeHACK.Engine/SaveSystem.cs
index f8cc662..de34318 100644
--- a/TimeHACK.Engine/SaveSystem.cs
+++ b/TimeHACK.Engine/SaveSystem.cs
@@ -125,9 +125,7 @@ namespace TimeHACK.Engine
         }
 
         public static void NewGame()
-        {
-            //TODO: User must set a username....somehow            
-
+        {        
             var save = new Save();
             save.ExperiencedStories = new List<string>();
             if (DevMode == true)
@@ -136,6 +134,7 @@ namespace TimeHACK.Engine
                 {
                     save.CurrentOS = "98";
                     save.ThemeName = "default98";
+                    currentTheme = new Default98Theme();
                 }
                 else
                 {
@@ -258,6 +257,9 @@ namespace TimeHACK.Engine
                 case "default95":
                     currentTheme = new Default95Theme();
                     break;
+                case "default98":
+                    currentTheme = new Default98Theme();
+                    break;
                 case "dangeranimals":
                     currentTheme = new DangerousCreaturesTheme();
                     break;
diff --git a/TimeHACK.Engine/Theme.cs b/TimeHACK.Engine/Theme.cs
index 89c913d..2b22072 100644
--- a/TimeHACK.Engine/Theme.cs
+++ b/TimeHACK.Engine/Theme.cs
@@ -40,6 +40,23 @@ namespace TimeHACK.Engine
         }
     }
 
+    public class Default98Theme : Theme
+    {
+        public Default98Theme()
+        {
+            startSound = Properties.Resources.Win95Start;
+            stopSound = Properties.Resources.Win95Stop;
+
+            asteriskSound = Properties.Resources.CHORD;
+            critStopSound = Properties.Resources.CHORD;
+            progErrorSound = Properties.Resources.CHORD;
+            questionSound = Properties.Resources.CHORD;
+
+            defaultWallpaper = null;
+            themeName = "default98";
+        }
+    }
+
     public class DangerousCreaturesTheme: Theme
     {
         public DangerousCreaturesTheme()
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs
index 19af4e5..abdf2b8 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs
@@ -127,7 +127,8 @@
             // 
             // MenuStrip1
             // 
-            this.MenuStrip1.BackColor = System.Drawing.Color.Silver;
+            this.MenuStrip1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(212)))), ((int)(((byte)(208)))), ((int)(((byte)(200)))));
+            this.MenuStrip1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
             this.MenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.FileToolStripMenuItem,
             this.EditToolStripMenuItem,
diff --git a/TimeHACK.Main/OS/Win98/Win98.cs b/TimeHACK.Main/OS/Win98/Win98.cs
index 54415af..e3e7043 100644
--- a/TimeHACK.Main/OS/Win98/Win98.cs
+++ b/TimeHACK.Main/OS/Win98/Win98.cs
@@ -363,8 +363,7 @@ namespace TimeHACK.OS.Win98
         {
             FileDialogBoxManager.IsInOpenDialog = false;
             FileDialogBoxManager.IsInSaveDialog = false;
-            Win95WindowsExplorer we = new Win95WindowsExplorer();
-            WinClassic app = wm.StartWin95(we, "Windows Explorer", Properties.Resources.WinClassicFileExplorer, true, true);
+            WinClassic app = wm.StartWin95(new WinClassicWindowsExplorer(), "Windows Explorer", Properties.Resources.WinClassicFileExplorer, true, true);
             AddTaskBarItem(app, app.Tag.ToString(), "Windows Explorer", Properties.Resources.WinClassicFileExplorer);
 
             nonimportantapps.Add(app);
diff --git a/TimeHACK.Main/OS/Win98/Win98Apps/AddressBook/WinClassicAddressBook.Designer.cs b/TimeHACK.Main/OS/Win98/Win98Apps/AddressBook/WinClassicAddressBook.Designer.cs
index 41107e8..201d159 100644
--- a/TimeHACK.Main/OS/Win98/Win98Apps/AddressBook/WinClassicAddressBook.Designer.cs
+++ b/TimeHACK.Main/OS/Win98/Win98Apps/AddressBook/WinClassicAddressBook.Designer.cs
@@ -105,67 +105,67 @@
             // newContactToolStripMenuItem
             // 
             this.newContactToolStripMenuItem.Name = "newContactToolStripMenuItem";
-            this.newContactToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.newContactToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
             this.newContactToolStripMenuItem.Text = "New contact...";
             this.newContactToolStripMenuItem.Click += new System.EventHandler(this.newContactToolStripMenuItem_Click);
             // 
             // newFolderToolStripMenuItem
             // 
             this.newFolderToolStripMenuItem.Name = "newFolderToolStripMenuItem";
-            this.newFolderToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.newFolderToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
             this.newFolderToolStripMenuItem.Text = "New folder...";
             this.newFolderToolStripMenuItem.Click += new System.EventHandler(this.newFolderToolStripMenuItem_Click);
             // 
             // toolStripSeparator1
             // 
             this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(149, 6);
+            this.toolStripSeparator1.Size = new System.Drawing.Size(147, 6);
             // 
             // propertiesToolStripMenuItem
             // 
             this.propertiesToolStripMenuItem.Name = "propertiesToolStripMenuItem";
-            this.propertiesToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.propertiesToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
             this.propertiesToolStripMenuItem.Text = "Properties";
             this.propertiesToolStripMenuItem.Click += new System.EventHandler(this.propertiesToolStripMenuItem_Click);
             // 
             // deleteToolStripMenuItem
             // 
             this.deleteToolStripMenuItem.Name = "deleteToolStripMenuItem";
-            this.deleteToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.deleteToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
             this.deleteToolStripMenuItem.Text = "Delete";
             this.deleteToolStripMenuItem.Click += new System.EventHandler(this.deleteToolStripMenuItem_Click);
             // 
             // toolStripSeparator2
             // 
             this.toolStripSeparator2.Name = "toolStripSeparator2";
-            this.toolStripSeparator2.Size = new System.Drawing.Size(149, 6);
+            this.toolStripSeparator2.Size = new System.Drawing.Size(147, 6);
             // 
             // importToolStripMenuItem
             // 
             this.importToolStripMenuItem.Name = "importToolStripMenuItem";
-            this.importToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.importToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
             this.importToolStripMenuItem.Text = "Import...";
             // 
             // exportToolStripMenuItem
             // 
             this.exportToolStripMenuItem.Name = "exportToolStripMenuItem";
-            this.exportToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.exportToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
             this.exportToolStripMenuItem.Text = "Export...";
             // 
             // toolStripSeparator3
             // 
             this.toolStripSeparator3.Name = "toolStripSeparator3";
-            this.toolStripSeparator3.Size = new System.Drawing.Size(149, 6);
+            this.toolStripSeparator3.Size = new System.Drawing.Size(147, 6);
             // 
             // toolStripSeparator4
             // 
             this.toolStripSeparator4.Name = "toolStripSeparator4";
-            this.toolStripSeparator4.Size = new System.Drawing.Size(149, 6);
+            this.toolStripSeparator4.Size = new System.Drawing.Size(147, 6);
             // 
             // exitToolStripMenuItem
             // 
             this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
-            this.exitToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.exitToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
             this.exitToolStripMenuItem.Text = "Exit";
             this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
             // 
@@ -184,7 +184,7 @@
             this.toolbarToolStripMenuItem.CheckOnClick = true;
             this.toolbarToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
             this.toolbarToolStripMenuItem.Name = "toolbarToolStripMenuItem";
-            this.toolbarToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.toolbarToolStripMenuItem.Size = new System.Drawing.Size(114, 22);
             this.toolbarToolStripMenuItem.Text = "Toolbar";
             this.toolbarToolStripMenuItem.Click += new System.EventHandler(this.toolbarToolStripMenuItem_Click);
             // 
@@ -194,7 +194,7 @@
             this.foldersToolStripMenuItem.CheckOnClick = true;
             this.foldersToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
             this.foldersToolStripMenuItem.Name = "foldersToolStripMenuItem";
-            this.foldersToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.foldersToolStripMenuItem.Size = new System.Drawing.Size(114, 22);
             this.foldersToolStripMenuItem.Text = "Folders";
             this.foldersToolStripMenuItem.Click += new System.EventHandler(this.foldersToolStripMenuItem_Click);
             // 
@@ -213,25 +213,25 @@
             this.dialToolStripMenuItem,
             this.internetToolStripMenuItem});
             this.actionToolStripMenuItem.Name = "actionToolStripMenuItem";
-            this.actionToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.actionToolStripMenuItem.Size = new System.Drawing.Size(109, 22);
             this.actionToolStripMenuItem.Text = "Action";
             // 
             // sendMailToolStripMenuItem
             // 
             this.sendMailToolStripMenuItem.Name = "sendMailToolStripMenuItem";
-            this.sendMailToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.sendMailToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
             this.sendMailToolStripMenuItem.Text = "Send Mail";
             // 
             // dialToolStripMenuItem
             // 
             this.dialToolStripMenuItem.Name = "dialToolStripMenuItem";
-            this.dialToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.dialToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
             this.dialToolStripMenuItem.Text = "Dial";
             // 
             // internetToolStripMenuItem
             // 
             this.internetToolStripMenuItem.Name = "internetToolStripMenuItem";
-            this.internetToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.internetToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
             this.internetToolStripMenuItem.Text = "Internet Call";
             // 
             // helpToolStripMenuItem
@@ -273,9 +273,8 @@
             // 
             // toolbar
             // 
-            this.toolbar.BackColor = System.Drawing.Color.Silver;
-            this.toolbar.BackgroundImage = global::TimeHACK.Properties.Resources.WinClassicGENERALApplicationToolbarBackground;
-            this.toolbar.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.toolbar.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(212)))), ((int)(((byte)(208)))), ((int)(((byte)(200)))));
+            this.toolbar.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.toolbar.Controls.Add(this.toolProp);
             this.toolbar.Controls.Add(this.toolNew);
             this.toolbar.Controls.Add(this.toolDelete);
diff --git a/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.Designer.cs b/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.Designer.cs
index c74b102..0e51ce7 100644
--- a/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.Designer.cs
+++ b/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.Designer.cs
@@ -30,6 +30,21 @@
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WinClassicWindowsExplorer));
             this.program = new System.Windows.Forms.Panel();
+            this.mainView = new System.Windows.Forms.ListView();
+            this.toprightcorner = new System.Windows.Forms.Panel();
+            this.bottomrightcorner = new System.Windows.Forms.Panel();
+            this.bottomleftcorner = new System.Windows.Forms.Panel();
+            this.topleftcorner = new System.Windows.Forms.Panel();
+            this.pnlSave = new System.Windows.Forms.Panel();
+            this.Button1 = new System.Windows.Forms.Button();
+            this.Label1 = new System.Windows.Forms.Label();
+            this.txtSave = new System.Windows.Forms.TextBox();
+            this.pnlInfo = new System.Windows.Forms.Panel();
+            this.pnlFolders = new System.Windows.Forms.Panel();
+            this.pnlFoldersTop = new System.Windows.Forms.Panel();
+            this.label2 = new System.Windows.Forms.Label();
+            this.btnFolderClose = new System.Windows.Forms.PictureBox();
+            this.diskView = new System.Windows.Forms.TreeView();
             this.MenuStrip1 = new System.Windows.Forms.MenuStrip();
             this.FileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.CreateShortcutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -72,28 +87,13 @@
             this.HelpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.HelpToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
             this.AboutWindows95ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.mainView = new System.Windows.Forms.ListView();
-            this.toprightcorner = new System.Windows.Forms.Panel();
-            this.bottomrightcorner = new System.Windows.Forms.Panel();
-            this.bottomleftcorner = new System.Windows.Forms.Panel();
-            this.topleftcorner = new System.Windows.Forms.Panel();
-            this.pnlSave = new System.Windows.Forms.Panel();
-            this.Button1 = new System.Windows.Forms.Button();
-            this.Label1 = new System.Windows.Forms.Label();
-            this.txtSave = new System.Windows.Forms.TextBox();
-            this.pnlInfo = new System.Windows.Forms.Panel();
-            this.pnlFolders = new System.Windows.Forms.Panel();
-            this.pnlFoldersTop = new System.Windows.Forms.Panel();
-            this.diskView = new System.Windows.Forms.TreeView();
-            this.pictureBox1 = new System.Windows.Forms.PictureBox();
-            this.label2 = new System.Windows.Forms.Label();
             this.program.SuspendLayout();
-            this.MenuStrip1.SuspendLayout();
             this.pnlSave.SuspendLayout();
             this.pnlInfo.SuspendLayout();
             this.pnlFolders.SuspendLayout();
             this.pnlFoldersTop.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.btnFolderClose)).BeginInit();
+            this.MenuStrip1.SuspendLayout();
             this.SuspendLayout();
             // 
             // program
@@ -113,9 +113,156 @@
             this.program.Size = new System.Drawing.Size(704, 517);
             this.program.TabIndex = 13;
             // 
+            // mainView
+            // 
+            this.mainView.Dock = System.Windows.Forms.DockStyle.Right;
+            this.mainView.Location = new System.Drawing.Point(403, 24);
+            this.mainView.Name = "mainView";
+            this.mainView.Size = new System.Drawing.Size(301, 458);
+            this.mainView.TabIndex = 10;
+            this.mainView.UseCompatibleStateImageBehavior = false;
+            this.mainView.View = System.Windows.Forms.View.List;
+            this.mainView.DoubleClick += new System.EventHandler(this.mainView_DoubleClick);
+            // 
+            // toprightcorner
+            // 
+            this.toprightcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.toprightcorner.Location = new System.Drawing.Point(700, 0);
+            this.toprightcorner.Name = "toprightcorner";
+            this.toprightcorner.Size = new System.Drawing.Size(4, 4);
+            this.toprightcorner.TabIndex = 6;
+            // 
+            // bottomrightcorner
+            // 
+            this.bottomrightcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.bottomrightcorner.Cursor = System.Windows.Forms.Cursors.SizeNWSE;
+            this.bottomrightcorner.Location = new System.Drawing.Point(700, 513);
+            this.bottomrightcorner.Name = "bottomrightcorner";
+            this.bottomrightcorner.Size = new System.Drawing.Size(4, 4);
+            this.bottomrightcorner.TabIndex = 4;
+            // 
+            // bottomleftcorner
+            // 
+            this.bottomleftcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.bottomleftcorner.Location = new System.Drawing.Point(0, 513);
+            this.bottomleftcorner.Name = "bottomleftcorner";
+            this.bottomleftcorner.Size = new System.Drawing.Size(4, 4);
+            this.bottomleftcorner.TabIndex = 2;
+            // 
+            // topleftcorner
+            // 
+            this.topleftcorner.Location = new System.Drawing.Point(0, 0);
+            this.topleftcorner.Name = "topleftcorner";
+            this.topleftcorner.Size = new System.Drawing.Size(4, 4);
+            this.topleftcorner.TabIndex = 1;
+            // 
+            // pnlSave
+            // 
+            this.pnlSave.Controls.Add(this.Button1);
+            this.pnlSave.Controls.Add(this.Label1);
+            this.pnlSave.Controls.Add(this.txtSave);
+            this.pnlSave.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.pnlSave.Location = new System.Drawing.Point(0, 482);
+            this.pnlSave.Name = "pnlSave";
+            this.pnlSave.Size = new System.Drawing.Size(704, 35);
+            this.pnlSave.TabIndex = 18;
+            this.pnlSave.Visible = false;
+            // 
+            // Button1
+            // 
+            this.Button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.Button1.Location = new System.Drawing.Point(626, 3);
+            this.Button1.Name = "Button1";
+            this.Button1.Size = new System.Drawing.Size(75, 23);
+            this.Button1.TabIndex = 17;
+            this.Button1.Text = "Save";
+            this.Button1.UseVisualStyleBackColor = true;
+            this.Button1.Click += new System.EventHandler(this.Button1_Click);
+            // 
+            // Label1
+            // 
+            this.Label1.AutoSize = true;
+            this.Label1.Location = new System.Drawing.Point(3, 6);
+            this.Label1.Name = "Label1";
+            this.Label1.Size = new System.Drawing.Size(57, 13);
+            this.Label1.TabIndex = 16;
+            this.Label1.Text = "File Name:";
+            // 
+            // txtSave
+            // 
+            this.txtSave.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtSave.Location = new System.Drawing.Point(60, 3);
+            this.txtSave.Name = "txtSave";
+            this.txtSave.Size = new System.Drawing.Size(560, 20);
+            this.txtSave.TabIndex = 15;
+            // 
+            // pnlInfo
+            // 
+            this.pnlInfo.Controls.Add(this.pnlFolders);
+            this.pnlInfo.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pnlInfo.Location = new System.Drawing.Point(0, 24);
+            this.pnlInfo.Name = "pnlInfo";
+            this.pnlInfo.Size = new System.Drawing.Size(704, 493);
+            this.pnlInfo.TabIndex = 19;
+            // 
+            // pnlFolders
+            // 
+            this.pnlFolders.Controls.Add(this.pnlFoldersTop);
+            this.pnlFolders.Controls.Add(this.diskView);
+            this.pnlFolders.Dock = System.Windows.Forms.DockStyle.Left;
+            this.pnlFolders.Location = new System.Drawing.Point(0, 0);
+            this.pnlFolders.Name = "pnlFolders";
+            this.pnlFolders.Size = new System.Drawing.Size(168, 493);
+            this.pnlFolders.TabIndex = 0;
+            // 
+            // pnlFoldersTop
+            // 
+            this.pnlFoldersTop.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(212)))), ((int)(((byte)(208)))), ((int)(((byte)(200)))));
+            this.pnlFoldersTop.Controls.Add(this.label2);
+            this.pnlFoldersTop.Controls.Add(this.btnFolderClose);
+            this.pnlFoldersTop.Dock = System.Windows.Forms.DockStyle.Top;
+            this.pnlFoldersTop.Location = new System.Drawing.Point(0, 0);
+            this.pnlFoldersTop.Name = "pnlFoldersTop";
+            this.pnlFoldersTop.Size = new System.Drawing.Size(168, 22);
+            this.pnlFoldersTop.TabIndex = 20;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(3, 3);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(41, 13);
+            this.label2.TabIndex = 1;
+            this.label2.Text = "Folders";
+            // 
+            // btnFolderClose
+            // 
+            this.btnFolderClose.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(212)))), ((int)(((byte)(208)))), ((int)(((byte)(200)))));
+            this.btnFolderClose.Image = ((System.Drawing.Image)(resources.GetObject("btnFolderClose.Image")));
+            this.btnFolderClose.Location = new System.Drawing.Point(144, 3);
+            this.btnFolderClose.Name = "btnFolderClose";
+            this.btnFolderClose.Size = new System.Drawing.Size(21, 16);
+            this.btnFolderClose.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+            this.btnFolderClose.TabIndex = 20;
+            this.btnFolderClose.TabStop = false;
+            this.btnFolderClose.Click += new System.EventHandler(this.btnFolderClose_Click);
+            this.btnFolderClose.MouseEnter += new System.EventHandler(this.pictureBox1_MouseEnter);
+            this.btnFolderClose.MouseLeave += new System.EventHandler(this.btnFolderClose_MouseLeave);
+            // 
+            // diskView
+            // 
+            this.diskView.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.diskView.Location = new System.Drawing.Point(0, 0);
+            this.diskView.Name = "diskView";
+            this.diskView.Size = new System.Drawing.Size(168, 493);
+            this.diskView.TabIndex = 13;
+            this.diskView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.diskView_AfterSelect);
+            // 
             // MenuStrip1
             // 
-            this.MenuStrip1.BackColor = System.Drawing.Color.Silver;
+            this.MenuStrip1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(212)))), ((int)(((byte)(208)))), ((int)(((byte)(200)))));
             this.MenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.FileToolStripMenuItem,
             this.EditToolStripMenuItem,
@@ -423,149 +570,6 @@
             this.AboutWindows95ToolStripMenuItem.Text = "About Windows 95";
             this.AboutWindows95ToolStripMenuItem.Click += new System.EventHandler(this.AboutWindows95ToolStripMenuItem_Click);
             // 
-            // mainView
-            // 
-            this.mainView.Dock = System.Windows.Forms.DockStyle.Right;
-            this.mainView.Location = new System.Drawing.Point(403, 24);
-            this.mainView.Name = "mainView";
-            this.mainView.Size = new System.Drawing.Size(301, 458);
-            this.mainView.TabIndex = 10;
-            this.mainView.UseCompatibleStateImageBehavior = false;
-            this.mainView.View = System.Windows.Forms.View.List;
-            this.mainView.DoubleClick += new System.EventHandler(this.mainView_DoubleClick);
-            // 
-            // toprightcorner
-            // 
-            this.toprightcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.toprightcorner.Location = new System.Drawing.Point(700, 0);
-            this.toprightcorner.Name = "toprightcorner";
-            this.toprightcorner.Size = new System.Drawing.Size(4, 4);
-            this.toprightcorner.TabIndex = 6;
-            // 
-            // bottomrightcorner
-            // 
-            this.bottomrightcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.bottomrightcorner.Cursor = System.Windows.Forms.Cursors.SizeNWSE;
-            this.bottomrightcorner.Location = new System.Drawing.Point(700, 513);
-            this.bottomrightcorner.Name = "bottomrightcorner";
-            this.bottomrightcorner.Size = new System.Drawing.Size(4, 4);
-            this.bottomrightcorner.TabIndex = 4;
-            // 
-            // bottomleftcorner
-            // 
-            this.bottomleftcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.bottomleftcorner.Location = new System.Drawing.Point(0, 513);
-            this.bottomleftcorner.Name = "bottomleftcorner";
-            this.bottomleftcorner.Size = new System.Drawing.Size(4, 4);
-            this.bottomleftcorner.TabIndex = 2;
-            // 
-            // topleftcorner
-            // 
-            this.topleftcorner.Location = new System.Drawing.Point(0, 0);
-            this.topleftcorner.Name = "topleftcorner";
-            this.topleftcorner.Size = new System.Drawing.Size(4, 4);
-            this.topleftcorner.TabIndex = 1;
-            // 
-            // pnlSave
-            // 
-            this.pnlSave.Controls.Add(this.Button1);
-            this.pnlSave.Controls.Add(this.Label1);
-            this.pnlSave.Controls.Add(this.txtSave);
-            this.pnlSave.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pnlSave.Location = new System.Drawing.Point(0, 482);
-            this.pnlSave.Name = "pnlSave";
-            this.pnlSave.Size = new System.Drawing.Size(704, 35);
-            this.pnlSave.TabIndex = 18;
-            this.pnlSave.Visible = false;
-            // 
-            // Button1
-            // 
-            this.Button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.Button1.Location = new System.Drawing.Point(626, 3);
-            this.Button1.Name = "Button1";
-            this.Button1.Size = new System.Drawing.Size(75, 23);
-            this.Button1.TabIndex = 17;
-            this.Button1.Text = "Save";
-            this.Button1.UseVisualStyleBackColor = true;
-            this.Button1.Click += new System.EventHandler(this.Button1_Click);
-            // 
-            // Label1
-            // 
-            this.Label1.AutoSize = true;
-            this.Label1.Location = new System.Drawing.Point(3, 6);
-            this.Label1.Name = "Label1";
-            this.Label1.Size = new System.Drawing.Size(57, 13);
-            this.Label1.TabIndex = 16;
-            this.Label1.Text = "File Name:";
-            // 
-            // txtSave
-            // 
-            this.txtSave.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtSave.Location = new System.Drawing.Point(60, 3);
-            this.txtSave.Name = "txtSave";
-            this.txtSave.Size = new System.Drawing.Size(560, 20);
-            this.txtSave.TabIndex = 15;
-            // 
-            // pnlInfo
-            // 
-            this.pnlInfo.Controls.Add(this.pnlFolders);
-            this.pnlInfo.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pnlInfo.Location = new System.Drawing.Point(0, 24);
-            this.pnlInfo.Name = "pnlInfo";
-            this.pnlInfo.Size = new System.Drawing.Size(704, 493);
-            this.pnlInfo.TabIndex = 19;
-            // 
-            // pnlFolders
-            // 
-            this.pnlFolders.Controls.Add(this.pnlFoldersTop);
-            this.pnlFolders.Controls.Add(this.diskView);
-            this.pnlFolders.Dock = System.Windows.Forms.DockStyle.Left;
-            this.pnlFolders.Location = new System.Drawing.Point(0, 0);
-            this.pnlFolders.Name = "pnlFolders";
-            this.pnlFolders.Size = new System.Drawing.Size(168, 493);
-            this.pnlFolders.TabIndex = 0;
-            // 
-            // pnlFoldersTop
-            // 
-            this.pnlFoldersTop.Controls.Add(this.label2);
-            this.pnlFoldersTop.Controls.Add(this.pictureBox1);
-            this.pnlFoldersTop.Dock = System.Windows.Forms.DockStyle.Top;
-            this.pnlFoldersTop.Location = new System.Drawing.Point(0, 0);
-            this.pnlFoldersTop.Name = "pnlFoldersTop";
-            this.pnlFoldersTop.Size = new System.Drawing.Size(168, 22);
-            this.pnlFoldersTop.TabIndex = 20;
-            // 
-            // diskView
-            // 
-            this.diskView.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.diskView.Location = new System.Drawing.Point(0, 0);
-            this.diskView.Name = "diskView";
-            this.diskView.Size = new System.Drawing.Size(168, 493);
-            this.diskView.TabIndex = 13;
-            this.diskView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.diskView_AfterSelect);
-            // 
-            // pictureBox1
-            // 
-            this.pictureBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(212)))), ((int)(((byte)(208)))), ((int)(((byte)(200)))));
-            this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
-            this.pictureBox1.Location = new System.Drawing.Point(144, 3);
-            this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(21, 16);
-            this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
-            this.pictureBox1.TabIndex = 20;
-            this.pictureBox1.TabStop = false;
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(3, 3);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(41, 13);
-            this.label2.TabIndex = 1;
-            this.label2.Text = "Folders";
-            // 
             // WinClassicWindowsExplorer
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -576,15 +580,15 @@
             this.Load += new System.EventHandler(this.WinClassicWindowsExplorer_Load);
             this.program.ResumeLayout(false);
             this.program.PerformLayout();
-            this.MenuStrip1.ResumeLayout(false);
-            this.MenuStrip1.PerformLayout();
             this.pnlSave.ResumeLayout(false);
             this.pnlSave.PerformLayout();
             this.pnlInfo.ResumeLayout(false);
             this.pnlFolders.ResumeLayout(false);
             this.pnlFoldersTop.ResumeLayout(false);
             this.pnlFoldersTop.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.btnFolderClose)).EndInit();
+            this.MenuStrip1.ResumeLayout(false);
+            this.MenuStrip1.PerformLayout();
             this.ResumeLayout(false);
 
         }
@@ -647,7 +651,7 @@
         private System.Windows.Forms.Panel pnlInfo;
         private System.Windows.Forms.Panel pnlFolders;
         private System.Windows.Forms.Panel pnlFoldersTop;
-        private System.Windows.Forms.PictureBox pictureBox1;
+        private System.Windows.Forms.PictureBox btnFolderClose;
         private System.Windows.Forms.Label label2;
     }
 }
diff --git a/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs b/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs
index 0f030a4..ed376c9 100644
--- a/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs
+++ b/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs
@@ -795,5 +795,20 @@ namespace TimeHACK.OS.Win95.Win95Apps
             }
             return toReturn;
         }
+
+        private void pictureBox1_MouseEnter(object sender, EventArgs e)
+        {
+            btnFolderClose.Image = Properties.Resources.XCross_highlighted;
+        }
+
+        private void btnFolderClose_MouseLeave(object sender, EventArgs e)
+        {
+            btnFolderClose.Image = Properties.Resources.XCross;
+        }
+
+        private void btnFolderClose_Click(object sender, EventArgs e)
+        {
+            pnlFolders.Hide();
+        }
     }
 }
diff --git a/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.resx b/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.resx
index 4ab5a31..521f476 100644
--- a/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.resx
+++ b/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.resx
@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="btnFolderClose.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAwAAAAJCAIAAACJ2loDAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
         wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xNkRpr/UAAABCSURBVChThYox
diff --git a/TimeHACK.Main/Properties/Resources.Designer.cs b/TimeHACK.Main/Properties/Resources.Designer.cs
index 7334f29..3603469 100644
--- a/TimeHACK.Main/Properties/Resources.Designer.cs
+++ b/TimeHACK.Main/Properties/Resources.Designer.cs
@@ -1360,5 +1360,25 @@ namespace TimeHACK.Properties {
                 return ((byte[])(obj));
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap XCross {
+            get {
+                object obj = ResourceManager.GetObject("XCross", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap XCross_highlighted {
+            get {
+                object obj = ResourceManager.GetObject("XCross_highlighted", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
     }
 }
diff --git a/TimeHACK.Main/Properties/Resources.resx b/TimeHACK.Main/Properties/Resources.resx
index 4e158fb..e8ffa48 100644
--- a/TimeHACK.Main/Properties/Resources.resx
+++ b/TimeHACK.Main/Properties/Resources.resx
@@ -660,4 +660,10 @@
   <data name="WinClassicGENERALApplicationToolbarBackground" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\WinClassicGENERALApplicationToolBoxBackground.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="XCross" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\XCross.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="XCross_highlighted" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\XCross_highlighted.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/TimeHACK.Main/Resources/WinClassicGENERALApplicationToolBoxBackground.png b/TimeHACK.Main/Resources/WinClassicGENERALApplicationToolBoxBackground.png
index da677c5..17f28cd 100644
--- a/TimeHACK.Main/Resources/WinClassicGENERALApplicationToolBoxBackground.png
+++ b/TimeHACK.Main/Resources/WinClassicGENERALApplicationToolBoxBackground.png
diff --git a/TimeHACK.Main/Resources/XCross.png b/TimeHACK.Main/Resources/XCross.png
new file mode 100644
index 0000000..cb3639a
--- /dev/null
+++ b/TimeHACK.Main/Resources/XCross.png
diff --git a/TimeHACK.Main/Resources/XCross_highlighted.png b/TimeHACK.Main/Resources/XCross_highlighted.png
new file mode 100644
index 0000000..d739087
--- /dev/null
+++ b/TimeHACK.Main/Resources/XCross_highlighted.png
diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj
index 6f489b8..fc48270 100644
--- a/TimeHACK.Main/TimeHACK.Main.csproj
+++ b/TimeHACK.Main/TimeHACK.Main.csproj
@@ -477,6 +477,8 @@
   <ItemGroup>
     <Content Include="Icon128x.ico" />
     <Content Include="Resources\12padams_EULA.txt" />
+    <None Include="Resources\XCross.png" />
+    <None Include="Resources\XCross_highlighted.png" />
     <None Include="Resources\DCTheme_BG.JPG" />
     <Content Include="Resources\Icon128x.ico" />
     <None Include="Resources\ICTheme_BG.jpg" />