diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
index 2d3a5eb5..918ce51d
--- a/.gitignore
+++ b/.gitignore
@@ -152,6 +152,4 @@ $RECYCLE.BIN/
 .DS_Store
 
 #Private files
-#EZBlocker/EZBlocker/AudioUtilities.cs#
-#EZBlocker/EZBlocker/Volume.cs
-signing.txt
\ No newline at end of file
+signing.txt
diff --git a/EZBlocker/EZBlocker.sln b/EZBlocker/EZBlocker.sln
old mode 100644
new mode 100755
diff --git a/EZBlocker/EZBlocker/Analytics.cs b/EZBlocker/EZBlocker/Analytics.cs
old mode 100644
new mode 100755
index bf644978..6d69006c
--- a/EZBlocker/EZBlocker/Analytics.cs
+++ b/EZBlocker/EZBlocker/Analytics.cs
@@ -3,6 +3,7 @@
 using System.Globalization;
 using System.Net.Http;
 using System.Threading.Tasks;
+using System.Management;
 
 namespace EZBlocker
 {
diff --git a/EZBlocker/EZBlocker/App.config b/EZBlocker/EZBlocker/App.config
old mode 100644
new mode 100755
index 214c66f5..c233d364
--- a/EZBlocker/EZBlocker/App.config
+++ b/EZBlocker/EZBlocker/App.config
@@ -2,16 +2,16 @@
 <configuration>
   <configSections>
     <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-      <section name="EZBlocker.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+      <section name="EZBlocker.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
     </sectionGroup>
   </configSections>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
   </startup>
   <userSettings>
     <EZBlocker.Properties.Settings>
       <setting name="CID" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="UpdateSettings" serializeAs="String">
         <value>True</value>
@@ -23,27 +23,27 @@
         <value>True</value>
       </setting>
       <setting name="LastPatched" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="SpotifyPath" serializeAs="String">
-        <value />
+        <value/>
       </setting>
     </EZBlocker.Properties.Settings>
   </userSettings>
   <appSettings>
-    <add key="EnableWindowsFormsHighDpiAutoResizing" value="true" />
-    <add key="ClientSettingsProvider.ServiceUri" value="" />
+    <add key="EnableWindowsFormsHighDpiAutoResizing" value="true"/>
+    <add key="ClientSettingsProvider.ServiceUri" value=""/>
   </appSettings>
   <system.web>
     <membership defaultProvider="ClientAuthenticationMembershipProvider">
       <providers>
-        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
+        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri=""/>
       </providers>
     </membership>
     <roleManager defaultProvider="ClientRoleProvider" enabled="true">
       <providers>
-        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
+        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400"/>
       </providers>
     </roleManager>
   </system.web>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/EZBlocker/EZBlocker/AudioUtils.cs b/EZBlocker/EZBlocker/AudioUtils.cs
old mode 100644
new mode 100755
diff --git a/EZBlocker/EZBlocker/EZBlocker.csproj b/EZBlocker/EZBlocker/EZBlocker.csproj
old mode 100644
new mode 100755
index 8b0f59ec..4d9bf6f9
--- a/EZBlocker/EZBlocker/EZBlocker.csproj
+++ b/EZBlocker/EZBlocker/EZBlocker.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>EZBlocker</RootNamespace>
     <AssemblyName>EZBlocker</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <IsWebBootstrapper>false</IsWebBootstrapper>
@@ -75,14 +75,7 @@
     <SignManifests>false</SignManifests>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Costura, Version=1.6.2.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
-      <HintPath>..\packages\Costura.Fody.1.6.2\lib\dotnet\Costura.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
+    <Reference Include="netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Drawing" />
@@ -111,7 +104,6 @@
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SpotifyHook.cs" />
-    <Compile Include="SpotifyPatcher.cs" />
     <EmbeddedResource Include="EZBlockerMain.resx">
       <DependentUpon>EZBlockerMain.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -119,11 +111,9 @@
     <EmbeddedResource Include="Properties\strings.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>strings.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <None Include="app.manifest" />
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -138,7 +128,6 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="FodyWeavers.xml" />
     <Content Include="my_music.ico" />
   </ItemGroup>
   <ItemGroup>
@@ -167,16 +156,21 @@
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </COMReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Windows.SDK.Contracts">
+      <Version>10.0.22000.196</Version>
+    </PackageReference>
+    <PackageReference Include="System.Runtime.InteropServices.WindowsRuntime">
+      <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Runtime.WindowsRuntime">
+      <Version>4.6.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Runtime.WindowsRuntime.UI.Xaml">
+      <Version>4.6.0</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Fody.2.0.0\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.2.0.0\build\dotnet\Fody.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Fody.2.0.0\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.2.0.0\build\dotnet\Fody.targets'))" />
-    <Error Condition="!Exists('..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets'))" />
-  </Target>
-  <Import Project="..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets')" />
   <!-- 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.
   <Target Name="BeforeBuild">
diff --git a/EZBlocker/EZBlocker/EZBlockerMain.Designer.cs b/EZBlocker/EZBlocker/EZBlockerMain.Designer.cs
old mode 100644
new mode 100755
index 5119776a..2523dd69
--- a/EZBlocker/EZBlocker/EZBlockerMain.Designer.cs
+++ b/EZBlocker/EZBlocker/EZBlockerMain.Designer.cs
@@ -35,7 +35,6 @@ private void InitializeComponent()
             this.NotifyIconContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.websiteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.undoPatchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.separatorToolStripMenuItem = new System.Windows.Forms.ToolStripSeparator();
             this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.WebsiteLink = new System.Windows.Forms.LinkLabel();
@@ -66,7 +65,6 @@ private void InitializeComponent()
             this.NotifyIconContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.openToolStripMenuItem,
             this.websiteToolStripMenuItem,
-            this.undoPatchToolStripMenuItem,
             this.separatorToolStripMenuItem,
             this.exitToolStripMenuItem});
             this.NotifyIconContextMenu.Name = "NotifyIconContextMenu";
