diff --git a/Rapid Reporter/Forms/AboutDlg.xaml b/Rapid Reporter/Forms/AboutDlg.xaml
deleted file mode 100644
index 9731463..0000000
--- a/Rapid Reporter/Forms/AboutDlg.xaml	
+++ /dev/null
@@ -1,44 +0,0 @@
-<Window x:Class="Rapid_Reporter.Forms.AboutDlg"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="About" IsEnabled="True" ResizeMode="NoResize" ShowInTaskbar="False" SizeToContent="WidthAndHeight" BorderThickness="1" WindowStartupLocation="CenterOwner" Icon="RapidReporter.ico" Topmost="True" Loaded="Window_Loaded">
-    <Grid Name="Columns2_1">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="34" />
-            <ColumnDefinition Width="Auto" />
-        </Grid.ColumnDefinitions>
-        <Image Source="RapidReporter.ico" Grid.Column="0" VerticalAlignment="Top" Margin="0,20,0,0"></Image>
-        <Grid Grid.Column="1" Name="Rows4_1">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="10" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="10"  />
-                <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid Grid.Row="0" Name="NameVersion">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <Label Name="appName" Grid.Column="0" Content="error: not retrieved" FontWeight="Bold" HorizontalAlignment="Center"></Label>
-                <Label Name="appVers" Grid.Column="1" Content="error: not retrieved" FontWeight="Bold" HorizontalAlignment="Center"></Label>
-            </Grid>
-            <Label Name="Description" Grid.Row="1" Content="Non-intrusive application for notetaking and reports, great for SBTM" HorizontalAlignment="Center"></Label>
-            <Label Name="Website" Grid.Row="2" HorizontalAlignment="Center" >
-                <Hyperlink NavigateUri="http://ortserver/" RequestNavigate="Hyperlink_RequestNavigate">Info, new versions and reporting bugs: http://ortserver/</Hyperlink>
-            </Label>
-            <Label Name="spacer1" Grid.Row="3" Content="" HorizontalAlignment="Center"></Label>
-            <Label Name="License" Grid.Row="4" Content="Copyright 2014 Tim Watkins" HorizontalAlignment="Center" FontSize="9"></Label>
-            <Button Name="Ok" Grid.Row="4" HorizontalAlignment="Right" Padding="5,1" Margin="5,0" IsCancel="True">Ok</Button>
-            <Label Name="spacer2" Grid.Row="5" Content="" HorizontalAlignment="Center"></Label>
-            <Grid Grid.Row="6" Name="Credits">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-            </Grid>
-        </Grid>
-    </Grid>
-</Window>
\ No newline at end of file
diff --git a/Rapid Reporter/Forms/AboutDlg.xaml.cs b/Rapid Reporter/Forms/AboutDlg.xaml.cs
deleted file mode 100644
index 5766e35..0000000
--- a/Rapid Reporter/Forms/AboutDlg.xaml.cs	
+++ /dev/null
@@ -1,40 +0,0 @@
-using System.Diagnostics;
-using System.Windows;
-
-namespace Rapid_Reporter.Forms
-{
-    /// <summary>
-    /// Interaction logic for AboutDlg.xaml
-    /// The dialog shows basic information about the application, as well as an expandable credits pane.
-    /// Two buttons are provided: A help button that shows the help dialog, and an Ok button to close the dialog.
-    /// </summary>
-    public partial class AboutDlg
-    {
-        // Constructor
-        //  We set the application name, version, and dialog title.
-        public AboutDlg()
-        {
-            Logger.Record("[AboutDlg]: Starting About Dialog. Initializing component.", "AboutDlg", "info");
-            InitializeComponent();
-            Title = System.Windows.Forms.Application.ProductName + " - Help";
-            appName.Content = System.Windows.Forms.Application.ProductName;
-            appVers.Content = System.Windows.Forms.Application.ProductVersion;
-            Logger.Record("[AboutDlg]: Window Ready, setting focus.", "AboutDlg", "info");
-            Ok.Focus();
-        }
-        private void Window_Loaded(object sender, RoutedEventArgs e)
-        {
-            Logger.Record("[Window_Loaded]: loading dialog....", "AboutDlg", "info");
-            Ok.Focus();
-        }
-
-        // There's a link line in the dialog pointing to the Rapid Reporter page: http://testing.gershon.info/reporter/
-        private void Hyperlink_RequestNavigate(object sender, System.Windows.Navigation.RequestNavigateEventArgs e)
-        {
-            Logger.Record("[RequestNavigate]: Link Pressed:" + e.Uri.AbsoluteUri, "AboutDlg", "info");
-            Process.Start(new ProcessStartInfo(e.Uri.AbsoluteUri));
-            Logger.Record("[RequestNavigate]: started browser process", "AboutDlg", "info");
-            e.Handled = true; // Can dismiss the event now that we dealt with it
-        }
-    }
-}
diff --git a/Rapid Reporter/Forms/AboutForm.Designer.cs b/Rapid Reporter/Forms/AboutForm.Designer.cs
new file mode 100644
index 0000000..615595e
--- /dev/null
+++ b/Rapid Reporter/Forms/AboutForm.Designer.cs	
@@ -0,0 +1,112 @@
+namespace Rapid_Reporter.Forms
+{
+    partial class AboutForm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AboutForm));
+            this.appName = new System.Windows.Forms.Label();
+            this.appVer = new System.Windows.Forms.Label();
+            this.label1 = new System.Windows.Forms.Label();
+            this.btnClose = new System.Windows.Forms.Button();
+            this.SuspendLayout();
+            // 
+            // appName
+            // 
+            this.appName.AutoSize = true;
+            this.appName.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.appName.Location = new System.Drawing.Point(12, 9);
+            this.appName.Name = "appName";
+            this.appName.Size = new System.Drawing.Size(96, 13);
+            this.appName.TabIndex = 0;
+            this.appName.Text = "App Name Here";
+            // 
+            // appVer
+            // 
+            this.appVer.AutoSize = true;
+            this.appVer.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.appVer.Location = new System.Drawing.Point(311, 9);
+            this.appVer.Name = "appVer";
+            this.appVer.Size = new System.Drawing.Size(96, 13);
+            this.appVer.TabIndex = 1;
+            this.appVer.Text = "App Name Here";
+            this.appVer.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            // 
+            // label1
+            // 
+            this.label1.Location = new System.Drawing.Point(12, 34);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(395, 228);
+            this.label1.TabIndex = 2;
+            this.label1.Text = resources.GetString("label1.Text");
+            this.label1.TextAlign = System.Drawing.ContentAlignment.TopCenter;
+            // 
+            // btnClose
+            // 
+            this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.btnClose.Location = new System.Drawing.Point(332, 265);
+            this.btnClose.Name = "btnClose";
+            this.btnClose.Size = new System.Drawing.Size(75, 23);
+            this.btnClose.TabIndex = 3;
+            this.btnClose.Text = "&Close";
+            this.btnClose.UseVisualStyleBackColor = true;
+            this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
+            // 
+            // AboutForm
+            // 
+            this.AcceptButton = this.btnClose;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.btnClose;
+            this.ClientSize = new System.Drawing.Size(419, 297);
+            this.ControlBox = false;
+            this.Controls.Add(this.btnClose);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.appVer);
+            this.Controls.Add(this.appName);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "AboutForm";
+            this.ShowIcon = false;
+            this.ShowInTaskbar = false;
+            this.Text = "About RR++";
+            this.TopMost = true;
+            this.Load += new System.EventHandler(this.AboutForm_Load);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Label appName;
+        private System.Windows.Forms.Label appVer;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Button btnClose;
+    }
+}
\ No newline at end of file
diff --git a/Rapid Reporter/Forms/AboutForm.cs b/Rapid Reporter/Forms/AboutForm.cs
new file mode 100644
index 0000000..c0f76b9
--- /dev/null
+++ b/Rapid Reporter/Forms/AboutForm.cs	
@@ -0,0 +1,24 @@
+using System;
+using System.Windows.Forms;
+
+namespace Rapid_Reporter.Forms
+{
+    public partial class AboutForm : Form
+    {
+        public AboutForm()
+        {
+            InitializeComponent();
+        }
+
+        private void AboutForm_Load(object sender, EventArgs e)
+        {
+            appName.Text = Application.ProductName;
+            appVer.Text = Application.ProductVersion;
+        }
+
+        private void btnClose_Click(object sender, EventArgs e)
+        {
+            Close();
+        }
+    }
+}
diff --git a/Rapid Reporter/Forms/AboutForm.resx b/Rapid Reporter/Forms/AboutForm.resx
new file mode 100644
index 0000000..c91eb75
--- /dev/null
+++ b/Rapid Reporter/Forms/AboutForm.resx	
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <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=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="label1.Text" xml:space="preserve">
+    <value>This software is a fork of the application "Rapid Reporter", originally published by Shmuel Gershon at http://testing.gershon.info/reporter/, and was listed as Copyright 2010+. The original application listed in it's readme document that "The application is released in a Creative Commons license BY-NC-SA.", which can be found here: http://creativecommons.org/licenses/by-nc-sa/4.0/.
+
+Many changes have been made, and the source code has almost completely been rewritten. Because of these changes, no warranty is given by the original author of "Rapid Reporter", and no warranty is given by the creators of this fork. The original author has not given any endorsement to this fork. The modifications and additions to this work are published under the CC BY-NC-SA license as well, found here: http://creativecommons.org/licenses/by-nc-sa/4.0/. 
+
+This fork is Copyright 2015+ Timothy Watkins.
+
+Info, new versions and reporting bugs:
+https://github.com/jankcat/rapidreporterplusplus</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rapid Reporter/Forms/SMWidget.xaml b/Rapid Reporter/Forms/SMWidget.xaml
index 94f7dc8..a8ed8a0 100644
--- a/Rapid Reporter/Forms/SMWidget.xaml	
+++ b/Rapid Reporter/Forms/SMWidget.xaml	
@@ -18,7 +18,16 @@
             <MenuItem Name="ColorPicker" Header="Pick Color" Click="ColorPicker_OnClick">
                 <MenuItem.Icon>
                     <Image Source="paintbrush.png" Width="20" Height="20"/></MenuItem.Icon></MenuItem>
