From b48e49bd9b882ca4e285d953ae866b211b1ab97b Mon Sep 17 00:00:00 2001
From: KrisIsBackAU <kris.merris@gmail.com>
Date: Thu, 30 Mar 2023 18:26:52 +1030
Subject: [PATCH] Default Audio Switcher Added

---
 Oculus VR Dash Manager/App.config             |  18 +++
 .../frm_Auto_Program_Launch_Settings.xaml     |  45 ++++++
 .../frm_Auto_Program_Launch_Settings.xaml.cs  |  47 ++++++
 .../Forms/Settings/frm_Settings_v2.xaml       |  19 ++-
 .../Forms/Settings/frm_Settings_v2.xaml.cs    | 138 +++++++++++++++++-
 Oculus VR Dash Manager/MainWindow.xaml.cs     |  21 ++-
 .../Oculus VR Dash Manager.csproj             |  22 ++-
 .../Oculus VR Dash Manager.csproj.user        |   6 +
 .../Properties/Settings.Designer.cs           |  74 +++++++++-
 .../Properties/Settings.settings              |  18 +++
 .../Software/Windows Audio v2.cs              | 128 ++++++++++++++++
 .../Software/Windows Audio.cs                 | 113 ++++++++++++++
 .../Theme/Styles.Shared.xaml                  | 120 +++++++++++++++
 13 files changed, 756 insertions(+), 13 deletions(-)
 create mode 100644 Oculus VR Dash Manager/Forms/Auto Program Launch/frm_Auto_Program_Launch_Settings.xaml
 create mode 100644 Oculus VR Dash Manager/Forms/Auto Program Launch/frm_Auto_Program_Launch_Settings.xaml.cs
 create mode 100644 Oculus VR Dash Manager/Software/Windows Audio v2.cs
 create mode 100644 Oculus VR Dash Manager/Software/Windows Audio.cs

diff --git a/Oculus VR Dash Manager/App.config b/Oculus VR Dash Manager/App.config
index 0584399..7ecd6f0 100644
--- a/Oculus VR Dash Manager/App.config	
+++ b/Oculus VR Dash Manager/App.config	
@@ -40,6 +40,24 @@
             <setting name="QuestPolling" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="Automatic_Audio_Switching" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="Normal_Speaker_ID" serializeAs="String">
+                <value>-1</value>
+            </setting>
+            <setting name="Quest_Speaker_ID" serializeAs="String">
+                <value>-1</value>
+            </setting>
+            <setting name="Normal_Speaker_GUID" serializeAs="String">
+                <value>00000000-0000-0000-0000-000000000000</value>
+            </setting>
+            <setting name="Quest_Speaker_GUID" serializeAs="String">
+                <value>00000000-0000-0000-0000-000000000000</value>
+            </setting>
+            <setting name="Auto_Audio_Change_DefaultCommunication" serializeAs="String">
+                <value>False</value>
+            </setting>
         </OVR_Dash_Manager.Properties.Settings>
     </userSettings>
 </configuration>
