diff --git a/Program.cs b/Program.cs
index d418d39..4831cc5 100644
--- a/Program.cs
+++ b/Program.cs
@@ -6,15 +6,15 @@ namespace RTFPad
 {
     static class Program
     {
-        /// <summary>
-        /// The main entry point for the application.
-        /// </summary>
         [STAThread]
-        static void Main()
+        static void Main(string[] args)
         {
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new rtfPadForm());
+            string startDoc = "";
+            if (args.Length > 0) { startDoc = args[0]; }
+            if (startDoc == "") { Application.Run(new rtfPadForm()); }
+            else { Application.Run(new rtfPadForm(startDoc)); }
         }
     }
 }
\ No newline at end of file
diff --git a/RTFPad.csproj b/RTFPad.csproj
index ee3fc7c..48b043d 100644
--- a/RTFPad.csproj
+++ b/RTFPad.csproj
@@ -10,14 +10,30 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>RTFPad</RootNamespace>
     <AssemblyName>RTFPad</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <PlatformTarget>x86</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
+    <Optimize>true</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -33,7 +49,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>icon.ico</ApplicationIcon>
+    <ApplicationIcon>RTFPad.ico</ApplicationIcon>
+  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>RTFPad.Program</StartupObject>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -83,10 +102,12 @@
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
     <EmbeddedResource Include="rtfPadForm.resx">
       <DependentUpon>rtfPadForm.cs</DependentUpon>
     </EmbeddedResource>
+    <None Include="app.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -99,6 +120,14 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="icon.ico" />
+    <Content Include="RTFPad.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/aboutForm.cs b/aboutForm.cs
index 0741d75..d861e01 100644
--- a/aboutForm.cs
+++ b/aboutForm.cs
@@ -1,9 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 using System.Diagnostics;
 
diff --git a/app.config b/app.config
new file mode 100644
index 0000000..fcd0c93
--- /dev/null
+++ b/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/findForm.cs b/findForm.cs
index da91223..f781445 100644
--- a/findForm.cs
+++ b/findForm.cs
@@ -1,9 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 
 
diff --git a/replaceForm.cs b/replaceForm.cs
index 06f9640..6825f13 100644
--- a/replaceForm.cs
+++ b/replaceForm.cs
@@ -1,9 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 
 namespace RTFPad
diff --git a/rtfPadForm.Designer.cs b/rtfPadForm.Designer.cs
index 5e109c7..6ce85bb 100644
--- a/rtfPadForm.Designer.cs
+++ b/rtfPadForm.Designer.cs
@@ -64,33 +64,15 @@ private void InitializeComponent()
             this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.aboutRTFPadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStrip = new System.Windows.Forms.ToolStrip();
-            this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
-            this.toolStripCBoxFont = new System.Windows.Forms.ToolStripComboBox();
-            this.toolStripCBoxFontSize = new System.Windows.Forms.ToolStripComboBox();
-            this.dialogOpen = new System.Windows.Forms.OpenFileDialog();
-            this.dialogSave = new System.Windows.Forms.SaveFileDialog();
-            this.tabControl = new System.Windows.Forms.TabControl();
-            this.statusStrip = new System.Windows.Forms.StatusStrip();
-            this.statusStripInfoLabel = new System.Windows.Forms.ToolStripStatusLabel();
-            this.tabMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.contextMenuNew = new System.Windows.Forms.ToolStripMenuItem();
-            this.contextMenuClose = new System.Windows.Forms.ToolStripMenuItem();
-            this.dialogPrintPreview = new System.Windows.Forms.PrintPreviewDialog();
-            this.dialogPrint = new System.Windows.Forms.PrintDialog();
-            this.dialogPageSetup = new System.Windows.Forms.PageSetupDialog();
-            this.dialogFont = new System.Windows.Forms.FontDialog();
-            this.dialogColor = new System.Windows.Forms.ColorDialog();
             this.toolStripNew = new System.Windows.Forms.ToolStripButton();
             this.toolStripOpen = new System.Windows.Forms.ToolStripButton();
             this.toolStripSave = new System.Windows.Forms.ToolStripButton();
             this.toolStripPrint = new System.Windows.Forms.ToolStripButton();
             this.toolStripPrintPreview = new System.Windows.Forms.ToolStripButton();
-            this.toolStripFind = new System.Windows.Forms.ToolStripButton();
-            this.toolStripCut = new System.Windows.Forms.ToolStripButton();
-            this.toolStripCopy = new System.Windows.Forms.ToolStripButton();
-            this.toolStripPaste = new System.Windows.Forms.ToolStripButton();
             this.toolStripUndo = new System.Windows.Forms.ToolStripButton();
             this.toolStripRedo = new System.Windows.Forms.ToolStripButton();
+            this.toolStripCBoxFont = new System.Windows.Forms.ToolStripComboBox();
+            this.toolStripCBoxFontSize = new System.Windows.Forms.ToolStripComboBox();
             this.toolStripBold = new System.Windows.Forms.ToolStripButton();
             this.toolStripItalic = new System.Windows.Forms.ToolStripButton();
             this.toolStripUnderline = new System.Windows.Forms.ToolStripButton();
@@ -100,6 +82,19 @@ private void InitializeComponent()
             this.toolStripAlignCenter = new System.Windows.Forms.ToolStripButton();
             this.toolStripAlignRight = new System.Windows.Forms.ToolStripButton();
             this.toolStripBullet = new System.Windows.Forms.ToolStripButton();
+            this.dialogOpen = new System.Windows.Forms.OpenFileDialog();
+            this.dialogSave = new System.Windows.Forms.SaveFileDialog();
+            this.tabControl = new System.Windows.Forms.TabControl();
+            this.statusStrip = new System.Windows.Forms.StatusStrip();
+            this.statusStripInfoLabel = new System.Windows.Forms.ToolStripStatusLabel();
+            this.tabMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.contextMenuNew = new System.Windows.Forms.ToolStripMenuItem();
+            this.contextMenuClose = new System.Windows.Forms.ToolStripMenuItem();
+            this.dialogPrintPreview = new System.Windows.Forms.PrintPreviewDialog();
+            this.dialogPrint = new System.Windows.Forms.PrintDialog();
+            this.dialogPageSetup = new System.Windows.Forms.PageSetupDialog();
+            this.dialogFont = new System.Windows.Forms.FontDialog();
+            this.dialogColor = new System.Windows.Forms.ColorDialog();
             this.menuStrip1.SuspendLayout();
             this.toolStrip.SuspendLayout();
             this.statusStrip.SuspendLayout();
@@ -108,6 +103,8 @@ private void InitializeComponent()
             // 
             // menuStrip1
             // 
+            this.menuStrip1.GripMargin = new System.Windows.Forms.Padding(2, 2, 0, 2);
+            this.menuStrip1.ImageScalingSize = new System.Drawing.Size(24, 24);
             this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.menuFile,
             this.menuEdit,
@@ -116,7 +113,7 @@ private void InitializeComponent()
             this.helpToolStripMenuItem});
             this.menuStrip1.Location = new System.Drawing.Point(0, 0);
             this.menuStrip1.Name = "menuStrip1";
-            this.menuStrip1.Size = new System.Drawing.Size(792, 24);
+            this.menuStrip1.Size = new System.Drawing.Size(978, 36);
             this.menuStrip1.TabIndex = 1;
             this.menuStrip1.Text = "menuStrip1";
             // 
@@ -135,7 +132,7 @@ private void InitializeComponent()
             this.toolStripSeparator2,
             this.menuFileExit});
             this.menuFile.Name = "menuFile";
-            this.menuFile.Size = new System.Drawing.Size(37, 20);
+            this.menuFile.Size = new System.Drawing.Size(54, 29);
             this.menuFile.Text = "&File";
             this.menuFile.Click += new System.EventHandler(this.menuFile_Click);
             // 
@@ -143,7 +140,7 @@ private void InitializeComponent()
             // 
             this.menuFileNewTab.Name = "menuFileNewTab";
             this.menuFileNewTab.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N)));
-            this.menuFileNewTab.Size = new System.Drawing.Size(214, 22);
+            this.menuFileNewTab.Size = new System.Drawing.Size(320, 34);
             this.menuFileNewTab.Text = "&New Tab...";
             this.menuFileNewTab.Click += new System.EventHandler(this.menuFileNew_Click);
             // 
@@ -152,7 +149,7 @@ private void InitializeComponent()
             this.menuFileCloseCurrentTab.Enabled = false;
             this.menuFileCloseCurrentTab.Name = "menuFileCloseCurrentTab";
             this.menuFileCloseCurrentTab.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.W)));
-            this.menuFileCloseCurrentTab.Size = new System.Drawing.Size(214, 22);
+            this.menuFileCloseCurrentTab.Size = new System.Drawing.Size(320, 34);
             this.menuFileCloseCurrentTab.Text = "&Close Current Tab";
             this.menuFileCloseCurrentTab.Click += new System.EventHandler(this.menuFileCloseCurrentTab_Click);
             // 
@@ -160,7 +157,7 @@ private void InitializeComponent()
             // 
             this.menuFileOpen.Name = "menuFileOpen";
             this.menuFileOpen.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
