From 7ddc3d7672bc4f2c4768b9818f73461c72d92c2f Mon Sep 17 00:00:00 2001
From: SpoinkyNL <spoinky.nl@gmail.com>
Date: Thu, 6 Oct 2016 16:17:33 +0200
Subject: [PATCH] Added direction buttons to ColorPicker theme

---
 Artemis/Artemis/Artemis.csproj                |  24 ++--
 Artemis/Artemis/Styles/ColorBox.xaml          | 114 ++++++++++++++----
 .../Views/Flyouts/FlyoutSettingsView.xaml     |  62 +++++-----
 Artemis/Artemis/Views/ShellView.xaml          |  33 ++++-
 Artemis/Artemis/packages.config               |  10 +-
 5 files changed, 168 insertions(+), 75 deletions(-)

diff --git a/Artemis/Artemis/Artemis.csproj b/Artemis/Artemis/Artemis.csproj
index e11609de2..84f2eed16 100644
--- a/Artemis/Artemis/Artemis.csproj
+++ b/Artemis/Artemis/Artemis.csproj
@@ -151,8 +151,8 @@
       <HintPath>..\packages\Colore.5.0.0\lib\net35\Corale.Colore.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="CUE.NET, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\CUE.NET.1.1.0\lib\net45\CUE.NET.dll</HintPath>
+    <Reference Include="CUE.NET, Version=1.1.0.1, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\CUE.NET.1.1.0.1\lib\net45\CUE.NET.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="DeltaCompressionDotNet, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1d14d6e5194e7f4a, processorArchitecture=MSIL">
@@ -167,12 +167,12 @@
       <HintPath>..\packages\DeltaCompressionDotNet.1.0.0\lib\net45\DeltaCompressionDotNet.PatchApi.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="DynamicExpresso.Core, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DynamicExpresso.Core.1.3.1.0\lib\net40\DynamicExpresso.Core.dll</HintPath>
+    <Reference Include="DynamicExpresso.Core, Version=1.3.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\DynamicExpresso.Core.1.3.3.4\lib\net40\DynamicExpresso.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="GongSolutions.Wpf.DragDrop, Version=0.1.4.3, Culture=neutral, PublicKeyToken=d19974ea350ccea1, processorArchitecture=MSIL">
-      <HintPath>..\packages\gong-wpf-dragdrop.0.1.4.3\lib\net40\GongSolutions.Wpf.DragDrop.dll</HintPath>
+    <Reference Include="GongSolutions.Wpf.DragDrop, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\gong-wpf-dragdrop.1.0.0\lib\net46\GongSolutions.Wpf.DragDrop.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Hardcodet.Wpf.TaskbarNotification, Version=1.0.5.0, Culture=neutral, processorArchitecture=MSIL">
@@ -187,8 +187,8 @@
       <HintPath>..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="MahApps.Metro, Version=1.2.4.0, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL">
-      <HintPath>..\packages\MahApps.Metro.1.2.4.0\lib\net45\MahApps.Metro.dll</HintPath>
+    <Reference Include="MahApps.Metro, Version=1.3.0.0, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL">
+      <HintPath>..\packages\MahApps.Metro.1.3.0\lib\net45\MahApps.Metro.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.QualityTools.Testing.Fakes, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -255,7 +255,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="SpotifyAPI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SpotifyAPI-NET.2.11.0\lib\SpotifyAPI.dll</HintPath>
+      <HintPath>..\packages\SpotifyAPI-NET.2.12.0\lib\SpotifyAPI.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Squirrel, Version=1.4.3.0, Culture=neutral, processorArchitecture=MSIL">
@@ -273,7 +273,7 @@
     <Reference Include="System.Web" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Caliburn.Micro.3.0.1\lib\net45\System.Windows.Interactivity.dll</HintPath>