\ No newline at end of file
diff --git a/Oculus VR Dash Manager/Forms/Auto Program Launch/frm_Auto_Program_Launch_Settings.xaml b/Oculus VR Dash Manager/Forms/Auto Program Launch/frm_Auto_Program_Launch_Settings.xaml
new file mode 100644
index 0000000..58e617f
--- /dev/null
+++ b/Oculus VR Dash Manager/Forms/Auto Program Launch/frm_Auto_Program_Launch_Settings.xaml	
@@ -0,0 +1,45 @@
+<Window x:Class="OVR_Dash_Manager.Forms.Auto_Program_Launch.frm_Auto_Program_Launch_Settings"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:OVR_Dash_Manager.Forms.Auto_Program_Launch"
+        Title="Auto Program Launch Settings" Height="450" Width="800" Loaded="Window_Loaded" Closing="Window_Closing">
+    
+    <Window.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="../../Theme/MetroDark.MSControls.Core.Implicit.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Window.Resources>
+
+    <Grid x:Name="gd_Settings" Background="#FF212121">
+        <ListView x:Name="lv_Programs" Margin="10,45,10,10" AlternationCount="2" >
+            <ListView.View>
+                <GridView>
+                    <GridViewColumn Header="Icon" Width="50">
+                        <GridViewColumn.CellTemplate>
+                            <DataTemplate>
+                                <Image x:Name="img_Icon" Width="16" Height="16" />
+                            </DataTemplate>
+                        </GridViewColumn.CellTemplate>
+                    </GridViewColumn>
+                    <GridViewColumn Header="File Name" Width="Auto"/>
+                    <GridViewColumn Header="File Path" Width="Auto"/>
+                    <GridViewColumn Header="Auto Launch On Startup" Width="50">
+                        <GridViewColumn.CellTemplate>
+                            <DataTemplate>
+                                <CheckBox x:Name="chkbx_Auto_Launch_On_Startup" Content="Launch on Startup" />
+                            </DataTemplate>
+                        </GridViewColumn.CellTemplate>
+                    </GridViewColumn>
+                </GridView>
+            </ListView.View>
+        </ListView>
+        <Button x:Name="btn_Add_Program" Content="Add Program" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Width="115" Height="23" Click="btn_Add_Program_Click"/>
+        <Button x:Name="btn_Remove_Program" Content="Remove Program" HorizontalAlignment="Left" Margin="150,10,0,0" VerticalAlignment="Top" Width="140" Height="23" Click="btn_Remove_Program_Click"/>
+        <Button x:Name="btn_Open_Program_Folder" Content="Open Program Folder" HorizontalAlignment="Left" Margin="316,10,0,0" VerticalAlignment="Top" Width="180" Height="23" Click="btn_Remove_Program_Click"/>
+
+    </Grid>
+</Window>
diff --git a/Oculus VR Dash Manager/Forms/Auto Program Launch/frm_Auto_Program_Launch_Settings.xaml.cs b/Oculus VR Dash Manager/Forms/Auto Program Launch/frm_Auto_Program_Launch_Settings.xaml.cs
new file mode 100644
index 0000000..c358a56
--- /dev/null
+++ b/Oculus VR Dash Manager/Forms/Auto Program Launch/frm_Auto_Program_Launch_Settings.xaml.cs	
@@ -0,0 +1,47 @@
+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.Shapes;
+
+namespace OVR_Dash_Manager.Forms.Auto_Program_Launch
+{
+    /// <summary>
+    /// Interaction logic for frm_Auto_Program_Launch_Settings.xaml
+    /// </summary>
+    public partial class frm_Auto_Program_Launch_Settings : Window
+    {
+        public frm_Auto_Program_Launch_Settings()
+        {
+            InitializeComponent();
+        }
+
+        private void btn_Add_Program_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void btn_Remove_Program_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+
+        }
+    }
+}
diff --git a/Oculus VR Dash Manager/Forms/Settings/frm_Settings_v2.xaml b/Oculus VR Dash Manager/Forms/Settings/frm_Settings_v2.xaml
index 470c09c..46a1c54 100644
--- a/Oculus VR Dash Manager/Forms/Settings/frm_Settings_v2.xaml	
+++ b/Oculus VR Dash Manager/Forms/Settings/frm_Settings_v2.xaml	
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:OVR_Dash_Manager.Forms.Settings"
         mc:Ignorable="d"
-        Title="Settings" Width="863" Height="660.422" ResizeMode="CanMinimize" WindowStartupLocation="CenterScreen">
+        Title="Settings" Width="863" Height="875.24" ResizeMode="CanMinimize" WindowStartupLocation="CenterScreen" Loaded="Window_Loaded" Closing="Window_Closing">
 
     <Window.Resources>
         <ResourceDictionary>
@@ -46,8 +46,23 @@
                 <local:uc_Setting Setting="SteamVRFocusFix" Margin="10,3,0,0" HorizontalAlignment="Left" Width="150" Height="30" VerticalAlignment="Top" />
                 <Label Content="Fix SteamVR Admin Program Focus Issue When it Occurs (Task View Glitch)" Margin="166,3,10,0" VerticalAlignment="Top" Height="30" />
                 <local:uc_Setting Setting="ExitLinkOn_UserExit_SteamVR" Margin="10,41,0,0" HorizontalAlignment="Left" Width="150" Height="30" VerticalAlignment="Top" />
-                <Label Content="Exit Oculus Link when User Closes Steam VR (Stable Link Connection Recommended)" HorizontalAlignment="Left" Margin="166,41,0,0" VerticalAlignment="Top" Height="30" />
+                <Label Content="Exit Oculus Link when User Closes Steam VR (Stable Link Connection Recommended)" Margin="166,41,10,0" VerticalAlignment="Top" Height="30" />
             </Grid>
         </GroupBox>
+        <GroupBox Header="Automatic Audio Switcher" Margin="10,617,10,11">
+            <Grid Margin="0">
+                <local:uc_Setting Setting="Automatic_Audio_Switching" HorizontalAlignment="Left" Width="150" Height="30" VerticalAlignment="Top" />
+                <Label Content="Automatically Switch Audio on Program Launch (to Quest Speaker) &amp; Program Close (to Normal Speaker)" VerticalAlignment="Top" Height="30" Margin="155,0,10,0" />
+                <local:uc_Setting Setting="Auto_Audio_Change_DefaultCommunication" HorizontalAlignment="Left" Width="150" Height="30" VerticalAlignment="Top" Margin="0,32,0,0" />
+                <Label Content="Change Default Communications Device As Well" VerticalAlignment="Top" Height="30" Margin="155,33,10,0" />
+                <ComboBox x:Name="cbo_NormalSpeaker" Margin="155,68,170,0" VerticalAlignment="Top" DisplayMemberPath="Name" SelectionChanged="cbo_NormalSpeaker_SelectionChanged"/>
+                <Label Content="Normal Speaker" VerticalAlignment="Top" Height="30" Margin="0,68,0,0" HorizontalAlignment="Left" Width="150" />
+                <ComboBox x:Name="cbo_QuestSpeaker" Margin="155,103,170,0" VerticalAlignment="Top" DisplayMemberPath="Name" SelectionChanged="cbo_QuestSpeaker_SelectionChanged"/>
+                <Label Content="Quest Speaker" VerticalAlignment="Top" Height="30" Margin="0,103,0,0" HorizontalAlignment="Left" Width="150" />
+                <Button x:Name="btn_Set_Default_Normal" Margin="650,68,10,0" Content="Set As Current" Click="btn_Set_Default_Normal_Click" Height="30" VerticalAlignment="Top" />
+                <Button x:Name="btn_Set_Default_Quest" Margin="650,103,10,0" Content="Set As Current" Click="btn_Set_Default_Quest_Click" Height="30" VerticalAlignment="Top" />
+            </Grid>
+        </GroupBox>
+
     </Grid>
 </Window>
