wordpad gui improvement part 1

22 files changed, 381 insertions, 148 deletions

diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicCalculator.Designer.cs b/TimeHACK.Main/GlobalPrograms/WinClassicCalculator.Designer.cs
index 70ad0a2..70ad0a2 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicCalculator.Designer.cs
+++ b/TimeHACK.Main/GlobalPrograms/WinClassicCalculator.Designer.cs
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicCalculator.cs b/TimeHACK.Main/GlobalPrograms/WinClassicCalculator.cs
index 71ded89..71ded89 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicCalculator.cs
+++ b/TimeHACK.Main/GlobalPrograms/WinClassicCalculator.cs
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicCalculator.resx b/TimeHACK.Main/GlobalPrograms/WinClassicCalculator.resx
index d7509b3..d7509b3 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicCalculator.resx
+++ b/TimeHACK.Main/GlobalPrograms/WinClassicCalculator.resx
diff --git a/TimeHACK.Main/GlobalPrograms/WinClassicNotepad.cs b/TimeHACK.Main/GlobalPrograms/WinClassicNotepad.cs
index 581b789..8e3726d 100644
--- a/TimeHACK.Main/GlobalPrograms/WinClassicNotepad.cs
+++ b/TimeHACK.Main/GlobalPrograms/WinClassicNotepad.cs
@@ -56,18 +56,12 @@ namespace TimeHACK.OS.Win95.Win95Apps
 
         private void cutToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            if (mainText.SelectedText.Length >= 0)
-            {
-                mainText.Cut();
-            }
+            if (mainText.SelectedText.Length >= 0) mainText.Cut();
         }
 
         private void copyToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            if (mainText.SelectedText.Length >= 0)
-            {
-                mainText.Copy();
-            }
+            if (mainText.SelectedText.Length >= 0) mainText.Copy();
         }
 
         private void pasteToolStripMenuItem_Click(object sender, EventArgs e)
@@ -116,7 +110,6 @@ namespace TimeHACK.OS.Win95.Win95Apps
                 if (selectedPath != "")
                 {
                     SaveSystem.CreateWindowsFile(pathList.ToString(), selectedPath.Split('\\').Last(), mainText.Text, 12, mainText.Text.Length);
-                    //File.WriteAllText(selectedPath, mainText.Text);
                 }
             } catch {
             }               
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.Designer.cs
index 710c51c..a3d3ab0 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.Designer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.Designer.cs
@@ -57,6 +57,11 @@
             this.aboutWordpadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.mainText = new System.Windows.Forms.RichTextBox();
             this.pnlToolbar = new System.Windows.Forms.Panel();
+            this.btnFind = new System.Windows.Forms.Button();
+            this.btnPrintPreview = new System.Windows.Forms.Button();
+            this.btnPrint = new System.Windows.Forms.Button();
+            this.btnSave = new System.Windows.Forms.Button();
+            this.btnOpen = new System.Windows.Forms.Button();
             this.btnPaste = new System.Windows.Forms.Button();
             this.btnCopy = new System.Windows.Forms.Button();
             this.btnCut = new System.Windows.Forms.Button();
@@ -71,16 +76,21 @@
             this.btnBold = new System.Windows.Forms.Button();
             this.statusBar = new System.Windows.Forms.Panel();
             this.lblStatus = new System.Windows.Forms.Label();
+            this.pictureBox3 = new System.Windows.Forms.PictureBox();
+            this.pictureBox4 = new System.Windows.Forms.PictureBox();
             this.topmenu.SuspendLayout();
             this.pnlToolbar.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.pnlFormatBar.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
             this.statusBar.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit();
             this.SuspendLayout();
             // 
             // topmenu
             // 
+            this.topmenu.AutoSize = false;
             this.topmenu.BackColor = System.Drawing.Color.Silver;
             this.topmenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.fileToolStripMenuItem,
@@ -91,42 +101,45 @@
             this.helpToolStripMenuItem});
             this.topmenu.Location = new System.Drawing.Point(0, 0);
             this.topmenu.Name = "topmenu";
-            this.topmenu.Size = new System.Drawing.Size(593, 24);
+            this.topmenu.Padding = new System.Windows.Forms.Padding(0);
+            this.topmenu.Size = new System.Drawing.Size(593, 19);
             this.topmenu.TabIndex = 0;
             this.topmenu.Text = "menuStrip1";
             // 
             // fileToolStripMenuItem
             // 
+            this.fileToolStripMenuItem.AutoSize = false;
             this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.newToolStripMenuItem,
             this.toolStripSeparator1,
             this.sendToolStripMenuItem,
             this.exitToolStripMenuItem});
             this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
-            this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
+            this.fileToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0);
+            this.fileToolStripMenuItem.Size = new System.Drawing.Size(28, 18);
             this.fileToolStripMenuItem.Text = "File";
             // 
             // newToolStripMenuItem
             // 
             this.newToolStripMenuItem.Name = "newToolStripMenuItem";
-            this.newToolStripMenuItem.Size = new System.Drawing.Size(109, 22);
+            this.newToolStripMenuItem.Size = new System.Drawing.Size(114, 22);
             this.newToolStripMenuItem.Text = "New";
             // 
             // toolStripSeparator1
             // 
             this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(106, 6);
+            this.toolStripSeparator1.Size = new System.Drawing.Size(111, 6);
             // 
             // sendToolStripMenuItem
             // 
             this.sendToolStripMenuItem.Name = "sendToolStripMenuItem";
