diff --git a/.gitignore b/.gitignore
index 741d71d..a461faf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,12 @@ bin/
 *.psess
 *.rar
 *.TMP
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
\ No newline at end of file
diff --git a/Components/LiveSplit.Skyrim.dll b/Components/LiveSplit.Skyrim.dll
index 378f449..589cff6 100644
Binary files a/Components/LiveSplit.Skyrim.dll and b/Components/LiveSplit.Skyrim.dll differ
diff --git a/Components/package.sh b/Components/package.sh
index b1d98ec..4c7707c 100755
--- a/Components/package.sh
+++ b/Components/package.sh
@@ -6,4 +6,4 @@ if [ -z "$VERSION" ]; then
     exit 1
 fi
 
-zip LiveSplit.Skyrim_v${VERSION}.zip LiveSplit.Skyrim.dll ../readme.txt
+zip -j LiveSplit.Skyrim_v${VERSION}.zip LiveSplit.Skyrim.dll ../README.md
diff --git a/Components/update.LiveSplit.Skyrim.xml b/Components/update.LiveSplit.Skyrim.xml
index 1053c67..f1a9cc8 100644
--- a/Components/update.LiveSplit.Skyrim.xml
+++ b/Components/update.LiveSplit.Skyrim.xml
@@ -1,4 +1,14 @@
 <updates>
+    <update version="2.3">
+        <files>
+            <file path="Components/LiveSplit.Skyrim.dll" status="changed"/>
+        </files>
+        <changelog>
+            <change>
+                Compatibility with LiveSplit 1.6
+            </change>
+        </changelog>
+    </update>
     <update version="2.2.1">
         <files>
             <file path="Components/LiveSplit.Skyrim.dll" status="changed"/>
diff --git a/LiveSplit.Skyrim.csproj b/LiveSplit.Skyrim.csproj
index 8b6b416..8d11d9c 100644
--- a/LiveSplit.Skyrim.csproj
+++ b/LiveSplit.Skyrim.csproj
@@ -16,10 +16,13 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\..\..\Program Files %28x86%29\LiveSplit\Components\</OutputPath>
+    <OutputPath>..\..\..\..\Program Files\LiveSplit\Components\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <AllowedReferenceRelatedFileExtensions>
+		.pdb
+    </AllowedReferenceRelatedFileExtensions>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
@@ -28,15 +31,17 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <AllowedReferenceRelatedFileExtensions>
+		.pdb
+    </AllowedReferenceRelatedFileExtensions>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="LiveSplit.Core">
-      <HintPath>..\..\..\..\Program Files (x86)\LiveSplit\LiveSplit.Core.dll</HintPath>
+      <HintPath>..\..\..\..\Program Files\LiveSplit\LiveSplit.Core.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="LiveSplit.Sound, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Program Files (x86)\LiveSplit\Components\LiveSplit.Sound.dll</HintPath>
+    <Reference Include="NAudio">
+      <HintPath>packages\NAudio.1.7.3\lib\net35\NAudio.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System" />
@@ -46,7 +51,7 @@
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Xml" />
     <Reference Include="UpdateManager">
-      <HintPath>..\..\..\..\Program Files (x86)\LiveSplit\UpdateManager.dll</HintPath>
+      <HintPath>..\..\..\..\Program Files\LiveSplit\UpdateManager.dll</HintPath>
       <Private>False</Private>
     </Reference>
   </ItemGroup>
@@ -70,6 +75,7 @@
     <Compile Include="GameMemory.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SafeNativeMethods.cs" />
+    <Compile Include="MediaPlayer.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Properties\Resources.resx">
@@ -82,33 +88,16 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="license.txt" />
+    <None Include="packages.config" />
     <None Include="README.md" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Resources\bearcart_short.mp3" />
   </ItemGroup>
   <ItemGroup>