-            this.menuFileOpen.Size = new System.Drawing.Size(214, 22);
+            this.menuFileOpen.Size = new System.Drawing.Size(320, 34);
             this.menuFileOpen.Text = "&Open...";
             this.menuFileOpen.Click += new System.EventHandler(this.menuFileOpen_Click);
             // 
@@ -168,52 +165,52 @@ private void InitializeComponent()
             // 
             this.menuFileSave.Name = "menuFileSave";
             this.menuFileSave.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));
-            this.menuFileSave.Size = new System.Drawing.Size(214, 22);
+            this.menuFileSave.Size = new System.Drawing.Size(320, 34);
             this.menuFileSave.Text = "&Save";
             this.menuFileSave.Click += new System.EventHandler(this.menuFileSave_Click);
             // 
             // menuFileSaveAs
             // 
             this.menuFileSaveAs.Name = "menuFileSaveAs";
-            this.menuFileSaveAs.Size = new System.Drawing.Size(214, 22);
+            this.menuFileSaveAs.Size = new System.Drawing.Size(320, 34);
             this.menuFileSaveAs.Text = "Save &As...";
             this.menuFileSaveAs.Click += new System.EventHandler(this.menuFileSaveAs_Click);
             // 
             // toolStripSeparator1
             // 
             this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(211, 6);
+            this.toolStripSeparator1.Size = new System.Drawing.Size(317, 6);
             // 
             // menuFilePrint
             // 
             this.menuFilePrint.Name = "menuFilePrint";
-            this.menuFilePrint.Size = new System.Drawing.Size(214, 22);
+            this.menuFilePrint.Size = new System.Drawing.Size(320, 34);
             this.menuFilePrint.Text = "&Print...";
             this.menuFilePrint.Click += new System.EventHandler(this.menuFilePrint_Click);
             // 
             // menuFilePrintPreview
             // 
             this.menuFilePrintPreview.Name = "menuFilePrintPreview";
-            this.menuFilePrintPreview.Size = new System.Drawing.Size(214, 22);
+            this.menuFilePrintPreview.Size = new System.Drawing.Size(320, 34);
             this.menuFilePrintPreview.Text = "Print Pre&view...";
             this.menuFilePrintPreview.Click += new System.EventHandler(this.menuFilePrintPreview_Click);
             // 
             // menuFilePageSetup
             // 
             this.menuFilePageSetup.Name = "menuFilePageSetup";
-            this.menuFilePageSetup.Size = new System.Drawing.Size(214, 22);
+            this.menuFilePageSetup.Size = new System.Drawing.Size(320, 34);
             this.menuFilePageSetup.Text = "Page Set&up...";
             this.menuFilePageSetup.Click += new System.EventHandler(this.menuFilePageSetup_Click);
             // 
             // toolStripSeparator2
             // 
             this.toolStripSeparator2.Name = "toolStripSeparator2";
-            this.toolStripSeparator2.Size = new System.Drawing.Size(211, 6);
+            this.toolStripSeparator2.Size = new System.Drawing.Size(317, 6);
             // 
             // menuFileExit
             // 
             this.menuFileExit.Name = "menuFileExit";
-            this.menuFileExit.Size = new System.Drawing.Size(214, 22);
+            this.menuFileExit.Size = new System.Drawing.Size(320, 34);
             this.menuFileExit.Text = "E&xit";
             this.menuFileExit.Click += new System.EventHandler(this.menuFileExit_Click);
             // 
@@ -233,14 +230,14 @@ private void InitializeComponent()
             this.menuEditFindNext,
             this.menuEditReplace});
             this.menuEdit.Name = "menuEdit";
-            this.menuEdit.Size = new System.Drawing.Size(39, 20);
+            this.menuEdit.Size = new System.Drawing.Size(58, 29);
             this.menuEdit.Text = "&Edit";
             // 
             // menuEditUndo
             // 
             this.menuEditUndo.Name = "menuEditUndo";
             this.menuEditUndo.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Z)));
-            this.menuEditUndo.Size = new System.Drawing.Size(164, 22);
+            this.menuEditUndo.Size = new System.Drawing.Size(248, 34);
             this.menuEditUndo.Text = "&Undo";
             this.menuEditUndo.Click += new System.EventHandler(this.menuEditUndo_Click);
             // 
@@ -248,20 +245,20 @@ private void InitializeComponent()
             // 
             this.menuEditRedo.Name = "menuEditRedo";
             this.menuEditRedo.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Y)));
-            this.menuEditRedo.Size = new System.Drawing.Size(164, 22);
+            this.menuEditRedo.Size = new System.Drawing.Size(248, 34);
             this.menuEditRedo.Text = "&Redo";
             this.menuEditRedo.Click += new System.EventHandler(this.menuEditRedo_Click);
             // 
             // toolStripSeparator6
             // 
             this.toolStripSeparator6.Name = "toolStripSeparator6";
-            this.toolStripSeparator6.Size = new System.Drawing.Size(161, 6);
+            this.toolStripSeparator6.Size = new System.Drawing.Size(245, 6);
             // 
             // menuEditCut
             // 
             this.menuEditCut.Name = "menuEditCut";
             this.menuEditCut.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.X)));
-            this.menuEditCut.Size = new System.Drawing.Size(164, 22);
+            this.menuEditCut.Size = new System.Drawing.Size(248, 34);
             this.menuEditCut.Text = "Cu&t";
             this.menuEditCut.Click += new System.EventHandler(this.menuEditCut_Click);
             // 
@@ -269,7 +266,7 @@ private void InitializeComponent()
             // 
             this.menuEditCopy.Name = "menuEditCopy";
             this.menuEditCopy.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C)));
-            this.menuEditCopy.Size = new System.Drawing.Size(164, 22);
+            this.menuEditCopy.Size = new System.Drawing.Size(248, 34);
             this.menuEditCopy.Text = "&Copy";
             this.menuEditCopy.Click += new System.EventHandler(this.menuEditCopy_Click);
             // 
@@ -277,7 +274,7 @@ private void InitializeComponent()
             // 
             this.menuEditPaste.Name = "menuEditPaste";
             this.menuEditPaste.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.V)));
-            this.menuEditPaste.Size = new System.Drawing.Size(164, 22);
+            this.menuEditPaste.Size = new System.Drawing.Size(248, 34);
             this.menuEditPaste.Text = "&Paste";
             this.menuEditPaste.Click += new System.EventHandler(this.menuEditPaste_Click);
             // 
@@ -285,7 +282,7 @@ private void InitializeComponent()
             // 
             this.menuEditClear.Name = "menuEditClear";
             this.menuEditClear.ShortcutKeys = System.Windows.Forms.Keys.Delete;
-            this.menuEditClear.Size = new System.Drawing.Size(164, 22);
+            this.menuEditClear.Size = new System.Drawing.Size(248, 34);
             this.menuEditClear.Text = "Cle&ar";
             this.menuEditClear.Click += new System.EventHandler(this.menuEditClear_Click);
             // 
@@ -293,20 +290,20 @@ private void InitializeComponent()
             // 
             this.menuEditSelectAll.Name = "menuEditSelectAll";
             this.menuEditSelectAll.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A)));
-            this.menuEditSelectAll.Size = new System.Drawing.Size(164, 22);
+            this.menuEditSelectAll.Size = new System.Drawing.Size(248, 34);
             this.menuEditSelectAll.Text = "Select A&ll";
             this.menuEditSelectAll.Click += new System.EventHandler(this.menuEditSelectAll_Click);
             // 
             // toolStripSeparator7
             // 
             this.toolStripSeparator7.Name = "toolStripSeparator7";
-            this.toolStripSeparator7.Size = new System.Drawing.Size(161, 6);
+            this.toolStripSeparator7.Size = new System.Drawing.Size(245, 6);
             // 
             // menuEditFind
             // 
             this.menuEditFind.Name = "menuEditFind";
             this.menuEditFind.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F)));
-            this.menuEditFind.Size = new System.Drawing.Size(164, 22);
+            this.menuEditFind.Size = new System.Drawing.Size(248, 34);
             this.menuEditFind.Text = "&Find";
             this.menuEditFind.Click += new System.EventHandler(this.menuEditFind_Click);
             // 
@@ -314,7 +311,7 @@ private void InitializeComponent()
             // 
             this.menuEditFindNext.Name = "menuEditFindNext";
             this.menuEditFindNext.ShortcutKeys = System.Windows.Forms.Keys.F3;
-            this.menuEditFindNext.Size = new System.Drawing.Size(164, 22);
+            this.menuEditFindNext.Size = new System.Drawing.Size(248, 34);
             this.menuEditFindNext.Text = "Find &Next";
             this.menuEditFindNext.Click += new System.EventHandler(this.menuEditFindNext_Click);
             // 
@@ -322,7 +319,7 @@ private void InitializeComponent()
             // 
             this.menuEditReplace.Name = "menuEditReplace";
             this.menuEditReplace.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.H)));
-            this.menuEditReplace.Size = new System.Drawing.Size(164, 22);
+            this.menuEditReplace.Size = new System.Drawing.Size(248, 34);
             this.menuEditReplace.Text = "&Replace";
             this.menuEditReplace.Click += new System.EventHandler(this.menuEditReplace_Click);
             // 