-            this.sendToolStripMenuItem.Size = new System.Drawing.Size(109, 22);
+            this.sendToolStripMenuItem.Size = new System.Drawing.Size(114, 22);
             this.sendToolStripMenuItem.Text = "Send...";
             // 
             // exitToolStripMenuItem
             // 
             this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
-            this.exitToolStripMenuItem.Size = new System.Drawing.Size(109, 22);
+            this.exitToolStripMenuItem.Size = new System.Drawing.Size(114, 22);
             this.exitToolStripMenuItem.Text = "Exit";
             // 
             // editToolStripMenuItem
@@ -141,53 +154,54 @@
             this.clearToolStripMenuItem,
             this.selectAllToolStripMenuItem});
             this.editToolStripMenuItem.Name = "editToolStripMenuItem";
-            this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20);
+            this.editToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0);
+            this.editToolStripMenuItem.Size = new System.Drawing.Size(36, 19);
             this.editToolStripMenuItem.Text = "Edit";
             // 
             // undoToolStripMenuItem
             // 
             this.undoToolStripMenuItem.Name = "undoToolStripMenuItem";
-            this.undoToolStripMenuItem.Size = new System.Drawing.Size(122, 22);
+            this.undoToolStripMenuItem.Size = new System.Drawing.Size(129, 22);
             this.undoToolStripMenuItem.Text = "Undo";
             // 
             // toolStripSeparator2
             // 
             this.toolStripSeparator2.Name = "toolStripSeparator2";
-            this.toolStripSeparator2.Size = new System.Drawing.Size(119, 6);
+            this.toolStripSeparator2.Size = new System.Drawing.Size(126, 6);
             // 
             // cutToolStripMenuItem
             // 
             this.cutToolStripMenuItem.Name = "cutToolStripMenuItem";
-            this.cutToolStripMenuItem.Size = new System.Drawing.Size(122, 22);
+            this.cutToolStripMenuItem.Size = new System.Drawing.Size(129, 22);
             this.cutToolStripMenuItem.Text = "Cut";
             // 
             // copyToolStripMenuItem
             // 
             this.copyToolStripMenuItem.Name = "copyToolStripMenuItem";
-            this.copyToolStripMenuItem.Size = new System.Drawing.Size(122, 22);
+            this.copyToolStripMenuItem.Size = new System.Drawing.Size(129, 22);
             this.copyToolStripMenuItem.Text = "Copy";
             // 
             // pasteToolStripMenuItem
             // 
             this.pasteToolStripMenuItem.Name = "pasteToolStripMenuItem";
-            this.pasteToolStripMenuItem.Size = new System.Drawing.Size(122, 22);
+            this.pasteToolStripMenuItem.Size = new System.Drawing.Size(129, 22);
             this.pasteToolStripMenuItem.Text = "Paste";
             // 
             // toolStripSeparator3
             // 
             this.toolStripSeparator3.Name = "toolStripSeparator3";
-            this.toolStripSeparator3.Size = new System.Drawing.Size(119, 6);
+            this.toolStripSeparator3.Size = new System.Drawing.Size(126, 6);
             // 
             // clearToolStripMenuItem
             // 
             this.clearToolStripMenuItem.Name = "clearToolStripMenuItem";
-            this.clearToolStripMenuItem.Size = new System.Drawing.Size(122, 22);
+            this.clearToolStripMenuItem.Size = new System.Drawing.Size(129, 22);
             this.clearToolStripMenuItem.Text = "Clear";
             // 
             // selectAllToolStripMenuItem
             // 
             this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem";
-            this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(122, 22);
+            this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(129, 22);
             this.selectAllToolStripMenuItem.Text = "Select All";
             // 
             // viewToolStripMenuItem
@@ -197,7 +211,8 @@
             this.formatBarToolStripMenuItem,
             this.statusBarToolStripMenuItem});
             this.viewToolStripMenuItem.Name = "viewToolStripMenuItem";
-            this.viewToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
+            this.viewToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0);
+            this.viewToolStripMenuItem.Size = new System.Drawing.Size(40, 19);
             this.viewToolStripMenuItem.Text = "View";
             // 
             // toolbarToolStripMenuItem
@@ -206,7 +221,7 @@
             this.toolbarToolStripMenuItem.CheckOnClick = true;
             this.toolbarToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
             this.toolbarToolStripMenuItem.Name = "toolbarToolStripMenuItem";
-            this.toolbarToolStripMenuItem.Size = new System.Drawing.Size(132, 22);
+            this.toolbarToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
             this.toolbarToolStripMenuItem.Text = "Toolbar";
             // 
             // formatBarToolStripMenuItem
@@ -215,7 +230,7 @@
             this.formatBarToolStripMenuItem.CheckOnClick = true;
             this.formatBarToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
             this.formatBarToolStripMenuItem.Name = "formatBarToolStripMenuItem";
-            this.formatBarToolStripMenuItem.Size = new System.Drawing.Size(132, 22);
+            this.formatBarToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
             this.formatBarToolStripMenuItem.Text = "Format Bar";
             // 
             // statusBarToolStripMenuItem
@@ -224,7 +239,7 @@
             this.statusBarToolStripMenuItem.CheckOnClick = true;
             this.statusBarToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
             this.statusBarToolStripMenuItem.Name = "statusBarToolStripMenuItem";
-            this.statusBarToolStripMenuItem.Size = new System.Drawing.Size(132, 22);
+            this.statusBarToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
             this.statusBarToolStripMenuItem.Text = "Status Bar";
             // 
             // insertToolStripMenuItem