\ No newline at end of file
diff --git a/Oculus VR Dash Manager/Forms/Settings/frm_Settings_v2.xaml.cs b/Oculus VR Dash Manager/Forms/Settings/frm_Settings_v2.xaml.cs
index 874a662..23f62db 100644
--- a/Oculus VR Dash Manager/Forms/Settings/frm_Settings_v2.xaml.cs	
+++ b/Oculus VR Dash Manager/Forms/Settings/frm_Settings_v2.xaml.cs	
@@ -1,4 +1,9 @@
-using System.Windows;
+using PlaybackDeviceSwitcher;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Windows;
+using System.Linq;
+using System.Windows.Controls;
 
 namespace OVR_Dash_Manager.Forms.Settings
 {
@@ -7,9 +12,140 @@ namespace OVR_Dash_Manager.Forms.Settings
     /// </summary>
     public partial class frm_Settings_v2 : Window
     {
+        bool Audio_DevicesChanged = false;
+        bool FireEvents = false;
+
         public frm_Settings_v2()
         {
             InitializeComponent();
         }
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            cbo_NormalSpeaker.ItemsSource = Software.Windows_Audio_v2.Speakers;
+            cbo_QuestSpeaker.ItemsSource = Software.Windows_Audio_v2.Speakers;
+
+            cbo_NormalSpeaker.SelectedItem = Software.Windows_Audio_v2.Speakers.FirstOrDefault(a => a.Normal_Speaker);
+            cbo_QuestSpeaker.SelectedItem = Software.Windows_Audio_v2.Speakers.FirstOrDefault(a => a.Quest_Speaker);
+
+            Audio_DevicesChanged = false;
+            FireEvents = true;
+        }
+
+        private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            if (Audio_DevicesChanged)
+            {
+                if (MessageBox.Show(this, "Automatic Audio Devices Changed - Are you sure you want to save this ?", "Confirm Automatic Audio Device Change", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes)
+                {
+
+                    Software.Windows_Audio_v2.IDevice_Ext NormalSpeaker = Software.Windows_Audio_v2.Speakers.FirstOrDefault(a => a.Normal_Speaker);
+                    Software.Windows_Audio_v2.IDevice_Ext QuestSpeaker = Software.Windows_Audio_v2.Speakers.FirstOrDefault(a => a.Quest_Speaker);
+
+                    Properties.Settings.Default.Normal_Speaker_GUID = NormalSpeaker != null ? NormalSpeaker.ID : new System.Guid();
+                    Properties.Settings.Default.Quest_Speaker_GUID = QuestSpeaker != null ? QuestSpeaker.ID : new System.Guid();
+                    Properties.Settings.Default.Save();
+                }
+            }
+        }
+
+        private void chkbx_Normal_Speaker_Checked(object sender, RoutedEventArgs e)
+        {
+            if (sender is CheckBox Box)
+            {
+                if (Box.DataContext is Software.Windows_Audio_v2.IDevice_Ext Speaker)
+                    CheckSpeaker(Speaker, true, true, false);
+            }
+        }
+
+        private void chkbx_Normal_Speaker_Unchecked(object sender, RoutedEventArgs e)
+        {
+            if (sender is CheckBox Box)
+            {
+                if (Box.DataContext is Software.Windows_Audio_v2.IDevice_Ext Speaker)
+                    CheckSpeaker(Speaker, false, true, false);
+            }
+        }
+
+        private void chkbx_Quest_Speaker_Checked(object sender, RoutedEventArgs e)
+        {
+            if (sender is CheckBox Box)
+            {
+                if (Box.DataContext is Software.Windows_Audio_v2.IDevice_Ext Speaker)
+                    CheckSpeaker(Speaker, true, false, true);
+            }
+        }
+
+        private void chkbx_Quest_Speaker_Unchecked(object sender, RoutedEventArgs e)
+        {
+            if (sender is CheckBox Box)
+            {
+                if (Box.DataContext is Software.Windows_Audio_v2.IDevice_Ext Speaker)
+                    CheckSpeaker(Speaker, false, false, true);
+            }
+        }
+
+        private void CheckSpeaker(Software.Windows_Audio_v2.IDevice_Ext Speaker, bool Checked, bool Normal, bool Quest)
+        {
+            if (!FireEvents)
+                return;
+
+            FireEvents = false;
+
+            // Force reset to make sure it cant be the same audio device
+            Audio_DevicesChanged = true;
+            Speaker.Quest_Speaker = false;
+            Speaker.Normal_Speaker = false;
+
+            if (Normal)
+            {
+                Software.Windows_Audio_v2.Speakers.ForEach(a => a.Normal_Speaker = false); // Remove all normals and just set the current
+                Speaker.Normal_Speaker = Checked;
+            }
+
+            if (Quest)
+            {
+                Software.Windows_Audio_v2.Speakers.ForEach(a => a.Quest_Speaker = false); // Remove all quests and just set the current
+                Speaker.Quest_Speaker = Checked;
+            }
+
+            FireEvents = true;
+        }
+
+        private void btn_Set_Default_Normal_Click(object sender, RoutedEventArgs e)
+        {
+            Software.Windows_Audio_v2.IDevice_Ext NormalSpeaker = Software.Windows_Audio_v2.Speakers.FirstOrDefault(a => a.Normal_Speaker);
+            if (NormalSpeaker != null)
+                Software.Windows_Audio_v2.Set_Default_PlaybackDevice(NormalSpeaker.ID);
+            else
+                MessageBox.Show(this, "Normal Speaker Not Found", "Normal Speaker Not Found", MessageBoxButton.OK, MessageBoxImage.Exclamation);
+        }
+
+        private void btn_Set_Default_Quest_Click(object sender, RoutedEventArgs e)
+        {
+            Software.Windows_Audio_v2.IDevice_Ext QuestSpeaker = Software.Windows_Audio_v2.Speakers.FirstOrDefault(a => a.Quest_Speaker);
+            if (QuestSpeaker != null)
+                Software.Windows_Audio_v2.Set_Default_PlaybackDevice(QuestSpeaker.ID);
+            else
+                MessageBox.Show(this, "Quest Speaker Not Set", "Quest Speaker Not Set", MessageBoxButton.OK, MessageBoxImage.Exclamation);
+        }
+
+        private void cbo_NormalSpeaker_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (cbo_NormalSpeaker.SelectedItem is Software.Windows_Audio_v2.IDevice_Ext Speaker)
+            {
+                CheckSpeaker(Speaker, true, true, false);
+            }
+        }
+
+        private void cbo_QuestSpeaker_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (cbo_QuestSpeaker.SelectedItem is Software.Windows_Audio_v2.IDevice_Ext Speaker)
+            {
+                CheckSpeaker(Speaker, true, false, true);
+            }
+        }
     }