-    <COMReference Include="MediaPlayer">
-      <Guid>{22D6F304-B0F6-11D0-94AB-0080C74C7E95}</Guid>
-      <VersionMajor>1</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>tlbimp</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="stdole">
-      <Guid>{00020430-0000-0000-C000-000000000046}</Guid>
-      <VersionMajor>2</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Components\update.LiveSplit.Skyrim.xml" />
+    <Content Include="Components\update.LiveSplit.Skyrim.xml">
+      <SubType>Designer</SubType>
+    </Content>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/MediaPlayer.cs b/MediaPlayer.cs
new file mode 100644
index 0000000..818408a
--- /dev/null
+++ b/MediaPlayer.cs
@@ -0,0 +1,61 @@
+using LiveSplit.Options;
+using NAudio.Wave;
+using System;
+using System.IO;
+using System.Threading.Tasks;
+
+namespace LiveSplit.Skyrim
+{
+    public class MediaPlayer
+    {
+        public int GeneralVolume { get; set; }
+        protected WaveOut Player { get; private set; }
+
+        public MediaPlayer()
+        {
+            GeneralVolume = 100;
+
+            Player = new WaveOut();
+        }
+
+        public void Dispose()
+        {
+            Player.Stop();
+        }
+
+        public void PlaySound(String location, int volume)
+        {
+            Player.Stop();
+
+            if (File.Exists(location))
+            {
+                Task.Factory.StartNew(() =>
+                {
+                    try
+                    {
+                        AudioFileReader audioFileReader = new AudioFileReader(location);
+                        audioFileReader.Volume = (volume / 100f) * (GeneralVolume / 100f);
+
+                        Player.DeviceNumber = -1;
+                        Player.Init(audioFileReader);
+                        Player.Play();
+                    }
+                    catch (Exception e)
+                    {
+                        Log.Error(e);
+                    }
+                });
+            }
+        }
+
+        public void PlaySound(String location)
+        {
+            PlaySound(location, GeneralVolume);
+        }
+
+        public void Stop()
+        {
+            Player.Stop();
+        }
+    }
+}
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index f9c443a..5349dcd 100644
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -33,7 +33,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.2.1.0")]
-[assembly: AssemblyFileVersion("2.2.1.0")]
+[assembly: AssemblyVersion("2.3.0.0")]
+[assembly: AssemblyFileVersion("2.3.0.0")]
 
 [assembly: ComponentFactory(typeof(SkyrimFactory))]
diff --git a/SkyrimComponent.cs b/SkyrimComponent.cs
index c692bc0..e42cde5 100644
--- a/SkyrimComponent.cs
+++ b/SkyrimComponent.cs
@@ -16,7 +16,7 @@ public override string ComponentName
             get { return "Skyrim"; }
         }
 
-        public IComponent SoundComponent { get; set; }
+        public MediaPlayer MediaPlayer { get; set; }
         public SkyrimSettings Settings { get; set; }
         public Time BearCartSplit { get; private set; }
 
@@ -36,25 +36,22 @@ public SkyrimComponent(LiveSplitState state)
             Trace.WriteLine($"[NoLoads] Using LiveSplit.Skyrim component version {Assembly.GetExecutingAssembly().GetName().Version} {(debug ? "Debug" : "Release")} build");
             _state = state;
 
+            try { MediaPlayer = new MediaPlayer(); }
+            catch { MediaPlayer = null; }
             this.Settings = new SkyrimSettings(this, state);
 
             _timer = new TimerModel { CurrentState = state };
 
             this.BearCartSplit = new Time();