@@ -331,13 +328,13 @@ private void InitializeComponent()
             this.menuView.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.menuViewWordWrap});
             this.menuView.Name = "menuView";
-            this.menuView.Size = new System.Drawing.Size(44, 20);
+            this.menuView.Size = new System.Drawing.Size(65, 29);
             this.menuView.Text = "&View";
             // 
             // menuViewWordWrap
             // 
             this.menuViewWordWrap.Name = "menuViewWordWrap";
-            this.menuViewWordWrap.Size = new System.Drawing.Size(134, 22);
+            this.menuViewWordWrap.Size = new System.Drawing.Size(206, 34);
             this.menuViewWordWrap.Text = "&Word Wrap";
             this.menuViewWordWrap.Click += new System.EventHandler(this.menuViewWordWrap_Click);
             // 
@@ -347,20 +344,20 @@ private void InitializeComponent()
             this.menuFormatFont,
             this.menuFormatColor});
             this.menuFormat.Name = "menuFormat";
-            this.menuFormat.Size = new System.Drawing.Size(57, 20);
+            this.menuFormat.Size = new System.Drawing.Size(85, 29);
             this.menuFormat.Text = "F&ormat";
             // 
             // menuFormatFont
             // 
             this.menuFormatFont.Name = "menuFormatFont";
-            this.menuFormatFont.Size = new System.Drawing.Size(103, 22);
+            this.menuFormatFont.Size = new System.Drawing.Size(157, 34);
             this.menuFormatFont.Text = "&Font";
             this.menuFormatFont.Click += new System.EventHandler(this.menuFormatFont_Click);
             // 
             // menuFormatColor
             // 
             this.menuFormatColor.Name = "menuFormatColor";
-            this.menuFormatColor.Size = new System.Drawing.Size(103, 22);
+            this.menuFormatColor.Size = new System.Drawing.Size(157, 34);
             this.menuFormatColor.Text = "&Color";
             this.menuFormatColor.Click += new System.EventHandler(this.menuFormatColor_Click);
             // 
@@ -369,13 +366,13 @@ private void InitializeComponent()
             this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.aboutRTFPadToolStripMenuItem});
             this.helpToolStripMenuItem.Name = "helpToolStripMenuItem";
-            this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
+            this.helpToolStripMenuItem.Size = new System.Drawing.Size(65, 29);
             this.helpToolStripMenuItem.Text = "&Help";
             // 
             // aboutRTFPadToolStripMenuItem
             // 
             this.aboutRTFPadToolStripMenuItem.Name = "aboutRTFPadToolStripMenuItem";
-            this.aboutRTFPadToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
+            this.aboutRTFPadToolStripMenuItem.Size = new System.Drawing.Size(226, 34);
             this.aboutRTFPadToolStripMenuItem.Text = "&About RTFPad";
             this.aboutRTFPadToolStripMenuItem.Click += new System.EventHandler(this.aboutRTFPadToolStripMenuItem_Click);
             // 
@@ -388,13 +385,8 @@ private void InitializeComponent()
             this.toolStripSave,
             this.toolStripPrint,
             this.toolStripPrintPreview,
-            this.toolStripFind,
-            this.toolStripCut,
-            this.toolStripCopy,
-            this.toolStripPaste,
             this.toolStripUndo,
             this.toolStripRedo,
-            this.toolStripSeparator5,
             this.toolStripCBoxFont,
             this.toolStripCBoxFontSize,
             this.toolStripBold,
@@ -406,151 +398,22 @@ private void InitializeComponent()
             this.toolStripAlignCenter,
             this.toolStripAlignRight,
             this.toolStripBullet});
-            this.toolStrip.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow;
-            this.toolStrip.Location = new System.Drawing.Point(0, 24);
+            this.toolStrip.Location = new System.Drawing.Point(0, 36);
             this.toolStrip.Name = "toolStrip";
-            this.toolStrip.Size = new System.Drawing.Size(792, 46);
+            this.toolStrip.Padding = new System.Windows.Forms.Padding(0);
+            this.toolStrip.Size = new System.Drawing.Size(978, 38);
+            this.toolStrip.Stretch = true;
             this.toolStrip.TabIndex = 2;
             this.toolStrip.Text = "toolStrip";
             // 
-            // toolStripSeparator5
-            // 
-            this.toolStripSeparator5.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
-            this.toolStripSeparator5.Margin = new System.Windows.Forms.Padding(0, 0, 500, 0);
-            this.toolStripSeparator5.Name = "toolStripSeparator5";
-            this.toolStripSeparator5.Size = new System.Drawing.Size(6, 23);
-            // 
-            // toolStripCBoxFont
-            // 
-            this.toolStripCBoxFont.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.toolStripCBoxFont.DropDownWidth = 200;
-            this.toolStripCBoxFont.MaxDropDownItems = 30;
-            this.toolStripCBoxFont.Name = "toolStripCBoxFont";
-            this.toolStripCBoxFont.Size = new System.Drawing.Size(180, 23);
-            this.toolStripCBoxFont.SelectedIndexChanged += new System.EventHandler(this.toolStripCBoxFont_SelectedIndexChanged);
-            // 
-            // toolStripCBoxFontSize
-            // 
-            this.toolStripCBoxFontSize.AutoSize = false;
-            this.toolStripCBoxFontSize.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.toolStripCBoxFontSize.Items.AddRange(new object[] {
-            "8",
-            "9",
-            "10",
-            "11",
-            "12",
-            "14",
-            "16",
-            "18",
-            "20",
-            "22",
-            "24",
-            "26",
-            "28",
-            "36",
-            "48",
-            "72"});
-            this.toolStripCBoxFontSize.MaxDropDownItems = 16;
-            this.toolStripCBoxFontSize.Name = "toolStripCBoxFontSize";
-            this.toolStripCBoxFontSize.Size = new System.Drawing.Size(50, 23);
-            this.toolStripCBoxFontSize.SelectedIndexChanged += new System.EventHandler(this.toolStripCBoxFontSize_SelectedIndexChanged);
-            // 
-            // dialogOpen
-            // 
-            this.dialogOpen.DefaultExt = "rtf";
-            this.dialogOpen.Filter = "Rich Text Format (*.rtf)|*.rtf|Plain text File (*.txt)|*.txt|All Files|";
-            // 
-            // dialogSave
-            // 
-            this.dialogSave.DefaultExt = "rtf";
-            this.dialogSave.Filter = "Rich Text Format (*.rtf)|*.rtf|Plain text File (*.txt)|*.txt|All Files|";
-            // 
-            // tabControl
-            // 
-            this.tabControl.AllowDrop = true;
-            this.tabControl.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabControl.ItemSize = new System.Drawing.Size(0, 18);
-            this.tabControl.Location = new System.Drawing.Point(0, 70);
-            this.tabControl.Name = "tabControl";
-            this.tabControl.SelectedIndex = 0;
-            this.tabControl.Size = new System.Drawing.Size(792, 476);
-            this.tabControl.TabIndex = 0;
-            this.tabControl.SelectedIndexChanged += new System.EventHandler(this.tabControl_SelectedIndexChanged);
-            this.tabControl.MouseUp += new System.Windows.Forms.MouseEventHandler(this.tabControl_MouseUp);
-            // 
-            // statusStrip
-            // 
-            this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.statusStripInfoLabel});
-            this.statusStrip.Location = new System.Drawing.Point(0, 546);
-            this.statusStrip.Name = "statusStrip";
-            this.statusStrip.Size = new System.Drawing.Size(792, 22);
-            this.statusStrip.TabIndex = 3;
-            // 
-            // statusStripInfoLabel
-            // 
-            this.statusStripInfoLabel.Name = "statusStripInfoLabel";
-            this.statusStripInfoLabel.Size = new System.Drawing.Size(0, 17);
-            // 
-            // tabMenu
-            // 
-            this.tabMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.contextMenuNew,
-            this.contextMenuClose});
-            this.tabMenu.Name = "tabMenu";
-            this.tabMenu.Size = new System.Drawing.Size(127, 48);
-            // 
-            // contextMenuNew
-            // 
-            this.contextMenuNew.Name = "contextMenuNew";
-            this.contextMenuNew.Size = new System.Drawing.Size(126, 22);
-            this.contextMenuNew.Text = "&New Tab";
-            this.contextMenuNew.Click += new System.EventHandler(this.contextMenuNew_Click);
-            // 
-            // contextMenuClose
-            // 
-            this.contextMenuClose.Name = "contextMenuClose";
-            this.contextMenuClose.Size = new System.Drawing.Size(126, 22);
-            this.contextMenuClose.Text = "&Close Tab";
-            this.contextMenuClose.Click += new System.EventHandler(this.contextMenuClose_Click);
-            // 
-            // dialogPrintPreview
-            // 
-            this.dialogPrintPreview.AutoScrollMargin = new System.Drawing.Size(0, 0);
-            this.dialogPrintPreview.AutoScrollMinSize = new System.Drawing.Size(0, 0);
-            this.dialogPrintPreview.ClientSize = new System.Drawing.Size(400, 300);
-            this.dialogPrintPreview.Enabled = true;
-            this.dialogPrintPreview.Icon = ((System.Drawing.Icon)(resources.GetObject("dialogPrintPreview.Icon")));
-            this.dialogPrintPreview.Name = "dialogPrintPreview";
-            this.dialogPrintPreview.ShowIcon = false;
-            this.dialogPrintPreview.Visible = false;
-            // 
-            // dialogPrint
-            // 
-            this.dialogPrint.UseEXDialog = true;
-            // 
-            // dialogPageSetup
-            // 
-            this.dialogPageSetup.EnableMetric = true;
-            this.dialogPageSetup.MinMargins = new System.Drawing.Printing.Margins(10, 10, 10, 10);
-            // 
-            // dialogFont
-            // 
-            this.dialogFont.FontMustExist = true;
-            this.dialogFont.ShowColor = true;
-            // 
-            // dialogColor
-            // 
-            this.dialogColor.AnyColor = true;
-            this.dialogColor.FullOpen = true;
-            // 
             // toolStripNew
             // 
             this.toolStripNew.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
             this.toolStripNew.Image = global::RTFPad.icons.NewDocument;
             this.toolStripNew.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.toolStripNew.Name = "toolStripNew";