@@ -232,13 +247,14 @@
             this.insertToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.dateTimeToolStripMenuItem});
             this.insertToolStripMenuItem.Name = "insertToolStripMenuItem";
-            this.insertToolStripMenuItem.Size = new System.Drawing.Size(48, 20);
+            this.insertToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0);
+            this.insertToolStripMenuItem.Size = new System.Drawing.Size(47, 19);
             this.insertToolStripMenuItem.Text = "Insert";
             // 
             // dateTimeToolStripMenuItem
             // 
             this.dateTimeToolStripMenuItem.Name = "dateTimeToolStripMenuItem";
-            this.dateTimeToolStripMenuItem.Size = new System.Drawing.Size(130, 22);
+            this.dateTimeToolStripMenuItem.Size = new System.Drawing.Size(137, 22);
             this.dateTimeToolStripMenuItem.Text = "Date/Time";
             // 
             // formatToolStripMenuItem
@@ -246,14 +262,15 @@
             this.formatToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.bulletStyleToolStripMenuItem});
             this.formatToolStripMenuItem.Name = "formatToolStripMenuItem";
-            this.formatToolStripMenuItem.Size = new System.Drawing.Size(57, 20);
+            this.formatToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0);
+            this.formatToolStripMenuItem.Size = new System.Drawing.Size(57, 19);
             this.formatToolStripMenuItem.Text = "Format";
             // 
             // bulletStyleToolStripMenuItem
             // 
             this.bulletStyleToolStripMenuItem.CheckOnClick = true;
             this.bulletStyleToolStripMenuItem.Name = "bulletStyleToolStripMenuItem";
-            this.bulletStyleToolStripMenuItem.Size = new System.Drawing.Size(131, 22);
+            this.bulletStyleToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
             this.bulletStyleToolStripMenuItem.Text = "Bullet style";
             // 
             // helpToolStripMenuItem
@@ -263,86 +280,151 @@
             this.toolStripSeparator4,
             this.aboutWordpadToolStripMenuItem});
             this.helpToolStripMenuItem.Name = "helpToolStripMenuItem";
-            this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
+            this.helpToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0);
+            this.helpToolStripMenuItem.Size = new System.Drawing.Size(39, 19);
             this.helpToolStripMenuItem.Text = "Help";
             // 
             // helpTopicsToolStripMenuItem
             // 
             this.helpTopicsToolStripMenuItem.Name = "helpTopicsToolStripMenuItem";
-            this.helpTopicsToolStripMenuItem.Size = new System.Drawing.Size(159, 22);
+            this.helpTopicsToolStripMenuItem.Size = new System.Drawing.Size(169, 22);
             this.helpTopicsToolStripMenuItem.Text = "Help Topics";
             // 
             // toolStripSeparator4
             // 
             this.toolStripSeparator4.Name = "toolStripSeparator4";
-            this.toolStripSeparator4.Size = new System.Drawing.Size(156, 6);
+            this.toolStripSeparator4.Size = new System.Drawing.Size(166, 6);
             // 
             // aboutWordpadToolStripMenuItem
             // 
             this.aboutWordpadToolStripMenuItem.Name = "aboutWordpadToolStripMenuItem";
-            this.aboutWordpadToolStripMenuItem.Size = new System.Drawing.Size(159, 22);
+            this.aboutWordpadToolStripMenuItem.Size = new System.Drawing.Size(169, 22);
             this.aboutWordpadToolStripMenuItem.Text = "About Wordpad";
             // 
             // mainText
             // 
             this.mainText.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.mainText.Location = new System.Drawing.Point(0, 80);
+            this.mainText.Location = new System.Drawing.Point(0, 79);
             this.mainText.Name = "mainText";
-            this.mainText.Size = new System.Drawing.Size(593, 290);
+            this.mainText.Size = new System.Drawing.Size(593, 274);
             this.mainText.TabIndex = 1;
             this.mainText.Text = "";
             // 
             // pnlToolbar
             // 
             this.pnlToolbar.BackColor = System.Drawing.Color.Silver;
+            this.pnlToolbar.Controls.Add(this.btnFind);
+            this.pnlToolbar.Controls.Add(this.btnPrintPreview);
+            this.pnlToolbar.Controls.Add(this.btnPrint);
+            this.pnlToolbar.Controls.Add(this.btnSave);
+            this.pnlToolbar.Controls.Add(this.btnOpen);
             this.pnlToolbar.Controls.Add(this.btnPaste);
             this.pnlToolbar.Controls.Add(this.btnCopy);
             this.pnlToolbar.Controls.Add(this.btnCut);
             this.pnlToolbar.Controls.Add(this.btnNew);
             this.pnlToolbar.Controls.Add(this.pictureBox1);
             this.pnlToolbar.Dock = System.Windows.Forms.DockStyle.Top;
-            this.pnlToolbar.Location = new System.Drawing.Point(0, 24);
+            this.pnlToolbar.Location = new System.Drawing.Point(0, 21);
             this.pnlToolbar.Name = "pnlToolbar";
             this.pnlToolbar.Size = new System.Drawing.Size(593, 28);
             this.pnlToolbar.TabIndex = 2;
             // 