-            IComponentFactory soundFactory;
-            if (ComponentManager.ComponentFactories.TryGetValue("LiveSplit.Sound.dll", out soundFactory))
-            {
-                SoundComponent = soundFactory.Create(_state) as SoundComponent;
 
-                this.BearCartDefaultSoundPath = System.IO.Path.GetTempPath() + @"LiveSplit.Skyrim\bearcart.mp3";
-                //extract embedded sound to temp folder
-                try
-                {
-                    System.IO.Directory.CreateDirectory(System.IO.Path.GetDirectoryName(BearCartDefaultSoundPath));
-                    System.IO.File.WriteAllBytes(BearCartDefaultSoundPath, Properties.Resources.bearcart_short);
-                }
-                catch (System.IO.IOException) { Trace.WriteLine("[NoLoads] Error when extracting bear cart sound to temp folder."); }
+            this.BearCartDefaultSoundPath = System.IO.Path.GetTempPath() + @"LiveSplit.Skyrim\bearcart.mp3";
+            //extract embedded sound to temp folder
+            try
+            {
+                System.IO.Directory.CreateDirectory(System.IO.Path.GetDirectoryName(BearCartDefaultSoundPath));
+                System.IO.File.WriteAllBytes(BearCartDefaultSoundPath, Properties.Resources.bearcart_short);
             }
+            catch (System.IO.IOException) { Trace.WriteLine("[NoLoads] Error when extracting bear cart sound to temp folder."); }
 
             _gameMemory = new GameMemory();
             _gameMemory.OnStartSaveLoad += gameMemory_OnStartSaveLoad;
@@ -73,7 +70,7 @@ public override void Dispose()
             _state.OnReset -= State_OnReset;
 
             _gameMemory?.Stop();
-            SoundComponent?.Dispose();
+            MediaPlayer?.Dispose();
         }
 
         void State_OnStart(object sender, EventArgs e)
@@ -183,14 +180,14 @@ void gameMemory_OnBearCart(object sender, EventArgs e)
                 Settings.IsBearCartSecret = false;
                 Settings.SaveBearCartConfig();
 
-                if (SoundComponent != null && (Settings.IsBearCartSecret || Settings.PlayBearCartSound)) //force play if it isn't unlocked in case the splits were shared
+                if (Settings.IsBearCartSecret || Settings.PlayBearCartSound) //force play if it isn't unlocked in case the splits were shared
                 {
                     if (Settings.IsBearCartSecret || !Settings.PlayBearCartSoundOnlyOnPB || IsBearCartPB(BearCartSplit))
                     {
-                        if (String.IsNullOrEmpty(Settings.BearCartSoundPath))
-                            ((SoundComponent)SoundComponent).PlaySound(BearCartDefaultSoundPath);
+                        if (String.IsNullOrEmpty(Settings.BearCartSoundPath) || !System.IO.File.Exists(Settings.BearCartSoundPath))
+                            MediaPlayer?.PlaySound(BearCartDefaultSoundPath);
                         else
-                            ((SoundComponent)SoundComponent).PlaySound(Settings.BearCartSoundPath);
+                            MediaPlayer?.PlaySound(Settings.BearCartSoundPath);
                     }
                 }
             }
@@ -227,8 +224,8 @@ void UpdateBearCartPB(bool silent = false)
                 }
             }
 
-            if (SoundComponent != null && !silent)
-                ((SoundComponent)SoundComponent).Player.Stop();
+            if (!silent)
+                MediaPlayer?.Stop();
 
             BearCartSplit = new Time();
         }
diff --git a/SkyrimSettings.Designer.cs b/SkyrimSettings.Designer.cs
index 23bb589..52ecf6b 100644
--- a/SkyrimSettings.Designer.cs
+++ b/SkyrimSettings.Designer.cs
@@ -40,8 +40,8 @@ private void InitializeComponent()
             this.chkEsbern = new System.Windows.Forms.CheckBox();
             this.chkRiverwood = new System.Windows.Forms.CheckBox();
             this.chkKarthspire = new System.Windows.Forms.CheckBox();
-            this.chkTheWall = new System.Windows.Forms.CheckBox();
             this.chkSeptimus = new System.Windows.Forms.CheckBox();
+            this.chkTheWall = new System.Windows.Forms.CheckBox();
             this.chkMzarkTower = new System.Windows.Forms.CheckBox();
             this.chkClearSky = new System.Windows.Forms.CheckBox();
             this.chkHorseClimb = new System.Windows.Forms.CheckBox();