+      <HintPath>..\packages\MahApps.Metro.1.3.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml" />
@@ -888,12 +888,12 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\CUE.NET.1.1.0\build\net45\CUE.NET.targets" Condition="Exists('..\packages\CUE.NET.1.1.0\build\net45\CUE.NET.targets')" />
+  <Import Project="..\packages\CUE.NET.1.1.0.1\build\net45\CUE.NET.targets" Condition="Exists('..\packages\CUE.NET.1.1.0.1\build\net45\CUE.NET.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\CUE.NET.1.1.0\build\net45\CUE.NET.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CUE.NET.1.1.0\build\net45\CUE.NET.targets'))" />
+    <Error Condition="!Exists('..\packages\CUE.NET.1.1.0.1\build\net45\CUE.NET.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CUE.NET.1.1.0.1\build\net45\CUE.NET.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Artemis/Artemis/Styles/ColorBox.xaml b/Artemis/Artemis/Styles/ColorBox.xaml
index bbd797280..95467db6b 100644
--- a/Artemis/Artemis/Styles/ColorBox.xaml
+++ b/Artemis/Artemis/Styles/ColorBox.xaml
@@ -627,14 +627,102 @@
                                                     </DockPanel.Style>
 
                                                     <UniformGrid Rows="5" DockPanel.Dock="Left" Margin="0,0,5,0">
+                                                        <TextBlock Text="Preset" VerticalAlignment="Center" />
+                                                        <TextBlock Text="Direction" VerticalAlignment="Center" />
                                                         <TextBlock Text="Start Point" VerticalAlignment="Center" />
                                                         <TextBlock Text="End Point" VerticalAlignment="Center" />
-                                                        <TextBlock Text="Mapping Mode" VerticalAlignment="Center" />
-                                                        <TextBlock Text="Spread Method" VerticalAlignment="Center" />
                                                         <TextBlock Text="Opacity" VerticalAlignment="Center" />
                                                     </UniformGrid>
 
                                                     <UniformGrid Rows="5" DockPanel.Dock="Right">
+                                                        <!-- Presets -->
+                                                        <UniformGrid Rows="1">
+                                                            <nc:DoubleUpDown
+                                                                Value="{Binding StartX, RelativeSource={RelativeSource TemplatedParent}}" />
+                                                            <nc:DoubleUpDown
+                                                                Value="{Binding StartY, RelativeSource={RelativeSource TemplatedParent}}" />
+                                                        </UniformGrid>
+
+                                                        <!-- Directions -->
+                                                        <UniformGrid Rows="1">
+                                                            <Button ToolTip="Horizontal"
+                                                                    Command="{x:Static nc:ColorBox.ReverseGradientStop}"
+                                                                    VerticalAlignment="Top" Width="32">
+                                                                <Button.Content>
+                                                                    <Rectangle
+                                                                        Fill="{Binding Path=Foreground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Button}}}"
+                                                                        Width="4" Height="14">
+                                                                        <Rectangle.OpacityMask>
+                                                                            <VisualBrush
+                                                                                Visual="{StaticResource appbar_minus}"
+                                                                                Stretch="Fill" />
+                                                                        </Rectangle.OpacityMask>
+                                                                        <Rectangle.RenderTransform>
+                                                                            <RotateTransform CenterX="2" CenterY="7"
+                                                                                             Angle="-90" />
+                                                                        </Rectangle.RenderTransform>
+                                                                    </Rectangle>
+                                                                </Button.Content>
+                                                            </Button>
+
+                                                            <Button ToolTip="Vertical"
+                                                                    Command="{x:Static nc:ColorBox.ReverseGradientStop}"
+                                                                    VerticalAlignment="Top" Width="32">
+                                                                <Button.Content>
+                                                                    <Rectangle
+                                                                        Fill="{Binding Path=Foreground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Button}}}"
+                                                                        Width="4" Height="14">
+                                                                        <Rectangle.OpacityMask>
+                                                                            <VisualBrush
+                                                                                Visual="{StaticResource appbar_minus}"
+                                                                                Stretch="Fill" />
+                                                                        </Rectangle.OpacityMask>
+                                                                    </Rectangle>
+                                                                </Button.Content>
+                                                            </Button>
+
+                                                            <Button ToolTip="Top left to bottom right"
+                                                                    Command="{x:Static nc:ColorBox.ReverseGradientStop}"
+                                                                    VerticalAlignment="Top" Width="32">
+                                                                <Button.Content>
+                                                                    <Rectangle
+                                                                        Fill="{Binding Path=Foreground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Button}}}"
+                                                                        Width="4" Height="14">
+                                                                        <Rectangle.OpacityMask>
+                                                                            <VisualBrush
+                                                                                Visual="{StaticResource appbar_minus}"
+                                                                                Stretch="Fill" />
+                                                                        </Rectangle.OpacityMask>
+                                                                        <Rectangle.RenderTransform>
+                                                                            <RotateTransform CenterX="2" CenterY="7"
+                                                                                             Angle="-45" />
+                                                                        </Rectangle.RenderTransform>
+                                                                    </Rectangle>
+                                                                </Button.Content>
+                                                            </Button>
+
+                                                            <Button ToolTip="Top right to bottom left"
+                                                                    Command="{x:Static nc:ColorBox.ReverseGradientStop}"
+                                                                    VerticalAlignment="Top" Width="32">
+                                                                <Button.Content>
+                                                                    <Rectangle
+                                                                        Fill="{Binding Path=Foreground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Button}}}"
+                                                                        Width="4" Height="14">
+                                                                        <Rectangle.OpacityMask>
+                                                                            <VisualBrush
+                                                                                Visual="{StaticResource appbar_minus}"
+                                                                                Stretch="Fill" />
+                                                                        </Rectangle.OpacityMask>
+                                                                        <Rectangle.RenderTransform>
+                                                                            <RotateTransform CenterX="2" CenterY="7"
+                                                                                             Angle="45" />
+                                                                        </Rectangle.RenderTransform>
+                                                                    </Rectangle>
+
+                                                                </Button.Content>
+                                                            </Button>
+                                                        </UniformGrid>
+
                                                         <UniformGrid Rows="1">
                                                             <nc:DoubleUpDown
                                                                 Value="{Binding StartX, RelativeSource={RelativeSource TemplatedParent}}" />
