diff --git a/.vs/TimerTrackerLoL/v15/.suo b/.vs/TimerTrackerLoL/v15/.suo
index f6582b7..f39c688 100644
Binary files a/.vs/TimerTrackerLoL/v15/.suo and b/.vs/TimerTrackerLoL/v15/.suo differ
diff --git a/.vs/TimerTrackerLoL/v15/sqlite3/storage.ide b/.vs/TimerTrackerLoL/v15/sqlite3/storage.ide
index 2f4b81e..f137d82 100644
Binary files a/.vs/TimerTrackerLoL/v15/sqlite3/storage.ide and b/.vs/TimerTrackerLoL/v15/sqlite3/storage.ide differ
diff --git a/Icon.ico b/Icon.ico
new file mode 100644
index 0000000..85cadbf
Binary files /dev/null and b/Icon.ico differ
diff --git a/TimerTrackerIcon.ico b/TimerTrackerIcon.ico
deleted file mode 100644
index 019b2ce..0000000
Binary files a/TimerTrackerIcon.ico and /dev/null differ
diff --git a/TimerTrackerLoL/App.config b/TimerTrackerLoL/App.config
index 510dfe9..abbb829 100644
--- a/TimerTrackerLoL/App.config
+++ b/TimerTrackerLoL/App.config
@@ -2,17 +2,17 @@
 <configuration>
     <configSections>
         <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-            <section name="TimerTracker.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+            <section name="SpellTracker.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
         </sectionGroup>
     </configSections>
     <startup>
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
     </startup>
     <userSettings>
-        <TimerTracker.My.MySettings>
+        <SpellTracker.My.MySettings>
             <setting name="textpath" serializeAs="String">
                 <value />
             </setting>
-        </TimerTracker.My.MySettings>
+        </SpellTracker.My.MySettings>
     </userSettings>
 </configuration>
\ No newline at end of file
diff --git a/TimerTrackerLoL/Form1.vb b/TimerTrackerLoL/Form1.vb
index 2805855..b408cac 100644
--- a/TimerTrackerLoL/Form1.vb
+++ b/TimerTrackerLoL/Form1.vb
@@ -99,7 +99,7 @@ Public Class InGameTracker
             Try
 
                 Dim keywords = {
-                    "atrox", "aurelion", "akali", "ahri", "mumu", "ali", "nivia", "annie", "azir", "ashe",
+                    "atrox", "aurelion", "akali", "ahri", "mumu", "ali", "nivia", "annie", "azir", "ashe", "adc",
                     "bard", "blitz", "brand", "braum",
                     "cait", "cass", "cho", "cork", "cami",
                     "dar", "dia", "mundo", "dr", "drav",
@@ -108,17 +108,17 @@ Public Class InGameTracker
                     "gal", "grag", "gang", "gp", "gar", "gnar", "grav",
                     "hec", "heim",
                     "ill", "ire", "ivern",
-                    "jar", "j4", "jay", "jan", "jax", "jhin", "jinx",
+                    "jar", "j4", "jay", "jan", "jax", "jhin", "jinx", "jung",
                     "kali", "karm", "kart", "kas", "kat", "ken", "kha", "kog", "kay", "kin", "kled", "kayn",
                     "lb", "lebl", "lee", "leo", "lis", "luc", "lux", "lu",
-                    "malz", "malp", "mao", "morg", "mord", "mf", "miss",
+                    "malz", "malp", "mao", "morg", "mord", "mf", "miss", "mid",
                     "nam", "nas", "nau", "nid", "noc", "nu",
                     "ola", "ori", "orn",
                     "pan", "pop",
                     "qui",
                     "ram", "rakan", "rek", "reng", "renek", "rum", "riv", "ryz",
-                    "sej", "she", "shy", "sion", "ska", "swa", "syn", "sha", "sin", "siv", "son", "sor", "raka",
-                    "tar", "tru", "tk", "tah", "tal", "tee", "thre", "tri", "try", "tf", "twi", "twit", "tali",
+                    "sej", "she", "shy", "sion", "ska", "swa", "syn", "sha", "sin", "siv", "son", "sor", "raka", "supp",
+                    "tar", "tru", "tk", "tah", "tal", "tee", "thre", "tri", "try", "tf", "twi", "twit", "tali", "top",
                     "ur", "udy",
                     "vel", "vi", "vik", "vlad", "vol", "var", "vay", "vei",
                     "war", "ww", "wu",
@@ -140,6 +140,25 @@ Public Class InGameTracker
                         Dim champName As String = lifesaver.Remove(lifesaver.Length - 1)
 
 #Region "champnames"
+                        If champName.StartsWith("supp") Then
+                            champName = "Support "
+                        End If
+
+                        If champName.StartsWith("adc") Then
+                            champName = "ADC "
+                        End If
+
+                        If champName.StartsWith("mid") Then
+                            champName = "Mid "
+                        End If
+
+                        If champName.StartsWith("jung") Then
+                            champName = "Jungle "
+                        End If
+
+                        If champName.StartsWith("top") Then
+                            champName = "Top "
+                        End If
 
                         If champName.StartsWith("orn") Then
                             champName = "Ornn "
diff --git a/TimerTrackerLoL/Icon.ico b/TimerTrackerLoL/Icon.ico
new file mode 100644
index 0000000..85cadbf
Binary files /dev/null and b/TimerTrackerLoL/Icon.ico differ
diff --git a/TimerTrackerLoL/My Project/Application.Designer.vb b/TimerTrackerLoL/My Project/Application.Designer.vb
index 9a56f5f..9b6b9df 100644
--- a/TimerTrackerLoL/My Project/Application.Designer.vb	
+++ b/TimerTrackerLoL/My Project/Application.Designer.vb	
@@ -32,7 +32,7 @@ Namespace My
         
         <Global.System.Diagnostics.DebuggerStepThroughAttribute()>  _
         Protected Overrides Sub OnCreateMainForm()
-            Me.MainForm = Global.TimerTracker.Main
+            Me.MainForm = Global.SpellTracker.Main
         End Sub
     End Class
 End Namespace
diff --git a/TimerTrackerLoL/My Project/Resources.Designer.vb b/TimerTrackerLoL/My Project/Resources.Designer.vb
index 5e63cc3..491761d 100644
--- a/TimerTrackerLoL/My Project/Resources.Designer.vb	
+++ b/TimerTrackerLoL/My Project/Resources.Designer.vb	
@@ -22,7 +22,7 @@ Namespace My.Resources
     '''<summary>
     '''  A strongly-typed resource class, for looking up localized strings, etc.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0"),  _
      Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
      Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
      Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
@@ -39,7 +39,7 @@ Namespace My.Resources
         Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
             Get
                 If Object.ReferenceEquals(resourceMan, Nothing) Then
-                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("TimerTracker.Resources", GetType(Resources).Assembly)
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("SpellTracker.Resources", GetType(Resources).Assembly)
                     resourceMan = temp
                 End If
                 Return resourceMan
diff --git a/TimerTrackerLoL/My Project/Settings.Designer.vb b/TimerTrackerLoL/My Project/Settings.Designer.vb
index 5ef5eaf..f999a8e 100644
--- a/TimerTrackerLoL/My Project/Settings.Designer.vb	
+++ b/TimerTrackerLoL/My Project/Settings.Designer.vb	
@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
     
     <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.3.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -29,7 +29,7 @@ Namespace My
     Private Shared addedHandlerLockObject As New Object
 
     <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)