@@ -76,9 +76,11 @@ private void InitializeComponent()
             this.chkBearCartPBNotification = new System.Windows.Forms.CheckBox();
             this.gbBearCartSound = new System.Windows.Forms.GroupBox();
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+            this.lVolume = new System.Windows.Forms.Label();
+            this.tbGeneralVolume = new System.Windows.Forms.TrackBar();
             this.chkPlayBearCartSound = new System.Windows.Forms.CheckBox();
             this.btnBrowseBearCartSound = new System.Windows.Forms.Button();
-            this.label1 = new System.Windows.Forms.Label();
+            this.lSound = new System.Windows.Forms.Label();
             this.txtBearCartSoundPath = new System.Windows.Forms.TextBox();
             this.chkPlayBearCartSoundOnlyOnPB = new System.Windows.Forms.CheckBox();
             this.btnBearCartSoundTest = new System.Windows.Forms.Button();
@@ -105,6 +107,7 @@ private void InitializeComponent()
             this.tlpBearCart.SuspendLayout();
             this.gbBearCartSound.SuspendLayout();
             this.tableLayoutPanel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.tbGeneralVolume)).BeginInit();
             this.gbStartSplits.SuspendLayout();
             this.flp.SuspendLayout();
             this.SuspendLayout();
@@ -292,23 +295,11 @@ private void InitializeComponent()
             this.chkKarthspire.Text = "Karthspire";
             this.chkKarthspire.UseVisualStyleBackColor = true;
             // 
-            // chkTheWall
-            // 
-            this.chkTheWall.AutoSize = true;
-            this.chkTheWall.Dock = System.Windows.Forms.DockStyle.Top;
-            this.chkTheWall.Location = new System.Drawing.Point(3, 118);
-            this.chkTheWall.Margin = new System.Windows.Forms.Padding(3, 3, 50, 3);
-            this.chkTheWall.Name = "chkTheWall";
-            this.chkTheWall.Size = new System.Drawing.Size(109, 17);
-            this.chkTheWall.TabIndex = 8;
-            this.chkTheWall.Text = "The Wall";
-            this.chkTheWall.UseVisualStyleBackColor = true;
-            // 
             // chkSeptimus
             // 
             this.chkSeptimus.AutoSize = true;
             this.chkSeptimus.Dock = System.Windows.Forms.DockStyle.Top;
-            this.chkSeptimus.Location = new System.Drawing.Point(3, 141);
+            this.chkSeptimus.Location = new System.Drawing.Point(3, 118);
             this.chkSeptimus.Margin = new System.Windows.Forms.Padding(3, 3, 50, 3);
             this.chkSeptimus.Name = "chkSeptimus";
             this.chkSeptimus.Size = new System.Drawing.Size(109, 17);
@@ -316,6 +307,18 @@ private void InitializeComponent()
             this.chkSeptimus.Text = "Septimus";
             this.chkSeptimus.UseVisualStyleBackColor = true;
             // 
+            // chkTheWall
+            // 
+            this.chkTheWall.AutoSize = true;
+            this.chkTheWall.Dock = System.Windows.Forms.DockStyle.Top;
+            this.chkTheWall.Location = new System.Drawing.Point(3, 141);
+            this.chkTheWall.Margin = new System.Windows.Forms.Padding(3, 3, 50, 3);
+            this.chkTheWall.Name = "chkTheWall";
+            this.chkTheWall.Size = new System.Drawing.Size(109, 17);
+            this.chkTheWall.TabIndex = 8;
+            this.chkTheWall.Text = "The Wall";
+            this.chkTheWall.UseVisualStyleBackColor = true;
+            // 
             // chkMzarkTower
             // 
             this.chkMzarkTower.AutoSize = true;
@@ -708,7 +711,7 @@ private void InitializeComponent()
             this.tlpBearCart.RowStyles.Add(new System.Windows.Forms.RowStyle());
             this.tlpBearCart.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 29F));
             this.tlpBearCart.RowStyles.Add(new System.Windows.Forms.RowStyle());
-            this.tlpBearCart.Size = new System.Drawing.Size(450, 167);
+            this.tlpBearCart.Size = new System.Drawing.Size(450, 196);
             this.tlpBearCart.TabIndex = 0;
             // 
             // chkBearCartPBNotification