@@ -649,14 +737,6 @@
                                                                 Value="{Binding EndY, RelativeSource={RelativeSource TemplatedParent}}" />
                                                         </UniformGrid>
 
-                                                        <ComboBox Margin="2"
-                                                                  ItemsSource="{Binding MappingModeTypes, RelativeSource={RelativeSource TemplatedParent}}"
-                                                                  SelectedItem="{Binding MappingMode, RelativeSource={RelativeSource TemplatedParent}}" />
-
-                                                        <ComboBox Margin="2"
-                                                                  ItemsSource="{Binding SpreadMethodTypes, RelativeSource={RelativeSource TemplatedParent}}"
-                                                                  SelectedItem="{Binding SpreadMethod, RelativeSource={RelativeSource TemplatedParent}}" />
-
                                                         <Slider Style="{StaticResource OpacitySliderStyle}" />
                                                     </UniformGrid>
                                                 </DockPanel>
@@ -676,17 +756,15 @@
                                                         </Style>
                                                     </DockPanel.Style>
 
-                                                    <UniformGrid Rows="7" DockPanel.Dock="Left" Margin="0,0,5,0">
+                                                    <UniformGrid Rows="5" DockPanel.Dock="Left" Margin="0,0,5,0">
                                                         <TextBlock Text="Gradient Origin" VerticalAlignment="Center" />
                                                         <TextBlock Text="Center" VerticalAlignment="Center" />
                                                         <TextBlock Text="Radius X" VerticalAlignment="Center" />
                                                         <TextBlock Text="Radius Y" VerticalAlignment="Center" />
-                                                        <TextBlock Text="Mapping Mode" VerticalAlignment="Center" />
-                                                        <TextBlock Text="Spread Method" VerticalAlignment="Center" />
                                                         <TextBlock Text="Opacity" VerticalAlignment="Center" />
                                                     </UniformGrid>
 
