diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config
index 8751237f..40bedb04 100644
--- a/.nuget/NuGet.Config
+++ b/.nuget/NuGet.Config
@@ -2,10 +2,10 @@
 <configuration>
   <packageSources>
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="FFXIVAPP.Common" value="D:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-common\packages" />
-	<add key="FFXIVAPP.IPluginInterface" value="D:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-iplugininterface\packages" />
-    <add key="FFXIVAPP.ResourceFiles" value="D:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-resourcefiles\packages" />
-    <add key="Sharlayan" value="D:\Users\Icehunter\Source\Repos\ffxivapp\sharlayan\distribution" />
+    <add key="FFXIVAPP.Common" value="C:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-common\packages" />
+	<add key="FFXIVAPP.IPluginInterface" value="C:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-iplugininterface\packages" />
+    <add key="FFXIVAPP.ResourceFiles" value="C:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-resourcefiles\packages" />
+    <add key="Sharlayan" value="C:\Users\Icehunter\Source\Repos\ffxivapp\sharlayan\distribution" />
   </packageSources>
   <activePackageSource>
     <add key="All" value="(Aggregate source)" />
diff --git a/FFXIVAPP.Client/FFXIVAPP.Client.csproj b/FFXIVAPP.Client/FFXIVAPP.Client.csproj
index 21199999..517ef2f2 100644
--- a/FFXIVAPP.Client/FFXIVAPP.Client.csproj
+++ b/FFXIVAPP.Client/FFXIVAPP.Client.csproj
@@ -54,13 +54,13 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="FFXIVAPP.Common, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\FFXIVAPP.Common.5.0.1\lib\net462\FFXIVAPP.Common.dll</HintPath>
+      <HintPath>..\..\ffxivapp-common\build\Debug\FFXIVAPP.Common.dll</HintPath>
     </Reference>
     <Reference Include="FFXIVAPP.IPluginInterface, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\FFXIVAPP.IPluginInterface.5.0.3\lib\net462\FFXIVAPP.IPluginInterface.dll</HintPath>
+      <HintPath>..\..\ffxivapp-iplugininterface\build\Debug\FFXIVAPP.IPluginInterface.dll</HintPath>
     </Reference>
     <Reference Include="FFXIVAPP.ResourceFiles, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\FFXIVAPP.ResourceFiles.2.0.1\lib\net462\FFXIVAPP.ResourceFiles.dll</HintPath>
+      <HintPath>..\..\ffxivapp-resourcefiles\build\Debug\FFXIVAPP.ResourceFiles.dll</HintPath>
     </Reference>
     <Reference Include="HtmlAgilityPack, Version=1.8.4.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
       <HintPath>..\packages\HtmlAgilityPack.1.8.4\lib\Net45\HtmlAgilityPack.dll</HintPath>
@@ -85,7 +85,7 @@
       <HintPath>..\packages\NLog.4.5.6\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="Sharlayan, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sharlayan.5.0.3\lib\net462\Sharlayan.dll</HintPath>
+      <HintPath>..\..\sharlayan\distribution\Sharlayan.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
@@ -332,6 +332,24 @@
     <Analyzer Include="..\packages\Text.Analyzers.2.6.1\analyzers\dotnet\cs\Text.Analyzers.dll" />
     <Analyzer Include="..\packages\Text.Analyzers.2.6.1\analyzers\dotnet\cs\Text.CSharp.Analyzers.dll" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\ffxivapp-common\FFXIVAPP.Common\FFXIVAPP.Common.csproj">