@@ -732,7 +735,7 @@ private void InitializeComponent()
             this.gbBearCartSound.Dock = System.Windows.Forms.DockStyle.Fill;
             this.gbBearCartSound.Location = new System.Drawing.Point(3, 58);
             this.gbBearCartSound.Name = "gbBearCartSound";
-            this.gbBearCartSound.Size = new System.Drawing.Size(444, 106);
+            this.gbBearCartSound.Size = new System.Drawing.Size(444, 135);
             this.gbBearCartSound.TabIndex = 6;
             this.gbBearCartSound.TabStop = false;
             this.gbBearCartSound.Text = "Sound";
@@ -745,22 +748,48 @@ private void InitializeComponent()
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 120F));
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+            this.tableLayoutPanel1.Controls.Add(this.lVolume, 0, 3);
+            this.tableLayoutPanel1.Controls.Add(this.tbGeneralVolume, 1, 3);
             this.tableLayoutPanel1.Controls.Add(this.chkPlayBearCartSound, 0, 0);
             this.tableLayoutPanel1.Controls.Add(this.btnBrowseBearCartSound, 2, 2);
-            this.tableLayoutPanel1.Controls.Add(this.label1, 0, 2);
+            this.tableLayoutPanel1.Controls.Add(this.lSound, 0, 2);
             this.tableLayoutPanel1.Controls.Add(this.txtBearCartSoundPath, 1, 2);
             this.tableLayoutPanel1.Controls.Add(this.chkPlayBearCartSoundOnlyOnPB, 0, 1);
             this.tableLayoutPanel1.Controls.Add(this.btnBearCartSoundTest, 2, 1);
             this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 16);
             this.tableLayoutPanel1.Name = "tableLayoutPanel1";
-            this.tableLayoutPanel1.RowCount = 3;
+            this.tableLayoutPanel1.RowCount = 4;
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 29F));
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 29F));
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 29F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(438, 87);
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 29F));
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(438, 116);
             this.tableLayoutPanel1.TabIndex = 0;
             // 
+            // lVolume
+            // 
+            this.lVolume.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.lVolume.AutoSize = true;
+            this.lVolume.Location = new System.Drawing.Point(3, 95);
+            this.lVolume.Name = "lVolume";
+            this.lVolume.Size = new System.Drawing.Size(114, 13);
+            this.lVolume.TabIndex = 10;
+            this.lVolume.Text = "Volume:";
+            // 
+            // tbGeneralVolume
+            // 
+            this.tableLayoutPanel1.SetColumnSpan(this.tbGeneralVolume, 2);
+            this.tbGeneralVolume.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tbGeneralVolume.Location = new System.Drawing.Point(123, 90);
+            this.tbGeneralVolume.Maximum = 100;
+            this.tbGeneralVolume.Name = "tbGeneralVolume";
+            this.tbGeneralVolume.Size = new System.Drawing.Size(312, 23);
+            this.tbGeneralVolume.TabIndex = 9;
+            this.tbGeneralVolume.TickFrequency = 10;
+            this.tbGeneralVolume.Value = 100;
+            // 
             // chkPlayBearCartSound
             // 
             this.chkPlayBearCartSound.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
@@ -789,16 +818,16 @@ private void InitializeComponent()
             this.btnBrowseBearCartSound.UseVisualStyleBackColor = true;
             this.btnBrowseBearCartSound.Click += new System.EventHandler(this.btnBrowseBearCartSound_Click);
             // 
-            // label1
+            // lSound
             // 
-            this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(3, 66);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(114, 13);
-            this.label1.TabIndex = 3;
-            this.label1.Text = "Sound:";
-            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.lSound.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.lSound.AutoSize = true;
+            this.lSound.Location = new System.Drawing.Point(3, 66);
+            this.lSound.Name = "lSound";
+            this.lSound.Size = new System.Drawing.Size(114, 13);
+            this.lSound.TabIndex = 3;
+            this.lSound.Text = "Sound:";
+            this.lSound.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
             // txtBearCartSoundPath
             // 