-                                                    <UniformGrid Rows="7" DockPanel.Dock="Right">
+                                                    <UniformGrid Rows="5" DockPanel.Dock="Right">
                                                         <UniformGrid Rows="1">
                                                             <nc:DoubleUpDown
                                                                 Value="{Binding GradientOriginX, RelativeSource={RelativeSource TemplatedParent}}" />
@@ -707,14 +785,6 @@
                                                         <nc:DoubleUpDown
                                                             Value="{Binding RadiusY, RelativeSource={RelativeSource TemplatedParent}}" />
 
-                                                        <ComboBox Margin="2"
-                                                                  ItemsSource="{Binding MappingModeTypes, RelativeSource={RelativeSource TemplatedParent}}"
-                                                                  SelectedItem="{Binding MappingMode, RelativeSource={RelativeSource TemplatedParent}}" />
-
-                                                        <ComboBox Margin="2"
-                                                                  ItemsSource="{Binding SpreadMethodTypes, RelativeSource={RelativeSource TemplatedParent}}"
-                                                                  SelectedItem="{Binding SpreadMethod, RelativeSource={RelativeSource TemplatedParent}}" />
-
                                                         <Slider Style="{StaticResource OpacitySliderStyle}" />
                                                     </UniformGrid>
                                                 </DockPanel>
diff --git a/Artemis/Artemis/Views/Flyouts/FlyoutSettingsView.xaml b/Artemis/Artemis/Views/Flyouts/FlyoutSettingsView.xaml
index 3db824477..abb1d0d3f 100644
--- a/Artemis/Artemis/Views/Flyouts/FlyoutSettingsView.xaml
+++ b/Artemis/Artemis/Views/Flyouts/FlyoutSettingsView.xaml
@@ -7,7 +7,7 @@
              xmlns:cal="http://www.caliburnproject.org"
              mc:Ignorable="d"
              d:DesignHeight="600" d:DesignWidth="300"
-             Width="300">
+             Width="270">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto" />
@@ -25,30 +25,33 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
 
         <!-- Master switch -->
         <Label Grid.Row="0" Grid.Column="0" Margin="5" VerticalAlignment="Center" HorizontalAlignment="Left"
                Content="Enable Artemis:" />
-        <controls:ToggleSwitch Grid.Row="0" Grid.Column="1" Margin="5" OnLabel="Yes" OffLabel="No"
-                               VerticalAlignment="Center" HorizontalAlignment="Right" Width="125"
-                               IsChecked="{Binding Path=Enabled, Mode=TwoWay}" />
+        <controls:ToggleSwitchButton Grid.Row="0" Grid.Column="1" Margin="5,5,10,5" VerticalAlignment="Center"
+                                     IsChecked="{Binding Path=Enabled, Mode=TwoWay}"
+                                     Style="{StaticResource MahApps.Metro.Styles.ToggleSwitchButton.Win10}"
+                                     HorizontalAlignment="Right" />
 
         <!-- Startup with Windows -->
         <Label Grid.Row="1" Grid.Column="0" Margin="5" VerticalAlignment="Center" HorizontalAlignment="Left"
-               Content="Startup with Windows:" />
-        <controls:ToggleSwitch Grid.Row="1" Grid.Column="1" Margin="5" OnLabel="Yes" OffLabel="No"
-                               IsChecked="{Binding Path=GeneralSettings.Autorun, Mode=TwoWay}"
-                               VerticalAlignment="Center" HorizontalAlignment="Right" Width="125" />
+               Content="Auto startup:" />
+        <controls:ToggleSwitchButton Grid.Row="1" Grid.Column="1" Margin="5,5,10,5" VerticalAlignment="Center"
+                                     IsChecked="{Binding Path=GeneralSettings.Autorun, Mode=TwoWay}"
+                                     Style="{StaticResource MahApps.Metro.Styles.ToggleSwitchButton.Win10}"
+                                     HorizontalAlignment="Right" />
+
 
         <!-- Show on startup -->
         <Label Grid.Row="2" Grid.Column="0" Margin="5" VerticalAlignment="Center" HorizontalAlignment="Left"
                Content="Show on startup:" />