+
+  
 }
\ No newline at end of file
diff --git a/Oculus VR Dash Manager/MainWindow.xaml.cs b/Oculus VR Dash Manager/MainWindow.xaml.cs
index 65accc3..142b773 100644
--- a/Oculus VR Dash Manager/MainWindow.xaml.cs	
+++ b/Oculus VR Dash Manager/MainWindow.xaml.cs	
@@ -1,5 +1,6 @@
-using System;
-using System.Diagnostics;
+using OVR_Dash_Manager.Software;
+using PlaybackDeviceSwitcher;
+using System;
 using System.Globalization;
 using System.IO;
 using System.Threading;
@@ -8,7 +9,6 @@
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Threading;
-using OVR_Dash_Manager.Software;
 using WindowsInput;
 using WindowsInput.Native;
 
@@ -36,11 +36,14 @@ public MainWindow()
 
             Title += " v" + typeof(MainWindow).Assembly.GetName().Version;
             Topmost = Properties.Settings.Default.AlwaysOnTop;
+
+
         }
 
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
             btn_Diagnostics.IsEnabled = false;
+            btn_OpenSettings.IsEnabled = false;
             lbl_CurrentSetting.Content = "Starting Up";
             Elevated = Functions.Process_Functions.IsCurrentProcess_Elevated();
 
