diff --git a/Project-Aurora/Project-Aurora/Profiles/LocalPCInformation.cs b/Project-Aurora/Project-Aurora/Profiles/LocalPCInformation.cs
index cc31840ca..675e6c2d8 100644
--- a/Project-Aurora/Project-Aurora/Profiles/LocalPCInformation.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/LocalPCInformation.cs
@@ -35,28 +35,21 @@ public class LocalPCInformation : Node {
         #endregion
 
         #region Audio Properties
-        private static readonly MMDeviceEnumerator mmDeviceEnumerator = new MMDeviceEnumerator();
-        private static readonly NAudio.Wave.WaveInEvent waveInEvent = new NAudio.Wave.WaveInEvent();
+        private static readonly AudioDeviceProxy captureProxy;
+        private static readonly AudioDeviceProxy renderProxy;
 
-        /// <summary>
-        /// Gets the default endpoint for output (playback) devices e.g. speakers, headphones, etc.
-        /// This will return null if there are no playback devices available.
-        /// </summary>
-        private MMDevice DefaultAudioOutDevice {
+        private MMDevice CaptureDevice {
             get {
-                try { return mmDeviceEnumerator.GetDefaultAudioEndpoint(DataFlow.Render, Role.Console); }
-                catch { return null; }
+                if (captureProxy != null)
+                    captureProxy.DeviceId = Global.Configuration.GSIAudioCaptureDevice;
+                return captureProxy?.Device;
             }
         }
 
-        /// <summary>
-        /// Gets the default endpoint for input (recording) devices e.g. microphones.
-        /// This will return null if there are no recording devices available.
-        /// </summary>
-        private MMDevice DefaultAudioInDevice {
+        private MMDevice RenderDevice {
             get {
-                try { return mmDeviceEnumerator.GetDefaultAudioEndpoint(DataFlow.Capture, Role.Console); }
-                catch { return null; }
+                renderProxy.DeviceId = Global.Configuration.GSIAudioRenderDevice;
+                return renderProxy?.Device;
             }
         }
 
@@ -64,32 +57,32 @@ private MMDevice DefaultAudioInDevice {
         /// Current system volume (as set from the speaker icon)
         /// </summary>
         // Note: Manually checks if muted to return 0 since this is not taken into account with the MasterVolumeLevelScalar.
-        public float SystemVolume => SystemVolumeIsMuted ? 0 : DefaultAudioOutDevice?.AudioEndpointVolume.MasterVolumeLevelScalar * 100 ?? 0;
+        public float SystemVolume => SystemVolumeIsMuted ? 0 : RenderDevice?.AudioEndpointVolume.MasterVolumeLevelScalar * 100 ?? 0;
 
         /// <summary>
         /// Gets whether the system volume is muted.
         /// </summary>
-        public bool SystemVolumeIsMuted => DefaultAudioOutDevice?.AudioEndpointVolume.Mute ?? true;
+        public bool SystemVolumeIsMuted => RenderDevice?.AudioEndpointVolume.Mute ?? true;
 
         /// <summary>
         /// The volume level that is being recorded by the default microphone even when muted.
         /// </summary>
-        public float MicrophoneLevel => DefaultAudioInDevice?.AudioMeterInformation.MasterPeakValue * 100 ?? 0;
+        public float MicrophoneLevel => CaptureDevice?.AudioMeterInformation.MasterPeakValue * 100 ?? 0;
 
         /// <summary>
         /// The volume level that is being emitted by the default speaker even when muted.
         /// </summary>
-        public float SpeakerLevel => DefaultAudioOutDevice?.AudioMeterInformation.MasterPeakValue * 100 ?? 0;
+        public float SpeakerLevel => RenderDevice?.AudioMeterInformation.MasterPeakValue * 100 ?? 0;
 
         /// <summary>
         /// The volume level that is being recorded by the default microphone if not muted.
         /// </summary>
-        public float MicLevelIfNotMuted => MicrophoneIsMuted ? 0 : DefaultAudioInDevice?.AudioMeterInformation.MasterPeakValue * 100 ?? 0;
+        public float MicLevelIfNotMuted => MicrophoneIsMuted ? 0 : CaptureDevice?.AudioMeterInformation.MasterPeakValue * 100 ?? 0;
 
         /// <summary>
         /// Gets whether the default microphone is muted.
         /// </summary>
-        public bool MicrophoneIsMuted => DefaultAudioInDevice?.AudioEndpointVolume.Mute ?? true;
+        public bool MicrophoneIsMuted => CaptureDevice?.AudioEndpointVolume.Mute ?? true;
         #endregion
 
         #region Device Properties
@@ -153,23 +146,13 @@ private MMDevice DefaultAudioInDevice {
         /// </summary>
         public bool IsDesktopLocked => DesktopUtils.IsDesktopLocked;
 
-        static LocalPCInformation() {
-            void StartStopRecording() {
-                // We must start recording to be able to capture audio in, but only do this if the user has the option set. Allowing them
-                // to turn it off will give them piece of mind we're not spying on them and will stop the Windows 10 mic icon appearing.
-                try {
-                    if (Global.Configuration.EnableAudioCapture)
-                        waveInEvent.StartRecording();
-                    else
-                        waveInEvent.StopRecording();
-                } catch { }
-            }
+        private bool pendingAudioDeviceUpdate = false;
 
-            StartStopRecording();
-            Global.Configuration.PropertyChanged += (sender, e) => {
-                if (e.PropertyName == "EnableAudioCapture")
-                    StartStopRecording();
-            };
+        static LocalPCInformation() {
+            // Do not create a capture device if audio capture is disabled. Otherwise it will create a mic icon in win 10 and people will think we're spies.
+            if (Global.Configuration.EnableAudioCapture)
+                captureProxy = new AudioDeviceProxy(Global.Configuration.GSIAudioCaptureDevice, DataFlow.Capture);
+            renderProxy = new AudioDeviceProxy(Global.Configuration.GSIAudioRenderDevice, DataFlow.Render);
         }
     }
 
diff --git a/Project-Aurora/Project-Aurora/Project-Aurora.csproj b/Project-Aurora/Project-Aurora/Project-Aurora.csproj
index d9cee6439..ad8c646dd 100644
--- a/Project-Aurora/Project-Aurora/Project-Aurora.csproj
+++ b/Project-Aurora/Project-Aurora/Project-Aurora.csproj
@@ -701,6 +701,7 @@
       <DependentUpon>Window_ProcessSelection.xaml</DependentUpon>
     </Compile>
     <Compile Include="Utils\AttachedApplication.cs" />
+    <Compile Include="Utils\AudioDeviceProxy.cs" />
     <Compile Include="Utils\CollectionUtils.cs" />
     <Compile Include="Utils\DragBehaviour.cs" />
     <Compile Include="Utils\FastMemberExtensions.cs" />
diff --git a/Project-Aurora/Project-Aurora/Settings/Configuration.cs b/Project-Aurora/Project-Aurora/Settings/Configuration.cs
index 35fa66a06..9ed26a8a6 100755
--- a/Project-Aurora/Project-Aurora/Settings/Configuration.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Configuration.cs
@@ -515,6 +515,9 @@ public class Configuration : INotifyPropertyChanged
 
         public List<string> ProfileOrder { get; set; } = new List<string>();
 
+        public string GSIAudioRenderDevice { get; set; } = AudioDeviceProxy.DEFAULT_DEVICE_ID;
+        public string GSIAudioCaptureDevice { get; set; } = AudioDeviceProxy.DEFAULT_DEVICE_ID;
+
         public Configuration()
         {
             //First Time Installs
diff --git a/Project-Aurora/Project-Aurora/Settings/Control_Settings.xaml b/Project-Aurora/Project-Aurora/Settings/Control_Settings.xaml
index 0b5ff0e73..239bc8501 100755
--- a/Project-Aurora/Project-Aurora/Settings/Control_Settings.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Control_Settings.xaml
@@ -8,7 +8,7 @@
              xmlns:EnumDeviceKeys="clr-namespace:Aurora.Devices"
              xmlns:EnumPercentEffectType="clr-namespace:Aurora.Settings"
              xmlns:EnumInteractiveEffects="clr-namespace:Aurora.Profiles.Desktop"
-             xmlns:EnumValueConverters="clr-namespace:Aurora.Utils"
+             xmlns:u="clr-namespace:Aurora.Utils"
              xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
              xmlns:Controls="clr-namespace:Aurora.Controls" xmlns:params="http://schemas.codeplex.com/elysium/params" x:Class="Aurora.Settings.Control_Settings"
              mc:Ignorable="d"
@@ -20,12 +20,12 @@
                     <x:Type TypeName="EnumPercentEffectType:PercentEffectType" />
                 </ObjectDataProvider.MethodParameters>
             </ObjectDataProvider>
-            <EnumValueConverters:PercentEffectTypeToStringVC x:Key="PercentEffectTypeToStringVC"/>
+            <u:PercentEffectTypeToStringVC x:Key="PercentEffectTypeToStringVC"/>
             <DataTemplate x:Key="PercentEffectTypeTemplate">
                 <TextBlock Text="{Binding Converter={StaticResource PercentEffectTypeToStringVC}}" />
             </DataTemplate>
 
-            <EnumValueConverters:DeviceKeysToStringVC x:Key="DeviceKeysToStringVC"/>
+            <u:DeviceKeysToStringVC x:Key="DeviceKeysToStringVC"/>
             <DataTemplate x:Key="DeviceKeys">
                 <TextBlock Text="{Binding Converter={StaticResource DeviceKeysToStringVC}}" />
             </DataTemplate>
@@ -35,7 +35,7 @@
                     <x:Type TypeName="EnumPercentEffectType:IdleEffects" />
                 </ObjectDataProvider.MethodParameters>
             </ObjectDataProvider>
-            <EnumValueConverters:IdleEffectsToStringVC x:Key="IdleEffectsToStringVC"/>
+            <u:IdleEffectsToStringVC x:Key="IdleEffectsToStringVC"/>
             <DataTemplate x:Key="IdleEffectsTemplate">
                 <TextBlock Text="{Binding Converter={StaticResource IdleEffectsToStringVC}}" />
             </DataTemplate>
@@ -45,7 +45,7 @@
                     <x:Type TypeName="local:PreferredKeyboardLocalization" />
                 </ObjectDataProvider.MethodParameters>
             </ObjectDataProvider>
-            <EnumValueConverters:KbLayoutToStringVC x:Key="KbLayoutToStringVC"/>
+            <u:KbLayoutToStringVC x:Key="KbLayoutToStringVC"/>
             <DataTemplate x:Key="KbLayoutTemplate">
                 <TextBlock Text="{Binding Converter={StaticResource KbLayoutToStringVC}}" />
             </DataTemplate>
@@ -55,7 +55,7 @@
                     <x:Type TypeName="local:PreferredKeyboard" />
                 </ObjectDataProvider.MethodParameters>
             </ObjectDataProvider>
-            <EnumValueConverters:KbBrandToStringVC x:Key="KbBrandToStringVC"/>
+            <u:KbBrandToStringVC x:Key="KbBrandToStringVC"/>
             <DataTemplate x:Key="KbBrandTemplate">
                 <TextBlock Text="{Binding Converter={StaticResource KbBrandToStringVC}}" />
             </DataTemplate>
@@ -65,7 +65,7 @@
                     <x:Type TypeName="local:PreferredMouse" />
                 </ObjectDataProvider.MethodParameters>
             </ObjectDataProvider>
-            <EnumValueConverters:MouseBrandToStringVC x:Key="MouseBrandToStringVC"/>
+            <u:MouseBrandToStringVC x:Key="MouseBrandToStringVC"/>
             <DataTemplate x:Key="MouseBrandTemplate">
                 <TextBlock Text="{Binding Converter={StaticResource MouseBrandToStringVC}}" />
             </DataTemplate>
@@ -75,7 +75,7 @@
                     <x:Type TypeName="local:MouseOrientationType" />
                 </ObjectDataProvider.MethodParameters>
             </ObjectDataProvider>
-            <EnumValueConverters:MouseOrientationToStringVC x:Key="MouseOrientationToStringVC"/>
+            <u:MouseOrientationToStringVC x:Key="MouseOrientationToStringVC"/>
             <DataTemplate x:Key="MouseOrientationTemplate">
                 <TextBlock Text="{Binding Converter={StaticResource MouseOrientationToStringVC}}" />
             </DataTemplate>
@@ -85,7 +85,7 @@
                     <x:Type TypeName="local:KeycapType" />
                 </ObjectDataProvider.MethodParameters>
             </ObjectDataProvider>
-            <EnumValueConverters:KeycapTypeToStringVC x:Key="KeycapTypeToStringVC"/>
+            <u:KeycapTypeToStringVC x:Key="KeycapTypeToStringVC"/>
             <DataTemplate x:Key="KeycapTypeTemplate">
                 <TextBlock Text="{Binding Converter={StaticResource KeycapTypeToStringVC}}" />
             </DataTemplate>
@@ -95,7 +95,7 @@
                     <x:Type TypeName="local:BitmapAccuracy" />
                 </ObjectDataProvider.MethodParameters>
             </ObjectDataProvider>
-            <EnumValueConverters:BitmapAccuracyToStringVC x:Key="BitmapAccuracyToStringVC"/>
+            <u:BitmapAccuracyToStringVC x:Key="BitmapAccuracyToStringVC"/>
             <DataTemplate x:Key="BitmapAccuracyTemplate">
                 <TextBlock Text="{Binding Converter={StaticResource BitmapAccuracyToStringVC}}" />
             </DataTemplate>
@@ -105,7 +105,7 @@
                     <x:Type TypeName="local:AppExitMode" />
                 </ObjectDataProvider.MethodParameters>
             </ObjectDataProvider>
-            <EnumValueConverters:appexitmodeToStringVC x:Key="appexitmodeToStringVC"/>
+            <u:appexitmodeToStringVC x:Key="appexitmodeToStringVC"/>
             <DataTemplate x:Key="appexitmodeTemplate">
                 <TextBlock Text="{Binding Converter={StaticResource appexitmodeToStringVC}}" />
             </DataTemplate>
@@ -115,7 +115,7 @@
                     <x:Type TypeName="local:ApplicationDetectionMode" />
                 </ObjectDataProvider.MethodParameters>
             </ObjectDataProvider>
-            <EnumValueConverters:AppDetectionModeToStringVC x:Key="AppDetectionModeToStringVC"/>
+            <u:AppDetectionModeToStringVC x:Key="AppDetectionModeToStringVC"/>
             <DataTemplate x:Key="AppDetectionModeTemplate">
                 <TextBlock Text="{Binding Converter={StaticResource AppDetectionModeToStringVC}}" />
             </DataTemplate>
@@ -132,10 +132,10 @@
                     <TextBlock HorizontalAlignment="Left" Margin="11,230,0,0" TextWrapping="Wrap" Text="Blackout start time:" VerticalAlignment="Top"/>
                     <TextBlock HorizontalAlignment="Left" Margin="12,254,0,0" TextWrapping="Wrap" Text="Blackout end time:" VerticalAlignment="Top"/>
                     <CheckBox x:Name="timed_dimming_with_games_checkbox" Content="Apply timed blackout to game events" HorizontalAlignment="Left" Margin="10,205,0,0" VerticalAlignment="Top" Checked="timed_dimming_with_games_checkbox_Checked" Unchecked="timed_dimming_with_games_checkbox_Checked"/>
-                    <ListBox x:Name="excluded_listbox" HorizontalAlignment="Left" Height="199" Margin="512,83,0,-30" VerticalAlignment="Top" Width="160"/>
-                    <TextBlock Text="Excluded Processes" HorizontalAlignment="Left" Margin="512,62,0,0" VerticalAlignment="Top" Width="113"/>
-                    <Button x:Name="excluded_add" Content="Add Process" HorizontalAlignment="Left" Margin="677,83,0,0" VerticalAlignment="Top" Click="excluded_add_Click"/>
-                    <Button x:Name="excluded_remove" Content="Remove Process" HorizontalAlignment="Left" Margin="677,111,0,0" VerticalAlignment="Top" Click="excluded_remove_Click"/>
+                    <ListBox x:Name="excluded_listbox" HorizontalAlignment="Left" Height="199" Margin="512,139,0,0" VerticalAlignment="Top" Width="160"/>
+                    <TextBlock Text="Excluded Processes" HorizontalAlignment="Left" Margin="512,117,0,0" VerticalAlignment="Top" Width="113"/>
+                    <Button x:Name="excluded_add" Content="Add Process" HorizontalAlignment="Left" Margin="677,139,0,0" VerticalAlignment="Top" Click="excluded_add_Click"/>
+                    <Button x:Name="excluded_remove" Content="Remove Process" HorizontalAlignment="Left" Margin="677,167,0,0" VerticalAlignment="Top" Click="excluded_remove_Click"/>
                     <TextBlock HorizontalAlignment="Left" Margin="12,132,0,0" TextWrapping="Wrap" Text="Keyboard brightness modifier: " VerticalAlignment="Top"/>
                     <TextBlock x:Name="lblKeyboardBrightness" HorizontalAlignment="Left" Margin="335,132,0,0" TextWrapping="Wrap" Text="0 %" VerticalAlignment="Top"/>
                     <Slider x:Name="sldKeyboardBrightness" HorizontalAlignment="Left" Margin="180,132,0,0" VerticalAlignment="Top" Width="150" Maximum="1" ValueChanged="sliderPercentages_ValueChanged" Value="{Binding KeyboardBrightness, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Tag="{Binding ElementName=lblKeyboardBrightness, Path=.}"/>
@@ -170,7 +170,14 @@
                     <TextBlock Text="Delay:" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="278,10,0,0" />
                     <xctk:IntegerUpDown x:Name="startDelayAmount" Height="22" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="315,8,0,0" Width="69" Minimum="0" Increment="15" ValueChanged="startDelayAmount_ValueChanged" />
                     <TextBlock Text="sec" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="389,10,0,0" />
-                    <CheckBox Content="Enable Audio Capture (for gamestates)" ToolTip="Aurora only measures the activity level from your microphone for use with the 'LocalPCInfo' game state. None of this data is stored or transmitted elsewhere." HorizontalAlignment="Left" Margin="512,39,0,0" VerticalAlignment="Top" IsChecked="{Binding EnableAudioCapture}" />
+
+                    <CheckBox Content="Enable Audio Capture for gamestates (restart required)" ToolTip="Aurora only measures the activity level from your microphone for use with the 'LocalPCInfo' game state. None of this data is stored or transmitted elsewhere." HorizontalAlignment="Left" Margin="512,39,0,0" VerticalAlignment="Top" IsChecked="{Binding EnableAudioCapture}" />
+                    <TextBlock Text="GSI Playback Device:" Margin="511,62,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" />
+                    <ComboBox SelectedValue="{Binding Path=GSIAudioRenderDevice, Mode=TwoWay}" ItemsSource="{x:Static u:AudioDeviceProxy.PlaybackDevices}" DisplayMemberPath="Value" SelectedValuePath="Key" Margin="632,59,0,0" Width="185" HorizontalAlignment="Left" VerticalAlignment="Top" />
+                    <TextBlock Text="?" TextDecorations="Underline" ToolTip="The audio playback device that will be used for the local PC information state values. Does not affect visualizer layer." ToolTipService.InitialShowDelay="0" Margin="822,62,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" />
+                    <TextBlock Text="GSI Recording Device:" Margin="511,89,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" />
+                    <ComboBox SelectedValue="{Binding Path=GSIAudioCaptureDevice, Mode=TwoWay}" ItemsSource="{x:Static u:AudioDeviceProxy.RecordingDevices}" DisplayMemberPath="Value" SelectedValuePath="Key" Margin="632,86,0,0" Width="185" HorizontalAlignment="Left" VerticalAlignment="Top" />
+                    <TextBlock Text="?" TextDecorations="Underline" ToolTip="The audio recording device that will be used for the local PC information state values. Does not affect visualizer layer." ToolTipService.InitialShowDelay="0" Margin="822,89,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" />
                 </Grid>
             </TabItem>
             <TabItem Header="Away Effects">
@@ -376,7 +383,7 @@
                         <ColumnDefinition/>
                         <ColumnDefinition/>
                     </Grid.ColumnDefinitions>
-                    
+
                     <StackPanel Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Top" >
                         <Button 
                             x:Name="btnShowBitmapWindow" 
diff --git a/Project-Aurora/Project-Aurora/Settings/Layers/Control_EqualizerLayer.xaml b/Project-Aurora/Project-Aurora/Settings/Layers/Control_EqualizerLayer.xaml
index 54895f59b..e140026a6 100644
--- a/Project-Aurora/Project-Aurora/Settings/Layers/Control_EqualizerLayer.xaml
+++ b/Project-Aurora/Project-Aurora/Settings/Layers/Control_EqualizerLayer.xaml
@@ -6,7 +6,7 @@
              xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" 
              xmlns:ncore="http://schemas.ncore.com/wpf/xaml/colorbox"
              xmlns:System="clr-namespace:System;assembly=mscorlib" 
-             xmlns:EnumValueConverters="clr-namespace:Aurora.Utils" 
+             xmlns:u="clr-namespace:Aurora.Utils" 
              xmlns:local="clr-namespace:Aurora.Settings.Layers"
              xmlns:c="clr-namespace:Aurora.Controls"
              mc:Ignorable="d" Loaded="UserControl_Loaded">
@@ -17,7 +17,7 @@
                     <x:Type TypeName="local:EqualizerType" />
                 </ObjectDataProvider.MethodParameters>
             </ObjectDataProvider>
-            <EnumValueConverters:EqualizerTypeToStringVC x:Key="EqualizerTypeToStringVC"/>
+            <u:EqualizerTypeToStringVC x:Key="EqualizerTypeToStringVC"/>
             <DataTemplate x:Key="EqualizerTypeTemplate">
                 <TextBlock Text="{Binding Converter={StaticResource EqualizerTypeToStringVC}}" />
             </DataTemplate>
@@ -27,7 +27,7 @@
                     <x:Type TypeName="local:EqualizerPresentationType" />
                 </ObjectDataProvider.MethodParameters>
             </ObjectDataProvider>
-            <EnumValueConverters:EqualizerPresentationTypeToStringVC x:Key="EqualizerPresentationTypeToStringVC"/>
+            <u:EqualizerPresentationTypeToStringVC x:Key="EqualizerPresentationTypeToStringVC"/>
             <DataTemplate x:Key="EqualizerPresentationTypeTemplate">
                 <TextBlock Text="{Binding Converter={StaticResource EqualizerPresentationTypeToStringVC}}" />
             </DataTemplate>
@@ -37,7 +37,7 @@
                     <x:Type TypeName="local:EqualizerBackgroundMode" />
                 </ObjectDataProvider.MethodParameters>
             </ObjectDataProvider>
-            <EnumValueConverters:EqualizerBackgroundModeToStringVC x:Key="EqualizerBackgroundModeToStringVC"/>
+            <u:EqualizerBackgroundModeToStringVC x:Key="EqualizerBackgroundModeToStringVC"/>
             <DataTemplate x:Key="EqualizerBackgroundModeTemplate">
                 <TextBlock Text="{Binding Converter={StaticResource EqualizerBackgroundModeToStringVC}}" />
             </DataTemplate>
@@ -90,5 +90,8 @@
         <Button x:Name="btn_ShowPreviewWindow" Content="Show Preview Window" HorizontalAlignment="Left" Margin="0,220,0,-2" VerticalAlignment="Top" Click="btn_ShowPreviewWindow_Click"/>
 
         <c:KeySequence x:Name="affectedKeys" Title="Affected Rectangle" RecordingTag="EqAffectedRect" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="511,7,0,0" SequenceUpdated="KeySequence_keys_SequenceUpdated" />
+
+        <TextBlock Text="Audio Device:" Margin="511,127,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" />
+        <ComboBox SelectedValue="{Binding Path=Properties._DeviceId, Mode=TwoWay}" ItemsSource="{x:Static u:AudioDeviceProxy.PlaybackDevices}" DisplayMemberPath="Value" SelectedValuePath="Key" Margin="589,125,0,0" Width="152" HorizontalAlignment="Left" VerticalAlignment="Top" />
     </Grid>
 </UserControl>
diff --git a/Project-Aurora/Project-Aurora/Settings/Layers/EqualizerLayerHandler.cs b/Project-Aurora/Project-Aurora/Settings/Layers/EqualizerLayerHandler.cs
index 01ee43733..95705e033 100644
--- a/Project-Aurora/Project-Aurora/Settings/Layers/EqualizerLayerHandler.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Layers/EqualizerLayerHandler.cs
@@ -114,6 +114,9 @@ public class EqualizerLayerHandlerProperties : LayerHandlerProperties<EqualizerL
         [JsonIgnore]
         public SortedSet<float> Frequencies { get { return Logic._Frequencies ?? _Frequencies ?? new SortedSet<float>(); } }
 
+        public string _DeviceId { get; set; }
+        [JsonIgnore] public string DeviceId => Logic?._DeviceId ?? _DeviceId ?? "";
+
         public EqualizerLayerHandlerProperties() : base()
         {
 
@@ -138,6 +141,7 @@ public override void Default()
             _BackgroundMode = EqualizerBackgroundMode.Disabled;
             _DimColor = Color.FromArgb(169, 0, 0, 0);
             _Frequencies = new SortedSet<float>() { 50, 95, 130, 180, 250, 350, 500, 620, 700, 850, 1200, 1600, 2200, 3000, 4100, 5600, 7700, 10000 };
+            _DeviceId = "";
         }
     }
 
@@ -146,12 +150,18 @@ public class EqualizerLayerHandler : LayerHandler<EqualizerLayerHandlerPropertie
     {
         public event NewLayerRendered NewLayerRender = delegate { };
 
-        MMDeviceEnumerator audio_device_enumerator = new MMDeviceEnumerator();
-        MMDevice default_device = null;
+        private AudioDeviceProxy deviceProxy;
+        private AudioDeviceProxy DeviceProxy {
+            get {
+                if (deviceProxy == null) {
+                    deviceProxy = new AudioDeviceProxy(DataFlow.Render);
+                    deviceProxy.WaveInDataAvailable += OnDataAvailable;
+                }
+                return deviceProxy;
+            }
+        }
 
         private List<float> flux_array = new List<float>();
-
-        private IWaveIn waveIn;
         private static int fftLength = 1024; // NAudio fft wants powers of two! was 8192
 
         // Base rectangle that defines the region that is used to render the audio output
@@ -179,57 +189,15 @@ protected override UserControl CreateControl()
             return new Control_EqualizerLayer(this);
         }
 
-        long startTime;
-        private void UpdateAudioCapture(MMDevice defaultDevice)
-        {
-            if (waveIn != null)
-            {
-                waveIn.StopRecording();
-                waveIn.Dispose();
-            }
-
-            default_device?.Dispose();
-            default_device = defaultDevice;
-
-            // Here you decide what you want to use as the waveIn.
-            // There are many options in NAudio and you can use other streams/files.
-            // Note that the code varies for each different source.
-            waveIn = new WasapiLoopbackCapture(default_device);
-            
-            waveIn.DataAvailable += OnDataAvailable;
-
-            waveIn.StartRecording();
-            startTime = Time.GetSecondsSinceEpoch();
-        }
-
-        private void CheckForDeviceChange()
-        {
-            MMDevice current_device = audio_device_enumerator.GetDefaultAudioEndpoint(DataFlow.Render, Role.Multimedia);
-
-            if (((WasapiLoopbackCapture)waveIn)?.CaptureState == CaptureState.Stopped
-                || default_device == null
-                || default_device.ID != current_device.ID
-                || (((WasapiLoopbackCapture)waveIn)?.CaptureState != CaptureState.Capturing && (Time.GetSecondsSinceEpoch() - startTime) > 20)) //Check if it has taken over 20 seconds to start the capture which may indicate that there has been an issue
-            {
-                Global.logger.LogLine($"CaptureState is {((WasapiLoopbackCapture)waveIn)?.CaptureState}");
-                UpdateAudioCapture(current_device);
-            }
-            else
-                current_device.Dispose();
-
-            current_device = null;
-        }
-
         public override EffectLayer Render(IGameState gamestate)
         {
             try
             {
-                //if (current_device != null)
-                //current_device.Dispose();
-                CheckForDeviceChange();
+                // Update device ID. If it has changed, it will re-assign itself to the new device
+                DeviceProxy.DeviceId = Properties.DeviceId;
 
                 // The system sound as a value between 0.0 and 1.0
-                float system_sound_normalized = default_device.AudioEndpointVolume.MasterVolumeLevelScalar;
+                float system_sound_normalized = DeviceProxy.Device?.AudioEndpointVolume.MasterVolumeLevelScalar ?? 1f;
 
                 // Scale the Maximum amplitude with the system sound if enabled, so that at 100% volume the max_amp is unchanged.
                 // Replaces all Properties.MaxAmplitude calls with the scaled value
@@ -385,12 +353,12 @@ void OnDataAvailable(object sender, WaveInEventArgs e)
             {
                 byte[] buffer = e.Buffer;
                 int bytesRecorded = e.BytesRecorded;
-                int bufferIncrement = waveIn.WaveFormat.BlockAlign;
+                int bufferIncrement = DeviceProxy.WaveIn.WaveFormat.BlockAlign;
 
                 // 4 bytes per channel, bufferIncrement is numChannels * 4
                 for (int index = 0; index < bytesRecorded; index += bufferIncrement) // Loop over the bytes, respecting the channel grouping
                 {
-                    if (waveIn.WaveFormat.Channels == 2)
+                    if (DeviceProxy.WaveIn.WaveFormat.Channels == 2)
                         // If recording has two channels, take the largest value and add that to the sampleAggregator.
                         sampleAggregator.Add(Math.Max(BitConverter.ToSingle(buffer, index), BitConverter.ToSingle(buffer, index + 4)));
                     else
@@ -451,8 +419,8 @@ private Brush GetBrush(float value, float position, float max_position)
 
         public override void Dispose()
         {
-            waveIn?.Dispose();
-            waveIn = null;
+            DeviceProxy?.Dispose();
+            deviceProxy = null;
         }
     }
 
diff --git a/Project-Aurora/Project-Aurora/Utils/AudioDeviceProxy.cs b/Project-Aurora/Project-Aurora/Utils/AudioDeviceProxy.cs
new file mode 100644
index 000000000..913cccda5
--- /dev/null
+++ b/Project-Aurora/Project-Aurora/Utils/AudioDeviceProxy.cs
@@ -0,0 +1,135 @@
+using NAudio.CoreAudioApi;
+using NAudio.Wave;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+
+namespace Aurora.Utils {
+
+    /// <summary>
+    /// Utility class to make it easier to manage dealing with audio devices and input.
+    /// Will handle the creation of devices if required. If another AudioDevice is using that device, they will share the same reference.
+    /// Can be hot-swapped to a different device, moving all events to the newly selected device.
+    /// </summary>
+    public sealed class AudioDeviceProxy : IDisposable {
+
+        public const string DEFAULT_DEVICE_ID = ""; // special ID to indicate the default device
+
+        private static readonly MMDeviceEnumerator deviceEnumerator = new MMDeviceEnumerator();
+
+        // Stores event handlers added to the proxy, so they can easily be added and removed from the MMDevice when it changes without
+        // needing to rely on the consumer manually removing and re-adding the events.
+        private EventHandler<WaveInEventArgs> waveInDataAvailable;
+
+        // ID of currently selected device.
+        private string deviceId;
+
+        static AudioDeviceProxy() {
+            // Tried using a static class to update the device lists when they changed, but it caused an AccessViolation. Will try look into this again in future
+            //deviceEnumerator.RegisterEndpointNotificationCallback(new DeviceChangedHandler());
+            RefreshDeviceLists();
+        }
+
+        /// <summary>Creates a new reference to the default audio device with the given flow direction.</summary>
+        public AudioDeviceProxy(DataFlow flow) : this(DEFAULT_DEVICE_ID, flow) { }
+
+        /// <summary>Creates a new reference to the audio device with the given ID with the given flow direction.</summary>
+        public AudioDeviceProxy(string deviceId, DataFlow flow) {
+            Flow = flow;
+            DeviceId = deviceId ?? DEFAULT_DEVICE_ID;
+        }
+
+        /// <summary>Indicates recorded data is available on the selected device.</summary>
+        /// <remarks>This event is automatically reassigned to the new device when it is swapped.</remarks>
+        public event EventHandler<WaveInEventArgs> WaveInDataAvailable {
+            add {
+                waveInDataAvailable += value; // Update stored event listeners
+                if (WaveIn != null) WaveIn.DataAvailable += value; // If the device is valid, pass the event handler on
+            }
+            remove {
+                waveInDataAvailable -= value; // Update stored event listeners
+                if (WaveIn != null) WaveIn.DataAvailable -= value; // If the device is valid, pass the event handler on
+            }
+        }
+
+        public MMDevice Device { get; private set; }
+        public WasapiCapture WaveIn { get; private set; }
+
+        /// <summary>Gets the currently assigned direction of this device.</summary>
+        public DataFlow Flow { get; }
+
+        /// <summary>Gets or sets the ID of the selected device.</summary>
+        public string DeviceId {
+            get => deviceId;
+            set {
+                value ??= DEFAULT_DEVICE_ID; // Ensure not-null (if null, assume default device)
+                if (deviceId == value) return;
+                deviceId = value;
+                UpdateDevice();
+            }
+        }
+
+        /// <summary>Gets a new MMDevice and wave in based on the current <see cref="DeviceId"/> and <see cref="Flow"/></summary>
+        private void UpdateDevice() {
+            // Release the current device (if any), removing any events as required
+            if (WaveIn != null)
+                WaveIn.DataAvailable -= waveInDataAvailable;
+            DisposeCurrentDevice();
+
+            // Get a new device with this ID and flow direction
+            var mmDevice = deviceId == DEFAULT_DEVICE_ID
+                ? deviceEnumerator.GetDefaultAudioEndpoint(Flow, Role.Multimedia) // Get default if no ID is provided
+                : deviceEnumerator.EnumerateAudioEndPoints(Flow, DeviceState.Active).FirstOrDefault(d => d.ID == DeviceId); // Otherwise, get the one with this ID
+            if (mmDevice == null) return;
+            Device = mmDevice;
+
+            // Get a WaveIn from the device and start it, adding any events as requied
+            WaveIn = Flow == DataFlow.Render ? new WasapiLoopbackCapture(mmDevice) : new WasapiCapture(mmDevice);
+            WaveIn.DataAvailable += waveInDataAvailable;
+            WaveIn.StartRecording();
+        }
+
+        /// <summary>Disposes and clears the current <see cref="Device"/> and <see cref="WaveIn"/>.</summary>
+        private void DisposeCurrentDevice() {
+            Device?.Dispose();
+            Device = null;
+
+            WaveIn?.StopRecording();
+            WaveIn?.Dispose();
+            WaveIn = null;
+        }
+
+        #region Device Enumeration
+        public static ObservableCollection<KeyValuePair<string, string>> PlaybackDevices { get; } = new ObservableCollection<KeyValuePair<string, string>>();
+        public static ObservableCollection<KeyValuePair<string, string>> RecordingDevices { get; } = new ObservableCollection<KeyValuePair<string, string>>();
+
+        // Updates the target list with the devices of the given dataflow type.
+        private static void RefreshDeviceList(ObservableCollection<KeyValuePair<string, string>> target, DataFlow flow) {
+            // Note: clear the target then repopulate it to make it easier for data binding. If we re-created this, we could not use {x:Static}.
+            target.Clear();
+            target.Add(new KeyValuePair<string, string>(DEFAULT_DEVICE_ID, "Default")); // Add default device to to the top of the list
+            foreach (var device in deviceEnumerator.EnumerateAudioEndPoints(flow, DeviceState.Active).OrderBy(d => d.DeviceFriendlyName))
+                target.Add(new KeyValuePair<string, string>(device.ID, device.DeviceFriendlyName));            
+        }
+
+        // Refreshes both playback and recording devices lists.
+        private static void RefreshDeviceLists() {
+            RefreshDeviceList(PlaybackDevices, DataFlow.Render);
+            RefreshDeviceList(RecordingDevices, DataFlow.Capture);
+        }
+        #endregion
+
+        #region IDisposable Implementation
+        private bool disposedValue = false;
+        public void Dispose() => Dispose(true);
+        void Dispose(bool disposing) {
+            if (!disposedValue) {
+                if (disposing)
+                    DisposeCurrentDevice();
+                disposedValue = true;
+            }
+        }
+        #endregion
+    }
+}