-        <controls:ToggleSwitch Grid.Row="2" Grid.Column="1" Margin="5" OnLabel="Yes" OffLabel="No"
-                               IsChecked="{Binding Path=GeneralSettings.ShowOnStartup, Mode=TwoWay}"
-                               VerticalAlignment="Center" HorizontalAlignment="Right" Width="125" />
+        <controls:ToggleSwitchButton Grid.Row="2" Grid.Column="1" Margin="5,5,10,5" VerticalAlignment="Center"
+                                     IsChecked="{Binding Path=GeneralSettings.ShowOnStartup, Mode=TwoWay}"
+                                     Style="{StaticResource MahApps.Metro.Styles.ToggleSwitchButton.Win10}"
+                                     HorizontalAlignment="Right" />
 
         <!-- Theme selection -->
         <Label Grid.Row="3" Grid.Column="0" Margin="5" VerticalAlignment="Center" HorizontalAlignment="Left"
@@ -73,45 +76,40 @@
 
         <!-- Gamestate port -->
         <Label Grid.Row="6" Grid.Column="0" Margin="5" VerticalAlignment="Center" HorizontalAlignment="Left"
-               Content="Gamestate server port:" />
+               Content="Gamestate port:" />
         <controls:NumericUpDown Grid.Row="6" Grid.Column="1" Margin="10" VerticalAlignment="Center"
-                                HorizontalAlignment="Right" Width="120"
+                                HorizontalAlignment="Right" Width="140"
                                 Value="{Binding Path=GeneralSettings.GamestatePort, Mode=TwoWay}" />
 
         <!-- Updates check -->
         <Label Grid.Row="7" Grid.Column="0" Margin="5" VerticalAlignment="Center" HorizontalAlignment="Left"
                Content="Auto-update:" />
-        <controls:ToggleSwitch Grid.Row="7" Grid.Column="1" Margin="5" OnLabel="Yes" OffLabel="No"
-                               VerticalAlignment="Center" HorizontalAlignment="Right" Width="125"
-                               IsChecked="{Binding Path=GeneralSettings.AutoUpdate, Mode=TwoWay}" />
+        <controls:ToggleSwitchButton Grid.Row="7" Grid.Column="1" Margin="5,5,10,5" VerticalAlignment="Center"
+                                     IsChecked="{Binding Path=GeneralSettings.AutoUpdate, Mode=TwoWay}"
+                                     Style="{StaticResource MahApps.Metro.Styles.ToggleSwitchButton.Win10}"
+                                     HorizontalAlignment="Right" />
 
-        <!-- Update pointers -->
-        <Label Grid.Row="8" Grid.Column="0" Margin="5" VerticalAlignment="Center" HorizontalAlignment="Left"
-               Content="Download pointers:" />
-        <controls:ToggleSwitch Grid.Row="8" Grid.Column="1" Margin="5" OnLabel="Yes" OffLabel="No"
-                               VerticalAlignment="Center" HorizontalAlignment="Right" Width="125"
-                               IsChecked="{Binding Path=GeneralSettings.EnablePointersUpdate, Mode=TwoWay}" />
 
         <!-- Logging -->
-        <Label Grid.Row="9" Grid.Column="0" Margin="5" VerticalAlignment="Center" HorizontalAlignment="Left"
+        <Label Grid.Row="8" Grid.Column="0" Margin="5" VerticalAlignment="Center" HorizontalAlignment="Left"
                Content="Log level:" />
-        <ComboBox Grid.Row="9" Grid.Column="1" x:Name="LogLevels" Margin="10" VerticalAlignment="Center"
+        <ComboBox Grid.Row="8" Grid.Column="1" x:Name="LogLevels" Margin="10" VerticalAlignment="Center"
                   HorizontalAlignment="Right"
                   Width="140" />