-            <MenuItem Name="AboutBox" Header="About..." Click="AboutBox_Click"><MenuItem.Icon><Image Source="RapidReporter.ico" Width="16" /></MenuItem.Icon></MenuItem>
+            <MenuItem Name="UpdateButton" Header="Check For Updates..." Click="UpdateButton_Click">
+                <MenuItem.Icon>
+                    <Image Source="update.png" Width="20" Height="20" />
+                </MenuItem.Icon>
+            </MenuItem>
+            <MenuItem Name="AboutBox" Header="About..." Click="AboutBox_Click">
+                <MenuItem.Icon>
+                    <Image Source="help.png" Width="20" Height="20" />
+                </MenuItem.Icon>
+            </MenuItem>
         </ContextMenu>
     </Window.ContextMenu>
     <Grid Name="MainGrid"  Background="#FF0068FF"> <!-- We want the application to shine in view, tester never has to look for it-->
@@ -28,7 +37,7 @@
             <ColumnDefinition />  <!-- Note taking section -->
             <ColumnDefinition Width="31" /> <!-- Close button -->
         </Grid.ColumnDefinitions>
-        <Slider Grid.Column="0" Margin="5" Name="TransparencySlide" LargeChange="0.5" Maximum="1" Minimum="0.5" Orientation="Vertical" Value="1" TickPlacement="TopLeft" TickFrequency="0.2" ValueChanged="TransparencySlide_ValueChanged" ToolTip="Transparency" />
+        <Slider Grid.Column="0" Margin="5" Name="TransparencySlide" LargeChange="0.5" Maximum="1" Minimum="0.5" Orientation="Vertical" TickPlacement="TopLeft" TickFrequency="0.2" ValueChanged="TransparencySlide_ValueChanged" ToolTip="Transparency" />
         <Button Grid.Column="1" Margin="0,5,0,0" Name="ScreenShot" Click="ScreenShot_Click" ToolTip="Snaps a screenshot. Shift+Click to edit and crop with Paint. Ctrl+Click to capture the full screen." VerticalAlignment="Top" IsEnabled="False" Height="22">
             <Button.BitmapEffect><BevelBitmapEffect BevelWidth="0" /></Button.BitmapEffect>
             <Image Name="ScreenShotIcon" Source="iconshot_dis.png"  Height="16" Width="18"/>