@@ -86,13 +84,6 @@ private void InitializeComponent()
             this.websiteToolStripMenuItem.Text = global::EZBlocker.Properties.strings.ToolStripWebsite;
             this.websiteToolStripMenuItem.Click += new System.EventHandler(this.websiteToolStripMenuItem_Click);
             // 
-            // undoPatchToolStripMenuItem
-            // 
-            this.undoPatchToolStripMenuItem.Name = "undoPatchToolStripMenuItem";
-            resources.ApplyResources(this.undoPatchToolStripMenuItem, "undoPatchToolStripMenuItem");
-            this.undoPatchToolStripMenuItem.Text = global::EZBlocker.Properties.strings.ToolStripRemovePatch;
-            this.undoPatchToolStripMenuItem.Click += new System.EventHandler(this.undoPatchToolStripMenuItem_Click);
-            // 
             // separatorToolStripMenuItem
             // 
             this.separatorToolStripMenuItem.Name = "separatorToolStripMenuItem";
@@ -192,7 +183,6 @@ private void InitializeComponent()
         private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem websiteToolStripMenuItem;
         private System.Windows.Forms.CheckBox SpotifyCheckbox;
-        private System.Windows.Forms.ToolStripMenuItem undoPatchToolStripMenuItem;
     }
 }
 
diff --git a/EZBlocker/EZBlocker/EZBlockerMain.cs b/EZBlocker/EZBlocker/EZBlockerMain.cs
old mode 100644
new mode 100755
index fe918679..e6e0aa45
--- a/EZBlocker/EZBlocker/EZBlockerMain.cs
+++ b/EZBlocker/EZBlocker/EZBlockerMain.cs
@@ -30,8 +30,6 @@ public partial class Main : Form
         private Analytics a;
         private DateTime lastRequest;
         private string lastAction = "";
-        private SpotifyPatcher patcher;
-        private Listener listener;
         private SpotifyHook hook;
 
         public Main()
@@ -72,7 +70,7 @@ private void MainTimer_Tick(object sender, EventArgs e)
                     {
                         if (muted)
                         {
-                            Thread.Sleep(500); // Give extra time for ad to change out
+                            Thread.Sleep(200); // Give extra time for ad to change out
                             Mute(false);
                         }
                         if (MainTimer.Interval != 200) MainTimer.Interval = 200;
@@ -244,10 +242,6 @@ private void Main_Load(object sender, EventArgs e)
             // Start Spotify hook
             hook = new SpotifyHook();
 
-            /* Start EZBlocker listener
-            listener = new Listener();
-            Task.Run(() => listener.Listen()); */
-
             MainTimer.Enabled = true;
 
             LogAction("/launch");
@@ -405,21 +399,6 @@ private void websiteToolStripMenuItem_Click(object sender, EventArgs e)
             Process.Start(website);
         }
 
-        private void undoPatchToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            Properties.Settings.Default.LastPatched = "";
-            Properties.Settings.Default.Save();
-
-            if (patcher.Restore())
-            {
-                MessageBox.Show(Properties.strings.UndoPatchOKMessageBox, "EZBlocker");
-            }
-            else
-            {
-                MessageBox.Show(Properties.strings.UndoPatchFailMessageBox, "EZBlocker");
-            }
-        }
-
         protected override void OnFormClosing(FormClosingEventArgs e)
         {
             if (!MainTimer.Enabled) return; // Still setting up UI
@@ -441,5 +420,6 @@ protected override void OnFormClosing(FormClosingEventArgs e)
 
         [DllImport("shell32.dll")]
         public static extern bool IsUserAnAdmin();
+
     }
 }
diff --git a/EZBlocker/EZBlocker/EZBlockerMain.resx b/EZBlocker/EZBlocker/EZBlockerMain.resx
old mode 100644
new mode 100755
index ff193066..103525eb
--- a/EZBlocker/EZBlocker/EZBlockerMain.resx
+++ b/EZBlocker/EZBlocker/EZBlockerMain.resx
@@ -127,8 +127,20 @@
     <value>348, 16</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="openToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>205, 22</value>
+  </data>
+  <data name="websiteToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>205, 22</value>
+  </data>
+  <data name="separatorToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>202, 6</value>
+  </data>
+  <data name="exitToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>205, 22</value>
+  </data>
   <data name="NotifyIconContextMenu.Size" type="System.Drawing.Size, System.Drawing">
-    <value>319, 122</value>
+    <value>206, 98</value>
   </data>
   <data name="&gt;&gt;NotifyIconContextMenu.Name" xml:space="preserve">
     <value>NotifyIconContextMenu</value>
@@ -7352,24 +7364,6 @@
   <data name="NotifyIcon.Visible" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="openToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>318, 28</value>
