diff --git a/pollPlugin/ChartBar.xaml b/pollPlugin/ChartBar.xaml
index 4de8116..447fd3e 100644
--- a/pollPlugin/ChartBar.xaml
+++ b/pollPlugin/ChartBar.xaml
@@ -26,7 +26,7 @@
                         <BeginStoryboard>
                             <Storyboard>
                                 <DoubleAnimation Storyboard.TargetProperty="(Effect).BlurRadius" To="10"
-                                                 Duration="0:0:0.3" />
+                                                 Duration="0:0:0.15" />
                             </Storyboard>
                         </BeginStoryboard>
                     </EventTrigger>
@@ -34,7 +34,7 @@
                         <BeginStoryboard>
                             <Storyboard>
                                 <DoubleAnimation Storyboard.TargetProperty="(Effect).BlurRadius" To="0"
-                                                 Duration="0:0:0.3" />
+                                                 Duration="0:0:0.15" />
                             </Storyboard>
                         </BeginStoryboard>
                     </EventTrigger>
diff --git a/pollPlugin/UserControl1.xaml b/pollPlugin/PollSetup.xaml
similarity index 89%
rename from pollPlugin/UserControl1.xaml
rename to pollPlugin/PollSetup.xaml
index 21663b9..8680463 100644
--- a/pollPlugin/UserControl1.xaml
+++ b/pollPlugin/PollSetup.xaml
@@ -1,4 +1,4 @@
-<Window x:Class="pollPlugin.UserControl1"
+<Window x:Class="pollPlugin.PollSetup"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -6,7 +6,7 @@
              xmlns:local="clr-namespace:pollPlugin"
              mc:Ignorable="d" 
              Background="{DynamicResource WindowBackgroundBrush}"
-             Title="PollWindow" Height="270" Width="260" ResizeMode="CanMinimize" Closing="Window_Closing">
+             Title="Setup poll" Height="275" Width="265" ResizeMode="CanMinimize" Closing="Window_Closing">
 
     <Window.Resources>
 
@@ -85,14 +85,15 @@
 
     <Grid x:Name="MainGrid">
 
-        <CheckBox x:Name="checkBox" Content="Multi-Vote" HorizontalAlignment="Left" Margin="10,207,0,0" VerticalAlignment="Top" Foreground="White" FontFamily="Segoe UI Light">
+        <CheckBox x:Name="cbMultiVote" Content="Multi-Vote" HorizontalAlignment="Left" Margin="10,207,0,0" VerticalAlignment="Top" Foreground="White" FontFamily="Segoe UI Light" Height="20"
+                  ToolTip="If this option is enabled, viewers can vote for multiple options instead of just one, but they can still only vote one time per option.">
             <CheckBox.Style>
                 <Style TargetType="{x:Type CheckBox}">
                     <Setter Property="Template" Value="{DynamicResource CheckboxTemplate}" />
                 </Style>
             </CheckBox.Style>
         </CheckBox>
-        <ListBox x:Name="listBox" HorizontalAlignment="Left" Height="171" Margin="10,31,0,0" VerticalAlignment="Top" Width="231" ScrollViewer.CanContentScroll="False" ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.VerticalScrollBarVisibility="Disabled">
+        <ListBox x:Name="listBox" HorizontalAlignment="Left" Height="166" Margin="10,36,0,0" VerticalAlignment="Top" Width="231" ScrollViewer.CanContentScroll="False" ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.VerticalScrollBarVisibility="Disabled">
             <ListBox.Style>
                 <Style TargetType="{x:Type ListBox}">
                     <Setter Property="Background" Value="Transparent" />
@@ -121,14 +122,14 @@
                 </Style>
             </Button.Style>
         </Button>
-        <Button x:Name="btnDelete" Content="-" HorizontalAlignment="Left" Margin="225,10,0,0" VerticalAlignment="Top" Width="16" Height="16" Click="btnDelete_Click">
+        <Button x:Name="btnDelete" Content="-" HorizontalAlignment="Left" Margin="220,10,0,0" VerticalAlignment="Top" Width="21" Height="21" Click="btnDelete_Click">
             <Button.Style>
                 <Style TargetType="{x:Type Button}">
                     <Setter Property="Template" Value="{StaticResource ButtonTemplate}" />
                 </Style>
             </Button.Style>
         </Button>
