From 70781f0cba10832cac1579e92f864944f3f531db Mon Sep 17 00:00:00 2001
From: Luke Anderson <stuntguy3000@gmail.com>
Date: Sat, 11 Jul 2020 13:24:00 +0930
Subject: [PATCH 1/2] Re-Write Payday 2 Effects - Fixes #2133 & #1160

---
 .../Profiles/Payday 2/Control_PD2.xaml        |  31 +--
 .../Profiles/Payday 2/Control_PD2.xaml.cs     |  78 +-----
 .../Layers/Control_PD2BackgroundLayer.xaml    |  56 ----
 .../Layers/Control_PD2BackgroundLayer.xaml.cs |  54 ----
 .../Layers/Control_PD2FlashbangLayer.xaml     |  14 -
 .../Layers/Control_PD2FlashbangLayer.xaml.cs  |  65 -----
 .../Control_PD2MaskOnAnimationLayer.xaml      |  10 +
 ...> Control_PD2MaskOnAnimationLayer.xaml.cs} |  23 +-
 .../Layers/Control_PD2StatesLayer.xaml        |  43 ---
 .../Layers/PD2BackgroundLayerHandler.cs       | 251 ------------------
 .../Layers/PD2FlashbangLayerHandler.cs        |  73 -----
 .../Layers/PD2MaskOnAnimationLayerHandler.cs  | 115 ++++++++
 .../Payday 2/Layers/PD2StatesLayerHandler.cs  | 118 --------
 .../Profiles/Payday 2/PD2Application.cs       |   4 +-
 .../Profiles/Payday 2/PD2Profile.cs           | 236 +++++++++++++++-
 .../Project-Aurora/Project-Aurora.csproj      |  32 +--
 .../Control_LayerControlPresenter.xaml.cs     |   1 -
 17 files changed, 375 insertions(+), 829 deletions(-)
 delete mode 100644 Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2BackgroundLayer.xaml
 delete mode 100644 Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2BackgroundLayer.xaml.cs
 delete mode 100644 Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2FlashbangLayer.xaml
 delete mode 100644 Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2FlashbangLayer.xaml.cs
 create mode 100644 Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2MaskOnAnimationLayer.xaml
 rename Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/{Control_PD2StatesLayer.xaml.cs => Control_PD2MaskOnAnimationLayer.xaml.cs} (53%)
 delete mode 100644 Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2StatesLayer.xaml
 delete mode 100644 Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2BackgroundLayerHandler.cs
 delete mode 100644 Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2FlashbangLayerHandler.cs
 create mode 100644 Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2MaskOnAnimationLayerHandler.cs
 delete mode 100644 Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2StatesLayerHandler.cs

diff --git a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Control_PD2.xaml b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Control_PD2.xaml
index 349e02a3a..385b8c106 100644
--- a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Control_PD2.xaml	
+++ b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Control_PD2.xaml	
@@ -69,36 +69,13 @@
         <TabControl>
             <TabItem Header="Overview for Payday 2">
                 <Grid>
-                    <TextBlock Margin="10,30,0,0" VerticalAlignment="Top" TextWrapping="Wrap" HorizontalAlignment="Left" Width="770"><Run Text="In order for Payday 2 support to work, you have to install the BLT Lua hook"/><Run Text=", BeardLib"/><Run Text=" and the GSI mod for Payday 2. Press the &quot;Get BLT Hook&quot; button to be taken to the BLT download page"/><Run Text=". Press the &quot;Get"/><Run Text=" BeardLib"/><Run Text="&quot;"/><Run Text=" button to be taken to its github page where it can be downloaded"/><Run Text=". Afterwards, you can press &quot;Install GSI for Payday 2&quot; to automatically install the GSI mod. (You need to have the BLT hook for GSI mod to function)"/></TextBlock>
-                    <Button x:Name="get_hook_button" Content="Get BLT Hook" HorizontalAlignment="Left" Margin="10,83,0,0" VerticalAlignment="Top" Click="get_hook_button_Click"/>
-                    <Button x:Name="get_lib_button" Content="Get BeardLib" HorizontalAlignment="Left" Margin="91,83,0,0" VerticalAlignment="Top" Click="get_lib_button_Click"/>
-                    <Button x:Name="install_mod_button" Content="Install GSI for Payday 2" HorizontalAlignment="Left" Margin="10,108,0,0" VerticalAlignment="Top" Click="install_mod_button_Click" Width="153"/>
+                    <TextBlock Margin="10,30,0,0" VerticalAlignment="Top" TextWrapping="Wrap" HorizontalAlignment="Left" Width="770">Payday 2 requires the following mods to function: SuperBLT (base mod), BeardLib (base mod extender), GSI (Aurora GSI integration).<LineBreak></LineBreak><LineBreak></LineBreak>To install, firstly click <Bold>Get SuperBLT</Bold> and follow the website's instructions to install.<LineBreak></LineBreak>Then, click <Bold>Get BeardLib</Bold> and follow the instructions to install.<LineBreak></LineBreak>Finally, click <Bold>Install GSI for Payday 2</Bold> and Aurora will install the GSI mod.</TextBlock>
+                    <Button x:Name="get_hook_button" Content="Get SuperBLT" HorizontalAlignment="Left" Margin="10,120,0,0" VerticalAlignment="Top" Click="get_hook_button_Click" RenderTransformOrigin="0.515,2.264" Width="80"/>
+                    <Button x:Name="get_lib_button" Content="Get BeardLib" HorizontalAlignment="Left" Margin="95,120,0,0" VerticalAlignment="Top" Click="get_lib_button_Click" Width="75"/>
+                    <Button x:Name="install_mod_button" Content="Install GSI for Payday 2" HorizontalAlignment="Left" Margin="10,145,0,0" VerticalAlignment="Top" Click="install_mod_button_Click" Width="160"/>
                     <CheckBox x:Name="game_enabled" Content="Enable Aurora to provide lighting effects with Payday 2" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Checked="game_enabled_Checked" Unchecked="game_enabled_Checked"/>
                 </Grid>
             </TabItem>
-            <TabItem Header="Preview">
-                <Grid>
-                    <Label Content="Level Phase:" HorizontalAlignment="Left" Margin="10,41,0,0" VerticalAlignment="Top"/>
-                    <ComboBox x:Name="preview_levelphase" HorizontalAlignment="Left" Margin="90,43,0,0" VerticalAlignment="Top" Width="200" IsSynchronizedWithCurrentItem="True" SelectedIndex="0" ItemsSource="{Binding Source={StaticResource PD2_LevelPhaseType}}" ItemTemplate="{Binding Source={StaticResource PD2_LevelPhaseTypeTemplate}}" SelectionChanged="preview_levelphase_SelectionChanged"/>
-                    <Label Content="Health:" HorizontalAlignment="Left" Margin="10,103,0,0" VerticalAlignment="Top"/>
-                    <Slider x:Name="preview_health_slider" HorizontalAlignment="Left" Margin="62,107,0,0" VerticalAlignment="Top" Width="114" Maximum="100" SmallChange="1" ValueChanged="preview_health_slider_ValueChanged"/>
-                    <Label x:Name="preview_health_amount" Content="0%" HorizontalAlignment="Left" Margin="181,103,0,0" VerticalAlignment="Top"/>
-                    <Label Content="Ammo:" HorizontalAlignment="Left" Margin="10,134,0,0" VerticalAlignment="Top"/>
-                    <Slider x:Name="preview_ammo_slider" HorizontalAlignment="Left" Margin="62,138,0,0" VerticalAlignment="Top" Width="114" Maximum="100" SmallChange="1" ValueChanged="preview_ammo_slider_ValueChanged"/>
-                    <Label x:Name="preview_ammo_amount" Content="0%" HorizontalAlignment="Left" Margin="181,134,0,0" VerticalAlignment="Top"/>
-                    <Label Content="Suspicion:" HorizontalAlignment="Left" Margin="10,165,0,0" VerticalAlignment="Top"/>
-                    <Slider x:Name="preview_suspicion_slider" HorizontalAlignment="Left" Margin="78,169,0,0" VerticalAlignment="Top" Width="98" Maximum="100" SmallChange="1" ValueChanged="preview_suspicion_slider_ValueChanged"/>
-                    <Label x:Name="preview_suspicion_amount" Content="0%" HorizontalAlignment="Left" Margin="181,165,0,0" VerticalAlignment="Top" RenderTransformOrigin="0.692,3.115"/>
-                    <Label Content="Player State:" HorizontalAlignment="Left" Margin="10,72,0,0" VerticalAlignment="Top"/>
-                    <ComboBox x:Name="preview_playerstate" HorizontalAlignment="Left" Margin="90,74,0,0" VerticalAlignment="Top" Width="200" IsSynchronizedWithCurrentItem="True" SelectedIndex="0" ItemsSource="{Binding Source={StaticResource PD2_PlayerStateType}}" ItemTemplate="{Binding Source={StaticResource PD2_PlayerStateTypeTemplate}}" SelectionChanged="preview_playerstate_SelectionChanged"/>
-                    <CheckBox x:Name="preview_swansong" Content="Is player in Swan Song" HorizontalAlignment="Left" Margin="13,196,0,0" VerticalAlignment="Top" Checked="preview_swansong_Checked" Unchecked="preview_swansong_Checked"/>
-                    <Label Content="Flashbang amount:" HorizontalAlignment="Left" Margin="10,216,0,0" VerticalAlignment="Top"/>
-                    <Slider x:Name="preview_flashbang_slider" HorizontalAlignment="Left" Margin="126,222,0,0" VerticalAlignment="Top" Width="98" Maximum="100" SmallChange="1" ValueChanged="preview_flashbang_slider_ValueChanged"/>
-                    <Label x:Name="preview_flashbang_amount" Content="0%" HorizontalAlignment="Left" Margin="229,218,0,0" VerticalAlignment="Top" RenderTransformOrigin="0.692,3.115"/>
-                    <Label Content="Game State:" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top"/>
-                    <ComboBox x:Name="preview_gamestate" HorizontalAlignment="Left" Margin="90,12,0,0" VerticalAlignment="Top" Width="200" IsSynchronizedWithCurrentItem="True" SelectedIndex="0" ItemsSource="{Binding Source={StaticResource PD2_GameStateType}}" ItemTemplate="{Binding Source={StaticResource PD2_GameStateTypeTemplate}}" SelectionChanged="preview_gamestate_SelectionChanged"/>
-                </Grid>
-            </TabItem>
         </TabControl>
     </Grid>
 </UserControl>
diff --git a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Control_PD2.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Control_PD2.xaml.cs
index e24d91b69..f19efb109 100644
--- a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Control_PD2.xaml.cs	
+++ b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Control_PD2.xaml.cs	
@@ -49,7 +49,7 @@ private void game_enabled_Checked(object sender, RoutedEventArgs e)
 
         private void get_hook_button_Click(object sender, RoutedEventArgs e)
         {
-            System.Diagnostics.Process.Start(new System.Diagnostics.ProcessStartInfo(@"http://paydaymods.com/download/"));
+            System.Diagnostics.Process.Start(new System.Diagnostics.ProcessStartInfo(@"https://superblt.znix.xyz/#superblt"));
         }
 
         private void install_mod_button_Click(object sender, RoutedEventArgs e)
@@ -92,83 +92,9 @@ private void install_mod_button_Click(object sender, RoutedEventArgs e)
             }
         }
 
-        private void preview_gamestate_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (IsLoaded)
-            {
-                (profile_manager.Config.Event._game_state as GameState_PD2).Game.State = (GSI.Nodes.GameStates)Enum.Parse(typeof(GSI.Nodes.GameStates), this.preview_gamestate.SelectedIndex.ToString());
-            }
-        }
-
-        private void preview_levelphase_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (IsLoaded)
-            {
-                (profile_manager.Config.Event._game_state as GameState_PD2).Level.Phase = (GSI.Nodes.LevelPhase)Enum.Parse(typeof(GSI.Nodes.LevelPhase), this.preview_levelphase.SelectedIndex.ToString());
-            }
-        }
-
-        private void preview_playerstate_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (IsLoaded)
-            {
-                (profile_manager.Config.Event._game_state as GameState_PD2).Players.LocalPlayer.State = (GSI.Nodes.PlayerState)Enum.Parse(typeof(GSI.Nodes.PlayerState), this.preview_playerstate.SelectedIndex.ToString());
-            }
-        }
-
-        private void preview_health_slider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
-        {
-            int hp_val = (int)this.preview_health_slider.Value;
-            if (this.preview_health_amount is Label)
-            {
-                this.preview_health_amount.Content = hp_val + "%";
-                (profile_manager.Config.Event._game_state as GameState_PD2).Players.LocalPlayer.Health.Current = hp_val;
-                (profile_manager.Config.Event._game_state as GameState_PD2).Players.LocalPlayer.Health.Max = 100;
-            }
-        }
-
-        private void preview_ammo_slider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
-        {
-            int ammo_val = (int)this.preview_ammo_slider.Value;
-            if (this.preview_ammo_amount is Label)
-            {
-                this.preview_ammo_amount.Content = ammo_val + "%";
-                (profile_manager.Config.Event._game_state as GameState_PD2).Players.LocalPlayer.Weapons.SelectedWeapon.Current_Clip = ammo_val;
-                (profile_manager.Config.Event._game_state as GameState_PD2).Players.LocalPlayer.Weapons.SelectedWeapon.Max_Clip = 100;
-            }
-        }
-
-        private void preview_suspicion_slider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
-        {
-            float susp_val = (float)this.preview_suspicion_slider.Value;
-            if (this.preview_suspicion_amount is Label)
-            {
-                this.preview_suspicion_amount.Content = (int)susp_val + "%";
-                (profile_manager.Config.Event._game_state as GameState_PD2).Players.LocalPlayer.SuspicionAmount = susp_val / 100.0f;
-            }
-        }
-
-        private void preview_flashbang_slider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
-        {
-            float flash_val = (float)this.preview_flashbang_slider.Value;
-            if (this.preview_flashbang_amount is Label)
-            {
-                this.preview_flashbang_amount.Content = (int)flash_val + "%";
-                (profile_manager.Config.Event._game_state as GameState_PD2).Players.LocalPlayer.FlashAmount = flash_val / 100.0f;
-            }
-        }
-
-        private void preview_swansong_Checked(object sender, RoutedEventArgs e)
-        {
-            if (IsLoaded && sender is CheckBox && (sender as CheckBox).IsChecked.HasValue)
-            {
-                (profile_manager.Config.Event._game_state as GameState_PD2).Players.LocalPlayer.IsSwanSong = (sender as CheckBox).IsChecked.Value;
-            }
-        }
-
         private void get_lib_button_Click(object sender, RoutedEventArgs e)
         {
-            System.Diagnostics.Process.Start(new System.Diagnostics.ProcessStartInfo(@"https://github.com/simon-wh/PAYDAY-2-BeardLib"));
+            System.Diagnostics.Process.Start(new System.Diagnostics.ProcessStartInfo(@"https://modworkshop.net/mod/14924"));
         }
     }
 }