-  </data>
-  <data name="websiteToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>318, 28</value>
-  </data>
-  <data name="undoPatchToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>318, 28</value>
-  </data>
-  <data name="undoPatchToolStripMenuItem.Visible" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
-  <data name="separatorToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>315, 6</value>
-  </data>
-  <data name="exitToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>318, 28</value>
-  </data>
   <data name="WebsiteLink.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
@@ -7381,7 +7375,7 @@
     <value>NoControl</value>
   </data>
   <data name="WebsiteLink.Location" type="System.Drawing.Point, System.Drawing">
-    <value>173, 134</value>
+    <value>195, 168</value>
   </data>
   <data name="WebsiteLink.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>4, 0, 4, 0</value>
@@ -7390,7 +7384,7 @@
     <value>Yes</value>
   </data>
   <data name="WebsiteLink.Size" type="System.Drawing.Size, System.Drawing">
-    <value>113, 18</value>
+    <value>80, 13</value>
   </data>
   <data name="WebsiteLink.TabIndex" type="System.Int32, mscorlib">
     <value>5</value>
@@ -7420,13 +7414,13 @@
     <value>NoControl</value>
   </data>
   <data name="VolumeMixerButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>16, 7</value>
+    <value>18, 9</value>
   </data>
   <data name="VolumeMixerButton.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>4, 5, 4, 5</value>
   </data>
   <data name="VolumeMixerButton.Size" type="System.Drawing.Size, System.Drawing">
-    <value>267, 44</value>
+    <value>300, 55</value>
   </data>
   <data name="VolumeMixerButton.TabIndex" type="System.Int32, mscorlib">
     <value>7</value>
@@ -7453,13 +7447,13 @@
     <value>NoControl</value>
   </data>
   <data name="StatusLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>13, 134</value>
+    <value>15, 168</value>
   </data>
   <data name="StatusLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>4, 0, 4, 0</value>
   </data>
   <data name="StatusLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>72, 18</value>
+    <value>54, 13</value>
   </data>
   <data name="StatusLabel.TabIndex" type="System.Int32, mscorlib">
     <value>9</value>
@@ -7489,13 +7483,13 @@
     <value>NoControl</value>
   </data>
   <data name="BlockBannersCheckbox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>16, 59</value>
+    <value>18, 74</value>
   </data>
   <data name="BlockBannersCheckbox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>4, 5, 4, 5</value>
   </data>
   <data name="BlockBannersCheckbox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>148, 22</value>
+    <value>111, 17</value>
   </data>
   <data name="BlockBannersCheckbox.TabIndex" type="System.Int32, mscorlib">
     <value>10</value>
@@ -7522,13 +7516,13 @@
     <value>NoControl</value>
   </data>
   <data name="StartupCheckbox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>16, 83</value>
+    <value>18, 104</value>
   </data>
   <data name="StartupCheckbox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>4, 5, 4, 5</value>
   </data>
   <data name="StartupCheckbox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>196, 22</value>
+    <value>145, 17</value>
   </data>
   <data name="StartupCheckbox.TabIndex" type="System.Int32, mscorlib">
     <value>11</value>
@@ -7555,13 +7549,13 @@
     <value>NoControl</value>
   </data>
   <data name="SpotifyCheckbox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>16, 108</value>
+    <value>18, 135</value>
   </data>
   <data name="SpotifyCheckbox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>4, 5, 4, 5</value>
   </data>
   <data name="SpotifyCheckbox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>214, 22</value>
+    <value>158, 17</value>
   </data>
   <data name="SpotifyCheckbox.TabIndex" type="System.Int32, mscorlib">
     <value>12</value>
@@ -7582,10 +7576,10 @@
     <value>True</value>
   </metadata>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>8, 16</value>
+    <value>9, 20</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>291, 163</value>
+    <value>327, 204</value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -14797,7 +14791,7 @@
 </value>
   </data>
   <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>4, 5, 4, 5</value>
   </data>
   <data name="$this.RightToLeftLayout" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -14832,12 +14826,6 @@
   <data name="&gt;&gt;websiteToolStripMenuItem.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;undoPatchToolStripMenuItem.Name" xml:space="preserve">
-    <value>undoPatchToolStripMenuItem</value>
-  </data>
-  <data name="&gt;&gt;undoPatchToolStripMenuItem.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="&gt;&gt;separatorToolStripMenuItem.Name" xml:space="preserve">
     <value>separatorToolStripMenuItem</value>
   </data>
diff --git a/EZBlocker/EZBlocker/FodyWeavers.xml b/EZBlocker/EZBlocker/FodyWeavers.xml
deleted file mode 100644
index 2a1a1b89..00000000
--- a/EZBlocker/EZBlocker/FodyWeavers.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Weavers>
-  <Costura />
-</Weavers>
\ No newline at end of file
diff --git a/EZBlocker/EZBlocker/Listener.cs b/EZBlocker/EZBlocker/Listener.cs
old mode 100644
new mode 100755
diff --git a/EZBlocker/EZBlocker/Program.cs b/EZBlocker/EZBlocker/Program.cs
old mode 100644
new mode 100755
diff --git a/EZBlocker/EZBlocker/Properties/AssemblyInfo.cs b/EZBlocker/EZBlocker/Properties/AssemblyInfo.cs
old mode 100644
new mode 100755
index 8638a34c..c1ff5fe6
--- a/EZBlocker/EZBlocker/Properties/AssemblyInfo.cs
+++ b/EZBlocker/EZBlocker/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Eric Zhang")]
 [assembly: AssemblyProduct("EZBlocker")]