-        <Button Grid.Row="10" Grid.Column="1" Margin="10" x:Name="ShowDebug" Content="Show debugger"
-                VerticalAlignment="Center"
+        <Button Grid.Row="9" Grid.Column="1" Margin="10" x:Name="ShowDebug" Content="Show debugger"
+                VerticalAlignment="Center" Width="90" HorizontalAlignment="Right"
                 Style="{DynamicResource SquareButtonStyle}" />
 
         <!-- Buttons -->
-        <Button Grid.Row="11" Grid.Column="0" Margin="10" x:Name="ResetSettings" Content="Reset settings"
-                VerticalAlignment="Center" HorizontalAlignment="Left" Width="120"
+        <Button Grid.Row="10" Grid.Column="0" Margin="10" x:Name="ResetSettings" Content="Reset settings"
+                VerticalAlignment="Center" HorizontalAlignment="Left" Width="90"
                 Style="{DynamicResource SquareButtonStyle}" />
-        <Button Grid.Row="11" Grid.Column="1" Margin="11" x:Name="SaveSettings" Content="Save changes"
-                VerticalAlignment="Center" HorizontalAlignment="Right" Width="120"
+        <Button Grid.Row="10" Grid.Column="1" Margin="11" x:Name="SaveSettings" Content="Save changes"
+                VerticalAlignment="Center" HorizontalAlignment="Right" Width="90"
                 Style="{DynamicResource SquareButtonStyle}" />
 
         <!-- Version -->
-        <Grid Grid.Row="12" Grid.Column="0" Grid.ColumnSpan="2" Margin="10" VerticalAlignment="Bottom">
+        <Grid Grid.Row="11" Grid.Column="0" Grid.ColumnSpan="2" Margin="10" VerticalAlignment="Bottom">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="*" />
diff --git a/Artemis/Artemis/Views/ShellView.xaml b/Artemis/Artemis/Views/ShellView.xaml
index 4370449be..2e86ff657 100644
--- a/Artemis/Artemis/Views/ShellView.xaml
+++ b/Artemis/Artemis/Views/ShellView.xaml
@@ -17,7 +17,31 @@
             <DrawingImage.Drawing>
                 <DrawingGroup>
                     <GeometryDrawing Brush="{DynamicResource IdealForegroundColorBrush}"