diff --git a/Rapid Reporter/Forms/SMWidget.xaml.cs b/Rapid Reporter/Forms/SMWidget.xaml.cs
index 25b07a2..f9da586 100644
--- a/Rapid Reporter/Forms/SMWidget.xaml.cs	
+++ b/Rapid Reporter/Forms/SMWidget.xaml.cs	
@@ -3,6 +3,7 @@
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.Globalization;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls.Primitives;
 using System.Windows.Forms;
@@ -11,7 +12,11 @@
 using System.Windows.Media.Animation;
 using System.Windows.Media.Effects;
 using System.Windows.Media.Imaging;
+using Application = System.Windows.Forms.Application;
+using Color = System.Windows.Media.Color;
+using ColorConverter = System.Windows.Media.ColorConverter;
 using KeyEventArgs = System.Windows.Input.KeyEventArgs;
+using MenuItem = System.Windows.Controls.MenuItem;
 
 #pragma warning disable 612,618
 
@@ -56,11 +61,15 @@ public partial class SmWidget
         // Default constructor, everything is empty/default values
         public SmWidget()
         {
+            RegUtil.InitReg();
+            var trans = GetTransparencyFromReg();
             Logger.Record("[SMWidget]: App constructor. Initializing.", "SMWidget", "info");
             InitializeComponent();
             SetBgColor(GetBgColorFromReg());
+            TransparencySlide.Value = trans;
             _ptn.InitializeComponent();
             _ptn.Sm = this;
+            Task.Run((Action)Updater.CheckVersion);
             NoteContent.Focus();
             Logger.Record("[SMWidget]: App constructor initialized and CLI executed.", "SMWidget", "info");
         }