-            this.toolStripNew.Size = new System.Drawing.Size(23, 20);
+            this.toolStripNew.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
+            this.toolStripNew.Size = new System.Drawing.Size(34, 28);
             this.toolStripNew.Text = "New Tab";
             this.toolStripNew.Click += new System.EventHandler(this.toolStripNew_Click);
             this.toolStripNew.MouseEnter += new System.EventHandler(this.toolStripNew_MouseEnter);
@@ -562,7 +425,8 @@ private void InitializeComponent()
             this.toolStripOpen.Image = global::RTFPad.icons.OpenFolder;
             this.toolStripOpen.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.toolStripOpen.Name = "toolStripOpen";
-            this.toolStripOpen.Size = new System.Drawing.Size(23, 20);
+            this.toolStripOpen.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
+            this.toolStripOpen.Size = new System.Drawing.Size(34, 28);
             this.toolStripOpen.Text = "Open File";
             this.toolStripOpen.Click += new System.EventHandler(this.toolStripOpen_Click);
             this.toolStripOpen.MouseEnter += new System.EventHandler(this.toolStripOpen_MouseEnter);
@@ -574,7 +438,8 @@ private void InitializeComponent()
             this.toolStripSave.Image = global::RTFPad.icons.Save;
             this.toolStripSave.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.toolStripSave.Name = "toolStripSave";
-            this.toolStripSave.Size = new System.Drawing.Size(23, 20);
+            this.toolStripSave.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
+            this.toolStripSave.Size = new System.Drawing.Size(34, 28);
             this.toolStripSave.Text = "Save Current Tab";
             this.toolStripSave.Click += new System.EventHandler(this.toolStripSave_Click);
             this.toolStripSave.MouseEnter += new System.EventHandler(this.toolStripSave_MouseEnter);
@@ -586,7 +451,8 @@ private void InitializeComponent()
             this.toolStripPrint.Image = global::RTFPad.icons.Print;
             this.toolStripPrint.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.toolStripPrint.Name = "toolStripPrint";
-            this.toolStripPrint.Size = new System.Drawing.Size(23, 20);
+            this.toolStripPrint.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
+            this.toolStripPrint.Size = new System.Drawing.Size(34, 28);
             this.toolStripPrint.Text = "Print Current Tab";
             this.toolStripPrint.Click += new System.EventHandler(this.toolStripPrint_Click);
             this.toolStripPrint.MouseEnter += new System.EventHandler(this.toolStripPrint_MouseEnter);
@@ -598,67 +464,21 @@ private void InitializeComponent()
             this.toolStripPrintPreview.Image = global::RTFPad.icons.PrintPreview;
             this.toolStripPrintPreview.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.toolStripPrintPreview.Name = "toolStripPrintPreview";
-            this.toolStripPrintPreview.Size = new System.Drawing.Size(23, 20);
+            this.toolStripPrintPreview.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
+            this.toolStripPrintPreview.Size = new System.Drawing.Size(34, 28);
             this.toolStripPrintPreview.Text = "Print Preview";
             this.toolStripPrintPreview.Click += new System.EventHandler(this.toolStripPrintPreview_Click);
             this.toolStripPrintPreview.MouseEnter += new System.EventHandler(this.toolStripPrintPreview_MouseEnter);
             this.toolStripPrintPreview.MouseLeave += new System.EventHandler(this.toolStripPrintPreview_MouseLeave);
             // 
-            // toolStripFind
-            // 
-            this.toolStripFind.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.toolStripFind.Image = global::RTFPad.icons.Find;
-            this.toolStripFind.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.toolStripFind.Name = "toolStripFind";
-            this.toolStripFind.Size = new System.Drawing.Size(23, 20);
-            this.toolStripFind.Text = "Find";
-            this.toolStripFind.Click += new System.EventHandler(this.toolStripFind_Click);
-            this.toolStripFind.MouseEnter += new System.EventHandler(this.toolStripFind_MouseEnter);
-            this.toolStripFind.MouseLeave += new System.EventHandler(this.toolStripFind_MouseLeave);
-            // 
-            // toolStripCut
-            // 
-            this.toolStripCut.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.toolStripCut.Image = global::RTFPad.icons.Cut;
-            this.toolStripCut.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.toolStripCut.Name = "toolStripCut";
-            this.toolStripCut.Size = new System.Drawing.Size(23, 20);
-            this.toolStripCut.Text = "Cut";
-            this.toolStripCut.Click += new System.EventHandler(this.toolStripCut_Click);
-            this.toolStripCut.MouseEnter += new System.EventHandler(this.toolStripCut_MouseEnter);
-            this.toolStripCut.MouseLeave += new System.EventHandler(this.toolStripCut_MouseLeave);
-            // 
-            // toolStripCopy
-            // 
-            this.toolStripCopy.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.toolStripCopy.Image = global::RTFPad.icons.Copy;
-            this.toolStripCopy.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.toolStripCopy.Name = "toolStripCopy";
-            this.toolStripCopy.Size = new System.Drawing.Size(23, 20);
-            this.toolStripCopy.Text = "Copy";
-            this.toolStripCopy.Click += new System.EventHandler(this.toolStripCopy_Click);
-            this.toolStripCopy.MouseEnter += new System.EventHandler(this.toolStripCopy_MouseEnter);
-            this.toolStripCopy.MouseLeave += new System.EventHandler(this.toolStripCopy_MouseLeave);
-            // 
-            // toolStripPaste
-            // 
-            this.toolStripPaste.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.toolStripPaste.Image = global::RTFPad.icons.Paste;
-            this.toolStripPaste.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.toolStripPaste.Name = "toolStripPaste";
-            this.toolStripPaste.Size = new System.Drawing.Size(23, 20);
-            this.toolStripPaste.Text = "Paste";
-            this.toolStripPaste.Click += new System.EventHandler(this.toolStripPaste_Click);
-            this.toolStripPaste.MouseEnter += new System.EventHandler(this.toolStripPaste_MouseEnter);
-            this.toolStripPaste.MouseLeave += new System.EventHandler(this.toolStripPaste_MouseLeave);
-            // 
             // toolStripUndo
             // 
             this.toolStripUndo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
             this.toolStripUndo.Image = global::RTFPad.icons.Edit_Undo;
             this.toolStripUndo.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.toolStripUndo.Name = "toolStripUndo";
-            this.toolStripUndo.Size = new System.Drawing.Size(23, 20);
+            this.toolStripUndo.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
+            this.toolStripUndo.Size = new System.Drawing.Size(34, 28);
             this.toolStripUndo.Text = "Undo";
             this.toolStripUndo.Click += new System.EventHandler(this.toolStripUndo_Click);
             this.toolStripUndo.MouseEnter += new System.EventHandler(this.toolStripUndo_MouseEnter);
@@ -670,19 +490,60 @@ private void InitializeComponent()
             this.toolStripRedo.Image = global::RTFPad.icons.Edit_Redo;
             this.toolStripRedo.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.toolStripRedo.Name = "toolStripRedo";
-            this.toolStripRedo.Size = new System.Drawing.Size(23, 20);
+            this.toolStripRedo.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
+            this.toolStripRedo.Size = new System.Drawing.Size(34, 28);
             this.toolStripRedo.Text = "Redo";
             this.toolStripRedo.Click += new System.EventHandler(this.toolStripRedo_Click);
             this.toolStripRedo.MouseEnter += new System.EventHandler(this.toolStripRedo_MouseEnter);
             this.toolStripRedo.MouseLeave += new System.EventHandler(this.toolStripRedo_MouseLeave);
             // 