diff --git a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2BackgroundLayer.xaml b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2BackgroundLayer.xaml
deleted file mode 100644
index 967e9fe4a..000000000
--- a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2BackgroundLayer.xaml	
+++ /dev/null
@@ -1,56 +0,0 @@
-<UserControl x:Class="Aurora.Profiles.Payday_2.Layers.Control_PD2BackgroundLayer"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:Aurora.Profiles.Payday_2.Layers"
-             xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-             xmlns:System="clr-namespace:System;assembly=mscorlib" 
-             xmlns:EnumDeviceKeys="clr-namespace:Aurora.Devices"
-             xmlns:EnumPercentEffectType="clr-namespace:Aurora.Settings"
-             xmlns:EnumPD2="clr-namespace:Aurora.Profiles.Payday_2"
-             xmlns:EnumPD2_GSI="clr-namespace:Aurora.Profiles.Payday_2.GSI.Nodes"
-             xmlns:Utils="clr-namespace:Aurora.Utils"
-             mc:Ignorable="d" Loaded="UserControl_Loaded">
-    <UserControl.Resources>
-        <ResourceDictionary>
-            <ObjectDataProvider x:Key="PercentEffectType" MethodName="GetValues" ObjectType="{x:Type System:Enum}">
-                <ObjectDataProvider.MethodParameters>
-                    <x:Type TypeName="EnumPercentEffectType:PercentEffectType" />
-                </ObjectDataProvider.MethodParameters>
-            </ObjectDataProvider>
-            <Utils:PercentEffectTypeToStringVC x:Key="PercentEffectTypeToStringVC"/>
-            <Utils:ColorConverter x:Key="ColorConverter"/>
-            <DataTemplate x:Key="PercentEffectTypeTemplate">
-                <TextBlock Text="{Binding Converter={StaticResource PercentEffectTypeToStringVC}}" />
-            </DataTemplate>
-        </ResourceDictionary>
-    </UserControl.Resources>
-    <Grid>
-        <Label HorizontalAlignment="Left" Padding="0" Content="Ambient Color:" VerticalAlignment="Top" Margin="0,3,0,0"/>
-        <xctk:ColorPicker x:Name="clrAmbient" Margin="85,0,0,0" Height="24" VerticalAlignment="Top" HorizontalAlignment="Left" Width="159" UsingAlphaChannel="True" ColorMode="ColorCanvas" SelectedColor="{Binding Path=_AmbientColor, Converter={StaticResource ColorConverter}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
-        <Label HorizontalAlignment="Left" Margin="0,32,0,0" Padding="0" Content="Assault Color:" VerticalAlignment="Top"/>
-        <xctk:ColorPicker x:Name="assault_colorpicker" Margin="77,29,0,0" Height="24" VerticalAlignment="Top" HorizontalAlignment="Left" Width="167" ColorMode="ColorCanvas" UsingAlphaChannel="True" SelectedColor="{Binding _AssaultColor, Converter={StaticResource ColorConverter}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
-        <Label HorizontalAlignment="Left" Margin="0,61,0,0" Padding="0" Content="Captain Winters Color:" VerticalAlignment="Top"/>
-        <xctk:ColorPicker x:Name="winters_colorpicker" Margin="124,58,0,0" Height="24" VerticalAlignment="Top" HorizontalAlignment="Left" Width="120" ColorMode="ColorCanvas" UsingAlphaChannel="True" SelectedColor="{Binding _WintersColor, Converter={StaticResource ColorConverter}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
-
-        <Label HorizontalAlignment="Left" Margin="249,5,0,0" Padding="0" Content="Assault Speed:" VerticalAlignment="Top"/>
-        <Label x:Name="lblAssaultSpeed" Content="x 1" HorizontalAlignment="Left" Margin="511,0,0,0" VerticalAlignment="Top"/>
-        <Slider x:Name="sldAssaultSpeed" HorizontalAlignment="Left" Margin="331,5,0,0" VerticalAlignment="Top" Width="175" Minimum="0.5" Maximum="1.5" SmallChange="0.25" Value="{Binding _AssaultSpeedMultiplier, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" ValueChanged="sldAssaultSpeed_ValueChanged"/>
-
-        <Label HorizontalAlignment="Left" Margin="249,32,0,0" Padding="0" Content="Assault Fade Color:" VerticalAlignment="Top"/>
-        <xctk:ColorPicker x:Name="clrAssaultFade" Margin="354,28,0,0" Height="24" VerticalAlignment="Top" HorizontalAlignment="Left" Width="182" ColorMode="ColorCanvas" UsingAlphaChannel="True" SelectedColor="{Binding _AssaultFadeColor, Converter={StaticResource ColorConverter}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
-        <CheckBox x:Name="cmbAssaultAnim" Content="Enable assault animation" HorizontalAlignment="Left" Margin="249,53,0,0" VerticalAlignment="Top" IsChecked="{Binding _AssaultAnimationEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
-
-        <CheckBox x:Name="background_show_suspicion" Content="Show the suspicion meter in the background" HorizontalAlignment="Left" Margin="0,82,0,0" VerticalAlignment="Top" IsChecked="{Binding Path=_ShowSuspicion, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
-        <Label HorizontalAlignment="Left" Margin="0,105,0,0" Padding="0" Content="Low Suspicion Color:" VerticalAlignment="Top"/>
-        <xctk:ColorPicker x:Name="low_suspicion_colorpicker" Margin="115,102,0,0" Height="24" VerticalAlignment="Top" HorizontalAlignment="Left" Width="129" UsingAlphaChannel="True" ColorMode="ColorCanvas" SelectedColor="{Binding _LowSuspicionColor, Converter={StaticResource ColorConverter}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
-        <Label HorizontalAlignment="Left" Margin="0,134,0,0" Padding="0" Content="Medium Suspicion Color:" VerticalAlignment="Top"/>
-        <xctk:ColorPicker x:Name="medium_suspicion_colorpicker" Margin="137,131,0,0" Height="24" VerticalAlignment="Top" HorizontalAlignment="Left" Width="107" ColorMode="ColorCanvas" UsingAlphaChannel="True" SelectedColor="{Binding _MediumSuspicionColor, Converter={StaticResource ColorConverter}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
-        <Label HorizontalAlignment="Left" Margin="0,163,0,0" Padding="0" Content="High Suspicion Color:" VerticalAlignment="Top"/>
-        <xctk:ColorPicker x:Name="high_suspicion_colorpicker" Margin="119,160,0,0" Height="24" VerticalAlignment="Top" HorizontalAlignment="Left" Width="125" ColorMode="ColorCanvas" UsingAlphaChannel="True" SelectedColor="{Binding _HighSuspicionColor, Converter={StaticResource ColorConverter}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
-        <Label HorizontalAlignment="Left" Margin="0,192,0,0" Padding="0" Content="Suspicion Effect Type:" VerticalAlignment="Top"/>
-        <ComboBox x:Name="suspicion_effect_type" HorizontalAlignment="Left" Margin="119,189,0,0" VerticalAlignment="Top" Width="200" ItemsSource="{Binding Source={StaticResource PercentEffectType}}" ItemTemplate="{Binding Source={StaticResource PercentEffectTypeTemplate}}" SelectedItem="{Binding _SuspicionEffectType, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
-        <CheckBox x:Name="background_peripheral_use" Content="Use background color with other peripheral devices" HorizontalAlignment="Left" Margin="0,216,0,0" VerticalAlignment="Top" IsChecked="{Binding _PeripheralUse, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
-    </Grid>
-</UserControl>
diff --git a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2BackgroundLayer.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2BackgroundLayer.xaml.cs
deleted file mode 100644
index ed19aa1fe..000000000
--- a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2BackgroundLayer.xaml.cs	
+++ /dev/null
@@ -1,54 +0,0 @@
-using Aurora.Settings;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace Aurora.Profiles.Payday_2.Layers
-{
-    /// <summary>
-    /// Interaction logic for Control_CSGOBackgroundLayer.xaml
-    /// </summary>
-    public partial class Control_PD2BackgroundLayer : UserControl
-    {
-        private bool settingsset = false;
-        private bool profileset = false;
-
-        public Control_PD2BackgroundLayer()
-        {
-            InitializeComponent();
-        }
-
-        public Control_PD2BackgroundLayer(PD2BackgroundLayerHandler datacontext)
-        {
-            this.DataContext = datacontext.Properties;
-            InitializeComponent();
-        }
-
-
-        internal void SetProfile(Application profile)
-        {
-        }
-
-        private void UserControl_Loaded(object sender, RoutedEventArgs e)
-        {
-
-            this.Loaded -= UserControl_Loaded;
-        }
-
-        private void sldAssaultSpeed_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
-        {
-            this.lblAssaultSpeed.Content = $"x {sldAssaultSpeed.Value.ToString("0.00")}";
-        }
-    }
-}
diff --git a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2FlashbangLayer.xaml b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2FlashbangLayer.xaml
deleted file mode 100644
index 572d41494..000000000
--- a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2FlashbangLayer.xaml	
+++ /dev/null
@@ -1,14 +0,0 @@
-<UserControl
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:Aurora.Profiles.Payday_2.Layers"
-             xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-             xmlns:Controls="clr-namespace:Aurora.Controls" x:Class="Aurora.Profiles.Payday_2.Layers.Control_PD2FlashbangLayer"
-             mc:Ignorable="d" Loaded="UserControl_Loaded">
-    <Grid>
-        <xctk:ColorPicker x:Name="ColorPicker_Flashbang" Margin="93,0,0,0" Height="20" VerticalAlignment="Top" HorizontalAlignment="Left" Width="151" UsingAlphaChannel="True" ColorMode="ColorCanvas" SelectedColorChanged="ColorPicker_Flashbang_SelectedColorChanged" />
-        <Label HorizontalAlignment="Left" Padding="0" Content="Flashbang Color:" VerticalAlignment="Top" Margin="0,2,0,0"/>
-    </Grid>
-</UserControl>
\ No newline at end of file
diff --git a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2FlashbangLayer.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2FlashbangLayer.xaml.cs
deleted file mode 100644
index 9953ebb61..000000000
--- a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2FlashbangLayer.xaml.cs	
+++ /dev/null
@@ -1,65 +0,0 @@
-using Aurora.Settings;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace Aurora.Profiles.Payday_2.Layers
-{
-    /// <summary>
-    /// Interaction logic for Control_PD2FlashbangLayer.xaml
-    /// </summary>
-    public partial class Control_PD2FlashbangLayer : UserControl
-    {
-        private bool settingsset = false;
-
-        public Control_PD2FlashbangLayer()
-        {
-            InitializeComponent();
-        }
-
-        public Control_PD2FlashbangLayer(PD2FlashbangLayerHandler datacontext)
-        {
-            InitializeComponent();
-
-            this.DataContext = datacontext;
-        }
-
-        public void SetSettings()
-        {
-            if (this.DataContext is PD2FlashbangLayerHandler && !settingsset)
-            {
-                this.ColorPicker_Flashbang.SelectedColor = Utils.ColorUtils.DrawingColorToMediaColor((this.DataContext as PD2FlashbangLayerHandler).Properties._FlashbangColor ?? System.Drawing.Color.Empty);
-
-                settingsset = true;
-            }
-        }
-
-        internal void SetProfile(Application profile)
-        {
-        }
-
-        private void UserControl_Loaded(object sender, RoutedEventArgs e)
-        {
-            SetSettings();
-
-            this.Loaded -= UserControl_Loaded;
-        }
-
-        private void ColorPicker_Flashbang_SelectedColorChanged(object sender, RoutedPropertyChangedEventArgs<Color?> e)
-        {
-            if (IsLoaded && settingsset && this.DataContext is PD2FlashbangLayerHandler && sender is Xceed.Wpf.Toolkit.ColorPicker && (sender as Xceed.Wpf.Toolkit.ColorPicker).SelectedColor.HasValue)
-                (this.DataContext as PD2FlashbangLayerHandler).Properties._FlashbangColor = Utils.ColorUtils.MediaColorToDrawingColor((sender as Xceed.Wpf.Toolkit.ColorPicker).SelectedColor.Value);
-        }
-    }
-}
diff --git a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2MaskOnAnimationLayer.xaml b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2MaskOnAnimationLayer.xaml
new file mode 100644
index 000000000..5b260bc8e
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2MaskOnAnimationLayer.xaml	
@@ -0,0 +1,10 @@
+<UserControl
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+            x:Class="Aurora.Profiles.Payday_2.Layers.Control_PD2MaskOnAnimationLayer"
+             mc:Ignorable="d" Loaded="UserControl_Loaded">
+    <Grid/>
+</UserControl>
\ No newline at end of file
diff --git a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2StatesLayer.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2MaskOnAnimationLayer.xaml.cs
similarity index 53%
rename from Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2StatesLayer.xaml.cs
rename to Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2MaskOnAnimationLayer.xaml.cs
index 4c152471f..45bf2ae47 100644
--- a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2StatesLayer.xaml.cs	
+++ b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2MaskOnAnimationLayer.xaml.cs	
@@ -17,38 +17,25 @@
 namespace Aurora.Profiles.Payday_2.Layers
 {
     /// <summary>
-    /// Interaction logic for Control_PD2StatesLayer.xaml
+    /// Interaction logic for Control_WinningTeamLayer.xaml
     /// </summary>
-    public partial class Control_PD2StatesLayer : UserControl
+    public partial class Control_PD2MaskOnAnimationLayer : UserControl
     {
-        private bool settingsset = false;
-        private bool profileset = false;
-
-        public Control_PD2StatesLayer()
+        public Control_PD2MaskOnAnimationLayer()
         {
             InitializeComponent();
         }
 
-        public Control_PD2StatesLayer(PD2StatesLayerHandler datacontext)
+        public Control_PD2MaskOnAnimationLayer(PD2MaskOnAnimationLayerHandler datacontext)
         {
-            this.DataContext = datacontext.Properties;
             InitializeComponent();
-        }
 
-
-        internal void SetProfile(Application profile)
-        {
+            this.DataContext = datacontext;
         }
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
         {
-
             this.Loaded -= UserControl_Loaded;
         }
-
-        private void sldSwanSongSpeed_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
-        {
-            this.lblSwanSongSpeed.Content = $"x {sldSwanSongSpeed.Value.ToString("0.00")}";
-        }
     }
 }