@@ -70,7 +79,7 @@ private void SMWidgetForm_Loaded(object sender, RoutedEventArgs e)
         {
             Logger.Record("[SMWidgetForm_Loaded]: Form loading to windows", "SMWidget", "info");
 
-            SMWidgetForm.Title = System.Windows.Forms.Application.ProductName;
+            SMWidgetForm.Title = Application.ProductName;
             SetWorkingDir(_currentSession.WorkingDir);
             StateMove(Session.SessionStartingStage.Tester);
 
@@ -130,8 +139,7 @@ private void ExitApp(bool dontFinishSession = false)
         private void TransparencySlide_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
         {
             Logger.Record("[TransparencySlide_ValueChanged]: Changing transparency to " + e.NewValue, "SMWidget", "config");
-            SMWidgetForm.Opacity = e.NewValue;
-            _ptn.Opacity = Math.Min(e.NewValue+0.2,1);
+            SetTransparency(e.NewValue);
         }
 
         // Application can be moved around the screen, to keep it out of the way
@@ -219,7 +227,7 @@ private void NoteContent_KeyUp(object sender, KeyEventArgs e)
                                     //  - 3) We clear notes and attachments to make place for new ones
                                     /*1*/
                                     _currentSession.UpdateNotes(_currentNoteType, NoteContent.Text.Replace("\"", "''").Replace(",", ";").Trim(), _screenshotName, PlainTextNoteName);
-                                    /*2*/   var item = new System.Windows.Controls.MenuItem {Header = NoteContent.Text};
+                                    /*2*/   var item = new MenuItem {Header = NoteContent.Text};
                                     item.Click += delegate { GetHistory(item.Header.ToString()); };
                                     NoteHistory.Items.Add(item);
                                     NoteHistory.Visibility = Visibility.Visible;
@@ -303,7 +311,7 @@ private void StateMove(Session.SessionStartingStage newStage, bool skipStartSess
         private void AboutBox_Click(object sender, RoutedEventArgs e)
         {
             Logger.Record("[AboutBox_Click]: About box invoked", "SMWidget", "info");
-            var about = new AboutDlg {Owner = this};
+            var about = new AboutForm();
             about.ShowDialog();
         }
 
@@ -428,6 +436,12 @@ private void ScreenShot_Click(object sender, RoutedEventArgs e)
             {
                 imgOut = ss.CaptureScreenShot();
             }
+            if (ss.Canceled)
+            {
+                if (edit || !direct) WindowState = WindowState.Normal;
+                Logger.Record("[ScreenShot_Click]: Cancelled screenshot", "SMWidget", "info");
+                return;
+            }
             AddScreenshot2Note(imgOut);                                 
             Logger.Record("[ScreenShot_Click]: Captured " + _screenshotName + ", edit: " + edit, "SMWidget", "info");
             if (edit)                                                                   
@@ -585,7 +599,7 @@ private void ResetSession()
             _currentStage = Session.SessionStartingStage.Tester;
             _recurrenceTimer = new Timer();
             _currentSession = new Session();    // The session managing class
-            SMWidgetForm.Title = System.Windows.Forms.Application.ProductName;
+            SMWidgetForm.Title = Application.ProductName;
             SetWorkingDir(_currentSession.WorkingDir);
             _recurrenceTimer.Tick += TimerEventProcessor; // this is the function called everytime the timer expires
             _recurrenceTimer.Interval = 90 * 1000; // 30 times 1 second (1000 milliseconds)
@@ -617,24 +631,40 @@ private void ColorPicker_OnClick(object sender, RoutedEventArgs e)
             var r = colorDialog.Color.R;
             var g = colorDialog.Color.G;
             var b = colorDialog.Color.B;
-            SetBgColor(System.Windows.Media.Color.FromArgb(colorDialog.Color.A, r, g, b));
+            SetBgColor(Color.FromArgb(colorDialog.Color.A, r, g, b));
         }
 
-        private void SetBgColor(System.Windows.Media.Color color)
+        private void SetBgColor(Color color)
         {
             RegUtil.CreateRegKey("BgColor", color.ToString());
             MainGrid.Background = new SolidColorBrush(color);
         }
 
-        private static System.Windows.Media.Color GetBgColorFromReg()
+        private static Color GetBgColorFromReg()
         {
             var str = RegUtil.ReadRegKey("BgColor");
             if (string.IsNullOrWhiteSpace(str))
-                return System.Windows.Media.Color.FromArgb(byte.MaxValue, (byte)0, (byte)104, byte.MaxValue);
-            var obj = System.Windows.Media.ColorConverter.ConvertFromString(str);
+                return Color.FromArgb(byte.MaxValue, 0, 104, byte.MaxValue);
+            var obj = ColorConverter.ConvertFromString(str);
             if (obj != null)
-                return (System.Windows.Media.Color)obj;
-            return System.Windows.Media.Color.FromArgb(byte.MaxValue, (byte)0, (byte)104, byte.MaxValue);
+                return (Color)obj;
+            return Color.FromArgb(byte.MaxValue, 0, 104, byte.MaxValue);
+        }
+
+        private void SetTransparency(Double transparency)
+        {
+            RegUtil.CreateRegKey("Transparency", transparency.ToString(CultureInfo.InvariantCulture));
+            SMWidgetForm.Opacity = transparency;
+            _ptn.Opacity = Math.Min(transparency + 0.2, 1);
+        }
+
+        private static double GetTransparencyFromReg()
+        {
+            var str = RegUtil.ReadRegKey("Transparency");
+            if (string.IsNullOrWhiteSpace(str))
+                return 1.0;
+            double trans;
+            return Double.TryParse(str, out trans) ? trans : 1.0;
         }
 
         private void ResumeSession_Click(object sender, RoutedEventArgs e)
@@ -642,15 +672,22 @@ private void ResumeSession_Click(object sender, RoutedEventArgs e)
             ResetSession();
             if (!_currentSession.ResumeSession()) return;
             StateMove(Session.SessionStartingStage.Notes, true);
-            _currentSession.UpdateNotes("Note", "[RR++]: Resuming Session...");
+            _currentSession.UpdateNotes("Note", "Resuming Session...");
             NoteContent.Focus();
         }
 
         private void PauseSession_Click(object sender, RoutedEventArgs e)
         {
             Logger.Record("[PauseSession_Click]: Pausing Session...", "SMWidget", "info");
-            _currentSession.UpdateNotes("Note", "[RR++]: Pausing Session...");
+            _currentSession.UpdateNotes("Note", "Pausing Session...");
             ExitApp(true);
         }
+
+        private void UpdateButton_Click(object sender, RoutedEventArgs e)
+        {
+            Updater.ManualCheckVersion();
+        }
+
+        
     }
 }
diff --git a/Rapid Reporter/Forms/SnippetForm.Designer.cs b/Rapid Reporter/Forms/SnippetForm.Designer.cs
index c780017..267120d 100644
--- a/Rapid Reporter/Forms/SnippetForm.Designer.cs	
+++ b/Rapid Reporter/Forms/SnippetForm.Designer.cs	
@@ -52,10 +52,13 @@ private void InitializeComponent()
             this.ClientSize = new System.Drawing.Size(284, 262);
             this.Controls.Add(this.pictureBox1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.KeyPreview = true;
             this.Name = "SnippetForm";
             this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
             this.Text = "SnippetForm";
+            this.TopMost = true;
             this.Load += new System.EventHandler(this.SnippetForm_Load);
+            this.Shown += new System.EventHandler(this.SnippetForm_Shown);
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             this.ResumeLayout(false);
 
diff --git a/Rapid Reporter/Forms/SnippetForm.cs b/Rapid Reporter/Forms/SnippetForm.cs
index b4f36fb..7d862b3 100644
--- a/Rapid Reporter/Forms/SnippetForm.cs	
+++ b/Rapid Reporter/Forms/SnippetForm.cs	
@@ -21,6 +21,8 @@ public partial class SnippetForm : Form
         public Pen SelectPen;
         bool _start;
 
+        public bool Cancelled;
+
         public SnippetForm()
         {
             InitializeComponent();
@@ -45,7 +47,6 @@ private void SnippetForm_Load(object sender, EventArgs e)
                 pictureBox1.Image = Image.FromStream(s);
             }
             Cursor = Cursors.Cross;
-            TopMost = true;
             BringToFront();
             Focus();
         }