-        <Button x:Name="btnAdd" Content="+" HorizontalAlignment="Left" Margin="204,10,0,0" VerticalAlignment="Top" Width="16" Height="16" Click="btnAdd_Click">
+        <Button x:Name="btnAdd" Content="+" HorizontalAlignment="Left" Margin="194,10,0,0" VerticalAlignment="Top" Width="21" Height="21" Click="btnAdd_Click">
             <Button.Style>
                 <Style TargetType="{x:Type Button}">
                     <Setter Property="Template" Value="{StaticResource ButtonTemplate}" />
@@ -138,8 +139,8 @@
         <TextBox Background="Transparent"
 			CaretBrush="White" BorderBrush="White"
 			Foreground="White" x:Name="tbAddOption" HorizontalAlignment="Left"
-            Height="16" Margin="10,10,0,0" TextWrapping="Wrap" Text=""
-            VerticalAlignment="Top" Width="189" FontSize="10"/>
+            Height="21" Margin="10,10,0,0" TextWrapping="Wrap" Text=""
+            VerticalAlignment="Top" Width="179" />
 
     </Grid>
 </Window>
diff --git a/pollPlugin/UserControl1.xaml.cs b/pollPlugin/PollSetup.xaml.cs
similarity index 96%
rename from pollPlugin/UserControl1.xaml.cs
rename to pollPlugin/PollSetup.xaml.cs
index e92a78e..c13b688 100644
--- a/pollPlugin/UserControl1.xaml.cs
+++ b/pollPlugin/PollSetup.xaml.cs
@@ -15,14 +15,14 @@ namespace pollPlugin
     /// <summary>
     /// Interaction logic for UserControl1.xaml
     /// </summary>
-    public partial class UserControl1 : Window, IPlugin
+    public partial class PollSetup : Window, IPlugin
     {
 
         private IPluginHost host;
         private ObservableCollection<string> pollOptions = new ObservableCollection<string>();
         private ResultsWindow rw;
 
-        public UserControl1()
+        public PollSetup()
         {
             Assembly.LoadFrom("plugin.dll");
             InitializeComponent();
@@ -111,7 +111,7 @@ private void btnDelete_Click(object sender, RoutedEventArgs e)
         private void btnStartPoll_Click(object sender, RoutedEventArgs e)
         {
             Hide();
-            ResultsWindow rw = new ResultsWindow(pollOptions, host);
+            ResultsWindow rw = new ResultsWindow(pollOptions, host, (bool)cbMultiVote.IsChecked);
         }
     }
 }