+            // toolStripCBoxFont
+            // 
+            this.toolStripCBoxFont.AutoSize = false;
+            this.toolStripCBoxFont.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.toolStripCBoxFont.DropDownWidth = 200;
+            this.toolStripCBoxFont.Margin = new System.Windows.Forms.Padding(0);
+            this.toolStripCBoxFont.MaxDropDownItems = 30;
+            this.toolStripCBoxFont.Name = "toolStripCBoxFont";
+            this.toolStripCBoxFont.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
+            this.toolStripCBoxFont.Size = new System.Drawing.Size(200, 33);
+            this.toolStripCBoxFont.SelectedIndexChanged += new System.EventHandler(this.toolStripCBoxFont_SelectedIndexChanged);
+            // 
+            // toolStripCBoxFontSize
+            // 
+            this.toolStripCBoxFontSize.AutoSize = false;
+            this.toolStripCBoxFontSize.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.toolStripCBoxFontSize.Items.AddRange(new object[] {
+            "8",
+            "9",
+            "10",
+            "11",
+            "12",
+            "14",
+            "16",
+            "18",
+            "20",
+            "22",
+            "24",
+            "26",
+            "28",
+            "36",
+            "48",
+            "72"});
+            this.toolStripCBoxFontSize.MaxDropDownItems = 16;
+            this.toolStripCBoxFontSize.Name = "toolStripCBoxFontSize";
+            this.toolStripCBoxFontSize.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
+            this.toolStripCBoxFontSize.Size = new System.Drawing.Size(73, 33);
+            this.toolStripCBoxFontSize.SelectedIndexChanged += new System.EventHandler(this.toolStripCBoxFontSize_SelectedIndexChanged);
+            // 
             // toolStripBold
             // 
             this.toolStripBold.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
             this.toolStripBold.Image = global::RTFPad.icons.Bold;
             this.toolStripBold.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.toolStripBold.Name = "toolStripBold";
-            this.toolStripBold.Size = new System.Drawing.Size(23, 20);
+            this.toolStripBold.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
+            this.toolStripBold.Size = new System.Drawing.Size(34, 28);
             this.toolStripBold.Text = "Bold";
             this.toolStripBold.Click += new System.EventHandler(this.toolStripBold_Click);
             this.toolStripBold.MouseEnter += new System.EventHandler(this.toolStripBold_MouseEnter);
@@ -694,7 +555,8 @@ private void InitializeComponent()
             this.toolStripItalic.Image = global::RTFPad.icons.Italic;
             this.toolStripItalic.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.toolStripItalic.Name = "toolStripItalic";
-            this.toolStripItalic.Size = new System.Drawing.Size(23, 20);
+            this.toolStripItalic.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
+            this.toolStripItalic.Size = new System.Drawing.Size(34, 28);
             this.toolStripItalic.Text = "Italic";
             this.toolStripItalic.Click += new System.EventHandler(this.toolStripItalic_Click);
             this.toolStripItalic.MouseEnter += new System.EventHandler(this.toolStripItalic_MouseEnter);
@@ -706,8 +568,9 @@ private void InitializeComponent()
             this.toolStripUnderline.Image = global::RTFPad.icons.Underline;
             this.toolStripUnderline.ImageTransparentColor = System.Drawing.Color.White;
             this.toolStripUnderline.Name = "toolStripUnderline";
-            this.toolStripUnderline.Size = new System.Drawing.Size(23, 20);
-            this.toolStripUnderline.Text = "toolStripButton3";
+            this.toolStripUnderline.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
+            this.toolStripUnderline.Size = new System.Drawing.Size(34, 28);
+            this.toolStripUnderline.Text = "Underline";
             this.toolStripUnderline.Click += new System.EventHandler(this.toolStripUnderline_Click);
             this.toolStripUnderline.MouseEnter += new System.EventHandler(this.toolStripUnderline_MouseEnter);
             this.toolStripUnderline.MouseLeave += new System.EventHandler(this.toolStripUnderline_MouseLeave);
@@ -718,7 +581,8 @@ private void InitializeComponent()
             this.toolStripStrikethrough.Image = global::RTFPad.icons.Strikeout;
             this.toolStripStrikethrough.ImageTransparentColor = System.Drawing.Color.White;
             this.toolStripStrikethrough.Name = "toolStripStrikethrough";
-            this.toolStripStrikethrough.Size = new System.Drawing.Size(23, 20);
+            this.toolStripStrikethrough.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
+            this.toolStripStrikethrough.Size = new System.Drawing.Size(34, 28);
             this.toolStripStrikethrough.Text = "Strikethrough";
             this.toolStripStrikethrough.Click += new System.EventHandler(this.toolStripStrikethrough_Click);
             this.toolStripStrikethrough.MouseEnter += new System.EventHandler(this.toolStripStrikethrough_MouseEnter);
@@ -730,9 +594,10 @@ private void InitializeComponent()
             this.toolStripFontColor.Image = global::RTFPad.icons.Color;
             this.toolStripFontColor.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.toolStripFontColor.Name = "toolStripFontColor";
-            this.toolStripFontColor.Size = new System.Drawing.Size(29, 20);
+            this.toolStripFontColor.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
+            this.toolStripFontColor.Size = new System.Drawing.Size(42, 28);
             this.toolStripFontColor.Text = "Color Picker";
-            this.toolStripFontColor.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.toolStripFontColor_DropDownItemClicked);
+            this.toolStripFontColor.Click += new System.EventHandler(this.toolStripFontColor_Click);
             this.toolStripFontColor.MouseEnter += new System.EventHandler(this.toolStripFontColor_MouseEnter);
             this.toolStripFontColor.MouseLeave += new System.EventHandler(this.toolStripFontColor_MouseLeave);
             // 
@@ -742,7 +607,8 @@ private void InitializeComponent()
             this.toolStripAlignLeft.Image = global::RTFPad.icons.Left;
             this.toolStripAlignLeft.ImageTransparentColor = System.Drawing.Color.White;
             this.toolStripAlignLeft.Name = "toolStripAlignLeft";
-            this.toolStripAlignLeft.Size = new System.Drawing.Size(23, 20);
+            this.toolStripAlignLeft.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
+            this.toolStripAlignLeft.Size = new System.Drawing.Size(34, 28);
             this.toolStripAlignLeft.Text = "Left Align";
             this.toolStripAlignLeft.Click += new System.EventHandler(this.toolStripAlignLeft_Click);
             this.toolStripAlignLeft.MouseEnter += new System.EventHandler(this.toolStripAlignLeft_MouseEnter);
@@ -754,7 +620,8 @@ private void InitializeComponent()
             this.toolStripAlignCenter.Image = global::RTFPad.icons.Center;
             this.toolStripAlignCenter.ImageTransparentColor = System.Drawing.Color.White;
             this.toolStripAlignCenter.Name = "toolStripAlignCenter";
-            this.toolStripAlignCenter.Size = new System.Drawing.Size(23, 20);
+            this.toolStripAlignCenter.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
+            this.toolStripAlignCenter.Size = new System.Drawing.Size(34, 28);
             this.toolStripAlignCenter.Text = "Center";
             this.toolStripAlignCenter.Click += new System.EventHandler(this.toolStripAlignCenter_Click);
             this.toolStripAlignCenter.MouseEnter += new System.EventHandler(this.toolStripAlignCenter_MouseEnter);
@@ -766,7 +633,8 @@ private void InitializeComponent()
             this.toolStripAlignRight.Image = global::RTFPad.icons.Right;
             this.toolStripAlignRight.ImageTransparentColor = System.Drawing.Color.White;
             this.toolStripAlignRight.Name = "toolStripAlignRight";
-            this.toolStripAlignRight.Size = new System.Drawing.Size(23, 20);
+            this.toolStripAlignRight.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
+            this.toolStripAlignRight.Size = new System.Drawing.Size(34, 28);
             this.toolStripAlignRight.Text = "Right Align";
             this.toolStripAlignRight.Click += new System.EventHandler(this.toolStripAlignRight_Click);
             this.toolStripAlignRight.MouseEnter += new System.EventHandler(this.toolStripAlignRight_MouseEnter);
@@ -777,28 +645,128 @@ private void InitializeComponent()
             this.toolStripBullet.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
             this.toolStripBullet.Image = global::RTFPad.icons.List_Bullets;
             this.toolStripBullet.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.toolStripBullet.Margin = new System.Windows.Forms.Padding(0);
             this.toolStripBullet.Name = "toolStripBullet";
-            this.toolStripBullet.Size = new System.Drawing.Size(23, 20);
+            this.toolStripBullet.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
+            this.toolStripBullet.Size = new System.Drawing.Size(34, 33);
             this.toolStripBullet.Text = "Bullets";
             this.toolStripBullet.Click += new System.EventHandler(this.toolStripBullet_Click);
             this.toolStripBullet.MouseEnter += new System.EventHandler(this.toolStripBullet_MouseEnter);
             this.toolStripBullet.MouseLeave += new System.EventHandler(this.toolStripBullet_MouseLeave);
             // 