@@ -101,5 +102,24 @@ private void SaveSnippet()
             g.DrawImage(originalImage, 0, 0, rect, GraphicsUnit.Pixel);
             Snippet = img;
         }
+
+        protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
+        {
+            if (keyData != Keys.Escape)
+                return base.ProcessCmdKey(ref msg, keyData);
+            Cancel();
+            return true;
+        }
+
+        internal void Cancel()
+        {
+            Cancelled = true;
+            CloseForm();
+        }
+
+        private void SnippetForm_Shown(object sender, EventArgs e)
+        {
+            Activate();
+        }
     }
 }
diff --git a/Rapid Reporter/Forms/UpdateChosen.cs b/Rapid Reporter/Forms/UpdateChosen.cs
new file mode 100644
index 0000000..21b22a7
--- /dev/null
+++ b/Rapid Reporter/Forms/UpdateChosen.cs	
@@ -0,0 +1,9 @@
+namespace Rapid_Reporter.Forms
+{
+    public enum UpdateChosen
+    {
+        Update,
+        Skip,
+        Later
+    }
+}
\ No newline at end of file
diff --git a/Rapid Reporter/Forms/UpdateForm.Designer.cs b/Rapid Reporter/Forms/UpdateForm.Designer.cs
new file mode 100644
index 0000000..490b5c5
--- /dev/null
+++ b/Rapid Reporter/Forms/UpdateForm.Designer.cs	
@@ -0,0 +1,155 @@
+namespace Rapid_Reporter.Forms
+{
+    partial class UpdateForm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.label1 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.myver = new System.Windows.Forms.Label();
+            this.serverver = new System.Windows.Forms.Label();
+            this.label5 = new System.Windows.Forms.Label();
+            this.btnUpdate = new System.Windows.Forms.Button();
+            this.btnCancel = new System.Windows.Forms.Button();
+            this.btnIgnore = new System.Windows.Forms.Button();
+            this.SuspendLayout();
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(12, 9);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(118, 13);
+            this.label1.TabIndex = 0;
+            this.label1.Text = "Your current version is: ";
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(12, 25);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(137, 13);
+            this.label2.TabIndex = 1;
+            this.label2.Text = "The most recent version is: ";
+            // 
+            // myver
+            // 
+            this.myver.AutoSize = true;
+            this.myver.Location = new System.Drawing.Point(136, 9);
+            this.myver.Name = "myver";
+            this.myver.Size = new System.Drawing.Size(16, 13);
+            this.myver.TabIndex = 2;
+            this.myver.Text = "...";
+            // 
+            // serverver
+            // 
+            this.serverver.AutoSize = true;
+            this.serverver.Location = new System.Drawing.Point(155, 25);
+            this.serverver.Name = "serverver";
+            this.serverver.Size = new System.Drawing.Size(16, 13);
+            this.serverver.TabIndex = 3;
+            this.serverver.Text = "...";
+            // 
+            // label5
+            // 
+            this.label5.Location = new System.Drawing.Point(12, 41);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(313, 29);
+            this.label5.TabIndex = 4;
+            this.label5.Text = "Visit https://github.com/jankcat/rapidreporterplusplus/releases to download the l" +
+    "atest version!\r\n";
+            // 
+            // btnUpdate
+            // 
+            this.btnUpdate.Location = new System.Drawing.Point(84, 76);
+            this.btnUpdate.Name = "btnUpdate";
+            this.btnUpdate.Size = new System.Drawing.Size(159, 23);
+            this.btnUpdate.TabIndex = 5;
+            this.btnUpdate.Text = "Show Me The Update Site!";
+            this.btnUpdate.UseVisualStyleBackColor = true;
+            this.btnUpdate.Click += new System.EventHandler(this.btnUpdate_Click);
+            // 
+            // btnCancel
+            // 
+            this.btnCancel.Location = new System.Drawing.Point(84, 105);
+            this.btnCancel.Name = "btnCancel";
+            this.btnCancel.Size = new System.Drawing.Size(159, 23);
+            this.btnCancel.TabIndex = 6;
+            this.btnCancel.Text = "Remind Me Later!";
+            this.btnCancel.UseVisualStyleBackColor = true;
+            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+            // 
+            // btnIgnore
+            // 
+            this.btnIgnore.Location = new System.Drawing.Point(84, 134);
+            this.btnIgnore.Name = "btnIgnore";
+            this.btnIgnore.Size = new System.Drawing.Size(159, 23);
+            this.btnIgnore.TabIndex = 7;
+            this.btnIgnore.Text = "Ingore This Version!";
+            this.btnIgnore.UseVisualStyleBackColor = true;
+            this.btnIgnore.Click += new System.EventHandler(this.btnIgnore_Click);
+            // 
+            // UpdateForm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(335, 171);
+            this.ControlBox = false;
+            this.Controls.Add(this.btnIgnore);
+            this.Controls.Add(this.btnCancel);
+            this.Controls.Add(this.btnUpdate);
+            this.Controls.Add(this.label5);
+            this.Controls.Add(this.serverver);
+            this.Controls.Add(this.myver);
+            this.Controls.Add(this.label2);
+            this.Controls.Add(this.label1);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "UpdateForm";
+            this.ShowIcon = false;
+            this.ShowInTaskbar = false;
+            this.Text = "Check for Updates...";
+            this.TopMost = true;
+            this.Load += new System.EventHandler(this.UpdateForm_Load);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.Label myver;
+        private System.Windows.Forms.Label serverver;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.Button btnUpdate;
+        private System.Windows.Forms.Button btnCancel;
+        private System.Windows.Forms.Button btnIgnore;
+    }
+}
\ No newline at end of file
diff --git a/Rapid Reporter/Forms/UpdateForm.cs b/Rapid Reporter/Forms/UpdateForm.cs
new file mode 100644
index 0000000..3985934
--- /dev/null
+++ b/Rapid Reporter/Forms/UpdateForm.cs	
@@ -0,0 +1,46 @@
+using System;
+using System.Windows.Forms;
+
+namespace Rapid_Reporter.Forms
+{
+    public partial class UpdateForm : Form
+    {
+        private Version _serverVersion;
+        internal UpdateChosen Choice = UpdateChosen.Later;
+
+        public UpdateForm()
+        {
+            InitializeComponent();
+        }
+
+        private void UpdateForm_Load(object sender, EventArgs e)
+        {
+            serverver.Text = (_serverVersion == null) ? "Cannot retrieve version" : _serverVersion.ToString();
+            myver.Text = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
+        }
+
+        internal void UpdateServerVersion(Version version)
+        {
+            _serverVersion = version;
+            serverver.Text = (_serverVersion == null) ? "Cannot retrieve version" : _serverVersion.ToString();
+        }
+
+        private void btnUpdate_Click(object sender, EventArgs e)
+        {
+            Choice = UpdateChosen.Update;
+            Close();
+        }
+
+        private void btnIgnore_Click(object sender, EventArgs e)
+        {
+            Choice = UpdateChosen.Skip;
+            Close();
+        }
+
+        private void btnCancel_Click(object sender, EventArgs e)
+        {
+            Choice = UpdateChosen.Later;
+            Close();
+        }
+    }
+}
diff --git a/Rapid Reporter/Forms/UpdateForm.resx b/Rapid Reporter/Forms/UpdateForm.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/Rapid Reporter/Forms/UpdateForm.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <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=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Rapid Reporter/Forms/help.png b/Rapid Reporter/Forms/help.png
new file mode 100644
index 0000000..70e982f
Binary files /dev/null and b/Rapid Reporter/Forms/help.png differ
diff --git a/Rapid Reporter/Forms/update.png b/Rapid Reporter/Forms/update.png
new file mode 100644
index 0000000..39cb58b
Binary files /dev/null and b/Rapid Reporter/Forms/update.png differ
diff --git a/Rapid Reporter/HTML/HttpCallUtil.cs b/Rapid Reporter/HTML/HttpCallUtil.cs
new file mode 100644
index 0000000..3b935cc
--- /dev/null
+++ b/Rapid Reporter/HTML/HttpCallUtil.cs	
@@ -0,0 +1,73 @@
+using System;
+using System.IO;
+using System.Net;
+using System.Text;
+
+namespace Rapid_Reporter.HTML
+{
+    internal static class HttpCallUtil
+    {
+        internal const int DefaultTimeout = 300000;
+        internal const string DefaultAcceptType = "text/plain";
+
+        internal static HttpResult HttpGetCall(string url)
+        {
+            var result = new HttpResult();
+
+            try
+            {
+                var httpReq = (HttpWebRequest)WebRequest.Create(url);
+                httpReq.Accept = DefaultAcceptType;
+                httpReq.Method = @"GET";
+                httpReq.Timeout = DefaultTimeout;
+                httpReq.AllowAutoRedirect = false;
+                httpReq.ContentLength = 0;
+
+                var httpResp = (HttpWebResponse)httpReq.GetResponse();
+                result.Status = httpResp.StatusDescription;
+                result.StatusCode = (int)httpResp.StatusCode;
+
+                var responseEncoding = (string.IsNullOrWhiteSpace(httpResp.CharacterSet))
+                                           ? Encoding.Default
+                                           : Encoding.GetEncoding(httpResp.CharacterSet);
+                var respStream = httpResp.GetResponseStream();
+                if (respStream == null) return result;
+                using (var sr = new StreamReader(respStream, responseEncoding))
+                {
+                    result.Message = sr.ReadToEnd();
+                }
+            }
+            catch (WebException e)
+            {
+                switch (e.Status)
+                {
+                    case WebExceptionStatus.Timeout:
+                    case WebExceptionStatus.SecureChannelFailure:
+                    case WebExceptionStatus.ConnectFailure:
+                        result.Status = e.Status.ToString();
+                        result.Message = e.Message;
+                        return result;
+                }
+
+                try
+                {
+                    result.Status = ((HttpWebResponse) e.Response).StatusDescription;
+                    result.StatusCode = (int) ((HttpWebResponse) e.Response).StatusCode;
+                    result.Message = e.Message;
+                }
+                catch
+                {
+                    result.Status = e.Status.ToString();
+                    result.Message = e.Message;
+                }
+            }
+            catch (Exception e)
+            {
+                result.Message = e.Message;
+            }
+            return result;
+        }
+    }
+
+
+}
diff --git a/Rapid Reporter/HTML/HttpResult.cs b/Rapid Reporter/HTML/HttpResult.cs
new file mode 100644
index 0000000..f0a616f
--- /dev/null
+++ b/Rapid Reporter/HTML/HttpResult.cs	
@@ -0,0 +1,17 @@
+namespace Rapid_Reporter.HTML
+{
+    class HttpResult
+    {
+        // Response
+        public int StatusCode { get; internal set; }
+        public string Status { get; internal set; }
+        public string Message { get; internal set; }
+
+        public HttpResult()
+        {
+            Status = "";
+            StatusCode = 0;
+            Message = "";
+        }
+    }
+}
diff --git a/Rapid Reporter/Properties/AssemblyInfo.cs b/Rapid Reporter/Properties/AssemblyInfo.cs
index 9e57b22..2b6177b 100644
--- a/Rapid Reporter/Properties/AssemblyInfo.cs	
+++ b/Rapid Reporter/Properties/AssemblyInfo.cs	
@@ -50,7 +50,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.4.0.0")]
-[assembly: AssemblyFileVersion("2.4.0.0")]
+[assembly: AssemblyVersion("2.5.0.0")]
+[assembly: AssemblyFileVersion("2.5.0.0")]
 [assembly: GuidAttribute("7AEB6D97-FCA8-4197-8DBD-0017E3B00468")]
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
diff --git a/Rapid Reporter/Rapid Reporter.csproj b/Rapid Reporter/Rapid Reporter.csproj
index 035ed5e..38cd6db 100644
--- a/Rapid Reporter/Rapid Reporter.csproj	
+++ b/Rapid Reporter/Rapid Reporter.csproj	
@@ -80,6 +80,7 @@
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
+    <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Web" />
     <Reference Include="System.Windows.Forms" />