+            // btnFind
+            // 
+            this.btnFind.BackgroundImage = global::TimeHACK.Properties.Resources.wordpad_find;
+            this.btnFind.FlatAppearance.BorderSize = 0;
+            this.btnFind.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnFind.Location = new System.Drawing.Point(137, 3);
+            this.btnFind.Name = "btnFind";
+            this.btnFind.Size = new System.Drawing.Size(23, 22);
+            this.btnFind.TabIndex = 6;
+            this.btnFind.UseVisualStyleBackColor = true;
+            // 
+            // btnPrintPreview
+            // 
+            this.btnPrintPreview.BackgroundImage = global::TimeHACK.Properties.Resources.wordpad_printpreview;
+            this.btnPrintPreview.FlatAppearance.BorderSize = 0;
+            this.btnPrintPreview.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnPrintPreview.Location = new System.Drawing.Point(106, 3);
+            this.btnPrintPreview.Name = "btnPrintPreview";
+            this.btnPrintPreview.Size = new System.Drawing.Size(23, 22);
+            this.btnPrintPreview.TabIndex = 5;
+            this.btnPrintPreview.UseVisualStyleBackColor = true;
+            // 
+            // btnPrint
+            // 
+            this.btnPrint.BackgroundImage = global::TimeHACK.Properties.Resources.wordpad_print;
+            this.btnPrint.FlatAppearance.BorderSize = 0;
+            this.btnPrint.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnPrint.Location = new System.Drawing.Point(83, 3);
+            this.btnPrint.Name = "btnPrint";
+            this.btnPrint.Size = new System.Drawing.Size(23, 22);
+            this.btnPrint.TabIndex = 4;
+            this.btnPrint.UseVisualStyleBackColor = true;
+            // 
+            // btnSave
+            // 
+            this.btnSave.BackgroundImage = global::TimeHACK.Properties.Resources.wordpad_save;
+            this.btnSave.FlatAppearance.BorderSize = 0;
+            this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnSave.Location = new System.Drawing.Point(52, 3);
+            this.btnSave.Name = "btnSave";
+            this.btnSave.Size = new System.Drawing.Size(23, 22);
+            this.btnSave.TabIndex = 3;
+            this.btnSave.UseVisualStyleBackColor = true;
+            // 
+            // btnOpen
+            // 
+            this.btnOpen.BackgroundImage = global::TimeHACK.Properties.Resources.wordpad_open;
+            this.btnOpen.FlatAppearance.BorderSize = 0;
+            this.btnOpen.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnOpen.Location = new System.Drawing.Point(29, 3);
+            this.btnOpen.Name = "btnOpen";
+            this.btnOpen.Size = new System.Drawing.Size(23, 22);
+            this.btnOpen.TabIndex = 2;
+            this.btnOpen.UseVisualStyleBackColor = true;
+            // 
             // btnPaste
             // 
-            this.btnPaste.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver;
-            this.btnPaste.Image = global::TimeHACK.Properties.Resources.WinClassicPaste;
-            this.btnPaste.Location = new System.Drawing.Point(102, 3);
+            this.btnPaste.BackgroundImage = global::TimeHACK.Properties.Resources.wordpad_paste;
+            this.btnPaste.FlatAppearance.BorderSize = 0;
+            this.btnPaste.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnPaste.Location = new System.Drawing.Point(214, 3);
             this.btnPaste.Name = "btnPaste";
-            this.btnPaste.Size = new System.Drawing.Size(26, 23);
+            this.btnPaste.Size = new System.Drawing.Size(23, 22);
             this.btnPaste.TabIndex = 1;
             this.btnPaste.UseVisualStyleBackColor = true;
             // 
             // btnCopy
             // 
-            this.btnCopy.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver;
-            this.btnCopy.Image = global::TimeHACK.Properties.Resources.WinClassicCopy;
-            this.btnCopy.Location = new System.Drawing.Point(70, 3);
+            this.btnCopy.BackgroundImage = global::TimeHACK.Properties.Resources.wordpad_copy;
+            this.btnCopy.FlatAppearance.BorderSize = 0;
+            this.btnCopy.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnCopy.Location = new System.Drawing.Point(191, 3);
             this.btnCopy.Name = "btnCopy";
-            this.btnCopy.Size = new System.Drawing.Size(26, 23);
+            this.btnCopy.Size = new System.Drawing.Size(23, 22);
             this.btnCopy.TabIndex = 1;
             this.btnCopy.UseVisualStyleBackColor = true;
             // 
             // btnCut
             // 
-            this.btnCut.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver;
-            this.btnCut.Image = global::TimeHACK.Properties.Resources.WinClassicCut;
-            this.btnCut.Location = new System.Drawing.Point(38, 3);
+            this.btnCut.BackgroundImage = global::TimeHACK.Properties.Resources.wordpad_cut;
+            this.btnCut.FlatAppearance.BorderSize = 0;
+            this.btnCut.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnCut.Location = new System.Drawing.Point(168, 3);
             this.btnCut.Name = "btnCut";
-            this.btnCut.Size = new System.Drawing.Size(26, 23);
+            this.btnCut.Size = new System.Drawing.Size(23, 22);
             this.btnCut.TabIndex = 1;
             this.btnCut.UseVisualStyleBackColor = true;
             // 
             // btnNew
             // 
-            this.btnNew.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver;
-            this.btnNew.Image = global::TimeHACK.Properties.Resources.WinClassicNew;
+            this.btnNew.BackgroundImage = global::TimeHACK.Properties.Resources.wordpad_new;
+            this.btnNew.FlatAppearance.BorderSize = 0;
+            this.btnNew.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnNew.Location = new System.Drawing.Point(6, 3);
             this.btnNew.Name = "btnNew";
-            this.btnNew.Size = new System.Drawing.Size(26, 23);
+            this.btnNew.Size = new System.Drawing.Size(23, 22);
             this.btnNew.TabIndex = 1;
             this.btnNew.UseVisualStyleBackColor = true;
             // 