-[assembly: AssemblyCopyright("Copyright ©  2012-2020 Eric Zhang")]
+[assembly: AssemblyCopyright("Copyright ©  2012-2021 Eric Zhang")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -31,5 +31,5 @@
 // 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.7.6.0")]
-[assembly: AssemblyFileVersion("1.7.6.0")]
+[assembly: AssemblyVersion("1.8.0.0")]
+[assembly: AssemblyFileVersion("1.8.0.0")]
diff --git a/EZBlocker/EZBlocker/Properties/Resources.Designer.cs b/EZBlocker/EZBlocker/Properties/Resources.Designer.cs
old mode 100644
new mode 100755
diff --git a/EZBlocker/EZBlocker/Properties/Settings.Designer.cs b/EZBlocker/EZBlocker/Properties/Settings.Designer.cs
old mode 100644
new mode 100755
index 9bb61459..f7c2e2a1
--- a/EZBlocker/EZBlocker/Properties/Settings.Designer.cs
+++ b/EZBlocker/EZBlocker/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace EZBlocker.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/EZBlocker/EZBlocker/Properties/Settings.settings b/EZBlocker/EZBlocker/Properties/Settings.settings
old mode 100644
new mode 100755
diff --git a/EZBlocker/EZBlocker/Properties/strings.Designer.cs b/EZBlocker/EZBlocker/Properties/strings.Designer.cs
old mode 100644
new mode 100755
index ce9c42dc..018cd615
--- a/EZBlocker/EZBlocker/Properties/strings.Designer.cs
+++ b/EZBlocker/EZBlocker/Properties/strings.Designer.cs
@@ -19,7 +19,7 @@ namespace EZBlocker.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class strings {
diff --git a/EZBlocker/EZBlocker/Properties/strings.resx b/EZBlocker/EZBlocker/Properties/strings.resx
old mode 100644
new mode 100755
diff --git a/EZBlocker/EZBlocker/Settings.cs b/EZBlocker/EZBlocker/Settings.cs
old mode 100644
new mode 100755
diff --git a/EZBlocker/EZBlocker/SpotifyHook.cs b/EZBlocker/EZBlocker/SpotifyHook.cs
old mode 100644
new mode 100755
index 69a2b88f..f49e7d61
--- a/EZBlocker/EZBlocker/SpotifyHook.cs
+++ b/EZBlocker/EZBlocker/SpotifyHook.cs
@@ -3,6 +3,8 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Threading;
+using System.Threading.Tasks;
+using Windows.Media.Control;
 
 namespace EZBlocker
 {
@@ -14,6 +16,9 @@ class SpotifyHook
         public string WindowName { get; private set; }
         public IntPtr Handle { get; private set; }
 
+        private GlobalSystemMediaTransportControlsSession gsmtcs;
+        private bool IsNextEnabled = true;
+
         private readonly Timer RefreshTimer;
         private float peak = 0f;
         private float lastPeak = 0f;
@@ -22,7 +27,7 @@ public SpotifyHook()
         {
             RefreshTimer = new Timer((e) =>
             {
-                if (IsRunning())
+                if (IsRunning() && gsmtcs != null)
                 {
                     WindowName = Spotify.MainWindowTitle;
                     Handle = Spotify.MainWindowHandle;
@@ -35,13 +40,15 @@ public SpotifyHook()
                         lastPeak = peak;
                         peak = AudioUtils.GetPeakVolume(VolumeControl.Control);
                     }
+                        IsNextEnabled = gsmtcs.GetPlaybackInfo().Controls.IsNextEnabled;
+                        Debug.WriteLine(IsNextEnabled);
                 }
                 else
                 {
                     ClearHooks();
                     HookSpotify();
                 }
-            }, null, TimeSpan.Zero, TimeSpan.FromMilliseconds(100));
+            }, null, TimeSpan.Zero, TimeSpan.FromMilliseconds(300));
         }
 
         public bool IsPlaying()
@@ -51,7 +58,7 @@ public bool IsPlaying()
 
         public bool IsAdPlaying()
         {
-            if ((WindowName.Equals("Advertisement") || !WindowName.Contains(" - ")) && !WindowName.Equals("") && !WindowName.Equals("Drag") && IsPlaying())
+            if (WindowName.Equals("Advertisement") || !IsNextEnabled && !WindowName.Equals("") && !WindowName.Equals("Drag") && IsPlaying())
             {
                 Debug.WriteLine("Ad: " + lastPeak.ToString() + " " + peak.ToString());
                 return true;
@@ -88,10 +95,15 @@ private void ClearHooks()
             Handle = IntPtr.Zero;
             if (VolumeControl != null) Marshal.ReleaseComObject(VolumeControl.Control);
             VolumeControl = null;
+            gsmtcs = null;
         }
 
         private bool HookSpotify()
         {
+            // First hook windows media controller
+            gsmtcs = GlobalSystemMediaTransportControlsSessionManager.RequestAsync().GetAwaiter().GetResult().GetCurrentSession();
+
+            // Hook Spotify process
             Children = new HashSet<int>();
 
             // Try hooking through window title
@@ -115,8 +127,5 @@ private bool HookSpotify()
 
             return false;
         }
-
-        [DllImport("user32.dll")]
-        private static extern bool ShowWindow(IntPtr hwnd, int nCmdShow);
     }
 }