+      <Project>{8d6cda64-78be-4bf0-b613-0c9afa225df5}</Project>
+      <Name>FFXIVAPP.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\ffxivapp-iplugininterface\FFXIVAPP.IPluginInterface\FFXIVAPP.IPluginInterface.csproj">
+      <Project>{56e3fd21-17c4-4306-ba2c-adaf6aaea330}</Project>
+      <Name>FFXIVAPP.IPluginInterface</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\ffxivapp-resourcefiles\FFXIVAPP.ResourceFiles\FFXIVAPP.ResourceFiles.csproj">
+      <Project>{38e2405f-58d4-411c-b1df-6e2d6f14082e}</Project>
+      <Name>FFXIVAPP.ResourceFiles</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\sharlayan\Sharlayan\Sharlayan.csproj">
+      <Project>{9510d5ef-208a-4897-a582-8eae5c6e9406}</Project>
+      <Name>Sharlayan</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>%25SYSTEMROOT%25\System32\WindowsPowerShell\v1.0\powershell.exe –NonInteractive –ExecutionPolicy Unrestricted –command "&amp; { &amp;'$(SolutionDir)RestorePackages.ps1' '$(SolutionDir).nuget/nuget.exe' }"</PreBuildEvent>
@@ -349,11 +367,11 @@
   </Target>
   <Import Project="..\packages\Fody.3.1.3\build\Fody.targets" Condition="Exists('..\packages\Fody.3.1.3\build\Fody.targets')" />
   <Import Project="..\packages\Costura.Fody.3.1.0\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.3.1.0\build\Costura.Fody.targets')" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- 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">
   </Target>
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/FFXIVAPP.Client/Initializer.cs b/FFXIVAPP.Client/Initializer.cs
index c172777e..09c448f1 100644
--- a/FFXIVAPP.Client/Initializer.cs
+++ b/FFXIVAPP.Client/Initializer.cs
@@ -157,9 +157,6 @@ internal static class Initializer {
 
                                 MessageBoxHelper.ShowMessageAsync(title, message.ToString(), () => ShellView.CloseApplication(true), delegate { });
                             }
-
-                            var uri = "https://ffxiv-app.com/Analytics/Google/?eCategory=Application Launch&eAction=Version Check&eLabel=FFXIVAPP";
-                            DispatcherHelper.Invoke(() => MainView.View.GoogleAnalytics.Navigate(uri));
                         }
                     }
                 }
diff --git a/FFXIVAPP.Client/Properties/AssemblyInfo.cs b/FFXIVAPP.Client/Properties/AssemblyInfo.cs
index 66c69260..41e3c4f7 100644
--- a/FFXIVAPP.Client/Properties/AssemblyInfo.cs
+++ b/FFXIVAPP.Client/Properties/AssemblyInfo.cs
@@ -20,7 +20,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("SyndicatedLife")]
 [assembly: AssemblyProduct("FFXIVAPP.Client")]