@@ -945,6 +974,7 @@ private void InitializeComponent()
             this.gbBearCartSound.PerformLayout();
             this.tableLayoutPanel1.ResumeLayout(false);
             this.tableLayoutPanel1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.tbGeneralVolume)).EndInit();
             this.gbStartSplits.ResumeLayout(false);
             this.gbStartSplits.PerformLayout();
             this.flp.ResumeLayout(false);
@@ -1010,11 +1040,13 @@ private void InitializeComponent()
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
         private System.Windows.Forms.CheckBox chkPlayBearCartSound;
         private System.Windows.Forms.Button btnBrowseBearCartSound;
-        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Label lSound;
         private System.Windows.Forms.Button btnBearCartSoundTest;
         private System.Windows.Forms.TextBox txtBearCartSoundPath;
         private System.Windows.Forms.Label lBearCartPB;
         private System.Windows.Forms.CheckBox chkPlayBearCartSoundOnlyOnPB;
         private System.Windows.Forms.CheckBox chkKarthspire;
+        private System.Windows.Forms.Label lVolume;
+        private System.Windows.Forms.TrackBar tbGeneralVolume;
     }
 }
diff --git a/SkyrimSettings.cs b/SkyrimSettings.cs
index a2f5d05..2e5f5a7 100644
--- a/SkyrimSettings.cs
+++ b/SkyrimSettings.cs
@@ -1,5 +1,4 @@
 using LiveSplit.Model;
-using LiveSplit.UI.Components;
 using System;
 using System.Collections.Generic;
 using System.Reflection;
@@ -120,6 +119,8 @@ public SkyrimSettings(SkyrimComponent component, LiveSplitState state)
             this.chkPlayBearCartSound.DataBindings.Add("Checked", this, "PlayBearCartSound", false, DataSourceUpdateMode.OnPropertyChanged);
             this.txtBearCartSoundPath.DataBindings.Add("Text", this, "BearCartSoundPath");
             this.chkPlayBearCartSoundOnlyOnPB.DataBindings.Add("Checked", this, "PlayBearCartSoundOnlyOnPB", false, DataSourceUpdateMode.OnPropertyChanged);
+            if (_component.MediaPlayer != null)
+                this.tbGeneralVolume.DataBindings.Add("Value", _component.MediaPlayer, "GeneralVolume");
 
             // defaults
             this.AutoStart = DEFAULT_AUTOSTART;
@@ -149,7 +150,7 @@ public SkyrimSettings(SkyrimComponent component, LiveSplitState state)
             this.Companions = DEFAULT_COMPANIONS;
             this.DarkBrotherhood = DEFAULT_DARKBROTHERHOOD;
             this.ThievesGuild = DEFAULT_THIEVESGUILD;
-            this.AnyPercentTemplate = DEFAULT_ANYPERCENTTEMPLATE;            
+            this.AnyPercentTemplate = DEFAULT_ANYPERCENTTEMPLATE;
             this.BearCartPBNotification = DEFAULT_BEARCARTPBNOTIFICATION;
             this.PlayBearCartSound = DEFAULT_PLAYBEARCARTSOUND;
             this.BearCartSoundPath = String.Empty;
@@ -171,9 +172,10 @@ public SkyrimSettings(SkyrimComponent component, LiveSplitState state)
 
         void Settings_OnLoad(object sender, EventArgs e)
         {
-            if (_component.SoundComponent == null)
+            if (_component.MediaPlayer == null)
             {
-                gbBearCartSound.Visible = false;
+                gbBearCartSound.Enabled = false;
+                gbBearCartSound.Text = "Sound (NAudio.dll is missing)";
             }
 
             if (BearCartPB.RealTime != null && BearCartPB.RealTime != new TimeSpan(0))
@@ -231,6 +233,8 @@ public XmlNode GetSettings(XmlDocument doc)
             settingsNode.AppendChild(ToElement(doc, "PlayBearCartSound", this.PlayBearCartSound));
             settingsNode.AppendChild(ToElement(doc, "BearCartSoundPath", this.BearCartSoundPath));
             settingsNode.AppendChild(ToElement(doc, "PlayBearCartSoundOnlyOnPB", this.PlayBearCartSoundOnlyOnPB));
+            if (_component.MediaPlayer != null)
+                settingsNode.AppendChild(ToElement(doc, "Volume", _component.MediaPlayer.GeneralVolume));
 
             return settingsNode;
         }
