diff --git a/APKInstaller/APKInstaller.vbproj b/APKInstaller/APKInstaller.vbproj
index 7a7da5e..ff556d3 100644
--- a/APKInstaller/APKInstaller.vbproj
+++ b/APKInstaller/APKInstaller.vbproj
@@ -37,7 +37,6 @@
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <RunOctoPack>true</RunOctoPack>
-    <DontImportPostSharp>True</DontImportPostSharp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -134,21 +133,13 @@
       <HintPath>..\packages\squirrel.windows.1.4.4\lib\Net45\NuGet.Squirrel.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="PostSharp, Version=4.2.29.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
-      <HintPath>..\packages\PostSharp.4.2.29\lib\net35-client\PostSharp.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="PostSharp.Patterns.Diagnostics, Version=4.2.29.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
-      <HintPath>..\packages\PostSharp.Patterns.Diagnostics.4.2.29\lib\net40\PostSharp.Patterns.Diagnostics.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Squirrel, Version=1.4.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\squirrel.windows.1.4.4\lib\Net45\Squirrel.dll</HintPath>
-      <Private>True</Private>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\NET\Apps\squirrel.windows\src\Squirrel\bin\Debug\Squirrel.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -306,16 +297,22 @@
       <DefaultIcon>ic_android_black_24px.ico</DefaultIcon>
     </FileAssociation>
   </ItemGroup>
+  <ItemGroup>
+    <COMReference Include="IWshRuntimeLibrary">
+      <Guid>{F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}</Guid>
+      <VersionMajor>1</VersionMajor>
+      <VersionMinor>0</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>tlbimp</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </COMReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-  <Import Project="..\packages\OctoPack.3.0.71\tools\OctoPack.targets" Condition="Exists('..\packages\OctoPack.3.0.71\tools\OctoPack.targets')" />
+  <Import Project="..\packages\OctoPack.3.4.2\tools\OctoPack.targets" Condition="Exists('..\packages\OctoPack.3.4.2\tools\OctoPack.targets')" />
   <Target Name="EnsureOctoPackImported" BeforeTargets="BeforeBuild" Condition="'$(OctoPackImported)' == ''">
-    <Error Condition="!Exists('..\packages\OctoPack.3.0.71\tools\OctoPack.targets') And ('$(RunOctoPack)' != '' And $(RunOctoPack))" Text="You are trying to build with OctoPack, but the NuGet targets file that OctoPack depends on is not available on this computer. This is probably because the OctoPack package has not been committed to source control, or NuGet Package Restore is not enabled. Please enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
-    <Error Condition="Exists('..\packages\OctoPack.3.0.71\tools\OctoPack.targets') And ('$(RunOctoPack)' != '' And $(RunOctoPack))" Text="OctoPack cannot be run because NuGet packages were restored prior to the build running, and the targets file was unavailable when the build started. Please build the project again to include these packages in the build. You may also need to make sure that your build server does not delete packages prior to each build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
-  </Target>
-  <Import Project="..\packages\PostSharp.4.2.29\tools\PostSharp.targets" Condition="Exists('..\packages\PostSharp.4.2.29\tools\PostSharp.targets')" />
-  <Target Name="EnsurePostSharpImported" BeforeTargets="BeforeBuild" Condition="'$(PostSharp30Imported)' == ''">
-    <Error Condition="!Exists('..\packages\PostSharp.4.2.29\tools\PostSharp.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://www.postsharp.net/links/nuget-restore." />
-    <Error Condition="Exists('..\packages\PostSharp.4.2.29\tools\PostSharp.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://www.postsharp.net/links/nuget-restore." />
+    <Error Condition="!Exists('..\packages\OctoPack.3.4.2\tools\OctoPack.targets') And ('$(RunOctoPack)' != '' And $(RunOctoPack))" Text="You are trying to build with OctoPack, but the NuGet targets file that OctoPack depends on is not available on this computer. This is probably because the OctoPack package has not been committed to source control, or NuGet Package Restore is not enabled. Please enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
+    <Error Condition="Exists('..\packages\OctoPack.3.4.2\tools\OctoPack.targets') And ('$(RunOctoPack)' != '' And $(RunOctoPack))" Text="OctoPack cannot be run because NuGet packages were restored prior to the build running, and the targets file was unavailable when the build started. Please build the project again to include these packages in the build. You may also need to make sure that your build server does not delete packages prior to each build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/APKInstaller/ApkInstaller.psproj b/APKInstaller/ApkInstaller.psproj
index 4109644..45603a8 100644
--- a/APKInstaller/ApkInstaller.psproj
+++ b/APKInstaller/ApkInstaller.psproj
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.postsharp.org/1.0/configuration">
   <Property Name="LoggingBackend" Value="Trace" />
-  <Using File="..\packages\PostSharp.Patterns.Diagnostics.4.2.29\tools\PostSharp.Patterns.Diagnostics.Weaver.dll" />
 </Project>
\ No newline at end of file
diff --git a/APKInstaller/App.config b/APKInstaller/App.config
index 794c7b5..52abe72 100644
--- a/APKInstaller/App.config
+++ b/APKInstaller/App.config
@@ -16,6 +16,9 @@
             <setting name="prerelease" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="enableUpdates" serializeAs="String">
+                <value>True</value>
+            </setting>
         </APKInstaller.My.MySettings>
     </userSettings>
 </configuration>
diff --git a/APKInstaller/My Project/AssemblyInfo.vb b/APKInstaller/My Project/AssemblyInfo.vb
index 9136155..d3637d9 100644
--- a/APKInstaller/My Project/AssemblyInfo.vb	
+++ b/APKInstaller/My Project/AssemblyInfo.vb	
@@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("0.1.7.1")>
-<Assembly: AssemblyFileVersion("0.1.7.1")>
+<Assembly: AssemblyVersion("0.1.7.3")>
+<Assembly: AssemblyFileVersion("0.1.7.3")>
 <Assembly: NeutralResourcesLanguage("en-US")>
 <Assembly: AssemblyMetadata("SquirrelAwareVersion", "1")>
diff --git a/APKInstaller/My Project/Settings.Designer.vb b/APKInstaller/My Project/Settings.Designer.vb
index 5b07a4d..6007932 100644
--- a/APKInstaller/My Project/Settings.Designer.vb	
+++ b/APKInstaller/My Project/Settings.Designer.vb	
@@ -11,21 +11,16 @@
 Option Strict On
 Option Explicit On
 
-Imports System.CodeDom.Compiler
-Imports System.ComponentModel
-Imports System.ComponentModel.Design
-Imports System.Configuration
-Imports System.Runtime.CompilerServices
 
 Namespace My
     
-    <CompilerGenerated(),  _
-     GeneratedCode("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0"),  _
-     EditorBrowsable(EditorBrowsableState.Advanced)>  _
+    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0"),  _
+     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
-        Inherits ApplicationSettingsBase
+        Inherits Global.System.Configuration.ApplicationSettingsBase
         
-        Private Shared defaultInstance As MySettings = CType(Synchronized(New MySettings()),MySettings)
+        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
         
 #Region "My.Settings Auto-Save Functionality"
 #If _MyType = "WindowsForms" Then
@@ -33,10 +28,10 @@ Namespace My
 
     Private Shared addedHandlerLockObject As New Object
 
-    <DebuggerNonUserCode(), EditorBrowsable(EditorBrowsableState.Advanced)> _
-    Private Shared Sub AutoSaveSettings(ByVal sender As Object, ByVal e As EventArgs)
-        If Application.SaveMySettingsOnExit Then
-            Settings.Save()
+    <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
+    Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs)
+        If My.Application.SaveMySettingsOnExit Then
+            My.Settings.Save()
         End If
     End Sub
 #End If
@@ -49,7 +44,7 @@ Namespace My
                If Not addedHandler Then
                     SyncLock addedHandlerLockObject
                         If Not addedHandler Then
-                            AddHandler Application.Shutdown, AddressOf AutoSaveSettings
+                            AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings
                             addedHandler = True
                         End If
                     End SyncLock
@@ -59,9 +54,9 @@ Namespace My
             End Get
         End Property
         
-        <UserScopedSetting(),  _
-         DebuggerNonUserCode(),  _
-         DefaultSettingValue("False")>  _
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("False")>  _
         Public Property noPromptSingleDevice() As Boolean
             Get
                 Return CType(Me("noPromptSingleDevice"),Boolean)
@@ -71,9 +66,9 @@ Namespace My
             End Set
         End Property
         
-        <UserScopedSetting(),  _
-         DebuggerNonUserCode(),  _
-         DefaultSettingValue("False")>  _
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("False")>  _
         Public Property prerelease() As Boolean
             Get
                 Return CType(Me("prerelease"),Boolean)
@@ -82,20 +77,32 @@ Namespace My
                 Me("prerelease") = value
             End Set
         End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("True")>  _
+        Public Property enableUpdates() As Boolean
+            Get
+                Return CType(Me("enableUpdates"),Boolean)
+            End Get
+            Set
+                Me("enableUpdates") = value
+            End Set
+        End Property
     End Class
 End Namespace
 
 Namespace My
     
-    <HideModuleName(),  _
-     DebuggerNonUserCode(),  _
-     CompilerGenerated()>  _
+    <Global.Microsoft.VisualBasic.HideModuleNameAttribute(),  _
+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
     Friend Module MySettingsProperty
         
-        <HelpKeyword("My.Settings")>  _
-        Friend ReadOnly Property Settings() As MySettings
+        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
+        Friend ReadOnly Property Settings() As Global.APKInstaller.My.MySettings
             Get
-                Return MySettings.Default
+                Return Global.APKInstaller.My.MySettings.Default
             End Get
         End Property
     End Module
diff --git a/APKInstaller/My Project/Settings.settings b/APKInstaller/My Project/Settings.settings
index 7e7cebe..d44e9bd 100644
--- a/APKInstaller/My Project/Settings.settings	
+++ b/APKInstaller/My Project/Settings.settings	
@@ -8,5 +8,8 @@
     <Setting Name="prerelease" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="enableUpdates" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/APKInstaller/packages.config b/APKInstaller/packages.config
index a2f53bd..27f5b34 100644
--- a/APKInstaller/packages.config
+++ b/APKInstaller/packages.config
@@ -2,9 +2,7 @@
 <packages>
   <package id="DeltaCompressionDotNet" version="2.0.0.0-rc1" targetFramework="net45" />
   <package id="Mono.Cecil" version="0.9.6.4" targetFramework="net45" />
-  <package id="OctoPack" version="3.0.71" targetFramework="net45" developmentDependency="true" />
-  <package id="PostSharp" version="4.2.29" targetFramework="net45" />
-  <package id="PostSharp.Patterns.Diagnostics" version="4.2.29" targetFramework="net45" />
+  <package id="OctoPack" version="3.4.2" targetFramework="net45" developmentDependency="true" />
   <package id="Splat" version="1.6.2" targetFramework="net45" />
   <package id="squirrel.windows" version="1.4.4" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/APKInstaller/src/About.Designer.vb b/APKInstaller/src/About.Designer.vb
index a6cb59c..506da8c 100644
--- a/APKInstaller/src/About.Designer.vb
+++ b/APKInstaller/src/About.Designer.vb
@@ -42,11 +42,11 @@ Partial Class About
         Me.TextBoxDescription = New System.Windows.Forms.TextBox()
         Me.OKButton = New MaterialSkin.Controls.MaterialRaisedButton()
         Me.LogoPictureBox = New System.Windows.Forms.PictureBox()