-[assembly: AssemblyCopyright("Copyright © 2007 - 2017 Ryan Wilson")]
+[assembly: AssemblyCopyright("Copyright © 2007 - 2020 Ryan Wilson")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/FFXIVAPP.Client/ViewModels/MainViewModel.cs b/FFXIVAPP.Client/ViewModels/MainViewModel.cs
index d381b824..ccc3d54e 100644
--- a/FFXIVAPP.Client/ViewModels/MainViewModel.cs
+++ b/FFXIVAPP.Client/ViewModels/MainViewModel.cs
@@ -38,7 +38,7 @@ internal sealed class MainViewModel : INotifyPropertyChanged {
 
         public void OpenWebSite() {
             try {
-                Process.Start("https://ffxiv-app.com");
+                Process.Start("https://xivapp.com");
             }
             catch (Exception ex) {
                 MessageBoxHelper.ShowMessage(AppViewModel.Instance.Locale["app_WarningMessage"], ex.Message);
diff --git a/FFXIVAPP.Client/Views/MainView.xaml b/FFXIVAPP.Client/Views/MainView.xaml
index dcc25fd6..adcc5dfb 100644
--- a/FFXIVAPP.Client/Views/MainView.xaml
+++ b/FFXIVAPP.Client/Views/MainView.xaml
@@ -18,7 +18,7 @@
                        Source="/FFXIVAPP.ResourceFiles;component/Theme/splash.png" />
                 <Button Width="200"
                         Command="{Binding OpenWebSiteCommand}"
-                        Content="Open https://ffxiv-app.com" />
+                        Content="Open https://xivapp.com" />
                 <WebBrowser x:Name="GoogleAnalytics" Visibility="Collapsed" />
             </StackPanel>
         </ScrollViewer>
diff --git a/FFXIVAPP.Client/packages.config b/FFXIVAPP.Client/packages.config
index 4ccf8013..66bfdda9 100644
--- a/FFXIVAPP.Client/packages.config
+++ b/FFXIVAPP.Client/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Costura.Fody" version="3.1.0" targetFramework="net462" />
-  <package id="FFXIVAPP.Common" version="5.0.1" targetFramework="net462" />
-  <package id="FFXIVAPP.IPluginInterface" version="5.0.3" targetFramework="net462" />
+  <package id="FFXIVAPP.Common" version="5.0.2" targetFramework="net462" />
+  <package id="FFXIVAPP.IPluginInterface" version="5.0.4" targetFramework="net462" />
   <package id="FFXIVAPP.ResourceFiles" version="2.0.1" targetFramework="net462" />
   <package id="Fody" version="3.1.3" targetFramework="net462" developmentDependency="true" />
   <package id="HtmlAgilityPack" version="1.8.4" targetFramework="net462" />
@@ -19,7 +19,7 @@
   <package id="NLog" version="4.5.6" targetFramework="net462" />
   <package id="NLog.Config" version="4.5.6" targetFramework="net462" />
   <package id="NLog.Schema" version="4.5.6" targetFramework="net462" />
-  <package id="Sharlayan" version="5.0.3" targetFramework="net462" />
+  <package id="Sharlayan" version="5.0.5" targetFramework="net462" />
   <package id="StyleCop.Analyzers" version="1.0.2" targetFramework="net462" developmentDependency="true" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
   <package id="Text.Analyzers" version="2.6.1" targetFramework="net462" developmentDependency="true" />
diff --git a/FFXIVAPP.Updater/MainWindow.xaml.cs b/FFXIVAPP.Updater/MainWindow.xaml.cs
index 69fa3698..b450d0da 100644
--- a/FFXIVAPP.Updater/MainWindow.xaml.cs
+++ b/FFXIVAPP.Updater/MainWindow.xaml.cs
@@ -63,17 +63,16 @@ public partial class MainWindow : INotifyPropertyChanged {
         /// <summary>
         /// </summary>
         private void DownloadUpdate() {
-            this.GoogleAnalytics.Navigate("https://ffxiv-app.com/Analytics/Google/?eCategory=Application Update&eAction=Download&eLabel=FFXIVAPP");
-            this.GoogleAnalytics.LoadCompleted += delegate {
-                try {
-                    this._webClient.DownloadFileCompleted += this.WebClientOnDownloadFileCompleted;
-                    this._webClient.DownloadProgressChanged += this.WebClientOnDownloadProgressChanged;
-                    this._webClient.DownloadFileAsync(new Uri(MainWindowViewModel.Instance.DownloadURI), MainWindowViewModel.Instance.ZipFileName);
-                }
-                catch (Exception) {
-                    Environment.Exit(0);
-                }
-            };
+            try
+            {
+                this._webClient.DownloadFileCompleted += this.WebClientOnDownloadFileCompleted;
+                this._webClient.DownloadProgressChanged += this.WebClientOnDownloadProgressChanged;
+                this._webClient.DownloadFileAsync(new Uri(MainWindowViewModel.Instance.DownloadURI), MainWindowViewModel.Instance.ZipFileName);
+            }
+            catch (Exception)
+            {
+                Environment.Exit(0);
+            }
         }
 
         private void ExtractAndClean() {
diff --git a/FFXIVAPP.Updater/Properties/AssemblyInfo.cs b/FFXIVAPP.Updater/Properties/AssemblyInfo.cs
index c8ce3771..c1088099 100644
--- a/FFXIVAPP.Updater/Properties/AssemblyInfo.cs
+++ b/FFXIVAPP.Updater/Properties/AssemblyInfo.cs
@@ -20,7 +20,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("SyndicatedLife")]
 [assembly: AssemblyProduct("FFXIVAPP.Updater")]
-[assembly: AssemblyCopyright("Copyright © 2007 - 2017 Ryan Wilson")]
+[assembly: AssemblyCopyright("Copyright © 2007 - 2020 Ryan Wilson")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/FFXIVAPP.sln.DotSettings b/FFXIVAPP.sln.DotSettings
index 5d63c8a9..160d4d2e 100644
--- a/FFXIVAPP.sln.DotSettings
+++ b/FFXIVAPP.sln.DotSettings
@@ -458,6 +458,7 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
diff --git a/SetupLinks.bat b/SetupLinks.bat
index d3e814ab..d1138300 100644
--- a/SetupLinks.bat
+++ b/SetupLinks.bat
@@ -1,6 +1,6 @@
-mklink /J FFXIVAPP.Plugin.Event D:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-plugin-event\distribution
-mklink /J FFXIVAPP.Plugin.Informer D:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-plugin-informer\distribution
-mklink /J FFXIVAPP.Plugin.Log D:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-plugin-log\distribution
-mklink /J FFXIVAPP.Plugin.Parse D:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-plugin-parse\distribution
-mklink /J FFXIVAPP.Plugin.Radar D:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-plugin-radar\distribution
-mklink /J FFXIVAPP.Plugin.Widgets D:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-plugin-widgets\distribution
\ No newline at end of file
+mklink /J FFXIVAPP.Plugin.Event C:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-plugin-event\distribution
+mklink /J FFXIVAPP.Plugin.Informer C:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-plugin-informer\distribution
+mklink /J FFXIVAPP.Plugin.Log C:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-plugin-log\distribution
+mklink /J FFXIVAPP.Plugin.Parse C:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-plugin-parse\distribution
+mklink /J FFXIVAPP.Plugin.Radar C:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-plugin-radar\distribution
+mklink /J FFXIVAPP.Plugin.Widgets C:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-plugin-widgets\distribution
diff --git a/distribution/FFXIVAPP.Common.dll b/distribution/FFXIVAPP.Common.dll
index dc693b53..4f7fbf13 100644
Binary files a/distribution/FFXIVAPP.Common.dll and b/distribution/FFXIVAPP.Common.dll differ
diff --git a/distribution/FFXIVAPP.Common.xml b/distribution/FFXIVAPP.Common.xml
index 6266aa23..e2be78bb 100644
--- a/distribution/FFXIVAPP.Common.xml
+++ b/distribution/FFXIVAPP.Common.xml
@@ -82,19 +82,19 @@
             <param name="culture"> </param>
             <returns> </returns>
         </member>
-        <member name="M:FFXIVAPP.Common.Converters.StringToBrushConverter.ConvertBack(System.Object,System.Type,System.Object,System.Globalization.CultureInfo)">
+        <member name="M:FFXIVAPP.Common.Converters.StringToBrushConverter.Convert(System.Object)">
             <summary>
             </summary>
             <param name="value"> </param>
-            <param name="targetType"> </param>
-            <param name="parameter"> </param>
-            <param name="culture"> </param>
             <returns> </returns>
         </member>
-        <member name="M:FFXIVAPP.Common.Converters.StringToBrushConverter.Convert(System.Object)">
+        <member name="M:FFXIVAPP.Common.Converters.StringToBrushConverter.ConvertBack(System.Object,System.Type,System.Object,System.Globalization.CultureInfo)">
             <summary>
             </summary>
             <param name="value"> </param>
+            <param name="targetType"> </param>
+            <param name="parameter"> </param>
+            <param name="culture"> </param>
             <returns> </returns>
         </member>
         <member name="M:FFXIVAPP.Common.Converters.VisibilityConverter.Convert(System.Object,System.Type,System.Object,System.Globalization.CultureInfo)">
@@ -127,12 +127,6 @@
             </summary>
             <returns> </returns>
         </member>
-        <member name="M:FFXIVAPP.Common.Helpers.FlowDocHelper.BlockLoaded(System.Object,System.Windows.RoutedEventArgs)">
-            <summary>
-            </summary>
-            <param name="sender"> </param>
-            <param name="e"> </param>
-        </member>
         <member name="M:FFXIVAPP.Common.Helpers.FlowDocHelper.AppendFlow(System.String,System.String,System.String,System.String[],System.Windows.Controls.FlowDocumentReader)">
             <summary>
             </summary>
@@ -142,6 +136,18 @@
             <param name="colors"> </param>
             <param name="flow"> </param>
         </member>
+        <member name="M:FFXIVAPP.Common.Helpers.FlowDocHelper.BlockLoaded(System.Object,System.Windows.RoutedEventArgs)">
+            <summary>
+            </summary>
+            <param name="sender"> </param>
+            <param name="e"> </param>
+        </member>
+        <member name="M:FFXIVAPP.Common.Helpers.ResourceHelper.StreamResource(System.String)">
+            <summary>
+            </summary>
+            <param name="path"> </param>
+            <returns> </returns>
+        </member>
         <member name="M:FFXIVAPP.Common.Helpers.ResourceHelper.StringResource(System.String)">
             <summary>
             </summary>
@@ -155,12 +161,6 @@
             <param name="field"> </param>
             <returns> </returns>
         </member>
-        <member name="M:FFXIVAPP.Common.Helpers.ResourceHelper.StreamResource(System.String)">
-            <summary>
-            </summary>
-            <param name="path"> </param>
-            <returns> </returns>
-        </member>
         <member name="M:FFXIVAPP.Common.Helpers.ResourceHelper.XDocResource(System.String)">
             <summary>
             </summary>
@@ -189,15 +189,6 @@
             <param name="t"></param>
             <param name="window"></param>
         </member>
-        <member name="M:FFXIVAPP.Common.Helpers.XmlHelper.SaveXmlNode(System.Xml.Linq.XDocument,System.String,System.String,System.String,System.Collections.Generic.IEnumerable{FFXIVAPP.Common.Models.XValuePair})">
-            <summary>
-            </summary>
-            <param name="xDoc"> </param>
-            <param name="xRoot"> </param>
-            <param name="xNode"> </param>
-            <param name="xKey"> </param>
-            <param name="xValuePairs"> </param>
-        </member>
         <member name="M:FFXIVAPP.Common.Helpers.XmlHelper.DeleteXmlNode(System.Xml.Linq.XDocument,System.String)">
             <summary>
             </summary>
@@ -210,6 +201,15 @@
             <param name="xValue"> </param>
             <returns> </returns>
         </member>
+        <member name="M:FFXIVAPP.Common.Helpers.XmlHelper.SaveXmlNode(System.Xml.Linq.XDocument,System.String,System.String,System.String,System.Collections.Generic.IEnumerable{FFXIVAPP.Common.Models.XValuePair})">
+            <summary>
+            </summary>
+            <param name="xDoc"> </param>
+            <param name="xRoot"> </param>
+            <param name="xNode"> </param>
+            <param name="xKey"> </param>
+            <param name="xValuePairs"> </param>
+        </member>
         <member name="M:FFXIVAPP.Common.Helpers.XmlHelper.IsLegalXmlChar(System.Int32)">
             <summary>
             </summary>
@@ -236,15 +236,20 @@
             </summary>
             <returns> </returns>
         </member>
-        <member name="M:FFXIVAPP.Common.Utilities.GridViewSort.ColumnHeaderClick(System.Object,System.Windows.RoutedEventArgs)">
+        <member name="M:FFXIVAPP.Common.Utilities.GridViewSort.ApplySort(System.ComponentModel.ICollectionView,System.String,System.Windows.Controls.ListView,System.Windows.Controls.GridViewColumnHeader)">
             <summary>
             </summary>
-            <param name="sender"> </param>
-            <param name="e"> </param>
+            <param name="view"> </param>
+            <param name="propertyName"> </param>
+            <param name="listView"> </param>
+            <param name="sortedColumnHeader"> </param>
         </member>
-        <member name="T:FFXIVAPP.Common.Utilities.GridViewSort.SortGlyphAdorner">
+        <member name="M:FFXIVAPP.Common.Utilities.GridViewSort.GetAncestor``1(System.Windows.DependencyObject)">
             <summary>
             </summary>
+            <typeparam name="T"> </typeparam>
+            <param name="dependencyObject"> </param>
+            <returns> </returns>
         </member>
         <member name="M:FFXIVAPP.Common.Utilities.GridViewSort.GetCommand(System.Windows.DependencyObject)">
             <summary>
@@ -258,44 +263,39 @@
             <param name="dependencyObject"> </param>
             <param name="command"> </param>
         </member>
-        <member name="M:FFXIVAPP.Common.Utilities.GridViewSort.GetSortedColumnHeader(System.Windows.DependencyObject)">
+        <member name="M:FFXIVAPP.Common.Utilities.GridViewSort.AddSortGlyph(System.Windows.Controls.GridViewColumnHeader,System.ComponentModel.ListSortDirection,System.Windows.Media.ImageSource)">
             <summary>
             </summary>
-            <param name="dependencyObject"> </param>
-            <returns> </returns>
+            <param name="columnHeader"> </param>
+            <param name="direction"> </param>
+            <param name="sortGlyph"> </param>
         </member>
-        <member name="M:FFXIVAPP.Common.Utilities.GridViewSort.SetSortedColumnHeader(System.Windows.DependencyObject,System.Windows.Controls.GridViewColumnHeader)">
+        <member name="M:FFXIVAPP.Common.Utilities.GridViewSort.ColumnHeaderClick(System.Object,System.Windows.RoutedEventArgs)">
             <summary>
             </summary>
-            <param name="dependencyObject"> </param>
-            <param name="header"> </param>
+            <param name="sender"> </param>
+            <param name="e"> </param>
         </member>
-        <member name="M:FFXIVAPP.Common.Utilities.GridViewSort.GetAncestor``1(System.Windows.DependencyObject)">
+        <member name="M:FFXIVAPP.Common.Utilities.GridViewSort.GetSortedColumnHeader(System.Windows.DependencyObject)">
             <summary>
             </summary>
-            <typeparam name="T"> </typeparam>
             <param name="dependencyObject"> </param>
             <returns> </returns>
         </member>
-        <member name="M:FFXIVAPP.Common.Utilities.GridViewSort.ApplySort(System.ComponentModel.ICollectionView,System.String,System.Windows.Controls.ListView,System.Windows.Controls.GridViewColumnHeader)">
+        <member name="M:FFXIVAPP.Common.Utilities.GridViewSort.RemoveSortGlyph(System.Windows.Controls.GridViewColumnHeader)">
             <summary>
             </summary>
-            <param name="view"> </param>
-            <param name="propertyName"> </param>
-            <param name="listView"> </param>
-            <param name="sortedColumnHeader"> </param>
+            <param name="columnHeader"> </param>
         </member>
-        <member name="M:FFXIVAPP.Common.Utilities.GridViewSort.AddSortGlyph(System.Windows.Controls.GridViewColumnHeader,System.ComponentModel.ListSortDirection,System.Windows.Media.ImageSource)">
+        <member name="M:FFXIVAPP.Common.Utilities.GridViewSort.SetSortedColumnHeader(System.Windows.DependencyObject,System.Windows.Controls.GridViewColumnHeader)">
             <summary>
             </summary>
-            <param name="columnHeader"> </param>
-            <param name="direction"> </param>
-            <param name="sortGlyph"> </param>
+            <param name="dependencyObject"> </param>
+            <param name="header"> </param>
         </member>
-        <member name="M:FFXIVAPP.Common.Utilities.GridViewSort.RemoveSortGlyph(System.Windows.Controls.GridViewColumnHeader)">
+        <member name="T:FFXIVAPP.Common.Utilities.GridViewSort.SortGlyphAdorner">
             <summary>
             </summary>
-            <param name="columnHeader"> </param>
         </member>
         <member name="M:FFXIVAPP.Common.Utilities.Logging.Log(NLog.Logger,FFXIVAPP.Common.Models.LogItem)">
             <summary>
@@ -329,33 +329,33 @@
             <param name="sender"> </param>
             <param name="e"> </param>
         </member>
-        <member name="M:FFXIVAPP.Common.ViewModelBase.CommandManagerHelper.CallWeakReferenceHandlers(System.Collections.Generic.List{System.WeakReference})">
+        <member name="M:FFXIVAPP.Common.ViewModelBase.CommandManagerHelper.AddHandlersToRequerySuggested(System.Collections.Generic.IEnumerable{System.WeakReference})">
             <summary>
             </summary>
             <param name="handlers"> </param>
         </member>
-        <member name="M:FFXIVAPP.Common.ViewModelBase.CommandManagerHelper.AddHandlersToRequerySuggested(System.Collections.Generic.IEnumerable{System.WeakReference})">
+        <member name="M:FFXIVAPP.Common.ViewModelBase.CommandManagerHelper.AddWeakReferenceHandler(System.Collections.Generic.List{System.WeakReference}@,System.EventHandler)">
             <summary>
             </summary>
             <param name="handlers"> </param>
+            <param name="handler"> </param>
         </member>
-        <member name="M:FFXIVAPP.Common.ViewModelBase.CommandManagerHelper.RemoveHandlersFromRequerySuggested(System.Collections.Generic.IEnumerable{System.WeakReference})">
+        <member name="M:FFXIVAPP.Common.ViewModelBase.CommandManagerHelper.AddWeakReferenceHandler(System.Collections.Generic.List{System.WeakReference}@,System.EventHandler,System.Int32)">
             <summary>
             </summary>
             <param name="handlers"> </param>
+            <param name="handler"> </param>
+            <param name="defaultListSize"> </param>
         </member>
-        <member name="M:FFXIVAPP.Common.ViewModelBase.CommandManagerHelper.AddWeakReferenceHandler(System.Collections.Generic.List{System.WeakReference}@,System.EventHandler)">
+        <member name="M:FFXIVAPP.Common.ViewModelBase.CommandManagerHelper.CallWeakReferenceHandlers(System.Collections.Generic.List{System.WeakReference})">
             <summary>
             </summary>
             <param name="handlers"> </param>
-            <param name="handler"> </param>
         </member>
-        <member name="M:FFXIVAPP.Common.ViewModelBase.CommandManagerHelper.AddWeakReferenceHandler(System.Collections.Generic.List{System.WeakReference}@,System.EventHandler,System.Int32)">
+        <member name="M:FFXIVAPP.Common.ViewModelBase.CommandManagerHelper.RemoveHandlersFromRequerySuggested(System.Collections.Generic.IEnumerable{System.WeakReference})">
             <summary>
             </summary>
             <param name="handlers"> </param>
-            <param name="handler"> </param>
-            <param name="defaultListSize"> </param>
         </member>
         <member name="M:FFXIVAPP.Common.ViewModelBase.CommandManagerHelper.RemoveWeakReferenceHandler(System.Collections.Generic.List{System.WeakReference},System.EventHandler)">
             <summary>
@@ -381,41 +381,41 @@
             <param name="canExecuteMethod"> </param>
             <param name="isAutomaticRequeryDisabled"> </param>
         </member>
-        <member name="P:FFXIVAPP.Common.ViewModelBase.DelegateCommand.IsAutomaticRequeryDisabled">
+        <member name="E:FFXIVAPP.Common.ViewModelBase.DelegateCommand.CanExecuteChanged">
             <summary>
             </summary>
         </member>
-        <member name="M:FFXIVAPP.Common.ViewModelBase.DelegateCommand.CanExecute">
+        <member name="P:FFXIVAPP.Common.ViewModelBase.DelegateCommand.IsAutomaticRequeryDisabled">
             <summary>
             </summary>
-            <returns> </returns>
         </member>
-        <member name="M:FFXIVAPP.Common.ViewModelBase.DelegateCommand.Execute">
+        <member name="M:FFXIVAPP.Common.ViewModelBase.DelegateCommand.RaiseCanExecuteChanged">
             <summary>
             </summary>
         </member>
-        <member name="M:FFXIVAPP.Common.ViewModelBase.DelegateCommand.RaiseCanExecuteChanged">
+        <member name="M:FFXIVAPP.Common.ViewModelBase.DelegateCommand.System#Windows#Input#ICommand#CanExecute(System.Object)">
             <summary>
             </summary>
+            <param name="parameter"> </param>
+            <returns> </returns>
         </member>
-        <member name="M:FFXIVAPP.Common.ViewModelBase.DelegateCommand.OnCanExecuteChanged">
+        <member name="M:FFXIVAPP.Common.ViewModelBase.DelegateCommand.System#Windows#Input#ICommand#Execute(System.Object)">
             <summary>
             </summary>
+            <param name="parameter"> </param>
         </member>
-        <member name="E:FFXIVAPP.Common.ViewModelBase.DelegateCommand.CanExecuteChanged">
+        <member name="M:FFXIVAPP.Common.ViewModelBase.DelegateCommand.CanExecute">
             <summary>
             </summary>
+            <returns> </returns>
         </member>
-        <member name="M:FFXIVAPP.Common.ViewModelBase.DelegateCommand.System#Windows#Input#ICommand#CanExecute(System.Object)">
+        <member name="M:FFXIVAPP.Common.ViewModelBase.DelegateCommand.Execute">
             <summary>
             </summary>
-            <param name="parameter"> </param>
-            <returns> </returns>
         </member>
-        <member name="M:FFXIVAPP.Common.ViewModelBase.DelegateCommand.System#Windows#Input#ICommand#Execute(System.Object)">
+        <member name="M:FFXIVAPP.Common.ViewModelBase.DelegateCommand.OnCanExecuteChanged">
             <summary>
             </summary>
-            <param name="parameter"> </param>
         </member>
         <member name="M:FFXIVAPP.Common.ViewModelBase.DelegateCommand`1.#ctor(System.Action{`0},System.Func{`0,System.Boolean})">
             <summary>
@@ -430,43 +430,43 @@
             <param name="canExecuteMethod"> </param>
             <param name="isAutomaticRequeryDisabled"> </param>
         </member>
-        <member name="P:FFXIVAPP.Common.ViewModelBase.DelegateCommand`1.IsAutomaticRequeryDisabled">
+        <member name="E:FFXIVAPP.Common.ViewModelBase.DelegateCommand`1.CanExecuteChanged">
             <summary>
             </summary>
         </member>
-        <member name="M:FFXIVAPP.Common.ViewModelBase.DelegateCommand`1.CanExecute(`0)">
-            <summary>
-            </summary>
-            <param name="parameter"> </param>
-            <returns> </returns>
-        </member>
-        <member name="M:FFXIVAPP.Common.ViewModelBase.DelegateCommand`1.Execute(`0)">
+        <member name="P:FFXIVAPP.Common.ViewModelBase.DelegateCommand`1.IsAutomaticRequeryDisabled">
             <summary>
             </summary>
-            <param name="parameter"> </param>
         </member>
         <member name="M:FFXIVAPP.Common.ViewModelBase.DelegateCommand`1.RaiseCanExecuteChanged">
             <summary>
             </summary>
         </member>
-        <member name="M:FFXIVAPP.Common.ViewModelBase.DelegateCommand`1.OnCanExecuteChanged">
+        <member name="M:FFXIVAPP.Common.ViewModelBase.DelegateCommand`1.System#Windows#Input#ICommand#CanExecute(System.Object)">
             <summary>
             </summary>
+            <param name="parameter"> </param>
+            <returns> </returns>
         </member>
-        <member name="E:FFXIVAPP.Common.ViewModelBase.DelegateCommand`1.CanExecuteChanged">
+        <member name="M:FFXIVAPP.Common.ViewModelBase.DelegateCommand`1.System#Windows#Input#ICommand#Execute(System.Object)">
             <summary>
             </summary>
+            <param name="parameter"> </param>
         </member>
-        <member name="M:FFXIVAPP.Common.ViewModelBase.DelegateCommand`1.System#Windows#Input#ICommand#CanExecute(System.Object)">
+        <member name="M:FFXIVAPP.Common.ViewModelBase.DelegateCommand`1.CanExecute(`0)">
             <summary>
             </summary>
             <param name="parameter"> </param>
             <returns> </returns>
         </member>
-        <member name="M:FFXIVAPP.Common.ViewModelBase.DelegateCommand`1.System#Windows#Input#ICommand#Execute(System.Object)">
+        <member name="M:FFXIVAPP.Common.ViewModelBase.DelegateCommand`1.Execute(`0)">
             <summary>
             </summary>
             <param name="parameter"> </param>
         </member>
+        <member name="M:FFXIVAPP.Common.ViewModelBase.DelegateCommand`1.OnCanExecuteChanged">
+            <summary>
+            </summary>
+        </member>
     </members>
 </doc>
diff --git a/distribution/FFXIVAPP.IPluginInterface.dll b/distribution/FFXIVAPP.IPluginInterface.dll
index 655898d1..da195412 100644
Binary files a/distribution/FFXIVAPP.IPluginInterface.dll and b/distribution/FFXIVAPP.IPluginInterface.dll differ
diff --git a/distribution/FFXIVAPP.ResourceFiles.dll b/distribution/FFXIVAPP.ResourceFiles.dll
index fc990264..67a732bd 100644
Binary files a/distribution/FFXIVAPP.ResourceFiles.dll and b/distribution/FFXIVAPP.ResourceFiles.dll differ
diff --git a/distribution/Sharlayan.dll b/distribution/Sharlayan.dll
index 4189d137..72787f3e 100644
Binary files a/distribution/Sharlayan.dll and b/distribution/Sharlayan.dll differ