+            // dialogOpen
+            // 
+            this.dialogOpen.DefaultExt = "rtf";
+            this.dialogOpen.Filter = "Rich Text Format (*.rtf)|*.rtf|Plain text File (*.txt)|*.txt|All Files|";
+            // 
+            // dialogSave
+            // 
+            this.dialogSave.DefaultExt = "rtf";
+            this.dialogSave.Filter = "Rich Text Format (*.rtf)|*.rtf|Plain text File (*.txt)|*.txt|All Files|";
+            // 
+            // tabControl
+            // 
+            this.tabControl.AllowDrop = true;
+            this.tabControl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabControl.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.tabControl.ItemSize = new System.Drawing.Size(0, 18);
+            this.tabControl.Location = new System.Drawing.Point(0, 74);
+            this.tabControl.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.tabControl.Name = "tabControl";
+            this.tabControl.SelectedIndex = 0;
+            this.tabControl.Size = new System.Drawing.Size(978, 954);
+            this.tabControl.TabIndex = 0;
+            this.tabControl.SelectedIndexChanged += new System.EventHandler(this.tabControl_SelectedIndexChanged);
+            this.tabControl.MouseUp += new System.Windows.Forms.MouseEventHandler(this.tabControl_MouseUp);
+            // 
+            // statusStrip
+            // 
+            this.statusStrip.ImageScalingSize = new System.Drawing.Size(24, 24);
+            this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.statusStripInfoLabel});
+            this.statusStrip.Location = new System.Drawing.Point(0, 1028);
+            this.statusStrip.Name = "statusStrip";
+            this.statusStrip.Padding = new System.Windows.Forms.Padding(2, 0, 21, 0);
+            this.statusStrip.Size = new System.Drawing.Size(978, 22);
+            this.statusStrip.TabIndex = 3;
+            // 
+            // statusStripInfoLabel
+            // 
+            this.statusStripInfoLabel.Name = "statusStripInfoLabel";
+            this.statusStripInfoLabel.Size = new System.Drawing.Size(0, 15);
+            // 
+            // tabMenu
+            // 
+            this.tabMenu.ImageScalingSize = new System.Drawing.Size(24, 24);
+            this.tabMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.contextMenuNew,
+            this.contextMenuClose});
+            this.tabMenu.Name = "tabMenu";
+            this.tabMenu.Size = new System.Drawing.Size(160, 68);
+            // 
+            // contextMenuNew
+            // 
+            this.contextMenuNew.Name = "contextMenuNew";
+            this.contextMenuNew.Size = new System.Drawing.Size(159, 32);
+            this.contextMenuNew.Text = "&New Tab";
+            this.contextMenuNew.Click += new System.EventHandler(this.contextMenuNew_Click);
+            // 
+            // contextMenuClose
+            // 
+            this.contextMenuClose.Name = "contextMenuClose";
+            this.contextMenuClose.Size = new System.Drawing.Size(159, 32);
+            this.contextMenuClose.Text = "&Close Tab";
+            this.contextMenuClose.Click += new System.EventHandler(this.contextMenuClose_Click);
+            // 
+            // dialogPrintPreview
+            // 
+            this.dialogPrintPreview.AutoScrollMargin = new System.Drawing.Size(0, 0);
+            this.dialogPrintPreview.AutoScrollMinSize = new System.Drawing.Size(0, 0);
+            this.dialogPrintPreview.ClientSize = new System.Drawing.Size(400, 300);
+            this.dialogPrintPreview.Enabled = true;
+            this.dialogPrintPreview.Icon = ((System.Drawing.Icon)(resources.GetObject("dialogPrintPreview.Icon")));
+            this.dialogPrintPreview.Name = "dialogPrintPreview";
+            this.dialogPrintPreview.ShowIcon = false;
+            this.dialogPrintPreview.Visible = false;
+            // 
+            // dialogPrint
+            // 
+            this.dialogPrint.UseEXDialog = true;
+            // 
+            // dialogPageSetup
+            // 
+            this.dialogPageSetup.EnableMetric = true;
+            this.dialogPageSetup.MinMargins = new System.Drawing.Printing.Margins(10, 10, 10, 10);
+            // 
+            // dialogFont
+            // 
+            this.dialogFont.Color = System.Drawing.Color.FromArgb(((int)(((byte)(182)))), ((int)(((byte)(246)))), ((int)(((byte)(240)))));
+            this.dialogFont.FontMustExist = true;
+            this.dialogFont.ShowColor = true;
+            // 
+            // dialogColor
+            // 
+            this.dialogColor.AnyColor = true;
+            this.dialogColor.FullOpen = true;
+            // 
             // rtfPadForm
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(792, 568);
+            this.ClientSize = new System.Drawing.Size(978, 1050);
             this.Controls.Add(this.tabControl);
             this.Controls.Add(this.statusStrip);
             this.Controls.Add(this.toolStrip);
             this.Controls.Add(this.menuStrip1);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.Location = new System.Drawing.Point(300, 10);
             this.MainMenuStrip = this.menuStrip1;
-            this.MinimumSize = new System.Drawing.Size(800, 600);
+            this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.MinimumSize = new System.Drawing.Size(300, 100);
             this.Name = "rtfPadForm";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
             this.Text = "RTFPad";
-            this.SizeChanged += new System.EventHandler(this.rtfPadForm_SizeChanged);
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.rtfPadForm_FormClosing);
             this.menuStrip1.ResumeLayout(false);
             this.menuStrip1.PerformLayout();
             this.toolStrip.ResumeLayout(false);
@@ -841,12 +809,7 @@ private void InitializeComponent()
         private System.Windows.Forms.ToolStripButton toolStripOpen;
         private System.Windows.Forms.ToolStripButton toolStripPrint;
         private System.Windows.Forms.ToolStripButton toolStripPrintPreview;
-        private System.Windows.Forms.ToolStripButton toolStripFind;
-        private System.Windows.Forms.ToolStripButton toolStripCut;
-        private System.Windows.Forms.ToolStripButton toolStripCopy;
-        private System.Windows.Forms.ToolStripButton toolStripPaste;
         private System.Windows.Forms.ToolStripButton toolStripUndo;
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
         private System.Windows.Forms.ToolStripComboBox toolStripCBoxFont;
         private System.Windows.Forms.ToolStripComboBox toolStripCBoxFontSize;
         private System.Windows.Forms.ToolStripDropDownButton toolStripFontColor;
diff --git a/rtfPadForm.cs b/rtfPadForm.cs
index bac72c9..dac6068 100644
--- a/rtfPadForm.cs
+++ b/rtfPadForm.cs
@@ -1,12 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
 using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 using System.IO;
 using PrintPreviewRichTextBox;