@@ -88,8 +89,11 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Forms\AboutDlg.xaml.cs">
-      <DependentUpon>AboutDlg.xaml</DependentUpon>
+    <Compile Include="Forms\AboutForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\AboutForm.Designer.cs">
+      <DependentUpon>AboutForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Forms\PlainTextNote.xaml.cs">
       <DependentUpon>PlainTextNote.xaml</DependentUpon>
@@ -107,10 +111,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </ApplicationDefinition>
-    <Page Include="Forms\AboutDlg.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
+    <Compile Include="Updater.cs" />
     <Page Include="Forms\PlainTextNote.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -123,8 +124,17 @@
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Forms\UpdateChosen.cs" />
+    <Compile Include="Forms\UpdateForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\UpdateForm.Designer.cs">
+      <DependentUpon>UpdateForm.cs</DependentUpon>
+    </Compile>
     <Compile Include="HTML\HTMLEmbedder.cs" />
     <Compile Include="HTML\Htmlstrings.cs" />
+    <Compile Include="HTML\HttpCallUtil.cs" />
+    <Compile Include="HTML\HttpResult.cs" />
     <Compile Include="KeyboardHook.cs" />
     <Compile Include="RegUtil.cs" />
     <Compile Include="ScreenShot.cs" />
@@ -145,9 +155,15 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <EmbeddedResource Include="Forms\AboutForm.resx">
+      <DependentUpon>AboutForm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Forms\SnippetForm.resx">
       <DependentUpon>SnippetForm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Forms\UpdateForm.resx">