@@ -245,7 +249,7 @@ public void SaveBearCartConfig()
             rootNode.AppendChild(ToElement(doc, "Secret", this.IsBearCartSecret));
             rootNode.AppendChild(ToElement(doc, "RealTime", this.BearCartPB.RealTime.Value));
             rootNode.AppendChild(ToElement(doc, "GameTime", this.BearCartPB.GameTime.Value));
-            
+
             doc.Save(BEAR_CART_CFG_FILE);
         }
 
@@ -288,6 +292,8 @@ public void SetSettings(XmlNode settings)
             this.PlayBearCartSound = ParseBool(settings, "PlayBearCartSound", DEFAULT_PLAYBEARCARTSOUND);
             this.BearCartSoundPath = settings["BearCartSoundPath"]?.InnerText ?? String.Empty;
             this.PlayBearCartSoundOnlyOnPB = ParseBool(settings, "PlayBearCartSoundOnlyOnPB", DEFAULT_PLAYBEARCARTSOUNDONLYONPB);
+            if (_component.MediaPlayer != null)
+                _component.MediaPlayer.GeneralVolume = ParseInt(settings["Volume"], 100);
 
             if (element["AnyPercentTemplate"] != null)
             {
@@ -344,6 +350,11 @@ static bool ParseBool(XmlNode settings, string setting, bool default_ = false)
                 : default_;
         }
 
+        public static int ParseInt(XmlElement intElement, int defaultInt = 0)
+        {
+            return intElement != null ? Int32.Parse(intElement.InnerText) : defaultInt;
+        }
+
         static XmlElement ToElement<T>(XmlDocument document, string name, T value)
         {
             XmlElement str = document.CreateElement(name);
@@ -484,16 +495,13 @@ protected String BrowseForPath(String path)
 
         private void chkBearCartSoundTest_Click(object sender, EventArgs e)
         {
-            if (_component.SoundComponent == null)
-                return;
-
-            if (String.IsNullOrEmpty(BearCartSoundPath))
+            if (String.IsNullOrEmpty(BearCartSoundPath) || !System.IO.File.Exists(BearCartSoundPath))
             {
-                ((SoundComponent)_component.SoundComponent).PlaySound(_component.BearCartDefaultSoundPath);
+                _component.MediaPlayer?.PlaySound(_component.BearCartDefaultSoundPath);
             }
             else if (System.IO.File.Exists(BearCartSoundPath))
             {
-                ((SoundComponent)_component.SoundComponent).PlaySound(BearCartSoundPath);
+                _component.MediaPlayer?.PlaySound(BearCartSoundPath);
             }
         }
 
@@ -507,12 +515,15 @@ private void chkPlayBearCartSound_CheckedChanged(object sender, EventArgs e)
             var enable = chkPlayBearCartSound.Checked;
 
             this.btnBrowseBearCartSound.Enabled = enable;
+            this.lSound.Enabled = enable;
             this.txtBearCartSoundPath.Enabled = enable;
             this.btnBearCartSoundTest.Enabled = enable;
             this.chkPlayBearCartSoundOnlyOnPB.Enabled = enable;
+            this.lVolume.Enabled = enable;
+            this.tbGeneralVolume.Enabled = enable;
 
-            if (_component.SoundComponent != null && !enable)
-                ((SoundComponent)_component.SoundComponent).Player.Stop();
+            if (!enable)
+                _component.MediaPlayer?.Stop();
         }
     }
 
diff --git a/packages.config b/packages.config
new file mode 100644
index 0000000..1aec9aa
--- /dev/null
+++ b/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NAudio" version="1.7.3" targetFramework="net40" />
+</packages>
\ No newline at end of file