-                                     Geometry="M1518 3378 c-48 -63 -61 -101 -66 -184 -4 -70 -1 -91 27 -170 l31 -89 -27 -20 c-32 -24 -849 -601 -981 -693 l-93 -64 -87 40 c-48 22 -91 37 -95 32 -5 -4 9 -41 29 -83 l37 -75 -28 -24 c-23 -20 -29 -35 -33 -81 l-4 -56 -82 -19 c-109 -25 -109 -41 4 -91 l85 -38 7 -64 c15 -137 90 -1279 85 -1293 -3 -7 -35 -24 -70 -35 -159 -53 -257 -168 -257 -302 0 -35 2 -38 47 -53 54 -18 185 -21 232 -5 29 10 31 14 31 58 0 26 6 56 14 66 13 18 15 18 46 -8 44 -37 78 -35 119 7 l34 35 -17 41 c-9 23 -12 39 -6 35 6 -4 43 -1 83 6 39 6 219 14 398 18 l327 6 113 57 c158 78 256 166 317 282 24 46 27 62 27 152 0 98 -1 103 -41 184 l-42 83 44 69 c24 37 51 68 59 68 9 0 44 -14 78 -32 l62 -31 -93 -44 c-58 -26 -92 -48 -90 -55 9 -27 353 -68 570 -68 108 0 108 0 108 24 0 34 -105 171 -220 286 -122 122 -238 216 -250 204 -6 -6 -1 -42 16 -98 14 -49 23 -91 19 -94 -3 -3 -36 9 -73 27 l-69 33 24 71 c13 39 23 76 23 82 0 6 28 17 63 24 279 58 399 300 314 632 -32 121 -49 155 -134 255 -37 45 -106 126 -152 180 -73 87 -241 326 -241 343 0 3 15 13 32 21 21 10 35 25 40 45 15 60 -16 103 -81 108 -43 3 -39 22 14 74 l45 43 -25 50 c-35 69 -77 114 -130 139 -63 30 -88 27 -117 -11z m215 -835 c188 -279 250 -417 250 -548 0 -133 -74 -214 -243 -265 l-55 -16 -37 -138 c-21 -76 -39 -140 -40 -141 -6 -5 -814 377 -823 390 -6 7 -19 46 -29 86 -10 41 -25 81 -33 91 -8 9 -57 35 -109 59 -52 23 -93 46 -92 51 2 4 233 169 513 366 l510 358 26 -46 c15 -25 88 -136 162 -247z m-1108 -898 c61 21 88 26 107 19 14 -5 204 -92 421 -194 l395 -185 -27 -35 c-15 -19 -53 -72 -84 -117 l-57 -81 30 -90 c39 -117 40 -179 2 -253 -45 -90 -147 -145 -347 -189 -71 -15 -435 -59 -600 -73 l-29 -2 -37 540 c-20 297 -40 581 -43 632 l-7 92 98 -46 97 -46 81 28z" />
+                                     Geometry="M1518 3378 c-48 -63 -61 -101 -66 -184 -4 -70 -1 -91 27 
+                                     -170 l31 -89 -27 -20 c-32 -24 -849 -601 -981 -693 l-93 -64 -87 40 
+                                     c-48 22 -91 37 -95 32 -5 -4 9 -41 29 -83 l37 -75 -28 -24 c-23 -20 
+                                     -29 -35 -33 -81 l-4 -56 -82 -19 c-109 -25 -109 -41 4 -91 l85 -38 7 
+                                     -64 c15 -137 90 -1279 85 -1293 -3 -7 -35 -24 -70 -35 -159 -53 -257                                     
+                                     -168 -257 -302 0 -35 2 -38 47 -53 54 -18 185 -21 232 -5 29 10 31 
+                                     14 31 58 0 26 6 56 14 66 13 18 15 18 46 -8 44 -37 78 -35 119 7 l34
+                                     35 -17 41 c-9 23 -12 39 -6 35 6 -4 43 -1 83 6 39 6 219 14 398 18 
+                                     l327 6 113 57 c158 78 256 166 317 282 24 46 27 62 27 152 0 98 -1 
+                                     103 -41 184 l-42 83 44 69 c24 37 51 68 59 68 9 0 44 -14 78 -32 l62
+                                     -31 -93 -44 c-58 -26 -92 -48 -90 -55 9 -27 353 -68 570 -68 108 0 
+                                     108 0 108 24 0 34 -105 171 -220 286 -122 122 -238 216 -250 204 -6 
+                                     -6 -1 -42 16 -98 14 -49 23 -91 19 -94 -3 -3 -36 9 -73 27 l-69 33 24
+                                     71 c13 39 23 76 23 82 0 6 28 17 63 24 279 58 399 300 314 632 -32 
+                                     121 -49 155 -134 255 -37 45 -106 126 -152 180 -73 87 -241 326 -241
+                                     343 0 3 15 13 32 21 21 10 35 25 40 45 15 60 -16 103 -81 108 -43 3 
+                                     -39 22 14 74 l45 43 -25 50 c-35 69 -77 114 -130 139 -63 30 -88 27 
+                                     -117 -11z m215 -835 c188 -279 250 -417 250 -548 0 -133 -74 -214 -243
+                                     -265 l-55 -16 -37 -138 c-21 -76 -39 -140 -40 -141 -6 -5 -814 377 -823
+                                     390 -6 7 -19 46 -29 86 -10 41 -25 81 -33 91 -8 9 -57 35 -109 59 -52 
+                                     23 -93 46 -92 51 2 4 233 169 513 366 l510 358 26 -46 c15 -25 88 -136
+                                     162 -247z m-1108 -898 c61 21 88 26 107 19 14 -5 204 -92 421 -194 l395
+                                     -185 -27 -35 c-15 -19 -53 -72 -84 -117 l-57 -81 30 -90 c39 -117 40 
+                                     -179 2 -253 -45 -90 -147 -145 -347 -189 -71 -15 -435 -59 -600 -73 l
+                                     -29 -2 -37 540 c-20 297 -40 581 -43 632 l-7 92 98 -46 97 -46 81 28z" />
                 </DrawingGroup>
             </DrawingImage.Drawing>
         </DrawingImage>