@@ -367,7 +449,7 @@
             this.pnlFormatBar.Controls.Add(this.btnItalic);
             this.pnlFormatBar.Controls.Add(this.btnBold);
             this.pnlFormatBar.Dock = System.Windows.Forms.DockStyle.Top;
-            this.pnlFormatBar.Location = new System.Drawing.Point(0, 52);
+            this.pnlFormatBar.Location = new System.Drawing.Point(0, 51);
             this.pnlFormatBar.Name = "pnlFormatBar";
             this.pnlFormatBar.Size = new System.Drawing.Size(593, 28);
             this.pnlFormatBar.TabIndex = 3;
@@ -393,7 +475,7 @@
             "36",
             "48",
             "72"});
-            this.comboSize.Location = new System.Drawing.Point(157, 3);
+            this.comboSize.Location = new System.Drawing.Point(252, 3);
             this.comboSize.Name = "comboSize";
             this.comboSize.Size = new System.Drawing.Size(50, 21);
             this.comboSize.TabIndex = 1;
@@ -404,7 +486,7 @@
             this.comboFont.FormattingEnabled = true;
             this.comboFont.Location = new System.Drawing.Point(6, 3);
             this.comboFont.Name = "comboFont";
-            this.comboFont.Size = new System.Drawing.Size(145, 21);
+            this.comboFont.Size = new System.Drawing.Size(240, 21);
             this.comboFont.TabIndex = 1;
             this.comboFont.Text = "Arial";
             // 
@@ -422,13 +504,14 @@
             // btnUnderline
             // 
             this.btnUnderline.BackColor = System.Drawing.Color.DimGray;
-            this.btnUnderline.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver;
+            this.btnUnderline.BackgroundImage = global::TimeHACK.Properties.Resources.wordpad_underline;
+            this.btnUnderline.FlatAppearance.BorderSize = 0;
+            this.btnUnderline.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnUnderline.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnUnderline.Location = new System.Drawing.Point(277, 2);
+            this.btnUnderline.Location = new System.Drawing.Point(358, 3);
             this.btnUnderline.Name = "btnUnderline";
-            this.btnUnderline.Size = new System.Drawing.Size(26, 23);
+            this.btnUnderline.Size = new System.Drawing.Size(23, 22);
             this.btnUnderline.TabIndex = 1;
-            this.btnUnderline.Text = "U";
             this.btnUnderline.UseVisualStyleBackColor = false;
             this.btnUnderline.Click += new System.EventHandler(this.btnUnderline_Click);
             this.btnUnderline.MouseEnter += new System.EventHandler(this.btnUnderline_MouseEnter);
@@ -437,13 +520,14 @@
             // btnItalic
             // 
             this.btnItalic.BackColor = System.Drawing.Color.DimGray;
-            this.btnItalic.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver;
+            this.btnItalic.BackgroundImage = global::TimeHACK.Properties.Resources.wordpad_italic;
+            this.btnItalic.FlatAppearance.BorderSize = 0;
+            this.btnItalic.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnItalic.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnItalic.Location = new System.Drawing.Point(245, 2);
+            this.btnItalic.Location = new System.Drawing.Point(335, 3);
             this.btnItalic.Name = "btnItalic";
-            this.btnItalic.Size = new System.Drawing.Size(26, 23);
+            this.btnItalic.Size = new System.Drawing.Size(23, 22);
             this.btnItalic.TabIndex = 1;
-            this.btnItalic.Text = "I";
             this.btnItalic.UseVisualStyleBackColor = false;
             this.btnItalic.Click += new System.EventHandler(this.btnItalic_Click);
             this.btnItalic.MouseEnter += new System.EventHandler(this.btnItalic_MouseEnter);
@@ -452,13 +536,14 @@
             // btnBold
             // 
             this.btnBold.BackColor = System.Drawing.Color.DimGray;
-            this.btnBold.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver;
+            this.btnBold.BackgroundImage = global::TimeHACK.Properties.Resources.wordpad_bold;
+            this.btnBold.FlatAppearance.BorderSize = 0;
+            this.btnBold.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnBold.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnBold.Location = new System.Drawing.Point(213, 2);
+            this.btnBold.Location = new System.Drawing.Point(312, 3);
             this.btnBold.Name = "btnBold";
-            this.btnBold.Size = new System.Drawing.Size(26, 23);
+            this.btnBold.Size = new System.Drawing.Size(23, 22);
             this.btnBold.TabIndex = 1;
-            this.btnBold.Text = "B";
             this.btnBold.UseVisualStyleBackColor = false;
             this.btnBold.Click += new System.EventHandler(this.btnBold_Click);
             this.btnBold.MouseEnter += new System.EventHandler(this.btnBold_MouseEnter);
@@ -484,13 +569,39 @@
             this.lblStatus.TabIndex = 0;
             this.lblStatus.Text = "For Help, go to Help -> Help topics";
             // 