diff --git a/pollPlugin/Properties/Settings.Designer.cs b/pollPlugin/Properties/Settings.Designer.cs
index 7f772a0..00723f9 100644
--- a/pollPlugin/Properties/Settings.Designer.cs
+++ b/pollPlugin/Properties/Settings.Designer.cs
@@ -8,23 +8,31 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace pollPlugin.Properties
-{
+namespace pollPlugin.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
-    {
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
         
-        public static Settings Default
-        {
-            get
-            {
+        public static Settings Default {
+            get {
                 return defaultInstance;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("True")]
+        public bool notify {
+            get {
+                return ((bool)(this["notify"]));
+            }
+            set {
+                this["notify"] = value;
+            }
+        }
     }
 }
diff --git a/pollPlugin/Properties/Settings.settings b/pollPlugin/Properties/Settings.settings
index 033d7a5..38fa1fb 100644
--- a/pollPlugin/Properties/Settings.settings
+++ b/pollPlugin/Properties/Settings.settings
@@ -1,7 +1,9 @@
 <?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="pollPlugin.Properties" GeneratedClassName="Settings">
+  <Profiles />
+  <Settings>
+    <Setting Name="notify" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
+  </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/pollPlugin/ResultsWindow.xaml b/pollPlugin/ResultsWindow.xaml
index e3f7bea..df01f4a 100644
--- a/pollPlugin/ResultsWindow.xaml
+++ b/pollPlugin/ResultsWindow.xaml
@@ -135,6 +135,15 @@
         <TextBlock x:Name="tbTimeRunning" HorizontalAlignment="Right" Margin="0,31,10,0" TextWrapping="Wrap" Text="0:00" VerticalAlignment="Top" TextAlignment="Right" Foreground="White"/>
         <TextBlock HorizontalAlignment="Right" Margin="0,70,10,0" TextWrapping="Wrap" Text="Total Votes:" VerticalAlignment="Top" Foreground="White"/>
         <TextBlock x:Name="tbTotalVotes" HorizontalAlignment="Right" Margin="0,86,10.333,0" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Foreground="White" FontFamily="Segoe UI Light" FontSize="48" TextAlignment="Right" Height="70"/>
+        <TextBlock x:Name="tbVoteType" Margin="0,161,10,0" TextWrapping="Wrap" Text="Single Vote" VerticalAlignment="Top" Foreground="White" HorizontalAlignment="Right" Width="85" TextAlignment="Right"/>
+        <CheckBox x:Name="cbNotify" Content="Notify" Foreground="White" HorizontalAlignment="Right" Margin="0,185,10,0" VerticalAlignment="Top"
+                  ToolTip="Sends a whisper message to the users after they voted so they know their vote has been received." Checked="cbNotify_Checked" Unchecked="cbNotify_Unchecked">
+            <CheckBox.Style>
+                <Style TargetType="CheckBox">
+                    <Setter Property="Template" Value="{StaticResource CheckboxTemplate}" />
+                </Style>
+            </CheckBox.Style>
+        </CheckBox>
 
     </Grid>
 </Window>
diff --git a/pollPlugin/ResultsWindow.xaml.cs b/pollPlugin/ResultsWindow.xaml.cs
index bca2958..d6c2211 100644
--- a/pollPlugin/ResultsWindow.xaml.cs
+++ b/pollPlugin/ResultsWindow.xaml.cs
@@ -1,16 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
 using System.Windows.Threading;
 using tvdc.EventArguments;
 using tvdc.Plugin;
@@ -34,23 +26,28 @@ public partial class ResultsWindow : Window
             { Color.FromRgb(255, 136, 0), Color.FromRgb(255, 165, 61)} 
         };
 
-        //UIElement[0] = ChartBar, [1] = TextBlock
         private Dictionary<string, OptionData> pollOptions = new Dictionary<string, OptionData>();
-        private Dictionary<string, string> voters = new Dictionary<string, string>();
+        private Dictionary<string, List<string>> voters = new Dictionary<string, List<string>>();
         private int totalVotes = 0;
+        private bool multiVote;
 
         private IPluginHost host;
 
         private DispatcherTimer tmr = new DispatcherTimer();
         private DateTime startTime;
 
-        public ResultsWindow(IEnumerable<string> options, IPluginHost host)
+        public ResultsWindow(IEnumerable<string> options, IPluginHost host, bool multiVote)
         {
             InitializeComponent();
 
+            cbNotify.IsChecked = Properties.Settings.Default.notify;
+
             this.host = host;
             this.host.IRC_PrivmsgReceived += messageReceived;
 
+            this.multiVote = multiVote;
+            tbVoteType.Text = multiVote ? "Multi Vote" : "Single Vote";
+
             startTime = DateTime.Now;
             tmr.Interval = TimeSpan.FromSeconds(1);
             tmr.Tick += Tmr_Tick;
@@ -87,10 +84,10 @@ private void Tmr_Tick(object sender, EventArgs e)
             {
                 if (totalVotes == 0)
                 {
-                    od.cb.setValue(100);
+                    od.cb.setValue(0);
                 } else
                 {
-                    od.cb.setValue((od.voteCount / totalVotes) * 200);
+                    od.cb.setValue((od.voteCount / totalVotes * 1.0) * 200);
                 }
             }
         }
@@ -121,16 +118,38 @@ public void messageReceived(object sender, PrivmsgReceivedEventArgs e)
                 string option = e.message.Trim().ToLower();
                 if (voters.ContainsKey(e.username))
                 {
-                    pollOptions[voters[e.username]].voteCount -= 1;
-                    voters[e.username] = option;
-                    host.sendMesssage(string.Format("/w {0} You changed your vote to {1}.",
-                        e.username, option));
+                    if (multiVote)
+                    {
+                        if (voters[e.username].Contains(option) && Properties.Settings.Default.notify)
+                        {
+                            host.sendMesssage(string.Format("/w {0} You already voted for {1}.",
+                            e.username, option));
+                            return;
+                        } else
+                        {
+                            voters[e.username].Add(option);
+                            totalVotes += 1;
+                            if (Properties.Settings.Default.notify)
+                                host.sendMesssage(string.Format("/w {0} Thanks for voting! You voted for {1}.",
+                                e.username, string.Join(", ", voters[e.username].ToArray())));
+                        }
+                    } else
+                    {
+                        pollOptions[voters[e.username][0]].voteCount -= 1;
+                        voters[e.username][0] = option;
+                        if (Properties.Settings.Default.notify)
+                            host.sendMesssage(string.Format("/w {0} You changed your vote to {1}.",
+                            e.username, option));
+                    }
                 } else
                 {
                     totalVotes += 1;
-                    voters.Add(e.username, option);
-                    host.sendMesssage(string.Format("/w {0} Thanks for voting! You voted for {1}.",
-                        e.username, option));
+                    List<string> l = new List<string>();
+                    l.Add(option);
+                    voters.Add(e.username, l);
+                    if (Properties.Settings.Default.notify)
+                        host.sendMesssage(string.Format("/w {0} Thanks for voting! You voted for {1}.",
+                            e.username, option));
                 }
                 pollOptions[option].voteCount += 1;
             }
@@ -153,5 +172,17 @@ private void Window_Closed(object sender, EventArgs e)
             tmr.Stop();
             host.IRC_PrivmsgReceived -= messageReceived;
         }