+    Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs)
         If My.Application.SaveMySettingsOnExit Then
             My.Settings.Save()
         End If
@@ -98,9 +98,9 @@ Namespace My
     Friend Module MySettingsProperty
         
         <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
-        Friend ReadOnly Property Settings() As Global.TimerTracker.My.MySettings
+        Friend ReadOnly Property Settings() As Global.SpellTracker.My.MySettings
             Get
-                Return Global.TimerTracker.My.MySettings.Default
+                Return Global.SpellTracker.My.MySettings.Default
             End Get
         End Property
     End Module
diff --git a/TimerTrackerLoL/Timer Tracker.vbproj b/TimerTrackerLoL/Timer Tracker.vbproj
index 7a277a9..03744f7 100644
--- a/TimerTrackerLoL/Timer Tracker.vbproj	
+++ b/TimerTrackerLoL/Timer Tracker.vbproj	
@@ -6,9 +6,9 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{CB53D98D-B028-4BD2-ADC3-48C596FC585C}</ProjectGuid>
     <OutputType>WinExe</OutputType>
-    <StartupObject>TimerTracker.My.MyApplication</StartupObject>
-    <RootNamespace>TimerTracker</RootNamespace>
-    <AssemblyName>Timer Tracker</AssemblyName>
+    <StartupObject>SpellTracker.My.MyApplication</StartupObject>
+    <RootNamespace>SpellTracker</RootNamespace>
+    <AssemblyName>Spell Tracker</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>WindowsForms</MyType>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
@@ -21,7 +21,7 @@
     <DefineDebug>true</DefineDebug>
     <DefineTrace>true</DefineTrace>
     <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>Timer Tracker.xml</DocumentationFile>
+    <DocumentationFile>Spell Tracker.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -31,7 +31,7 @@
     <DefineTrace>true</DefineTrace>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>Timer Tracker.xml</DocumentationFile>
+    <DocumentationFile>Spell Tracker.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
@@ -47,7 +47,7 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>TimerTrackerIcon.ico</ApplicationIcon>
+    <ApplicationIcon>Icon.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -131,6 +131,7 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="Icon.ico" />
     <Content Include="TimerTrackerIcon.ico" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
diff --git a/TimerTrackerLoL/TimerTrackerIcon.ico b/TimerTrackerLoL/TimerTrackerIcon.ico
deleted file mode 100644
index 019b2ce..0000000
Binary files a/TimerTrackerLoL/TimerTrackerIcon.ico and /dev/null differ