+            // pictureBox3
+            // 
+            this.pictureBox3.BackgroundImage = global::TimeHACK.Properties.Resources.ie4_hsplitter;
+            this.pictureBox3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.pictureBox3.Dock = System.Windows.Forms.DockStyle.Top;
+            this.pictureBox3.Location = new System.Drawing.Point(0, 19);
+            this.pictureBox3.Name = "pictureBox3";
+            this.pictureBox3.Size = new System.Drawing.Size(593, 2);
+            this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+            this.pictureBox3.TabIndex = 5;
+            this.pictureBox3.TabStop = false;
+            // 
+            // pictureBox4
+            // 
+            this.pictureBox4.BackgroundImage = global::TimeHACK.Properties.Resources.ie4_hsplitter;
+            this.pictureBox4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.pictureBox4.Dock = System.Windows.Forms.DockStyle.Top;
+            this.pictureBox4.Location = new System.Drawing.Point(0, 49);
+            this.pictureBox4.Name = "pictureBox4";
+            this.pictureBox4.Size = new System.Drawing.Size(593, 2);
+            this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+            this.pictureBox4.TabIndex = 6;
+            this.pictureBox4.TabStop = false;
+            // 
             // WinClassicWordPad
             // 
             this.BackColor = System.Drawing.Color.Silver;
-            this.Controls.Add(this.statusBar);
             this.Controls.Add(this.mainText);
+            this.Controls.Add(this.statusBar);
             this.Controls.Add(this.pnlFormatBar);
+            this.Controls.Add(this.pictureBox4);
             this.Controls.Add(this.pnlToolbar);
+            this.Controls.Add(this.pictureBox3);
             this.Controls.Add(this.topmenu);
             this.Name = "WinClassicWordPad";
             this.Size = new System.Drawing.Size(593, 370);
@@ -502,8 +613,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
             this.statusBar.ResumeLayout(false);
             this.statusBar.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit();
             this.ResumeLayout(false);
-            this.PerformLayout();
 
         }
 
@@ -551,5 +663,12 @@
         private System.Windows.Forms.Button btnUnderline;
         private System.Windows.Forms.Button btnItalic;
         private System.Windows.Forms.Button btnBold;