-        Me.TableLayoutPanel.SuspendLayout()
-        Me.Panel1.SuspendLayout()
-        Me.Panel2.SuspendLayout()
-        CType(Me.LogoPictureBox, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.SuspendLayout()
+        Me.TableLayoutPanel.SuspendLayout
+        Me.Panel1.SuspendLayout
+        Me.Panel2.SuspendLayout
+        CType(Me.LogoPictureBox,System.ComponentModel.ISupportInitialize).BeginInit
+        Me.SuspendLayout
         '
         'TableLayoutPanel
         '
@@ -63,7 +63,7 @@ Partial Class About
         '
         Me.LabelCopyright.Depth = 0
         resources.ApplyResources(Me.LabelCopyright, "LabelCopyright")
-        Me.LabelCopyright.ForeColor = System.Drawing.Color.FromArgb(CType(CType(222, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer))
+        Me.LabelCopyright.ForeColor = System.Drawing.Color.FromArgb(CType(CType(222,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer))
         Me.LabelCopyright.MouseState = MaterialSkin.MouseState.HOVER
         Me.LabelCopyright.Name = "LabelCopyright"
         '
@@ -71,7 +71,7 @@ Partial Class About
         '
         Me.LabelCompanyName.Depth = 0
         resources.ApplyResources(Me.LabelCompanyName, "LabelCompanyName")
-        Me.LabelCompanyName.ForeColor = System.Drawing.Color.FromArgb(CType(CType(222, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer))
+        Me.LabelCompanyName.ForeColor = System.Drawing.Color.FromArgb(CType(CType(222,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer))
         Me.LabelCompanyName.MouseState = MaterialSkin.MouseState.HOVER
         Me.LabelCompanyName.Name = "LabelCompanyName"
         '
@@ -87,7 +87,7 @@ Partial Class About
         '
         resources.ApplyResources(Me.lblUpdateStatus, "lblUpdateStatus")
         Me.lblUpdateStatus.Depth = 0
-        Me.lblUpdateStatus.ForeColor = System.Drawing.Color.FromArgb(CType(CType(222, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer))
+        Me.lblUpdateStatus.ForeColor = System.Drawing.Color.FromArgb(CType(CType(222,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer))
         Me.lblUpdateStatus.MouseState = MaterialSkin.MouseState.HOVER
         Me.lblUpdateStatus.Name = "lblUpdateStatus"
         '
@@ -98,14 +98,14 @@ Partial Class About
         Me.chkPrerelease.MouseLocation = New System.Drawing.Point(-1, -1)
         Me.chkPrerelease.MouseState = MaterialSkin.MouseState.HOVER
         Me.chkPrerelease.Name = "chkPrerelease"
-        Me.chkPrerelease.Ripple = True
-        Me.chkPrerelease.UseVisualStyleBackColor = True
+        Me.chkPrerelease.Ripple = true
+        Me.chkPrerelease.UseVisualStyleBackColor = true
         '
         'LabelVersion
         '
         Me.LabelVersion.Depth = 0
         resources.ApplyResources(Me.LabelVersion, "LabelVersion")
-        Me.LabelVersion.ForeColor = System.Drawing.Color.FromArgb(CType(CType(222, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer))
+        Me.LabelVersion.ForeColor = System.Drawing.Color.FromArgb(CType(CType(222,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer))
         Me.LabelVersion.MouseState = MaterialSkin.MouseState.HOVER
         Me.LabelVersion.Name = "LabelVersion"
         '
@@ -123,24 +123,25 @@ Partial Class About
         Me.TextBoxDescription.Cursor = System.Windows.Forms.Cursors.Arrow
         resources.ApplyResources(Me.TextBoxDescription, "TextBoxDescription")
         Me.TextBoxDescription.Name = "TextBoxDescription"
-        Me.TextBoxDescription.ReadOnly = True
-        Me.TextBoxDescription.TabStop = False
+        Me.TextBoxDescription.ReadOnly = true
+        Me.TextBoxDescription.TabStop = false
         '
         'OKButton
         '
         resources.ApplyResources(Me.OKButton, "OKButton")
         Me.OKButton.Depth = 0
         Me.OKButton.DialogResult = System.Windows.Forms.DialogResult.Cancel
+        Me.OKButton.Icon = Nothing
         Me.OKButton.MouseState = MaterialSkin.MouseState.HOVER
         Me.OKButton.Name = "OKButton"
-        Me.OKButton.Primary = True
+        Me.OKButton.Primary = true
         '
         'LogoPictureBox
         '
         resources.ApplyResources(Me.LogoPictureBox, "LogoPictureBox")
         Me.LogoPictureBox.Image = Global.APKInstaller.My.Resources.Resources.FIRSTTech_IconVert_RGB
         Me.LogoPictureBox.Name = "LogoPictureBox"
-        Me.LogoPictureBox.TabStop = False
+        Me.LogoPictureBox.TabStop = false
         '
         'About
         '
@@ -148,19 +149,19 @@ Partial Class About
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.CancelButton = Me.OKButton
         Me.Controls.Add(Me.TableLayoutPanel)
-        Me.MaximizeBox = False
-        Me.MinimizeBox = False
+        Me.MaximizeBox = false
+        Me.MinimizeBox = false
         Me.Name = "About"
-        Me.ShowInTaskbar = False
-        Me.TableLayoutPanel.ResumeLayout(False)
-        Me.Panel1.ResumeLayout(False)
-        Me.Panel1.PerformLayout()
-        Me.Panel2.ResumeLayout(False)
-        Me.Panel2.PerformLayout()
-        CType(Me.LogoPictureBox, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.ResumeLayout(False)
+        Me.ShowInTaskbar = false
+        Me.TableLayoutPanel.ResumeLayout(false)
+        Me.Panel1.ResumeLayout(false)
+        Me.Panel1.PerformLayout
+        Me.Panel2.ResumeLayout(false)
+        Me.Panel2.PerformLayout
+        CType(Me.LogoPictureBox,System.ComponentModel.ISupportInitialize).EndInit
+        Me.ResumeLayout(false)
 
-    End Sub
+End Sub
     Friend WithEvents LabelVersion As MaterialLabel
     Friend WithEvents LabelCompanyName As MaterialLabel
     Friend WithEvents OKButton As MaterialRaisedButton
diff --git a/APKInstaller/src/About.resx b/APKInstaller/src/About.resx
index 94204de..964033f 100644
--- a/APKInstaller/src/About.resx
+++ b/APKInstaller/src/About.resx
@@ -241,19 +241,19 @@
     <value>Roboto, 10pt</value>
   </data>
   <data name="chkPrerelease.Location" type="System.Drawing.Point, System.Drawing">
-    <value>189, 4</value>
+    <value>10, 4</value>
   </data>
   <data name="chkPrerelease.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>0, 0, 0, 0</value>
   </data>
   <data name="chkPrerelease.Size" type="System.Drawing.Size, System.Drawing">
-    <value>156, 30</value>
+    <value>173, 30</value>
   </data>
   <data name="chkPrerelease.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
   </data>
   <data name="chkPrerelease.Text" xml:space="preserve">
-    <value>Use Prereleases</value>
+    <value>Check for Updates</value>
   </data>
   <data name="&gt;&gt;chkPrerelease.Name" xml:space="preserve">
     <value>chkPrerelease</value>
@@ -369,6 +369,12 @@ Customize the application's assembly information in the Application pane of Proj
   <data name="OKButton.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Right</value>
   </data>
+  <data name="OKButton.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="OKButton.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
+    <value>GrowAndShrink</value>
+  </data>
   <data name="OKButton.Location" type="System.Drawing.Point, System.Drawing">
     <value>247, 104</value>
   </data>
@@ -376,7 +382,7 @@ Customize the application's assembly information in the Application pane of Proj
     <value>4, 4, 4, 4</value>
   </data>
   <data name="OKButton.Size" type="System.Drawing.Size, System.Drawing">
-    <value>100, 25</value>
+    <value>45, 36</value>
   </data>
   <data name="OKButton.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
diff --git a/APKInstaller/src/About.vb b/APKInstaller/src/About.vb
index ee48d0c..7486d21 100644
--- a/APKInstaller/src/About.vb
+++ b/APKInstaller/src/About.vb
@@ -22,14 +22,14 @@ Public NotInheritable Class About
         TextBoxDescription.Font = LabelVersion.Font
         TextBoxDescription.Text = My.Application.Info.Description
 
-        chkPrerelease.Checked = My.Settings.prerelease
+        chkPrerelease.Checked = My.Settings.enableUpdates
         chkPrerelease.Location = New Point(131, 0)
 
         lblUpdateStatus.Text = AppUpdateManager.UpdateStatusText
     End Sub
 
     Private Sub chkPrerelease_CheckedChanged(sender As Object, e As EventArgs) Handles chkPrerelease.CheckedChanged
-        My.Settings.prerelease = chkPrerelease.Checked
+        My.Settings.enableUpdates = chkPrerelease.Checked
         AppUpdateManager.UpdateApp()
     End Sub
 
diff --git a/APKInstaller/src/AndroidTools.vb b/APKInstaller/src/AndroidTools.vb
index 92516a3..f39981b 100644
--- a/APKInstaller/src/AndroidTools.vb
+++ b/APKInstaller/src/AndroidTools.vb
@@ -58,7 +58,7 @@ Public NotInheritable Class AndroidTools
     ''' <summary>
     ''' Sets up both ADB and AAPT for later use
     ''' </summary>
-    <Log("App Installer Debug")>
+    '<Log("App Installer Debug")>
     Public Shared Sub SetupIfPossible()
         If Not File.Exists(_aaptCache) Then
             _aaptCache = Nothing
@@ -77,7 +77,7 @@ Public NotInheritable Class AndroidTools
 
     End Sub
 
-    <Log("App Installer Debug")>
+    '<Log("App Installer Debug")>
     Private Shared Function SetupAdb() As String
         Dim windir = Environment.GetEnvironmentVariable("windir")
         If Not (File.Exists(Path.Combine(windir, "adb.exe")) Or File.Exists(Path.Combine(windir, "system32", "adb.exe"))) Then
@@ -157,8 +157,8 @@ Public NotInheritable Class AndroidTools
         Return _adbCache
     End Function
 
+    '<Log("App Installer Debug")>
     <SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId:="aapt")>
-    <Log("App Installer Debug")>
     Private Shared Function SetupAapt() As String
         Dim aaptPath = ""
 
@@ -193,8 +193,8 @@ Public NotInheritable Class AndroidTools
     ''' <param name="run">run this program before returning</param>
     ''' <param name="waitToReturn">wait for this program to return, run parameter must be true</param>
     ''' <returns>an adb process</returns>
+    '<Log("App Installer Debug")>
     <SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")>
-    <Log("App Installer Debug")>
     Public Shared Function RunAdb(args As String, redirectStdOut As Boolean, run As Boolean, waitToReturn As Boolean) As Process
         SetupIfPossible()
         Dim pAdb As New Process
@@ -227,7 +227,7 @@ Public NotInheritable Class AndroidTools
     ''' <param name="args">aapt arguments</param>
     ''' <param name="redirectStdOut">true if the standard output stream should be redirected, otherwise false</param>
     ''' <returns>an instance of an aapt process, not started</returns>
-    <Log("App Installer Debug")>
+    '<Log("App Installer Debug")>
     Friend Shared Function RunAapt(args As String, redirectStdOut As Boolean) As Process
         SetupIfPossible()
         Dim pAapt As New Process()
@@ -245,12 +245,12 @@ Public NotInheritable Class AndroidTools
     ''' </summary>
     ''' <param name="apkFile">the location of the APK file</param>
     ''' <returns>The package name of the APK file, or nothing on failure</returns>
-    <Log("App Installer Debug")>
+    ''<Log("App Installer Debug")>
     Shared Function PackageName(apkFile As String) As String
         If apkFile Is Nothing Then
             Throw New ArgumentNullException(NameOf(apkFile))
         End If
-
+        apkFile = apkFile.Trim()
         Using process = RunAapt("dump badging """ & apkFile & """", True)
             process.Start()
 
@@ -284,7 +284,7 @@ Public NotInheritable Class AndroidTools
         End Using
     End Function
 
-    <Log("App Installer Debug")>
+    '<Log("App Installer Debug")>
     Shared Function IsAndroidSdk(path As String) As Boolean
         Dim platformTools = IO.Path.Combine(path, "platform-tools")
         Dim tools = IO.Path.Combine(path, "tools")
@@ -308,7 +308,7 @@ Public NotInheritable Class AndroidTools
     ''' </summary>
     ''' <param name="path">a delimited list of paths, or a single path location</param>
     ''' <returns>Nothing if none of the paths result in an usable Android SDK, or the path of an Android SDK</returns>
-    <Log("App Installer Debug")>
+    '<Log("App Installer Debug")>
     Shared Function MostLikelyAndroidSdk(path As String) As String
         If path Is Nothing Then
             Throw New ArgumentNullException(NameOf(path))
@@ -322,7 +322,7 @@ Public NotInheritable Class AndroidTools
     ''' </summary>
     ''' <param name="paths">the locations in a string format</param>
     ''' <returns>Nothing if none of the paths result in an usable Android SDK, or the path of an Android SDK</returns>
-    <Log("App Installer Debug")>
+    '<Log("App Installer Debug")>
     Shared Function MostLikelyAndroidSdk(paths As String()) As String
         If paths Is Nothing Then
             Throw New ArgumentNullException(NameOf(paths))
diff --git a/APKInstaller/src/AppUpdateManager.vb b/APKInstaller/src/AppUpdateManager.vb
index ddd5100..a18fc0e 100644
--- a/APKInstaller/src/AppUpdateManager.vb
+++ b/APKInstaller/src/AppUpdateManager.vb
@@ -1,11 +1,16 @@
 
 Imports System.Diagnostics.CodeAnalysis
 Imports System.IO
+Imports System.Net.Http
+Imports System.Net.Http.Headers
+Imports System.Text
 Imports System.Threading
 Imports APKInstaller.My.Resources
+Imports IWshRuntimeLibrary
 Imports MaterialSkin.Controls
 Imports Microsoft.Win32
 Imports Squirrel
+Imports Squirrel.UpdateManager
 
 ''' <summary>
 ''' Core Updating system of APKInstaller. This handles app installs, updates, and uninstalls
@@ -23,7 +28,8 @@ Public Class AppUpdateManager
     Private ReadOnly _gui As Form
     Private Shared _configured As Boolean = False
     'Private Shared _updateStatusText As String = "Everything is up-to-date"
-
+    Private Shared hasCheckedForUpdate As Boolean = False
+    Private Shared installerCode As Integer = -1
     'Private _updatesEnabled As Boolean
 
     ''' <summary>
@@ -66,16 +72,82 @@ Public Class AppUpdateManager
     End Sub
 
     Private Shared Async Sub GetUpdateManager()
-
         Try
-            Const updatePath = "https://github.com/dmssargent/AppInstaller"
-            ' todo: on release allow prerelease to toggle on and off
-            Dim githubMgr = Await UpdateManager.GitHubUpdateManager(updatePath, prerelease:=True)
+            'Const updatePath = "https://github.com/dmssargent/AppInstaller"
+
+            If My.Settings.enableUpdates
+                Dim githubMgr = Await GitHubUpdateManager("https://github.com/dmssargent/AppInstaller")
+                'Dim githubMgr = New UpdateManager("https://github.com/dmssargent/AppInstaller/releases/download/v0.1.7.1-rc/")
+                _updateManager = githubMgr
+                installerCode = 0
+            End If
+        Catch e As Exception
+            installerCode = 1
+            Console.Write(e.ToString())
+        End Try
+
+        _configured = True
+    End Sub
+
+    Private Shared Async Function GitHubUpdateManager(repoUrl As String) As Task(Of UpdateManager)
+        Dim repoUri = New Uri(repoUrl)
+        Dim userAgent = New ProductInfoHeaderValue("Squirrel", "1.4.4.0")
+
+        If (repoUri.Segments.Length <> 3) Then
+            Throw New Exception("Repo URL must be to the root URL of the repo e.g. https://github.com/myuser/myrepo")
+        End If
 
-            _updateManager = githubMgr
+        Dim releasesApiBuilder = New StringBuilder("repos").Append(repoUri.AbsolutePath).Append("/releases")
 
 
+
+        Dim baseAddress As Uri
+
+        If (repoUri.Host.EndsWith("github.com", StringComparison.OrdinalIgnoreCase)) Then
+            baseAddress = New Uri("https://api.github.com/")
+        Else
+            ' if it's not github.com, it's probably an Enterprise server
+            ' now the problem with Enterprise is that the API doesn't come prefixed
+            ' it comes suffixed
+            ' so the API path of http://internal.github.server.local API location is
+            ' http://interal.github.server.local/api/v3. 
+            baseAddress = New Uri(String.Format("{0}{1}{2}/api/v3/", repoUri.Scheme, Uri.SchemeDelimiter, repoUri.Host))
+        End If
+
+        ' above ^^ notice the end slashes for the baseAddress, explained here: http : //stackoverflow.com/a/23438417/162694
+
+        Using client = New HttpClient() With {.BaseAddress = baseAddress}
+            client.DefaultRequestHeaders.UserAgent.Add(userAgent)
+            Dim releasesApi = releasesApiBuilder.ToString()
+            Dim response = Await client.GetAsync(releasesApi)
+            response.EnsureSuccessStatusCode()
+
+            Dim releases = Json.SimpleJson.DeserializeObject(Of List(Of Release))(Await response.Content.ReadAsStringAsync())
+            Dim latestRelease = releases.First()
+
+
+            Dim latestReleaseUrl = latestRelease.HtmlUrl.Replace("/tag/", "/download/")
+
+            Return New UpdateManager(latestReleaseUrl, Nothing, Nothing, Nothing)
+        End Using
+
+
+    End Function
+
+
+    Private Shared Sub GetBackupUpdateManager()
+        installerCode = -2
+        Try
+            'Const updatePath = "https://github.com/dmssargent/AppInstaller"
+
+            If My.Settings.enableUpdates
+                'Dim githubMgr = Await UpdateManager.GitHubUpdateManager("https://github.com/dmssargent/AppInstaller", prerelease:=True)
+                Dim githubMgr = New UpdateManager("https://github.com/dmssargent/AppInstaller/releases/download/v0.1.7.1-rc/")
+                _updateManager = githubMgr
+                installerCode = 0
+            End If
         Catch e As Exception
+            installerCode = 2
             Console.Write(e.ToString())
         End Try
 
@@ -94,21 +166,55 @@ Public Class AppUpdateManager
         'MsgBox("Squirrel Handle")
         SquirrelAwareApp.HandleEvents(
                 onInitialInstall:=Sub(v) SquirrelInstall(),
-                onAppUpdate:=Sub(v) _updateManager.CreateShortcutForThisExe(),
+                onAppUpdate:=Sub(v)
+                                 SquirrelUninstall()
+                                 SquirrelInstall()
+                             End Sub,
                 onAppUninstall:=Sub(v) SquirrelUninstall()
             )
 
     End Sub
 
-    Private Shared Function VerifyState() As Boolean
-        If (_updateManager Is Nothing) Then
-            While Not _configured
+    Shared Function VerifyState(Optional noThrow As Boolean = True) As Boolean
+        If Not My.Settings.enableUpdates
+            _UpdateStatusText = "Updates are disabled"
+        End If
+
+        If (_updateManager Is Nothing) And My.Settings.enableUpdates Then
+            Dim i = 0
+            While Not (_updateManager Is Nothing) And My.Settings.enableUpdates
                 Thread.Sleep(10)
+                i += 1
+                If installerCode = 1
+                    If noThrow
+                        _UpdateStatusText = "Updates are broken :("
+                        Return False
+                    End If
+                    Throw New InvalidOperationException("The update components are broken!")
+                ElseIf i > 100 And installerCode = -1
+                    GetBackupUpdateManager()
+                    Continue While ' for another loop to detect conditions
+                    'If noThrow
+                    '    _UpdateStatusText = "Updates are broken :("
+                    '    Return False
+                    'End If
+                    'Throw New TimeoutException("Check for update component timed out during init")
+                ElseIf i > 500 And installerCode = -2
+                    If noThrow
+                        _UpdateStatusText = "Updates are broken :("
+                        Return False
+                    End If
+                    Throw New TimeoutException("Check for update component (1st and 2nd) timed out during init")
+                ElseIf installerCode = 2
+                    If noThrow
+                        _UpdateStatusText = "Updates are really broken :("
+                        Return False
+                    End If
+                    Throw New InvalidOperationException("The update components (2nd) are broken!")
+                ElseIf installerCode = 0
+                    _UpdateStatusText = "Everything is up-to-date"
+                End If
             End While
-
-            If (_updateManager Is Nothing) Then
-                Return False
-            End If
         End If
         Return True
     End Function
@@ -116,7 +222,23 @@ Public Class AppUpdateManager
     Private Shared Sub SquirrelInstall()
         'MsgBox("Squirrel Install")
         _updateManager.CreateShortcutForThisExe()
+        InstallStage2()
+    End Sub
 
+    ''' <summary>
+    ''' DO NOT CALL if Squirrel is working, verify this by calling VerifyState
+    ''' </summary>
+    Shared Sub NonSquirrelInstall()
+        Dim shell = New WshShell()
+        CreateExecutableShortcut(shell, Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory)))
+        Dim startMenuPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Microsoft", "Windows", "Start Menu", "Programs", My.Application.Info.CompanyName)
+        Directory.CreateDirectory(startMenuPath)
+        CreateExecutableShortcut(shell, startMenuPath)
+
+        InstallStage2()
+    End Sub
+
+    Private Shared Sub InstallStage2()
         ' Create a default icon
         Dim icon = Path.Combine(Path.GetDirectoryName(Application.ExecutablePath), "APK.ico")
         Using file As New FileStream(icon, FileMode.Create)
@@ -157,14 +279,13 @@ Public Class AppUpdateManager
         shellKey.Close()
 
         appClassKey.Close()
-
     End Sub
 
     Private Shared Sub SquirrelUninstall()
         _updateManager.RemoveShortcutForThisExe()
 
         Dim icon = Path.Combine(Path.GetDirectoryName(Application.ExecutablePath), "APK.ico")
-        File.Delete(icon)
+        IO.File.Delete(icon)
 
         Const appClassKey = "AppInstaller"
 
@@ -177,18 +298,41 @@ Public Class AppUpdateManager
         classes.DeleteSubKey(appClassKey)
     End Sub
 
+    Private Shared Sub CreateExecutableShortcut(shell As WshShell, shortcutPath As String)
+        If Not Directory.Exists(shortcutPath)
+            Throw New FileNotFoundException(shortcutPath)
+        End If
+        Dim shortcut As WshShortcut = CType(shell.CreateShortcut(Path.Combine(shortcutPath, "App Installer.lnk")), WshShortcut)
+        shortcut.IconLocation = Path.Combine(Path.GetDirectoryName(Application.ExecutablePath), "APK.ico")
+        shortcut.TargetPath = Application.ExecutablePath
+        shortcut.Description = My.Application.Info.Description
+        shortcut.Arguments = ""
+        shortcut.Save
+    End Sub
+
 
 
     Private Async Sub StartUpdate()
+        If My.Settings.enableUpdates = False Or IO.File.Exists(Application.StartupPath & "noupdate")
+            Exit Sub
+        End If
+
         If Not VerifyState() Then
             Exit Sub
         End If
 
-        Dim updateInfo = Await _updateManager.CheckForUpdate
-        If (updateInfo.FutureReleaseEntry().Version.CompareTo(updateInfo.CurrentlyInstalledVersion.Version) > 0) Then
-            Await _updateManager.UpdateApp()
-            NotifyOfUpdate()
+        If Not hasCheckedForUpdate
+            Try 
+                Dim updateInfo = Await _updateManager.CheckForUpdate
+                If (updateInfo.ReleasesToApply.Count > 0) Then
+                    Await _updateManager.UpdateApp()
+                    NotifyOfUpdate()
+                End If
+            Catch ex As Exception
+                    Console.Write(ex.ToString)
+            End Try
         End If
+
     End Sub
 
     ''' <summary>
diff --git a/APKInstaller/src/Installer.vb b/APKInstaller/src/Installer.vb
index a77aec2..efff1a2 100644
--- a/APKInstaller/src/Installer.vb
+++ b/APKInstaller/src/Installer.vb
@@ -4,7 +4,6 @@ Imports System.IO
 Imports System.Threading
 Imports APKInstaller.My.Resources
 Imports MaterialSkin.Controls
-Imports PostSharp.Patterns.Diagnostics
 
 ''' <summary>
 ''' Handler of installing Android packages
@@ -79,7 +78,7 @@ Public Class Installer
     ''' Adds files to be installed
     ''' </summary>
     ''' <param name="files">files to be installed</param>
-    <Log("App Installer Debug")>
+    '<Log("App Installer Debug")>
     Sub AddFilesToInstall(files() As String, clear As Boolean, notifyUser As Boolean)
         If files Is Nothing Then
             Throw New ArgumentNullException(NameOf(files))
@@ -114,7 +113,7 @@ Public Class Installer
         _filesToInstallDesc = _txtUserInput.Text
     End Sub
 
-    <Log("App Installer Debug")>
+    '<Log("App Installer Debug")>
     Public Sub RemoveFile(path As String)
         _filesToInstall.Remove(path)
     End Sub
@@ -128,9 +127,9 @@ Public Class Installer
     ''' <param name="path">the file location for the APK file</param>
     ''' <param name="notifyUser">true will notify the user of the problem via dialogs, false will not</param>
     ''' <returns>true if the file is a valid APK, false otherwise</returns>
-    <Log("App Installer Debug")>
+    '<Log("App Installer Debug")>
     Public Shared Function ValidateFile(path As String, notifyUser As Boolean) As Boolean
-        If path Is Nothing Then
+         If path Is Nothing Then
             Throw New ArgumentNullException(NameOf(path))
         End If
 
@@ -147,7 +146,7 @@ Public Class Installer
         Try
             ' Check for the correct extension and that the file can be correctly parsed as an APK
             If path.ToUpper(CultureInfo.CurrentCulture).EndsWith(".APK", StringComparison.CurrentCultureIgnoreCase) And
-            AndroidTools.PackageName(path) Is "" Then
+            AndroidTools.PackageName(path.trim()) Is "" Then
                 If notifyUser Then
                     MsgBox("""" & path & """" & Strings.invalidApk,
                        CType(MsgBoxStyle.OkOnly + MsgBoxStyle.Exclamation, MsgBoxStyle), "Invalid File")
@@ -407,7 +406,7 @@ Public Class Installer
     End Function
 
     Shared Function ForceRemovePackage(ByVal apkFile As String) As Boolean
-        Using adb = AndroidTools.RunAdb("uninstall " & AndroidTools.PackageName(apkFile), False, True, True)
+        Using adb = AndroidTools.RunAdb("uninstall " & AndroidTools.PackageName(apkFile.trim()), False, True, True)
             Return adb.ExitCode = 0
         End Using
     End Function
diff --git a/APKInstaller/src/Main.Designer.vb b/APKInstaller/src/Main.Designer.vb
index 0e3c1d3..e6290f8 100644
--- a/APKInstaller/src/Main.Designer.vb
+++ b/APKInstaller/src/Main.Designer.vb
@@ -27,25 +27,25 @@ Partial Class Main
     'Do not modify it using the code editor.
     <DebuggerStepThrough()>
     Private Sub InitializeComponent()
-        Dim resources As ComponentResourceManager = New ComponentResourceManager(GetType(Main))
-        Me.lblStatus = New MaterialLabel()
-        Me.txtFileLocation = New MaterialSingleLineTextField()
-        Me.chkReinstall = New MaterialCheckBox()
-        Me.chkForce = New MaterialCheckBox()
-        Me.btnOpenFileDialogTrigger = New MaterialFlatButton()
-        Me.btnInstall = New MaterialRaisedButton()
-        Me.pgbStatus = New MaterialProgressBar()
-        Me.lnkAbout = New LinkLabel()
-        Me.lnkHelp = New LinkLabel()
-        Me.SuspendLayout()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(Main))
+        Me.lblStatus = New MaterialSkin.Controls.MaterialLabel()
+        Me.txtFileLocation = New MaterialSkin.Controls.MaterialSingleLineTextField()
+        Me.chkReinstall = New MaterialSkin.Controls.MaterialCheckBox()
+        Me.chkForce = New MaterialSkin.Controls.MaterialCheckBox()
+        Me.btnOpenFileDialogTrigger = New MaterialSkin.Controls.MaterialFlatButton()
+        Me.btnInstall = New MaterialSkin.Controls.MaterialRaisedButton()
+        Me.pgbStatus = New MaterialSkin.Controls.MaterialProgressBar()
+        Me.lnkAbout = New System.Windows.Forms.LinkLabel()
+        Me.lnkHelp = New System.Windows.Forms.LinkLabel()
+        Me.SuspendLayout
         '
         'lblStatus
         '
-        Me.lblStatus.AllowDrop = True
+        Me.lblStatus.AllowDrop = true
         resources.ApplyResources(Me.lblStatus, "lblStatus")
         Me.lblStatus.Depth = 0
-        Me.lblStatus.ForeColor = Color.FromArgb(CType(CType(222, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer))
-        Me.lblStatus.MouseState = MouseState.HOVER
+        Me.lblStatus.ForeColor = System.Drawing.Color.FromArgb(CType(CType(222,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer))
+        Me.lblStatus.MouseState = MaterialSkin.MouseState.HOVER
         Me.lblStatus.Name = "lblStatus"
         '
         'txtFileLocation
@@ -54,94 +54,96 @@ Partial Class Main
         Me.txtFileLocation.Depth = 0
         Me.txtFileLocation.Hint = ""
         Me.txtFileLocation.MaxLength = 32767
-        Me.txtFileLocation.MouseState = MouseState.HOVER
+        Me.txtFileLocation.MouseState = MaterialSkin.MouseState.HOVER
         Me.txtFileLocation.Name = "txtFileLocation"
-        Me.txtFileLocation.PasswordChar = ChrW(0)
+        Me.txtFileLocation.PasswordChar = Global.Microsoft.VisualBasic.ChrW(0)
         Me.txtFileLocation.SelectedText = ""
         Me.txtFileLocation.SelectionLength = 0
         Me.txtFileLocation.SelectionStart = 0
-        Me.txtFileLocation.TabStop = False
-        Me.txtFileLocation.UseSystemPasswordChar = False
+        Me.txtFileLocation.TabStop = false
+        Me.txtFileLocation.UseSystemPasswordChar = false
         '
         'chkReinstall
         '
         resources.ApplyResources(Me.chkReinstall, "chkReinstall")
-        Me.chkReinstall.Checked = True
-        Me.chkReinstall.CheckState = CheckState.Checked
+        Me.chkReinstall.Checked = true
+        Me.chkReinstall.CheckState = System.Windows.Forms.CheckState.Checked
         Me.chkReinstall.Depth = 0
-        Me.chkReinstall.MouseLocation = New Point(-1, -1)
-        Me.chkReinstall.MouseState = MouseState.HOVER
+        Me.chkReinstall.MouseLocation = New System.Drawing.Point(-1, -1)
+        Me.chkReinstall.MouseState = MaterialSkin.MouseState.HOVER
         Me.chkReinstall.Name = "chkReinstall"
-        Me.chkReinstall.Ripple = True
-        Me.chkReinstall.UseVisualStyleBackColor = True
+        Me.chkReinstall.Ripple = true
+        Me.chkReinstall.UseVisualStyleBackColor = true
         '
         'chkForce
         '
         resources.ApplyResources(Me.chkForce, "chkForce")
         Me.chkForce.Depth = 0
-        Me.chkForce.MouseLocation = New Point(-1, -1)
-        Me.chkForce.MouseState = MouseState.HOVER
+        Me.chkForce.MouseLocation = New System.Drawing.Point(-1, -1)
+        Me.chkForce.MouseState = MaterialSkin.MouseState.HOVER
         Me.chkForce.Name = "chkForce"
-        Me.chkForce.Ripple = True
-        Me.chkForce.UseVisualStyleBackColor = True
+        Me.chkForce.Ripple = true
+        Me.chkForce.UseVisualStyleBackColor = true
         '
         'btnOpenFileDialogTrigger
         '
         resources.ApplyResources(Me.btnOpenFileDialogTrigger, "btnOpenFileDialogTrigger")
         Me.btnOpenFileDialogTrigger.Depth = 0
-        Me.btnOpenFileDialogTrigger.MouseState = MouseState.HOVER
+        Me.btnOpenFileDialogTrigger.Icon = Nothing
+        Me.btnOpenFileDialogTrigger.MouseState = MaterialSkin.MouseState.HOVER
         Me.btnOpenFileDialogTrigger.Name = "btnOpenFileDialogTrigger"
-        Me.btnOpenFileDialogTrigger.Primary = False
-        Me.btnOpenFileDialogTrigger.UseVisualStyleBackColor = True
+        Me.btnOpenFileDialogTrigger.Primary = false
+        Me.btnOpenFileDialogTrigger.UseVisualStyleBackColor = true
         '
         'btnInstall
         '
-        Me.btnInstall.AllowDrop = True
+        Me.btnInstall.AllowDrop = true
         resources.ApplyResources(Me.btnInstall, "btnInstall")
         Me.btnInstall.Depth = 0
-        Me.btnInstall.ForeColor = Color.Green
-        Me.btnInstall.MouseState = MouseState.HOVER
+        Me.btnInstall.ForeColor = System.Drawing.Color.Green
+        Me.btnInstall.Icon = Nothing
+        Me.btnInstall.MouseState = MaterialSkin.MouseState.HOVER
         Me.btnInstall.Name = "btnInstall"
-        Me.btnInstall.Primary = True
-        Me.btnInstall.UseVisualStyleBackColor = True
+        Me.btnInstall.Primary = true
+        Me.btnInstall.UseVisualStyleBackColor = true
         '
         'pgbStatus
         '
         resources.ApplyResources(Me.pgbStatus, "pgbStatus")
         Me.pgbStatus.Depth = 0
-        Me.pgbStatus.MouseState = MouseState.HOVER
+        Me.pgbStatus.MouseState = MaterialSkin.MouseState.HOVER
         Me.pgbStatus.Name = "pgbStatus"
-        Me.pgbStatus.Style = ProgressBarStyle.Marquee
+        Me.pgbStatus.Style = System.Windows.Forms.ProgressBarStyle.Marquee
         '
         'lnkAbout
         '
-        Me.lnkAbout.ActiveLinkColor = Color.White
+        Me.lnkAbout.ActiveLinkColor = System.Drawing.Color.White
         resources.ApplyResources(Me.lnkAbout, "lnkAbout")
-        Me.lnkAbout.BackColor = Color.FromArgb(CType(CType(245, Byte), Integer), CType(CType(124, Byte), Integer), CType(CType(0, Byte), Integer))
-        Me.lnkAbout.ForeColor = Color.FromArgb(CType(CType(222, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer))
-        Me.lnkAbout.LinkBehavior = LinkBehavior.HoverUnderline
-        Me.lnkAbout.LinkColor = Color.White
+        Me.lnkAbout.BackColor = System.Drawing.Color.FromArgb(CType(CType(245,Byte),Integer), CType(CType(124,Byte),Integer), CType(CType(0,Byte),Integer))
+        Me.lnkAbout.ForeColor = System.Drawing.Color.FromArgb(CType(CType(222,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer))
+        Me.lnkAbout.LinkBehavior = System.Windows.Forms.LinkBehavior.HoverUnderline
+        Me.lnkAbout.LinkColor = System.Drawing.Color.White
         Me.lnkAbout.Name = "lnkAbout"
-        Me.lnkAbout.TabStop = True
-        Me.lnkAbout.VisitedLinkColor = Color.White
+        Me.lnkAbout.TabStop = true
+        Me.lnkAbout.VisitedLinkColor = System.Drawing.Color.White
         '
         'lnkHelp
         '
-        Me.lnkHelp.ActiveLinkColor = Color.White
+        Me.lnkHelp.ActiveLinkColor = System.Drawing.Color.White
         resources.ApplyResources(Me.lnkHelp, "lnkHelp")
-        Me.lnkHelp.BackColor = Color.FromArgb(CType(CType(245, Byte), Integer), CType(CType(124, Byte), Integer), CType(CType(0, Byte), Integer))
-        Me.lnkHelp.ForeColor = Color.FromArgb(CType(CType(222, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer))
-        Me.lnkHelp.LinkBehavior = LinkBehavior.HoverUnderline
-        Me.lnkHelp.LinkColor = Color.White
+        Me.lnkHelp.BackColor = System.Drawing.Color.FromArgb(CType(CType(245,Byte),Integer), CType(CType(124,Byte),Integer), CType(CType(0,Byte),Integer))
+        Me.lnkHelp.ForeColor = System.Drawing.Color.FromArgb(CType(CType(222,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer))
+        Me.lnkHelp.LinkBehavior = System.Windows.Forms.LinkBehavior.HoverUnderline
+        Me.lnkHelp.LinkColor = System.Drawing.Color.White
         Me.lnkHelp.Name = "lnkHelp"
-        Me.lnkHelp.TabStop = True
-        Me.lnkHelp.VisitedLinkColor = Color.White
+        Me.lnkHelp.TabStop = true
+        Me.lnkHelp.VisitedLinkColor = System.Drawing.Color.White
         '
         'Main
         '
-        Me.AllowDrop = True
+        Me.AllowDrop = true
         resources.ApplyResources(Me, "$this")
-        Me.AutoScaleMode = AutoScaleMode.Font
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.Controls.Add(Me.lnkHelp)
         Me.Controls.Add(Me.lnkAbout)
         Me.Controls.Add(Me.pgbStatus)
@@ -152,10 +154,10 @@ Partial Class Main
         Me.Controls.Add(Me.txtFileLocation)
         Me.Controls.Add(Me.lblStatus)
         Me.Name = "Main"
-        Me.ResumeLayout(False)
-        Me.PerformLayout()
+        Me.ResumeLayout(false)
+        Me.PerformLayout
 
-    End Sub
+End Sub
     Friend WithEvents lblStatus As MaterialLabel
     Friend WithEvents txtFileLocation As MaterialSingleLineTextField
     Friend WithEvents chkReinstall As MaterialCheckBox
diff --git a/APKInstaller/src/Main.resx b/APKInstaller/src/Main.resx
index 1a124be..303a198 100644
--- a/APKInstaller/src/Main.resx
+++ b/APKInstaller/src/Main.resx
@@ -159,6 +159,9 @@
   <data name="txtFileLocation.Location" type="System.Drawing.Point, System.Drawing">
     <value>12, 517</value>
   </data>
+  <data name="txtFileLocation.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>3, 2, 3, 2</value>
+  </data>
   <data name="txtFileLocation.Size" type="System.Drawing.Size, System.Drawing">
     <value>723, 28</value>
   </data>
@@ -187,7 +190,7 @@
     <value>Roboto, 10pt</value>
   </data>
   <data name="chkReinstall.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 498</value>
+    <value>9, 474</value>
   </data>
   <data name="chkReinstall.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>0, 0, 0, 0</value>
@@ -223,7 +226,7 @@
     <value>Roboto, 10pt</value>
   </data>
   <data name="chkForce.Location" type="System.Drawing.Point, System.Drawing">
-    <value>200, 498</value>
+    <value>197, 474</value>
   </data>
   <data name="chkForce.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>0, 0, 0, 0</value>
@@ -259,13 +262,13 @@
     <value>GrowAndShrink</value>
   </data>
   <data name="btnOpenFileDialogTrigger.Location" type="System.Drawing.Point, System.Drawing">
-    <value>768, 517</value>
+    <value>767, 516</value>
   </data>
   <data name="btnOpenFileDialogTrigger.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>4, 6, 4, 6</value>
   </data>
   <data name="btnOpenFileDialogTrigger.Size" type="System.Drawing.Size, System.Drawing">
-    <value>82, 36</value>
+    <value>91, 36</value>
   </data>
   <data name="btnOpenFileDialogTrigger.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
@@ -288,14 +291,23 @@
   <data name="btnInstall.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left, Right</value>
   </data>
+  <data name="btnInstall.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
+    <value>GrowAndShrink</value>
+  </data>
   <data name="btnInstall.Font" type="System.Drawing.Font, System.Drawing">
     <value>Open Sans Extrabold, 18pt, style=Bold</value>
   </data>
+  <data name="btnInstall.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
   <data name="btnInstall.Location" type="System.Drawing.Point, System.Drawing">
-    <value>295, 375</value>
+    <value>277, 309</value>
+  </data>
+  <data name="btnInstall.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>3, 2, 3, 2</value>
   </data>
   <data name="btnInstall.Size" type="System.Drawing.Size, System.Drawing">
-    <value>255, 78</value>
+    <value>272, 83</value>
   </data>
   <data name="btnInstall.TabIndex" type="System.Int32, mscorlib">
     <value>5</value>
@@ -322,7 +334,10 @@
     <value>Bottom, Left, Right</value>
   </data>
   <data name="pgbStatus.Location" type="System.Drawing.Point, System.Drawing">
-    <value>14, 459</value>
+    <value>13, 452</value>
+  </data>
+  <data name="pgbStatus.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>3, 2, 3, 2</value>
   </data>
   <data name="pgbStatus.Size" type="System.Drawing.Size, System.Drawing">
     <value>820, 5</value>
@@ -391,7 +406,7 @@
     <value>NoControl</value>
   </data>
   <data name="lnkHelp.Location" type="System.Drawing.Point, System.Drawing">
-    <value>794, 49</value>
+    <value>795, 49</value>
   </data>
   <data name="lnkHelp.Size" type="System.Drawing.Size, System.Drawing">
     <value>50, 24</value>
@@ -424,7 +439,7 @@
     <value>Zoom</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>846, 560</value>
+    <value>845, 560</value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -473,7 +488,7 @@
 </value>
   </data>
   <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>2, 2, 2, 2</value>
+    <value>3, 2, 3, 2</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
     <value>App Installer</value>
diff --git a/APKInstaller/src/Main.vb b/APKInstaller/src/Main.vb
index c9ae6fd..aefe6ed 100644
--- a/APKInstaller/src/Main.vb
+++ b/APKInstaller/src/Main.vb
@@ -5,7 +5,6 @@ Imports System.Threading
 Imports APKInstaller.My.Resources
 Imports MaterialSkin
 Imports MaterialSkin.Controls
-Imports PostSharp.Patterns.Diagnostics
 
 ''' <summary>
 ''' The main GUI of the application
@@ -14,9 +13,13 @@ Public Class Main
     ' This delegate enables asynchronous calls for setting
     ' the text property on a TextBox control.
     Private Delegate Sub SetTextCallback(ByRef label As MaterialLabel, ByVal [text] As String)
+
     Private Delegate Sub VisibilityCallback(visible As Boolean, ByVal useStep As Boolean, stepAmount As Integer)
+
     Private Delegate Sub StepProgressBarDelegate()
+
     Private Delegate Sub ResetGuiCallback(message As String)
+
     Private _singleInstall As Boolean = False
     'Private stopAll As Boolean
     Private ReadOnly _apkInstaller As Installer
@@ -25,6 +28,7 @@ Public Class Main
     Private _dialogLock As Boolean = False
     Private _txtLock As Boolean
     Private _lastEditInTextbox As String = ""
+    Private Shared _loadedApp As Boolean = False
 
 
     Sub New()
@@ -38,7 +42,7 @@ Public Class Main
         _apkInstaller = New Installer(Me, lblStatus, txtFileLocation)
     End Sub
 
-    <Log("App Installer Debug")>
+    '<Log("App Installer Debug")>
     Private Sub APKInstallerMain_Load(sender As Object, e As EventArgs) Handles Me.Load
         ' Handle Fatal Errors for further diagnostics
         AddHandler Application.ThreadException, AddressOf FatalErrorWasThrownHandlerTE
@@ -52,12 +56,18 @@ Public Class Main
         Dim manager = MaterialSkinManager.Instance
         manager.AddFormToManage(Me)
         SkinManager.Theme = MaterialSkinManager.Themes.LIGHT
-        SkinManager.ColorScheme = New ColorScheme(Primary.Orange700, Primary.Orange700, Primary.Orange100, Accent.LightBlue200, TextShade.WHITE)
+        SkinManager.ColorScheme = New ColorScheme(Primary.Orange700, Primary.Orange700, Primary.Orange100,
+                                                  Accent.LightBlue200, TextShade.WHITE)
         lnkAbout.Font = SkinManager.ROBOTO_MEDIUM_10
         lnkHelp.Font = SkinManager.ROBOTO_MEDIUM_10
         lnkAbout.ForeColor = Color.White
         lnkHelp.ForeColor = Color.White
 
+        btnInstall.AutoSize = False
+        btnInstall.Location = New Point(205, 259)
+        btnInstall.Height = 83
+        btnInstall.Width = 272
+
         CenterToScreen()
 
         ' Start parsing the arguments
@@ -79,7 +89,14 @@ Public Class Main
         Next
 
         If Not enableFileArg Then
-            MsgBox("The installer is broken.", CType(MsgBoxStyle.Critical + MsgBoxStyle.OkOnly, MsgBoxStyle))
+            if AppUpdateManager.VerifyState(True)
+                AppUpdateManager.HandleEvents() ' The next line will be only executed if everything is not working correctly
+                MsgBox("The installer is broken.", CType(MsgBoxStyle.Critical + MsgBoxStyle.OkOnly, MsgBoxStyle))
+            Else
+                AppUpdateManager.NonSquirrelInstall()
+                MsgBox("The installer is broken. However, we still managed to do things with the current state. Please send the following crash log to the developer.", CType(MsgBoxStyle.Critical + MsgBoxStyle.OkOnly, MsgBoxStyle))
+                AppUpdateManager.VerifyState(False)
+            End If
             Close()
         End If
 
@@ -88,6 +105,7 @@ Public Class Main
         If Not (fileArgs.Length = 0) And txtFileLocation.Text.Length > 0 And btnInstall.Enabled Then
             SetupSingleInstall(e, noPrompt)
         End If
+        _loadedApp = true
     End Sub
 
     Private Sub SetupSingleInstall(e As EventArgs, noPrompt As Boolean)
@@ -98,9 +116,13 @@ Public Class Main
         chkForce.Visible = False
         chkReinstall.Visible = False
         If Not noPrompt Then
-            chkReinstall.Checked = MsgBox(Strings.updateQuestion, CType(MsgBoxStyle.Question + MsgBoxStyle.YesNo, MsgBoxStyle)).Equals(MsgBoxResult.Yes)
+            chkReinstall.Checked =
+                MsgBox(Strings.updateQuestion, CType(MsgBoxStyle.Question + MsgBoxStyle.YesNo, MsgBoxStyle)).Equals(
+                    MsgBoxResult.Yes)
             If Not chkReinstall.Checked Then
-                chkForce.Checked = MsgBox(Strings.forceQuestion, CType(MsgBoxStyle.Question + MsgBoxStyle.YesNo, MsgBoxStyle)).Equals(MsgBoxResult.Yes)
+                chkForce.Checked =
+                    MsgBox(Strings.forceQuestion, CType(MsgBoxStyle.Question + MsgBoxStyle.YesNo, MsgBoxStyle)).Equals(
+                        MsgBoxResult.Yes)
             End If
         End If
 
@@ -108,7 +130,10 @@ Public Class Main
     End Sub
 
     Private Sub ParseFileArgument(appList As List(Of String), arg As String)
-        If Not MsgBox(Strings.installApkAtConfirm & """" & arg & """", CType(MsgBoxStyle.Information + MsgBoxStyle.OkCancel, MsgBoxStyle)).Equals(MsgBoxResult.Ok) Then
+        If _
+            Not _
+            MsgBox(Strings.installApkAtConfirm & """" & arg & """",
+                   CType(MsgBoxStyle.Information + MsgBoxStyle.OkCancel, MsgBoxStyle)).Equals(MsgBoxResult.Ok) Then
             MsgBox(Strings.installAborted, CType(MsgBoxStyle.Information + MsgBoxStyle.OkOnly, MsgBoxStyle))
             Close()
 
@@ -129,11 +154,15 @@ Public Class Main
         ElseIf (arg.Equals("/?") Or arg.Equals("--help") Or arg.Equals("/h") Or arg.Equals("-h")) Then
             MsgBox(My.Application.Info.ProductName & " v" & My.Application.Info.Version.ToString & vbCrLf & vbCrLf &
                    "Usage Options " & vbCrLf &
-                   "--force | -f" & vbCrLf & vbTab & "Removes any existing application And wipes " & vbCrLf & vbTab & "any associated application data for that " & vbCrLf & vbTab & "application, before installing" & vbCrLf &
-                   "--update | --reinstall | -r" & vbCrLf & vbTab & "Reinstalls the app represented by the given APK." & vbCrLf & vbTab & "Does nothing if the app Is Not already installed" & vbCrLf &
-                   "--no-prompt | -np" & vbCrLf & vbTab & "Does Not prompt user for settings" & vbCrLf & vbTab & " [Implicit with options: -r, -f]" & vbCrLf &
+                   "--force | -f" & vbCrLf & vbTab & "Removes any existing application And wipes " & vbCrLf & vbTab &
+                   "any associated application data for that " & vbCrLf & vbTab & "application, before installing" &
+                   vbCrLf &
+                   "--update | --reinstall | -r" & vbCrLf & vbTab & "Reinstalls the app represented by the given APK." &
+                   vbCrLf & vbTab & "Does nothing if the app is not already installed" & vbCrLf &
+                   "--no-prompt | -np" & vbCrLf & vbTab & "Does Not prompt user for settings" & vbCrLf & vbTab &
+                   " [Implicit with options: -r, -f]" & vbCrLf &
                    "-!np | --prompt" & vbCrLf & vbTab & "Prompts the user about options [Overrides: -np]",
-                    CType(MsgBoxStyle.Information + MsgBoxStyle.OkOnly, MsgBoxStyle), "Usage")
+                   CType(MsgBoxStyle.Information + MsgBoxStyle.OkOnly, MsgBoxStyle), "Usage")
             Close()
         ElseIf (arg.Equals("-np") Or arg.Equals("--no-prompt")) Then
             noPrompt = True
@@ -150,8 +179,13 @@ Public Class Main
         Using fileDialog = New OpenFileDialog()
             If (txtFileLocation.Text.Length > 0) Then
                 If txtFileLocation.Text.Contains(Path.PathSeparator) Then
-                    fileDialog.FileName = txtFileLocation.Text.Substring(txtFileLocation.Text.LastIndexOf(Path.PathSeparator.ToString, StringComparison.OrdinalIgnoreCase),
-                                                                         txtFileLocation.Text.Length - txtFileLocation.Text.LastIndexOf(Path.PathSeparator.ToString, StringComparison.OrdinalIgnoreCase))
+                    fileDialog.FileName =
+                        txtFileLocation.Text.Substring(
+                            txtFileLocation.Text.LastIndexOf(Path.PathSeparator.ToString,
+                                                             StringComparison.OrdinalIgnoreCase),
+                            txtFileLocation.Text.Length -
+                            txtFileLocation.Text.LastIndexOf(Path.PathSeparator.ToString,
+                                                             StringComparison.OrdinalIgnoreCase))
                 Else
                     fileDialog.FileName = txtFileLocation.Text
                 End If
@@ -197,30 +231,39 @@ Public Class Main
         If _apkInstaller Is Nothing Then
             Exit Sub
         End If
-  
-        If _apkInstaller IsNot Nothing AndAlso Not _apkInstaller.UseMultiFileDialog Then
+        
+        'If Not txtFileLocation.Focused Then
+        '    exit Sub
+        'End if
+
             Dim pos = txtFileLocation.SelectionStart
             Dim currentData = txtFileLocation.Text
-            If currentData.Contains(",") Then
-                Dim firstIndex = currentData.IndexOf(",", StringComparison.Ordinal)
-                If firstIndex > pos Then
+            Dim comma = ","
+            If currentData.Contains(comma) Then
+                Dim firstIndex = currentData.IndexOf(comma, StringComparison.Ordinal)
+                If firstIndex > pos Then ' Cursor is within first index
                     currentData = currentData.Substring(0, firstIndex + 1)
-                Else
+                Else ' Cursor is not
                     If pos >= currentData.Length Then
-                        currentData = currentData.Substring(currentData.LastIndexOf(",", StringComparison.Ordinal) + 1)
+                        currentData = currentData.Substring(currentData.LastIndexOf(comma, StringComparison.Ordinal) + 1)
                     Else
-                        Dim index = -1
+                        Dim index = - 1
+                        'DIm tempString = currentData
                         While True
-                            Dim temp = currentData.IndexOf(",", index + 1, StringComparison.Ordinal)
+                            Dim temp = currentData.IndexOf(comma, index + 1, StringComparison.Ordinal)
+                            Dim tempString = currentData.Substring(Math.Max(index, Math.Max(- 1, temp)) + 1)
                             If temp >= pos Then
                                 Exit While
-                            Else
+                            Elseif Not tempString.Contains(comma)
+                                index = temp + 1
+                                exit while
+                            else
                                 index = temp
                             End If
                         End While
-                        currentData = currentData.Substring(index)
-                        If currentData.Contains(",") Then
-                            currentData = currentData.Substring(0, currentData.IndexOf(",", StringComparison.Ordinal) + 1)
+                        currentData = currentData.Substring(index )
+                        If currentData.Contains(comma) Then
+                            currentData = currentData.Substring(0, currentData.IndexOf(comma, StringComparison.Ordinal) + 1)
                         End If
                     End If
                 End If
@@ -230,16 +273,54 @@ Public Class Main
             Dim oldFiles = ExtractFilesFromString(_lastEditInTextbox)
             Dim currentFiles = ExtractFilesFromString(txtFileLocation.Text)
             If Not oldFiles.Equals(currentFiles)
-                for each file In oldFiles
-                    if Not currentFiles.Contains(file)
+                For Each file In oldFiles
+                    If Not currentFiles.Contains(file)
                         _apkInstaller.RemoveFile(file)
                     End If
                 Next
             End If
 
-            CheckInstallerConfig(Installer.ValidateFile(currentData))
+
+            ' Detect user typing
+            If _lastEditInTextbox.Length < txtFileLocation.Text.Length
+                if currentData.Contains(Path.DirectorySeparatorChar)
+                    Dim folder = currentData.Substring(0, currentData.LastIndexOf(Path.DirectorySeparatorChar) + 1)
+                    Dim file = currentData.Replace(folder, "")
+                    if Directory.Exists(folder) And file.length > 1 _
+                        ' 2 is how many characters the user needs to type before autocomplete
+                        for each possibleFile in Directory.EnumerateFileSystemEntries(folder)
+                            'Dim pFile = possibleFile.Substring(0, possibleFile.LastIndexOf(Path.DirectorySeparatorChar) + 1)
+                            if possibleFile.StartsWith(currentData)
+                                ' Found a solution to what the user is typing
+                                Dim selStart = txtFileLocation.Text.IndexOf(currentData, StringComparison.Ordinal) +
+                                               currentData.Length
+                                if Directory.Exists(possibleFile)
+                                    possibleFile &= Path.DirectorySeparatorChar
+                                End If
+                                Dim selLength = possibleFile.Replace(currentData, "").Length
+                                txtFileLocation.Text = txtFileLocation.Text.Replace(currentData, possibleFile)
+                                txtFileLocation.SelectionStart = selStart
+                                txtFileLocation.SelectionLength = selLength
+                                'currentData = possibleFile
+                                Exit For
+                            End If
+                        Next
+                    End If
+
+                End if
+            End If
+
+            if Installer.ValidateFile(currentData)
+                _apkInstaller.AddFilesToInstall(New String() {currentData})
+                CheckInstallerConfig(True)
+            else
+                CheckInstallerConfig(False)
+            End If
+        
+
+        if _lastEditInTextbox <> txtFileLocation.Text ' Keep last actual edit
+            _lastEditInTextbox = txtFileLocation.Text
         End If
-        _lastEditInTextbox = txtFileLocation.Text
     End Sub
 
     Private Sub Main_GotFocus(sender As Object, e As EventArgs) Handles Me.GotFocus
@@ -294,7 +375,9 @@ Public Class Main
 
     Private Sub chkForce_CheckedChanged(sender As Object, e As EventArgs) Handles chkForce.CheckedChanged
         If chkForce.Checked Then
-            chkForce.Checked = MsgBox(Strings.forceConfirm, CType(MsgBoxStyle.Exclamation + MsgBoxStyle.YesNo, MsgBoxStyle)) = MsgBoxResult.Yes
+            chkForce.Checked =
+                MsgBox(Strings.forceConfirm, CType(MsgBoxStyle.Exclamation + MsgBoxStyle.YesNo, MsgBoxStyle)) =
+                MsgBoxResult.Yes
         End If
     End Sub
 
@@ -302,14 +385,14 @@ Public Class Main
         _apkInstaller.Abort()
     End Sub
 
-    <Log("App Installer Debug")>
+    '<Log("App Installer Debug")>
     Private Sub Form1_Closed(sender As Object, e As EventArgs) Handles Me.Closed
         IoUtilities.Cleanup() ' Cleanup all of the tools we used
         AppUpdateManager.CleanUp()
     End Sub
 
-    <SuppressMessage("Microsoft.Design", "CA1045:DoNotPassTypesByReference", MessageId:="0#")>
-    <Log("App Installer Debug")>
+    '<Log("App Installer Debug")>
+    <SuppressMessage("Microsoft.Design", "CA1045:DoNotPassTypesByReference", MessageId := "0#")>
     Sub SetText(ByRef label As MaterialLabel, message As String)
         If label Is Nothing Then
             Throw New ArgumentNullException(NameOf(label))
@@ -323,13 +406,13 @@ Public Class Main
         End If
     End Sub
 
-    <Log("App Installer Debug")>
+    '<Log("App Installer Debug")>
     Sub ShowProgressAnimation(isVisible As Boolean, useStep As Boolean)
         ShowProgressAnimation(isVisible, useStep, 0)
     End Sub
 
-    <SuppressMessage("Microsoft.Design", "CA1026:DefaultParametersShouldNotBeUsed")>
-    <Log("App Installer Debug")>
+    '<SuppressMessage("Microsoft.Design", "CA1026:DefaultParametersShouldNotBeUsed")>
+    '<Log("App Installer Debug")>
     Sub ShowProgressAnimation(isVisible As Boolean, useStep As Boolean, Optional stepAmount As Integer = 0)
         If pgbStatus.InvokeRequired Then
             Dim d As New VisibilityCallback(AddressOf ShowProgressAnimation)
@@ -345,7 +428,7 @@ Public Class Main
         End If
     End Sub
 
-    <Log("App Installer Debug")>
+    '<Log("App Installer Debug")>
     Sub StepProgressBar()
         If pgbStatus.InvokeRequired Then
             Dim d As New StepProgressBarDelegate(AddressOf StepProgressBar)
@@ -355,45 +438,64 @@ Public Class Main
         End If
     End Sub
 
-    <Log("App Installer Debug")>
+    '<Log("App Installer Debug")>
     Private Shared Sub FatalErrorWasThrownHandler(e As Exception)
-        Dim details = ""
-        If (e IsNot Nothing) Then
-            details = Convert.ToBase64String(Encoding.Unicode.GetBytes(e.Message & e.StackTrace))
+        Dim details = "App Installer " & Application.ProductVersion & " Crash Dump :(" & vbCrLf &
+                            e.Message & e.StackTrace
+        If (e Is Nothing) Then
+            Return
+            'details = Convert.ToBase64String(Encoding.Unicode.GetBytes(e.Message & e.StackTrace))
         End If
         Dim sTempFileName As String = Path.GetTempFileName()
         Using fsTemp As New FileStream(sTempFileName, FileMode.Create)
             Dim detailsDump As Byte() = Encoding.Unicode.GetBytes(details)
-            fsTemp.Write(detailsDump, 0, details.Length)
+            Dim i = 0
+            For j = 0 To detailsDump.Length - 1
+                If detailsDump(j) = 0
+                    Continue For
+                End If
+                detailsDump(i) = detailsDump(j)
+                i += 1
+            Next
+            fsTemp.Write(detailsDump, 0, i)
         End Using
-        MsgBox(Strings.appError & vbCrLf &
-                    (If(e Is Nothing, "", Strings.appErrorFileWanted & vbCrLf & sTempFileName & vbCrLf)) &
-                    Strings.wantToRestart, CType(MsgBoxStyle.YesNo + MsgBoxStyle.Critical, MsgBoxStyle))
+        Dim restartApp = False
+        if MsgBox(if(_loadedApp, Strings.appError, "A problem starting the app has occurred.") & vbCrLf &
+               (If(e Is Nothing, "", Strings.appErrorFileWanted & vbCrLf & sTempFileName & vbCrLf)) &
+               if(_loadedApp, "Do you want to disable the update mechanism and restart the app?", Strings.wantToRestart), CType(MsgBoxStyle.YesNo + MsgBoxStyle.Critical, MsgBoxStyle)) = MsgBoxResult.Yes Then
+            restartApp = True
+        End if
+
         Try
             File.Delete(sTempFileName)
         Catch ex As Exception When TypeOf ex Is ArgumentException Or TypeOf ex Is ArgumentNullException
             Throw New IOException("The diagnostics file name is invalid. This shouldn't happen ever." & vbCrLf &
-                                    "File name: " & sTempFileName)
+                                  "File name: " & sTempFileName)
         Catch ex As Exception When TypeOf ex Is PathTooLongException Or TypeOf ex Is DirectoryNotFoundException _
-            Or TypeOf ex Is UnauthorizedAccessException Or TypeOf ex Is IOException
+                                   Or TypeOf ex Is UnauthorizedAccessException Or TypeOf ex Is IOException
 
             Throw New IOException("The diagnostic file can't be automatically removed at runtime.", ex)
         End Try
 
+        If restartApp
+            If _loadedApp
+                My.Settings.enableUpdates = False
+            End If
+            Application.Restart()
+        End If
     End Sub
 
-    <Log("App Installer Debug")>
+    '<Log("App Installer Debug")>
     Private Shared Sub FatalErrorWasThrownHandlerTE(sender As Object, e As ThreadExceptionEventArgs)
         FatalErrorWasThrownHandler(e.Exception)
-
     End Sub
 
-    <Log("App Installer Debug")>
+    '<Log("App Installer Debug")>
     Private Shared Sub FatalErrorWasThrownHandlerCD(sender As Object, e As UnhandledExceptionEventArgs)
         FatalErrorWasThrownHandler(CType(e.ExceptionObject, Exception))
     End Sub
 
-    <Log("App Installer Debug")>
+    '<Log("App Installer Debug")>
     Private Sub txtFileLocation_GotFocus(sender As Object, e As EventArgs) Handles txtFileLocation.GotFocus
         If _apkInstaller IsNot Nothing Then
             If _apkInstaller.UseMultiFileDialog Then
@@ -409,6 +511,7 @@ Public Class Main
                         _dialogLock = True
                         If dialog.ShowDialog = DialogResult.OK Then
                             _apkInstaller.AddFilesToInstall(dialog.GetFiles(), True)
+                            CheckInstallerConfig()
                         End If
                         _dialogLock = False
                     End If
@@ -447,16 +550,18 @@ Public Class Main
             End If
             _txtLock = False
         End If
-
     End Sub
 
     Private Shared Function ExtractFilesFromString(data As String) As List(Of String)
         Dim files = New List(Of String)
+        If data = "," Or data = "" Or data = Path.DirectorySeparatorChar
+            Return files
+        End If
         data = data.Replace("...", "")
         If data.Contains(",") Then
             Dim commaFiles = data.Split(CType(",", Char))
             For Each file In commaFiles
-                If data.Contains(file) Then
+                If file <> "" AndAlso data.Contains(file) Then
                     data = data.Replace(file, "")
                 End If
             Next
@@ -466,7 +571,7 @@ Public Class Main
         If data.Contains(Path.PathSeparator) Then
             Dim collection = data.Split(Path.PathSeparator)
             For Each file In collection
-                If data.Contains(file) Then
+                If file <> "" AndAlso data.Contains(file) Then
                     data = data.Replace(file, "")
                 End If
             Next
@@ -498,11 +603,14 @@ Public Class Main
     End Sub
 
     Private Sub lnkHelp_Click(sender As Object, e As EventArgs) Handles lnkHelp.Click
-        ' Using browser = New Process()
         UseWaitCursor = True
         Process.Start("https://cdn.rawgit.com/dmssargent/AppInstaller/v0.1.7.1-rc/docs/manual.pdf")
-        'MsgBox("The help feature isn't quite done.")
         UseWaitCursor = False
-        'End Using
+    End Sub
+
+    Private Sub txtFileLocation_KeyDown(sender As Object, e As KeyEventArgs) Handles txtFileLocation.KeyDown
+        If e.KeyCode = Keys.Right
+            txtFileLocation_TextChanged(sender, New EventArgs())
+        End If
     End Sub
 End Class
diff --git a/APKInstaller/src/MultiPackageDialog.Designer.vb b/APKInstaller/src/MultiPackageDialog.Designer.vb
index 6347ccb..0bbc085 100644
--- a/APKInstaller/src/MultiPackageDialog.Designer.vb
+++ b/APKInstaller/src/MultiPackageDialog.Designer.vb
@@ -27,33 +27,34 @@ Partial Class MultiPackageDialog
     'Do not modify it using the code editor.
     <DebuggerStepThrough()>
     Private Sub InitializeComponent()
-        Dim resources As ComponentResourceManager = New ComponentResourceManager(GetType(MultiPackageDialog))
-        Me.lstFiles = New ListBox()
-        Me.btnAdd = New MaterialFlatButton()
-        Me.txtFile = New MaterialSingleLineTextField()
-        Me.lblFile = New MaterialLabel()
-        Me.lblFiles = New MaterialLabel()
-        Me.btnDelete = New MaterialFlatButton()
-        Me.btnOk = New MaterialRaisedButton()
-        Me.btnCancel = New MaterialFlatButton()
-        Me.btnBrowse = New MaterialFlatButton()
-        Me.btnModify = New MaterialFlatButton()
-        Me.SuspendLayout()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(MultiPackageDialog))
+        Me.lstFiles = New System.Windows.Forms.ListBox()
+        Me.btnAdd = New MaterialSkin.Controls.MaterialFlatButton()
+        Me.txtFile = New MaterialSkin.Controls.MaterialSingleLineTextField()
+        Me.lblFile = New MaterialSkin.Controls.MaterialLabel()
+        Me.lblFiles = New MaterialSkin.Controls.MaterialLabel()
+        Me.btnDelete = New MaterialSkin.Controls.MaterialFlatButton()
+        Me.btnOk = New MaterialSkin.Controls.MaterialRaisedButton()
+        Me.btnCancel = New MaterialSkin.Controls.MaterialFlatButton()
+        Me.btnBrowse = New MaterialSkin.Controls.MaterialFlatButton()
+        Me.btnModify = New MaterialSkin.Controls.MaterialFlatButton()
+        Me.SuspendLayout
         '
         'lstFiles
         '
         resources.ApplyResources(Me.lstFiles, "lstFiles")
-        Me.lstFiles.FormattingEnabled = True
+        Me.lstFiles.FormattingEnabled = true
         Me.lstFiles.Name = "lstFiles"
         '
         'btnAdd
         '
         resources.ApplyResources(Me.btnAdd, "btnAdd")
         Me.btnAdd.Depth = 0
-        Me.btnAdd.MouseState = MouseState.HOVER
+        Me.btnAdd.Icon = Nothing
+        Me.btnAdd.MouseState = MaterialSkin.MouseState.HOVER
         Me.btnAdd.Name = "btnAdd"
-        Me.btnAdd.Primary = False
-        Me.btnAdd.UseVisualStyleBackColor = True
+        Me.btnAdd.Primary = false
+        Me.btnAdd.UseVisualStyleBackColor = true
         '
         'txtFile
         '
@@ -61,84 +62,89 @@ Partial Class MultiPackageDialog
         Me.txtFile.Depth = 0
         Me.txtFile.Hint = ""
         Me.txtFile.MaxLength = 32767
-        Me.txtFile.MouseState = MouseState.HOVER
+        Me.txtFile.MouseState = MaterialSkin.MouseState.HOVER
         Me.txtFile.Name = "txtFile"
-        Me.txtFile.PasswordChar = ChrW(0)
+        Me.txtFile.PasswordChar = Global.Microsoft.VisualBasic.ChrW(0)
         Me.txtFile.SelectedText = ""
         Me.txtFile.SelectionLength = 0
         Me.txtFile.SelectionStart = 0
-        Me.txtFile.TabStop = False
-        Me.txtFile.UseSystemPasswordChar = False
+        Me.txtFile.TabStop = false
+        Me.txtFile.UseSystemPasswordChar = false
         '
         'lblFile
         '
         resources.ApplyResources(Me.lblFile, "lblFile")
         Me.lblFile.Depth = 0
-        Me.lblFile.ForeColor = Color.FromArgb(CType(CType(222, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer))
-        Me.lblFile.MouseState = MouseState.HOVER
+        Me.lblFile.ForeColor = System.Drawing.Color.FromArgb(CType(CType(222,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer))
+        Me.lblFile.MouseState = MaterialSkin.MouseState.HOVER
         Me.lblFile.Name = "lblFile"
         '
         'lblFiles
         '
         resources.ApplyResources(Me.lblFiles, "lblFiles")
         Me.lblFiles.Depth = 0
-        Me.lblFiles.ForeColor = Color.FromArgb(CType(CType(222, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer))
-        Me.lblFiles.MouseState = MouseState.HOVER
+        Me.lblFiles.ForeColor = System.Drawing.Color.FromArgb(CType(CType(222,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer))
+        Me.lblFiles.MouseState = MaterialSkin.MouseState.HOVER
         Me.lblFiles.Name = "lblFiles"
         '
         'btnDelete
         '
         resources.ApplyResources(Me.btnDelete, "btnDelete")
         Me.btnDelete.Depth = 0
-        Me.btnDelete.MouseState = MouseState.HOVER
+        Me.btnDelete.Icon = Nothing
+        Me.btnDelete.MouseState = MaterialSkin.MouseState.HOVER
         Me.btnDelete.Name = "btnDelete"
-        Me.btnDelete.Primary = False
-        Me.btnDelete.UseVisualStyleBackColor = True
+        Me.btnDelete.Primary = false
+        Me.btnDelete.UseVisualStyleBackColor = true
         '
         'btnOk
         '
         resources.ApplyResources(Me.btnOk, "btnOk")
         Me.btnOk.Depth = 0
-        Me.btnOk.MouseState = MouseState.HOVER
+        Me.btnOk.Icon = Nothing
+        Me.btnOk.MouseState = MaterialSkin.MouseState.HOVER
         Me.btnOk.Name = "btnOk"
-        Me.btnOk.Primary = True
-        Me.btnOk.UseVisualStyleBackColor = True
+        Me.btnOk.Primary = true
+        Me.btnOk.UseVisualStyleBackColor = true
         '
         'btnCancel
         '
         resources.ApplyResources(Me.btnCancel, "btnCancel")
         Me.btnCancel.Depth = 0
-        Me.btnCancel.DialogResult = DialogResult.Yes
-        Me.btnCancel.MouseState = MouseState.HOVER
+        Me.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Yes
+        Me.btnCancel.Icon = Nothing
+        Me.btnCancel.MouseState = MaterialSkin.MouseState.HOVER
         Me.btnCancel.Name = "btnCancel"
-        Me.btnCancel.Primary = False
-        Me.btnCancel.UseVisualStyleBackColor = True
+        Me.btnCancel.Primary = false
+        Me.btnCancel.UseVisualStyleBackColor = true
         '
         'btnBrowse
         '
         resources.ApplyResources(Me.btnBrowse, "btnBrowse")
         Me.btnBrowse.Depth = 0
-        Me.btnBrowse.MouseState = MouseState.HOVER
+        Me.btnBrowse.Icon = Nothing
+        Me.btnBrowse.MouseState = MaterialSkin.MouseState.HOVER
         Me.btnBrowse.Name = "btnBrowse"
-        Me.btnBrowse.Primary = False
-        Me.btnBrowse.UseVisualStyleBackColor = True
+        Me.btnBrowse.Primary = false
+        Me.btnBrowse.UseVisualStyleBackColor = true
         '
         'btnModify
         '
         resources.ApplyResources(Me.btnModify, "btnModify")
         Me.btnModify.Depth = 0
-        Me.btnModify.MouseState = MouseState.HOVER
+        Me.btnModify.Icon = Nothing
+        Me.btnModify.MouseState = MaterialSkin.MouseState.HOVER
         Me.btnModify.Name = "btnModify"
-        Me.btnModify.Primary = False
-        Me.btnModify.UseVisualStyleBackColor = True
+        Me.btnModify.Primary = false
+        Me.btnModify.UseVisualStyleBackColor = true
         '
         'MultiPackageDialog
         '
         Me.AcceptButton = Me.btnOk
         resources.ApplyResources(Me, "$this")
-        Me.AutoScaleMode = AutoScaleMode.Font
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.CancelButton = Me.btnCancel
-        Me.ControlBox = False
+        Me.ControlBox = false
         Me.Controls.Add(Me.btnAdd)
         Me.Controls.Add(Me.btnBrowse)
         Me.Controls.Add(Me.btnCancel)
@@ -149,13 +155,13 @@ Partial Class MultiPackageDialog
         Me.Controls.Add(Me.txtFile)
         Me.Controls.Add(Me.btnModify)
         Me.Controls.Add(Me.lstFiles)
-        Me.MaximizeBox = False
-        Me.MinimizeBox = False
+        Me.MaximizeBox = false
+        Me.MinimizeBox = false
         Me.Name = "MultiPackageDialog"
-        Me.ResumeLayout(False)
-        Me.PerformLayout()
+        Me.ResumeLayout(false)
+        Me.PerformLayout
 
-    End Sub
+End Sub
 
     Friend WithEvents lstFiles As ListBox
     Friend WithEvents btnAdd As MaterialFlatButton
diff --git a/APKInstaller/src/MultiPackageDialog.resx b/APKInstaller/src/MultiPackageDialog.resx
index 7b4ee9b..f865638 100644
--- a/APKInstaller/src/MultiPackageDialog.resx
+++ b/APKInstaller/src/MultiPackageDialog.resx
@@ -125,15 +125,15 @@
   <data name="lstFiles.HorizontalScrollbar" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="lstFiles.ItemHeight" type="System.Int32, mscorlib">
-    <value>16</value>
-  </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="lstFiles.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 156</value>
+    <value>9, 127</value>
+  </data>
+  <data name="lstFiles.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>2, 2, 2, 2</value>
   </data>
   <data name="lstFiles.Size" type="System.Drawing.Size, System.Drawing">
-    <value>373, 276</value>
+    <value>281, 225</value>
   </data>
   <data name="lstFiles.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -160,13 +160,13 @@
     <value>GrowAndShrink</value>
   </data>
   <data name="btnAdd.Location" type="System.Drawing.Point, System.Drawing">
-    <value>434, 156</value>
+    <value>332, 127</value>
   </data>
   <data name="btnAdd.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 6, 4, 6</value>
+    <value>3, 5, 3, 5</value>
   </data>
   <data name="btnAdd.Size" type="System.Drawing.Size, System.Drawing">
-    <value>47, 36</value>
+    <value>56, 36</value>
   </data>
   <data name="btnAdd.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -190,10 +190,13 @@
     <value>Top, Left, Right</value>
   </data>
   <data name="txtFile.Location" type="System.Drawing.Point, System.Drawing">
-    <value>101, 93</value>
+    <value>76, 76</value>
+  </data>
+  <data name="txtFile.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>2, 2, 2, 2</value>
   </data>
   <data name="txtFile.Size" type="System.Drawing.Size, System.Drawing">
-    <value>284, 28</value>
+    <value>213, 28</value>
   </data>
   <data name="txtFile.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
@@ -217,7 +220,10 @@
     <value>Roboto, 11pt</value>
   </data>
   <data name="lblFile.Location" type="System.Drawing.Point, System.Drawing">
-    <value>8, 93</value>
+    <value>6, 76</value>
+  </data>
+  <data name="lblFile.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>2, 0, 2, 0</value>
   </data>
   <data name="lblFile.Size" type="System.Drawing.Size, System.Drawing">
     <value>87, 24</value>
@@ -247,7 +253,10 @@
     <value>Roboto, 11pt</value>
   </data>
   <data name="lblFiles.Location" type="System.Drawing.Point, System.Drawing">
-    <value>8, 128</value>
+    <value>6, 104</value>
+  </data>
+  <data name="lblFiles.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>2, 0, 2, 0</value>
   </data>
   <data name="lblFiles.Size" type="System.Drawing.Size, System.Drawing">
     <value>51, 24</value>
@@ -280,13 +289,13 @@
     <value>GrowAndShrink</value>
   </data>
   <data name="btnDelete.Location" type="System.Drawing.Point, System.Drawing">
-    <value>434, 252</value>
+    <value>306, 205</value>
   </data>
   <data name="btnDelete.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 6, 4, 6</value>
+    <value>3, 5, 3, 5</value>
   </data>
   <data name="btnDelete.Size" type="System.Drawing.Size, System.Drawing">
-    <value>73, 36</value>
+    <value>82, 36</value>
   </data>
   <data name="btnDelete.TabIndex" type="System.Int32, mscorlib">
     <value>6</value>
@@ -309,11 +318,20 @@
   <data name="btnOk.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Right</value>
   </data>
+  <data name="btnOk.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="btnOk.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
+    <value>GrowAndShrink</value>
+  </data>
   <data name="btnOk.Location" type="System.Drawing.Point, System.Drawing">
-    <value>419, 447</value>
+    <value>335, 353</value>
+  </data>
+  <data name="btnOk.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>2, 2, 2, 2</value>
   </data>
   <data name="btnOk.Size" type="System.Drawing.Size, System.Drawing">
-    <value>75, 23</value>
+    <value>45, 36</value>
   </data>
   <data name="btnOk.TabIndex" type="System.Int32, mscorlib">
     <value>7</value>
@@ -343,13 +361,13 @@
     <value>GrowAndShrink</value>
   </data>
   <data name="btnCancel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>325, 440</value>
+    <value>237, 353</value>
   </data>
   <data name="btnCancel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 6, 4, 6</value>
+    <value>3, 5, 3, 5</value>
   </data>
   <data name="btnCancel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>78, 36</value>
+    <value>87, 36</value>
   </data>
   <data name="btnCancel.TabIndex" type="System.Int32, mscorlib">
     <value>8</value>
@@ -379,13 +397,13 @@
     <value>GrowAndShrink</value>
   </data>
   <data name="btnBrowse.Location" type="System.Drawing.Point, System.Drawing">
-    <value>428, 88</value>
+    <value>299, 71</value>
   </data>
   <data name="btnBrowse.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 6, 4, 6</value>
+    <value>3, 5, 3, 5</value>
   </data>
   <data name="btnBrowse.Size" type="System.Drawing.Size, System.Drawing">
-    <value>82, 36</value>
+    <value>91, 36</value>
   </data>
   <data name="btnBrowse.TabIndex" type="System.Int32, mscorlib">
     <value>9</value>
@@ -415,13 +433,13 @@
     <value>GrowAndShrink</value>
   </data>
   <data name="btnModify.Location" type="System.Drawing.Point, System.Drawing">
-    <value>434, 204</value>
+    <value>305, 166</value>
   </data>
   <data name="btnModify.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 6, 4, 6</value>
+    <value>3, 5, 3, 5</value>
   </data>
   <data name="btnModify.Size" type="System.Drawing.Size, System.Drawing">
-    <value>76, 36</value>
+    <value>85, 36</value>
   </data>
   <data name="btnModify.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -445,10 +463,10 @@
     <value>True</value>
   </metadata>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>8, 16</value>
+    <value>6, 13</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>506, 492</value>
+    <value>380, 400</value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -496,6 +514,9 @@
         fwA=
 </value>
   </data>
+  <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>2, 2, 2, 2</value>
+  </data>
   <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
     <value>CenterParent</value>
   </data>