+
+        private void cbNotify_Checked(object sender, RoutedEventArgs e)
+        {
+            Properties.Settings.Default.notify = true;
+            Properties.Settings.Default.Save();
+        }
+
+        private void cbNotify_Unchecked(object sender, RoutedEventArgs e)
+        {
+            Properties.Settings.Default.notify = false;
+            Properties.Settings.Default.Save();
+        }
     }
 }
diff --git a/pollPlugin/app.config b/pollPlugin/app.config
new file mode 100644
index 0000000..730dfb4
--- /dev/null
+++ b/pollPlugin/app.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <configSections>
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+            <section name="pollPlugin.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+        </sectionGroup>
+    </configSections>
+    <userSettings>
+        <pollPlugin.Properties.Settings>
+            <setting name="notify" serializeAs="String">
+                <value>True</value>
+            </setting>
+        </pollPlugin.Properties.Settings>
+    </userSettings>
+</configuration>
\ No newline at end of file
diff --git a/pollPlugin/pollPlugin.csproj b/pollPlugin/pollPlugin.csproj
index 9bbf418..73ece9e 100644
--- a/pollPlugin/pollPlugin.csproj
+++ b/pollPlugin/pollPlugin.csproj
@@ -58,7 +58,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="UserControl1.xaml">
+    <Page Include="PollSetup.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -68,8 +68,8 @@
     <Compile Include="ResultsWindow.xaml.cs">
       <DependentUpon>ResultsWindow.xaml</DependentUpon>
     </Compile>
-    <Compile Include="UserControl1.xaml.cs">
-      <DependentUpon>UserControl1.xaml</DependentUpon>
+    <Compile Include="PollSetup.xaml.cs">
+      <DependentUpon>PollSetup.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
@@ -91,6 +91,7 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="app.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -111,7 +112,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>copy $(TargetPath) $(SolutionDir)\tvdc\bin\Debug\</PostBuildEvent>
+    <PostBuildEvent>copy "$(TargetPath)" "$(SolutionDir)tvdc\bin\Debug\"</PostBuildEvent>
   </PropertyGroup>
   <!-- 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/tvdc.sln b/tvdc.sln
index 6639ce9..c6c30b7 100644
--- a/tvdc.sln
+++ b/tvdc.sln
@@ -1,14 +1,18 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tvdc", "tvdc\tvdc.csproj", "{BD9CC7C0-3D04-42B9-BA3C-40CA4F1B78F8}"
 	ProjectSection(ProjectDependencies) = postProject
 		{8CE76121-E353-4A06-A8E6-2DF560ED2228} = {8CE76121-E353-4A06-A8E6-2DF560ED2228}
+		{B857BA90-2B28-4138-B0D2-27213281EE21} = {B857BA90-2B28-4138-B0D2-27213281EE21}
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "pollPlugin", "pollPlugin\pollPlugin.csproj", "{8CE76121-E353-4A06-A8E6-2DF560ED2228}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B857BA90-2B28-4138-B0D2-27213281EE21} = {B857BA90-2B28-4138-B0D2-27213281EE21}
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "plugin", "plugin\plugin.csproj", "{B857BA90-2B28-4138-B0D2-27213281EE21}"
 EndProject