+      <DependentUpon>UpdateForm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -219,22 +235,22 @@
   <ItemGroup>
     <PublishFile Include="RapidReporter++.exe.config">
       <Visible>False</Visible>
-      <PublishState>Auto</PublishState>
-      <IncludeHash>False</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Auto</PublishState>
+      <IncludeHash>False</IncludeHash>
       <FileType>File</FileType>
     </PublishFile>
     <PublishFile Include="RapidReporter++.exe.manifest">
       <Visible>False</Visible>
-      <PublishState>Auto</PublishState>
-      <IncludeHash>False</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Auto</PublishState>
+      <IncludeHash>False</IncludeHash>
       <FileType>ManifestEntryPoint</FileType>
     </PublishFile>
   </ItemGroup>
@@ -259,6 +275,12 @@
   <ItemGroup>
     <Resource Include="Forms\play.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Forms\update.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Forms\help.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>
diff --git a/Rapid Reporter/RegUtil.cs b/Rapid Reporter/RegUtil.cs
index dcf8453..93a0f1e 100644
--- a/Rapid Reporter/RegUtil.cs	
+++ b/Rapid Reporter/RegUtil.cs	
@@ -6,6 +6,11 @@ internal static class RegUtil
     {
         internal const string RegBgColor = "BgColor";
 
+        internal static void InitReg()
+        {
+            Registry.CurrentUser.CreateSubKey("Software").CreateSubKey("RapidReporterPP");
+        }
+
         internal static void CreateRegKey(string name, string value)
         {
             var subKey = Registry.CurrentUser.CreateSubKey("Software").CreateSubKey("RapidReporterPP");
@@ -21,9 +26,16 @@ internal static string ReadRegKey(string name)
             RegistryKey registryKey = Registry.CurrentUser.OpenSubKey("Software").OpenSubKey("RapidReporterPP");
             if (registryKey == null)
                 return "";
-            var str = registryKey.GetValue(name).ToString();
-            registryKey.Close();
-            return str;
+            try
+            {
+                var str = registryKey.GetValue(name).ToString();
+                registryKey.Close();
+                return str;
+            }
+            catch
+            {
+                return null;
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/Rapid Reporter/ScreenShot.cs b/Rapid Reporter/ScreenShot.cs
index dbeb697..5613f64 100644
--- a/Rapid Reporter/ScreenShot.cs	
+++ b/Rapid Reporter/ScreenShot.cs	
@@ -33,6 +33,8 @@ class ScreenShot
         [DllImport("user32.dll")]
         public static extern IntPtr GetWindowDC(IntPtr ptr);
 
+        public bool Canceled;
+
         public Bitmap CaptureSnippet()
         {
             int minX = 0, minY = 0, maxX = 0, maxY = 0;
@@ -56,7 +58,7 @@ public Bitmap CaptureSnippet()
                     ScreenStartImage = CaptureScreenShot()
                 };
             snipForm.ShowDialog();
-
+            if (snipForm.Cancelled || snipForm.Snippet == null) Canceled = true;
             return snipForm.Snippet ?? new Bitmap(1, 1);
         }
 
@@ -114,5 +116,7 @@ public Bitmap CaptureScreenShot()
             Logger.Record("[CaptureScreenshot]: BMP object ready, returning it to calling function", "ScreenShot", "info");
             return (bmp);
         }
+
+        
     }
 }