diff --git a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2StatesLayer.xaml b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2StatesLayer.xaml
deleted file mode 100644
index 061f812f6..000000000
--- a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2StatesLayer.xaml	
+++ /dev/null
@@ -1,43 +0,0 @@
-<UserControl x:Class="Aurora.Profiles.Payday_2.Layers.Control_PD2StatesLayer"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:Aurora.Profiles.Payday_2.Layers"
-             xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-             xmlns:System="clr-namespace:System;assembly=mscorlib" 
-             xmlns:EnumDeviceKeys="clr-namespace:Aurora.Devices"
-             xmlns:EnumPercentEffectType="clr-namespace:Aurora.Settings"
-             xmlns:EnumPD2="clr-namespace:Aurora.Profiles.Payday_2"
-             xmlns:EnumPD2_GSI="clr-namespace:Aurora.Profiles.Payday_2.GSI.Nodes"
-             xmlns:Utils="clr-namespace:Aurora.Utils"
-             mc:Ignorable="d" Loaded="UserControl_Loaded">
-    <UserControl.Resources>
-        <ResourceDictionary>
-            <ObjectDataProvider x:Key="PercentEffectType" MethodName="GetValues" ObjectType="{x:Type System:Enum}">
-                <ObjectDataProvider.MethodParameters>
-                    <x:Type TypeName="EnumPercentEffectType:PercentEffectType" />
-                </ObjectDataProvider.MethodParameters>
-            </ObjectDataProvider>
-            <Utils:PercentEffectTypeToStringVC x:Key="PercentEffectTypeToStringVC"/>
-            <Utils:ColorConverter x:Key="ColorConverter"/>
-            <DataTemplate x:Key="PercentEffectTypeTemplate">
-                <TextBlock Text="{Binding Converter={StaticResource PercentEffectTypeToStringVC}}" />
-            </DataTemplate>
-        </ResourceDictionary>
-    </UserControl.Resources>
-    <Grid>
-        <Label HorizontalAlignment="Left" Padding="0" Content="Downed Color:" VerticalAlignment="Top" Margin="0,3,0,0"/>
-        <xctk:ColorPicker x:Name="clrDowned" Margin="84,0,0,0" Height="24" VerticalAlignment="Top" HorizontalAlignment="Left" Width="160" UsingAlphaChannel="True" ColorMode="ColorCanvas" SelectedColor="{Binding Path=_DownedColor, Converter={StaticResource ColorConverter}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
-        <Label HorizontalAlignment="Left" Margin="0,32,0,0" Padding="0" Content="Arrested Color:" VerticalAlignment="Top"/>
-        <xctk:ColorPicker x:Name="clrArrested" Margin="84,29,0,0" Height="24" VerticalAlignment="Top" HorizontalAlignment="Left" Width="160" ColorMode="ColorCanvas" UsingAlphaChannel="True" SelectedColor="{Binding _ArrestedColor, Converter={StaticResource ColorConverter}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
-        <Label HorizontalAlignment="Left" Margin="0,87,0,0" Padding="0" Content="Swan Song Color:" VerticalAlignment="Top"/>
-        <xctk:ColorPicker x:Name="clr_SwanSong" Margin="98,84,0,0" Height="24" VerticalAlignment="Top" HorizontalAlignment="Left" Width="146" ColorMode="ColorCanvas" UsingAlphaChannel="True" SelectedColor="{Binding _SwanSongColor, Converter={StaticResource ColorConverter}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
-
-        <TextBlock HorizontalAlignment="Left" Margin="0,115,0,0" TextWrapping="Wrap" Text="Swan Song Speed:" VerticalAlignment="Top"/>
-        <Label x:Name="lblSwanSongSpeed" Content="x 1" HorizontalAlignment="Left" Margin="262,108,0,0" VerticalAlignment="Top"/>
-        <Slider x:Name="sldSwanSongSpeed" HorizontalAlignment="Left" Margin="102,113,0,0" VerticalAlignment="Top" Width="155" Minimum="0.5" Maximum="1.5" SmallChange="0.25" Value="{Binding _SwanSongSpeedMultiplier, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" ValueChanged="sldSwanSongSpeed_ValueChanged"/>
-
-        <CheckBox x:Name="chkbx_UseSwanSong" Content="Enable Swan Song effect" HorizontalAlignment="Left" Margin="0,63,0,0" VerticalAlignment="Top" IsChecked="{Binding Path=_ShowSwanSong, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
-    </Grid>
-</UserControl>
diff --git a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2BackgroundLayerHandler.cs b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2BackgroundLayerHandler.cs
deleted file mode 100644
index 2ce527132..000000000
--- a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2BackgroundLayerHandler.cs	
+++ /dev/null
@@ -1,251 +0,0 @@
-using Aurora.EffectsEngine;
-using Aurora.Profiles.Payday_2.GSI;
-using Aurora.Profiles.Payday_2.GSI.Nodes;
-using Aurora.Settings;
-using Aurora.Settings.Layers;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Controls;
-
-namespace Aurora.Profiles.Payday_2.Layers
-{
-    public class PD2BackgroundLayerHandlerProperties : LayerHandlerProperties2Color<PD2BackgroundLayerHandlerProperties>
-    {
-        public Color? _AmbientColor { get; set; }
-
-        [JsonIgnore]
-        public Color AmbientColor { get { return Logic._AmbientColor ?? _AmbientColor ?? Color.Empty; } }
-
-        public Color? _AssaultColor { get; set; }
-
-        [JsonIgnore]
-        public Color AssaultColor { get { return Logic._AssaultColor ?? _AssaultColor ?? Color.Empty; } }
-
-        public Color? _WintersColor { get; set; }
-
-        [JsonIgnore]
-        public Color WintersColor { get { return Logic._WintersColor ?? _WintersColor ?? Color.Empty; } }
-
-        public float? _AssaultSpeedMultiplier { get; set; }
-
-        [JsonIgnore]
-        public float AssaultSpeedMultiplier { get { return Logic._AssaultSpeedMultiplier ?? _AssaultSpeedMultiplier ?? 0.0F; } }
-
-        public Color? _AssaultFadeColor { get; set; }
-
-        [JsonIgnore]
-        public Color AssaultFadeColor { get { return Logic._AssaultFadeColor ?? _AssaultFadeColor ?? Color.Empty; } }
-
-        public bool? _AssaultAnimationEnabled { get; set; }
-
-        [JsonIgnore]
-        public bool AssaultAnimationEnabled { get { return Logic._AssaultAnimationEnabled ?? _AssaultAnimationEnabled ?? false; } }
-
-        public Color? _LowSuspicionColor { get; set; }
-
-        [JsonIgnore]
-        public Color LowSuspicionColor { get { return Logic._LowSuspicionColor ?? _LowSuspicionColor ?? Color.Empty; } }
-
-        public Color? _MediumSuspicionColor { get; set; }
-
-        [JsonIgnore]
-        public Color MediumSuspicionColor { get { return Logic._MediumSuspicionColor ?? _MediumSuspicionColor ?? Color.Empty; } }
-
-        public Color? _HighSuspicionColor { get; set; }
-
-        [JsonIgnore]
-        public Color HighSuspicionColor { get { return Logic._HighSuspicionColor ?? _HighSuspicionColor ?? Color.Empty; } }
-
-        public bool? _ShowSuspicion { get; set; }
-
-        [JsonIgnore]
-        public bool ShowSuspicion { get { return Logic._ShowSuspicion ?? _ShowSuspicion ?? false; } }
-
-        public PercentEffectType? _SuspicionEffectType { get; set; }
-
-        public PercentEffectType SuspicionEffectType { get { return Logic._SuspicionEffectType ?? _SuspicionEffectType ?? PercentEffectType.AllAtOnce; } }
-
-        public bool? _PeripheralUse { get; set; }
-
-        [JsonIgnore]
-        public bool PeripheralUse { get { return Logic._PeripheralUse ?? _PeripheralUse ?? false; } }
-
-
-        public PD2BackgroundLayerHandlerProperties() : base() { }
-
-        public PD2BackgroundLayerHandlerProperties(bool assign_default = false) : base(assign_default) { }
-
-        public override void Default()
-        {
-            base.Default();
-
-            _AmbientColor = Color.FromArgb(158, 205, 255);
-            _AssaultColor = Color.FromArgb(158, 205, 255);
-            _WintersColor = Color.FromArgb(221, 99, 33);
-            _AssaultSpeedMultiplier = 1.0f;
-            _AssaultFadeColor = Color.FromArgb(255, 255, 255);
-            _AssaultAnimationEnabled = true;
-            _LowSuspicionColor = Color.FromArgb(0, 0, 0, 255);
-            _MediumSuspicionColor = Color.FromArgb(255, 0, 0, 255);
-            _HighSuspicionColor = Color.FromArgb(255, 255, 0, 0);
-            _ShowSuspicion = true;
-            _SuspicionEffectType = PercentEffectType.Progressive;
-            _PeripheralUse = true;
-        }
-
-    }
-
-    public class PD2BackgroundLayerHandler : LayerHandler<PD2BackgroundLayerHandlerProperties>
-    {
-        private float no_return_flashamount = 1.0f;
-        private float no_return_timeleft;
-
-        protected override UserControl CreateControl()
-        {
-            return new Control_PD2BackgroundLayer(this);
-        }
-
-        public override EffectLayer Render(IGameState state)
-        {
-            EffectLayer bg_layer = new EffectLayer("Payday 2 - Background");
-
-            if (state is GameState_PD2)
-            {
-
-                GameState_PD2 pd2 = (GameState_PD2)state;
-
-                Color bg_color = Properties.AmbientColor;
-
-                long currenttime = Utils.Time.GetMillisecondsSinceEpoch();
-
-                if ((pd2.Level.Phase == LevelPhase.Assault || pd2.Level.Phase == LevelPhase.Winters) && pd2.Game.State == GameStates.Ingame)
-                {
-                    if (pd2.Level.Phase == LevelPhase.Assault)
-                        bg_color = Properties.AssaultColor;
-                    else if (pd2.Level.Phase == LevelPhase.Winters)
-                        bg_color = Properties.WintersColor;
-
-                    double blend_percent = Math.Pow(Math.Sin(((currenttime % 1300L) / 1300.0D) * Properties.AssaultSpeedMultiplier * 2.0D * Math.PI), 2.0D);
-
-                    bg_color = Utils.ColorUtils.BlendColors(Properties.AssaultFadeColor, bg_color, blend_percent);
-
-                    if (Properties.AssaultAnimationEnabled)
-                    {
-
-                        Color effect_contours = Color.FromArgb(200, Color.Black);
-                        float animation_stage_yoffset = 20.0f;
-                        float animation_repeat_keyframes = 250.0f; //Effects.canvas_width * 2.0f;
-
-                        /* Effect visual:
-
-                        / /  ----  / /
-
-                        */
-
-                        /*
-                         * !!!NOTE: TO BE REWORKED INTO ANIMATIONS!!!
-
-                        EffectColorFunction line1_col_func = new EffectColorFunction(
-                            new EffectLine(-1f, Effects.canvas_width + assault_yoffset + animation_stage_yoffset),
-                            new ColorSpectrum(effect_contours),
-                            2);
-
-                        EffectColorFunction line2_col_func = new EffectColorFunction(
-                            new EffectLine(-1f, Effects.canvas_width + assault_yoffset + 9.0f + animation_stage_yoffset),
-                            new ColorSpectrum(effect_contours),
-                            2);
-
-                        EffectColorFunction line3_col_func = new EffectColorFunction(
-                            new EffectLine(new EffectPoint(Effects.canvas_width + assault_yoffset + 17.0f + animation_stage_yoffset, Effects.canvas_height / 2.0f), new EffectPoint(Effects.canvas_width + assault_yoffset + 34.0f + animation_stage_yoffset, Effects.canvas_height / 2.0f), true),
-                            new ColorSpectrum(effect_contours),
-                            6);
-
-                        EffectColorFunction line4_col_func = new EffectColorFunction(
-                            new EffectLine(-1f, Effects.canvas_width + assault_yoffset + 52.0f + animation_stage_yoffset),
-                            new ColorSpectrum(effect_contours),
-                            2);
-
-                        EffectColorFunction line5_col_func = new EffectColorFunction(
-                            new EffectLine(-1f, Effects.canvas_width + assault_yoffset + 61.0f + animation_stage_yoffset),
-                            new ColorSpectrum(effect_contours),
-                            2);
-
-                        assault_yoffset -= 0.50f;
-                        assault_yoffset = assault_yoffset % animation_repeat_keyframes;
-
-                        bg_layer.AddPostFunction(line1_col_func);
-                        bg_layer.AddPostFunction(line2_col_func);
-                        //bg_layer.AddPostFunction(line3_col_func);
-                        bg_layer.AddPostFunction(line4_col_func);
-                        bg_layer.AddPostFunction(line5_col_func);
-
-                        */
-                    }
-
-                    bg_layer.Fill(bg_color);
-
-                    if (Properties.PeripheralUse)
-                        bg_layer.Set(Devices.DeviceKeys.Peripheral, bg_color);
-                }
-                else if (pd2.Level.Phase == LevelPhase.Stealth && pd2.Game.State == GameStates.Ingame)
-                {
-                    if (Properties.ShowSuspicion)
-                    {
-                        double percentSuspicious = ((double)pd2.Players.LocalPlayer.SuspicionAmount / (double)1.0);
-
-                        ColorSpectrum suspicion_spec = new ColorSpectrum(Properties.LowSuspicionColor, Properties.HighSuspicionColor);
-                        suspicion_spec.SetColorAt(0.5f, Properties.MediumSuspicionColor);
-
-                        Settings.KeySequence suspicionSequence = new Settings.KeySequence(new Settings.FreeFormObject(0, 0, 1.0f / (Effects.editor_to_canvas_width / Effects.canvas_width), 1.0f / (Effects.editor_to_canvas_height / Effects.canvas_height)));
-
-                        bg_layer.PercentEffect(suspicion_spec, suspicionSequence, percentSuspicious, 1.0D, Properties.SuspicionEffectType);
-
-                        if (Properties.PeripheralUse)
-                            bg_layer.Set(Devices.DeviceKeys.Peripheral, suspicion_spec.GetColorAt((float)percentSuspicious));
-                    }
-                }
-                else if (pd2.Level.Phase == LevelPhase.Point_of_no_return && pd2.Game.State == GameStates.Ingame)
-                {
-                    ColorSpectrum no_return_spec = new ColorSpectrum(Color.Red, Color.Yellow);
-                    if (pd2.Level.NoReturnTime != no_return_timeleft)
-                    {
-                        no_return_timeleft = pd2.Level.NoReturnTime;
-                        no_return_flashamount = 1.0f;
-                    }
-
-                    Color no_return_color = no_return_spec.GetColorAt(no_return_flashamount);
-                    no_return_flashamount -= 0.05f;
-
-                    if (no_return_flashamount < 0.0f)
-                        no_return_flashamount = 0.0f;
-
-                    bg_layer.Fill(no_return_color);
-
-                    if (Properties.PeripheralUse)
-                        bg_layer.Set(Devices.DeviceKeys.Peripheral, no_return_color);
-                }
-                else
-                {
-                    bg_layer.Fill(bg_color);
-
-                    if (Properties.PeripheralUse)
-                        bg_layer.Set(Devices.DeviceKeys.Peripheral, bg_color);
-                }
-
-            }
-
-            return bg_layer;
-        }
-
-        public override void SetApplication(Application profile)
-        {
-            (_Control as Control_PD2BackgroundLayer)?.SetProfile(profile);
-            base.SetApplication(profile);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2FlashbangLayerHandler.cs b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2FlashbangLayerHandler.cs
deleted file mode 100644
index 585e40ec4..000000000
--- a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2FlashbangLayerHandler.cs	
+++ /dev/null
@@ -1,73 +0,0 @@
-using Aurora.EffectsEngine;
-using Aurora.Profiles.CSGO.GSI;
-using Aurora.Profiles.CSGO.GSI.Nodes;
-using Aurora.Profiles.Payday_2.GSI;
-using Aurora.Profiles.Payday_2.GSI.Nodes;
-using Aurora.Settings;
-using Aurora.Settings.Layers;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Controls;
-
-namespace Aurora.Profiles.Payday_2.Layers
-{
-    public class PD2FlashbangLayerHandlerProperties : LayerHandlerProperties2Color<PD2FlashbangLayerHandlerProperties>
-    {
-        public Color? _FlashbangColor { get; set; }
-
-        [JsonIgnore]
-        public Color FlashbangColor { get { return Logic._FlashbangColor ?? _FlashbangColor ?? Color.Empty; } }
-
-        public PD2FlashbangLayerHandlerProperties() : base() { }
-
-        public PD2FlashbangLayerHandlerProperties(bool assign_default = false) : base(assign_default) { }
-
-        public override void Default()
-        {
-            base.Default();
-
-            this._FlashbangColor = Color.FromArgb(255, 255, 255);
-        }
-
-    }
-
-    public class PD2FlashbangLayerHandler : LayerHandler<PD2FlashbangLayerHandlerProperties>
-    {
-        protected override UserControl CreateControl()
-        {
-            return new Control_PD2FlashbangLayer(this);
-        }
-
-        public override EffectLayer Render(IGameState state)
-        {
-            EffectLayer flashed_layer = new EffectLayer("Payday 2 - Flashed");
-
-            if (state is GameState_PD2)
-            {
-                GameState_PD2 pd2state = state as GameState_PD2;
-
-                //Update Flashed
-                if (pd2state.Game.State == GameStates.Ingame && pd2state.LocalPlayer.FlashAmount > 0)
-                {
-                    Color flash_color = Utils.ColorUtils.MultiplyColorByScalar(Properties.FlashbangColor, pd2state.LocalPlayer.FlashAmount);
-
-                    flashed_layer.Fill(flash_color);
-                }
-            }
-
-            return flashed_layer;
-        }
-
-        public override void SetApplication(Application profile)
-        {
-            (Control as Control_PD2FlashbangLayer).SetProfile(profile);
-            base.SetApplication(profile);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2MaskOnAnimationLayerHandler.cs b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2MaskOnAnimationLayerHandler.cs
new file mode 100644
index 000000000..b0cb8c7b7
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2MaskOnAnimationLayerHandler.cs	
@@ -0,0 +1,115 @@
+using Aurora.EffectsEngine;
+using Aurora.EffectsEngine.Animations;
+using Aurora.Profiles.CSGO.GSI;
+using Aurora.Profiles.CSGO.GSI.Nodes;
+using Aurora.Profiles.Payday_2.GSI;
+using Aurora.Profiles.Payday_2.GSI.Nodes;
+using Aurora.Settings;
+using Aurora.Settings.Layers;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+
+namespace Aurora.Profiles.Payday_2.Layers
+{
+    public class PD2MaskOnAnimationLayerHandler : LayerHandler
+    {
+        private readonly AnimationTrack[] tracks =
+        {
+            new AnimationTrack("Track 0", 1.0f, 0.0f)
+        };
+
+        private long previoustime = 0;
+        private long currenttime = 0;
+
+        private static float effectKeyframe = 0.0f;
+        private const float effectAnimationTime = 1.0f;
+
+        private bool showAnimation = false;
+        private bool animationRun = false;
+
+        protected override UserControl CreateControl()
+        {
+            return new Control_PD2MaskOnAnimationLayer(this);
+        }
+
+        public override EffectLayer Render(IGameState state)
+        {
+            previoustime = currenttime;
+            currenttime = Utils.Time.GetMillisecondsSinceEpoch();
+
+            EffectLayer effectLayer = new EffectLayer("PD2 - Mask On Animation");
+            AnimationMix animationMix = new AnimationMix();
+
+            if (state is GameState_PD2 gameState_PD2)
+            {
+                if (animationRun && (gameState_PD2.LocalPlayer.State == PlayerState.Civilian || gameState_PD2.LocalPlayer.State == PlayerState.Undefined || gameState_PD2.LocalPlayer.State == PlayerState.Mask_Off))
+                {
+                    animationRun = false;
+                }
+
+                if ((gameState_PD2.LocalPlayer.State == PlayerState.Standard) && !animationRun && !showAnimation)
+                {
+                    this.SetTracks(PD2Colours.PlayerState_Standard);
+                    animationMix.Clear();
+                    showAnimation = true;
+                }
+
+                if (showAnimation)
+                {
+                    animationMix = new AnimationMix(tracks);
+
+                    effectLayer.Fill(PD2Colours.PlayerState_Civilian);
+                    animationMix.Draw(effectLayer.GetGraphics(), effectKeyframe);
+                    effectKeyframe += (currenttime - previoustime) / 1000.0f;
+
+                    if (effectKeyframe >= effectAnimationTime)
+                    {
+                        showAnimation = false;
+                        animationRun = true;
+                        effectKeyframe = 0;
+                    }
+                }
+            }
+
+            return effectLayer;
+        }
+
+        public override void SetApplication(Application profile)
+        {
+            base.SetApplication(profile);
+        }
+
+        private void SetTracks(Color color)
+        {
+            for (int i = 0; i < tracks.Length; i++)
+            {
+                tracks[i].SetFrame(
+                    0.0f,
+                    new AnimationFilledCircle(
+                        (int)(Effects.canvas_width_center * 0.9),
+                        Effects.canvas_height_center,
+                        0,
+                        PD2Colours.GameTheme,
+                        4)
+                );
+
+                tracks[i].SetFrame(
+                    1.0f,
+                    new AnimationFilledCircle(
+                        (int)(Effects.canvas_width_center * 0.9),
+                        Effects.canvas_height_center,
+                        Effects.canvas_biggest / 2.0f,
+                        PD2Colours.GameTheme,
+                        4)
+                );
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2StatesLayerHandler.cs b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2StatesLayerHandler.cs
deleted file mode 100644
index 42de48746..000000000
--- a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2StatesLayerHandler.cs	
+++ /dev/null
@@ -1,118 +0,0 @@
-using Aurora.EffectsEngine;
-using Aurora.Profiles.Payday_2.GSI;
-using Aurora.Profiles.Payday_2.GSI.Nodes;
-using Aurora.Settings;
-using Aurora.Settings.Layers;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Controls;
-
-namespace Aurora.Profiles.Payday_2.Layers
-{
-    public class PD2StatesLayerHandlerProperties : LayerHandlerProperties2Color<PD2StatesLayerHandlerProperties>
-    {
-        public Color? _DownedColor { get; set; }
-
-        [JsonIgnore]
-        public Color DownedColor { get { return Logic._DownedColor ?? _DownedColor ?? Color.Empty; } }
-
-        public Color? _ArrestedColor { get; set; }
-
-        [JsonIgnore]
-        public Color ArrestedColor { get { return Logic._ArrestedColor ?? _ArrestedColor ?? Color.Empty; } }
-
-        public Color? _SwanSongColor { get; set; }
-
-        [JsonIgnore]
-        public Color SwanSongColor { get { return Logic._SwanSongColor ?? _SwanSongColor ?? Color.Empty; } }
-
-        public bool? _ShowSwanSong { get; set; }
-
-        [JsonIgnore]
-        public bool ShowSwanSong { get { return Logic._ShowSwanSong ?? _ShowSwanSong ?? false; } }
-
-        public float? _SwanSongSpeedMultiplier { get; set; }
-
-        [JsonIgnore]
-        public float SwanSongSpeedMultiplier { get { return Logic._SwanSongSpeedMultiplier ?? _SwanSongSpeedMultiplier ?? 0.0F; } }
-
-        public PD2StatesLayerHandlerProperties() : base() { }
-
-        public PD2StatesLayerHandlerProperties(bool assign_default = false) : base(assign_default) { }
-
-        public override void Default()
-        {
-            base.Default();
-
-            _DownedColor = Color.White;
-            _ArrestedColor = Color.DarkRed;
-            _ShowSwanSong = true;
-            _SwanSongColor = Color.FromArgb(158, 205, 255);
-            _SwanSongSpeedMultiplier = 1.0f;
-        }
-
-    }
-
-    public class PD2StatesLayerHandler : LayerHandler<PD2StatesLayerHandlerProperties>
-    {
-        protected override UserControl CreateControl()
-        {
-            return new Control_PD2StatesLayer(this);
-        }
-
-        public override EffectLayer Render(IGameState state)
-        {
-            EffectLayer states_layer = new EffectLayer("Payday 2 - States");
-
-            if (state is GameState_PD2)
-            {
-                GameState_PD2 pd2state = (GameState_PD2)state;
-
-                if (pd2state.Game.State == GameStates.Ingame)
-                {
-                    if (pd2state.LocalPlayer.State == PlayerState.Incapacitated || pd2state.LocalPlayer.State == PlayerState.Bleed_out || pd2state.LocalPlayer.State == PlayerState.Fatal)
-                    {
-                        int incapAlpha = (int)(pd2state.LocalPlayer.DownTime > 10 ? 0 : 255 * (1.0D - (double)pd2state.LocalPlayer.DownTime / 10.0D));
-
-                        if (incapAlpha > 255)
-                            incapAlpha = 255;
-                        else if (incapAlpha < 0)
-                            incapAlpha = 0;
-
-                        Color incapColor = Color.FromArgb(incapAlpha, Properties.DownedColor);
-
-                        states_layer.Fill(incapColor).Set(Devices.DeviceKeys.Peripheral, incapColor);
-                    }
-                    else if (pd2state.LocalPlayer.State == PlayerState.Arrested)
-                    {
-                        states_layer.Fill(Properties.ArrestedColor).Set(Devices.DeviceKeys.Peripheral, Properties.ArrestedColor);
-                    }
-
-                    if (pd2state.LocalPlayer.IsSwanSong && Properties.ShowSwanSong)
-                    {
-                        double blend_percent = Math.Pow(Math.Cos((Utils.Time.GetMillisecondsSinceEpoch() % 1300L) / 1300.0D * Properties.SwanSongSpeedMultiplier * 2.0D * Math.PI), 2.0D);
-
-                        Color swansongColor = Utils.ColorUtils.MultiplyColorByScalar(Properties.SwanSongColor, blend_percent);
-
-                        EffectLayer swansong_layer = new EffectLayer("Payday 2 - Swansong", swansongColor).Set(Devices.DeviceKeys.Peripheral, swansongColor);
-
-                        states_layer += swansong_layer;
-                    }
-                }
-            }
-
-            return states_layer;
-        }
-
-        public override void SetApplication(Application profile)
-        {
-            (_Control as Control_PD2StatesLayer)?.SetProfile(profile);
-            base.SetApplication(profile);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Project-Aurora/Project-Aurora/Profiles/Payday 2/PD2Application.cs b/Project-Aurora/Project-Aurora/Profiles/Payday 2/PD2Application.cs
index 9613a0081..337820bb7 100644
--- a/Project-Aurora/Project-Aurora/Profiles/Payday 2/PD2Application.cs	
+++ b/Project-Aurora/Project-Aurora/Profiles/Payday 2/PD2Application.cs	
@@ -17,9 +17,7 @@ public PD2()
                 IconURI = "Resources/pd2_64x64.png"
             })
         {
-            AllowLayer<PD2BackgroundLayerHandler>();
-            AllowLayer<PD2FlashbangLayerHandler>();
-            AllowLayer<PD2StatesLayerHandler>();            
+            AllowLayer<PD2MaskOnAnimationLayerHandler>();
         }
     }
 }
diff --git a/Project-Aurora/Project-Aurora/Profiles/Payday 2/PD2Profile.cs b/Project-Aurora/Project-Aurora/Profiles/Payday 2/PD2Profile.cs
index 974b6ea19..f2ae96433 100644
--- a/Project-Aurora/Project-Aurora/Profiles/Payday 2/PD2Profile.cs	
+++ b/Project-Aurora/Project-Aurora/Profiles/Payday 2/PD2Profile.cs	
@@ -1,10 +1,29 @@
-using Aurora.Settings;
+using Aurora.Devices;
+using Aurora.EffectsEngine;
+using Aurora.Profiles.Payday_2.GSI.Nodes;
+using Aurora.Profiles.Payday_2.Layers;
+using Aurora.Settings;
 using Aurora.Settings.Layers;
+using Aurora.Settings.Overrides.Logic;
+using Aurora.Settings.Overrides.Logic.Builder;
 using System.Collections.Generic;
 using System.Drawing;
 
 namespace Aurora.Profiles.Payday_2
 {
+    public class PD2Colours
+    {
+        public static Color GameTheme = Color.FromArgb(4, 119, 207);
+        public static Color PlayerState_Standard = Color.FromArgb(4, 119, 207);
+        public static Color PlayerState_Tazed = Color.FromArgb(255, 0, 0);
+        public static Color PlayerState_Arrested = Color.FromArgb(255, 0, 0);
+        public static Color PlayerState_Downed = Color.FromArgb(255, 0, 0);
+        public static Color PlayerState_Civilian = Color.FromArgb(200, 200, 200);
+        public static Color LevelState_Loud = Color.FromArgb(255, 255, 0);
+        public static Color LevelState_Winters = Color.FromArgb(255, 165, 0);
+        public static Color LevelState_PointOfNoReturn = Color.FromArgb(255, 0, 0);
+    }
+
     public class PD2Profile : ApplicationProfile
     {
         public PD2Profile() : base()
@@ -17,7 +36,10 @@ public override void Reset()
             base.Reset();
             Layers = new System.Collections.ObjectModel.ObservableCollection<Layer>
             {
-                new Layer("Payday 2 Flashbang", new Payday_2.Layers.PD2FlashbangLayerHandler()),
+                // PD2 Mask On Animation
+                new Layer("Mask On Animation", new PD2MaskOnAnimationLayerHandler()),
+
+                // PD2 Health/Ammo Indicators
                 new Layer("Health Indicator", new PercentLayerHandler()
                 {
                     Properties = new PercentLayerHandlerProperties()
@@ -35,7 +57,13 @@ public override void Reset()
                         _VariablePath = "LocalPlayer/Health/Current",
                         _MaxVariablePath = "LocalPlayer/Health/Max"
                     },
-                }),
+                }, new OverrideLogicBuilder()
+                    .SetLookupTable("_Enabled", new OverrideLookupTableBuilder<bool>()
+                        .AddEntry(false, new BooleanGSIEnum("LocalPlayer/State", PlayerState.Civilian))
+                        .AddEntry(false, new BooleanGSIEnum("LocalPlayer/State", PlayerState.Undefined))
+                        .AddEntry(false, new BooleanGSIEnum("LocalPlayer/State", PlayerState.Mask_Off))
+                    )
+                ),
                 new Layer("Ammo Indicator", new PercentLayerHandler()
                 {
                     Properties = new PercentLayerHandlerProperties()
@@ -53,9 +81,205 @@ public override void Reset()
                         _VariablePath = "LocalPlayer/Weapons/SelectedWeapon/Current_Clip",
                         _MaxVariablePath = "LocalPlayer/Weapons/SelectedWeapon/Max_Clip"
                     },
-                }),
-                new Layer("Payday 2 States", new Payday_2.Layers.PD2StatesLayerHandler()),
-                new Layer("Payday 2 Background", new Payday_2.Layers.PD2BackgroundLayerHandler())
+                }, new OverrideLogicBuilder()
+                    .SetLookupTable("_Enabled", new OverrideLookupTableBuilder<bool>()
+                        .AddEntry(false, new BooleanGSIEnum("LocalPlayer/State", PlayerState.Civilian))
+                        .AddEntry(false, new BooleanGSIEnum("LocalPlayer/State", PlayerState.Undefined))
+                        .AddEntry(false, new BooleanGSIEnum("LocalPlayer/State", PlayerState.Mask_Off))
+                    )
+                ),
+
+                // PD2 Loud (Assault) State Animation
+                new Layer("Loud (Assault) Animation", new GradientLayerHandler()
+                {
+                    Properties = new GradientLayerHandlerProperties()
+                    {
+                        _GradientConfig = new LayerEffectConfig()
+                        {
+                            Speed = 10,
+                            Angle = 0,
+                            GradientSize = 100,
+                            AnimationType = AnimationType.Translate_XY,
+                            AnimationReverse = false,
+                            Brush = new EffectBrush()
+                            {
+                                type = EffectBrush.BrushType.Linear,
+                                wrap = EffectBrush.BrushWrap.Repeat,
+                                colorGradients = new SortedDictionary<float, Color> {
+                                    { 0, PD2Colours.LevelState_Loud },
+                                    { 0.5F, PD2Colours.LevelState_Loud },
+                                    { 1, Color.White }
+                                },
+                                start = new PointF()
+                                {
+                                    X = 0.0F,
+                                    Y = -0.5F
+                                },
+                                end = new PointF()
+                                {
+                                    X = 1F,
+                                    Y = 1F
+                                },
+                                center = new PointF()
+                                {
+                                    X = 1F,
+                                    Y = 1F
+                                }
+                            }
+                        },
+                        _Sequence = new KeySequence()
+                        {
+                            type = KeySequenceType.FreeForm,
+                            freeform = Effects.WholeCanvasFreeForm
+                        }
+                    }
+                }, new OverrideLogicBuilder()
+                    .SetDynamicBoolean("_Enabled", new BooleanGSIEnum("Level/Phase", LevelPhase.Assault))
+                ),
+
+                // PD2 Loud (Assault) State Animation
+                new Layer("Loud (Winters) Animation", new GradientLayerHandler()
+                {
+                    Properties = new GradientLayerHandlerProperties()
+                    {
+                        _GradientConfig = new LayerEffectConfig()
+                        {
+                            Speed = 10,
+                            Angle = 0,
+                            GradientSize = 100,
+                            AnimationType = AnimationType.Translate_XY,
+                            AnimationReverse = false,
+                            Brush = new EffectBrush()
+                            {
+                                type = EffectBrush.BrushType.Linear,
+                                wrap = EffectBrush.BrushWrap.Repeat,
+                                colorGradients = new SortedDictionary<float, Color> {
+                                    { 0, PD2Colours.LevelState_Winters },
+                                    { 0.5F, PD2Colours.LevelState_Winters },
+                                    { 1, Color.White }
+                                },
+                                start = new PointF()
+                                {
+                                    X = 0.0F,
+                                    Y = -0.5F
+                                },
+                                end = new PointF()
+                                {
+                                    X = 1F,
+                                    Y = 1F
+                                },
+                                center = new PointF()
+                                {
+                                    X = 1F,
+                                    Y = 1F
+                                }
+                            }
+                        },
+                        _Sequence = new KeySequence()
+                        {
+                            type = KeySequenceType.FreeForm,
+                            freeform = Effects.WholeCanvasFreeForm
+                        }
+                    }
+                }, new OverrideLogicBuilder()
+                    .SetDynamicBoolean("_Enabled", new BooleanGSIEnum("Level/Phase", LevelPhase.Winters))
+                ),
+
+                // PD2 Loud (Point of No Return) State Animation
+                new Layer("Loud (Point of No Return) Animation", new GradientFillLayerHandler()
+                {
+                    Properties = new GradientFillLayerHandlerProperties()
+                    {
+                        _FillEntireKeyboard = true,
+                        _GradientConfig = new LayerEffectConfig()
+                        {
+                            Speed = 10f,
+                            Brush = new EffectBrush()
+                            {
+                                type = EffectBrush.BrushType.Linear,
+                                wrap = EffectBrush.BrushWrap.Repeat,
+                                colorGradients = new SortedDictionary<float, Color> {
+                                    { 0, Color.Black },
+                                    { 0.25f, PD2Colours.LevelState_PointOfNoReturn },
+                                    { 0.5f, Color.Black },
+                                    { 0.75f, PD2Colours.LevelState_PointOfNoReturn },
+                                    { 1, Color.Black }
+                                },
+                                start = new PointF()
+                                {
+                                    X = 0F,
+                                    Y = 1F
+                                },
+                                end = new PointF()
+                                {
+                                    X = 1F,
+                                    Y = 1F
+                                },
+                                center = new PointF()
+                                {
+                                    X = 0F,
+                                    Y = 0F
+                                }
+                            }
+                        }
+                    }
+                }, new OverrideLogicBuilder()
+                    .SetDynamicBoolean("_Enabled", new BooleanGSIEnum("Level/Phase", LevelPhase.Point_of_no_return))
+                ),
+
+                // PD2 Level State Backgrounds
+                new Layer("Level State Backgrounds", new SolidFillLayerHandler() {
+                    Properties = new SolidFillLayerHandlerProperties()
+                    {
+                        _PrimaryColor = Color.FromArgb(0,0,0,0)
+                    }
+                }, new OverrideLogicBuilder()
+                    .SetLookupTable("_Enabled", new OverrideLookupTableBuilder<bool>()
+                        .AddEntry(true, new BooleanGSIEnum("LocalPlayer/State", PlayerState.Standard))
+                    )
+                    .SetLookupTable("_PrimaryColor", new OverrideLookupTableBuilder<Color>()
+                        .AddEntry(PD2Colours.LevelState_Loud, new BooleanGSIEnum("Level/Phase", LevelPhase.Loud))
+                        .AddEntry(PD2Colours.LevelState_Loud, new BooleanGSIEnum("Level/Phase", LevelPhase.Assault))
+                    )
+                ),
+
+                // PD2 Player State Backgrounds
+                new Layer("Player State Backgrounds", new SolidFillLayerHandler() {
+                    Properties = new SolidFillLayerHandlerProperties()
+                    {
+                        _PrimaryColor = Color.FromArgb(0,0,0,0)
+                    }
+                }, new OverrideLogicBuilder()
+                    .SetLookupTable("_Enabled", new OverrideLookupTableBuilder<bool>()
+                        .AddEntry(true, new BooleanGSIEnum("LocalPlayer/State", PlayerState.Standard))
+                    )
+                    .SetLookupTable("_PrimaryColor", new OverrideLookupTableBuilder<Color>()
+                        .AddEntry(PD2Colours.GameTheme, new BooleanGSIEnum("LocalPlayer/State", PlayerState.Standard))
+                        .AddEntry(PD2Colours.GameTheme, new BooleanGSIEnum("LocalPlayer/State", PlayerState.Carry))
+                        .AddEntry(PD2Colours.PlayerState_Arrested, new BooleanGSIEnum("LocalPlayer/State", PlayerState.Arrested))
+                        .AddEntry(PD2Colours.PlayerState_Civilian, new BooleanGSIEnum("LocalPlayer/State", PlayerState.Mask_Off))
+                        .AddEntry(PD2Colours.PlayerState_Civilian, new BooleanGSIEnum("LocalPlayer/State", PlayerState.Civilian))
+                    )
+                ),
+
+                // PD2 Logo-Colour Background Effect
+                new Layer("Background Effect", new SolidFillLayerHandler() {
+                    Properties = new SolidFillLayerHandlerProperties()
+                    {
+                        _PrimaryColor = PD2Colours.GameTheme
+                    }
+                }, new OverrideLogicBuilder()
+                    .SetLookupTable("_Enabled", new OverrideLookupTableBuilder<bool>()
+                        .AddEntry(true, new BooleanGSIEnum("Game/State", GameStates.Undefined))
+                        .AddEntry(true, new BooleanGSIEnum("Game/State", GameStates.None))
+                        .AddEntry(true, new BooleanGSIEnum("Game/State", GameStates.Kit_menu))
+                        .AddEntry(true, new BooleanGSIEnum("Game/State", GameStates.Loot_menu))
+                        .AddEntry(true, new BooleanGSIEnum("Game/State", GameStates.Menu_Pause))
+                        .AddEntry(false, new BooleanGSIEnum("Game/State", GameStates.Mission_end_failure))
+                        .AddEntry(false, new BooleanGSIEnum("Game/State", GameStates.Mission_end_success))
+                        .AddEntry(false, new BooleanGSIEnum("Game/State", GameStates.Ingame))
+                    )
+                )
             };
         }
     }
diff --git a/Project-Aurora/Project-Aurora/Project-Aurora.csproj b/Project-Aurora/Project-Aurora/Project-Aurora.csproj
index e0b45ea4a..5e7a8a830 100644
--- a/Project-Aurora/Project-Aurora/Project-Aurora.csproj
+++ b/Project-Aurora/Project-Aurora/Project-Aurora.csproj
@@ -240,6 +240,10 @@
     </Compile>
     <Compile Include="Profiles\AutoJsonNode.cs" />
     <Compile Include="Profiles\LocalPCInformation.cs" />
+    <Compile Include="Profiles\Payday 2\Layers\Control_PD2MaskOnAnimationLayer.xaml.cs">
+      <DependentUpon>Control_PD2MaskOnAnimationLayer.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Profiles\Payday 2\Layers\PD2MaskOnAnimationLayerHandler.cs" />
     <Compile Include="Profiles\RocketLeague\GSI\Nodes\Team.cs" />
     <Compile Include="Profiles\RocketLeague\Layers\RocketLeagueGoalExplosionLayerHandler.cs" />
     <Compile Include="Profiles\Osu\GSI\Enums.cs" />
@@ -970,18 +974,6 @@
     </None>
     <None Include="Profiles\Overlays\VolumeOverlay\Event_VolumeOverlay.cs" />
     <None Include="Profiles\Overlays\VolumeOverlay\VolumeOverlaySettings.cs" />
-    <Compile Include="Profiles\Payday 2\Layers\Control_PD2StatesLayer.xaml.cs">
-      <DependentUpon>Control_PD2StatesLayer.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Profiles\Payday 2\Layers\Control_PD2FlashbangLayer.xaml.cs">
-      <DependentUpon>Control_PD2FlashbangLayer.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Profiles\Payday 2\Layers\Control_PD2BackgroundLayer.xaml.cs">
-      <DependentUpon>Control_PD2BackgroundLayer.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Profiles\Payday 2\Layers\PD2StatesLayerHandler.cs" />
-    <Compile Include="Profiles\Payday 2\Layers\PD2FlashbangLayerHandler.cs" />
-    <Compile Include="Profiles\Payday 2\Layers\PD2BackgroundLayerHandler.cs" />
     <Compile Include="Profiles\LightingStateManager.cs" />
     <Compile Include="Profiles\Worms_WMD\Control_WormsWMD.xaml.cs">
       <DependentUpon>Control_WormsWMD.xaml</DependentUpon>
@@ -1779,6 +1771,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Profiles\Payday 2\Layers\Control_PD2MaskOnAnimationLayer.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Profiles\Stardew Valley\Control_StardewValley.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -2087,18 +2083,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Profiles\Payday 2\Layers\Control_PD2StatesLayer.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Profiles\Payday 2\Layers\Control_PD2FlashbangLayer.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Profiles\Payday 2\Layers\Control_PD2BackgroundLayer.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Profiles\KillingFloor2\Control_KillingFloor2.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/Project-Aurora/Project-Aurora/Settings/Control_LayerControlPresenter.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Control_LayerControlPresenter.xaml.cs
index f9cb733bb..ff10fa783 100644
--- a/Project-Aurora/Project-Aurora/Settings/Control_LayerControlPresenter.xaml.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Control_LayerControlPresenter.xaml.cs
@@ -17,7 +17,6 @@
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
-using Aurora.Profiles.Payday_2.Layers;
 using Aurora.Profiles;
 
 namespace Aurora.Settings

From 9948521f8e5a16d8a99ec985f7206dc9c81b0329 Mon Sep 17 00:00:00 2001
From: Luke Anderson <stuntguy3000@gmail.com>
Date: Sat, 5 Sep 2020 00:17:44 +0930
Subject: [PATCH 2/2] Restore Legacy PD2 Layers

---
 .../Profiles/Payday 2/Control_PD2.xaml        |  23 --
 .../Profiles/Payday 2/Control_PD2.xaml.cs     |  74 -----
 .../Layers/Control_PD2BackgroundLayer.xaml.cs |  54 ++++
 .../Layers/Control_PD2FlashbangLayer.xaml     |  14 +
 .../Layers/Control_PD2FlashbangLayer.xaml.cs  |  65 +++++
 .../Layers/Control_PD2StatesLayer.xaml.cs     |  54 ++++
 .../Layers/PD2BackgroundLayerHandler.cs       | 253 ++++++++++++++++++
 .../Layers/PD2FlashbangLayerHandler.cs        |  75 ++++++
 .../Payday 2/Layers/PD2StatesLayerHandler.cs  | 120 +++++++++
 .../Profiles/Payday 2/PD2Application.cs       |   3 +
 10 files changed, 638 insertions(+), 97 deletions(-)
 create mode 100644 Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2BackgroundLayer.xaml.cs
 create mode 100644 Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2FlashbangLayer.xaml
 create mode 100644 Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2FlashbangLayer.xaml.cs
 create mode 100644 Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2StatesLayer.xaml.cs
 create mode 100644 Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2BackgroundLayerHandler.cs
 create mode 100644 Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2FlashbangLayerHandler.cs
 create mode 100644 Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2StatesLayerHandler.cs

diff --git a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Control_PD2.xaml b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Control_PD2.xaml
index 58d8607b4..cbc98a7ef 100644
--- a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Control_PD2.xaml	
+++ b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Control_PD2.xaml	
@@ -20,29 +20,6 @@
                     <Button x:Name="install_mod_button" Content="Install GSI for Payday 2" HorizontalAlignment="Left" Margin="10,145,0,0" VerticalAlignment="Top" Click="install_mod_button_Click" Width="160"/>
                     <CheckBox x:Name="game_enabled" Content="Enable Aurora to provide lighting effects with Payday 2" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Checked="game_enabled_Checked" Unchecked="game_enabled_Checked"/>
                 </Grid>
-            </TabItem>
-			<TabItem Header="Preview">
-                <Grid>
-                    <Label Content="Level Phase:" HorizontalAlignment="Left" Margin="10,41,0,0" VerticalAlignment="Top"/>
-                    <ComboBox x:Name="preview_levelphase" HorizontalAlignment="Left" Margin="90,43,0,0" VerticalAlignment="Top" Width="200" IsSynchronizedWithCurrentItem="True" SelectedIndex="0" ItemsSource="{u:EnumToItemsSource {x:Type e:LevelPhase}}" DisplayMemberPath="Text" SelectedValuePath="Value" SelectionChanged="preview_levelphase_SelectionChanged"/>
-                    <Label Content="Health:" HorizontalAlignment="Left" Margin="10,103,0,0" VerticalAlignment="Top"/>
-                    <Slider x:Name="preview_health_slider" HorizontalAlignment="Left" Margin="62,107,0,0" VerticalAlignment="Top" Width="114" Maximum="100" SmallChange="1" ValueChanged="preview_health_slider_ValueChanged"/>
-                    <Label x:Name="preview_health_amount" Content="0%" HorizontalAlignment="Left" Margin="181,103,0,0" VerticalAlignment="Top"/>
-                    <Label Content="Ammo:" HorizontalAlignment="Left" Margin="10,134,0,0" VerticalAlignment="Top"/>
-                    <Slider x:Name="preview_ammo_slider" HorizontalAlignment="Left" Margin="62,138,0,0" VerticalAlignment="Top" Width="114" Maximum="100" SmallChange="1" ValueChanged="preview_ammo_slider_ValueChanged"/>
-                    <Label x:Name="preview_ammo_amount" Content="0%" HorizontalAlignment="Left" Margin="181,134,0,0" VerticalAlignment="Top"/>
-                    <Label Content="Suspicion:" HorizontalAlignment="Left" Margin="10,165,0,0" VerticalAlignment="Top"/>
-                    <Slider x:Name="preview_suspicion_slider" HorizontalAlignment="Left" Margin="78,169,0,0" VerticalAlignment="Top" Width="98" Maximum="100" SmallChange="1" ValueChanged="preview_suspicion_slider_ValueChanged"/>
-                    <Label x:Name="preview_suspicion_amount" Content="0%" HorizontalAlignment="Left" Margin="181,165,0,0" VerticalAlignment="Top" RenderTransformOrigin="0.692,3.115"/>
-                    <Label Content="Player State:" HorizontalAlignment="Left" Margin="10,72,0,0" VerticalAlignment="Top"/>
-                    <ComboBox x:Name="preview_playerstate" HorizontalAlignment="Left" Margin="90,74,0,0" VerticalAlignment="Top" Width="200" IsSynchronizedWithCurrentItem="True" SelectedIndex="0" ItemsSource="{u:EnumToItemsSource {x:Type e:PlayerState}}" DisplayMemberPath="Text" SelectedValuePath="Value" SelectionChanged="preview_playerstate_SelectionChanged"/>
-                    <CheckBox x:Name="preview_swansong" Content="Is player in Swan Song" HorizontalAlignment="Left" Margin="13,196,0,0" VerticalAlignment="Top" Checked="preview_swansong_Checked" Unchecked="preview_swansong_Checked"/>
-                    <Label Content="Flashbang amount:" HorizontalAlignment="Left" Margin="10,216,0,0" VerticalAlignment="Top"/>
-                    <Slider x:Name="preview_flashbang_slider" HorizontalAlignment="Left" Margin="126,222,0,0" VerticalAlignment="Top" Width="98" Maximum="100" SmallChange="1" ValueChanged="preview_flashbang_slider_ValueChanged"/>
-                    <Label x:Name="preview_flashbang_amount" Content="0%" HorizontalAlignment="Left" Margin="229,218,0,0" VerticalAlignment="Top" RenderTransformOrigin="0.692,3.115"/>
-                    <Label Content="Game State:" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top"/>
-                    <ComboBox x:Name="preview_gamestate" HorizontalAlignment="Left" Margin="90,12,0,0" VerticalAlignment="Top" Width="200" IsSynchronizedWithCurrentItem="True" SelectedIndex="0" ItemsSource="{u:EnumToItemsSource {x:Type e:GameStates}}" DisplayMemberPath="Text" SelectedValuePath="Value" SelectionChanged="preview_gamestate_SelectionChanged"/>
-                </Grid>
             </TabItem>
         </TabControl>
     </Grid>
diff --git a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Control_PD2.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Control_PD2.xaml.cs
index 81ecf8867..80e008f26 100644
--- a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Control_PD2.xaml.cs	
+++ b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Control_PD2.xaml.cs	
@@ -92,80 +92,6 @@ private void install_mod_button_Click(object sender, RoutedEventArgs e)
             }
         }
 
-        private void preview_gamestate_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (IsLoaded)
-            {
-                (profile_manager.Config.Event._game_state as GameState_PD2).Game.State = (GSI.Nodes.GameStates)preview_gamestate.SelectedValue;
-            }
-        }
-
-        private void preview_levelphase_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (IsLoaded)
-            {
-                (profile_manager.Config.Event._game_state as GameState_PD2).Level.Phase = (GSI.Nodes.LevelPhase)preview_levelphase.SelectedValue;
-            }
-        }
-
-        private void preview_playerstate_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (IsLoaded)
-            {
-                (profile_manager.Config.Event._game_state as GameState_PD2).Players.LocalPlayer.State = (GSI.Nodes.PlayerState)preview_playerstate.SelectedValue;
-            }
-        }
-
-        private void preview_health_slider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
-        {
-            int hp_val = (int)this.preview_health_slider.Value;
-            if (this.preview_health_amount is Label)
-            {
-                this.preview_health_amount.Content = hp_val + "%";
-                (profile_manager.Config.Event._game_state as GameState_PD2).Players.LocalPlayer.Health.Current = hp_val;
-                (profile_manager.Config.Event._game_state as GameState_PD2).Players.LocalPlayer.Health.Max = 100;
-            }
-        }
-
-        private void preview_ammo_slider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
-        {
-            int ammo_val = (int)this.preview_ammo_slider.Value;
-            if (this.preview_ammo_amount is Label)
-            {
-                this.preview_ammo_amount.Content = ammo_val + "%";
-                (profile_manager.Config.Event._game_state as GameState_PD2).Players.LocalPlayer.Weapons.SelectedWeapon.Current_Clip = ammo_val;
-                (profile_manager.Config.Event._game_state as GameState_PD2).Players.LocalPlayer.Weapons.SelectedWeapon.Max_Clip = 100;
-            }
-        }
-
-        private void preview_suspicion_slider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
-        {
-            float susp_val = (float)this.preview_suspicion_slider.Value;
-            if (this.preview_suspicion_amount is Label)
-            {
-                this.preview_suspicion_amount.Content = (int)susp_val + "%";
-                (profile_manager.Config.Event._game_state as GameState_PD2).Players.LocalPlayer.SuspicionAmount = susp_val / 100.0f;
-            }
-        }
-
-        private void preview_flashbang_slider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
-        {
-            float flash_val = (float)this.preview_flashbang_slider.Value;
-            if (this.preview_flashbang_amount is Label)
-            {
-                this.preview_flashbang_amount.Content = (int)flash_val + "%";
-                (profile_manager.Config.Event._game_state as GameState_PD2).Players.LocalPlayer.FlashAmount = flash_val / 100.0f;
-            }
-        }
-
-        private void preview_swansong_Checked(object sender, RoutedEventArgs e)
-        {
-            if (IsLoaded && sender is CheckBox && (sender as CheckBox).IsChecked.HasValue)
-            {
-                (profile_manager.Config.Event._game_state as GameState_PD2).Players.LocalPlayer.IsSwanSong = (sender as CheckBox).IsChecked.Value;
-            }
-        }
-
         private void get_lib_button_Click(object sender, RoutedEventArgs e)
         {
             System.Diagnostics.Process.Start(new System.Diagnostics.ProcessStartInfo(@"https://modworkshop.net/mod/14924"));
diff --git a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2BackgroundLayer.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2BackgroundLayer.xaml.cs
new file mode 100644
index 000000000..ed19aa1fe
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2BackgroundLayer.xaml.cs	
@@ -0,0 +1,54 @@
+using Aurora.Settings;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Aurora.Profiles.Payday_2.Layers
+{
+    /// <summary>
+    /// Interaction logic for Control_CSGOBackgroundLayer.xaml
+    /// </summary>
+    public partial class Control_PD2BackgroundLayer : UserControl
+    {
+        private bool settingsset = false;
+        private bool profileset = false;
+
+        public Control_PD2BackgroundLayer()
+        {
+            InitializeComponent();
+        }
+
+        public Control_PD2BackgroundLayer(PD2BackgroundLayerHandler datacontext)
+        {
+            this.DataContext = datacontext.Properties;
+            InitializeComponent();
+        }
+
+
+        internal void SetProfile(Application profile)
+        {
+        }
+
+        private void UserControl_Loaded(object sender, RoutedEventArgs e)
+        {
+
+            this.Loaded -= UserControl_Loaded;
+        }
+
+        private void sldAssaultSpeed_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
+        {
+            this.lblAssaultSpeed.Content = $"x {sldAssaultSpeed.Value.ToString("0.00")}";
+        }
+    }
+}
diff --git a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2FlashbangLayer.xaml b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2FlashbangLayer.xaml
new file mode 100644
index 000000000..572d41494
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2FlashbangLayer.xaml	
@@ -0,0 +1,14 @@
+<UserControl
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Aurora.Profiles.Payday_2.Layers"
+             xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+             xmlns:Controls="clr-namespace:Aurora.Controls" x:Class="Aurora.Profiles.Payday_2.Layers.Control_PD2FlashbangLayer"
+             mc:Ignorable="d" Loaded="UserControl_Loaded">
+    <Grid>
+        <xctk:ColorPicker x:Name="ColorPicker_Flashbang" Margin="93,0,0,0" Height="20" VerticalAlignment="Top" HorizontalAlignment="Left" Width="151" UsingAlphaChannel="True" ColorMode="ColorCanvas" SelectedColorChanged="ColorPicker_Flashbang_SelectedColorChanged" />
+        <Label HorizontalAlignment="Left" Padding="0" Content="Flashbang Color:" VerticalAlignment="Top" Margin="0,2,0,0"/>
+    </Grid>
+</UserControl>
\ No newline at end of file
diff --git a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2FlashbangLayer.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2FlashbangLayer.xaml.cs
new file mode 100644
index 000000000..9953ebb61
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2FlashbangLayer.xaml.cs	
@@ -0,0 +1,65 @@
+using Aurora.Settings;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Aurora.Profiles.Payday_2.Layers
+{
+    /// <summary>
+    /// Interaction logic for Control_PD2FlashbangLayer.xaml
+    /// </summary>
+    public partial class Control_PD2FlashbangLayer : UserControl
+    {
+        private bool settingsset = false;
+
+        public Control_PD2FlashbangLayer()
+        {
+            InitializeComponent();
+        }
+
+        public Control_PD2FlashbangLayer(PD2FlashbangLayerHandler datacontext)
+        {
+            InitializeComponent();
+
+            this.DataContext = datacontext;
+        }
+
+        public void SetSettings()
+        {
+            if (this.DataContext is PD2FlashbangLayerHandler && !settingsset)
+            {
+                this.ColorPicker_Flashbang.SelectedColor = Utils.ColorUtils.DrawingColorToMediaColor((this.DataContext as PD2FlashbangLayerHandler).Properties._FlashbangColor ?? System.Drawing.Color.Empty);
+
+                settingsset = true;
+            }
+        }
+
+        internal void SetProfile(Application profile)
+        {
+        }
+
+        private void UserControl_Loaded(object sender, RoutedEventArgs e)
+        {
+            SetSettings();
+
+            this.Loaded -= UserControl_Loaded;
+        }
+
+        private void ColorPicker_Flashbang_SelectedColorChanged(object sender, RoutedPropertyChangedEventArgs<Color?> e)
+        {
+            if (IsLoaded && settingsset && this.DataContext is PD2FlashbangLayerHandler && sender is Xceed.Wpf.Toolkit.ColorPicker && (sender as Xceed.Wpf.Toolkit.ColorPicker).SelectedColor.HasValue)
+                (this.DataContext as PD2FlashbangLayerHandler).Properties._FlashbangColor = Utils.ColorUtils.MediaColorToDrawingColor((sender as Xceed.Wpf.Toolkit.ColorPicker).SelectedColor.Value);
+        }
+    }
+}
diff --git a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2StatesLayer.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2StatesLayer.xaml.cs
new file mode 100644
index 000000000..4c152471f
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/Control_PD2StatesLayer.xaml.cs	
@@ -0,0 +1,54 @@
+using Aurora.Settings;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Aurora.Profiles.Payday_2.Layers
+{
+    /// <summary>
+    /// Interaction logic for Control_PD2StatesLayer.xaml
+    /// </summary>
+    public partial class Control_PD2StatesLayer : UserControl
+    {
+        private bool settingsset = false;
+        private bool profileset = false;
+
+        public Control_PD2StatesLayer()
+        {
+            InitializeComponent();
+        }
+
+        public Control_PD2StatesLayer(PD2StatesLayerHandler datacontext)
+        {
+            this.DataContext = datacontext.Properties;
+            InitializeComponent();
+        }
+
+
+        internal void SetProfile(Application profile)
+        {
+        }
+
+        private void UserControl_Loaded(object sender, RoutedEventArgs e)
+        {
+
+            this.Loaded -= UserControl_Loaded;
+        }
+
+        private void sldSwanSongSpeed_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
+        {
+            this.lblSwanSongSpeed.Content = $"x {sldSwanSongSpeed.Value.ToString("0.00")}";
+        }
+    }
+}
diff --git a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2BackgroundLayerHandler.cs b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2BackgroundLayerHandler.cs
new file mode 100644
index 000000000..071249136
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2BackgroundLayerHandler.cs	
@@ -0,0 +1,253 @@
+using Aurora.EffectsEngine;
+using Aurora.Profiles.Payday_2.GSI;
+using Aurora.Profiles.Payday_2.GSI.Nodes;
+using Aurora.Settings;
+using Aurora.Settings.Layers;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+
+namespace Aurora.Profiles.Payday_2.Layers
+{
+    [Obsolete]
+    public class PD2BackgroundLayerHandlerProperties : LayerHandlerProperties2Color<PD2BackgroundLayerHandlerProperties>
+    {
+        public Color? _AmbientColor { get; set; }
+
+        [JsonIgnore]
+        public Color AmbientColor { get { return Logic._AmbientColor ?? _AmbientColor ?? Color.Empty; } }
+
+        public Color? _AssaultColor { get; set; }
+
+        [JsonIgnore]
+        public Color AssaultColor { get { return Logic._AssaultColor ?? _AssaultColor ?? Color.Empty; } }
+
+        public Color? _WintersColor { get; set; }
+
+        [JsonIgnore]
+        public Color WintersColor { get { return Logic._WintersColor ?? _WintersColor ?? Color.Empty; } }
+
+        public float? _AssaultSpeedMultiplier { get; set; }
+
+        [JsonIgnore]
+        public float AssaultSpeedMultiplier { get { return Logic._AssaultSpeedMultiplier ?? _AssaultSpeedMultiplier ?? 0.0F; } }
+
+        public Color? _AssaultFadeColor { get; set; }
+
+        [JsonIgnore]
+        public Color AssaultFadeColor { get { return Logic._AssaultFadeColor ?? _AssaultFadeColor ?? Color.Empty; } }
+
+        public bool? _AssaultAnimationEnabled { get; set; }
+
+        [JsonIgnore]
+        public bool AssaultAnimationEnabled { get { return Logic._AssaultAnimationEnabled ?? _AssaultAnimationEnabled ?? false; } }
+
+        public Color? _LowSuspicionColor { get; set; }
+
+        [JsonIgnore]
+        public Color LowSuspicionColor { get { return Logic._LowSuspicionColor ?? _LowSuspicionColor ?? Color.Empty; } }
+
+        public Color? _MediumSuspicionColor { get; set; }
+
+        [JsonIgnore]
+        public Color MediumSuspicionColor { get { return Logic._MediumSuspicionColor ?? _MediumSuspicionColor ?? Color.Empty; } }
+
+        public Color? _HighSuspicionColor { get; set; }
+
+        [JsonIgnore]
+        public Color HighSuspicionColor { get { return Logic._HighSuspicionColor ?? _HighSuspicionColor ?? Color.Empty; } }
+
+        public bool? _ShowSuspicion { get; set; }
+
+        [JsonIgnore]
+        public bool ShowSuspicion { get { return Logic._ShowSuspicion ?? _ShowSuspicion ?? false; } }
+
+        public PercentEffectType? _SuspicionEffectType { get; set; }
+
+        public PercentEffectType SuspicionEffectType { get { return Logic._SuspicionEffectType ?? _SuspicionEffectType ?? PercentEffectType.AllAtOnce; } }
+
+        public bool? _PeripheralUse { get; set; }
+
+        [JsonIgnore]
+        public bool PeripheralUse { get { return Logic._PeripheralUse ?? _PeripheralUse ?? false; } }
+
+
+        public PD2BackgroundLayerHandlerProperties() : base() { }
+
+        public PD2BackgroundLayerHandlerProperties(bool assign_default = false) : base(assign_default) { }
+
+        public override void Default()
+        {
+            base.Default();
+
+            _AmbientColor = Color.FromArgb(158, 205, 255);
+            _AssaultColor = Color.FromArgb(158, 205, 255);
+            _WintersColor = Color.FromArgb(221, 99, 33);
+            _AssaultSpeedMultiplier = 1.0f;
+            _AssaultFadeColor = Color.FromArgb(255, 255, 255);
+            _AssaultAnimationEnabled = true;
+            _LowSuspicionColor = Color.FromArgb(0, 0, 0, 255);
+            _MediumSuspicionColor = Color.FromArgb(255, 0, 0, 255);
+            _HighSuspicionColor = Color.FromArgb(255, 255, 0, 0);
+            _ShowSuspicion = true;
+            _SuspicionEffectType = PercentEffectType.Progressive;
+            _PeripheralUse = true;
+        }
+
+    }
+
+    [Obsolete]
+    public class PD2BackgroundLayerHandler : LayerHandler<PD2BackgroundLayerHandlerProperties>
+    {
+        private float no_return_flashamount = 1.0f;
+        private float no_return_timeleft;
+
+        protected override UserControl CreateControl()
+        {
+            return new Control_PD2BackgroundLayer(this);
+        }
+
+        public override EffectLayer Render(IGameState state)
+        {
+            EffectLayer bg_layer = new EffectLayer("Payday 2 - Background");
+
+            if (state is GameState_PD2)
+            {
+
+                GameState_PD2 pd2 = (GameState_PD2)state;
+
+                Color bg_color = Properties.AmbientColor;
+
+                long currenttime = Utils.Time.GetMillisecondsSinceEpoch();
+
+                if ((pd2.Level.Phase == LevelPhase.Assault || pd2.Level.Phase == LevelPhase.Winters) && pd2.Game.State == GameStates.Ingame)
+                {
+                    if (pd2.Level.Phase == LevelPhase.Assault)
+                        bg_color = Properties.AssaultColor;
+                    else if (pd2.Level.Phase == LevelPhase.Winters)
+                        bg_color = Properties.WintersColor;
+
+                    double blend_percent = Math.Pow(Math.Sin(((currenttime % 1300L) / 1300.0D) * Properties.AssaultSpeedMultiplier * 2.0D * Math.PI), 2.0D);
+
+                    bg_color = Utils.ColorUtils.BlendColors(Properties.AssaultFadeColor, bg_color, blend_percent);
+
+                    if (Properties.AssaultAnimationEnabled)
+                    {
+
+                        Color effect_contours = Color.FromArgb(200, Color.Black);
+                        float animation_stage_yoffset = 20.0f;
+                        float animation_repeat_keyframes = 250.0f; //Effects.canvas_width * 2.0f;
+
+                        /* Effect visual:
+
+                        / /  ----  / /
+
+                        */
+
+                        /*
+                         * !!!NOTE: TO BE REWORKED INTO ANIMATIONS!!!
+
+                        EffectColorFunction line1_col_func = new EffectColorFunction(
+                            new EffectLine(-1f, Effects.canvas_width + assault_yoffset + animation_stage_yoffset),
+                            new ColorSpectrum(effect_contours),
+                            2);
+
+                        EffectColorFunction line2_col_func = new EffectColorFunction(
+                            new EffectLine(-1f, Effects.canvas_width + assault_yoffset + 9.0f + animation_stage_yoffset),
+                            new ColorSpectrum(effect_contours),
+                            2);
+
+                        EffectColorFunction line3_col_func = new EffectColorFunction(
+                            new EffectLine(new EffectPoint(Effects.canvas_width + assault_yoffset + 17.0f + animation_stage_yoffset, Effects.canvas_height / 2.0f), new EffectPoint(Effects.canvas_width + assault_yoffset + 34.0f + animation_stage_yoffset, Effects.canvas_height / 2.0f), true),
+                            new ColorSpectrum(effect_contours),
+                            6);
+
+                        EffectColorFunction line4_col_func = new EffectColorFunction(
+                            new EffectLine(-1f, Effects.canvas_width + assault_yoffset + 52.0f + animation_stage_yoffset),
+                            new ColorSpectrum(effect_contours),
+                            2);
+
+                        EffectColorFunction line5_col_func = new EffectColorFunction(
+                            new EffectLine(-1f, Effects.canvas_width + assault_yoffset + 61.0f + animation_stage_yoffset),
+                            new ColorSpectrum(effect_contours),
+                            2);
+
+                        assault_yoffset -= 0.50f;
+                        assault_yoffset = assault_yoffset % animation_repeat_keyframes;
+
+                        bg_layer.AddPostFunction(line1_col_func);
+                        bg_layer.AddPostFunction(line2_col_func);
+                        //bg_layer.AddPostFunction(line3_col_func);
+                        bg_layer.AddPostFunction(line4_col_func);
+                        bg_layer.AddPostFunction(line5_col_func);
+
+                        */
+                    }
+
+                    bg_layer.Fill(bg_color);
+
+                    if (Properties.PeripheralUse)
+                        bg_layer.Set(Devices.DeviceKeys.Peripheral, bg_color);
+                }
+                else if (pd2.Level.Phase == LevelPhase.Stealth && pd2.Game.State == GameStates.Ingame)
+                {
+                    if (Properties.ShowSuspicion)
+                    {
+                        double percentSuspicious = ((double)pd2.Players.LocalPlayer.SuspicionAmount / (double)1.0);
+
+                        ColorSpectrum suspicion_spec = new ColorSpectrum(Properties.LowSuspicionColor, Properties.HighSuspicionColor);
+                        suspicion_spec.SetColorAt(0.5f, Properties.MediumSuspicionColor);
+
+                        Settings.KeySequence suspicionSequence = new Settings.KeySequence(new Settings.FreeFormObject(0, 0, 1.0f / (Effects.editor_to_canvas_width / Effects.canvas_width), 1.0f / (Effects.editor_to_canvas_height / Effects.canvas_height)));
+
+                        bg_layer.PercentEffect(suspicion_spec, suspicionSequence, percentSuspicious, 1.0D, Properties.SuspicionEffectType);
+
+                        if (Properties.PeripheralUse)
+                            bg_layer.Set(Devices.DeviceKeys.Peripheral, suspicion_spec.GetColorAt((float)percentSuspicious));
+                    }
+                }
+                else if (pd2.Level.Phase == LevelPhase.Point_of_no_return && pd2.Game.State == GameStates.Ingame)
+                {
+                    ColorSpectrum no_return_spec = new ColorSpectrum(Color.Red, Color.Yellow);
+                    if (pd2.Level.NoReturnTime != no_return_timeleft)
+                    {
+                        no_return_timeleft = pd2.Level.NoReturnTime;
+                        no_return_flashamount = 1.0f;
+                    }
+
+                    Color no_return_color = no_return_spec.GetColorAt(no_return_flashamount);
+                    no_return_flashamount -= 0.05f;
+
+                    if (no_return_flashamount < 0.0f)
+                        no_return_flashamount = 0.0f;
+
+                    bg_layer.Fill(no_return_color);
+
+                    if (Properties.PeripheralUse)
+                        bg_layer.Set(Devices.DeviceKeys.Peripheral, no_return_color);
+                }
+                else
+                {
+                    bg_layer.Fill(bg_color);
+
+                    if (Properties.PeripheralUse)
+                        bg_layer.Set(Devices.DeviceKeys.Peripheral, bg_color);
+                }
+
+            }
+
+            return bg_layer;
+        }
+
+        public override void SetApplication(Application profile)
+        {
+            (_Control as Control_PD2BackgroundLayer)?.SetProfile(profile);
+            base.SetApplication(profile);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2FlashbangLayerHandler.cs b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2FlashbangLayerHandler.cs
new file mode 100644
index 000000000..2ac8715d8
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2FlashbangLayerHandler.cs	
@@ -0,0 +1,75 @@
+using Aurora.EffectsEngine;
+using Aurora.Profiles.CSGO.GSI;
+using Aurora.Profiles.CSGO.GSI.Nodes;
+using Aurora.Profiles.Payday_2.GSI;
+using Aurora.Profiles.Payday_2.GSI.Nodes;
+using Aurora.Settings;
+using Aurora.Settings.Layers;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+
+namespace Aurora.Profiles.Payday_2.Layers
+{
+    [Obsolete]
+    public class PD2FlashbangLayerHandlerProperties : LayerHandlerProperties2Color<PD2FlashbangLayerHandlerProperties>
+    {
+        public Color? _FlashbangColor { get; set; }
+
+        [JsonIgnore]
+        public Color FlashbangColor { get { return Logic._FlashbangColor ?? _FlashbangColor ?? Color.Empty; } }
+
+        public PD2FlashbangLayerHandlerProperties() : base() { }
+
+        public PD2FlashbangLayerHandlerProperties(bool assign_default = false) : base(assign_default) { }
+
+        public override void Default()
+        {
+            base.Default();
+
+            this._FlashbangColor = Color.FromArgb(255, 255, 255);
+        }
+
+    }
+
+    [Obsolete]
+    public class PD2FlashbangLayerHandler : LayerHandler<PD2FlashbangLayerHandlerProperties>
+    {
+        protected override UserControl CreateControl()
+        {
+            return new Control_PD2FlashbangLayer(this);
+        }
+
+        public override EffectLayer Render(IGameState state)
+        {
+            EffectLayer flashed_layer = new EffectLayer("Payday 2 - Flashed");
+
+            if (state is GameState_PD2)
+            {
+                GameState_PD2 pd2state = state as GameState_PD2;
+
+                //Update Flashed
+                if (pd2state.Game.State == GameStates.Ingame && pd2state.LocalPlayer.FlashAmount > 0)
+                {
+                    Color flash_color = Utils.ColorUtils.MultiplyColorByScalar(Properties.FlashbangColor, pd2state.LocalPlayer.FlashAmount);
+
+                    flashed_layer.Fill(flash_color);
+                }
+            }
+
+            return flashed_layer;
+        }
+
+        public override void SetApplication(Application profile)
+        {
+            (Control as Control_PD2FlashbangLayer).SetProfile(profile);
+            base.SetApplication(profile);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2StatesLayerHandler.cs b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2StatesLayerHandler.cs
new file mode 100644
index 000000000..abe3b41ea
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Profiles/Payday 2/Layers/PD2StatesLayerHandler.cs	
@@ -0,0 +1,120 @@
+using Aurora.EffectsEngine;
+using Aurora.Profiles.Payday_2.GSI;
+using Aurora.Profiles.Payday_2.GSI.Nodes;
+using Aurora.Settings;
+using Aurora.Settings.Layers;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+
+namespace Aurora.Profiles.Payday_2.Layers
+{
+    [Obsolete]
+    public class PD2StatesLayerHandlerProperties : LayerHandlerProperties2Color<PD2StatesLayerHandlerProperties>
+    {
+        public Color? _DownedColor { get; set; }
+
+        [JsonIgnore]
+        public Color DownedColor { get { return Logic._DownedColor ?? _DownedColor ?? Color.Empty; } }
+
+        public Color? _ArrestedColor { get; set; }
+
+        [JsonIgnore]
+        public Color ArrestedColor { get { return Logic._ArrestedColor ?? _ArrestedColor ?? Color.Empty; } }
+
+        public Color? _SwanSongColor { get; set; }
+
+        [JsonIgnore]
+        public Color SwanSongColor { get { return Logic._SwanSongColor ?? _SwanSongColor ?? Color.Empty; } }
+
+        public bool? _ShowSwanSong { get; set; }
+
+        [JsonIgnore]
+        public bool ShowSwanSong { get { return Logic._ShowSwanSong ?? _ShowSwanSong ?? false; } }
+
+        public float? _SwanSongSpeedMultiplier { get; set; }
+
+        [JsonIgnore]
+        public float SwanSongSpeedMultiplier { get { return Logic._SwanSongSpeedMultiplier ?? _SwanSongSpeedMultiplier ?? 0.0F; } }
+
+        public PD2StatesLayerHandlerProperties() : base() { }
+
+        public PD2StatesLayerHandlerProperties(bool assign_default = false) : base(assign_default) { }
+
+        public override void Default()
+        {
+            base.Default();
+
+            _DownedColor = Color.White;
+            _ArrestedColor = Color.DarkRed;
+            _ShowSwanSong = true;
+            _SwanSongColor = Color.FromArgb(158, 205, 255);
+            _SwanSongSpeedMultiplier = 1.0f;
+        }
+
+    }
+
+    [Obsolete]
+    public class PD2StatesLayerHandler : LayerHandler<PD2StatesLayerHandlerProperties>
+    {
+        protected override UserControl CreateControl()
+        {
+            return new Control_PD2StatesLayer(this);
+        }
+
+        public override EffectLayer Render(IGameState state)
+        {
+            EffectLayer states_layer = new EffectLayer("Payday 2 - States");
+
+            if (state is GameState_PD2)
+            {
+                GameState_PD2 pd2state = (GameState_PD2)state;
+
+                if (pd2state.Game.State == GameStates.Ingame)
+                {
+                    if (pd2state.LocalPlayer.State == PlayerState.Incapacitated || pd2state.LocalPlayer.State == PlayerState.Bleed_out || pd2state.LocalPlayer.State == PlayerState.Fatal)
+                    {
+                        int incapAlpha = (int)(pd2state.LocalPlayer.DownTime > 10 ? 0 : 255 * (1.0D - (double)pd2state.LocalPlayer.DownTime / 10.0D));
+
+                        if (incapAlpha > 255)
+                            incapAlpha = 255;
+                        else if (incapAlpha < 0)
+                            incapAlpha = 0;
+
+                        Color incapColor = Color.FromArgb(incapAlpha, Properties.DownedColor);
+
+                        states_layer.Fill(incapColor).Set(Devices.DeviceKeys.Peripheral, incapColor);
+                    }
+                    else if (pd2state.LocalPlayer.State == PlayerState.Arrested)
+                    {
+                        states_layer.Fill(Properties.ArrestedColor).Set(Devices.DeviceKeys.Peripheral, Properties.ArrestedColor);
+                    }
+
+                    if (pd2state.LocalPlayer.IsSwanSong && Properties.ShowSwanSong)
+                    {
+                        double blend_percent = Math.Pow(Math.Cos((Utils.Time.GetMillisecondsSinceEpoch() % 1300L) / 1300.0D * Properties.SwanSongSpeedMultiplier * 2.0D * Math.PI), 2.0D);
+
+                        Color swansongColor = Utils.ColorUtils.MultiplyColorByScalar(Properties.SwanSongColor, blend_percent);
+
+                        EffectLayer swansong_layer = new EffectLayer("Payday 2 - Swansong", swansongColor).Set(Devices.DeviceKeys.Peripheral, swansongColor);
+
+                        states_layer += swansong_layer;
+                    }
+                }
+            }
+
+            return states_layer;
+        }
+
+        public override void SetApplication(Application profile)
+        {
+            (_Control as Control_PD2StatesLayer)?.SetProfile(profile);
+            base.SetApplication(profile);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Project-Aurora/Project-Aurora/Profiles/Payday 2/PD2Application.cs b/Project-Aurora/Project-Aurora/Profiles/Payday 2/PD2Application.cs
index 337820bb7..8b01f7743 100644
--- a/Project-Aurora/Project-Aurora/Profiles/Payday 2/PD2Application.cs	
+++ b/Project-Aurora/Project-Aurora/Profiles/Payday 2/PD2Application.cs	
@@ -17,6 +17,9 @@ public PD2()
                 IconURI = "Resources/pd2_64x64.png"
             })
         {
+            AllowLayer<PD2BackgroundLayerHandler>();
+            AllowLayer<PD2FlashbangLayerHandler>();
+            AllowLayer<PD2StatesLayerHandler>();
             AllowLayer<PD2MaskOnAnimationLayerHandler>();
         }
     }