+using System.Linq;
 
 namespace RTFPad
 {
@@ -26,21 +24,24 @@ public partial class rtfPadForm : Form
         #endregion
 
         #region constructor
+        public rtfPadForm(string startdoc)
+        {
+            InitializeComponent();
+            SetupTheForm();
+            int LastSlash = startdoc.LastIndexOf('\\');
+            string FileToOpen = startdoc.Substring(LastSlash + 1);
+            OpenFileNamed(this, null, FileToOpen, startdoc);
+        }
+
         public rtfPadForm()
         {
             InitializeComponent();
-            this.fontList = FontFamily.Families;
-            foreach (FontFamily font in fontList)
-            {
-                this.toolStripCBoxFont.Items.Add(font.Name);
-            }
-            foreach (string color in colorList)
-            {
-                Color boja = Color.FromKnownColor((KnownColor)System.Enum.Parse(typeof(KnownColor), color));
-                if (boja.IsSystemColor == false && boja.Name != Color.Transparent.Name)
-                    this.toolStripFontColor.DropDownItems.Add(color);
-                    
-            }
+            SetupTheForm();
+        }
+
+        private void SetupTheForm()
+        {
+            FontsAndColors();
             foreach (ToolStripDropDownItem entry in this.toolStripFontColor.DropDownItems)
             {
                 entry.BackColor = Color.FromKnownColor((KnownColor)System.Enum.Parse(typeof(KnownColor), entry.Text));
@@ -58,6 +59,30 @@ public rtfPadForm()
             }
             this.newTab();
             this.rtb_SelectionChanged(this, new EventArgs());
+            this.toolStripCBoxFont.Text = "Calibri";
+            this.toolStripCBoxFontSize.Text = "20";
+            this.Height = 750;
+        }
+
+        private void FontsAndColors()
+        {
+            this.fontList = FontFamily.Families;
+            object[] fontObjects = new object[fontList.Count()];
+            int fontIdx = 0;   
+            foreach (FontFamily font in fontList)
+            {
+                fontObjects[fontIdx++] = font.Name;
+            }
+            this.toolStripCBoxFont.Items.AddRange(fontObjects);
+
+            //foreach (string color in colorList)
+            //{
+            //    Color boja = Color.FromKnownColor((KnownColor)System.Enum.Parse(typeof(KnownColor), color));
+            //    if (boja.IsSystemColor == false && boja.Name != Color.Transparent.Name)
+            //    {
+            //        this.toolStripFontColor.DropDownItems.Add(color);
+            //    }
+            //}
         }
         #endregion
 
@@ -66,29 +91,6 @@ public rtfPadForm()
         /* File Exit */
         private void menuFileExit_Click(object sender, EventArgs e)
         {
-            if (this.tabControl.TabCount <= 0) return;
-
-            for (int i = this.tabControl.TabCount; i >= 0; --i)
-            {
-                this.tabControl.SelectedIndex = i;
-                RichTextBox rtb = (RichTextBox)this.tabControl.SelectedTab.Controls[0];
-
-                if (rtb.Text != (string)rtb.Tag)
-                {
-
-                    DialogResult result = MessageBox.Show("Do you wish to save changes to " + this.tabControl.SelectedTab.Text + " ?",
-                                     "RTFPad", MessageBoxButtons.YesNoCancel);
-
-                    if (result == DialogResult.Yes)
-                    {
-                        menuFileSave_Click(sender, e);
-                    }
-                    else if (result == DialogResult.Cancel)
-                    {
-                        return;
-                    }
-                }
-            }
             this.Close();
         }
 
@@ -103,69 +105,78 @@ private void menuFileOpen_Click(object sender, EventArgs e)
         {
             if (this.dialogOpen.ShowDialog() == DialogResult.OK)
             {
-                bool exists = false;
-                for (int i = 0; i < this.tabControl.TabCount; i++)
+                string FileToOpen = this.dialogOpen.SafeFileName;
+                string wholeFileName = this.dialogOpen.FileName;
+                OpenFileNamed(sender, e, FileToOpen, wholeFileName);
+            }
+        }
+
+        private void OpenFileNamed(object sender, EventArgs e, string FileToOpen, string wholeFileName)
+        {
+            bool exists = false;
+            for (int i = 0; i < this.tabControl.TabCount; i++)
+            {
+                if (this.tabControl.TabPages[i].Text == FileToOpen)
                 {
-                    if (this.tabControl.TabPages[i].Text == this.dialogOpen.SafeFileName)
-                    {
-                        exists = true;
-                        this.tabControl.SelectedIndex = i;
-                    }
+                    exists = true;
+                    this.tabControl.SelectedIndex = i;
                 }
+            }
 
-                if (exists == false)
+            if (exists == false)
+            {
+                if (this.tabControl.TabCount < MAX_TABS) menuFileNew_Click(sender, e);
+                else
                 {
-                    if (this.tabControl.TabCount < MAX_TABS) menuFileNew_Click(sender, e);
-                    else
+                    DialogResult mBoxResult = MessageBox.Show("Max tab count reached! Do you wish to open the file in the current tab?",
+                                                                "RTFPad", MessageBoxButtons.YesNoCancel);
+                    switch (mBoxResult)
                     {
-                        DialogResult mBoxResult = MessageBox.Show("Max tab count reached! Do you wish to open the file in the current tab?",
-                                                                    "RTFPad", MessageBoxButtons.YesNoCancel);
-                        switch (mBoxResult)
-                        {
-                            case DialogResult.Yes: this.closeTab();
-                                                   this.newTab();
-                                                   break;
-                            case DialogResult.No: MessageBox.Show("Close a tab", "RTFPad", MessageBoxButtons.OK);
-                                                  return; 
-                            case DialogResult.Cancel: return;
-                        }
-
-                    }
-                    RichTextBox rtb = (RichTextBox)this.tabControl.SelectedTab.Controls[0];
-
-                    StreamReader value;
-                    openedFileInTab.TryGetValue(this.tabControl.SelectedTab.Text, out value);
-                    if (value != null)
-                        this.openedFileInTab[this.tabControl.SelectedTab.Text].Close();
-
-                    this.fileTypeInTab.Remove(this.tabControl.SelectedTab.Text);
-                    this.fileNameInTab.Remove(this.tabControl.SelectedTab.Text);
-                    this.openedFileInTab.Remove(this.tabControl.SelectedTab.Text);
-                    this.selectedColorInTab.Remove(this.tabControl.SelectedTab.Text);
-                    this.textToFindInTab.Remove(this.tabControl.SelectedTab.Text);
-                    this.matchCaseInTab.Remove(this.tabControl.SelectedTab.Text);
-
-                    this.tabControl.SelectedTab.Text = this.dialogOpen.SafeFileName;
-                    int fileType = 0;
-                    if (this.dialogOpen.FilterIndex == 1)
-                    {
-                        rtb.LoadFile(this.dialogOpen.FileName, RichTextBoxStreamType.RichText);
-                        fileType = 1;
+                        case DialogResult.Yes:
+                            this.closeTab();
+                            this.newTab();
+                            break;
+                        case DialogResult.No:
+                            MessageBox.Show("Close a tab", "RTFPad", MessageBoxButtons.OK);
+                            return;
+                        case DialogResult.Cancel: return;
                     }
-                    else
-                    {
-                        rtb.LoadFile(this.dialogOpen.FileName, RichTextBoxStreamType.PlainText);
-                        fileType = 2;
-                    }
-                    rtb.Tag = rtb.Text;
-                    this.openedFileInTab[this.tabControl.SelectedTab.Text] = new StreamReader(this.dialogOpen.FileName);
-                    this.tabControl.SelectedTab.Text                        = this.dialogOpen.SafeFileName;
-                    this.fileNameInTab[this.tabControl.SelectedTab.Text]    = this.dialogOpen.FileName;
-                    this.Text                                               = "RTFPad - " + this.tabControl.SelectedTab.Text;
-                    this.fileTypeInTab[this.tabControl.SelectedTab.Text]   = fileType;
-                    this.rtb_SelectionChanged(sender, e);
-                    this.tabControl_SelectedIndexChanged(sender, e);
+
+                }
+                RichTextBox rtb = (RichTextBox)this.tabControl.SelectedTab.Controls[0];
+
+                StreamReader value;
+                openedFileInTab.TryGetValue(this.tabControl.SelectedTab.Text, out value);
+                if (value != null)
+                    this.openedFileInTab[this.tabControl.SelectedTab.Text].Close();
+
+                this.fileTypeInTab.Remove(this.tabControl.SelectedTab.Text);
+                this.fileNameInTab.Remove(this.tabControl.SelectedTab.Text);
+                this.openedFileInTab.Remove(this.tabControl.SelectedTab.Text);
+                this.selectedColorInTab.Remove(this.tabControl.SelectedTab.Text);
+                this.textToFindInTab.Remove(this.tabControl.SelectedTab.Text);
+                this.matchCaseInTab.Remove(this.tabControl.SelectedTab.Text);
+
+                this.tabControl.SelectedTab.Text = FileToOpen;
+                int fileType = 0;
+                if (this.dialogOpen.FilterIndex == 1)
+                {
+                    rtb.LoadFile(wholeFileName, RichTextBoxStreamType.RichText);
+                    fileType = 1;
                 }
+                else
+                {
+                    rtb.LoadFile(wholeFileName, RichTextBoxStreamType.PlainText);
+                    fileType = 2;
+                }
+                rtb.Tag = rtb.Text;
+                this.openedFileInTab[this.tabControl.SelectedTab.Text] = new StreamReader(wholeFileName);
+                this.tabControl.SelectedTab.Text = FileToOpen;
+                this.fileNameInTab[this.tabControl.SelectedTab.Text] = wholeFileName;
+                this.Text = "RTFPad - " + this.tabControl.SelectedTab.Text;
+                this.fileTypeInTab[this.tabControl.SelectedTab.Text] = fileType;
+                this.rtb_SelectionChanged(sender, e);
+                this.tabControl_SelectedIndexChanged(sender, e);
             }
         }
 
@@ -214,6 +225,7 @@ private void menuFileSaveAs_Click(object sender, EventArgs e)
         private void menuFileSave_Click(object sender, EventArgs e)
         {
             RichTextBox rtb = (RichTextBox)this.tabControl.SelectedTab.Controls[0];
+            rtb.Tag = rtb.Text;
             string currentTabKey = this.tabControl.SelectedTab.Text;
             StreamReader value;
             this.openedFileInTab.TryGetValue(currentTabKey, out value);
@@ -540,23 +552,16 @@ private void toolStripCBoxFontSize_SelectedIndexChanged(object sender, EventArgs
         }
 
         /* Tool Strip Color */
-        private void toolStripFontColor_DropDownItemClicked(object sender, ToolStripItemClickedEventArgs e)
+        private void toolStripFontColor_Click(object sender, EventArgs e)
         {
-            if (this.tabControl.TabCount <= 0) return;
+            ColorDialog MyDialog = new ColorDialog();
+            MyDialog.Color = Color.Black;
 
-            RichTextBox rtb = (RichTextBox)this.tabControl.SelectedTab.Controls[0];
-            rtb.SelectionColor = Color.FromKnownColor((KnownColor)System.Enum.Parse(typeof(KnownColor), e.ClickedItem.Text));
-
-            if (!this.selectedColorInTab.ContainsKey(this.tabControl.SelectedTab.Text))
-                this.selectedColorInTab.Add(this.tabControl.SelectedTab.Text, default(int));
-
-            int index;
-            this.selectedColorInTab.TryGetValue(this.tabControl.SelectedTab.Text, out index);
-
-            ((ToolStripMenuItem)this.toolStripFontColor.DropDownItems[index]).Checked = false;
-            this.selectedColorInTab[this.tabControl.SelectedTab.Text] = this.toolStripFontColor.
-                                                                        DropDownItems.IndexOf((ToolStripMenuItem)e.ClickedItem);
-            ((ToolStripMenuItem)e.ClickedItem).Checked = true;
+            if (MyDialog.ShowDialog() == DialogResult.OK)
+            {
+                RichTextBox rtb = (RichTextBox)this.tabControl.SelectedTab.Controls[0];
+                rtb.SelectionColor = MyDialog.Color;
+            }
         }
 
         /* Tool Strip Undo */
@@ -948,7 +953,7 @@ private void rtb_TextChanged(Object sender, EventArgs e)
             if (rtb.TextLength == 0)
             {
                 this.menuEditFind.Enabled = false;
-                this.toolStripFind.Enabled = false;
+                //this.toolStripFind.Enabled = false;
                 this.menuEditFindNext.Enabled = false;
                 this.menuEditReplace.Enabled = false;
                 this.menuEditSelectAll.Enabled = false;
@@ -957,7 +962,7 @@ private void rtb_TextChanged(Object sender, EventArgs e)
             else
             {
                 this.menuEditFind.Enabled = true;
-                this.toolStripFind.Enabled = true;
+                //this.toolStripFind.Enabled = true;
                 this.menuEditFindNext.Enabled = true;
                 this.menuEditReplace.Enabled = true;
                 this.menuEditSelectAll.Enabled = true;
@@ -995,7 +1000,7 @@ private void rtb_SelectionChanged(Object sender, EventArgs e)
                 if (rtb.TextLength == 0)
                 {
                     this.menuEditFind.Enabled      = false;
-                    this.toolStripFind.Enabled     = false;
+                    //this.toolStripFind.Enabled     = false;
                     this.menuEditFindNext.Enabled  = false;
                     this.menuEditReplace.Enabled   = false;
                     this.menuEditSelectAll.Enabled = false;
@@ -1004,7 +1009,7 @@ private void rtb_SelectionChanged(Object sender, EventArgs e)
                 else
                 {
                     this.menuEditFind.Enabled      = true;
-                    this.toolStripFind.Enabled     = true;
+                    //this.toolStripFind.Enabled     = true;
                     this.menuEditFindNext.Enabled  = true;
                     this.menuEditReplace.Enabled   = true;
                     this.menuEditSelectAll.Enabled = true;
@@ -1036,17 +1041,17 @@ private void rtb_SelectionChanged(Object sender, EventArgs e)
                 {
                     this.menuEditClear.Enabled = false;
                     this.menuEditCut.Enabled   = false;
-                    this.toolStripCut.Enabled  = false;
+                    //this.toolStripCut.Enabled  = false;
                     this.menuEditCopy.Enabled  = false;
-                    this.toolStripCopy.Enabled = false;
+                    //this.toolStripCopy.Enabled = false;
                 }
                 else
                 {
                     this.menuEditClear.Enabled = true;
                     this.menuEditCut.Enabled   = true;
-                    this.toolStripCut.Enabled  = true;
+                    //this.toolStripCut.Enabled  = true;
                     this.menuEditCopy.Enabled  = true;
-                    this.toolStripCopy.Enabled = true;
+                    //this.toolStripCopy.Enabled = true;
                 }
                 if (rtb.SelectionFont.Bold) this.toolStripBold.Checked = true;
                 else this.toolStripBold.Checked = false;
@@ -1085,7 +1090,7 @@ private void tabControl_SelectedIndexChanged(object sender, EventArgs e)
                 this.Text = "RTFPad - " + this.tabControl.SelectedTab.Text;
                 this.rtb_SelectionChanged(sender, e);
                 this.menuEditPaste.Enabled          = true;
-                this.toolStripPaste.Enabled         = true;
+                //this.toolStripPaste.Enabled         = true;
                 this.menuFilePrint.Enabled          = true;
                 this.toolStripPrint.Enabled         = true;
                 this.menuFilePrintPreview.Enabled   = true;
@@ -1121,7 +1126,7 @@ private void tabControl_SelectedIndexChanged(object sender, EventArgs e)
             else
             {
                 this.menuEditFind.Enabled           = false;
-                this.toolStripFind.Enabled          = false;
+                //this.toolStripFind.Enabled          = false;
                 this.menuEditFindNext.Enabled       = false;
                 this.menuEditReplace.Enabled        = false;
                 this.menuEditSelectAll.Enabled      = false;
@@ -1131,11 +1136,11 @@ private void tabControl_SelectedIndexChanged(object sender, EventArgs e)
                 this.toolStripRedo.Enabled          = false;
                 this.menuEditClear.Enabled          = false;
                 this.menuEditCut.Enabled            = false;
-                this.toolStripCut.Enabled           = false;
+                //this.toolStripCut.Enabled           = false;
                 this.menuEditCopy.Enabled           = false;
-                this.toolStripCopy.Enabled          = false;
+                //this.toolStripCopy.Enabled          = false;
                 this.menuEditPaste.Enabled          = false;
-                this.toolStripPaste.Enabled         = false;
+                //this.toolStripPaste.Enabled         = false;
                 this.menuFilePrint.Enabled          = false;
                 this.toolStripPrint.Enabled         = false;
                 this.menuFilePrintPreview.Enabled   = false;
@@ -1171,17 +1176,17 @@ private void tabControl_MouseUp(object sender, MouseEventArgs e)
         /* Event which watches for the change in form size
          * Used for styling the Tool Strip so it's displayed in two rows when possible
          */
-        private void rtfPadForm_SizeChanged(object sender, EventArgs e)
-        {
-            if (this.WindowState == FormWindowState.Maximized || this.Size.Width > 900 )
-            {
-                toolStripSeparator5.Margin = new System.Windows.Forms.Padding(0, 0, 0, 0);
-            }
-            else
-            {
-                toolStripSeparator5.Margin = new System.Windows.Forms.Padding(0, 0, 500, 0);
-            }
-        }
+        //private void rtfPadForm_SizeChanged(object sender, EventArgs e)
+        //{
+        //    if (this.WindowState == FormWindowState.Maximized || this.Size.Width > 900 )
+        //    {
+        //        toolStripSeparator5.Margin = new System.Windows.Forms.Padding(0, 0, 0, 0);
+        //    }
+        //    else
+        //    {
+        //        toolStripSeparator5.Margin = new System.Windows.Forms.Padding(0, 0, 500, 0);
+        //    }
+        //}
         #endregion
 
         #region Tool Strip Mouse Over Events
@@ -1386,5 +1391,33 @@ private void toolStripBullet_MouseLeave(object sender, EventArgs e)
             this.statusStripInfoLabel.Text = "";
         }
         #endregion
+
+        private void rtfPadForm_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            if (this.tabControl.TabCount <= 0) return;
+
+            for (int i = this.tabControl.TabCount; i > 0; --i)
+            {
+                this.tabControl.SelectedIndex = i;
+                RichTextBox rtb = (RichTextBox)this.tabControl.TabPages[i - 1].Controls[0];
+
+                if (rtb.Text != rtb.Tag.ToString())
+                {
+                    DialogResult result = MessageBox.Show("Do you wish to save changes to " + this.tabControl.SelectedTab.Text + " ?",
+                                     "RTFPad", MessageBoxButtons.YesNoCancel);
+
+                    if (result == DialogResult.Yes)
+                    {
+                        menuFileSave_Click(sender, e);
+                    }
+                    else if (result == DialogResult.Cancel)
+                    {
+                        e.Cancel = true;
+                        return;
+                    }
+                }
+            }
+        }
+
     }
 }
\ No newline at end of file
diff --git a/rtfPadForm.resx b/rtfPadForm.resx
index 1b7a409..ea2d9e2 100644
--- a/rtfPadForm.resx
+++ b/rtfPadForm.resx
@@ -112,33 +112,33 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>216, 56</value>
+  <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>284, 65</value>
   </metadata>
-  <metadata name="toolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>118, 56</value>
+  <metadata name="toolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>152, 65</value>
   </metadata>
-  <metadata name="dialogOpen.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>331, 56</value>
+  <metadata name="dialogOpen.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>440, 65</value>
   </metadata>
-  <metadata name="dialogSave.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>556, 56</value>
+  <metadata name="dialogSave.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>746, 65</value>
   </metadata>
-  <metadata name="statusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>447, 56</value>
+  <metadata name="statusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>598, 65</value>
   </metadata>
-  <metadata name="tabMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 56</value>
+  <metadata name="tabMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 65</value>
   </metadata>
-  <metadata name="dialogPrintPreview.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>128, 17</value>
+  <metadata name="dialogPrintPreview.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>168, 17</value>
   </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="dialogPrintPreview.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAYAICAQAAAAAADoAgAAZgAAABAQEAAAAAAAKAEAAE4DAAAgIAAAAQAIAKgIAAB2BAAAEBAAAAEA
@@ -312,17 +312,20 @@
         wf+0BQAAgAUAAIAFAACAAQAAgAHB/4ABAACAAQAAgAEAALwBAAC8AQAAvAHB/4ABbP///5H/
 </value>
   </data>
-  <metadata name="dialogPrint.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="dialogPrint.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="dialogPageSetup.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>281, 17</value>
+  <metadata name="dialogPageSetup.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>382, 17</value>
   </metadata>
-  <metadata name="dialogFont.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>540, 17</value>
+  <metadata name="dialogFont.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>739, 17</value>
   </metadata>
-  <metadata name="dialogColor.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>425, 17</value>
+  <metadata name="dialogColor.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>582, 17</value>
+  </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>121</value>
   </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>