\ No newline at end of file
diff --git a/Rapid Reporter/Updater.cs b/Rapid Reporter/Updater.cs
new file mode 100644
index 0000000..c985bab
--- /dev/null
+++ b/Rapid Reporter/Updater.cs	
@@ -0,0 +1,104 @@
+using System;
+using System.Reflection;
+using System.Windows;
+using Rapid_Reporter.Forms;
+using Rapid_Reporter.HTML;
+
+namespace Rapid_Reporter
+{
+    internal static class Updater
+    {
+        internal static void ManualCheckVersion()
+        {
+            var parsedVersion = GetServerVersion();
+            if (parsedVersion == null)
+            {
+                SetAllowedToCheckValue(new Version(0, 0, 0, 0));
+                MessageBox.Show("Unable to retrieve latest version number from GitHub.");
+                return;
+            }
+            if (UpToDateWithLatest(parsedVersion))
+            {
+                SetAllowedToCheckValue(new Version(0, 0, 0, 0));
+                MessageBox.Show("You are currently up to date!\r\nWe will let you know if a new version comes down the pipeline.");
+                return;
+            }
+            ShowUpdateDlg(parsedVersion);
+        }
+
+        private static void ShowUpdateDlg(Version parsedVersion)
+        {
+            var updateDlg = new UpdateForm();
+            updateDlg.UpdateServerVersion(parsedVersion);
+            updateDlg.ShowDialog();
+            switch (updateDlg.Choice)
+            {
+                case UpdateChosen.Update:
+                    SetAllowedToCheckValue(new Version(0, 0, 0, 0));
+                    System.Diagnostics.Process.Start("https://github.com/jankcat/rapidreporterplusplus/releases");
+                    return;
+                case UpdateChosen.Skip:
+                    SetAllowedToCheckValue(parsedVersion);
+                    return;
+                case UpdateChosen.Later:
+                    SetAllowedToCheckValue(new Version(0, 0, 0, 0));
+                    return;
+            }
+        }
+
+        internal static void CheckVersion()
+        {
+            var parsedVersion = GetServerVersion();
+            if (parsedVersion == null) return;
+            if (UpToDateWithLatest(parsedVersion)) return;
+            if (!AllowedToCheckForUpdates(parsedVersion)) return;
+            ShowUpdateDlg(parsedVersion);
+        }
+
+        private static bool AllowedToCheckForUpdates(Version serverVersion)
+        {
+            var str = RegUtil.ReadRegKey("UpdateToSkip");
+            if (string.IsNullOrWhiteSpace(str))
+                return true;
+            Version regver;
+            try
+            {
+                regver = new Version(str);
+            }
+            catch
+            {
+                return true;
+            }
+            return regver != serverVersion;
+        }
+
+        private static void SetAllowedToCheckValue(Version updateToSkip)
+        {
+            RegUtil.CreateRegKey("UpdateToSkip", updateToSkip.ToString());
+        }
+
+        private static bool UpToDateWithLatest(Version latest)
+        {
+            var appVersion = Assembly.GetExecutingAssembly().GetName().Version;
+            return appVersion >= latest;
+        }
+
+        private static Version GetServerVersion()
+        {
+            var verCall = HttpCallUtil.HttpGetCall(@"https://raw.githubusercontent.com/jankcat/rapidreporterplusplus/development/currentVersion.txt"); //development
+            //var verCall = HttpCallUtil.HttpGetCall(@"https://raw.githubusercontent.com/jankcat/rapidreporterplusplus/master/currentVersion.txt"); //master
+            if (string.IsNullOrWhiteSpace(verCall.Message)) return null;
+            var ver = verCall.Message.Split(Convert.ToChar("."));
+            if (ver.Length != 4) return null;
+            try
+            {
+                var parsedVersion = new Version(verCall.Message);
+                return parsedVersion;
+            }
+            catch
+            {
+                return null;
+            }
+        }
+    }
+}
diff --git a/RapidReporter++.exe b/RapidReporter++.exe
deleted file mode 100644
index 6f26ec3..0000000
Binary files a/RapidReporter++.exe and /dev/null differ
diff --git a/Readme.docx b/Readme.docx
index 843c19d..5a6735c 100644
Binary files a/Readme.docx and b/Readme.docx differ
diff --git a/currentVersion.txt b/currentVersion.txt
new file mode 100644
index 0000000..a86b05f
--- /dev/null
+++ b/currentVersion.txt
@@ -0,0 +1 @@
+2.5.0.0
\ No newline at end of file