@@ -67,6 +70,7 @@ private void Steam_Steam_VR_Running_State_Changed_Event()
 
         private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
         {
+            Software.Windows_Audio_v2.Set_To_Normal_Speaker_Auto();
             Software.ADB.Stop();
             Functions.Process_Watcher.Stop();
 
@@ -140,9 +144,16 @@ private void Startup()
 
                 CheckRunTime();
 
+                Software.Windows_Audio_v2.Setup();
+                Software.Windows_Audio_v2.Set_To_Quest_Speaker_Auto();
+
+                //Software.Windows_Audio.Setup();
+                //Software.Windows_Audio.Set_To_Quest_Speaker_Auto();
+
                 Functions_Old.DoAction(this, new Action(delegate ()
                 {
                     btn_Diagnostics.IsEnabled = true;
+                    btn_OpenSettings.IsEnabled = true;
                     lbl_SteamVR_Status.Content = "Installed: " + Software.Steam.Steam_VR_Installed;
                     lbl_CurrentSetting.Content = Software.Oculus.Current_Dash_Name;
                     Update_Dash_Buttons();
@@ -276,7 +287,7 @@ private void btn_ActivateDash_Click(object sender, RoutedEventArgs e)
 
             if (sender is Button button)
                 ActivateDash(button);
-
+            
             Thread ReactivateButtons = new Thread(Thread_ReactivateButtons);
             ReactivateButtons.IsBackground = true;
             ReactivateButtons.Start();
@@ -286,7 +297,7 @@ private void btn_ActivateDash_Click(object sender, RoutedEventArgs e)
 
         private void Thread_ReactivateButtons()
         {
-            Thread.Sleep(10000);
+            Thread.Sleep(5000);
             Functions_Old.DoAction(this, new Action(delegate () { Update_Dash_Buttons(); }));
         }
 
diff --git a/Oculus VR Dash Manager/Oculus VR Dash Manager.csproj b/Oculus VR Dash Manager/Oculus VR Dash Manager.csproj
index e97ec4d..4542273 100644
--- a/Oculus VR Dash Manager/Oculus VR Dash Manager.csproj	
+++ b/Oculus VR Dash Manager/Oculus VR Dash Manager.csproj	
@@ -12,15 +12,15 @@
     <Copyright>KrisIsBack (AU)</Copyright>
     <PackageIcon>Icon.ico</PackageIcon>
     <PackageIconUrl />
-    <Version>1.0.3.1</Version>
+    <Version>1.0.3.3</Version>
     <Authors>KrisIsBack (AU)</Authors>
     <PackageReleaseNotes>Official &amp; Oculus Killer - Supported with Updates
 https://github.com/KrisIsBackAU/Oculus-VR-Dash-Manager</PackageReleaseNotes>
     <NeutralLanguage>en-AU</NeutralLanguage>
     <RepositoryUrl>https://github.com/KrisIsBackAU/Oculus-VR-Dash-Manager</RepositoryUrl>
     <ApplicationManifest>app.manifest</ApplicationManifest>
-    <AssemblyVersion>1.0.3.1</AssemblyVersion>
-    <FileVersion>1.0.3.1</FileVersion>
+    <AssemblyVersion>1.0.3.3</AssemblyVersion>
+    <FileVersion>1.0.3.3</FileVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
 
@@ -35,10 +35,15 @@ https://github.com/KrisIsBackAU/Oculus-VR-Dash-Manager</PackageReleaseNotes>
     <Page Remove="Images\**" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Remove="Software\Windows Audio.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="AdvancedSharpAdbClient" Version="2.5.4" />
+    <PackageReference Include="BrettHewitt.PlaybackDeviceSwitcher" Version="1.0.5" />
     <PackageReference Include="InputSimulator" Version="1.0.4" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="System.Management" Version="6.0.0" />
     <PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0" />
   </ItemGroup>
@@ -78,4 +83,13 @@ https://github.com/KrisIsBackAU/Oculus-VR-Dash-Manager</PackageReleaseNotes>
     <Folder Include="ADB\" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Reference Include="AudioSwitcher.AudioApi">
+      <HintPath>..\..\..\..\..\Downloads\AudioSwitcher-master\AudioSwitcher.AudioApi\bin\Debug\net45\AudioSwitcher.AudioApi.dll</HintPath>
+    </Reference>
+    <Reference Include="AudioSwitcher.AudioApi.CoreAudio">
+      <HintPath>..\..\..\..\..\Downloads\AudioSwitcher-master\AudioSwitcher.AudioApi.CoreAudio\bin\Debug\net45\AudioSwitcher.AudioApi.CoreAudio.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
 </Project>
diff --git a/Oculus VR Dash Manager/Oculus VR Dash Manager.csproj.user b/Oculus VR Dash Manager/Oculus VR Dash Manager.csproj.user
index 19b4966..4073e77 100644
--- a/Oculus VR Dash Manager/Oculus VR Dash Manager.csproj.user	
+++ b/Oculus VR Dash Manager/Oculus VR Dash Manager.csproj.user	
@@ -7,6 +7,9 @@
     </ApplicationDefinition>
   </ItemGroup>
   <ItemGroup>
+    <Compile Update="Forms\Auto Program Launch\frm_Auto_Program_Launch_Settings.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Update="Forms\frm_Diagnostics.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -36,6 +39,9 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <Page Update="Forms\Auto Program Launch\frm_Auto_Program_Launch_Settings.xaml">
+      <SubType>Designer</SubType>
+    </Page>
     <Page Update="Forms\frm_Diagnostics.xaml">
       <SubType>Designer</SubType>
     </Page>
diff --git a/Oculus VR Dash Manager/Properties/Settings.Designer.cs b/Oculus VR Dash Manager/Properties/Settings.Designer.cs
index a416aaf..5267534 100644
--- a/Oculus VR Dash Manager/Properties/Settings.Designer.cs	
+++ b/Oculus VR Dash Manager/Properties/Settings.Designer.cs	
@@ -12,7 +12,7 @@ namespace OVR_Dash_Manager.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.5.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -154,5 +154,77 @@ public bool QuestPolling {
                 this["QuestPolling"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool Automatic_Audio_Switching {
+            get {
+                return ((bool)(this["Automatic_Audio_Switching"]));
+            }
+            set {
+                this["Automatic_Audio_Switching"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("-1")]
+        public int Normal_Speaker_ID {
+            get {
+                return ((int)(this["Normal_Speaker_ID"]));
+            }
+            set {
+                this["Normal_Speaker_ID"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("-1")]
+        public int Quest_Speaker_ID {
+            get {
+                return ((int)(this["Quest_Speaker_ID"]));
+            }
+            set {
+                this["Quest_Speaker_ID"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("00000000-0000-0000-0000-000000000000")]
+        public global::System.Guid Normal_Speaker_GUID {
+            get {
+                return ((global::System.Guid)(this["Normal_Speaker_GUID"]));
+            }
+            set {
+                this["Normal_Speaker_GUID"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("00000000-0000-0000-0000-000000000000")]
+        public global::System.Guid Quest_Speaker_GUID {
+            get {
+                return ((global::System.Guid)(this["Quest_Speaker_GUID"]));
+            }
+            set {
+                this["Quest_Speaker_GUID"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool Auto_Audio_Change_DefaultCommunication {
+            get {
+                return ((bool)(this["Auto_Audio_Change_DefaultCommunication"]));
+            }
+            set {
+                this["Auto_Audio_Change_DefaultCommunication"] = value;
+            }
+        }
     }
 }
diff --git a/Oculus VR Dash Manager/Properties/Settings.settings b/Oculus VR Dash Manager/Properties/Settings.settings
index 12b015f..87e61fe 100644
--- a/Oculus VR Dash Manager/Properties/Settings.settings	
+++ b/Oculus VR Dash Manager/Properties/Settings.settings	
@@ -35,5 +35,23 @@
     <Setting Name="QuestPolling" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="Automatic_Audio_Switching" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
+    <Setting Name="Normal_Speaker_ID" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">-1</Value>
+    </Setting>
+    <Setting Name="Quest_Speaker_ID" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">-1</Value>
+    </Setting>
+    <Setting Name="Normal_Speaker_GUID" Type="System.Guid" Scope="User">
+      <Value Profile="(Default)">00000000-0000-0000-0000-000000000000</Value>
+    </Setting>
+    <Setting Name="Quest_Speaker_GUID" Type="System.Guid" Scope="User">
+      <Value Profile="(Default)">00000000-0000-0000-0000-000000000000</Value>
+    </Setting>
+    <Setting Name="Auto_Audio_Change_DefaultCommunication" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/Oculus VR Dash Manager/Software/Windows Audio v2.cs b/Oculus VR Dash Manager/Software/Windows Audio v2.cs
new file mode 100644
index 0000000..91c8a0e
--- /dev/null
+++ b/Oculus VR Dash Manager/Software/Windows Audio v2.cs	
@@ -0,0 +1,128 @@
+using AudioSwitcher.AudioApi;
+using AudioSwitcher.AudioApi.CoreAudio;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+
+namespace OVR_Dash_Manager.Software
+{
+    public static class Windows_Audio_v2
+    {
+        static IAudioController controller;
+        static bool _IsSetup = false;
+        public static List<IDevice_Ext> Speakers;
+
+        public static void Setup()
+        {
+            if (_IsSetup)
+                return;
+
+            controller = new CoreAudioController();
+            IEnumerable<IDevice> Devices = controller.GetDevices();
+            Speakers = new List<IDevice_Ext>();
+            foreach (IDevice item in Devices)
+            {
+                IDevice_Ext New = new IDevice_Ext(item);
+
+                if (New.ID == Properties.Settings.Default.Normal_Speaker_GUID)
+                    New.Normal_Speaker = true;
+
+                if (New.ID == Properties.Settings.Default.Quest_Speaker_GUID)
+                    New.Quest_Speaker = true;
+
+                Speakers.Add(New);
+            }
+
+            _IsSetup = true;
+        }
+
+        public static void Set_Default_PlaybackDevice(IDevice Speaker)
+        {
+            Speaker.SetAsDefault();
+
+            if (Properties.Settings.Default.Auto_Audio_Change_DefaultCommunication)
+                Speaker.SetAsDefaultCommunications();
+        }
+
+        public static void Set_Default_PlaybackDevice(Guid Speaker_ID)
+        {
+            IDevice Speaker = controller.GetDevice(Speaker_ID);
+            if (Speaker != null)
+                Set_Default_PlaybackDevice(Speaker);
+        }
+
+        public static void Set_To_Normal_Speaker_Auto(Boolean Force = false)
+        {
+            if (Properties.Settings.Default.Automatic_Audio_Switching || Force)
+            {
+                IDevice Speaker = controller.GetDevice(Properties.Settings.Default.Normal_Speaker_GUID);
+                if (Speaker != null)
+                    Set_Default_PlaybackDevice(Speaker);
+            }
+        }
+
+        public static void Set_To_Quest_Speaker_Auto(Boolean Force = false)
+        {
+            if (Properties.Settings.Default.Automatic_Audio_Switching || Force)
+            {
+                IDevice Speaker = controller.GetDevice(Properties.Settings.Default.Quest_Speaker_GUID);
+                if (Speaker != null)
+                    Set_Default_PlaybackDevice(Speaker);
+            }
+        }
+
+        public class IDevice_Ext : INotifyPropertyChanged
+        {
+            // Add To Class : INotifyPropertyChanged
+            #region Notify Property Changed Members
+            public event PropertyChangedEventHandler PropertyChanged;
+            private void OnPropertyChanged(string propertyName)
+            {
+                PropertyChangedEventHandler handler = PropertyChanged;
+                if (handler != null)
+                {
+                    handler(this, new PropertyChangedEventArgs(propertyName));
+                }
+            }
+            #endregion
+
+            public IDevice_Ext(IDevice Speaker)
+            {
+                this.Name = Speaker.FullName;
+                this.ID = Speaker.Id;
+            }
+
+            private bool _Normal_Speaker;
+            public bool Normal_Speaker
+            {
+                get { return _Normal_Speaker; }
+                set { if (value != _Normal_Speaker) _Normal_Speaker = value; OnPropertyChanged("Normal_Speaker"); }
+            }
+
+
+
+            private bool _Quest_Speaker;
+            public bool Quest_Speaker
+            {
+                get { return _Quest_Speaker; }
+                set { if (value != _Quest_Speaker) _Quest_Speaker = value; OnPropertyChanged("Quest_Speaker"); }
+            }
+
+            private string _Name;
+            public string Name
+            {
+                get { return _Name; }
+                set { if (value != null || value != _Name) _Name = value; OnPropertyChanged("Name"); }
+            }
+
+
+            private Guid _ID;
+            public Guid ID
+            {
+                get { return _ID; }
+                set { if (value != _ID) _ID = value; OnPropertyChanged("ID"); }
+            }
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/Oculus VR Dash Manager/Software/Windows Audio.cs b/Oculus VR Dash Manager/Software/Windows Audio.cs
new file mode 100644
index 0000000..57bcd5d
--- /dev/null
+++ b/Oculus VR Dash Manager/Software/Windows Audio.cs	
@@ -0,0 +1,113 @@
+using PlaybackDeviceSwitcher;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Linq;
+
+namespace OVR_Dash_Manager.Software
+{
+    public static class Windows_Audio
+    {
+        public static List<PlayBackDevice_Ext> Speakers;
+
+        public static void Setup()
+        {
+            PlayBackDevice[] outputs = PlaybackDeviceSwitcherWrapper.GetPlayBackDevices();
+            Speakers = new List<PlayBackDevice_Ext>();
+
+            foreach (PlayBackDevice item in outputs)
+            {
+                PlayBackDevice_Ext Speaker = new PlayBackDevice_Ext(item);
+
+                if (Speaker.ID == Properties.Settings.Default.Normal_Speaker_ID)
+                    Speaker.Normal_Speaker = true;
+
+                if (Speaker.ID == Properties.Settings.Default.Quest_Speaker_ID)
+                    Speaker.Quest_Speaker = true;
+
+                Speakers.Add(Speaker);
+            }
+        }
+
+        public static void Set_To_Normal_Speaker_Auto(Boolean Force = false)
+        {
+            if (Properties.Settings.Default.Automatic_Audio_Switching || Force)
+            {
+                PlayBackDevice_Ext Speaker = Speakers.FirstOrDefault(a => a.ID == Properties.Settings.Default.Normal_Speaker_ID);
+                if (Speaker != null)
+                    SetDefaultPlayBackDevice(Speaker.ID);
+            }
+        }
+
+        public static void Set_To_Quest_Speaker_Auto(Boolean Force = false)
+        {
+            if (Properties.Settings.Default.Automatic_Audio_Switching || Force)
+            {
+                PlayBackDevice_Ext Speaker = Speakers.FirstOrDefault(a => a.ID == Properties.Settings.Default.Quest_Speaker_ID);
+                if (Speaker != null)
+                    SetDefaultPlayBackDevice(Speaker.ID);
+            }
+        }
+
+        public static void SetDefaultPlayBackDevice(int ID)
+        {
+            PlaybackDeviceSwitcherWrapper.SetDefaultPlayBackDevice(ID);
+            Debug.WriteLine($"Switched to device " + ID);
+        }
+
+        public class PlayBackDevice_Ext : INotifyPropertyChanged
+        {
+            // Add To Class : INotifyPropertyChanged
+            #region Notify Property Changed Members
+            public event PropertyChangedEventHandler PropertyChanged;
+            private void OnPropertyChanged(string propertyName)
+            {
+                PropertyChangedEventHandler handler = PropertyChanged;
+                if (handler != null)
+                {
+                    handler(this, new PropertyChangedEventArgs(propertyName));
+                }
+            }
+            #endregion
+
+            public PlayBackDevice_Ext(PlayBackDevice Speaker)
+            {
+                this.Name = Speaker.Name;
+                this.ID = Speaker.Id;
+            }
+
+            private bool _Normal_Speaker;
+            public bool Normal_Speaker
+            {
+                get { return _Normal_Speaker; }
+                set { if (value != _Normal_Speaker) _Normal_Speaker = value; OnPropertyChanged("Normal_Speaker"); }
+            }
+
+
+
+            private bool _Quest_Speaker;
+            public bool Quest_Speaker
+            {
+                get { return _Quest_Speaker; }
+                set { if (value != _Quest_Speaker) _Quest_Speaker = value; OnPropertyChanged("Quest_Speaker"); }
+            }
+
+            private string _Name;
+            public string Name
+            {
+                get { return _Name; }
+                set { if (value != null || value != _Name) _Name = value; OnPropertyChanged("Name"); }
+            }
+
+
+            private int _ID;
+            public int ID
+            {
+                get { return _ID; }
+                set { if (value != _ID) _ID = value; OnPropertyChanged("ID"); }
+            }
+
+        }
+    }
+}
diff --git a/Oculus VR Dash Manager/Theme/Styles.Shared.xaml b/Oculus VR Dash Manager/Theme/Styles.Shared.xaml
index 87fc4be..08bf189 100644
--- a/Oculus VR Dash Manager/Theme/Styles.Shared.xaml	
+++ b/Oculus VR Dash Manager/Theme/Styles.Shared.xaml	
@@ -484,6 +484,126 @@
         </Setter>
     </Style>
 
+    <!-- *********************************  ListViewItem Style  ********************************* -->
+    <Style x:Key="ListViewItemStyle" TargetType="ListViewItem">
+        <Setter Property="Background" Value="{StaticResource TransparentBrush}" />
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}" />
+        <Setter Property="FontSize" Value="13.333" />
+        <Setter Property="FontFamily" Value="Segoe UI" />
+        <Setter Property="MinHeight" Value="30" />
+        <Setter Property="Padding" Value="6,2" />
+        <Setter Property="Margin" Value="0" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ListBoxItem">
+                    <Grid>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="MouseOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Bd" Storyboard.TargetProperty="Fill">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ListBoxItemHoverBackgroundBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Bd" Storyboard.TargetProperty="Stroke">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ListBoxItemHoverBorderBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Foreground" Storyboard.TargetName="contentControl">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource LightForegroundBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="DisabledVisualElement">
+                                            <DiscreteObjectKeyFrame KeyTime="0">
+                                                <DiscreteObjectKeyFrame.Value>
+                                                    <Visibility>Visible</Visibility>
+                                                </DiscreteObjectKeyFrame.Value>
+                                            </DiscreteObjectKeyFrame>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="SelectionStates">
+                                <VisualState x:Name="Unselected" />
+                                <VisualState x:Name="Selected">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="BgSelected">
+                                            <DiscreteObjectKeyFrame KeyTime="0">
+                                                <DiscreteObjectKeyFrame.Value>
+                                                    <Visibility>Visible</Visibility>
+                                                </DiscreteObjectKeyFrame.Value>
+                                            </DiscreteObjectKeyFrame>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="contentControl">
+                                            <DiscreteObjectKeyFrame KeyTime="0">
+                                                <DiscreteObjectKeyFrame.Value>
+                                                    <Visibility>Collapsed</Visibility>
+                                                </DiscreteObjectKeyFrame.Value>
+                                            </DiscreteObjectKeyFrame>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="contentControl1">
+                                            <DiscreteObjectKeyFrame KeyTime="0">
+                                                <DiscreteObjectKeyFrame.Value>
+                                                    <Visibility>Visible</Visibility>
+                                                </DiscreteObjectKeyFrame.Value>
+                                            </DiscreteObjectKeyFrame>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetProperty="Foreground" Storyboard.TargetName="contentControl1">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource LightForegroundBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="SelectedUnfocused">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="BgSelected">
+                                            <DiscreteObjectKeyFrame KeyTime="0">
+                                                <DiscreteObjectKeyFrame.Value>
+                                                    <Visibility>Visible</Visibility>
+                                                </DiscreteObjectKeyFrame.Value>
+                                            </DiscreteObjectKeyFrame>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Foreground" Storyboard.TargetName="contentControl">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource LightForegroundBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="FocusStates">
+                                <VisualState x:Name="Focused">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="FocusedVisualElement">
+                                            <DiscreteObjectKeyFrame KeyTime="0">
+                                                <DiscreteObjectKeyFrame.Value>
+                                                    <Visibility>Visible</Visibility>
+                                                </DiscreteObjectKeyFrame.Value>
+                                            </DiscreteObjectKeyFrame>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Unfocused" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                        <Rectangle x:Name="Bd" Fill="{TemplateBinding Background}" />
+                        <Rectangle x:Name="BgSelected" Fill="{StaticResource ListBoxItemSelectedBackgroundBrush}" Stroke="{StaticResource ListBoxItemSelectedBorderBrush}" Visibility="Collapsed" />
+                        <ContentControl x:Name="contentControl" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Foreground="{TemplateBinding Foreground}">
+                            <ContentPresenter x:Name="contentPresenter" />
+                        </ContentControl>
+                        <ContentControl x:Name="contentControl1" Visibility="Collapsed" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Foreground="{StaticResource ForegroundBrush}">
+                            <ContentPresenter x:Name="contentPresenter1" />
+                        </ContentControl>
+                        <Rectangle x:Name="FocusedVisualElement" IsHitTestVisible="False" Visibility="Collapsed" Stroke="{StaticResource ListBoxItemPressedBorderBrush}" StrokeThickness="2" />
+                        <Rectangle x:Name="DisabledVisualElement" Fill="{StaticResource DisabledVisualElement}" Visibility="Collapsed" />
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
     <!-- ********************************** CheckBoxStyle **********************************-->
     <Style x:Key="CheckBoxStyle" TargetType="CheckBox">
         <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}" />