diff --git a/tvdc/AuthenticationWindow.xaml b/tvdc/AuthenticationWindow.xaml
new file mode 100644
index 0000000..90b92a4
--- /dev/null
+++ b/tvdc/AuthenticationWindow.xaml
@@ -0,0 +1,13 @@
+<Window x:Class="tvdc.AuthenticationWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:tvdc"
+        mc:Ignorable="d"
+        Title="Authenticate" Height="400" Width="350" Loaded="Window_Loaded">
+    <Grid>
+        <WebBrowser x:Name="wb" Margin="0,0,0,0" Navigating="wb_Navigating" />
+
+    </Grid>
+</Window>
diff --git a/tvdc/AuthenticationWindow.xaml.cs b/tvdc/AuthenticationWindow.xaml.cs
new file mode 100644
index 0000000..29ce852
--- /dev/null
+++ b/tvdc/AuthenticationWindow.xaml.cs
@@ -0,0 +1,34 @@
+using System.Windows;
+
+namespace tvdc
+{
+    /// <summary>
+    /// Interaction logic for AuthenticationWindow.xaml
+    /// </summary>
+    public partial class AuthenticationWindow : Window
+    {
+
+        public string oauth { get; private set; }
+
+        public AuthenticationWindow()
+        {
+            InitializeComponent();
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            wb.Navigate("https://api.twitch.tv/kraken/oauth2/authorize?response_type=token&client_id=" +
+                Properties.Resources.client_id +
+                "&redirect_uri=http://newcat.bplaced.net/tvd/&scope=chat_login+user_subscriptions&force_verify=true");
+        }
+
+        private void wb_Navigating(object sender, System.Windows.Navigation.NavigatingCancelEventArgs e)
+        {
+            if (e.Uri.ToString().StartsWith("http://newcat.bplaced.net/tvd/"))
+            {
+                oauth = "oauth:" + e.Uri.Fragment.Substring(14, e.Uri.Fragment.IndexOf('&') - 14);
+                Close();
+            }
+        }
+    }
+}
diff --git a/tvdc/MainWindow.xaml.cs b/tvdc/MainWindow.xaml.cs
index fa4f8d0..225035f 100644
--- a/tvdc/MainWindow.xaml.cs
+++ b/tvdc/MainWindow.xaml.cs
@@ -13,7 +13,6 @@
 namespace tvdc
 {
 
-    //TODO: Fix that if there is text after an emoticon it sometimes doesn't get displayed
     //TODO: Replace poll window with poll plugin
     //TODO: Add support for cheering
 
@@ -92,11 +91,15 @@ private async void init()
             vm.chatEntryList.CollectionChanged += ChatEntryList_CollectionChanged;
             vm.enableSorting = false;
 
+            vm.chatEntryList.Add(new ChatEntry(ChatEntry.Type.IRC, "Initializing..."));
+
             //Init emoticons
-            EmoticonManager.initialize();
+            if (!await EmoticonManager.initialize())
+            {
+                vm.chatEntryList.Add(new ChatEntry(ChatEntry.Type.ERROR, "Failed to download emoticon list."));
+            }
 
             //Load badges and download sub badge
-            vm.chatEntryList.Add(new ChatEntry(ChatEntry.Type.IRC, "Initializing..."));
             Badges.init();
             if (!await Badges.downloadSubBadge(channel))
                 vm.chatEntryList.Add(new ChatEntry(ChatEntry.Type.ERROR, "Failed to download subscriber badge."));
@@ -392,14 +395,9 @@ private void tbChat_TextChanged(object sender, TextChangedEventArgs e)
                 irc.send(text);
 
                 Dictionary<string, string> tags = new Dictionary<string, string>();
-                tags.Add("emotes", "");
+                tags.Add("emotes", EmoticonManager.parseEmoticons(text));
                 tags.Add("badges", Badges.badgeListToString(u.badges));
 
-                //if (u.isMod)
-                //{
-                //    tags.Add("mod", "1");
-                //}
-
                 vm.chatEntryList_Add( new ChatEntry(ChatEntry.Type.CHAT, text, nick, u.color, tags));
 
                 tbChat.Text = "";
diff --git a/tvdc/Properties/AssemblyInfo.cs b/tvdc/Properties/AssemblyInfo.cs
index d7b5eee..093deec 100644
--- a/tvdc/Properties/AssemblyInfo.cs
+++ b/tvdc/Properties/AssemblyInfo.cs
@@ -52,6 +52,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.3.0")]
-[assembly: AssemblyFileVersion("1.1.3.0")]
-[assembly: nUpdateVersion("1.1.3.0")]
+[assembly: AssemblyVersion("1.2.0.0")]
+[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: nUpdateVersion("1.2.0.0")]
diff --git a/tvdc/Settings.xaml b/tvdc/Settings.xaml
index ce27c7d..40cdf95 100644
--- a/tvdc/Settings.xaml
+++ b/tvdc/Settings.xaml
@@ -16,7 +16,7 @@
             </TextBox.Background>
         </TextBox>
         <Label Content="oAuth" FontFamily="Segoe UI Light" FontSize="13" Foreground="White" HorizontalAlignment="Left" Margin="9,61,0,0" Name="lblOauth" VerticalAlignment="Top" VerticalContentAlignment="Center" />
-        <TextBox Height="23" Margin="12,86,12,0" Name="tbOauth" VerticalAlignment="Top" BorderBrush="White" Foreground="White" CaretBrush="White" >
+        <TextBox Height="23" Margin="12,86,12,0" Name="tbOauth" VerticalAlignment="Top" BorderBrush="White" Foreground="White" CaretBrush="White" IsReadOnly="True">
             <TextBox.Background>
                 <SolidColorBrush />
             </TextBox.Background>
diff --git a/tvdc/Settings.xaml.cs b/tvdc/Settings.xaml.cs
index ce4f4db..aa1534f 100644
--- a/tvdc/Settings.xaml.cs
+++ b/tvdc/Settings.xaml.cs
@@ -1,11 +1,5 @@
-using System;
-using System.Windows;
+using System.Windows;
 using System.Windows.Input;
-using System.Diagnostics;
-using nUpdate.Updating;
-using System.Globalization;
-using System.IO;
-using System.Text;
 
 namespace tvdc
 {
@@ -30,7 +24,13 @@ public Settings()
 
         private void linkGenerate_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
-            Process.Start("http://www.twitchapps.com/tmi");
+            //Process.Start("http://www.twitchapps.com/tmi");
+            AuthenticationWindow aw = new AuthenticationWindow();
+            aw.ShowDialog();
+            if (aw.oauth != "")
+            {
+                tbOauth.Text = aw.oauth;
+            }
         }
 
         private void btnOK_Click(object sender, RoutedEventArgs e)
diff --git a/tvdc/Static Stuff/EmoticonManager.cs b/tvdc/Static Stuff/EmoticonManager.cs
index b473edf..b7093f6 100644
--- a/tvdc/Static Stuff/EmoticonManager.cs	
+++ b/tvdc/Static Stuff/EmoticonManager.cs	
@@ -4,11 +4,12 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.IO;
-using System.Web.Script.Serialization;
+using Newtonsoft.Json.Linq;
 using System.Collections;
 using System.Text.RegularExpressions;
 using System.Net.Http;
 using System.Windows;
+using System.Net;
 
 namespace tvdc
 {
@@ -19,16 +20,18 @@ class EmoticonManager
 
         public static string tempPath = Environment.GetFolderPath(Environment.SpecialFolder.InternetCache) + "\\tvd\\emoticons\\";
         private static Dictionary<int, Emoticon> emoticons = new Dictionary<int, Emoticon>();
+        private static Dictionary<string, int> availableEmoticonsForUser = new Dictionary<string, int>();
 
         public static bool isCached(int id)
         {
             return File.Exists(tempPath + id.ToString() + ".png");
         }
 
-        public static void initialize()
+        public static async Task<bool> initialize()
         {
 
             emoticons.Clear();
+            availableEmoticonsForUser.Clear();
 
             if (!Directory.Exists(Environment.GetFolderPath(Environment.SpecialFolder.InternetCache) + "\\tvd"))
                 Directory.CreateDirectory(Environment.GetFolderPath(Environment.SpecialFolder.InternetCache) + "\\tvd");
@@ -45,6 +48,8 @@ public static void initialize()
                 emoticons.Add(eID, new Emoticon(eID));
             }
 
+            return await downloadUserEmoticonList();
+
         }
 
         public static Emoticon requestEmoticon(int emoteID)
@@ -74,5 +79,100 @@ public static void clearCache()
 
         }
 