@@ -32,6 +56,9 @@
             </Grid>
         </DataTemplate>
     </Controls:MetroWindow.IconTemplate>
+    <Controls:MetroWindow.WindowButtonCommands>
+        <Controls:WindowButtonCommands Style="{DynamicResource MahApps.Metro.Styles.WindowButtonCommands.Win10}" />
+    </Controls:MetroWindow.WindowButtonCommands>
     <Controls:MetroWindow.RightWindowCommands>
         <Controls:WindowCommands>
             <Button cal:Message.Attach="Settings">
@@ -42,9 +69,7 @@
                             <VisualBrush Stretch="Fill" Visual="{StaticResource appbar_settings}" />
                         </Rectangle.OpacityMask>
                     </Rectangle>
-                    <TextBlock Margin="4 -3 0 0"
-                               VerticalAlignment="Center"
-                               Text="settings" />
+                    <TextBlock Margin="4 -3 0 0" VerticalAlignment="Center" Text="settings" />
                 </StackPanel>
             </Button>
         </Controls:WindowCommands>
diff --git a/Artemis/Artemis/packages.config b/Artemis/Artemis/packages.config
index e8320cba4..ff52bee03 100644
--- a/Artemis/Artemis/packages.config
+++ b/Artemis/Artemis/packages.config
@@ -4,14 +4,14 @@
   <package id="Caliburn.Micro.Core" version="3.0.1" targetFramework="net452" />
   <package id="Castle.Core" version="3.3.3" targetFramework="net452" />
   <package id="Colore" version="5.0.0" targetFramework="net461" />
-  <package id="CUE.NET" version="1.1.0" targetFramework="net461" />
+  <package id="CUE.NET" version="1.1.0.1" targetFramework="net461" />
   <package id="DeltaCompressionDotNet" version="1.0.0" targetFramework="net461" />
-  <package id="DynamicExpresso.Core" version="1.3.1.0" targetFramework="net452" />
+  <package id="DynamicExpresso.Core" version="1.3.3.4" targetFramework="net461" />
   <package id="Extended.Wpf.Toolkit" version="2.9" targetFramework="net461" />
-  <package id="gong-wpf-dragdrop" version="0.1.4.3" targetFramework="net452" />
+  <package id="gong-wpf-dragdrop" version="1.0.0" targetFramework="net461" />
   <package id="Hardcodet.NotifyIcon.Wpf" version="1.0.8" targetFramework="net452" />
   <package id="log4net" version="2.0.5" targetFramework="net452" />
-  <package id="MahApps.Metro" version="1.2.4.0" targetFramework="net452" />
+  <package id="MahApps.Metro" version="1.3.0" targetFramework="net461" />
   <package id="MahApps.Metro.Resources" version="0.6.1.0" targetFramework="net452" />
   <package id="Mono.Cecil" version="0.9.6.1" targetFramework="net461" />
   <package id="NAudio" version="1.7.3" targetFramework="net452" />
@@ -25,7 +25,7 @@
   <package id="NLog.Schema" version="4.3.7" targetFramework="net461" />
   <package id="Process.NET" version="1.0.1" targetFramework="net461" />
   <package id="Splat" version="1.6.2" targetFramework="net461" />
-  <package id="SpotifyAPI-NET" version="2.11.0" targetFramework="net461" />
+  <package id="SpotifyAPI-NET" version="2.12.0" targetFramework="net461" />
   <package id="squirrel.windows" version="1.4.4" targetFramework="net461" />
   <package id="VirtualInput" version="1.0.1" targetFramework="net452" />
   <package id="WpfExceptionViewer" version="1.0.0.0" targetFramework="net452" />