diff --git a/EZBlocker/EZBlocker/SpotifyPatcher.cs b/EZBlocker/EZBlocker/SpotifyPatcher.cs
deleted file mode 100644
index 05657d82..00000000
--- a/EZBlocker/EZBlocker/SpotifyPatcher.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Diagnostics;
-using ICSharpCode.SharpZipLib.Zip;
-using ICSharpCode.SharpZipLib.Core;
-using System.Threading;
-
-namespace EZBlocker
-{
-    class SpotifyPatcher
-    {
-        private readonly string spotifyPath = Environment.GetEnvironmentVariable("APPDATA") + @"\Spotify\spotify.exe";
-        private readonly string targetPath = Environment.GetEnvironmentVariable("APPDATA") + @"\Spotify\Apps\zlink.spa";
-        private readonly string tmpPath = Environment.GetEnvironmentVariable("TMP") + @"\EZBlocker\";
-        private readonly string backupPath = "";
-
-        public SpotifyPatcher()
-        {
-            Directory.CreateDirectory(tmpPath);
-            backupPath = tmpPath + "backup.spa";
-        }
-
-        public bool Patch()
-        {
-            Dictionary<String, String> patches = new Dictionary<string, string>
-            {
-                { "openProductUpgradePage", "openWebsite" },
-                { "UPGRADE_LABEL", "'EZBlocker'" },
-                { "UPGRADE_TOOLTIP_TEXT", "'Open EZBlocker Website'" },
-                { "<script type=\"text/javascript\" src=\"/zlink.bundle.js\"></script>", @"<script src=/zlink.bundle.js></script><script>function openWebsite(){window.open('{WEBSITE}')}w=new Worker('worker.js'),w.onmessage=function(e){w.postMessage(document.getElementById('player-button-next').disabled)},w.postMessage('')</script>".Replace("{WEBSITE}", Main.website) }
-            };
-            string worker = @"var sendEZB=function(e){var t=new XMLHttpRequest;t.open('GET','http://localhost:19691/'+e,!0),t.send()};self.addEventListener('message',function(e){sendEZB(e.data),setTimeout(function(){postMessage('ready')},300)},!1);";
-
-            string workingDir = Path.Combine(tmpPath, new Random().Next(999, 9999).ToString());
-            try
-            {
-                System.IO.Compression.ZipFile.ExtractToDirectory(targetPath, workingDir);
-
-                // Check if already patched
-                if (File.Exists(Path.Combine(workingDir, "worker.js"))) {
-                    return true;
-                }
-
-                // Add web worker
-                File.WriteAllText(Path.Combine(workingDir, "worker.js"), worker);
-
-                // Patch index
-                string patchFile = Path.Combine(workingDir, "index.html");
-                string contents = File.ReadAllText(patchFile, System.Text.Encoding.UTF8);
-                foreach (KeyValuePair<string, string> patch in patches)
-                {
-                    contents = contents.Replace(patch.Key, patch.Value);
-                }
-                File.WriteAllText(patchFile, contents, System.Text.Encoding.UTF8);
-
-                string patchedPath = Path.Combine(tmpPath, "zlink.spa");
-                File.Delete(patchedPath);
-                ZipCompress(patchedPath, workingDir);
-
-                File.Replace(patchedPath, targetPath, backupPath);
-
-                Directory.Delete(workingDir, true);
-            }
-            catch (Exception e)
-            {
-                Debug.WriteLine(e);
-                Directory.Delete(workingDir, true);
-                Restore();
-                return false;
-            }
-
-            // Restart Spotify if running
-            try
-            {
-                foreach (Process p in Process.GetProcessesByName("spotify"))
-                {
-                    p.Kill();
-                }
-            } catch (Exception e) {
-                Debug.WriteLine(e);
-            }
-
-            Thread.Sleep(3000);
-            Process.Start(spotifyPath);
-
-            return true;
-        }
-
-        public bool Restore()
-        {
-            if (File.Exists(backupPath))
-            {
-                File.Copy(backupPath, targetPath, true);
-                return true;
-            }
-            return false;
-        }
-
-        private void ZipCompress(string outPathname, string folderName)
-        {
-            FileStream fsOut = File.Create(outPathname);
-            ZipOutputStream zipStream = new ZipOutputStream(fsOut);
-
-            // This setting will strip the leading part of the folder path in the entries, to
-            // make the entries relative to the starting folder.
-            // To include the full path for each entry up to the drive root, assign folderOffset = 0.
-            int folderOffset = folderName.Length + (folderName.EndsWith("\\") ? 0 : 1);
-
-            CompressFolder(folderName, zipStream, folderOffset);
-
-            zipStream.IsStreamOwner = true;
-            zipStream.Close();
-        }
-
-        private void CompressFolder(string path, ZipOutputStream zipStream, int folderOffset)
-        {
-            foreach (string filename in Directory.GetFiles(path))
-            {
-                FileInfo fi = new FileInfo(filename);
-
-                string entryName = filename.Substring(folderOffset); // Makes the name in zip based on the folder
-                entryName = ZipEntry.CleanName(entryName); // Removes drive from name and fixes slash direction
-                ZipEntry newEntry = new ZipEntry(entryName)
-                {
-                    DateTime = fi.LastWriteTime, // Note the zip format stores 2 second granularity
-                    Size = fi.Length
-                };
-
-                zipStream.PutNextEntry(newEntry);
-
-                // Zip the file in buffered chunks
-                // the "using" will close the stream even if an exception occurs
-                byte[] buffer = new byte[4096];
-                using (FileStream streamReader = File.OpenRead(filename))
-                {
-                    StreamUtils.Copy(streamReader, zipStream, buffer);
-                }
-                zipStream.CloseEntry();
-            }
-            string[] folders = Directory.GetDirectories(path);
-            foreach (string folder in folders)
-            {
-                CompressFolder(folder, zipStream, folderOffset);
-            }
-        }
-    }
-}
diff --git a/EZBlocker/EZBlocker/app.manifest b/EZBlocker/EZBlocker/app.manifest
old mode 100644
new mode 100755
diff --git a/EZBlocker/EZBlocker/my_music.ico b/EZBlocker/EZBlocker/my_music.ico
old mode 100644
new mode 100755
diff --git a/EZBlocker/EZBlocker/packages.config b/EZBlocker/EZBlocker/packages.config
deleted file mode 100644
index 81b626d0..00000000
--- a/EZBlocker/EZBlocker/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Costura.Fody" version="1.6.2" targetFramework="net45" developmentDependency="true" />
-  <package id="Fody" version="2.0.0" targetFramework="net45" developmentDependency="true" />
-  <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/EZBlocker/packages/Costura.Fody.1.6.2/Costura.Fody.1.6.2.nupkg b/EZBlocker/packages/Costura.Fody.1.6.2/Costura.Fody.1.6.2.nupkg
deleted file mode 100644
index 5bf56cff..00000000
Binary files a/EZBlocker/packages/Costura.Fody.1.6.2/Costura.Fody.1.6.2.nupkg and /dev/null differ
diff --git a/EZBlocker/packages/Costura.Fody.1.6.2/Costura.Fody.dll b/EZBlocker/packages/Costura.Fody.1.6.2/Costura.Fody.dll
deleted file mode 100644
index 539fd585..00000000
Binary files a/EZBlocker/packages/Costura.Fody.1.6.2/Costura.Fody.dll and /dev/null differ
diff --git a/EZBlocker/packages/Costura.Fody.1.6.2/Costura.Tasks.dll b/EZBlocker/packages/Costura.Fody.1.6.2/Costura.Tasks.dll
deleted file mode 100644
index b7a01b17..00000000
Binary files a/EZBlocker/packages/Costura.Fody.1.6.2/Costura.Tasks.dll and /dev/null differ
diff --git a/EZBlocker/packages/Costura.Fody.1.6.2/lib/dotnet/Costura.dll b/EZBlocker/packages/Costura.Fody.1.6.2/lib/dotnet/Costura.dll
deleted file mode 100644
index f6655f1f..00000000
Binary files a/EZBlocker/packages/Costura.Fody.1.6.2/lib/dotnet/Costura.dll and /dev/null differ
diff --git a/EZBlocker/packages/Costura.Fody.1.6.2/lib/portable-net+sl+win+wpa+wp/Costura.dll b/EZBlocker/packages/Costura.Fody.1.6.2/lib/portable-net+sl+win+wpa+wp/Costura.dll
deleted file mode 100644
index f6655f1f..00000000
Binary files a/EZBlocker/packages/Costura.Fody.1.6.2/lib/portable-net+sl+win+wpa+wp/Costura.dll and /dev/null differ
diff --git a/EZBlocker/packages/Costura.Fody.1.6.2/tools/install.ps1 b/EZBlocker/packages/Costura.Fody.1.6.2/tools/install.ps1
deleted file mode 100644
index d41e9b12..00000000
--- a/EZBlocker/packages/Costura.Fody.1.6.2/tools/install.ps1
+++ /dev/null
@@ -1,94 +0,0 @@
-param($installPath, $toolsPath, $package, $project)
-
-
-function RemoveForceProjectLevelHack($project)
-{
-    Write-Host "RemoveForceProjectLevelHack"
-	Foreach ($item in $project.ProjectItems)
-	{
-		if ($item.Name -eq "Fody_ToBeDeleted.txt")
-		{
-			$item.Delete()
-		}
-	}
-}
-
-function FlushVariables()
-{
-    Write-Host "Flushing environment variables"
-    $env:FodyLastProjectPath = ""
-    $env:FodyLastWeaverName = ""
-    $env:FodyLastXmlContents = ""
-}
-
-function Update-FodyConfig($addinName, $project)
-{
-	Write-Host "Update-FodyConfig"
-    $fodyWeaversPath = [System.IO.Path]::Combine([System.IO.Path]::GetDirectoryName($project.FullName), "FodyWeavers.xml")
-
-	$FodyLastProjectPath = $env:FodyLastProjectPath
-	$FodyLastWeaverName = $env:FodyLastWeaverName
-	$FodyLastXmlContents = $env:FodyLastXmlContents
-
-	if (
-		($FodyLastProjectPath -eq $project.FullName) -and
-		($FodyLastWeaverName -eq $addinName))
-	{
-        Write-Host "Upgrade detected. Restoring content for $addinName"
-		[System.IO.File]::WriteAllText($fodyWeaversPath, $FodyLastXmlContents)
-        FlushVariables
-		return
-	}
-
-    FlushVariables
-
-    $xml = [xml](get-content $fodyWeaversPath)
-
-    $weavers = $xml["Weavers"]
-    $node = $weavers.SelectSingleNode($addinName)
-
-    if (-not $node)
-    {
-        Write-Host "Appending node"
-        $newNode = $xml.CreateElement($addinName)
-        $weavers.AppendChild($newNode)
-    }
-
-    $xml.Save($fodyWeaversPath)
-}
-
-function Fix-ReferencesCopyLocal($package, $project)
-{
-    Write-Host "Fix-ReferencesCopyLocal $($package.Id)"
-    $asms = $package.AssemblyReferences | %{$_.Name}
-
-    foreach ($reference in $project.Object.References)
-    {
-        if ($asms -contains $reference.Name + ".dll")
-        {
-            if($reference.CopyLocal -eq $true)
-            {
-                $reference.CopyLocal = $false;
-            }
-        }
-    }
-}
-
-function UnlockWeaversXml($project)
-{
-    $fodyWeaversProjectItem = $project.ProjectItems.Item("FodyWeavers.xml");
-    if ($fodyWeaversProjectItem)
-    {
-        $fodyWeaversProjectItem.Open("{7651A701-06E5-11D1-8EBD-00A0C90F26EA}")
-        $fodyWeaversProjectItem.Save()
-		$fodyWeaversProjectItem.Document.Close()
-    }
-}
-
-UnlockWeaversXml($project)
-
-RemoveForceProjectLevelHack $project
-
-Update-FodyConfig $package.Id.Replace(".Fody", "") $project
-
-Fix-ReferencesCopyLocal $package $project
\ No newline at end of file
diff --git a/EZBlocker/packages/Costura.Fody.1.6.2/tools/uninstall.ps1 b/EZBlocker/packages/Costura.Fody.1.6.2/tools/uninstall.ps1
deleted file mode 100644
index 6fb0d2f0..00000000
--- a/EZBlocker/packages/Costura.Fody.1.6.2/tools/uninstall.ps1
+++ /dev/null
@@ -1,47 +0,0 @@
-param($installPath, $toolsPath, $package, $project)
-
-
-function Update-FodyConfig($addinName, $project)
-{
-    $fodyWeaversPath = [System.IO.Path]::Combine([System.IO.Path]::GetDirectoryName($project.FullName), "FodyWeavers.xml")
-
-    if (!(Test-Path ($fodyWeaversPath)))
-    {
-        return
-    }
-
-    Write-Host "Caching variables for possible update"
-	$env:FodyLastProjectPath = $project.FullName
-	$env:FodyLastWeaverName = $addinName
-	$env:FodyLastXmlContents = [IO.File]::ReadAllText($fodyWeaversPath)
-
-
-    $xml = [xml](get-content $fodyWeaversPath)
-
-    $weavers = $xml["Weavers"]
-    $node = $weavers.SelectSingleNode($addinName)
-
-    if ($node)
-    {
-        Write-Host "Removing node from FodyWeavers.xml"
-        $weavers.RemoveChild($node)
-    }
-
-    $xml.Save($fodyWeaversPath)
-}
-
-
-function UnlockWeaversXml($project)
-{
-    $fodyWeaversProjectItem = $project.ProjectItems.Item("FodyWeavers.xml");
-    if ($fodyWeaversProjectItem)
-    {
-        $fodyWeaversProjectItem.Open("{7651A701-06E5-11D1-8EBD-00A0C90F26EA}")
-        $fodyWeaversProjectItem.Save()
-		$fodyWeaversProjectItem.Document.Close()
-    }
-}
-
-UnlockWeaversXml($project)
-
-Update-FodyConfig $package.Id.Replace(".Fody", "") $project
\ No newline at end of file
diff --git a/EZBlocker/packages/Fody.2.0.0/Content/FodyWeavers.xml b/EZBlocker/packages/Fody.2.0.0/Content/FodyWeavers.xml
deleted file mode 100644
index 0227a5d0..00000000
--- a/EZBlocker/packages/Fody.2.0.0/Content/FodyWeavers.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Weavers>
-  
-</Weavers>
\ No newline at end of file
diff --git a/EZBlocker/packages/Fody.2.0.0/Fody.2.0.0.nupkg b/EZBlocker/packages/Fody.2.0.0/Fody.2.0.0.nupkg
deleted file mode 100644
index b0683c76..00000000
Binary files a/EZBlocker/packages/Fody.2.0.0/Fody.2.0.0.nupkg and /dev/null differ
diff --git a/EZBlocker/packages/Fody.2.0.0/Fody.dll b/EZBlocker/packages/Fody.2.0.0/Fody.dll
deleted file mode 100644
index bce246b7..00000000
Binary files a/EZBlocker/packages/Fody.2.0.0/Fody.dll and /dev/null differ
diff --git a/EZBlocker/packages/Fody.2.0.0/FodyCommon.dll b/EZBlocker/packages/Fody.2.0.0/FodyCommon.dll
deleted file mode 100644
index 4d3c03b2..00000000
Binary files a/EZBlocker/packages/Fody.2.0.0/FodyCommon.dll and /dev/null differ
diff --git a/EZBlocker/packages/Fody.2.0.0/FodyIsolated.dll b/EZBlocker/packages/Fody.2.0.0/FodyIsolated.dll
deleted file mode 100644
index 451f05a8..00000000
Binary files a/EZBlocker/packages/Fody.2.0.0/FodyIsolated.dll and /dev/null differ
diff --git a/EZBlocker/packages/Fody.2.0.0/Mono.Cecil.Mdb.dll b/EZBlocker/packages/Fody.2.0.0/Mono.Cecil.Mdb.dll
deleted file mode 100644
index 8f1d0859..00000000
Binary files a/EZBlocker/packages/Fody.2.0.0/Mono.Cecil.Mdb.dll and /dev/null differ
diff --git a/EZBlocker/packages/Fody.2.0.0/Mono.Cecil.Pdb.dll b/EZBlocker/packages/Fody.2.0.0/Mono.Cecil.Pdb.dll
deleted file mode 100644
index 6b085b9c..00000000
Binary files a/EZBlocker/packages/Fody.2.0.0/Mono.Cecil.Pdb.dll and /dev/null differ
diff --git a/EZBlocker/packages/Fody.2.0.0/Mono.Cecil.Rocks.dll b/EZBlocker/packages/Fody.2.0.0/Mono.Cecil.Rocks.dll
deleted file mode 100644
index 5514de42..00000000
Binary files a/EZBlocker/packages/Fody.2.0.0/Mono.Cecil.Rocks.dll and /dev/null differ
diff --git a/EZBlocker/packages/Fody.2.0.0/Mono.Cecil.dll b/EZBlocker/packages/Fody.2.0.0/Mono.Cecil.dll
deleted file mode 100644
index 70de67f2..00000000
Binary files a/EZBlocker/packages/Fody.2.0.0/Mono.Cecil.dll and /dev/null differ
diff --git a/EZBlocker/packages/Fody.2.0.0/Tools/install.ps1 b/EZBlocker/packages/Fody.2.0.0/Tools/install.ps1
deleted file mode 100644
index 09c40ddc..00000000
--- a/EZBlocker/packages/Fody.2.0.0/Tools/install.ps1
+++ /dev/null
@@ -1,3 +0,0 @@
-param($installPath, $toolsPath, $package, $project)
-$item = $project.ProjectItems | where-object {$_.Name -eq "FodyWeavers.xml"} 
-$item.Properties.Item("BuildAction").Value = [int]0
\ No newline at end of file
diff --git a/EZBlocker/packages/SharpZipLib.0.86.0/SharpZipLib.0.86.0.nupkg b/EZBlocker/packages/SharpZipLib.0.86.0/SharpZipLib.0.86.0.nupkg
deleted file mode 100644
index 27717487..00000000
Binary files a/EZBlocker/packages/SharpZipLib.0.86.0/SharpZipLib.0.86.0.nupkg and /dev/null differ
diff --git a/EZBlocker/packages/SharpZipLib.0.86.0/lib/11/ICSharpCode.SharpZipLib.dll b/EZBlocker/packages/SharpZipLib.0.86.0/lib/11/ICSharpCode.SharpZipLib.dll
deleted file mode 100644
index 60ef0c99..00000000
Binary files a/EZBlocker/packages/SharpZipLib.0.86.0/lib/11/ICSharpCode.SharpZipLib.dll and /dev/null differ
diff --git a/EZBlocker/packages/SharpZipLib.0.86.0/lib/20/ICSharpCode.SharpZipLib.dll b/EZBlocker/packages/SharpZipLib.0.86.0/lib/20/ICSharpCode.SharpZipLib.dll
deleted file mode 100644
index fe643ebc..00000000
Binary files a/EZBlocker/packages/SharpZipLib.0.86.0/lib/20/ICSharpCode.SharpZipLib.dll and /dev/null differ
diff --git a/EZBlocker/packages/SharpZipLib.0.86.0/lib/SL3/SharpZipLib.Silverlight3.dll b/EZBlocker/packages/SharpZipLib.0.86.0/lib/SL3/SharpZipLib.Silverlight3.dll
deleted file mode 100644
index e3fd9620..00000000
Binary files a/EZBlocker/packages/SharpZipLib.0.86.0/lib/SL3/SharpZipLib.Silverlight3.dll and /dev/null differ
diff --git a/EZBlocker/packages/SharpZipLib.0.86.0/lib/SL4/SharpZipLib.Silverlight4.dll b/EZBlocker/packages/SharpZipLib.0.86.0/lib/SL4/SharpZipLib.Silverlight4.dll
deleted file mode 100644
index f915af4c..00000000
Binary files a/EZBlocker/packages/SharpZipLib.0.86.0/lib/SL4/SharpZipLib.Silverlight4.dll and /dev/null differ
diff --git a/LICENSE b/LICENSE
old mode 100644
new mode 100755
diff --git a/README.md b/README.md
old mode 100644
new mode 100755
index 695c2e70..b37b46c8
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 EZBlocker
 =========
 
-EZBlocker is a Spotify Ad Blocker written in C# for Windows 7/8/10. The goal for EZBlocker is to be the most reliable ad blocker for Spotify.
+EZBlocker is a Spotify Ad Blocker written in C# for Windows 7/8/10/11. The goal for EZBlocker is to be the most reliable ad blocker for Spotify.
 
 When an advertisement is playing, EZBlocker will mute Spotify until it's over.
 
@@ -35,7 +35,9 @@ More data could probably be extracted through the web worker, but I haven't had
 
 
 ## Changelog (Major releases only):
-
+- V 1.8 (Oct 31, 2021):
+  - New muting logic, reduces false positives (podcasts no longer muted)
+  - Cleanup and bugfixes
 - V 1.7 (July 22, 2018):
   - Almost a complete re-write of the application (lighter, more performant, cleaner code)
   - New Spotify ad detection and muting logic after Spotify's shutdown of its local API