+        private System.Windows.Forms.PictureBox pictureBox3;
+        private System.Windows.Forms.PictureBox pictureBox4;
+        private System.Windows.Forms.Button btnOpen;
+        private System.Windows.Forms.Button btnSave;
+        private System.Windows.Forms.Button btnPrint;
+        private System.Windows.Forms.Button btnPrintPreview;
+        private System.Windows.Forms.Button btnFind;
     }
 }
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs
index 7d0dd1c..7d7956a 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs
@@ -15,16 +15,15 @@ namespace TimeHACK.OS.Win95.Win95Apps
     public partial class WinClassicWordPad : UserControl
     {
         WindowManager wm = new WindowManager();
+        
+        bool doBold = false;
+        bool doItalic = false;
+        bool doUnderline = false;
 
-        bool btnBoldSelected = true;
-        bool btnItalicSelected = true;
-        bool btnUnderlineSelected = true;
-        bool doBold;
-        bool doItalic;
-        bool doUnderline;
         public WinClassicWordPad()
         {
             InitializeComponent();
+
             foreach (ToolStripMenuItem item in topmenu.Items)
             {
                 item.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((0)));
@@ -35,13 +34,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
             }
 
             // Time to prepare to load all the fonts up for the combo boxes
-
-            foreach (FontFamily font in System.Drawing.FontFamily.Families)
-            {
-                // Added to the ComboBox here
-
-                comboFont.Items.Add(font.Name);
-            }
+            foreach (FontFamily font in FontFamily.Families) comboFont.Items.Add(font.Name);
 
             // Handlers
             this.clearToolStripMenuItem.Click += (sender, args) => mainText.Text = mainText.Text.Remove(mainText.SelectionStart, mainText.SelectedText.Length);
@@ -71,48 +64,44 @@ namespace TimeHACK.OS.Win95.Win95Apps
 
         private void btnBold_Click(object sender, EventArgs e)
         {
-            if (btnBoldSelected == false)
+            if (!doBold)
             {
                 btnBold.BackgroundImage = null;
-                btnBoldSelected = true;
-                
+                doBold = true;
             } else {
-                btnBold.BackgroundImage = Properties.Resources.sliversilver;
-                btnBoldSelected = false;
+                btnBold.BackgroundImage = Properties.Resources.wordpad_bold;
+                doBold = false;
             }
-            doBold = btnBoldSelected;
             DoFontStyles();
         }
 
         private void btnItalic_Click(object sender, EventArgs e)
         {
-            if (btnItalicSelected == false)
+            if (!doItalic)
             {
-                btnItalic.BackgroundImage = Properties.Resources.sliversilver;
-                btnItalicSelected = true;
+                btnItalic.BackgroundImage = null;
+                doItalic = true;
             }
             else
             {
-                btnItalic.BackgroundImage = null;
-                btnItalicSelected = false;
+                btnItalic.BackgroundImage = Properties.Resources.wordpad_italic;
+                doItalic = false;
             }
-            doItalic = btnItalicSelected;
             DoFontStyles();
         }
 
         private void btnUnderline_Click(object sender, EventArgs e)
         {
-            if (btnUnderlineSelected == false)
+            if (!doUnderline)
             {
-                btnUnderline.BackgroundImage = Properties.Resources.sliversilver;
-                btnUnderlineSelected = true;
+                btnUnderline.BackgroundImage = null;
+                doUnderline = true;
             }
             else
             {
-                btnUnderline.BackgroundImage = null;
-                btnUnderlineSelected = false;
+                btnUnderline.BackgroundImage = Properties.Resources.wordpad_underline;
+                doUnderline = false;
             }
-            doUnderline = btnUnderlineSelected;
             DoFontStyles();
         }
 
@@ -175,9 +164,9 @@ namespace TimeHACK.OS.Win95.Win95Apps
             FontStyle Bold = FontStyle.Regular;
             FontStyle Italic = FontStyle.Regular;
             FontStyle Underline = FontStyle.Regular;
-            if (doBold == true) Bold = FontStyle.Bold;
-            if (doItalic == true) Italic = FontStyle.Italic;
-            if (doUnderline == true)Underline = FontStyle.Underline;
+            if (doBold) Bold = FontStyle.Bold;
+            if (doItalic) Italic = FontStyle.Italic;
+            if (doUnderline) Underline = FontStyle.Underline;
             mainText.SelectionFont = new Font(mainText.SelectionFont.FontFamily, mainText.SelectionFont.Size, Bold | Italic | Underline);
         }
     }
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.resx
index 1af7de1..6dff4e6 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.resx
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.resx
@@ -117,4 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="topmenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>
\ No newline at end of file
diff --git a/TimeHACK.Main/Properties/Resources.Designer.cs b/TimeHACK.Main/Properties/Resources.Designer.cs
index 2460c78..744f5b5 100644
--- a/TimeHACK.Main/Properties/Resources.Designer.cs
+++ b/TimeHACK.Main/Properties/Resources.Designer.cs
@@ -1243,26 +1243,6 @@ namespace TimeHACK.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap WinClassicCopy {
-            get {
-                object obj = ResourceManager.GetObject("WinClassicCopy", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap WinClassicCut {
-            get {
-                object obj = ResourceManager.GetObject("WinClassicCut", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap WinClassicDisplayExample {
             get {
                 object obj = ResourceManager.GetObject("WinClassicDisplayExample", resourceCulture);
@@ -1493,16 +1473,6 @@ namespace TimeHACK.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap WinClassicNew {
-            get {
-                object obj = ResourceManager.GetObject("WinClassicNew", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap WinClassicNotepad {
             get {
                 object obj = ResourceManager.GetObject("WinClassicNotepad", resourceCulture);
@@ -1713,6 +1683,126 @@ namespace TimeHACK.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
+        internal static System.Drawing.Bitmap wordpad_bold {
+            get {
+                object obj = ResourceManager.GetObject("wordpad_bold", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap wordpad_copy {
+            get {
+                object obj = ResourceManager.GetObject("wordpad_copy", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap wordpad_cut {
+            get {
+                object obj = ResourceManager.GetObject("wordpad_cut", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap wordpad_find {
+            get {
+                object obj = ResourceManager.GetObject("wordpad_find", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap wordpad_italic {
+            get {
+                object obj = ResourceManager.GetObject("wordpad_italic", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap wordpad_new {
+            get {
+                object obj = ResourceManager.GetObject("wordpad_new", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap wordpad_open {
+            get {
+                object obj = ResourceManager.GetObject("wordpad_open", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap wordpad_paste {
+            get {
+                object obj = ResourceManager.GetObject("wordpad_paste", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap wordpad_print {
+            get {
+                object obj = ResourceManager.GetObject("wordpad_print", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap wordpad_printpreview {
+            get {
+                object obj = ResourceManager.GetObject("wordpad_printpreview", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap wordpad_save {
+            get {
+                object obj = ResourceManager.GetObject("wordpad_save", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap wordpad_underline {
+            get {
+                object obj = ResourceManager.GetObject("wordpad_underline", resourceCulture);
+                return ((System.Drawing.Bitmap)(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);
diff --git a/TimeHACK.Main/Properties/Resources.resx b/TimeHACK.Main/Properties/Resources.resx
index 90654ef..ba878c4 100644
--- a/TimeHACK.Main/Properties/Resources.resx
+++ b/TimeHACK.Main/Properties/Resources.resx
@@ -145,9 +145,6 @@
   <data name="MSNewGame" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\resources\titlescreen\msnewgame.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="WinClassicNew" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\WinClassic\WinClassicNew.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="WinClassicMinesweeperSmile" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\minsweeper smile.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -267,9 +264,6 @@
   <data name="WinClassicRun" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\resources\winclassic\winclassicrun.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="WinClassicCut" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\WinClassic\WinClassicCut.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="ie4_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ie4_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -555,9 +549,6 @@
   <data name="windows_command_prompt" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\windows_command_prompt.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="WinClassicCopy" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\WinClassic\WinClassicCopy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="win95_splitter" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\win95_splitter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -606,7 +597,7 @@
   <data name="Win95IconIE4" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ
+        vQAADr0BR/uQrQAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ
         1okT9uuef4slmG9gWjdzN4Wnf9bRT1RhaCN+KriGieyvkjr8Rl7AMMbywE0zCBiIBS9Awbn7tUD29xME
         Q0rM8IHhPbziKRhMU0pqjVIfcgHAfB2oiugnuEnG/EkZ/4fLZEksutHaB6sGQO/gf7MbAAAAAElFTkSu
         QmCC
@@ -771,4 +762,40 @@
   <data name="WinClassicMinesweeperWin" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\minsweeper win.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="wordpad_bold" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\wordpad_bold.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="wordpad_copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\wordpad_copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="wordpad_cut" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\wordpad_cut.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="wordpad_find" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\wordpad_find.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="wordpad_italic" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\wordpad_italic.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="wordpad_new" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\wordpad_new.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="wordpad_open" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\wordpad_open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="wordpad_paste" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\wordpad_paste.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="wordpad_print" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\wordpad_print.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="wordpad_printpreview" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\wordpad_printpreview.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="wordpad_save" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\wordpad_save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="wordpad_underline" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\wordpad_underline.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/wordpad_bold.png b/TimeHACK.Main/Resources/wordpad_bold.png
new file mode 100644
index 0000000..b66df82
--- /dev/null
+++ b/TimeHACK.Main/Resources/wordpad_bold.png
diff --git a/TimeHACK.Main/Resources/wordpad_copy.png b/TimeHACK.Main/Resources/wordpad_copy.png
new file mode 100644
index 0000000..c78e5f7
--- /dev/null
+++ b/TimeHACK.Main/Resources/wordpad_copy.png
diff --git a/TimeHACK.Main/Resources/wordpad_cut.png b/TimeHACK.Main/Resources/wordpad_cut.png
new file mode 100644
index 0000000..0b354ef
--- /dev/null
+++ b/TimeHACK.Main/Resources/wordpad_cut.png
diff --git a/TimeHACK.Main/Resources/wordpad_find.png b/TimeHACK.Main/Resources/wordpad_find.png
new file mode 100644
index 0000000..21c904e
--- /dev/null
+++ b/TimeHACK.Main/Resources/wordpad_find.png
diff --git a/TimeHACK.Main/Resources/wordpad_italic.png b/TimeHACK.Main/Resources/wordpad_italic.png
new file mode 100644
index 0000000..bc61fd2
--- /dev/null
+++ b/TimeHACK.Main/Resources/wordpad_italic.png
diff --git a/TimeHACK.Main/Resources/wordpad_new.png b/TimeHACK.Main/Resources/wordpad_new.png
new file mode 100644
index 0000000..b84751c
--- /dev/null
+++ b/TimeHACK.Main/Resources/wordpad_new.png
diff --git a/TimeHACK.Main/Resources/wordpad_open.png b/TimeHACK.Main/Resources/wordpad_open.png
new file mode 100644
index 0000000..8a800db
--- /dev/null
+++ b/TimeHACK.Main/Resources/wordpad_open.png
diff --git a/TimeHACK.Main/Resources/wordpad_paste.png b/TimeHACK.Main/Resources/wordpad_paste.png
new file mode 100644
index 0000000..cd2a2dc
--- /dev/null
+++ b/TimeHACK.Main/Resources/wordpad_paste.png
diff --git a/TimeHACK.Main/Resources/wordpad_print.png b/TimeHACK.Main/Resources/wordpad_print.png
new file mode 100644
index 0000000..0f5c061
--- /dev/null
+++ b/TimeHACK.Main/Resources/wordpad_print.png
diff --git a/TimeHACK.Main/Resources/wordpad_printpreview.png b/TimeHACK.Main/Resources/wordpad_printpreview.png
new file mode 100644
index 0000000..707f8aa
--- /dev/null
+++ b/TimeHACK.Main/Resources/wordpad_printpreview.png
diff --git a/TimeHACK.Main/Resources/wordpad_save.png b/TimeHACK.Main/Resources/wordpad_save.png
new file mode 100644
index 0000000..8a378b1
--- /dev/null
+++ b/TimeHACK.Main/Resources/wordpad_save.png
diff --git a/TimeHACK.Main/Resources/wordpad_underline.png b/TimeHACK.Main/Resources/wordpad_underline.png
new file mode 100644
index 0000000..5066755
--- /dev/null
+++ b/TimeHACK.Main/Resources/wordpad_underline.png
diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj
index cc73245..d482947 100644
--- a/TimeHACK.Main/TimeHACK.Main.csproj
+++ b/TimeHACK.Main/TimeHACK.Main.csproj
@@ -202,10 +202,10 @@
     <Compile Include="OS\Win95\Win95Apps\Win95Installer.Designer.cs">
       <DependentUpon>Win95Installer.cs</DependentUpon>
     </Compile>
-    <Compile Include="OS\Win95\Win95Apps\WinClassicCalculator.cs">
+    <Compile Include="GlobalPrograms\WinClassicCalculator.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="OS\Win95\Win95Apps\WinClassicCalculator.Designer.cs">
+    <Compile Include="GlobalPrograms\WinClassicCalculator.Designer.cs">
       <DependentUpon>WinClassicCalculator.cs</DependentUpon>
     </Compile>
     <Compile Include="OS\Win95\Win95Apps\WinClassicFTPClient.cs">
@@ -399,7 +399,7 @@
     <EmbeddedResource Include="OS\Win95\Win95Apps\Win95Installer.resx">
       <DependentUpon>Win95Installer.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OS\Win95\Win95Apps\WinClassicCalculator.resx">
+    <EmbeddedResource Include="GlobalPrograms\WinClassicCalculator.resx">
       <DependentUpon>WinClassicCalculator.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="OS\Win95\Win95Apps\WinClassicFTPClient.resx">
@@ -516,6 +516,18 @@
   <ItemGroup>
     <Content Include="Icon128x.ico" />
     <Content Include="Resources\12padams_EULA.txt" />
+    <None Include="Resources\wordpad_find.png" />
+    <None Include="Resources\wordpad_printpreview.png" />
+    <None Include="Resources\wordpad_print.png" />
+    <None Include="Resources\wordpad_save.png" />
+    <None Include="Resources\wordpad_open.png" />
+    <None Include="Resources\wordpad_paste.png" />
+    <None Include="Resources\wordpad_copy.png" />
+    <None Include="Resources\wordpad_cut.png" />
+    <None Include="Resources\wordpad_new.png" />
+    <None Include="Resources\wordpad_underline.png" />
+    <None Include="Resources\wordpad_italic.png" />
+    <None Include="Resources\wordpad_bold.png" />
     <None Include="Resources\XCross.png" />
     <None Include="Resources\XCross_highlighted.png" />
     <None Include="Resources\DCTheme_BG.JPG" />