+        public static string parseEmoticons(string text)
+        {
+            List<EmoticonPositionData> emotePositions = new List<EmoticonPositionData>();
+            foreach (string s in availableEmoticonsForUser.Keys)
+            {
+
+                //TODO: Regex not perfect yet, e. g. \:-?D as s will also Match 123:D
+                MatchCollection mc = Regex.Matches(text, "((?=\\W)|(^|\\b))" + s + "(?=\\W|$|\\b)");
+
+                if (mc.Count > 0)
+                {
+                    Dictionary<int, int> positions = new Dictionary<int, int>();
+
+                    foreach (Match m in mc)
+                    {
+                        positions.Add(m.Index, m.Index + m.Length - 1);
+                    }
+
+                    emotePositions.Add(new EmoticonPositionData()
+                    {
+                        id = availableEmoticonsForUser[s],
+                        positions = positions
+                    });
+                }
+                    
+            }
+
+            string returnString = "";
+
+            for (int i = 0; i < emotePositions.Count; i++)
+            {
+                if (i > 0)
+                    returnString += "/";
+
+                returnString += emotePositions[i].id + ":";
+                Dictionary<int, int> pos = emotePositions[i].positions;
+
+                for (int j = 0; j < pos.Count; j++)
+                {
+                    if (j > 0)
+                        returnString += ",";
+
+                    returnString += pos.ElementAt(j).Key.ToString() + "-" + pos.ElementAt(j).Value.ToString();
+                }
+            }
+
+            return returnString;
+
+        }
+
+        private class EmoticonPositionData
+        {
+            public int id;
+            public Dictionary<int, int> positions;
+        }
+
+        private static async Task<bool> downloadUserEmoticonList()
+        {
+
+            using (WebClient wc = new WebClient())
+            {
+
+                wc.Headers.Add("Client-ID", Properties.Resources.client_id);
+
+                try
+                {
+                    string json = await wc.DownloadStringTaskAsync(
+                        string.Format("https://api.twitch.tv/kraken/users/{0}/emotes?oauth_token={1}",
+                        Properties.Settings.Default.nick, Properties.Settings.Default.oauth.Substring(6)));
+
+                    JObject root = JObject.Parse(json);
+                    JObject sets = (JObject)root["emoticon_sets"];
+                    
+                    foreach (JToken set in sets.Children())
+                    {
+                        foreach (JToken em in set.First)
+                        {
+                            availableEmoticonsForUser.Add(WebUtility.HtmlDecode((string)em["code"]), (int)em["id"]);
+                        }
+                    }
+                    
+                } catch (WebException)
+                {
+                    return false;
+                } catch (InvalidOperationException)
+                {
+                    return false;
+                }
+
+                return true;
+
+            }
+
+        }
+
     }
 }
diff --git a/tvdc/UserControls/ChatRow.xaml.cs b/tvdc/UserControls/ChatRow.xaml.cs
index b3b290e..9c18ada 100644
--- a/tvdc/UserControls/ChatRow.xaml.cs
+++ b/tvdc/UserControls/ChatRow.xaml.cs
@@ -157,6 +157,11 @@ private void updateData()
                     i = ep.endIndex + 1;
                 }
 
+                if (positions[positions.Count - 1].endIndex < Tags["text"].Length - 1)
+                {
+                    paragraphs.Add(Tags["text"].Substring(positions[positions.Count - 1].endIndex + 1));
+                }
+
             } else
             {
                 paragraphs.Add(Tags["text"]);
diff --git a/tvdc/tvdc.csproj b/tvdc/tvdc.csproj
index b05d043..0553a64 100644
--- a/tvdc/tvdc.csproj
+++ b/tvdc/tvdc.csproj
@@ -100,6 +100,9 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="AuthenticationWindow.xaml.cs">
+      <DependentUpon>AuthenticationWindow.xaml</DependentUpon>
+    </Compile>
     <Compile Include="PluginHelper.cs" />
     <Compile Include="Static Stuff\Extensions.cs" />
     <Compile Include="Models\ChatEntry.cs" />
@@ -128,6 +131,10 @@
     <Compile Include="UserControls\ViewerRow.xaml.cs">
       <DependentUpon>ViewerRow.xaml</DependentUpon>
     </Compile>
+    <Page Include="AuthenticationWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="UpdateWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>