From cd9977a967bb4ca0b88b05e7a61be3532c78cb3a Mon Sep 17 00:00:00 2001
From: Brandon Chong <brndnchong@gmail.com>
Date: Tue, 4 Jun 2019 14:04:40 -0700
Subject: [PATCH 01/17] Refactor and split text parsing into different classes

- Add TextSegment classes.
- Add placeholder classes. Each placeholder will now be responsible for updating and providing its own values
- Turn text parsing into a static method. The text parser no longer worries about maintaining state as that responsibility is moved to the segments
---
 src/AudioBand/AudioBand.csproj                |  10 +
 .../TextFormatting/AlbumNamePlaceholder.cs    |  25 ++
 .../TextFormatting/FormattedTextParser.cs     | 245 +++---------------
 .../TextFormatting/PlaceholderTextSegment.cs  |  34 +++
 .../TextFormatting/SongArtistPlaceholder.cs   |  25 ++
 .../TextFormatting/SongLengthPlaceholder.cs   |  25 ++
 .../TextFormatting/SongNamePlaceholder.cs     |  25 ++
 .../TextFormatting/SongProgressPlaceholder.cs |  25 ++
 .../TextFormatting/StaticTextSegment.cs       |  24 ++
 .../TextFormatting/TextPlaceholder.cs         |  49 ++++
 .../TextFormatting/TextPlaceholderFactory.cs  |  45 ++++
 .../TextPlaceholderParameter.cs               |  18 ++
 src/AudioBand/TextFormatting/TextSegment.cs   |  24 +-
 .../ViewModels/CustomLabelViewModel.cs        |  48 +---
 14 files changed, 362 insertions(+), 260 deletions(-)
 create mode 100644 src/AudioBand/TextFormatting/AlbumNamePlaceholder.cs
 create mode 100644 src/AudioBand/TextFormatting/PlaceholderTextSegment.cs
 create mode 100644 src/AudioBand/TextFormatting/SongArtistPlaceholder.cs
 create mode 100644 src/AudioBand/TextFormatting/SongLengthPlaceholder.cs
 create mode 100644 src/AudioBand/TextFormatting/SongNamePlaceholder.cs
 create mode 100644 src/AudioBand/TextFormatting/SongProgressPlaceholder.cs
 create mode 100644 src/AudioBand/TextFormatting/StaticTextSegment.cs
 create mode 100644 src/AudioBand/TextFormatting/TextPlaceholder.cs
 create mode 100644 src/AudioBand/TextFormatting/TextPlaceholderFactory.cs
 create mode 100644 src/AudioBand/TextFormatting/TextPlaceholderParameter.cs

diff --git a/src/AudioBand/AudioBand.csproj b/src/AudioBand/AudioBand.csproj
index 5205809e..45885066 100644
--- a/src/AudioBand/AudioBand.csproj
+++ b/src/AudioBand/AudioBand.csproj
@@ -182,6 +182,16 @@
     <Compile Include="Settings\Models\v3\SettingsV3.cs" />
     <Compile Include="Settings\Profiles\SettingsV3Profile.cs" />
     <Compile Include="TaskbarHook.cs" />
+    <Compile Include="TextFormatting\AlbumNamePlaceholder.cs" />
+    <Compile Include="TextFormatting\SongArtistPlaceholder.cs" />
+    <Compile Include="TextFormatting\SongLengthPlaceholder.cs" />
+    <Compile Include="TextFormatting\SongNamePlaceholder.cs" />
+    <Compile Include="TextFormatting\PlaceholderTextSegment.cs" />
+    <Compile Include="TextFormatting\StaticTextSegment.cs" />
+    <Compile Include="TextFormatting\TextPlaceholder.cs" />
+    <Compile Include="TextFormatting\SongProgressPlaceholder.cs" />
+    <Compile Include="TextFormatting\TextPlaceholderFactory.cs" />
+    <Compile Include="TextFormatting\TextPlaceholderParameter.cs" />
     <Compile Include="ValueConverters\FlagToBoolConverter.cs" />
     <Compile Include="ValueConverters\Converters.cs" />
     <Compile Include="ValueConverters\MultiConverters.cs" />
diff --git a/src/AudioBand/TextFormatting/AlbumNamePlaceholder.cs b/src/AudioBand/TextFormatting/AlbumNamePlaceholder.cs
new file mode 100644
index 00000000..d715d9f2
--- /dev/null
+++ b/src/AudioBand/TextFormatting/AlbumNamePlaceholder.cs
@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+
+namespace AudioBand.TextFormatting
+{
+    /// <summary>
+    /// A <see cref="TextPlaceholder"/> with the value based on the album name.
+    /// </summary>
+    public class AlbumNamePlaceholder : TextPlaceholder
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AlbumNamePlaceholder"/> class.
+        /// </summary>
+        /// <param name="parameters">The placeholder parameters.</param>
+        public AlbumNamePlaceholder(IEnumerable<TextPlaceholderParameter> parameters)
+            : base(parameters)
+        {
+        }
+
+        /// <inheritdoc />
+        public override string GetText()
+        {
+            return "album name";
+        }
+    }
+}
diff --git a/src/AudioBand/TextFormatting/FormattedTextParser.cs b/src/AudioBand/TextFormatting/FormattedTextParser.cs
index 848e99ec..39339450 100644
--- a/src/AudioBand/TextFormatting/FormattedTextParser.cs
+++ b/src/AudioBand/TextFormatting/FormattedTextParser.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Windows.Media;
-using AudioBand.Extensions;
 
 namespace AudioBand.TextFormatting
 {
@@ -15,239 +13,107 @@ internal class FormattedTextParser
     {
         private const char PlaceholderStartToken = '{';
         private const char PlaceholderEndToken = '}';
-        private const string ArtistPlaceholder = "artist";
-        private const string SongNamePlaceholder = "song";
-        private const string AlbumNamePlaceholder = "album";
-        private const string CurrentTimePlaceholder = "time";
-        private const string SongLengthPlaceholder = "length";
         private const string BoldStyle = "*";
         private const string ItalicsStyle = "&";
         private const string UnderlineStyle = "_";
 
         private const string Styles = BoldStyle + ItalicsStyle + UnderlineStyle;
-        private const string Tags = ArtistPlaceholder + "|" + SongNamePlaceholder + "|" + AlbumNamePlaceholder + "|" + CurrentTimePlaceholder + "|" + SongLengthPlaceholder;
+        private static readonly string Tags = string.Join("|", TextPlaceholderFactory.Tags);
         private static readonly Regex PlaceholderPattern = new Regex($@"(?<style>[{Styles}])*(?<tag>({Tags}))(:(?<color>#[A-Fa-f0-9]{{6,8}}))?", RegexOptions.Compiled | RegexOptions.ExplicitCapture);
         private static readonly ColorConverter ColorConverter = new ColorConverter();
 
-        private readonly object _textSegmentLock = new object();
-        private string _format;
-        private string _artist;
-        private string _songName;
-        private string _albumName;
-        private TimeSpan _songProgress;
-        private TimeSpan _songLength;
-        private Color _defaultColor;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FormattedTextParser"/> class.
-        /// </summary>
-        /// <param name="format">The text format.</param>
-        /// <param name="defaultColor">The default color.</param>
-        public FormattedTextParser(string format, Color defaultColor)
-        {
-            Format = format;
-            DefaultColor = defaultColor;
-
-            Parse();
-        }
-
-        /// <summary>
-        /// Gets or sets the list of text segments.
-        /// </summary>
-        public ObservableCollection<TextSegment> TextSegments { get; set; }
-
-        /// <summary>
-        /// Gets or sets the text format.
-        /// </summary>
-        public string Format
-        {
-            get => _format;
-            set
-            {
-                _format = value;
-                Parse();
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the artist.
-        /// </summary>
-        public string Artist
-        {
-            get => _artist;
-            set
-            {
-                _artist = value;
-                UpdatePlaceholderValue(FormattedTextFlags.Artist, value);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the song name.
-        /// </summary>
-        public string SongName
-        {
-            get => _songName;
-            set
-            {
-                _songName = value;
-                UpdatePlaceholderValue(FormattedTextFlags.Song, value);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the album name.
-        /// </summary>
-        public string AlbumName
-        {
-            get => _albumName;
-            set
-            {
-                _albumName = value;
-                UpdatePlaceholderValue(FormattedTextFlags.Album, value);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the song progress.
-        /// </summary>
-        public TimeSpan SongProgress
-        {
-            get => _songProgress;
-            set
-            {
-                _songProgress = value;
-                UpdatePlaceholderValue(FormattedTextFlags.CurrentTime, value.Format());
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the song length.
-        /// </summary>
-        public TimeSpan SongLength
-        {
-            get => _songLength;
-            set
-            {
-                _songLength = value;
-                UpdatePlaceholderValue(FormattedTextFlags.SongLength, value.Format());
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the default color.
-        /// </summary>
-        public Color DefaultColor
-        {
-            get => _defaultColor;
-            set
-            {
-                _defaultColor = value;
-                foreach (var textChunk in TextSegments)
-                {
-                    if (!textChunk.Type.HasFlag(FormattedTextFlags.Colored))
-                    {
-                        textChunk.Color = value;
-                    }
-                }
-            }
-        }
-
         /// <summary>
-        /// Gets the format flags.
+        /// Parses the formatted text string.
         /// </summary>
-        public FormattedTextFlags Flags { get; private set; }
-
-        private void Parse()
+        /// <param name="format">The formatted string.</param>
+        /// <param name="defaultColor">The default text color to use.</param>
+        /// <returns>A list of text segments.</returns>
+        public static IEnumerable<TextSegment> ParseFormattedString(string format, Color defaultColor)
         {
             // Build up segments, each chunk is a sparately formatted piece of text
             var segments = new List<TextSegment>();
             var currentText = new StringBuilder();
 
-            if (Format == null)
-            {
-                return;
-            }
-
             // go through building up segments character by character
-            for (int i = 0; i < Format.Length; i++)
+            for (int i = 0; i < format.Length; i++)
             {
-                switch (Format[i])
+                switch (format[i])
                 {
                     // If we see the start of the format, get a chunk until the end token
                     case PlaceholderStartToken:
                         // Add what we have so far
-                        AddSegment(segments, currentText, false);
+                        AddSegment(segments, currentText, false, defaultColor);
 
                         // Skip the start token
                         i++;
 
                         // Add everything until the end token or end of the string
-                        while (i < Format.Length && Format[i] != PlaceholderEndToken)
+                        while (i < format.Length && format[i] != PlaceholderEndToken)
                         {
-                            currentText.Append(Format[i]);
+                            currentText.Append(format[i]);
                             i++;
                         }
 
                         // If we reached the end of the string before an end token
-                        if (i == Format.Length)
+                        if (i == format.Length)
                         {
                             currentText.Insert(0, PlaceholderStartToken);
-                            AddSegment(segments, currentText, false);
+                            AddSegment(segments, currentText, false, defaultColor);
                         }
                         else
                         {
                             // Full placeholder
-                            AddSegment(segments, currentText, true);
+                            AddSegment(segments, currentText, true, defaultColor);
                         }
 
                         break;
                     default:
-                        currentText.Append(Format[i]);
+                        currentText.Append(format[i]);
                         break;
                 }
             }
 
-            AddSegment(segments, currentText, false);
-
-            lock (_textSegmentLock)
-            {
-                TextSegments = new ObservableCollection<TextSegment>(segments);
-            }
+            AddSegment(segments, currentText, false, defaultColor);
+            return segments;
         }
 
-        private void AddSegment(List<TextSegment> segments, StringBuilder text, bool placeholder)
+        private static void AddSegment(List<TextSegment> segments, StringBuilder text, bool isPlaceholder, Color defaultColor)
         {
             if (text.Length == 0)
             {
                 return;
             }
 
-            if (placeholder)
+            if (isPlaceholder)
             {
-                ParsePlaceholder(text.ToString(), out string value, out FormattedTextFlags type, out Color c);
-                segments.Add(new TextSegment(value, type, c));
-                Flags |= type;
+                if (TryParsePlaceholder(text.ToString(), defaultColor, out TextPlaceholder placeholder, out FormattedTextFlags flags, out Color c))
+                {
+                    segments.Add(new PlaceholderTextSegment(placeholder, flags, c));
+                }
+                else
+                {
+                    segments.Add(new StaticTextSegment("!Invalid format!", FormattedTextFlags.Normal, Colors.Red));
+                }
             }
             else
             {
-                segments.Add(new TextSegment(text.ToString(), FormattedTextFlags.Normal, DefaultColor));
+                segments.Add(new StaticTextSegment(text.ToString(), FormattedTextFlags.Normal, defaultColor));
             }
 
             text.Clear();
         }
 
-        private void ParsePlaceholder(string formatString, out string value, out FormattedTextFlags flags, out Color color)
+        private static bool TryParsePlaceholder(string placeholderString, Color defaultColor, out TextPlaceholder placeholder, out FormattedTextFlags flags, out Color color)
         {
-            var match = PlaceholderPattern.Match(formatString);
+            var match = PlaceholderPattern.Match(placeholderString);
             flags = FormattedTextFlags.Normal;
 
             if (!match.Success)
             {
-                value = "! invalid format !";
+                placeholder = null;
                 flags = FormattedTextFlags.Normal;
-                color = DefaultColor;
-                return;
+                color = defaultColor;
+                return false;
             }
 
             if (match.Groups["style"].Success)
@@ -270,31 +136,10 @@ private void ParsePlaceholder(string formatString, out string value, out Formatt
                 }
             }
 
-            switch (match.Groups["tag"].Value)
+            if (!TextPlaceholderFactory.TryGetPlaceholder(match.Groups["tag"].Value, null, out placeholder))
             {
-                case ArtistPlaceholder:
-                    value = Artist;
-                    flags |= FormattedTextFlags.Artist;
-                    break;
-                case SongNamePlaceholder:
-                    value = SongName;
-                    flags |= FormattedTextFlags.Song;
-                    break;
-                case AlbumNamePlaceholder:
-                    value = AlbumName;
-                    flags |= FormattedTextFlags.Album;
-                    break;
-                case CurrentTimePlaceholder:
-                    value = SongProgress.Format();
-                    flags |= FormattedTextFlags.CurrentTime;
-                    break;
-                case SongLengthPlaceholder:
-                    value = SongLength.Format();
-                    flags |= FormattedTextFlags.SongLength;
-                    break;
-                default:
-                    value = "invalid";
-                    break;
+                color = Colors.Red;
+                return false;
             }
 
             if (match.Groups["color"].Success)
@@ -306,27 +151,15 @@ private void ParsePlaceholder(string formatString, out string value, out Formatt
                 }
                 catch (Exception)
                 {
-                    color = DefaultColor;
+                    color = defaultColor;
                 }
             }
             else
             {
-                color = DefaultColor;
+                color = defaultColor;
             }
-        }
 
-        private void UpdatePlaceholderValue(FormattedTextFlags type, string value)
-        {
-            lock (_textSegmentLock)
-            {
-                foreach (var textChunk in TextSegments)
-                {
-                    if (textChunk.Type.HasFlag(type))
-                    {
-                        textChunk.Text = value;
-                    }
-                }
-            }
+            return true;
         }
     }
 }
diff --git a/src/AudioBand/TextFormatting/PlaceholderTextSegment.cs b/src/AudioBand/TextFormatting/PlaceholderTextSegment.cs
new file mode 100644
index 00000000..e4031cd1
--- /dev/null
+++ b/src/AudioBand/TextFormatting/PlaceholderTextSegment.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Windows.Media;
+
+namespace AudioBand.TextFormatting
+{
+    /// <summary>
+    /// A <see cref="TextSegment"/> that supports values provided by a <see cref="TextPlaceholder"/>.
+    /// </summary>
+    public class PlaceholderTextSegment : TextSegment
+    {
+        private readonly TextPlaceholder _textPlaceholder;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PlaceholderTextSegment"/> class.
+        /// </summary>
+        /// <param name="textPlaceholder">The text placeholder to use.</param>
+        /// <param name="flags">The text flags.</param>
+        /// <param name="color">The text color.</param>
+        public PlaceholderTextSegment(TextPlaceholder textPlaceholder, FormattedTextFlags flags, Color color)
+        {
+            Flags = flags;
+            Color = color;
+            Text = textPlaceholder.GetText();
+
+            textPlaceholder.TextChanged += TextPlaceholderTextChanged;
+            _textPlaceholder = textPlaceholder;
+        }
+
+        private void TextPlaceholderTextChanged(object sender, EventArgs e)
+        {
+            Text = _textPlaceholder.GetText();
+        }
+    }
+}
diff --git a/src/AudioBand/TextFormatting/SongArtistPlaceholder.cs b/src/AudioBand/TextFormatting/SongArtistPlaceholder.cs
new file mode 100644
index 00000000..cbadac89
--- /dev/null
+++ b/src/AudioBand/TextFormatting/SongArtistPlaceholder.cs
@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+
+namespace AudioBand.TextFormatting
+{
+    /// <summary>
+    /// A <see cref="TextPlaceholder"/> with the value based on the song artist.
+    /// </summary>
+    public class SongArtistPlaceholder : TextPlaceholder
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SongArtistPlaceholder"/> class.
+        /// </summary>
+        /// <param name="parameters">The placeholder parameter.</param>
+        public SongArtistPlaceholder(IEnumerable<TextPlaceholderParameter> parameters)
+            : base(parameters)
+        {
+        }
+
+        /// <inheritdoc />
+        public override string GetText()
+        {
+            return "artist";
+        }
+    }
+}
diff --git a/src/AudioBand/TextFormatting/SongLengthPlaceholder.cs b/src/AudioBand/TextFormatting/SongLengthPlaceholder.cs
new file mode 100644
index 00000000..669cb022
--- /dev/null
+++ b/src/AudioBand/TextFormatting/SongLengthPlaceholder.cs
@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+
+namespace AudioBand.TextFormatting
+{
+    /// <summary>
+    /// A <see cref="TextPlaceholder"/> with the value based on the songs total time.
+    /// </summary>
+    public class SongLengthPlaceholder : TextPlaceholder
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SongLengthPlaceholder"/> class.
+        /// </summary>
+        /// <param name="parameters">The placeholder parameters.</param>
+        public SongLengthPlaceholder(IEnumerable<TextPlaceholderParameter> parameters)
+            : base(parameters)
+        {
+        }
+
+        /// <inheritdoc />
+        public override string GetText()
+        {
+            return "length";
+        }
+    }
+}
diff --git a/src/AudioBand/TextFormatting/SongNamePlaceholder.cs b/src/AudioBand/TextFormatting/SongNamePlaceholder.cs
new file mode 100644
index 00000000..62720384
--- /dev/null
+++ b/src/AudioBand/TextFormatting/SongNamePlaceholder.cs
@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+
+namespace AudioBand.TextFormatting
+{
+    /// <summary>
+    /// A <see cref="TextPlaceholder"/> with a value based on the current song name.
+    /// </summary>
+    public class SongNamePlaceholder : TextPlaceholder
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SongNamePlaceholder"/> class.
+        /// </summary>
+        /// <param name="parameters">The placeholder parameters.</param>
+        public SongNamePlaceholder(IEnumerable<TextPlaceholderParameter> parameters)
+            : base(parameters)
+        {
+        }
+
+        /// <inheritdoc />
+        public override string GetText()
+        {
+            return "song name";
+        }
+    }
+}
diff --git a/src/AudioBand/TextFormatting/SongProgressPlaceholder.cs b/src/AudioBand/TextFormatting/SongProgressPlaceholder.cs
new file mode 100644
index 00000000..0a554e70
--- /dev/null
+++ b/src/AudioBand/TextFormatting/SongProgressPlaceholder.cs
@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+
+namespace AudioBand.TextFormatting
+{
+    /// <summary>
+    /// A <see cref="TextPlaceholder"/> with a value based on the current song progress.
+    /// </summary>
+    public class SongProgressPlaceholder : TextPlaceholder
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SongProgressPlaceholder"/> class.
+        /// </summary>
+        /// <param name="parameters">The placeholder parameters.</param>
+        public SongProgressPlaceholder(IEnumerable<TextPlaceholderParameter> parameters)
+            : base(parameters)
+        {
+        }
+
+        /// <inheritdoc />
+        public override string GetText()
+        {
+            return "time";
+        }
+    }
+}
diff --git a/src/AudioBand/TextFormatting/StaticTextSegment.cs b/src/AudioBand/TextFormatting/StaticTextSegment.cs
new file mode 100644
index 00000000..eabe5386
--- /dev/null
+++ b/src/AudioBand/TextFormatting/StaticTextSegment.cs
@@ -0,0 +1,24 @@
+using System.Windows.Media;
+
+namespace AudioBand.TextFormatting
+{
+    /// <summary>
+    /// A <see cref="TextSegment"/> that has a static value.
+    /// </summary>
+    public class StaticTextSegment : TextSegment
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StaticTextSegment"/> class
+        /// with text, color and type.
+        /// </summary>
+        /// <param name="text">The text.</param>
+        /// <param name="flags">The text type.</param>
+        /// <param name="color">The text color.</param>
+        public StaticTextSegment(string text, FormattedTextFlags flags, Color color)
+        {
+            Text = text;
+            Flags = flags;
+            Color = color;
+        }
+    }
+}
diff --git a/src/AudioBand/TextFormatting/TextPlaceholder.cs b/src/AudioBand/TextFormatting/TextPlaceholder.cs
new file mode 100644
index 00000000..04fcdf94
--- /dev/null
+++ b/src/AudioBand/TextFormatting/TextPlaceholder.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+
+namespace AudioBand.TextFormatting
+{
+    /// <summary>
+    /// A placeholder text that has values based on the current song.
+    /// </summary>
+    public abstract class TextPlaceholder
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TextPlaceholder"/> class.
+        /// </summary>
+        /// <param name="parameters">The parameters passed to the text format.</param>
+        protected TextPlaceholder(IEnumerable<TextPlaceholderParameter> parameters)
+        {
+            // TODO parameters
+        }
+
+        /// <summary>
+        /// Occurs when the placeholders text has changed.
+        /// </summary>
+        public event EventHandler TextChanged;
+
+        /// <summary>
+        /// Gets the current text value for the placeholder.
+        /// </summary>
+        /// <returns>The value.</returns>
+        public abstract string GetText();
+
+        /// <summary>
+        /// Raises the <see cref="TextChanged"/> event.
+        /// </summary>
+        protected void RaiseTextChanged()
+        {
+            TextChanged?.Invoke(this, EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Gets the parameter from the name.
+        /// </summary>
+        /// <param name="parameterName">The parameter name.</param>
+        /// <returns>The value of the parameter or null if not passed in.</returns>
+        protected string GetParameter(string parameterName)
+        {
+            return null;
+        }
+    }
+}
diff --git a/src/AudioBand/TextFormatting/TextPlaceholderFactory.cs b/src/AudioBand/TextFormatting/TextPlaceholderFactory.cs
new file mode 100644
index 00000000..cd445d90
--- /dev/null
+++ b/src/AudioBand/TextFormatting/TextPlaceholderFactory.cs
@@ -0,0 +1,45 @@
+using System.Collections.Generic;
+
+namespace AudioBand.TextFormatting
+{
+    /// <summary>
+    /// Factory class that creates text placeholders.
+    /// </summary>
+    public static class TextPlaceholderFactory
+    {
+        private static readonly Dictionary<string, PlaceholderFactoryFunc> PlaceholderMap = new Dictionary<string, PlaceholderFactoryFunc>()
+        {
+            { "artist", parameters => new SongArtistPlaceholder(parameters) },
+            { "song", parameters => new SongNamePlaceholder(parameters) },
+            { "album", parameters => new AlbumNamePlaceholder(parameters) },
+            { "time", parameters => new SongProgressPlaceholder(parameters) },
+            { "length", parameters => new SongLengthPlaceholder(parameters) },
+        };
+
+        private delegate TextPlaceholder PlaceholderFactoryFunc(IEnumerable<TextPlaceholderParameter> parameters);
+
+        /// <summary>
+        /// Gets all available tags for text placeholders.
+        /// </summary>
+        public static IEnumerable<string> Tags { get; } = PlaceholderMap.Keys;
+
+        /// <summary>
+        /// Attempts to create a <see cref="TextPlaceholder"/> based on the given tag.
+        /// </summary>
+        /// <param name="tag">The tag for the placeholder.</param>
+        /// <param name="parameters">The parameters for the placeholder.</param>
+        /// <param name="placeholder">The text placeholder.</param>
+        /// <returns>True if the tag matches a placeholder.</returns>
+        public static bool TryGetPlaceholder(string tag, IEnumerable<TextPlaceholderParameter> parameters, out TextPlaceholder placeholder)
+        {
+            if (PlaceholderMap.TryGetValue(tag, out var func))
+            {
+                placeholder = func(parameters);
+                return true;
+            }
+
+            placeholder = null;
+            return false;
+        }
+    }
+}
diff --git a/src/AudioBand/TextFormatting/TextPlaceholderParameter.cs b/src/AudioBand/TextFormatting/TextPlaceholderParameter.cs
new file mode 100644
index 00000000..84a5988f
--- /dev/null
+++ b/src/AudioBand/TextFormatting/TextPlaceholderParameter.cs
@@ -0,0 +1,18 @@
+namespace AudioBand.TextFormatting
+{
+    /// <summary>
+    /// Parameters for a text placeholder.
+    /// </summary>
+    public class TextPlaceholderParameter
+    {
+        /// <summary>
+        /// Gets or sets the parameter name.
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets the parameter value.
+        /// </summary>
+        public string Value { get; set; }
+    }
+}
diff --git a/src/AudioBand/TextFormatting/TextSegment.cs b/src/AudioBand/TextFormatting/TextSegment.cs
index bb2c2388..c94be240 100644
--- a/src/AudioBand/TextFormatting/TextSegment.cs
+++ b/src/AudioBand/TextFormatting/TextSegment.cs
@@ -4,40 +4,26 @@
 namespace AudioBand.TextFormatting
 {
     /// <summary>
-    /// A chunk of text that has its own custom rendering.
+    /// A segment of text to be rendered in a text label.
     /// </summary>
-    public class TextSegment : ModelBase
+    public abstract class TextSegment : ModelBase
     {
         private string _text;
         private Color _color;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TextSegment"/> class
-        /// with text, color and type.
-        /// </summary>
-        /// <param name="text">The text.</param>
-        /// <param name="type">The text type.</param>
-        /// <param name="color">The text color.</param>
-        public TextSegment(string text, FormattedTextFlags type, Color color)
-        {
-            Text = text;
-            Type = type;
-            Color = color;
-        }
-
         /// <summary>
         /// Gets or sets the text.
         /// </summary>
         public string Text
         {
             get => _text;
-            set => SetProperty(ref _text, value);
+            protected set => SetProperty(ref _text, value);
         }
 
         /// <summary>
-        /// Gets the text type.
+        /// Gets or sets the text segment flags.
         /// </summary>
-        public FormattedTextFlags Type { get; }
+        public FormattedTextFlags Flags { get; protected set; }
 
         /// <summary>
         /// Gets or sets the chunk color.
diff --git a/src/AudioBand/ViewModels/CustomLabelViewModel.cs b/src/AudioBand/ViewModels/CustomLabelViewModel.cs
index fb3d6fb8..3d4d7f89 100644
--- a/src/AudioBand/ViewModels/CustomLabelViewModel.cs
+++ b/src/AudioBand/ViewModels/CustomLabelViewModel.cs
@@ -15,9 +15,9 @@ namespace AudioBand.ViewModels
     /// </summary>
     public class CustomLabelViewModel : LayoutViewModelBase<CustomLabel>
     {
-        private readonly FormattedTextParser _parser;
         private IInternalAudioSource _audioSource;
         private bool _isPlaying;
+        private IEnumerable<TextSegment> _textSegments;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="CustomLabelViewModel"/> class.
@@ -28,7 +28,7 @@ public CustomLabelViewModel(CustomLabel model, IDialogService dialogService)
             : base(model)
         {
             DialogService = dialogService;
-            _parser = new FormattedTextParser(FormatString, Color);
+            TextSegments = FormattedTextParser.ParseFormattedString(FormatString, Color);
         }
 
         /// <summary>
@@ -155,7 +155,11 @@ public double RightFadeOffset
         /// <summary>
         /// Gets the text segments.
         /// </summary>
-        public IEnumerable<TextSegment> TextSegments => _parser.TextSegments;
+        public IEnumerable<TextSegment> TextSegments
+        {
+            get => _textSegments;
+            private set => SetProperty(ref _textSegments, value, false);
+        }
 
         /// <summary>
         /// Gets the values of <see cref="CustomLabel.TextAlignment"/>.
@@ -206,10 +210,14 @@ protected override void OnModelPropertyChanged(string propertyName)
             switch (propertyName)
             {
                 case nameof(Model.Color):
-                    _parser.DefaultColor = Model.Color;
+                    foreach (var textSegment in TextSegments)
+                    {
+                        textSegment.Color = Color;
+                    }
+
                     break;
                 case nameof(Model.FormatString):
-                    _parser.Format = Model.FormatString;
+                    TextSegments = FormattedTextParser.ParseFormattedString(FormatString, Color);
                     break;
             }
         }
@@ -218,26 +226,18 @@ private void UpdateAudioSource(IInternalAudioSource audioSource)
         {
             if (_audioSource != null)
             {
-                Clear();
-                _audioSource.TrackInfoChanged -= AudioSourceOnTrackInfoChanged;
-                _audioSource.TrackProgressChanged -= AudioSourceOnTrackProgressChanged;
                 _audioSource.IsPlayingChanged -= AudioSourceOnIsPlayingChanged;
             }
 
             _audioSource = audioSource;
             if (_audioSource == null)
             {
-                Clear();
                 return;
             }
 
             // Sync current information in the case the profiles change, otherwise we won't receive information until the next time the event is activated.
-            AudioSourceOnTrackInfoChanged(null, _audioSource.LastTrackInfo);
             AudioSourceOnIsPlayingChanged(null, _audioSource.IsPlaying);
-            AudioSourceOnTrackProgressChanged(null, _audioSource.CurrentProgress);
 
-            _audioSource.TrackInfoChanged += AudioSourceOnTrackInfoChanged;
-            _audioSource.TrackProgressChanged += AudioSourceOnTrackProgressChanged;
             _audioSource.IsPlayingChanged += AudioSourceOnIsPlayingChanged;
         }
 
@@ -245,27 +245,5 @@ private void AudioSourceOnIsPlayingChanged(object sender, bool e)
         {
             IsPlaying = e;
         }
-
-        private void AudioSourceOnTrackProgressChanged(object sender, TimeSpan e)
-        {
-            _parser.SongProgress = e;
-        }
-
-        private void AudioSourceOnTrackInfoChanged(object sender, TrackInfoChangedEventArgs e)
-        {
-            _parser.Artist = e.Artist;
-            _parser.AlbumName = e.Album;
-            _parser.SongLength = e.TrackLength;
-            _parser.SongName = e.TrackName;
-        }
-
-        private void Clear()
-        {
-            _parser.Artist = null;
-            _parser.AlbumName = null;
-            _parser.SongName = null;
-            _parser.SongLength = TimeSpan.Zero;
-            _parser.SongProgress = TimeSpan.Zero;
-        }
     }
 }

From 750ea6e996c4564f5e01d9a1a8dedad97c7185cd Mon Sep 17 00:00:00 2001
From: Brandon Chong <brndnchong@gmail.com>
Date: Wed, 12 Jun 2019 14:55:55 -0700
Subject: [PATCH 02/17] Add audio session interface

Instead of setting the audio source directly in the view models, an interface is added in-between which will handle state and audio source changes

- Github: fixes #185
---
 src/AudioBand/AudioBand.csproj                |   2 +
 src/AudioBand/AudioSource/AudioSession.cs     | 168 ++++++++++++++++++
 src/AudioBand/AudioSource/IAudioSession.cs    |  62 +++++++
 .../AudioSource/IInternalAudioSource.cs       |  15 --
 .../Behaviors/TextBlockTextSegments.cs        |   6 +-
 src/AudioBand/Deskband.cs                     |   1 +
 .../TextFormatting/AlbumNamePlaceholder.cs    |  15 +-
 .../TextFormatting/FormattedTextFlags.cs      |  36 +---
 .../TextFormatting/FormattedTextParser.cs     |  21 +--
 .../TextFormatting/SongArtistPlaceholder.cs   |  15 +-
 .../TextFormatting/SongLengthPlaceholder.cs   |  16 +-
 .../TextFormatting/SongNamePlaceholder.cs     |  15 +-
 .../TextFormatting/SongProgressPlaceholder.cs |  16 +-
 .../TextFormatting/TextPlaceholder.cs         |  40 ++++-
 .../TextFormatting/TextPlaceholderFactory.cs  |  18 +-
 src/AudioBand/ViewModels/AlbumArtViewModel.cs |  37 ++--
 .../ViewModels/AudioBandToolbarViewModel.cs   |  22 +--
 .../ViewModels/CustomLabelViewModel.cs        |  40 ++---
 .../ViewModels/CustomLabelsViewModel.cs       |  32 +---
 .../ViewModels/NextButtonViewModel.cs         |  25 +--
 .../ViewModels/PlayPauseButtonViewModel.cs    |  39 ++--
 .../ViewModels/PreviousButtonViewModel.cs     |  24 +--
 .../ViewModels/ProgressBarViewModel.cs        |  51 ++----
 23 files changed, 445 insertions(+), 271 deletions(-)
 create mode 100644 src/AudioBand/AudioSource/AudioSession.cs
 create mode 100644 src/AudioBand/AudioSource/IAudioSession.cs

diff --git a/src/AudioBand/AudioBand.csproj b/src/AudioBand/AudioBand.csproj
index 45885066..705f4d1b 100644
--- a/src/AudioBand/AudioBand.csproj
+++ b/src/AudioBand/AudioBand.csproj
@@ -97,6 +97,8 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AudioSource\AudioSourceProxy.cs" />
+    <Compile Include="AudioSource\AudioSession.cs" />
+    <Compile Include="AudioSource\IAudioSession.cs" />
     <Compile Include="AudioSource\IAudioSourceManager.cs" />
     <Compile Include="AudioSource\IInternalAudioSource.cs" />
     <Compile Include="Behaviors\CanvasPositioning.cs" />
diff --git a/src/AudioBand/AudioSource/AudioSession.cs b/src/AudioBand/AudioSource/AudioSession.cs
new file mode 100644
index 00000000..ed16a69b
--- /dev/null
+++ b/src/AudioBand/AudioSource/AudioSession.cs
@@ -0,0 +1,168 @@
+using System;
+using System.Drawing;
+using AudioBand.Models;
+
+namespace AudioBand.AudioSource
+{
+    /// <summary>
+    /// Persistent audio source session that updates when the audio source changes.
+    /// </summary>
+    public class AudioSession : ModelBase, IAudioSession
+    {
+        private IInternalAudioSource _currentAudioSource;
+        private bool _isPlaying;
+        private string _songArtist;
+        private string _songName;
+        private string _albumName;
+        private TimeSpan _songProgress;
+        private TimeSpan _songLength;
+        private bool _isShuffleOn;
+        private RepeatMode _repeatMode;
+        private Image _album;
+
+        /// <summary>
+        /// Gets or sets the current audio source.
+        /// </summary>
+        public IInternalAudioSource CurrentAudioSource
+        {
+            get => _currentAudioSource;
+            set
+            {
+                if (_currentAudioSource == value)
+                {
+                    return;
+                }
+
+                _currentAudioSource = value;
+                AudioSourceChanged();
+            }
+        }
+
+        /// <inheritdoc />
+        public bool IsPlaying
+        {
+            get => _isPlaying;
+            set => SetProperty(ref _isPlaying, value);
+        }
+
+        /// <inheritdoc />
+        public string SongArtist
+        {
+            get => _songArtist;
+            set => SetProperty(ref _songArtist, value);
+        }
+
+        /// <inheritdoc />
+        public string SongName
+        {
+            get => _songName;
+            set => SetProperty(ref _songName, value);
+        }
+
+        /// <inheritdoc />
+        public string AlbumName
+        {
+            get => _albumName;
+            set => SetProperty(ref _albumName, value);
+        }
+
+        /// <inheritdoc />
+        public Image AlbumArt
+        {
+            get => _album;
+            set => SetProperty(ref _album, value);
+        }
+
+        /// <inheritdoc />
+        public TimeSpan SongProgress
+        {
+            get => _songProgress;
+            set => SetProperty(ref _songProgress, value);
+        }
+
+        /// <inheritdoc />
+        public TimeSpan SongLength
+        {
+            get => _songLength;
+            set => SetProperty(ref _songLength, value);
+        }
+
+        /// <inheritdoc />
+        public bool IsShuffleOn
+        {
+            get => _isShuffleOn;
+            set => SetProperty(ref _isShuffleOn, value);
+        }
+
+        /// <inheritdoc />
+        public RepeatMode RepeatMode
+        {
+            get => _repeatMode;
+            set => SetProperty(ref _repeatMode, value);
+        }
+
+        private void AudioSourceChanged()
+        {
+            if (_currentAudioSource != null)
+            {
+                ClearSession();
+                _currentAudioSource.TrackInfoChanged -= AudioSourceOnTrackInfoChanged;
+                _currentAudioSource.IsPlayingChanged -= AudioSourceOnIsPlayingChanged;
+                _currentAudioSource.TrackProgressChanged -= AudioSourceOnTrackProgressChanged;
+                _currentAudioSource.RepeatModeChanged -= AudioSourceOnRepeatModeChanged;
+                _currentAudioSource.ShuffleChanged -= AudioSourceOnShuffleChanged;
+            }
+
+            if (_currentAudioSource == null)
+            {
+                ClearSession();
+                return;
+            }
+
+            _currentAudioSource.TrackInfoChanged += AudioSourceOnTrackInfoChanged;
+            _currentAudioSource.IsPlayingChanged += AudioSourceOnIsPlayingChanged;
+            _currentAudioSource.TrackProgressChanged += AudioSourceOnTrackProgressChanged;
+            _currentAudioSource.RepeatModeChanged += AudioSourceOnRepeatModeChanged;
+            _currentAudioSource.ShuffleChanged += AudioSourceOnShuffleChanged;
+        }
+
+        private void AudioSourceOnShuffleChanged(object sender, bool e)
+        {
+            IsShuffleOn = e;
+        }
+
+        private void AudioSourceOnRepeatModeChanged(object sender, RepeatMode e)
+        {
+            RepeatMode = e;
+        }
+
+        private void AudioSourceOnTrackProgressChanged(object sender, TimeSpan e)
+        {
+            SongProgress = e;
+        }
+
+        private void AudioSourceOnIsPlayingChanged(object sender, bool e)
+        {
+            IsPlaying = e;
+        }
+
+        private void AudioSourceOnTrackInfoChanged(object sender, TrackInfoChangedEventArgs e)
+        {
+            SongArtist = e.Artist;
+            SongLength = e.TrackLength;
+            SongName = e.TrackName;
+            AlbumName = e.Album;
+            AlbumArt = e.AlbumArt;
+        }
+
+        private void ClearSession()
+        {
+            IsPlaying = false;
+            SongArtist = null;
+            SongName = null;
+            AlbumName = null;
+            SongProgress = TimeSpan.Zero;
+            SongLength = TimeSpan.Zero;
+        }
+    }
+}
diff --git a/src/AudioBand/AudioSource/IAudioSession.cs b/src/AudioBand/AudioSource/IAudioSession.cs
new file mode 100644
index 00000000..5494ebd2
--- /dev/null
+++ b/src/AudioBand/AudioSource/IAudioSession.cs
@@ -0,0 +1,62 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace AudioBand.AudioSource
+{
+    /// <summary>
+    /// Encapsulates the the audio session.
+    /// </summary>
+    public interface IAudioSession : INotifyPropertyChanged
+    {
+        /// <summary>
+        /// Gets or sets the current audio source.
+        /// </summary>
+        IInternalAudioSource CurrentAudioSource { get; set; }
+
+        /// <summary>
+        /// Gets a value indicating whether the audio source is currently playing.
+        /// </summary>
+        bool IsPlaying { get; }
+
+        /// <summary>
+        /// Gets the current song artist.
+        /// </summary>
+        string SongArtist { get; }
+
+        /// <summary>
+        /// Gets the current song name.
+        /// </summary>
+        string SongName { get; }
+
+        /// <summary>
+        /// Gets the current album name.
+        /// </summary>
+        string AlbumName { get; }
+
+        /// <summary>
+        /// Gets the current album.
+        /// </summary>
+        Image AlbumArt { get; }
+
+        /// <summary>
+        /// Gets the current song progress.
+        /// </summary>
+        TimeSpan SongProgress { get; }
+
+        /// <summary>
+        /// Gets the current song length.
+        /// </summary>
+        TimeSpan SongLength { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether shuffle is currently on.
+        /// </summary>
+        bool IsShuffleOn { get; }
+
+        /// <summary>
+        /// Gets the current repeat mode.
+        /// </summary>
+        RepeatMode RepeatMode { get; }
+    }
+}
diff --git a/src/AudioBand/AudioSource/IInternalAudioSource.cs b/src/AudioBand/AudioSource/IInternalAudioSource.cs
index 24217b80..319713f8 100644
--- a/src/AudioBand/AudioSource/IInternalAudioSource.cs
+++ b/src/AudioBand/AudioSource/IInternalAudioSource.cs
@@ -8,21 +8,6 @@ namespace AudioBand.AudioSource
     /// </summary>
     public interface IInternalAudioSource : IAudioSource
     {
-        /// <summary>
-        /// Gets a value indicating whether the audio source is currently playing.
-        /// </summary>
-        bool IsPlaying { get; }
-
-        /// <summary>
-        /// Gets the current progress.
-        /// </summary>
-        TimeSpan CurrentProgress { get; }
-
-        /// <summary>
-        /// Gets the last track info.
-        /// </summary>
-        TrackInfoChangedEventArgs LastTrackInfo { get; }
-
         /// <summary>
         /// Gets the settings that the audio source exposes.
         /// </summary>
diff --git a/src/AudioBand/Behaviors/TextBlockTextSegments.cs b/src/AudioBand/Behaviors/TextBlockTextSegments.cs
index d005172f..58af6d2f 100644
--- a/src/AudioBand/Behaviors/TextBlockTextSegments.cs
+++ b/src/AudioBand/Behaviors/TextBlockTextSegments.cs
@@ -52,17 +52,17 @@ private static IEnumerable<Inline> CreateInlines(IEnumerable<TextSegment> segmen
                 var run = new Run();
                 run.SetBinding(Run.TextProperty, textBinding);
                 run.SetBinding(TextElement.ForegroundProperty, colorBinding);
-                if (textSegment.Type.HasFlag(FormattedTextFlags.Bold))
+                if (textSegment.Flags.HasFlag(FormattedTextFlags.Bold))
                 {
                     run.FontWeight = FontWeights.Bold;
                 }
 
-                if (textSegment.Type.HasFlag(FormattedTextFlags.Italic))
+                if (textSegment.Flags.HasFlag(FormattedTextFlags.Italic))
                 {
                     run.FontStyle = FontStyles.Italic;
                 }
 
-                if (textSegment.Type.HasFlag(FormattedTextFlags.Underline))
+                if (textSegment.Flags.HasFlag(FormattedTextFlags.Underline))
                 {
                     run.TextDecorations.Add(TextDecorations.Underline);
                 }
diff --git a/src/AudioBand/Deskband.cs b/src/AudioBand/Deskband.cs
index b6f37f32..0af904e7 100644
--- a/src/AudioBand/Deskband.cs
+++ b/src/AudioBand/Deskband.cs
@@ -105,6 +105,7 @@ private void ConfigureDependencies()
                 _container.Register<IAppSettings, AppSettings>(Lifestyle.Singleton);
                 _container.Register<IDialogService, DialogService>(Lifestyle.Singleton);
                 _container.Register<IViewModelContainer, ViewModelContainer>(Lifestyle.Singleton);
+                _container.Register<IAudioSession, AudioSession>(Lifestyle.Singleton);
 
                 _container.Register<AboutDialogViewModel>(Lifestyle.Singleton);
                 _container.Register<AlbumArtViewModel>(Lifestyle.Singleton);
diff --git a/src/AudioBand/TextFormatting/AlbumNamePlaceholder.cs b/src/AudioBand/TextFormatting/AlbumNamePlaceholder.cs
index d715d9f2..7e583647 100644
--- a/src/AudioBand/TextFormatting/AlbumNamePlaceholder.cs
+++ b/src/AudioBand/TextFormatting/AlbumNamePlaceholder.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using AudioBand.AudioSource;
 
 namespace AudioBand.TextFormatting
 {
@@ -11,15 +12,23 @@ public class AlbumNamePlaceholder : TextPlaceholder
         /// Initializes a new instance of the <see cref="AlbumNamePlaceholder"/> class.
         /// </summary>
         /// <param name="parameters">The placeholder parameters.</param>
-        public AlbumNamePlaceholder(IEnumerable<TextPlaceholderParameter> parameters)
-            : base(parameters)
+        /// <param name="audioSession">The audio session.</param>
+        public AlbumNamePlaceholder(IEnumerable<TextPlaceholderParameter> parameters, IAudioSession audioSession)
+            : base(parameters, audioSession)
         {
+            AddSessionPropertyFilter(nameof(IAudioSession.AlbumName));
         }
 
         /// <inheritdoc />
         public override string GetText()
         {
-            return "album name";
+            return Session.AlbumName;
+        }
+
+        /// <inheritdoc />
+        protected override void OnAudioSessionPropertyChanged(string propertyName)
+        {
+            RaiseTextChanged();
         }
     }
 }
diff --git a/src/AudioBand/TextFormatting/FormattedTextFlags.cs b/src/AudioBand/TextFormatting/FormattedTextFlags.cs
index d0f3dcb5..16f9f469 100644
--- a/src/AudioBand/TextFormatting/FormattedTextFlags.cs
+++ b/src/AudioBand/TextFormatting/FormattedTextFlags.cs
@@ -13,49 +13,19 @@ public enum FormattedTextFlags
         /// </summary>
         Normal = 0,
 
-        /// <summary>
-        /// Displays the artist
-        /// </summary>
-        Artist = 1,
-
-        /// <summary>
-        /// Displays the song.
-        /// </summary>
-        Song = 2,
-
-        /// <summary>
-        /// Displays the album
-        /// </summary>
-        Album = 4,
-
-        /// <summary>
-        /// Displays the current time.
-        /// </summary>
-        CurrentTime = 8,
-
-        /// <summary>
-        /// Displays the song length.
-        /// </summary>
-        SongLength = 16,
-
-        /// <summary>
-        /// Text is colored.
-        /// </summary>
-        Colored = 32,
-
         /// <summary>
         /// Text is bolded.
         /// </summary>
-        Bold = 64,
+        Bold = 1,
 
         /// <summary>
         /// Text is italicised.
         /// </summary>
-        Italic = 128,
+        Italic = 1 << 1,
 
         /// <summary>
         /// Text is underlined.
         /// </summary>
-        Underline = 256,
+        Underline = 1 << 2,
     }
 }
diff --git a/src/AudioBand/TextFormatting/FormattedTextParser.cs b/src/AudioBand/TextFormatting/FormattedTextParser.cs
index 39339450..a46e33bf 100644
--- a/src/AudioBand/TextFormatting/FormattedTextParser.cs
+++ b/src/AudioBand/TextFormatting/FormattedTextParser.cs
@@ -3,6 +3,7 @@
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Windows.Media;
+using AudioBand.AudioSource;
 
 namespace AudioBand.TextFormatting
 {
@@ -27,8 +28,9 @@ internal class FormattedTextParser
         /// </summary>
         /// <param name="format">The formatted string.</param>
         /// <param name="defaultColor">The default text color to use.</param>
+        /// <param name="audioSession">The audio session to use.</param>
         /// <returns>A list of text segments.</returns>
-        public static IEnumerable<TextSegment> ParseFormattedString(string format, Color defaultColor)
+        public static IEnumerable<TextSegment> ParseFormattedString(string format, Color defaultColor, IAudioSession audioSession)
         {
             // Build up segments, each chunk is a sparately formatted piece of text
             var segments = new List<TextSegment>();
@@ -42,7 +44,7 @@ public static IEnumerable<TextSegment> ParseFormattedString(string format, Color
                     // If we see the start of the format, get a chunk until the end token
                     case PlaceholderStartToken:
                         // Add what we have so far
-                        AddSegment(segments, currentText, false, defaultColor);
+                        AddSegment(segments, currentText, false, defaultColor, audioSession);
 
                         // Skip the start token
                         i++;
@@ -58,12 +60,12 @@ public static IEnumerable<TextSegment> ParseFormattedString(string format, Color
                         if (i == format.Length)
                         {
                             currentText.Insert(0, PlaceholderStartToken);
-                            AddSegment(segments, currentText, false, defaultColor);
+                            AddSegment(segments, currentText, false, defaultColor, audioSession);
                         }
                         else
                         {
                             // Full placeholder
-                            AddSegment(segments, currentText, true, defaultColor);
+                            AddSegment(segments, currentText, true, defaultColor, audioSession);
                         }
 
                         break;
@@ -73,11 +75,11 @@ public static IEnumerable<TextSegment> ParseFormattedString(string format, Color
                 }
             }
 
-            AddSegment(segments, currentText, false, defaultColor);
+            AddSegment(segments, currentText, false, defaultColor, audioSession);
             return segments;
         }
 
-        private static void AddSegment(List<TextSegment> segments, StringBuilder text, bool isPlaceholder, Color defaultColor)
+        private static void AddSegment(List<TextSegment> segments, StringBuilder text, bool isPlaceholder, Color defaultColor, IAudioSession session)
         {
             if (text.Length == 0)
             {
@@ -86,7 +88,7 @@ private static void AddSegment(List<TextSegment> segments, StringBuilder text, b
 
             if (isPlaceholder)
             {
-                if (TryParsePlaceholder(text.ToString(), defaultColor, out TextPlaceholder placeholder, out FormattedTextFlags flags, out Color c))
+                if (TryParsePlaceholder(text.ToString(), defaultColor, session, out TextPlaceholder placeholder, out FormattedTextFlags flags, out Color c))
                 {
                     segments.Add(new PlaceholderTextSegment(placeholder, flags, c));
                 }
@@ -103,7 +105,7 @@ private static void AddSegment(List<TextSegment> segments, StringBuilder text, b
             text.Clear();
         }
 
-        private static bool TryParsePlaceholder(string placeholderString, Color defaultColor, out TextPlaceholder placeholder, out FormattedTextFlags flags, out Color color)
+        private static bool TryParsePlaceholder(string placeholderString, Color defaultColor, IAudioSession session, out TextPlaceholder placeholder, out FormattedTextFlags flags, out Color color)
         {
             var match = PlaceholderPattern.Match(placeholderString);
             flags = FormattedTextFlags.Normal;
@@ -136,7 +138,7 @@ private static bool TryParsePlaceholder(string placeholderString, Color defaultC
                 }
             }
 
-            if (!TextPlaceholderFactory.TryGetPlaceholder(match.Groups["tag"].Value, null, out placeholder))
+            if (!TextPlaceholderFactory.TryGetPlaceholder(match.Groups["tag"].Value, null, session, out placeholder))
             {
                 color = Colors.Red;
                 return false;
@@ -147,7 +149,6 @@ private static bool TryParsePlaceholder(string placeholderString, Color defaultC
                 try
                 {
                     color = (Color)ColorConverter.ConvertFrom(match.Groups["color"].Value);
-                    flags |= FormattedTextFlags.Colored;
                 }
                 catch (Exception)
                 {
diff --git a/src/AudioBand/TextFormatting/SongArtistPlaceholder.cs b/src/AudioBand/TextFormatting/SongArtistPlaceholder.cs
index cbadac89..b14d3d92 100644
--- a/src/AudioBand/TextFormatting/SongArtistPlaceholder.cs
+++ b/src/AudioBand/TextFormatting/SongArtistPlaceholder.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using AudioBand.AudioSource;
 
 namespace AudioBand.TextFormatting
 {
@@ -11,15 +12,23 @@ public class SongArtistPlaceholder : TextPlaceholder
         /// Initializes a new instance of the <see cref="SongArtistPlaceholder"/> class.
         /// </summary>
         /// <param name="parameters">The placeholder parameter.</param>
-        public SongArtistPlaceholder(IEnumerable<TextPlaceholderParameter> parameters)
-            : base(parameters)
+        /// <param name="audioSession">The audio session.</param>
+        public SongArtistPlaceholder(IEnumerable<TextPlaceholderParameter> parameters, IAudioSession audioSession)
+            : base(parameters, audioSession)
         {
+            AddSessionPropertyFilter(nameof(IAudioSession.SongArtist));
         }
 
         /// <inheritdoc />
         public override string GetText()
         {
-            return "artist";
+            return Session.SongArtist;
+        }
+
+        /// <inheritdoc />
+        protected override void OnAudioSessionPropertyChanged(string propertyName)
+        {
+            RaiseTextChanged();
         }
     }
 }
diff --git a/src/AudioBand/TextFormatting/SongLengthPlaceholder.cs b/src/AudioBand/TextFormatting/SongLengthPlaceholder.cs
index 669cb022..4789f283 100644
--- a/src/AudioBand/TextFormatting/SongLengthPlaceholder.cs
+++ b/src/AudioBand/TextFormatting/SongLengthPlaceholder.cs
@@ -1,4 +1,6 @@
 using System.Collections.Generic;
+using AudioBand.AudioSource;
+using AudioBand.Extensions;
 
 namespace AudioBand.TextFormatting
 {
@@ -11,15 +13,23 @@ public class SongLengthPlaceholder : TextPlaceholder
         /// Initializes a new instance of the <see cref="SongLengthPlaceholder"/> class.
         /// </summary>
         /// <param name="parameters">The placeholder parameters.</param>
-        public SongLengthPlaceholder(IEnumerable<TextPlaceholderParameter> parameters)
-            : base(parameters)
+        /// <param name="audioSession">The audio session.</param>
+        public SongLengthPlaceholder(IEnumerable<TextPlaceholderParameter> parameters, IAudioSession audioSession)
+            : base(parameters, audioSession)
         {
+            AddSessionPropertyFilter(nameof(IAudioSession.SongLength));
         }
 
         /// <inheritdoc />
         public override string GetText()
         {
-            return "length";
+            return Session.SongLength.Format();
+        }
+
+        /// <inheritdoc />
+        protected override void OnAudioSessionPropertyChanged(string propertyName)
+        {
+            RaiseTextChanged();
         }
     }
 }
diff --git a/src/AudioBand/TextFormatting/SongNamePlaceholder.cs b/src/AudioBand/TextFormatting/SongNamePlaceholder.cs
index 62720384..ed7f0e6b 100644
--- a/src/AudioBand/TextFormatting/SongNamePlaceholder.cs
+++ b/src/AudioBand/TextFormatting/SongNamePlaceholder.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using AudioBand.AudioSource;
 
 namespace AudioBand.TextFormatting
 {
@@ -11,15 +12,23 @@ public class SongNamePlaceholder : TextPlaceholder
         /// Initializes a new instance of the <see cref="SongNamePlaceholder"/> class.
         /// </summary>
         /// <param name="parameters">The placeholder parameters.</param>
-        public SongNamePlaceholder(IEnumerable<TextPlaceholderParameter> parameters)
-            : base(parameters)
+        /// <param name="session">The audio session.</param>
+        public SongNamePlaceholder(IEnumerable<TextPlaceholderParameter> parameters, IAudioSession session)
+            : base(parameters, session)
         {
+            AddSessionPropertyFilter(nameof(IAudioSession.SongName));
         }
 
         /// <inheritdoc />
         public override string GetText()
         {
-            return "song name";
+            return Session.SongName;
+        }
+
+        /// <inheritdoc />
+        protected override void OnAudioSessionPropertyChanged(string propertyName)
+        {
+            RaiseTextChanged();
         }
     }
 }
diff --git a/src/AudioBand/TextFormatting/SongProgressPlaceholder.cs b/src/AudioBand/TextFormatting/SongProgressPlaceholder.cs
index 0a554e70..07309330 100644
--- a/src/AudioBand/TextFormatting/SongProgressPlaceholder.cs
+++ b/src/AudioBand/TextFormatting/SongProgressPlaceholder.cs
@@ -1,4 +1,6 @@
 using System.Collections.Generic;
+using AudioBand.AudioSource;
+using AudioBand.Extensions;
 
 namespace AudioBand.TextFormatting
 {
@@ -11,15 +13,23 @@ public class SongProgressPlaceholder : TextPlaceholder
         /// Initializes a new instance of the <see cref="SongProgressPlaceholder"/> class.
         /// </summary>
         /// <param name="parameters">The placeholder parameters.</param>
-        public SongProgressPlaceholder(IEnumerable<TextPlaceholderParameter> parameters)
-            : base(parameters)
+        /// <param name="session">The audio session.</param>
+        public SongProgressPlaceholder(IEnumerable<TextPlaceholderParameter> parameters, IAudioSession session)
+            : base(parameters, session)
         {
+            AddSessionPropertyFilter(nameof(IAudioSession.SongProgress));
         }
 
         /// <inheritdoc />
         public override string GetText()
         {
-            return "time";
+            return Session.SongProgress.Format();
+        }
+
+        /// <inheritdoc />
+        protected override void OnAudioSessionPropertyChanged(string propertyName)
+        {
+            RaiseTextChanged();
         }
     }
 }
diff --git a/src/AudioBand/TextFormatting/TextPlaceholder.cs b/src/AudioBand/TextFormatting/TextPlaceholder.cs
index 04fcdf94..da1ea723 100644
--- a/src/AudioBand/TextFormatting/TextPlaceholder.cs
+++ b/src/AudioBand/TextFormatting/TextPlaceholder.cs
@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
+using AudioBand.AudioSource;
 
 namespace AudioBand.TextFormatting
 {
@@ -8,12 +10,18 @@ namespace AudioBand.TextFormatting
     /// </summary>
     public abstract class TextPlaceholder
     {
+        private readonly HashSet<string> _propertyFilter = new HashSet<string>();
+
         /// <summary>
         /// Initializes a new instance of the <see cref="TextPlaceholder"/> class.
         /// </summary>
         /// <param name="parameters">The parameters passed to the text format.</param>
-        protected TextPlaceholder(IEnumerable<TextPlaceholderParameter> parameters)
+        /// <param name="audioSession">The audio session to use for the placeholder value.</param>
+        protected TextPlaceholder(IEnumerable<TextPlaceholderParameter> parameters, IAudioSession audioSession)
         {
+            Session = audioSession;
+            Session.PropertyChanged += AudioSessionOnPropertyChanged;
+
             // TODO parameters
         }
 
@@ -22,6 +30,11 @@ protected TextPlaceholder(IEnumerable<TextPlaceholderParameter> parameters)
         /// </summary>
         public event EventHandler TextChanged;
 
+        /// <summary>
+        /// Gets the audio session.
+        /// </summary>
+        protected IAudioSession Session { get; private set; }
+
         /// <summary>
         /// Gets the current text value for the placeholder.
         /// </summary>
@@ -45,5 +58,30 @@ protected string GetParameter(string parameterName)
         {
             return null;
         }
+
+        /// <summary>
+        /// Adds a filter for <see cref="OnAudioSessionPropertyChanged"/>.
+        /// </summary>
+        /// <param name="audioSessionPropertyName">The property name to filter.</param>
+        protected void AddSessionPropertyFilter(string audioSessionPropertyName)
+        {
+            _propertyFilter.Add(audioSessionPropertyName);
+        }
+
+        /// <summary>
+        /// Called when the audio session property value changes.
+        /// </summary>
+        /// <param name="propertyName">The name of the property that changed.</param>
+        protected virtual void OnAudioSessionPropertyChanged(string propertyName)
+        {
+        }
+
+        private void AudioSessionOnPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (_propertyFilter.Contains(e.PropertyName) || _propertyFilter.Count == 0)
+            {
+                OnAudioSessionPropertyChanged(e.PropertyName);
+            }
+        }
     }
 }
diff --git a/src/AudioBand/TextFormatting/TextPlaceholderFactory.cs b/src/AudioBand/TextFormatting/TextPlaceholderFactory.cs
index cd445d90..f7c8bc08 100644
--- a/src/AudioBand/TextFormatting/TextPlaceholderFactory.cs
+++ b/src/AudioBand/TextFormatting/TextPlaceholderFactory.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using AudioBand.AudioSource;
 
 namespace AudioBand.TextFormatting
 {
@@ -9,14 +10,14 @@ public static class TextPlaceholderFactory
     {
         private static readonly Dictionary<string, PlaceholderFactoryFunc> PlaceholderMap = new Dictionary<string, PlaceholderFactoryFunc>()
         {
-            { "artist", parameters => new SongArtistPlaceholder(parameters) },
-            { "song", parameters => new SongNamePlaceholder(parameters) },
-            { "album", parameters => new AlbumNamePlaceholder(parameters) },
-            { "time", parameters => new SongProgressPlaceholder(parameters) },
-            { "length", parameters => new SongLengthPlaceholder(parameters) },
+            { "artist", (parameters, session) => new SongArtistPlaceholder(parameters, session) },
+            { "song", (parameters, session) => new SongNamePlaceholder(parameters, session) },
+            { "album", (parameters, session) => new AlbumNamePlaceholder(parameters, session) },
+            { "time", (parameters, session) => new SongProgressPlaceholder(parameters, session) },
+            { "length", (parameters, session) => new SongLengthPlaceholder(parameters, session) },
         };
 
-        private delegate TextPlaceholder PlaceholderFactoryFunc(IEnumerable<TextPlaceholderParameter> parameters);
+        private delegate TextPlaceholder PlaceholderFactoryFunc(IEnumerable<TextPlaceholderParameter> parameters, IAudioSession session);
 
         /// <summary>
         /// Gets all available tags for text placeholders.
@@ -28,13 +29,14 @@ public static class TextPlaceholderFactory
         /// </summary>
         /// <param name="tag">The tag for the placeholder.</param>
         /// <param name="parameters">The parameters for the placeholder.</param>
+        /// <param name="session">The audio session.</param>
         /// <param name="placeholder">The text placeholder.</param>
         /// <returns>True if the tag matches a placeholder.</returns>
-        public static bool TryGetPlaceholder(string tag, IEnumerable<TextPlaceholderParameter> parameters, out TextPlaceholder placeholder)
+        public static bool TryGetPlaceholder(string tag, IEnumerable<TextPlaceholderParameter> parameters, IAudioSession session, out TextPlaceholder placeholder)
         {
             if (PlaceholderMap.TryGetValue(tag, out var func))
             {
-                placeholder = func(parameters);
+                placeholder = func(parameters, session);
                 return true;
             }
 
diff --git a/src/AudioBand/ViewModels/AlbumArtViewModel.cs b/src/AudioBand/ViewModels/AlbumArtViewModel.cs
index 50c9453d..7ca9f20c 100644
--- a/src/AudioBand/ViewModels/AlbumArtViewModel.cs
+++ b/src/AudioBand/ViewModels/AlbumArtViewModel.cs
@@ -1,5 +1,7 @@
 using System;
+using System.ComponentModel;
 using System.Diagnostics;
+using System.Drawing;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using AudioBand.AudioSource;
@@ -15,7 +17,7 @@ namespace AudioBand.ViewModels
     public class AlbumArtViewModel : LayoutViewModelBase<AlbumArt>
     {
         private readonly IAppSettings _appsettings;
-        private IAudioSource _audioSource;
+        private readonly IAudioSession _audioSession;
         private ImageSource _albumArt;
 
         /// <summary>
@@ -23,13 +25,16 @@ public class AlbumArtViewModel : LayoutViewModelBase<AlbumArt>
         /// </summary>
         /// <param name="appsettings">The app settings.</param>
         /// <param name="dialogService">The dialog service.</param>
-        public AlbumArtViewModel(IAppSettings appsettings, IDialogService dialogService)
+        /// <param name="audioSession">The audio session.</param>
+        public AlbumArtViewModel(IAppSettings appsettings, IDialogService dialogService, IAudioSession audioSession)
             : base(appsettings.AlbumArt)
         {
             DialogService = dialogService;
             _appsettings = appsettings;
+            _audioSession = audioSession;
 
             appsettings.ProfileChanged += AppsettingsOnProfileChanged;
+            audioSession.PropertyChanged += AudioSessionOnPropertyChanged;
         }
 
         /// <summary>
@@ -51,14 +56,6 @@ public ImageSource AlbumArt
             private set => SetProperty(ref _albumArt, value, false);
         }
 
-        /// <summary>
-        /// Sets the audio source.
-        /// </summary>
-        public IAudioSource AudioSource
-        {
-            set => UpdateAudioSource(value);
-        }
-
         /// <summary>
         /// Gets the dialog service.
         /// </summary>
@@ -70,27 +67,19 @@ private void AppsettingsOnProfileChanged(object sender, EventArgs e)
             ReplaceModel(_appsettings.AlbumArt);
         }
 
-        private void UpdateAudioSource(IAudioSource audioSource)
+        private void AudioSessionOnPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
-            if (_audioSource != null)
-            {
-                AlbumArt = null;
-                _audioSource.TrackInfoChanged -= AudioSourceOnTrackInfoChanged;
-            }
-
-            _audioSource = audioSource;
-            if (_audioSource == null)
+            if (e.PropertyName != nameof(IAudioSession.AlbumArt))
             {
-                AlbumArt = null;
                 return;
             }
 
-            _audioSource.TrackInfoChanged += AudioSourceOnTrackInfoChanged;
+            AlbumArtUpdated(_audioSession.AlbumArt);
         }
 
-        private void AudioSourceOnTrackInfoChanged(object sender, TrackInfoChangedEventArgs e)
+        private void AlbumArtUpdated(Image albumArt)
         {
-            if (e.AlbumArt == null)
+            if (albumArt == null)
             {
                 try
                 {
@@ -104,7 +93,7 @@ private void AudioSourceOnTrackInfoChanged(object sender, TrackInfoChangedEventA
                 return;
             }
 
-            AlbumArt = e.AlbumArt.ToImageSource();
+            AlbumArt = albumArt.ToImageSource();
         }
     }
 }
diff --git a/src/AudioBand/ViewModels/AudioBandToolbarViewModel.cs b/src/AudioBand/ViewModels/AudioBandToolbarViewModel.cs
index 4a02e61d..6c6f6106 100644
--- a/src/AudioBand/ViewModels/AudioBandToolbarViewModel.cs
+++ b/src/AudioBand/ViewModels/AudioBandToolbarViewModel.cs
@@ -1,14 +1,11 @@
 using System;
 using System.Collections.ObjectModel;
-using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Input;
 using AudioBand.AudioSource;
 using AudioBand.Commands;
 using AudioBand.Messages;
-using AudioBand.Models;
 using AudioBand.Settings;
-using NLog.Fluent;
 
 namespace AudioBand.ViewModels
 {
@@ -20,6 +17,7 @@ public class AudioBandToolbarViewModel : ViewModelBase
         private readonly IAppSettings _appSettings;
         private readonly IAudioSourceManager _audioSourceManager;
         private readonly IMessageBus _messageBus;
+        private readonly IAudioSession _audioSession;
         private IAudioSource _selectedAudioSource;
 
         /// <summary>
@@ -29,11 +27,13 @@ public class AudioBandToolbarViewModel : ViewModelBase
         /// <param name="appSettings">The app settings.</param>
         /// <param name="audioSourceManager">The audio source mananger.</param>
         /// <param name="messageBus">The message bus.</param>
-        public AudioBandToolbarViewModel(IViewModelContainer viewModels, IAppSettings appSettings, IAudioSourceManager audioSourceManager, IMessageBus messageBus)
+        /// <param name="audioSession">The audio session.</param>
+        public AudioBandToolbarViewModel(IViewModelContainer viewModels, IAppSettings appSettings, IAudioSourceManager audioSourceManager, IMessageBus messageBus, IAudioSession audioSession)
         {
             _appSettings = appSettings;
             _audioSourceManager = audioSourceManager;
             _messageBus = messageBus;
+            _audioSession = audioSession;
             ViewModels = viewModels;
 
             ShowSettingsWindowCommand = new RelayCommand(ShowSettingsWindowCommandOnExecute);
@@ -134,7 +134,7 @@ private async Task SelectAudioSourceCommandOnExecute(IInternalAudioSource audioS
                 return;
             }
 
-            UpdateViewModels(audioSource);
+            _audioSession.CurrentAudioSource = audioSource;
 
             Logger.Debug("Activating new audio source {audiosource}", audioSource.Name);
             try
@@ -152,17 +152,5 @@ private async Task SelectAudioSourceCommandOnExecute(IInternalAudioSource audioS
                 _appSettings.Save();
             }
         }
-
-        private void UpdateViewModels(IInternalAudioSource audioSource)
-        {
-            ViewModels.AlbumArtViewModel.AudioSource = audioSource;
-            ViewModels.NextButtonViewModel.AudioSource = audioSource;
-            ViewModels.PreviousButtonViewModel.AudioSource = audioSource;
-            ViewModels.PlayPauseButtonViewModel.AudioSource = audioSource;
-            ViewModels.ProgressBarViewModel.AudioSource = audioSource;
-            ViewModels.RepeatModeButtonViewModel.AudioSource = audioSource;
-            ViewModels.ShuffleModeButtonViewModel.AudioSource = audioSource;
-            ViewModels.CustomLabelsViewModel.AudioSource = audioSource;
-        }
     }
 }
diff --git a/src/AudioBand/ViewModels/CustomLabelViewModel.cs b/src/AudioBand/ViewModels/CustomLabelViewModel.cs
index 3d4d7f89..da25d0a9 100644
--- a/src/AudioBand/ViewModels/CustomLabelViewModel.cs
+++ b/src/AudioBand/ViewModels/CustomLabelViewModel.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Windows.Media;
 using AudioBand.AudioSource;
@@ -15,7 +16,7 @@ namespace AudioBand.ViewModels
     /// </summary>
     public class CustomLabelViewModel : LayoutViewModelBase<CustomLabel>
     {
-        private IInternalAudioSource _audioSource;
+        private readonly IAudioSession _audioSession;
         private bool _isPlaying;
         private IEnumerable<TextSegment> _textSegments;
 
@@ -24,11 +25,15 @@ public class CustomLabelViewModel : LayoutViewModelBase<CustomLabel>
         /// </summary>
         /// <param name="model">The custom label.</param>
         /// <param name="dialogService">The dialog service.</param>
-        public CustomLabelViewModel(CustomLabel model, IDialogService dialogService)
+        /// <param name="audioSession">The audio session.</param>
+        public CustomLabelViewModel(CustomLabel model, IDialogService dialogService, IAudioSession audioSession)
             : base(model)
         {
+            _audioSession = audioSession;
+            _audioSession.PropertyChanged += AudioSessionOnPropertyChanged;
+
             DialogService = dialogService;
-            TextSegments = FormattedTextParser.ParseFormattedString(FormatString, Color);
+            TextSegments = FormattedTextParser.ParseFormattedString(FormatString, Color, audioSession);
         }
 
         /// <summary>
@@ -186,14 +191,6 @@ public IEnumerable<TextSegment> TextSegments
         /// </summary>
         public IDialogService DialogService { get; }
 
-        /// <summary>
-        /// Sets the audio source.
-        /// </summary>
-        public IInternalAudioSource AudioSource
-        {
-            set => UpdateAudioSource(value);
-        }
-
         /// <summary>
         /// Gets or sets a value indicating whether a track is playing.
         /// </summary>
@@ -217,33 +214,24 @@ protected override void OnModelPropertyChanged(string propertyName)
 
                     break;
                 case nameof(Model.FormatString):
-                    TextSegments = FormattedTextParser.ParseFormattedString(FormatString, Color);
+                    TextSegments = FormattedTextParser.ParseFormattedString(FormatString, Color, _audioSession);
                     break;
             }
         }
 
-        private void UpdateAudioSource(IInternalAudioSource audioSource)
+        private void AudioSessionOnPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
-            if (_audioSource != null)
-            {
-                _audioSource.IsPlayingChanged -= AudioSourceOnIsPlayingChanged;
-            }
-
-            _audioSource = audioSource;
-            if (_audioSource == null)
+            if (e.PropertyName != nameof(IAudioSession.IsPlaying))
             {
                 return;
             }
 
-            // Sync current information in the case the profiles change, otherwise we won't receive information until the next time the event is activated.
-            AudioSourceOnIsPlayingChanged(null, _audioSource.IsPlaying);
-
-            _audioSource.IsPlayingChanged += AudioSourceOnIsPlayingChanged;
+            OnIsPlayingChanged(_audioSession.IsPlaying);
         }
 
-        private void AudioSourceOnIsPlayingChanged(object sender, bool e)
+        private void OnIsPlayingChanged(bool isPlaying)
         {
-            IsPlaying = e;
+            IsPlaying = isPlaying;
         }
     }
 }
diff --git a/src/AudioBand/ViewModels/CustomLabelsViewModel.cs b/src/AudioBand/ViewModels/CustomLabelsViewModel.cs
index 8ff20537..78e5e9ac 100644
--- a/src/AudioBand/ViewModels/CustomLabelsViewModel.cs
+++ b/src/AudioBand/ViewModels/CustomLabelsViewModel.cs
@@ -19,7 +19,7 @@ public class CustomLabelsViewModel : ViewModelBase
         private readonly HashSet<CustomLabelViewModel> _removed = new HashSet<CustomLabelViewModel>();
         private readonly IAppSettings _appsettings;
         private readonly IDialogService _dialogService;
-        private IInternalAudioSource _audioSource;
+        private readonly IAudioSession _audioSession;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="CustomLabelsViewModel"/> class
@@ -27,10 +27,12 @@ public class CustomLabelsViewModel : ViewModelBase
         /// </summary>
         /// <param name="appsettings">The app setings.</param>
         /// <param name="dialogService">The dialog service.</param>
-        public CustomLabelsViewModel(IAppSettings appsettings, IDialogService dialogService)
+        /// <param name="audioSession">The audio session.</param>
+        public CustomLabelsViewModel(IAppSettings appsettings, IDialogService dialogService, IAudioSession audioSession)
         {
             _appsettings = appsettings;
             _dialogService = dialogService;
+            _audioSession = audioSession;
             SetupLabels();
 
             AddLabelCommand = new RelayCommand(AddLabelCommandOnExecute);
@@ -53,14 +55,6 @@ public CustomLabelsViewModel(IAppSettings appsettings, IDialogService dialogServ
         /// </summary>
         public RelayCommand<CustomLabelViewModel> RemoveLabelCommand { get; }
 
-        /// <summary>
-        /// Sets the audio source.
-        /// </summary>
-        public IInternalAudioSource AudioSource
-        {
-            set => UpdateAudioSource(value);
-        }
-
         /// <inheritdoc/>
         protected override void OnBeginEdit()
         {
@@ -103,7 +97,7 @@ private void AddLabelCommandOnExecute(object o)
         {
             BeginEdit();
 
-            var newLabel = new CustomLabelViewModel(new CustomLabel(), _dialogService) { Name = "New Label" };
+            var newLabel = new CustomLabelViewModel(new CustomLabel(), _dialogService, _audioSession) { Name = "New Label" };
             CustomLabels.Add(newLabel);
 
             _added.Add(newLabel);
@@ -130,7 +124,7 @@ private void RemoveLabelCommandOnExecute(CustomLabelViewModel labelViewModel)
         private void SetupLabels()
         {
             CustomLabels.Clear();
-            foreach (var customLabelVm in _appsettings.CustomLabels.Select(customLabel => new CustomLabelViewModel(customLabel, _dialogService)))
+            foreach (var customLabelVm in _appsettings.CustomLabels.Select(customLabel => new CustomLabelViewModel(customLabel, _dialogService, _audioSession)))
             {
                 CustomLabels.Add(customLabelVm);
             }
@@ -142,20 +136,6 @@ private void AppsettingsOnProfileChanged(object sender, EventArgs e)
 
             // Add labels for new profile
             SetupLabels();
-
-            foreach (var customLabelViewModel in CustomLabels)
-            {
-                customLabelViewModel.AudioSource = _audioSource;
-            }
-        }
-
-        private void UpdateAudioSource(IInternalAudioSource audioSource)
-        {
-            _audioSource = audioSource;
-            foreach (var customLabelViewModel in CustomLabels)
-            {
-                customLabelViewModel.AudioSource = audioSource;
-            }
         }
     }
 }
diff --git a/src/AudioBand/ViewModels/NextButtonViewModel.cs b/src/AudioBand/ViewModels/NextButtonViewModel.cs
index 02803505..abfefe93 100644
--- a/src/AudioBand/ViewModels/NextButtonViewModel.cs
+++ b/src/AudioBand/ViewModels/NextButtonViewModel.cs
@@ -1,7 +1,7 @@
 using System;
+using System.ComponentModel;
 using System.Diagnostics;
 using System.Threading.Tasks;
-using System.Windows.Input;
 using AudioBand.AudioSource;
 using AudioBand.Commands;
 using AudioBand.Models;
@@ -15,17 +15,19 @@ namespace AudioBand.ViewModels
     public class NextButtonViewModel : ButtonViewModelBase<NextButton>
     {
         private readonly IAppSettings _appSettings;
-        private IAudioSource _audioSource;
+        private readonly IAudioSession _audioSession;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="NextButtonViewModel"/> class.
         /// </summary>
         /// <param name="appSettings">The appSettings.</param>
         /// <param name="dialogService">The dialog service.</param>
-        public NextButtonViewModel(IAppSettings appSettings, IDialogService dialogService)
+        /// <param name="audioSession">The audio session.</param>
+        public NextButtonViewModel(IAppSettings appSettings, IDialogService dialogService, IAudioSession audioSession)
             : base(appSettings.NextButton, dialogService)
         {
             _appSettings = appSettings;
+            _audioSession = audioSession;
             _appSettings.ProfileChanged += AppsSettingsOnProfileChanged;
             NextTrackCommand = new AsyncRelayCommand<object>(NextTrackCommandOnExecute);
             Content = new ButtonContentViewModel(Model.Content, new NextButton().Content, dialogService);
@@ -37,32 +39,19 @@ public NextButtonViewModel(IAppSettings appSettings, IDialogService dialogServic
         /// </summary>
         public ButtonContentViewModel Content { get; }
 
-        /// <summary>
-        /// Sets the audio source.
-        /// </summary>
-        public IAudioSource AudioSource
-        {
-            set => UpdateAudioSource(value);
-        }
-
         /// <summary>
         /// Gets the next track command.
         /// </summary>
         public IAsyncCommand NextTrackCommand { get; }
 
-        private void UpdateAudioSource(IAudioSource audioSource)
-        {
-            _audioSource = audioSource;
-        }
-
         private async Task NextTrackCommandOnExecute(object arg)
         {
-            if (_audioSource == null)
+            if (_audioSession.CurrentAudioSource == null)
             {
                 return;
             }
 
-            await _audioSource.NextTrackAsync();
+            await _audioSession.CurrentAudioSource.NextTrackAsync();
         }
 
         private void AppsSettingsOnProfileChanged(object sender, EventArgs e)
diff --git a/src/AudioBand/ViewModels/PlayPauseButtonViewModel.cs b/src/AudioBand/ViewModels/PlayPauseButtonViewModel.cs
index 923b8ee8..3e52daac 100644
--- a/src/AudioBand/ViewModels/PlayPauseButtonViewModel.cs
+++ b/src/AudioBand/ViewModels/PlayPauseButtonViewModel.cs
@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.Diagnostics;
 using System.Threading.Tasks;
 using System.Windows.Input;
@@ -15,18 +16,21 @@ namespace AudioBand.ViewModels
     public class PlayPauseButtonViewModel : ButtonViewModelBase<PlayPauseButton>
     {
         private readonly IAppSettings _appSettings;
+        private readonly IAudioSession _audioSession;
         private bool _isPlaying;
-        private IAudioSource _audioSource;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="PlayPauseButtonViewModel"/> class.
         /// </summary>
         /// <param name="appSettings">App settings.</param>
         /// <param name="dialogService">The dialog service.</param>
-        public PlayPauseButtonViewModel(IAppSettings appSettings, IDialogService dialogService)
+        /// <param name="audioSession">The audio session.</param>
+        public PlayPauseButtonViewModel(IAppSettings appSettings, IDialogService dialogService, IAudioSession audioSession)
             : base(appSettings.PlayPauseButton, dialogService)
         {
             _appSettings = appSettings;
+            _audioSession = audioSession;
+            _audioSession.PropertyChanged += AudioSessionOnPropertyChanged;
             _appSettings.ProfileChanged += AppSettingsOnProfileChanged;
             PlayPauseTrackCommand = new AsyncRelayCommand<object>(PlayPauseTrackCommandOnExecute);
 
@@ -47,14 +51,6 @@ public PlayPauseButtonViewModel(IAppSettings appSettings, IDialogService dialogS
         /// </summary>
         public ButtonContentViewModel PauseContent { get; }
 
-        /// <summary>
-        /// Sets the audio source.
-        /// </summary>
-        public IAudioSource AudioSource
-        {
-            set => UpdateAudioSource(value);
-        }
-
         /// <summary>
         /// Gets the play pause command.
         /// </summary>
@@ -81,42 +77,35 @@ private void AppSettingsOnProfileChanged(object sender, EventArgs e)
             ReplaceModel(_appSettings.PlayPauseButton);
         }
 
-        private void UpdateAudioSource(IAudioSource audioSource)
+        private void AudioSessionOnPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
-            if (_audioSource != null)
-            {
-                _audioSource.IsPlayingChanged -= AudioSourceOnIsPlayingChanged;
-            }
-
-            _audioSource = audioSource;
-            if (_audioSource == null)
+            if (e.PropertyName != nameof(IAudioSession.IsPlaying))
             {
-                IsPlaying = false;
                 return;
             }
 
-            _audioSource.IsPlayingChanged += AudioSourceOnIsPlayingChanged;
+            OnIsPlayingChanged(_audioSession.IsPlaying);
         }
 
-        private void AudioSourceOnIsPlayingChanged(object sender, bool e)
+        private void OnIsPlayingChanged(bool isPlaying)
         {
-            IsPlaying = e;
+            IsPlaying = isPlaying;
         }
 
         private async Task PlayPauseTrackCommandOnExecute(object arg)
         {
-            if (_audioSource == null)
+            if (_audioSession.CurrentAudioSource == null)
             {
                 return;
             }
 
             if (IsPlaying)
             {
-                await _audioSource.PauseTrackAsync();
+                await _audioSession.CurrentAudioSource.PauseTrackAsync();
             }
             else
             {
-                await _audioSource.PlayTrackAsync();
+                await _audioSession.CurrentAudioSource.PlayTrackAsync();
             }
         }
     }
diff --git a/src/AudioBand/ViewModels/PreviousButtonViewModel.cs b/src/AudioBand/ViewModels/PreviousButtonViewModel.cs
index 3b28c401..015ddb8b 100644
--- a/src/AudioBand/ViewModels/PreviousButtonViewModel.cs
+++ b/src/AudioBand/ViewModels/PreviousButtonViewModel.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Diagnostics;
 using System.Threading.Tasks;
-using System.Windows.Input;
 using AudioBand.AudioSource;
 using AudioBand.Commands;
 using AudioBand.Models;
@@ -15,17 +14,19 @@ namespace AudioBand.ViewModels
     public class PreviousButtonViewModel : ButtonViewModelBase<PreviousButton>
     {
         private readonly IAppSettings _appSettings;
-        private IAudioSource _audioSource;
+        private readonly IAudioSession _audioSession;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="PreviousButtonViewModel"/> class.
         /// </summary>
         /// <param name="appSettings">The app settings.</param>
         /// <param name="dialogService">The dialog service.</param>
-        public PreviousButtonViewModel(IAppSettings appSettings, IDialogService dialogService)
+        /// <param name="audioSession">The audio session.</param>
+        public PreviousButtonViewModel(IAppSettings appSettings, IDialogService dialogService, IAudioSession audioSession)
             : base(appSettings.PreviousButton, dialogService)
         {
             _appSettings = appSettings;
+            _audioSession = audioSession;
             _appSettings.ProfileChanged += AppsSettingsOnProfileChanged;
             PreviousTrackCommand = new AsyncRelayCommand<object>(PreviousTrackCommandOnExecute);
             Content = new ButtonContentViewModel(Model.Content, new PreviousButton().Content, dialogService);
@@ -37,32 +38,19 @@ public PreviousButtonViewModel(IAppSettings appSettings, IDialogService dialogSe
         /// </summary>
         public ButtonContentViewModel Content { get; }
 
-        /// <summary>
-        /// Sets the audio source.
-        /// </summary>
-        public IAudioSource AudioSource
-        {
-            set => UpdateAudioSource(value);
-        }
-
         /// <summary>
         /// Gets the previous track command.
         /// </summary>
         public IAsyncCommand PreviousTrackCommand { get; }
 
-        private void UpdateAudioSource(IAudioSource audioSource)
-        {
-            _audioSource = audioSource;
-        }
-
         private async Task PreviousTrackCommandOnExecute(object arg)
         {
-            if (_audioSource == null)
+            if (_audioSession.CurrentAudioSource == null)
             {
                 return;
             }
 
-            await _audioSource.PreviousTrackAsync();
+            await _audioSession.CurrentAudioSource.PreviousTrackAsync();
         }
 
         private void AppsSettingsOnProfileChanged(object sender, EventArgs e)
diff --git a/src/AudioBand/ViewModels/ProgressBarViewModel.cs b/src/AudioBand/ViewModels/ProgressBarViewModel.cs
index 8a9bae66..4ecb5bad 100644
--- a/src/AudioBand/ViewModels/ProgressBarViewModel.cs
+++ b/src/AudioBand/ViewModels/ProgressBarViewModel.cs
@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.Diagnostics;
 using System.Windows.Media;
 using AudioBand.AudioSource;
@@ -13,7 +14,7 @@ namespace AudioBand.ViewModels
     public class ProgressBarViewModel : LayoutViewModelBase<ProgressBar>
     {
         private readonly IAppSettings _appsettings;
-        private IAudioSource _audioSource;
+        private readonly IAudioSession _audioSession;
         private TimeSpan _trackProgress;
         private TimeSpan _trackLength;
 
@@ -22,10 +23,13 @@ public class ProgressBarViewModel : LayoutViewModelBase<ProgressBar>
         /// </summary>
         /// <param name="appsettings">The app settings.</param>
         /// <param name="dialogService">The dialog service.</param>
-        public ProgressBarViewModel(IAppSettings appsettings, IDialogService dialogService)
+        /// <param name="audioSession">The audio session.</param>
+        public ProgressBarViewModel(IAppSettings appsettings, IDialogService dialogService, IAudioSession audioSession)
             : base(appsettings.ProgressBar)
         {
             _appsettings = appsettings;
+            _audioSession = audioSession;
+            _audioSession.PropertyChanged += AudioSessionOnPropertyChanged;
             DialogService = dialogService;
 
             _appsettings.ProfileChanged += AppsettingsOnProfileChanged;
@@ -71,7 +75,7 @@ public TimeSpan TrackProgress
             {
                 if (SetProperty(ref _trackProgress, value, trackChanges: false))
                 {
-                    _audioSource?.SetPlaybackProgressAsync(value);
+                    _audioSession.CurrentAudioSource?.SetPlaybackProgressAsync(value);
                 }
             }
         }
@@ -90,50 +94,33 @@ public TimeSpan TrackLength
         /// </summary>
         public IDialogService DialogService { get; set; }
 
-        /// <summary>
-        /// Sets the audio source.
-        /// </summary>
-        public IAudioSource AudioSource
-        {
-            set => UpdateAudioSource(value);
-        }
-
         private void AppsettingsOnProfileChanged(object sender, EventArgs e)
         {
             Debug.Assert(IsEditing == false, "Should not be editing");
             ReplaceModel(_appsettings.ProgressBar);
         }
 
-        private void UpdateAudioSource(IAudioSource audioSource)
+        private void AudioSessionOnPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
-            if (_audioSource != null)
+            switch (e.PropertyName)
             {
-                _audioSource.TrackProgressChanged -= AudioSourceOnTrackProgressChanged;
-                _audioSource.TrackInfoChanged -= AudioSourceOnTrackInfoChanged;
-                TrackProgress = TimeSpan.Zero;
-                TrackLength = TimeSpan.Zero;
+                case nameof(IAudioSession.SongProgress):
+                    OnProgressChanged(_audioSession.SongProgress);
+                    break;
+                case nameof(IAudioSession.SongLength):
+                    OnSongLengthChanged(_audioSession.SongLength);
+                    break;
             }
-
-            _audioSource = audioSource;
-            if (_audioSource == null)
-            {
-                TrackLength = TimeSpan.Zero;
-                TrackProgress = TimeSpan.Zero;
-                return;
-            }
-
-            _audioSource.TrackInfoChanged += AudioSourceOnTrackInfoChanged;
-            _audioSource.TrackProgressChanged += AudioSourceOnTrackProgressChanged;
         }
 
-        private void AudioSourceOnTrackInfoChanged(object sender, TrackInfoChangedEventArgs e)
+        private void OnSongLengthChanged(TimeSpan length)
         {
-            TrackLength = e.TrackLength;
+            TrackLength = length;
         }
 
-        private void AudioSourceOnTrackProgressChanged(object sender, TimeSpan e)
+        private void OnProgressChanged(TimeSpan progress)
         {
-            _trackProgress = e;
+            _trackProgress = progress;
             RaisePropertyChanged(nameof(TrackProgress));
         }
     }

From 3e7166ac704d4111cf26322f743f485615252c11 Mon Sep 17 00:00:00 2001
From: Brandon Chong <brndnchong@gmail.com>
Date: Wed, 12 Jun 2019 15:39:32 -0700
Subject: [PATCH 03/17] Update tests for changes

---
 src/AudioBand.Test/AlbumArtViewModelTests.cs  |   3 +-
 src/AudioBand.Test/AudioBand.Test.csproj      |   2 +-
 src/AudioBand.Test/ButtonViewModels.cs        |  41 +--
 .../CustomLabelsViewModelTests.cs             |  17 +-
 src/AudioBand.Test/CustomTextParsingTests.cs  | 262 ++++++++++++++++
 .../ProgressBarViewModelTests.cs              |   3 +-
 .../SettingsWindowViewModelTests.cs           |   3 +-
 src/AudioBand.Test/TextRendererTests.cs       | 296 ------------------
 .../ViewModels/CustomLabelViewModel.cs        |   1 +
 9 files changed, 301 insertions(+), 327 deletions(-)
 create mode 100644 src/AudioBand.Test/CustomTextParsingTests.cs
 delete mode 100644 src/AudioBand.Test/TextRendererTests.cs

diff --git a/src/AudioBand.Test/AlbumArtViewModelTests.cs b/src/AudioBand.Test/AlbumArtViewModelTests.cs
index 51d405b9..26f0edcb 100644
--- a/src/AudioBand.Test/AlbumArtViewModelTests.cs
+++ b/src/AudioBand.Test/AlbumArtViewModelTests.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using AudioBand.AudioSource;
 using AudioBand.Models;
 using AudioBand.Settings;
 using AudioBand.ViewModels;
@@ -34,7 +35,7 @@ public void ListensToProfileChanges()
             _appSettings.SetupSequence(m => m.AlbumArt)
                 .Returns(first)
                 .Returns(second);
-            var vm = new AlbumArtViewModel(_appSettings.Object, _dialog.Object);
+            var vm = new AlbumArtViewModel(_appSettings.Object, _dialog.Object, new Mock<IAudioSession>().Object);
             bool raised = false;
             vm.PropertyChanged += (sender, e) => raised = true;
 
diff --git a/src/AudioBand.Test/AudioBand.Test.csproj b/src/AudioBand.Test/AudioBand.Test.csproj
index 7331766e..3d873865 100644
--- a/src/AudioBand.Test/AudioBand.Test.csproj
+++ b/src/AudioBand.Test/AudioBand.Test.csproj
@@ -100,7 +100,7 @@
     <Compile Include="SettingsMigrationTests.cs" />
     <Compile Include="AudioSourceSettingsCollectionTests.cs" />
     <Compile Include="SettingsWindowViewModelTests.cs" />
-    <Compile Include="TextRendererTests.cs" />
+    <Compile Include="CustomTextParsingTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ButtonViewModels.cs" />
     <Compile Include="ProgressBarViewModelTests.cs" />
diff --git a/src/AudioBand.Test/ButtonViewModels.cs b/src/AudioBand.Test/ButtonViewModels.cs
index 59b89fbc..40c71196 100644
--- a/src/AudioBand.Test/ButtonViewModels.cs
+++ b/src/AudioBand.Test/ButtonViewModels.cs
@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.Drawing;
 using System.Threading.Tasks;
 using AudioBand.AudioSource;
@@ -15,12 +16,14 @@ public class ButtonViewModels
     {
         private Mock<IAppSettings> _appSettings;
         private Mock<IDialogService> _dialog;
+        private Mock<IAudioSession> _session;
 
         [TestInitialize]
         public void TestInit()
         {
             _appSettings = new Mock<IAppSettings>();
             _dialog = new Mock<IDialogService>();
+            _session = new Mock<IAudioSession>();
         }
 
         [TestMethod]
@@ -32,7 +35,7 @@ public void NextButtonListensforProfileChanges()
                 .Returns(first)
                 .Returns(second);
 
-            var vm = new NextButtonViewModel(_appSettings.Object, _dialog.Object);
+            var vm = new NextButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object);
             bool raised = false;
             vm.PropertyChanged += (_, __) => raised = true;
 
@@ -49,10 +52,10 @@ public void NextButtonListensforProfileChanges()
         public async Task NextButtonCommandCallsNextTrack()
         {
             _appSettings.SetupGet(m => m.NextButton).Returns(new NextButton());
-            var vm = new NextButtonViewModel(_appSettings.Object, _dialog.Object);
-            var audioSourceMock = new Mock<IAudioSource>();
+            var audioSourceMock = new Mock<IInternalAudioSource>();
             audioSourceMock.Setup(m => m.NextTrackAsync()).Returns(Task.CompletedTask);
-            vm.AudioSource = audioSourceMock.Object;
+            _session.SetupGet(m => m.CurrentAudioSource).Returns(audioSourceMock.Object);
+            var vm = new NextButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object);
 
             await vm.NextTrackCommand.ExecuteAsync(null);
             audioSourceMock.Verify(m => m.NextTrackAsync());
@@ -67,7 +70,7 @@ public void PlayPauseButtonListensForProfileChanges()
                 .Returns(first)
                 .Returns(second);
 
-            var vm = new PlayPauseButtonViewModel(_appSettings.Object, _dialog.Object);
+            var vm = new PlayPauseButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object);
             bool raised = false;
             vm.PropertyChanged += (_, __) => raised = true;
 
@@ -83,7 +86,7 @@ public void PlayPauseButtonListensForProfileChanges()
         public void PlayPauseButtonMarkedAsEditingWhenContentIsEdited()
         {
             _appSettings.SetupGet(m => m.PlayPauseButton).Returns(new PlayPauseButton());
-            var viewModel = new PlayPauseButtonViewModel(_appSettings.Object, _dialog.Object);
+            var viewModel = new PlayPauseButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object);
 
             viewModel.PlayContent.Text = "";
             Assert.IsTrue(viewModel.PlayContent.IsEditing);
@@ -102,16 +105,14 @@ public void PlayPauseButtonMarkedAsEditingWhenContentIsEdited()
         public void PlayPauseButtonListensToAudioSource()
         {
             _appSettings.SetupGet(m => m.PlayPauseButton).Returns(new PlayPauseButton());
-            var viewModel = new PlayPauseButtonViewModel(_appSettings.Object, _dialog.Object);
-            var audioSourceMock = new Mock<IAudioSource>();
+            _session.SetupSequence(m => m.IsPlaying).Returns(true).Returns(false);
+            var viewModel = new PlayPauseButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object);
 
-            viewModel.AudioSource = audioSourceMock.Object;
-
-            audioSourceMock.Raise(m => m.IsPlayingChanged += null, null, true);
+            _session.Raise(m => m.PropertyChanged+= null, null, new PropertyChangedEventArgs(nameof(IAudioSession.IsPlaying)));
             Assert.IsTrue(viewModel.IsPlaying);
             Assert.IsFalse(viewModel.IsPlayButtonShown);
 
-            audioSourceMock.Raise(m => m.IsPlayingChanged += null, null, false);
+            _session.Raise(m => m.PropertyChanged += null, null, new PropertyChangedEventArgs(nameof(IAudioSession.IsPlaying)));
             Assert.IsFalse(viewModel.IsPlaying);
             Assert.IsTrue(viewModel.IsPlayButtonShown);
         }
@@ -120,8 +121,7 @@ public void PlayPauseButtonListensToAudioSource()
         public async Task PlayPauseButtonPlayAndPauseCommandWorks()
         {
             _appSettings.SetupGet(m => m.PlayPauseButton).Returns(new PlayPauseButton());
-            var viewModel = new PlayPauseButtonViewModel(_appSettings.Object, _dialog.Object);
-            var audioSourceMock = new Mock<IAudioSource>();
+            var audioSourceMock = new Mock<IInternalAudioSource>();
             var isPlayingSequence = new[] {true, false};
             var index = 0;
             audioSourceMock.Setup(m => m.PlayTrackAsync())
@@ -131,7 +131,12 @@ public async Task PlayPauseButtonPlayAndPauseCommandWorks()
                 .Callback(() => Assert.AreEqual(isPlayingSequence[index++], false))
                 .Returns(Task.CompletedTask);
 
+            _session.SetupGet(m => m.CurrentAudioSource).Returns(audioSourceMock.Object);
+            _session.SetupSequence(m => m.IsPlaying).Returns(true).Returns(false);
+
+            var viewModel = new PlayPauseButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object);
             await viewModel.PlayPauseTrackCommand.ExecuteAsync(null);
+            _session.Raise(m => m.PropertyChanged += null, null, new PropertyChangedEventArgs(nameof(IAudioSession.IsPlaying)));
             audioSourceMock.Raise(m => m.IsPlayingChanged += null, null, true);
             await viewModel.PlayPauseTrackCommand.ExecuteAsync(null);
         }
@@ -145,7 +150,7 @@ public void PreviousButtonListensForProfileChanges()
                 .Returns(first)
                 .Returns(second);
 
-            var vm = new PreviousButtonViewModel(_appSettings.Object, _dialog.Object);
+            var vm = new PreviousButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object);
             bool raised = false;
             vm.PropertyChanged += (_, __) => raised = true;
 
@@ -161,10 +166,10 @@ public void PreviousButtonListensForProfileChanges()
         public async Task PreviousButtonCommandCallsPreviousTrack()
         {
             _appSettings.SetupGet(m => m.PreviousButton).Returns(new PreviousButton());
-            var vm = new PreviousButtonViewModel(_appSettings.Object, _dialog.Object);
-            var audioSourceMock = new Mock<IAudioSource>();
+            var audioSourceMock = new Mock<IInternalAudioSource>();
             audioSourceMock.Setup(m => m.PreviousTrackAsync()).Returns(Task.CompletedTask);
-            vm.AudioSource = audioSourceMock.Object;
+            _session.SetupGet(m => m.CurrentAudioSource).Returns(audioSourceMock.Object);
+            var vm = new PreviousButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object);
 
             await vm.PreviousTrackCommand.ExecuteAsync(null);
             audioSourceMock.Verify(m => m.PreviousTrackAsync());
diff --git a/src/AudioBand.Test/CustomLabelsViewModelTests.cs b/src/AudioBand.Test/CustomLabelsViewModelTests.cs
index 502b65b1..5eee1c23 100644
--- a/src/AudioBand.Test/CustomLabelsViewModelTests.cs
+++ b/src/AudioBand.Test/CustomLabelsViewModelTests.cs
@@ -19,6 +19,7 @@ public class CustomLabelsViewModelTests
     {
         private Mock<IDialogService> _dialogMock;
         private Mock<IAppSettings> _appSettingsMock;
+        private Mock<IAudioSession> _sessionMock;
         private CustomLabel _label;
         private CustomLabelsViewModel _viewModel;
 
@@ -29,7 +30,8 @@ public void Init()
             _appSettingsMock = new Mock<IAppSettings>();
             _appSettingsMock.Setup(x => x.CustomLabels).Returns(new List<CustomLabel>());
             _label = new CustomLabel();
-            _viewModel = new CustomLabelsViewModel(_appSettingsMock.Object, _dialogMock.Object);
+            _sessionMock = new Mock<IAudioSession>();
+            _viewModel = new CustomLabelsViewModel(_appSettingsMock.Object, _dialogMock.Object, _sessionMock.Object);
         }
 
         [TestMethod]
@@ -86,7 +88,7 @@ public void RemoveLabel_ThenCancel()
         {
             _appSettingsMock.SetupGet(x => x.CustomLabels).Returns(new List<CustomLabel> { new CustomLabel() });
             _dialogMock.Setup(o => o.ShowConfirmationDialog(It.IsAny<ConfirmationDialogType>(), It.IsAny<object>())).Returns(true);
-            _viewModel = new CustomLabelsViewModel(_appSettingsMock.Object, _dialogMock.Object);
+            _viewModel = new CustomLabelsViewModel(_appSettingsMock.Object, _dialogMock.Object, _sessionMock.Object);
             _viewModel.BeginEdit();
             var label = _viewModel.CustomLabels[0];
             _viewModel.RemoveLabelCommand.Execute(label);
@@ -117,7 +119,7 @@ public void ProfileChangeRemovesAllLabelsAndAddsNewOnes()
                 .Returns(new List<CustomLabel> { new CustomLabel { Name = "test" } })
                 .Returns(new List<CustomLabel> { new CustomLabel { Name = "second" } });
 
-            var vm = new CustomLabelsViewModel(settingsMock.Object, new Mock<IDialogService>().Object);
+            var vm = new CustomLabelsViewModel(settingsMock.Object, new Mock<IDialogService>().Object, _sessionMock.Object);
             Assert.AreEqual(1, vm.CustomLabels.Count);
             Assert.AreEqual("test", vm.CustomLabels[0].Name);
             _appSettingsMock.Raise(m => m.ProfileChanged += null, null, EventArgs.Empty);
@@ -125,18 +127,15 @@ public void ProfileChangeRemovesAllLabelsAndAddsNewOnes()
         }
 
         [TestMethod]
-        public void ProfileChangeUpdateAudioSources()
+        public void ProfileChangeViewModelStillHasCurrentTrackData()
         {
             var settingsMock = new Mock<IAppSettings>();
             settingsMock.SetupSequence(m => m.CustomLabels)
                 .Returns(new List<CustomLabel> {new CustomLabel()});
-            var audioSourceMock = new Mock<IInternalAudioSource>();
-            audioSourceMock.SetupGet(m => m.LastTrackInfo).Returns(new TrackInfoChangedEventArgs());
+            _sessionMock.SetupGet(m => m.IsPlaying).Returns(true);
 
-            var vm = new CustomLabelsViewModel(settingsMock.Object, new Mock<IDialogService>().Object);
-            vm.AudioSource = audioSourceMock.Object;
+            var vm = new CustomLabelsViewModel(settingsMock.Object, new Mock<IDialogService>().Object, _sessionMock.Object);
             _appSettingsMock.Raise(m => m.ProfileChanged += null, null, EventArgs.Empty);
-            audioSourceMock.Raise(m => m.IsPlayingChanged += null, null, true);
             Assert.IsTrue(vm.CustomLabels[0].IsPlaying);
         }
     }
diff --git a/src/AudioBand.Test/CustomTextParsingTests.cs b/src/AudioBand.Test/CustomTextParsingTests.cs
new file mode 100644
index 00000000..e9040e19
--- /dev/null
+++ b/src/AudioBand.Test/CustomTextParsingTests.cs
@@ -0,0 +1,262 @@
+using System;
+using System.ComponentModel;
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Windows.Media;
+using AudioBand.AudioSource;
+using AudioBand.TextFormatting;
+using Moq;
+
+namespace AudioBand.Test
+{
+    [TestClass]
+    public class CustomTextParsingTests
+    {
+        [TestMethod]
+        public void ParseNormal()
+        {
+            var format = "hello";
+            var segments = FormattedTextParser.ParseFormattedString(format, Colors.Black, new Mock<IAudioSession>().Object).ToList();
+
+            Assert.AreEqual(1, segments.Count);
+            Assert.AreEqual("hello", segments[0].Text);
+            Assert.IsTrue(segments[0].Flags.HasFlag(FormattedTextFlags.Normal));
+        }
+
+        [TestMethod]
+        public void ParseEmpty()
+        {
+            var format = "";
+            var segments = FormattedTextParser.ParseFormattedString(format, Colors.Black, new Mock<IAudioSession>().Object).ToList();
+
+            Assert.AreEqual(0, segments.Count);
+        }
+
+        [TestMethod]
+        public void ParseSinglePlaceholder()
+        {
+            var format = "{artist}";
+            var artist = "123";
+            var session = new Mock<IAudioSession>();
+            session.SetupGet(m => m.SongArtist).Returns(artist);
+            var segments = FormattedTextParser.ParseFormattedString(format, Colors.Black, session.Object).ToList();
+
+            Assert.AreEqual(1, segments.Count);
+            Assert.AreEqual(artist, segments[0].Text);
+        }
+
+        [TestMethod]
+        public void ParsePlaceholderWithNormal()
+        {
+            var format = "{artist} song";
+            var artist = "123";
+            var session = new Mock<IAudioSession>();
+            session.SetupGet(m => m.SongArtist).Returns(artist);
+            var segments = FormattedTextParser.ParseFormattedString(format, Colors.Black, session.Object).ToList();
+            Assert.AreEqual(2, segments.Count);
+
+            Assert.AreEqual(artist, segments[0].Text);
+
+            Assert.AreEqual(" song", segments[1].Text);
+            Assert.IsTrue(segments[1].Flags.HasFlag(FormattedTextFlags.Normal));
+        }
+
+        [TestMethod]
+        public void ParseSingleNormalWithPlaceholder()
+        {
+            var format = "by {artist}";
+            var artist = "123";
+            var session = new Mock<IAudioSession>();
+            session.SetupGet(m => m.SongArtist).Returns(artist);
+            var segments = FormattedTextParser.ParseFormattedString(format, Colors.Black, session.Object).ToList();
+
+            Assert.AreEqual(2, segments.Count);
+
+            Assert.AreEqual("by ", segments[0].Text);
+            Assert.IsTrue(segments[0].Flags.HasFlag(FormattedTextFlags.Normal));
+
+            Assert.AreEqual(artist, segments[1].Text);
+        }
+
+        [TestMethod]
+        public void ParseUnclosed()
+        {
+            var format = "{artist";
+            var segments = FormattedTextParser.ParseFormattedString(format, Colors.Black, new Mock<IAudioSession>().Object).ToList();
+
+            Assert.AreEqual(1, segments.Count);
+            Assert.AreEqual("{artist", segments[0].Text);
+            Assert.IsTrue(segments[0].Flags.HasFlag(FormattedTextFlags.Normal));
+        }
+
+        [TestMethod]
+        public void ParseOnlyClosing()
+        {
+            var format = "}";
+            var segments = FormattedTextParser.ParseFormattedString(format, Colors.Black, new Mock<IAudioSession>().Object).ToList();
+
+            Assert.AreEqual(1, segments.Count);
+            Assert.AreEqual("}", segments[0].Text);
+            Assert.IsTrue(segments[0].Flags.HasFlag(FormattedTextFlags.Normal));
+        }
+
+        [TestMethod]
+        public void ParseComplex()
+        {
+            var format = "this is {artist} and ";
+            var artist = "123";
+            var session = new Mock<IAudioSession>();
+            session.SetupGet(m => m.SongArtist).Returns(artist);
+            var segments = FormattedTextParser
+                .ParseFormattedString(format, Colors.Black, session.Object).ToList();
+
+            Assert.AreEqual(3, segments.Count);
+
+            Assert.AreEqual("this is ", segments[0].Text);
+            Assert.IsTrue(segments[0].Flags.HasFlag(FormattedTextFlags.Normal));
+
+            Assert.AreEqual(artist, segments[1].Text);
+
+            Assert.AreEqual(" and ", segments[2].Text);
+            Assert.IsTrue(segments[2].Flags.HasFlag(FormattedTextFlags.Normal));
+        }
+
+        [TestMethod]
+        public void ParseInvalidFormat()
+        {
+            var format = "{something}";
+            var segments = FormattedTextParser.ParseFormattedString(format, Colors.Black, new Mock<IAudioSession>().Object).ToList();
+
+            Assert.AreEqual(1, segments.Count);
+
+            Assert.AreEqual("!Invalid format!", segments[0].Text);
+            Assert.IsTrue(segments[0].Flags.HasFlag(FormattedTextFlags.Normal));
+        }
+
+        [TestMethod]
+        public void ParseArtist()
+        {
+            var format = "{artist}";
+            var artist = "123";
+            var artist2 = "next";
+            var mock = new Mock<IAudioSession>();
+            mock.SetupSequence(m => m.SongArtist).Returns(artist).Returns(artist2);
+            var segments = FormattedTextParser.ParseFormattedString(format, Colors.Black, mock.Object).ToList();
+
+            Assert.AreEqual(1, segments.Count);
+            Assert.AreEqual(artist, segments[0].Text);
+
+            mock.Raise(m => m.PropertyChanged += null, null, new PropertyChangedEventArgs(nameof(IAudioSession.SongArtist)));
+            Assert.AreEqual(artist2, segments[0].Text);
+        }
+
+        [TestMethod]
+        public void ParseSong()
+        {
+            var format = "{song}";
+            var song = "the song";
+            var mock = new Mock<IAudioSession>();
+            mock.SetupGet(m => m.SongName).Returns(song);
+            var segments = FormattedTextParser.ParseFormattedString(format, Colors.Black, mock.Object).ToList();
+
+            Assert.AreEqual(1, segments.Count);
+            Assert.AreEqual(song, segments[0].Text);
+        }
+
+        [TestMethod]
+        public void ParseAlbum()
+        {
+            var format = "{album}";
+            var album = "the album";
+            var mock = new Mock<IAudioSession>();
+            mock.SetupGet(m => m.AlbumName).Returns(album);
+            var segments = FormattedTextParser.ParseFormattedString(format, Colors.Black, mock.Object).ToList();
+
+            Assert.AreEqual(1, segments.Count);
+            Assert.AreEqual(album, segments[0].Text);
+        }
+
+        [TestMethod]
+        public void ParseTime()
+        {
+            var format = "{time}";
+            var time = TimeSpan.FromSeconds(40);
+            var mock = new Mock<IAudioSession>();
+            mock.SetupGet(m => m.SongProgress).Returns(time);
+            var segments = FormattedTextParser.ParseFormattedString(format, Colors.Black, mock.Object).ToList();
+
+            Assert.AreEqual(1, segments.Count);
+            Assert.AreEqual("0:40", segments[0].Text);
+        }
+
+        [TestMethod]
+        public void ParseLength()
+        {
+            var format = "{length}";
+            var time = TimeSpan.FromSeconds(80);
+            var mock = new Mock<IAudioSession>();
+            mock.SetupGet(m => m.SongLength).Returns(time);
+            var segments = FormattedTextParser.ParseFormattedString(format, Colors.Black, mock.Object).ToList();
+
+            Assert.AreEqual(1, segments.Count);
+            Assert.AreEqual("1:20", segments[0].Text);
+        }
+
+        [TestMethod]
+        public void ParseStyleBold()
+        {
+            var format = "{*artist}";
+            var mock = new Mock<IAudioSession>();
+            var segments = FormattedTextParser.ParseFormattedString(format, Colors.Black, mock.Object).ToList();
+
+            Assert.AreEqual(1, segments.Count);
+            Assert.IsTrue(segments[0].Flags.HasFlag(FormattedTextFlags.Bold));
+        }
+
+        [TestMethod]
+        public void ParseStyleItalic()
+        {
+            var format = "{&artist}";
+            var segments = FormattedTextParser
+                .ParseFormattedString(format, Colors.Black, new Mock<IAudioSession>().Object).ToList();
+
+            Assert.AreEqual(1, segments.Count);
+            Assert.IsTrue(segments[0].Flags.HasFlag(FormattedTextFlags.Italic));
+        }
+
+        [TestMethod]
+        public void ParseStyleUnderline()
+        {
+            var format = "{_artist}";
+            var segments = FormattedTextParser
+                .ParseFormattedString(format, Colors.Black, new Mock<IAudioSession>().Object).ToList();
+
+            Assert.AreEqual(1, segments.Count);
+            Assert.IsTrue(segments[0].Flags.HasFlag(FormattedTextFlags.Underline));
+        }
+
+        [TestMethod]
+        public void ParseStyleWithColor()
+        {
+            var format = "{_artist:#ff00ff}";
+            var segments = FormattedTextParser
+                .ParseFormattedString(format, Colors.Black, new Mock<IAudioSession>().Object).ToList();
+
+            Assert.AreEqual(1, segments.Count);
+            Assert.IsTrue(segments[0].Flags.HasFlag(FormattedTextFlags.Underline));
+            Assert.AreEqual(Color.FromRgb(255, 0, 255), segments[0].Color);
+        }
+
+        [TestMethod]
+        public void ParseMultipleStyles()
+        {
+            var format = "{*_artist}";
+            var segments = FormattedTextParser
+                .ParseFormattedString(format, Colors.Black, new Mock<IAudioSession>().Object).ToList();
+
+            Assert.AreEqual(1, segments.Count);
+            Assert.IsTrue(segments[0].Flags.HasFlag(FormattedTextFlags.Underline));
+            Assert.IsTrue(segments[0].Flags.HasFlag(FormattedTextFlags.Bold));
+        }
+    }
+}
diff --git a/src/AudioBand.Test/ProgressBarViewModelTests.cs b/src/AudioBand.Test/ProgressBarViewModelTests.cs
index 7d76eead..b0b8e041 100644
--- a/src/AudioBand.Test/ProgressBarViewModelTests.cs
+++ b/src/AudioBand.Test/ProgressBarViewModelTests.cs
@@ -5,6 +5,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using System.Windows.Media;
+using AudioBand.AudioSource;
 
 namespace AudioBand.Test
 {
@@ -22,7 +23,7 @@ public void ListensForProfileChanges()
                 .Returns(first)
                 .Returns(second);
 
-            var vm = new ProgressBarViewModel(settingsMock.Object, new Mock<IDialogService>().Object);
+            var vm = new ProgressBarViewModel(settingsMock.Object, new Mock<IDialogService>().Object, new Mock<IAudioSession>().Object);
             bool raised = false;
             vm.PropertyChanged += (_, __) => raised = true;
 
diff --git a/src/AudioBand.Test/SettingsWindowViewModelTests.cs b/src/AudioBand.Test/SettingsWindowViewModelTests.cs
index 4da78bb7..c64eda42 100644
--- a/src/AudioBand.Test/SettingsWindowViewModelTests.cs
+++ b/src/AudioBand.Test/SettingsWindowViewModelTests.cs
@@ -7,6 +7,7 @@
 using System.Web.ModelBinding;
 using System.Windows.Controls;
 using System.Windows.Forms;
+using AudioBand.AudioSource;
 using AudioBand.Messages;
 using AudioBand.Models;
 using AudioBand.Settings;
@@ -32,7 +33,7 @@ public void TestSetup()
             _appSettings.SetupGet(m => m.CustomLabels).Returns(new List<CustomLabel>());
             _dialog = new Mock<IDialogService>();
             _container = new Mock<IViewModelContainer>();
-            _container.SetupGet(m => m.CustomLabelsViewModel).Returns(new CustomLabelsViewModel(_appSettings.Object, _dialog.Object));
+            _container.SetupGet(m => m.CustomLabelsViewModel).Returns(new CustomLabelsViewModel(_appSettings.Object, _dialog.Object, new Mock<IAudioSession>().Object));
             _messageBus = new Mock<IMessageBus>();
         }
 
diff --git a/src/AudioBand.Test/TextRendererTests.cs b/src/AudioBand.Test/TextRendererTests.cs
deleted file mode 100644
index 73383013..00000000
--- a/src/AudioBand.Test/TextRendererTests.cs
+++ /dev/null
@@ -1,296 +0,0 @@
-using System;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Windows.Media;
-using AudioBand.TextFormatting;
-
-namespace AudioBand.Test
-{
-    [TestClass]
-    public class TextRendererTests
-    {
-        [TestMethod]
-        public void ParseNormal()
-        {
-            var format = "hello";
-            var r = new FormattedTextParser(format, Colors.Black);
-
-            Assert.AreEqual(1, r.TextSegments.Count);
-            Assert.AreEqual("hello", r.TextSegments[0].Text);
-            Assert.IsTrue(r.TextSegments[0].Type.HasFlag(FormattedTextFlags.Normal));
-        }
-
-        [TestMethod]
-        public void ParseEmpty()
-        {
-            var format = "";
-            var r = new FormattedTextParser(format, Colors.Black);
-
-            Assert.AreEqual(0, r.TextSegments.Count);
-        }
-
-        [TestMethod]
-        public void ParseSinglePlaceholder()
-        {
-            var format = "{artist}";
-            var artist = "123";
-            var r = new FormattedTextParser(format, Colors.Black)
-            {
-                Artist = artist
-            };
-
-            Assert.AreEqual(1, r.TextSegments.Count);
-            Assert.AreEqual(artist, r.TextSegments[0].Text);
-            Assert.IsTrue(r.TextSegments[0].Type.HasFlag(FormattedTextFlags.Artist));
-        }
-
-        [TestMethod]
-        public void ParsePlaceholderWithNormal()
-        {
-            var format = "{artist} song";
-            var artist = "123";
-            var r = new FormattedTextParser(format, Colors.Black)
-            {
-                Artist = artist
-            };
-
-            Assert.AreEqual(2, r.TextSegments.Count);
-
-            Assert.AreEqual(artist, r.TextSegments[0].Text);
-            Assert.IsTrue(r.TextSegments[0].Type.HasFlag(FormattedTextFlags.Artist));
-
-            Assert.AreEqual(" song", r.TextSegments[1].Text);
-            Assert.IsTrue(r.TextSegments[1].Type.HasFlag(FormattedTextFlags.Normal));
-        }
-
-        [TestMethod]
-        public void ParseSingleNormalWithPlaceholder()
-        {
-            var format = "by {artist}";
-            var artist = "123";
-            var r = new FormattedTextParser(format, Colors.Black)
-            {
-                Artist = artist
-            };
-
-            Assert.AreEqual(2, r.TextSegments.Count);
-
-            Assert.AreEqual("by ", r.TextSegments[0].Text);
-            Assert.IsTrue(r.TextSegments[0].Type.HasFlag(FormattedTextFlags.Normal));
-
-            Assert.AreEqual(artist, r.TextSegments[1].Text);
-            Assert.IsTrue(r.TextSegments[1].Type.HasFlag(FormattedTextFlags.Artist));
-        }
-
-        [TestMethod]
-        public void ParseUnclosed()
-        {
-            var format = "{artist";
-            var r = new FormattedTextParser(format, Colors.Black);
-
-            Assert.AreEqual(1, r.TextSegments.Count);
-            Assert.AreEqual("{artist", r.TextSegments[0].Text);
-            Assert.IsTrue(r.TextSegments[0].Type.HasFlag(FormattedTextFlags.Normal));
-        }
-
-        [TestMethod]
-        public void ParseOnlyClosing()
-        {
-            var format = "}";
-            var r = new FormattedTextParser(format, Colors.Black);
-
-            Assert.AreEqual(1, r.TextSegments.Count);
-            Assert.AreEqual("}", r.TextSegments[0].Text);
-            Assert.IsTrue(r.TextSegments[0].Type.HasFlag(FormattedTextFlags.Normal));
-        }
-
-        [TestMethod]
-        public void ParseComplex()
-        {
-            var format = "this is {artist} and ";
-            var artist = "123";
-            var r = new FormattedTextParser(format, Colors.Black)
-            {
-                Artist = artist
-            };
-
-            Assert.AreEqual(3, r.TextSegments.Count);
-
-            Assert.AreEqual("this is ", r.TextSegments[0].Text);
-            Assert.IsTrue(r.TextSegments[0].Type.HasFlag(FormattedTextFlags.Normal));
-
-            Assert.AreEqual(artist, r.TextSegments[1].Text);
-            Assert.IsTrue(r.TextSegments[1].Type.HasFlag(FormattedTextFlags.Artist));
-
-            Assert.AreEqual(" and ", r.TextSegments[2].Text);
-            Assert.IsTrue(r.TextSegments[2].Type.HasFlag(FormattedTextFlags.Normal));
-        }
-
-        [TestMethod]
-        public void ParseInvalidFormat()
-        {
-            var format = "{something}";
-            var r = new FormattedTextParser(format, Colors.Black);
-
-            Assert.AreEqual(1, r.TextSegments.Count);
-
-            Assert.AreEqual("! invalid format !", r.TextSegments[0].Text);
-            Assert.IsTrue(r.TextSegments[0].Type.HasFlag(FormattedTextFlags.Normal));
-        }
-
-        [TestMethod]
-        public void ParseArtist()
-        {
-            var format = "{artist}";
-            var artist = "123";
-            var r = new FormattedTextParser(format, Colors.Black)
-            {
-                Artist = artist
-            };
-
-            Assert.AreEqual(1, r.TextSegments.Count);
-            Assert.AreEqual(artist, r.TextSegments[0].Text);
-            Assert.IsTrue(r.TextSegments[0].Type.HasFlag(FormattedTextFlags.Artist));
-        }
-
-        [TestMethod]
-        public void ParseSong()
-        {
-            var format = "{song}";
-            var song = "the song";
-            var r = new FormattedTextParser(format, Colors.Black)
-            {
-                SongName = song
-            };
-
-            Assert.AreEqual(1, r.TextSegments.Count);
-            Assert.AreEqual(song, r.TextSegments[0].Text);
-            Assert.IsTrue(r.TextSegments[0].Type.HasFlag(FormattedTextFlags.Song));
-        }
-
-        [TestMethod]
-        public void ParseAlbum()
-        {
-            var format = "{album}";
-            var album = "the album";
-            var r = new FormattedTextParser(format, Colors.Black)
-            {
-                AlbumName = album
-            };
-
-            Assert.AreEqual(1, r.TextSegments.Count);
-            Assert.AreEqual(album, r.TextSegments[0].Text);
-            Assert.IsTrue(r.TextSegments[0].Type.HasFlag(FormattedTextFlags.Album));
-        }
-
-        [TestMethod]
-        public void ParseTime()
-        {
-            var format = "{time}";
-            var time = TimeSpan.FromSeconds(40);
-            var r = new FormattedTextParser(format, Colors.Black)
-            {
-                SongProgress = time,
-            };
-
-            Assert.AreEqual(1, r.TextSegments.Count);
-            Assert.AreEqual("0:40", r.TextSegments[0].Text);
-            Assert.IsTrue(r.TextSegments[0].Type.HasFlag(FormattedTextFlags.CurrentTime));
-        }
-
-        [TestMethod]
-        public void ParseLength()
-        {
-            var format = "{length}";
-            var time = TimeSpan.FromSeconds(80);
-            var r = new FormattedTextParser(format, Colors.Black)
-            {
-                SongLength = time,
-            };
-
-            Assert.AreEqual(1, r.TextSegments.Count);
-            Assert.AreEqual("1:20", r.TextSegments[0].Text);
-            Assert.IsTrue(r.TextSegments[0].Type.HasFlag(FormattedTextFlags.SongLength));
-        }
-
-        [TestMethod]
-        public void ParseStyleBold()
-        {
-            var format = "{*artist}";
-            var artist = "123";
-            var r = new FormattedTextParser(format, Colors.Black)
-            {
-                Artist = artist
-            };
-
-            Assert.AreEqual(1, r.TextSegments.Count);
-            Assert.AreEqual(artist, r.TextSegments[0].Text);
-            Assert.IsTrue(r.TextSegments[0].Type.HasFlag(FormattedTextFlags.Artist));
-            Assert.IsTrue(r.TextSegments[0].Type.HasFlag(FormattedTextFlags.Bold));
-        }
-
-        [TestMethod]
-        public void ParseStyleItalic()
-        {
-            var format = "{&artist}";
-            var artist = "123";
-            var r = new FormattedTextParser(format, Colors.Black)
-            {
-                Artist = artist
-            };
-
-            Assert.AreEqual(1, r.TextSegments.Count);
-            Assert.AreEqual(artist, r.TextSegments[0].Text);
-            Assert.IsTrue(r.TextSegments[0].Type.HasFlag(FormattedTextFlags.Artist));
-            Assert.IsTrue(r.TextSegments[0].Type.HasFlag(FormattedTextFlags.Italic));
-        }
-
-        [TestMethod]
-        public void ParseStyleUnderline()
-        {
-            var format = "{_artist}";
-            var artist = "123";
-            var r = new FormattedTextParser(format, Colors.Black)
-            {
-                Artist = artist
-            };
-
-            Assert.AreEqual(1, r.TextSegments.Count);
-            Assert.AreEqual(artist, r.TextSegments[0].Text);
-            Assert.IsTrue(r.TextSegments[0].Type.HasFlag(FormattedTextFlags.Artist));
-            Assert.IsTrue(r.TextSegments[0].Type.HasFlag(FormattedTextFlags.Underline));
-        }
-
-        [TestMethod]
-        public void ParseStyleWithColor()
-        {
-            var format = "{_artist:#ff00ff}";
-            var artist = "123";
-            var r = new FormattedTextParser(format, Colors.Black)
-            {
-                Artist = artist
-            };
-
-            Assert.AreEqual(1, r.TextSegments.Count);
-            Assert.AreEqual(artist, r.TextSegments[0].Text);
-            Assert.IsTrue(r.TextSegments[0].Type.HasFlag(FormattedTextFlags.Artist));
-            Assert.IsTrue(r.TextSegments[0].Type.HasFlag(FormattedTextFlags.Underline));
-            Assert.AreEqual(Color.FromRgb(255, 0, 255), r.TextSegments[0].Color);
-        }
-
-        [TestMethod]
-        public void ParseMultipleStyles()
-        {
-            var format = "{*_artist}";
-            var artist = "test";
-            var r = new FormattedTextParser(format, Colors.Black)
-            {
-                Artist = artist,
-            };
-            Assert.AreEqual(1, r.TextSegments.Count);
-            Assert.AreEqual(artist, r.TextSegments[0].Text);
-            Assert.IsTrue(r.TextSegments[0].Type.HasFlag(FormattedTextFlags.Artist));
-            Assert.IsTrue(r.TextSegments[0].Type.HasFlag(FormattedTextFlags.Underline));
-            Assert.IsTrue(r.TextSegments[0].Type.HasFlag(FormattedTextFlags.Bold));
-        }
-    }
-}
diff --git a/src/AudioBand/ViewModels/CustomLabelViewModel.cs b/src/AudioBand/ViewModels/CustomLabelViewModel.cs
index da25d0a9..747f784b 100644
--- a/src/AudioBand/ViewModels/CustomLabelViewModel.cs
+++ b/src/AudioBand/ViewModels/CustomLabelViewModel.cs
@@ -34,6 +34,7 @@ public CustomLabelViewModel(CustomLabel model, IDialogService dialogService, IAu
 
             DialogService = dialogService;
             TextSegments = FormattedTextParser.ParseFormattedString(FormatString, Color, audioSession);
+            IsPlaying = _audioSession.IsPlaying;
         }
 
         /// <summary>

From 6f7be9258d783999c51f261d7768b97e1505a62e Mon Sep 17 00:00:00 2001
From: Brandon Chong <brndnchong@gmail.com>
Date: Wed, 12 Jun 2019 15:50:54 -0700
Subject: [PATCH 04/17] Add remaining time text placeholder

---
 src/AudioBand/AudioBand.csproj                |  1 +
 src/AudioBand/Resources/Strings.xaml          |  3 +-
 .../RemainingTimePlaceholder.cs               | 42 +++++++++++++++++++
 .../TextFormatting/TextPlaceholderFactory.cs  |  1 +
 4 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 src/AudioBand/TextFormatting/RemainingTimePlaceholder.cs

diff --git a/src/AudioBand/AudioBand.csproj b/src/AudioBand/AudioBand.csproj
index 705f4d1b..a06c6fd7 100644
--- a/src/AudioBand/AudioBand.csproj
+++ b/src/AudioBand/AudioBand.csproj
@@ -185,6 +185,7 @@
     <Compile Include="Settings\Profiles\SettingsV3Profile.cs" />
     <Compile Include="TaskbarHook.cs" />
     <Compile Include="TextFormatting\AlbumNamePlaceholder.cs" />
+    <Compile Include="TextFormatting\RemainingTimePlaceholder.cs" />
     <Compile Include="TextFormatting\SongArtistPlaceholder.cs" />
     <Compile Include="TextFormatting\SongLengthPlaceholder.cs" />
     <Compile Include="TextFormatting\SongNamePlaceholder.cs" />
diff --git a/src/AudioBand/Resources/Strings.xaml b/src/AudioBand/Resources/Strings.xaml
index b537eb93..2f8d549c 100644
--- a/src/AudioBand/Resources/Strings.xaml
+++ b/src/AudioBand/Resources/Strings.xaml
@@ -70,7 +70,8 @@ Placeholders will be substituted with their corresponding values. Placeholders a
 &#8226; song - The title of the current song
 &#8226; album - Album name for the current song
 &#8226; time - Current playback time for the current song
-&#8226; length - Total length of the current song</sys:String>
+&#8226; length - Total length of the current song
+&#8226; remaining - The remaining time left in current song</sys:String>
     <sys:String x:Key="CustomLabelFormatHelpTextStyles" xml:space="preserve">&#8226; * - Bolds the placeholder
 &#8226; &amp; - Italicizes the placeholder
 &#8226; _ - Underlines the placeholder</sys:String>
diff --git a/src/AudioBand/TextFormatting/RemainingTimePlaceholder.cs b/src/AudioBand/TextFormatting/RemainingTimePlaceholder.cs
new file mode 100644
index 00000000..f2ac4f46
--- /dev/null
+++ b/src/AudioBand/TextFormatting/RemainingTimePlaceholder.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using AudioBand.AudioSource;
+using AudioBand.Extensions;
+
+namespace AudioBand.TextFormatting
+{
+    /// <summary>
+    /// A <see cref="TextPlaceholder"/> with the value of the remaining time in the song.
+    /// </summary>
+    public class RemainingTimePlaceholder : TextPlaceholder
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RemainingTimePlaceholder"/> class.
+        /// </summary>
+        /// <param name="parameters">The placeholder parameters.</param>
+        /// <param name="audioSession">The audio session.</param>
+        public RemainingTimePlaceholder(IEnumerable<TextPlaceholderParameter> parameters, IAudioSession audioSession)
+            : base(parameters, audioSession)
+        {
+            AddSessionPropertyFilter(nameof(IAudioSession.SongProgress));
+            AddSessionPropertyFilter(nameof(IAudioSession.SongLength));
+        }
+
+        /// <inheritdoc />
+        public override string GetText()
+        {
+            if (Session.SongLength < Session.SongProgress)
+            {
+                return TimeSpan.Zero.Format();
+            }
+
+            return (Session.SongLength - Session.SongProgress).Format();
+        }
+
+        /// <inheritdoc />
+        protected override void OnAudioSessionPropertyChanged(string propertyName)
+        {
+            RaiseTextChanged();
+        }
+    }
+}
diff --git a/src/AudioBand/TextFormatting/TextPlaceholderFactory.cs b/src/AudioBand/TextFormatting/TextPlaceholderFactory.cs
index f7c8bc08..ae173c73 100644
--- a/src/AudioBand/TextFormatting/TextPlaceholderFactory.cs
+++ b/src/AudioBand/TextFormatting/TextPlaceholderFactory.cs
@@ -15,6 +15,7 @@ public static class TextPlaceholderFactory
             { "album", (parameters, session) => new AlbumNamePlaceholder(parameters, session) },
             { "time", (parameters, session) => new SongProgressPlaceholder(parameters, session) },
             { "length", (parameters, session) => new SongLengthPlaceholder(parameters, session) },
+            { "remaining", (parameters, session) => new RemainingTimePlaceholder(parameters, session) },
         };
 
         private delegate TextPlaceholder PlaceholderFactoryFunc(IEnumerable<TextPlaceholderParameter> parameters, IAudioSession session);

From 6dd67d2d5a7aec9d639159667a5659ab43cc0124 Mon Sep 17 00:00:00 2001
From: Brandon Chong <brndnchong@gmail.com>
Date: Thu, 13 Jun 2019 17:10:28 -0700
Subject: [PATCH 05/17] Add new base objects

---
 .../{ViewModels => }/AlsoNotifyAttribute.cs   |   3 +-
 src/AudioBand/ChangeTracking/ChangeTracker.cs |  83 ++++++++++++
 .../ChangeTracking/IChangeTrackable.cs        |  21 +++
 .../ChangeTracking/IChangeTracker.cs          |  48 +++++++
 src/AudioBand/ObservableObject.cs             | 110 ++++++++++++++++
 src/AudioBand/ViewModels/ViewModelBase.cs     | 120 ++++--------------
 6 files changed, 287 insertions(+), 98 deletions(-)
 rename src/AudioBand/{ViewModels => }/AlsoNotifyAttribute.cs (92%)
 create mode 100644 src/AudioBand/ChangeTracking/ChangeTracker.cs
 create mode 100644 src/AudioBand/ChangeTracking/IChangeTrackable.cs
 create mode 100644 src/AudioBand/ChangeTracking/IChangeTracker.cs
 create mode 100644 src/AudioBand/ObservableObject.cs

diff --git a/src/AudioBand/ViewModels/AlsoNotifyAttribute.cs b/src/AudioBand/AlsoNotifyAttribute.cs
similarity index 92%
rename from src/AudioBand/ViewModels/AlsoNotifyAttribute.cs
rename to src/AudioBand/AlsoNotifyAttribute.cs
index 1f25c7bb..a695c10a 100644
--- a/src/AudioBand/ViewModels/AlsoNotifyAttribute.cs
+++ b/src/AudioBand/AlsoNotifyAttribute.cs
@@ -1,7 +1,8 @@
 using System;
 using System.ComponentModel;
+using AudioBand.ViewModels;
 
-namespace AudioBand.ViewModels
+namespace AudioBand
 {
     /// <summary>
     /// Specifies that <see cref="INotifyPropertyChanged.PropertyChanged"/> event of <see cref="ViewModelBase{TModel}"/> will be raised for other properties.
diff --git a/src/AudioBand/ChangeTracking/ChangeTracker.cs b/src/AudioBand/ChangeTracking/ChangeTracker.cs
new file mode 100644
index 00000000..1fd316d8
--- /dev/null
+++ b/src/AudioBand/ChangeTracking/ChangeTracker.cs
@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace AudioBand.ChangeTracking
+{
+    /// <summary>
+    /// Basic change tracker.
+    /// </summary>
+    public class ChangeTracker : IChangeTracker
+    {
+        private readonly HashSet<IChangeTrackable> _trackedObjects = new HashSet<IChangeTrackable>();
+        private readonly HashSet<IChangeTrackable> _objectsThatAreEditing = new HashSet<IChangeTrackable>();
+
+        /// <inheritdoc />
+        public event EventHandler TrackingStateChanged;
+
+        /// <inheritdoc />
+        public bool IsAnyEditing => _objectsThatAreEditing.Any();
+
+        /// <inheritdoc />
+        public void Add(IChangeTrackable toTrack)
+        {
+            _trackedObjects.Add(toTrack);
+            toTrack.IsEditingChanged += ChangeTrackableOnIsEditingChanged;
+        }
+
+        /// <inheritdoc />
+        public void Remove(IChangeTrackable toTrack)
+        {
+            _trackedObjects.Remove(toTrack);
+            toTrack.IsEditingChanged -= ChangeTrackableOnIsEditingChanged;
+        }
+
+        /// <inheritdoc />
+        public void BeginEditAll()
+        {
+            foreach (var changeTrackable in _trackedObjects)
+            {
+                changeTrackable.BeginEdit();
+            }
+        }
+
+        /// <inheritdoc />
+        public void CancelEditAll()
+        {
+            foreach (var changeTrackable in _trackedObjects)
+            {
+                changeTrackable.CancelEdit();
+            }
+        }
+
+        /// <inheritdoc />
+        public void EndEditAll()
+        {
+            foreach (var changeTrackable in _trackedObjects)
+            {
+                changeTrackable.EndEdit();
+            }
+        }
+
+        private void ChangeTrackableOnIsEditingChanged(object sender, EventArgs e)
+        {
+            var trackable = (IChangeTrackable)sender;
+            if (trackable.IsEditing)
+            {
+                _objectsThatAreEditing.Add(trackable);
+                if (_objectsThatAreEditing.Count == 1)
+                {
+                    TrackingStateChanged?.Invoke(this, EventArgs.Empty);
+                }
+            }
+            else
+            {
+                _objectsThatAreEditing.Remove(trackable);
+                if (_objectsThatAreEditing.Count == 0)
+                {
+                    TrackingStateChanged?.Invoke(this, EventArgs.Empty);
+                }
+            }
+        }
+    }
+}
diff --git a/src/AudioBand/ChangeTracking/IChangeTrackable.cs b/src/AudioBand/ChangeTracking/IChangeTrackable.cs
new file mode 100644
index 00000000..6df869d0
--- /dev/null
+++ b/src/AudioBand/ChangeTracking/IChangeTrackable.cs
@@ -0,0 +1,21 @@
+using System;
+using System.ComponentModel;
+
+namespace AudioBand.ChangeTracking
+{
+    /// <summary>
+    /// Interface that marks an object as being able to participate in the change tracking system.
+    /// </summary>
+    public interface IChangeTrackable : IEditableObject
+    {
+        /// <summary>
+        /// Occurs when the <see cref="IsEditing"/> property value has changed.
+        /// </summary>
+        event EventHandler IsEditingChanged;
+
+        /// <summary>
+        /// Gets a value indicating whether the current object is being edited.
+        /// </summary>
+        bool IsEditing { get; }
+    }
+}
diff --git a/src/AudioBand/ChangeTracking/IChangeTracker.cs b/src/AudioBand/ChangeTracking/IChangeTracker.cs
new file mode 100644
index 00000000..c22596e8
--- /dev/null
+++ b/src/AudioBand/ChangeTracking/IChangeTracker.cs
@@ -0,0 +1,48 @@
+using System;
+using System.ComponentModel;
+
+namespace AudioBand.ChangeTracking
+{
+    /// <summary>
+    /// An object that maintains change tracking for <see cref="IChangeTrackable"/> objects.
+    /// </summary>
+    public interface IChangeTracker
+    {
+        /// <summary>
+        /// Occurs when the change tracking state is changed.
+        /// </summary>
+        event EventHandler TrackingStateChanged;
+
+        /// <summary>
+        /// Gets a value indicating whether any associated <see cref="IChangeTrackable"/> object has <see cref="IChangeTrackable.IsEditing"/> set to true.
+        /// </summary>
+        bool IsAnyEditing { get; }
+
+        /// <summary>
+        /// Adds a <see cref="IChangeTrackable"/> object to the tracking scope.
+        /// </summary>
+        /// <param name="toTrack">The object add to tracking.</param>
+        void Add(IChangeTrackable toTrack);
+
+        /// <summary>
+        /// Removes a <see cref="IChangeTrackable"/> object from the tracking scope.
+        /// </summary>
+        /// <param name="toTrack">The object to remove from tracking.</param>
+        void Remove(IChangeTrackable toTrack);
+
+        /// <summary>
+        /// Calls <see cref="IEditableObject.BeginEdit"/> for all tracked objects.
+        /// </summary>
+        void BeginEditAll();
+
+        /// <summary>
+        /// Calls <see cref="IEditableObject.CancelEdit"/> for all tracked objects.
+        /// </summary>
+        void CancelEditAll();
+
+        /// <summary>
+        /// Calls <see cref="IEditableObject.EndEdit"/> for all tracked objects.
+        /// </summary>
+        void EndEditAll();
+    }
+}
diff --git a/src/AudioBand/ObservableObject.cs b/src/AudioBand/ObservableObject.cs
new file mode 100644
index 00000000..1d7ea8fa
--- /dev/null
+++ b/src/AudioBand/ObservableObject.cs
@@ -0,0 +1,110 @@
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using FastMember;
+
+namespace AudioBand
+{
+    /// <summary>
+    /// Base object that implements and provides facilities for <see cref="INotifyPropertyChanged"/>.
+    /// </summary>
+    public abstract class ObservableObject : INotifyPropertyChanged
+    {
+        private readonly Dictionary<string, string[]> _alsoNotifyMap = new Dictionary<string, string[]>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ObservableObject"/> class.
+        /// </summary>
+        protected ObservableObject()
+        {
+            Accessor = TypeAccessor.Create(GetType(), true);
+            SetupAlsoNotify();
+        }
+
+        /// <inheritdoc />
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        /// <summary>
+        /// Gets the type accessor for this object.
+        /// </summary>
+        protected TypeAccessor Accessor { get; }
+
+        /// <summary>
+        /// Raises the <see cref="PropertyChanged"/> event.
+        /// </summary>
+        /// <param name="propertyName">Name of the property that changed.</param>
+        protected void RaisePropertyChanged([CallerMemberName] string propertyName = null)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+
+        /// <summary>
+        /// Notifies all properties changed.
+        /// </summary>
+        protected void RaisePropertyChangedAll()
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(string.Empty));
+        }
+
+        /// <summary>
+        /// Sets the <paramref name="field"/> to the <paramref name="newValue"/> if they are different and raise <see cref="PropertyChanged"/>
+        /// for the property and other properties marked with the <see cref="AlsoNotifyAttribute"/>.
+        /// </summary>
+        /// <typeparam name="T">Type of the property.</typeparam>
+        /// <param name="field">Old value.</param>
+        /// <param name="newValue">New value.</param>
+        /// <param name="propertyName">Name of the property that changed.</param>
+        /// <returns>True if the property changed.</returns>
+        protected virtual bool SetProperty<T>(ref T field, T newValue, [CallerMemberName] string propertyName = null)
+        {
+            if (EqualityComparer<T>.Default.Equals(field, newValue))
+            {
+                return false;
+            }
+
+            OnPropertyChanging(propertyName);
+            field = newValue;
+            RaisePropertyChanged(propertyName);
+            OnPropertyChanged(propertyName);
+
+            if (_alsoNotifyMap.TryGetValue(propertyName, out var alsoNotify))
+            {
+                foreach (var alsoNotifyPropertyName in alsoNotify)
+                {
+                    OnPropertyChanging(alsoNotifyPropertyName);
+                    RaisePropertyChanged(alsoNotifyPropertyName);
+                    OnPropertyChanged(alsoNotifyPropertyName);
+                }
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Override this method to handle the event when a property is changing.
+        /// </summary>
+        /// <param name="propertyName">The name of the property that is changing.</param>
+        protected virtual void OnPropertyChanging(string propertyName)
+        {
+        }
+
+        /// <summary>
+        /// Override this method to handle the event when a property was changed.
+        /// </summary>
+        /// <param name="propertyName">The name of the property that changed.</param>
+        protected virtual void OnPropertyChanged(string propertyName)
+        {
+        }
+
+        private void SetupAlsoNotify()
+        {
+            var alsoNotifyProperties = Accessor.GetMembers().Where(m => m.IsDefined(typeof(AlsoNotifyAttribute)));
+            foreach (var propertyInfo in alsoNotifyProperties)
+            {
+                var attr = (AlsoNotifyAttribute)propertyInfo.GetAttribute(typeof(AlsoNotifyAttribute), true);
+                _alsoNotifyMap.Add(propertyInfo.Name, attr.AlsoNotify);
+            }
+        }
+    }
+}
diff --git a/src/AudioBand/ViewModels/ViewModelBase.cs b/src/AudioBand/ViewModels/ViewModelBase.cs
index 2e5e1735..cb61203c 100644
--- a/src/AudioBand/ViewModels/ViewModelBase.cs
+++ b/src/AudioBand/ViewModels/ViewModelBase.cs
@@ -4,23 +4,20 @@
 using System.ComponentModel;
 using System.Linq;
 using System.Runtime.CompilerServices;
+using System.Windows.Input;
+using AudioBand.ChangeTracking;
 using AudioBand.Commands;
 using AudioBand.Logging;
-using AudioBand.Messages;
 using AutoMapper;
-using FastMember;
 using NLog;
 
 namespace AudioBand.ViewModels
 {
     /// <summary>
-    /// Base class for view models with automatic support for
-    /// <see cref="INotifyPropertyChanged"/>, <see cref="IResettableObject"/>, <see cref="INotifyDataErrorInfo"/> and commands.
+    /// Base class for view models. Extends <see cref="ObservableObject"/> with automatic support for
+    /// <see cref="IChangeTrackable"/>, <see cref="IResettableObject"/>, <see cref="INotifyDataErrorInfo"/> and associated commands.
     /// </summary>
-    /// <remarks>
-    /// <see cref="IEditableObject"/> is implemented explicitly through methods instead of the interface because of issues with the methods being automatically called.
-    /// </remarks>
-    public abstract class ViewModelBase : INotifyPropertyChanged, IResettableObject, INotifyDataErrorInfo
+    public abstract class ViewModelBase : ObservableObject, IChangeTrackable, IResettableObject, INotifyDataErrorInfo
     {
         private readonly Dictionary<string, IEnumerable<string>> _propertyErrors = new Dictionary<string, IEnumerable<string>>();
         private bool _isEditing;
@@ -31,21 +28,18 @@ public abstract class ViewModelBase : INotifyPropertyChanged, IResettableObject,
         protected ViewModelBase()
         {
             Logger = AudioBandLogManager.GetLogger(GetType().FullName);
-            Accessor = TypeAccessor.Create(GetType(), true);
 
             BeginEditCommand = new RelayCommand(o => BeginEdit());
             EndEditCommand = new RelayCommand(o => EndEdit());
             CancelEditCommand = new RelayCommand(o => CancelEdit());
             ResetCommand = new RelayCommand(o => Reset());
-
-            SetupAlsoNotify();
         }
 
         /// <inheritdoc cref="INotifyDataErrorInfo.ErrorsChanged"/>
         public event EventHandler<DataErrorsChangedEventArgs> ErrorsChanged;
 
-        /// <inheritdoc cref="INotifyPropertyChanged.PropertyChanged"/>
-        public event PropertyChangedEventHandler PropertyChanged;
+        /// <inheritdoc />
+        public event EventHandler IsEditingChanged;
 
         /// <inheritdoc cref="INotifyDataErrorInfo.HasErrors"/>
         public bool HasErrors => _propertyErrors.Any(entry => entry.Value?.Any() ?? false);
@@ -53,47 +47,41 @@ protected ViewModelBase()
         /// <summary>
         /// Gets the command to start editing.
         /// </summary>
-        public RelayCommand BeginEditCommand { get; }
+        public ICommand BeginEditCommand { get; }
 
         /// <summary>
         /// Gets the command to end editing.
         /// </summary>
-        public RelayCommand EndEditCommand { get; }
+        public ICommand EndEditCommand { get; }
 
         /// <summary>
         /// Gets the command to cancel edit.
         /// </summary>
-        public RelayCommand CancelEditCommand { get; }
+        public ICommand CancelEditCommand { get; }
 
         /// <summary>
         /// Gets the command to reset the state.
         /// </summary>
-        public RelayCommand ResetCommand { get; }
+        public ICommand ResetCommand { get; }
 
-        /// <summary>
-        /// Gets a value indicating whether the current object is being edited.
-        /// </summary>
+        /// <inheritdoc />
         public bool IsEditing
         {
             get => _isEditing;
-            private set => SetProperty(ref _isEditing, value, trackChanges: false);
+            private set
+            {
+                if (SetProperty(ref _isEditing, value))
+                {
+                    IsEditingChanged?.Invoke(this, EventArgs.Empty);
+                }
+            }
         }
 
-        /// <summary>
-        /// Gets the map from [model property name] to [other vm property names].
-        /// </summary>
-        protected Dictionary<string, string[]> AlsoNotifyMap { get; } = new Dictionary<string, string[]>();
-
         /// <summary>
         /// Gets the logger for the view model.
         /// </summary>
         protected ILogger Logger { get; }
 
-        /// <summary>
-        /// Gets the type accessor for this object.
-        /// </summary>
-        protected TypeAccessor Accessor { get; }
-
         /// <inheritdoc cref="INotifyDataErrorInfo.GetErrors"/>
         public IEnumerable GetErrors(string propertyName)
         {
@@ -156,23 +144,6 @@ public void Reset()
             OnReset();
         }
 
-        /// <summary>
-        /// Notifies subsribers to a property change.
-        /// </summary>
-        /// <param name="propertyName">Name of the property that changed.</param>
-        protected void RaisePropertyChanged([CallerMemberName] string propertyName = null)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
-
-        /// <summary>
-        /// Notifies all properties changed.
-        /// </summary>
-        protected void RaisePropertyChangedAll()
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(string.Empty));
-        }
-
         /// <summary>
         /// Resets an object to its default state.
         /// </summary>
@@ -225,41 +196,6 @@ protected virtual void OnBeginEdit()
         {
         }
 
-        /// <summary>
-        /// Sets the <paramref name="field"/> and calls property changed for it and any others given with a <see cref="AlsoNotifyAttribute"/>.
-        /// </summary>
-        /// <typeparam name="TValue">Type of the value.</typeparam>
-        /// <param name="field">Field to set.</param>
-        /// <param name="newValue">New value of the field.</param>
-        /// <param name="trackChanges">True if <see cref="BeginEdit"/> should be called if the value changes.</param>
-        /// <param name="propertyName">Name of the property to notify with.</param>
-        /// <returns>Returns true if new value was set.</returns>
-        protected bool SetProperty<TValue>(ref TValue field, TValue newValue, bool trackChanges = true, [CallerMemberName] string propertyName = null)
-        {
-            if (EqualityComparer<TValue>.Default.Equals(field, newValue))
-            {
-                return false;
-            }
-
-            if (trackChanges)
-            {
-                BeginEdit();
-            }
-
-            field = newValue;
-            RaisePropertyChanged(propertyName);
-
-            if (AlsoNotifyMap.TryGetValue(propertyName, out var alsoNotify))
-            {
-                foreach (var propName in alsoNotify)
-                {
-                    RaisePropertyChanged(propName);
-                }
-            }
-
-            return true;
-        }
-
         /// <summary>
         /// Raises a <see cref="ErrorsChanged"/> event.
         /// </summary>
@@ -293,7 +229,7 @@ protected void RaiseValidationError(Exception e, [CallerMemberName] string prope
         }
 
         /// <summary>
-        /// Clears validation errors.
+        /// Clears all validation errors.
         /// </summary>
         protected void ClearErrors()
         {
@@ -302,23 +238,13 @@ protected void ClearErrors()
         }
 
         /// <summary>
-        /// Clears errors for a property.
+        /// Clears validation errors for a property.
         /// </summary>
-        /// <param name="propertyName">The property to clear.</param>
-        protected void ClearError(string propertyName)
+        /// <param name="propertyName">The name of the property to clear.</param>
+        protected void ClearError([CallerMemberName] string propertyName = null)
         {
             _propertyErrors.Remove(propertyName);
             ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(propertyName));
         }
-
-        private void SetupAlsoNotify()
-        {
-            var alsoNotifyProperties = Accessor.GetMembers().Where(m => m.IsDefined(typeof(AlsoNotifyAttribute)));
-            foreach (var propertyInfo in alsoNotifyProperties)
-            {
-                var attr = (AlsoNotifyAttribute)propertyInfo.GetAttribute(typeof(AlsoNotifyAttribute), true);
-                AlsoNotifyMap.Add(propertyInfo.Name, attr.AlsoNotify);
-            }
-        }
     }
 }

From 381715703540e80c2fcf71eb60a6b682adbcd154 Mon Sep 17 00:00:00 2001
From: Brandon Chong <brndnchong@gmail.com>
Date: Thu, 13 Jun 2019 18:07:17 -0700
Subject: [PATCH 06/17] Update view model bases

---
 src/AudioBand/ObservableObject.cs             |  54 +++++++--
 src/AudioBand/ViewModels/ViewModelBase.cs     | 105 ++++++++++++++----
 .../ViewModels/ViewModelBase{TModel}.cs       |  90 +--------------
 3 files changed, 130 insertions(+), 119 deletions(-)

diff --git a/src/AudioBand/ObservableObject.cs b/src/AudioBand/ObservableObject.cs
index 1d7ea8fa..4a21475c 100644
--- a/src/AudioBand/ObservableObject.cs
+++ b/src/AudioBand/ObservableObject.cs
@@ -11,6 +11,7 @@ namespace AudioBand
     /// </summary>
     public abstract class ObservableObject : INotifyPropertyChanged
     {
+        private readonly Dictionary<object, ObjectAccessor> _modelToAccessor = new Dictionary<object, ObjectAccessor>();
         private readonly Dictionary<string, string[]> _alsoNotifyMap = new Dictionary<string, string[]>();
 
         /// <summary>
@@ -56,7 +57,7 @@ protected void RaisePropertyChangedAll()
         /// <param name="newValue">New value.</param>
         /// <param name="propertyName">Name of the property that changed.</param>
         /// <returns>True if the property changed.</returns>
-        protected virtual bool SetProperty<T>(ref T field, T newValue, [CallerMemberName] string propertyName = null)
+        protected bool SetProperty<T>(ref T field, T newValue, [CallerMemberName] string propertyName = null)
         {
             if (EqualityComparer<T>.Default.Equals(field, newValue))
             {
@@ -67,17 +68,39 @@ protected virtual bool SetProperty<T>(ref T field, T newValue, [CallerMemberName
             field = newValue;
             RaisePropertyChanged(propertyName);
             OnPropertyChanged(propertyName);
+            RaiseAlsoNotify(propertyName);
+            return true;
+        }
 
-            if (_alsoNotifyMap.TryGetValue(propertyName, out var alsoNotify))
+        /// <summary>
+        /// Sets the <paramref name="modelPropertyName"/> property of the <paramref name="model"/> to the <paramref name="newValue"/>
+        /// if they are different and raise <see cref="PropertyChanged"/> for the property and other properties marked with the <see cref="AlsoNotifyAttribute"/>.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <typeparam name="TValue">The type of the value.</typeparam>
+        /// <param name="model">The model instance.</param>
+        /// <param name="modelPropertyName">The property name of the model.</param>
+        /// <param name="newValue">The new value to set.</param>
+        /// <param name="propertyName">The property name.</param>
+        /// <returns>True if the property changed.</returns>
+        protected bool SetProperty<TModel, TValue>(TModel model, string modelPropertyName, TValue newValue, [CallerMemberName] string propertyName = null)
+        {
+            if (!_modelToAccessor.ContainsKey(model))
             {
-                foreach (var alsoNotifyPropertyName in alsoNotify)
-                {
-                    OnPropertyChanging(alsoNotifyPropertyName);
-                    RaisePropertyChanged(alsoNotifyPropertyName);
-                    OnPropertyChanged(alsoNotifyPropertyName);
-                }
+                _modelToAccessor.Add(model, ObjectAccessor.Create(model));
             }
 
+            var currentModelValue = (TValue)_modelToAccessor[model][modelPropertyName];
+            if (EqualityComparer<TValue>.Default.Equals(currentModelValue, newValue))
+            {
+                return false;
+            }
+
+            OnPropertyChanging(propertyName);
+            _modelToAccessor[model][modelPropertyName] = newValue;
+            RaisePropertyChanged(propertyName);
+            OnPropertyChanged(propertyName);
+            RaiseAlsoNotify(propertyName);
             return true;
         }
 
@@ -106,5 +129,20 @@ private void SetupAlsoNotify()
                 _alsoNotifyMap.Add(propertyInfo.Name, attr.AlsoNotify);
             }
         }
+
+        private void RaiseAlsoNotify(string propertyName)
+        {
+            if (!_alsoNotifyMap.TryGetValue(propertyName, out var alsoNotify))
+            {
+                return;
+            }
+
+            foreach (var alsoNotifyPropertyName in alsoNotify)
+            {
+                OnPropertyChanging(alsoNotifyPropertyName);
+                RaisePropertyChanged(alsoNotifyPropertyName);
+                OnPropertyChanged(alsoNotifyPropertyName);
+            }
+        }
     }
 }
diff --git a/src/AudioBand/ViewModels/ViewModelBase.cs b/src/AudioBand/ViewModels/ViewModelBase.cs
index cb61203c..610eaeb3 100644
--- a/src/AudioBand/ViewModels/ViewModelBase.cs
+++ b/src/AudioBand/ViewModels/ViewModelBase.cs
@@ -145,55 +145,54 @@ public void Reset()
         }
 
         /// <summary>
-        /// Resets an object to its default state.
+        /// Called when <see cref="Reset"/> is called.
         /// </summary>
-        /// <typeparam name="T">Object type.</typeparam>
-        /// <param name="obj">Object to reset.</param>
-        protected void ResetObject<T>(T obj)
-            where T : new()
+        protected virtual void OnReset()
         {
-            var mapper = new MapperConfiguration(cfg => cfg.CreateMap<T, T>()).CreateMapper();
-            mapper.Map<T, T>(new T(), obj);
         }
 
         /// <summary>
-        /// Resets an object to its default state using the given state.
+        /// Called when <see cref="CancelEdit"/> is called.
         /// </summary>
-        /// <typeparam name="T">Object type.</typeparam>
-        /// <param name="initialState">The objects initial state.</param>
-        /// <param name="obj">Object to reset.</param>
-        protected void ResetObject<T>(T initialState, T obj)
+        protected virtual void OnCancelEdit()
         {
-            var mapper = new MapperConfiguration(cfg => cfg.CreateMap<T, T>()).CreateMapper();
-            mapper.Map<T, T>(initialState, obj);
         }
 
         /// <summary>
-        /// Called when <see cref="Reset"/> is called.
+        /// Called when <see cref="EndEdit"/> is called.
         /// </summary>
-        protected virtual void OnReset()
+        protected virtual void OnEndEdit()
         {
         }
 
         /// <summary>
-        /// Called when <see cref="CancelEdit"/> is called.
+        /// Called when <see cref="BeginEdit"/> is called.
         /// </summary>
-        protected virtual void OnCancelEdit()
+        protected virtual void OnBeginEdit()
         {
         }
 
         /// <summary>
-        /// Called when <see cref="EndEdit"/> is called.
+        /// Resets an object to its default state.
         /// </summary>
-        protected virtual void OnEndEdit()
+        /// <typeparam name="T">Object type.</typeparam>
+        /// <param name="obj">Object to reset.</param>
+        protected void ResetObject<T>(T obj)
+            where T : new()
         {
+            MapType(new T(), obj);
         }
 
         /// <summary>
-        /// Called when <see cref="BeginEdit"/> is called.
+        /// Maps an object from to another instance of the same type.
         /// </summary>
-        protected virtual void OnBeginEdit()
+        /// <typeparam name="T">The type of the object to map.</typeparam>
+        /// <param name="objectFrom">The object to map.</param>
+        /// <param name="objectTo">The other instance of the object to map to.</param>
+        protected void MapType<T>(T objectFrom, T objectTo)
         {
+            var mapper = new MapperConfiguration(cfg => cfg.CreateMap<T, T>()).CreateMapper();
+            mapper.Map<T, T>(objectFrom, objectTo);
         }
 
         /// <summary>
@@ -246,5 +245,67 @@ protected void ClearError([CallerMemberName] string propertyName = null)
             _propertyErrors.Remove(propertyName);
             ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(propertyName));
         }
+
+        /// <summary>
+        /// Sets the <paramref name="field"/> to the <paramref name="newValue"/> if they are different and raise <see cref="PropertyChanged"/>
+        /// for the property and other properties marked with the <see cref="AlsoNotifyAttribute"/>. And invokes <see cref="BeginEdit"/>.
+        /// </summary>
+        /// <typeparam name="T">Type of the property.</typeparam>
+        /// <param name="field">Old value.</param>
+        /// <param name="newValue">New value.</param>
+        /// <param name="propertyName">Name of the property that changed.</param>
+        /// <returns>True if the property changed.</returns>
+        protected bool SetPropertyAndTrack<T>(ref T field, T newValue, [CallerMemberName] string propertyName = null)
+        {
+            var didChange = SetProperty(ref field, newValue, propertyName);
+            if (didChange)
+            {
+                BeginEdit();
+            }
+
+            return didChange;
+        }
+
+        /// <summary>
+        /// Sets the <paramref name="modelPropertyName"/> property of the <paramref name="model"/> to the <paramref name="newValue"/>
+        /// if they are different and raise <see cref="PropertyChanged"/> for the property and other properties marked with the <see cref="AlsoNotifyAttribute"/>.
+        /// And invokes <see cref="BeginEdit"/>.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <typeparam name="TValue">The type of the value.</typeparam>
+        /// <param name="model">The model instance.</param>
+        /// <param name="modelPropertyName">The property name of the model.</param>
+        /// <param name="newValue">The new value to set.</param>
+        /// <param name="propertyName">The property name.</param>
+        /// <returns>True if the property changed.</returns>
+        protected bool SetPropertyAndTrack<TModel, TValue>(TModel model, string modelPropertyName, TValue newValue, [CallerMemberName] string propertyName = null)
+        {
+            var didChange = SetProperty(model, modelPropertyName, newValue, propertyName);
+            if (didChange)
+            {
+                BeginEdit();
+            }
+
+            return didChange;
+        }
+
+        /// <summary>
+        /// Registers a model for automatic <see cref="BeginEdit"/>, <see cref="Reset"/>, <see cref="EndEdit"/> and <see cref="CancelEdit"/>.
+        /// </summary>
+        /// <param name="model">The model to register.</param>
+        protected void RegisterModelForChangeTracking(object model)
+        {
+            _trackedModels.Add(model);
+            _backupModels.Add(_trackedModels, model);
+        }
+
+        /// <summary>
+        /// Removes a model for automatic <see cref="BeginEdit"/>, <see cref="Reset"/>, <see cref="EndEdit"/> and <see cref="CancelEdit"/>.
+        /// </summary>
+        /// <param name="model">The model to unregister.</param>
+        protected void UnregisterModelFromChangeTracking(object model)
+        {
+            _trackedModels.Remove(model);
+        }
     }
 }
diff --git a/src/AudioBand/ViewModels/ViewModelBase{TModel}.cs b/src/AudioBand/ViewModels/ViewModelBase{TModel}.cs
index 8df5065d..f0658742 100644
--- a/src/AudioBand/ViewModels/ViewModelBase{TModel}.cs
+++ b/src/AudioBand/ViewModels/ViewModelBase{TModel}.cs
@@ -17,60 +17,10 @@ public abstract class ViewModelBase<TModel> : ViewModelBase
     {
         // Mapping from a model and model property to the viewmodel property name
         private readonly Dictionary<(object model, string modelPropName), List<string>> _modelToPropertyName = new Dictionary<(object model, string modelPropName), List<string>>();
-        private readonly Dictionary<object, ObjectAccessor> _modelToAccessor = new Dictionary<object, ObjectAccessor>();
+
         private readonly MapperConfiguration _mapperConfiguration = new MapperConfiguration(cfg => cfg.CreateMap<TModel, TModel>());
         private TModel _backup;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ViewModelBase{TModel}"/> class
-        /// with the model and hooks up change notifications.
-        /// </summary>
-        /// <param name="model">The model.</param>
-        protected ViewModelBase(TModel model)
-        {
-            Model = model;
-            SetupModelBindings(Model);
-        }
-
-        /// <summary>
-        /// Gets or sets the model associated with this view model.
-        /// </summary>
-        protected TModel Model { get; set; }
-
-        /// <summary>
-        /// Get the model representation of this viewmodel. By default it returns <see cref="Model"/>.
-        /// </summary>
-        /// <returns>A model representation.</returns>
-        public virtual TModel GetModel()
-        {
-            return Model;
-        }
-
-        /// <summary>
-        /// Sets the property in the <see cref="Model"/>.
-        /// </summary>
-        /// <typeparam name="TValue">Type of the property to set.</typeparam>
-        /// <param name="modelPropertyName">Name of the property to set.</param>
-        /// <param name="newValue">New value to set.</param>
-        /// <param name="trackChanges">True if changes are tracked by calling <see cref="ViewModelBase.BeginEdit"/>.</param>
-        /// <param name="propertyName">Name of the property to notify with.</param>
-        /// <returns>Returns true if new value was set.</returns>
-        protected bool SetProperty<TValue>(string modelPropertyName, TValue newValue, bool trackChanges = true, [CallerMemberName] string propertyName = null)
-        {
-            var currentModelValue = (TValue)_modelToAccessor[Model][modelPropertyName];
-            if (EqualityComparer<TValue>.Default.Equals(currentModelValue, newValue))
-            {
-                return false;
-            }
-
-            if (trackChanges)
-            {
-                BeginEdit();
-            }
-
-            _modelToAccessor[Model][modelPropertyName] = newValue;
-            return true;
-        }
 
         /// <summary>
         /// Performs setup to recieve change notifications from <paramref name="model"/> and wire it to properties marked with <see cref="PropertyChangeBindingAttribute"/>.
@@ -174,43 +124,5 @@ protected override void OnBeginEdit()
             _backup = new TModel();
             _mapperConfiguration.CreateMapper().Map(Model, _backup);
         }
-
-        /// <summary>
-        /// Called when a model property changes.
-        /// </summary>
-        /// <param name="propertyName">Name of the property that changed.</param>
-        protected virtual void OnModelPropertyChanged(string propertyName)
-        {
-        }
-
-        /// <summary>
-        /// When a model property changes, raise <see cref="INotifyPropertyChanged.PropertyChanged"/> for the corresponding property marked with <see cref="PropertyChangeBindingAttribute"/>
-        /// and also properties in <see cref="AlsoNotifyAttribute"/>.
-        /// </summary>
-        /// <param name="sender">The sender.</param>
-        /// <param name="propertyChangedEventArgs">The event args.</param>
-        private void ModelOnPropertyChanged(object sender, PropertyChangedEventArgs propertyChangedEventArgs)
-        {
-            if (!_modelToPropertyName.TryGetValue((sender, propertyChangedEventArgs.PropertyName), out var propertyNames))
-            {
-                return;
-            }
-
-            foreach (var propertyName in propertyNames)
-            {
-                RaisePropertyChanged(propertyName);
-                OnModelPropertyChanged(propertyName);
-
-                if (!AlsoNotifyMap.TryGetValue(propertyName, out var alsoNotfify))
-                {
-                    continue;
-                }
-
-                foreach (var name in alsoNotfify)
-                {
-                    RaisePropertyChanged(name);
-                }
-            }
-        }
     }
 }

From 16fddf92b79874c853858508f27c8692bdb07aa8 Mon Sep 17 00:00:00 2001
From: Brandon Chong <brndnchong@gmail.com>
Date: Fri, 14 Jun 2019 14:46:53 -0700
Subject: [PATCH 07/17] Update old viewmodels to use new base class

---
 src/AudioBand/AlsoNotifyAttribute.cs          |   3 +-
 src/AudioBand/AudioBand.csproj                |  11 +-
 src/AudioBand/AudioSource/AudioSession.cs     |   3 +-
 src/AudioBand/ChangeTracking/ChangeTracker.cs |  83 --------
 .../ChangeTracking/IChangeTrackable.cs        |  21 --
 .../ChangeTracking/IChangeTracker.cs          |  48 -----
 src/AudioBand/Deskband.cs                     |   1 +
 src/AudioBand/Messages/EditEndMessage.cs      |  18 ++
 src/AudioBand/Messages/EditStartMessage.cs    |   9 +
 src/AudioBand/Models/AlbumArt.cs              |   8 +-
 src/AudioBand/Models/AlbumArtPopup.cs         |  38 +---
 src/AudioBand/Models/AudioBand.cs             |  24 +--
 src/AudioBand/Models/AudioSourceSetting.cs    |  17 +-
 src/AudioBand/Models/AudioSourceSettings.cs   |   2 +-
 src/AudioBand/Models/ButtonContent.cs         |  66 +------
 src/AudioBand/Models/ButtonModelBase.cs       |  22 +--
 src/AudioBand/Models/CustomLabel.cs           |  85 ++-------
 src/AudioBand/Models/LayoutModelBase.cs       |  46 +----
 src/AudioBand/Models/ModelBase.cs             |  59 ------
 src/AudioBand/Models/ProgressBar.cs           |  18 +-
 src/AudioBand/TextFormatting/TextSegment.cs   |   3 +-
 .../ViewModels/AboutDialogViewModel.cs        |   2 +-
 .../ViewModels/AlbumArtPopupViewModel.cs      |  74 +++++--
 src/AudioBand/ViewModels/AlbumArtViewModel.cs |  22 ++-
 .../ViewModels/AudioBandToolbarViewModel.cs   |   7 +-
 .../ViewModels/AudioBandViewModel.cs          |  61 ++++--
 .../ViewModels/AudioSourceSettingKeyValue.cs  |  45 ++++-
 .../AudioSourceSettingsCollectionViewModel.cs |   8 +-
 .../AudioSourceSettingsViewModel.cs           |  12 +-
 .../ViewModels/ButtonContentViewModel.cs      | 102 ++++++----
 .../ViewModels/ButtonViewModelBase.cs         |  20 +-
 .../ViewModels/CustomLabelViewModel.cs        |  71 ++++---
 .../ViewModels/CustomLabelsViewModel.cs       |  13 +-
 .../ViewModels/LayoutViewModelBase.cs         |  72 +++++--
 .../ViewModels/NextButtonViewModel.cs         |  18 +-
 .../ViewModels/PlayPauseButtonViewModel.cs    |  20 +-
 .../ViewModels/PreviousButtonViewModel.cs     |  16 +-
 .../ViewModels/ProgressBarViewModel.cs        |  32 ++--
 .../PropertyChangeBindingAttribute.cs         |  28 ---
 .../RenameProfileDialogViewModel.cs           |   6 +-
 .../ViewModels/RepeatModeButtonViewModel.cs   |  46 +++--
 .../ViewModels/SettingsWindowViewModel.cs     |  66 +------
 .../ViewModels/ShuffleModeButtonViewModel.cs  |  46 +++--
 .../ViewModels/TrackStateAttribute.cs         |  12 ++
 .../ViewModels/ValidatingViewModelBase.cs     |  85 +++++++++
 src/AudioBand/ViewModels/ViewModelBase.cs     | 180 ++++++------------
 .../ViewModels/ViewModelBase{TModel}.cs       | 128 -------------
 .../ViewModels/ViewModelContainer.cs          |   4 +-
 48 files changed, 715 insertions(+), 1066 deletions(-)
 delete mode 100644 src/AudioBand/ChangeTracking/ChangeTracker.cs
 delete mode 100644 src/AudioBand/ChangeTracking/IChangeTrackable.cs
 delete mode 100644 src/AudioBand/ChangeTracking/IChangeTracker.cs
 create mode 100644 src/AudioBand/Messages/EditEndMessage.cs
 create mode 100644 src/AudioBand/Messages/EditStartMessage.cs
 delete mode 100644 src/AudioBand/Models/ModelBase.cs
 delete mode 100644 src/AudioBand/ViewModels/PropertyChangeBindingAttribute.cs
 create mode 100644 src/AudioBand/ViewModels/TrackStateAttribute.cs
 create mode 100644 src/AudioBand/ViewModels/ValidatingViewModelBase.cs
 delete mode 100644 src/AudioBand/ViewModels/ViewModelBase{TModel}.cs

diff --git a/src/AudioBand/AlsoNotifyAttribute.cs b/src/AudioBand/AlsoNotifyAttribute.cs
index a695c10a..9794ebc7 100644
--- a/src/AudioBand/AlsoNotifyAttribute.cs
+++ b/src/AudioBand/AlsoNotifyAttribute.cs
@@ -1,11 +1,10 @@
 using System;
 using System.ComponentModel;
-using AudioBand.ViewModels;
 
 namespace AudioBand
 {
     /// <summary>
-    /// Specifies that <see cref="INotifyPropertyChanged.PropertyChanged"/> event of <see cref="ViewModelBase{TModel}"/> will be raised for other properties.
+    /// Specifies that <see cref="INotifyPropertyChanged.PropertyChanged"/> events will be raised for other properties.
     /// </summary>
     [AttributeUsage(AttributeTargets.Property)]
     internal class AlsoNotifyAttribute : Attribute
diff --git a/src/AudioBand/AudioBand.csproj b/src/AudioBand/AudioBand.csproj
index a06c6fd7..08876364 100644
--- a/src/AudioBand/AudioBand.csproj
+++ b/src/AudioBand/AudioBand.csproj
@@ -106,6 +106,8 @@
     <Compile Include="Behaviors\RedirectScrolling.cs" />
     <Compile Include="Behaviors\SliderClickAndDrag.cs" />
     <Compile Include="Behaviors\TrackOffsetFix.cs" />
+    <Compile Include="StateModel\IChangeTrackable.cs" />
+    <Compile Include="StateModel\TrackStateAttribute.cs" />
     <Compile Include="Commands\AsyncRelayCommand.cs" />
     <Compile Include="Commands\IAsyncCommand.cs" />
     <Compile Include="Commands\RelayCommand.cs" />
@@ -119,6 +121,8 @@
     <Compile Include="Extensions\ObjectExtensions.cs" />
     <Compile Include="Extensions\TimeSpanExtensions.cs" />
     <Compile Include="Messages\DpiChangedMessage.cs" />
+    <Compile Include="Messages\EditEndMessage.cs" />
+    <Compile Include="Messages\EditStartMessage.cs" />
     <Compile Include="Messages\FocusChangedMessage.cs" />
     <Compile Include="Messages\IMessageBus.cs" />
     <Compile Include="Messages\MessageBus.cs" />
@@ -130,7 +134,6 @@
     <Compile Include="Models\ButtonContentType.cs" />
     <Compile Include="Models\ButtonModelBase.cs" />
     <Compile Include="Models\LayoutModelBase.cs" />
-    <Compile Include="Models\ModelBase.cs" />
     <Compile Include="Models\NextButton.cs" />
     <Compile Include="Models\PlayPauseButton.cs" />
     <Compile Include="Models\PositionAnchor.cs" />
@@ -144,6 +147,7 @@
     <Compile Include="Models\TextFadeEffect.cs" />
     <Compile Include="Models\TextOverflow.cs" />
     <Compile Include="NativeMethods.cs" />
+    <Compile Include="ObservableObject.cs" />
     <Compile Include="Resources\Theming\DarkThemeResources.cs" />
     <Compile Include="Resources\Theming\FallbackThemeDictionary.cs" />
     <Compile Include="Resources\Theming\IThemeDictionary.cs" />
@@ -201,7 +205,7 @@
     <Compile Include="ValueConverters\PathToImageSourceConverter.cs" />
     <Compile Include="ValueConverters\PointConverter.cs" />
     <Compile Include="ViewModels\AlbumArtPopupViewModel.cs" />
-    <Compile Include="ViewModels\AlsoNotifyAttribute.cs" />
+    <Compile Include="AlsoNotifyAttribute.cs" />
     <Compile Include="ViewModels\AudioBandToolbarViewModel.cs" />
     <Compile Include="ViewModels\AudioSourceSettingKeyValue.cs" />
     <Compile Include="ViewModels\AudioSourceSettingsCollectionViewModel.cs" />
@@ -214,13 +218,12 @@
     <Compile Include="ViewModels\LayoutViewModelBase.cs" />
     <Compile Include="ViewModels\PlayPauseButtonViewModel.cs" />
     <Compile Include="ViewModels\PreviousButtonViewModel.cs" />
-    <Compile Include="ViewModels\PropertyChangeBindingAttribute.cs" />
     <Compile Include="ViewModels\RenameProfileDialogViewModel.cs" />
     <Compile Include="ViewModels\RepeatModeButtonViewModel.cs" />
     <Compile Include="ViewModels\SettingsWindowViewModel.cs" />
     <Compile Include="ViewModels\ShuffleModeButtonViewModel.cs" />
+    <Compile Include="ViewModels\ValidatingViewModelBase.cs" />
     <Compile Include="ViewModels\ViewModelBase.cs" />
-    <Compile Include="ViewModels\ViewModelBase{TModel}.cs" />
     <Compile Include="ViewModels\ViewModelContainer.cs" />
     <Compile Include="Models\AudioSourceSetting.cs" />
     <Compile Include="Models\AudioSourceSettings.cs" />
diff --git a/src/AudioBand/AudioSource/AudioSession.cs b/src/AudioBand/AudioSource/AudioSession.cs
index ed16a69b..fbafc942 100644
--- a/src/AudioBand/AudioSource/AudioSession.cs
+++ b/src/AudioBand/AudioSource/AudioSession.cs
@@ -1,13 +1,12 @@
 using System;
 using System.Drawing;
-using AudioBand.Models;
 
 namespace AudioBand.AudioSource
 {
     /// <summary>
     /// Persistent audio source session that updates when the audio source changes.
     /// </summary>
-    public class AudioSession : ModelBase, IAudioSession
+    public class AudioSession : ObservableObject, IAudioSession
     {
         private IInternalAudioSource _currentAudioSource;
         private bool _isPlaying;
diff --git a/src/AudioBand/ChangeTracking/ChangeTracker.cs b/src/AudioBand/ChangeTracking/ChangeTracker.cs
deleted file mode 100644
index 1fd316d8..00000000
--- a/src/AudioBand/ChangeTracking/ChangeTracker.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace AudioBand.ChangeTracking
-{
-    /// <summary>
-    /// Basic change tracker.
-    /// </summary>
-    public class ChangeTracker : IChangeTracker
-    {
-        private readonly HashSet<IChangeTrackable> _trackedObjects = new HashSet<IChangeTrackable>();
-        private readonly HashSet<IChangeTrackable> _objectsThatAreEditing = new HashSet<IChangeTrackable>();
-
-        /// <inheritdoc />
-        public event EventHandler TrackingStateChanged;
-
-        /// <inheritdoc />
-        public bool IsAnyEditing => _objectsThatAreEditing.Any();
-
-        /// <inheritdoc />
-        public void Add(IChangeTrackable toTrack)
-        {
-            _trackedObjects.Add(toTrack);
-            toTrack.IsEditingChanged += ChangeTrackableOnIsEditingChanged;
-        }
-
-        /// <inheritdoc />
-        public void Remove(IChangeTrackable toTrack)
-        {
-            _trackedObjects.Remove(toTrack);
-            toTrack.IsEditingChanged -= ChangeTrackableOnIsEditingChanged;
-        }
-
-        /// <inheritdoc />
-        public void BeginEditAll()
-        {
-            foreach (var changeTrackable in _trackedObjects)
-            {
-                changeTrackable.BeginEdit();
-            }
-        }
-
-        /// <inheritdoc />
-        public void CancelEditAll()
-        {
-            foreach (var changeTrackable in _trackedObjects)
-            {
-                changeTrackable.CancelEdit();
-            }
-        }
-
-        /// <inheritdoc />
-        public void EndEditAll()
-        {
-            foreach (var changeTrackable in _trackedObjects)
-            {
-                changeTrackable.EndEdit();
-            }
-        }
-
-        private void ChangeTrackableOnIsEditingChanged(object sender, EventArgs e)
-        {
-            var trackable = (IChangeTrackable)sender;
-            if (trackable.IsEditing)
-            {
-                _objectsThatAreEditing.Add(trackable);
-                if (_objectsThatAreEditing.Count == 1)
-                {
-                    TrackingStateChanged?.Invoke(this, EventArgs.Empty);
-                }
-            }
-            else
-            {
-                _objectsThatAreEditing.Remove(trackable);
-                if (_objectsThatAreEditing.Count == 0)
-                {
-                    TrackingStateChanged?.Invoke(this, EventArgs.Empty);
-                }
-            }
-        }
-    }
-}
diff --git a/src/AudioBand/ChangeTracking/IChangeTrackable.cs b/src/AudioBand/ChangeTracking/IChangeTrackable.cs
deleted file mode 100644
index 6df869d0..00000000
--- a/src/AudioBand/ChangeTracking/IChangeTrackable.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.ComponentModel;
-
-namespace AudioBand.ChangeTracking
-{
-    /// <summary>
-    /// Interface that marks an object as being able to participate in the change tracking system.
-    /// </summary>
-    public interface IChangeTrackable : IEditableObject
-    {
-        /// <summary>
-        /// Occurs when the <see cref="IsEditing"/> property value has changed.
-        /// </summary>
-        event EventHandler IsEditingChanged;
-
-        /// <summary>
-        /// Gets a value indicating whether the current object is being edited.
-        /// </summary>
-        bool IsEditing { get; }
-    }
-}
diff --git a/src/AudioBand/ChangeTracking/IChangeTracker.cs b/src/AudioBand/ChangeTracking/IChangeTracker.cs
deleted file mode 100644
index c22596e8..00000000
--- a/src/AudioBand/ChangeTracking/IChangeTracker.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System;
-using System.ComponentModel;
-
-namespace AudioBand.ChangeTracking
-{
-    /// <summary>
-    /// An object that maintains change tracking for <see cref="IChangeTrackable"/> objects.
-    /// </summary>
-    public interface IChangeTracker
-    {
-        /// <summary>
-        /// Occurs when the change tracking state is changed.
-        /// </summary>
-        event EventHandler TrackingStateChanged;
-
-        /// <summary>
-        /// Gets a value indicating whether any associated <see cref="IChangeTrackable"/> object has <see cref="IChangeTrackable.IsEditing"/> set to true.
-        /// </summary>
-        bool IsAnyEditing { get; }
-
-        /// <summary>
-        /// Adds a <see cref="IChangeTrackable"/> object to the tracking scope.
-        /// </summary>
-        /// <param name="toTrack">The object add to tracking.</param>
-        void Add(IChangeTrackable toTrack);
-
-        /// <summary>
-        /// Removes a <see cref="IChangeTrackable"/> object from the tracking scope.
-        /// </summary>
-        /// <param name="toTrack">The object to remove from tracking.</param>
-        void Remove(IChangeTrackable toTrack);
-
-        /// <summary>
-        /// Calls <see cref="IEditableObject.BeginEdit"/> for all tracked objects.
-        /// </summary>
-        void BeginEditAll();
-
-        /// <summary>
-        /// Calls <see cref="IEditableObject.CancelEdit"/> for all tracked objects.
-        /// </summary>
-        void CancelEditAll();
-
-        /// <summary>
-        /// Calls <see cref="IEditableObject.EndEdit"/> for all tracked objects.
-        /// </summary>
-        void EndEditAll();
-    }
-}
diff --git a/src/AudioBand/Deskband.cs b/src/AudioBand/Deskband.cs
index 0af904e7..60509f52 100644
--- a/src/AudioBand/Deskband.cs
+++ b/src/AudioBand/Deskband.cs
@@ -16,6 +16,7 @@
 using CSDeskBand;
 using NLog;
 using SimpleInjector;
+using SimpleInjector.Advanced;
 
 namespace AudioBand
 {
diff --git a/src/AudioBand/Messages/EditEndMessage.cs b/src/AudioBand/Messages/EditEndMessage.cs
new file mode 100644
index 00000000..27328f6b
--- /dev/null
+++ b/src/AudioBand/Messages/EditEndMessage.cs
@@ -0,0 +1,18 @@
+namespace AudioBand.Messages
+{
+    /// <summary>
+    /// Global message that indicates that editing is ending.
+    /// </summary>
+    public enum EditEndMessage
+    {
+        /// <summary>
+        /// User cancelled all current edits.
+        /// </summary>
+        Cancelled,
+
+        /// <summary>
+        /// User accepted all current edits.
+        /// </summary>
+        Accepted,
+    }
+}
diff --git a/src/AudioBand/Messages/EditStartMessage.cs b/src/AudioBand/Messages/EditStartMessage.cs
new file mode 100644
index 00000000..83454626
--- /dev/null
+++ b/src/AudioBand/Messages/EditStartMessage.cs
@@ -0,0 +1,9 @@
+namespace AudioBand.Messages
+{
+    /// <summary>
+    /// Global message to mark the start of editing.
+    /// </summary>
+    public enum EditStartMessage
+    {
+    }
+}
diff --git a/src/AudioBand/Models/AlbumArt.cs b/src/AudioBand/Models/AlbumArt.cs
index f488ead9..cf16b051 100644
--- a/src/AudioBand/Models/AlbumArt.cs
+++ b/src/AudioBand/Models/AlbumArt.cs
@@ -5,8 +5,6 @@
     /// </summary>
     public class AlbumArt : LayoutModelBase
     {
-        private string _placeholderPath = "";
-
         /// <summary>
         /// Initializes a new instance of the <see cref="AlbumArt"/> class.
         /// </summary>
@@ -21,10 +19,6 @@ public AlbumArt()
         /// <summary>
         /// Gets or sets the path of the placeholder image.
         /// </summary>
-        public string PlaceholderPath
-        {
-            get => _placeholderPath;
-            set => SetProperty(ref _placeholderPath, value);
-        }
+        public string PlaceholderPath { get; set; } = "";
     }
 }
diff --git a/src/AudioBand/Models/AlbumArtPopup.cs b/src/AudioBand/Models/AlbumArtPopup.cs
index 2a55e454..e3e769d5 100644
--- a/src/AudioBand/Models/AlbumArtPopup.cs
+++ b/src/AudioBand/Models/AlbumArtPopup.cs
@@ -3,57 +3,31 @@
     /// <summary>
     /// Model for the album art popup.
     /// </summary>
-    public class AlbumArtPopup : ModelBase
+    public class AlbumArtPopup
     {
-        private bool _isVisible = true;
-        private double _width = 250;
-        private double _height = 250;
-        private double _xPosition = -110;
-        private double _margin = -4;
-
         /// <summary>
         /// Gets or sets a value indicating whether the album art popup is visible.
         /// </summary>
-        public bool IsVisible
-        {
-            get => _isVisible;
-            set => SetProperty(ref _isVisible, value);
-        }
+        public bool IsVisible { get; set; } = true;
 
         /// <summary>
         /// Gets or sets the width of the album art popup.
         /// </summary>
-        public double Width
-        {
-            get => _width;
-            set => SetProperty(ref _width, value);
-        }
+        public double Width { get; set; } = 250;
 
         /// <summary>
         /// Gets or sets the height of the album art popup.
         /// </summary>
-        public double Height
-        {
-            get => _height;
-            set => SetProperty(ref _height, value);
-        }
+        public double Height { get; set; } = 250;
 
         /// <summary>
         /// Gets or sets the x position of the album art popup.
         /// </summary>
-        public double XPosition
-        {
-            get => _xPosition;
-            set => SetProperty(ref _xPosition, value);
-        }
+        public double XPosition { get; set; } = -110;
 
         /// <summary>
         /// Gets or sets the margin between the album art popup and the taskbar.
         /// </summary>
-        public double Margin
-        {
-            get => _margin;
-            set => SetProperty(ref _margin, value);
-        }
+        public double Margin { get; set; } = 4;
     }
 }
diff --git a/src/AudioBand/Models/AudioBand.cs b/src/AudioBand/Models/AudioBand.cs
index c6f7c634..63e389ef 100644
--- a/src/AudioBand/Models/AudioBand.cs
+++ b/src/AudioBand/Models/AudioBand.cs
@@ -5,37 +5,21 @@ namespace AudioBand.Models
     /// <summary>
     /// The model for the toolbar.
     /// </summary>
-    public class AudioBand : ModelBase
+    public class AudioBand
     {
-        private double _width = 500;
-        private double _height = 30;
-        private Color _backgroundColor = Colors.Transparent;
-
         /// <summary>
         /// Gets or sets the width of the toolbar.
         /// </summary>
-        public double Width
-        {
-            get => _width;
-            set => SetProperty(ref _width, value);
-        }
+        public double Width { get; set; } = 500;
 
         /// <summary>
         /// Gets or sets the height of the toolbar.
         /// </summary>
-        public double Height
-        {
-            get => _height;
-            set => SetProperty(ref _height, value);
-        }
+        public double Height { get; set; } = 30;
 
         /// <summary>
         /// Gets or sets the background color of the toolbar.
         /// </summary>
-        public Color BackgroundColor
-        {
-            get => _backgroundColor;
-            set => SetProperty(ref _backgroundColor, value);
-        }
+        public Color BackgroundColor { get; set; } = Colors.Transparent;
     }
 }
diff --git a/src/AudioBand/Models/AudioSourceSetting.cs b/src/AudioBand/Models/AudioSourceSetting.cs
index 483589c4..6111169d 100644
--- a/src/AudioBand/Models/AudioSourceSetting.cs
+++ b/src/AudioBand/Models/AudioSourceSetting.cs
@@ -5,19 +5,12 @@ namespace AudioBand.Models
     /// <summary>
     /// A key / value pair that represents a single setting for an audio source.
     /// </summary>
-    public class AudioSourceSetting : ModelBase
+    public class AudioSourceSetting
     {
-        private string _name;
-        private object _value;
-
         /// <summary>
         /// Gets or sets the name of the setting provided by the <see cref="IAudioSource"/>.
         /// </summary>
-        public string Name
-        {
-            get => _name;
-            set => SetProperty(ref _name, value);
-        }
+        public string Name { get; set; }
 
         /// <summary>
         /// Gets or sets the value of the setting.
@@ -26,10 +19,6 @@ public string Name
         /// The value of the setting, either provided by the <see cref="IAudioSource"/> or the user.
         /// The default value is set by the <see cref="IAudioSource"/>.
         /// </value>
-        public object Value
-        {
-            get => _value;
-            set => SetProperty(ref _value, value);
-        }
+        public object Value { get; set; }
     }
 }
diff --git a/src/AudioBand/Models/AudioSourceSettings.cs b/src/AudioBand/Models/AudioSourceSettings.cs
index 131b93c9..ae6ceb5b 100644
--- a/src/AudioBand/Models/AudioSourceSettings.cs
+++ b/src/AudioBand/Models/AudioSourceSettings.cs
@@ -5,7 +5,7 @@ namespace AudioBand.Models
     /// <summary>
     /// Collection of settings for a specific audio source.
     /// </summary>
-    public class AudioSourceSettings : ModelBase
+    public class AudioSourceSettings
     {
         /// <summary>
         /// Gets or sets the name of the audio source.
diff --git a/src/AudioBand/Models/ButtonContent.cs b/src/AudioBand/Models/ButtonContent.cs
index 764bc836..4c7ff35b 100644
--- a/src/AudioBand/Models/ButtonContent.cs
+++ b/src/AudioBand/Models/ButtonContent.cs
@@ -5,97 +5,51 @@ namespace AudioBand.Models
     /// <summary>
     /// Model for button content, including image or text settings.
     /// </summary>
-    public class ButtonContent : ModelBase
+    public class ButtonContent
     {
-        private ButtonContentType _contentType = ButtonContentType.Text;
-        private string _imagePath;
-        private string _hoveredImagePath;
-        private string _clickedImagePath;
-        private string _fontFamily = "Segoe MDL2 Assets";
-        private string _text;
-        private Color _textColor = Colors.White;
-        private Color _hoveredTextColor = Colors.White;
-        private Color _clickedTextColor = Colors.White;
-
         /// <summary>
         /// Gets or sets the content type.
         /// </summary>
-        public ButtonContentType ContentType
-        {
-            get => _contentType;
-            set => SetProperty(ref _contentType, value);
-        }
+        public ButtonContentType ContentType { get; set; } = ButtonContentType.Text;
 
         /// <summary>
         /// Gets or sets the image path.
         /// </summary>
-        public string ImagePath
-        {
-            get => _imagePath;
-            set => SetProperty(ref _imagePath, value);
-        }
+        public string ImagePath { get; set; }
 
         /// <summary>
         /// Gets or sets the hovered image path.
         /// </summary>
-        public string HoveredImagePath
-        {
-            get => _hoveredImagePath;
-            set => SetProperty(ref _hoveredImagePath, value);
-        }
+        public string HoveredImagePath { get; set; }
 
         /// <summary>
         /// Gets or sets the clicked image path.
         /// </summary>
-        public string ClickedImagePath
-        {
-            get => _clickedImagePath;
-            set => SetProperty(ref _clickedImagePath, value);
-        }
+        public string ClickedImagePath { get; set; }
 
         /// <summary>
         /// Gets or sets the font family.
         /// </summary>
-        public string FontFamily
-        {
-            get => _fontFamily;
-            set => SetProperty(ref _fontFamily, value);
-        }
+        public string FontFamily { get; set; } = "Segoe MDL2 Assets";
 
         /// <summary>
         /// Gets or sets the text.
         /// </summary>
-        public string Text
-        {
-            get => _text;
-            set => SetProperty(ref _text, value);
-        }
+        public string Text { get; set; }
 
         /// <summary>
         /// Gets or sets the text color.
         /// </summary>
-        public Color TextColor
-        {
-            get => _textColor;
-            set => SetProperty(ref _textColor, value);
-        }
+        public Color TextColor { get; set; } = Colors.White;
 
         /// <summary>
         /// Gets or sets the text color when hovered.
         /// </summary>
-        public Color HoveredTextColor
-        {
-            get => _hoveredTextColor;
-            set => SetProperty(ref _hoveredTextColor, value);
-        }
+        public Color HoveredTextColor { get; set; } = Colors.White;
 
         /// <summary>
         /// Gets or sets the text color when clicked.
         /// </summary>
-        public Color ClickedTextColor
-        {
-            get => _clickedTextColor;
-            set => SetProperty(ref _clickedTextColor, value);
-        }
+        public Color ClickedTextColor { get; set; } = Colors.White;
     }
 }
diff --git a/src/AudioBand/Models/ButtonModelBase.cs b/src/AudioBand/Models/ButtonModelBase.cs
index 1278da14..9657945d 100644
--- a/src/AudioBand/Models/ButtonModelBase.cs
+++ b/src/AudioBand/Models/ButtonModelBase.cs
@@ -7,35 +7,19 @@ namespace AudioBand.Models
     /// </summary>
     public class ButtonModelBase : LayoutModelBase
     {
-        private Color _backgroundColor = Colors.Transparent;
-        private Color _hoveredBackgroundColor = Color.FromArgb(25, 255, 255, 255);
-        private Color _clickedBackgroundColor = Color.FromArgb(15, 255, 255, 255);
-
         /// <summary>
         /// Gets or sets the background color.
         /// </summary>
-        public Color BackgroundColor
-        {
-            get => _backgroundColor;
-            set => SetProperty(ref _backgroundColor, value);
-        }
+        public Color BackgroundColor { get; set; } = Colors.Transparent;
 
         /// <summary>
         /// Gets or sets the background color when hovered.
         /// </summary>
-        public Color HoveredBackgroundColor
-        {
-            get => _hoveredBackgroundColor;
-            set => SetProperty(ref _hoveredBackgroundColor, value);
-        }
+        public Color HoveredBackgroundColor { get; set; } = Color.FromArgb(25, 255, 255, 255);
 
         /// <summary>
         /// Gets or sets the background color when clicked.
         /// </summary>
-        public Color ClickedBackgroundColor
-        {
-            get => _clickedBackgroundColor;
-            set => SetProperty(ref _clickedBackgroundColor, value);
-        }
+        public Color ClickedBackgroundColor { get; set; } = Color.FromArgb(15, 255, 255, 255);
     }
 }
diff --git a/src/AudioBand/Models/CustomLabel.cs b/src/AudioBand/Models/CustomLabel.cs
index d0c21aa8..d83ad798 100644
--- a/src/AudioBand/Models/CustomLabel.cs
+++ b/src/AudioBand/Models/CustomLabel.cs
@@ -7,19 +7,6 @@ namespace AudioBand.Models
     /// </summary>
     public class CustomLabel : LayoutModelBase
     {
-        private string _fontFamily = "Segoe UI";
-        private float _fontSize = 8.5f;
-        private Color _color = Colors.White;
-        private string _formatString = "{artist} - {song}";
-        private TextAlignment _alignment = TextAlignment.Center;
-        private string _name = "Now Playing";
-        private int _scrollSpeed = 5000;
-        private TextOverflow _textOverflow = TextOverflow.Scroll;
-        private ScrollBehavior _scrollBehavior = ScrollBehavior.Always;
-        private TextFadeEffect _textFadeEffect = TextFadeEffect.OnlyWhenScrolling;
-        private double _leftFadeOffset = 0.1;
-        private double _rightFadeOffset = 0.9;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="CustomLabel"/> class.
         /// </summary>
@@ -55,109 +42,61 @@ public enum TextAlignment
         /// <summary>
         /// Gets or sets the font family of the label.
         /// </summary>
-        public string FontFamily
-        {
-            get => _fontFamily;
-            set => SetProperty(ref _fontFamily, value);
-        }
+        public string FontFamily { get; set; } = "Segoe UI";
 
         /// <summary>
         /// Gets or sets the font size of the label.
         /// </summary>
-        public float FontSize
-        {
-            get => _fontSize;
-            set => SetProperty(ref _fontSize, value);
-        }
+        public float FontSize { get; set; } = 12;
 
         /// <summary>
         /// Gets or sets the color of the label.
         /// </summary>
-        public Color Color
-        {
-            get => _color;
-            set => SetProperty(ref _color, value);
-        }
+        public Color Color { get; set; } = Colors.White;
 
         /// <summary>
         /// Gets or sets the format for the label.
         /// </summary>
-        public string FormatString
-        {
-            get => _formatString;
-            set => SetProperty(ref _formatString, value);
-        }
+        public string FormatString { get; set; } = "{artist} - {song}";
 
         /// <summary>
         /// Gets or sets the alignment of the text.
         /// </summary>
-        public TextAlignment Alignment
-        {
-            get => _alignment;
-            set => SetProperty(ref _alignment, value);
-        }
+        public TextAlignment Alignment { get; set; } = TextAlignment.Center;
 
         /// <summary>
         /// Gets or sets the name of the label.
         /// </summary>
-        public string Name
-        {
-            get => _name;
-            set => SetProperty(ref _name, value);
-        }
+        public string Name { get; set; } = "Now Playing";
 
         /// <summary>
         /// Gets or sets the number to milliseconds to scroll across.
         /// </summary>
-        public int ScrollSpeed
-        {
-            get => _scrollSpeed;
-            set => SetProperty(ref _scrollSpeed, value);
-        }
+        public int ScrollSpeed { get; set; } = 5000;
 
         /// <summary>
         /// Gets or sets the text overflow behavior.
         /// </summary>
-        public TextOverflow TextOverflow
-        {
-            get => _textOverflow;
-            set => SetProperty(ref _textOverflow, value);
-        }
+        public TextOverflow TextOverflow { get; set; } = TextOverflow.Scroll;
 
         /// <summary>
         /// Gets or sets the scroll behavior.
         /// </summary>
-        public ScrollBehavior ScrollBehavior
-        {
-            get => _scrollBehavior;
-            set => SetProperty(ref _scrollBehavior, value);
-        }
+        public ScrollBehavior ScrollBehavior { get; set; } = ScrollBehavior.Always;
 
         /// <summary>
         /// Gets or sets the fade effect.
         /// </summary>
-        public TextFadeEffect FadeEffect
-        {
-            get => _textFadeEffect;
-            set => SetProperty(ref _textFadeEffect, value);
-        }
+        public TextFadeEffect FadeEffect { get; set; } = TextFadeEffect.OnlyWhenScrolling;
 
         /// <summary>
         /// Gets or sets the fade offset for the left side.
         /// </summary>
-        public double LeftFadeOffset
-        {
-            get => _leftFadeOffset;
-            set => SetProperty(ref _leftFadeOffset, value);
-        }
+        public double LeftFadeOffset { get; set; } = 0.1;
 
         /// <summary>
         /// Gets or sets the fade offset for the right side.
         /// </summary>
-        public double RightFadeOffset
-        {
-            get => _rightFadeOffset;
-            set => SetProperty(ref _rightFadeOffset, value);
-        }
+        public double RightFadeOffset { get; set; } = 0.9;
     }
 }
diff --git a/src/AudioBand/Models/LayoutModelBase.cs b/src/AudioBand/Models/LayoutModelBase.cs
index 2fe85784..5b5b3b6c 100644
--- a/src/AudioBand/Models/LayoutModelBase.cs
+++ b/src/AudioBand/Models/LayoutModelBase.cs
@@ -3,67 +3,37 @@
     /// <summary>
     /// Base model that contains support for layout.
     /// </summary>
-    public class LayoutModelBase : ModelBase
+    /// <remarks>This should probably be a has-a relationship instead of inheriting from this class.</remarks>
+    public class LayoutModelBase
     {
-        private bool _isVisible = true;
-        private double _width;
-        private double _height;
-        private double _xPosition;
-        private double _yPosition;
-        private PositionAnchor _positionAnchor = PositionAnchor.TopLeft;
-
         /// <summary>
         /// Gets or sets a value indicating whether it is visible.
         /// </summary>
-        public bool IsVisible
-        {
-            get => _isVisible;
-            set => SetProperty(ref _isVisible, value);
-        }
+        public bool IsVisible { get; set; } = true;
 
         /// <summary>
         /// Gets or sets the width.
         /// </summary>
-        public double Width
-        {
-            get => _width;
-            set => SetProperty(ref _width, value);
-        }
+        public double Width { get; set; }
 
         /// <summary>
         /// Gets or sets the height.
         /// </summary>
-        public double Height
-        {
-            get => _height;
-            set => SetProperty(ref _height, value);
-        }
+        public double Height { get; set; }
 
         /// <summary>
         /// Gets or sets the x position.
         /// </summary>
-        public double XPosition
-        {
-            get => _xPosition;
-            set => SetProperty(ref _xPosition, value);
-        }
+        public double XPosition { get; set; }
 
         /// <summary>
         /// Gets or sets the y position.
         /// </summary>
-        public double YPosition
-        {
-            get => _yPosition;
-            set => SetProperty(ref _yPosition, value);
-        }
+        public double YPosition { get; set; }
 
         /// <summary>
         /// Gets or sets the positioning.
         /// </summary>
-        public PositionAnchor Anchor
-        {
-            get => _positionAnchor;
-            set => SetProperty(ref _positionAnchor, value);
-        }
+        public PositionAnchor Anchor { get; set; } = PositionAnchor.TopLeft;
     }
 }
diff --git a/src/AudioBand/Models/ModelBase.cs b/src/AudioBand/Models/ModelBase.cs
deleted file mode 100644
index b71f1e80..00000000
--- a/src/AudioBand/Models/ModelBase.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Runtime.CompilerServices;
-using AudioBand.Logging;
-using NLog;
-
-namespace AudioBand.Models
-{
-    /// <summary>
-    /// Base class for models.
-    /// </summary>
-    public class ModelBase : INotifyPropertyChanged
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ModelBase"/> class.
-        /// </summary>
-        public ModelBase()
-        {
-            Logger = AudioBandLogManager.GetLogger(GetType().FullName);
-        }
-
-        /// <inheritdoc cref="INotifyPropertyChanged.PropertyChanged"/>
-        public event PropertyChangedEventHandler PropertyChanged;
-
-        /// <summary>
-        /// Gets the logger for the model.
-        /// </summary>
-        protected ILogger Logger { get; }
-
-        /// <summary>
-        /// Raises the <see cref="PropertyChanged"/> event.
-        /// </summary>
-        /// <param name="propertyName">Name of the property that changed.</param>
-        protected void RaisePropertyChanged([CallerMemberName] string propertyName = null)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
-
-        /// <summary>
-        /// Set property to a new value.
-        /// </summary>
-        /// <typeparam name="T">Type of the property.</typeparam>
-        /// <param name="field">Old value.</param>
-        /// <param name="newValue">New value.</param>
-        /// <param name="propertyName">Name of the property that changed.</param>
-        /// <returns>True if the property changed.</returns>
-        protected virtual bool SetProperty<T>(ref T field, T newValue, [CallerMemberName] string propertyName = null)
-        {
-            if (EqualityComparer<T>.Default.Equals(field, newValue))
-            {
-                return false;
-            }
-
-            field = newValue;
-            RaisePropertyChanged(propertyName);
-            return true;
-        }
-    }
-}
diff --git a/src/AudioBand/Models/ProgressBar.cs b/src/AudioBand/Models/ProgressBar.cs
index 99ae31cc..946956be 100644
--- a/src/AudioBand/Models/ProgressBar.cs
+++ b/src/AudioBand/Models/ProgressBar.cs
@@ -25,28 +25,16 @@ public ProgressBar()
         /// <summary>
         /// Gets or sets the foreground color.
         /// </summary>
-        public Color ForegroundColor
-        {
-            get => _foregroundColor;
-            set => SetProperty(ref _foregroundColor, value);
-        }
+        public Color ForegroundColor { get; set; } = Colors.DodgerBlue;
 
         /// <summary>
         /// Gets or sets the background color.
         /// </summary>
-        public Color BackgroundColor
-        {
-            get => _backgroundColor;
-            set => SetProperty(ref _backgroundColor, value);
-        }
+        public Color BackgroundColor { get; set; } = Colors.DimGray;
 
         /// <summary>
         /// Gets or sets the hover color.
         /// </summary>
-        public Color HoverColor
-        {
-            get => _hoverColor;
-            set => SetProperty(ref _hoverColor, value);
-        }
+        public Color HoverColor { get; set; } = Colors.DeepSkyBlue;
     }
 }
diff --git a/src/AudioBand/TextFormatting/TextSegment.cs b/src/AudioBand/TextFormatting/TextSegment.cs
index c94be240..eacafb7d 100644
--- a/src/AudioBand/TextFormatting/TextSegment.cs
+++ b/src/AudioBand/TextFormatting/TextSegment.cs
@@ -1,12 +1,11 @@
 using System.Windows.Media;
-using AudioBand.Models;
 
 namespace AudioBand.TextFormatting
 {
     /// <summary>
     /// A segment of text to be rendered in a text label.
     /// </summary>
-    public abstract class TextSegment : ModelBase
+    public abstract class TextSegment : ObservableObject
     {
         private string _text;
         private Color _color;
diff --git a/src/AudioBand/ViewModels/AboutDialogViewModel.cs b/src/AudioBand/ViewModels/AboutDialogViewModel.cs
index fd9b4974..7d2d584d 100644
--- a/src/AudioBand/ViewModels/AboutDialogViewModel.cs
+++ b/src/AudioBand/ViewModels/AboutDialogViewModel.cs
@@ -10,7 +10,7 @@ namespace AudioBand.ViewModels
     /// <summary>
     /// View model for the `about audioband` view.
     /// </summary>
-    public class AboutDialogViewModel : ViewModelBase
+    public class AboutDialogViewModel : ObservableObject
     {
         /// <summary>
         /// Gets the current audioband version.
diff --git a/src/AudioBand/ViewModels/AlbumArtPopupViewModel.cs b/src/AudioBand/ViewModels/AlbumArtPopupViewModel.cs
index 70aa86f4..2326b325 100644
--- a/src/AudioBand/ViewModels/AlbumArtPopupViewModel.cs
+++ b/src/AudioBand/ViewModels/AlbumArtPopupViewModel.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Diagnostics;
+using AudioBand.Messages;
 using AudioBand.Models;
 using AudioBand.Settings;
 
@@ -8,75 +9,110 @@ namespace AudioBand.ViewModels
     /// <summary>
     /// View model for the album art popup.
     /// </summary>
-    public class AlbumArtPopupViewModel : ViewModelBase<AlbumArtPopup>
+    public class AlbumArtPopupViewModel : ViewModelBase
     {
         private readonly IAppSettings _appSettings;
+        private readonly AlbumArtPopup _model = new AlbumArtPopup();
+        private readonly AlbumArtPopup _backup = new AlbumArtPopup();
 
         /// <summary>
         /// Initializes a new instance of the <see cref="AlbumArtPopupViewModel"/> class.
         /// </summary>
         /// <param name="appSettings">The app settings.</param>
-        public AlbumArtPopupViewModel(IAppSettings appSettings)
-            : base(appSettings.AlbumArtPopup)
+        /// <param name="messageBus">The message bus.</param>
+        public AlbumArtPopupViewModel(IAppSettings appSettings, IMessageBus messageBus)
         {
+            MapSelf(appSettings.AlbumArtPopup, _model);
+            MapSelf(appSettings.AlbumArtPopup, _backup);
+
             _appSettings = appSettings;
             appSettings.ProfileChanged += AppSettingsOnProfileChanged;
+            UseMessageBus(messageBus);
         }
 
         /// <summary>
         /// Gets or sets a value indicating whether it is visible.
         /// </summary>
-        [PropertyChangeBinding(nameof(AlbumArtPopup.IsVisible))]
+        [TrackState]
         public bool IsVisible
         {
-            get => Model.IsVisible;
-            set => SetProperty(nameof(Model.IsVisible), value);
+            get => _model.IsVisible;
+            set => SetProperty(_model, nameof(_model.IsVisible), value);
         }
 
         /// <summary>
         /// Gets or sets the width.
         /// </summary>
-        [PropertyChangeBinding(nameof(AlbumArtPopup.Width))]
+        [TrackState]
         public double Width
         {
-            get => Model.Width;
-            set => SetProperty(nameof(Model.Width), value);
+            get => _model.Width;
+            set => SetProperty(_model, nameof(_model.Width), value);
         }
 
         /// <summary>
         /// Gets or sets the height.
         /// </summary>
-        [PropertyChangeBinding(nameof(AlbumArtPopup.Height))]
+        [TrackState]
         public double Height
         {
-            get => Model.Height;
-            set => SetProperty(nameof(Model.Height), value);
+            get => _model.Height;
+            set => SetProperty(_model, nameof(_model.Height), value);
         }
 
         /// <summary>
         /// Gets or sets the x position.
         /// </summary>
-        [PropertyChangeBinding(nameof(AlbumArtPopup.XPosition))]
+        [TrackState]
         public double XPosition
         {
-            get => Model.XPosition;
-            set => SetProperty(nameof(Model.XPosition), value);
+            get => _model.XPosition;
+            set => SetProperty(_model, nameof(_model.XPosition), value);
         }
 
         /// <summary>
         /// Gets or sets the margin.
         /// </summary>
-        [PropertyChangeBinding(nameof(AlbumArtPopup.Margin))]
+        [TrackState]
         public double Margin
         {
-            get => Model.Margin;
-            set => SetProperty(nameof(Model.Margin), value);
+            get => _model.Margin;
+            set => SetProperty(_model, nameof(_model.Margin), value);
+        }
+
+        /// <inheritdoc />
+        protected override void OnReset()
+        {
+            base.OnReset();
+            ResetObject(_model);
+        }
+
+        /// <inheritdoc />
+        protected override void OnBeginEdit()
+        {
+            base.OnBeginEdit();
+            MapSelf(_model, _backup);
+        }
+
+        /// <inheritdoc />
+        protected override void OnCancelEdit()
+        {
+            base.OnCancelEdit();
+            MapSelf(_backup, _model);
+        }
+
+        /// <inheritdoc />
+        protected override void OnEndEdit()
+        {
+            base.OnEndEdit();
+            MapSelf(_model, _appSettings.AlbumArtPopup);
         }
 
         private void AppSettingsOnProfileChanged(object sender, EventArgs e)
         {
             Debug.Assert(IsEditing == false, "Should not be editing");
-            ReplaceModel(_appSettings.AlbumArtPopup);
+            MapSelf(_appSettings.AlbumArtPopup, _model);
+            RaisePropertyChangedAll();
         }
     }
 }
diff --git a/src/AudioBand/ViewModels/AlbumArtViewModel.cs b/src/AudioBand/ViewModels/AlbumArtViewModel.cs
index 7ca9f20c..3b762fcf 100644
--- a/src/AudioBand/ViewModels/AlbumArtViewModel.cs
+++ b/src/AudioBand/ViewModels/AlbumArtViewModel.cs
@@ -6,6 +6,7 @@
 using System.Windows.Media.Imaging;
 using AudioBand.AudioSource;
 using AudioBand.Extensions;
+using AudioBand.Messages;
 using AudioBand.Models;
 using AudioBand.Settings;
 
@@ -26,8 +27,9 @@ public class AlbumArtViewModel : LayoutViewModelBase<AlbumArt>
         /// <param name="appsettings">The app settings.</param>
         /// <param name="dialogService">The dialog service.</param>
         /// <param name="audioSession">The audio session.</param>
-        public AlbumArtViewModel(IAppSettings appsettings, IDialogService dialogService, IAudioSession audioSession)
-            : base(appsettings.AlbumArt)
+        /// <param name="messageBus">The message bus.</param>
+        public AlbumArtViewModel(IAppSettings appsettings, IDialogService dialogService, IAudioSession audioSession, IMessageBus messageBus)
+            : base(messageBus, appsettings.AlbumArt)
         {
             DialogService = dialogService;
             _appsettings = appsettings;
@@ -40,11 +42,11 @@ public AlbumArtViewModel(IAppSettings appsettings, IDialogService dialogService,
         /// <summary>
         /// Gets or sets the placeholder path.
         /// </summary>
-        [PropertyChangeBinding(nameof(Models.AlbumArt.PlaceholderPath))]
+        [TrackState]
         public string PlaceholderPath
         {
             get => Model.PlaceholderPath;
-            set => SetProperty(nameof(Model.PlaceholderPath), value);
+            set => SetProperty(Model, nameof(Model.PlaceholderPath), value);
         }
 
         /// <summary>
@@ -53,7 +55,7 @@ public string PlaceholderPath
         public ImageSource AlbumArt
         {
             get => _albumArt;
-            private set => SetProperty(ref _albumArt, value, false);
+            private set => SetProperty(ref _albumArt, value);
         }
 
         /// <summary>
@@ -61,10 +63,18 @@ public ImageSource AlbumArt
         /// </summary>
         public IDialogService DialogService { get; }
 
+        /// <inheritdoc />
+        protected override void OnEndEdit()
+        {
+            base.OnEndEdit();
+            MapSelf(Model, _appsettings.AlbumArt);
+        }
+
         private void AppsettingsOnProfileChanged(object sender, EventArgs e)
         {
             Debug.Assert(IsEditing == false, "Should not be editing");
-            ReplaceModel(_appsettings.AlbumArt);
+            MapSelf(_appsettings.AlbumArt, Model);
+            RaisePropertyChangedAll();
         }
 
         private void AudioSessionOnPropertyChanged(object sender, PropertyChangedEventArgs e)
diff --git a/src/AudioBand/ViewModels/AudioBandToolbarViewModel.cs b/src/AudioBand/ViewModels/AudioBandToolbarViewModel.cs
index 6c6f6106..b5525f2c 100644
--- a/src/AudioBand/ViewModels/AudioBandToolbarViewModel.cs
+++ b/src/AudioBand/ViewModels/AudioBandToolbarViewModel.cs
@@ -4,16 +4,19 @@
 using System.Windows.Input;
 using AudioBand.AudioSource;
 using AudioBand.Commands;
+using AudioBand.Logging;
 using AudioBand.Messages;
 using AudioBand.Settings;
+using NLog;
 
 namespace AudioBand.ViewModels
 {
     /// <summary>
     /// View model for audio band toolbar.
     /// </summary>
-    public class AudioBandToolbarViewModel : ViewModelBase
+    public class AudioBandToolbarViewModel : ObservableObject
     {
+        private static readonly ILogger Logger = AudioBandLogManager.GetLogger<AudioBandToolbarViewModel>();
         private readonly IAppSettings _appSettings;
         private readonly IAudioSourceManager _audioSourceManager;
         private readonly IMessageBus _messageBus;
@@ -74,7 +77,7 @@ public IAudioSource SelectedAudioSource
             get => _selectedAudioSource;
             set
             {
-                if (SetProperty(ref _selectedAudioSource, value, false))
+                if (SetProperty(ref _selectedAudioSource, value))
                 {
                     _appSettings.AudioSource = value?.Name;
                 }
diff --git a/src/AudioBand/ViewModels/AudioBandViewModel.cs b/src/AudioBand/ViewModels/AudioBandViewModel.cs
index f31efca6..cef3bb74 100644
--- a/src/AudioBand/ViewModels/AudioBandViewModel.cs
+++ b/src/AudioBand/ViewModels/AudioBandViewModel.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Diagnostics;
 using System.Windows.Media;
+using AudioBand.Messages;
 using AudioBand.Settings;
 
 namespace AudioBand.ViewModels
@@ -8,51 +9,56 @@ namespace AudioBand.ViewModels
     /// <summary>
     /// View model for the general application.
     /// </summary>
-    public class AudioBandViewModel : ViewModelBase<Models.AudioBand>
+    public class AudioBandViewModel : ViewModelBase
     {
         private readonly IAppSettings _appsettings;
+        private readonly Models.AudioBand _model = new Models.AudioBand();
+        private readonly Models.AudioBand _backup = new Models.AudioBand();
 
         /// <summary>
         /// Initializes a new instance of the <see cref="AudioBandViewModel"/> class.
         /// </summary>
         /// <param name="appsettings">The app settings.</param>
         /// <param name="dialogService">The dialog service.</param>
-        public AudioBandViewModel(IAppSettings appsettings, IDialogService dialogService)
-            : base(appsettings.AudioBand)
+        /// <param name="messageBus">The message bus.</param>
+        public AudioBandViewModel(IAppSettings appsettings, IDialogService dialogService, IMessageBus messageBus)
         {
+            MapSelf(appsettings.AudioBand, _model);
+
             DialogService = dialogService;
             _appsettings = appsettings;
             appsettings.ProfileChanged += AppsettingsOnProfileChanged;
+            UseMessageBus(messageBus);
         }
 
         /// <summary>
         /// Gets or sets the width.
         /// </summary>
-        [PropertyChangeBinding(nameof(Models.AudioBand.Width))]
+        [TrackState]
         public double Width
         {
-            get => Model.Width;
-            set => SetProperty(nameof(Model.Width), value);
+            get => _model.Width;
+            set => SetProperty(_model, nameof(_model.Width), value);
         }
 
         /// <summary>
         /// Gets or sets the height.
         /// </summary>
-        [PropertyChangeBinding(nameof(Models.AudioBand.Height))]
+        [TrackState]
         public double Height
         {
-            get => Model.Height;
-            set => SetProperty(nameof(Model.Height), value);
+            get => _model.Height;
+            set => SetProperty(_model, nameof(_model.Height), value);
         }
 
         /// <summary>
         /// Gets or sets the background color.
         /// </summary>
-        [PropertyChangeBinding(nameof(Models.AudioBand.BackgroundColor))]
+        [TrackState]
         public Color BackgroundColor
         {
-            get => Model.BackgroundColor;
-            set => SetProperty(nameof(Model.BackgroundColor), value);
+            get => _model.BackgroundColor;
+            set => SetProperty(_model, nameof(_model.BackgroundColor), value);
         }
 
         /// <summary>
@@ -60,10 +66,39 @@ public Color BackgroundColor
         /// </summary>
         public IDialogService DialogService { get; }
 
+        /// <inheritdoc />
+        protected override void OnReset()
+        {
+            base.OnReset();
+            ResetObject(_model);
+        }
+
+        /// <inheritdoc />
+        protected override void OnBeginEdit()
+        {
+            base.OnBeginEdit();
+            MapSelf(_model, _backup);
+        }
+
+        /// <inheritdoc />
+        protected override void OnCancelEdit()
+        {
+            base.OnCancelEdit();
+            MapSelf(_backup, _model);
+        }
+
+        /// <inheritdoc />
+        protected override void OnEndEdit()
+        {
+            base.OnEndEdit();
+            MapSelf(_model, _appsettings.AudioBand);
+        }
+
         private void AppsettingsOnProfileChanged(object sender, EventArgs e)
         {
             Debug.Assert(IsEditing == false, "Should not be editing");
-            ReplaceModel(_appsettings.AudioBand);
+            MapSelf(_appsettings.AudioBand, _model);
+            RaisePropertyChangedAll();
         }
     }
 }
diff --git a/src/AudioBand/ViewModels/AudioSourceSettingKeyValue.cs b/src/AudioBand/ViewModels/AudioSourceSettingKeyValue.cs
index 63ac29f6..4bfd94b6 100644
--- a/src/AudioBand/ViewModels/AudioSourceSettingKeyValue.cs
+++ b/src/AudioBand/ViewModels/AudioSourceSettingKeyValue.cs
@@ -1,5 +1,6 @@
 using System;
 using AudioBand.AudioSource;
+using AudioBand.Messages;
 using AudioBand.Models;
 using AudioSourceHost;
 
@@ -8,42 +9,46 @@ namespace AudioBand.ViewModels
     /// <summary>
     /// View model for <see cref="AudioSourceSetting"/>. Represents one key-value pair.
     /// </summary>
-    public class AudioSourceSettingKeyValue : ViewModelBase<AudioSourceSetting>
+    public class AudioSourceSettingKeyValue : ViewModelBase
     {
         private readonly AudioSourceSettingAttribute _settingAttribute;
         private readonly IInternalAudioSource _audioSource;
+        private readonly AudioSourceSetting _model = new AudioSourceSetting();
+        private readonly AudioSourceSetting _originalSource;
+        private readonly AudioSourceSetting _backup = new AudioSourceSetting();
 
         /// <summary>
         /// Initializes a new instance of the <see cref="AudioSourceSettingKeyValue"/> class
         /// with the model, setting information and if it was saved.
         /// </summary>
         /// <param name="audioSource">The associated <see cref="IInternalAudioSource"/>.</param>
-        /// <param name="model">The setting model.</param>
+        /// <param name="source">The setting model.</param>
         /// <param name="settingAttribute">The <see cref="AudioSourceSettingAttribute"/>.</param>
-        public AudioSourceSettingKeyValue(IInternalAudioSource audioSource, AudioSourceSetting model, AudioSourceSettingAttribute settingAttribute)
-            : base(model)
+        public AudioSourceSettingKeyValue(IInternalAudioSource audioSource, AudioSourceSetting source, AudioSourceSettingAttribute settingAttribute)
         {
             _settingAttribute = settingAttribute;
             _audioSource = audioSource;
+            _originalSource = source;
+
+            MapSelf(_originalSource, _model);
 
             // Model value was deserialized from string maybe so change to correct type
-            model.Value = TypeConvertHelper.ConvertToType(model.Value, SettingType);
+            source.Value = TypeConvertHelper.ConvertToType(source.Value, SettingType);
         }
 
         /// <summary>
         /// Gets the setting name.
         /// </summary>
-        [PropertyChangeBinding(nameof(AudioSourceSetting.Name))]
-        public string Name => Model.Name;
+        public string Name => _model.Name;
 
         /// <summary>
         /// Gets or sets the value of the setting, can be any basic type.
         /// </summary>
-        [PropertyChangeBinding(nameof(AudioSourceSetting.Value))]
+        [TrackState]
         public object Value
         {
-            get => Model.Value;
-            set => SetProperty(nameof(Model.Value), value);
+            get => _model.Value;
+            set => SetProperty(_model, nameof(_model.Value), value);
         }
 
         /// <summary>
@@ -91,6 +96,25 @@ public void PropagateSettingToAudioSource()
             }
         }
 
+        /// <inheritdoc />
+        protected override void OnBeginEdit()
+        {
+            base.OnBeginEdit();
+            MapSelf(_model, _backup);
+        }
+
+        /// <inheritdoc />
+        protected override void OnCancelEdit()
+        {
+            base.OnCancelEdit();
+            if (ReadOnly)
+            {
+                return;
+            }
+
+            MapSelf(_backup, _model);
+        }
+
         /// <inheritdoc/>
         protected override void OnEndEdit()
         {
@@ -100,6 +124,7 @@ protected override void OnEndEdit()
                 return;
             }
 
+            MapSelf(_model, _originalSource);
             PropagateSettingToAudioSource();
         }
     }
diff --git a/src/AudioBand/ViewModels/AudioSourceSettingsCollectionViewModel.cs b/src/AudioBand/ViewModels/AudioSourceSettingsCollectionViewModel.cs
index 3634b06b..2f41eae2 100644
--- a/src/AudioBand/ViewModels/AudioSourceSettingsCollectionViewModel.cs
+++ b/src/AudioBand/ViewModels/AudioSourceSettingsCollectionViewModel.cs
@@ -4,6 +4,7 @@
 using System.ComponentModel;
 using System.Linq;
 using AudioBand.AudioSource;
+using AudioBand.Messages;
 using AudioBand.Models;
 
 namespace AudioBand.ViewModels
@@ -14,15 +15,18 @@ namespace AudioBand.ViewModels
     public class AudioSourceSettingsCollectionViewModel : ViewModelBase
     {
         private readonly IInternalAudioSource _audioSource;
+        private readonly IMessageBus _messageBus;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="AudioSourceSettingsCollectionViewModel"/> class.
         /// </summary>
         /// <param name="audioSource">The audiosource that these settings belong to.</param>
         /// <param name="settingsModel">The settings model.</param>
-        public AudioSourceSettingsCollectionViewModel(IInternalAudioSource audioSource, AudioSourceSettings settingsModel)
+        /// <param name="messageBus">The message bus.</param>
+        public AudioSourceSettingsCollectionViewModel(IInternalAudioSource audioSource, AudioSourceSettings settingsModel, IMessageBus messageBus)
         {
             _audioSource = audioSource;
+            _messageBus = messageBus;
             SettingsList = new ObservableCollection<AudioSourceSettingKeyValue>(CreateKeyValuePairs(audioSource, settingsModel));
             _audioSource.SettingChanged += AudioSourceOnSettingChanged;
 
@@ -30,6 +34,8 @@ public AudioSourceSettingsCollectionViewModel(IInternalAudioSource audioSource,
             {
                 audioSourceSettingKeyValue.PropertyChanged += AudioSourceSettingKeyValueOnPropertyChanged;
             }
+
+            UseMessageBus(messageBus);
         }
 
         /// <summary>
diff --git a/src/AudioBand/ViewModels/AudioSourceSettingsViewModel.cs b/src/AudioBand/ViewModels/AudioSourceSettingsViewModel.cs
index 1beecfc5..be4ae67f 100644
--- a/src/AudioBand/ViewModels/AudioSourceSettingsViewModel.cs
+++ b/src/AudioBand/ViewModels/AudioSourceSettingsViewModel.cs
@@ -1,6 +1,7 @@
 using System.Collections.ObjectModel;
 using System.Linq;
 using AudioBand.AudioSource;
+using AudioBand.Messages;
 using AudioBand.Models;
 using AudioBand.Settings;
 
@@ -9,18 +10,21 @@ namespace AudioBand.ViewModels
     /// <summary>
     /// View model for ALL audio source settings.
     /// </summary>
-    public class AudioSourceSettingsViewModel : ViewModelBase
+    public class AudioSourceSettingsViewModel : ObservableObject
     {
         private readonly IAppSettings _appSettings;
+        private readonly IMessageBus _messageBus;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="AudioSourceSettingsViewModel"/> class
         /// with the settings.
         /// </summary>
         /// <param name="appSettings">The app settings.</param>
-        public AudioSourceSettingsViewModel(IAppSettings appSettings)
+        /// <param name="messageBus">The message bus.</param>
+        public AudioSourceSettingsViewModel(IAppSettings appSettings, IMessageBus messageBus)
         {
             _appSettings = appSettings;
+            _messageBus = messageBus;
         }
 
         /// <summary>
@@ -44,14 +48,14 @@ public void CreateViewModelForAudioSource(IInternalAudioSource audioSource)
             var matchingSetting = _appSettings.AudioSourceSettings.FirstOrDefault(s => s.AudioSourceName == audioSource.Name);
             if (matchingSetting != null)
             {
-                var viewModel = new AudioSourceSettingsCollectionViewModel(audioSource, matchingSetting);
+                var viewModel = new AudioSourceSettingsCollectionViewModel(audioSource, matchingSetting, _messageBus);
                 AudioSourcesSettings.Add(viewModel);
             }
             else
             {
                 var newSettingsModel = new AudioSourceSettings { AudioSourceName = audioSource.Name };
                 _appSettings.AudioSourceSettings.Add(newSettingsModel);
-                var newViewModel = new AudioSourceSettingsCollectionViewModel(audioSource, newSettingsModel);
+                var newViewModel = new AudioSourceSettingsCollectionViewModel(audioSource, newSettingsModel, _messageBus);
                 AudioSourcesSettings.Add(newViewModel);
             }
 
diff --git a/src/AudioBand/ViewModels/ButtonContentViewModel.cs b/src/AudioBand/ViewModels/ButtonContentViewModel.cs
index 4d92f9f6..622090ef 100644
--- a/src/AudioBand/ViewModels/ButtonContentViewModel.cs
+++ b/src/AudioBand/ViewModels/ButtonContentViewModel.cs
@@ -1,7 +1,7 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Windows.Media;
 using AudioBand.Extensions;
+using AudioBand.Messages;
 using AudioBand.Models;
 
 namespace AudioBand.ViewModels
@@ -9,21 +9,26 @@ namespace AudioBand.ViewModels
     /// <summary>
     /// View model for button content.
     /// </summary>
-    public class ButtonContentViewModel : ViewModelBase<ButtonContent>
+    public class ButtonContentViewModel : ViewModelBase
     {
-        private readonly ButtonContent _resetContent;
+        private readonly ButtonContent _model = new ButtonContent();
+        private readonly ButtonContent _backup = new ButtonContent();
+        private readonly ButtonContent _resetState;
+        private readonly ButtonContent _originalSource;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ButtonContentViewModel"/> class.
         /// </summary>
-        /// <param name="model">The button content model.</param>
-        /// <param name="resetContent">The state used for resetting.</param>
+        /// <param name="source">The button content model.</param>
+        /// <param name="resetState">The state used for resetting.</param>
         /// <param name="dialogService">The dialog service.</param>
-        public ButtonContentViewModel(ButtonContent model, ButtonContent resetContent, IDialogService dialogService)
-            : base(model)
+        public ButtonContentViewModel(ButtonContent source, ButtonContent resetState, IDialogService dialogService)
         {
-            _resetContent = resetContent;
+            _resetState = resetState;
+            _originalSource = source;
             DialogService = dialogService;
+
+            MapSelf(source, _model);
         }
 
         /// <summary>
@@ -34,91 +39,91 @@ public ButtonContentViewModel(ButtonContent model, ButtonContent resetContent, I
         /// <summary>
         /// Gets or sets the content type.
         /// </summary>
-        [PropertyChangeBinding(nameof(ButtonContent.ContentType))]
+        [TrackState]
         public ButtonContentType ContentType
         {
-            get => Model.ContentType;
-            set => SetProperty(nameof(Model.ContentType), value);
+            get => _model.ContentType;
+            set => SetProperty(_model, nameof(_model.ContentType), value);
         }
 
         /// <summary>
         /// Gets or sets the image path.
         /// </summary>
-        [PropertyChangeBinding(nameof(ButtonContent.ImagePath))]
+        [TrackState]
         public string ImagePath
         {
-            get => Model.ImagePath;
-            set => SetProperty(nameof(Model.ImagePath), value);
+            get => _model.ImagePath;
+            set => SetProperty(_model, nameof(_model.ImagePath), value);
         }
 
         /// <summary>
         /// Gets or sets the path of the image when hovered.
         /// </summary>
-        [PropertyChangeBinding(nameof(ButtonContent.HoveredImagePath))]
+        [TrackState]
         public string HoveredImagePath
         {
-            get => Model.HoveredImagePath;
-            set => SetProperty(nameof(Model.HoveredImagePath), value);
+            get => _model.HoveredImagePath;
+            set => SetProperty(_model, nameof(_model.HoveredImagePath), value);
         }
 
         /// <summary>
         /// Gets or sets the path of the image when clicked.
         /// </summary>
-        [PropertyChangeBinding(nameof(ButtonContent.ClickedImagePath))]
+        [TrackState]
         public string ClickedImagePath
         {
-            get => Model.ClickedImagePath;
-            set => SetProperty(nameof(Model.ClickedImagePath), value);
+            get => _model.ClickedImagePath;
+            set => SetProperty(_model, nameof(_model.ClickedImagePath), value);
         }
 
         /// <summary>
         /// Gets or sets the font family for the text.
         /// </summary>
-        [PropertyChangeBinding(nameof(ButtonContent.FontFamily))]
+        [TrackState]
         public string FontFamily
         {
-            get => Model.FontFamily;
-            set => SetProperty(nameof(Model.FontFamily), value);
+            get => _model.FontFamily;
+            set => SetProperty(_model, nameof(_model.FontFamily), value);
         }
 
         /// <summary>
         /// Gets or sets the text.
         /// </summary>
-        [PropertyChangeBinding(nameof(ButtonContent.Text))]
+        [TrackState]
         public string Text
         {
-            get => Model.Text;
-            set => SetProperty(nameof(Model.Text), value);
+            get => _model.Text;
+            set => SetProperty(_model, nameof(_model.Text), value);
         }
 
         /// <summary>
         /// Gets or sets the text color.
         /// </summary>
-        [PropertyChangeBinding(nameof(ButtonContent.TextColor))]
+        [TrackState]
         public Color TextColor
         {
-            get => Model.TextColor;
-            set => SetProperty(nameof(Model.TextColor), value);
+            get => _model.TextColor;
+            set => SetProperty(_model, nameof(_model.TextColor), value);
         }
 
         /// <summary>
         /// Gets or sets the text color when hovered.
         /// </summary>
-        [PropertyChangeBinding(nameof(ButtonContent.HoveredTextColor))]
+        [TrackState]
         public Color HoveredTextColor
         {
-            get => Model.HoveredTextColor;
-            set => SetProperty(nameof(Model.HoveredTextColor), value);
+            get => _model.HoveredTextColor;
+            set => SetProperty(_model, nameof(_model.HoveredTextColor), value);
         }
 
         /// <summary>
         /// Gets or sets the text color when clicked.
         /// </summary>
-        [PropertyChangeBinding(nameof(ButtonContent.ClickedTextColor))]
+        [TrackState]
         public Color ClickedTextColor
         {
-            get => Model.ClickedTextColor;
-            set => SetProperty(nameof(Model.ClickedTextColor), value);
+            get => _model.ClickedTextColor;
+            set => SetProperty(_model, nameof(_model.ClickedTextColor), value);
         }
 
         /// <summary>
@@ -129,8 +134,29 @@ public Color ClickedTextColor
         /// <inheritdoc />
         protected override void OnReset()
         {
-            BeginEdit();
-            ResetObject(_resetContent, Model);
+            base.OnReset();
+            MapSelf(_resetState, _model);
+        }
+
+        /// <inheritdoc />
+        protected override void OnBeginEdit()
+        {
+            base.OnBeginEdit();
+            MapSelf(_model, _backup);
+        }
+
+        /// <inheritdoc />
+        protected override void OnCancelEdit()
+        {
+            base.OnCancelEdit();
+            MapSelf(_backup, _model);
+        }
+
+        /// <inheritdoc />
+        protected override void OnEndEdit()
+        {
+            base.OnEndEdit();
+            MapSelf(_model, _originalSource);
         }
     }
 }
diff --git a/src/AudioBand/ViewModels/ButtonViewModelBase.cs b/src/AudioBand/ViewModels/ButtonViewModelBase.cs
index 69ff8944..40f06b46 100644
--- a/src/AudioBand/ViewModels/ButtonViewModelBase.cs
+++ b/src/AudioBand/ViewModels/ButtonViewModelBase.cs
@@ -2,6 +2,7 @@
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Windows.Media;
+using AudioBand.Messages;
 using AudioBand.Models;
 
 namespace AudioBand.ViewModels
@@ -18,10 +19,11 @@ public class ButtonViewModelBase<TButton> : LayoutViewModelBase<TButton>
         /// <summary>
         /// Initializes a new instance of the <see cref="ButtonViewModelBase{TButton}"/> class.
         /// </summary>
-        /// <param name="model">The button model.</param>
+        /// <param name="source">The button model with the initial data.</param>
         /// <param name="dialogService">The dialog service to use.</param>
-        public ButtonViewModelBase(TButton model, IDialogService dialogService)
-            : base(model)
+        /// <param name="messageBus">The message bus to use.</param>
+        public ButtonViewModelBase(TButton source, IDialogService dialogService, IMessageBus messageBus)
+            : base(messageBus, source)
         {
             DialogService = dialogService;
         }
@@ -29,31 +31,31 @@ public ButtonViewModelBase(TButton model, IDialogService dialogService)
         /// <summary>
         /// Gets or sets the background color.
         /// </summary>
-        [PropertyChangeBinding(nameof(ButtonModelBase.BackgroundColor))]
+        [TrackState]
         public Color BackgroundColor
         {
             get => Model.BackgroundColor;
-            set => SetProperty(nameof(Model.BackgroundColor), value);
+            set => SetProperty(Model, nameof(Model.BackgroundColor), value);
         }
 
         /// <summary>
         /// Gets or sets the background color when hovered.
         /// </summary>
-        [PropertyChangeBinding(nameof(ButtonModelBase.HoveredBackgroundColor))]
+        [TrackState]
         public Color HoveredBackgroundColor
         {
             get => Model.HoveredBackgroundColor;
-            set => SetProperty(nameof(Model.HoveredBackgroundColor), value);
+            set => SetProperty(Model, nameof(Model.HoveredBackgroundColor), value);
         }
 
         /// <summary>
         /// Gets or sets the background color when clicked.
         /// </summary>
-        [PropertyChangeBinding(nameof(ButtonModelBase.ClickedBackgroundColor))]
+        [TrackState]
         public Color ClickedBackgroundColor
         {
             get => Model.ClickedBackgroundColor;
-            set => SetProperty(nameof(Model.ClickedBackgroundColor), value);
+            set => SetProperty(Model, nameof(Model.ClickedBackgroundColor), value);
         }
 
         /// <summary>
diff --git a/src/AudioBand/ViewModels/CustomLabelViewModel.cs b/src/AudioBand/ViewModels/CustomLabelViewModel.cs
index 747f784b..c427e15d 100644
--- a/src/AudioBand/ViewModels/CustomLabelViewModel.cs
+++ b/src/AudioBand/ViewModels/CustomLabelViewModel.cs
@@ -5,6 +5,7 @@
 using System.Windows.Media;
 using AudioBand.AudioSource;
 using AudioBand.Extensions;
+using AudioBand.Messages;
 using AudioBand.Models;
 using AudioBand.TextFormatting;
 using TextAlignment = AudioBand.Models.CustomLabel.TextAlignment;
@@ -23,11 +24,12 @@ public class CustomLabelViewModel : LayoutViewModelBase<CustomLabel>
         /// <summary>
         /// Initializes a new instance of the <see cref="CustomLabelViewModel"/> class.
         /// </summary>
-        /// <param name="model">The custom label.</param>
+        /// <param name="source">The custom label.</param>
         /// <param name="dialogService">The dialog service.</param>
         /// <param name="audioSession">The audio session.</param>
-        public CustomLabelViewModel(CustomLabel model, IDialogService dialogService, IAudioSession audioSession)
-            : base(model)
+        /// <param name="messageBus">The message bus.</param>
+        public CustomLabelViewModel(CustomLabel source, IDialogService dialogService, IAudioSession audioSession, IMessageBus messageBus)
+            : base(messageBus, source)
         {
             _audioSession = audioSession;
             _audioSession.PropertyChanged += AudioSessionOnPropertyChanged;
@@ -40,122 +42,122 @@ public CustomLabelViewModel(CustomLabel model, IDialogService dialogService, IAu
         /// <summary>
         /// Gets or sets the name of the label.
         /// </summary>
-        [PropertyChangeBinding(nameof(CustomLabel.Name))]
+        [TrackState]
         public string Name
         {
             get => Model.Name;
-            set => SetProperty(nameof(Model.Name), value);
+            set => SetProperty(Model, nameof(Model.Name), value);
         }
 
         /// <summary>
         /// Gets or sets the font family.
         /// </summary>
-        [PropertyChangeBinding(nameof(CustomLabel.FontFamily))]
+        [TrackState]
         public string FontFamily
         {
             get => Model.FontFamily;
-            set => SetProperty(nameof(Model.FontFamily), value);
+            set => SetProperty(Model, nameof(Model.FontFamily), value);
         }
 
         /// <summary>
         /// Gets or sets the font size.
         /// </summary>
-        [PropertyChangeBinding(nameof(CustomLabel.FontSize))]
+        [TrackState]
         public float FontSize
         {
             get => Model.FontSize;
-            set => SetProperty(nameof(Model.FontSize), value);
+            set => SetProperty(Model, nameof(Model.FontSize), value);
         }
 
         /// <summary>
         /// Gets or sets the font color.
         /// </summary>
-        [PropertyChangeBinding(nameof(CustomLabel.Color))]
+        [TrackState]
         public Color Color
         {
             get => Model.Color;
-            set => SetProperty(nameof(Model.Color), value);
+            set => SetProperty(Model, nameof(Model.Color), value);
         }
 
         /// <summary>
         /// Gets or sets the format string.
         /// </summary>
-        [PropertyChangeBinding(nameof(CustomLabel.FormatString))]
         [AlsoNotify(nameof(TextSegments))]
+        [TrackState]
         public string FormatString
         {
             get => Model.FormatString;
-            set => SetProperty(nameof(Model.FormatString), value);
+            set => SetProperty(Model, nameof(Model.FormatString), value);
         }
 
         /// <summary>
         /// Gets or sets the text alignment.
         /// </summary>
-        [PropertyChangeBinding(nameof(CustomLabel.Alignment))]
+        [TrackState]
         public TextAlignment TextAlignment
         {
             get => Model.Alignment;
-            set => SetProperty(nameof(Model.Alignment), value);
+            set => SetProperty(Model, nameof(Model.Alignment), value);
         }
 
         /// <summary>
         /// Gets or sets the scroll speed.
         /// </summary>
-        [PropertyChangeBinding(nameof(CustomLabel.ScrollSpeed))]
+        [TrackState]
         public TimeSpan ScrollSpeed
         {
             get => TimeSpan.FromMilliseconds(Model.ScrollSpeed);
-            set => SetProperty(nameof(Model.ScrollSpeed), (int)value.TotalMilliseconds);
+            set => SetProperty(Model, nameof(Model.ScrollSpeed), (int)value.TotalMilliseconds);
         }
 
         /// <summary>
         /// Gets or sets the text overflow.
         /// </summary>
-        [PropertyChangeBinding(nameof(CustomLabel.TextOverflow))]
+        [TrackState]
         public TextOverflow TextOverflow
         {
             get => Model.TextOverflow;
-            set => SetProperty(nameof(Model.TextOverflow), value);
+            set => SetProperty(Model, nameof(Model.TextOverflow), value);
         }
 
         /// <summary>
         /// Gets or sets the scroll behavior.
         /// </summary>
-        [PropertyChangeBinding(nameof(CustomLabel.ScrollBehavior))]
+        [TrackState]
         public ScrollBehavior ScrollBehavior
         {
             get => Model.ScrollBehavior;
-            set => SetProperty(nameof(Model.ScrollBehavior), value);
+            set => SetProperty(Model, nameof(Model.ScrollBehavior), value);
         }
 
         /// <summary>
         /// Gets or sets the fade effect.
         /// </summary>
-        [PropertyChangeBinding(nameof(CustomLabel.FadeEffect))]
+        [TrackState]
         public TextFadeEffect FadeEffect
         {
             get => Model.FadeEffect;
-            set => SetProperty(nameof(Model.FadeEffect), value);
+            set => SetProperty(Model, nameof(Model.FadeEffect), value);
         }
 
         /// <summary>
         /// Gets or sets the left offset for the text fade gradient.
         /// </summary>
-        [PropertyChangeBinding(nameof(CustomLabel.LeftFadeOffset))]
+        [TrackState]
         public double LeftFadeOffset
         {
             get => Model.LeftFadeOffset;
-            set => SetProperty(nameof(Model.LeftFadeOffset), value);
+            set => SetProperty(Model, nameof(Model.LeftFadeOffset), value);
         }
 
         /// <summary>
         /// Gets or sets the right offset for the text fade gradient.
         /// </summary>
-        [PropertyChangeBinding(nameof(CustomLabel.RightFadeOffset))]
+        [TrackState]
         public double RightFadeOffset
         {
             get => Model.RightFadeOffset;
-            set => SetProperty(nameof(Model.RightFadeOffset), value);
+            set => SetProperty(Model, nameof(Model.RightFadeOffset), value);
         }
 
         /// <summary>
@@ -164,7 +166,7 @@ public double RightFadeOffset
         public IEnumerable<TextSegment> TextSegments
         {
             get => _textSegments;
-            private set => SetProperty(ref _textSegments, value, false);
+            private set => SetProperty(ref _textSegments, value);
         }
 
         /// <summary>
@@ -199,11 +201,20 @@ public IEnumerable<TextSegment> TextSegments
         public bool IsPlaying
         {
             get => _isPlaying;
-            set => SetProperty(ref _isPlaying, value, false);
+            set => SetProperty(ref _isPlaying, value);
+        }
+
+        /// <summary>
+        /// Gets the current custom label model.
+        /// </summary>
+        /// <returns>The custom label model.</returns>
+        public CustomLabel GetModel()
+        {
+            return Model;
         }
 
         /// <inheritdoc/>
-        protected override void OnModelPropertyChanged(string propertyName)
+        protected override void OnPropertyChanged(string propertyName)
         {
             switch (propertyName)
             {
diff --git a/src/AudioBand/ViewModels/CustomLabelsViewModel.cs b/src/AudioBand/ViewModels/CustomLabelsViewModel.cs
index 78e5e9ac..5692b21b 100644
--- a/src/AudioBand/ViewModels/CustomLabelsViewModel.cs
+++ b/src/AudioBand/ViewModels/CustomLabelsViewModel.cs
@@ -5,6 +5,7 @@
 using System.Linq;
 using AudioBand.AudioSource;
 using AudioBand.Commands;
+using AudioBand.Messages;
 using AudioBand.Models;
 using AudioBand.Settings;
 
@@ -15,8 +16,8 @@ namespace AudioBand.ViewModels
     /// </summary>
     public class CustomLabelsViewModel : ViewModelBase
     {
-        private readonly HashSet<CustomLabelViewModel> _added = new HashSet<CustomLabelViewModel>();
-        private readonly HashSet<CustomLabelViewModel> _removed = new HashSet<CustomLabelViewModel>();
+        private readonly List<CustomLabelViewModel> _added = new List<CustomLabelViewModel>();
+        private readonly List<CustomLabelViewModel> _removed = new List<CustomLabelViewModel>();
         private readonly IAppSettings _appsettings;
         private readonly IDialogService _dialogService;
         private readonly IAudioSession _audioSession;
@@ -28,11 +29,13 @@ public class CustomLabelsViewModel : ViewModelBase
         /// <param name="appsettings">The app setings.</param>
         /// <param name="dialogService">The dialog service.</param>
         /// <param name="audioSession">The audio session.</param>
-        public CustomLabelsViewModel(IAppSettings appsettings, IDialogService dialogService, IAudioSession audioSession)
+        /// <param name="messageBus">The message bus.</param>
+        public CustomLabelsViewModel(IAppSettings appsettings, IDialogService dialogService, IAudioSession audioSession, IMessageBus messageBus)
         {
             _appsettings = appsettings;
             _dialogService = dialogService;
             _audioSession = audioSession;
+            UseMessageBus(messageBus);
             SetupLabels();
 
             AddLabelCommand = new RelayCommand(AddLabelCommandOnExecute);
@@ -97,7 +100,7 @@ private void AddLabelCommandOnExecute(object o)
         {
             BeginEdit();
 
-            var newLabel = new CustomLabelViewModel(new CustomLabel(), _dialogService, _audioSession) { Name = "New Label" };
+            var newLabel = new CustomLabelViewModel(new CustomLabel(), _dialogService, _audioSession, MessageBus) { Name = "New Label" };
             CustomLabels.Add(newLabel);
 
             _added.Add(newLabel);
@@ -124,7 +127,7 @@ private void RemoveLabelCommandOnExecute(CustomLabelViewModel labelViewModel)
         private void SetupLabels()
         {
             CustomLabels.Clear();
-            foreach (var customLabelVm in _appsettings.CustomLabels.Select(customLabel => new CustomLabelViewModel(customLabel, _dialogService, _audioSession)))
+            foreach (var customLabelVm in _appsettings.CustomLabels.Select(customLabel => new CustomLabelViewModel(customLabel, _dialogService, _audioSession, MessageBus)))
             {
                 CustomLabels.Add(customLabelVm);
             }
diff --git a/src/AudioBand/ViewModels/LayoutViewModelBase.cs b/src/AudioBand/ViewModels/LayoutViewModelBase.cs
index e0bdaec0..00ab5147 100644
--- a/src/AudioBand/ViewModels/LayoutViewModelBase.cs
+++ b/src/AudioBand/ViewModels/LayoutViewModelBase.cs
@@ -1,81 +1,113 @@
-using AudioBand.Models;
+using AudioBand.Messages;
+using AudioBand.Models;
 
 namespace AudioBand.ViewModels
 {
     /// <summary>
-    /// Base view model for <see cref="LayoutModelBase"/>.
+    /// Base view model for <see cref="LayoutModelBase"/> with an instance of the model.
     /// </summary>
-    /// <typeparam name="TModel">A <see cref="LayoutModelBase"/> object.</typeparam>
-    public class LayoutViewModelBase<TModel> : ViewModelBase<TModel>
+    /// <typeparam name="TModel">The model type.</typeparam>
+    public class LayoutViewModelBase<TModel> : ViewModelBase
         where TModel : LayoutModelBase, new()
     {
+        private readonly TModel _backup = new TModel();
+
         /// <summary>
-        /// Initializes a new instance of the <see cref="LayoutViewModelBase{TModel}"/> class.
+        /// Initializes a new instance of the <see cref="LayoutViewModelBase{TModel}"/> class
+        /// and maps the data from <paramref name="source"/> to the <see cref="Model"/> and registers <see cref="Model"/> for change tracking.
         /// </summary>
-        /// <param name="model">The model.</param>
-        public LayoutViewModelBase(TModel model)
-            : base(model)
+        /// <param name="source">The initial model data.</param>
+        /// <param name="messageBus">The message bus.</param>
+        public LayoutViewModelBase(IMessageBus messageBus, TModel source)
         {
+            MapSelf(source, Model);
+            UseMessageBus(messageBus);
         }
 
         /// <summary>
         /// Gets or sets a value indicating whether it is visible.
         /// </summary>
-        [PropertyChangeBinding(nameof(LayoutModelBase.IsVisible))]
+        [TrackState]
         public bool IsVisible
         {
             get => Model.IsVisible;
-            set => SetProperty(nameof(Model.IsVisible), value);
+            set => SetProperty(Model, nameof(Model.IsVisible), value);
         }
 
         /// <summary>
         /// Gets or sets the width.
         /// </summary>
-        [PropertyChangeBinding(nameof(LayoutModelBase.Width))]
+        [TrackState]
         public double Width
         {
             get => Model.Width;
-            set => SetProperty(nameof(Model.Width), value);
+            set => SetProperty(Model, nameof(Model.Width), value);
         }
 
         /// <summary>
         /// Gets or sets the height.
         /// </summary>
-        [PropertyChangeBinding(nameof(LayoutModelBase.Height))]
+        [TrackState]
         public double Height
         {
             get => Model.Height;
-            set => SetProperty(nameof(Model.Height), value);
+            set => SetProperty(Model, nameof(Model.Height), value);
         }
 
         /// <summary>
         /// Gets or sets the x position.
         /// </summary>
-        [PropertyChangeBinding(nameof(LayoutModelBase.XPosition))]
+        [TrackState]
         public double XPosition
         {
             get => Model.XPosition;
-            set => SetProperty(nameof(Model.XPosition), value);
+            set => SetProperty(Model, nameof(Model.XPosition), value);
         }
 
         /// <summary>
         /// Gets or sets the y position.
         /// </summary>
-        [PropertyChangeBinding(nameof(LayoutModelBase.YPosition))]
+        [TrackState]
         public double YPosition
         {
             get => Model.YPosition;
-            set => SetProperty(nameof(Model.YPosition), value);
+            set => SetProperty(Model, nameof(Model.YPosition), value);
         }
 
         /// <summary>
         /// Gets or sets the relative positioning.
         /// </summary>
-        [PropertyChangeBinding(nameof(LayoutModelBase.Anchor))]
+        [TrackState]
         public PositionAnchor Anchor
         {
             get => Model.Anchor;
-            set => SetProperty(nameof(Model.Anchor), value);
+            set => SetProperty(Model, nameof(Model.Anchor), value);
+        }
+
+        /// <summary>
+        /// Gets the instance of a the model for this view model.
+        /// </summary>
+        protected TModel Model { get; } = new TModel();
+
+        /// <inheritdoc />
+        protected override void OnReset()
+        {
+            base.OnReset();
+            ResetObject(Model);
+        }
+
+        /// <inheritdoc />
+        protected override void OnBeginEdit()
+        {
+            base.OnBeginEdit();
+            MapSelf(Model, _backup);
+        }
+
+        /// <inheritdoc />
+        protected override void OnCancelEdit()
+        {
+            base.OnCancelEdit();
+            MapSelf(_backup, Model);
         }
     }
 }
diff --git a/src/AudioBand/ViewModels/NextButtonViewModel.cs b/src/AudioBand/ViewModels/NextButtonViewModel.cs
index abfefe93..6b4ea6a0 100644
--- a/src/AudioBand/ViewModels/NextButtonViewModel.cs
+++ b/src/AudioBand/ViewModels/NextButtonViewModel.cs
@@ -1,9 +1,9 @@
 using System;
-using System.ComponentModel;
 using System.Diagnostics;
 using System.Threading.Tasks;
 using AudioBand.AudioSource;
 using AudioBand.Commands;
+using AudioBand.Messages;
 using AudioBand.Models;
 using AudioBand.Settings;
 
@@ -23,12 +23,14 @@ public class NextButtonViewModel : ButtonViewModelBase<NextButton>
         /// <param name="appSettings">The appSettings.</param>
         /// <param name="dialogService">The dialog service.</param>
         /// <param name="audioSession">The audio session.</param>
-        public NextButtonViewModel(IAppSettings appSettings, IDialogService dialogService, IAudioSession audioSession)
-            : base(appSettings.NextButton, dialogService)
+        /// <param name="messageBus">The message bus.</param>
+        public NextButtonViewModel(IAppSettings appSettings, IDialogService dialogService, IAudioSession audioSession, IMessageBus messageBus)
+            : base(appSettings.NextButton, dialogService, messageBus)
         {
             _appSettings = appSettings;
             _audioSession = audioSession;
             _appSettings.ProfileChanged += AppsSettingsOnProfileChanged;
+
             NextTrackCommand = new AsyncRelayCommand<object>(NextTrackCommandOnExecute);
             Content = new ButtonContentViewModel(Model.Content, new NextButton().Content, dialogService);
             TrackContentViewModel(Content);
@@ -44,6 +46,13 @@ public NextButtonViewModel(IAppSettings appSettings, IDialogService dialogServic
         /// </summary>
         public IAsyncCommand NextTrackCommand { get; }
 
+        /// <inheritdoc />
+        protected override void OnEndEdit()
+        {
+            base.OnEndEdit();
+            MapSelf(Model, _appSettings.NextButton);
+        }
+
         private async Task NextTrackCommandOnExecute(object arg)
         {
             if (_audioSession.CurrentAudioSource == null)
@@ -57,7 +66,8 @@ private async Task NextTrackCommandOnExecute(object arg)
         private void AppsSettingsOnProfileChanged(object sender, EventArgs e)
         {
             Debug.Assert(IsEditing == false, "Should not be editing");
-            ReplaceModel(_appSettings.NextButton);
+            MapSelf(_appSettings.NextButton, Model);
+            RaisePropertyChangedAll();
         }
     }
 }
diff --git a/src/AudioBand/ViewModels/PlayPauseButtonViewModel.cs b/src/AudioBand/ViewModels/PlayPauseButtonViewModel.cs
index 3e52daac..b5709fe3 100644
--- a/src/AudioBand/ViewModels/PlayPauseButtonViewModel.cs
+++ b/src/AudioBand/ViewModels/PlayPauseButtonViewModel.cs
@@ -1,10 +1,11 @@
 using System;
 using System.ComponentModel;
 using System.Diagnostics;
+using System.Runtime.Remoting.Messaging;
 using System.Threading.Tasks;
-using System.Windows.Input;
 using AudioBand.AudioSource;
 using AudioBand.Commands;
+using AudioBand.Messages;
 using AudioBand.Models;
 using AudioBand.Settings;
 
@@ -25,8 +26,9 @@ public class PlayPauseButtonViewModel : ButtonViewModelBase<PlayPauseButton>
         /// <param name="appSettings">App settings.</param>
         /// <param name="dialogService">The dialog service.</param>
         /// <param name="audioSession">The audio session.</param>
-        public PlayPauseButtonViewModel(IAppSettings appSettings, IDialogService dialogService, IAudioSession audioSession)
-            : base(appSettings.PlayPauseButton, dialogService)
+        /// <param name="messageBus">The message bus.</param>
+        public PlayPauseButtonViewModel(IAppSettings appSettings, IDialogService dialogService, IAudioSession audioSession, IMessageBus messageBus)
+            : base(appSettings.PlayPauseButton, dialogService, messageBus)
         {
             _appSettings = appSettings;
             _audioSession = audioSession;
@@ -63,7 +65,7 @@ public PlayPauseButtonViewModel(IAppSettings appSettings, IDialogService dialogS
         public bool IsPlaying
         {
             get => _isPlaying;
-            private set => SetProperty(ref _isPlaying, value, false);
+            private set => SetProperty(ref _isPlaying, value);
         }
 
         /// <summary>
@@ -71,10 +73,18 @@ public bool IsPlaying
         /// </summary>
         public bool IsPlayButtonShown => !_isPlaying;
 
+        /// <inheritdoc />
+        protected override void OnEndEdit()
+        {
+            base.OnEndEdit();
+            MapSelf(Model, _appSettings.PlayPauseButton);
+        }
+
         private void AppSettingsOnProfileChanged(object sender, EventArgs e)
         {
             Debug.Assert(IsEditing == false, "Should not be editing");
-            ReplaceModel(_appSettings.PlayPauseButton);
+            MapSelf(_appSettings.PlayPauseButton, Model);
+            RaisePropertyChangedAll();
         }
 
         private void AudioSessionOnPropertyChanged(object sender, PropertyChangedEventArgs e)
diff --git a/src/AudioBand/ViewModels/PreviousButtonViewModel.cs b/src/AudioBand/ViewModels/PreviousButtonViewModel.cs
index 015ddb8b..a44698b4 100644
--- a/src/AudioBand/ViewModels/PreviousButtonViewModel.cs
+++ b/src/AudioBand/ViewModels/PreviousButtonViewModel.cs
@@ -3,6 +3,7 @@
 using System.Threading.Tasks;
 using AudioBand.AudioSource;
 using AudioBand.Commands;
+using AudioBand.Messages;
 using AudioBand.Models;
 using AudioBand.Settings;
 
@@ -22,8 +23,9 @@ public class PreviousButtonViewModel : ButtonViewModelBase<PreviousButton>
         /// <param name="appSettings">The app settings.</param>
         /// <param name="dialogService">The dialog service.</param>
         /// <param name="audioSession">The audio session.</param>
-        public PreviousButtonViewModel(IAppSettings appSettings, IDialogService dialogService, IAudioSession audioSession)
-            : base(appSettings.PreviousButton, dialogService)
+        /// <param name="messageBus">The message bus.</param>
+        public PreviousButtonViewModel(IAppSettings appSettings, IDialogService dialogService, IAudioSession audioSession, IMessageBus messageBus)
+            : base(appSettings.PreviousButton, dialogService, messageBus)
         {
             _appSettings = appSettings;
             _audioSession = audioSession;
@@ -43,6 +45,13 @@ public PreviousButtonViewModel(IAppSettings appSettings, IDialogService dialogSe
         /// </summary>
         public IAsyncCommand PreviousTrackCommand { get; }
 
+        /// <inheritdoc />
+        protected override void OnEndEdit()
+        {
+            base.OnEndEdit();
+            MapSelf(Model, _appSettings.PreviousButton);
+        }
+
         private async Task PreviousTrackCommandOnExecute(object arg)
         {
             if (_audioSession.CurrentAudioSource == null)
@@ -56,7 +65,8 @@ private async Task PreviousTrackCommandOnExecute(object arg)
         private void AppsSettingsOnProfileChanged(object sender, EventArgs e)
         {
             Debug.Assert(IsEditing == false, "Should not be editing");
-            ReplaceModel(_appSettings.PreviousButton);
+            MapSelf(_appSettings.PreviousButton, Model);
+            RaisePropertyChangedAll();
         }
     }
 }
diff --git a/src/AudioBand/ViewModels/ProgressBarViewModel.cs b/src/AudioBand/ViewModels/ProgressBarViewModel.cs
index 4ecb5bad..f05f81cf 100644
--- a/src/AudioBand/ViewModels/ProgressBarViewModel.cs
+++ b/src/AudioBand/ViewModels/ProgressBarViewModel.cs
@@ -3,6 +3,7 @@
 using System.Diagnostics;
 using System.Windows.Media;
 using AudioBand.AudioSource;
+using AudioBand.Messages;
 using AudioBand.Models;
 using AudioBand.Settings;
 
@@ -24,8 +25,9 @@ public class ProgressBarViewModel : LayoutViewModelBase<ProgressBar>
         /// <param name="appsettings">The app settings.</param>
         /// <param name="dialogService">The dialog service.</param>
         /// <param name="audioSession">The audio session.</param>
-        public ProgressBarViewModel(IAppSettings appsettings, IDialogService dialogService, IAudioSession audioSession)
-            : base(appsettings.ProgressBar)
+        /// <param name="messageBus">The message bus.</param>
+        public ProgressBarViewModel(IAppSettings appsettings, IDialogService dialogService, IAudioSession audioSession, IMessageBus messageBus)
+            : base(messageBus, appsettings.ProgressBar)
         {
             _appsettings = appsettings;
             _audioSession = audioSession;
@@ -38,31 +40,31 @@ public ProgressBarViewModel(IAppSettings appsettings, IDialogService dialogServi
         /// <summary>
         /// Gets or sets the foreground color.
         /// </summary>
-        [PropertyChangeBinding(nameof(ProgressBar.ForegroundColor))]
+        [TrackState]
         public Color ForegroundColor
         {
             get => Model.ForegroundColor;
-            set => SetProperty(nameof(Model.ForegroundColor), value);
+            set => SetProperty(Model, nameof(Model.ForegroundColor), value);
         }
 
         /// <summary>
         /// Gets or sets the background color.
         /// </summary>
-        [PropertyChangeBinding(nameof(ProgressBar.BackgroundColor))]
+        [TrackState]
         public Color BackgroundColor
         {
             get => Model.BackgroundColor;
-            set => SetProperty(nameof(Model.BackgroundColor), value);
+            set => SetProperty(Model, nameof(Model.BackgroundColor), value);
         }
 
         /// <summary>
         /// Gets or sets the hover color.
         /// </summary>
-        [PropertyChangeBinding(nameof(ProgressBar.HoverColor))]
+        [TrackState]
         public Color HoverColor
         {
             get => Model.HoverColor;
-            set => SetProperty(nameof(Model.HoverColor), value);
+            set => SetProperty(Model, nameof(Model.HoverColor), value);
         }
 
         /// <summary>
@@ -73,7 +75,7 @@ public TimeSpan TrackProgress
             get => _trackProgress;
             set
             {
-                if (SetProperty(ref _trackProgress, value, trackChanges: false))
+                if (SetProperty(ref _trackProgress, value))
                 {
                     _audioSession.CurrentAudioSource?.SetPlaybackProgressAsync(value);
                 }
@@ -86,7 +88,7 @@ public TimeSpan TrackProgress
         public TimeSpan TrackLength
         {
             get => _trackLength;
-            private set => SetProperty(ref _trackLength, value, false);
+            private set => SetProperty(ref _trackLength, value);
         }
 
         /// <summary>
@@ -94,10 +96,18 @@ public TimeSpan TrackLength
         /// </summary>
         public IDialogService DialogService { get; set; }
 
+        /// <inheritdoc />
+        protected override void OnEndEdit()
+        {
+            base.OnEndEdit();
+            MapSelf(Model, _appsettings.ProgressBar);
+        }
+
         private void AppsettingsOnProfileChanged(object sender, EventArgs e)
         {
             Debug.Assert(IsEditing == false, "Should not be editing");
-            ReplaceModel(_appsettings.ProgressBar);
+            MapSelf(_appsettings.ProgressBar, Model);
+            RaisePropertyChangedAll();
         }
 
         private void AudioSessionOnPropertyChanged(object sender, PropertyChangedEventArgs e)
diff --git a/src/AudioBand/ViewModels/PropertyChangeBindingAttribute.cs b/src/AudioBand/ViewModels/PropertyChangeBindingAttribute.cs
deleted file mode 100644
index 2235bd9c..00000000
--- a/src/AudioBand/ViewModels/PropertyChangeBindingAttribute.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.ComponentModel;
-
-namespace AudioBand.ViewModels
-{
-    /// <summary>
-    /// Specifies that <see cref="INotifyPropertyChanged.PropertyChanged"/> event of <see cref="ViewModelBase{TModel}"/> will be raised for this property
-    /// when the property of a model changes.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Property)]
-    internal class PropertyChangeBindingAttribute : Attribute
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PropertyChangeBindingAttribute"/> class
-        /// with the property name of the model.
-        /// </summary>
-        /// <param name="propertyName">Name of the property in the model that will trigger a <see cref="INotifyPropertyChanged.PropertyChanged"/> event.</param>
-        public PropertyChangeBindingAttribute(string propertyName)
-        {
-            PropertyName = propertyName;
-        }
-
-        /// <summary>
-        /// Gets the name of the property in the model that will trigger a <see cref="INotifyPropertyChanged.PropertyChanged"/> event.
-        /// </summary>
-        public string PropertyName { get; }
-    }
-}
diff --git a/src/AudioBand/ViewModels/RenameProfileDialogViewModel.cs b/src/AudioBand/ViewModels/RenameProfileDialogViewModel.cs
index 2dca76c8..8717eb03 100644
--- a/src/AudioBand/ViewModels/RenameProfileDialogViewModel.cs
+++ b/src/AudioBand/ViewModels/RenameProfileDialogViewModel.cs
@@ -8,7 +8,7 @@ namespace AudioBand.ViewModels
     /// <summary>
     /// View model for the rename profile dialog.
     /// </summary>
-    public class RenameProfileDialogViewModel : ViewModelBase
+    public class RenameProfileDialogViewModel : ValidatingViewModelBase
     {
         private readonly IEnumerable<string> _profileNames;
         private string _currentName;
@@ -46,7 +46,7 @@ public RenameProfileDialogViewModel(string currentName, IEnumerable<string> prof
         public string CurrentName
         {
             get => _currentName;
-            set => SetProperty(ref _currentName, value, trackChanges: false);
+            set => SetProperty(ref _currentName, value);
         }
 
         /// <summary>
@@ -71,7 +71,7 @@ public string NewProfileName
                     ClearErrors();
                 }
 
-                SetProperty(ref _newProfileName, value, trackChanges: false);
+                SetProperty(ref _newProfileName, value);
             }
         }
 
diff --git a/src/AudioBand/ViewModels/RepeatModeButtonViewModel.cs b/src/AudioBand/ViewModels/RepeatModeButtonViewModel.cs
index 472e88d0..d9af5843 100644
--- a/src/AudioBand/ViewModels/RepeatModeButtonViewModel.cs
+++ b/src/AudioBand/ViewModels/RepeatModeButtonViewModel.cs
@@ -1,9 +1,10 @@
 using System;
+using System.ComponentModel;
 using System.Diagnostics;
 using System.Threading.Tasks;
-using System.Windows.Input;
 using AudioBand.AudioSource;
 using AudioBand.Commands;
+using AudioBand.Messages;
 using AudioBand.Models;
 using AudioBand.Settings;
 
@@ -15,7 +16,7 @@ namespace AudioBand.ViewModels
     public class RepeatModeButtonViewModel : ButtonViewModelBase<RepeatModeButton>
     {
         private readonly IAppSettings _appSettings;
-        private IAudioSource _audioSource;
+        private readonly IAudioSession _audioSession;
         private RepeatMode _repeatMode;
 
         /// <summary>
@@ -23,10 +24,14 @@ public class RepeatModeButtonViewModel : ButtonViewModelBase<RepeatModeButton>
         /// </summary>
         /// <param name="appSettings">The app settings.</param>
         /// <param name="dialogService">The dialog service.</param>
-        public RepeatModeButtonViewModel(IAppSettings appSettings, IDialogService dialogService)
-            : base(appSettings.RepeatModeButton, dialogService)
+        /// <param name="audioSession">The audio session.</param>
+        /// <param name="messageBus">The message bus.</param>
+        public RepeatModeButtonViewModel(IAppSettings appSettings, IDialogService dialogService, IAudioSession audioSession, IMessageBus messageBus)
+            : base(appSettings.RepeatModeButton, dialogService, messageBus)
         {
             _appSettings = appSettings;
+            _audioSession = audioSession;
+            _audioSession.PropertyChanged += AudioSessionOnPropertyChanged;
             _appSettings.ProfileChanged += AppSettingsOnProfileChanged;
 
             var resetState = new RepeatModeButton();
@@ -66,35 +71,27 @@ public RepeatModeButtonViewModel(IAppSettings appSettings, IDialogService dialog
         public RepeatMode RepeatMode
         {
             get => _repeatMode;
-            private set => SetProperty(ref _repeatMode, value, false);
+            private set => SetProperty(ref _repeatMode, value);
         }
 
-        /// <summary>
-        /// Sets the audio source.
-        /// </summary>
-        public IAudioSource AudioSource
+        /// <inheritdoc />
+        protected override void OnEndEdit()
         {
-            set => UpdateAudioSource(value);
+            base.OnEndEdit();
+            MapSelf(Model, _appSettings.RepeatModeButton);
         }
 
-        private void UpdateAudioSource(IAudioSource audioSource)
+        private void AudioSessionOnPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
-            if (_audioSource != null)
-            {
-                _audioSource.RepeatModeChanged -= AudioSourceOnRepeatModeChanged;
-            }
-
-            _audioSource = audioSource;
-            if (_audioSource == null)
+            if (e.PropertyName != nameof(IAudioSession.RepeatMode))
             {
-                RepeatMode = RepeatMode.Off;
                 return;
             }
 
-            _audioSource.RepeatModeChanged += AudioSourceOnRepeatModeChanged;
+            OnRepeatModeChanged(_audioSession.RepeatMode);
         }
 
-        private void AudioSourceOnRepeatModeChanged(object sender, RepeatMode e)
+        private void OnRepeatModeChanged(RepeatMode e)
         {
             RepeatMode = e;
         }
@@ -102,12 +99,13 @@ private void AudioSourceOnRepeatModeChanged(object sender, RepeatMode e)
         private void AppSettingsOnProfileChanged(object sender, EventArgs e)
         {
             Debug.Assert(IsEditing == false, "Should not be editing");
-            ReplaceModel(_appSettings.RepeatModeButton);
+            MapSelf(_appSettings.RepeatModeButton, Model);
+            RaisePropertyChangedAll();
         }
 
         private async Task CycleRepeatModeCommandOnExecute(object obj)
         {
-            if (_audioSource == null)
+            if (_audioSession.CurrentAudioSource == null)
             {
                 return;
             }
@@ -126,7 +124,7 @@ private async Task CycleRepeatModeCommandOnExecute(object obj)
                     break;
             }
 
-            await _audioSource.SetRepeatModeAsync(nextRepeatMode);
+            await _audioSession.CurrentAudioSource.SetRepeatModeAsync(nextRepeatMode);
         }
     }
 }
diff --git a/src/AudioBand/ViewModels/SettingsWindowViewModel.cs b/src/AudioBand/ViewModels/SettingsWindowViewModel.cs
index cf01f3ad..4a617a84 100644
--- a/src/AudioBand/ViewModels/SettingsWindowViewModel.cs
+++ b/src/AudioBand/ViewModels/SettingsWindowViewModel.cs
@@ -1,7 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.ComponentModel;
 using System.Diagnostics;
 using System.Linq;
 using AudioBand.Commands;
@@ -18,7 +16,6 @@ public class SettingsWindowViewModel : ViewModelBase
         private readonly IAppSettings _appSettings;
         private readonly IDialogService _dialogService;
         private readonly IMessageBus _messageBus;
-        private readonly List<ViewModelBase> _dirtyViewModels = new List<ViewModelBase>();
         private ViewModelBase _selectedViewModel;
         private string _selectedProfileName;
         private bool _hasUnsavedChanges;
@@ -36,6 +33,7 @@ public SettingsWindowViewModel(IAppSettings appSettings, IDialogService dialogSe
             _appSettings = appSettings;
             _dialogService = dialogService;
             _messageBus = messageBus;
+            messageBus.Subscribe<EditStartMessage>(EditStartMessageOnPublished);
             ViewModels = viewModels;
             _selectedProfileName = appSettings.CurrentProfile;
             Profiles = new ObservableCollection<string>(appSettings.Profiles);
@@ -50,8 +48,6 @@ public SettingsWindowViewModel(IAppSettings appSettings, IDialogService dialogSe
             CloseCommand = new RelayCommand(CloseCommandOnExecute);
             ImportProfilesCommand = new RelayCommand(ImportProfilesCommandOnExecute);
             ExportProfilesCommand = new RelayCommand(ExportProfilesCommandOnExecute);
-
-            ViewModels.CustomLabelsViewModel.PropertyChanged += ViewModelOnEditChanged;
         }
 
         /// <summary>
@@ -65,26 +61,7 @@ public SettingsWindowViewModel(IAppSettings appSettings, IDialogService dialogSe
         public ViewModelBase SelectedViewModel
         {
             get => _selectedViewModel;
-            set
-            {
-                var old = _selectedViewModel;
-                if (SetProperty(ref _selectedViewModel, value, trackChanges: false))
-                {
-                    if (old != null)
-                    {
-                        old.PropertyChanged -= ViewModelOnEditChanged;
-                    }
-
-                    if (value != null)
-                    {
-                        value.PropertyChanged += ViewModelOnEditChanged;
-                        if (value.IsEditing)
-                        {
-                            HandleViewModelEditing(value);
-                        }
-                    }
-                }
-            }
+            set => SetProperty(ref _selectedViewModel, value);
         }
 
         /// <summary>
@@ -95,7 +72,7 @@ public string SelectedProfileName
             get => _selectedProfileName;
             set
             {
-                if (SetProperty(ref _selectedProfileName, value, trackChanges: false))
+                if (SetProperty(ref _selectedProfileName, value))
                 {
                     EndEdits();
                     _appSettings.CurrentProfile = value;
@@ -109,7 +86,7 @@ public string SelectedProfileName
         public string SelectedViewHeader
         {
             get => _selectedViewHeader;
-            set => SetProperty(ref _selectedViewHeader, value, trackChanges: false);
+            set => SetProperty(ref _selectedViewHeader, value);
         }
 
         /// <summary>
@@ -118,7 +95,7 @@ public string SelectedViewHeader
         public bool HasUnsavedChanges
         {
             get => _hasUnsavedChanges;
-            set => SetProperty(ref _hasUnsavedChanges, value, trackChanges: false);
+            set => SetProperty(ref _hasUnsavedChanges, value);
         }
 
         /// <summary>
@@ -240,8 +217,8 @@ private void CloseCommandOnExecute(object obj)
 
         private void SaveCommandOnExecute(object obj)
         {
-            _appSettings.Save();
             EndEdits();
+            _appSettings.Save();
         }
 
         private bool SaveCommandCanExecute(object obj)
@@ -251,44 +228,19 @@ private bool SaveCommandCanExecute(object obj)
 
         private void EndEdits()
         {
-            foreach (var dirtyViewModel in _dirtyViewModels)
-            {
-                dirtyViewModel.EndEdit();
-            }
-
-            _dirtyViewModels.Clear();
+            _messageBus.Publish(EditEndMessage.Accepted);
             HasUnsavedChanges = false;
         }
 
         private void CancelEdits()
         {
-            foreach (var dirtyViewModel in _dirtyViewModels)
-            {
-                dirtyViewModel.CancelEdit();
-            }
-
-            _dirtyViewModels.Clear();
+            _messageBus.Publish(EditEndMessage.Cancelled);
             HasUnsavedChanges = false;
         }
 
-        private void ViewModelOnEditChanged(object sender, PropertyChangedEventArgs e)
-        {
-            if (e.PropertyName != nameof(IsEditing))
-            {
-                return;
-            }
-
-            var vm = (ViewModelBase)sender;
-            if (vm.IsEditing)
-            {
-                HandleViewModelEditing(vm);
-            }
-        }
-
-        private void HandleViewModelEditing(ViewModelBase vm)
+        private void EditStartMessageOnPublished(EditStartMessage obj)
         {
             HasUnsavedChanges = true;
-            _dirtyViewModels.Add(vm);
         }
 
         private void ExportProfilesCommandOnExecute(object obj)
diff --git a/src/AudioBand/ViewModels/ShuffleModeButtonViewModel.cs b/src/AudioBand/ViewModels/ShuffleModeButtonViewModel.cs
index 1551ab1f..2f3a8070 100644
--- a/src/AudioBand/ViewModels/ShuffleModeButtonViewModel.cs
+++ b/src/AudioBand/ViewModels/ShuffleModeButtonViewModel.cs
@@ -1,7 +1,9 @@
 using System;
+using System.ComponentModel;
 using System.Threading.Tasks;
 using AudioBand.AudioSource;
 using AudioBand.Commands;
+using AudioBand.Messages;
 using AudioBand.Models;
 using AudioBand.Settings;
 
@@ -13,7 +15,7 @@ namespace AudioBand.ViewModels
     public class ShuffleModeButtonViewModel : ButtonViewModelBase<ShuffleModeButton>
     {
         private readonly IAppSettings _appSettings;
-        private IAudioSource _audioSource;
+        private readonly IAudioSession _audioSession;
         private bool _isShuffleOn;
 
         /// <summary>
@@ -21,10 +23,14 @@ public class ShuffleModeButtonViewModel : ButtonViewModelBase<ShuffleModeButton>
         /// </summary>
         /// <param name="appSettings">The app settings.</param>
         /// <param name="dialogService">The dialog service.</param>
-        public ShuffleModeButtonViewModel(IAppSettings appSettings, IDialogService dialogService)
-            : base(appSettings.ShuffleModeButton, dialogService)
+        /// <param name="audioSession">The audio session.</param>
+        /// <param name="messageBus">The message bus.</param>
+        public ShuffleModeButtonViewModel(IAppSettings appSettings, IDialogService dialogService, IAudioSession audioSession, IMessageBus messageBus)
+            : base(appSettings.ShuffleModeButton, dialogService, messageBus)
         {
             _appSettings = appSettings;
+            _audioSession = audioSession;
+            _audioSession.PropertyChanged += AudioSessionOnPropertyChanged;
             _appSettings.ProfileChanged += AppSettingsOnProfileChanged;
 
             ToggleShuffleCommand = new AsyncRelayCommand<object>(ToggleShuffleCommandOnExecute);
@@ -56,53 +62,45 @@ public ShuffleModeButtonViewModel(IAppSettings appSettings, IDialogService dialo
         public bool IsShuffleOn
         {
             get => _isShuffleOn;
-            private set => SetProperty(ref _isShuffleOn, value, false);
+            private set => SetProperty(ref _isShuffleOn, value);
         }
 
-        /// <summary>
-        /// Sets the audio source.
-        /// </summary>
-        public IAudioSource AudioSource
+        /// <inheritdoc />
+        protected override void OnEndEdit()
         {
-            private get => _audioSource;
-            set => UpdateAudioSource(value);
+            base.OnEndEdit();
+            MapSelf(Model, _appSettings.ShuffleModeButton);
         }
 
-        private void UpdateAudioSource(IAudioSource audioSource)
+        private void AudioSessionOnPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
-            if (_audioSource != null)
-            {
-                _audioSource.ShuffleChanged -= AudioSourceOnShuffleChanged;
-            }
-
-            _audioSource = audioSource;
-            if (_audioSource == null)
+            if (e.PropertyName != nameof(IAudioSession.IsShuffleOn))
             {
-                IsShuffleOn = false;
                 return;
             }
 
-            _audioSource.ShuffleChanged += AudioSourceOnShuffleChanged;
+            OnSufflechanged(_audioSession.IsShuffleOn);
         }
 
-        private void AudioSourceOnShuffleChanged(object sender, bool e)
+        private void OnSufflechanged(bool e)
         {
             IsShuffleOn = e;
         }
 
         private void AppSettingsOnProfileChanged(object sender, EventArgs e)
         {
-            ReplaceModel(_appSettings.ShuffleModeButton);
+            MapSelf(_appSettings.ShuffleModeButton, Model);
+            RaisePropertyChangedAll();
         }
 
         private async Task ToggleShuffleCommandOnExecute(object arg)
         {
-            if (AudioSource == null)
+            if (_audioSession.CurrentAudioSource == null)
             {
                 return;
             }
 
-            await AudioSource.SetShuffleAsync(!IsShuffleOn);
+            await _audioSession.CurrentAudioSource.SetShuffleAsync(!IsShuffleOn);
         }
     }
 }
diff --git a/src/AudioBand/ViewModels/TrackStateAttribute.cs b/src/AudioBand/ViewModels/TrackStateAttribute.cs
new file mode 100644
index 00000000..3783ee82
--- /dev/null
+++ b/src/AudioBand/ViewModels/TrackStateAttribute.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace AudioBand.ViewModels
+{
+    /// <summary>
+    /// Marks the property for state tracking.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Property)]
+    public class TrackStateAttribute : Attribute
+    {
+    }
+}
diff --git a/src/AudioBand/ViewModels/ValidatingViewModelBase.cs b/src/AudioBand/ViewModels/ValidatingViewModelBase.cs
new file mode 100644
index 00000000..3a00b23c
--- /dev/null
+++ b/src/AudioBand/ViewModels/ValidatingViewModelBase.cs
@@ -0,0 +1,85 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Runtime.CompilerServices;
+
+namespace AudioBand.ViewModels
+{
+    /// <summary>
+    /// A view model base that extends <see cref="ObservableObject"/> and adds support for validation via <see cref="INotifyDataErrorInfo"/>.
+    /// </summary>
+    public abstract class ValidatingViewModelBase : ObservableObject, INotifyDataErrorInfo
+    {
+        private readonly Dictionary<string, IEnumerable<string>> _propertyErrors = new Dictionary<string, IEnumerable<string>>();
+
+        /// <inheritdoc cref="INotifyDataErrorInfo.ErrorsChanged"/>
+        public event EventHandler<DataErrorsChangedEventArgs> ErrorsChanged;
+
+        /// <inheritdoc cref="INotifyDataErrorInfo.HasErrors"/>
+        public bool HasErrors => _propertyErrors.Any(entry => entry.Value?.Any() ?? false);
+
+        /// <inheritdoc cref="INotifyDataErrorInfo.GetErrors"/>
+        public IEnumerable GetErrors(string propertyName)
+        {
+            if (_propertyErrors.TryGetValue(propertyName, out var errors) && errors.Any())
+            {
+                return _propertyErrors[propertyName];
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Raises a <see cref="ErrorsChanged"/> event.
+        /// </summary>
+        /// <param name="errors">Errors that occured during validation.</param>
+        /// <param name="propertyName">Property that failed validation.</param>
+        protected void RaiseValidationError(IEnumerable<string> errors, [CallerMemberName] string propertyName = null)
+        {
+            _propertyErrors.Clear();
+            _propertyErrors[propertyName] = errors;
+            ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(propertyName));
+        }
+
+        /// <summary>
+        /// Raises a <see cref="ErrorsChanged"/> event.
+        /// </summary>
+        /// <param name="error">Error that occured during validation.</param>
+        /// <param name="propertyName">Property that failed validation.</param>
+        protected void RaiseValidationError(string error, [CallerMemberName] string propertyName = null)
+        {
+            RaiseValidationError(new[] { error }, propertyName);
+        }
+
+        /// <summary>
+        /// Raises a <see cref="ErrorsChanged"/> event.
+        /// </summary>
+        /// <param name="e">Exception that occured during validation.</param>
+        /// <param name="propertyName">Property that failed validation.</param>
+        protected void RaiseValidationError(Exception e, [CallerMemberName] string propertyName = null)
+        {
+            RaiseValidationError(e.ToString(), propertyName);
+        }
+
+        /// <summary>
+        /// Clears all validation errors.
+        /// </summary>
+        protected void ClearErrors()
+        {
+            _propertyErrors.Clear();
+            ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(string.Empty));
+        }
+
+        /// <summary>
+        /// Clears validation errors for a property.
+        /// </summary>
+        /// <param name="propertyName">The name of the property to clear.</param>
+        protected void ClearError([CallerMemberName] string propertyName = null)
+        {
+            _propertyErrors.Remove(propertyName);
+            ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(propertyName));
+        }
+    }
+}
diff --git a/src/AudioBand/ViewModels/ViewModelBase.cs b/src/AudioBand/ViewModels/ViewModelBase.cs
index 610eaeb3..4767e079 100644
--- a/src/AudioBand/ViewModels/ViewModelBase.cs
+++ b/src/AudioBand/ViewModels/ViewModelBase.cs
@@ -1,25 +1,23 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Runtime.CompilerServices;
 using System.Windows.Input;
-using AudioBand.ChangeTracking;
 using AudioBand.Commands;
 using AudioBand.Logging;
+using AudioBand.Messages;
 using AutoMapper;
 using NLog;
 
 namespace AudioBand.ViewModels
 {
     /// <summary>
-    /// Base class for view models. Extends <see cref="ObservableObject"/> with automatic support for
-    /// <see cref="IChangeTrackable"/>, <see cref="IResettableObject"/>, <see cref="INotifyDataErrorInfo"/> and associated commands.
+    /// Base class for view models. Extends <see cref="ValidatingViewModelBase"/> with support for
+    /// <see cref="IEditableObject"/>, <see cref="IResettableObject"/>, and associated commands.
     /// </summary>
-    public abstract class ViewModelBase : ObservableObject, IChangeTrackable, IResettableObject, INotifyDataErrorInfo
+    public abstract class ViewModelBase : ValidatingViewModelBase, IEditableObject, IResettableObject
     {
-        private readonly Dictionary<string, IEnumerable<string>> _propertyErrors = new Dictionary<string, IEnumerable<string>>();
+        private readonly Dictionary<Type, MapperConfiguration> _mapperCache = new Dictionary<Type, MapperConfiguration>();
+        private readonly HashSet<string> _trackedProperties = new HashSet<string>();
         private bool _isEditing;
 
         /// <summary>
@@ -33,17 +31,15 @@ protected ViewModelBase()
             EndEditCommand = new RelayCommand(o => EndEdit());
             CancelEditCommand = new RelayCommand(o => CancelEdit());
             ResetCommand = new RelayCommand(o => Reset());
-        }
 
-        /// <inheritdoc cref="INotifyDataErrorInfo.ErrorsChanged"/>
-        public event EventHandler<DataErrorsChangedEventArgs> ErrorsChanged;
+            GetTrackingProperties();
+        }
 
-        /// <inheritdoc />
+        /// <summary>
+        /// Occurs when <see cref="IsEditing"/> changes.
+        /// </summary>
         public event EventHandler IsEditingChanged;
 
-        /// <inheritdoc cref="INotifyDataErrorInfo.HasErrors"/>
-        public bool HasErrors => _propertyErrors.Any(entry => entry.Value?.Any() ?? false);
-
         /// <summary>
         /// Gets the command to start editing.
         /// </summary>
@@ -64,7 +60,10 @@ protected ViewModelBase()
         /// </summary>
         public ICommand ResetCommand { get; }
 
-        /// <inheritdoc />
+        /// <summary>
+        /// Gets a value indicating whether the object is being edited.
+        /// </summary>
+        /// <value>True when <see cref="BeginEdit"/> is called and <see cref="EndEdit"/> or <see cref="CancelEdit"/> has not been called.</value>
         public bool IsEditing
         {
             get => _isEditing;
@@ -82,16 +81,10 @@ private set
         /// </summary>
         protected ILogger Logger { get; }
 
-        /// <inheritdoc cref="INotifyDataErrorInfo.GetErrors"/>
-        public IEnumerable GetErrors(string propertyName)
-        {
-            if (_propertyErrors.TryGetValue(propertyName, out var errors) && errors.Any())
-            {
-                return _propertyErrors[propertyName];
-            }
-
-            return null;
-        }
+        /// <summary>
+        /// Gets the message bus.
+        /// </summary>
+        protected IMessageBus MessageBus { get; private set; }
 
         /// <summary>
         /// Begins editing on this object.
@@ -121,6 +114,7 @@ public void EndEdit()
             Logger.Debug("Ending edit");
             OnEndEdit();
             IsEditing = false;
+            RaisePropertyChangedAll();
         }
 
         /// <summary>
@@ -136,12 +130,15 @@ public void CancelEdit()
             Logger.Debug("Cancelling edit");
             OnCancelEdit();
             IsEditing = false;
+            RaisePropertyChangedAll();
         }
 
         /// <inheritdoc cref="IResettableObject.Reset"/>
         public void Reset()
         {
+            BeginEdit();
             OnReset();
+            RaisePropertyChangedAll();
         }
 
         /// <summary>
@@ -170,6 +167,7 @@ protected virtual void OnEndEdit()
         /// </summary>
         protected virtual void OnBeginEdit()
         {
+            MessageBus?.Publish(default(EditStartMessage));
         }
 
         /// <summary>
@@ -180,7 +178,7 @@ protected virtual void OnBeginEdit()
         protected void ResetObject<T>(T obj)
             where T : new()
         {
-            MapType(new T(), obj);
+            MapSelf(new T(), obj);
         }
 
         /// <summary>
@@ -189,123 +187,57 @@ protected void ResetObject<T>(T obj)
         /// <typeparam name="T">The type of the object to map.</typeparam>
         /// <param name="objectFrom">The object to map.</param>
         /// <param name="objectTo">The other instance of the object to map to.</param>
-        protected void MapType<T>(T objectFrom, T objectTo)
-        {
-            var mapper = new MapperConfiguration(cfg => cfg.CreateMap<T, T>()).CreateMapper();
-            mapper.Map<T, T>(objectFrom, objectTo);
-        }
-
-        /// <summary>
-        /// Raises a <see cref="ErrorsChanged"/> event.
-        /// </summary>
-        /// <param name="errors">Errors that occured during validation.</param>
-        /// <param name="propertyName">Property that failed validation.</param>
-        protected void RaiseValidationError(IEnumerable<string> errors, [CallerMemberName] string propertyName = null)
+        protected void MapSelf<T>(T objectFrom, T objectTo)
         {
-            _propertyErrors.Clear();
-            _propertyErrors[propertyName] = errors;
-            ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(propertyName));
-        }
-
-        /// <summary>
-        /// Raises a <see cref="ErrorsChanged"/> event.
-        /// </summary>
-        /// <param name="error">Error that occured during validation.</param>
-        /// <param name="propertyName">Property that failed validation.</param>
-        protected void RaiseValidationError(string error, [CallerMemberName] string propertyName = null)
-        {
-            RaiseValidationError(new[] { error }, propertyName);
-        }
+            if (!_mapperCache.ContainsKey(typeof(T)))
+            {
+                _mapperCache.Add(typeof(T), new MapperConfiguration(cfg => cfg.CreateMap<T, T>()));
+            }
 
-        /// <summary>
-        /// Raises a <see cref="ErrorsChanged"/> event.
-        /// </summary>
-        /// <param name="e">Exception that occured during validation.</param>
-        /// <param name="propertyName">Property that failed validation.</param>
-        protected void RaiseValidationError(Exception e, [CallerMemberName] string propertyName = null)
-        {
-            RaiseValidationError(e.ToString(), propertyName);
+            _mapperCache[typeof(T)].CreateMapper().Map<T, T>(objectFrom, objectTo);
         }
 
-        /// <summary>
-        /// Clears all validation errors.
-        /// </summary>
-        protected void ClearErrors()
+        /// <inheritdoc />
+        protected override void OnPropertyChanging(string propertyName)
         {
-            _propertyErrors.Clear();
-            ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(string.Empty));
+            base.OnPropertyChanging(propertyName);
+            if (_trackedProperties.Contains(propertyName))
+            {
+                BeginEdit();
+            }
         }
 
         /// <summary>
-        /// Clears validation errors for a property.
+        /// Use the message bus for listening and publishing edit events.
         /// </summary>
-        /// <param name="propertyName">The name of the property to clear.</param>
-        protected void ClearError([CallerMemberName] string propertyName = null)
+        /// <param name="messageBus">The message bus to use.</param>
+        protected void UseMessageBus(IMessageBus messageBus)
         {
-            _propertyErrors.Remove(propertyName);
-            ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(propertyName));
+            MessageBus = messageBus;
+            messageBus.Subscribe<EditEndMessage>(OnEditEndMessagePublished);
         }
 
-        /// <summary>
-        /// Sets the <paramref name="field"/> to the <paramref name="newValue"/> if they are different and raise <see cref="PropertyChanged"/>
-        /// for the property and other properties marked with the <see cref="AlsoNotifyAttribute"/>. And invokes <see cref="BeginEdit"/>.
-        /// </summary>
-        /// <typeparam name="T">Type of the property.</typeparam>
-        /// <param name="field">Old value.</param>
-        /// <param name="newValue">New value.</param>
-        /// <param name="propertyName">Name of the property that changed.</param>
-        /// <returns>True if the property changed.</returns>
-        protected bool SetPropertyAndTrack<T>(ref T field, T newValue, [CallerMemberName] string propertyName = null)
+        private void GetTrackingProperties()
         {
-            var didChange = SetProperty(ref field, newValue, propertyName);
-            if (didChange)
+            foreach (var member in Accessor.GetMembers())
             {
-                BeginEdit();
+                if (member.IsDefined(typeof(TrackStateAttribute)))
+                {
+                    _trackedProperties.Add(member.Name);
+                }
             }
-
-            return didChange;
         }
 
-        /// <summary>
-        /// Sets the <paramref name="modelPropertyName"/> property of the <paramref name="model"/> to the <paramref name="newValue"/>
-        /// if they are different and raise <see cref="PropertyChanged"/> for the property and other properties marked with the <see cref="AlsoNotifyAttribute"/>.
-        /// And invokes <see cref="BeginEdit"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The type of the model.</typeparam>
-        /// <typeparam name="TValue">The type of the value.</typeparam>
-        /// <param name="model">The model instance.</param>
-        /// <param name="modelPropertyName">The property name of the model.</param>
-        /// <param name="newValue">The new value to set.</param>
-        /// <param name="propertyName">The property name.</param>
-        /// <returns>True if the property changed.</returns>
-        protected bool SetPropertyAndTrack<TModel, TValue>(TModel model, string modelPropertyName, TValue newValue, [CallerMemberName] string propertyName = null)
+        private void OnEditEndMessagePublished(EditEndMessage message)
         {
-            var didChange = SetProperty(model, modelPropertyName, newValue, propertyName);
-            if (didChange)
+            if (message == EditEndMessage.Cancelled)
             {
-                BeginEdit();
+                CancelEdit();
+            }
+            else if (message == EditEndMessage.Accepted)
+            {
+                EndEdit();
             }
-
-            return didChange;
-        }
-
-        /// <summary>
-        /// Registers a model for automatic <see cref="BeginEdit"/>, <see cref="Reset"/>, <see cref="EndEdit"/> and <see cref="CancelEdit"/>.
-        /// </summary>
-        /// <param name="model">The model to register.</param>
-        protected void RegisterModelForChangeTracking(object model)
-        {
-            _trackedModels.Add(model);
-            _backupModels.Add(_trackedModels, model);
-        }
-
-        /// <summary>
-        /// Removes a model for automatic <see cref="BeginEdit"/>, <see cref="Reset"/>, <see cref="EndEdit"/> and <see cref="CancelEdit"/>.
-        /// </summary>
-        /// <param name="model">The model to unregister.</param>
-        protected void UnregisterModelFromChangeTracking(object model)
-        {
-            _trackedModels.Remove(model);
         }
     }
 }
diff --git a/src/AudioBand/ViewModels/ViewModelBase{TModel}.cs b/src/AudioBand/ViewModels/ViewModelBase{TModel}.cs
deleted file mode 100644
index f0658742..00000000
--- a/src/AudioBand/ViewModels/ViewModelBase{TModel}.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using AudioBand.Models;
-using AutoMapper;
-using FastMember;
-
-namespace AudioBand.ViewModels
-{
-    /// <summary>
-    /// Base class for a viewmodel with a model.
-    /// </summary>
-    /// <typeparam name="TModel">Type of the model.</typeparam>
-    public abstract class ViewModelBase<TModel> : ViewModelBase
-        where TModel : ModelBase, new()
-    {
-        // Mapping from a model and model property to the viewmodel property name
-        private readonly Dictionary<(object model, string modelPropName), List<string>> _modelToPropertyName = new Dictionary<(object model, string modelPropName), List<string>>();
-
-        private readonly MapperConfiguration _mapperConfiguration = new MapperConfiguration(cfg => cfg.CreateMap<TModel, TModel>());
-        private TModel _backup;
-
-
-        /// <summary>
-        /// Performs setup to recieve change notifications from <paramref name="model"/> and wire it to properties marked with <see cref="PropertyChangeBindingAttribute"/>.
-        /// </summary>
-        /// <param name="model">Model to subscribe to for <see cref="INotifyPropertyChanged.PropertyChanged"/>.</param>
-        /// <typeparam name="T">The type of the model.</typeparam>
-        protected void SetupModelBindings<T>(T model)
-            where T : ModelBase
-        {
-            _modelToAccessor.Add(model, ObjectAccessor.Create(model));
-
-            var members = Accessor.GetMembers().Where(m => m.IsDefined(typeof(PropertyChangeBindingAttribute)));
-            foreach (var member in members)
-            {
-                var bindingAttr = (PropertyChangeBindingAttribute)member.GetAttribute(typeof(PropertyChangeBindingAttribute), true);
-                var key = (model, bindingAttr.PropertyName);
-                if (_modelToPropertyName.ContainsKey(key))
-                {
-                    _modelToPropertyName[key].Add(member.Name);
-                }
-                else
-                {
-                    _modelToPropertyName.Add(key, new List<string> { member.Name });
-                }
-            }
-
-            model.PropertyChanged += ModelOnPropertyChanged;
-        }
-
-        /// <summary>
-        /// Unbinds the model.
-        /// </summary>
-        /// <typeparam name="T">The type of the model.</typeparam>
-        /// <param name="model">The model to unbind.</param>
-        protected void UnbindModel<T>(T model)
-            where T : ModelBase
-        {
-            if (model == null)
-            {
-                return;
-            }
-
-            _modelToAccessor.Remove(model);
-            model.PropertyChanged -= ModelOnPropertyChanged;
-            var keys = _modelToPropertyName.Keys.Where(key => key.model == model).ToList();
-            foreach (var key in keys)
-            {
-                _modelToPropertyName.Remove(key);
-            }
-        }
-
-        /// <summary>
-        /// Unbinds the current <see cref="Model"/> and binds to new one.
-        /// </summary>
-        /// <typeparam name="T">The type of the model.</typeparam>
-        /// <param name="newModel">The new model to replace..</param>
-        protected void ReplaceModel<T>(T newModel)
-            where T : TModel
-        {
-            UnbindModel(Model);
-            Model = newModel;
-            SetupModelBindings(Model);
-            RaisePropertyChangedAll();
-        }
-
-        /// <summary>
-        /// Resets the <see cref="Model"/> to a state as if it was just instantiated.
-        /// </summary>
-        protected override void OnReset()
-        {
-            base.OnReset();
-            BeginEdit();
-            ResetObject(Model);
-        }
-
-        /// <summary>
-        /// Cancels edits to the <see cref="Model"/>.
-        /// </summary>
-        protected override void OnCancelEdit()
-        {
-            base.OnCancelEdit();
-            _mapperConfiguration.CreateMapper().Map(_backup, Model);
-            _backup = null;
-        }
-
-        /// <summary>
-        /// Accepts edits to the <see cref="Model"/>.
-        /// </summary>
-        protected override void OnEndEdit()
-        {
-            base.OnEndEdit();
-            _backup = null;
-        }
-
-        /// <summary>
-        /// Starts tracking changes to the <see cref="Model"/>.
-        /// </summary>
-        protected override void OnBeginEdit()
-        {
-            base.OnBeginEdit();
-            _backup = new TModel();
-            _mapperConfiguration.CreateMapper().Map(Model, _backup);
-        }
-    }
-}
diff --git a/src/AudioBand/ViewModels/ViewModelContainer.cs b/src/AudioBand/ViewModels/ViewModelContainer.cs
index a484d2b7..34bb7778 100644
--- a/src/AudioBand/ViewModels/ViewModelContainer.cs
+++ b/src/AudioBand/ViewModels/ViewModelContainer.cs
@@ -1,4 +1,6 @@
-namespace AudioBand.ViewModels
+using System.Linq;
+
+namespace AudioBand.ViewModels
 {
     /// <summary>
     /// Container for all the view models.

From 765b97bee5894fb2fd46da761ae595069019fd46 Mon Sep 17 00:00:00 2001
From: Brandon Chong <brndnchong@gmail.com>
Date: Tue, 18 Jun 2019 13:24:51 -0700
Subject: [PATCH 08/17] Update tests for refactoring changes

---
 .../AlbumArtPopupViewModelTests.cs            | 15 ++-
 src/AudioBand.Test/AlbumArtViewModelTests.cs  |  5 +-
 src/AudioBand.Test/AudioBandViewModelTests.cs |  5 +-
 .../AudioSourceSettingsCollectionTests.cs     | 28 +++---
 src/AudioBand.Test/ButtonViewModels.cs        | 83 +++++++----------
 .../CustomLabelsViewModelTests.cs             | 12 ++-
 .../ProgressBarViewModelTests.cs              |  3 +-
 .../SettingsWindowViewModelTests.cs           | 34 +++----
 src/AudioBand.Test/ViewModelBaseTests.cs      | 91 +++++++------------
 src/AudioBand/AudioBand.csproj                |  3 +-
 10 files changed, 120 insertions(+), 159 deletions(-)

diff --git a/src/AudioBand.Test/AlbumArtPopupViewModelTests.cs b/src/AudioBand.Test/AlbumArtPopupViewModelTests.cs
index 1ec831e5..fd38466f 100644
--- a/src/AudioBand.Test/AlbumArtPopupViewModelTests.cs
+++ b/src/AudioBand.Test/AlbumArtPopupViewModelTests.cs
@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using AudioBand.Messages;
 using AudioBand.Models;
 using AudioBand.Settings;
 using AudioBand.ViewModels;
@@ -16,11 +12,13 @@ namespace AudioBand.Test
     public class AlbumArtPopupViewModelTests
     {
         private Mock<IAppSettings> _appSettings;
+        private Mock<IMessageBus> _messageBus;
 
         [TestInitialize]
         public void TestInit()
         {
             _appSettings = new Mock<IAppSettings>();
+            _messageBus = new Mock<IMessageBus>();
         }
 
         [TestMethod]
@@ -30,16 +28,15 @@ public void ListensForProfileChangesAndMapsProperly()
             var second = new AlbumArtPopup() {Height = 20};
             _appSettings.SetupSequence(m => m.AlbumArtPopup)
                 .Returns(first)
+                .Returns(second)
                 .Returns(second);
-            var vm = new AlbumArtPopupViewModel(_appSettings.Object);
-            bool raise = false;
-            vm.PropertyChanged += (_, __) => raise = true;
+
+            var vm = new AlbumArtPopupViewModel(_appSettings.Object, _messageBus.Object);
 
             Assert.AreEqual(first.Height, vm.Height);
             _appSettings.Raise(m => m.ProfileChanged += null, EventArgs.Empty);
 
             Assert.IsFalse(vm.IsEditing);
-            Assert.IsTrue(raise);
             Assert.AreEqual(second.Height, vm.Height);
         }
     }
diff --git a/src/AudioBand.Test/AlbumArtViewModelTests.cs b/src/AudioBand.Test/AlbumArtViewModelTests.cs
index 26f0edcb..fa2313ba 100644
--- a/src/AudioBand.Test/AlbumArtViewModelTests.cs
+++ b/src/AudioBand.Test/AlbumArtViewModelTests.cs
@@ -5,6 +5,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using AudioBand.AudioSource;
+using AudioBand.Messages;
 using AudioBand.Models;
 using AudioBand.Settings;
 using AudioBand.ViewModels;
@@ -18,6 +19,7 @@ public class AlbumArtViewModelTests
     {
         private Mock<IAppSettings> _appSettings;
         private Mock<IDialogService> _dialog;
+        private Mock<IMessageBus> _messageBus;
 
         [TestInitialize]
         public void TestInit()
@@ -25,6 +27,7 @@ public void TestInit()
             _appSettings = new Mock<IAppSettings>();
             _appSettings.SetupGet(m => m.AlbumArt).Returns(new AlbumArt());
             _dialog = new Mock<IDialogService>();
+            _messageBus = new Mock<IMessageBus>();
         }
 
         [TestMethod]
@@ -35,7 +38,7 @@ public void ListensToProfileChanges()
             _appSettings.SetupSequence(m => m.AlbumArt)
                 .Returns(first)
                 .Returns(second);
-            var vm = new AlbumArtViewModel(_appSettings.Object, _dialog.Object, new Mock<IAudioSession>().Object);
+            var vm = new AlbumArtViewModel(_appSettings.Object, _dialog.Object, new Mock<IAudioSession>().Object, _messageBus.Object);
             bool raised = false;
             vm.PropertyChanged += (sender, e) => raised = true;
 
diff --git a/src/AudioBand.Test/AudioBandViewModelTests.cs b/src/AudioBand.Test/AudioBandViewModelTests.cs
index 6f3adeaf..a569cf2a 100644
--- a/src/AudioBand.Test/AudioBandViewModelTests.cs
+++ b/src/AudioBand.Test/AudioBandViewModelTests.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using AudioBand.Messages;
 using AudioBand.Settings;
 using AudioBand.ViewModels;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -14,10 +15,12 @@ namespace AudioBand.Test
     public class AudioBandViewModelTests
     {
         private Mock<IAppSettings> _appSettings;
+        private Mock<IMessageBus> _messageBus;
 
         [TestInitialize]
         public void TestInit()
         {
+            _messageBus = new Mock<IMessageBus>();
             _appSettings = new Mock<IAppSettings>();
         }
 
@@ -29,7 +32,7 @@ public void AudioBandViewModelListensToProfileChanges()
             _appSettings.SetupSequence(m => m.AudioBand)
                 .Returns(first)
                 .Returns(second);
-            var vm = new AudioBandViewModel(_appSettings.Object, new Mock<IDialogService>().Object);
+            var vm = new AudioBandViewModel(_appSettings.Object, new Mock<IDialogService>().Object, _messageBus.Object);
 
             bool raised = false;
             vm.PropertyChanged += (_, __) => raised = true;
diff --git a/src/AudioBand.Test/AudioSourceSettingsCollectionTests.cs b/src/AudioBand.Test/AudioSourceSettingsCollectionTests.cs
index 43afa163..425adfd9 100644
--- a/src/AudioBand.Test/AudioSourceSettingsCollectionTests.cs
+++ b/src/AudioBand.Test/AudioSourceSettingsCollectionTests.cs
@@ -3,12 +3,8 @@
 using AudioBand.ViewModels;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
+using AudioBand.Messages;
 
 namespace AudioBand.Test
 {
@@ -16,12 +12,13 @@ namespace AudioBand.Test
     public class AudioSourceSettingsCollectionTests
     {
         private Mock<IInternalAudioSource> _audioSourceMock;
-
+        private Mock<IMessageBus> _messageBus;
 
         [TestInitialize]
         public void Init()
         {
             _audioSourceMock = new Mock<IInternalAudioSource>();
+            _messageBus = new Mock<IMessageBus>();
         }
 
         [TestMethod]
@@ -38,7 +35,7 @@ public void NoMatchingSettings()
             };
             var settings = new AudioSourceSettings { AudioSourceName = name, Settings = keyVals };
 
-            var vm = new AudioSourceSettingsCollectionViewModel(_audioSourceMock.Object, settings);
+            var vm = new AudioSourceSettingsCollectionViewModel(_audioSourceMock.Object, settings, _messageBus.Object);
 
             Assert.AreEqual(0, vm.SettingsList.Count);
             Assert.AreEqual(name, vm.AudioSourceName);
@@ -61,7 +58,7 @@ public void MatchingSettingsShouldCreateVmsInOrder()
             _audioSourceMock.SetupGet(s => s[It.Is<string>(x => x == setting1)]).Returns(val1);
             _audioSourceMock.SetupGet(s => s[It.Is<string>(x => x == setting2)]).Returns(val2);
             _audioSourceMock.Setup(s => s.GetSettingType(It.Is<string>(x => x == setting1))).Returns(typeof(string));
-            _audioSourceMock.Setup(s => s.GetSettingType(It.Is<string>(x => x == setting2))).Returns(typeof(string));
+            _audioSourceMock.Setup(s => s.GetSettingType(It.Is<string>(x => x == setting2))).Returns(typeof(int));
 
             var settingModels = new List<AudioSourceSetting>
             {
@@ -70,7 +67,7 @@ public void MatchingSettingsShouldCreateVmsInOrder()
             };
 
             var settings = new AudioSourceSettings { Settings = settingModels };
-            var vm = new AudioSourceSettingsCollectionViewModel(_audioSourceMock.Object, settings);
+            var vm = new AudioSourceSettingsCollectionViewModel(_audioSourceMock.Object, settings, _messageBus.Object);
 
             Assert.AreEqual(settingModels.Count, vm.SettingsList.Count);
             Assert.AreEqual(settingModels[0].Name, vm.SettingsList[0].Name);
@@ -81,7 +78,7 @@ public void MatchingSettingsShouldCreateVmsInOrder()
         }
 
         [TestMethod]
-        public void AudioSourceSettingUpdatesAreHandled()
+        public void AudioSourceSettingUpdateNewValueIsWrittenBackToSettings()
         {
             var setting = "setting";
 
@@ -91,14 +88,15 @@ public void AudioSourceSettingUpdatesAreHandled()
             {
                 Settings = new List<AudioSourceSetting> { settingModel }
             };
-
-            var vm = new AudioSourceSettingsCollectionViewModel(_audioSourceMock.Object, settings);
-
             object newSettingValue = 1;
             _audioSourceMock.SetupGet(s => s[It.Is<string>(x => x == setting)]).Returns(newSettingValue);
+
+            var vm = new AudioSourceSettingsCollectionViewModel(_audioSourceMock.Object, settings, _messageBus.Object);
+
             _audioSourceMock.Raise(s => s.SettingChanged += null, new SettingChangedEventArgs(setting));
 
-            Assert.AreEqual(settingModel.Value, newSettingValue);
+            vm.EndEdit();
+            Assert.AreEqual(newSettingValue, settingModel.Value);
         }
        
         [TestMethod]
@@ -126,7 +124,7 @@ public void AudioSourceSettingsCalledInPriority()
             _audioSourceMock.InSequence(s).SetupSet(source => source[It.Is<string>(x => x == setting1.Name)] = null);
             _audioSourceMock.InSequence(s).SetupSet(source => source[It.Is<string>(x => x == setting2.Name)] = null);
 
-            var vm = new AudioSourceSettingsCollectionViewModel(_audioSourceMock.Object, settings);
+            var vm = new AudioSourceSettingsCollectionViewModel(_audioSourceMock.Object, settings, _messageBus.Object);
 
             _audioSourceMock.VerifySet(source => source[setting3.Name] = null);
             _audioSourceMock.VerifySet(source => source[setting1.Name] = null);
diff --git a/src/AudioBand.Test/ButtonViewModels.cs b/src/AudioBand.Test/ButtonViewModels.cs
index 40c71196..b168b715 100644
--- a/src/AudioBand.Test/ButtonViewModels.cs
+++ b/src/AudioBand.Test/ButtonViewModels.cs
@@ -3,6 +3,7 @@
 using System.Drawing;
 using System.Threading.Tasks;
 using AudioBand.AudioSource;
+using AudioBand.Messages;
 using AudioBand.Models;
 using AudioBand.Settings;
 using AudioBand.ViewModels;
@@ -17,6 +18,7 @@ public class ButtonViewModels
         private Mock<IAppSettings> _appSettings;
         private Mock<IDialogService> _dialog;
         private Mock<IAudioSession> _session;
+        private Mock<IMessageBus> _messageBus;
 
         [TestInitialize]
         public void TestInit()
@@ -24,6 +26,7 @@ public void TestInit()
             _appSettings = new Mock<IAppSettings>();
             _dialog = new Mock<IDialogService>();
             _session = new Mock<IAudioSession>();
+            _messageBus = new Mock<IMessageBus>();
         }
 
         [TestMethod]
@@ -35,7 +38,7 @@ public void NextButtonListensforProfileChanges()
                 .Returns(first)
                 .Returns(second);
 
-            var vm = new NextButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object);
+            var vm = new NextButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object, _messageBus.Object);
             bool raised = false;
             vm.PropertyChanged += (_, __) => raised = true;
 
@@ -55,7 +58,7 @@ public async Task NextButtonCommandCallsNextTrack()
             var audioSourceMock = new Mock<IInternalAudioSource>();
             audioSourceMock.Setup(m => m.NextTrackAsync()).Returns(Task.CompletedTask);
             _session.SetupGet(m => m.CurrentAudioSource).Returns(audioSourceMock.Object);
-            var vm = new NextButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object);
+            var vm = new NextButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object, _messageBus.Object);
 
             await vm.NextTrackCommand.ExecuteAsync(null);
             audioSourceMock.Verify(m => m.NextTrackAsync());
@@ -70,7 +73,7 @@ public void PlayPauseButtonListensForProfileChanges()
                 .Returns(first)
                 .Returns(second);
 
-            var vm = new PlayPauseButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object);
+            var vm = new PlayPauseButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object, _messageBus.Object);
             bool raised = false;
             vm.PropertyChanged += (_, __) => raised = true;
 
@@ -86,7 +89,7 @@ public void PlayPauseButtonListensForProfileChanges()
         public void PlayPauseButtonMarkedAsEditingWhenContentIsEdited()
         {
             _appSettings.SetupGet(m => m.PlayPauseButton).Returns(new PlayPauseButton());
-            var viewModel = new PlayPauseButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object);
+            var viewModel = new PlayPauseButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object, _messageBus.Object);
 
             viewModel.PlayContent.Text = "";
             Assert.IsTrue(viewModel.PlayContent.IsEditing);
@@ -106,7 +109,7 @@ public void PlayPauseButtonListensToAudioSource()
         {
             _appSettings.SetupGet(m => m.PlayPauseButton).Returns(new PlayPauseButton());
             _session.SetupSequence(m => m.IsPlaying).Returns(true).Returns(false);
-            var viewModel = new PlayPauseButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object);
+            var viewModel = new PlayPauseButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object, _messageBus.Object);
 
             _session.Raise(m => m.PropertyChanged+= null, null, new PropertyChangedEventArgs(nameof(IAudioSession.IsPlaying)));
             Assert.IsTrue(viewModel.IsPlaying);
@@ -134,7 +137,7 @@ public async Task PlayPauseButtonPlayAndPauseCommandWorks()
             _session.SetupGet(m => m.CurrentAudioSource).Returns(audioSourceMock.Object);
             _session.SetupSequence(m => m.IsPlaying).Returns(true).Returns(false);
 
-            var viewModel = new PlayPauseButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object);
+            var viewModel = new PlayPauseButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object, _messageBus.Object);
             await viewModel.PlayPauseTrackCommand.ExecuteAsync(null);
             _session.Raise(m => m.PropertyChanged += null, null, new PropertyChangedEventArgs(nameof(IAudioSession.IsPlaying)));
             audioSourceMock.Raise(m => m.IsPlayingChanged += null, null, true);
@@ -150,7 +153,7 @@ public void PreviousButtonListensForProfileChanges()
                 .Returns(first)
                 .Returns(second);
 
-            var vm = new PreviousButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object);
+            var vm = new PreviousButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object, _messageBus.Object);
             bool raised = false;
             vm.PropertyChanged += (_, __) => raised = true;
 
@@ -169,7 +172,7 @@ public async Task PreviousButtonCommandCallsPreviousTrack()
             var audioSourceMock = new Mock<IInternalAudioSource>();
             audioSourceMock.Setup(m => m.PreviousTrackAsync()).Returns(Task.CompletedTask);
             _session.SetupGet(m => m.CurrentAudioSource).Returns(audioSourceMock.Object);
-            var vm = new PreviousButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object);
+            var vm = new PreviousButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object, _messageBus.Object);
 
             await vm.PreviousTrackCommand.ExecuteAsync(null);
             audioSourceMock.Verify(m => m.PreviousTrackAsync());
@@ -184,7 +187,7 @@ public void RepeatModeButtonListensForProfileChanges()
                 .Returns(first)
                 .Returns(second);
 
-            var vm = new RepeatModeButtonViewModel(_appSettings.Object, _dialog.Object);
+            var vm = new RepeatModeButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object, _messageBus.Object);
             bool raised = false;
             vm.PropertyChanged += (_, __) => raised = true;
 
@@ -200,7 +203,7 @@ public void RepeatModeButtonListensForProfileChanges()
         public void RepeatModeButtonMarkedAsEditingWhenContentIsEditing()
         {
             _appSettings.SetupGet(m => m.RepeatModeButton).Returns(new RepeatModeButton());
-            var viewModel = new RepeatModeButtonViewModel(_appSettings.Object, _dialog.Object);
+            var viewModel = new RepeatModeButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object, _messageBus.Object);
 
             Assert.IsFalse(viewModel.RepeatTrackContent.IsEditing);
             Assert.IsFalse(viewModel.IsEditing);
@@ -211,37 +214,30 @@ public void RepeatModeButtonMarkedAsEditingWhenContentIsEditing()
             Assert.IsTrue(viewModel.IsEditing);
         }
 
-        [TestMethod]
-        public void RepeatModeButtonSubscribesToAudioSource()
-        {
-            _appSettings.SetupGet(m => m.RepeatModeButton).Returns(new RepeatModeButton());
-            var viewModel = new RepeatModeButtonViewModel(_appSettings.Object, _dialog.Object);
-            var audiosourceMock = new Mock<IAudioSource>();
-            viewModel.AudioSource = audiosourceMock.Object;
-
-            audiosourceMock.Raise(m => m.RepeatModeChanged += null, null, RepeatMode.RepeatTrack);
-            Assert.AreEqual(RepeatMode.RepeatTrack, viewModel.RepeatMode);
-        }
-
         [TestMethod]
         public async Task RepeatModeButtonCyclesRepeatMode()
         {
-            _appSettings.SetupGet(m => m.RepeatModeButton).Returns(new RepeatModeButton());
-            var viewModel = new RepeatModeButtonViewModel(_appSettings.Object, _dialog.Object);
-            var audiosourceMock = new Mock<IAudioSource>();
             var repeatSequence = new[] {RepeatMode.RepeatContext, RepeatMode.RepeatTrack, RepeatMode.Off};
             var index = 0;
+            var audiosourceMock = new Mock<IInternalAudioSource>();
             audiosourceMock.Setup(m => m.SetRepeatModeAsync(It.IsAny<RepeatMode>()))
                 .Callback((RepeatMode mode) => Assert.AreEqual(repeatSequence[index++], mode))
                 .Returns(Task.CompletedTask);
+            _appSettings.SetupGet(m => m.RepeatModeButton).Returns(new RepeatModeButton());
+            _session.SetupGet(m => m.CurrentAudioSource).Returns(audiosourceMock.Object);
+            _session.SetupSequence(m => m.RepeatMode)
+                .Returns(RepeatMode.RepeatContext)
+                .Returns(RepeatMode.RepeatTrack)
+                .Returns(RepeatMode.Off)
+                ;
 
-            viewModel.AudioSource = audiosourceMock.Object;
+            var viewModel = new RepeatModeButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object, _messageBus.Object);
 
             Assert.AreEqual(RepeatMode.Off, viewModel.RepeatMode);
             await viewModel.CycleRepeatModeCommand.ExecuteAsync(null);
-            audiosourceMock.Raise(m => m.RepeatModeChanged += null, null, RepeatMode.RepeatContext);
+            _session.Raise(m => m.PropertyChanged += null, null, new PropertyChangedEventArgs(nameof(IAudioSession.RepeatMode)));
             await viewModel.CycleRepeatModeCommand.ExecuteAsync(null);
-            audiosourceMock.Raise(m => m.RepeatModeChanged += null, null, RepeatMode.RepeatTrack);
+            _session.Raise(m => m.PropertyChanged += null, null, new PropertyChangedEventArgs(nameof(IAudioSession.RepeatMode)));
             await viewModel.CycleRepeatModeCommand.ExecuteAsync(null);
         }
 
@@ -254,7 +250,7 @@ public void ShuffleModeButtonListensForProfileChanges()
                 .Returns(first)
                 .Returns(second);
 
-            var vm = new ShuffleModeButtonViewModel(_appSettings.Object, _dialog.Object);
+            var vm = new ShuffleModeButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object, _messageBus.Object);
             bool raised = false;
             vm.PropertyChanged += (_, __) => raised = true;
 
@@ -270,7 +266,7 @@ public void ShuffleModeButtonListensForProfileChanges()
         public void ShuffleModeButtonMarkedAsEditingWhenContentIsEdited()
         {
             _appSettings.SetupGet(m => m.ShuffleModeButton).Returns(new ShuffleModeButton());
-            var vm = new ShuffleModeButtonViewModel(_appSettings.Object, _dialog.Object);
+            var vm = new ShuffleModeButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object, _messageBus.Object);
 
             vm.ShuffleOnContent.Text = "A";
             Assert.IsTrue(vm.ShuffleOnContent.IsEditing);
@@ -285,36 +281,25 @@ public void ShuffleModeButtonMarkedAsEditingWhenContentIsEdited()
             Assert.IsTrue(vm.IsEditing);
         }
 
-        [TestMethod]
-        public void ShuffleModeButtonSubscribesToAudioSource()
-        {
-            _appSettings.SetupGet(m => m.ShuffleModeButton).Returns(new ShuffleModeButton());
-            var vm = new ShuffleModeButtonViewModel(_appSettings.Object, _dialog.Object);
-            var audioSourceMock = new Mock<IAudioSource>();
-            vm.AudioSource = audioSourceMock.Object;
-
-            audioSourceMock.Raise(m => m.ShuffleChanged += null, null, true);
-            Assert.IsTrue(vm.IsShuffleOn);
-
-            audioSourceMock.Raise(m => m.ShuffleChanged += null, null, false);
-            Assert.IsFalse(vm.IsShuffleOn);
-        }
-
         [TestMethod]
         public async Task ShuffleModeButtonCommandTogglesShuffle()
         {
             _appSettings.SetupGet(m => m.ShuffleModeButton).Returns(new ShuffleModeButton());
-            var vm = new ShuffleModeButtonViewModel(_appSettings.Object, _dialog.Object);
-            var audioSourceMock = new Mock<IAudioSource>();
+            var vm = new ShuffleModeButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object, _messageBus.Object);
+            var audioSourceMock = new Mock<IInternalAudioSource>();
+            _session.SetupGet(m => m.CurrentAudioSource).Returns(audioSourceMock.Object);
+            _session.SetupSequence(m => m.IsShuffleOn)
+                .Returns(true)
+                .Returns(false);
+
             var sequence = new[] {true, false};
             var index = 0;
             audioSourceMock.Setup(m => m.SetShuffleAsync(It.IsAny<bool>()))
                 .Callback((bool shuffle) => Assert.AreEqual(sequence[index++], shuffle))
                 .Returns(Task.CompletedTask);
 
-            vm.AudioSource = audioSourceMock.Object;
             await vm.ToggleShuffleCommand.ExecuteAsync(null);
-            audioSourceMock.Raise(m => m.ShuffleChanged += null, null, true);
+            _session.Raise(m => m.PropertyChanged += null, null, new PropertyChangedEventArgs(nameof(IAudioSession.IsShuffleOn)));
             await vm.ToggleShuffleCommand.ExecuteAsync(null);
         }
     }
diff --git a/src/AudioBand.Test/CustomLabelsViewModelTests.cs b/src/AudioBand.Test/CustomLabelsViewModelTests.cs
index 5eee1c23..ae7b38a6 100644
--- a/src/AudioBand.Test/CustomLabelsViewModelTests.cs
+++ b/src/AudioBand.Test/CustomLabelsViewModelTests.cs
@@ -1,8 +1,10 @@
 using System;
 using System.Text;
 using System.Collections.Generic;
+using System.Runtime.Remoting.Messaging;
 using System.Threading.Tasks;
 using AudioBand.AudioSource;
+using AudioBand.Messages;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using AudioBand.ViewModels;
 using AudioBand.Models;
@@ -20,6 +22,7 @@ public class CustomLabelsViewModelTests
         private Mock<IDialogService> _dialogMock;
         private Mock<IAppSettings> _appSettingsMock;
         private Mock<IAudioSession> _sessionMock;
+        private Mock<IMessageBus> _messageBus;
         private CustomLabel _label;
         private CustomLabelsViewModel _viewModel;
 
@@ -31,7 +34,8 @@ public void Init()
             _appSettingsMock.Setup(x => x.CustomLabels).Returns(new List<CustomLabel>());
             _label = new CustomLabel();
             _sessionMock = new Mock<IAudioSession>();
-            _viewModel = new CustomLabelsViewModel(_appSettingsMock.Object, _dialogMock.Object, _sessionMock.Object);
+            _messageBus = new Mock<IMessageBus>();
+            _viewModel = new CustomLabelsViewModel(_appSettingsMock.Object, _dialogMock.Object, _sessionMock.Object, _messageBus.Object);
         }
 
         [TestMethod]
@@ -88,7 +92,7 @@ public void RemoveLabel_ThenCancel()
         {
             _appSettingsMock.SetupGet(x => x.CustomLabels).Returns(new List<CustomLabel> { new CustomLabel() });
             _dialogMock.Setup(o => o.ShowConfirmationDialog(It.IsAny<ConfirmationDialogType>(), It.IsAny<object>())).Returns(true);
-            _viewModel = new CustomLabelsViewModel(_appSettingsMock.Object, _dialogMock.Object, _sessionMock.Object);
+            _viewModel = new CustomLabelsViewModel(_appSettingsMock.Object, _dialogMock.Object, _sessionMock.Object, _messageBus.Object);
             _viewModel.BeginEdit();
             var label = _viewModel.CustomLabels[0];
             _viewModel.RemoveLabelCommand.Execute(label);
@@ -119,7 +123,7 @@ public void ProfileChangeRemovesAllLabelsAndAddsNewOnes()
                 .Returns(new List<CustomLabel> { new CustomLabel { Name = "test" } })
                 .Returns(new List<CustomLabel> { new CustomLabel { Name = "second" } });
 
-            var vm = new CustomLabelsViewModel(settingsMock.Object, new Mock<IDialogService>().Object, _sessionMock.Object);
+            var vm = new CustomLabelsViewModel(settingsMock.Object, new Mock<IDialogService>().Object, _sessionMock.Object, _messageBus.Object);
             Assert.AreEqual(1, vm.CustomLabels.Count);
             Assert.AreEqual("test", vm.CustomLabels[0].Name);
             _appSettingsMock.Raise(m => m.ProfileChanged += null, null, EventArgs.Empty);
@@ -134,7 +138,7 @@ public void ProfileChangeViewModelStillHasCurrentTrackData()
                 .Returns(new List<CustomLabel> {new CustomLabel()});
             _sessionMock.SetupGet(m => m.IsPlaying).Returns(true);
 
-            var vm = new CustomLabelsViewModel(settingsMock.Object, new Mock<IDialogService>().Object, _sessionMock.Object);
+            var vm = new CustomLabelsViewModel(settingsMock.Object, new Mock<IDialogService>().Object, _sessionMock.Object, _messageBus.Object);
             _appSettingsMock.Raise(m => m.ProfileChanged += null, null, EventArgs.Empty);
             Assert.IsTrue(vm.CustomLabels[0].IsPlaying);
         }
diff --git a/src/AudioBand.Test/ProgressBarViewModelTests.cs b/src/AudioBand.Test/ProgressBarViewModelTests.cs
index b0b8e041..2caac561 100644
--- a/src/AudioBand.Test/ProgressBarViewModelTests.cs
+++ b/src/AudioBand.Test/ProgressBarViewModelTests.cs
@@ -6,6 +6,7 @@
 using Moq;
 using System.Windows.Media;
 using AudioBand.AudioSource;
+using AudioBand.Messages;
 
 namespace AudioBand.Test
 {
@@ -23,7 +24,7 @@ public void ListensForProfileChanges()
                 .Returns(first)
                 .Returns(second);
 
-            var vm = new ProgressBarViewModel(settingsMock.Object, new Mock<IDialogService>().Object, new Mock<IAudioSession>().Object);
+            var vm = new ProgressBarViewModel(settingsMock.Object, new Mock<IDialogService>().Object, new Mock<IAudioSession>().Object, new Mock<IMessageBus>().Object);
             bool raised = false;
             vm.PropertyChanged += (_, __) => raised = true;
 
diff --git a/src/AudioBand.Test/SettingsWindowViewModelTests.cs b/src/AudioBand.Test/SettingsWindowViewModelTests.cs
index c64eda42..5b4537be 100644
--- a/src/AudioBand.Test/SettingsWindowViewModelTests.cs
+++ b/src/AudioBand.Test/SettingsWindowViewModelTests.cs
@@ -33,8 +33,8 @@ public void TestSetup()
             _appSettings.SetupGet(m => m.CustomLabels).Returns(new List<CustomLabel>());
             _dialog = new Mock<IDialogService>();
             _container = new Mock<IViewModelContainer>();
-            _container.SetupGet(m => m.CustomLabelsViewModel).Returns(new CustomLabelsViewModel(_appSettings.Object, _dialog.Object, new Mock<IAudioSession>().Object));
             _messageBus = new Mock<IMessageBus>();
+            _container.SetupGet(m => m.CustomLabelsViewModel).Returns(new CustomLabelsViewModel(_appSettings.Object, _dialog.Object, new Mock<IAudioSession>().Object, _messageBus.Object));
         }
 
         private SettingsWindowViewModel CreateVm()
@@ -47,15 +47,16 @@ private class TestViewmodel : ViewModelBase
         }
 
         [TestMethod]
-        public void HasUnsavedChangesWhenSelectedViewModelIsEditing()
+        public void HasUnsavedChangesWhenStartEditMessageIsPublished()
         {
+            Action<EditStartMessage> handler = null;
+            _messageBus.Setup(m => m.Subscribe(It.IsAny<Action<EditStartMessage>>()))
+                .Callback<Action<EditStartMessage>>(x => handler = x);
+
             var vm = CreateVm();
 
             Assert.IsFalse(vm.HasUnsavedChanges);
-            var newViewModel = new TestViewmodel();
-            vm.SelectedViewModel = newViewModel;
-
-            newViewModel.BeginEdit();
+            handler(default(EditStartMessage));
             Assert.IsTrue(vm.HasUnsavedChanges);
         }
 
@@ -75,13 +76,11 @@ public void SaveCommandEndsEditsAndSavesSettings()
             var vm = CreateVm();
 
             var childViewModel = new TestViewmodel();
-            vm.HasUnsavedChanges = true;
-            vm.SelectedViewModel = childViewModel;
-            childViewModel.BeginEdit();
+            vm.HasUnsavedChanges = true; ;
             vm.SaveCommand.Execute(null);
 
             _appSettings.Verify(m => m.Save(), Times.Once);
-            Assert.IsFalse(childViewModel.IsEditing);
+            _messageBus.Verify(m => m.Publish(It.Is<EditEndMessage>(msg => msg == EditEndMessage.Accepted), It.IsAny<string>()));
             Assert.IsFalse(vm.HasUnsavedChanges);
         }
 
@@ -92,9 +91,7 @@ public void CloseCommandShowsDialogIfUnsavedChanges()
                 .Returns(true);
 
             var vm = CreateVm();
-            var childViewModel = new TestViewmodel();
-            vm.SelectedViewModel = childViewModel;
-            childViewModel.BeginEdit();
+            vm.HasUnsavedChanges = true;
 
             vm.CloseCommand.Execute(null);
             _dialog.Verify(m => m.ShowConfirmationDialog(It.Is<ConfirmationDialogType>(d => d == ConfirmationDialogType.DiscardChanges), It.IsAny<object[]>()));
@@ -107,14 +104,12 @@ public void CloseCommandShowsDialogIfUnsavedChanges_DiscardChangesCancelsEditsAn
                 .Returns(true);
 
             var vm = CreateVm();
-            var childViewModel = new TestViewmodel();
-            vm.SelectedViewModel = childViewModel;
-            childViewModel.BeginEdit();
+            vm.HasUnsavedChanges = true;
 
             vm.CloseCommand.Execute(null);
-            Assert.IsFalse(childViewModel.IsEditing);
             _messageBus.Verify(m => m.Publish(It.Is<SettingsWindowMessage>(msg => msg == SettingsWindowMessage.CloseWindow), It.IsAny<string>()));
             Assert.IsFalse(vm.HasUnsavedChanges);
+            _messageBus.Verify(m => m.Publish(It.Is<EditEndMessage>(msg => msg == EditEndMessage.Cancelled), It.IsAny<string>()));
         }
 
         [TestMethod]
@@ -124,12 +119,9 @@ public void CloseCommandShowsDialogIfUnsavedChanges_CancelCloseDoesNotCloseWindo
                 .Returns(false);
 
             var vm = CreateVm();
-            var childViewModel = new TestViewmodel();
-            vm.SelectedViewModel = childViewModel;
-            childViewModel.BeginEdit();
+            vm.HasUnsavedChanges = true;
 
             vm.CloseCommand.Execute(null);
-            Assert.IsTrue(childViewModel.IsEditing);
             _messageBus.Verify(m => m.Publish(It.Is<SettingsWindowMessage>(msg => msg == SettingsWindowMessage.CloseWindow), It.IsAny<string>()), Times.Never);
         }
 
diff --git a/src/AudioBand.Test/ViewModelBaseTests.cs b/src/AudioBand.Test/ViewModelBaseTests.cs
index 949b57c1..756b4d9b 100644
--- a/src/AudioBand.Test/ViewModelBaseTests.cs
+++ b/src/AudioBand.Test/ViewModelBaseTests.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Windows.Controls;
-using AudioBand.Messages;
-using AudioBand.Models;
-using AudioBand.ViewModels;
-using Castle.DynamicProxy.Generators.Emitters.SimpleAST;
+using AudioBand.ViewModels;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace AudioBand.Test
@@ -17,11 +12,10 @@ public void SetPropertyWithChangedFieldCallsPropertyChanged()
             string propertyName = null;
             var vm = new ViewModel();
             vm.PropertyChanged += (o, e) => { propertyName = e.PropertyName; };
-            vm._field = 0;
             vm.Field = 10;
 
             Assert.AreEqual(nameof(ViewModel.Field), propertyName);
-            Assert.AreEqual(10, vm._field);
+            Assert.AreEqual(10, vm.Field);
         }
 
         [TestMethod]
@@ -31,19 +25,17 @@ public void SetPropertySameField()
             string propertyName = null;
             var vm = new ViewModel();
             vm.PropertyChanged += (o, e) => { propertyName = e.PropertyName; called++; };
-            vm._field = 0;
             vm.Field = 0;
 
             Assert.AreEqual(0, called);
             Assert.AreEqual(null, propertyName);
-            Assert.AreEqual(0, vm._field);
+            Assert.AreEqual(0, vm.Field);
         }
 
         [TestMethod]
-        public void SetPropertyAutomaticallyStartsEdit()
+        public void SetPropertyWithTrackedStateAttributeAutomaticallyStartsEdit()
         {
             var vm = new ViewModel();
-            vm._field = 0;
             vm.Field = 0;
 
             Assert.IsFalse(vm.IsEditing);
@@ -51,6 +43,17 @@ public void SetPropertyAutomaticallyStartsEdit()
             Assert.IsTrue(vm.IsEditing);
         }
 
+        [TestMethod]
+        public void SetPropertyWithoutTrackedStateAttributeDoesNotStartEdit()
+        {
+            var vm = new ViewModel();
+            vm.FieldNotTracked = 0;
+
+            Assert.IsFalse(vm.IsEditing);
+            vm.FieldNotTracked = 1;
+            Assert.IsFalse(vm.IsEditing);
+        }
+
         [TestMethod]
         public void SetPropertyWithModelAutomaticallyStartsEdit()
         {
@@ -71,26 +74,6 @@ public void ResetViewModelWithModelStartsEdit()
             Assert.IsTrue(vm.IsEditing);
         }
 
-        [TestMethod]
-        public void ViewModelWithModelSetupBindingsProperly()
-        {
-            var m = new Model();
-            var vm = new ViewModelWithModel(m);
-
-            bool raised = false;
-            vm.PropertyChanged += (sender, e) =>
-            {
-                if (e.PropertyName == nameof(ViewModelWithModel.Field))
-                {
-                    raised = true;
-                }
-            };
-
-            m.ModelField = 10;
-
-            Assert.IsTrue(raised);
-        }
-
         [TestMethod]
         public void ViewModelWithModelUnbindModelProperly()
         {
@@ -106,56 +89,52 @@ public void ViewModelWithModelUnbindModelProperly()
                 }
             };
 
-            vm.Unbind();
-
-            m.ModelField = 10;
-
             Assert.IsFalse(raised);
         }
 
         private class ViewModel : ViewModelBase
         {
-            public int _field;
+            private int _field = 0;
+            private int _notTracked = 0;
 
+            [TrackState]
             public int Field
             {
                 get => _field;
                 set => SetProperty(ref _field, value);
             }
-        }
 
-        private class ViewModelWithModel : ViewModelBase<Model>
-        {
-            public ViewModelWithModel() : base(new Model())
+            public int FieldNotTracked
             {
+                get => _notTracked;
+                set => SetProperty(ref _notTracked, value);
             }
+        }
 
-            public ViewModelWithModel(Model m) : base(m)
+        private class ViewModelWithModel : ViewModelBase
+        {
+            private Model model = new Model();
+
+            public ViewModelWithModel()
             {
             }
 
-            [PropertyChangeBinding(nameof(ViewModelBaseTests.Model.ModelField))]
-            public int Field
+            public ViewModelWithModel(Model m)
             {
-                get => Model.ModelField;
-                set => SetProperty(nameof(ViewModelBaseTests.Model.ModelField), value);
+                model = m;
             }
 
-            public void Unbind()
+            [TrackState]
+            public int Field
             {
-                UnbindModel(Model);
+                get => model.Value;
+                set => SetProperty(model, nameof(ViewModelBaseTests.Model.Value), value);
             }
         }
 
-        private class Model : ModelBase
+        private class Model
         {
-            private int _field = 0;
-
-            public int ModelField
-            {
-                get => _field;
-                set => SetProperty(ref _field, value);
-            }
+            public int Value { get; set; } = 0;
         }
     }
 }
diff --git a/src/AudioBand/AudioBand.csproj b/src/AudioBand/AudioBand.csproj
index 08876364..0912c4e9 100644
--- a/src/AudioBand/AudioBand.csproj
+++ b/src/AudioBand/AudioBand.csproj
@@ -106,8 +106,7 @@
     <Compile Include="Behaviors\RedirectScrolling.cs" />
     <Compile Include="Behaviors\SliderClickAndDrag.cs" />
     <Compile Include="Behaviors\TrackOffsetFix.cs" />
-    <Compile Include="StateModel\IChangeTrackable.cs" />
-    <Compile Include="StateModel\TrackStateAttribute.cs" />
+    <Compile Include="ViewModels\TrackStateAttribute.cs" />
     <Compile Include="Commands\AsyncRelayCommand.cs" />
     <Compile Include="Commands\IAsyncCommand.cs" />
     <Compile Include="Commands\RelayCommand.cs" />

From 7fe97e3b523c6f91d58605469ed29c9278430d83 Mon Sep 17 00:00:00 2001
From: Brandon Chong <brndnchong@gmail.com>
Date: Tue, 18 Jun 2019 15:38:01 -0700
Subject: [PATCH 09/17] Update nuget packages

---
 src/AudioBand.Logging/AudioBand.Logging.csproj     |  5 +++--
 src/AudioBand.Logging/app.config                   | 12 ++++++------
 src/AudioBand.Test/AudioBand.Test.csproj           |  7 ++-----
 src/AudioBand/AudioBand.csproj                     |  9 +++------
 src/AudioSourceHost/App.config                     | 14 +++++++-------
 src/AudioSourceHost/AudioSourceHost.csproj         |  7 ++++---
 src/MusicBeeAudioSource/MusicBeeAudioSource.csproj |  3 ++-
 src/SpotifyAudioSource/SpotifyAudioSource.csproj   | 10 ++++------
 src/SpotifyAudioSource/app.config                  |  8 ++++----
 src/iTunesAudioSource/iTunesAudioSource.csproj     |  3 ++-
 10 files changed, 37 insertions(+), 41 deletions(-)

diff --git a/src/AudioBand.Logging/AudioBand.Logging.csproj b/src/AudioBand.Logging/AudioBand.Logging.csproj
index 6e5a9557..170e0bbd 100644
--- a/src/AudioBand.Logging/AudioBand.Logging.csproj
+++ b/src/AudioBand.Logging/AudioBand.Logging.csproj
@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>AudioBand.Logging</RootNamespace>
     <AssemblyName>AudioBand.Logging</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -88,7 +89,7 @@
       <Version>0.1.4</Version>
     </PackageReference>
     <PackageReference Include="NLog">
-      <Version>4.6.3</Version>
+      <Version>4.6.5</Version>
     </PackageReference>
     <PackageReference Include="StyleCop.Analyzers">
       <Version>1.1.118</Version>
diff --git a/src/AudioBand.Logging/app.config b/src/AudioBand.Logging/app.config
index 74f5bf7e..9ea4dacd 100644
--- a/src/AudioBand.Logging/app.config
+++ b/src/AudioBand.Logging/app.config
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.2.3.0" newVersion="1.2.3.0" />
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.2.3.0" newVersion="1.2.3.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.4.3.0" newVersion="1.4.3.0" />
+        <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.4.3.0" newVersion="1.4.3.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/></startup></configuration>
diff --git a/src/AudioBand.Test/AudioBand.Test.csproj b/src/AudioBand.Test/AudioBand.Test.csproj
index 3d873865..63b4c6c9 100644
--- a/src/AudioBand.Test/AudioBand.Test.csproj
+++ b/src/AudioBand.Test/AudioBand.Test.csproj
@@ -121,7 +121,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Moq">
-      <Version>4.10.1</Version>
+      <Version>4.11.0</Version>
     </PackageReference>
     <PackageReference Include="MSTest.TestAdapter">
       <Version>1.4.0</Version>
@@ -130,14 +130,11 @@
       <Version>1.4.0</Version>
     </PackageReference>
     <PackageReference Include="Nett">
-      <Version>0.11.0</Version>
+      <Version>0.12.0</Version>
     </PackageReference>
     <PackageReference Include="System.Threading.Tasks.Extensions">
       <Version>4.5.2</Version>
     </PackageReference>
-    <PackageReference Include="System.ValueTuple">
-      <Version>4.5.0</Version>
-    </PackageReference>
   </ItemGroup>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/src/AudioBand/AudioBand.csproj b/src/AudioBand/AudioBand.csproj
index 0912c4e9..f4e2106e 100644
--- a/src/AudioBand/AudioBand.csproj
+++ b/src/AudioBand/AudioBand.csproj
@@ -479,13 +479,13 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="AutoMapper">
-      <Version>8.1.0</Version>
+      <Version>8.1.1</Version>
     </PackageReference>
     <PackageReference Include="Dsafa.WpfColorPicker">
       <Version>1.2.0</Version>
     </PackageReference>
     <PackageReference Include="FastMember">
-      <Version>1.4.1</Version>
+      <Version>1.5.0</Version>
     </PackageReference>
     <PackageReference Include="FluentWPF">
       <Version>0.6.1</Version>
@@ -497,7 +497,7 @@
       <Version>10.0.17134.1000-preview</Version>
     </PackageReference>
     <PackageReference Include="Nett">
-      <Version>0.11.0</Version>
+      <Version>0.12.0</Version>
     </PackageReference>
     <PackageReference Include="SharpVectors.Reloaded">
       <Version>1.3.0</Version>
@@ -510,9 +510,6 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="System.ValueTuple">
-      <Version>4.5.0</Version>
-    </PackageReference>
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/src/AudioSourceHost/App.config b/src/AudioSourceHost/App.config
index c033c463..bfa7c860 100644
--- a/src/AudioSourceHost/App.config
+++ b/src/AudioSourceHost/App.config
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/>
     </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.2.3.0" newVersion="1.2.3.0" />
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.2.3.0" newVersion="1.2.3.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.4.3.0" newVersion="1.4.3.0" />
+        <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.4.3.0" newVersion="1.4.3.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/src/AudioSourceHost/AudioSourceHost.csproj b/src/AudioSourceHost/AudioSourceHost.csproj
index 88d85e7d..db68e4f8 100644
--- a/src/AudioSourceHost/AudioSourceHost.csproj
+++ b/src/AudioSourceHost/AudioSourceHost.csproj
@@ -8,10 +8,11 @@
     <OutputType>Library</OutputType>
     <RootNamespace>AudioSourceHost</RootNamespace>
     <AssemblyName>AudioSourceHost</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -111,10 +112,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FastMember">
-      <Version>1.4.1</Version>
+      <Version>1.5.0</Version>
     </PackageReference>
     <PackageReference Include="Nett">
-      <Version>0.11.0</Version>
+      <Version>0.12.0</Version>
     </PackageReference>
     <PackageReference Include="StyleCop.Analyzers">
       <Version>1.1.118</Version>
diff --git a/src/MusicBeeAudioSource/MusicBeeAudioSource.csproj b/src/MusicBeeAudioSource/MusicBeeAudioSource.csproj
index 44f9cebf..4b326fc2 100644
--- a/src/MusicBeeAudioSource/MusicBeeAudioSource.csproj
+++ b/src/MusicBeeAudioSource/MusicBeeAudioSource.csproj
@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>MusicBeeAudioSource</RootNamespace>
     <AssemblyName>MusicBeeAudioSource</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/SpotifyAudioSource/SpotifyAudioSource.csproj b/src/SpotifyAudioSource/SpotifyAudioSource.csproj
index 28b8c203..e2fe1e6f 100644
--- a/src/SpotifyAudioSource/SpotifyAudioSource.csproj
+++ b/src/SpotifyAudioSource/SpotifyAudioSource.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SpotifyAudioSource</RootNamespace>
     <AssemblyName>SpotifyAudioSource</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -106,19 +107,16 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="SpotifyAPI.Web">
-      <Version>4.0.0</Version>
+      <Version>4.1.1</Version>
     </PackageReference>
     <PackageReference Include="SpotifyAPI.Web.Auth">
-      <Version>4.0.0</Version>
+      <Version>4.1.0</Version>
     </PackageReference>
     <PackageReference Include="StyleCop.Analyzers">
       <Version>1.1.118</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="System.ValueTuple">
-      <Version>4.5.0</Version>
-    </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
diff --git a/src/SpotifyAudioSource/app.config b/src/SpotifyAudioSource/app.config
index d876472d..1577d417 100644
--- a/src/SpotifyAudioSource/app.config
+++ b/src/SpotifyAudioSource/app.config
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/></startup></configuration>
diff --git a/src/iTunesAudioSource/iTunesAudioSource.csproj b/src/iTunesAudioSource/iTunesAudioSource.csproj
index 05d0b239..c4975490 100644
--- a/src/iTunesAudioSource/iTunesAudioSource.csproj
+++ b/src/iTunesAudioSource/iTunesAudioSource.csproj
@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>iTunesAudioSource</RootNamespace>
     <AssemblyName>iTunesAudioSource</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

From 6f1dcd023f04158f6408bbf490003e89c10856d8 Mon Sep 17 00:00:00 2001
From: Brandon Chong <brndnchong@gmail.com>
Date: Tue, 18 Jun 2019 16:05:45 -0700
Subject: [PATCH 10/17] Fix tests due to upgraded nuget packages

---
 src/AudioBand/Settings/Migrations/V1ToV2.cs | 8 ++++++++
 src/AudioBand/Settings/Migrations/V2ToV3.cs | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/src/AudioBand/Settings/Migrations/V1ToV2.cs b/src/AudioBand/Settings/Migrations/V1ToV2.cs
index 42a4eae9..4b2d5c0a 100644
--- a/src/AudioBand/Settings/Migrations/V1ToV2.cs
+++ b/src/AudioBand/Settings/Migrations/V1ToV2.cs
@@ -16,6 +16,14 @@ static V1ToV2()
         {
             MapConfig = new MapperConfiguration(c =>
             {
+                c.CreateMap<Models.V1.AudioSourceSetting, Models.V2.AudioSourceSetting>();
+                c.CreateMap<Models.V1.AlbumArtAppearance, Models.V2.AlbumArtSettings>();
+                c.CreateMap<Models.V1.AudioBandSettings, Models.V2.AudioBandSettings>();
+                c.CreateMap<Models.V1.AudioBandAppearance, Models.V2.AudioBandSettings>();
+                c.CreateMap<Models.V1.NextSongButtonAppearance, Models.V2.NextButtonSettings>();
+                c.CreateMap<Models.V1.PlayPauseButtonAppearance, Models.V2.PlayPauseButtonSettings>();
+                c.CreateMap<Models.V1.PreviousSongButtonAppearance, Models.V2.PreviousButtonSettings>();
+                c.CreateMap<Models.V1.ProgressBarAppearance, Models.V2.ProgressBarSettings>();
                 c.CreateMap<Models.V1.AlbumArtPopupAppearance, Models.V2.AlbumArtPopupSettings>()
                     .ForMember(dest => dest.XPosition, opts => opts.MapFrom(source => source.XOffset));
                 c.CreateMap<Models.V1.TextAppearance, Models.V2.CustomLabelSettings>();
diff --git a/src/AudioBand/Settings/Migrations/V2ToV3.cs b/src/AudioBand/Settings/Migrations/V2ToV3.cs
index 21707816..dff1dc1e 100644
--- a/src/AudioBand/Settings/Migrations/V2ToV3.cs
+++ b/src/AudioBand/Settings/Migrations/V2ToV3.cs
@@ -97,6 +97,7 @@ private MapperConfiguration GetMapConfig()
                     .ForMember(dest => dest.BackgroundColor, opt => opt.Ignore());
                 cfg.CreateMap<Models.V2.AlbumArtSettings, AlbumArt>()
                     .ForMember(dest => dest.Anchor, opt => opt.MapFrom(source => PositionAnchor.TopLeft));
+                cfg.CreateMap<Models.V2.AlbumArtPopupSettings, AlbumArtPopup>();
                 cfg.CreateMap<Models.V2.Settings, ProfileV3>()
                     .ForMember(dest => dest.AlbumArtPopupSettings, opt => opt.MapFrom(source => source.AlbumArtPopupSettings))
                     .ForMember(dest => dest.AlbumArtSettings, opt => opt.MapFrom(source => source.AlbumArtSettings))
@@ -109,6 +110,7 @@ private MapperConfiguration GetMapConfig()
                     .ForMember(dest => dest.RepeatModeButtonSettings, opt => opt.MapFrom(source => new RepeatModeButton()))
                     .ForMember(dest => dest.ShuffleModeButtonSettings, opt => opt.MapFrom(source => new ShuffleModeButton()));
                 cfg.CreateMap<Models.V2.Settings, Dictionary<string, ProfileV3>>().ConvertUsing<ProfilesConverter>();
+                cfg.CreateMap<Models.V2.AudioSourceSetting, AudioSourceSetting>();
                 cfg.CreateMap<Models.V2.Settings, SettingsV3>()
                     .ForMember(dest => dest.Version, opt => opt.Ignore())
                     .ForMember(dest => dest.AudioSourceSettings, opt => opt.MapFrom(source => source.AudioSourceSettings))

From 83602a3a7a13652d0557ef0dbc9c369f6d89d1a8 Mon Sep 17 00:00:00 2001
From: Brandon Chong <brndnchong@gmail.com>
Date: Thu, 20 Jun 2019 11:05:15 -0700
Subject: [PATCH 11/17] Add debugging quality of life changes

---
 src/AudioBand/AudioBand.csproj                |  3 +-
 src/AudioBand/Commands/AsyncRelayCommand.cs   | 59 +++------------
 .../Commands/AsyncRelayCommand{T}.cs          | 71 +++++++++++++++++++
 src/AudioBand/Commands/RelayCommand.cs        |  8 +--
 src/AudioBand/Commands/RelayCommand{T}.cs     |  4 +-
 src/AudioBand/Messages/MessageBus.cs          | 10 ++-
 .../ViewModels/AboutDialogViewModel.cs        |  4 +-
 .../ViewModels/AudioBandToolbarViewModel.cs   |  2 +-
 .../ViewModels/CustomLabelsViewModel.cs       |  2 +-
 .../RenameProfileDialogViewModel.cs           |  6 +-
 .../ViewModels/SettingsWindowViewModel.cs     | 14 ++--
 src/AudioBand/ViewModels/ViewModelBase.cs     |  8 +--
 .../Views/Settings/ImagePicker.xaml.cs        |  6 +-
 .../Views/Settings/SettingsWindow.xaml.cs     |  2 +-
 14 files changed, 120 insertions(+), 79 deletions(-)
 create mode 100644 src/AudioBand/Commands/AsyncRelayCommand{T}.cs

diff --git a/src/AudioBand/AudioBand.csproj b/src/AudioBand/AudioBand.csproj
index f4e2106e..5b038a20 100644
--- a/src/AudioBand/AudioBand.csproj
+++ b/src/AudioBand/AudioBand.csproj
@@ -106,8 +106,9 @@
     <Compile Include="Behaviors\RedirectScrolling.cs" />
     <Compile Include="Behaviors\SliderClickAndDrag.cs" />
     <Compile Include="Behaviors\TrackOffsetFix.cs" />
-    <Compile Include="ViewModels\TrackStateAttribute.cs" />
     <Compile Include="Commands\AsyncRelayCommand.cs" />
+    <Compile Include="ViewModels\TrackStateAttribute.cs" />
+    <Compile Include="Commands\AsyncRelayCommand{T}.cs" />
     <Compile Include="Commands\IAsyncCommand.cs" />
     <Compile Include="Commands\RelayCommand.cs" />
     <Compile Include="Commands\RelayCommand{T}.cs" />
diff --git a/src/AudioBand/Commands/AsyncRelayCommand.cs b/src/AudioBand/Commands/AsyncRelayCommand.cs
index 1c55ede8..f22f0638 100644
--- a/src/AudioBand/Commands/AsyncRelayCommand.cs
+++ b/src/AudioBand/Commands/AsyncRelayCommand.cs
@@ -1,67 +1,30 @@
 using System;
 using System.Threading.Tasks;
-using System.Windows.Input;
 
 namespace AudioBand.Commands
 {
     /// <summary>
-    /// Basic async command.
+    /// An async relay command that does not have a parameter.
     /// </summary>
-    /// <typeparam name="T">Type of the command parameter.</typeparam>
-    public class AsyncRelayCommand<T> : IAsyncCommand
+    public class AsyncRelayCommand : AsyncRelayCommand<object>
     {
-        private readonly Func<T, Task> _execute;
-        private readonly Predicate<T> _canExecute;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AsyncRelayCommand{T}"/> class
-        /// with a delegate to be executed.
-        /// </summary>
-        /// <param name="execute">Action to execute.</param>
-        public AsyncRelayCommand(Func<T, Task> execute)
-            : this(execute, null)
-        {
-        }
-
         /// <summary>
-        /// Initializes a new instance of the <see cref="AsyncRelayCommand{T}"/> class
-        /// with a delegate to be executed and a predicate to determine if it can be executed.
+        /// Initializes a new instance of the <see cref="AsyncRelayCommand"/> class.
         /// </summary>
-        /// <param name="execute">Async delegate to execute.</param>
-        /// <param name="canExecute">Predicate to check if the commmand can execute.</param>
-        public AsyncRelayCommand(Func<T, Task> execute, Predicate<T> canExecute)
-        {
-            _execute = execute ?? throw new ArgumentNullException(nameof(execute));
-            _canExecute = canExecute;
-        }
-
-        /// <inheritdoc cref="ICommand.CanExecuteChanged"/>
-        public event EventHandler CanExecuteChanged
-        {
-            add => CommandManager.RequerySuggested += value;
-            remove => CommandManager.RequerySuggested -= value;
-        }
-
-        /// <inheritdoc cref="ICommand.CanExecute"/>
-        public bool CanExecute(object parameter)
-        {
-            return _canExecute?.Invoke((T)parameter) ?? true;
-        }
-
-        /// <inheritdoc cref="ICommand.Execute"/>
-        public async void Execute(object parameter)
+        /// <param name="execute">The function to execute.</param>
+        public AsyncRelayCommand(Func<Task> execute)
+            : base(o => execute())
         {
-            await ExecuteAsync(parameter);
         }
 
         /// <summary>
-        /// Execute the command asynchronously.
+        /// Initializes a new instance of the <see cref="AsyncRelayCommand"/> class.
         /// </summary>
-        /// <param name="parameter">Command paramerter.</param>
-        /// <returns>Task.</returns>
-        public async Task ExecuteAsync(object parameter)
+        /// <param name="execute">The function to execute.</param>
+        /// <param name="canExecute">The predicate to determine if the command can execute.</param>
+        public AsyncRelayCommand(Func<Task> execute, Func<bool> canExecute)
+            : base(o => execute(), o => canExecute())
         {
-            await _execute((T)parameter);
         }
     }
 }
diff --git a/src/AudioBand/Commands/AsyncRelayCommand{T}.cs b/src/AudioBand/Commands/AsyncRelayCommand{T}.cs
new file mode 100644
index 00000000..9c8869e6
--- /dev/null
+++ b/src/AudioBand/Commands/AsyncRelayCommand{T}.cs
@@ -0,0 +1,71 @@
+using System;
+using System.Diagnostics;
+using System.Threading.Tasks;
+using System.Windows.Input;
+
+namespace AudioBand.Commands
+{
+    /// <summary>
+    /// Basic async command.
+    /// </summary>
+    /// <typeparam name="T">Type of the command parameter.</typeparam>
+    public class AsyncRelayCommand<T> : IAsyncCommand
+    {
+        private readonly Func<T, Task> _execute;
+        private readonly Predicate<T> _canExecute;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AsyncRelayCommand{T}"/> class
+        /// with a delegate to be executed.
+        /// </summary>
+        /// <param name="execute">Action to execute.</param>
+        public AsyncRelayCommand(Func<T, Task> execute)
+            : this(execute, null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AsyncRelayCommand{T}"/> class
+        /// with a delegate to be executed and a predicate to determine if it can be executed.
+        /// </summary>
+        /// <param name="execute">Async delegate to execute.</param>
+        /// <param name="canExecute">Predicate to check if the command can execute.</param>
+        public AsyncRelayCommand(Func<T, Task> execute, Predicate<T> canExecute)
+        {
+            _execute = execute ?? throw new ArgumentNullException(nameof(execute));
+            _canExecute = canExecute;
+        }
+
+        /// <inheritdoc cref="ICommand.CanExecuteChanged"/>
+        public event EventHandler CanExecuteChanged
+        {
+            add => CommandManager.RequerySuggested += value;
+            remove => CommandManager.RequerySuggested -= value;
+        }
+
+        /// <inheritdoc cref="ICommand.CanExecute"/>
+        [DebuggerStepThrough]
+        public bool CanExecute(object parameter)
+        {
+            return _canExecute?.Invoke((T)parameter) ?? true;
+        }
+
+        /// <inheritdoc cref="ICommand.Execute"/>
+        [DebuggerStepThrough]
+        public async void Execute(object parameter)
+        {
+            await ExecuteAsync(parameter);
+        }
+
+        /// <summary>
+        /// Execute the command asynchronously.
+        /// </summary>
+        /// <param name="parameter">Command parameter.</param>
+        /// <returns>Task.</returns>
+        [DebuggerStepThrough]
+        public async Task ExecuteAsync(object parameter)
+        {
+            await _execute((T)parameter);
+        }
+    }
+}
diff --git a/src/AudioBand/Commands/RelayCommand.cs b/src/AudioBand/Commands/RelayCommand.cs
index 447cc733..6c9c6a0b 100644
--- a/src/AudioBand/Commands/RelayCommand.cs
+++ b/src/AudioBand/Commands/RelayCommand.cs
@@ -10,8 +10,8 @@ public class RelayCommand : RelayCommand<object>
         /// with an action to be executed.
         /// </summary>
         /// <param name="execute">Action to execute.</param>
-        public RelayCommand(Action<object> execute)
-            : base(execute)
+        public RelayCommand(Action execute)
+            : base(o => execute())
         {
         }
 
@@ -21,8 +21,8 @@ public RelayCommand(Action<object> execute)
         /// </summary>
         /// <param name="execute">Action to execute.</param>
         /// <param name="canExecute">Predicate to check if the command can be executed.</param>
-        public RelayCommand(Action<object> execute, Predicate<object> canExecute)
-            : base(execute, canExecute)
+        public RelayCommand(Action execute, Func<bool> canExecute)
+            : base(o => execute(), o => canExecute())
         {
         }
     }
diff --git a/src/AudioBand/Commands/RelayCommand{T}.cs b/src/AudioBand/Commands/RelayCommand{T}.cs
index 0aeb2704..f4f941b3 100644
--- a/src/AudioBand/Commands/RelayCommand{T}.cs
+++ b/src/AudioBand/Commands/RelayCommand{T}.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Specialized;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Windows.Input;
 
 namespace AudioBand.Commands
@@ -26,7 +27,7 @@ public RelayCommand(Action<T> execute)
         /// with an action to be executed and a predicate to determine if it can be executed.
         /// </summary>
         /// <param name="execute">Action to execute.</param>
-        /// <param name="canExecute">Predicate to check if the commmand can be executed.</param>
+        /// <param name="canExecute">Predicate to check if the command can be executed.</param>
         public RelayCommand(Action<T> execute, Predicate<T> canExecute)
         {
             _execute = execute ?? throw new ArgumentNullException(nameof(execute));
@@ -55,6 +56,7 @@ public void RaiseCanExecuteChanged()
         }
 
         /// <inheritdoc cref="ICommand.Execute"/>
+        [DebuggerStepThrough]
         public void Execute(object parameter)
         {
             _execute((T)parameter);
diff --git a/src/AudioBand/Messages/MessageBus.cs b/src/AudioBand/Messages/MessageBus.cs
index 14ba82fc..2d134a0a 100644
--- a/src/AudioBand/Messages/MessageBus.cs
+++ b/src/AudioBand/Messages/MessageBus.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Runtime.CompilerServices;
 using AudioBand.Logging;
@@ -16,9 +17,10 @@ public class MessageBus : IMessageBus
         private readonly Dictionary<Type, List<object>> _handlers = new Dictionary<Type, List<object>>();
 
         /// <inheritdoc />
+        [DebuggerStepThrough]
         public void Subscribe<TMessage>(Action<TMessage> handler)
         {
-            Logger.Debug("{class} registered new handler for {message}", handler.Target.GetType(), typeof(TMessage));
+            Logger.Trace("{class} registered new handler for {message}", handler.Target.GetType(), typeof(TMessage));
 
             if (_handlers.ContainsKey(typeof(TMessage)))
             {
@@ -31,9 +33,10 @@ public void Subscribe<TMessage>(Action<TMessage> handler)
         }
 
         /// <inheritdoc />
+        [DebuggerStepThrough]
         public void Unsubscribe<TMessage>(Action<TMessage> handler)
         {
-            Logger.Debug("{class} unsubscribed for {message}", handler.Target.GetType(), typeof(TMessage));
+            Logger.Trace("{class} unsubscribed for {message}", handler.Target.GetType(), typeof(TMessage));
 
             if (_handlers.TryGetValue(typeof(TMessage), out var handlers))
             {
@@ -42,6 +45,7 @@ public void Unsubscribe<TMessage>(Action<TMessage> handler)
         }
 
         /// <inheritdoc />
+        [DebuggerStepThrough]
         public void Publish<TMessage>(TMessage message, [CallerMemberName] string caller = "")
         {
             if (!_handlers.TryGetValue(typeof(TMessage), out var handlers))
@@ -51,7 +55,7 @@ public void Publish<TMessage>(TMessage message, [CallerMemberName] string caller
 
             foreach (var handler in handlers.Cast<Action<TMessage>>())
             {
-                Logger.Debug("Message published {caller} -> {info}", caller, new { Target = handler.Target.GetType(), Handler = handler.Method.Name, Message = message });
+                Logger.Trace("Message published {caller} -> {info}", caller, new { Target = handler.Target.GetType(), Handler = handler.Method.Name, Message = message });
                 handler(message);
             }
         }
diff --git a/src/AudioBand/ViewModels/AboutDialogViewModel.cs b/src/AudioBand/ViewModels/AboutDialogViewModel.cs
index 7d2d584d..10d7f083 100644
--- a/src/AudioBand/ViewModels/AboutDialogViewModel.cs
+++ b/src/AudioBand/ViewModels/AboutDialogViewModel.cs
@@ -47,12 +47,12 @@ public class AboutDialogViewModel : ObservableObject
         /// </summary>
         public ICommand OpenLog { get; } = new RelayCommand(OpenLogCommandOnExecute);
 
-        private static void OpenLogCommandOnExecute(object obj)
+        private static void OpenLogCommandOnExecute()
         {
             Process.Start(Path.Combine(Path.GetTempPath(), "AudioBand.log"));
         }
 
-        private static void OpenSettingsFolderCommandOnExecute(object obj)
+        private static void OpenSettingsFolderCommandOnExecute()
         {
             Process.Start(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "AudioBand"));
         }
diff --git a/src/AudioBand/ViewModels/AudioBandToolbarViewModel.cs b/src/AudioBand/ViewModels/AudioBandToolbarViewModel.cs
index b5525f2c..33c812c6 100644
--- a/src/AudioBand/ViewModels/AudioBandToolbarViewModel.cs
+++ b/src/AudioBand/ViewModels/AudioBandToolbarViewModel.cs
@@ -84,7 +84,7 @@ public IAudioSource SelectedAudioSource
             }
         }
 
-        private void ShowSettingsWindowCommandOnExecute(object obj)
+        private void ShowSettingsWindowCommandOnExecute()
         {
             _messageBus.Publish(SettingsWindowMessage.OpenWindow);
         }
diff --git a/src/AudioBand/ViewModels/CustomLabelsViewModel.cs b/src/AudioBand/ViewModels/CustomLabelsViewModel.cs
index 5692b21b..206b4101 100644
--- a/src/AudioBand/ViewModels/CustomLabelsViewModel.cs
+++ b/src/AudioBand/ViewModels/CustomLabelsViewModel.cs
@@ -96,7 +96,7 @@ protected override void OnEndEdit()
             }
         }
 
-        private void AddLabelCommandOnExecute(object o)
+        private void AddLabelCommandOnExecute()
         {
             BeginEdit();
 
diff --git a/src/AudioBand/ViewModels/RenameProfileDialogViewModel.cs b/src/AudioBand/ViewModels/RenameProfileDialogViewModel.cs
index 8717eb03..6a385d41 100644
--- a/src/AudioBand/ViewModels/RenameProfileDialogViewModel.cs
+++ b/src/AudioBand/ViewModels/RenameProfileDialogViewModel.cs
@@ -85,17 +85,17 @@ public string NewProfileName
         /// </summary>
         public RelayCommand CancelCommand { get; }
 
-        private void CancelCommandOnExecute(object obj)
+        private void CancelCommandOnExecute()
         {
             Canceled?.Invoke(this, EventArgs.Empty);
         }
 
-        private void OkCommandOnExecute(object obj)
+        private void OkCommandOnExecute()
         {
             Accepted?.Invoke(this, EventArgs.Empty);
         }
 
-        private bool OkCommandCanExecute(object obj)
+        private bool OkCommandCanExecute()
         {
             return !HasErrors;
         }
diff --git a/src/AudioBand/ViewModels/SettingsWindowViewModel.cs b/src/AudioBand/ViewModels/SettingsWindowViewModel.cs
index 4a617a84..e0922bf0 100644
--- a/src/AudioBand/ViewModels/SettingsWindowViewModel.cs
+++ b/src/AudioBand/ViewModels/SettingsWindowViewModel.cs
@@ -171,7 +171,7 @@ private bool DeleteProfileCommandCanExecute(string obj)
             return Profiles.Count > 1;
         }
 
-        private void AddProfileCommandOnExecute(object o)
+        private void AddProfileCommandOnExecute()
         {
             const string NewProfileName = "New Profile";
             string newprofile = NewProfileName;
@@ -185,7 +185,7 @@ private void AddProfileCommandOnExecute(object o)
             Profiles.Add(newprofile);
         }
 
-        private void RenameProfileCommandOnExecute(object obj)
+        private void RenameProfileCommandOnExecute()
         {
             string newProfileName = _dialogService.ShowRenameDialog(SelectedProfileName, Profiles.ToList());
             if (newProfileName == null || newProfileName == SelectedProfileName)
@@ -199,7 +199,7 @@ private void RenameProfileCommandOnExecute(object obj)
             SelectedProfileName = newProfileName;
         }
 
-        private void CloseCommandOnExecute(object obj)
+        private void CloseCommandOnExecute()
         {
             if (!HasUnsavedChanges)
             {
@@ -215,13 +215,13 @@ private void CloseCommandOnExecute(object obj)
             }
         }
 
-        private void SaveCommandOnExecute(object obj)
+        private void SaveCommandOnExecute()
         {
             EndEdits();
             _appSettings.Save();
         }
 
-        private bool SaveCommandCanExecute(object obj)
+        private bool SaveCommandCanExecute()
         {
             return HasUnsavedChanges;
         }
@@ -243,7 +243,7 @@ private void EditStartMessageOnPublished(EditStartMessage obj)
             HasUnsavedChanges = true;
         }
 
-        private void ExportProfilesCommandOnExecute(object obj)
+        private void ExportProfilesCommandOnExecute()
         {
             var exportPath = _dialogService.ShowExportProfilesDialog();
             if (exportPath == null)
@@ -254,7 +254,7 @@ private void ExportProfilesCommandOnExecute(object obj)
             _appSettings.ExportProfilesToPath(exportPath);
         }
 
-        private void ImportProfilesCommandOnExecute(object obj)
+        private void ImportProfilesCommandOnExecute()
         {
             try
             {
diff --git a/src/AudioBand/ViewModels/ViewModelBase.cs b/src/AudioBand/ViewModels/ViewModelBase.cs
index 4767e079..2c4ce2dd 100644
--- a/src/AudioBand/ViewModels/ViewModelBase.cs
+++ b/src/AudioBand/ViewModels/ViewModelBase.cs
@@ -27,10 +27,10 @@ protected ViewModelBase()
         {
             Logger = AudioBandLogManager.GetLogger(GetType().FullName);
 
-            BeginEditCommand = new RelayCommand(o => BeginEdit());
-            EndEditCommand = new RelayCommand(o => EndEdit());
-            CancelEditCommand = new RelayCommand(o => CancelEdit());
-            ResetCommand = new RelayCommand(o => Reset());
+            BeginEditCommand = new RelayCommand(BeginEdit);
+            EndEditCommand = new RelayCommand(EndEdit);
+            CancelEditCommand = new RelayCommand(CancelEdit);
+            ResetCommand = new RelayCommand(Reset);
 
             GetTrackingProperties();
         }
diff --git a/src/AudioBand/Views/Settings/ImagePicker.xaml.cs b/src/AudioBand/Views/Settings/ImagePicker.xaml.cs
index 61e1ead2..4ed1fc14 100644
--- a/src/AudioBand/Views/Settings/ImagePicker.xaml.cs
+++ b/src/AudioBand/Views/Settings/ImagePicker.xaml.cs
@@ -76,17 +76,17 @@ public string Title
         /// </summary>
         public RelayCommand BrowseForImageCommand { get; }
 
-        private void ResetImagePathOnExecuted(object parameter)
+        private void ResetImagePathOnExecuted()
         {
             ImagePath = "";
         }
 
-        private bool ResetImagePathCanExecute(object parameter)
+        private bool ResetImagePathCanExecute()
         {
             return !string.IsNullOrEmpty(ImagePath);
         }
 
-        private void BrowseForImageOnExecuted(object parameter)
+        private void BrowseForImageOnExecuted()
         {
             Debug.Assert(DialogService != null, "Dialog service not assigned");
 
diff --git a/src/AudioBand/Views/Settings/SettingsWindow.xaml.cs b/src/AudioBand/Views/Settings/SettingsWindow.xaml.cs
index 9e6fc268..5c966254 100644
--- a/src/AudioBand/Views/Settings/SettingsWindow.xaml.cs
+++ b/src/AudioBand/Views/Settings/SettingsWindow.xaml.cs
@@ -70,7 +70,7 @@ private void OnActivated(object sender, EventArgs e)
             _messageBus.Publish(FocusChangedMessage.FocusCaptured);
         }
 
-        private void OpenAboutCommandOnExecute(object o)
+        private void OpenAboutCommandOnExecute()
         {
             _dialogService.ShowAboutDialog();
         }

From a554bd34d3ea30f32b2819e35fba4130fd08af33 Mon Sep 17 00:00:00 2001
From: Brandon Chong <brndnchong@gmail.com>
Date: Thu, 20 Jun 2019 21:33:57 -0700
Subject: [PATCH 12/17] Add Xaml Styler

---
 src/AudioBand/Resources/ButtonStyles.xaml     | 231 +++++----
 src/AudioBand/Resources/ComboBoxStyles.xaml   | 203 +++++---
 .../Resources/ContextMenuStyles.xaml          | 123 +++--
 src/AudioBand/Resources/Icons.xaml            | 228 +++++++--
 .../Resources/NavigationPaneStyles.xaml       | 183 ++++---
 .../Resources/NumericInputStyles.xaml         |  84 ++--
 .../Resources/PasswordBoxStyles.xaml          |  51 +-
 .../Resources/RangeSliderStyles.xaml          |  22 +-
 src/AudioBand/Resources/ScrollbarStyle.xaml   | 125 +++--
 .../Resources/SettingsWindowStyle.xaml        |  96 ++--
 src/AudioBand/Resources/Shared.xaml           |  59 +--
 src/AudioBand/Resources/Strings.xaml          |  28 +-
 src/AudioBand/Resources/TextBoxStyles.xaml    |  51 +-
 src/AudioBand/Resources/TextStyles.xaml       |  46 +-
 .../Resources/ToolbarButtonStyles.xaml        | 207 ++++----
 .../Resources/ToolbarContextMenuStyles.xaml   |  92 ++--
 .../Resources/ToolbarProgressBarStyle.xaml    |  86 ++--
 src/AudioBand/Resources/Tooltips.xaml         |  23 +-
 src/AudioBand/Views/AudioBandToolbar.xaml     | 286 ++++++-----
 src/AudioBand/Views/Dialogs/AboutDialog.xaml  | 124 +++--
 .../Views/Dialogs/ConfirmationDialog.xaml     |  88 ++--
 .../Views/Dialogs/RenameProfileDialog.xaml    |  70 ++-
 .../Views/Settings/AlbumArtSettingsView.xaml  |  32 +-
 .../Settings/AlbumPopupSettingsView.xaml      |  52 +-
 .../Settings/AudioSourceSettingsView.xaml     |  86 ++--
 .../Views/Settings/ButtonBaseTemplate.xaml    |  30 +-
 .../Views/Settings/ButtonContentTemplate.xaml |  69 ++-
 src/AudioBand/Views/Settings/ColorPicker.xaml |  55 ++-
 .../Settings/CustomLabelSettingsView.xaml     | 204 +++++---
 .../Views/Settings/GeneralSettingsView.xaml   |  40 +-
 src/AudioBand/Views/Settings/ImagePicker.xaml |  84 ++--
 .../Settings/LayoutSettingsTemplate.xaml      |  49 +-
 .../Settings/PlayPauseButtonSettingsView.xaml |  40 +-
 .../Settings/PlaybackButtonSettingsView.xaml  |  48 +-
 .../Settings/ProgressBarSettingsView.xaml     |  44 +-
 .../RepeatModeButtonSettingsView.xaml         |  49 +-
 .../Views/Settings/SettingsWindow.xaml        | 465 ++++++++++--------
 .../ShuffleModeButtonSettingsView.xaml        |  41 +-
 src/Settings.XamlStyler                       |  41 ++
 39 files changed, 2383 insertions(+), 1552 deletions(-)
 create mode 100644 src/Settings.XamlStyler

diff --git a/src/AudioBand/Resources/ButtonStyles.xaml b/src/AudioBand/Resources/ButtonStyles.xaml
index 8a69c0b5..2270cb46 100644
--- a/src/AudioBand/Resources/ButtonStyles.xaml
+++ b/src/AudioBand/Resources/ButtonStyles.xaml
@@ -1,49 +1,57 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:AudioBand.Resources"
+                    xmlns:converters="clr-namespace:AudioBand.ValueConverters"
                     xmlns:fluentWpf="clr-namespace:SourceChord.FluentWPF;assembly=FluentWPF"
-                    xmlns:theme="clr-namespace:AudioBand.Resources.Theming"
+                    xmlns:local="clr-namespace:AudioBand.Resources"
                     xmlns:metro="http://metro.mahapps.com/winfx/xaml/controls"
-                    xmlns:converters="clr-namespace:AudioBand.ValueConverters">
+                    xmlns:theme="clr-namespace:AudioBand.Resources.Theming">
     <ResourceDictionary.MergedDictionaries>
-        <local:SharedDictionary Source="pack://application:,,,/FluentWPF;component/Styles/Controls.xaml"/>
+        <local:SharedDictionary Source="pack://application:,,,/FluentWPF;component/Styles/Controls.xaml" />
         <local:SharedDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.ToggleSwitch.xaml" />
-        <local:SharedDictionary Source="Shared.xaml"/>
+        <local:SharedDictionary Source="Shared.xaml" />
     </ResourceDictionary.MergedDictionaries>
-    <Style TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-        <Setter Property="OverridesDefaultStyle" Value="True"/>
-        <Setter Property="SnapsToDevicePixels" Value="True"/>
-        <Setter Property="FontSize" Value="{StaticResource BodyFontSize}"/>
-        <Setter Property="Foreground" Value="{theme:ThemeResource SystemBaseHighColor}"/>
-        <Setter Property="Background" Value="{theme:ThemeResource SystemBaseLowColor}"/>
-        <Setter Property="BorderBrush" Value="{theme:ThemeResource SystemBaseLowColor}"/>
-        <Setter Property="BorderThickness" Value="2"/>
-        <Setter Property="Height" Value="{StaticResource DefaultButtonHeight}"/>
-        <Setter Property="VerticalAlignment" Value="Stretch"/>
-        <Setter Property="HorizontalAlignment" Value="Stretch"/>
+    <Style BasedOn="{StaticResource {x:Type Button}}" TargetType="{x:Type Button}">
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="FontSize" Value="{StaticResource BodyFontSize}" />
+        <Setter Property="Foreground" Value="{theme:ThemeResource SystemBaseHighColor}" />
+        <Setter Property="Background" Value="{theme:ThemeResource SystemBaseLowColor}" />
+        <Setter Property="BorderBrush" Value="{theme:ThemeResource SystemBaseLowColor}" />
+        <Setter Property="BorderThickness" Value="2" />
+        <Setter Property="Height" Value="{StaticResource DefaultButtonHeight}" />
+        <Setter Property="VerticalAlignment" Value="Stretch" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Button}">
-                    <Border Name="Border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"
+                    <Border Name="Border"
                             Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
                             RenderTransformOrigin="0.5, 0.5">
                         <Border.RenderTransform>
-                            <ScaleTransform ScaleX="1" ScaleY="1"/>
+                            <ScaleTransform ScaleX="1" ScaleY="1" />
                         </Border.RenderTransform>
-                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                          Margin="4" TextBlock.Foreground="{TemplateBinding Foreground}"/>
+                        <ContentPresenter Margin="4"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          TextBlock.Foreground="{TemplateBinding Foreground}" />
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
                                 <VisualStateGroup.Transitions>
                                     <VisualTransition GeneratedDuration="0:0:0.01" />
                                 </VisualStateGroup.Transitions>
-                                <VisualState x:Name="Normal"/>
+                                <VisualState x:Name="Normal" />
                                 <VisualState x:Name="Pressed">
                                     <Storyboard>
-                                        <DoubleAnimation Storyboard.TargetName="Border" Storyboard.TargetProperty="(RenderTransform).(ScaleTransform.ScaleX)"
-                                                         To="0.98" Duration="0:0:0.01"/>
-                                        <DoubleAnimation Storyboard.TargetName="Border" Storyboard.TargetProperty="(RenderTransform).(ScaleTransform.ScaleY)"
-                                                         To="0.98" Duration="0:0:0.01"/>
+                                        <DoubleAnimation Storyboard.TargetName="Border"
+                                                         Storyboard.TargetProperty="(RenderTransform).(ScaleTransform.ScaleX)"
+                                                         To="0.98"
+                                                         Duration="0:0:0.01" />
+                                        <DoubleAnimation Storyboard.TargetName="Border"
+                                                         Storyboard.TargetProperty="(RenderTransform).(ScaleTransform.ScaleY)"
+                                                         To="0.98"
+                                                         Duration="0:0:0.01" />
                                     </Storyboard>
                                 </VisualState>
                             </VisualStateGroup>
@@ -54,53 +62,66 @@
         </Setter>
         <Style.Triggers>
             <Trigger Property="IsDefault" Value="True">
-                <Setter Property="BorderBrush" Value="{theme:ThemeResource SystemBaseMediumColor}"/>
+                <Setter Property="BorderBrush" Value="{theme:ThemeResource SystemBaseMediumColor}" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
-                <Setter Property="Foreground" Value="{theme:ThemeResource SystemBaseMediumLowColor}"/>
-                <Setter Property="Background" Value="{theme:ThemeResource SystemBaseLowColor}"/>
+                <Setter Property="Foreground" Value="{theme:ThemeResource SystemBaseMediumLowColor}" />
+                <Setter Property="Background" Value="{theme:ThemeResource SystemBaseLowColor}" />
             </Trigger>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="BorderBrush" Value="{theme:ThemeResource SystemBaseMediumColor}"/>
+                <Setter Property="BorderBrush" Value="{theme:ThemeResource SystemBaseMediumColor}" />
             </Trigger>
             <Trigger Property="IsPressed" Value="True">
-                <Setter Property="Background" Value="{theme:ThemeResource SystemBaseMediumColor}"/>
+                <Setter Property="Background" Value="{theme:ThemeResource SystemBaseMediumColor}" />
             </Trigger>
             <Trigger Property="IsFocused" Value="True">
-                <Setter Property="BorderBrush" Value="{theme:ThemeResource SystemBaseMediumColor}"/>
+                <Setter Property="BorderBrush" Value="{theme:ThemeResource SystemBaseMediumColor}" />
             </Trigger>
         </Style.Triggers>
     </Style>
-    <Style x:Key="RevealButton" TargetType="{x:Type Button}" BasedOn="{StaticResource ButtonRevealStyle}">
-        <Setter Property="SnapsToDevicePixels" Value="True"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="Foreground" Value="{theme:ThemeResource SystemBaseHighColor}"/>
+    <Style x:Key="RevealButton"
+           BasedOn="{StaticResource ButtonRevealStyle}"
+           TargetType="{x:Type Button}">
+        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Foreground" Value="{theme:ThemeResource SystemBaseHighColor}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Button}">
-                    <Grid x:Name="Root" Background="{TemplateBinding Background}" RenderTransformOrigin="0.5, 0.5">
+                    <Grid x:Name="Root"
+                          Background="{TemplateBinding Background}"
+                          RenderTransformOrigin="0.5, 0.5">
                         <Grid.RenderTransform>
-                            <ScaleTransform/>
+                            <ScaleTransform />
                         </Grid.RenderTransform>
-                        <Rectangle x:Name="RevealHoverLightLayer" Opacity="0"
-                                   HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
-                                   Fill="{StaticResource RevealHoverLightBrush}"/>
-                        <Border x:Name="Border" BorderBrush="{StaticResource RevealBorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent">
-                            <ContentPresenter x:Name="Content" Focusable="False"
-                                              HorizontalAlignment="Center" VerticalAlignment="Center"
-                                              Margin="{TemplateBinding Padding}"/>
+                        <Rectangle x:Name="RevealHoverLightLayer"
+                                   HorizontalAlignment="Stretch"
+                                   VerticalAlignment="Stretch"
+                                   Fill="{StaticResource RevealHoverLightBrush}"
+                                   Opacity="0" />
+                        <Border x:Name="Border"
+                                Background="Transparent"
+                                BorderBrush="{StaticResource RevealBorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}">
+                            <ContentPresenter x:Name="Content"
+                                              Margin="{TemplateBinding Padding}"
+                                              HorizontalAlignment="Center"
+                                              VerticalAlignment="Center"
+                                              Focusable="False" />
                         </Border>
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal"/>
+                                <VisualState x:Name="Normal" />
                                 <VisualState x:Name="MouseOver">
                                     <Storyboard>
-                                        <DoubleAnimation Storyboard.TargetName="RevealHoverLightLayer" Storyboard.TargetProperty="Opacity"
-                                                         From="0" To="1" Duration="0:0:0.1">
+                                        <DoubleAnimation Storyboard.TargetName="RevealHoverLightLayer"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         From="0"
+                                                         To="1"
+                                                         Duration="0:0:0.1">
                                             <DoubleAnimation.EasingFunction>
-                                                <CubicEase EasingMode="EaseOut"/>
+                                                <CubicEase EasingMode="EaseOut" />
                                             </DoubleAnimation.EasingFunction>
                                         </DoubleAnimation>
                                     </Storyboard>
@@ -108,20 +129,24 @@
                                 <VisualState x:Name="Pressed">
                                     <Storyboard>
                                         <ColorAnimationUsingKeyFrames Storyboard.TargetName="Border" Storyboard.TargetProperty="Background.(SolidColorBrush.Color)">
-                                            <DiscreteColorKeyFrame Value="#88FFFFFF" KeyTime="0"/>
-                                            <DiscreteColorKeyFrame Value="#88FFFFFF" KeyTime="0"/>
-                                            <EasingColorKeyFrame Value="#22FFFFFF" KeyTime="0:0:0.2"/>
+                                            <DiscreteColorKeyFrame KeyTime="0" Value="#88FFFFFF" />
+                                            <DiscreteColorKeyFrame KeyTime="0" Value="#88FFFFFF" />
+                                            <EasingColorKeyFrame KeyTime="0:0:0.2" Value="#22FFFFFF" />
                                         </ColorAnimationUsingKeyFrames>
-                                        <DoubleAnimation Storyboard.TargetName="Root" Storyboard.TargetProperty="(RenderTransform).(ScaleTransform.ScaleX)"
-                                                         To="0.98" Duration="0:0:0.01"/>
-                                        <DoubleAnimation Storyboard.TargetName="Root" Storyboard.TargetProperty="(RenderTransform).(ScaleTransform.ScaleY)"
-                                                         To="0.98" Duration="0:0:0.01"/>
+                                        <DoubleAnimation Storyboard.TargetName="Root"
+                                                         Storyboard.TargetProperty="(RenderTransform).(ScaleTransform.ScaleX)"
+                                                         To="0.98"
+                                                         Duration="0:0:0.01" />
+                                        <DoubleAnimation Storyboard.TargetName="Root"
+                                                         Storyboard.TargetProperty="(RenderTransform).(ScaleTransform.ScaleY)"
+                                                         To="0.98"
+                                                         Duration="0:0:0.01" />
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState x:Name="Disabled">
                                     <Storyboard>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Border" Storyboard.TargetProperty="BorderBrush">
-                                            <DiscreteObjectKeyFrame Value="{x:Null}" KeyTime="0"/>
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Null}" />
                                         </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
@@ -133,37 +158,44 @@
         </Setter>
         <Style.Triggers>
             <Trigger Property="IsEnabled" Value="False">
-                <Setter Property="Foreground" Value="{theme:ThemeResource SystemBaseMediumLowColor}"/>
+                <Setter Property="Foreground" Value="{theme:ThemeResource SystemBaseMediumLowColor}" />
             </Trigger>
         </Style.Triggers>
     </Style>
     <Style x:Key="ContainerButtonStyle" TargetType="{x:Type Button}">
-        <Setter Property="OverridesDefaultStyle" Value="True"/>
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="Foreground" Value="{theme:ThemeResource SystemBaseHighColor}"/>
-        <Setter Property="Margin" Value="-6, 0, 0, 0"/>
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Foreground" Value="{theme:ThemeResource SystemBaseHighColor}" />
+        <Setter Property="Margin" Value="-6,0,0,0" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Button}">
-                    <Border x:Name="Border" Background="{TemplateBinding Background}" Padding="6" RenderTransformOrigin="0.5,0.5"
+                    <Border x:Name="Border"
+                            Padding="6"
+                            Background="{TemplateBinding Background}"
                             BorderBrush="{StaticResource RevealBorderBrush}"
-                            BorderThickness="1">
+                            BorderThickness="1"
+                            RenderTransformOrigin="0.5,0.5">
                         <Border.RenderTransform>
-                            <ScaleTransform/>
+                            <ScaleTransform />
                         </Border.RenderTransform>
-                        <ContentPresenter/>
+                        <ContentPresenter />
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
                                 <VisualStateGroup.Transitions>
                                     <VisualTransition GeneratedDuration="0:0:0.01" />
                                 </VisualStateGroup.Transitions>
-                                <VisualState x:Name="Normal"/>
+                                <VisualState x:Name="Normal" />
                                 <VisualState x:Name="Pressed">
                                     <Storyboard>
-                                        <DoubleAnimation Storyboard.TargetName="Border" Storyboard.TargetProperty="(RenderTransform).(ScaleTransform.ScaleX)"
-                                                         To="0.98" Duration="0:0:0.01"/>
-                                        <DoubleAnimation Storyboard.TargetName="Border" Storyboard.TargetProperty="(RenderTransform).(ScaleTransform.ScaleY)"
-                                                         To="0.98" Duration="0:0:0.01"/>
+                                        <DoubleAnimation Storyboard.TargetName="Border"
+                                                         Storyboard.TargetProperty="(RenderTransform).(ScaleTransform.ScaleX)"
+                                                         To="0.98"
+                                                         Duration="0:0:0.01" />
+                                        <DoubleAnimation Storyboard.TargetName="Border"
+                                                         Storyboard.TargetProperty="(RenderTransform).(ScaleTransform.ScaleY)"
+                                                         To="0.98"
+                                                         Duration="0:0:0.01" />
                                     </Storyboard>
                                 </VisualState>
                             </VisualStateGroup>
@@ -174,10 +206,10 @@
         </Setter>
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="{theme:ThemeResource SystemChromeMediumColor}"/>
+                <Setter Property="Background" Value="{theme:ThemeResource SystemChromeMediumColor}" />
             </Trigger>
             <Trigger Property="IsPressed" Value="True">
-                <Setter Property="Background" Value="{theme:ThemeResource SystemChromeHighColor}"/>
+                <Setter Property="Background" Value="{theme:ThemeResource SystemChromeHighColor}" />
             </Trigger>
         </Style.Triggers>
     </Style>
@@ -189,35 +221,36 @@
         <Setter Property="Padding" Value="0" />
         <Setter Property="ThumbIndicatorWidth" Value="10" />
         <Setter Property="Width" Value="44" />
-        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type metro:ToggleSwitchButton}">
                     <Grid>
                         <Grid x:Name="PART_SwitchTrack">
                             <Border x:Name="PART_SwitchBrushBorder"
-                                    Opacity="0"
                                     Width="{TemplateBinding Width}"
                                     Height="{TemplateBinding Height}"
+                                    Background="{theme:ThemeResource SystemAccentColor}"
                                     CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Height, Converter={x:Static converters:Converters.DoubleToCornerRadius}, Mode=OneWay}"
-                                    Background="{theme:ThemeResource SystemAccentColor}"/>
+                                    Opacity="0" />
                             <Border x:Name="PART_SwitchBrushOuterBorder"
-                                    Opacity="1"
                                     Width="{TemplateBinding Width}"
                                     Height="{TemplateBinding Height}"
+                                    BorderBrush="{theme:ThemeResource SystemBaseHighColor}"
+                                    BorderThickness="2"
                                     CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Height, Converter={x:Static converters:Converters.DoubleToCornerRadius}, Mode=OneWay}"
-                                    BorderThickness="2" BorderBrush="{theme:ThemeResource SystemBaseHighColor}"/>
+                                    Opacity="1" />
                             <Border x:Name="PART_ThumbIndicator"
-                                  Width="{TemplateBinding Height}"
-                                  Height="{TemplateBinding Height}"
-                                  HorizontalAlignment="Left">
+                                    Width="{TemplateBinding Height}"
+                                    Height="{TemplateBinding Height}"
+                                    HorizontalAlignment="Left">
                                 <FrameworkElement.RenderTransform>
                                     <TranslateTransform x:Name="PART_ThumbTranslate" />
                                 </FrameworkElement.RenderTransform>
                                 <Ellipse x:Name="PART_ThumbIndicatorInner"
                                          Width="{TemplateBinding ThumbIndicatorWidth}"
                                          Height="{TemplateBinding ThumbIndicatorWidth}"
-                                         Fill="{theme:ThemeResource SystemBaseHighColor}"/>
+                                         Fill="{theme:ThemeResource SystemBaseHighColor}" />
                             </Border>
                         </Grid>
                         <Thumb x:Name="PART_DraggingThumb">
@@ -241,7 +274,7 @@
                         <Trigger Property="IsChecked" Value="True">
                             <Setter TargetName="PART_SwitchBrushBorder" Property="Opacity" Value="1" />
                             <Setter TargetName="PART_SwitchBrushOuterBorder" Property="Opacity" Value="0" />
-                            <Setter TargetName="PART_ThumbIndicatorInner" Property="Fill" Value="White"/>
+                            <Setter TargetName="PART_ThumbIndicatorInner" Property="Fill" Value="White" />
                         </Trigger>
                         <!--  MouseOver  -->
                         <MultiTrigger>
@@ -250,7 +283,7 @@
                                 <Condition Property="IsChecked" Value="False" />
                                 <Condition Property="IsEnabled" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="PART_SwitchBrushOuterBorder" Property="BorderBrush" Value="{theme:ThemeResource SystemBaseMediumColor}"/>
+                            <Setter TargetName="PART_SwitchBrushOuterBorder" Property="BorderBrush" Value="{theme:ThemeResource SystemBaseMediumColor}" />
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
@@ -258,7 +291,7 @@
                                 <Condition Property="IsChecked" Value="True" />
                                 <Condition Property="IsEnabled" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="PART_SwitchBrushBorder" Property="Background" Value="{theme:ThemeResource SystemAccentColorMedium}"/>
+                            <Setter TargetName="PART_SwitchBrushBorder" Property="Background" Value="{theme:ThemeResource SystemAccentColorMedium}" />
                         </MultiTrigger>
                         <!--  Pressed  -->
                         <Trigger Property="IsPressed" Value="True">
@@ -272,24 +305,24 @@
             </Setter.Value>
         </Setter>
     </Style>
-    <Style TargetType="{x:Type metro:ToggleSwitch}" BasedOn="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}">
-        <Setter Property="VerticalAlignment" Value="Center"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="FontSize" Value="{StaticResource BodyFontSize}"/>
+    <Style BasedOn="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}" TargetType="{x:Type metro:ToggleSwitch}">
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="FontSize" Value="{StaticResource BodyFontSize}" />
         <Setter Property="ContentDirection" Value="RightToLeft" />
-        <Setter Property="ToggleSwitchButtonStyle" Value="{StaticResource Win10ToggleSwitch}"/>
+        <Setter Property="ToggleSwitchButtonStyle" Value="{StaticResource Win10ToggleSwitch}" />
     </Style>
 
-    <Style TargetType="{x:Type CheckBox}" BasedOn="{StaticResource {x:Type CheckBox}}">
-        <Setter Property="BorderThickness" Value="{DynamicResource BorderThickness}"/>
-        <Setter Property="BorderBrush" Value="{theme:ThemeResource SystemBaseLowColor}"/>
-        <Setter Property="metro:ControlsHelper.MouseOverBorderBrush" Value="{theme:ThemeResource SystemBaseMediumColor}"/>
-        <Setter Property="metro:ControlsHelper.FocusBorderBrush" Value="{theme:ThemeResource SystemAccentColor}"/>
-        <Setter Property="VerticalAlignment" Value="Center"/>
-        <Setter Property="HorizontalAlignment" Value="Center"/>
+    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="{x:Type CheckBox}">
+        <Setter Property="BorderThickness" Value="{DynamicResource BorderThickness}" />
+        <Setter Property="BorderBrush" Value="{theme:ThemeResource SystemBaseLowColor}" />
+        <Setter Property="metro:ControlsHelper.MouseOverBorderBrush" Value="{theme:ThemeResource SystemBaseMediumColor}" />
+        <Setter Property="metro:ControlsHelper.FocusBorderBrush" Value="{theme:ThemeResource SystemAccentColor}" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
         <Style.Triggers>
             <Trigger Property="IsChecked" Value="True">
-                <Setter Property="Background" Value="{theme:ThemeResource SystemAccentColor}"/>
+                <Setter Property="Background" Value="{theme:ThemeResource SystemAccentColor}" />
             </Trigger>
         </Style.Triggers>
     </Style>
diff --git a/src/AudioBand/Resources/ComboBoxStyles.xaml b/src/AudioBand/Resources/ComboBoxStyles.xaml
index 6a7ae951..9384e96e 100644
--- a/src/AudioBand/Resources/ComboBoxStyles.xaml
+++ b/src/AudioBand/Resources/ComboBoxStyles.xaml
@@ -4,38 +4,41 @@
                     xmlns:system="clr-namespace:System;assembly=mscorlib"
                     xmlns:theme="clr-namespace:AudioBand.Resources.Theming">
     <ResourceDictionary.MergedDictionaries>
-        <local:SharedDictionary Source="Shared.xaml"/>
-        <local:SharedDictionary Source="ScrollbarStyle.xaml"/>
+        <local:SharedDictionary Source="Shared.xaml" />
+        <local:SharedDictionary Source="ScrollbarStyle.xaml" />
     </ResourceDictionary.MergedDictionaries>
-    <Style TargetType="ComboBoxItem" BasedOn="{StaticResource {x:Type ComboBoxItem}}">
+    <Style BasedOn="{StaticResource {x:Type ComboBoxItem}}" TargetType="ComboBoxItem">
         <Style.Resources>
             <system:Double x:Key="ComboBoxItemHeight">30</system:Double>
         </Style.Resources>
-        <Setter Property="Height" Value="{StaticResource ComboBoxItemHeight}"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Height" Value="{StaticResource ComboBoxItemHeight}" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ComboBoxItem}">
-                    <Border x:Name="ComboBoxItem" SnapsToDevicePixels="True" Background="{TemplateBinding Background}" Padding="4, 0">
-                        <ContentPresenter VerticalAlignment="Center"/>
+                    <Border x:Name="ComboBoxItem"
+                            Padding="4,0"
+                            Background="{TemplateBinding Background}"
+                            SnapsToDevicePixels="True">
+                        <ContentPresenter VerticalAlignment="Center" />
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
         <Style.Triggers>
             <Trigger Property="IsSelected" Value="True">
-                <Setter Property="Background" Value="{theme:ThemeResource SystemAccentColorLow}"/>
+                <Setter Property="Background" Value="{theme:ThemeResource SystemAccentColorLow}" />
             </Trigger>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="{theme:ThemeResource SystemListMediumColor}"/>
+                <Setter Property="Background" Value="{theme:ThemeResource SystemListMediumColor}" />
             </Trigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
-                    <Condition Property="IsSelected" Value="True"/>
-                    <Condition Property="IsMouseOver" Value="True"/>
+                    <Condition Property="IsSelected" Value="True" />
+                    <Condition Property="IsMouseOver" Value="True" />
                 </MultiTrigger.Conditions>
                 <MultiTrigger.Setters>
-                    <Setter Property="Background" Value="{theme:ThemeResource SystemAccentColorHigh}"/>
+                    <Setter Property="Background" Value="{theme:ThemeResource SystemAccentColorHigh}" />
                 </MultiTrigger.Setters>
             </MultiTrigger>
         </Style.Triggers>
@@ -44,70 +47,102 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ToggleButton}">
-                    <Border VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Background="{TemplateBinding Background}">
-                        <TextBlock Foreground="{theme:ThemeResource SystemBaseMediumColor}"
-                                   HorizontalAlignment="Right" VerticalAlignment="Center"
-                                   Margin="8, 0"
-                                   TextAlignment="Center" FontFamily="Segoe MDL2 Assets" Text="&#xE70D;" FontSize="16"/>
+                    <Border HorizontalAlignment="Stretch"
+                            VerticalAlignment="Stretch"
+                            Background="{TemplateBinding Background}">
+                        <TextBlock Margin="8,0"
+                                   HorizontalAlignment="Right"
+                                   VerticalAlignment="Center"
+                                   FontFamily="Segoe MDL2 Assets"
+                                   FontSize="16"
+                                   Foreground="{theme:ThemeResource SystemBaseMediumColor}"
+                                   Text="&#xE70D;"
+                                   TextAlignment="Center" />
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
     <Style TargetType="{x:Type ComboBox}">
-        <Setter Property="OverridesDefaultStyle" Value="True"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="VerticalAlignment" Value="Center"/>
-        <Setter Property="BorderThickness" Value="{StaticResource BorderThickness}"/>
-        <Setter Property="BorderBrush" Value="{theme:ThemeResource SystemBaseLowColor}"/>
-        <Setter Property="FontSize" Value="{StaticResource BodyFontSize}"/>
-        <Setter Property="Background" Value="{theme:ThemeResource SystemAltHighColor}"/>
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="BorderThickness" Value="{StaticResource BorderThickness}" />
+        <Setter Property="BorderBrush" Value="{theme:ThemeResource SystemBaseLowColor}" />
+        <Setter Property="FontSize" Value="{StaticResource BodyFontSize}" />
+        <Setter Property="Background" Value="{theme:ThemeResource SystemAltHighColor}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ComboBox">
-                    <Border x:Name="Border" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-                        <Grid VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+                    <Border x:Name="Border"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                        <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="{Binding ElementName=Border, Path=ActualHeight}"/>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="{Binding ElementName=Border, Path=ActualHeight}" />
                             </Grid.ColumnDefinitions>
-                            <ToggleButton x:Name="ToggleButton" Grid.Column="0" Grid.ColumnSpan="2"
-                                          Focusable="false" BorderThickness="0"
-                                          IsChecked="{Binding Path=IsDropDownOpen,Mode=TwoWay,RelativeSource={RelativeSource TemplatedParent}}"
-                                          VerticalAlignment="Stretch" HorizontalAlignment="Stretch"
+                            <ToggleButton x:Name="ToggleButton"
+                                          Grid.Column="0"
+                                          Grid.ColumnSpan="2"
+                                          HorizontalAlignment="Stretch"
+                                          VerticalAlignment="Stretch"
                                           Background="{TemplateBinding Background}"
-                                          Style="{StaticResource ComboboxToggleButtonStyle}"/>
-                            <ContentPresenter Name="ContentSite" Grid.Column="0" IsHitTestVisible="False"
+                                          BorderThickness="0"
+                                          Focusable="false"
+                                          IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                          Style="{StaticResource ComboboxToggleButtonStyle}" />
+                            <ContentPresenter Name="ContentSite"
+                                              Grid.Column="0"
                                               Margin="{StaticResource InputSpacing}"
+                                              HorizontalAlignment="Left"
+                                              VerticalAlignment="Center"
                                               Content="{TemplateBinding SelectionBoxItem}"
                                               ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
                                               ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
-                                              VerticalAlignment="Center" HorizontalAlignment="Left" />
-                            <TextBox x:Name="PART_EditableTextBox" Grid.Column="0" Style="{x:Null}"
-                                     BorderThickness="0" Padding="{StaticResource InputSpacing}"
-                                     HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
-                                     VerticalContentAlignment="Center" Foreground="{TemplateBinding Foreground}"
-                                     Focusable="True" Background="Transparent"
-                                     Visibility="Hidden"
+                                              IsHitTestVisible="False" />
+                            <TextBox x:Name="PART_EditableTextBox"
+                                     Grid.Column="0"
+                                     Padding="{StaticResource InputSpacing}"
+                                     HorizontalAlignment="Stretch"
+                                     VerticalAlignment="Stretch"
+                                     VerticalContentAlignment="Center"
+                                     Background="Transparent"
+                                     BorderThickness="0"
+                                     ContextMenu="{StaticResource StandardInputContextMenu}"
+                                     Focusable="True"
+                                     Foreground="{TemplateBinding Foreground}"
                                      IsReadOnly="{TemplateBinding IsReadOnly}"
-                                     ContextMenu="{StaticResource StandardInputContextMenu}">
-                            </TextBox>
-                            <Popup x:Name="PART_Popup" Grid.Column="0" Placement="Center" AllowsTransparency="True"
-                                   IsOpen="{TemplateBinding IsDropDownOpen}" PlacementTarget="{Binding ElementName=Border}"
-                                   Focusable="False" PopupAnimation="Fade">
-                                <Border BorderThickness="1" Margin="8" RenderTransformOrigin="0.5, 0.5"
-                                        BorderBrush="{theme:ThemeResource SystemChromeHighColor}"
-                                        MinWidth="{TemplateBinding ActualWidth}"
+                                     Style="{x:Null}"
+                                     Visibility="Hidden" />
+                            <Popup x:Name="PART_Popup"
+                                   Grid.Column="0"
+                                   AllowsTransparency="True"
+                                   Focusable="False"
+                                   IsOpen="{TemplateBinding IsDropDownOpen}"
+                                   Placement="Center"
+                                   PlacementTarget="{Binding ElementName=Border}"
+                                   PopupAnimation="Fade">
+                                <Border MinWidth="{TemplateBinding ActualWidth}"
                                         MaxHeight="{TemplateBinding MaxDropDownHeight}"
-                                        Background="{theme:ThemeResource SystemChromeMediumLowColor}">
+                                        Margin="8"
+                                        Background="{theme:ThemeResource SystemChromeMediumLowColor}"
+                                        BorderBrush="{theme:ThemeResource SystemChromeHighColor}"
+                                        BorderThickness="1"
+                                        RenderTransformOrigin="0.5, 0.5">
                                     <Border.Effect>
-                                        <DropShadowEffect x:Name="PopupEffect" BlurRadius="15" Opacity="0" ShadowDepth="0"/>
+                                        <DropShadowEffect x:Name="PopupEffect"
+                                                          BlurRadius="15"
+                                                          Opacity="0"
+                                                          ShadowDepth="0" />
                                     </Border.Effect>
                                     <FrameworkElement.RenderTransform>
-                                        <ScaleTransform x:Name="PopupTransform"/>
+                                        <ScaleTransform x:Name="PopupTransform" />
                                     </FrameworkElement.RenderTransform>
-                                    <ScrollViewer Margin="0, 4" VerticalScrollBarVisibility="Auto" CanContentScroll="True">
-                                        <VirtualizingStackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Contained"/>
+                                    <ScrollViewer Margin="0,4"
+                                                  CanContentScroll="True"
+                                                  VerticalScrollBarVisibility="Auto">
+                                        <VirtualizingStackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Contained" />
                                     </ScrollViewer>
                                 </Border>
                             </Popup>
@@ -115,48 +150,60 @@
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsGrouping" Value="true">
-                            <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
+                            <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
                         </Trigger>
                         <Trigger Property="IsEditable" Value="True">
-                            <Setter Property="IsTabStop" Value="false"/>
+                            <Setter Property="IsTabStop" Value="false" />
                             <Setter TargetName="ContentSite" Property="Visibility" Value="Hidden" />
                             <Setter TargetName="PART_EditableTextBox" Property="Visibility" Value="Visible" />
                         </Trigger>
                         <Trigger Property="IsKeyboardFocusWithin" Value="True">
-                            <Setter TargetName="Border" Property="BorderBrush" Value="{theme:ThemeResource SystemAccentColor}"/>
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{theme:ThemeResource SystemAccentColor}" />
                         </Trigger>
                         <Trigger Property="IsFocused" Value="True">
-                            <Setter TargetName="Border" Property="BorderBrush" Value="{theme:ThemeResource SystemAccentColor}"/>
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{theme:ThemeResource SystemAccentColor}" />
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Border" Property="BorderBrush" Value="{theme:ThemeResource SystemBaseMediumColor}"/>
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{theme:ThemeResource SystemBaseMediumColor}" />
                         </Trigger>
                         <Trigger Property="IsDropDownOpen" Value="True">
                             <Trigger.EnterActions>
                                 <BeginStoryboard>
                                     <Storyboard>
-                                        <DoubleAnimation Storyboard.TargetName="PopupTransform" Storyboard.TargetProperty="ScaleX"
-                                                         From="0.8" To="1" Duration="0:0:0.1">
+                                        <DoubleAnimation Storyboard.TargetName="PopupTransform"
+                                                         Storyboard.TargetProperty="ScaleX"
+                                                         From="0.8"
+                                                         To="1"
+                                                         Duration="0:0:0.1">
                                             <DoubleAnimation.EasingFunction>
-                                                <BackEase EasingMode="EaseOut" Amplitude="0.1"/>
+                                                <BackEase Amplitude="0.1" EasingMode="EaseOut" />
                                             </DoubleAnimation.EasingFunction>
                                         </DoubleAnimation>
-                                        <DoubleAnimation Storyboard.TargetName="PopupTransform" Storyboard.TargetProperty="ScaleY"
-                                                         From="0.5" To="1" Duration="0:0:0.1">
+                                        <DoubleAnimation Storyboard.TargetName="PopupTransform"
+                                                         Storyboard.TargetProperty="ScaleY"
+                                                         From="0.5"
+                                                         To="1"
+                                                         Duration="0:0:0.1">
                                             <DoubleAnimation.EasingFunction>
-                                                <BackEase EasingMode="EaseOut" Amplitude="0.1"/>
+                                                <BackEase Amplitude="0.1" EasingMode="EaseOut" />
                                             </DoubleAnimation.EasingFunction>
                                         </DoubleAnimation>
-                                        <DoubleAnimation Storyboard.TargetName="PopupEffect" Storyboard.TargetProperty="Opacity"
-                                                         From="0" To="0.4" Duration="0:0:0.4">
+                                        <DoubleAnimation Storyboard.TargetName="PopupEffect"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         From="0"
+                                                         To="0.4"
+                                                         Duration="0:0:0.4">
                                             <DoubleAnimation.EasingFunction>
-                                                <QuadraticEase EasingMode="EaseOut"/>
+                                                <QuadraticEase EasingMode="EaseOut" />
                                             </DoubleAnimation.EasingFunction>
                                         </DoubleAnimation>
-                                        <DoubleAnimation Storyboard.TargetName="PopupEffect" Storyboard.TargetProperty="ShadowDepth"
-                                                         From="10" To="2" Duration="0:0:0.4">
+                                        <DoubleAnimation Storyboard.TargetName="PopupEffect"
+                                                         Storyboard.TargetProperty="ShadowDepth"
+                                                         From="10"
+                                                         To="2"
+                                                         Duration="0:0:0.4">
                                             <DoubleAnimation.EasingFunction>
-                                                <QuadraticEase EasingMode="EaseOut"/>
+                                                <QuadraticEase EasingMode="EaseOut" />
                                             </DoubleAnimation.EasingFunction>
                                         </DoubleAnimation>
                                     </Storyboard>
@@ -165,8 +212,10 @@
                             <Trigger.ExitActions>
                                 <BeginStoryboard>
                                     <Storyboard>
-                                        <DoubleAnimation Storyboard.TargetName="PopupEffect" Storyboard.TargetProperty="Opacity"
-                                                         From="0" Duration="0"/>
+                                        <DoubleAnimation Storyboard.TargetName="PopupEffect"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         From="0"
+                                                         Duration="0" />
                                     </Storyboard>
                                 </BeginStoryboard>
                             </Trigger.ExitActions>
@@ -178,12 +227,12 @@
     </Style>
     <DataTemplate x:Key="FontFamilyComboBoxItemDataTemplate">
         <TextBlock>
-            <Run Text="{Binding Path=.}"/>
-            <Run Text="  "/>
-            <Run Text="{Binding Path=.}" FontFamily="{Binding Path=.}"/>
+            <Run Text="{Binding Path=.}" />
+            <Run Text="  " />
+            <Run FontFamily="{Binding Path=.}" Text="{Binding Path=.}" />
         </TextBlock>
     </DataTemplate>
     <DataTemplate x:Key="EnumDescriptorItemTemplate">
-        <TextBlock Text="{Binding Description}"/>
+        <TextBlock Text="{Binding Description}" />
     </DataTemplate>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/AudioBand/Resources/ContextMenuStyles.xaml b/src/AudioBand/Resources/ContextMenuStyles.xaml
index 546bf264..47b00804 100644
--- a/src/AudioBand/Resources/ContextMenuStyles.xaml
+++ b/src/AudioBand/Resources/ContextMenuStyles.xaml
@@ -1,44 +1,56 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:theme="clr-namespace:AudioBand.Resources.Theming"
-                    xmlns:resources="clr-namespace:AudioBand.Resources"
                     xmlns:converters="clr-namespace:AudioBand.ValueConverters"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
+                    xmlns:resources="clr-namespace:AudioBand.Resources"
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                    xmlns:theme="clr-namespace:AudioBand.Resources.Theming">
     <ResourceDictionary.MergedDictionaries>
-        <resources:SharedDictionary Source="Shared.xaml"/>
+        <resources:SharedDictionary Source="Shared.xaml" />
     </ResourceDictionary.MergedDictionaries>
-    <DropShadowEffect x:Key="DropShadowEffect" BlurRadius="12" Opacity="0.2" ShadowDepth="0"/>
+    <DropShadowEffect x:Key="DropShadowEffect"
+                      BlurRadius="12"
+                      Opacity="0.2"
+                      ShadowDepth="0" />
     <Style x:Key="ContextStackPanelStyle" TargetType="{x:Type StackPanel}">
-        <Setter Property="OverridesDefaultStyle" Value="True"/>
-        <Setter Property="MinWidth" Value="200"/>
-        <Setter Property="Grid.IsSharedSizeScope" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="MinWidth" Value="200" />
+        <Setter Property="Grid.IsSharedSizeScope" Value="True" />
     </Style>
     <Style TargetType="{x:Type ContextMenu}">
-        <Setter Property="OverridesDefaultStyle" Value="True"/>
-        <Setter Property="Foreground" Value="{theme:ThemeResource SystemBaseHighColor}"/>
-        <Setter Property="FontSize" Value="{StaticResource BodyFontSize}"/>
-        <Setter Property="FontFamily" Value="Segoe UI"/>
-        <Setter Property="Placement" Value="Relative"/>
-        <Setter Property="Background" Value="{theme:ThemeResource SystemChromeMediumLowColor}"/>
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Foreground" Value="{theme:ThemeResource SystemBaseHighColor}" />
+        <Setter Property="FontSize" Value="{StaticResource BodyFontSize}" />
+        <Setter Property="FontFamily" Value="Segoe UI" />
+        <Setter Property="Placement" Value="Relative" />
+        <Setter Property="Background" Value="{theme:ThemeResource SystemChromeMediumLowColor}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate>
-                    <Border Padding="0, 8" Background="{TemplateBinding Background}" Margin="8" Effect="{StaticResource DropShadowEffect}"
-                            BorderThickness="1" BorderBrush="{theme:ThemeResource SystemChromeHighColor}"
+                    <Border Margin="8"
+                            Padding="0,8"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{theme:ThemeResource SystemChromeHighColor}"
+                            BorderThickness="1"
+                            Effect="{StaticResource DropShadowEffect}"
                             RenderTransformOrigin="0.5, 1">
-                        <StackPanel Orientation="Vertical" IsItemsHost="True" Style="{StaticResource ContextStackPanelStyle}"/>
+                        <StackPanel IsItemsHost="True"
+                                    Orientation="Vertical"
+                                    Style="{StaticResource ContextStackPanelStyle}" />
                         <FrameworkElement.RenderTransform>
-                            <TranslateTransform x:Name="Transform" Y="-500"/>
+                            <TranslateTransform x:Name="Transform" Y="-500" />
                         </FrameworkElement.RenderTransform>
                     </Border>
                     <ControlTemplate.Triggers>
                         <EventTrigger RoutedEvent="Opened">
                             <BeginStoryboard>
                                 <Storyboard>
-                                    <DoubleAnimation Storyboard.TargetName="Transform" Storyboard.TargetProperty="Y"
-                                                     From="-500" To="0" Duration="0:0:0.3">
+                                    <DoubleAnimation Storyboard.TargetName="Transform"
+                                                     Storyboard.TargetProperty="Y"
+                                                     From="-500"
+                                                     To="0"
+                                                     Duration="0:0:0.3">
                                         <DoubleAnimation.EasingFunction>
-                                            <CubicEase EasingMode="EaseOut"/>
+                                            <CubicEase EasingMode="EaseOut" />
                                         </DoubleAnimation.EasingFunction>
                                     </DoubleAnimation>
                                 </Storyboard>
@@ -50,42 +62,65 @@
         </Setter>
     </Style>
     <Style TargetType="{x:Type MenuItem}">
-        <Setter Property="OverridesDefaultStyle" Value="True"/>
-        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Background" Value="Transparent" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type MenuItem}">
-                    <Grid Background="{TemplateBinding Background}" x:Name="MenuItemRoot">
+                    <Grid x:Name="MenuItemRoot" Background="{TemplateBinding Background}">
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition MinWidth="40" SharedSizeGroup="IconColumn"/>
-                            <ColumnDefinition Width="*"/>
-                            <ColumnDefinition Width="Auto" SharedSizeGroup="ShortcutColumn"/>
-                            <ColumnDefinition Width="Auto" SharedSizeGroup="ExpandColumn"/>
+                            <ColumnDefinition MinWidth="40" SharedSizeGroup="IconColumn" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" SharedSizeGroup="ShortcutColumn" />
+                            <ColumnDefinition Width="Auto" SharedSizeGroup="ExpandColumn" />
                         </Grid.ColumnDefinitions>
-                        <ContentPresenter Grid.Column="0" x:Name="IconContent" Content="{TemplateBinding Icon}" Margin="8, 0" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                        <ContentPresenter Grid.Column="1" x:Name="HeaderContent" 
-                                          Content="{TemplateBinding Header}" ContentTemplate="{TemplateBinding HeaderTemplate}" 
-                                          Margin="0, 6" HorizontalAlignment="Left"/>
-                        <TextBlock x:Name="InputGestureText" Grid.Column="2" Text="{TemplateBinding InputGestureText}" VerticalAlignment="Center"/>
-                        <TextBlock x:Name="ItemsArrow" Grid.Column="3" FontFamily="Segoe MDL2 Assets" Text="&#xE76C;" 
-                                   VerticalAlignment="Center" Margin="8, 0" Visibility="Hidden"/>
-                        <Popup Grid.Column="0" x:Name="Popup" Placement="Right" HorizontalOffset="-4" IsOpen="{TemplateBinding IsSubmenuOpen}"
-                               AllowsTransparency="True" Focusable="False" PopupAnimation="Slide">
-                            <Border Padding="0, 8" Effect="{StaticResource DropShadowEffect}"
-                                    Background="{theme:ThemeResource SystemChromeMediumLowColor}">
-                                <StackPanel IsItemsHost="True" Style="{StaticResource ContextStackPanelStyle}"/>
+                        <ContentPresenter x:Name="IconContent"
+                                          Grid.Column="0"
+                                          Margin="8,0"
+                                          HorizontalAlignment="Center"
+                                          VerticalAlignment="Center"
+                                          Content="{TemplateBinding Icon}" />
+                        <ContentPresenter x:Name="HeaderContent"
+                                          Grid.Column="1"
+                                          Margin="0,6"
+                                          HorizontalAlignment="Left"
+                                          Content="{TemplateBinding Header}"
+                                          ContentTemplate="{TemplateBinding HeaderTemplate}" />
+                        <TextBlock x:Name="InputGestureText"
+                                   Grid.Column="2"
+                                   VerticalAlignment="Center"
+                                   Text="{TemplateBinding InputGestureText}" />
+                        <TextBlock x:Name="ItemsArrow"
+                                   Grid.Column="3"
+                                   Margin="8,0"
+                                   VerticalAlignment="Center"
+                                   FontFamily="Segoe MDL2 Assets"
+                                   Text="&#xE76C;"
+                                   Visibility="Hidden" />
+                        <Popup x:Name="Popup"
+                               Grid.Column="0"
+                               AllowsTransparency="True"
+                               Focusable="False"
+                               HorizontalOffset="-4"
+                               IsOpen="{TemplateBinding IsSubmenuOpen}"
+                               Placement="Right"
+                               PopupAnimation="Slide">
+                            <Border Padding="0,8"
+                                    Background="{theme:ThemeResource SystemChromeMediumLowColor}"
+                                    Effect="{StaticResource DropShadowEffect}">
+                                <StackPanel IsItemsHost="True" Style="{StaticResource ContextStackPanelStyle}" />
                             </Border>
                         </Popup>
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="HasItems" Value="True">
-                            <Setter TargetName="ItemsArrow" Property="Visibility" Value="Visible"/>
+                            <Setter TargetName="ItemsArrow" Property="Visibility" Value="Visible" />
                         </Trigger>
                         <Trigger Property="Icon" Value="{x:Null}">
-                            <Setter TargetName="IconContent" Property="Visibility" Value="Collapsed"/>
+                            <Setter TargetName="IconContent" Property="Visibility" Value="Collapsed" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Foreground" Value="{theme:ThemeResource SystemBaseMediumLowColor}"/>
+                            <Setter Property="Foreground" Value="{theme:ThemeResource SystemBaseMediumLowColor}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -93,7 +128,7 @@
         </Setter>
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="{theme:ThemeResource SystemListMediumColor}"/>
+                <Setter Property="Background" Value="{theme:ThemeResource SystemListMediumColor}" />
             </Trigger>
         </Style.Triggers>
     </Style>
diff --git a/src/AudioBand/Resources/Icons.xaml b/src/AudioBand/Resources/Icons.xaml
index 71f04b5d..9ccd6b71 100644
--- a/src/AudioBand/Resources/Icons.xaml
+++ b/src/AudioBand/Resources/Icons.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
                     xmlns:o="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
                     xmlns:theme="clr-namespace:AudioBand.Resources.Theming">
     <sys:Double x:Key="IconPenThickness">12</sys:Double>
     <DrawingImage x:Key="Gear" o:Freeze="True">
@@ -10,15 +10,25 @@
                 <DrawingGroup Opacity="1">
                     <GeometryDrawing Geometry="F1 M256,256z M0,0z M149.34143,8.1202889L154.91232,44.517145 170.8059,51.134267 199.67907,31.335414 226.98953,60.447032 206.53482,88.430299 211.76551,104.1725 247.71762,110.45786 247.9575,149.13689 212.86881,154.68282 204.80119,172.19054 225.45367,201.10011 197.18742,228.63076 167.96977,207.16859 152.44913,211.62058 145.77083,247.96554 105.56832,247.75822 100.86214,212.074 85.373214,205.29654 52.990665,226.22304 27.697185,196.88925 48.248011,168.77477 42.166014,152.16852 8.0337052,146.12725 8.2300323,106.96936 42.56331,101.59356 50.081221,85.034549 28.728186,56.274655 59.318872,27.241394 87.15175,48.485183 103.22617,42.418321 109.50403,8.0172874z">
                         <GeometryDrawing.Pen>
-                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}" Thickness="{StaticResource IconPenThickness}" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
+                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}"
+                                 EndLineCap="Flat"
+                                 LineJoin="Miter"
+                                 StartLineCap="Flat"
+                                 Thickness="{StaticResource IconPenThickness}" />
                         </GeometryDrawing.Pen>
                     </GeometryDrawing>
                     <GeometryDrawing>
                         <GeometryDrawing.Pen>
-                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}" Thickness="{StaticResource IconPenThickness}" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
+                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}"
+                                 EndLineCap="Flat"
+                                 LineJoin="Miter"
+                                 StartLineCap="Flat"
+                                 Thickness="{StaticResource IconPenThickness}" />
                         </GeometryDrawing.Pen>
                         <GeometryDrawing.Geometry>
-                            <EllipseGeometry RadiusX="45.7952" RadiusY="45.7952" Center="128,128" />
+                            <EllipseGeometry Center="128,128"
+                                             RadiusX="45.7952"
+                                             RadiusY="45.7952" />
                         </GeometryDrawing.Geometry>
                     </GeometryDrawing>
                 </DrawingGroup>
@@ -31,13 +41,21 @@
                 <DrawingGroup Opacity="1">
                     <GeometryDrawing Geometry="F1 M256,256z M0,0z M248,6.8750015E-08L248,256">
                         <GeometryDrawing.Pen>
-                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}" Thickness="{StaticResource IconPenThickness}" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
+                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}"
+                                 EndLineCap="Flat"
+                                 LineJoin="Miter"
+                                 StartLineCap="Flat"
+                                 Thickness="{StaticResource IconPenThickness}" />
                         </GeometryDrawing.Pen>
                     </GeometryDrawing>
                     <DrawingGroup Transform="-0.85326308,0,0,-1.0497388,217.1153,262.36656">
                         <GeometryDrawing Geometry="F1 M256,256z M0,0z M60.365532,128.00001L153.18276,74.411943 245.99999,20.823889 246,128 246,235.17611 153.18276,181.58806z">
                             <GeometryDrawing.Pen>
-                                <Pen Brush="{theme:ThemeResource SystemBaseHighColor}" Thickness="{StaticResource IconPenThickness}" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
+                                <Pen Brush="{theme:ThemeResource SystemBaseHighColor}"
+                                     EndLineCap="Flat"
+                                     LineJoin="Miter"
+                                     StartLineCap="Flat"
+                                     Thickness="{StaticResource IconPenThickness}" />
                             </GeometryDrawing.Pen>
                         </GeometryDrawing>
                     </DrawingGroup>
@@ -51,7 +69,11 @@
                 <DrawingGroup Opacity="1" Transform="-0.85326308,0,0,-1.0497388,255.09891,262.36656">
                     <GeometryDrawing Geometry="F1 M256,256z M0,0z M60.365532,128.00001L153.18276,74.411943 245.99999,20.823889 246,128 246,235.17611 153.18276,181.58806z">
                         <GeometryDrawing.Pen>
-                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}" Thickness="{StaticResource IconPenThickness}" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
+                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}"
+                                 EndLineCap="Flat"
+                                 LineJoin="Miter"
+                                 StartLineCap="Flat"
+                                 Thickness="{StaticResource IconPenThickness}" />
                         </GeometryDrawing.Pen>
                     </GeometryDrawing>
                 </DrawingGroup>
@@ -64,13 +86,21 @@
                 <DrawingGroup Opacity="1">
                     <GeometryDrawing Geometry="F1 M256,256z M0,0z M8,1.65E-06L8,256">
                         <GeometryDrawing.Pen>
-                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}" Thickness="{StaticResource IconPenThickness}" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
+                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}"
+                                 EndLineCap="Flat"
+                                 LineJoin="Miter"
+                                 StartLineCap="Flat"
+                                 Thickness="{StaticResource IconPenThickness}" />
                         </GeometryDrawing.Pen>
                     </GeometryDrawing>
                     <DrawingGroup Transform="0.85326308,0,0,-1.0497388,38.884699,262.36656">
                         <GeometryDrawing Geometry="F1 M256,256z M0,0z M60.365532,128.00001L153.18276,74.411943 245.99999,20.823889 246,128 246,235.17611 153.18276,181.58806z">
                             <GeometryDrawing.Pen>
-                                <Pen Brush="{theme:ThemeResource SystemBaseHighColor}" Thickness="{StaticResource IconPenThickness}" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
+                                <Pen Brush="{theme:ThemeResource SystemBaseHighColor}"
+                                     EndLineCap="Flat"
+                                     LineJoin="Miter"
+                                     StartLineCap="Flat"
+                                     Thickness="{StaticResource IconPenThickness}" />
                             </GeometryDrawing.Pen>
                         </GeometryDrawing>
                     </DrawingGroup>
@@ -84,20 +114,34 @@
                 <DrawingGroup Opacity="1">
                     <GeometryDrawing Geometry="F1 M256,256z M0,0z M216,128L256,128">
                         <GeometryDrawing.Pen>
-                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}" Thickness="{StaticResource IconPenThickness}" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Round" />
+                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}"
+                                 EndLineCap="Flat"
+                                 LineJoin="Round"
+                                 StartLineCap="Flat"
+                                 Thickness="{StaticResource IconPenThickness}" />
                         </GeometryDrawing.Pen>
                     </GeometryDrawing>
                     <GeometryDrawing Geometry="F1 M256,256z M0,0z M0,128L120,128">
                         <GeometryDrawing.Pen>
-                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}" Thickness="{StaticResource IconPenThickness}" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
+                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}"
+                                 EndLineCap="Flat"
+                                 LineJoin="Miter"
+                                 StartLineCap="Flat"
+                                 Thickness="{StaticResource IconPenThickness}" />
                         </GeometryDrawing.Pen>
                     </GeometryDrawing>
                     <GeometryDrawing>
                         <GeometryDrawing.Pen>
-                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}" Thickness="{StaticResource IconPenThickness}" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
+                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}"
+                                 EndLineCap="Flat"
+                                 LineJoin="Miter"
+                                 StartLineCap="Flat"
+                                 Thickness="{StaticResource IconPenThickness}" />
                         </GeometryDrawing.Pen>
                         <GeometryDrawing.Geometry>
-                            <EllipseGeometry RadiusX="32" RadiusY="32" Center="169.2363,128" />
+                            <EllipseGeometry Center="169.2363,128"
+                                             RadiusX="32"
+                                             RadiusY="32" />
                         </GeometryDrawing.Geometry>
                     </GeometryDrawing>
                 </DrawingGroup>
@@ -110,23 +154,37 @@
                 <DrawingGroup Opacity="1">
                     <GeometryDrawing>
                         <GeometryDrawing.Pen>
-                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}" Thickness="{StaticResource IconPenThickness}" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
+                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}"
+                                 EndLineCap="Flat"
+                                 LineJoin="Miter"
+                                 StartLineCap="Flat"
+                                 Thickness="{StaticResource IconPenThickness}" />
                         </GeometryDrawing.Pen>
                         <GeometryDrawing.Geometry>
-                            <RectangleGeometry RadiusX="0" RadiusY="0" Rect="8,8,240,240" />
+                            <RectangleGeometry RadiusX="0"
+                                               RadiusY="0"
+                                               Rect="8,8,240,240" />
                         </GeometryDrawing.Geometry>
                     </GeometryDrawing>
                     <GeometryDrawing>
                         <GeometryDrawing.Pen>
-                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}" Thickness="{StaticResource IconPenThickness}" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
+                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}"
+                                 EndLineCap="Flat"
+                                 LineJoin="Miter"
+                                 StartLineCap="Flat"
+                                 Thickness="{StaticResource IconPenThickness}" />
                         </GeometryDrawing.Pen>
                         <GeometryDrawing.Geometry>
-                            <EllipseGeometry RadiusX="84" RadiusY="84" Center="128,128" />
+                            <EllipseGeometry Center="128,128"
+                                             RadiusX="84"
+                                             RadiusY="84" />
                         </GeometryDrawing.Geometry>
                     </GeometryDrawing>
                     <GeometryDrawing Brush="{theme:ThemeResource SystemBaseHighColor}">
                         <GeometryDrawing.Geometry>
-                            <EllipseGeometry RadiusX="24" RadiusY="24" Center="128,128" />
+                            <EllipseGeometry Center="128,128"
+                                             RadiusX="24"
+                                             RadiusY="24" />
                         </GeometryDrawing.Geometry>
                     </GeometryDrawing>
                 </DrawingGroup>
@@ -142,29 +200,47 @@
                 <DrawingGroup Opacity="1">
                     <GeometryDrawing Geometry="F1 M256,256z M0,0z M32,248L248,248 248,32">
                         <GeometryDrawing.Pen>
-                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}" Thickness="{StaticResource IconPenThickness}" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
+                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}"
+                                 EndLineCap="Flat"
+                                 LineJoin="Miter"
+                                 StartLineCap="Flat"
+                                 Thickness="{StaticResource IconPenThickness}" />
                         </GeometryDrawing.Pen>
                     </GeometryDrawing>
                     <DrawingGroup Opacity="1" Transform="0.85833965,0,0,0.8626511,30.745242,78.738149">
                         <GeometryDrawing>
                             <GeometryDrawing.Pen>
-                                <Pen Brush="{theme:ThemeResource SystemBaseHighColor}" Thickness="{StaticResource IconPenThickness}" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
+                                <Pen Brush="{theme:ThemeResource SystemBaseHighColor}"
+                                     EndLineCap="Flat"
+                                     LineJoin="Miter"
+                                     StartLineCap="Flat"
+                                     Thickness="{StaticResource IconPenThickness}" />
                             </GeometryDrawing.Pen>
                             <GeometryDrawing.Geometry>
-                                <RectangleGeometry RadiusX="0" RadiusY="0" Rect="-26.5,-82,240,240" />
+                                <RectangleGeometry RadiusX="0"
+                                                   RadiusY="0"
+                                                   Rect="-26.5,-82,240,240" />
                             </GeometryDrawing.Geometry>
                         </GeometryDrawing>
                         <GeometryDrawing>
                             <GeometryDrawing.Pen>
-                                <Pen Brush="{theme:ThemeResource SystemBaseHighColor}" Thickness="{StaticResource IconPenThickness}" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
+                                <Pen Brush="{theme:ThemeResource SystemBaseHighColor}"
+                                     EndLineCap="Flat"
+                                     LineJoin="Miter"
+                                     StartLineCap="Flat"
+                                     Thickness="{StaticResource IconPenThickness}" />
                             </GeometryDrawing.Pen>
                             <GeometryDrawing.Geometry>
-                                <EllipseGeometry RadiusX="84" RadiusY="84" Center="93.5,38" />
+                                <EllipseGeometry Center="93.5,38"
+                                                 RadiusX="84"
+                                                 RadiusY="84" />
                             </GeometryDrawing.Geometry>
                         </GeometryDrawing>
                         <GeometryDrawing Brush="{theme:ThemeResource SystemBaseHighColor}">
                             <GeometryDrawing.Geometry>
-                                <EllipseGeometry RadiusX="24" RadiusY="24" Center="93.5,38" />
+                                <EllipseGeometry Center="93.5,38"
+                                                 RadiusX="24"
+                                                 RadiusY="24" />
                             </GeometryDrawing.Geometry>
                         </GeometryDrawing>
                     </DrawingGroup>
@@ -178,13 +254,27 @@
                 <DrawingGroup Opacity="1">
                     <GeometryDrawing Geometry="F1 M256,256z M0,0z M112,56L248.00021,56 248.00021,196 45,196 45,164">
                         <GeometryDrawing.Pen>
-                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}" Thickness="{StaticResource IconPenThickness}" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
+                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}"
+                                 EndLineCap="Flat"
+                                 LineJoin="Miter"
+                                 StartLineCap="Flat"
+                                 Thickness="{StaticResource IconPenThickness}" />
                         </GeometryDrawing.Pen>
                     </GeometryDrawing>
                     <DrawingGroup>
                         <GlyphRunDrawing ForegroundBrush="{theme:ThemeResource SystemBaseHighColor}">
                             <GlyphRunDrawing.GlyphRun>
-                                <GlyphRun PixelsPerDip="1" BaselineOrigin="-2.84375,146" FontRenderingEmSize="160" BidiLevel="0" IsSideways="False" ClusterMap="0" Characters="T" GlyphIndices="55" AdvanceWidths="97.7333333333333" GlyphOffsets="0,0" Language="en-us">
+                                <GlyphRun AdvanceWidths="97.7333333333333"
+                                          BaselineOrigin="-2.84375,146"
+                                          BidiLevel="0"
+                                          Characters="T"
+                                          ClusterMap="0"
+                                          FontRenderingEmSize="160"
+                                          GlyphIndices="55"
+                                          GlyphOffsets="0,0"
+                                          IsSideways="False"
+                                          Language="en-us"
+                                          PixelsPerDip="1">
                                     <GlyphRun.GlyphTypeface>
                                         <GlyphTypeface FontUri="C:\WINDOWS\FONTS\TIMES.TTF" StyleSimulations="None" />
                                     </GlyphRun.GlyphTypeface>
@@ -202,42 +292,70 @@
                 <DrawingGroup Opacity="1">
                     <GeometryDrawing Brush="{theme:ThemeResource SystemBaseHighColor}">
                         <GeometryDrawing.Geometry>
-                            <EllipseGeometry RadiusX="23" RadiusY="18" Center="155,217" />
+                            <EllipseGeometry Center="155,217"
+                                             RadiusX="23"
+                                             RadiusY="18" />
                         </GeometryDrawing.Geometry>
                     </GeometryDrawing>
                     <GeometryDrawing Brush="{theme:ThemeResource SystemBaseHighColor}">
                         <GeometryDrawing.Geometry>
-                            <EllipseGeometry RadiusX="23" RadiusY="18" Center="233,195" />
+                            <EllipseGeometry Center="233,195"
+                                             RadiusX="23"
+                                             RadiusY="18" />
                         </GeometryDrawing.Geometry>
                     </GeometryDrawing>
                     <GeometryDrawing Geometry="F1 M256,256z M0,0z M248,196L248,106 170,121 170,216">
                         <GeometryDrawing.Pen>
-                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}" Thickness="{StaticResource IconPenThickness}" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
+                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}"
+                                 EndLineCap="Flat"
+                                 LineJoin="Miter"
+                                 StartLineCap="Flat"
+                                 Thickness="{StaticResource IconPenThickness}" />
                         </GeometryDrawing.Pen>
                     </GeometryDrawing>
                     <GeometryDrawing Geometry="F1 M256,256z M0,0z M0,38L255.98528,38">
                         <GeometryDrawing.Pen>
-                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}" Thickness="{StaticResource IconPenThickness}" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
+                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}"
+                                 EndLineCap="Flat"
+                                 LineJoin="Miter"
+                                 StartLineCap="Flat"
+                                 Thickness="{StaticResource IconPenThickness}" />
                         </GeometryDrawing.Pen>
                     </GeometryDrawing>
                     <GeometryDrawing Geometry="F1 M256,256z M0,0z M0,78L256,78">
                         <GeometryDrawing.Pen>
-                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}" Thickness="{StaticResource IconPenThickness}" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
+                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}"
+                                 EndLineCap="Flat"
+                                 LineJoin="Miter"
+                                 StartLineCap="Flat"
+                                 Thickness="{StaticResource IconPenThickness}" />
                         </GeometryDrawing.Pen>
                     </GeometryDrawing>
                     <GeometryDrawing Geometry="F1 M256,256z M0,0z M0,118L139.99999,118">
                         <GeometryDrawing.Pen>
-                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}" Thickness="{StaticResource IconPenThickness}" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
+                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}"
+                                 EndLineCap="Flat"
+                                 LineJoin="Miter"
+                                 StartLineCap="Flat"
+                                 Thickness="{StaticResource IconPenThickness}" />
                         </GeometryDrawing.Pen>
                     </GeometryDrawing>
                     <GeometryDrawing Geometry="F1 M256,256z M0,0z M0,158L139.99999,158">
                         <GeometryDrawing.Pen>
-                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}" Thickness="{StaticResource IconPenThickness}" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
+                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}"
+                                 EndLineCap="Flat"
+                                 LineJoin="Miter"
+                                 StartLineCap="Flat"
+                                 Thickness="{StaticResource IconPenThickness}" />
                         </GeometryDrawing.Pen>
                     </GeometryDrawing>
                     <GeometryDrawing Geometry="F1 M256,256z M0,0z M0,38L256,38">
                         <GeometryDrawing.Pen>
-                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}" Thickness="{StaticResource IconPenThickness}" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
+                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}"
+                                 EndLineCap="Flat"
+                                 LineJoin="Miter"
+                                 StartLineCap="Flat"
+                                 Thickness="{StaticResource IconPenThickness}" />
                         </GeometryDrawing.Pen>
                     </GeometryDrawing>
                 </DrawingGroup>
@@ -250,12 +368,20 @@
                 <DrawingGroup Opacity="1">
                     <GeometryDrawing Geometry="F1 M256,256z M0,0z M142.19071,79.195957L178.96026,42.426407 142.19071,5.656854 M98.960267,42.426407L178.96026,42.426407 M34.618799,188.81415A90.992584,85.751953,0,0,1,14.894088,95.362512A90.992584,85.751953,0,0,1,98.960277,42.426411">
                         <GeometryDrawing.Pen>
-                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}" Thickness="{StaticResource IconPenThickness}" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
+                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}"
+                                 EndLineCap="Flat"
+                                 LineJoin="Miter"
+                                 StartLineCap="Flat"
+                                 Thickness="{StaticResource IconPenThickness}" />
                         </GeometryDrawing.Pen>
                     </GeometryDrawing>
                     <GeometryDrawing Geometry="F1 M256,256z M0,0z M113.80929,176.80405L77.03974,213.5736 113.80929,250.34315 M157.03974,213.5736L77.03974,213.5736 M221.3812,67.185856A90.992584,85.751953,0,0,1,241.10591,160.6375A90.992584,85.751953,0,0,1,157.03973,213.5736">
                         <GeometryDrawing.Pen>
-                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}" Thickness="{StaticResource IconPenThickness}" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
+                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}"
+                                 EndLineCap="Flat"
+                                 LineJoin="Miter"
+                                 StartLineCap="Flat"
+                                 Thickness="{StaticResource IconPenThickness}" />
                         </GeometryDrawing.Pen>
                     </GeometryDrawing>
                 </DrawingGroup>
@@ -268,27 +394,47 @@
                 <DrawingGroup Opacity="1">
                     <GeometryDrawing Geometry="F1 M256,256z M0,0z M197.50773,230.15227L238.93436,191.00532 199.81815,149.54615">
                         <GeometryDrawing.Pen>
-                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}" Thickness="{StaticResource IconPenThickness}" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
+                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}"
+                                 EndLineCap="Flat"
+                                 LineJoin="Miter"
+                                 StartLineCap="Flat"
+                                 Thickness="{StaticResource IconPenThickness}" />
                         </GeometryDrawing.Pen>
                     </GeometryDrawing>
                     <GeometryDrawing Geometry="F1 M256,256z M0,0z M133.67526,152.01873C171.72829,193.16201,238.93436,191.00532,238.93436,191.00532">
                         <GeometryDrawing.Pen>
-                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}" Thickness="{StaticResource IconPenThickness}" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
+                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}"
+                                 EndLineCap="Flat"
+                                 LineJoin="Miter"
+                                 StartLineCap="Flat"
+                                 Thickness="{StaticResource IconPenThickness}" />
                         </GeometryDrawing.Pen>
                     </GeometryDrawing>
                     <GeometryDrawing Geometry="F1 M256,256z M0,0z M1.3320683,66.254193C1.3320683,66.254193,56.25668,65.309776,98.133769,105.46534">
                         <GeometryDrawing.Pen>
-                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}" Thickness="{StaticResource IconPenThickness}" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
+                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}"
+                                 EndLineCap="Flat"
+                                 LineJoin="Miter"
+                                 StartLineCap="Flat"
+                                 Thickness="{StaticResource IconPenThickness}" />
                         </GeometryDrawing.Pen>
                     </GeometryDrawing>
                     <GeometryDrawing Geometry="F1 M256,256z M0,0z M202.25421,25.672407L242.54219,65.992049 202.25421,106.3117">
                         <GeometryDrawing.Pen>
-                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}" Thickness="{StaticResource IconPenThickness}" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
+                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}"
+                                 EndLineCap="Flat"
+                                 LineJoin="Miter"
+                                 StartLineCap="Flat"
+                                 Thickness="{StaticResource IconPenThickness}" />
                         </GeometryDrawing.Pen>
                     </GeometryDrawing>
                     <GeometryDrawing Geometry="F1 M256,256z M0,0z M1.4633263,183.87359C1.4633263,183.87359 81.058783,187.52905 123.66156,118.0149 158.6725,60.888179 242.54219,65.992049 242.54219,65.992049">
                         <GeometryDrawing.Pen>
-                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}" Thickness="{StaticResource IconPenThickness}" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
+                            <Pen Brush="{theme:ThemeResource SystemBaseHighColor}"
+                                 EndLineCap="Flat"
+                                 LineJoin="Miter"
+                                 StartLineCap="Flat"
+                                 Thickness="{StaticResource IconPenThickness}" />
                         </GeometryDrawing.Pen>
                     </GeometryDrawing>
                 </DrawingGroup>
diff --git a/src/AudioBand/Resources/NavigationPaneStyles.xaml b/src/AudioBand/Resources/NavigationPaneStyles.xaml
index 6ce96978..406063ab 100644
--- a/src/AudioBand/Resources/NavigationPaneStyles.xaml
+++ b/src/AudioBand/Resources/NavigationPaneStyles.xaml
@@ -1,73 +1,88 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:AudioBand.Resources"
                     xmlns:fluentWpf="clr-namespace:SourceChord.FluentWPF;assembly=FluentWPF"
-                    xmlns:valueConverters="clr-namespace:AudioBand.ValueConverters"
-                    xmlns:theme="clr-namespace:AudioBand.Resources.Theming">
+                    xmlns:local="clr-namespace:AudioBand.Resources"
+                    xmlns:theme="clr-namespace:AudioBand.Resources.Theming"
+                    xmlns:valueConverters="clr-namespace:AudioBand.ValueConverters">
     <ResourceDictionary.MergedDictionaries>
-        <local:SharedDictionary Source="Shared.xaml"/>
+        <local:SharedDictionary Source="Shared.xaml" />
     </ResourceDictionary.MergedDictionaries>
     <Style x:Key="NavigationPaneListBoxItem" TargetType="{x:Type ListBoxItem}">
-        <Setter Property="KeyboardNavigation.IsTabStop" Value="False"/>
+        <Setter Property="KeyboardNavigation.IsTabStop" Value="False" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ListBoxItem}">
-                    <ContentPresenter/>
+                    <ContentPresenter />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
     <Style x:Key="NavigationPaneTextBlock" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="{StaticResource NavigationPaneItemFontSize}"/>
-        <Setter Property="FontWeight" Value="Light"/>
+        <Setter Property="FontSize" Value="{StaticResource NavigationPaneItemFontSize}" />
+        <Setter Property="FontWeight" Value="Light" />
     </Style>
     <Style x:Key="NavigationPaneRadioButton" TargetType="{x:Type RadioButton}">
-        <Setter Property="SnapsToDevicePixels" Value="True"/>
-        <Setter Property="FontSize" Value="{StaticResource NavigationPaneItemFontSize}"/>
-        <Setter Property="FontWeight" Value="Light"/>
-        <Setter Property="Height" Value="{StaticResource NavigationPaneItemHeight}"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="VerticalAlignment" Value="Center"/>
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="Foreground" Value="{theme:ThemeResource SystemBaseHighColor}"/>
-        <Setter Property="BorderBrush" Value="Transparent"/>
-        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="FontSize" Value="{StaticResource NavigationPaneItemFontSize}" />
+        <Setter Property="FontWeight" Value="Light" />
+        <Setter Property="Height" Value="{StaticResource NavigationPaneItemHeight}" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Foreground" Value="{theme:ThemeResource SystemBaseHighColor}" />
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="0" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type RadioButton}">
-                    <Grid Background="{TemplateBinding Background}"
-                          RenderTransformOrigin="0.5, 0.5">
+                    <Grid Background="{TemplateBinding Background}" RenderTransformOrigin="0.5, 0.5">
                         <Grid.RenderTransform>
-                            <ScaleTransform ScaleX="1" ScaleY="1"/>
+                            <ScaleTransform ScaleX="1" ScaleY="1" />
                         </Grid.RenderTransform>
                         <Rectangle x:Name="RevealHoverLightLayer"
-                                   Opacity="0" StrokeThickness="0"
-                                   HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
-                                   Fill="{StaticResource RevealHoverLightBrush}"/>
-                        <Border x:Name="Border" BorderBrush="{StaticResource RevealBorderBrush}"
-                                BorderThickness="0,1,1,1" Background="{TemplateBinding Background}"/>
+                                   HorizontalAlignment="Stretch"
+                                   VerticalAlignment="Stretch"
+                                   Fill="{StaticResource RevealHoverLightBrush}"
+                                   Opacity="0"
+                                   StrokeThickness="0" />
+                        <Border x:Name="Border"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{StaticResource RevealBorderBrush}"
+                                BorderThickness="0,1,1,1" />
                         <DockPanel LastChildFill="True">
-                            <Rectangle DockPanel.Dock="Left" Fill="{theme:ThemeResource SystemAccentColor}" Width="5" Height="25"
-                                           Visibility="{TemplateBinding IsChecked, Converter={x:Static valueConverters:Converters.BoolToVisibility}, ConverterParameter=False}" VerticalAlignment="Center"/>
-                            <ContentPresenter Margin="15, 0, 0, 0" VerticalAlignment="Center"/>
+                            <Rectangle Width="5"
+                                       Height="25"
+                                       VerticalAlignment="Center"
+                                       DockPanel.Dock="Left"
+                                       Fill="{theme:ThemeResource SystemAccentColor}"
+                                       Visibility="{TemplateBinding IsChecked,
+                                                                    Converter={x:Static valueConverters:Converters.BoolToVisibility},
+                                                                    ConverterParameter=False}" />
+                            <ContentPresenter Margin="15,0,0,0" VerticalAlignment="Center" />
                         </DockPanel>
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal"/>
+                                <VisualState x:Name="Normal" />
                                 <VisualState x:Name="MouseOver">
                                     <Storyboard>
-                                        <DoubleAnimation Storyboard.TargetName="RevealHoverLightLayer" Storyboard.TargetProperty="Opacity"
-                                                         To="1" Duration="0"/>
+                                        <DoubleAnimation Storyboard.TargetName="RevealHoverLightLayer"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="1"
+                                                         Duration="0" />
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState x:Name="Pressed">
                                     <Storyboard>
-                                        <DoubleAnimation Storyboard.TargetName="RevealHoverLightLayer" Storyboard.TargetProperty="Opacity"
-                                                         To="1" Duration="0"/>
+                                        <DoubleAnimation Storyboard.TargetName="RevealHoverLightLayer"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="1"
+                                                         Duration="0" />
                                         <DoubleAnimation Storyboard.TargetProperty="(RenderTransform).(ScaleTransform.ScaleX)"
-                                                         To="0.98" Duration="0:0:0.01"/>
+                                                         To="0.98"
+                                                         Duration="0:0:0.01" />
                                         <DoubleAnimation Storyboard.TargetProperty="(RenderTransform).(ScaleTransform.ScaleY)"
-                                                         To="0.98" Duration="0:0:0.01"/>
+                                                         To="0.98"
+                                                         Duration="0:0:0.01" />
                                     </Storyboard>
                                 </VisualState>
                             </VisualStateGroup>
@@ -78,65 +93,79 @@
         </Setter>
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="{theme:ThemeResource SystemListLowColor}"/>
+                <Setter Property="Background" Value="{theme:ThemeResource SystemListLowColor}" />
             </Trigger>
             <Trigger Property="IsPressed" Value="True">
-                <Setter Property="Background" Value="{theme:ThemeResource SystemListMediumColor}"/>
+                <Setter Property="Background" Value="{theme:ThemeResource SystemListMediumColor}" />
             </Trigger>
         </Style.Triggers>
     </Style>
     <Style x:Key="ExpanderToggleButton" TargetType="{x:Type ToggleButton}">
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="Foreground" Value="{theme:ThemeResource SystemBaseHighColor}"/>
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Foreground" Value="{theme:ThemeResource SystemBaseHighColor}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ToggleButton}">
                     <Grid Background="{TemplateBinding Background}">
                         <Rectangle x:Name="RevealHoverLightLayer"
-                                   Opacity="0" StrokeThickness="0"
-                                   HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
-                                   Fill="{StaticResource RevealHoverLightBrush}"/>
-                        <Border BorderBrush="{StaticResource RevealBorderBrush}"
-                                Background="{TemplateBinding Background}" BorderThickness="1"/>
+                                   HorizontalAlignment="Stretch"
+                                   VerticalAlignment="Stretch"
+                                   Fill="{StaticResource RevealHoverLightBrush}"
+                                   Opacity="0"
+                                   StrokeThickness="0" />
+                        <Border Background="{TemplateBinding Background}"
+                                BorderBrush="{StaticResource RevealBorderBrush}"
+                                BorderThickness="1" />
                         <DockPanel>
-                            <TextBlock x:Name="ExpanderIcon" DockPanel.Dock="Left"
-                                       Margin="20, 0, 0, 0"
-                                       HorizontalAlignment="Center" VerticalAlignment="Center"
-                                       RenderTransformOrigin="0.5,0.5" TextAlignment="Left"
-                                       FontFamily="Segoe MDL2 Assets" FontSize="18" Text="&#xE76C;">
+                            <TextBlock x:Name="ExpanderIcon"
+                                       Margin="20,0,0,0"
+                                       HorizontalAlignment="Center"
+                                       VerticalAlignment="Center"
+                                       DockPanel.Dock="Left"
+                                       FontFamily="Segoe MDL2 Assets"
+                                       FontSize="18"
+                                       RenderTransformOrigin="0.5,0.5"
+                                       Text="&#xE76C;"
+                                       TextAlignment="Left">
                                 <FrameworkElement.RenderTransform>
-                                    <RotateTransform Angle="0"/>
+                                    <RotateTransform Angle="0" />
                                 </FrameworkElement.RenderTransform>
                             </TextBlock>
-                            <ContentPresenter Margin="10, 0, 0, 0" VerticalAlignment="Center"/>
+                            <ContentPresenter Margin="10,0,0,0" VerticalAlignment="Center" />
                         </DockPanel>
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal"/>
+                                <VisualState x:Name="Normal" />
                                 <VisualState x:Name="MouseOver">
                                     <Storyboard>
-                                        <DoubleAnimation Storyboard.TargetName="RevealHoverLightLayer" Storyboard.TargetProperty="Opacity"
-                                                         To="1" Duration="0"/>
+                                        <DoubleAnimation Storyboard.TargetName="RevealHoverLightLayer"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="1"
+                                                         Duration="0" />
                                     </Storyboard>
                                 </VisualState>
                             </VisualStateGroup>
                             <VisualStateGroup x:Name="CheckStates">
                                 <VisualState x:Name="Unchecked">
                                     <Storyboard>
-                                        <DoubleAnimation Storyboard.TargetName="ExpanderIcon" Storyboard.TargetProperty="(RenderTransform).(RotateTransform.Angle)"
-                                                         To="0" Duration="0:0:0.2">
+                                        <DoubleAnimation Storyboard.TargetName="ExpanderIcon"
+                                                         Storyboard.TargetProperty="(RenderTransform).(RotateTransform.Angle)"
+                                                         To="0"
+                                                         Duration="0:0:0.2">
                                             <DoubleAnimation.EasingFunction>
-                                                <QuadraticEase EasingMode="EaseOut"/>
+                                                <QuadraticEase EasingMode="EaseOut" />
                                             </DoubleAnimation.EasingFunction>
                                         </DoubleAnimation>
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState x:Name="Checked">
                                     <Storyboard>
-                                        <DoubleAnimation Storyboard.TargetName="ExpanderIcon" Storyboard.TargetProperty="(RenderTransform).(RotateTransform.Angle)"
-                                                         To="90" Duration="0:0:0.2">
+                                        <DoubleAnimation Storyboard.TargetName="ExpanderIcon"
+                                                         Storyboard.TargetProperty="(RenderTransform).(RotateTransform.Angle)"
+                                                         To="90"
+                                                         Duration="0:0:0.2">
                                             <DoubleAnimation.EasingFunction>
-                                                <QuadraticEase EasingMode="EaseOut"/>
+                                                <QuadraticEase EasingMode="EaseOut" />
                                             </DoubleAnimation.EasingFunction>
                                         </DoubleAnimation>
                                     </Storyboard>
@@ -149,28 +178,30 @@
         </Setter>
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="{theme:ThemeResource SystemListLowColor}"/>
+                <Setter Property="Background" Value="{theme:ThemeResource SystemListLowColor}" />
             </Trigger>
             <Trigger Property="IsPressed" Value="True">
-                <Setter Property="Background" Value="{theme:ThemeResource SystemListMediumColor}"/>
+                <Setter Property="Background" Value="{theme:ThemeResource SystemListMediumColor}" />
             </Trigger>
         </Style.Triggers>
     </Style>
     <Style x:Key="NavigationPaneExpander" TargetType="{x:Type Expander}">
-        <Setter Property="SnapsToDevicePixels" Value="True"/>
-        <Setter Property="IsExpanded" Value="True"/>
+        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="IsExpanded" Value="True" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Expander}">
                     <Grid>
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto"/>
-                            <RowDefinition Height="0" x:Name="ContentRow"/>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition x:Name="ContentRow" Height="0" />
                         </Grid.RowDefinitions>
-                        <ToggleButton Grid.Row="0" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                        <ToggleButton Grid.Row="0"
                                       Height="{StaticResource NavigationPaneItemHeight}"
-                                      Content="{TemplateBinding Header}" Style="{StaticResource ExpanderToggleButton}"/>
-                        <ContentPresenter Grid.Row="1"/>
+                                      Content="{TemplateBinding Header}"
+                                      IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                      Style="{StaticResource ExpanderToggleButton}" />
+                        <ContentPresenter Grid.Row="1" />
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsExpanded" Value="True">
@@ -182,11 +213,11 @@
         </Setter>
     </Style>
     <Style x:Key="NavigationPaneIcon" TargetType="{x:Type Image}">
-        <Setter Property="Height" Value="{StaticResource NavigationPaneIconLength}"/>
-        <Setter Property="Width" Value="{StaticResource NavigationPaneIconLength}"/>
-        <Setter Property="SnapsToDevicePixels" Value="True"/>
-        <Setter Property="HorizontalAlignment" Value="Center"/>
-        <Setter Property="VerticalAlignment" Value="Center"/>
-        <Setter Property="Margin" Value="0, 0, 15, 0"/>
+        <Setter Property="Height" Value="{StaticResource NavigationPaneIconLength}" />
+        <Setter Property="Width" Value="{StaticResource NavigationPaneIconLength}" />
+        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="Margin" Value="0,0,15,0" />
     </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/AudioBand/Resources/NumericInputStyles.xaml b/src/AudioBand/Resources/NumericInputStyles.xaml
index dbadac0b..ee33dd00 100644
--- a/src/AudioBand/Resources/NumericInputStyles.xaml
+++ b/src/AudioBand/Resources/NumericInputStyles.xaml
@@ -1,34 +1,34 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:behaviors="clr-namespace:AudioBand.Behaviors"
                     xmlns:local="clr-namespace:AudioBand.Resources"
                     xmlns:metro="http://metro.mahapps.com/winfx/xaml/controls"
-                    xmlns:behaviors="clr-namespace:AudioBand.Behaviors"
                     xmlns:theming="clr-namespace:AudioBand.Resources.Theming">
     <ResourceDictionary.MergedDictionaries>
-        <local:SharedDictionary Source="Shared.xaml"/>
+        <local:SharedDictionary Source="Shared.xaml" />
     </ResourceDictionary.MergedDictionaries>
     <Style x:Key="RepeatButtonStyle" TargetType="{x:Type RepeatButton}">
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type RepeatButton}">
                     <Border Background="{TemplateBinding Background}">
-                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
-    <Style TargetType="{x:Type metro:NumericUpDown}" BasedOn="{StaticResource {x:Type metro:NumericUpDown}}">
-        <Setter Property="TextAlignment" Value="Left"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="Padding" Value="{StaticResource InputSpacing}"/>
-        <Setter Property="BorderThickness" Value="{StaticResource BorderThickness}"/>
-        <Setter Property="BorderBrush" Value="{theming:ThemeResource SystemBaseLowColor}"/>
-        <Setter Property="Background" Value="{theming:ThemeResource SystemAltHighColor}"/>
-        <Setter Property="Foreground" Value="{theming:ThemeResource SystemBaseHighColor}"/>
-        <Setter Property="FontSize" Value="{StaticResource BodyFontSize}"/>
-        <Setter Property="metro:ControlsHelper.MouseOverBorderBrush" Value="{theming:ThemeResource SystemBaseMediumColor}"/>
-        <Setter Property="metro:ControlsHelper.FocusBorderBrush" Value="{theming:ThemeResource SystemAccentColor}"/>
+    <Style BasedOn="{StaticResource {x:Type metro:NumericUpDown}}" TargetType="{x:Type metro:NumericUpDown}">
+        <Setter Property="TextAlignment" Value="Left" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Padding" Value="{StaticResource InputSpacing}" />
+        <Setter Property="BorderThickness" Value="{StaticResource BorderThickness}" />
+        <Setter Property="BorderBrush" Value="{theming:ThemeResource SystemBaseLowColor}" />
+        <Setter Property="Background" Value="{theming:ThemeResource SystemAltHighColor}" />
+        <Setter Property="Foreground" Value="{theming:ThemeResource SystemBaseHighColor}" />
+        <Setter Property="FontSize" Value="{StaticResource BodyFontSize}" />
+        <Setter Property="metro:ControlsHelper.MouseOverBorderBrush" Value="{theming:ThemeResource SystemBaseMediumColor}" />
+        <Setter Property="metro:ControlsHelper.FocusBorderBrush" Value="{theming:ThemeResource SystemAccentColor}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type metro:NumericUpDown}">
@@ -48,7 +48,7 @@
                                      Grid.Column="0"
                                      MinWidth="20"
                                      MinHeight="{TemplateBinding MinHeight}"
-                                     Margin="0 0 -2 0"
+                                     Margin="0,0,-2,0"
                                      HorizontalAlignment="Stretch"
                                      HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                                      VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
@@ -82,25 +82,29 @@
                             <RepeatButton x:Name="PART_NumericUp"
                                           Grid.Column="1"
                                           Width="{TemplateBinding UpDownButtonsWidth}"
-                                          Margin="0 2 0 2"
-                                          Delay="{TemplateBinding Delay}"
+                                          Margin="0,2,0,2"
                                           Background="Transparent"
+                                          Delay="{TemplateBinding Delay}"
                                           Foreground="{theming:ThemeResource SystemBaseMediumColor}"
                                           IsTabStop="False"
                                           Style="{StaticResource RepeatButtonStyle}">
-                                <TextBlock Text="&#xE948;" FontFamily="Segoe MDL2 Assets" FontSize="14"/>
+                                <TextBlock FontFamily="Segoe MDL2 Assets"
+                                           FontSize="14"
+                                           Text="&#xE948;" />
                             </RepeatButton>
                             <RepeatButton x:Name="PART_NumericDown"
                                           Grid.Column="2"
                                           Width="{TemplateBinding UpDownButtonsWidth}"
-                                          Margin="0 2 2 2"
+                                          Margin="0,2,2,2"
                                           VerticalContentAlignment="Center"
-                                          Delay="{TemplateBinding Delay}"
                                           Background="Transparent"
+                                          Delay="{TemplateBinding Delay}"
                                           Foreground="{theming:ThemeResource SystemBaseMediumColor}"
                                           IsTabStop="False"
                                           Style="{StaticResource RepeatButtonStyle}">
-                                <TextBlock Text="&#xE949;" FontFamily="Segoe MDL2 Assets" FontSize="14"/>
+                                <TextBlock FontFamily="Segoe MDL2 Assets"
+                                           FontSize="14"
+                                           Text="&#xE949;" />
                             </RepeatButton>
                         </Grid>
                         <Border x:Name="DisabledVisualElement"
@@ -115,13 +119,13 @@
                     <ControlTemplate.Triggers>
                         <Trigger Property="ButtonsAlignment" Value="Left">
                             <Setter TargetName="PART_NumericDown" Property="Grid.Column" Value="1" />
-                            <Setter TargetName="PART_NumericDown" Property="Margin" Value="0 2 0 2" />
+                            <Setter TargetName="PART_NumericDown" Property="Margin" Value="0,2,0,2" />
                             <Setter TargetName="PART_NumericDownColumn" Property="Width" Value="*" />
                             <Setter TargetName="PART_NumericUp" Property="Grid.Column" Value="0" />
-                            <Setter TargetName="PART_NumericUp" Property="Margin" Value="2 2 0 2" />
+                            <Setter TargetName="PART_NumericUp" Property="Margin" Value="2,2,0,2" />
                             <Setter TargetName="PART_NumericUpColumn" Property="Width" Value="Auto" />
                             <Setter TargetName="PART_TextBox" Property="Grid.Column" Value="2" />
-                            <Setter TargetName="PART_TextBox" Property="Margin" Value="-2 0 0 0" />
+                            <Setter TargetName="PART_TextBox" Property="Margin" Value="-2,0,0,0" />
                             <Setter TargetName="PART_TextBoxColumn" Property="Width" Value="Auto" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
@@ -169,32 +173,32 @@
         </Setter>
         <Style.Triggers>
             <Trigger Property="behaviors:NumericInput.Type" Value="Size">
-                <Setter Property="NumericInputMode" Value="All"/>
-                <Setter Property="Minimum" Value="1"/>
-                <Setter Property="Interval" Value="0.5"/>
+                <Setter Property="NumericInputMode" Value="All" />
+                <Setter Property="Minimum" Value="1" />
+                <Setter Property="Interval" Value="0.5" />
             </Trigger>
             <Trigger Property="behaviors:NumericInput.Type" Value="Position">
-                <Setter Property="NumericInputMode" Value="All"/>
-                <Setter Property="Interval" Value="0.5"/>
+                <Setter Property="NumericInputMode" Value="All" />
+                <Setter Property="Interval" Value="0.5" />
             </Trigger>
             <Trigger Property="behaviors:NumericInput.Type" Value="FontSize">
-                <Setter Property="NumericInputMode" Value="All"/>
-                <Setter Property="Minimum" Value="0.5"/>
-                <Setter Property="Interval" Value="0.5"/>
+                <Setter Property="NumericInputMode" Value="All" />
+                <Setter Property="Minimum" Value="0.5" />
+                <Setter Property="Interval" Value="0.5" />
             </Trigger>
             <Trigger Property="behaviors:NumericInput.Type" Value="Positive">
-                <Setter Property="NumericInputMode" Value="Numbers"/>
-                <Setter Property="Minimum" Value="0"/>
-                <Setter Property="Interval" Value="1"/>
+                <Setter Property="NumericInputMode" Value="Numbers" />
+                <Setter Property="Minimum" Value="0" />
+                <Setter Property="Interval" Value="1" />
             </Trigger>
             <Trigger Property="behaviors:NumericInput.Type" Value="Integer">
-                <Setter Property="NumericInputMode" Value="Numbers"/>
-                <Setter Property="Interval" Value="1"/>
+                <Setter Property="NumericInputMode" Value="Numbers" />
+                <Setter Property="Interval" Value="1" />
             </Trigger>
             <Trigger Property="behaviors:NumericInput.Type" Value="WholeNumber">
-                <Setter Property="NumericInputMode" Value="Numbers"/>
-                <Setter Property="Minimum" Value="0"/>
-                <Setter Property="Interval" Value="1"/>
+                <Setter Property="NumericInputMode" Value="Numbers" />
+                <Setter Property="Minimum" Value="0" />
+                <Setter Property="Interval" Value="1" />
             </Trigger>
         </Style.Triggers>
     </Style>
diff --git a/src/AudioBand/Resources/PasswordBoxStyles.xaml b/src/AudioBand/Resources/PasswordBoxStyles.xaml
index fbbb3945..1ef1e1d7 100644
--- a/src/AudioBand/Resources/PasswordBoxStyles.xaml
+++ b/src/AudioBand/Resources/PasswordBoxStyles.xaml
@@ -4,41 +4,46 @@
                     xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
                     xmlns:theming="clr-namespace:AudioBand.Resources.Theming">
     <ResourceDictionary.MergedDictionaries>
-        <local:SharedDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.PasswordBox.xaml"/>
-        <local:SharedDictionary Source="Shared.xaml"/>
+        <local:SharedDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.PasswordBox.xaml" />
+        <local:SharedDictionary Source="Shared.xaml" />
     </ResourceDictionary.MergedDictionaries>
-    <Style TargetType="{x:Type PasswordBox}" BasedOn="{StaticResource MetroPasswordBox}">
-        <Setter Property="mah:TextBoxHelper.ClearTextButton" Value="True"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="Padding" Value="4,0,0,0"/>
-        <Setter Property="FontSize" Value="{StaticResource BodyFontSize}"/>
-        <Setter Property="BorderThickness" Value="{StaticResource BorderThickness}"/>
-        <Setter Property="BorderBrush" Value="{theming:ThemeResource SystemBaseLowColor}"/>
-        <Setter Property="Background" Value="{theming:ThemeResource SystemAltHighColor}"/>
-        <Setter Property="Foreground" Value="{theming:ThemeResource SystemBaseHighColor}"/>
-        <Setter Property="mah:ControlsHelper.MouseOverBorderBrush" Value="{theming:ThemeResource SystemBaseMediumColor}"/>
-        <Setter Property="mah:ControlsHelper.FocusBorderBrush" Value="{theming:ThemeResource SystemAccentColor}"/>
-        <Setter Property="SelectionBrush" Value="{theming:ThemeResource SystemAccentColorMedium}"/>
-        <Setter Property="CaretBrush" Value="{theming:ThemeResource SystemBaseHighColor}"/>
-        <Setter Property="ContextMenu" Value="{StaticResource StandardInputContextMenu}"/>
+    <Style BasedOn="{StaticResource MetroPasswordBox}" TargetType="{x:Type PasswordBox}">
+        <Setter Property="mah:TextBoxHelper.ClearTextButton" Value="True" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Padding" Value="4,0,0,0" />
+        <Setter Property="FontSize" Value="{StaticResource BodyFontSize}" />
+        <Setter Property="BorderThickness" Value="{StaticResource BorderThickness}" />
+        <Setter Property="BorderBrush" Value="{theming:ThemeResource SystemBaseLowColor}" />
+        <Setter Property="Background" Value="{theming:ThemeResource SystemAltHighColor}" />
+        <Setter Property="Foreground" Value="{theming:ThemeResource SystemBaseHighColor}" />
+        <Setter Property="mah:ControlsHelper.MouseOverBorderBrush" Value="{theming:ThemeResource SystemBaseMediumColor}" />
+        <Setter Property="mah:ControlsHelper.FocusBorderBrush" Value="{theming:ThemeResource SystemAccentColor}" />
+        <Setter Property="SelectionBrush" Value="{theming:ThemeResource SystemAccentColorMedium}" />
+        <Setter Property="CaretBrush" Value="{theming:ThemeResource SystemBaseHighColor}" />
+        <Setter Property="ContextMenu" Value="{StaticResource StandardInputContextMenu}" />
         <Style.Resources>
             <Style x:Key="ChromelessButtonStyle" TargetType="{x:Type Button}">
-                <Setter Property="OverridesDefaultStyle" Value="True"/>
+                <Setter Property="OverridesDefaultStyle" Value="True" />
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="{x:Type Button}">
                             <Border x:Name="Border" Background="Transparent">
-                                <TextBlock x:Name="ClearText" VerticalAlignment="Center" HorizontalAlignment="Center"
-                                           Foreground="{theming:ThemeResource SystemBaseMediumColor}" FontFamily="Segoe MDL2 Assets" Text="&#xE894;" FontSize="14"/>
+                                <TextBlock x:Name="ClearText"
+                                           HorizontalAlignment="Center"
+                                           VerticalAlignment="Center"
+                                           FontFamily="Segoe MDL2 Assets"
+                                           FontSize="14"
+                                           Foreground="{theming:ThemeResource SystemBaseMediumColor}"
+                                           Text="&#xE894;" />
                             </Border>
                             <ControlTemplate.Triggers>
                                 <Trigger Property="IsMouseOver" Value="True">
-                                    <Setter TargetName="Border" Property="Background" Value="{theming:ThemeResource SystemChromeMediumColor}"/>
-                                    <Setter TargetName="ClearText" Property="Foreground" Value="{theming:ThemeResource SystemAccentColor}"/>
+                                    <Setter TargetName="Border" Property="Background" Value="{theming:ThemeResource SystemChromeMediumColor}" />
+                                    <Setter TargetName="ClearText" Property="Foreground" Value="{theming:ThemeResource SystemAccentColor}" />
                                 </Trigger>
                                 <Trigger Property="IsPressed" Value="True">
-                                    <Setter TargetName="Border" Property="Background" Value="{theming:ThemeResource SystemChromeLowColor}"/>
-                                    <Setter TargetName="ClearText" Property="Foreground" Value="{theming:ThemeResource SystemAccentColorHigh}"/>
+                                    <Setter TargetName="Border" Property="Background" Value="{theming:ThemeResource SystemChromeLowColor}" />
+                                    <Setter TargetName="ClearText" Property="Foreground" Value="{theming:ThemeResource SystemAccentColorHigh}" />
                                 </Trigger>
                             </ControlTemplate.Triggers>
                         </ControlTemplate>
diff --git a/src/AudioBand/Resources/RangeSliderStyles.xaml b/src/AudioBand/Resources/RangeSliderStyles.xaml
index 0baebae9..4ebc1d19 100644
--- a/src/AudioBand/Resources/RangeSliderStyles.xaml
+++ b/src/AudioBand/Resources/RangeSliderStyles.xaml
@@ -3,16 +3,16 @@
                     xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
                     xmlns:theme="clr-namespace:AudioBand.Resources.Theming">
     <Style x:Key="RangeSliderStyle" TargetType="{x:Type mah:RangeSlider}">
-        <Setter Property="mah:SliderHelper.TrackFillBrush" Value="{theme:ThemeResource SystemBaseLowColor}"/>
-        <Setter Property="mah:SliderHelper.TrackFillHoverBrush" Value="{theme:ThemeResource SystemBaseLowColor}"/>
-        <Setter Property="mah:SliderHelper.TrackFillPressedBrush" Value="{theme:ThemeResource SystemBaseLowColor}"/>
-        <Setter Property="mah:SliderHelper.TrackValueFillBrush" Value="{theme:ThemeResource SystemAccentColor}"/>
-        <Setter Property="mah:SliderHelper.TrackValueFillHoverBrush" Value="{theme:ThemeResource SystemAccentColorMedium}"/>
-        <Setter Property="mah:SliderHelper.TrackValueFillPressedBrush" Value="{theme:ThemeResource SystemAccentColorHigh}"/>
-        <Setter Property="mah:SliderHelper.ThumbFillBrush" Value="{theme:ThemeResource SystemBaseMediumColor}"/>
-        <Setter Property="mah:SliderHelper.ThumbFillHoverBrush" Value="{theme:ThemeResource SystemBaseMediumLowColor}"/>
-        <Setter Property="mah:SliderHelper.ThumbFillPressedBrush" Value="{theme:ThemeResource SystemBaseMediumHighColor}"/>
-        <Setter Property="Foreground" Value="{theme:ThemeResource SystemBaseHighColor}"/>
-        <Setter Property="Background" Value="{theme:ThemeResource SystemAltHighColor}"/>
+        <Setter Property="mah:SliderHelper.TrackFillBrush" Value="{theme:ThemeResource SystemBaseLowColor}" />
+        <Setter Property="mah:SliderHelper.TrackFillHoverBrush" Value="{theme:ThemeResource SystemBaseLowColor}" />
+        <Setter Property="mah:SliderHelper.TrackFillPressedBrush" Value="{theme:ThemeResource SystemBaseLowColor}" />
+        <Setter Property="mah:SliderHelper.TrackValueFillBrush" Value="{theme:ThemeResource SystemAccentColor}" />
+        <Setter Property="mah:SliderHelper.TrackValueFillHoverBrush" Value="{theme:ThemeResource SystemAccentColorMedium}" />
+        <Setter Property="mah:SliderHelper.TrackValueFillPressedBrush" Value="{theme:ThemeResource SystemAccentColorHigh}" />
+        <Setter Property="mah:SliderHelper.ThumbFillBrush" Value="{theme:ThemeResource SystemBaseMediumColor}" />
+        <Setter Property="mah:SliderHelper.ThumbFillHoverBrush" Value="{theme:ThemeResource SystemBaseMediumLowColor}" />
+        <Setter Property="mah:SliderHelper.ThumbFillPressedBrush" Value="{theme:ThemeResource SystemBaseMediumHighColor}" />
+        <Setter Property="Foreground" Value="{theme:ThemeResource SystemBaseHighColor}" />
+        <Setter Property="Background" Value="{theme:ThemeResource SystemAltHighColor}" />
     </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/AudioBand/Resources/ScrollbarStyle.xaml b/src/AudioBand/Resources/ScrollbarStyle.xaml
index 27ba6fe7..48094ac3 100644
--- a/src/AudioBand/Resources/ScrollbarStyle.xaml
+++ b/src/AudioBand/Resources/ScrollbarStyle.xaml
@@ -1,8 +1,8 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:AudioBand.Resources"
-                    xmlns:theme="clr-namespace:AudioBand.Resources.Theming"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                    xmlns:theme="clr-namespace:AudioBand.Resources.Theming">
     <sys:Double x:Key="ScrollbarWidth">14</sys:Double>
     <Duration x:Key="ScrollbarAnimationDuration">0:0:0.1</Duration>
     <sys:TimeSpan x:Key="ScrollbarAnimationBeginTime">0:0:0.3</sys:TimeSpan>
@@ -16,6 +16,12 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type RepeatButton}">
                     <Border x:Name="Border" Background="Transparent">
+                        <Path x:Name="Arrow"
+                              HorizontalAlignment="Center"
+                              VerticalAlignment="Center"
+                              Data="{Binding Content, RelativeSource={RelativeSource TemplatedParent}}"
+                              Stroke="{theme:ThemeResource SystemBaseHighColor}"
+                              StrokeThickness="1" />
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
                                 <VisualState x:Name="Normal" />
@@ -42,9 +48,6 @@
                                 </VisualState>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
-                        <Path x:Name="Arrow" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{Binding Content, RelativeSource={RelativeSource TemplatedParent}}"
-                              Stroke="{theme:ThemeResource SystemBaseHighColor}" StrokeThickness="1">
-                        </Path>
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
@@ -70,23 +73,23 @@
         <Setter Property="OverridesDefaultStyle" Value="true" />
         <Setter Property="IsTabStop" Value="false" />
         <Setter Property="Focusable" Value="false" />
-        <Setter Property="Background" Value="{theme:ThemeResource SystemBaseMediumLowColor}"/>
+        <Setter Property="Background" Value="{theme:ThemeResource SystemBaseMediumLowColor}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Thumb}">
-                    <Border Background="{TemplateBinding Background}"/>
+                    <Border Background="{TemplateBinding Background}" />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
         <Style.Triggers>
             <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type Track}}, Path=RenderTransform.(ScaleTransform.ScaleX)}" Value="1">
-                <Setter Property="Background" Value="{theme:ThemeResource SystemBaseLowColor}"/>
+                <Setter Property="Background" Value="{theme:ThemeResource SystemBaseLowColor}" />
             </DataTrigger>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="{theme:ThemeResource SystemBaseMediumLowColor}"/>
+                <Setter Property="Background" Value="{theme:ThemeResource SystemBaseMediumLowColor}" />
             </Trigger>
             <Trigger Property="IsDragging" Value="True">
-                <Setter Property="Background" Value="{theme:ThemeResource SystemBaseMediumColor}"/>
+                <Setter Property="Background" Value="{theme:ThemeResource SystemBaseMediumColor}" />
             </Trigger>
         </Style.Triggers>
     </Style>
@@ -98,53 +101,83 @@
                 <RowDefinition Height="0.00001*" />
                 <RowDefinition MaxHeight="{StaticResource ScrollbarWidth}" />
             </Grid.RowDefinitions>
-            <Border x:Name="Border" Grid.RowSpan="3" Background="{theme:ThemeResource SystemListLowColor}" Opacity="0"/>
-            <RepeatButton Grid.Row="0" Style="{StaticResource LineRepeatButtonStyle}" Command="ScrollBar.LineUpCommand" Content="M 0 4 L 4 0 L 8 4" 
-                          x:Name="LineUpButton" Opacity="0"/>
-            <Track x:Name="PART_Track" Grid.Row="1" IsDirectionReversed="true" RenderTransformOrigin="0.7, 0">
+            <Border x:Name="Border"
+                    Grid.RowSpan="3"
+                    Background="{theme:ThemeResource SystemListLowColor}"
+                    Opacity="0" />
+            <RepeatButton x:Name="LineUpButton"
+                          Grid.Row="0"
+                          Command="ScrollBar.LineUpCommand"
+                          Content="M 0 4 L 4 0 L 8 4"
+                          Opacity="0"
+                          Style="{StaticResource LineRepeatButtonStyle}" />
+            <Track x:Name="PART_Track"
+                   Grid.Row="1"
+                   IsDirectionReversed="true"
+                   RenderTransformOrigin="0.7, 0">
                 <Track.RenderTransform>
-                    <ScaleTransform x:Name="TrackTransform" ScaleX="0.2"/>
+                    <ScaleTransform x:Name="TrackTransform" ScaleX="0.2" />
                 </Track.RenderTransform>
                 <Track.DecreaseRepeatButton>
-                    <RepeatButton Style="{StaticResource TrackRepeatButtonStyle}" Command="ScrollBar.PageUpCommand"/>
+                    <RepeatButton Command="ScrollBar.PageUpCommand" Style="{StaticResource TrackRepeatButtonStyle}" />
                 </Track.DecreaseRepeatButton>
                 <Track.Thumb>
-                    <Thumb x:Name="Thumb" Style="{StaticResource ScrollBarThumb}"/>
+                    <Thumb x:Name="Thumb" Style="{StaticResource ScrollBarThumb}" />
                 </Track.Thumb>
                 <Track.IncreaseRepeatButton>
-                    <RepeatButton Style="{StaticResource TrackRepeatButtonStyle}" Command="ScrollBar.PageDownCommand" />
+                    <RepeatButton Command="ScrollBar.PageDownCommand" Style="{StaticResource TrackRepeatButtonStyle}" />
                 </Track.IncreaseRepeatButton>
             </Track>
-            <RepeatButton Grid.Row="2" Style="{StaticResource LineRepeatButtonStyle}" Command="ScrollBar.LineDownCommand" Content="M 0 0 L 4 4 L 8 0"
-                          x:Name="LineDownButton" Opacity="0"/>
+            <RepeatButton x:Name="LineDownButton"
+                          Grid.Row="2"
+                          Command="ScrollBar.LineDownCommand"
+                          Content="M 0 0 L 4 4 L 8 0"
+                          Opacity="0"
+                          Style="{StaticResource LineRepeatButtonStyle}" />
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
                 <Trigger.EnterActions>
                     <BeginStoryboard>
                         <Storyboard BeginTime="{StaticResource ScrollbarAnimationBeginTime}">
-                            <DoubleAnimation Storyboard.TargetName="TrackTransform" Storyboard.TargetProperty="ScaleX"
-                                             To="1" Duration="{StaticResource ScrollbarAnimationDuration}"/>
-                            <DoubleAnimation Storyboard.TargetName="Border" Storyboard.TargetProperty="Opacity"
-                                             To="1" Duration="{StaticResource ScrollbarAnimationDuration}"/>
-                            <DoubleAnimation Storyboard.TargetName="LineUpButton" Storyboard.TargetProperty="Opacity"
-                                             To="1" Duration="{StaticResource ScrollbarAnimationDuration}"/>
-                            <DoubleAnimation Storyboard.TargetName="LineDownButton" Storyboard.TargetProperty="Opacity"
-                                             To="1" Duration="{StaticResource ScrollbarAnimationDuration}"/>
+                            <DoubleAnimation Storyboard.TargetName="TrackTransform"
+                                             Storyboard.TargetProperty="ScaleX"
+                                             To="1"
+                                             Duration="{StaticResource ScrollbarAnimationDuration}" />
+                            <DoubleAnimation Storyboard.TargetName="Border"
+                                             Storyboard.TargetProperty="Opacity"
+                                             To="1"
+                                             Duration="{StaticResource ScrollbarAnimationDuration}" />
+                            <DoubleAnimation Storyboard.TargetName="LineUpButton"
+                                             Storyboard.TargetProperty="Opacity"
+                                             To="1"
+                                             Duration="{StaticResource ScrollbarAnimationDuration}" />
+                            <DoubleAnimation Storyboard.TargetName="LineDownButton"
+                                             Storyboard.TargetProperty="Opacity"
+                                             To="1"
+                                             Duration="{StaticResource ScrollbarAnimationDuration}" />
                         </Storyboard>
                     </BeginStoryboard>
                 </Trigger.EnterActions>
                 <Trigger.ExitActions>
                     <BeginStoryboard>
                         <Storyboard BeginTime="{StaticResource ScrollbarAnimationExitTime}">
-                            <DoubleAnimation Storyboard.TargetName="TrackTransform" Storyboard.TargetProperty="ScaleX"
-                                             To="0.2" Duration="{StaticResource ScrollbarAnimationDuration}"/>
-                            <DoubleAnimation Storyboard.TargetName="Border" Storyboard.TargetProperty="Opacity"
-                                             To="0" Duration="{StaticResource ScrollbarAnimationDuration}"/>
-                            <DoubleAnimation Storyboard.TargetName="LineUpButton" Storyboard.TargetProperty="Opacity"
-                                             To="0" Duration="{StaticResource ScrollbarAnimationDuration}"/>
-                            <DoubleAnimation Storyboard.TargetName="LineDownButton" Storyboard.TargetProperty="Opacity"
-                                             To="0" Duration="{StaticResource ScrollbarAnimationDuration}"/>
+                            <DoubleAnimation Storyboard.TargetName="TrackTransform"
+                                             Storyboard.TargetProperty="ScaleX"
+                                             To="0.2"
+                                             Duration="{StaticResource ScrollbarAnimationDuration}" />
+                            <DoubleAnimation Storyboard.TargetName="Border"
+                                             Storyboard.TargetProperty="Opacity"
+                                             To="0"
+                                             Duration="{StaticResource ScrollbarAnimationDuration}" />
+                            <DoubleAnimation Storyboard.TargetName="LineUpButton"
+                                             Storyboard.TargetProperty="Opacity"
+                                             To="0"
+                                             Duration="{StaticResource ScrollbarAnimationDuration}" />
+                            <DoubleAnimation Storyboard.TargetName="LineDownButton"
+                                             Storyboard.TargetProperty="Opacity"
+                                             To="0"
+                                             Duration="{StaticResource ScrollbarAnimationDuration}" />
                         </Storyboard>
                     </BeginStoryboard>
                 </Trigger.ExitActions>
@@ -160,19 +193,27 @@
                 <ColumnDefinition MaxWidth="{StaticResource ScrollbarWidth}" />
             </Grid.ColumnDefinitions>
             <Border Grid.ColumnSpan="3" Background="{theme:ThemeResource SystemListLowColor}" />
-            <RepeatButton Grid.Column="0" Style="{StaticResource LineRepeatButtonStyle}" Command="ScrollBar.LineLeftCommand" Content="M 4 0 L 0 4 L 4 8" />
-            <Track x:Name="PART_Track" Grid.Column="1" IsDirectionReversed="False">
+            <RepeatButton Grid.Column="0"
+                          Command="ScrollBar.LineLeftCommand"
+                          Content="M 4 0 L 0 4 L 4 8"
+                          Style="{StaticResource LineRepeatButtonStyle}" />
+            <Track x:Name="PART_Track"
+                   Grid.Column="1"
+                   IsDirectionReversed="False">
                 <Track.DecreaseRepeatButton>
-                    <RepeatButton Style="{StaticResource TrackRepeatButtonStyle}" Command="ScrollBar.PageLeftCommand" />
+                    <RepeatButton Command="ScrollBar.PageLeftCommand" Style="{StaticResource TrackRepeatButtonStyle}" />
                 </Track.DecreaseRepeatButton>
                 <Track.Thumb>
-                    <Thumb Style="{StaticResource ScrollBarThumb}"/>
+                    <Thumb Style="{StaticResource ScrollBarThumb}" />
                 </Track.Thumb>
                 <Track.IncreaseRepeatButton>
-                    <RepeatButton Style="{StaticResource TrackRepeatButtonStyle}" Command="ScrollBar.PageRightCommand" />
+                    <RepeatButton Command="ScrollBar.PageRightCommand" Style="{StaticResource TrackRepeatButtonStyle}" />
                 </Track.IncreaseRepeatButton>
             </Track>
-            <RepeatButton Grid.Column="2" Style="{StaticResource LineRepeatButtonStyle}" Command="ScrollBar.LineRightCommand" Content="M 0 0 L 4 4 L 0 8" />
+            <RepeatButton Grid.Column="2"
+                          Command="ScrollBar.LineRightCommand"
+                          Content="M 0 0 L 4 4 L 0 8"
+                          Style="{StaticResource LineRepeatButtonStyle}" />
         </Grid>
     </ControlTemplate>
 
diff --git a/src/AudioBand/Resources/SettingsWindowStyle.xaml b/src/AudioBand/Resources/SettingsWindowStyle.xaml
index 40b30c29..24a6cf30 100644
--- a/src/AudioBand/Resources/SettingsWindowStyle.xaml
+++ b/src/AudioBand/Resources/SettingsWindowStyle.xaml
@@ -1,35 +1,35 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:metro="http://metro.mahapps.com/winfx/xaml/controls"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                    xmlns:resources="clr-namespace:AudioBand.Resources"
                     xmlns:settings="clr-namespace:AudioBand.Views.Settings"
-                    xmlns:resources="clr-namespace:AudioBand.Resources">
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
     <ResourceDictionary.MergedDictionaries>
-        <resources:SharedDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/controls.xaml"/>
+        <resources:SharedDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/controls.xaml" />
         <resources:SharedDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
         <resources:SharedDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Colors.xaml" />
         <resources:SharedDictionary Source="pack://application:,,,/FluentWPF;component/Styles/Controls.xaml" />
-        <resources:SharedDictionary Source="Shared.xaml"/>
-        <resources:SharedDictionary Source="Tooltips.xaml"/>
-        <resources:SharedDictionary Source="ContextMenuStyles.xaml"/>
-        <resources:SharedDictionary Source="ButtonStyles.xaml"/>
-        <resources:SharedDictionary Source="NavigationPaneStyles.xaml"/>
-        <resources:SharedDictionary Source="TextStyles.xaml"/>
-        <resources:SharedDictionary Source="TextBoxStyles.xaml"/>
-        <resources:SharedDictionary Source="PasswordBoxStyles.xaml"/>
-        <resources:SharedDictionary Source="NumericInputStyles.xaml"/>
-        <resources:SharedDictionary Source="ComboBoxStyles.xaml"/>
-        <resources:SharedDictionary Source="ScrollbarStyle.xaml"/>
+        <resources:SharedDictionary Source="Shared.xaml" />
+        <resources:SharedDictionary Source="Tooltips.xaml" />
+        <resources:SharedDictionary Source="ContextMenuStyles.xaml" />
+        <resources:SharedDictionary Source="ButtonStyles.xaml" />
+        <resources:SharedDictionary Source="NavigationPaneStyles.xaml" />
+        <resources:SharedDictionary Source="TextStyles.xaml" />
+        <resources:SharedDictionary Source="TextBoxStyles.xaml" />
+        <resources:SharedDictionary Source="PasswordBoxStyles.xaml" />
+        <resources:SharedDictionary Source="NumericInputStyles.xaml" />
+        <resources:SharedDictionary Source="ComboBoxStyles.xaml" />
+        <resources:SharedDictionary Source="ScrollbarStyle.xaml" />
     </ResourceDictionary.MergedDictionaries>
-    <Style TargetType="{x:Type Slider}" BasedOn="{StaticResource {x:Type Slider}}">
-        <Setter Property="IsMoveToPointEnabled" Value="True"/>
+    <Style BasedOn="{StaticResource {x:Type Slider}}" TargetType="{x:Type Slider}">
+        <Setter Property="IsMoveToPointEnabled" Value="True" />
     </Style>
     <Style TargetType="{x:Type ListBox}">
-        <Setter Property="OverridesDefaultStyle" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ListBox}">
-                    <ItemsPresenter/>
+                    <ItemsPresenter />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -38,52 +38,56 @@
     <Style x:Key="SettingsStackPanel" TargetType="{x:Type StackPanel}">
         <Style.Resources>
             <sys:Double x:Key="InputHeight">32</sys:Double>
-            <Thickness x:Key="DefaultControlMargin" Left="0" Top="4" Right="0" Bottom="0"/>
-            <Style TargetType="{x:Type metro:ToggleSwitch}" BasedOn="{StaticResource {x:Type metro:ToggleSwitch}}">
-                <Setter Property="Margin" Value="{StaticResource DefaultControlMargin}"/>
+            <Thickness x:Key="DefaultControlMargin"
+                       Bottom="0"
+                       Left="0"
+                       Right="0"
+                       Top="4" />
+            <Style BasedOn="{StaticResource {x:Type metro:ToggleSwitch}}" TargetType="{x:Type metro:ToggleSwitch}">
+                <Setter Property="Margin" Value="{StaticResource DefaultControlMargin}" />
             </Style>
-            <Style TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
-                <Setter Property="Margin" Value="{StaticResource DefaultControlMargin}"/>
-                <Setter Property="Height" Value="{StaticResource InputHeight}"/>
-                <Setter Property="Width" Value="200"/>
-                <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Style BasedOn="{StaticResource {x:Type ComboBox}}" TargetType="{x:Type ComboBox}">
+                <Setter Property="Margin" Value="{StaticResource DefaultControlMargin}" />
+                <Setter Property="Height" Value="{StaticResource InputHeight}" />
+                <Setter Property="Width" Value="200" />
+                <Setter Property="HorizontalAlignment" Value="Left" />
             </Style>
-            <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource {x:Type TextBox}}">
-                <Setter Property="Margin" Value="{StaticResource DefaultControlMargin}"/>
-                <Setter Property="FontSize" Value="{StaticResource BodyFontSize}"/>
-                <Setter Property="Padding" Value="2"/>
-                <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Style BasedOn="{StaticResource {x:Type TextBox}}" TargetType="{x:Type TextBox}">
+                <Setter Property="Margin" Value="{StaticResource DefaultControlMargin}" />
+                <Setter Property="FontSize" Value="{StaticResource BodyFontSize}" />
+                <Setter Property="Padding" Value="2" />
+                <Setter Property="HorizontalAlignment" Value="Left" />
             </Style>
-            <Style TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-                <Setter Property="Margin" Value="{StaticResource DefaultControlMargin}"/>
+            <Style BasedOn="{StaticResource {x:Type Button}}" TargetType="{x:Type Button}">
+                <Setter Property="Margin" Value="{StaticResource DefaultControlMargin}" />
             </Style>
             <Style TargetType="{x:Type DockPanel}">
-                <Setter Property="Margin" Value="{StaticResource DefaultControlMargin}"/>
+                <Setter Property="Margin" Value="{StaticResource DefaultControlMargin}" />
             </Style>
             <Style TargetType="{x:Type Rectangle}">
-                <Setter Property="Margin" Value="{StaticResource DefaultControlMargin}"/>
+                <Setter Property="Margin" Value="{StaticResource DefaultControlMargin}" />
             </Style>
-            <Style TargetType="{x:Type PasswordBox}" BasedOn="{StaticResource {x:Type PasswordBox}}">
-                <Setter Property="Margin" Value="{StaticResource DefaultControlMargin}"/>
+            <Style BasedOn="{StaticResource {x:Type PasswordBox}}" TargetType="{x:Type PasswordBox}">
+                <Setter Property="Margin" Value="{StaticResource DefaultControlMargin}" />
             </Style>
-            <Style TargetType="{x:Type metro:NumericUpDown}" BasedOn="{StaticResource {x:Type metro:NumericUpDown}}">
-                <Setter Property="Margin" Value="{StaticResource DefaultControlMargin}"/>
-                <Setter Property="HorizontalAlignment" Value="Left"/>
-                <Setter Property="Width" Value="120"/>
+            <Style BasedOn="{StaticResource {x:Type metro:NumericUpDown}}" TargetType="{x:Type metro:NumericUpDown}">
+                <Setter Property="Margin" Value="{StaticResource DefaultControlMargin}" />
+                <Setter Property="HorizontalAlignment" Value="Left" />
+                <Setter Property="Width" Value="120" />
             </Style>
             <Style TargetType="{x:Type settings:ColorPicker}">
-                <Setter Property="Margin" Value="{StaticResource DefaultControlMargin}"/>
+                <Setter Property="Margin" Value="{StaticResource DefaultControlMargin}" />
             </Style>
             <Style TargetType="{x:Type settings:ImagePicker}">
-                <Setter Property="Margin" Value="{StaticResource DefaultControlMargin}"/>
+                <Setter Property="Margin" Value="{StaticResource DefaultControlMargin}" />
             </Style>
             <Style TargetType="{x:Type metro:RangeSlider}">
-                <Setter Property="Margin" Value="{StaticResource DefaultControlMargin}"/>
+                <Setter Property="Margin" Value="{StaticResource DefaultControlMargin}" />
             </Style>
         </Style.Resources>
     </Style>
     <Style x:Key="ArrangementGridStyle" TargetType="{x:Type UniformGrid}">
-        <Setter Property="Width" Value="300"/>
-        <Setter Property="HorizontalAlignment" Value="Left"/>
+        <Setter Property="Width" Value="300" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
     </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/AudioBand/Resources/Shared.xaml b/src/AudioBand/Resources/Shared.xaml
index 81972fe7..3623125d 100644
--- a/src/AudioBand/Resources/Shared.xaml
+++ b/src/AudioBand/Resources/Shared.xaml
@@ -1,16 +1,20 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:fw="clr-namespace:SourceChord.FluentWPF;assembly=FluentWPF"
                     xmlns:o="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
+                    xmlns:resources="clr-namespace:AudioBand.Resources"
                     xmlns:system="clr-namespace:System;assembly=mscorlib"
-                    xmlns:fw="clr-namespace:SourceChord.FluentWPF;assembly=FluentWPF"
-                    xmlns:theme="clr-namespace:AudioBand.Resources.Theming"
-                    xmlns:resources="clr-namespace:AudioBand.Resources">
+                    xmlns:theme="clr-namespace:AudioBand.Resources.Theming">
     <ResourceDictionary.MergedDictionaries>
         <resources:SharedDictionary Source="pack://application:,,,/FluentWPF;component/Styles/Controls.xaml" />
     </ResourceDictionary.MergedDictionaries>
-    <Thickness x:Key="InputSpacing" Left="4" Top="0" Right="4" Bottom="0"/>
+    <Thickness x:Key="InputSpacing"
+               Bottom="0"
+               Left="4"
+               Right="4"
+               Top="0" />
     <Thickness x:Key="BorderThickness">2</Thickness>
-    <Thickness x:Key="SectionMargin" Top="16"/>
+    <Thickness x:Key="SectionMargin" Top="16" />
     <Color x:Key="ButtonRevealColor">#88FFFFFF</Color>
     <GridLength x:Key="DefaultControlHeightLength">32</GridLength>
     <system:Double x:Key="DefaultControlHeight">32</system:Double>
@@ -21,61 +25,60 @@
     <system:Double x:Key="HeaderFontSize">34</system:Double>
     <system:Double x:Key="DefaultButtonHeight">30</system:Double>
     <system:Double x:Key="NavigationPaneIconLength">18</system:Double>
-    <RadialGradientBrush x:Shared="False" x:Key="RevealHoverLightBrush" MappingMode="Absolute" RadiusX="200" RadiusY="200">
+    <RadialGradientBrush x:Key="RevealHoverLightBrush" x:Shared="False" MappingMode="Absolute" RadiusX="200" RadiusY="200">
         <RadialGradientBrush.Center>
             <MultiBinding Converter="{StaticResource relativePositionConverter}">
-                <Binding RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Rectangle}}" Path="(fw:PointerTracker.RootObject)"/>
-                <Binding RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Rectangle}}"/>
-                <Binding RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Rectangle}}" Path="(fw:PointerTracker.Position)" />
+                <Binding Path="(fw:PointerTracker.RootObject)" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Rectangle}}" />
+                <Binding RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Rectangle}}" />
+                <Binding Path="(fw:PointerTracker.Position)" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Rectangle}}" />
             </MultiBinding>
         </RadialGradientBrush.Center>
         <RadialGradientBrush.GradientOrigin>
             <MultiBinding Converter="{StaticResource relativePositionConverter}">
-                <Binding RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Rectangle}}" Path="(fw:PointerTracker.RootObject)"/>
-                <Binding RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Rectangle}}"/>
-                <Binding RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Rectangle}}" Path="(fw:PointerTracker.Position)" />
+                <Binding Path="(fw:PointerTracker.RootObject)" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Rectangle}}" />
+                <Binding RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Rectangle}}" />
+                <Binding Path="(fw:PointerTracker.Position)" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Rectangle}}" />
             </MultiBinding>
         </RadialGradientBrush.GradientOrigin>
-        <GradientStop Color="#44FFFFFF" Offset="0"/>
-        <GradientStop Color="Transparent" Offset="0.8"/>
+        <GradientStop Offset="0" Color="#44FFFFFF" />
+        <GradientStop Offset="0.8" Color="Transparent" />
     </RadialGradientBrush>
     <ContextMenu x:Key="StandardInputContextMenu">
         <MenuItem Command="ApplicationCommands.Cut">
             <MenuItem.Icon>
-                <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE8C6;"/>
+                <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE8C6;" />
             </MenuItem.Icon>
         </MenuItem>
         <MenuItem Command="ApplicationCommands.Copy">
             <MenuItem.Icon>
-                <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE8C8;"/>
+                <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE8C8;" />
             </MenuItem.Icon>
         </MenuItem>
         <MenuItem Command="ApplicationCommands.Paste">
             <MenuItem.Icon>
-                <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE77F;"/>
+                <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE77F;" />
             </MenuItem.Icon>
         </MenuItem>
     </ContextMenu>
-    <fw:OpacityConverter x:Key="RevealOpacityConverter"/>
+    <fw:OpacityConverter x:Key="RevealOpacityConverter" />
     <system:Double x:Key="RevealOpacity">0.6</system:Double>
-    <RadialGradientBrush x:Key="RevealBorderBrush" MappingMode="Absolute" RadiusX="70" RadiusY="70" x:Shared="False"
-                         Opacity="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(fw:PointerTracker.IsEnter), Converter={StaticResource RevealOpacityConverter}, ConverterParameter={StaticResource RevealOpacity}}">
+    <RadialGradientBrush x:Key="RevealBorderBrush" x:Shared="False" MappingMode="Absolute" Opacity="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(fw:PointerTracker.IsEnter), Converter={StaticResource RevealOpacityConverter}, ConverterParameter={StaticResource RevealOpacity}}" RadiusX="70" RadiusY="70">
         <RadialGradientBrush.GradientStops>
-            <GradientStop Color="{theme:ThemeResource SystemBaseMediumColor}"/>
-            <GradientStop Color="Transparent" Offset="1"/>
+            <GradientStop Color="{theme:ThemeResource SystemBaseMediumColor}" />
+            <GradientStop Offset="1" Color="Transparent" />
         </RadialGradientBrush.GradientStops>
         <RadialGradientBrush.Center>
             <MultiBinding Converter="{StaticResource relativePositionConverter}">
-                <Binding RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type FrameworkElement}}" Path="(fw:PointerTracker.RootObject)"/>
-                <Binding RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type FrameworkElement}}"/>
-                <Binding RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type FrameworkElement}}" Path="(fw:PointerTracker.Position)" />
+                <Binding Path="(fw:PointerTracker.RootObject)" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type FrameworkElement}}" />
+                <Binding RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type FrameworkElement}}" />
+                <Binding Path="(fw:PointerTracker.Position)" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type FrameworkElement}}" />
             </MultiBinding>
         </RadialGradientBrush.Center>
         <RadialGradientBrush.GradientOrigin>
             <MultiBinding Converter="{StaticResource relativePositionConverter}">
-                <Binding RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type FrameworkElement}}" Path="(fw:PointerTracker.RootObject)"/>
-                <Binding RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type FrameworkElement}}"/>
-                <Binding RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type FrameworkElement}}" Path="(fw:PointerTracker.Position)" />
+                <Binding Path="(fw:PointerTracker.RootObject)" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type FrameworkElement}}" />
+                <Binding RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type FrameworkElement}}" />
+                <Binding Path="(fw:PointerTracker.Position)" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type FrameworkElement}}" />
             </MultiBinding>
         </RadialGradientBrush.GradientOrigin>
     </RadialGradientBrush>
diff --git a/src/AudioBand/Resources/Strings.xaml b/src/AudioBand/Resources/Strings.xaml
index 2f8d549c..e6a9b5e5 100644
--- a/src/AudioBand/Resources/Strings.xaml
+++ b/src/AudioBand/Resources/Strings.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:sys="clr-namespace:System;assembly=mscorlib">
-    <!-- Common settings -->
+    <!--  Common settings  -->
     <sys:String x:Key="WidthLabelText">Width</sys:String>
     <sys:String x:Key="HeightLabelText">Height</sys:String>
     <sys:String x:Key="VisibilityLabelText">Visibility</sys:String>
@@ -21,14 +21,14 @@
     <sys:String x:Key="BackgroundColorDescription">Background color</sys:String>
     <sys:String x:Key="PositionAnchorDescription">Change the relative positioning of the control</sys:String>
 
-    <!-- Play/pause button settings -->
+    <!--  Play/pause button settings  -->
     <sys:String x:Key="PlayButtonContentSectionText">Play button content</sys:String>
     <sys:String x:Key="PauseButtonContentSectionText">Pause button content</sys:String>
 
-    <!-- Playback button settings -->
+    <!--  Playback button settings  -->
     <sys:String x:Key="PlaybackButtonContentSectionText">Button content</sys:String>
 
-    <!-- Button content settings -->
+    <!--  Button content settings  -->
     <sys:String x:Key="ButtonImageLabelText">Button Image</sys:String>
     <sys:String x:Key="ButtonHoveredImageLabelText">Button image when hovered</sys:String>
     <sys:String x:Key="ButtonClickedImageLabelText">Button image when clicked</sys:String>
@@ -37,16 +37,16 @@
     <sys:String x:Key="ButtonFontFamilyDescription">Select the font family for the text</sys:String>
     <sys:String x:Key="ButtonTextDescription">Button text</sys:String>
 
-    <!-- Repeat mode button settings -->
+    <!--  Repeat mode button settings  -->
     <sys:String x:Key="RepeatModeButtonOffContentSectionText">Repeat off button content</sys:String>
     <sys:String x:Key="RepeatModeButtonContextContentSectionText">Repeat on button content</sys:String>
     <sys:String x:Key="RepeatModeButtonTrackContentSectionText">Repeat track button content</sys:String>
 
-    <!-- Shuffle mode button settings -->
+    <!--  Shuffle mode button settings  -->
     <sys:String x:Key="ShuffleModeButtonOffContentSectionText">Shuffle off button content</sys:String>
     <sys:String x:Key="ShuffleModeButtonOnContentSectionText">Shuffle on button content</sys:String>
 
-    <!-- Custom text label settings -->
+    <!--  Custom text label settings  -->
     <sys:String x:Key="CustomLabelNameSectionText">Label name</sys:String>
     <sys:String x:Key="CustomLabelNameDescription">Choose a name for the label</sys:String>
     <sys:String x:Key="CustomLabelFontFamilyDescription">Font Family</sys:String>
@@ -81,7 +81,7 @@ Showing the album name in bold : {*album}
 Showing the song progress in gray : {time:#A9A9A9} : {length:#A9A9A9}
 Using style and color : {*artist:#a9a9a9}</sys:String>
 
-    <!-- Navigation pane -->
+    <!--  Navigation pane  -->
     <sys:String x:Key="GeneralSettingsTab">General</sys:String>
     <sys:String x:Key="PlaybackControlsTab">Playback Controls</sys:String>
     <sys:String x:Key="PlayPauseButtonTab">Play/Pause Button</sys:String>
@@ -99,7 +99,7 @@ Using style and color : {*artist:#a9a9a9}</sys:String>
     <sys:String x:Key="AddNewLabelHelpText">Add a new label</sys:String>
     <sys:String x:Key="DeleteLabelHelpText">Delete this label</sys:String>
 
-    <!-- Common button text -->
+    <!--  Common button text  -->
     <sys:String x:Key="ResetButtonText">Reset Settings</sys:String>
     <sys:String x:Key="BrowseButtonText">Browse</sys:String>
     <sys:String x:Key="DefaultButtonText">Default</sys:String>
@@ -119,17 +119,17 @@ Using style and color : {*artist:#a9a9a9}</sys:String>
     <sys:String x:Key="RememberHelpText">This setting will be saved. Are you sure?</sys:String>
     <sys:String x:Key="RememberSettingLabelText">Remember</sys:String>
 
-    <!-- Progress bar settings text -->
+    <!--  Progress bar settings text  -->
     <sys:String x:Key="ProgressBarColorsSectionText">Colors</sys:String>
     <sys:String x:Key="ProgressBarForegroundColorDescription">Foreground color</sys:String>
     <sys:String x:Key="ProgressBarBackgroundColorDescription">Background color</sys:String>
     <sys:String x:Key="ProgressBarHoverColorDescription">Background color when hovered</sys:String>
 
-    <!-- Album art settings text -->
+    <!--  Album art settings text  -->
     <sys:String x:Key="AlbumArtPlaceholderSectionText">Image</sys:String>
     <sys:String x:Key="AlbumArtPlaceholderDescription">Placeholder image</sys:String>
 
-    <!-- Dialogs -->
+    <!--  Dialogs  -->
     <sys:String x:Key="AboutTitle">About AudioBand</sys:String>
     <sys:String x:Key="DeleteLabelDialogTitle">Delete label</sys:String>
     <sys:String x:Key="DeleteLabelDialogBody">Are you sure you want to delete the label '{0}'?</sys:String>
@@ -145,7 +145,7 @@ Using style and color : {*artist:#a9a9a9}</sys:String>
     <sys:String x:Key="DeleteProfileDialogTitle">Delete profile</sys:String>
     <sys:String x:Key="DeleteProfileDialogBody">Are you sure you want to delete the profile '{0}'</sys:String>
 
-    <!-- Profiles -->
+    <!--  Profiles  -->
     <sys:String x:Key="NewProfileHelpText">New profile</sys:String>
     <sys:String x:Key="DeleteProfileHelpText">Delete the current profile</sys:String>
     <sys:String x:Key="RenameProfileHelpText">Rename the current profile</sys:String>
@@ -153,7 +153,7 @@ Using style and color : {*artist:#a9a9a9}</sys:String>
     <sys:String x:Key="ExportProfilesHelpText">Export profiles</sys:String>
     <sys:String x:Key="DefaultProfileItemText">Default Profile</sys:String>
 
-    <!-- Image picker -->
+    <!--  Image picker  -->
     <sys:String x:Key="ImagePickerResetText">Click here to reset</sys:String>
     <sys:String x:Key="ImagePickerNoImageText">No image selected</sys:String>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/AudioBand/Resources/TextBoxStyles.xaml b/src/AudioBand/Resources/TextBoxStyles.xaml
index 50dedff0..3cc1caff 100644
--- a/src/AudioBand/Resources/TextBoxStyles.xaml
+++ b/src/AudioBand/Resources/TextBoxStyles.xaml
@@ -5,41 +5,46 @@
                     xmlns:theme="clr-namespace:AudioBand.Resources.Theming">
     <ResourceDictionary.MergedDictionaries>
         <local:SharedDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/controls.textbox.xaml" />
-        <local:SharedDictionary Source="Shared.xaml"/>
-        <local:SharedDictionary Source="ContextMenuStyles.xaml"/>
+        <local:SharedDictionary Source="Shared.xaml" />
+        <local:SharedDictionary Source="ContextMenuStyles.xaml" />
     </ResourceDictionary.MergedDictionaries>
-    <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource MetroTextBox}">
-        <Setter Property="TextAlignment" Value="Left"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="Padding" Value="{StaticResource InputSpacing}"/>
-        <Setter Property="FontSize" Value="{StaticResource BodyFontSize}"/>
-        <Setter Property="BorderThickness" Value="{StaticResource BorderThickness}"/>
-        <Setter Property="BorderBrush" Value="{theme:ThemeResource SystemBaseLowColor}"/>
-        <Setter Property="Background" Value="{theme:ThemeResource SystemAltHighColor}"/>
-        <Setter Property="Foreground" Value="{theme:ThemeResource SystemBaseHighColor}"/>
-        <Setter Property="mah:ControlsHelper.MouseOverBorderBrush" Value="{theme:ThemeResource SystemBaseMediumColor}"/>
-        <Setter Property="mah:ControlsHelper.FocusBorderBrush" Value="{theme:ThemeResource SystemAccentColor}"/>
-        <Setter Property="SelectionBrush" Value="{theme:ThemeResource SystemAccentColorMedium}"/>
-        <Setter Property="CaretBrush" Value="{theme:ThemeResource SystemBaseHighColor}"/>
-        <Setter Property="ContextMenu" Value="{StaticResource StandardInputContextMenu}"/>
+    <Style BasedOn="{StaticResource MetroTextBox}" TargetType="{x:Type TextBox}">
+        <Setter Property="TextAlignment" Value="Left" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Padding" Value="{StaticResource InputSpacing}" />
+        <Setter Property="FontSize" Value="{StaticResource BodyFontSize}" />
+        <Setter Property="BorderThickness" Value="{StaticResource BorderThickness}" />
+        <Setter Property="BorderBrush" Value="{theme:ThemeResource SystemBaseLowColor}" />
+        <Setter Property="Background" Value="{theme:ThemeResource SystemAltHighColor}" />
+        <Setter Property="Foreground" Value="{theme:ThemeResource SystemBaseHighColor}" />
+        <Setter Property="mah:ControlsHelper.MouseOverBorderBrush" Value="{theme:ThemeResource SystemBaseMediumColor}" />
+        <Setter Property="mah:ControlsHelper.FocusBorderBrush" Value="{theme:ThemeResource SystemAccentColor}" />
+        <Setter Property="SelectionBrush" Value="{theme:ThemeResource SystemAccentColorMedium}" />
+        <Setter Property="CaretBrush" Value="{theme:ThemeResource SystemBaseHighColor}" />
+        <Setter Property="ContextMenu" Value="{StaticResource StandardInputContextMenu}" />
         <Style.Resources>
             <Style x:Key="ChromelessButtonStyle" TargetType="{x:Type Button}">
-                <Setter Property="OverridesDefaultStyle" Value="True"/>
+                <Setter Property="OverridesDefaultStyle" Value="True" />
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="{x:Type Button}">
                             <Border x:Name="Border" Background="Transparent">
-                                <TextBlock x:Name="ClearText" VerticalAlignment="Center" HorizontalAlignment="Center"
-                                           Foreground="{theme:ThemeResource SystemBaseMediumColor}" FontFamily="Segoe MDL2 Assets" Text="&#xE894;" FontSize="14"/>
+                                <TextBlock x:Name="ClearText"
+                                           HorizontalAlignment="Center"
+                                           VerticalAlignment="Center"
+                                           FontFamily="Segoe MDL2 Assets"
+                                           FontSize="14"
+                                           Foreground="{theme:ThemeResource SystemBaseMediumColor}"
+                                           Text="&#xE894;" />
                             </Border>
                             <ControlTemplate.Triggers>
                                 <Trigger Property="IsMouseOver" Value="True">
-                                    <Setter TargetName="Border" Property="Background" Value="{theme:ThemeResource SystemChromeMediumColor}"/>
-                                    <Setter TargetName="ClearText" Property="Foreground" Value="{theme:ThemeResource SystemAccentColor}"/>
+                                    <Setter TargetName="Border" Property="Background" Value="{theme:ThemeResource SystemChromeMediumColor}" />
+                                    <Setter TargetName="ClearText" Property="Foreground" Value="{theme:ThemeResource SystemAccentColor}" />
                                 </Trigger>
                                 <Trigger Property="IsPressed" Value="True">
-                                    <Setter TargetName="Border" Property="Background" Value="{theme:ThemeResource SystemChromeLowColor}"/>
-                                    <Setter TargetName="ClearText" Property="Foreground" Value="{theme:ThemeResource SystemAccentColorHigh}"/>
+                                    <Setter TargetName="Border" Property="Background" Value="{theme:ThemeResource SystemChromeLowColor}" />
+                                    <Setter TargetName="ClearText" Property="Foreground" Value="{theme:ThemeResource SystemAccentColorHigh}" />
                                 </Trigger>
                             </ControlTemplate.Triggers>
                         </ControlTemplate>
diff --git a/src/AudioBand/Resources/TextStyles.xaml b/src/AudioBand/Resources/TextStyles.xaml
index 2eaf58d3..b1d351c8 100644
--- a/src/AudioBand/Resources/TextStyles.xaml
+++ b/src/AudioBand/Resources/TextStyles.xaml
@@ -3,36 +3,40 @@
                     xmlns:local="clr-namespace:AudioBand.Resources"
                     xmlns:theme="clr-namespace:AudioBand.Resources.Theming">
     <ResourceDictionary.MergedDictionaries>
-        <local:SharedDictionary Source="Shared.xaml"/>
+        <local:SharedDictionary Source="Shared.xaml" />
     </ResourceDictionary.MergedDictionaries>
-    <Style TargetType="{x:Type Label}" BasedOn="{StaticResource {x:Type Label}}">
-        <Setter Property="VerticalAlignment" Value="Center"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="FontSize" Value="{StaticResource BodyFontSize}"/>
+    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="{x:Type Label}">
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="FontSize" Value="{StaticResource BodyFontSize}" />
     </Style>
-    <Style x:Key="DescriptionTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-        <Setter Property="Margin" Value="0, 8, 0, 0"/>
-        <Setter Property="FontSize" Value="{StaticResource BodyFontSize}"/>
-        <Setter Property="TextAlignment" Value="Left"/>
-        <Setter Property="VerticalAlignment" Value="Center"/>
+    <Style x:Key="DescriptionTextBlock"
+           BasedOn="{StaticResource {x:Type TextBlock}}"
+           TargetType="{x:Type TextBlock}">
+        <Setter Property="Margin" Value="0,8,0,0" />
+        <Setter Property="FontSize" Value="{StaticResource BodyFontSize}" />
+        <Setter Property="TextAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Center" />
     </Style>
-    <Style TargetType="{x:Type Hyperlink}" BasedOn="{StaticResource {x:Type Hyperlink}}">
-        <Setter Property="Foreground" Value="{theme:ThemeResource SystemAccentColor}"/>
-        <Setter Property="TextDecorations" Value="{x:Null}"/>
+    <Style BasedOn="{StaticResource {x:Type Hyperlink}}" TargetType="{x:Type Hyperlink}">
+        <Setter Property="Foreground" Value="{theme:ThemeResource SystemAccentColor}" />
+        <Setter Property="TextDecorations" Value="{x:Null}" />
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Foreground" Value="{theme:ThemeResource SystemBaseMediumHighColor}"/>
+                <Setter Property="Foreground" Value="{theme:ThemeResource SystemBaseMediumHighColor}" />
             </Trigger>
         </Style.Triggers>
     </Style>
-    <Style x:Key="TitleTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-        <Setter Property="FontSize" Value="{StaticResource TitleFontSize}"/>
-        <Setter Property="FontWeight" Value="Normal"/>
-        <Setter Property="LineHeight" Value="28"/>
+    <Style x:Key="TitleTextBlock"
+           BasedOn="{StaticResource {x:Type TextBlock}}"
+           TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="{StaticResource TitleFontSize}" />
+        <Setter Property="FontWeight" Value="Normal" />
+        <Setter Property="LineHeight" Value="28" />
     </Style>
     <Style x:Key="ProfileIconText" TargetType="{x:Type TextBlock}">
-        <Setter Property="UseLayoutRounding" Value="True"/>
-        <Setter Property="FontSize" Value="16"/>
-        <Setter Property="FontFamily" Value="Segoe MDL2 Assets"/>
+        <Setter Property="UseLayoutRounding" Value="True" />
+        <Setter Property="FontSize" Value="16" />
+        <Setter Property="FontFamily" Value="Segoe MDL2 Assets" />
     </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/AudioBand/Resources/ToolbarButtonStyles.xaml b/src/AudioBand/Resources/ToolbarButtonStyles.xaml
index a8d09a04..4d34c0fc 100644
--- a/src/AudioBand/Resources/ToolbarButtonStyles.xaml
+++ b/src/AudioBand/Resources/ToolbarButtonStyles.xaml
@@ -1,22 +1,32 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-                    xmlns:viewmodels="clr-namespace:AudioBand.ViewModels"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                    xmlns:audioSource="clr-namespace:AudioBand.AudioSource;assembly=AudioBand.AudioSource"
+                    xmlns:behaviors="clr-namespace:AudioBand.Behaviors"
                     xmlns:converters="clr-namespace:AudioBand.ValueConverters"
+                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                     xmlns:models="clr-namespace:AudioBand.Models"
-                    xmlns:behaviors="clr-namespace:AudioBand.Behaviors"
-                    xmlns:audioSource="clr-namespace:AudioBand.AudioSource;assembly=AudioBand.AudioSource"
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                    xmlns:viewmodels="clr-namespace:AudioBand.ViewModels"
                     mc:Ignorable="d">
-    <Pen x:Key="ButtonImagePen" Brush="#FFFFFF" Thickness="30" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
-    <Pen x:Key="ButtonImagePenDim" Brush="#888888" Thickness="30" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
+    <Pen x:Key="ButtonImagePen"
+         Brush="#FFFFFF"
+         EndLineCap="Flat"
+         LineJoin="Miter"
+         StartLineCap="Flat"
+         Thickness="30" />
+    <Pen x:Key="ButtonImagePenDim"
+         Brush="#888888"
+         EndLineCap="Flat"
+         LineJoin="Miter"
+         StartLineCap="Flat"
+         Thickness="30" />
     <DrawingImage x:Key="PauseButtonDefault">
         <DrawingImage.Drawing>
             <DrawingGroup ClipGeometry="M0,0 V256 H256 V0 H0 Z">
                 <DrawingGroup Opacity="1">
-                    <GeometryDrawing Geometry="F1 M256,256z M0,0z M88,0L88,256" Pen="{StaticResource ButtonImagePen}"/>
-                    <GeometryDrawing Geometry="F1 M256,256z M0,0z M184,0L184,256" Pen="{StaticResource ButtonImagePen}"/>
+                    <GeometryDrawing Geometry="F1 M256,256z M0,0z M88,0L88,256" Pen="{StaticResource ButtonImagePen}" />
+                    <GeometryDrawing Geometry="F1 M256,256z M0,0z M184,0L184,256" Pen="{StaticResource ButtonImagePen}" />
                 </DrawingGroup>
             </DrawingGroup>
         </DrawingImage.Drawing>
@@ -25,8 +35,7 @@
         <DrawingImage.Drawing>
             <DrawingGroup ClipGeometry="M0,0 V256 H256 V0 H0 Z">
                 <DrawingGroup Opacity="1" Transform="-0.85326308,0,0,-1.0497388,255.09891,262.36656">
-                    <GeometryDrawing Geometry="F1 M256,256z M0,0z M60.365532,128.00001L153.18276,74.411943 245.99999,20.823889 246,128 246,235.17611 153.18276,181.58806z"
-                                     Pen="{StaticResource ButtonImagePen}"/>
+                    <GeometryDrawing Geometry="F1 M256,256z M0,0z M60.365532,128.00001L153.18276,74.411943 245.99999,20.823889 246,128 246,235.17611 153.18276,181.58806z" Pen="{StaticResource ButtonImagePen}" />
                 </DrawingGroup>
             </DrawingGroup>
         </DrawingImage.Drawing>
@@ -35,10 +44,9 @@
         <DrawingImage.Drawing>
             <DrawingGroup ClipGeometry="M0,0 V256 H256 V0 H0 Z">
                 <DrawingGroup Opacity="1">
-                    <GeometryDrawing Geometry="F1 M256,256z M0,0z M248,6.8750015E-08L248,256" Pen="{StaticResource ButtonImagePen}"/>
+                    <GeometryDrawing Geometry="F1 M256,256z M0,0z M248,6.8750015E-08L248,256" Pen="{StaticResource ButtonImagePen}" />
                     <DrawingGroup Transform="-0.85326308,0,0,-1.0497388,217.1153,262.36656">
-                        <GeometryDrawing Geometry="F1 M256,256z M0,0z M60.365532,128.00001L153.18276,74.411943 245.99999,20.823889 246,128 246,235.17611 153.18276,181.58806z"
-                                         Pen="{StaticResource ButtonImagePen}"/>
+                        <GeometryDrawing Geometry="F1 M256,256z M0,0z M60.365532,128.00001L153.18276,74.411943 245.99999,20.823889 246,128 246,235.17611 153.18276,181.58806z" Pen="{StaticResource ButtonImagePen}" />
                     </DrawingGroup>
                 </DrawingGroup>
             </DrawingGroup>
@@ -48,10 +56,9 @@
         <DrawingImage.Drawing>
             <DrawingGroup ClipGeometry="M0,0 V256 H256 V0 H0 Z">
                 <DrawingGroup Opacity="1">
-                    <GeometryDrawing Geometry="F1 M256,256z M0,0z M8,1.65E-06L8,256" Pen="{StaticResource ButtonImagePen}"/>
+                    <GeometryDrawing Geometry="F1 M256,256z M0,0z M8,1.65E-06L8,256" Pen="{StaticResource ButtonImagePen}" />
                     <DrawingGroup Transform="0.85326308,0,0,-1.0497388,38.884699,262.36656">
-                        <GeometryDrawing Geometry="F1 M256,256z M0,0z M60.365532,128.00001L153.18276,74.411943 245.99999,20.823889 246,128 246,235.17611 153.18276,181.58806z"
-                                         Pen="{StaticResource ButtonImagePen}"/>
+                        <GeometryDrawing Geometry="F1 M256,256z M0,0z M60.365532,128.00001L153.18276,74.411943 245.99999,20.823889 246,128 246,235.17611 153.18276,181.58806z" Pen="{StaticResource ButtonImagePen}" />
                     </DrawingGroup>
                 </DrawingGroup>
             </DrawingGroup>
@@ -61,10 +68,8 @@
         <DrawingImage.Drawing>
             <DrawingGroup ClipGeometry="M0,0 V256 H256 V0 H0 Z">
                 <DrawingGroup Opacity="1">
-                    <GeometryDrawing Geometry="F1 M256,256z M0,0z M142.19071,79.195957L178.96026,42.426407 142.19071,5.656854 M98.960267,42.426407L178.96026,42.426407 M34.618799,188.81415A90.992584,85.751953,0,0,1,14.894088,95.362512A90.992584,85.751953,0,0,1,98.960277,42.426411"
-                                     Pen="{StaticResource ButtonImagePenDim}"/>
-                    <GeometryDrawing Geometry="F1 M256,256z M0,0z M113.80929,176.80405L77.03974,213.5736 113.80929,250.34315 M157.03974,213.5736L77.03974,213.5736 M221.3812,67.185856A90.992584,85.751953,0,0,1,241.10591,160.6375A90.992584,85.751953,0,0,1,157.03973,213.5736"
-                                     Pen="{StaticResource ButtonImagePenDim}"/>
+                    <GeometryDrawing Geometry="F1 M256,256z M0,0z M142.19071,79.195957L178.96026,42.426407 142.19071,5.656854 M98.960267,42.426407L178.96026,42.426407 M34.618799,188.81415A90.992584,85.751953,0,0,1,14.894088,95.362512A90.992584,85.751953,0,0,1,98.960277,42.426411" Pen="{StaticResource ButtonImagePenDim}" />
+                    <GeometryDrawing Geometry="F1 M256,256z M0,0z M113.80929,176.80405L77.03974,213.5736 113.80929,250.34315 M157.03974,213.5736L77.03974,213.5736 M221.3812,67.185856A90.992584,85.751953,0,0,1,241.10591,160.6375A90.992584,85.751953,0,0,1,157.03973,213.5736" Pen="{StaticResource ButtonImagePenDim}" />
                 </DrawingGroup>
             </DrawingGroup>
         </DrawingImage.Drawing>
@@ -73,11 +78,13 @@
         <DrawingImage.Drawing>
             <DrawingGroup ClipGeometry="M0,0 V256 H256 V0 H0 Z">
                 <DrawingGroup Opacity="1">
-                    <GeometryDrawing Pen="{StaticResource ButtonImagePen}" Geometry="F1 M256,256z M0,0z M142.19071,79.195957L178.96026,42.426407 142.19071,5.656854 M98.960267,42.426407L178.96026,42.426407 M34.618799,188.81415A90.992584,85.751953,0,0,1,14.894088,95.362512A90.992584,85.751953,0,0,1,98.960277,42.426411"/>
-                    <GeometryDrawing Pen="{StaticResource ButtonImagePen}" Geometry="F1 M256,256z M0,0z M113.80929,176.80405L77.03974,213.5736 113.80929,250.34315 M157.03974,213.5736L77.03974,213.5736 M221.3812,67.185856A90.992584,85.751953,0,0,1,241.10591,160.6375A90.992584,85.751953,0,0,1,157.03973,213.5736"/>
+                    <GeometryDrawing Geometry="F1 M256,256z M0,0z M142.19071,79.195957L178.96026,42.426407 142.19071,5.656854 M98.960267,42.426407L178.96026,42.426407 M34.618799,188.81415A90.992584,85.751953,0,0,1,14.894088,95.362512A90.992584,85.751953,0,0,1,98.960277,42.426411" Pen="{StaticResource ButtonImagePen}" />
+                    <GeometryDrawing Geometry="F1 M256,256z M0,0z M113.80929,176.80405L77.03974,213.5736 113.80929,250.34315 M157.03974,213.5736L77.03974,213.5736 M221.3812,67.185856A90.992584,85.751953,0,0,1,241.10591,160.6375A90.992584,85.751953,0,0,1,157.03973,213.5736" Pen="{StaticResource ButtonImagePen}" />
                     <GeometryDrawing Pen="{StaticResource ButtonImagePen}">
                         <GeometryDrawing.Geometry>
-                            <EllipseGeometry RadiusX="22" RadiusY="22" Center="128,128" />
+                            <EllipseGeometry Center="128,128"
+                                             RadiusX="22"
+                                             RadiusY="22" />
                         </GeometryDrawing.Geometry>
                     </GeometryDrawing>
                 </DrawingGroup>
@@ -88,12 +95,23 @@
         <DrawingImage.Drawing>
             <DrawingGroup ClipGeometry="M0,0 V256 H256 V0 H0 Z">
                 <DrawingGroup Opacity="1">
-                    <GeometryDrawing Pen="{StaticResource ButtonImagePen}" Geometry="F1 M256,256z M0,0z M142.19071,79.195957L178.96026,42.426407 142.19071,5.656854 M98.960267,42.426407L178.96026,42.426407 M34.618799,188.81415A90.992584,85.751953,0,0,1,14.894088,95.362512A90.992584,85.751953,0,0,1,98.960277,42.426411"/>
-                    <GeometryDrawing Pen="{StaticResource ButtonImagePen}" Geometry="F1 M256,256z M0,0z M113.80929,176.80405L77.03974,213.5736 113.80929,250.34315 M157.03974,213.5736L77.03974,213.5736 M221.3812,67.185856A90.992584,85.751953,0,0,1,241.10591,160.6375A90.992584,85.751953,0,0,1,157.03973,213.5736"/>
+                    <GeometryDrawing Geometry="F1 M256,256z M0,0z M142.19071,79.195957L178.96026,42.426407 142.19071,5.656854 M98.960267,42.426407L178.96026,42.426407 M34.618799,188.81415A90.992584,85.751953,0,0,1,14.894088,95.362512A90.992584,85.751953,0,0,1,98.960277,42.426411" Pen="{StaticResource ButtonImagePen}" />
+                    <GeometryDrawing Geometry="F1 M256,256z M0,0z M113.80929,176.80405L77.03974,213.5736 113.80929,250.34315 M157.03974,213.5736L77.03974,213.5736 M221.3812,67.185856A90.992584,85.751953,0,0,1,241.10591,160.6375A90.992584,85.751953,0,0,1,157.03973,213.5736" Pen="{StaticResource ButtonImagePen}" />
                     <DrawingGroup>
                         <GlyphRunDrawing ForegroundBrush="White">
                             <GlyphRunDrawing.GlyphRun>
-                                <GlyphRun PixelsPerDip="1" BaselineOrigin="94.079124,170.94922" FontRenderingEmSize="120" BidiLevel="0" IsSideways="False" CaretStops="1 1" ClusterMap="0" Characters="1" GlyphIndices="20" AdvanceWidths="64.6866666666667" GlyphOffsets="0,0" Language="en-us">
+                                <GlyphRun AdvanceWidths="64.6866666666667"
+                                          BaselineOrigin="94.079124,170.94922"
+                                          BidiLevel="0"
+                                          CaretStops="1 1"
+                                          Characters="1"
+                                          ClusterMap="0"
+                                          FontRenderingEmSize="120"
+                                          GlyphIndices="20"
+                                          GlyphOffsets="0,0"
+                                          IsSideways="False"
+                                          Language="en-us"
+                                          PixelsPerDip="1">
                                     <GlyphRun.GlyphTypeface>
                                         <GlyphTypeface FontUri="C:\WINDOWS\FONTS\SEGOEUI.TTF" StyleSimulations="None" />
                                     </GlyphRun.GlyphTypeface>
@@ -109,11 +127,11 @@
         <DrawingImage.Drawing>
             <DrawingGroup ClipGeometry="M0,0 V256 H256 V0 H0 Z">
                 <DrawingGroup Opacity="1">
-                    <GeometryDrawing Geometry="F1 M256,256z M0,0z M197.50773,230.15227L238.93436,191.00532 199.81815,149.54615" Pen="{StaticResource ButtonImagePenDim}"/>
-                    <GeometryDrawing Geometry="F1 M256,256z M0,0z M133.67526,152.01873C171.72829,193.16201,238.93436,191.00532,238.93436,191.00532" Pen="{StaticResource ButtonImagePenDim}"/>
-                    <GeometryDrawing Geometry="F1 M256,256z M0,0z M1.3320683,66.254193C1.3320683,66.254193,56.25668,65.309776,98.133769,105.46534" Pen="{StaticResource ButtonImagePenDim}"/>
-                    <GeometryDrawing Geometry="F1 M256,256z M0,0z M202.25421,25.672407L242.54219,65.992049 202.25421,106.3117" Pen="{StaticResource ButtonImagePenDim}"/>
-                    <GeometryDrawing Geometry="F1 M256,256z M0,0z M1.4633263,183.87359C1.4633263,183.87359 81.058783,187.52905 123.66156,118.0149 158.6725,60.888179 242.54219,65.992049 242.54219,65.992049" Pen="{StaticResource ButtonImagePenDim}"/>
+                    <GeometryDrawing Geometry="F1 M256,256z M0,0z M197.50773,230.15227L238.93436,191.00532 199.81815,149.54615" Pen="{StaticResource ButtonImagePenDim}" />
+                    <GeometryDrawing Geometry="F1 M256,256z M0,0z M133.67526,152.01873C171.72829,193.16201,238.93436,191.00532,238.93436,191.00532" Pen="{StaticResource ButtonImagePenDim}" />
+                    <GeometryDrawing Geometry="F1 M256,256z M0,0z M1.3320683,66.254193C1.3320683,66.254193,56.25668,65.309776,98.133769,105.46534" Pen="{StaticResource ButtonImagePenDim}" />
+                    <GeometryDrawing Geometry="F1 M256,256z M0,0z M202.25421,25.672407L242.54219,65.992049 202.25421,106.3117" Pen="{StaticResource ButtonImagePenDim}" />
+                    <GeometryDrawing Geometry="F1 M256,256z M0,0z M1.4633263,183.87359C1.4633263,183.87359 81.058783,187.52905 123.66156,118.0149 158.6725,60.888179 242.54219,65.992049 242.54219,65.992049" Pen="{StaticResource ButtonImagePenDim}" />
                 </DrawingGroup>
             </DrawingGroup>
         </DrawingImage.Drawing>
@@ -122,17 +140,19 @@
         <DrawingImage.Drawing>
             <DrawingGroup ClipGeometry="M0,0 V256 H256 V0 H0 Z">
                 <DrawingGroup Opacity="1">
-                    <GeometryDrawing Geometry="F1 M256,256z M0,0z M197.50773,230.15227L238.93436,191.00532 199.81815,149.54615" Pen="{StaticResource ButtonImagePen}"/>
-                    <GeometryDrawing Geometry="F1 M256,256z M0,0z M133.67526,152.01873C171.72829,193.16201,238.93436,191.00532,238.93436,191.00532" Pen="{StaticResource ButtonImagePen}"/>
-                    <GeometryDrawing Geometry="F1 M256,256z M0,0z M1.3320683,66.254193C1.3320683,66.254193,56.25668,65.309776,98.133769,105.46534" Pen="{StaticResource ButtonImagePen}"/>
-                    <GeometryDrawing Geometry="F1 M256,256z M0,0z M202.25421,25.672407L242.54219,65.992049 202.25421,106.3117" Pen="{StaticResource ButtonImagePen}"/>
-                    <GeometryDrawing Geometry="F1 M256,256z M0,0z M1.4633263,183.87359C1.4633263,183.87359 81.058783,187.52905 123.66156,118.0149 158.6725,60.888179 242.54219,65.992049 242.54219,65.992049" Pen="{StaticResource ButtonImagePen}"/>
+                    <GeometryDrawing Geometry="F1 M256,256z M0,0z M197.50773,230.15227L238.93436,191.00532 199.81815,149.54615" Pen="{StaticResource ButtonImagePen}" />
+                    <GeometryDrawing Geometry="F1 M256,256z M0,0z M133.67526,152.01873C171.72829,193.16201,238.93436,191.00532,238.93436,191.00532" Pen="{StaticResource ButtonImagePen}" />
+                    <GeometryDrawing Geometry="F1 M256,256z M0,0z M1.3320683,66.254193C1.3320683,66.254193,56.25668,65.309776,98.133769,105.46534" Pen="{StaticResource ButtonImagePen}" />
+                    <GeometryDrawing Geometry="F1 M256,256z M0,0z M202.25421,25.672407L242.54219,65.992049 202.25421,106.3117" Pen="{StaticResource ButtonImagePen}" />
+                    <GeometryDrawing Geometry="F1 M256,256z M0,0z M1.4633263,183.87359C1.4633263,183.87359 81.058783,187.52905 123.66156,118.0149 158.6725,60.888179 242.54219,65.992049 242.54219,65.992049" Pen="{StaticResource ButtonImagePen}" />
                     <GeometryDrawing>
                         <GeometryDrawing.Brush>
                             <SolidColorBrush Color="White" />
                         </GeometryDrawing.Brush>
                         <GeometryDrawing.Geometry>
-                            <EllipseGeometry RadiusX="20" RadiusY="20" Center="128,236" />
+                            <EllipseGeometry Center="128,236"
+                                             RadiusX="20"
+                                             RadiusY="20" />
                         </GeometryDrawing.Geometry>
                     </GeometryDrawing>
                 </DrawingGroup>
@@ -141,12 +161,12 @@
     </DrawingImage>
     <Duration x:Key="ButtonAnimationDuration">0:0:0.1</Duration>
     <DataTemplate x:Key="ToolbarButtonContentImageTemplate" DataType="viewmodels:ButtonContentViewModel">
-        <Viewbox RenderOptions.BitmapScalingMode="Fant" Margin="1">
+        <Viewbox Margin="1" RenderOptions.BitmapScalingMode="Fant">
             <Image x:Name="Image">
                 <Image.Source>
                     <MultiBinding Converter="{x:Static converters:MultiConverters.PathToImageSource}">
-                        <Binding Path="ImagePath"/>
-                        <Binding RelativeSource="{RelativeSource AncestorType={x:Type Button}}" Path="(behaviors:Fallback.FallbackImageSource)"/>
+                        <Binding Path="ImagePath" />
+                        <Binding Path="(behaviors:Fallback.FallbackImageSource)" RelativeSource="{RelativeSource AncestorType={x:Type Button}}" />
                     </MultiBinding>
                 </Image.Source>
             </Image>
@@ -156,8 +176,8 @@
                 <Setter TargetName="Image" Property="Source">
                     <Setter.Value>
                         <MultiBinding Converter="{x:Static converters:MultiConverters.PathToImageSource}">
-                            <Binding Path="HoveredImagePath"/>
-                            <Binding RelativeSource="{RelativeSource AncestorType={x:Type Button}}" Path="(behaviors:Fallback.FallbackImageSource)"/>
+                            <Binding Path="HoveredImagePath" />
+                            <Binding Path="(behaviors:Fallback.FallbackImageSource)" RelativeSource="{RelativeSource AncestorType={x:Type Button}}" />
                         </MultiBinding>
                     </Setter.Value>
                 </Setter>
@@ -166,8 +186,8 @@
                 <Setter TargetName="Image" Property="Source">
                     <Setter.Value>
                         <MultiBinding Converter="{x:Static converters:MultiConverters.PathToImageSource}">
-                            <Binding Path="ClickedImagePath"/>
-                            <Binding RelativeSource="{RelativeSource AncestorType={x:Type Button}}" Path="(behaviors:Fallback.FallbackImageSource)"/>
+                            <Binding Path="ClickedImagePath" />
+                            <Binding Path="(behaviors:Fallback.FallbackImageSource)" RelativeSource="{RelativeSource AncestorType={x:Type Button}}" />
                         </MultiBinding>
                     </Setter.Value>
                 </Setter>
@@ -176,111 +196,116 @@
     </DataTemplate>
     <DataTemplate x:Key="ToolbarButtonContentTextTemplate" DataType="viewmodels:ButtonContentViewModel">
         <Viewbox>
-            <TextBlock x:Name="Text" Text="{Binding Text}" FontFamily="{Binding FontFamily}" 
-                       Foreground="{Binding TextColor, Converter={x:Static converters:Converters.ColorToBrush}}" FontSize="72"/>
+            <TextBlock x:Name="Text"
+                       FontFamily="{Binding FontFamily}"
+                       FontSize="72"
+                       Foreground="{Binding TextColor, Converter={x:Static converters:Converters.ColorToBrush}}"
+                       Text="{Binding Text}" />
         </Viewbox>
         <DataTemplate.Triggers>
             <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type Button}}, Path=IsMouseOver}" Value="True">
-                <Setter TargetName="Text" Property="Foreground" Value="{Binding HoveredTextColor, Converter={x:Static converters:Converters.ColorToBrush}}"/>
+                <Setter TargetName="Text" Property="Foreground" Value="{Binding HoveredTextColor, Converter={x:Static converters:Converters.ColorToBrush}}" />
             </DataTrigger>
             <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type Button}}, Path=IsPressed}" Value="True">
-                <Setter TargetName="Text" Property="Foreground" Value="{Binding ClickedTextColor, Converter={x:Static converters:Converters.ColorToBrush}}"/>
+                <Setter TargetName="Text" Property="Foreground" Value="{Binding ClickedTextColor, Converter={x:Static converters:Converters.ColorToBrush}}" />
             </DataTrigger>
         </DataTemplate.Triggers>
     </DataTemplate>
     <ControlTemplate x:Key="ToolbarButtonControlTemplate" TargetType="{x:Type Button}">
         <Grid>
-            <Border x:Name="ButtonBackground" Background="{Binding BackgroundColor, Converter={x:Static converters:Converters.ColorToBrush}}"/>
-            <ContentPresenter x:Name="ButtonContent" Content="{TemplateBinding Content}"
-                              HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
+            <Border x:Name="ButtonBackground" Background="{Binding BackgroundColor, Converter={x:Static converters:Converters.ColorToBrush}}" />
+            <ContentPresenter x:Name="ButtonContent"
+                              HorizontalAlignment="Stretch"
+                              VerticalAlignment="Stretch"
+                              Content="{TemplateBinding Content}" />
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter TargetName="ButtonBackground" Property="Background" Value="{Binding HoveredBackgroundColor, Converter={x:Static converters:Converters.ColorToBrush}}"/>
+                <Setter TargetName="ButtonBackground" Property="Background" Value="{Binding HoveredBackgroundColor, Converter={x:Static converters:Converters.ColorToBrush}}" />
             </Trigger>
             <Trigger Property="IsPressed" Value="True">
-                <Setter TargetName="ButtonBackground" Property="Background" Value="{Binding ClickedBackgroundColor, Converter={x:Static converters:Converters.ColorToBrush}}"/>
+                <Setter TargetName="ButtonBackground" Property="Background" Value="{Binding ClickedBackgroundColor, Converter={x:Static converters:Converters.ColorToBrush}}" />
             </Trigger>
             <DataTrigger Binding="{Binding ElementName=ButtonContent, Path=Content.(viewmodels:ButtonContentViewModel.ContentType)}" Value="{x:Static models:ButtonContentType.Text}">
-                <Setter TargetName="ButtonContent" Property="ContentTemplate" Value="{StaticResource ToolbarButtonContentTextTemplate}"/>
+                <Setter TargetName="ButtonContent" Property="ContentTemplate" Value="{StaticResource ToolbarButtonContentTextTemplate}" />
             </DataTrigger>
             <DataTrigger Binding="{Binding ElementName=ButtonContent, Path=Content.(viewmodels:ButtonContentViewModel.ContentType)}" Value="{x:Static models:ButtonContentType.Image}">
-                <Setter TargetName="ButtonContent" Property="ContentTemplate" Value="{StaticResource ToolbarButtonContentImageTemplate}"/>
+                <Setter TargetName="ButtonContent" Property="ContentTemplate" Value="{StaticResource ToolbarButtonContentImageTemplate}" />
             </DataTrigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <!-- Button styles -->
+    <!--  Button styles  -->
     <Style x:Key="ToolbarPlayPauseButtonStyle" TargetType="{x:Type Button}">
         <d:Style.DataContext>
-            <x:Type Type="viewmodels:PlayPauseButtonViewModel"/>
+            <x:Type Type="viewmodels:PlayPauseButtonViewModel" />
         </d:Style.DataContext>
-        <Setter Property="OverridesDefaultStyle" Value="True"/>
-        <Setter Property="Template" Value="{StaticResource ToolbarButtonControlTemplate}"/>
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Template" Value="{StaticResource ToolbarButtonControlTemplate}" />
         <Style.Triggers>
             <DataTrigger Binding="{Binding IsPlayButtonShown}" Value="True">
-                <Setter Property="Content" Value="{Binding PlayContent}"/>
-                <Setter Property="behaviors:Fallback.FallbackImageSource" Value="{StaticResource PlayButtonDefault}"/>
+                <Setter Property="Content" Value="{Binding PlayContent}" />
+                <Setter Property="behaviors:Fallback.FallbackImageSource" Value="{StaticResource PlayButtonDefault}" />
             </DataTrigger>
             <DataTrigger Binding="{Binding IsPlayButtonShown}" Value="False">
-                <Setter Property="Content" Value="{Binding PauseContent}"/>
-                <Setter Property="behaviors:Fallback.FallbackImageSource" Value="{StaticResource PauseButtonDefault}"/>
+                <Setter Property="Content" Value="{Binding PauseContent}" />
+                <Setter Property="behaviors:Fallback.FallbackImageSource" Value="{StaticResource PauseButtonDefault}" />
             </DataTrigger>
         </Style.Triggers>
     </Style>
     <Style x:Key="ToolbarNextButtonStyle" TargetType="{x:Type Button}">
         <d:Style.DataContext>
-            <x:Type Type="viewmodels:NextButtonViewModel"/>
+            <x:Type Type="viewmodels:NextButtonViewModel" />
         </d:Style.DataContext>
-        <Setter Property="OverridesDefaultStyle" Value="True"/>
-        <Setter Property="behaviors:Fallback.FallbackImageSource" Value="{StaticResource NextButtonDefault}"/>
-        <Setter Property="Template" Value="{StaticResource ToolbarButtonControlTemplate}"/>
-        <Setter Property="Content" Value="{Binding Content}"/>
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="behaviors:Fallback.FallbackImageSource" Value="{StaticResource NextButtonDefault}" />
+        <Setter Property="Template" Value="{StaticResource ToolbarButtonControlTemplate}" />
+        <Setter Property="Content" Value="{Binding Content}" />
     </Style>
     <Style x:Key="ToolbarPreviousButtonStyle" TargetType="{x:Type Button}">
         <d:Style.DataContext>
-            <x:Type Type="viewmodels:PreviousButtonViewModel"/>
+            <x:Type Type="viewmodels:PreviousButtonViewModel" />
         </d:Style.DataContext>
-        <Setter Property="OverridesDefaultStyle" Value="True"/>
-        <Setter Property="behaviors:Fallback.FallbackImageSource" Value="{StaticResource PreviousButtonDefault}"/>
-        <Setter Property="Template" Value="{StaticResource ToolbarButtonControlTemplate}"/>
-        <Setter Property="Content" Value="{Binding Content}"/>
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="behaviors:Fallback.FallbackImageSource" Value="{StaticResource PreviousButtonDefault}" />
+        <Setter Property="Template" Value="{StaticResource ToolbarButtonControlTemplate}" />
+        <Setter Property="Content" Value="{Binding Content}" />
     </Style>
     <Style x:Key="ToolbarRepeatModeButtonStyle" TargetType="{x:Type Button}">
         <d:Style.DataContext>
-            <x:Type Type="viewmodels:RepeatModeButtonViewModel"/>
+            <x:Type Type="viewmodels:RepeatModeButtonViewModel" />
         </d:Style.DataContext>
-        <Setter Property="OverridesDefaultStyle" Value="True"/>
-        <Setter Property="Template" Value="{StaticResource ToolbarButtonControlTemplate}"/>
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Template" Value="{StaticResource ToolbarButtonControlTemplate}" />
         <Style.Triggers>
             <DataTrigger Binding="{Binding RepeatMode}" Value="{x:Static audioSource:RepeatMode.Off}">
-                <Setter Property="Content" Value="{Binding RepeatOffContent}"/>
-                <Setter Property="behaviors:Fallback.FallbackImageSource" Value="{StaticResource RepeatOffDefault}"/>
+                <Setter Property="Content" Value="{Binding RepeatOffContent}" />
+                <Setter Property="behaviors:Fallback.FallbackImageSource" Value="{StaticResource RepeatOffDefault}" />
             </DataTrigger>
             <DataTrigger Binding="{Binding RepeatMode}" Value="{x:Static audioSource:RepeatMode.RepeatContext}">
-                <Setter Property="Content" Value="{Binding RepeatContextContent}"/>
-                <Setter Property="behaviors:Fallback.FallbackImageSource" Value="{StaticResource RepeatContextDefault}"/>
+                <Setter Property="Content" Value="{Binding RepeatContextContent}" />
+                <Setter Property="behaviors:Fallback.FallbackImageSource" Value="{StaticResource RepeatContextDefault}" />
             </DataTrigger>
             <DataTrigger Binding="{Binding RepeatMode}" Value="{x:Static audioSource:RepeatMode.RepeatTrack}">
-                <Setter Property="Content" Value="{Binding RepeatTrackContent}"/>
-                <Setter Property="behaviors:Fallback.FallbackImageSource" Value="{StaticResource RepeatOneDefault}"/>
+                <Setter Property="Content" Value="{Binding RepeatTrackContent}" />
+                <Setter Property="behaviors:Fallback.FallbackImageSource" Value="{StaticResource RepeatOneDefault}" />
             </DataTrigger>
         </Style.Triggers>
     </Style>
     <Style x:Key="ToolbarShuffleModeButtonStyle" TargetType="{x:Type Button}">
         <d:Style.DataContext>
-            <x:Type Type="viewmodels:ShuffleModeButtonViewModel"/>
+            <x:Type Type="viewmodels:ShuffleModeButtonViewModel" />
         </d:Style.DataContext>
-        <Setter Property="OverridesDefaultStyle" Value="True"/>
-        <Setter Property="Template" Value="{StaticResource ToolbarButtonControlTemplate}"/>
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Template" Value="{StaticResource ToolbarButtonControlTemplate}" />
         <Style.Triggers>
             <DataTrigger Binding="{Binding IsShuffleOn}" Value="True">
-                <Setter Property="Content" Value="{Binding ShuffleOnContent}"/>
-                <Setter Property="behaviors:Fallback.FallbackImageSource" Value="{StaticResource ShuffleOnDefault}"/>
+                <Setter Property="Content" Value="{Binding ShuffleOnContent}" />
+                <Setter Property="behaviors:Fallback.FallbackImageSource" Value="{StaticResource ShuffleOnDefault}" />
             </DataTrigger>
             <DataTrigger Binding="{Binding IsShuffleOn}" Value="False">
-                <Setter Property="Content" Value="{Binding ShuffleOffContent}"/>
-                <Setter Property="behaviors:Fallback.FallbackImageSource" Value="{StaticResource ShuffleOffDefault}"/>
+                <Setter Property="Content" Value="{Binding ShuffleOffContent}" />
+                <Setter Property="behaviors:Fallback.FallbackImageSource" Value="{StaticResource ShuffleOffDefault}" />
             </DataTrigger>
         </Style.Triggers>
     </Style>
diff --git a/src/AudioBand/Resources/ToolbarContextMenuStyles.xaml b/src/AudioBand/Resources/ToolbarContextMenuStyles.xaml
index e924fa45..64e203e3 100644
--- a/src/AudioBand/Resources/ToolbarContextMenuStyles.xaml
+++ b/src/AudioBand/Resources/ToolbarContextMenuStyles.xaml
@@ -2,29 +2,34 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:fluentWpf="clr-namespace:SourceChord.FluentWPF;assembly=FluentWPF">
     <Color x:Key="ContextMenuHighlightColor">#44FFFFFF</Color>
-    <SolidColorBrush x:Key="ContextMenuHighlightBrush" Color="{StaticResource ContextMenuHighlightColor}"/>
+    <SolidColorBrush x:Key="ContextMenuHighlightBrush" Color="{StaticResource ContextMenuHighlightColor}" />
     <Color x:Key="ContextMenuBorderColor">#44ffffff</Color>
-    <SolidColorBrush x:Key="ContextMenuBorderBrush" Color="{StaticResource ContextMenuBorderColor}"/>
+    <SolidColorBrush x:Key="ContextMenuBorderBrush" Color="{StaticResource ContextMenuBorderColor}" />
     <Color x:Key="ContextMenuBackgroundColor">#AA000000</Color>
-    <SolidColorBrush x:Key="ContextMenuBackgroundBrush" Color="{StaticResource ContextMenuBackgroundColor}"/>
+    <SolidColorBrush x:Key="ContextMenuBackgroundBrush" Color="{StaticResource ContextMenuBackgroundColor}" />
     <Style x:Key="ContextMenuItemsHostStyle" TargetType="{x:Type StackPanel}">
-        <Setter Property="OverridesDefaultStyle" Value="True"/>
-        <Setter Property="MinWidth" Value="200"/>
-        <Setter Property="Grid.IsSharedSizeScope" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="MinWidth" Value="200" />
+        <Setter Property="Grid.IsSharedSizeScope" Value="True" />
     </Style>
+    <PopupAnimation x:Key="{x:Static SystemParameters.MenuPopupAnimationKey}">None</PopupAnimation>
     <Style x:Key="ToolbarContextMenu" TargetType="{x:Type ContextMenu}">
-        <Setter Property="OverridesDefaultStyle" Value="True"/>
-        <Setter Property="Foreground" Value="White"/>
-        <Setter Property="FontSize" Value="14"/>
-        <Setter Property="FontFamily" Value="Segoe UI"/>
-        <Setter Property="FontWeight" Value="Light"/>
-        <Setter Property="Placement" Value="Top"/>
-        <Setter Property="Background" Value="{StaticResource ContextMenuBackgroundBrush}"/>
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Foreground" Value="White" />
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="FontFamily" Value="Segoe UI" />
+        <Setter Property="FontWeight" Value="Light" />
+        <Setter Property="Placement" Value="Top" />
+        <Setter Property="Background" Value="{StaticResource ContextMenuBackgroundBrush}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate>
-                    <Border Background="{StaticResource ContextMenuBackgroundBrush}" BorderThickness="1" Padding="0, 8">
-                        <StackPanel Orientation="Vertical" IsItemsHost="True" Style="{StaticResource ContextMenuItemsHostStyle}"/>
+                    <Border Padding="0,8"
+                            Background="{StaticResource ContextMenuBackgroundBrush}"
+                            BorderThickness="1">
+                        <StackPanel IsItemsHost="True"
+                                    Orientation="Vertical"
+                                    Style="{StaticResource ContextMenuItemsHostStyle}" />
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
@@ -34,32 +39,53 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type MenuItem}">
-                    <Grid Background="{TemplateBinding Background}" x:Name="MenuItemRoot">
+                    <Grid x:Name="MenuItemRoot" Background="{TemplateBinding Background}">
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition MinWidth="40" SharedSizeGroup="IconColumn"/>
-                            <ColumnDefinition Width="*"/>
-                            <ColumnDefinition Width="Auto" SharedSizeGroup="ExpandColumn"/>
+                            <ColumnDefinition MinWidth="40" SharedSizeGroup="IconColumn" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" SharedSizeGroup="ExpandColumn" />
                         </Grid.ColumnDefinitions>
-                        <ContentPresenter Grid.Column="0" x:Name="IconContent" Content="{TemplateBinding Icon}" Margin="8, 0" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                        <ContentPresenter Grid.Column="1" x:Name="HeaderContent" 
-                                          Content="{TemplateBinding Header}" ContentTemplate="{TemplateBinding HeaderTemplate}" 
-                                          Margin="0, 6" HorizontalAlignment="Left"/>
-                        <TextBlock x:Name="ItemsArrow" Grid.Column="2" FontFamily="Segoe MDL2 Assets" Text="&#xE76C;" 
-                                   VerticalAlignment="Center" Margin="8, 0" Visibility="Hidden"/>
-                        <fluentWpf:AcrylicPopup Grid.Column="0" x:Name="Popup" Placement="Right" HorizontalOffset="-4" IsOpen="{TemplateBinding IsSubmenuOpen}"
-                               AllowsTransparency="True" Focusable="False" PopupAnimation="Fade">
-                            <Border BorderThickness="1" BorderBrush="{StaticResource ContextMenuBorderBrush}" Padding="0, 8" 
-                                    Background="{StaticResource ContextMenuBackgroundBrush}">
-                                <StackPanel IsItemsHost="True" Style="{StaticResource ContextMenuItemsHostStyle}"/>
+                        <ContentPresenter x:Name="IconContent"
+                                          Grid.Column="0"
+                                          Margin="8,0"
+                                          HorizontalAlignment="Center"
+                                          VerticalAlignment="Center"
+                                          Content="{TemplateBinding Icon}" />
+                        <ContentPresenter x:Name="HeaderContent"
+                                          Grid.Column="1"
+                                          Margin="0,6"
+                                          HorizontalAlignment="Left"
+                                          Content="{TemplateBinding Header}"
+                                          ContentTemplate="{TemplateBinding HeaderTemplate}" />
+                        <TextBlock x:Name="ItemsArrow"
+                                   Grid.Column="2"
+                                   Margin="8,0"
+                                   VerticalAlignment="Center"
+                                   FontFamily="Segoe MDL2 Assets"
+                                   Text="&#xE76C;"
+                                   Visibility="Hidden" />
+                        <fluentWpf:AcrylicPopup x:Name="Popup"
+                                                Grid.Column="0"
+                                                AllowsTransparency="True"
+                                                Focusable="False"
+                                                HorizontalOffset="-4"
+                                                IsOpen="{TemplateBinding IsSubmenuOpen}"
+                                                Placement="Right"
+                                                PopupAnimation="None">
+                            <Border Padding="0,8"
+                                    Background="{StaticResource ContextMenuBackgroundBrush}"
+                                    BorderBrush="{StaticResource ContextMenuBorderBrush}"
+                                    BorderThickness="0.5">
+                                <StackPanel IsItemsHost="True" Style="{StaticResource ContextMenuItemsHostStyle}" />
                             </Border>
                         </fluentWpf:AcrylicPopup>
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="HasItems" Value="True">
-                            <Setter TargetName="ItemsArrow" Property="Visibility" Value="Visible"/>
+                            <Setter TargetName="ItemsArrow" Property="Visibility" Value="Visible" />
                         </Trigger>
                         <Trigger Property="Icon" Value="{x:Null}">
-                            <Setter TargetName="IconContent" Property="Visibility" Value="Collapsed"/>
+                            <Setter TargetName="IconContent" Property="Visibility" Value="Collapsed" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -67,7 +93,7 @@
         </Setter>
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="{StaticResource ContextMenuHighlightBrush}"/>
+                <Setter Property="Background" Value="{StaticResource ContextMenuHighlightBrush}" />
             </Trigger>
         </Style.Triggers>
     </Style>
diff --git a/src/AudioBand/Resources/ToolbarProgressBarStyle.xaml b/src/AudioBand/Resources/ToolbarProgressBarStyle.xaml
index 0a58a863..4196431a 100644
--- a/src/AudioBand/Resources/ToolbarProgressBarStyle.xaml
+++ b/src/AudioBand/Resources/ToolbarProgressBarStyle.xaml
@@ -1,28 +1,28 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:behaviors="clr-namespace:AudioBand.Behaviors"
+                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                    xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
                     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-                    xmlns:viewmodels="clr-namespace:AudioBand.ViewModels"
                     xmlns:sys="clr-namespace:System;assembly=mscorlib"
                     xmlns:valueConverters="clr-namespace:AudioBand.ValueConverters"
-                    xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
-                    xmlns:behaviors="clr-namespace:AudioBand.Behaviors"
+                    xmlns:viewmodels="clr-namespace:AudioBand.ViewModels"
                     xmlns:views="clr-namespace:AudioBand.Views"
                     mc:Ignorable="d">
     <Style x:Key="ProgressBarStyle" TargetType="{x:Type Slider}">
         <d:Style.DataContext>
-            <x:Type Type="viewmodels:ProgressBarViewModel"/>
+            <x:Type Type="viewmodels:ProgressBarViewModel" />
         </d:Style.DataContext>
         <Style.Resources>
             <PopupAnimation x:Key="{x:Static SystemParameters.ToolTipPopupAnimationKey}">Fade</PopupAnimation>
         </Style.Resources>
-        <Setter Property="SnapsToDevicePixels" Value="True"/>
-        <Setter Property="OverridesDefaultStyle" Value="True"/>
-        <Setter Property="Background" Value="{Binding BackgroundColor, Converter={x:Static valueConverters:Converters.ColorToBrush}}"/>
-        <Setter Property="Foreground" Value="{Binding ForegroundColor, Converter={x:Static valueConverters:Converters.ColorToBrush}}"/>
-        <Setter Property="IsMoveToPointEnabled" Value="True"/>
-        <Setter Property="Focusable" Value="False"/>
-        <Setter Property="ClipToBounds" Value="False"/>
+        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Background" Value="{Binding BackgroundColor, Converter={x:Static valueConverters:Converters.ColorToBrush}}" />
+        <Setter Property="Foreground" Value="{Binding ForegroundColor, Converter={x:Static valueConverters:Converters.ColorToBrush}}" />
+        <Setter Property="IsMoveToPointEnabled" Value="True" />
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="ClipToBounds" Value="False" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Slider}">
@@ -34,49 +34,57 @@
                             <Setter Property="Template">
                                 <Setter.Value>
                                     <ControlTemplate TargetType="{x:Type RepeatButton}">
-                                        <Border Background="{TemplateBinding Background}" 
-                                                Height="{TemplateBinding Height}"
-                                                CornerRadius="{TemplateBinding Height, Converter={x:Static valueConverters:Converters.DoubleToCornerRadius}}"/>
+                                        <Border Height="{TemplateBinding Height}"
+                                                Background="{TemplateBinding Background}"
+                                                CornerRadius="{TemplateBinding Height,
+                                                                               Converter={x:Static valueConverters:Converters.DoubleToCornerRadius}}" />
                                     </ControlTemplate>
                                 </Setter.Value>
                             </Setter>
                         </Style>
                         <Style x:Key="SliderThumb" TargetType="{x:Type Thumb}">
-                            <Setter Property="OverridesDefaultStyle" Value="true"/>
+                            <Setter Property="OverridesDefaultStyle" Value="true" />
                             <Setter Property="Template">
                                 <Setter.Value>
                                     <ControlTemplate TargetType="{x:Type Thumb}">
-                                        <Ellipse Width="{TemplateBinding Width}" Height="{TemplateBinding Height}"
-                                                 Fill="{TemplateBinding Background}" 
+                                        <Ellipse Width="{TemplateBinding Width}"
+                                                 Height="{TemplateBinding Height}"
+                                                 Fill="{TemplateBinding Background}"
                                                  Stroke="{TemplateBinding Foreground}"
-                                                 StrokeThickness="2"/>
+                                                 StrokeThickness="2" />
                                     </ControlTemplate>
                                 </Setter.Value>
                             </Setter>
                         </Style>
                     </ControlTemplate.Resources>
                     <Canvas Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
-                        <views:CustomTrack x:Name="PART_Track" Orientation="{TemplateBinding Orientation}" Width="{TemplateBinding Width}">
+                        <views:CustomTrack x:Name="PART_Track"
+                                           Width="{TemplateBinding Width}"
+                                           Orientation="{TemplateBinding Orientation}">
                             <i:Interaction.Behaviors>
-                                <behaviors:TrackOffsetFix/>
+                                <behaviors:TrackOffsetFix />
                             </i:Interaction.Behaviors>
                             <Track.IncreaseRepeatButton>
-                                <RepeatButton Style="{StaticResource SliderRepeatButtonStyle}" 
+                                <RepeatButton Height="{TemplateBinding Height}"
+                                              Background="{TemplateBinding Background}"
                                               Command="Slider.IncreaseLarge"
-                                              Height="{TemplateBinding Height}"
-                                              Background="{TemplateBinding Background}"/>
+                                              Style="{StaticResource SliderRepeatButtonStyle}" />
                             </Track.IncreaseRepeatButton>
                             <Track.DecreaseRepeatButton>
-                                <RepeatButton Style="{StaticResource SliderRepeatButtonStyle}" 
+                                <RepeatButton Height="{TemplateBinding Height}"
+                                              Background="{TemplateBinding Foreground}"
                                               Command="Slider.DecreaseLarge"
-                                              Height="{TemplateBinding Height}"
-                                              Background="{TemplateBinding Foreground}"/>
+                                              Style="{StaticResource SliderRepeatButtonStyle}" />
                             </Track.DecreaseRepeatButton>
                             <Track.Thumb>
-                                <Thumb x:Name="Thumb" Style="{StaticResource SliderThumb}" Background="{TemplateBinding Background}" Foreground="{TemplateBinding Foreground}" Opacity="0">
+                                <Thumb x:Name="Thumb"
+                                       Background="{TemplateBinding Background}"
+                                       Foreground="{TemplateBinding Foreground}"
+                                       Opacity="0"
+                                       Style="{StaticResource SliderThumb}">
                                     <Thumb.Width>
                                         <MultiBinding Converter="{x:Static valueConverters:MultiConverters.Multiply}">
-                                            <Binding Path="Height"/>
+                                            <Binding Path="Height" />
                                             <Binding>
                                                 <Binding.Source>
                                                     <sys:Double>3</sys:Double>
@@ -86,7 +94,7 @@
                                     </Thumb.Width>
                                     <Thumb.Height>
                                         <MultiBinding Converter="{x:Static valueConverters:MultiConverters.Multiply}">
-                                            <Binding Path="Height"/>
+                                            <Binding Path="Height" />
                                             <Binding>
                                                 <Binding.Source>
                                                     <sys:Double>3</sys:Double>
@@ -103,7 +111,9 @@
                                             <Storyboard>
                                                 <DoubleAnimation Storyboard.TargetName="Thumb"
                                                                  Storyboard.TargetProperty="Opacity"
-                                                                 From="0" To="1" Duration="0:0:0.1"/>
+                                                                 From="0"
+                                                                 To="1"
+                                                                 Duration="0:0:0.1" />
                                             </Storyboard>
                                         </BeginStoryboard>
                                     </EventTrigger.Actions>
@@ -114,7 +124,9 @@
                                             <Storyboard>
                                                 <DoubleAnimation Storyboard.TargetName="Thumb"
                                                                  Storyboard.TargetProperty="Opacity"
-                                                                 From="1" To="0" Duration="0:0:0.1"/>
+                                                                 From="1"
+                                                                 To="0"
+                                                                 Duration="0:0:0.1" />
                                             </Storyboard>
                                         </BeginStoryboard>
                                     </EventTrigger.Actions>
@@ -127,11 +139,11 @@
         </Setter>
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Foreground" Value="{Binding HoverColor, Converter={x:Static valueConverters:Converters.ColorToBrush}}"/>
-                <Setter Property="ToolTip.IsOpen" Value="True"/>
-                <Setter Property="ToolTip.StaysOpen" Value="True"/>
-                <Setter Property="ToolTipService.ShowDuration" Value="999999"/>
-                <Setter Property="ToolTipService.InitialShowDelay" Value="0"/>
+                <Setter Property="Foreground" Value="{Binding HoverColor, Converter={x:Static valueConverters:Converters.ColorToBrush}}" />
+                <Setter Property="ToolTip.IsOpen" Value="True" />
+                <Setter Property="ToolTip.StaysOpen" Value="True" />
+                <Setter Property="ToolTipService.ShowDuration" Value="999999" />
+                <Setter Property="ToolTipService.InitialShowDelay" Value="0" />
             </Trigger>
         </Style.Triggers>
     </Style>
diff --git a/src/AudioBand/Resources/Tooltips.xaml b/src/AudioBand/Resources/Tooltips.xaml
index a6b8e039..ee3ea34a 100644
--- a/src/AudioBand/Resources/Tooltips.xaml
+++ b/src/AudioBand/Resources/Tooltips.xaml
@@ -1,23 +1,26 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:theme="clr-namespace:AudioBand.Resources.Theming"
-                    xmlns:resources="clr-namespace:AudioBand.Resources">
+                    xmlns:resources="clr-namespace:AudioBand.Resources"
+                    xmlns:theme="clr-namespace:AudioBand.Resources.Theming">
     <ResourceDictionary.MergedDictionaries>
-        <resources:SharedDictionary Source="Shared.xaml"/> 
+        <resources:SharedDictionary Source="Shared.xaml" />
     </ResourceDictionary.MergedDictionaries>
     <Style TargetType="{x:Type ToolTip}">
-        <Setter Property="Background" Value="{theme:ThemeResource SystemChromeMediumLowColor}"/>
-        <Setter Property="Foreground" Value="{theme:ThemeResource SystemBaseHighColor}"/>
-        <Setter Property="TextElement.FontSize" Value="{StaticResource BodyFontSize}"/>
+        <Setter Property="Background" Value="{theme:ThemeResource SystemChromeMediumLowColor}" />
+        <Setter Property="Foreground" Value="{theme:ThemeResource SystemBaseHighColor}" />
+        <Setter Property="TextElement.FontSize" Value="{StaticResource BodyFontSize}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ToolTip}">
-                    <Border BorderThickness="1" BorderBrush="{theme:ThemeResource SystemChromeHighColor}" Margin="4" Padding="4"
-                            Background="{TemplateBinding Background}">
+                    <Border Margin="4"
+                            Padding="4"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{theme:ThemeResource SystemChromeHighColor}"
+                            BorderThickness="1">
                         <Border.Effect>
-                            <DropShadowEffect ShadowDepth="0" Opacity="0.3"/>
+                            <DropShadowEffect Opacity="0.3" ShadowDepth="0" />
                         </Border.Effect>
-                        <ContentPresenter/>
+                        <ContentPresenter />
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/src/AudioBand/Views/AudioBandToolbar.xaml b/src/AudioBand/Views/AudioBandToolbar.xaml
index 5d658bbb..a6b9cb77 100644
--- a/src/AudioBand/Views/AudioBandToolbar.xaml
+++ b/src/AudioBand/Views/AudioBandToolbar.xaml
@@ -1,29 +1,30 @@
 <UserControl x:Class="AudioBand.Views.AudioBandToolbar"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
-             xmlns:viewModels="clr-namespace:AudioBand.ViewModels"
-             xmlns:converters="clr-namespace:AudioBand.ValueConverters"
              xmlns:audioSource="clr-namespace:AudioBand.AudioSource;assembly=AudioBand.AudioSource"
-             xmlns:fluentWpf="clr-namespace:SourceChord.FluentWPF;assembly=FluentWPF"
              xmlns:behaviors="clr-namespace:AudioBand.Behaviors"
-             xmlns:resources="clr-namespace:AudioBand.Resources"
-             xmlns:sys="clr-namespace:System;assembly=mscorlib"
+             xmlns:converters="clr-namespace:AudioBand.ValueConverters"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:fluentWpf="clr-namespace:SourceChord.FluentWPF;assembly=FluentWPF"
+             xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:models="clr-namespace:AudioBand.Models"
-             xmlns:views="clr-namespace:AudioBand.Views"
-             mc:Ignorable="d"
-             HorizontalAlignment="Stretch" VerticalAlignment="Stretch" 
+             xmlns:resources="clr-namespace:AudioBand.Resources"
+             xmlns:viewModels="clr-namespace:AudioBand.ViewModels"
+             HorizontalAlignment="Stretch"
+             VerticalAlignment="Stretch"
+             d:DataContext="{d:DesignInstance viewModels:AudioBandToolbarViewModel,
+                                              IsDesignTimeCreatable=False}"
+             d:DesignHeight="450"
+             d:DesignWidth="800"
              Background="{Binding ViewModels.AudioBandViewModel.BackgroundColor, Converter={x:Static converters:Converters.ColorToBrush}}"
-             d:DesignHeight="450" d:DesignWidth="800"
-             d:DataContext="{d:DesignInstance viewModels:AudioBandToolbarViewModel, IsDesignTimeCreatable=False}">
+             mc:Ignorable="d">
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <resources:SharedDictionary Source="../Resources/ToolbarButtonStyles.xaml"/>
-                <resources:SharedDictionary Source="../Resources/ToolbarProgressBarStyle.xaml"/>
-                <resources:SharedDictionary Source="../Resources/ToolbarContextMenuStyles.xaml"/>
+                <resources:SharedDictionary Source="../Resources/ToolbarButtonStyles.xaml" />
+                <resources:SharedDictionary Source="../Resources/ToolbarProgressBarStyle.xaml" />
+                <resources:SharedDictionary Source="../Resources/ToolbarContextMenuStyles.xaml" />
             </ResourceDictionary.MergedDictionaries>
             <DrawingImage x:Key="AlbumArtFallback">
                 <DrawingImage.Drawing>
@@ -31,23 +32,37 @@
                         <DrawingGroup Opacity="1">
                             <GeometryDrawing>
                                 <GeometryDrawing.Pen>
-                                    <Pen Brush="#ffffff" Thickness="8" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
+                                    <Pen Brush="#ffffff"
+                                         EndLineCap="Flat"
+                                         LineJoin="Miter"
+                                         StartLineCap="Flat"
+                                         Thickness="8" />
                                 </GeometryDrawing.Pen>
                                 <GeometryDrawing.Geometry>
-                                    <RectangleGeometry RadiusX="0" RadiusY="0" Rect="8,8,240,240" />
+                                    <RectangleGeometry RadiusX="0"
+                                                       RadiusY="0"
+                                                       Rect="8,8,240,240" />
                                 </GeometryDrawing.Geometry>
                             </GeometryDrawing>
                             <GeometryDrawing>
                                 <GeometryDrawing.Pen>
-                                    <Pen Brush="#ffffff" Thickness="10" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
+                                    <Pen Brush="#ffffff"
+                                         EndLineCap="Flat"
+                                         LineJoin="Miter"
+                                         StartLineCap="Flat"
+                                         Thickness="10" />
                                 </GeometryDrawing.Pen>
                                 <GeometryDrawing.Geometry>
-                                    <EllipseGeometry RadiusX="84" RadiusY="84" Center="128,128" />
+                                    <EllipseGeometry Center="128,128"
+                                                     RadiusX="84"
+                                                     RadiusY="84" />
                                 </GeometryDrawing.Geometry>
                             </GeometryDrawing>
                             <GeometryDrawing Brush="#ffffff">
                                 <GeometryDrawing.Geometry>
-                                    <EllipseGeometry RadiusX="24" RadiusY="24" Center="128,128" />
+                                    <EllipseGeometry Center="128,128"
+                                                     RadiusX="24"
+                                                     RadiusY="24" />
                                 </GeometryDrawing.Geometry>
                             </GeometryDrawing>
                         </DrawingGroup>
@@ -59,49 +74,53 @@
     </UserControl.Resources>
     <i:Interaction.Triggers>
         <i:EventTrigger EventName="Loaded">
-            <i:InvokeCommandAction Command="{Binding LoadCommand}"/>
+            <i:InvokeCommandAction Command="{Binding LoadCommand}" />
         </i:EventTrigger>
     </i:Interaction.Triggers>
     <i:Interaction.Behaviors>
-        <behaviors:DpiScaling/>
+        <behaviors:DpiScaling />
     </i:Interaction.Behaviors>
     <UserControl.ContextMenu>
         <fluentWpf:AcrylicContextMenu Style="{StaticResource ToolbarContextMenu}">
             <i:Interaction.Behaviors>
-                <behaviors:DpiScaling/>
+                <behaviors:DpiScaling />
             </i:Interaction.Behaviors>
             <ContextMenu.Resources>
-                <Style TargetType="{x:Type MenuItem}" BasedOn="{StaticResource ToolbarContextMenuItem}"/>
+                <Style BasedOn="{StaticResource ToolbarContextMenuItem}" TargetType="{x:Type MenuItem}" />
             </ContextMenu.Resources>
-            <MenuItem Header="AudioBand Settings" Command="{Binding ShowSettingsWindowCommand}" Style="{StaticResource ToolbarContextMenuItem}">
+            <MenuItem Command="{Binding ShowSettingsWindowCommand}"
+                      Header="AudioBand Settings"
+                      Style="{StaticResource ToolbarContextMenuItem}">
                 <MenuItem.Icon>
-                    <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE713;"/>
+                    <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE713;" />
                 </MenuItem.Icon>
             </MenuItem>
-            <MenuItem Header="Audio sources" ItemsSource="{Binding AudioSources}" Style="{StaticResource ToolbarContextMenuItem}">
+            <MenuItem Header="Audio sources"
+                      ItemsSource="{Binding AudioSources}"
+                      Style="{StaticResource ToolbarContextMenuItem}">
                 <MenuItem.Icon>
-                    <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE8D6;"/>
+                    <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE8D6;" />
                 </MenuItem.Icon>
                 <MenuItem.ItemTemplate>
                     <DataTemplate DataType="{x:Type audioSource:IAudioSource}">
-                        <TextBlock Text="{Binding Name}"/>
+                        <TextBlock Text="{Binding Name}" />
                     </DataTemplate>
                 </MenuItem.ItemTemplate>
                 <MenuItem.ItemContainerStyle>
-                    <Style TargetType="{x:Type MenuItem}" BasedOn="{StaticResource ToolbarContextMenuItem}">
-                        <Setter Property="Command" Value="{Binding PlacementTarget.DataContext.SelectAudioSourceCommand, RelativeSource={RelativeSource AncestorType={x:Type ContextMenu}}}"/>
-                        <Setter Property="CommandParameter" Value="{Binding}"/>
+                    <Style BasedOn="{StaticResource ToolbarContextMenuItem}" TargetType="{x:Type MenuItem}">
+                        <Setter Property="Command" Value="{Binding PlacementTarget.DataContext.SelectAudioSourceCommand, RelativeSource={RelativeSource AncestorType={x:Type ContextMenu}}}" />
+                        <Setter Property="CommandParameter" Value="{Binding}" />
                         <Style.Triggers>
                             <DataTrigger Value="True">
                                 <DataTrigger.Binding>
                                     <MultiBinding Converter="{x:Static converters:MultiConverters.Comparison}">
-                                        <Binding Path="Name"/>
-                                        <Binding RelativeSource="{RelativeSource AncestorType={x:Type ContextMenu}}" Path="PlacementTarget.DataContext.SelectedAudioSource.Name"/>
+                                        <Binding Path="Name" />
+                                        <Binding Path="PlacementTarget.DataContext.SelectedAudioSource.Name" RelativeSource="{RelativeSource AncestorType={x:Type ContextMenu}}" />
                                     </MultiBinding>
                                 </DataTrigger.Binding>
                                 <Setter Property="Icon">
                                     <Setter.Value>
-                                        <TextBlock Text="&#xE73E;" FontFamily="Segoe MDL2 Assets"/>
+                                        <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE73E;" />
                                     </Setter.Value>
                                 </Setter>
                             </DataTrigger>
@@ -113,52 +132,57 @@
     </UserControl.ContextMenu>
     <Canvas Width="{Binding ViewModels.AudioBandViewModel.Width}" Height="{Binding ViewModels.AudioBandViewModel.Height}">
         <Canvas.Resources>
-            <behaviors:BindingProxy x:Key="DataContextProxy" Value="{Binding .}"/>
+            <behaviors:BindingProxy x:Key="DataContextProxy" Value="{Binding .}" />
         </Canvas.Resources>
-        <Viewbox x:Name="AlbumArt" DataContext="{Binding ViewModels.AlbumArtViewModel}"
-                     Width="{Binding Width}" Height="{Binding Height}"
-                     Visibility="{Binding IsVisible, Converter={x:Static converters:Converters.BoolToVisibility}}"
-                     ToolTipService.InitialShowDelay="500" ToolTipService.ShowDuration="999999"
-                     ToolTipService.HasDropShadow="True"
-                     RenderOptions.BitmapScalingMode="Fant"
-                     behaviors:CanvasPositioning.Anchor="{Binding Anchor}"
-                     behaviors:CanvasPositioning.AnchorXDistance="{Binding XPosition}"
-                     behaviors:CanvasPositioning.AnchorYDistance="{Binding YPosition}">
+        <Viewbox x:Name="AlbumArt"
+                 Width="{Binding Width}"
+                 Height="{Binding Height}"
+                 behaviors:CanvasPositioning.Anchor="{Binding Anchor}"
+                 behaviors:CanvasPositioning.AnchorXDistance="{Binding XPosition}"
+                 behaviors:CanvasPositioning.AnchorYDistance="{Binding YPosition}"
+                 DataContext="{Binding ViewModels.AlbumArtViewModel}"
+                 RenderOptions.BitmapScalingMode="Fant"
+                 ToolTipService.HasDropShadow="True"
+                 ToolTipService.InitialShowDelay="500"
+                 ToolTipService.ShowDuration="999999"
+                 Visibility="{Binding IsVisible, Converter={x:Static converters:Converters.BoolToVisibility}}">
             <Image>
                 <Image.Style>
                     <Style TargetType="{x:Type Image}">
-                        <Setter Property="Source" Value="{Binding AlbumArt, FallbackValue={StaticResource AlbumArtFallback}}"/>
+                        <Setter Property="Source" Value="{Binding AlbumArt, FallbackValue={StaticResource AlbumArtFallback}}" />
                         <Style.Triggers>
                             <DataTrigger Binding="{Binding AlbumArt}" Value="{x:Null}">
-                                <Setter Property="Source" Value="{Binding PlaceholderPath, 
-                                                                        Converter={x:Static converters:Converters.PathToImageSource},
-                                                                        TargetNullValue={StaticResource AlbumArtFallback},
-                                                                        FallbackValue={StaticResource AlbumArtFallback}}"/>
+                                <Setter Property="Source" Value="{Binding PlaceholderPath, Converter={x:Static converters:Converters.PathToImageSource}, TargetNullValue={StaticResource AlbumArtFallback}, FallbackValue={StaticResource AlbumArtFallback}}" />
                             </DataTrigger>
                         </Style.Triggers>
                     </Style>
                 </Image.Style>
             </Image>
             <Viewbox.ToolTip>
-                <ToolTip DataContext="{Binding Source={StaticResource DataContextProxy}, Path=Value.ViewModels.AlbumArtPopupViewModel}"
-                         Background="Black" BorderThickness="0" Padding="0" HasDropShadow="True" PlacementTarget="{Binding ElementName=AlbumArt}"
-                         Placement="RelativePoint" HorizontalOffset="{Binding XPosition}" VerticalOffset="{Binding Margin}"
-                         x:Name="AlbumArtTooltip">
+                <ToolTip x:Name="AlbumArtTooltip"
+                         Padding="0"
+                         Background="Black"
+                         BorderThickness="0"
+                         DataContext="{Binding Source={StaticResource DataContextProxy}, Path=Value.ViewModels.AlbumArtPopupViewModel}"
+                         HasDropShadow="True"
+                         HorizontalOffset="{Binding XPosition}"
+                         Placement="RelativePoint"
+                         PlacementTarget="{Binding ElementName=AlbumArt}"
+                         VerticalOffset="{Binding Margin}">
                     <i:Interaction.Behaviors>
-                        <behaviors:DpiScaling/>
+                        <behaviors:DpiScaling />
                     </i:Interaction.Behaviors>
-                    <Viewbox Width="{Binding Width}" Height="{Binding Height}" RenderOptions.BitmapScalingMode="Fant"
+                    <Viewbox Width="{Binding Width}"
+                             Height="{Binding Height}"
+                             RenderOptions.BitmapScalingMode="Fant"
                              Visibility="{Binding IsVisible, Converter={x:Static converters:Converters.BoolToVisibility}}">
                         <Image DataContext="{Binding Source={StaticResource DataContextProxy}, Path=Value.ViewModels.AlbumArtViewModel}">
                             <Image.Style>
                                 <Style TargetType="{x:Type Image}">
-                                    <Setter Property="Source" Value="{Binding AlbumArt, FallbackValue={StaticResource AlbumArtFallback}}"/>
+                                    <Setter Property="Source" Value="{Binding AlbumArt, FallbackValue={StaticResource AlbumArtFallback}}" />
                                     <Style.Triggers>
                                         <DataTrigger Binding="{Binding AlbumArt}" Value="{x:Null}">
-                                            <Setter Property="Source" Value="{Binding PlaceholderPath,               
-                                                    Converter={x:Static converters:Converters.PathToImageSource},
-                                                    FallbackValue={StaticResource AlbumArtFallback},
-                                                    TargetNullValue={StaticResource AlbumArtFallback}}"/>
+                                            <Setter Property="Source" Value="{Binding PlaceholderPath, Converter={x:Static converters:Converters.PathToImageSource}, FallbackValue={StaticResource AlbumArtFallback}, TargetNullValue={StaticResource AlbumArtFallback}}" />
                                         </DataTrigger>
                                     </Style.Triggers>
                                 </Style>
@@ -167,13 +191,15 @@
                     </Viewbox>
                     <ToolTip.Style>
                         <Style TargetType="{x:Type ToolTip}">
-                            <Setter Property="Opacity" Value="1"/>
+                            <Setter Property="Opacity" Value="1" />
                             <Style.Triggers>
                                 <EventTrigger RoutedEvent="Opened">
                                     <BeginStoryboard>
                                         <Storyboard>
                                             <DoubleAnimation Storyboard.TargetProperty="Opacity"
-                                                                     From="0" To="1" Duration="0:0:0.3"/>
+                                                             From="0"
+                                                             To="1"
+                                                             Duration="0:0:0.3" />
                                         </Storyboard>
                                     </BeginStoryboard>
                                 </EventTrigger>
@@ -183,136 +209,158 @@
                 </ToolTip>
             </Viewbox.ToolTip>
         </Viewbox>
-        <Button x:Name="PlayPauseButton" DataContext="{Binding ViewModels.PlayPauseButtonViewModel}"
+        <Button x:Name="PlayPauseButton"
                 Width="{Binding Width}"
                 Height="{Binding Height}"
                 behaviors:CanvasPositioning.Anchor="{Binding Anchor}"
                 behaviors:CanvasPositioning.AnchorXDistance="{Binding XPosition}"
                 behaviors:CanvasPositioning.AnchorYDistance="{Binding YPosition}"
-                Visibility="{Binding IsVisible, Converter={x:Static converters:Converters.BoolToVisibility}}"
+                Command="{Binding PlayPauseTrackCommand}"
+                DataContext="{Binding ViewModels.PlayPauseButtonViewModel}"
                 Style="{StaticResource ToolbarPlayPauseButtonStyle}"
-                Command="{Binding PlayPauseTrackCommand}"/>
-        <Button x:Name="NextButton" DataContext="{Binding ViewModels.NextButtonViewModel}"
+                Visibility="{Binding IsVisible, Converter={x:Static converters:Converters.BoolToVisibility}}" />
+        <Button x:Name="NextButton"
                 Width="{Binding Width}"
                 Height="{Binding Height}"
-                Visibility="{Binding IsVisible, Converter={x:Static converters:Converters.BoolToVisibility}}"
                 behaviors:CanvasPositioning.Anchor="{Binding Anchor}"
                 behaviors:CanvasPositioning.AnchorXDistance="{Binding XPosition}"
                 behaviors:CanvasPositioning.AnchorYDistance="{Binding YPosition}"
+                Command="{Binding NextTrackCommand}"
+                DataContext="{Binding ViewModels.NextButtonViewModel}"
                 Style="{StaticResource ToolbarNextButtonStyle}"
-                Command="{Binding NextTrackCommand}"/>
-        <Button x:Name="PreviousButton" DataContext="{Binding ViewModels.PreviousButtonViewModel}"
+                Visibility="{Binding IsVisible, Converter={x:Static converters:Converters.BoolToVisibility}}" />
+        <Button x:Name="PreviousButton"
                 Width="{Binding Width}"
                 Height="{Binding Height}"
-                Visibility="{Binding IsVisible, Converter={x:Static converters:Converters.BoolToVisibility}}"
                 behaviors:CanvasPositioning.Anchor="{Binding Anchor}"
                 behaviors:CanvasPositioning.AnchorXDistance="{Binding XPosition}"
                 behaviors:CanvasPositioning.AnchorYDistance="{Binding YPosition}"
+                Command="{Binding PreviousTrackCommand}"
+                DataContext="{Binding ViewModels.PreviousButtonViewModel}"
                 Style="{StaticResource ToolbarPreviousButtonStyle}"
-                Command="{Binding PreviousTrackCommand}"/>
-        <Button x:Name="RepeatModeButton" DataContext="{Binding ViewModels.RepeatModeButtonViewModel}"
+                Visibility="{Binding IsVisible, Converter={x:Static converters:Converters.BoolToVisibility}}" />
+        <Button x:Name="RepeatModeButton"
                 Width="{Binding Width}"
                 Height="{Binding Height}"
-                Visibility="{Binding IsVisible, Converter={x:Static converters:Converters.BoolToVisibility}}"
                 behaviors:CanvasPositioning.Anchor="{Binding Anchor}"
                 behaviors:CanvasPositioning.AnchorXDistance="{Binding XPosition}"
                 behaviors:CanvasPositioning.AnchorYDistance="{Binding YPosition}"
+                Command="{Binding CycleRepeatModeCommand}"
+                DataContext="{Binding ViewModels.RepeatModeButtonViewModel}"
                 Style="{StaticResource ToolbarRepeatModeButtonStyle}"
-                Command="{Binding CycleRepeatModeCommand}"/>
-        <Button x:Name="ShuffleModeButton" DataContext="{Binding ViewModels.ShuffleModeButtonViewModel}"
+                Visibility="{Binding IsVisible, Converter={x:Static converters:Converters.BoolToVisibility}}" />
+        <Button x:Name="ShuffleModeButton"
                 Width="{Binding Width}"
                 Height="{Binding Height}"
-                Visibility="{Binding IsVisible, Converter={x:Static converters:Converters.BoolToVisibility}}"
                 behaviors:CanvasPositioning.Anchor="{Binding Anchor}"
                 behaviors:CanvasPositioning.AnchorXDistance="{Binding XPosition}"
                 behaviors:CanvasPositioning.AnchorYDistance="{Binding YPosition}"
+                Command="{Binding ToggleShuffleCommand}"
+                DataContext="{Binding ViewModels.ShuffleModeButtonViewModel}"
                 Style="{StaticResource ToolbarShuffleModeButtonStyle}"
-                Command="{Binding ToggleShuffleCommand}"/>
-        <Slider x:Name="ProgressBar" DataContext="{Binding ViewModels.ProgressBarViewModel}"
-                Width="{Binding Width}" Height="{Binding Height}"
-                Visibility="{Binding IsVisible, Converter={x:Static converters:Converters.BoolToVisibility}}"
+                Visibility="{Binding IsVisible, Converter={x:Static converters:Converters.BoolToVisibility}}" />
+        <Slider x:Name="ProgressBar"
+                Width="{Binding Width}"
+                Height="{Binding Height}"
                 behaviors:CanvasPositioning.Anchor="{Binding Anchor}"
                 behaviors:CanvasPositioning.AnchorXDistance="{Binding XPosition}"
                 behaviors:CanvasPositioning.AnchorYDistance="{Binding YPosition}"
+                DataContext="{Binding ViewModels.ProgressBarViewModel}"
+                Maximum="{Binding TrackLength, Converter={x:Static converters:Converters.TimeSpanToMs}, Mode=OneWay}"
+                Minimum="0"
                 Style="{StaticResource ProgressBarStyle}"
-                Minimum="0" Maximum="{Binding TrackLength, Converter={x:Static converters:Converters.TimeSpanToMs}, Mode=OneWay}">
+                Visibility="{Binding IsVisible, Converter={x:Static converters:Converters.BoolToVisibility}}">
             <i:Interaction.Behaviors>
-                <behaviors:SliderThrottle FinalValue="{Binding TrackProgress, Converter={x:Static converters:Converters.TimeSpanToMs}, Mode=TwoWay}"/>
-                <behaviors:SliderClickAndDrag/>
+                <behaviors:SliderThrottle FinalValue="{Binding TrackProgress, Converter={x:Static converters:Converters.TimeSpanToMs}, Mode=TwoWay}" />
+                <behaviors:SliderClickAndDrag />
             </i:Interaction.Behaviors>
         </Slider>
-        <ItemsControl x:Name="CustomLabels" ItemsSource="{Binding ViewModels.CustomLabelsViewModel.CustomLabels}"
-                                        Width="{Binding ViewModels.AudioBandViewModel.Width}" Height="{Binding ViewModels.AudioBandViewModel.Height}">
+        <ItemsControl x:Name="CustomLabels"
+                      Width="{Binding ViewModels.AudioBandViewModel.Width}"
+                      Height="{Binding ViewModels.AudioBandViewModel.Height}"
+                      ItemsSource="{Binding ViewModels.CustomLabelsViewModel.CustomLabels}">
             <ItemsControl.ItemsPanel>
                 <ItemsPanelTemplate>
-                    <Canvas/>
+                    <Canvas />
                 </ItemsPanelTemplate>
             </ItemsControl.ItemsPanel>
             <ItemsControl.ItemContainerStyle>
                 <Style TargetType="ContentPresenter">
-                    <Setter Property="behaviors:CanvasPositioning.Anchor" Value="{Binding Anchor}"/>
+                    <Setter Property="behaviors:CanvasPositioning.Anchor" Value="{Binding Anchor}" />
                     <Setter Property="behaviors:CanvasPositioning.AnchorXDistance" Value="{Binding XPosition}" />
                     <Setter Property="behaviors:CanvasPositioning.AnchorYDistance" Value="{Binding YPosition}" />
                 </Style>
             </ItemsControl.ItemContainerStyle>
             <ItemsControl.ItemTemplate>
                 <DataTemplate DataType="{x:Type viewModels:CustomLabelViewModel}">
-                    <Canvas Width="{Binding Width}" Height="{Binding Height}" ClipToBounds="True" Background="Transparent">
+                    <Canvas Width="{Binding Width}"
+                            Height="{Binding Height}"
+                            Background="Transparent"
+                            ClipToBounds="True">
                         <i:Interaction.Behaviors>
-                            <behaviors:MarqueeContainer ScrollDuration="{Binding ScrollSpeed}" 
+                            <behaviors:MarqueeContainer IsPlaying="{Binding IsPlaying}"
+                                                        ScrollBehavior="{Binding ScrollBehavior}"
+                                                        ScrollDuration="{Binding ScrollSpeed}"
                                                         TargetChild="{Binding ElementName=TextBlock1}"
                                                         TargetCopy="{Binding ElementName=TextBlockCopy}"
-                                                        TextOverflow="{Binding TextOverflow}"
-                                                        ScrollBehavior="{Binding ScrollBehavior}"
-                                                        IsPlaying="{Binding IsPlaying}"/>
+                                                        TextOverflow="{Binding TextOverflow}" />
                         </i:Interaction.Behaviors>
-                        <TextBlock x:Name="TextBlock1" behaviors:TextBlockTextSegments.TextSegments="{Binding TextSegments}"
-                                   MinWidth="{Binding Width}" MinHeight="{Binding Height}"
-                                   Visibility="{Binding IsVisible, Converter={x:Static converters:Converters.BoolToVisibility}}"
+                        <TextBlock x:Name="TextBlock1"
+                                   MinWidth="{Binding Width}"
+                                   MinHeight="{Binding Height}"
+                                   VerticalAlignment="Center"
+                                   behaviors:TextBlockTextSegments.TextSegments="{Binding TextSegments}"
+                                   FontFamily="{Binding FontFamily}"
+                                   FontSize="{Binding FontSize}"
                                    Foreground="{Binding Color, Converter={x:Static converters:Converters.ColorToBrush}}"
-                                   FontSize="{Binding FontSize}" FontFamily="{Binding FontFamily}"
-                                   VerticalAlignment="Center" TextTrimming="None" TextWrapping="NoWrap"
-                                   TextAlignment="{Binding TextAlignment, Converter={x:Static converters:Converters.TextAlignment}}">
-                        </TextBlock>
-                        <TextBlock x:Name="TextBlockCopy" behaviors:TextBlockTextSegments.TextSegments="{Binding TextSegments}"
-                                   MinWidth="{Binding Width}" MinHeight="{Binding Height}"
-                                   Visibility="{Binding IsVisible, Converter={x:Static converters:Converters.BoolToVisibility}}"
+                                   TextAlignment="{Binding TextAlignment, Converter={x:Static converters:Converters.TextAlignment}}"
+                                   TextTrimming="None"
+                                   TextWrapping="NoWrap"
+                                   Visibility="{Binding IsVisible, Converter={x:Static converters:Converters.BoolToVisibility}}" />
+                        <TextBlock x:Name="TextBlockCopy"
+                                   MinWidth="{Binding Width}"
+                                   MinHeight="{Binding Height}"
+                                   VerticalAlignment="Center"
+                                   behaviors:TextBlockTextSegments.TextSegments="{Binding TextSegments}"
+                                   FontFamily="{Binding FontFamily}"
+                                   FontSize="{Binding FontSize}"
                                    Foreground="{Binding Color, Converter={x:Static converters:Converters.ColorToBrush}}"
-                                   FontSize="{Binding FontSize}" FontFamily="{Binding FontFamily}"
-                                   VerticalAlignment="Center" TextTrimming="None" TextWrapping="NoWrap" Opacity="0"
-                                   TextAlignment="{Binding TextAlignment, Converter={x:Static converters:Converters.TextAlignment}}">
-                        </TextBlock>
+                                   Opacity="0"
+                                   TextAlignment="{Binding TextAlignment, Converter={x:Static converters:Converters.TextAlignment}}"
+                                   TextTrimming="None"
+                                   TextWrapping="NoWrap"
+                                   Visibility="{Binding IsVisible, Converter={x:Static converters:Converters.BoolToVisibility}}" />
                         <Canvas.Style>
                             <Style TargetType="{x:Type Canvas}">
                                 <Style.Resources>
-                                    <LinearGradientBrush x:Key="Mask" StartPoint="0,0" MappingMode="Absolute">
-                                        <!-- Use mapping mode absolute because relative mode is relative to the child text instead of the canvas -->
+                                    <LinearGradientBrush x:Key="Mask" MappingMode="Absolute" StartPoint="0,0">
+                                        <!--  Use mapping mode absolute because relative mode is relative to the child text instead of the canvas  -->
                                         <LinearGradientBrush.EndPoint>
                                             <MultiBinding Converter="{x:Static converters:MultiConverters.Point}">
-                                                <Binding RelativeSource="{RelativeSource AncestorType={x:Type Canvas}}" Path="ActualWidth"/>
+                                                <Binding Path="ActualWidth" RelativeSource="{RelativeSource AncestorType={x:Type Canvas}}" />
                                                 <Binding>
                                                     <Binding.Source>0.0</Binding.Source>
                                                 </Binding>
                                             </MultiBinding>
                                         </LinearGradientBrush.EndPoint>
                                         <LinearGradientBrush.GradientStops>
-                                            <GradientStop Color="Transparent" Offset="0"/>
-                                            <GradientStop Color="Black" Offset="{Binding LeftFadeOffset}"/>
-                                            <GradientStop Color="Black" Offset="{Binding RightFadeOffset}"/>
-                                            <GradientStop Color="Transparent" Offset="1"/>
+                                            <GradientStop Offset="0" Color="Transparent" />
+                                            <GradientStop Offset="{Binding LeftFadeOffset}" Color="Black" />
+                                            <GradientStop Offset="{Binding RightFadeOffset}" Color="Black" />
+                                            <GradientStop Offset="1" Color="Transparent" />
                                         </LinearGradientBrush.GradientStops>
                                     </LinearGradientBrush>
                                 </Style.Resources>
                                 <Style.Triggers>
                                     <DataTrigger Binding="{Binding FadeEffect}" Value="{x:Static models:TextFadeEffect.Always}">
-                                        <Setter Property="OpacityMask" Value="{StaticResource Mask}"/>
+                                        <Setter Property="OpacityMask" Value="{StaticResource Mask}" />
                                     </DataTrigger>
                                     <MultiDataTrigger>
                                         <MultiDataTrigger.Conditions>
-                                            <Condition Binding="{Binding FadeEffect}" Value="{x:Static models:TextFadeEffect.OnlyWhenScrolling}"/>
-                                            <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(behaviors:MarqueeContainer.IsScrolling)}" Value="True"/>
+                                            <Condition Binding="{Binding FadeEffect}" Value="{x:Static models:TextFadeEffect.OnlyWhenScrolling}" />
+                                            <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(behaviors:MarqueeContainer.IsScrolling)}" Value="True" />
                                         </MultiDataTrigger.Conditions>
-                                        <Setter Property="OpacityMask" Value="{StaticResource Mask}"/>
+                                        <Setter Property="OpacityMask" Value="{StaticResource Mask}" />
                                     </MultiDataTrigger>
                                 </Style.Triggers>
                             </Style>
diff --git a/src/AudioBand/Views/Dialogs/AboutDialog.xaml b/src/AudioBand/Views/Dialogs/AboutDialog.xaml
index 0802041b..40f17494 100644
--- a/src/AudioBand/Views/Dialogs/AboutDialog.xaml
+++ b/src/AudioBand/Views/Dialogs/AboutDialog.xaml
@@ -1,43 +1,47 @@
 <Window x:Class="AudioBand.Views.Dialogs.AboutDialog"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:viewmodels="clr-namespace:AudioBand.ViewModels"
-             xmlns:theme="clr-namespace:AudioBand.Resources.Theming"
-             xmlns:PresentationOptions="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
-             xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
-             xmlns:behaviors="clr-namespace:AudioBand.Behaviors"
-             xmlns:resources="clr-namespace:AudioBand.Resources"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800"
-             Icon="pack://application:,,,/AudioBand;component/audioband.ico"
-             Width="600" Height="500"
-             WindowStartupLocation="CenterScreen"
-             Title="About Audio Band"
-             Foreground="{theme:ThemeResource SystemBaseHighColor}"
-             Background="{theme:ThemeResource SystemAltHighColor}">
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:PresentationOptions="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
+        xmlns:behaviors="clr-namespace:AudioBand.Behaviors"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:resources="clr-namespace:AudioBand.Resources"
+        xmlns:theme="clr-namespace:AudioBand.Resources.Theming"
+        xmlns:viewmodels="clr-namespace:AudioBand.ViewModels"
+        Title="About Audio Band"
+        Width="600"
+        Height="500"
+        d:DesignHeight="450"
+        d:DesignWidth="800"
+        Background="{theme:ThemeResource SystemAltHighColor}"
+        Foreground="{theme:ThemeResource SystemBaseHighColor}"
+        Icon="pack://application:,,,/AudioBand;component/audioband.ico"
+        WindowStartupLocation="CenterScreen"
+        mc:Ignorable="d">
     <i:Interaction.Behaviors>
-        <behaviors:AppUserModelID/>
-        <behaviors:DpiScaling/>
+        <behaviors:AppUserModelID />
+        <behaviors:DpiScaling />
     </i:Interaction.Behaviors>
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <resources:SharedDictionary Source="../../Resources/SettingsWindowStyle.xaml"/>
-                <resources:SharedDictionary Source="../../Resources/Strings.xaml"/>
+                <resources:SharedDictionary Source="../../Resources/SettingsWindowStyle.xaml" />
+                <resources:SharedDictionary Source="../../Resources/Strings.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Window.Resources>
     <Window.DataContext>
-        <viewmodels:AboutDialogViewModel/>
+        <viewmodels:AboutDialogViewModel />
     </Window.DataContext>
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="300"/>
-            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="300" />
+            <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
-        <StackPanel Grid.Column="0" Orientation="Vertical" VerticalAlignment="Center">
+        <StackPanel Grid.Column="0"
+                    VerticalAlignment="Center"
+                    Orientation="Vertical">
             <Image Width="200" Height="200">
                 <Image.Source>
                     <DrawingImage PresentationOptions:Freeze="True">
@@ -53,57 +57,77 @@
                     </DrawingImage>
                 </Image.Source>
             </Image>
-            <TextBlock HorizontalAlignment="Center" FontSize="{StaticResource HeaderFontSize}" Text="Audio Band" FontWeight="Bold"/>
-            <TextBlock HorizontalAlignment="Center" Margin="0, 10" FontSize="14" Text="{Binding Version}"/>
+            <TextBlock HorizontalAlignment="Center"
+                       FontSize="{StaticResource HeaderFontSize}"
+                       FontWeight="Bold"
+                       Text="Audio Band" />
+            <TextBlock Margin="0,10"
+                       HorizontalAlignment="Center"
+                       FontSize="14"
+                       Text="{Binding Version}" />
         </StackPanel>
         <Grid Grid.Column="1">
             <Grid.RowDefinitions>
-                <RowDefinition Height="*"/>
-                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
-            <StackPanel Grid.Row="0" Orientation="Vertical" VerticalAlignment="Stretch">
+            <StackPanel Grid.Row="0"
+                        VerticalAlignment="Stretch"
+                        Orientation="Vertical">
                 <StackPanel.Margin>
-                    <Thickness Top="{x:Static SystemParameters.CaptionHeight}"/>
+                    <Thickness Top="{x:Static SystemParameters.CaptionHeight}" />
                 </StackPanel.Margin>
                 <StackPanel.Resources>
-                    <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-                        <Setter Property="FontSize" Value="{StaticResource BodyFontSize}"/>
-                        <Setter Property="TextWrapping" Value="Wrap"/>
-                        <Setter Property="Margin" Value="5"/>
+                    <Style BasedOn="{StaticResource {x:Type TextBlock}}" TargetType="{x:Type TextBlock}">
+                        <Setter Property="FontSize" Value="{StaticResource BodyFontSize}" />
+                        <Setter Property="TextWrapping" Value="Wrap" />
+                        <Setter Property="Margin" Value="5" />
                     </Style>
                 </StackPanel.Resources>
-                <TextBlock Text="{StaticResource AudioBandAboutDialogDescription}"/>
+                <TextBlock Text="{StaticResource AudioBandAboutDialogDescription}" />
                 <TextBlock>
-                    <Run Text="{StaticResource AudioBandAboutDialogProjectPre}"/>
-                    <Hyperlink NavigateUri="{Binding ProjectLink}" Command="{Binding OpenLinkCommand}" CommandParameter="{Binding ProjectLink}">
-                        <Run Text="{Binding ProjectLink, Mode=OneTime}"/>
+                    <Run Text="{StaticResource AudioBandAboutDialogProjectPre}" />
+                    <Hyperlink Command="{Binding OpenLinkCommand}"
+                               CommandParameter="{Binding ProjectLink}"
+                               NavigateUri="{Binding ProjectLink}">
+                        <Run Text="{Binding ProjectLink, Mode=OneTime}" />
                     </Hyperlink>
                 </TextBlock>
                 <TextBlock>
-                    <Hyperlink NavigateUri="{Binding LicenseLink}" Command="{Binding OpenLinkCommand}" CommandParameter="{Binding LicenseLink}">
-                        <Run Text="{StaticResource AudioBandAboutDialogLicenseLinkText}"/>
+                    <Hyperlink Command="{Binding OpenLinkCommand}"
+                               CommandParameter="{Binding LicenseLink}"
+                               NavigateUri="{Binding LicenseLink}">
+                        <Run Text="{StaticResource AudioBandAboutDialogLicenseLinkText}" />
                     </Hyperlink>
                 </TextBlock>
                 <TextBlock>
-                    <Hyperlink NavigateUri="{Binding ThirdPartyLicenseLink}" Command="{Binding OpenLinkCommand}" CommandParameter="{Binding ThirdPartyLicenseLink}">
-                        <Run Text="{StaticResource AudioBandAboutDialogThirdPartyLicenseLink}"/>
+                    <Hyperlink Command="{Binding OpenLinkCommand}"
+                               CommandParameter="{Binding ThirdPartyLicenseLink}"
+                               NavigateUri="{Binding ThirdPartyLicenseLink}">
+                        <Run Text="{StaticResource AudioBandAboutDialogThirdPartyLicenseLink}" />
                     </Hyperlink>
                 </TextBlock>
                 <TextBlock>
                     <Hyperlink Command="{Binding OpenSettingsFolderCommand}">
-                        <Run Text="{StaticResource AudioBandAboutDialogSettingsLinkText}"/>
+                        <Run Text="{StaticResource AudioBandAboutDialogSettingsLinkText}" />
                     </Hyperlink>
                 </TextBlock>
                 <TextBlock>
                     <Hyperlink Command="{Binding OpenLog}">
-                        <Run Text="{StaticResource AudioBandAboutDialogLogsLink}"/>
+                        <Run Text="{StaticResource AudioBandAboutDialogLogsLink}" />
                     </Hyperlink>
                 </TextBlock>
-                <TextBlock Text="Logo by @mirzazulfan"/>
+                <TextBlock Text="Logo by @mirzazulfan" />
             </StackPanel>
-            <Button Grid.Row="1" Content="{StaticResource OkButtonText}" IsDefault="True" IsCancel="True" Width="80"
-                    HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="8"
-                    Click="OkButtonOnClick"/>
+            <Button Grid.Row="1"
+                    Width="80"
+                    Margin="8"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Bottom"
+                    Click="OkButtonOnClick"
+                    Content="{StaticResource OkButtonText}"
+                    IsCancel="True"
+                    IsDefault="True" />
         </Grid>
     </Grid>
 </Window>
diff --git a/src/AudioBand/Views/Dialogs/ConfirmationDialog.xaml b/src/AudioBand/Views/Dialogs/ConfirmationDialog.xaml
index cfac8883..a6e84c53 100644
--- a/src/AudioBand/Views/Dialogs/ConfirmationDialog.xaml
+++ b/src/AudioBand/Views/Dialogs/ConfirmationDialog.xaml
@@ -1,93 +1,113 @@
 <Window x:Class="AudioBand.Views.Dialogs.ConfirmationDialog"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:behaviors="clr-namespace:AudioBand.Behaviors"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
-        xmlns:behaviors="clr-namespace:AudioBand.Behaviors"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:resources="clr-namespace:AudioBand.Resources"
         xmlns:theme="clr-namespace:AudioBand.Resources.Theming"
-        mc:Ignorable="d"
-        WindowStartupLocation="CenterScreen"
-        Icon="pack://application:,,,/AudioBand;component/audioband.ico"
-        WindowStyle="None"
         x:Name="ConfirmationDialogWindow"
-        MinHeight="200" MinWidth="300"
-        Height="250" Width="450"
-        SizeToContent="Height"
+        Width="450"
+        Height="250"
+        MinWidth="300"
+        MinHeight="200"
+        Background="{theme:ThemeResource SystemAltHighColor}"
         Foreground="{theme:ThemeResource SystemBaseHighColor}"
-        Background="{theme:ThemeResource SystemAltHighColor}">
+        Icon="pack://application:,,,/AudioBand;component/audioband.ico"
+        SizeToContent="Height"
+        WindowStartupLocation="CenterScreen"
+        WindowStyle="None"
+        mc:Ignorable="d">
     <i:Interaction.Behaviors>
-        <behaviors:AppUserModelID/>
-        <behaviors:DpiScaling/>
+        <behaviors:AppUserModelID />
+        <behaviors:DpiScaling />
     </i:Interaction.Behaviors>
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <resources:SharedDictionary Source="../../Resources/SettingsWindowStyle.xaml"/>
-                <resources:SharedDictionary Source="../../Resources/Strings.xaml"/>
+                <resources:SharedDictionary Source="../../Resources/SettingsWindowStyle.xaml" />
+                <resources:SharedDictionary Source="../../Resources/Strings.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Window.Resources>
     <Grid Margin="20">
         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="*"/>
-            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
-        <TextBlock FontSize="{StaticResource TitleFontSize}" Grid.Row="0" x:Name="MessageTitle" TextWrapping="Wrap">
+        <TextBlock x:Name="MessageTitle"
+                   Grid.Row="0"
+                   FontSize="{StaticResource TitleFontSize}"
+                   TextWrapping="Wrap">
             <TextBlock.Style>
-                <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+                <Style BasedOn="{StaticResource {x:Type TextBlock}}" TargetType="{x:Type TextBlock}">
                     <Style.Triggers>
                         <DataTrigger Binding="{Binding ElementName=ConfirmationDialogWindow, Path=DialogType}" Value="DeleteLabel">
-                            <Setter Property="Text" Value="{StaticResource DeleteLabelDialogTitle}"/>
+                            <Setter Property="Text" Value="{StaticResource DeleteLabelDialogTitle}" />
                         </DataTrigger>
                         <DataTrigger Binding="{Binding ElementName=ConfirmationDialogWindow, Path=DialogType}" Value="DiscardChanges">
-                            <Setter Property="Text" Value="{StaticResource DiscardChangesDialogTitle}"/>
+                            <Setter Property="Text" Value="{StaticResource DiscardChangesDialogTitle}" />
                         </DataTrigger>
                         <DataTrigger Binding="{Binding ElementName=ConfirmationDialogWindow, Path=DialogType}" Value="DeleteProfile">
-                            <Setter Property="Text" Value="{StaticResource DeleteProfileDialogTitle}"/>
+                            <Setter Property="Text" Value="{StaticResource DeleteProfileDialogTitle}" />
                         </DataTrigger>
                     </Style.Triggers>
                 </Style>
             </TextBlock.Style>
         </TextBlock>
-        <TextBlock FontSize="{StaticResource BodyFontSize}" Grid.Row="1" x:Name="MessageBody" Margin="0, 20" TextWrapping="Wrap">
+        <TextBlock x:Name="MessageBody"
+                   Grid.Row="1"
+                   Margin="0,20"
+                   FontSize="{StaticResource BodyFontSize}"
+                   TextWrapping="Wrap">
             <TextBlock.Style>
-                <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+                <Style BasedOn="{StaticResource {x:Type TextBlock}}" TargetType="{x:Type TextBlock}">
                     <Style.Triggers>
                         <DataTrigger Binding="{Binding ElementName=ConfirmationDialogWindow, Path=DialogType}" Value="DeleteLabel">
-                            <Setter Property="Text" Value="{Binding ElementName=ConfirmationDialogWindow, Path=DialogData[0], StringFormat={StaticResource DeleteLabelDialogBody}}"/>
+                            <Setter Property="Text" Value="{Binding ElementName=ConfirmationDialogWindow, Path=DialogData[0], StringFormat={StaticResource DeleteLabelDialogBody}}" />
                         </DataTrigger>
                         <DataTrigger Binding="{Binding ElementName=ConfirmationDialogWindow, Path=DialogType}" Value="DiscardChanges">
-                            <Setter Property="Text" Value="{StaticResource DiscardChangesDialogBody}"/>
+                            <Setter Property="Text" Value="{StaticResource DiscardChangesDialogBody}" />
                         </DataTrigger>
                         <DataTrigger Binding="{Binding ElementName=ConfirmationDialogWindow, Path=DialogType}" Value="DeleteProfile">
-                            <Setter Property="Text" Value="{Binding ElementName=ConfirmationDialogWindow, Path=DialogData[0], StringFormat={StaticResource DeleteProfileDialogBody}}"/>
+                            <Setter Property="Text" Value="{Binding ElementName=ConfirmationDialogWindow, Path=DialogData[0], StringFormat={StaticResource DeleteProfileDialogBody}}" />
                         </DataTrigger>
                     </Style.Triggers>
                 </Style>
             </TextBlock.Style>
         </TextBlock>
-        <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right">
-            <Button x:Name="DefaultButton" IsDefault="True" Click="OkButtonOnClick" Width="100" Margin="8, 0">
+        <StackPanel Grid.Row="2"
+                    HorizontalAlignment="Right"
+                    Orientation="Horizontal">
+            <Button x:Name="DefaultButton"
+                    Width="100"
+                    Margin="8,0"
+                    Click="OkButtonOnClick"
+                    IsDefault="True">
                 <Button.Style>
-                    <Style TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+                    <Style BasedOn="{StaticResource {x:Type Button}}" TargetType="{x:Type Button}">
                         <Style.Triggers>
                             <DataTrigger Binding="{Binding ElementName=ConfirmationDialogWindow, Path=DialogType}" Value="DeleteLabel">
-                                <Setter Property="Content" Value="{StaticResource DeleteButtonText}"/>
+                                <Setter Property="Content" Value="{StaticResource DeleteButtonText}" />
                             </DataTrigger>
                             <DataTrigger Binding="{Binding ElementName=ConfirmationDialogWindow, Path=DialogType}" Value="DiscardChanges">
-                                <Setter Property="Content" Value="{StaticResource DiscardButtonText}"/>
+                                <Setter Property="Content" Value="{StaticResource DiscardButtonText}" />
                             </DataTrigger>
                             <DataTrigger Binding="{Binding ElementName=ConfirmationDialogWindow, Path=DialogType}" Value="DeleteProfile">
-                                <Setter Property="Content" Value="{StaticResource DeleteButtonText}"/>
+                                <Setter Property="Content" Value="{StaticResource DeleteButtonText}" />
                             </DataTrigger>
                         </Style.Triggers>
                     </Style>
                 </Button.Style>
             </Button>
-            <Button x:Name="CancelButton" IsCancel="True" Click="CancelButtonOnClick" Content="{StaticResource CancelButtonText}" Width="100" Margin="8, 0"/>
+            <Button x:Name="CancelButton"
+                    Width="100"
+                    Margin="8,0"
+                    Click="CancelButtonOnClick"
+                    Content="{StaticResource CancelButtonText}"
+                    IsCancel="True" />
         </StackPanel>
     </Grid>
 </Window>
diff --git a/src/AudioBand/Views/Dialogs/RenameProfileDialog.xaml b/src/AudioBand/Views/Dialogs/RenameProfileDialog.xaml
index 9538de6b..551b5f5b 100644
--- a/src/AudioBand/Views/Dialogs/RenameProfileDialog.xaml
+++ b/src/AudioBand/Views/Dialogs/RenameProfileDialog.xaml
@@ -1,50 +1,66 @@
 <Window x:Class="AudioBand.Views.Dialogs.RenameProfileDialog"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:behaviors="clr-namespace:AudioBand.Behaviors"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
-        xmlns:viewModels="clr-namespace:AudioBand.ViewModels"
-        xmlns:behaviors="clr-namespace:AudioBand.Behaviors"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:resources="clr-namespace:AudioBand.Resources"
         xmlns:theme="clr-namespace:AudioBand.Resources.Theming"
-        mc:Ignorable="d"
-        Icon="pack://application:,,,/AudioBand;component/audioband.ico"
-        WindowStyle="None"
-        MinHeight="180" MinWidth="300"
-        Height="200" Width="450"
+        xmlns:viewModels="clr-namespace:AudioBand.ViewModels"
         Title="RenameProfileDialog"
-        WindowStartupLocation="CenterScreen"
-        d:DataContext="{d:DesignInstance viewModels:RenameProfileDialogViewModel, IsDesignTimeCreatable=True}"
+        Width="450"
+        Height="200"
+        MinWidth="300"
+        MinHeight="180"
+        d:DataContext="{d:DesignInstance viewModels:RenameProfileDialogViewModel,
+                                         IsDesignTimeCreatable=True}"
+        Background="{theme:ThemeResource SystemAltHighColor}"
         Foreground="{theme:ThemeResource SystemBaseHighColor}"
-        Background="{theme:ThemeResource SystemAltHighColor}">
+        Icon="pack://application:,,,/AudioBand;component/audioband.ico"
+        WindowStartupLocation="CenterScreen"
+        WindowStyle="None"
+        mc:Ignorable="d">
     <i:Interaction.Behaviors>
-        <behaviors:AppUserModelID/>
-        <behaviors:DpiScaling/>
+        <behaviors:AppUserModelID />
+        <behaviors:DpiScaling />
     </i:Interaction.Behaviors>
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <resources:SharedDictionary Source="../../Resources/SettingsWindowStyle.xaml"/>
-                <resources:SharedDictionary Source="../../Resources/Strings.xaml"/>
+                <resources:SharedDictionary Source="../../Resources/SettingsWindowStyle.xaml" />
+                <resources:SharedDictionary Source="../../Resources/Strings.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Window.Resources>
     <Grid Margin="20">
         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
-        <TextBlock FontSize="{StaticResource TitleFontSize}" Grid.Row="0" TextWrapping="Wrap" 
-                   Text="{Binding CurrentName, StringFormat={StaticResource RenameProfileDialogTitle}}"/>
-        <TextBox x:Name="NameInput" Grid.Row="1" Margin="0, 20"
-                 Text="{Binding NewProfileName, ValidatesOnNotifyDataErrors=True, UpdateSourceTrigger=PropertyChanged}"/>
-        <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right">
-            <Button x:Name="OkButton" Content="{StaticResource OkButtonText}" Width="100" Margin="8, 0"
-                    Command="{Binding OkCommand}"/>
-            <Button x:Name="CancelButton" IsCancel="True" Content="{StaticResource CancelButtonText}" Width="100" Margin="0"
-                    Command="{Binding CancelCommand}"/>
+        <TextBlock Grid.Row="0"
+                   FontSize="{StaticResource TitleFontSize}"
+                   Text="{Binding CurrentName, StringFormat={StaticResource RenameProfileDialogTitle}}"
+                   TextWrapping="Wrap" />
+        <TextBox x:Name="NameInput"
+                 Grid.Row="1"
+                 Margin="0,20"
+                 Text="{Binding NewProfileName, ValidatesOnNotifyDataErrors=True, UpdateSourceTrigger=PropertyChanged}" />
+        <StackPanel Grid.Row="2"
+                    HorizontalAlignment="Right"
+                    Orientation="Horizontal">
+            <Button x:Name="OkButton"
+                    Width="100"
+                    Margin="8,0"
+                    Command="{Binding OkCommand}"
+                    Content="{StaticResource OkButtonText}" />
+            <Button x:Name="CancelButton"
+                    Width="100"
+                    Margin="0"
+                    Command="{Binding CancelCommand}"
+                    Content="{StaticResource CancelButtonText}"
+                    IsCancel="True" />
         </StackPanel>
     </Grid>
 </Window>
diff --git a/src/AudioBand/Views/Settings/AlbumArtSettingsView.xaml b/src/AudioBand/Views/Settings/AlbumArtSettingsView.xaml
index 42d666a3..2181bb4e 100644
--- a/src/AudioBand/Views/Settings/AlbumArtSettingsView.xaml
+++ b/src/AudioBand/Views/Settings/AlbumArtSettingsView.xaml
@@ -1,29 +1,35 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:AudioBand.Views.Settings"
-                    xmlns:viewmodels="clr-namespace:AudioBand.ViewModels"
-                    xmlns:metro="http://metro.mahapps.com/winfx/xaml/controls"
-                    xmlns:behaviors="clr-namespace:AudioBand.Behaviors"
-                    xmlns:resources="clr-namespace:AudioBand.Resources">
+                    xmlns:resources="clr-namespace:AudioBand.Resources"
+                    xmlns:viewmodels="clr-namespace:AudioBand.ViewModels">
     <DataTemplate DataType="{x:Type viewmodels:AlbumArtViewModel}">
         <DataTemplate.Resources>
             <ResourceDictionary>
                 <ResourceDictionary.MergedDictionaries>
-                    <resources:SharedDictionary Source="../../Resources/Shared.xaml"/>
-                    <resources:SharedDictionary Source="../../Resources/Strings.xaml"/>
-                    <resources:SharedDictionary Source="../../Resources/SettingsWindowStyle.xaml"/>
-                    <resources:SharedDictionary Source="LayoutSettingsTemplate.xaml"/>
+                    <resources:SharedDictionary Source="../../Resources/Shared.xaml" />
+                    <resources:SharedDictionary Source="../../Resources/Strings.xaml" />
+                    <resources:SharedDictionary Source="../../Resources/SettingsWindowStyle.xaml" />
+                    <resources:SharedDictionary Source="LayoutSettingsTemplate.xaml" />
                 </ResourceDictionary.MergedDictionaries>
             </ResourceDictionary>
         </DataTemplate.Resources>
         <StackPanel Style="{StaticResource SettingsStackPanel}">
-            <ContentPresenter Content="{Binding}" ContentTemplate="{StaticResource LayoutSettingsTemplate}"/>
+            <ContentPresenter Content="{Binding}" ContentTemplate="{StaticResource LayoutSettingsTemplate}" />
 
-            <TextBlock Text="{StaticResource AlbumArtPlaceholderSectionText}" Style="{StaticResource TitleTextBlock}" Margin="{StaticResource SectionMargin}"/>
-            <local:ImagePicker ImagePath="{Binding PlaceholderPath, Mode=TwoWay}" DialogService="{Binding DialogService}" Title="{StaticResource AlbumArtPlaceholderDescription}"/>
+            <TextBlock Margin="{StaticResource SectionMargin}"
+                       Style="{StaticResource TitleTextBlock}"
+                       Text="{StaticResource AlbumArtPlaceholderSectionText}" />
+            <local:ImagePicker Title="{StaticResource AlbumArtPlaceholderDescription}"
+                               DialogService="{Binding DialogService}"
+                               ImagePath="{Binding PlaceholderPath, Mode=TwoWay}" />
 
-            <TextBlock Text="{StaticResource OtherSectionText}" Style="{StaticResource TitleTextBlock}" Margin="{StaticResource SectionMargin}"/>
-            <Button HorizontalAlignment="Left" Content="{StaticResource ResetButtonText}" Command="{Binding ResetCommand}"/>
+            <TextBlock Margin="{StaticResource SectionMargin}"
+                       Style="{StaticResource TitleTextBlock}"
+                       Text="{StaticResource OtherSectionText}" />
+            <Button HorizontalAlignment="Left"
+                    Command="{Binding ResetCommand}"
+                    Content="{StaticResource ResetButtonText}" />
         </StackPanel>
     </DataTemplate>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/AudioBand/Views/Settings/AlbumPopupSettingsView.xaml b/src/AudioBand/Views/Settings/AlbumPopupSettingsView.xaml
index c3e9484a..e7b6c857 100644
--- a/src/AudioBand/Views/Settings/AlbumPopupSettingsView.xaml
+++ b/src/AudioBand/Views/Settings/AlbumPopupSettingsView.xaml
@@ -1,36 +1,44 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:viewmodels="clr-namespace:AudioBand.ViewModels"
-                 xmlns:metro="http://metro.mahapps.com/winfx/xaml/controls"
-                 xmlns:behaviors="clr-namespace:AudioBand.Behaviors"
-                 xmlns:resources="clr-namespace:AudioBand.Resources">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:behaviors="clr-namespace:AudioBand.Behaviors"
+                    xmlns:metro="http://metro.mahapps.com/winfx/xaml/controls"
+                    xmlns:resources="clr-namespace:AudioBand.Resources"
+                    xmlns:viewmodels="clr-namespace:AudioBand.ViewModels">
     <DataTemplate DataType="{x:Type viewmodels:AlbumArtPopupViewModel}">
         <DataTemplate.Resources>
             <ResourceDictionary>
                 <ResourceDictionary.MergedDictionaries>
-                    <resources:SharedDictionary Source="../../Resources/Shared.xaml"/>
-                    <resources:SharedDictionary Source="../../Resources/Strings.xaml"/>
-                    <resources:SharedDictionary Source="../../Resources/SettingsWindowStyle.xaml"/>
+                    <resources:SharedDictionary Source="../../Resources/Shared.xaml" />
+                    <resources:SharedDictionary Source="../../Resources/Strings.xaml" />
+                    <resources:SharedDictionary Source="../../Resources/SettingsWindowStyle.xaml" />
                 </ResourceDictionary.MergedDictionaries>
             </ResourceDictionary>
         </DataTemplate.Resources>
         <StackPanel Style="{StaticResource SettingsStackPanel}">
-            <TextBlock Text="{StaticResource DisplaySectionText}" Style="{StaticResource TitleTextBlock}"/>
-            <TextBlock Text="{StaticResource VisibilityLabelText}" Style="{StaticResource DescriptionTextBlock}"/>
-            <metro:ToggleSwitch OnLabel="{StaticResource StatusVisible}" OffLabel="{StaticResource StatusHidden}" IsChecked="{Binding IsVisible, Mode=TwoWay}"/>
-            <UniformGrid Rows="4" Columns="2" Style="{StaticResource ArrangementGridStyle}">
-                <TextBlock Text="{StaticResource WidthLabelText}" Style="{StaticResource DescriptionTextBlock}"/>
-                <TextBlock Text="{StaticResource HeightLabelText}" Style="{StaticResource DescriptionTextBlock}"/>
-                <metro:NumericUpDown behaviors:NumericInput.Type="Size" Value="{Binding Width, Mode=TwoWay}"/>
-                <metro:NumericUpDown behaviors:NumericInput.Type="Size" Value="{Binding Height, Mode=TwoWay}"/>
-                <TextBlock Text="{StaticResource XPositionLabelText}" Style="{StaticResource DescriptionTextBlock}"/>
-                <TextBlock Text="{StaticResource YPositionLabelText}" Style="{StaticResource DescriptionTextBlock}"/>
-                <metro:NumericUpDown behaviors:NumericInput.Type="Position" Value="{Binding XPosition, Mode=TwoWay}"/>
-                <metro:NumericUpDown behaviors:NumericInput.Type="Position" Value="{Binding Margin, Mode=TwoWay}"/>
+            <TextBlock Style="{StaticResource TitleTextBlock}" Text="{StaticResource DisplaySectionText}" />
+            <TextBlock Style="{StaticResource DescriptionTextBlock}" Text="{StaticResource VisibilityLabelText}" />
+            <metro:ToggleSwitch IsChecked="{Binding IsVisible, Mode=TwoWay}"
+                                OffLabel="{StaticResource StatusHidden}"
+                                OnLabel="{StaticResource StatusVisible}" />
+            <UniformGrid Columns="2"
+                         Rows="4"
+                         Style="{StaticResource ArrangementGridStyle}">
+                <TextBlock Style="{StaticResource DescriptionTextBlock}" Text="{StaticResource WidthLabelText}" />
+                <TextBlock Style="{StaticResource DescriptionTextBlock}" Text="{StaticResource HeightLabelText}" />
+                <metro:NumericUpDown behaviors:NumericInput.Type="Size" Value="{Binding Width, Mode=TwoWay}" />
+                <metro:NumericUpDown behaviors:NumericInput.Type="Size" Value="{Binding Height, Mode=TwoWay}" />
+                <TextBlock Style="{StaticResource DescriptionTextBlock}" Text="{StaticResource XPositionLabelText}" />
+                <TextBlock Style="{StaticResource DescriptionTextBlock}" Text="{StaticResource YPositionLabelText}" />
+                <metro:NumericUpDown behaviors:NumericInput.Type="Position" Value="{Binding XPosition, Mode=TwoWay}" />
+                <metro:NumericUpDown behaviors:NumericInput.Type="Position" Value="{Binding Margin, Mode=TwoWay}" />
             </UniformGrid>
 
-            <TextBlock Text="{StaticResource OtherSectionText}" Style="{StaticResource TitleTextBlock}" Margin="{StaticResource SectionMargin}"/>
-            <Button HorizontalAlignment="Left" Content="{StaticResource ResetButtonText}" Command="{Binding ResetCommand}"/>
+            <TextBlock Margin="{StaticResource SectionMargin}"
+                       Style="{StaticResource TitleTextBlock}"
+                       Text="{StaticResource OtherSectionText}" />
+            <Button HorizontalAlignment="Left"
+                    Command="{Binding ResetCommand}"
+                    Content="{StaticResource ResetButtonText}" />
         </StackPanel>
     </DataTemplate>
 </ResourceDictionary>
diff --git a/src/AudioBand/Views/Settings/AudioSourceSettingsView.xaml b/src/AudioBand/Views/Settings/AudioSourceSettingsView.xaml
index 13fe778d..578cd561 100644
--- a/src/AudioBand/Views/Settings/AudioSourceSettingsView.xaml
+++ b/src/AudioBand/Views/Settings/AudioSourceSettingsView.xaml
@@ -1,78 +1,92 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:viewmodels="clr-namespace:AudioBand.ViewModels"
-             xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
-             xmlns:metro="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
-             xmlns:theme="clr-namespace:AudioBand.Resources.Theming"
-             xmlns:behaviors="clr-namespace:AudioBand.Behaviors"
-             xmlns:templateSelectors="clr-namespace:AudioBand.TemplateSelectors"
-             xmlns:converters="clr-namespace:AudioBand.ValueConverters"
-             xmlns:resources="clr-namespace:AudioBand.Resources">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:behaviors="clr-namespace:AudioBand.Behaviors"
+                    xmlns:converters="clr-namespace:AudioBand.ValueConverters"
+                    xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+                    xmlns:metro="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
+                    xmlns:resources="clr-namespace:AudioBand.Resources"
+                    xmlns:templateSelectors="clr-namespace:AudioBand.TemplateSelectors"
+                    xmlns:theme="clr-namespace:AudioBand.Resources.Theming"
+                    xmlns:viewmodels="clr-namespace:AudioBand.ViewModels">
     <DataTemplate DataType="{x:Type viewmodels:AudioSourceSettingsCollectionViewModel}">
         <DataTemplate.Resources>
             <ResourceDictionary>
                 <ResourceDictionary.MergedDictionaries>
-                    <resources:SharedDictionary Source="../../Resources/Shared.xaml"/>
-                    <resources:SharedDictionary Source="../../Resources/Strings.xaml"/>
-                    <resources:SharedDictionary Source="../../Resources/SettingsWindowStyle.xaml"/>
+                    <resources:SharedDictionary Source="../../Resources/Shared.xaml" />
+                    <resources:SharedDictionary Source="../../Resources/Strings.xaml" />
+                    <resources:SharedDictionary Source="../../Resources/SettingsWindowStyle.xaml" />
                 </ResourceDictionary.MergedDictionaries>
             </ResourceDictionary>
         </DataTemplate.Resources>
         <ItemsControl ItemsSource="{Binding SettingsList}">
             <ItemsControl.ItemTemplate>
                 <DataTemplate>
-                    <Border Margin="0, 4">
+                    <Border Margin="0,4">
                         <StackPanel Visibility="{Binding Visible, Converter={x:Static converters:Converters.BoolToVisibility}}">
                             <FrameworkElement.Resources>
                                 <DataTemplate x:Key="String">
-                                    <TextBox TextWrapping="Wrap" IsReadOnly="{Binding ReadOnly}" metro:TextBoxHelper.ClearTextButton="True"
-                                             Height="{StaticResource DefaultControlHeight}"
-                                             Text="{Binding Value, Mode=TwoWay, ValidatesOnNotifyDataErrors=True}"/>
+                                    <TextBox Height="{StaticResource DefaultControlHeight}"
+                                             metro:TextBoxHelper.ClearTextButton="True"
+                                             IsReadOnly="{Binding ReadOnly}"
+                                             Text="{Binding Value, Mode=TwoWay, ValidatesOnNotifyDataErrors=True}"
+                                             TextWrapping="Wrap" />
                                 </DataTemplate>
                                 <DataTemplate x:Key="Int">
-                                    <metro:NumericUpDown Value="{Binding Value, Mode=TwoWay, ValidatesOnNotifyDataErrors=True}" behaviors:NumericInput.Type="Integer"
-                                                         Height="{StaticResource DefaultControlHeight}"/>
+                                    <metro:NumericUpDown Height="{StaticResource DefaultControlHeight}"
+                                                         behaviors:NumericInput.Type="Integer"
+                                                         Value="{Binding Value, Mode=TwoWay, ValidatesOnNotifyDataErrors=True}" />
                                 </DataTemplate>
                                 <DataTemplate x:Key="UInt">
-                                    <metro:NumericUpDown Value="{Binding Value, Mode=TwoWay, ValidatesOnNotifyDataErrors=True, Converter={x:Static converters:Converters.CoerceNumber}}"
-                                                         behaviors:NumericInput.Type="Positive" Height="{StaticResource DefaultControlHeight}"/>
+                                    <metro:NumericUpDown Height="{StaticResource DefaultControlHeight}"
+                                                         behaviors:NumericInput.Type="Positive"
+                                                         Value="{Binding Value, Mode=TwoWay, ValidatesOnNotifyDataErrors=True, Converter={x:Static converters:Converters.CoerceNumber}}" />
                                 </DataTemplate>
                                 <DataTemplate x:Key="Bool">
-                                    <metro:ToggleSwitch IsChecked="{Binding Value, Mode=TwoWay, ValidatesOnNotifyDataErrors=True, Converter={x:Static converters:Converters.CoerceNumber}}"
-                                                        OnLabel="" OffLabel="" Height="{StaticResource DefaultControlHeight}"/>
+                                    <metro:ToggleSwitch Height="{StaticResource DefaultControlHeight}"
+                                                        IsChecked="{Binding Value, Mode=TwoWay, ValidatesOnNotifyDataErrors=True, Converter={x:Static converters:Converters.CoerceNumber}}"
+                                                        OffLabel=""
+                                                        OnLabel="" />
                                 </DataTemplate>
                                 <DataTemplate x:Key="Password">
                                     <Grid Height="{StaticResource DefaultControlHeight}">
                                         <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="*"/>
-                                            <ColumnDefinition Width="Auto"/>
+                                            <ColumnDefinition Width="*" />
+                                            <ColumnDefinition Width="Auto" />
                                         </Grid.ColumnDefinitions>
                                         <PasswordBox Grid.Column="0">
                                             <i:Interaction.Behaviors>
-                                                <behaviors:PasswordBehaviour Password="{Binding Value, Mode=TwoWay}"/>
+                                                <behaviors:PasswordBehaviour Password="{Binding Value, Mode=TwoWay}" />
                                             </i:Interaction.Behaviors>
                                         </PasswordBox>
-                                        <TextBlock Margin="4, 0" Grid.Column="1"
-                                                   VerticalAlignment="Center" HorizontalAlignment="Stretch"
+                                        <TextBlock Grid.Column="1"
+                                                   Margin="4,0"
+                                                   HorizontalAlignment="Stretch"
+                                                   VerticalAlignment="Center"
+                                                   FontFamily="Segoe MDL2 Assets"
+                                                   FontSize="20"
                                                    Foreground="{DynamicResource ValidationBrush5}"
-                                                   FontFamily="Segoe MDL2 Assets" Text="&#xE7BA;" FontSize="20">
+                                                   Text="&#xE7BA;">
                                             <FrameworkElement.ToolTip>
-                                                <TextBlock Text="{StaticResource SensitiveSettingsWarning}"/>
+                                                <TextBlock Text="{StaticResource SensitiveSettingsWarning}" />
                                             </FrameworkElement.ToolTip>
                                         </TextBlock>
                                     </Grid>
                                 </DataTemplate>
                                 <templateSelectors:AudioSourceSettingSelector x:Key="ValueTemplateSelector"
-                                                                              StringTemplate="{StaticResource String}"
                                                                               BoolTemplate="{StaticResource Bool}"
                                                                               IntTemplate="{StaticResource Int}"
-                                                                              UIntTemplate="{StaticResource UInt}"
-                                                                              PasswordStringTemplate="{StaticResource Password}"/>
+                                                                              PasswordStringTemplate="{StaticResource Password}"
+                                                                              StringTemplate="{StaticResource String}"
+                                                                              UIntTemplate="{StaticResource UInt}" />
                             </FrameworkElement.Resources>
-                            <TextBlock Text="{Binding Name}" FontSize="16"/>
-                            <TextBlock Text="{Binding Description}" FontSize="{StaticResource BodyFontSize}" Foreground="{theme:ThemeResource SystemBaseMediumColor}"
-                                       Visibility="{Binding Description, Converter={x:Static converters:Converters.StringToVisibility}}"/>
-                            <ContentControl Content="{Binding}" ContentTemplateSelector="{StaticResource ValueTemplateSelector}" Margin="0, 4, 0, 0"/>
+                            <TextBlock FontSize="16" Text="{Binding Name}" />
+                            <TextBlock FontSize="{StaticResource BodyFontSize}"
+                                       Foreground="{theme:ThemeResource SystemBaseMediumColor}"
+                                       Text="{Binding Description}"
+                                       Visibility="{Binding Description, Converter={x:Static converters:Converters.StringToVisibility}}" />
+                            <ContentControl Margin="0,4,0,0"
+                                            Content="{Binding}"
+                                            ContentTemplateSelector="{StaticResource ValueTemplateSelector}" />
                         </StackPanel>
                     </Border>
                 </DataTemplate>
diff --git a/src/AudioBand/Views/Settings/ButtonBaseTemplate.xaml b/src/AudioBand/Views/Settings/ButtonBaseTemplate.xaml
index d6911c37..63d486ab 100644
--- a/src/AudioBand/Views/Settings/ButtonBaseTemplate.xaml
+++ b/src/AudioBand/Views/Settings/ButtonBaseTemplate.xaml
@@ -1,27 +1,35 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:AudioBand.Views.Settings"
-                    xmlns:resources="clr-namespace:AudioBand.Resources"
                     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                    xmlns:local="clr-namespace:AudioBand.Views.Settings"
                     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                    xmlns:resources="clr-namespace:AudioBand.Resources"
                     mc:Ignorable="d">
     <DataTemplate x:Key="ButtonBaseTemplate">
         <DataTemplate.Resources>
             <ResourceDictionary>
                 <ResourceDictionary.MergedDictionaries>
-                    <resources:SharedDictionary Source="../../Resources/SettingsWindowStyle.xaml"/>
-                    <resources:SharedDictionary Source="../../Resources/Strings.xaml"/>
-                    <resources:SharedDictionary Source="LayoutSettingsTemplate.xaml"/>
+                    <resources:SharedDictionary Source="../../Resources/SettingsWindowStyle.xaml" />
+                    <resources:SharedDictionary Source="../../Resources/Strings.xaml" />
+                    <resources:SharedDictionary Source="LayoutSettingsTemplate.xaml" />
                 </ResourceDictionary.MergedDictionaries>
             </ResourceDictionary>
         </DataTemplate.Resources>
-        <StackPanel Style="{StaticResource SettingsStackPanel}" KeyboardNavigation.IsTabStop="False">
-            <ContentPresenter Content="{Binding}" ContentTemplate="{StaticResource LayoutSettingsTemplate}"/>
+        <StackPanel KeyboardNavigation.IsTabStop="False" Style="{StaticResource SettingsStackPanel}">
+            <ContentPresenter Content="{Binding}" ContentTemplate="{StaticResource LayoutSettingsTemplate}" />
 
-            <TextBlock Margin="{StaticResource SectionMargin}" Text="{StaticResource BackgroundColorSectionText}" Style="{StaticResource TitleTextBlock}"/>
-            <local:ColorPicker Color="{Binding BackgroundColor}" DialogService="{Binding DialogService}" Title="{StaticResource DefaultColorLabelText}"/>
-            <local:ColorPicker Color="{Binding HoveredBackgroundColor}" DialogService="{Binding DialogService}" Title="{StaticResource ProgressBarHoverColorDescription}"/>
-            <local:ColorPicker Color="{Binding ClickedBackgroundColor}" DialogService="{Binding DialogService}" Title="{StaticResource ClickedColorLabelText}"/>
+            <TextBlock Margin="{StaticResource SectionMargin}"
+                       Style="{StaticResource TitleTextBlock}"
+                       Text="{StaticResource BackgroundColorSectionText}" />
+            <local:ColorPicker Title="{StaticResource DefaultColorLabelText}"
+                               DialogService="{Binding DialogService}"
+                               Color="{Binding BackgroundColor}" />
+            <local:ColorPicker Title="{StaticResource ProgressBarHoverColorDescription}"
+                               DialogService="{Binding DialogService}"
+                               Color="{Binding HoveredBackgroundColor}" />
+            <local:ColorPicker Title="{StaticResource ClickedColorLabelText}"
+                               DialogService="{Binding DialogService}"
+                               Color="{Binding ClickedBackgroundColor}" />
         </StackPanel>
     </DataTemplate>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/AudioBand/Views/Settings/ButtonContentTemplate.xaml b/src/AudioBand/Views/Settings/ButtonContentTemplate.xaml
index 5754c613..48394d9b 100644
--- a/src/AudioBand/Views/Settings/ButtonContentTemplate.xaml
+++ b/src/AudioBand/Views/Settings/ButtonContentTemplate.xaml
@@ -1,59 +1,76 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:AudioBand.Views.Settings"
-                    xmlns:viewModels="clr-namespace:AudioBand.ViewModels"
-                    xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
-                    xmlns:behaviors="clr-namespace:AudioBand.Behaviors"
                     xmlns:models="clr-namespace:AudioBand.Models"
-                    xmlns:resources="clr-namespace:AudioBand.Resources">
+                    xmlns:resources="clr-namespace:AudioBand.Resources"
+                    xmlns:viewModels="clr-namespace:AudioBand.ViewModels">
     <DataTemplate x:Key="ButtonContentTemplate" DataType="{x:Type viewModels:ButtonContentViewModel}">
         <DataTemplate.Resources>
             <ResourceDictionary>
                 <ResourceDictionary.MergedDictionaries>
-                    <resources:SharedDictionary Source="../../Resources/SettingsWindowStyle.xaml"/>
-                    <resources:SharedDictionary Source="../../Resources/Strings.xaml"/>
+                    <resources:SharedDictionary Source="../../Resources/SettingsWindowStyle.xaml" />
+                    <resources:SharedDictionary Source="../../Resources/Strings.xaml" />
                 </ResourceDictionary.MergedDictionaries>
             </ResourceDictionary>
         </DataTemplate.Resources>
-        <StackPanel Style="{StaticResource SettingsStackPanel}" KeyboardNavigation.IsTabStop="False">
-            <TextBlock Text="{StaticResource ButtonContentTypeDescription}" Style="{StaticResource DescriptionTextBlock}"/>
-            <ComboBox ItemsSource="{Binding ButtonContentTypes}" ItemTemplate="{StaticResource EnumDescriptorItemTemplate}"
-                      SelectedValue="{Binding ContentType}" SelectedValuePath="Value"/>
+        <StackPanel KeyboardNavigation.IsTabStop="False" Style="{StaticResource SettingsStackPanel}">
+            <TextBlock Style="{StaticResource DescriptionTextBlock}" Text="{StaticResource ButtonContentTypeDescription}" />
+            <ComboBox ItemTemplate="{StaticResource EnumDescriptorItemTemplate}"
+                      ItemsSource="{Binding ButtonContentTypes}"
+                      SelectedValue="{Binding ContentType}"
+                      SelectedValuePath="Value" />
             <ItemsControl IsTabStop="False">
                 <ItemsControl.Style>
                     <Style TargetType="{x:Type ItemsControl}">
-                        <Setter Property="Visibility" Value="Collapsed"/>
+                        <Setter Property="Visibility" Value="Collapsed" />
                         <Style.Triggers>
                             <DataTrigger Binding="{Binding ContentType}" Value="{x:Static models:ButtonContentType.Image}">
-                                <Setter Property="Visibility" Value="Visible"/>
+                                <Setter Property="Visibility" Value="Visible" />
                             </DataTrigger>
                         </Style.Triggers>
                     </Style>
                 </ItemsControl.Style>
-                <local:ImagePicker ImagePath="{Binding ImagePath, Mode=TwoWay}" DialogService="{Binding DialogService}" Title="{StaticResource ButtonImageLabelText}"/>
-                <local:ImagePicker ImagePath="{Binding HoveredImagePath, Mode=TwoWay}" DialogService="{Binding DialogService}" Title="{StaticResource ButtonHoveredImageLabelText}"/>
-                <local:ImagePicker ImagePath="{Binding ClickedImagePath, Mode=TwoWay}" DialogService="{Binding DialogService}" Title="{StaticResource ButtonClickedImageLabelText}"/>
+                <local:ImagePicker Title="{StaticResource ButtonImageLabelText}"
+                                   DialogService="{Binding DialogService}"
+                                   ImagePath="{Binding ImagePath, Mode=TwoWay}" />
+                <local:ImagePicker Title="{StaticResource ButtonHoveredImageLabelText}"
+                                   DialogService="{Binding DialogService}"
+                                   ImagePath="{Binding HoveredImagePath, Mode=TwoWay}" />
+                <local:ImagePicker Title="{StaticResource ButtonClickedImageLabelText}"
+                                   DialogService="{Binding DialogService}"
+                                   ImagePath="{Binding ClickedImagePath, Mode=TwoWay}" />
             </ItemsControl>
             <ItemsControl IsTabStop="False">
                 <ItemsControl.Style>
                     <Style TargetType="{x:Type ItemsControl}">
-                        <Setter Property="Visibility" Value="Collapsed"/>
+                        <Setter Property="Visibility" Value="Collapsed" />
                         <Style.Triggers>
                             <DataTrigger Binding="{Binding ContentType}" Value="{x:Static models:ButtonContentType.Text}">
-                                <Setter Property="Visibility" Value="Visible"/>
+                                <Setter Property="Visibility" Value="Visible" />
                             </DataTrigger>
                         </Style.Triggers>
                     </Style>
                 </ItemsControl.Style>
-                <TextBlock Text="{StaticResource ButtonFontFamilyDescription}" Style="{StaticResource DescriptionTextBlock}"/>
-                <ComboBox ItemsSource="{Binding Source={x:Static Fonts.SystemFontFamilies}}" IsEditable="True"
-                          SelectedValue="{Binding FontFamily}" SelectedValuePath="Source"
-                          ItemTemplate="{StaticResource FontFamilyComboBoxItemDataTemplate}" Width="400"/>
-                <TextBlock Text="{StaticResource ButtonTextDescription}" Style="{StaticResource DescriptionTextBlock}"/>
-                <TextBox Text="{Binding Text}" FontFamily="{Binding FontFamily}" Width="100"/>
-                <local:ColorPicker Color="{Binding TextColor}" DialogService="{Binding DialogService}" Title="{StaticResource ButtonTextColorDescription}"/>
-                <local:ColorPicker Color="{Binding HoveredTextColor}" DialogService="{Binding DialogService}" Title="{StaticResource ButtonTextHoverColorDescription}"/>
-                <local:ColorPicker Color="{Binding ClickedTextColor}" DialogService="{Binding DialogService}" Title="{StaticResource ButtonTextClickedColorDescription}"/>
+                <TextBlock Style="{StaticResource DescriptionTextBlock}" Text="{StaticResource ButtonFontFamilyDescription}" />
+                <ComboBox Width="400"
+                          IsEditable="True"
+                          ItemTemplate="{StaticResource FontFamilyComboBoxItemDataTemplate}"
+                          ItemsSource="{Binding Source={x:Static Fonts.SystemFontFamilies}}"
+                          SelectedValue="{Binding FontFamily}"
+                          SelectedValuePath="Source" />
+                <TextBlock Style="{StaticResource DescriptionTextBlock}" Text="{StaticResource ButtonTextDescription}" />
+                <TextBox Width="100"
+                         FontFamily="{Binding FontFamily}"
+                         Text="{Binding Text}" />
+                <local:ColorPicker Title="{StaticResource ButtonTextColorDescription}"
+                                   DialogService="{Binding DialogService}"
+                                   Color="{Binding TextColor}" />
+                <local:ColorPicker Title="{StaticResource ButtonTextHoverColorDescription}"
+                                   DialogService="{Binding DialogService}"
+                                   Color="{Binding HoveredTextColor}" />
+                <local:ColorPicker Title="{StaticResource ButtonTextClickedColorDescription}"
+                                   DialogService="{Binding DialogService}"
+                                   Color="{Binding ClickedTextColor}" />
             </ItemsControl>
         </StackPanel>
     </DataTemplate>
diff --git a/src/AudioBand/Views/Settings/ColorPicker.xaml b/src/AudioBand/Views/Settings/ColorPicker.xaml
index fe4a062b..be03383a 100644
--- a/src/AudioBand/Views/Settings/ColorPicker.xaml
+++ b/src/AudioBand/Views/Settings/ColorPicker.xaml
@@ -1,46 +1,55 @@
 <UserControl x:Class="AudioBand.Views.Settings.ColorPicker"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:AudioBand.Views.Settings"
              xmlns:converters="clr-namespace:AudioBand.ValueConverters"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:local="clr-namespace:AudioBand.Views.Settings"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:resources="clr-namespace:AudioBand.Resources"
              xmlns:theme="clr-namespace:AudioBand.Resources.Theming"
-             mc:Ignorable="d" 
              x:Name="ColorPickerControl"
-             d:DesignHeight="50" d:DesignWidth="300"
-             d:DataContext="{d:DesignInstance local:ColorPicker}">
+             d:DataContext="{d:DesignInstance local:ColorPicker}"
+             d:DesignHeight="50"
+             d:DesignWidth="300"
+             mc:Ignorable="d">
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <resources:SharedDictionary Source="../../Resources/Strings.xaml"/>
-                <resources:SharedDictionary Source="../../Resources/Shared.xaml"/>
-                <resources:SharedDictionary Source="../../Resources/SettingsWindowStyle.xaml"/>
+                <resources:SharedDictionary Source="../../Resources/Strings.xaml" />
+                <resources:SharedDictionary Source="../../Resources/Shared.xaml" />
+                <resources:SharedDictionary Source="../../Resources/SettingsWindowStyle.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>
-    <Button Style="{StaticResource ContainerButtonStyle}" Click="OpenColorPickerOnClick">
+    <Button Click="OpenColorPickerOnClick" Style="{StaticResource ContainerButtonStyle}">
         <Grid HorizontalAlignment="Left">
             <Grid.RowDefinitions>
-                <RowDefinition Height="*"/>
-                <RowDefinition Height="*"/>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
-                <ColumnDefinition/>
-                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition />
+                <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
-            <Rectangle Grid.Row="0" Grid.Column="0" Grid.RowSpan="2"
-                       VerticalAlignment="Stretch" Stroke="{theme:ThemeResource SystemBaseHighColor}"
-                       Width="40" Height="40" Margin="0, 0, 10, 0"
-                       Fill="{Binding Color, ElementName=ColorPickerControl, Mode=OneWay, Converter={x:Static converters:Converters.ColorToBrush}}"/>
-            <TextBlock Grid.Row="0" Grid.Column="1"
-                       FontSize="14"
+            <Rectangle Grid.Row="0"
+                       Grid.RowSpan="2"
+                       Grid.Column="0"
+                       Width="40"
+                       Height="40"
+                       Margin="0,0,10,0"
+                       VerticalAlignment="Stretch"
+                       Fill="{Binding Color, ElementName=ColorPickerControl, Mode=OneWay, Converter={x:Static converters:Converters.ColorToBrush}}"
+                       Stroke="{theme:ThemeResource SystemBaseHighColor}" />
+            <TextBlock Grid.Row="0"
+                       Grid.Column="1"
                        VerticalAlignment="Top"
-                       Text="{Binding Title, ElementName=ColorPickerControl}"/>
-            <TextBlock Grid.Row="1" Grid.Column="1"
+                       FontSize="14"
+                       Text="{Binding Title, ElementName=ColorPickerControl}" />
+            <TextBlock Grid.Row="1"
+                       Grid.Column="1"
                        VerticalAlignment="Bottom"
-                       Foreground="{theme:ThemeResource SystemBaseMediumColor}" FontSize="14"
+                       FontSize="14"
+                       Foreground="{theme:ThemeResource SystemBaseMediumColor}"
                        Text="{Binding Color, ElementName=ColorPickerControl, Mode=OneWay, Converter={x:Static converters:Converters.ColorToName}}" />
         </Grid>
     </Button>
diff --git a/src/AudioBand/Views/Settings/CustomLabelSettingsView.xaml b/src/AudioBand/Views/Settings/CustomLabelSettingsView.xaml
index c882d5d0..81df32ce 100644
--- a/src/AudioBand/Views/Settings/CustomLabelSettingsView.xaml
+++ b/src/AudioBand/Views/Settings/CustomLabelSettingsView.xaml
@@ -1,47 +1,54 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:metro="http://metro.mahapps.com/winfx/xaml/controls"
-             xmlns:local="clr-namespace:AudioBand.Views.Settings"
-             xmlns:viewmodels="clr-namespace:AudioBand.ViewModels"
-             xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
-             xmlns:behaviors="clr-namespace:AudioBand.Behaviors"
-             xmlns:converters="clr-namespace:AudioBand.ValueConverters"
-             xmlns:models="clr-namespace:AudioBand.Models"
-             xmlns:resources="clr-namespace:AudioBand.Resources"
-             xmlns:theming="clr-namespace:AudioBand.Resources.Theming">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:behaviors="clr-namespace:AudioBand.Behaviors"
+                    xmlns:converters="clr-namespace:AudioBand.ValueConverters"
+                    xmlns:local="clr-namespace:AudioBand.Views.Settings"
+                    xmlns:metro="http://metro.mahapps.com/winfx/xaml/controls"
+                    xmlns:models="clr-namespace:AudioBand.Models"
+                    xmlns:resources="clr-namespace:AudioBand.Resources"
+                    xmlns:theming="clr-namespace:AudioBand.Resources.Theming"
+                    xmlns:viewmodels="clr-namespace:AudioBand.ViewModels">
     <DataTemplate DataType="{x:Type viewmodels:CustomLabelViewModel}">
         <DataTemplate.Resources>
             <ResourceDictionary>
                 <ResourceDictionary.MergedDictionaries>
-                    <resources:SharedDictionary Source="../../Resources/Shared.xaml"/>
-                    <resources:SharedDictionary Source="../../Resources/Strings.xaml"/>
-                    <resources:SharedDictionary Source="../../Resources/SettingsWindowStyle.xaml"/>
-                    <resources:SharedDictionary Source="../../Resources/RangeSliderStyles.xaml"/>
-                    <resources:SharedDictionary Source="LayoutSettingsTemplate.xaml"/>
+                    <resources:SharedDictionary Source="../../Resources/Shared.xaml" />
+                    <resources:SharedDictionary Source="../../Resources/Strings.xaml" />
+                    <resources:SharedDictionary Source="../../Resources/SettingsWindowStyle.xaml" />
+                    <resources:SharedDictionary Source="../../Resources/RangeSliderStyles.xaml" />
+                    <resources:SharedDictionary Source="LayoutSettingsTemplate.xaml" />
                 </ResourceDictionary.MergedDictionaries>
             </ResourceDictionary>
         </DataTemplate.Resources>
         <StackPanel Style="{StaticResource SettingsStackPanel}">
-            <TextBlock Text="{StaticResource CustomLabelNameSectionText}" Style="{StaticResource TitleTextBlock}"/>
-            <TextBlock Text="{StaticResource CustomLabelNameDescription}" Style="{StaticResource DescriptionTextBlock}"/>
-            <TextBox metro:TextBoxHelper.ClearTextButton="True" Text="{Binding Name, Mode=TwoWay}" Width="150"/>
-            <ContentPresenter Content="{Binding}" ContentTemplate="{StaticResource LayoutSettingsTemplate}" Margin="{StaticResource SectionMargin}"/>
+            <TextBlock Style="{StaticResource TitleTextBlock}" Text="{StaticResource CustomLabelNameSectionText}" />
+            <TextBlock Style="{StaticResource DescriptionTextBlock}" Text="{StaticResource CustomLabelNameDescription}" />
+            <TextBox Width="150"
+                     metro:TextBoxHelper.ClearTextButton="True"
+                     Text="{Binding Name, Mode=TwoWay}" />
+            <ContentPresenter Margin="{StaticResource SectionMargin}"
+                              Content="{Binding}"
+                              ContentTemplate="{StaticResource LayoutSettingsTemplate}" />
 
-            <TextBlock Text="{StaticResource CustomLabelFormatSectionText}" Style="{StaticResource TitleTextBlock}" Margin="{StaticResource SectionMargin}"/>
-            <TextBlock Style="{StaticResource DescriptionTextBlock}" x:Name="CustomLabelFormatHelpLink" Focusable="False">
-                <Run Text="{StaticResource CustomLabelTextFormatDescription}"/>.
+            <TextBlock Margin="{StaticResource SectionMargin}"
+                       Style="{StaticResource TitleTextBlock}"
+                       Text="{StaticResource CustomLabelFormatSectionText}" />
+            <TextBlock x:Name="CustomLabelFormatHelpLink"
+                       Focusable="False"
+                       Style="{StaticResource DescriptionTextBlock}">
+                <Run Text="{StaticResource CustomLabelTextFormatDescription}" />
+                .
                 <TextBlock>
                     <Hyperlink>
-                        <Run Text="{StaticResource CustomLabelTextFormatHelpLink}"/>
+                        <Run Text="{StaticResource CustomLabelTextFormatHelpLink}" />
                     </Hyperlink>
                     <TextBlock.Triggers>
                         <EventTrigger RoutedEvent="FrameworkElement.GotFocus">
                             <EventTrigger.Actions>
                                 <BeginStoryboard>
                                     <Storyboard>
-                                        <BooleanAnimationUsingKeyFrames Storyboard.TargetName="FormatHelpPopup"
-                                                                        Storyboard.TargetProperty="IsOpen">
-                                            <DiscreteBooleanKeyFrame KeyTime="0" Value="True"/>
+                                        <BooleanAnimationUsingKeyFrames Storyboard.TargetName="FormatHelpPopup" Storyboard.TargetProperty="IsOpen">
+                                            <DiscreteBooleanKeyFrame KeyTime="0" Value="True" />
                                         </BooleanAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </BeginStoryboard>
@@ -51,9 +58,8 @@
                             <EventTrigger.Actions>
                                 <BeginStoryboard>
                                     <Storyboard>
-                                        <BooleanAnimationUsingKeyFrames Storyboard.TargetName="FormatHelpPopup"
-                                                                        Storyboard.TargetProperty="IsOpen">
-                                            <DiscreteBooleanKeyFrame KeyTime="0" Value="False"/>
+                                        <BooleanAnimationUsingKeyFrames Storyboard.TargetName="FormatHelpPopup" Storyboard.TargetProperty="IsOpen">
+                                            <DiscreteBooleanKeyFrame KeyTime="0" Value="False" />
                                         </BooleanAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </BeginStoryboard>
@@ -62,74 +68,116 @@
                     </TextBlock.Triggers>
                 </TextBlock>
             </TextBlock>
-            <TextBox metro:TextBoxHelper.ClearTextButton="True" Text="{Binding FormatString, Mode=TwoWay}" Width="400"/>
-            <Popup x:Name="FormatHelpPopup" StaysOpen="False" AllowsTransparency="True" PopupAnimation="Slide"
-                     PlacementTarget="{x:Reference CustomLabelFormatHelpLink}" Placement="Top">
-                <Border BorderThickness="1" BorderBrush="{theming:ThemeResource SystemChromeHighColor}" Margin="4" Padding="4"
-                        Background="{theming:ThemeResource SystemChromeMediumLowColor}">
+            <TextBox Width="400"
+                     metro:TextBoxHelper.ClearTextButton="True"
+                     Text="{Binding FormatString, Mode=TwoWay}" />
+            <Popup x:Name="FormatHelpPopup"
+                   AllowsTransparency="True"
+                   Placement="Top"
+                   PlacementTarget="{x:Reference CustomLabelFormatHelpLink}"
+                   PopupAnimation="Slide"
+                   StaysOpen="False">
+                <Border Margin="4"
+                        Padding="4"
+                        Background="{theming:ThemeResource SystemChromeMediumLowColor}"
+                        BorderBrush="{theming:ThemeResource SystemChromeHighColor}"
+                        BorderThickness="1">
                     <Border.Effect>
-                        <DropShadowEffect ShadowDepth="0" Opacity="0.3"/>
+                        <DropShadowEffect Opacity="0.3" ShadowDepth="0" />
                     </Border.Effect>
-                    <TextBlock Foreground="{theming:ThemeResource SystemBaseHighColor}" FontSize="{StaticResource BodyFontSize}">
-                        <TextBlock Text="{StaticResource CustomLabelFormatHelpText}"/><LineBreak/>
-                        <Bold>Tags</Bold> <LineBreak/>
-                        <TextBlock Text="{StaticResource CustomLabelFormatHelpTextTags}"/><LineBreak/>
-                        <Bold>Styles</Bold> <LineBreak/>
-                        <TextBlock Text="{StaticResource CustomLabelFormatHelpTextStyles}"/><LineBreak/>
-                        <Bold>Colors</Bold> <LineBreak/>
-                        <TextBlock Text="{StaticResource CustomLabelFormatHelpTextColors}"/><LineBreak/>
-                        <Bold>Example formats</Bold> <LineBreak/>
-                        <TextBlock Text="{StaticResource CustomLabelFormatHelpTextExamples}"/><LineBreak/>
+                    <TextBlock FontSize="{StaticResource BodyFontSize}" Foreground="{theming:ThemeResource SystemBaseHighColor}">
+                        <TextBlock Text="{StaticResource CustomLabelFormatHelpText}" /><LineBreak />
+                        <Bold>Tags</Bold> <LineBreak />
+                        <TextBlock Text="{StaticResource CustomLabelFormatHelpTextTags}" /><LineBreak />
+                        <Bold>Styles</Bold> <LineBreak />
+                        <TextBlock Text="{StaticResource CustomLabelFormatHelpTextStyles}" /><LineBreak />
+                        <Bold>Colors</Bold> <LineBreak />
+                        <TextBlock Text="{StaticResource CustomLabelFormatHelpTextColors}" /><LineBreak />
+                        <Bold>Example formats</Bold> <LineBreak />
+                        <TextBlock Text="{StaticResource CustomLabelFormatHelpTextExamples}" /><LineBreak />
                     </TextBlock>
                 </Border>
             </Popup>
 
-            <TextBlock Text="{StaticResource CustomLabelFontSectionText}" Style="{StaticResource TitleTextBlock}" Margin="{StaticResource SectionMargin}"/>
-            <TextBlock Text="{StaticResource CustomLabelAlignmentDescription}" Style="{StaticResource DescriptionTextBlock}"/>
-            <ComboBox IsEditable="False" ItemsSource="{Binding TextAlignValues}" SelectedItem="{Binding TextAlignment, Mode=TwoWay}"/>
-            <TextBlock Text="{StaticResource CustomLabelFontFamilyDescription}" Style="{StaticResource DescriptionTextBlock}"/>
-            <ComboBox IsEditable="True" ItemsSource="{Binding Source={x:Static Fonts.SystemFontFamilies}}" 
-                      ItemTemplate="{StaticResource FontFamilyComboBoxItemDataTemplate}" Width="400"
-                      SelectedValue="{Binding FontFamily}" SelectedValuePath="Source"/>
-            <TextBlock Text="{StaticResource CustomLabelFontSizeDescription}" Style="{StaticResource DescriptionTextBlock}"/>
-            <metro:NumericUpDown behaviors:NumericInput.Type="FontSize" Value="{Binding FontSize, Mode=TwoWay}"/>
-            <local:ColorPicker DialogService="{Binding Path=DialogService}" Color="{Binding Path=Color}" Title="{StaticResource CustomLabelFontColorDescription}"/>
+            <TextBlock Margin="{StaticResource SectionMargin}"
+                       Style="{StaticResource TitleTextBlock}"
+                       Text="{StaticResource CustomLabelFontSectionText}" />
+            <TextBlock Style="{StaticResource DescriptionTextBlock}" Text="{StaticResource CustomLabelAlignmentDescription}" />
+            <ComboBox IsEditable="False"
+                      ItemsSource="{Binding TextAlignValues}"
+                      SelectedItem="{Binding TextAlignment, Mode=TwoWay}" />
+            <TextBlock Style="{StaticResource DescriptionTextBlock}" Text="{StaticResource CustomLabelFontFamilyDescription}" />
+            <ComboBox Width="400"
+                      IsEditable="True"
+                      ItemTemplate="{StaticResource FontFamilyComboBoxItemDataTemplate}"
+                      ItemsSource="{Binding Source={x:Static Fonts.SystemFontFamilies}}"
+                      SelectedValue="{Binding FontFamily}"
+                      SelectedValuePath="Source" />
+            <TextBlock Style="{StaticResource DescriptionTextBlock}" Text="{StaticResource CustomLabelFontSizeDescription}" />
+            <metro:NumericUpDown behaviors:NumericInput.Type="FontSize" Value="{Binding FontSize, Mode=TwoWay}" />
+            <local:ColorPicker Title="{StaticResource CustomLabelFontColorDescription}"
+                               DialogService="{Binding Path=DialogService}"
+                               Color="{Binding Path=Color}" />
 
-            <TextBlock Text="{StaticResource CustomLabelOverflowSectionText}" Style="{StaticResource TitleTextBlock}" Margin="{StaticResource SectionMargin}"/>
-            <TextBlock Text="{StaticResource CustomLabelOverflowDescription}" Style="{StaticResource DescriptionTextBlock}"/>
-            <ComboBox ItemsSource="{Binding TextOverflowValues}" ItemTemplate="{StaticResource EnumDescriptorItemTemplate}"
-                      SelectedValue="{Binding TextOverflow}" SelectedValuePath="Value"/>
+            <TextBlock Margin="{StaticResource SectionMargin}"
+                       Style="{StaticResource TitleTextBlock}"
+                       Text="{StaticResource CustomLabelOverflowSectionText}" />
+            <TextBlock Style="{StaticResource DescriptionTextBlock}" Text="{StaticResource CustomLabelOverflowDescription}" />
+            <ComboBox ItemTemplate="{StaticResource EnumDescriptorItemTemplate}"
+                      ItemsSource="{Binding TextOverflowValues}"
+                      SelectedValue="{Binding TextOverflow}"
+                      SelectedValuePath="Value" />
             <ItemsControl>
                 <ItemsControl.Style>
                     <Style TargetType="{x:Type ItemsControl}">
-                        <Setter Property="Visibility" Value="Collapsed"/>
+                        <Setter Property="Visibility" Value="Collapsed" />
                         <Style.Triggers>
                             <DataTrigger Binding="{Binding TextOverflow}" Value="{x:Static models:TextOverflow.Scroll}">
-                                <Setter Property="Visibility" Value="Visible"/>
+                                <Setter Property="Visibility" Value="Visible" />
                             </DataTrigger>
                         </Style.Triggers>
                     </Style>
                 </ItemsControl.Style>
-                <TextBlock Text="{StaticResource CustomLabelScrollBehaviorDescription}" Style="{StaticResource DescriptionTextBlock}"/>
-                <ComboBox ItemsSource="{Binding ScrollBehaviorValues}" ItemTemplate="{StaticResource EnumDescriptorItemTemplate}" Width="300"
-                          SelectedValue="{Binding ScrollBehavior}" SelectedValuePath="Value"/>
-                <TextBlock Text="{StaticResource CustomLabelScrollSpeedDescription}" Style="{StaticResource DescriptionTextBlock}"/>
-                <metro:NumericUpDown behaviors:NumericInput.Type="WholeNumber" Value="{Binding ScrollSpeed, Mode=TwoWay, Converter={x:Static converters:Converters.TimeSpanToMs}, Delay=700}"/>
+                <TextBlock Style="{StaticResource DescriptionTextBlock}" Text="{StaticResource CustomLabelScrollBehaviorDescription}" />
+                <ComboBox Width="300"
+                          ItemTemplate="{StaticResource EnumDescriptorItemTemplate}"
+                          ItemsSource="{Binding ScrollBehaviorValues}"
+                          SelectedValue="{Binding ScrollBehavior}"
+                          SelectedValuePath="Value" />
+                <TextBlock Style="{StaticResource DescriptionTextBlock}" Text="{StaticResource CustomLabelScrollSpeedDescription}" />
+                <metro:NumericUpDown behaviors:NumericInput.Type="WholeNumber" Value="{Binding ScrollSpeed, Mode=TwoWay, Converter={x:Static converters:Converters.TimeSpanToMs}, Delay=700}" />
             </ItemsControl>
 
-            <TextBlock Text="{StaticResource CustomLabelEffectsSectionText}" Style="{StaticResource TitleTextBlock}" Margin="{StaticResource SectionMargin}"/>
-            <TextBlock Text="{StaticResource CustomLabelTextEffectDescription}" Style="{StaticResource DescriptionTextBlock}"/>
-            <ComboBox ItemsSource="{Binding FadeEffectValues}" ItemTemplate="{StaticResource EnumDescriptorItemTemplate}"
-                      SelectedValue="{Binding FadeEffect}" SelectedValuePath="Value"/>
-            <TextBlock Text="{StaticResource CustomLabelTextFadeDescription}" Style="{StaticResource DescriptionTextBlock}"/>
-            <metro:RangeSlider MinRange="0" MinRangeWidth="0" Minimum="0.0" Maximum="1.0" Style="{StaticResource RangeSliderStyle}"
-                               LowerValue="{Binding LeftFadeOffset}" UpperValue="{Binding RightFadeOffset}"
-                               AutoToolTipPlacement="TopLeft" AutoToolTipPrecision="2" IsMoveToPointEnabled="True"
-                               Width="400" HorizontalAlignment="Left"
-                               TickFrequency="0.1" TickPlacement="BottomRight"/>
+            <TextBlock Margin="{StaticResource SectionMargin}"
+                       Style="{StaticResource TitleTextBlock}"
+                       Text="{StaticResource CustomLabelEffectsSectionText}" />
+            <TextBlock Style="{StaticResource DescriptionTextBlock}" Text="{StaticResource CustomLabelTextEffectDescription}" />
+            <ComboBox ItemTemplate="{StaticResource EnumDescriptorItemTemplate}"
+                      ItemsSource="{Binding FadeEffectValues}"
+                      SelectedValue="{Binding FadeEffect}"
+                      SelectedValuePath="Value" />
+            <TextBlock Style="{StaticResource DescriptionTextBlock}" Text="{StaticResource CustomLabelTextFadeDescription}" />
+            <metro:RangeSlider Width="400"
+                               HorizontalAlignment="Left"
+                               AutoToolTipPlacement="TopLeft"
+                               AutoToolTipPrecision="2"
+                               IsMoveToPointEnabled="True"
+                               LowerValue="{Binding LeftFadeOffset}"
+                               Maximum="1.0"
+                               MinRange="0"
+                               MinRangeWidth="0"
+                               Minimum="0.0"
+                               Style="{StaticResource RangeSliderStyle}"
+                               TickFrequency="0.1"
+                               TickPlacement="BottomRight"
+                               UpperValue="{Binding RightFadeOffset}" />
 
-            <TextBlock Text="{StaticResource OtherSectionText}" Style="{StaticResource TitleTextBlock}" Margin="{StaticResource SectionMargin}"/>
-            <Button HorizontalAlignment="Left" Content="{StaticResource ResetButtonText}" Command="{Binding ResetCommand}"/>
+            <TextBlock Margin="{StaticResource SectionMargin}"
+                       Style="{StaticResource TitleTextBlock}"
+                       Text="{StaticResource OtherSectionText}" />
+            <Button HorizontalAlignment="Left"
+                    Command="{Binding ResetCommand}"
+                    Content="{StaticResource ResetButtonText}" />
         </StackPanel>
     </DataTemplate>
 </ResourceDictionary>
diff --git a/src/AudioBand/Views/Settings/GeneralSettingsView.xaml b/src/AudioBand/Views/Settings/GeneralSettingsView.xaml
index b31a3ad7..336ca1f4 100644
--- a/src/AudioBand/Views/Settings/GeneralSettingsView.xaml
+++ b/src/AudioBand/Views/Settings/GeneralSettingsView.xaml
@@ -1,30 +1,36 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:viewmodels="clr-namespace:AudioBand.ViewModels"
-             xmlns:metro="http://metro.mahapps.com/winfx/xaml/controls"
-             xmlns:behaviors="clr-namespace:AudioBand.Behaviors"
-             xmlns:resources="clr-namespace:AudioBand.Resources"
-             xmlns:settings="clr-namespace:AudioBand.Views.Settings">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:behaviors="clr-namespace:AudioBand.Behaviors"
+                    xmlns:metro="http://metro.mahapps.com/winfx/xaml/controls"
+                    xmlns:resources="clr-namespace:AudioBand.Resources"
+                    xmlns:settings="clr-namespace:AudioBand.Views.Settings"
+                    xmlns:viewmodels="clr-namespace:AudioBand.ViewModels">
     <DataTemplate DataType="{x:Type viewmodels:AudioBandViewModel}">
         <DataTemplate.Resources>
             <ResourceDictionary>
                 <ResourceDictionary.MergedDictionaries>
-                    <resources:SharedDictionary Source="../../Resources/Shared.xaml"/>
-                    <resources:SharedDictionary Source="../../Resources/Strings.xaml"/>
-                    <resources:SharedDictionary Source="../../Resources/SettingsWindowStyle.xaml"/>
+                    <resources:SharedDictionary Source="../../Resources/Shared.xaml" />
+                    <resources:SharedDictionary Source="../../Resources/Strings.xaml" />
+                    <resources:SharedDictionary Source="../../Resources/SettingsWindowStyle.xaml" />
                 </ResourceDictionary.MergedDictionaries>
             </ResourceDictionary>
         </DataTemplate.Resources>
         <StackPanel Style="{StaticResource SettingsStackPanel}">
-            <TextBlock Text="{StaticResource DisplaySectionText}" Style="{StaticResource TitleTextBlock}"/>
-            <TextBlock Text="{StaticResource WidthLabelText}" Style="{StaticResource DescriptionTextBlock}"/>
-            <metro:NumericUpDown behaviors:NumericInput.Type="Size" Value="{Binding Width, Mode=TwoWay}"/>
-            <TextBlock Text="{StaticResource HeightLabelText}" Style="{StaticResource DescriptionTextBlock}"/>
-            <metro:NumericUpDown behaviors:NumericInput.Type="Size" Value="{Binding Height, Mode=TwoWay}"/>
-            <settings:ColorPicker DialogService="{Binding DialogService}" Title="{StaticResource BackgroundColorDescription}" Color="{Binding BackgroundColor}"/>
+            <TextBlock Style="{StaticResource TitleTextBlock}" Text="{StaticResource DisplaySectionText}" />
+            <TextBlock Style="{StaticResource DescriptionTextBlock}" Text="{StaticResource WidthLabelText}" />
+            <metro:NumericUpDown behaviors:NumericInput.Type="Size" Value="{Binding Width, Mode=TwoWay}" />
+            <TextBlock Style="{StaticResource DescriptionTextBlock}" Text="{StaticResource HeightLabelText}" />
+            <metro:NumericUpDown behaviors:NumericInput.Type="Size" Value="{Binding Height, Mode=TwoWay}" />
+            <settings:ColorPicker Title="{StaticResource BackgroundColorDescription}"
+                                  DialogService="{Binding DialogService}"
+                                  Color="{Binding BackgroundColor}" />
 
-            <TextBlock Text="{StaticResource OtherSectionText}" Style="{StaticResource TitleTextBlock}" Margin="{StaticResource SectionMargin}"/>
-            <Button HorizontalAlignment="Left" Content="{StaticResource ResetButtonText}" Command="{Binding ResetCommand}"/>
+            <TextBlock Margin="{StaticResource SectionMargin}"
+                       Style="{StaticResource TitleTextBlock}"
+                       Text="{StaticResource OtherSectionText}" />
+            <Button HorizontalAlignment="Left"
+                    Command="{Binding ResetCommand}"
+                    Content="{StaticResource ResetButtonText}" />
         </StackPanel>
     </DataTemplate>
 </ResourceDictionary>
diff --git a/src/AudioBand/Views/Settings/ImagePicker.xaml b/src/AudioBand/Views/Settings/ImagePicker.xaml
index 77094ae8..cfc1f77f 100644
--- a/src/AudioBand/Views/Settings/ImagePicker.xaml
+++ b/src/AudioBand/Views/Settings/ImagePicker.xaml
@@ -1,78 +1,94 @@
 <UserControl x:Class="AudioBand.Views.Settings.ImagePicker"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:converters="clr-namespace:AudioBand.ValueConverters"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:resources="clr-namespace:AudioBand.Resources"
              xmlns:theme="clr-namespace:AudioBand.Resources.Theming"
-             mc:Ignorable="d" 
-             d:DesignHeight="40" d:DesignWidth="500"
-             x:Name="ImagePickerControl">
+             x:Name="ImagePickerControl"
+             d:DesignHeight="40"
+             d:DesignWidth="500"
+             mc:Ignorable="d">
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <resources:SharedDictionary Source="../../Resources/Strings.xaml"/>
-                <resources:SharedDictionary Source="../../Resources/Shared.xaml"/>
-                <resources:SharedDictionary Source="../../Resources/SettingsWindowStyle.xaml"/>
+                <resources:SharedDictionary Source="../../Resources/Strings.xaml" />
+                <resources:SharedDictionary Source="../../Resources/Shared.xaml" />
+                <resources:SharedDictionary Source="../../Resources/SettingsWindowStyle.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>
-    <Button Style="{StaticResource ContainerButtonStyle}" Command="{Binding BrowseForImageCommand, ElementName=ImagePickerControl}">
+    <Button Command="{Binding BrowseForImageCommand, ElementName=ImagePickerControl}" Style="{StaticResource ContainerButtonStyle}">
         <Grid HorizontalAlignment="Left">
             <Grid.RowDefinitions>
-                <RowDefinition Height="*"/>
-                <RowDefinition Height="*"/>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
-                <ColumnDefinition/>
-                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition />
+                <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
-            <TextBlock x:Name="DefaultImage" Grid.Column="0" Grid.Row="0" Grid.RowSpan="2"
-                       Width="40" Height="40"
-                       Margin="0, 0, 10, 0"
-                       FontFamily="Segoe MDL2 Assets" FontSize="40" Text="&#xEB9F;">
+            <TextBlock x:Name="DefaultImage"
+                       Grid.Row="0"
+                       Grid.RowSpan="2"
+                       Grid.Column="0"
+                       Width="40"
+                       Height="40"
+                       Margin="0,0,10,0"
+                       FontFamily="Segoe MDL2 Assets"
+                       FontSize="40"
+                       Text="&#xEB9F;">
                 <TextBlock.Style>
                     <Style TargetType="{x:Type TextBlock}">
-                        <Setter Property="Visibility" Value="Hidden"/>
+                        <Setter Property="Visibility" Value="Hidden" />
                         <Style.Triggers>
                             <DataTrigger Binding="{Binding ImagePath, ElementName=ImagePickerControl}" Value="">
-                                <Setter Property="Visibility" Value="Visible"/>
+                                <Setter Property="Visibility" Value="Visible" />
                             </DataTrigger>
                             <DataTrigger Binding="{Binding ImagePath, ElementName=ImagePickerControl}" Value="{x:Null}">
-                                <Setter Property="Visibility" Value="Visible"/>
+                                <Setter Property="Visibility" Value="Visible" />
                             </DataTrigger>
                         </Style.Triggers>
                     </Style>
                 </TextBlock.Style>
             </TextBlock>
-            <Viewbox x:Name="ImageDisplay" Grid.Column="0" Grid.Row="0" Grid.RowSpan="2"
-                     Width="40" Height="40" Margin="0, 0, 10, 0" RenderOptions.BitmapScalingMode="Fant"
+            <Viewbox x:Name="ImageDisplay"
+                     Grid.Row="0"
+                     Grid.RowSpan="2"
+                     Grid.Column="0"
+                     Width="40"
+                     Height="40"
+                     Margin="0,0,10,0"
+                     RenderOptions.BitmapScalingMode="Fant"
                      Visibility="{Binding ImagePath, ElementName=ImagePickerControl, Converter={x:Static converters:Converters.StringToVisibility}}">
-                <Image x:Name="Image" Source="{Binding ImagePath, ElementName=ImagePickerControl, Converter={x:Static converters:Converters.PathToImageSource}}"/>
+                <Image x:Name="Image" Source="{Binding ImagePath, ElementName=ImagePickerControl, Converter={x:Static converters:Converters.PathToImageSource}}" />
             </Viewbox>
-            <TextBlock Grid.Column="1" Grid.Row="0"
-                       FontSize="14"
-                       VerticalAlignment="Top">
-                <Run Text="{Binding Title, ElementName=ImagePickerControl}"/>
-                <TextBlock Visibility="{Binding ImagePath, ElementName=ImagePickerControl, Converter={x:Static converters:Converters.StringToVisibility}}"
-                           HorizontalAlignment="Right">
+            <TextBlock Grid.Row="0"
+                       Grid.Column="1"
+                       VerticalAlignment="Top"
+                       FontSize="14">
+                <Run Text="{Binding Title, ElementName=ImagePickerControl}" />
+                <TextBlock HorizontalAlignment="Right" Visibility="{Binding ImagePath, ElementName=ImagePickerControl, Converter={x:Static converters:Converters.StringToVisibility}}">
                     <Hyperlink Command="{Binding ResetImageCommand, ElementName=ImagePickerControl}">
-                        <Run Text="{StaticResource ImagePickerResetText}"/>
+                        <Run Text="{StaticResource ImagePickerResetText}" />
                     </Hyperlink>
                 </TextBlock>
             </TextBlock>
-            <TextBlock Grid.Column="1" Grid.Row="1" VerticalAlignment="Bottom" FontSize="14"
+            <TextBlock Grid.Row="1"
+                       Grid.Column="1"
+                       VerticalAlignment="Bottom"
+                       FontSize="14"
                        Foreground="{theme:ThemeResource SystemBaseMediumColor}">
                 <TextBlock.Style>
                     <Style TargetType="{x:Type TextBlock}">
-                        <Setter Property="Text" Value="{Binding ImagePath, ElementName=ImagePickerControl}"/>
+                        <Setter Property="Text" Value="{Binding ImagePath, ElementName=ImagePickerControl}" />
                         <Style.Triggers>
                             <DataTrigger Binding="{Binding ImagePath, ElementName=ImagePickerControl}" Value="">
-                                <Setter Property="Text" Value="{StaticResource ImagePickerNoImageText}"/>
+                                <Setter Property="Text" Value="{StaticResource ImagePickerNoImageText}" />
                             </DataTrigger>
                             <DataTrigger Binding="{Binding ImagePath, ElementName=ImagePickerControl}" Value="{x:Null}">
-                                <Setter Property="Text" Value="{StaticResource ImagePickerNoImageText}"/>
+                                <Setter Property="Text" Value="{StaticResource ImagePickerNoImageText}" />
                             </DataTrigger>
                         </Style.Triggers>
                     </Style>
diff --git a/src/AudioBand/Views/Settings/LayoutSettingsTemplate.xaml b/src/AudioBand/Views/Settings/LayoutSettingsTemplate.xaml
index 4808bada..c48b4699 100644
--- a/src/AudioBand/Views/Settings/LayoutSettingsTemplate.xaml
+++ b/src/AudioBand/Views/Settings/LayoutSettingsTemplate.xaml
@@ -1,39 +1,44 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:resources="clr-namespace:AudioBand.Resources"
-                    xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
                     xmlns:behaviors="clr-namespace:AudioBand.Behaviors"
-                    xmlns:models="clr-namespace:AudioBand.Models"
                     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                    xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
                     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                    xmlns:models="clr-namespace:AudioBand.Models"
+                    xmlns:resources="clr-namespace:AudioBand.Resources"
                     mc:Ignorable="d">
     <DataTemplate x:Key="LayoutSettingsTemplate">
         <DataTemplate.Resources>
             <ResourceDictionary>
                 <ResourceDictionary.MergedDictionaries>
-                    <resources:SharedDictionary Source="../../Resources/SettingsWindowStyle.xaml"/>
-                    <resources:SharedDictionary Source="../../Resources/Strings.xaml"/>
+                    <resources:SharedDictionary Source="../../Resources/SettingsWindowStyle.xaml" />
+                    <resources:SharedDictionary Source="../../Resources/Strings.xaml" />
                 </ResourceDictionary.MergedDictionaries>
             </ResourceDictionary>
         </DataTemplate.Resources>
-        <StackPanel Style="{StaticResource SettingsStackPanel}" KeyboardNavigation.IsTabStop="False">
-            <TextBlock Text="{StaticResource DisplaySectionText}" Style="{StaticResource TitleTextBlock}"/>
-            <TextBlock Text="{StaticResource VisibilityLabelText}" Style="{StaticResource DescriptionTextBlock}"/>
-            <mah:ToggleSwitch OnLabel="{StaticResource StatusVisible}" OffLabel="{StaticResource StatusHidden}"
-                            IsChecked="{Binding IsVisible, Mode=TwoWay}"/>
-            <UniformGrid Rows="4" Columns="2" Style="{StaticResource ArrangementGridStyle}">
-                <TextBlock Text="{StaticResource WidthLabelText}" Style="{StaticResource DescriptionTextBlock}"/>
-                <TextBlock Text="{StaticResource HeightLabelText}" Style="{StaticResource DescriptionTextBlock}"/>
-                <mah:NumericUpDown behaviors:NumericInput.Type="Size" Value="{Binding Width, Mode=TwoWay}"/>
-                <mah:NumericUpDown behaviors:NumericInput.Type="Size" Value="{Binding Height, Mode=TwoWay}"/>
-                <TextBlock Text="{StaticResource XPositionLabelText}" Style="{StaticResource DescriptionTextBlock}"/>
-                <TextBlock Text="{StaticResource YPositionLabelText}" Style="{StaticResource DescriptionTextBlock}"/>
-                <mah:NumericUpDown behaviors:NumericInput.Type="Position" Value="{Binding XPosition, Mode=TwoWay}"/>
-                <mah:NumericUpDown behaviors:NumericInput.Type="Position" Value="{Binding YPosition, Mode=TwoWay}"/>
+        <StackPanel KeyboardNavigation.IsTabStop="False" Style="{StaticResource SettingsStackPanel}">
+            <TextBlock Style="{StaticResource TitleTextBlock}" Text="{StaticResource DisplaySectionText}" />
+            <TextBlock Style="{StaticResource DescriptionTextBlock}" Text="{StaticResource VisibilityLabelText}" />
+            <mah:ToggleSwitch IsChecked="{Binding IsVisible, Mode=TwoWay}"
+                              OffLabel="{StaticResource StatusHidden}"
+                              OnLabel="{StaticResource StatusVisible}" />
+            <UniformGrid Columns="2"
+                         Rows="4"
+                         Style="{StaticResource ArrangementGridStyle}">
+                <TextBlock Style="{StaticResource DescriptionTextBlock}" Text="{StaticResource WidthLabelText}" />
+                <TextBlock Style="{StaticResource DescriptionTextBlock}" Text="{StaticResource HeightLabelText}" />
+                <mah:NumericUpDown behaviors:NumericInput.Type="Size" Value="{Binding Width, Mode=TwoWay}" />
+                <mah:NumericUpDown behaviors:NumericInput.Type="Size" Value="{Binding Height, Mode=TwoWay}" />
+                <TextBlock Style="{StaticResource DescriptionTextBlock}" Text="{StaticResource XPositionLabelText}" />
+                <TextBlock Style="{StaticResource DescriptionTextBlock}" Text="{StaticResource YPositionLabelText}" />
+                <mah:NumericUpDown behaviors:NumericInput.Type="Position" Value="{Binding XPosition, Mode=TwoWay}" />
+                <mah:NumericUpDown behaviors:NumericInput.Type="Position" Value="{Binding YPosition, Mode=TwoWay}" />
             </UniformGrid>
-            <TextBlock Text="{StaticResource PositionAnchorDescription}" Style="{StaticResource DescriptionTextBlock}"/>
-            <ComboBox ItemsSource="{x:Static models:PositionAnchors.Values}" ItemTemplate="{StaticResource EnumDescriptorItemTemplate}"
-                      SelectedValue="{Binding Anchor}" SelectedValuePath="Value"/>
+            <TextBlock Style="{StaticResource DescriptionTextBlock}" Text="{StaticResource PositionAnchorDescription}" />
+            <ComboBox ItemTemplate="{StaticResource EnumDescriptorItemTemplate}"
+                      ItemsSource="{x:Static models:PositionAnchors.Values}"
+                      SelectedValue="{Binding Anchor}"
+                      SelectedValuePath="Value" />
         </StackPanel>
     </DataTemplate>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/AudioBand/Views/Settings/PlayPauseButtonSettingsView.xaml b/src/AudioBand/Views/Settings/PlayPauseButtonSettingsView.xaml
index 5ddae8e9..b75a417c 100644
--- a/src/AudioBand/Views/Settings/PlayPauseButtonSettingsView.xaml
+++ b/src/AudioBand/Views/Settings/PlayPauseButtonSettingsView.xaml
@@ -1,35 +1,37 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:AudioBand.Views.Settings"
-             xmlns:metro="http://metro.mahapps.com/winfx/xaml/controls"
-             xmlns:viewmodels="clr-namespace:AudioBand.ViewModels"
-             xmlns:models="clr-namespace:AudioBand.Models"
-             xmlns:behaviors="clr-namespace:AudioBand.Behaviors"
-             xmlns:resources="clr-namespace:AudioBand.Resources">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:resources="clr-namespace:AudioBand.Resources"
+                    xmlns:viewmodels="clr-namespace:AudioBand.ViewModels">
     <DataTemplate DataType="{x:Type viewmodels:PlayPauseButtonViewModel}">
         <DataTemplate.Resources>
             <ResourceDictionary>
                 <ResourceDictionary.MergedDictionaries>
-                    <resources:SharedDictionary Source="../../Resources/SettingsWindowStyle.xaml"/>
-                    <resources:SharedDictionary Source="../../Resources/Strings.xaml"/>
-                    <resources:SharedDictionary Source="ButtonBaseTemplate.xaml"/>
-                    <resources:SharedDictionary Source="ButtonContentTemplate.xaml"/>
+                    <resources:SharedDictionary Source="../../Resources/SettingsWindowStyle.xaml" />
+                    <resources:SharedDictionary Source="../../Resources/Strings.xaml" />
+                    <resources:SharedDictionary Source="ButtonBaseTemplate.xaml" />
+                    <resources:SharedDictionary Source="ButtonContentTemplate.xaml" />
                 </ResourceDictionary.MergedDictionaries>
             </ResourceDictionary>
         </DataTemplate.Resources>
         <StackPanel Style="{StaticResource SettingsStackPanel}">
-            <ContentPresenter Content="{Binding}" ContentTemplate="{StaticResource ButtonBaseTemplate}"/>
+            <ContentPresenter Content="{Binding}" ContentTemplate="{StaticResource ButtonBaseTemplate}" />
 
-            <TextBlock Margin="{StaticResource SectionMargin}" Text="{StaticResource PlayButtonContentSectionText}" Style="{StaticResource TitleTextBlock}"/>
-            <ContentPresenter Content="{Binding PlayContent}" ContentTemplate="{StaticResource ButtonContentTemplate}"/>
+            <TextBlock Margin="{StaticResource SectionMargin}"
+                       Style="{StaticResource TitleTextBlock}"
+                       Text="{StaticResource PlayButtonContentSectionText}" />
+            <ContentPresenter Content="{Binding PlayContent}" ContentTemplate="{StaticResource ButtonContentTemplate}" />
 
-            <TextBlock Margin="{StaticResource SectionMargin}" Text="{StaticResource PauseButtonContentSectionText}" Style="{StaticResource TitleTextBlock}"/>
-            <ContentPresenter Content="{Binding PauseContent}" ContentTemplate="{StaticResource ButtonContentTemplate}"/>
+            <TextBlock Margin="{StaticResource SectionMargin}"
+                       Style="{StaticResource TitleTextBlock}"
+                       Text="{StaticResource PauseButtonContentSectionText}" />
+            <ContentPresenter Content="{Binding PauseContent}" ContentTemplate="{StaticResource ButtonContentTemplate}" />
 
-            <TextBlock Margin="{StaticResource SectionMargin}" Text="{StaticResource OtherSectionText}" Style="{StaticResource TitleTextBlock}"/>
+            <TextBlock Margin="{StaticResource SectionMargin}"
+                       Style="{StaticResource TitleTextBlock}"
+                       Text="{StaticResource OtherSectionText}" />
             <Button HorizontalAlignment="Left"
-                Content="{StaticResource ResetButtonText}"
-                Command="{Binding ResetCommand}"/>
+                    Command="{Binding ResetCommand}"
+                    Content="{StaticResource ResetButtonText}" />
         </StackPanel>
     </DataTemplate>
 </ResourceDictionary>
diff --git a/src/AudioBand/Views/Settings/PlaybackButtonSettingsView.xaml b/src/AudioBand/Views/Settings/PlaybackButtonSettingsView.xaml
index d23637c7..c2a3bec2 100644
--- a/src/AudioBand/Views/Settings/PlaybackButtonSettingsView.xaml
+++ b/src/AudioBand/Views/Settings/PlaybackButtonSettingsView.xaml
@@ -1,41 +1,41 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:AudioBand.Views.Settings"
-             xmlns:metro="http://metro.mahapps.com/winfx/xaml/controls"
-             xmlns:viewmodels="clr-namespace:AudioBand.ViewModels"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:models="clr-namespace:AudioBand.Models"
-             xmlns:behaviors="clr-namespace:AudioBand.Behaviors"
-             xmlns:resources="clr-namespace:AudioBand.Resources"
-             mc:Ignorable="d">
+                    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:resources="clr-namespace:AudioBand.Resources"
+                    xmlns:viewmodels="clr-namespace:AudioBand.ViewModels"
+                    mc:Ignorable="d">
     <DataTemplate x:Key="PlaybackButtonContent">
         <DataTemplate.Resources>
             <ResourceDictionary>
                 <ResourceDictionary.MergedDictionaries>
-                    <resources:SharedDictionary Source="../../Resources/SettingsWindowStyle.xaml"/>
-                    <resources:SharedDictionary Source="../../Resources/Strings.xaml"/>
-                    <resources:SharedDictionary Source="ButtonBaseTemplate.xaml"/>
-                    <resources:SharedDictionary Source="ButtonContentTemplate.xaml"/>
+                    <resources:SharedDictionary Source="../../Resources/SettingsWindowStyle.xaml" />
+                    <resources:SharedDictionary Source="../../Resources/Strings.xaml" />
+                    <resources:SharedDictionary Source="ButtonBaseTemplate.xaml" />
+                    <resources:SharedDictionary Source="ButtonContentTemplate.xaml" />
                 </ResourceDictionary.MergedDictionaries>
             </ResourceDictionary>
         </DataTemplate.Resources>
-        <StackPanel Style="{StaticResource SettingsStackPanel}" d:DataContext="{d:DesignInstance viewmodels:NextButtonViewModel}">
-            <ContentPresenter Content="{Binding}" ContentTemplate="{StaticResource ButtonBaseTemplate}"/>
+        <StackPanel d:DataContext="{d:DesignInstance viewmodels:NextButtonViewModel}" Style="{StaticResource SettingsStackPanel}">
+            <ContentPresenter Content="{Binding}" ContentTemplate="{StaticResource ButtonBaseTemplate}" />
 
-            <TextBlock Margin="{StaticResource SectionMargin}" Text="{StaticResource PlaybackButtonContentSectionText}" Style="{StaticResource TitleTextBlock}"/>
-            <ContentPresenter Content="{Binding Content}" ContentTemplate="{StaticResource ButtonContentTemplate}"/>
+            <TextBlock Margin="{StaticResource SectionMargin}"
+                       Style="{StaticResource TitleTextBlock}"
+                       Text="{StaticResource PlaybackButtonContentSectionText}" />
+            <ContentPresenter Content="{Binding Content}" ContentTemplate="{StaticResource ButtonContentTemplate}" />
 
-            <TextBlock Margin="{StaticResource SectionMargin}" Text="{StaticResource OtherSectionText}" Style="{StaticResource TitleTextBlock}"/>
-            <Button HorizontalAlignment="Left" 
-                Content="{StaticResource ResetButtonText}"
-                Command="{Binding ResetCommand}"/>
+            <TextBlock Margin="{StaticResource SectionMargin}"
+                       Style="{StaticResource TitleTextBlock}"
+                       Text="{StaticResource OtherSectionText}" />
+            <Button HorizontalAlignment="Left"
+                    Command="{Binding ResetCommand}"
+                    Content="{StaticResource ResetButtonText}" />
         </StackPanel>
     </DataTemplate>
     <DataTemplate DataType="{x:Type viewmodels:NextButtonViewModel}">
-        <ContentControl ContentTemplate="{StaticResource PlaybackButtonContent}" Content="{Binding}"/>
+        <ContentControl Content="{Binding}" ContentTemplate="{StaticResource PlaybackButtonContent}" />
     </DataTemplate>
     <DataTemplate DataType="{x:Type viewmodels:PreviousButtonViewModel}">
-        <ContentControl ContentTemplate="{StaticResource PlaybackButtonContent}" Content="{Binding}"/>
+        <ContentControl Content="{Binding}" ContentTemplate="{StaticResource PlaybackButtonContent}" />
     </DataTemplate>
 </ResourceDictionary>
diff --git a/src/AudioBand/Views/Settings/ProgressBarSettingsView.xaml b/src/AudioBand/Views/Settings/ProgressBarSettingsView.xaml
index 4f2bf974..a0c1215f 100644
--- a/src/AudioBand/Views/Settings/ProgressBarSettingsView.xaml
+++ b/src/AudioBand/Views/Settings/ProgressBarSettingsView.xaml
@@ -1,31 +1,41 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:AudioBand.Views.Settings"
-             xmlns:viewmodels="clr-namespace:AudioBand.ViewModels"
-             xmlns:metro="http://metro.mahapps.com/winfx/xaml/controls"
-             xmlns:behaviors="clr-namespace:AudioBand.Behaviors"
-             xmlns:resources="clr-namespace:AudioBand.Resources">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:AudioBand.Views.Settings"
+                    xmlns:resources="clr-namespace:AudioBand.Resources"
+                    xmlns:viewmodels="clr-namespace:AudioBand.ViewModels">
     <DataTemplate DataType="{x:Type viewmodels:ProgressBarViewModel}">
         <DataTemplate.Resources>
             <ResourceDictionary>
                 <ResourceDictionary.MergedDictionaries>
-                    <resources:SharedDictionary Source="../../Resources/Shared.xaml"/>
-                    <resources:SharedDictionary Source="../../Resources/Strings.xaml"/>
-                    <resources:SharedDictionary Source="../../Resources/SettingsWindowStyle.xaml"/>
-                    <resources:SharedDictionary Source="LayoutSettingsTemplate.xaml"/>
+                    <resources:SharedDictionary Source="../../Resources/Shared.xaml" />
+                    <resources:SharedDictionary Source="../../Resources/Strings.xaml" />
+                    <resources:SharedDictionary Source="../../Resources/SettingsWindowStyle.xaml" />
+                    <resources:SharedDictionary Source="LayoutSettingsTemplate.xaml" />
                 </ResourceDictionary.MergedDictionaries>
             </ResourceDictionary>
         </DataTemplate.Resources>
         <StackPanel Style="{StaticResource SettingsStackPanel}">
-            <ContentPresenter Content="{Binding}" ContentTemplate="{StaticResource LayoutSettingsTemplate}"/>
+            <ContentPresenter Content="{Binding}" ContentTemplate="{StaticResource LayoutSettingsTemplate}" />
 
-            <TextBlock Text="{StaticResource ProgressBarColorsSectionText}" Style="{StaticResource TitleTextBlock}" Margin="{StaticResource SectionMargin}"/>
-            <local:ColorPicker DialogService="{Binding DialogService}" Color="{Binding ForegroundColor}" Title="{StaticResource ProgressBarForegroundColorDescription}"/>
-            <local:ColorPicker DialogService="{Binding DialogService}" Color="{Binding BackgroundColor}" Title="{StaticResource ProgressBarBackgroundColorDescription}"/>
-            <local:ColorPicker DialogService="{Binding DialogService}" Color="{Binding HoverColor}" Title="{StaticResource ProgressBarHoverColorDescription}"/>
+            <TextBlock Margin="{StaticResource SectionMargin}"
+                       Style="{StaticResource TitleTextBlock}"
+                       Text="{StaticResource ProgressBarColorsSectionText}" />
+            <local:ColorPicker Title="{StaticResource ProgressBarForegroundColorDescription}"
+                               DialogService="{Binding DialogService}"
+                               Color="{Binding ForegroundColor}" />
+            <local:ColorPicker Title="{StaticResource ProgressBarBackgroundColorDescription}"
+                               DialogService="{Binding DialogService}"
+                               Color="{Binding BackgroundColor}" />
+            <local:ColorPicker Title="{StaticResource ProgressBarHoverColorDescription}"
+                               DialogService="{Binding DialogService}"
+                               Color="{Binding HoverColor}" />
 
-            <TextBlock Text="{StaticResource OtherSectionText}" Style="{StaticResource TitleTextBlock}" Margin="{StaticResource SectionMargin}"/>
-            <Button HorizontalAlignment="Left" Content="{StaticResource ResetButtonText}" Command="{Binding ResetCommand}"/>
+            <TextBlock Margin="{StaticResource SectionMargin}"
+                       Style="{StaticResource TitleTextBlock}"
+                       Text="{StaticResource OtherSectionText}" />
+            <Button HorizontalAlignment="Left"
+                    Command="{Binding ResetCommand}"
+                    Content="{StaticResource ResetButtonText}" />
         </StackPanel>
     </DataTemplate>
 </ResourceDictionary>
diff --git a/src/AudioBand/Views/Settings/RepeatModeButtonSettingsView.xaml b/src/AudioBand/Views/Settings/RepeatModeButtonSettingsView.xaml
index 12394f58..1de87a74 100644
--- a/src/AudioBand/Views/Settings/RepeatModeButtonSettingsView.xaml
+++ b/src/AudioBand/Views/Settings/RepeatModeButtonSettingsView.xaml
@@ -1,35 +1,50 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:AudioBand.Views.Settings"
-                    xmlns:viewmodels="clr-namespace:AudioBand.ViewModels"
-                    xmlns:resources="clr-namespace:AudioBand.Resources">
+                    xmlns:resources="clr-namespace:AudioBand.Resources"
+                    xmlns:viewmodels="clr-namespace:AudioBand.ViewModels">
     <DataTemplate DataType="{x:Type viewmodels:RepeatModeButtonViewModel}">
         <DataTemplate.Resources>
             <ResourceDictionary>
                 <ResourceDictionary.MergedDictionaries>
-                    <resources:SharedDictionary Source="../../Resources/SettingsWindowStyle.xaml"/>
-                    <resources:SharedDictionary Source="../../Resources/Strings.xaml"/>
-                    <resources:SharedDictionary Source="ButtonBaseTemplate.xaml"/>
-                    <resources:SharedDictionary Source="ButtonContentTemplate.xaml"/>
+                    <resources:SharedDictionary Source="../../Resources/SettingsWindowStyle.xaml" />
+                    <resources:SharedDictionary Source="../../Resources/Strings.xaml" />
+                    <resources:SharedDictionary Source="ButtonBaseTemplate.xaml" />
+                    <resources:SharedDictionary Source="ButtonContentTemplate.xaml" />
                 </ResourceDictionary.MergedDictionaries>
             </ResourceDictionary>
         </DataTemplate.Resources>
         <StackPanel Style="{StaticResource SettingsStackPanel}">
-            <ContentPresenter Content="{Binding}" ContentTemplate="{StaticResource ButtonBaseTemplate}" Focusable="False"/>
+            <ContentPresenter Content="{Binding}"
+                              ContentTemplate="{StaticResource ButtonBaseTemplate}"
+                              Focusable="False" />
 
-            <TextBlock Margin="{StaticResource SectionMargin}" Text="{StaticResource RepeatModeButtonOffContentSectionText}" Style="{StaticResource TitleTextBlock}"/>
-            <ContentPresenter Content="{Binding RepeatOffContent}" ContentTemplate="{StaticResource ButtonContentTemplate}" Focusable="False"/>
+            <TextBlock Margin="{StaticResource SectionMargin}"
+                       Style="{StaticResource TitleTextBlock}"
+                       Text="{StaticResource RepeatModeButtonOffContentSectionText}" />
+            <ContentPresenter Content="{Binding RepeatOffContent}"
+                              ContentTemplate="{StaticResource ButtonContentTemplate}"
+                              Focusable="False" />
 
-            <TextBlock Margin="{StaticResource SectionMargin}" Text="{StaticResource RepeatModeButtonContextContentSectionText}" Style="{StaticResource TitleTextBlock}"/>
-            <ContentPresenter Content="{Binding RepeatContextContent}" ContentTemplate="{StaticResource ButtonContentTemplate}" Focusable="False"/>
+            <TextBlock Margin="{StaticResource SectionMargin}"
+                       Style="{StaticResource TitleTextBlock}"
+                       Text="{StaticResource RepeatModeButtonContextContentSectionText}" />
+            <ContentPresenter Content="{Binding RepeatContextContent}"
+                              ContentTemplate="{StaticResource ButtonContentTemplate}"
+                              Focusable="False" />
 
-            <TextBlock Margin="{StaticResource SectionMargin}" Text="{StaticResource RepeatModeButtonTrackContentSectionText}" Style="{StaticResource TitleTextBlock}"/>
-            <ContentPresenter Content="{Binding RepeatTrackContent}" ContentTemplate="{StaticResource ButtonContentTemplate}" Focusable="False"/>
+            <TextBlock Margin="{StaticResource SectionMargin}"
+                       Style="{StaticResource TitleTextBlock}"
+                       Text="{StaticResource RepeatModeButtonTrackContentSectionText}" />
+            <ContentPresenter Content="{Binding RepeatTrackContent}"
+                              ContentTemplate="{StaticResource ButtonContentTemplate}"
+                              Focusable="False" />
 
-            <TextBlock Margin="{StaticResource SectionMargin}" Text="{StaticResource OtherSectionText}" Style="{StaticResource TitleTextBlock}"/>
+            <TextBlock Margin="{StaticResource SectionMargin}"
+                       Style="{StaticResource TitleTextBlock}"
+                       Text="{StaticResource OtherSectionText}" />
             <Button HorizontalAlignment="Left"
-                    Content="{StaticResource ResetButtonText}"
-                    Command="{Binding ResetCommand}"/>
+                    Command="{Binding ResetCommand}"
+                    Content="{StaticResource ResetButtonText}" />
         </StackPanel>
     </DataTemplate>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/AudioBand/Views/Settings/SettingsWindow.xaml b/src/AudioBand/Views/Settings/SettingsWindow.xaml
index a8fe7189..d577fecb 100644
--- a/src/AudioBand/Views/Settings/SettingsWindow.xaml
+++ b/src/AudioBand/Views/Settings/SettingsWindow.xaml
@@ -1,75 +1,82 @@
-<fw:AcrylicWindow
-            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-            xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-            xmlns:converters="clr-namespace:AudioBand.ValueConverters"
-            xmlns:viewmodels="clr-namespace:AudioBand.ViewModels"
-            xmlns:fw="clr-namespace:SourceChord.FluentWPF;assembly=FluentWPF"
-            xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
-            xmlns:behaviors="clr-namespace:AudioBand.Behaviors"
-            xmlns:resources="clr-namespace:AudioBand.Resources"
-            xmlns:theme="clr-namespace:AudioBand.Resources.Theming"
-            x:Class="AudioBand.Views.Settings.SettingsWindow"
-            mc:Ignorable="d" 
-            x:Name="Window"
-            d:DesignHeight="600" d:DesignWidth="400"
-            d:DataContext="{d:DesignInstance viewmodels:SettingsWindowViewModel, IsDesignTimeCreatable=True}"
-            Title="Audio Band Settings"
-            Icon="pack://application:,,,/AudioBand;component/audioband.ico"
-            Height="700"
-            Width="930"
-            TintOpacity="0"
-            TintColor="Transparent"
-            FallbackColor="Transparent"
-            NoiseOpacity="0.01"
-            fw:PointerTracker.Enabled="True"
-            ExtendViewIntoTitleBar="True"
-            WindowStartupLocation="CenterScreen"
-            Foreground="{theme:ThemeResource SystemBaseHighColor}"
-            BorderBrush="{theme:ThemeResource SystemAccentColor}">
+<fw:AcrylicWindow x:Class="AudioBand.Views.Settings.SettingsWindow"
+                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                  xmlns:behaviors="clr-namespace:AudioBand.Behaviors"
+                  xmlns:converters="clr-namespace:AudioBand.ValueConverters"
+                  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                  xmlns:fw="clr-namespace:SourceChord.FluentWPF;assembly=FluentWPF"
+                  xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+                  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                  xmlns:resources="clr-namespace:AudioBand.Resources"
+                  xmlns:theme="clr-namespace:AudioBand.Resources.Theming"
+                  xmlns:viewmodels="clr-namespace:AudioBand.ViewModels"
+                  x:Name="Window"
+                  Title="Audio Band Settings"
+                  Width="930"
+                  Height="700"
+                  d:DataContext="{d:DesignInstance viewmodels:SettingsWindowViewModel,
+                                                   IsDesignTimeCreatable=True}"
+                  d:DesignHeight="600"
+                  d:DesignWidth="400"
+                  fw:PointerTracker.Enabled="True"
+                  BorderBrush="{theme:ThemeResource SystemAccentColor}"
+                  ExtendViewIntoTitleBar="True"
+                  FallbackColor="Transparent"
+                  Foreground="{theme:ThemeResource SystemBaseHighColor}"
+                  Icon="pack://application:,,,/AudioBand;component/audioband.ico"
+                  NoiseOpacity="0.01"
+                  TintColor="Transparent"
+                  TintOpacity="0"
+                  WindowStartupLocation="CenterScreen"
+                  mc:Ignorable="d">
     <i:Interaction.Behaviors>
-        <behaviors:AppUserModelID/>
-        <behaviors:DpiScaling/>
+        <behaviors:AppUserModelID />
+        <behaviors:DpiScaling />
     </i:Interaction.Behaviors>
     <i:Interaction.Triggers>
         <i:EventTrigger EventName="Closing">
-            <i:InvokeCommandAction Command="{Binding CloseCommand}"/>
+            <i:InvokeCommandAction Command="{Binding CloseCommand}" />
         </i:EventTrigger>
     </i:Interaction.Triggers>
     <fw:AcrylicWindow.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <resources:SharedDictionary Source="../../Resources/SettingsWindowStyle.xaml"/>
-                <resources:SharedDictionary Source="../../Resources/Strings.xaml"/>
-                <resources:SharedDictionary Source="../../Resources/Icons.xaml"/>
+                <resources:SharedDictionary Source="../../Resources/SettingsWindowStyle.xaml" />
+                <resources:SharedDictionary Source="../../Resources/Strings.xaml" />
+                <resources:SharedDictionary Source="../../Resources/Icons.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </fw:AcrylicWindow.Resources>
-    <DockPanel LastChildFill="True" KeyboardNavigation.IsTabStop="False">
+    <DockPanel KeyboardNavigation.IsTabStop="False" LastChildFill="True">
         <Grid>
             <Grid.RowDefinitions>
-                <RowDefinition Height="*"/>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="30"/>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="30" />
             </Grid.RowDefinitions>
-            <Border x:Name="CustomFallback" Grid.RowSpan="3" Background="{theme:ThemeResource SystemChromeMediumColor}">
+            <Border x:Name="CustomFallback"
+                    Grid.RowSpan="3"
+                    Background="{theme:ThemeResource SystemChromeMediumColor}">
                 <Border.Style>
                     <Style TargetType="{x:Type Border}">
-                        <Setter Property="Opacity" Value="0.6"/>
+                        <Setter Property="Opacity" Value="0.6" />
                         <Style.Triggers>
                             <DataTrigger Binding="{Binding ElementName=Window, Path=IsActive}" Value="False">
                                 <DataTrigger.EnterActions>
                                     <BeginStoryboard>
                                         <Storyboard>
-                                            <DoubleAnimation Storyboard.TargetProperty="Opacity" To="1" Duration="0:0:0.2"/>
+                                            <DoubleAnimation Storyboard.TargetProperty="Opacity"
+                                                             To="1"
+                                                             Duration="0:0:0.2" />
                                         </Storyboard>
                                     </BeginStoryboard>
                                 </DataTrigger.EnterActions>
                                 <DataTrigger.ExitActions>
                                     <BeginStoryboard>
                                         <Storyboard>
-                                            <DoubleAnimation Storyboard.TargetProperty="Opacity" To="0.6" Duration="0:0:0.2"/>
+                                            <DoubleAnimation Storyboard.TargetProperty="Opacity"
+                                                             To="0.6"
+                                                             Duration="0:0:0.2" />
                                         </Storyboard>
                                     </BeginStoryboard>
                                 </DataTrigger.ExitActions>
@@ -78,119 +85,161 @@
                     </Style>
                 </Border.Style>
             </Border>
-            <ScrollViewer Grid.Row="0" VerticalScrollBarVisibility="Auto" IsTabStop="False" Width="300" WindowChrome.IsHitTestVisibleInChrome="True">
-                <StackPanel DockPanel.Dock="Left" Background="Transparent" x:Name="NavigationPane">
-                    <RadioButton Style="{StaticResource NavigationPaneRadioButton}" GroupName="nav"
-                                 Command="{Binding SelectViewModelCommand}" CommandParameter="{Binding ViewModels.AudioBandViewModel}">
+            <ScrollViewer Grid.Row="0"
+                          Width="300"
+                          IsTabStop="False"
+                          VerticalScrollBarVisibility="Auto"
+                          WindowChrome.IsHitTestVisibleInChrome="True">
+                <StackPanel x:Name="NavigationPane"
+                            Background="Transparent"
+                            DockPanel.Dock="Left">
+                    <RadioButton Command="{Binding SelectViewModelCommand}"
+                                 CommandParameter="{Binding ViewModels.AudioBandViewModel}"
+                                 GroupName="nav"
+                                 Style="{StaticResource NavigationPaneRadioButton}">
                         <StackPanel Orientation="Horizontal">
-                            <Image Style="{StaticResource NavigationPaneIcon}" Source="{StaticResource Gear}"/>
-                            <TextBlock Text="{StaticResource GeneralSettingsTab}"/>
+                            <Image Source="{StaticResource Gear}" Style="{StaticResource NavigationPaneIcon}" />
+                            <TextBlock Text="{StaticResource GeneralSettingsTab}" />
                         </StackPanel>
                     </RadioButton>
-                    <RadioButton Style="{StaticResource NavigationPaneRadioButton}" GroupName="nav"
-                                 Command="{Binding SelectViewModelCommand}" CommandParameter="{Binding ViewModels.PlayPauseButtonViewModel}">
+                    <RadioButton Command="{Binding SelectViewModelCommand}"
+                                 CommandParameter="{Binding ViewModels.PlayPauseButtonViewModel}"
+                                 GroupName="nav"
+                                 Style="{StaticResource NavigationPaneRadioButton}">
                         <StackPanel Orientation="Horizontal">
-                            <Image Style="{StaticResource NavigationPaneIcon}" Source="{StaticResource Play}"/>
-                            <TextBlock Text="{StaticResource PlayPauseButtonTab}"/>
+                            <Image Source="{StaticResource Play}" Style="{StaticResource NavigationPaneIcon}" />
+                            <TextBlock Text="{StaticResource PlayPauseButtonTab}" />
                         </StackPanel>
                     </RadioButton>
-                    <RadioButton Style="{StaticResource NavigationPaneRadioButton}" GroupName="nav" 
-                                 Command="{Binding SelectViewModelCommand}" CommandParameter="{Binding ViewModels.NextButtonViewModel}">
+                    <RadioButton Command="{Binding SelectViewModelCommand}"
+                                 CommandParameter="{Binding ViewModels.NextButtonViewModel}"
+                                 GroupName="nav"
+                                 Style="{StaticResource NavigationPaneRadioButton}">
                         <StackPanel Orientation="Horizontal">
-                            <Image Style="{StaticResource NavigationPaneIcon}" Source="{StaticResource Next}"/>
-                            <TextBlock Text="{StaticResource NextButtonTab}"/>
+                            <Image Source="{StaticResource Next}" Style="{StaticResource NavigationPaneIcon}" />
+                            <TextBlock Text="{StaticResource NextButtonTab}" />
                         </StackPanel>
                     </RadioButton>
-                    <RadioButton Style="{StaticResource NavigationPaneRadioButton}" GroupName="nav"
-                                 Command="{Binding SelectViewModelCommand}" CommandParameter="{Binding ViewModels.PreviousButtonViewModel}">
+                    <RadioButton Command="{Binding SelectViewModelCommand}"
+                                 CommandParameter="{Binding ViewModels.PreviousButtonViewModel}"
+                                 GroupName="nav"
+                                 Style="{StaticResource NavigationPaneRadioButton}">
                         <StackPanel Orientation="Horizontal">
-                            <Image Style="{StaticResource NavigationPaneIcon}" Source="{StaticResource Previous}"/>
-                            <TextBlock Text="{StaticResource PrevButtonTab}"/>
+                            <Image Source="{StaticResource Previous}" Style="{StaticResource NavigationPaneIcon}" />
+                            <TextBlock Text="{StaticResource PrevButtonTab}" />
                         </StackPanel>
                     </RadioButton>
-                    <RadioButton Style="{StaticResource NavigationPaneRadioButton}" GroupName="nav"
-                                 Command="{Binding SelectViewModelCommand}" CommandParameter="{Binding ViewModels.RepeatModeButtonViewModel}">
+                    <RadioButton Command="{Binding SelectViewModelCommand}"
+                                 CommandParameter="{Binding ViewModels.RepeatModeButtonViewModel}"
+                                 GroupName="nav"
+                                 Style="{StaticResource NavigationPaneRadioButton}">
                         <StackPanel Orientation="Horizontal">
-                            <Image Style="{StaticResource NavigationPaneIcon}" Source="{StaticResource RepeatModeIcon}"/>
-                            <TextBlock Text="{StaticResource RepeatModeButtonTab}"/>
+                            <Image Source="{StaticResource RepeatModeIcon}" Style="{StaticResource NavigationPaneIcon}" />
+                            <TextBlock Text="{StaticResource RepeatModeButtonTab}" />
                         </StackPanel>
                     </RadioButton>
-                    <RadioButton Style="{StaticResource NavigationPaneRadioButton}" GroupName="nav"
-                                 Command="{Binding SelectViewModelCommand}" CommandParameter="{Binding ViewModels.ShuffleModeButtonViewModel}">
+                    <RadioButton Command="{Binding SelectViewModelCommand}"
+                                 CommandParameter="{Binding ViewModels.ShuffleModeButtonViewModel}"
+                                 GroupName="nav"
+                                 Style="{StaticResource NavigationPaneRadioButton}">
                         <StackPanel Orientation="Horizontal">
-                            <Image Style="{StaticResource NavigationPaneIcon}" Source="{StaticResource ShuffleModeIcon}"/>
-                            <TextBlock Text="{StaticResource ShuffleModeButtonTab}"/>
+                            <Image Source="{StaticResource ShuffleModeIcon}" Style="{StaticResource NavigationPaneIcon}" />
+                            <TextBlock Text="{StaticResource ShuffleModeButtonTab}" />
                         </StackPanel>
                     </RadioButton>
-                    <RadioButton Style="{StaticResource NavigationPaneRadioButton}" GroupName="nav"
-                                 Command="{Binding SelectViewModelCommand}" CommandParameter="{Binding ViewModels.ProgressBarViewModel}">
+                    <RadioButton Command="{Binding SelectViewModelCommand}"
+                                 CommandParameter="{Binding ViewModels.ProgressBarViewModel}"
+                                 GroupName="nav"
+                                 Style="{StaticResource NavigationPaneRadioButton}">
                         <StackPanel Orientation="Horizontal">
-                            <Image Style="{StaticResource NavigationPaneIcon}" Source="{StaticResource Progress}"/>
-                            <TextBlock Text="{StaticResource ProgressBarTab}"/>
+                            <Image Source="{StaticResource Progress}" Style="{StaticResource NavigationPaneIcon}" />
+                            <TextBlock Text="{StaticResource ProgressBarTab}" />
                         </StackPanel>
                     </RadioButton>
-                    <RadioButton Style="{StaticResource NavigationPaneRadioButton}" GroupName="nav"
-                                 Command="{Binding SelectViewModelCommand}" CommandParameter="{Binding ViewModels.AlbumArtViewModel}">
+                    <RadioButton Command="{Binding SelectViewModelCommand}"
+                                 CommandParameter="{Binding ViewModels.AlbumArtViewModel}"
+                                 GroupName="nav"
+                                 Style="{StaticResource NavigationPaneRadioButton}">
                         <StackPanel Orientation="Horizontal">
-                            <Image Style="{StaticResource NavigationPaneIcon}" Source="{StaticResource Album}"/>
-                            <TextBlock Text="{StaticResource AlbumArtTab}"/>
+                            <Image Source="{StaticResource Album}" Style="{StaticResource NavigationPaneIcon}" />
+                            <TextBlock Text="{StaticResource AlbumArtTab}" />
                         </StackPanel>
                     </RadioButton>
-                    <RadioButton Style="{StaticResource NavigationPaneRadioButton}" GroupName="nav"
-                                 Command="{Binding SelectViewModelCommand}" CommandParameter="{Binding ViewModels.AlbumArtPopupViewModel}">
+                    <RadioButton Command="{Binding SelectViewModelCommand}"
+                                 CommandParameter="{Binding ViewModels.AlbumArtPopupViewModel}"
+                                 GroupName="nav"
+                                 Style="{StaticResource NavigationPaneRadioButton}">
                         <StackPanel Orientation="Horizontal">
-                            <Image Style="{StaticResource NavigationPaneIcon}" Source="{StaticResource AlbumPopup}"/>
-                            <TextBlock Text="{StaticResource AlbumArtPopupTab}"/>
+                            <Image Source="{StaticResource AlbumPopup}" Style="{StaticResource NavigationPaneIcon}" />
+                            <TextBlock Text="{StaticResource AlbumArtPopupTab}" />
                         </StackPanel>
                     </RadioButton>
                     <Expander Style="{StaticResource NavigationPaneExpander}">
                         <Expander.Header>
                             <Grid>
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*"/>
-                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
                                 </Grid.ColumnDefinitions>
-                                <TextBlock Grid.Column="0" Text="{StaticResource CustomLabelsTab}" Style="{StaticResource NavigationPaneTextBlock}"
-                                           VerticalAlignment="Center" FontWeight="Normal" Foreground="{theme:ThemeResource SystemBaseHighColor}">
-                                </TextBlock>
-                                <Button Grid.Column="1" Style="{StaticResource RevealButton}" BorderThickness="1,0,0,0"
-                                        Width="{StaticResource NavigationPaneItemHeight}" Height="{StaticResource NavigationPaneItemHeight}"
-                                        Command="{Binding Path=ViewModels.CustomLabelsViewModel.AddLabelCommand}">
-                                    <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE710;" FontSize="17"/>
+                                <TextBlock Grid.Column="0"
+                                           VerticalAlignment="Center"
+                                           FontWeight="Normal"
+                                           Foreground="{theme:ThemeResource SystemBaseHighColor}"
+                                           Style="{StaticResource NavigationPaneTextBlock}"
+                                           Text="{StaticResource CustomLabelsTab}" />
+                                <Button Grid.Column="1"
+                                        Width="{StaticResource NavigationPaneItemHeight}"
+                                        Height="{StaticResource NavigationPaneItemHeight}"
+                                        BorderThickness="1,0,0,0"
+                                        Command="{Binding Path=ViewModels.CustomLabelsViewModel.AddLabelCommand}"
+                                        Style="{StaticResource RevealButton}">
+                                    <TextBlock FontFamily="Segoe MDL2 Assets"
+                                               FontSize="17"
+                                               Text="&#xE710;" />
                                     <Button.ToolTip>
-                                        <TextBlock Text="{StaticResource AddNewLabelHelpText}"/>
+                                        <TextBlock Text="{StaticResource AddNewLabelHelpText}" />
                                     </Button.ToolTip>
                                 </Button>
                             </Grid>
                         </Expander.Header>
-                        <ListBox Background="Transparent" ItemsSource="{Binding Path=ViewModels.CustomLabelsViewModel.CustomLabels}"
+                        <ListBox Background="Transparent"
                                  ItemContainerStyle="{StaticResource NavigationPaneListBoxItem}"
+                                 ItemsSource="{Binding Path=ViewModels.CustomLabelsViewModel.CustomLabels}"
                                  KeyboardNavigation.TabNavigation="Local">
                             <i:Interaction.Behaviors>
-                                <behaviors:RedirectScrolling/>
+                                <behaviors:RedirectScrolling />
                             </i:Interaction.Behaviors>
                             <ListBox.ItemTemplate>
                                 <DataTemplate>
-                                    <RadioButton Style="{StaticResource NavigationPaneRadioButton}" 
+                                    <RadioButton Command="{Binding ElementName=Window, Path=DataContext.SelectViewModelCommand}"
+                                                 CommandParameter="{Binding}"
                                                  GroupName="nav"
-                                                 Command="{Binding ElementName=Window, Path=DataContext.SelectViewModelCommand}"
-                                                 CommandParameter="{Binding}">
+                                                 Style="{StaticResource NavigationPaneRadioButton}">
                                         <Grid HorizontalAlignment="Stretch">
                                             <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="Auto"/>
-                                                <ColumnDefinition Width="*"/>
-                                                <ColumnDefinition Width="Auto"/>
+                                                <ColumnDefinition Width="Auto" />
+                                                <ColumnDefinition Width="*" />
+                                                <ColumnDefinition Width="Auto" />
                                             </Grid.ColumnDefinitions>
-                                            <Image Grid.Column="0" Style="{StaticResource NavigationPaneIcon}" Source="{StaticResource TextLabels}"/>
-                                            <TextBlock Grid.Column="1" Text="{Binding Name}"
-                                                        HorizontalAlignment="Stretch" VerticalAlignment="Center"/>
-                                            <Button Grid.Column="2" Style="{StaticResource RevealButton}" BorderThickness="1,0,0,0"
-                                                        Width="{StaticResource NavigationPaneItemHeight}" Height="{StaticResource NavigationPaneItemHeight}"
-                                                        Command="{Binding ElementName=Window, Path=DataContext.ViewModels.CustomLabelsViewModel.RemoveLabelCommand}"
-                                                        CommandParameter="{Binding}">
-                                                <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE711;" FontSize="18"/>
+                                            <Image Grid.Column="0"
+                                                   Source="{StaticResource TextLabels}"
+                                                   Style="{StaticResource NavigationPaneIcon}" />
+                                            <TextBlock Grid.Column="1"
+                                                       HorizontalAlignment="Stretch"
+                                                       VerticalAlignment="Center"
+                                                       Text="{Binding Name}" />
+                                            <Button Grid.Column="2"
+                                                    Width="{StaticResource NavigationPaneItemHeight}"
+                                                    Height="{StaticResource NavigationPaneItemHeight}"
+                                                    BorderThickness="1,0,0,0"
+                                                    Command="{Binding ElementName=Window, Path=DataContext.ViewModels.CustomLabelsViewModel.RemoveLabelCommand}"
+                                                    CommandParameter="{Binding}"
+                                                    Style="{StaticResource RevealButton}">
+                                                <TextBlock FontFamily="Segoe MDL2 Assets"
+                                                           FontSize="18"
+                                                           Text="&#xE711;" />
                                                 <Button.ToolTip>
-                                                    <TextBlock Text="{StaticResource DeleteLabelHelpText}"/>
+                                                    <TextBlock Text="{StaticResource DeleteLabelHelpText}" />
                                                 </Button.ToolTip>
                                             </Button>
                                         </Grid>
@@ -201,27 +250,33 @@
                     </Expander>
                     <Expander Style="{StaticResource NavigationPaneExpander}">
                         <Expander.Header>
-                            <TextBlock Padding="0, 0, 10, 0" FontWeight="Normal" Style="{StaticResource NavigationPaneTextBlock}" Text="{StaticResource AudioSourceSettingsTab}"
-                                       Foreground="{theme:ThemeResource SystemBaseHighColor}"/>
+                            <TextBlock Padding="0,0,10,0"
+                                       FontWeight="Normal"
+                                       Foreground="{theme:ThemeResource SystemBaseHighColor}"
+                                       Style="{StaticResource NavigationPaneTextBlock}"
+                                       Text="{StaticResource AudioSourceSettingsTab}" />
                         </Expander.Header>
-                        <ListBox Background="Transparent" ItemsSource="{Binding Path=ViewModels.AudioSourceSettingsViewModel.AudioSourcesSettings}"
-                                 ItemContainerStyle="{StaticResource NavigationPaneListBoxItem}">
+                        <ListBox Background="Transparent"
+                                 ItemContainerStyle="{StaticResource NavigationPaneListBoxItem}"
+                                 ItemsSource="{Binding Path=ViewModels.AudioSourceSettingsViewModel.AudioSourcesSettings}">
                             <i:Interaction.Behaviors>
-                                <behaviors:RedirectScrolling/>
+                                <behaviors:RedirectScrolling />
                             </i:Interaction.Behaviors>
                             <ListBox.ItemTemplate>
                                 <DataTemplate>
-                                    <RadioButton Style="{StaticResource NavigationPaneRadioButton}" 
+                                    <RadioButton Command="{Binding ElementName=Window, Path=DataContext.SelectViewModelCommand}"
+                                                 CommandParameter="{Binding}"
                                                  GroupName="nav"
-                                                 Command="{Binding ElementName=Window, Path=DataContext.SelectViewModelCommand}"
-                                                 CommandParameter="{Binding}">
+                                                 Style="{StaticResource NavigationPaneRadioButton}">
                                         <Grid>
                                             <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="Auto"/>
-                                                <ColumnDefinition Width="*"/>
+                                                <ColumnDefinition Width="Auto" />
+                                                <ColumnDefinition Width="*" />
                                             </Grid.ColumnDefinitions>
-                                            <Image Grid.Column="0" Style="{StaticResource NavigationPaneIcon}" Source="{StaticResource AudioSources}"/>
-                                            <TextBlock Grid.Column="1" Text="{Binding AudioSourceName}"/>
+                                            <Image Grid.Column="0"
+                                                   Source="{StaticResource AudioSources}"
+                                                   Style="{StaticResource NavigationPaneIcon}" />
+                                            <TextBlock Grid.Column="1" Text="{Binding AudioSourceName}" />
                                         </Grid>
                                     </RadioButton>
                                 </DataTemplate>
@@ -230,136 +285,162 @@
                     </Expander>
                 </StackPanel>
             </ScrollViewer>
-            <ComboBox Margin="8" Height="{StaticResource DefaultButtonHeight}" Grid.Row="1"
-                      x:Name="ProfilesComboBox"  IsSynchronizedWithCurrentItem="True"
-                      SelectedItem="{Binding SelectedProfileName, Mode=TwoWay}"
-                      ItemsSource="{Binding Profiles}">
-            </ComboBox>
-            <UniformGrid Grid.Row="2" Rows="1" SnapsToDevicePixels="True">
+            <ComboBox x:Name="ProfilesComboBox"
+                      Grid.Row="1"
+                      Height="{StaticResource DefaultButtonHeight}"
+                      Margin="8"
+                      IsSynchronizedWithCurrentItem="True"
+                      ItemsSource="{Binding Profiles}"
+                      SelectedItem="{Binding SelectedProfileName, Mode=TwoWay}" />
+            <UniformGrid Grid.Row="2"
+                         Rows="1"
+                         SnapsToDevicePixels="True">
                 <UniformGrid.Resources>
-                    <Style TargetType="{x:Type Button}" BasedOn="{StaticResource RevealButton}"/>
+                    <Style BasedOn="{StaticResource RevealButton}" TargetType="{x:Type Button}" />
                 </UniformGrid.Resources>
                 <Button Command="{Binding AddProfileCommand}">
-                    <TextBlock Style="{StaticResource ProfileIconText}" Text="&#xE710;" FontSize="17"/> <!-- Line up the icon better by using different font size-->
+                    <TextBlock FontSize="17"
+                               Style="{StaticResource ProfileIconText}"
+                               Text="&#xE710;" />
+                    <!--  Line up the icon better by using different font size  -->
                     <Button.ToolTip>
-                        <TextBlock Text="{StaticResource NewProfileHelpText}"/>
+                        <TextBlock Text="{StaticResource NewProfileHelpText}" />
                     </Button.ToolTip>
                 </Button>
-                <Button Command="{Binding DeleteProfileCommand}" 
-                        CommandParameter="{Binding ElementName=ProfilesComboBox, Path=SelectedItem}">
-                    <TextBlock Style="{StaticResource ProfileIconText}" Text="&#xE74D;"/>
+                <Button Command="{Binding DeleteProfileCommand}" CommandParameter="{Binding ElementName=ProfilesComboBox, Path=SelectedItem}">
+                    <TextBlock Style="{StaticResource ProfileIconText}" Text="&#xE74D;" />
                     <Button.ToolTip>
-                        <TextBlock Text="{StaticResource DeleteProfileHelpText}"/>
+                        <TextBlock Text="{StaticResource DeleteProfileHelpText}" />
                     </Button.ToolTip>
                 </Button>
                 <Button Command="{Binding RenameProfileCommand}">
-                    <TextBlock Style="{StaticResource ProfileIconText}" Text="&#xE8AC;"/>
+                    <TextBlock Style="{StaticResource ProfileIconText}" Text="&#xE8AC;" />
                     <Button.ToolTip>
-                        <TextBlock Text="{StaticResource RenameProfileHelpText}"/>
+                        <TextBlock Text="{StaticResource RenameProfileHelpText}" />
                     </Button.ToolTip>
                 </Button>
                 <Button Command="{Binding ImportProfilesCommand}">
-                    <TextBlock Style="{StaticResource ProfileIconText}" Text="&#xE896;"/>
+                    <TextBlock Style="{StaticResource ProfileIconText}" Text="&#xE896;" />
                     <Button.ToolTip>
-                        <TextBlock Text="{StaticResource ImportProfilesHelpText}"/>
+                        <TextBlock Text="{StaticResource ImportProfilesHelpText}" />
                     </Button.ToolTip>
                 </Button>
                 <Button Command="{Binding ExportProfilesCommand}">
-                    <TextBlock Style="{StaticResource ProfileIconText}" Text="&#xE898;"/>
+                    <TextBlock Style="{StaticResource ProfileIconText}" Text="&#xE898;" />
                     <Button.ToolTip>
-                        <TextBlock Text="{StaticResource ExportProfilesHelpText}"/>
+                        <TextBlock Text="{StaticResource ExportProfilesHelpText}" />
                     </Button.ToolTip>
                 </Button>
             </UniformGrid>
         </Grid>
-        <StackPanel Orientation="Horizontal" FlowDirection="RightToLeft"
-                    DockPanel.Dock="Bottom" HorizontalAlignment="Stretch"
-                    SnapsToDevicePixels="True" Background="{theme:ThemeResource SystemAltHighColor}">
-            <Button Content="{StaticResource CloseButtonText}" IsCancel="True" Width="80" Margin="8"
-                    Command="{Binding CloseCommand}"/>
-            <Button Content="{StaticResource ApplyButtonText}" Width="80" Margin="8"
-                    Command="{Binding SaveCommand}"/>
+        <StackPanel HorizontalAlignment="Stretch"
+                    Background="{theme:ThemeResource SystemAltHighColor}"
+                    DockPanel.Dock="Bottom"
+                    FlowDirection="RightToLeft"
+                    Orientation="Horizontal"
+                    SnapsToDevicePixels="True">
+            <Button Width="80"
+                    Margin="8"
+                    Command="{Binding CloseCommand}"
+                    Content="{StaticResource CloseButtonText}"
+                    IsCancel="True" />
+            <Button Width="80"
+                    Margin="8"
+                    Command="{Binding SaveCommand}"
+                    Content="{StaticResource ApplyButtonText}" />
         </StackPanel>
-        <Grid SnapsToDevicePixels="True" Background="{theme:ThemeResource SystemAltHighColor}">
+        <Grid Background="{theme:ThemeResource SystemAltHighColor}" SnapsToDevicePixels="True">
             <Grid.RowDefinitions>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="*"/>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
             </Grid.RowDefinitions>
-            <StackPanel x:Name="CaptionControls" Orientation="Horizontal" Grid.Row="0" WindowChrome.IsHitTestVisibleInChrome="True"
-                        Height="{x:Static SystemParameters.CaptionHeight}" HorizontalAlignment="Right" Margin="0, 0, 140, 0">
+            <StackPanel x:Name="CaptionControls"
+                        Grid.Row="0"
+                        Height="{x:Static SystemParameters.CaptionHeight}"
+                        Margin="0,0,140,0"
+                        HorizontalAlignment="Right"
+                        Orientation="Horizontal"
+                        WindowChrome.IsHitTestVisibleInChrome="True">
                 <TextBlock VerticalAlignment="Center">
                     <Hyperlink Command="{Binding ElementName=Window, Path=OpenAboutDialogCommand}">
-                        <Run Text="{StaticResource AboutButtonText}"/>
+                        <Run Text="{StaticResource AboutButtonText}" />
                     </Hyperlink>
                 </TextBlock>
             </StackPanel>
-            <TextBlock x:Name="ViewHeader" Grid.Row="1" Margin="20, 0" FontWeight="Light" LineHeight="40" 
-                       FontSize="{StaticResource HeaderFontSize}">
+            <TextBlock x:Name="ViewHeader"
+                       Grid.Row="1"
+                       Margin="20,0"
+                       FontSize="{StaticResource HeaderFontSize}"
+                       FontWeight="Light"
+                       LineHeight="40">
                 <TextBlock.Style>
-                    <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+                    <Style BasedOn="{StaticResource {x:Type TextBlock}}" TargetType="{x:Type TextBlock}">
                         <Style.Triggers>
                             <DataTrigger Binding="{Binding SelectedViewModel, Converter={x:Static converters:Converters.ObjectToType}}" Value="{x:Type viewmodels:AlbumArtViewModel}">
-                                <Setter Property="Text" Value="{StaticResource AlbumArtTab}"/>
+                                <Setter Property="Text" Value="{StaticResource AlbumArtTab}" />
                             </DataTrigger>
                             <DataTrigger Binding="{Binding SelectedViewModel, Converter={x:Static converters:Converters.ObjectToType}}" Value="{x:Type viewmodels:AlbumArtPopupViewModel}">
-                                <Setter Property="Text" Value="{StaticResource AlbumArtPopupTab}"/>
+                                <Setter Property="Text" Value="{StaticResource AlbumArtPopupTab}" />
                             </DataTrigger>
                             <DataTrigger Binding="{Binding SelectedViewModel, Converter={x:Static converters:Converters.ObjectToType}}" Value="{x:Type viewmodels:AudioBandViewModel}">
-                                <Setter Property="Text" Value="{StaticResource GeneralSettingsTab}"/>
+                                <Setter Property="Text" Value="{StaticResource GeneralSettingsTab}" />
                             </DataTrigger>
                             <DataTrigger Binding="{Binding SelectedViewModel, Converter={x:Static converters:Converters.ObjectToType}}" Value="{x:Type viewmodels:AudioSourceSettingsCollectionViewModel}">
-                                <Setter Property="Text" Value="{Binding Path=SelectedViewModel.(viewmodels:AudioSourceSettingsCollectionViewModel.AudioSourceName), 
-                                                                        Converter={x:Static converters:Converters.StringFormat}, 
-                                                                        ConverterParameter={StaticResource AudioSourceViewHeaderFormat}}"/>
+                                <Setter Property="Text" Value="{Binding Path=SelectedViewModel.(viewmodels:AudioSourceSettingsCollectionViewModel.AudioSourceName), Converter={x:Static converters:Converters.StringFormat}, ConverterParameter={StaticResource AudioSourceViewHeaderFormat}}" />
                             </DataTrigger>
                             <DataTrigger Binding="{Binding SelectedViewModel, Converter={x:Static converters:Converters.ObjectToType}}" Value="{x:Type viewmodels:CustomLabelViewModel}">
-                                <Setter Property="Text" Value="{Binding Path=SelectedViewModel.(viewmodels:CustomLabelViewModel.Name),
-                                                                        Converter={x:Static converters:Converters.StringFormat},
-                                                                        ConverterParameter={StaticResource LabelsViewHeaderFormat}}"/>
+                                <Setter Property="Text" Value="{Binding Path=SelectedViewModel.(viewmodels:CustomLabelViewModel.Name), Converter={x:Static converters:Converters.StringFormat}, ConverterParameter={StaticResource LabelsViewHeaderFormat}}" />
                             </DataTrigger>
                             <DataTrigger Binding="{Binding SelectedViewModel, Converter={x:Static converters:Converters.ObjectToType}}" Value="{x:Type viewmodels:PlayPauseButtonViewModel}">
-                                <Setter Property="Text" Value="{StaticResource PlayPauseButtonTab}"/>
+                                <Setter Property="Text" Value="{StaticResource PlayPauseButtonTab}" />
                             </DataTrigger>
                             <DataTrigger Binding="{Binding SelectedViewModel, Converter={x:Static converters:Converters.ObjectToType}}" Value="{x:Type viewmodels:NextButtonViewModel}">
-                                <Setter Property="Text" Value="{StaticResource NextButtonTab}"/>
+                                <Setter Property="Text" Value="{StaticResource NextButtonTab}" />
                             </DataTrigger>
                             <DataTrigger Binding="{Binding SelectedViewModel, Converter={x:Static converters:Converters.ObjectToType}}" Value="{x:Type viewmodels:PreviousButtonViewModel}">
-                                <Setter Property="Text" Value="{StaticResource PrevButtonTab}"/>
+                                <Setter Property="Text" Value="{StaticResource PrevButtonTab}" />
                             </DataTrigger>
                             <DataTrigger Binding="{Binding SelectedViewModel, Converter={x:Static converters:Converters.ObjectToType}}" Value="{x:Type viewmodels:ProgressBarViewModel}">
-                                <Setter Property="Text" Value="{StaticResource ProgressBarTab}"/>
+                                <Setter Property="Text" Value="{StaticResource ProgressBarTab}" />
                             </DataTrigger>
                             <DataTrigger Binding="{Binding SelectedViewModel, Converter={x:Static converters:Converters.ObjectToType}}" Value="{x:Type viewmodels:RepeatModeButtonViewModel}">
-                                <Setter Property="Text" Value="{StaticResource RepeatModeButtonTab}"/>
+                                <Setter Property="Text" Value="{StaticResource RepeatModeButtonTab}" />
                             </DataTrigger>
                             <DataTrigger Binding="{Binding SelectedViewModel, Converter={x:Static converters:Converters.ObjectToType}}" Value="{x:Type viewmodels:ShuffleModeButtonViewModel}">
-                                <Setter Property="Text" Value="{StaticResource ShuffleModeButtonTab}"/>
+                                <Setter Property="Text" Value="{StaticResource ShuffleModeButtonTab}" />
                             </DataTrigger>
                         </Style.Triggers>
                     </Style>
                 </TextBlock.Style>
             </TextBlock>
-            <ScrollViewer x:Name="ContentScrollView" VerticalScrollBarVisibility="Auto" IsTabStop="False" Grid.Row="2" FocusVisualStyle="{x:Null}">
-                <ContentControl Content="{Binding SelectedViewModel}" BorderThickness="0" IsTabStop="False" Margin="20">
-                <ContentControl.Resources>
-                    <ResourceDictionary>
-                        <ResourceDictionary.MergedDictionaries>
-                            <resources:SharedDictionary Source="AlbumArtSettingsView.xaml"/>
-                            <resources:SharedDictionary Source="AlbumPopupSettingsView.xaml"/>
-                            <resources:SharedDictionary Source="AudioSourceSettingsView.xaml"/>
-                            <resources:SharedDictionary Source="CustomLabelSettingsView.xaml"/>
-                            <resources:SharedDictionary Source="GeneralSettingsView.xaml"/>
-                            <resources:SharedDictionary Source="PlaybackButtonSettingsView.xaml"/>
-                            <resources:SharedDictionary Source="PlayPauseButtonSettingsView.xaml"/>
-                            <resources:SharedDictionary Source="ProgressBarSettingsView.xaml"/>
-                            <resources:SharedDictionary Source="RepeatModeButtonSettingsView.xaml"/>
-                            <resources:SharedDictionary Source="ShuffleModeButtonSettingsView.xaml"/>
-                        </ResourceDictionary.MergedDictionaries>
-                    </ResourceDictionary>
-                </ContentControl.Resources>
-            </ContentControl>
-        </ScrollViewer>
+            <ScrollViewer x:Name="ContentScrollView"
+                          Grid.Row="2"
+                          FocusVisualStyle="{x:Null}"
+                          IsTabStop="False"
+                          VerticalScrollBarVisibility="Auto">
+                <ContentControl Margin="20"
+                                BorderThickness="0"
+                                Content="{Binding SelectedViewModel}"
+                                IsTabStop="False">
+                    <ContentControl.Resources>
+                        <ResourceDictionary>
+                            <ResourceDictionary.MergedDictionaries>
+                                <resources:SharedDictionary Source="AlbumArtSettingsView.xaml" />
+                                <resources:SharedDictionary Source="AlbumPopupSettingsView.xaml" />
+                                <resources:SharedDictionary Source="AudioSourceSettingsView.xaml" />
+                                <resources:SharedDictionary Source="CustomLabelSettingsView.xaml" />
+                                <resources:SharedDictionary Source="GeneralSettingsView.xaml" />
+                                <resources:SharedDictionary Source="PlaybackButtonSettingsView.xaml" />
+                                <resources:SharedDictionary Source="PlayPauseButtonSettingsView.xaml" />
+                                <resources:SharedDictionary Source="ProgressBarSettingsView.xaml" />
+                                <resources:SharedDictionary Source="RepeatModeButtonSettingsView.xaml" />
+                                <resources:SharedDictionary Source="ShuffleModeButtonSettingsView.xaml" />
+                            </ResourceDictionary.MergedDictionaries>
+                        </ResourceDictionary>
+                    </ContentControl.Resources>
+                </ContentControl>
+            </ScrollViewer>
         </Grid>
     </DockPanel>
 </fw:AcrylicWindow>
diff --git a/src/AudioBand/Views/Settings/ShuffleModeButtonSettingsView.xaml b/src/AudioBand/Views/Settings/ShuffleModeButtonSettingsView.xaml
index 79416597..9b589099 100644
--- a/src/AudioBand/Views/Settings/ShuffleModeButtonSettingsView.xaml
+++ b/src/AudioBand/Views/Settings/ShuffleModeButtonSettingsView.xaml
@@ -1,32 +1,43 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:AudioBand.Views.Settings"
-                    xmlns:viewmodels="clr-namespace:AudioBand.ViewModels"
-                    xmlns:resources="clr-namespace:AudioBand.Resources">
+                    xmlns:resources="clr-namespace:AudioBand.Resources"
+                    xmlns:viewmodels="clr-namespace:AudioBand.ViewModels">
     <DataTemplate DataType="{x:Type viewmodels:ShuffleModeButtonViewModel}">
         <DataTemplate.Resources>
             <ResourceDictionary>
                 <ResourceDictionary.MergedDictionaries>
-                    <resources:SharedDictionary Source="../../Resources/SettingsWindowStyle.xaml"/>
-                    <resources:SharedDictionary Source="../../Resources/Strings.xaml"/>
-                    <resources:SharedDictionary Source="ButtonBaseTemplate.xaml"/>
-                    <resources:SharedDictionary Source="ButtonContentTemplate.xaml"/>
+                    <resources:SharedDictionary Source="../../Resources/SettingsWindowStyle.xaml" />
+                    <resources:SharedDictionary Source="../../Resources/Strings.xaml" />
+                    <resources:SharedDictionary Source="ButtonBaseTemplate.xaml" />
+                    <resources:SharedDictionary Source="ButtonContentTemplate.xaml" />
                 </ResourceDictionary.MergedDictionaries>
             </ResourceDictionary>
         </DataTemplate.Resources>
         <StackPanel Style="{StaticResource SettingsStackPanel}">
-            <ContentPresenter Content="{Binding}" ContentTemplate="{StaticResource ButtonBaseTemplate}" Focusable="False"/>
+            <ContentPresenter Content="{Binding}"
+                              ContentTemplate="{StaticResource ButtonBaseTemplate}"
+                              Focusable="False" />
 
-            <TextBlock Margin="{StaticResource SectionMargin}" Text="{StaticResource ShuffleModeButtonOffContentSectionText}" Style="{StaticResource TitleTextBlock}"/>
-            <ContentPresenter Content="{Binding ShuffleOffContent}" ContentTemplate="{StaticResource ButtonContentTemplate}" Focusable="False"/>
+            <TextBlock Margin="{StaticResource SectionMargin}"
+                       Style="{StaticResource TitleTextBlock}"
+                       Text="{StaticResource ShuffleModeButtonOffContentSectionText}" />
+            <ContentPresenter Content="{Binding ShuffleOffContent}"
+                              ContentTemplate="{StaticResource ButtonContentTemplate}"
+                              Focusable="False" />
 
-            <TextBlock Margin="{StaticResource SectionMargin}" Text="{StaticResource ShuffleModeButtonOnContentSectionText}" Style="{StaticResource TitleTextBlock}"/>
-            <ContentPresenter Content="{Binding ShuffleOnContent}" ContentTemplate="{StaticResource ButtonContentTemplate}" Focusable="False"/>
+            <TextBlock Margin="{StaticResource SectionMargin}"
+                       Style="{StaticResource TitleTextBlock}"
+                       Text="{StaticResource ShuffleModeButtonOnContentSectionText}" />
+            <ContentPresenter Content="{Binding ShuffleOnContent}"
+                              ContentTemplate="{StaticResource ButtonContentTemplate}"
+                              Focusable="False" />
 
-            <TextBlock Margin="{StaticResource SectionMargin}" Text="{StaticResource OtherSectionText}" Style="{StaticResource TitleTextBlock}"/>
+            <TextBlock Margin="{StaticResource SectionMargin}"
+                       Style="{StaticResource TitleTextBlock}"
+                       Text="{StaticResource OtherSectionText}" />
             <Button HorizontalAlignment="Left"
-                    Content="{StaticResource ResetButtonText}"
-                    Command="{Binding ResetCommand}"/>
+                    Command="{Binding ResetCommand}"
+                    Content="{StaticResource ResetButtonText}" />
         </StackPanel>
     </DataTemplate>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Settings.XamlStyler b/src/Settings.XamlStyler
new file mode 100644
index 00000000..43f41132
--- /dev/null
+++ b/src/Settings.XamlStyler
@@ -0,0 +1,41 @@
+{
+    "AttributesTolerance": 2,
+    "KeepFirstAttributeOnSameLine": true,
+    "MaxAttributeCharactersPerLine": 0,
+    "MaxAttributesPerLine": 1,
+    "NewlineExemptionElements": "RadialGradientBrush, GradientStop, LinearGradientBrush, ScaleTransfom, SkewTransform, RotateTransform, TranslateTransform, Trigger, Condition, Setter",
+    "SeparateByGroups": false,
+    "AttributeIndentation": 0,
+    "AttributeIndentationStyle": 1,
+    "RemoveDesignTimeReferences":  false,
+    "EnableAttributeReordering": true,
+    "AttributeOrderingRuleGroups": [
+        "x:Class",
+        "xmlns, xmlns:x",
+        "xmlns:*",
+        "x:Key, Key, x:Name, Name, x:Uid, Uid, Title",
+        "Grid.Row, Grid.RowSpan, Grid.Column, Grid.ColumnSpan, Canvas.Left, Canvas.Top, Canvas.Right, Canvas.Bottom",
+        "Width, Height, MinWidth, MinHeight, MaxWidth, MaxHeight",
+        "Margin, Padding, HorizontalAlignment, VerticalAlignment, HorizontalContentAlignment, VerticalContentAlignment, Panel.ZIndex",
+        "*:*, *",
+        "PageSource, PageIndex, Offset, Color, TargetName, Property, Value, StartPoint, EndPoint",
+        "mc:Ignorable, d:IsDataSource, d:LayoutOverrides, d:IsStaticText",
+        "Storyboard.*, From, To, Duration"
+    ],
+    "FirstLineAttributes": "",
+    "OrderAttributesByName": true,
+    "PutEndingBracketOnNewLine": false,
+    "RemoveEndingTagOfEmptyElement": true,
+    "SpaceBeforeClosingSlash": true,
+    "RootElementLineBreakRule": 0,
+    "ReorderVSM": 2,
+    "ReorderGridChildren": false,
+    "ReorderCanvasChildren": false,
+    "ReorderSetters": 0,
+    "FormatMarkupExtension": true,
+    "NoNewLineMarkupExtensions": "x:Bind, Binding",
+    "ThicknessSeparator": 2,
+    "ThicknessAttributes": "Margin, Padding, BorderThickness, ThumbnailClipMargin",
+    "FormatOnSave": true,
+    "CommentPadding": 2,
+}
\ No newline at end of file

From bac6a9aaf866d14007b23ab0489243499d6a6ee7 Mon Sep 17 00:00:00 2001
From: Brandon Chong <brndnchong@gmail.com>
Date: Mon, 24 Jun 2019 13:10:56 -0700
Subject: [PATCH 13/17] Group tests into own folders

---
 src/AudioBand.Test/AudioBand.Test.csproj.DotSettings          | 4 ++++
 src/AudioBand.Test/{ => Settings}/SettingsMigrationTests.cs   | 0
 .../{ => TextFormatting}/CustomTextParsingTests.cs            | 0
 .../{ => ViewModels}/AlbumArtPopupViewModelTests.cs           | 0
 src/AudioBand.Test/{ => ViewModels}/AlbumArtViewModelTests.cs | 0
 .../{ => ViewModels}/AudioBandViewModelTests.cs               | 0
 .../{ => ViewModels}/AudioSourceSettingsCollectionTests.cs    | 0
 src/AudioBand.Test/{ => ViewModels}/ButtonViewModels.cs       | 0
 .../{ => ViewModels}/CustomLabelsViewModelTests.cs            | 0
 .../{ => ViewModels}/ProgressBarViewModelTests.cs             | 0
 .../{ => ViewModels}/SettingsWindowViewModelTests.cs          | 0
 src/AudioBand.Test/{ => ViewModels}/ViewModelBaseTests.cs     | 0
 12 files changed, 4 insertions(+)
 create mode 100644 src/AudioBand.Test/AudioBand.Test.csproj.DotSettings
 rename src/AudioBand.Test/{ => Settings}/SettingsMigrationTests.cs (100%)
 rename src/AudioBand.Test/{ => TextFormatting}/CustomTextParsingTests.cs (100%)
 rename src/AudioBand.Test/{ => ViewModels}/AlbumArtPopupViewModelTests.cs (100%)
 rename src/AudioBand.Test/{ => ViewModels}/AlbumArtViewModelTests.cs (100%)
 rename src/AudioBand.Test/{ => ViewModels}/AudioBandViewModelTests.cs (100%)
 rename src/AudioBand.Test/{ => ViewModels}/AudioSourceSettingsCollectionTests.cs (100%)
 rename src/AudioBand.Test/{ => ViewModels}/ButtonViewModels.cs (100%)
 rename src/AudioBand.Test/{ => ViewModels}/CustomLabelsViewModelTests.cs (100%)
 rename src/AudioBand.Test/{ => ViewModels}/ProgressBarViewModelTests.cs (100%)
 rename src/AudioBand.Test/{ => ViewModels}/SettingsWindowViewModelTests.cs (100%)
 rename src/AudioBand.Test/{ => ViewModels}/ViewModelBaseTests.cs (100%)

diff --git a/src/AudioBand.Test/AudioBand.Test.csproj.DotSettings b/src/AudioBand.Test/AudioBand.Test.csproj.DotSettings
new file mode 100644
index 00000000..cd7ca864
--- /dev/null
+++ b/src/AudioBand.Test/AudioBand.Test.csproj.DotSettings
@@ -0,0 +1,4 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=settings/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=textformatting/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=viewmodels/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/src/AudioBand.Test/SettingsMigrationTests.cs b/src/AudioBand.Test/Settings/SettingsMigrationTests.cs
similarity index 100%
rename from src/AudioBand.Test/SettingsMigrationTests.cs
rename to src/AudioBand.Test/Settings/SettingsMigrationTests.cs
diff --git a/src/AudioBand.Test/CustomTextParsingTests.cs b/src/AudioBand.Test/TextFormatting/CustomTextParsingTests.cs
similarity index 100%
rename from src/AudioBand.Test/CustomTextParsingTests.cs
rename to src/AudioBand.Test/TextFormatting/CustomTextParsingTests.cs
diff --git a/src/AudioBand.Test/AlbumArtPopupViewModelTests.cs b/src/AudioBand.Test/ViewModels/AlbumArtPopupViewModelTests.cs
similarity index 100%
rename from src/AudioBand.Test/AlbumArtPopupViewModelTests.cs
rename to src/AudioBand.Test/ViewModels/AlbumArtPopupViewModelTests.cs
diff --git a/src/AudioBand.Test/AlbumArtViewModelTests.cs b/src/AudioBand.Test/ViewModels/AlbumArtViewModelTests.cs
similarity index 100%
rename from src/AudioBand.Test/AlbumArtViewModelTests.cs
rename to src/AudioBand.Test/ViewModels/AlbumArtViewModelTests.cs
diff --git a/src/AudioBand.Test/AudioBandViewModelTests.cs b/src/AudioBand.Test/ViewModels/AudioBandViewModelTests.cs
similarity index 100%
rename from src/AudioBand.Test/AudioBandViewModelTests.cs
rename to src/AudioBand.Test/ViewModels/AudioBandViewModelTests.cs
diff --git a/src/AudioBand.Test/AudioSourceSettingsCollectionTests.cs b/src/AudioBand.Test/ViewModels/AudioSourceSettingsCollectionTests.cs
similarity index 100%
rename from src/AudioBand.Test/AudioSourceSettingsCollectionTests.cs
rename to src/AudioBand.Test/ViewModels/AudioSourceSettingsCollectionTests.cs
diff --git a/src/AudioBand.Test/ButtonViewModels.cs b/src/AudioBand.Test/ViewModels/ButtonViewModels.cs
similarity index 100%
rename from src/AudioBand.Test/ButtonViewModels.cs
rename to src/AudioBand.Test/ViewModels/ButtonViewModels.cs
diff --git a/src/AudioBand.Test/CustomLabelsViewModelTests.cs b/src/AudioBand.Test/ViewModels/CustomLabelsViewModelTests.cs
similarity index 100%
rename from src/AudioBand.Test/CustomLabelsViewModelTests.cs
rename to src/AudioBand.Test/ViewModels/CustomLabelsViewModelTests.cs
diff --git a/src/AudioBand.Test/ProgressBarViewModelTests.cs b/src/AudioBand.Test/ViewModels/ProgressBarViewModelTests.cs
similarity index 100%
rename from src/AudioBand.Test/ProgressBarViewModelTests.cs
rename to src/AudioBand.Test/ViewModels/ProgressBarViewModelTests.cs
diff --git a/src/AudioBand.Test/SettingsWindowViewModelTests.cs b/src/AudioBand.Test/ViewModels/SettingsWindowViewModelTests.cs
similarity index 100%
rename from src/AudioBand.Test/SettingsWindowViewModelTests.cs
rename to src/AudioBand.Test/ViewModels/SettingsWindowViewModelTests.cs
diff --git a/src/AudioBand.Test/ViewModelBaseTests.cs b/src/AudioBand.Test/ViewModels/ViewModelBaseTests.cs
similarity index 100%
rename from src/AudioBand.Test/ViewModelBaseTests.cs
rename to src/AudioBand.Test/ViewModels/ViewModelBaseTests.cs

From 74827f320eb7271f8e9aaedf880fa6db0c004e7a Mon Sep 17 00:00:00 2001
From: Brandon Chong <brndnchong@gmail.com>
Date: Mon, 24 Jun 2019 13:35:10 -0700
Subject: [PATCH 14/17] Convert from mstest to xunit

---
 src/AudioBand.Test/AudioBand.Test.csproj      |  38 +--
 .../Settings/SettingsMigrationTests.cs        | 288 +++++++++---------
 .../TextFormatting/CustomTextParsingTests.cs  | 145 +++++----
 .../ViewModels/AlbumArtPopupViewModelTests.cs |  14 +-
 .../ViewModels/AlbumArtViewModelTests.cs      |  21 +-
 .../ViewModels/AudioBandViewModelTests.cs     |  20 +-
 .../AudioSourceSettingsCollectionTests.cs     |  31 +-
 .../ViewModels/ButtonViewModels.cs            | 125 ++++----
 .../ViewModels/CustomLabelsViewModelTests.cs  |  47 ++-
 .../ViewModels/ProgressBarViewModelTests.cs   |  13 +-
 .../SettingsWindowViewModelTests.cs           |  90 +++---
 .../ViewModels/ViewModelBaseTests.cs          |  43 ++-
 12 files changed, 419 insertions(+), 456 deletions(-)

diff --git a/src/AudioBand.Test/AudioBand.Test.csproj b/src/AudioBand.Test/AudioBand.Test.csproj
index 63b4c6c9..1a342f98 100644
--- a/src/AudioBand.Test/AudioBand.Test.csproj
+++ b/src/AudioBand.Test/AudioBand.Test.csproj
@@ -93,18 +93,18 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AlbumArtPopupViewModelTests.cs" />
-    <Compile Include="AlbumArtViewModelTests.cs" />
-    <Compile Include="AudioBandViewModelTests.cs" />
-    <Compile Include="CustomLabelsViewModelTests.cs" />
-    <Compile Include="SettingsMigrationTests.cs" />
-    <Compile Include="AudioSourceSettingsCollectionTests.cs" />
-    <Compile Include="SettingsWindowViewModelTests.cs" />
-    <Compile Include="CustomTextParsingTests.cs" />
+    <Compile Include="ViewModels\AlbumArtPopupViewModelTests.cs" />
+    <Compile Include="ViewModels\AlbumArtViewModelTests.cs" />
+    <Compile Include="ViewModels\AudioBandViewModelTests.cs" />
+    <Compile Include="ViewModels\CustomLabelsViewModelTests.cs" />
+    <Compile Include="Settings\SettingsMigrationTests.cs" />
+    <Compile Include="ViewModels\AudioSourceSettingsCollectionTests.cs" />
+    <Compile Include="ViewModels\SettingsWindowViewModelTests.cs" />
+    <Compile Include="TextFormatting\CustomTextParsingTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ButtonViewModels.cs" />
-    <Compile Include="ProgressBarViewModelTests.cs" />
-    <Compile Include="ViewModelBaseTests.cs" />
+    <Compile Include="ViewModels\ButtonViewModels.cs" />
+    <Compile Include="ViewModels\ProgressBarViewModelTests.cs" />
+    <Compile Include="ViewModels\ViewModelBaseTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
@@ -121,13 +121,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Moq">
-      <Version>4.11.0</Version>
-    </PackageReference>
-    <PackageReference Include="MSTest.TestAdapter">
-      <Version>1.4.0</Version>
-    </PackageReference>
-    <PackageReference Include="MSTest.TestFramework">
-      <Version>1.4.0</Version>
+      <Version>4.12.0</Version>
     </PackageReference>
     <PackageReference Include="Nett">
       <Version>0.12.0</Version>
@@ -135,6 +129,14 @@
     <PackageReference Include="System.Threading.Tasks.Extensions">
       <Version>4.5.2</Version>
     </PackageReference>
+    <PackageReference Include="xunit">
+      <Version>2.4.1</Version>
+    </PackageReference>
+    <PackageReference Include="xunit.runner.visualstudio">
+      <Version>2.4.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
   </ItemGroup>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/src/AudioBand.Test/Settings/SettingsMigrationTests.cs b/src/AudioBand.Test/Settings/SettingsMigrationTests.cs
index e9c82729..2c676617 100644
--- a/src/AudioBand.Test/Settings/SettingsMigrationTests.cs
+++ b/src/AudioBand.Test/Settings/SettingsMigrationTests.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Drawing;
 using System.Windows.Media;
 using AudioBand.Models;
 using AudioBand.Settings;
@@ -8,16 +7,15 @@
 using AudioBand.Settings.Models.V1;
 using V1Settings = AudioBand.Settings.Models.V1.AudioBandSettings;
 using V2Settings = AudioBand.Settings.Models.V2.Settings;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Nett;
+using Xunit;
 using AudioSourceSetting = AudioBand.Settings.Models.V1.AudioSourceSetting;
 
 namespace AudioBand.Test
 {
-    [TestClass]
     public class SettingsMigrationTests
     {
-        [TestMethod]
+        [Fact]
         public void MigrateV1ToV2_Main()
         {
             var v1 = new V1Settings()
@@ -27,11 +25,11 @@ public void MigrateV1ToV2_Main()
 
             var v2 = Migration.MigrateSettings<V2Settings>(v1, "0.1", "2");
 
-            Assert.AreEqual(v2.Version, "2");
-            Assert.AreEqual(v2.AudioSource, "test");
+            Assert.Equal("2", v2.Version);
+            Assert.Equal("test", v2.AudioSource);
         }
 
-        [TestMethod]
+        [Fact]
         public void MigrateV1ToV2_AlbumArtPopup()
         {
             var setting = new AlbumArtPopupAppearance
@@ -50,14 +48,14 @@ public void MigrateV1ToV2_AlbumArtPopup()
 
             var v2 = Migration.MigrateSettings<V2Settings>(v1, "0.1", "2");
 
-            Assert.AreEqual(v2.AlbumArtPopupSettings.Width, setting.Width);
-            Assert.AreEqual(v2.AlbumArtPopupSettings.Height, setting.Height);
-            Assert.AreEqual(v2.AlbumArtPopupSettings.IsVisible, setting.IsVisible);
-            Assert.AreEqual(v2.AlbumArtPopupSettings.Margin, setting.Margin);
-            Assert.AreEqual(v2.AlbumArtPopupSettings.XPosition, setting.XOffset);
+            Assert.Equal(v2.AlbumArtPopupSettings.Width, setting.Width);
+            Assert.Equal(v2.AlbumArtPopupSettings.Height, setting.Height);
+            Assert.Equal(v2.AlbumArtPopupSettings.IsVisible, setting.IsVisible);
+            Assert.Equal(v2.AlbumArtPopupSettings.Margin, setting.Margin);
+            Assert.Equal(v2.AlbumArtPopupSettings.XPosition, setting.XOffset);
         }
 
-        [TestMethod]
+        [Fact]
         public void MigrateV1ToV2_AlbumArt()
         {
             var setting = new AlbumArtAppearance
@@ -77,15 +75,15 @@ public void MigrateV1ToV2_AlbumArt()
 
             var v2 = Migration.MigrateSettings<V2Settings>(v1, "0.1", "2");
 
-            Assert.AreEqual(v2.AlbumArtSettings.Width, setting.Width);
-            Assert.AreEqual(v2.AlbumArtSettings.Height, setting.Height);
-            Assert.AreEqual(v2.AlbumArtSettings.IsVisible, setting.IsVisible);
-            Assert.AreEqual(v2.AlbumArtSettings.XPosition, setting.XPosition);
-            Assert.AreEqual(v2.AlbumArtSettings.YPosition, setting.YPosition);
-            Assert.AreEqual(v2.AlbumArtSettings.PlaceholderPath, setting.PlaceholderPath);
+            Assert.Equal(v2.AlbumArtSettings.Width, setting.Width);
+            Assert.Equal(v2.AlbumArtSettings.Height, setting.Height);
+            Assert.Equal(v2.AlbumArtSettings.IsVisible, setting.IsVisible);
+            Assert.Equal(v2.AlbumArtSettings.XPosition, setting.XPosition);
+            Assert.Equal(v2.AlbumArtSettings.YPosition, setting.YPosition);
+            Assert.Equal(v2.AlbumArtSettings.PlaceholderPath, setting.PlaceholderPath);
         }
 
-        [TestMethod]
+        [Fact]
         public void MigrateV1ToV2_Audioband()
         {
             var setting = new AudioBandAppearance
@@ -101,11 +99,11 @@ public void MigrateV1ToV2_Audioband()
 
             var v2 = Migration.MigrateSettings<V2Settings>(v1, "0.1", "2");
 
-            Assert.AreEqual(v2.AudioBandSettings.Width, setting.Width);
-            Assert.AreEqual(v2.AudioBandSettings.Height, setting.Height);
+            Assert.Equal(v2.AudioBandSettings.Width, setting.Width);
+            Assert.Equal(v2.AudioBandSettings.Height, setting.Height);
         }
 
-        [TestMethod]
+        [Fact]
         public void MigrateV1ToV2_NextSong()
         {
             var setting = new NextSongButtonAppearance
@@ -125,15 +123,15 @@ public void MigrateV1ToV2_NextSong()
 
             var v2 = Migration.MigrateSettings<V2Settings>(v1, "0.1", "2");
 
-            Assert.AreEqual(v2.NextButtonSettings.Width, setting.Width);
-            Assert.AreEqual(v2.NextButtonSettings.Height, setting.Height);
-            Assert.AreEqual(v2.NextButtonSettings.IsVisible, setting.IsVisible);
-            Assert.AreEqual(v2.NextButtonSettings.XPosition, setting.XPosition);
-            Assert.AreEqual(v2.NextButtonSettings.YPosition, setting.YPosition);
-            Assert.AreEqual(v2.NextButtonSettings.ImagePath, setting.ImagePath);
+            Assert.Equal(v2.NextButtonSettings.Width, setting.Width);
+            Assert.Equal(v2.NextButtonSettings.Height, setting.Height);
+            Assert.Equal(v2.NextButtonSettings.IsVisible, setting.IsVisible);
+            Assert.Equal(v2.NextButtonSettings.XPosition, setting.XPosition);
+            Assert.Equal(v2.NextButtonSettings.YPosition, setting.YPosition);
+            Assert.Equal(v2.NextButtonSettings.ImagePath, setting.ImagePath);
         }
 
-        [TestMethod]
+        [Fact]
         public void MigrateV1ToV2_AudioSourceSettings()
         {
             var setting1 = new AudioSourceSettingsCollection
@@ -156,19 +154,19 @@ public void MigrateV1ToV2_AudioSourceSettings()
 
             var v2 = Migration.MigrateSettings<V2Settings>(v1, "0.1", "2");
 
-            Assert.AreEqual(v2.AudioSourceSettings.Count, settings.Count);
-            Assert.AreEqual(v2.AudioSourceSettings[0].AudioSourceName, setting1.Name);
-            Assert.AreEqual(v2.AudioSourceSettings[0].Settings.Count, setting1.Settings.Count);
-            Assert.AreEqual(v2.AudioSourceSettings[0].Settings[0].Name, setting1.Settings[0].Name);
-            Assert.AreEqual(v2.AudioSourceSettings[0].Settings[0].Value, setting1.Settings[0].Value);
+            Assert.Equal(v2.AudioSourceSettings.Count, settings.Count);
+            Assert.Equal(v2.AudioSourceSettings[0].AudioSourceName, setting1.Name);
+            Assert.Equal(v2.AudioSourceSettings[0].Settings.Count, setting1.Settings.Count);
+            Assert.Equal(v2.AudioSourceSettings[0].Settings[0].Name, setting1.Settings[0].Name);
+            Assert.Equal(v2.AudioSourceSettings[0].Settings[0].Value, setting1.Settings[0].Value);
 
-            Assert.AreEqual(v2.AudioSourceSettings[1].AudioSourceName, setting2.Name);
-            Assert.AreEqual(v2.AudioSourceSettings[1].Settings.Count, setting2.Settings.Count);
-            Assert.AreEqual(v2.AudioSourceSettings[1].Settings[0].Name, setting2.Settings[0].Name);
-            Assert.AreEqual(v2.AudioSourceSettings[1].Settings[0].Value, setting2.Settings[0].Value);
+            Assert.Equal(v2.AudioSourceSettings[1].AudioSourceName, setting2.Name);
+            Assert.Equal(v2.AudioSourceSettings[1].Settings.Count, setting2.Settings.Count);
+            Assert.Equal(v2.AudioSourceSettings[1].Settings[0].Name, setting2.Settings[0].Name);
+            Assert.Equal(v2.AudioSourceSettings[1].Settings[0].Value, setting2.Settings[0].Value);
         }
 
-        [TestMethod]
+        [Fact]
         public void MigrateV1ToV2_PlayPauseButton()
         {
             var setting = new PlayPauseButtonAppearance
@@ -185,16 +183,16 @@ public void MigrateV1ToV2_PlayPauseButton()
             var v1 = new V1Settings {PlayPauseButtonAppearance = setting};
             var v2 = Migration.MigrateSettings<V2Settings>(v1, "0.1", "2");
 
-            Assert.AreEqual(v2.PlayPauseButtonSettings.Width, setting.Width);
-            Assert.AreEqual(v2.PlayPauseButtonSettings.Height, setting.Height);
-            Assert.AreEqual(v2.PlayPauseButtonSettings.XPosition, setting.XPosition);
-            Assert.AreEqual(v2.PlayPauseButtonSettings.YPosition, setting.YPosition);
-            Assert.AreEqual(v2.PlayPauseButtonSettings.IsVisible, setting.IsVisible);
-            Assert.AreEqual(v2.PlayPauseButtonSettings.PauseButtonImagePath, setting.PauseButtonImagePath);
-            Assert.AreEqual(v2.PlayPauseButtonSettings.PlayButtonImagePath, setting.PlayButtonImagePath);
+            Assert.Equal(v2.PlayPauseButtonSettings.Width, setting.Width);
+            Assert.Equal(v2.PlayPauseButtonSettings.Height, setting.Height);
+            Assert.Equal(v2.PlayPauseButtonSettings.XPosition, setting.XPosition);
+            Assert.Equal(v2.PlayPauseButtonSettings.YPosition, setting.YPosition);
+            Assert.Equal(v2.PlayPauseButtonSettings.IsVisible, setting.IsVisible);
+            Assert.Equal(v2.PlayPauseButtonSettings.PauseButtonImagePath, setting.PauseButtonImagePath);
+            Assert.Equal(v2.PlayPauseButtonSettings.PlayButtonImagePath, setting.PlayButtonImagePath);
         }
 
-        [TestMethod]
+        [Fact]
         public void MigrateV1ToV2_PreviousButton()
         {
             var setting = new PreviousSongButtonAppearance
@@ -210,15 +208,15 @@ public void MigrateV1ToV2_PreviousButton()
             var v1 = new V1Settings {PreviousSongButtonAppearance = setting};
             var v2 = Migration.MigrateSettings<V2Settings>(v1, "0.1", "2");
 
-            Assert.AreEqual(v2.PreviousButtonSettings.Height, setting.Height);
-            Assert.AreEqual(v2.PreviousButtonSettings.Width, setting.Width);
-            Assert.AreEqual(v2.PreviousButtonSettings.XPosition, setting.XPosition);
-            Assert.AreEqual(v2.PreviousButtonSettings.YPosition, setting.YPosition);
-            Assert.AreEqual(v2.PreviousButtonSettings.IsVisible, setting.IsVisible);
-            Assert.AreEqual(v2.PreviousButtonSettings.ImagePath, setting.ImagePath);
+            Assert.Equal(v2.PreviousButtonSettings.Height, setting.Height);
+            Assert.Equal(v2.PreviousButtonSettings.Width, setting.Width);
+            Assert.Equal(v2.PreviousButtonSettings.XPosition, setting.XPosition);
+            Assert.Equal(v2.PreviousButtonSettings.YPosition, setting.YPosition);
+            Assert.Equal(v2.PreviousButtonSettings.IsVisible, setting.IsVisible);
+            Assert.Equal(v2.PreviousButtonSettings.ImagePath, setting.ImagePath);
         }
 
-        [TestMethod]
+        [Fact]
         public void MigrateV1ToV2_ProgressBar()
         {
             var setting = new ProgressBarAppearance
@@ -235,16 +233,16 @@ public void MigrateV1ToV2_ProgressBar()
             var v1 = new V1Settings {ProgressBarAppearance = setting};
             var v2 = Migration.MigrateSettings<V2Settings>(v1, "0.1", "2");
 
-            Assert.AreEqual(v2.ProgressBarSettings.Width, setting.Width);
-            Assert.AreEqual(v2.ProgressBarSettings.Height, setting.Height);
-            Assert.AreEqual(v2.ProgressBarSettings.XPosition, setting.XPosition);
-            Assert.AreEqual(v2.ProgressBarSettings.YPosition, setting.YPosition);
-            Assert.AreEqual(v2.ProgressBarSettings.IsVisible, setting.IsVisible);
-            Assert.AreEqual(v2.ProgressBarSettings.BackgroundColor, setting.BackgroundColor);
-            Assert.AreEqual(v2.ProgressBarSettings.ForegroundColor, setting.ForegroundColor);
+            Assert.Equal(v2.ProgressBarSettings.Width, setting.Width);
+            Assert.Equal(v2.ProgressBarSettings.Height, setting.Height);
+            Assert.Equal(v2.ProgressBarSettings.XPosition, setting.XPosition);
+            Assert.Equal(v2.ProgressBarSettings.YPosition, setting.YPosition);
+            Assert.Equal(v2.ProgressBarSettings.IsVisible, setting.IsVisible);
+            Assert.Equal(v2.ProgressBarSettings.BackgroundColor, setting.BackgroundColor);
+            Assert.Equal(v2.ProgressBarSettings.ForegroundColor, setting.ForegroundColor);
         }
 
-        [TestMethod]
+        [Fact]
         public void MigrateV1ToV2_CustomText()
         {
             var text1 = new TextAppearance
@@ -267,22 +265,22 @@ public void MigrateV1ToV2_CustomText()
             var v1 = new V1Settings {TextAppearances = texts};
             var v2 = Migration.MigrateSettings<V2Settings>(v1, "0.1", "2");
 
-            Assert.AreEqual(v2.CustomLabelSettings.Count, texts.Count);
-            Assert.AreEqual(v2.CustomLabelSettings[0].Color, text1.Color);
-            Assert.AreEqual(v2.CustomLabelSettings[0].Width, text1.Width);
-            Assert.AreEqual(v2.CustomLabelSettings[0].Height, text1.Height);
-            Assert.AreEqual(v2.CustomLabelSettings[0].Name, text1.Name);
-            Assert.AreEqual(v2.CustomLabelSettings[0].XPosition, text1.XPosition);
-            Assert.AreEqual(v2.CustomLabelSettings[0].IsVisible, text1.IsVisible);
-            Assert.AreEqual(v2.CustomLabelSettings[0].YPosition, text1.YPosition);
-            Assert.AreEqual(v2.CustomLabelSettings[0].ScrollSpeed, text1.ScrollSpeed);
-            Assert.AreEqual(v2.CustomLabelSettings[0].FontSize, text1.FontSize);
-            Assert.AreEqual(v2.CustomLabelSettings[0].FontFamily, text1.FontFamily);
-            Assert.AreEqual(v2.CustomLabelSettings[0].Alignment, text1.Alignment);
-            Assert.AreEqual(v2.CustomLabelSettings[0].FormatString, text1.FormatString);
+            Assert.Equal(v2.CustomLabelSettings.Count, texts.Count);
+            Assert.Equal(v2.CustomLabelSettings[0].Color, text1.Color);
+            Assert.Equal(v2.CustomLabelSettings[0].Width, text1.Width);
+            Assert.Equal(v2.CustomLabelSettings[0].Height, text1.Height);
+            Assert.Equal(v2.CustomLabelSettings[0].Name, text1.Name);
+            Assert.Equal(v2.CustomLabelSettings[0].XPosition, text1.XPosition);
+            Assert.Equal(v2.CustomLabelSettings[0].IsVisible, text1.IsVisible);
+            Assert.Equal(v2.CustomLabelSettings[0].YPosition, text1.YPosition);
+            Assert.Equal(v2.CustomLabelSettings[0].ScrollSpeed, text1.ScrollSpeed);
+            Assert.Equal(v2.CustomLabelSettings[0].FontSize, text1.FontSize);
+            Assert.Equal(v2.CustomLabelSettings[0].FontFamily, text1.FontFamily);
+            Assert.Equal(v2.CustomLabelSettings[0].Alignment, text1.Alignment);
+            Assert.Equal(v2.CustomLabelSettings[0].FormatString, text1.FormatString);
         }
 
-        [TestMethod]
+        [Fact]
         public void MigrateV2ToV3()
         {
             string settingsFile = @"Version = ""2""
@@ -432,74 +430,74 @@ public void MigrateV2ToV3()
             var v2 = Toml.ReadString<V2Settings>(settingsFile, settings);
             var v3 = Migration.MigrateSettings<SettingsV3>(v2, "2", "3");
 
-            Assert.AreEqual("3", v3.Version);
-            Assert.AreEqual(v2.AudioSource, v3.AudioSource);
-
-            Assert.AreEqual(v2.AlbumArtPopupSettings.Width, v3.Profiles[SettingsV3.DefaultProfileName].AlbumArtPopupSettings.Width);
-            Assert.AreEqual(v2.AlbumArtPopupSettings.Height, v3.Profiles[SettingsV3.DefaultProfileName].AlbumArtPopupSettings.Height);
-            Assert.AreEqual(v2.AlbumArtPopupSettings.IsVisible, v3.Profiles[SettingsV3.DefaultProfileName].AlbumArtPopupSettings.IsVisible);
-            Assert.AreEqual(v2.AlbumArtPopupSettings.Margin, v3.Profiles[SettingsV3.DefaultProfileName].AlbumArtPopupSettings.Margin);
-            Assert.AreEqual(v2.AlbumArtPopupSettings.XPosition, v3.Profiles[SettingsV3.DefaultProfileName].AlbumArtPopupSettings.XPosition);
-
-            Assert.AreEqual(v2.AlbumArtSettings.Width, v3.Profiles[SettingsV3.DefaultProfileName].AlbumArtSettings.Width);
-            Assert.AreEqual(v2.AlbumArtSettings.Height, v3.Profiles[SettingsV3.DefaultProfileName].AlbumArtSettings.Height);
-            Assert.AreEqual(v2.AlbumArtSettings.IsVisible, v3.Profiles[SettingsV3.DefaultProfileName].AlbumArtSettings.IsVisible);
-            Assert.AreEqual(v2.AlbumArtSettings.XPosition, v3.Profiles[SettingsV3.DefaultProfileName].AlbumArtSettings.XPosition);
-            Assert.AreEqual(v2.AlbumArtSettings.YPosition, v3.Profiles[SettingsV3.DefaultProfileName].AlbumArtSettings.YPosition);
-            Assert.AreEqual(v2.AlbumArtSettings.PlaceholderPath, v3.Profiles[SettingsV3.DefaultProfileName].AlbumArtSettings.PlaceholderPath);
-
-            Assert.AreEqual(v2.AudioBandSettings.Width, v3.Profiles[SettingsV3.DefaultProfileName].AudioBandSettings.Width);
-            Assert.AreEqual(v2.AudioBandSettings.Height, v3.Profiles[SettingsV3.DefaultProfileName].AudioBandSettings.Height);
-
-            Assert.AreEqual(v2.NextButtonSettings.Width, v3.Profiles[SettingsV3.DefaultProfileName].NextButtonSettings.Width);
-            Assert.AreEqual(v2.NextButtonSettings.Height, v3.Profiles[SettingsV3.DefaultProfileName].NextButtonSettings.Height);
-            Assert.AreEqual(v2.NextButtonSettings.IsVisible, v3.Profiles[SettingsV3.DefaultProfileName].NextButtonSettings.IsVisible);
-            Assert.AreEqual(v2.NextButtonSettings.XPosition, v3.Profiles[SettingsV3.DefaultProfileName].NextButtonSettings.XPosition);
-            Assert.AreEqual(v2.NextButtonSettings.YPosition, v3.Profiles[SettingsV3.DefaultProfileName].NextButtonSettings.YPosition);
-            Assert.AreEqual(v2.NextButtonSettings.ImagePath, v3.Profiles[SettingsV3.DefaultProfileName].NextButtonSettings.Content.ImagePath);
-
-            Assert.AreEqual(v2.AudioSourceSettings.Count, v3.AudioSourceSettings.Count);
-            Assert.AreEqual(v2.AudioSourceSettings[0].AudioSourceName, v3.AudioSourceSettings[0].AudioSourceName);
-            Assert.AreEqual(v2.AudioSourceSettings[0].Settings.Count, v3.AudioSourceSettings[0].Settings.Count);
-            Assert.AreEqual(v2.AudioSourceSettings[0].Settings[0].Name, v3.AudioSourceSettings[0].Settings[0].Name);
-            Assert.AreEqual(v2.AudioSourceSettings[0].Settings[0].Value, v3.AudioSourceSettings[0].Settings[0].Value);
-
-            Assert.AreEqual(v2.PlayPauseButtonSettings.Width, v3.Profiles[SettingsV3.DefaultProfileName].PlayPauseButtonSettings.Width);
-            Assert.AreEqual(v2.PlayPauseButtonSettings.Height, v3.Profiles[SettingsV3.DefaultProfileName].PlayPauseButtonSettings.Height);
-            Assert.AreEqual(v2.PlayPauseButtonSettings.XPosition, v3.Profiles[SettingsV3.DefaultProfileName].PlayPauseButtonSettings.XPosition);
-            Assert.AreEqual(v2.PlayPauseButtonSettings.YPosition, v3.Profiles[SettingsV3.DefaultProfileName].PlayPauseButtonSettings.YPosition);
-            Assert.AreEqual(v2.PlayPauseButtonSettings.IsVisible, v3.Profiles[SettingsV3.DefaultProfileName].PlayPauseButtonSettings.IsVisible);
-            Assert.AreEqual(v2.PlayPauseButtonSettings.PauseButtonImagePath, v3.Profiles[SettingsV3.DefaultProfileName].PlayPauseButtonSettings.PauseContent.ImagePath);
-            Assert.AreEqual(v2.PlayPauseButtonSettings.PlayButtonImagePath, v3.Profiles[SettingsV3.DefaultProfileName].PlayPauseButtonSettings.PlayContent.ImagePath);
-
-            Assert.AreEqual(v2.PreviousButtonSettings.Height, v3.Profiles[SettingsV3.DefaultProfileName].PreviousButtonSettings.Height);
-            Assert.AreEqual(v2.PreviousButtonSettings.Width, v3.Profiles[SettingsV3.DefaultProfileName].PreviousButtonSettings.Width);
-            Assert.AreEqual(v2.PreviousButtonSettings.XPosition, v3.Profiles[SettingsV3.DefaultProfileName].PreviousButtonSettings.XPosition);
-            Assert.AreEqual(v2.PreviousButtonSettings.YPosition, v3.Profiles[SettingsV3.DefaultProfileName].PreviousButtonSettings.YPosition);
-            Assert.AreEqual(v2.PreviousButtonSettings.IsVisible, v3.Profiles[SettingsV3.DefaultProfileName].PreviousButtonSettings.IsVisible);
-            Assert.AreEqual(v2.PreviousButtonSettings.ImagePath, v3.Profiles[SettingsV3.DefaultProfileName].PreviousButtonSettings.Content.ImagePath);
-
-            Assert.AreEqual(v2.ProgressBarSettings.Width, v3.Profiles[SettingsV3.DefaultProfileName].ProgressBarSettings.Width);
-            Assert.AreEqual(v2.ProgressBarSettings.Height, v3.Profiles[SettingsV3.DefaultProfileName].ProgressBarSettings.Height);
-            Assert.AreEqual(v2.ProgressBarSettings.XPosition, v3.Profiles[SettingsV3.DefaultProfileName].ProgressBarSettings.XPosition);
-            Assert.AreEqual(v2.ProgressBarSettings.YPosition, v3.Profiles[SettingsV3.DefaultProfileName].ProgressBarSettings.YPosition);
-            Assert.AreEqual(v2.ProgressBarSettings.IsVisible, v3.Profiles[SettingsV3.DefaultProfileName].ProgressBarSettings.IsVisible);
-            Assert.AreEqual(v2.ProgressBarSettings.BackgroundColor, v3.Profiles[SettingsV3.DefaultProfileName].ProgressBarSettings.BackgroundColor);
-            Assert.AreEqual(v2.ProgressBarSettings.ForegroundColor, v3.Profiles[SettingsV3.DefaultProfileName].ProgressBarSettings.ForegroundColor);
-
-            Assert.AreEqual(v2.CustomLabelSettings.Count, v3.Profiles[SettingsV3.DefaultProfileName].CustomLabelSettings.Count);
-            Assert.AreEqual(v2.CustomLabelSettings[0].Color, v3.Profiles[SettingsV3.DefaultProfileName].CustomLabelSettings[0].Color);
-            Assert.AreEqual(v2.CustomLabelSettings[0].Width, v3.Profiles[SettingsV3.DefaultProfileName].CustomLabelSettings[0].Width);
-            Assert.AreEqual(v2.CustomLabelSettings[0].Height, v3.Profiles[SettingsV3.DefaultProfileName].CustomLabelSettings[0].Height);
-            Assert.AreEqual(v2.CustomLabelSettings[0].Name, v3.Profiles[SettingsV3.DefaultProfileName].CustomLabelSettings[0].Name);
-            Assert.AreEqual(v2.CustomLabelSettings[0].XPosition, v3.Profiles[SettingsV3.DefaultProfileName].CustomLabelSettings[0].XPosition);
-            Assert.AreEqual(v2.CustomLabelSettings[0].IsVisible, v3.Profiles[SettingsV3.DefaultProfileName].CustomLabelSettings[0].IsVisible);
-            Assert.AreEqual(v2.CustomLabelSettings[0].YPosition, v3.Profiles[SettingsV3.DefaultProfileName].CustomLabelSettings[0].YPosition);
-            Assert.AreEqual(v2.CustomLabelSettings[0].ScrollSpeed, v3.Profiles[SettingsV3.DefaultProfileName].CustomLabelSettings[0].ScrollSpeed);
-            Assert.AreEqual(v2.CustomLabelSettings[0].FontSize, v3.Profiles[SettingsV3.DefaultProfileName].CustomLabelSettings[0].FontSize);
-            Assert.AreEqual(v2.CustomLabelSettings[0].FontFamily, v3.Profiles[SettingsV3.DefaultProfileName].CustomLabelSettings[0].FontFamily);
-            Assert.AreEqual(v2.CustomLabelSettings[0].Alignment, v3.Profiles[SettingsV3.DefaultProfileName].CustomLabelSettings[0].Alignment);
-            Assert.AreEqual(v2.CustomLabelSettings[0].FormatString, v3.Profiles[SettingsV3.DefaultProfileName].CustomLabelSettings[0].FormatString);
+            Assert.Equal("3", v3.Version);
+            Assert.Equal(v2.AudioSource, v3.AudioSource);
+
+            Assert.Equal(v2.AlbumArtPopupSettings.Width, v3.Profiles[SettingsV3.DefaultProfileName].AlbumArtPopupSettings.Width);
+            Assert.Equal(v2.AlbumArtPopupSettings.Height, v3.Profiles[SettingsV3.DefaultProfileName].AlbumArtPopupSettings.Height);
+            Assert.Equal(v2.AlbumArtPopupSettings.IsVisible, v3.Profiles[SettingsV3.DefaultProfileName].AlbumArtPopupSettings.IsVisible);
+            Assert.Equal(v2.AlbumArtPopupSettings.Margin, v3.Profiles[SettingsV3.DefaultProfileName].AlbumArtPopupSettings.Margin);
+            Assert.Equal(v2.AlbumArtPopupSettings.XPosition, v3.Profiles[SettingsV3.DefaultProfileName].AlbumArtPopupSettings.XPosition);
+
+            Assert.Equal(v2.AlbumArtSettings.Width, v3.Profiles[SettingsV3.DefaultProfileName].AlbumArtSettings.Width);
+            Assert.Equal(v2.AlbumArtSettings.Height, v3.Profiles[SettingsV3.DefaultProfileName].AlbumArtSettings.Height);
+            Assert.Equal(v2.AlbumArtSettings.IsVisible, v3.Profiles[SettingsV3.DefaultProfileName].AlbumArtSettings.IsVisible);
+            Assert.Equal(v2.AlbumArtSettings.XPosition, v3.Profiles[SettingsV3.DefaultProfileName].AlbumArtSettings.XPosition);
+            Assert.Equal(v2.AlbumArtSettings.YPosition, v3.Profiles[SettingsV3.DefaultProfileName].AlbumArtSettings.YPosition);
+            Assert.Equal(v2.AlbumArtSettings.PlaceholderPath, v3.Profiles[SettingsV3.DefaultProfileName].AlbumArtSettings.PlaceholderPath);
+
+            Assert.Equal(v2.AudioBandSettings.Width, v3.Profiles[SettingsV3.DefaultProfileName].AudioBandSettings.Width);
+            Assert.Equal(v2.AudioBandSettings.Height, v3.Profiles[SettingsV3.DefaultProfileName].AudioBandSettings.Height);
+
+            Assert.Equal(v2.NextButtonSettings.Width, v3.Profiles[SettingsV3.DefaultProfileName].NextButtonSettings.Width);
+            Assert.Equal(v2.NextButtonSettings.Height, v3.Profiles[SettingsV3.DefaultProfileName].NextButtonSettings.Height);
+            Assert.Equal(v2.NextButtonSettings.IsVisible, v3.Profiles[SettingsV3.DefaultProfileName].NextButtonSettings.IsVisible);
+            Assert.Equal(v2.NextButtonSettings.XPosition, v3.Profiles[SettingsV3.DefaultProfileName].NextButtonSettings.XPosition);
+            Assert.Equal(v2.NextButtonSettings.YPosition, v3.Profiles[SettingsV3.DefaultProfileName].NextButtonSettings.YPosition);
+            Assert.Equal(v2.NextButtonSettings.ImagePath, v3.Profiles[SettingsV3.DefaultProfileName].NextButtonSettings.Content.ImagePath);
+
+            Assert.Equal(v2.AudioSourceSettings.Count, v3.AudioSourceSettings.Count);
+            Assert.Equal(v2.AudioSourceSettings[0].AudioSourceName, v3.AudioSourceSettings[0].AudioSourceName);
+            Assert.Equal(v2.AudioSourceSettings[0].Settings.Count, v3.AudioSourceSettings[0].Settings.Count);
+            Assert.Equal(v2.AudioSourceSettings[0].Settings[0].Name, v3.AudioSourceSettings[0].Settings[0].Name);
+            Assert.Equal(v2.AudioSourceSettings[0].Settings[0].Value, v3.AudioSourceSettings[0].Settings[0].Value);
+
+            Assert.Equal(v2.PlayPauseButtonSettings.Width, v3.Profiles[SettingsV3.DefaultProfileName].PlayPauseButtonSettings.Width);
+            Assert.Equal(v2.PlayPauseButtonSettings.Height, v3.Profiles[SettingsV3.DefaultProfileName].PlayPauseButtonSettings.Height);
+            Assert.Equal(v2.PlayPauseButtonSettings.XPosition, v3.Profiles[SettingsV3.DefaultProfileName].PlayPauseButtonSettings.XPosition);
+            Assert.Equal(v2.PlayPauseButtonSettings.YPosition, v3.Profiles[SettingsV3.DefaultProfileName].PlayPauseButtonSettings.YPosition);
+            Assert.Equal(v2.PlayPauseButtonSettings.IsVisible, v3.Profiles[SettingsV3.DefaultProfileName].PlayPauseButtonSettings.IsVisible);
+            Assert.Equal(v2.PlayPauseButtonSettings.PauseButtonImagePath, v3.Profiles[SettingsV3.DefaultProfileName].PlayPauseButtonSettings.PauseContent.ImagePath);
+            Assert.Equal(v2.PlayPauseButtonSettings.PlayButtonImagePath, v3.Profiles[SettingsV3.DefaultProfileName].PlayPauseButtonSettings.PlayContent.ImagePath);
+
+            Assert.Equal(v2.PreviousButtonSettings.Height, v3.Profiles[SettingsV3.DefaultProfileName].PreviousButtonSettings.Height);
+            Assert.Equal(v2.PreviousButtonSettings.Width, v3.Profiles[SettingsV3.DefaultProfileName].PreviousButtonSettings.Width);
+            Assert.Equal(v2.PreviousButtonSettings.XPosition, v3.Profiles[SettingsV3.DefaultProfileName].PreviousButtonSettings.XPosition);
+            Assert.Equal(v2.PreviousButtonSettings.YPosition, v3.Profiles[SettingsV3.DefaultProfileName].PreviousButtonSettings.YPosition);
+            Assert.Equal(v2.PreviousButtonSettings.IsVisible, v3.Profiles[SettingsV3.DefaultProfileName].PreviousButtonSettings.IsVisible);
+            Assert.Equal(v2.PreviousButtonSettings.ImagePath, v3.Profiles[SettingsV3.DefaultProfileName].PreviousButtonSettings.Content.ImagePath);
+
+            Assert.Equal(v2.ProgressBarSettings.Width, v3.Profiles[SettingsV3.DefaultProfileName].ProgressBarSettings.Width);
+            Assert.Equal(v2.ProgressBarSettings.Height, v3.Profiles[SettingsV3.DefaultProfileName].ProgressBarSettings.Height);
+            Assert.Equal(v2.ProgressBarSettings.XPosition, v3.Profiles[SettingsV3.DefaultProfileName].ProgressBarSettings.XPosition);
+            Assert.Equal(v2.ProgressBarSettings.YPosition, v3.Profiles[SettingsV3.DefaultProfileName].ProgressBarSettings.YPosition);
+            Assert.Equal(v2.ProgressBarSettings.IsVisible, v3.Profiles[SettingsV3.DefaultProfileName].ProgressBarSettings.IsVisible);
+            Assert.Equal(v2.ProgressBarSettings.BackgroundColor, v3.Profiles[SettingsV3.DefaultProfileName].ProgressBarSettings.BackgroundColor);
+            Assert.Equal(v2.ProgressBarSettings.ForegroundColor, v3.Profiles[SettingsV3.DefaultProfileName].ProgressBarSettings.ForegroundColor);
+
+            Assert.Equal(v2.CustomLabelSettings.Count, v3.Profiles[SettingsV3.DefaultProfileName].CustomLabelSettings.Count);
+            Assert.Equal(v2.CustomLabelSettings[0].Color, v3.Profiles[SettingsV3.DefaultProfileName].CustomLabelSettings[0].Color);
+            Assert.Equal(v2.CustomLabelSettings[0].Width, v3.Profiles[SettingsV3.DefaultProfileName].CustomLabelSettings[0].Width);
+            Assert.Equal(v2.CustomLabelSettings[0].Height, v3.Profiles[SettingsV3.DefaultProfileName].CustomLabelSettings[0].Height);
+            Assert.Equal(v2.CustomLabelSettings[0].Name, v3.Profiles[SettingsV3.DefaultProfileName].CustomLabelSettings[0].Name);
+            Assert.Equal(v2.CustomLabelSettings[0].XPosition, v3.Profiles[SettingsV3.DefaultProfileName].CustomLabelSettings[0].XPosition);
+            Assert.Equal(v2.CustomLabelSettings[0].IsVisible, v3.Profiles[SettingsV3.DefaultProfileName].CustomLabelSettings[0].IsVisible);
+            Assert.Equal(v2.CustomLabelSettings[0].YPosition, v3.Profiles[SettingsV3.DefaultProfileName].CustomLabelSettings[0].YPosition);
+            Assert.Equal(v2.CustomLabelSettings[0].ScrollSpeed, v3.Profiles[SettingsV3.DefaultProfileName].CustomLabelSettings[0].ScrollSpeed);
+            Assert.Equal(v2.CustomLabelSettings[0].FontSize, v3.Profiles[SettingsV3.DefaultProfileName].CustomLabelSettings[0].FontSize);
+            Assert.Equal(v2.CustomLabelSettings[0].FontFamily, v3.Profiles[SettingsV3.DefaultProfileName].CustomLabelSettings[0].FontFamily);
+            Assert.Equal(v2.CustomLabelSettings[0].Alignment, v3.Profiles[SettingsV3.DefaultProfileName].CustomLabelSettings[0].Alignment);
+            Assert.Equal(v2.CustomLabelSettings[0].FormatString, v3.Profiles[SettingsV3.DefaultProfileName].CustomLabelSettings[0].FormatString);
         }
     }
 }
diff --git a/src/AudioBand.Test/TextFormatting/CustomTextParsingTests.cs b/src/AudioBand.Test/TextFormatting/CustomTextParsingTests.cs
index e9040e19..884ca61e 100644
--- a/src/AudioBand.Test/TextFormatting/CustomTextParsingTests.cs
+++ b/src/AudioBand.Test/TextFormatting/CustomTextParsingTests.cs
@@ -1,38 +1,37 @@
 using System;
 using System.ComponentModel;
 using System.Linq;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Windows.Media;
 using AudioBand.AudioSource;
 using AudioBand.TextFormatting;
 using Moq;
+using Xunit;
 
 namespace AudioBand.Test
 {
-    [TestClass]
     public class CustomTextParsingTests
     {
-        [TestMethod]
+        [Fact]
         public void ParseNormal()
         {
             var format = "hello";
             var segments = FormattedTextParser.ParseFormattedString(format, Colors.Black, new Mock<IAudioSession>().Object).ToList();
 
-            Assert.AreEqual(1, segments.Count);
-            Assert.AreEqual("hello", segments[0].Text);
-            Assert.IsTrue(segments[0].Flags.HasFlag(FormattedTextFlags.Normal));
+            Assert.Single(segments);
+            Assert.Equal("hello", segments[0].Text);
+            Assert.True(segments[0].Flags.HasFlag(FormattedTextFlags.Normal));
         }
 
-        [TestMethod]
+        [Fact]
         public void ParseEmpty()
         {
             var format = "";
             var segments = FormattedTextParser.ParseFormattedString(format, Colors.Black, new Mock<IAudioSession>().Object).ToList();
 
-            Assert.AreEqual(0, segments.Count);
+            Assert.Empty(segments);
         }
 
-        [TestMethod]
+        [Fact]
         public void ParseSinglePlaceholder()
         {
             var format = "{artist}";
@@ -41,11 +40,11 @@ public void ParseSinglePlaceholder()
             session.SetupGet(m => m.SongArtist).Returns(artist);
             var segments = FormattedTextParser.ParseFormattedString(format, Colors.Black, session.Object).ToList();
 
-            Assert.AreEqual(1, segments.Count);
-            Assert.AreEqual(artist, segments[0].Text);
+            Assert.Single(segments);
+            Assert.Equal(artist, segments[0].Text);
         }
 
-        [TestMethod]
+        [Fact]
         public void ParsePlaceholderWithNormal()
         {
             var format = "{artist} song";
@@ -53,15 +52,15 @@ public void ParsePlaceholderWithNormal()
             var session = new Mock<IAudioSession>();
             session.SetupGet(m => m.SongArtist).Returns(artist);
             var segments = FormattedTextParser.ParseFormattedString(format, Colors.Black, session.Object).ToList();
-            Assert.AreEqual(2, segments.Count);
+            Assert.Equal(2, segments.Count);
 
-            Assert.AreEqual(artist, segments[0].Text);
+            Assert.Equal(artist, segments[0].Text);
 
-            Assert.AreEqual(" song", segments[1].Text);
-            Assert.IsTrue(segments[1].Flags.HasFlag(FormattedTextFlags.Normal));
+            Assert.Equal(" song", segments[1].Text);
+            Assert.True(segments[1].Flags.HasFlag(FormattedTextFlags.Normal));
         }
 
-        [TestMethod]
+        [Fact]
         public void ParseSingleNormalWithPlaceholder()
         {
             var format = "by {artist}";
@@ -70,37 +69,37 @@ public void ParseSingleNormalWithPlaceholder()
             session.SetupGet(m => m.SongArtist).Returns(artist);
             var segments = FormattedTextParser.ParseFormattedString(format, Colors.Black, session.Object).ToList();
 
-            Assert.AreEqual(2, segments.Count);
+            Assert.Equal(2, segments.Count);
 
-            Assert.AreEqual("by ", segments[0].Text);
-            Assert.IsTrue(segments[0].Flags.HasFlag(FormattedTextFlags.Normal));
+            Assert.Equal("by ", segments[0].Text);
+            Assert.True(segments[0].Flags.HasFlag(FormattedTextFlags.Normal));
 
-            Assert.AreEqual(artist, segments[1].Text);
+            Assert.Equal(artist, segments[1].Text);
         }
 
-        [TestMethod]
+        [Fact]
         public void ParseUnclosed()
         {
             var format = "{artist";
             var segments = FormattedTextParser.ParseFormattedString(format, Colors.Black, new Mock<IAudioSession>().Object).ToList();
 
-            Assert.AreEqual(1, segments.Count);
-            Assert.AreEqual("{artist", segments[0].Text);
-            Assert.IsTrue(segments[0].Flags.HasFlag(FormattedTextFlags.Normal));
+            Assert.Single(segments);
+            Assert.Equal("{artist", segments[0].Text);
+            Assert.True(segments[0].Flags.HasFlag(FormattedTextFlags.Normal));
         }
 
-        [TestMethod]
+        [Fact]
         public void ParseOnlyClosing()
         {
             var format = "}";
             var segments = FormattedTextParser.ParseFormattedString(format, Colors.Black, new Mock<IAudioSession>().Object).ToList();
 
-            Assert.AreEqual(1, segments.Count);
-            Assert.AreEqual("}", segments[0].Text);
-            Assert.IsTrue(segments[0].Flags.HasFlag(FormattedTextFlags.Normal));
+            Assert.Single(segments);
+            Assert.Equal("}", segments[0].Text);
+            Assert.True(segments[0].Flags.HasFlag(FormattedTextFlags.Normal));
         }
 
-        [TestMethod]
+        [Fact]
         public void ParseComplex()
         {
             var format = "this is {artist} and ";
@@ -110,30 +109,30 @@ public void ParseComplex()
             var segments = FormattedTextParser
                 .ParseFormattedString(format, Colors.Black, session.Object).ToList();
 
-            Assert.AreEqual(3, segments.Count);
+            Assert.Equal(3, segments.Count);
 
-            Assert.AreEqual("this is ", segments[0].Text);
-            Assert.IsTrue(segments[0].Flags.HasFlag(FormattedTextFlags.Normal));
+            Assert.Equal("this is ", segments[0].Text);
+            Assert.True(segments[0].Flags.HasFlag(FormattedTextFlags.Normal));
 
-            Assert.AreEqual(artist, segments[1].Text);
+            Assert.Equal(artist, segments[1].Text);
 
-            Assert.AreEqual(" and ", segments[2].Text);
-            Assert.IsTrue(segments[2].Flags.HasFlag(FormattedTextFlags.Normal));
+            Assert.Equal(" and ", segments[2].Text);
+            Assert.True(segments[2].Flags.HasFlag(FormattedTextFlags.Normal));
         }
 
-        [TestMethod]
+        [Fact]
         public void ParseInvalidFormat()
         {
             var format = "{something}";
             var segments = FormattedTextParser.ParseFormattedString(format, Colors.Black, new Mock<IAudioSession>().Object).ToList();
 
-            Assert.AreEqual(1, segments.Count);
+            Assert.Single(segments);
 
-            Assert.AreEqual("!Invalid format!", segments[0].Text);
-            Assert.IsTrue(segments[0].Flags.HasFlag(FormattedTextFlags.Normal));
+            Assert.Equal("!Invalid format!", segments[0].Text);
+            Assert.True(segments[0].Flags.HasFlag(FormattedTextFlags.Normal));
         }
 
-        [TestMethod]
+        [Fact]
         public void ParseArtist()
         {
             var format = "{artist}";
@@ -143,14 +142,14 @@ public void ParseArtist()
             mock.SetupSequence(m => m.SongArtist).Returns(artist).Returns(artist2);
             var segments = FormattedTextParser.ParseFormattedString(format, Colors.Black, mock.Object).ToList();
 
-            Assert.AreEqual(1, segments.Count);
-            Assert.AreEqual(artist, segments[0].Text);
+            Assert.Single(segments);
+            Assert.Equal(artist, segments[0].Text);
 
             mock.Raise(m => m.PropertyChanged += null, null, new PropertyChangedEventArgs(nameof(IAudioSession.SongArtist)));
-            Assert.AreEqual(artist2, segments[0].Text);
+            Assert.Equal(artist2, segments[0].Text);
         }
 
-        [TestMethod]
+        [Fact]
         public void ParseSong()
         {
             var format = "{song}";
@@ -159,11 +158,11 @@ public void ParseSong()
             mock.SetupGet(m => m.SongName).Returns(song);
             var segments = FormattedTextParser.ParseFormattedString(format, Colors.Black, mock.Object).ToList();
 
-            Assert.AreEqual(1, segments.Count);
-            Assert.AreEqual(song, segments[0].Text);
+            Assert.Single(segments);
+            Assert.Equal(song, segments[0].Text);
         }
 
-        [TestMethod]
+        [Fact]
         public void ParseAlbum()
         {
             var format = "{album}";
@@ -172,11 +171,11 @@ public void ParseAlbum()
             mock.SetupGet(m => m.AlbumName).Returns(album);
             var segments = FormattedTextParser.ParseFormattedString(format, Colors.Black, mock.Object).ToList();
 
-            Assert.AreEqual(1, segments.Count);
-            Assert.AreEqual(album, segments[0].Text);
+            Assert.Single(segments);
+            Assert.Equal(album, segments[0].Text);
         }
 
-        [TestMethod]
+        [Fact]
         public void ParseTime()
         {
             var format = "{time}";
@@ -185,11 +184,11 @@ public void ParseTime()
             mock.SetupGet(m => m.SongProgress).Returns(time);
             var segments = FormattedTextParser.ParseFormattedString(format, Colors.Black, mock.Object).ToList();
 
-            Assert.AreEqual(1, segments.Count);
-            Assert.AreEqual("0:40", segments[0].Text);
+            Assert.Single(segments);
+            Assert.Equal("0:40", segments[0].Text);
         }
 
-        [TestMethod]
+        [Fact]
         public void ParseLength()
         {
             var format = "{length}";
@@ -198,65 +197,65 @@ public void ParseLength()
             mock.SetupGet(m => m.SongLength).Returns(time);
             var segments = FormattedTextParser.ParseFormattedString(format, Colors.Black, mock.Object).ToList();
 
-            Assert.AreEqual(1, segments.Count);
-            Assert.AreEqual("1:20", segments[0].Text);
+            Assert.Single(segments);
+            Assert.Equal("1:20", segments[0].Text);
         }
 
-        [TestMethod]
+        [Fact]
         public void ParseStyleBold()
         {
             var format = "{*artist}";
             var mock = new Mock<IAudioSession>();
             var segments = FormattedTextParser.ParseFormattedString(format, Colors.Black, mock.Object).ToList();
 
-            Assert.AreEqual(1, segments.Count);
-            Assert.IsTrue(segments[0].Flags.HasFlag(FormattedTextFlags.Bold));
+            Assert.Single(segments);
+            Assert.True(segments[0].Flags.HasFlag(FormattedTextFlags.Bold));
         }
 
-        [TestMethod]
+        [Fact]
         public void ParseStyleItalic()
         {
             var format = "{&artist}";
             var segments = FormattedTextParser
                 .ParseFormattedString(format, Colors.Black, new Mock<IAudioSession>().Object).ToList();
 
-            Assert.AreEqual(1, segments.Count);
-            Assert.IsTrue(segments[0].Flags.HasFlag(FormattedTextFlags.Italic));
+            Assert.Single(segments);
+            Assert.True(segments[0].Flags.HasFlag(FormattedTextFlags.Italic));
         }
 
-        [TestMethod]
+        [Fact]
         public void ParseStyleUnderline()
         {
             var format = "{_artist}";
             var segments = FormattedTextParser
                 .ParseFormattedString(format, Colors.Black, new Mock<IAudioSession>().Object).ToList();
 
-            Assert.AreEqual(1, segments.Count);
-            Assert.IsTrue(segments[0].Flags.HasFlag(FormattedTextFlags.Underline));
+            Assert.Single(segments);
+            Assert.True(segments[0].Flags.HasFlag(FormattedTextFlags.Underline));
         }
 
-        [TestMethod]
+        [Fact]
         public void ParseStyleWithColor()
         {
             var format = "{_artist:#ff00ff}";
             var segments = FormattedTextParser
                 .ParseFormattedString(format, Colors.Black, new Mock<IAudioSession>().Object).ToList();
 
-            Assert.AreEqual(1, segments.Count);
-            Assert.IsTrue(segments[0].Flags.HasFlag(FormattedTextFlags.Underline));
-            Assert.AreEqual(Color.FromRgb(255, 0, 255), segments[0].Color);
+            Assert.Single(segments);
+            Assert.True(segments[0].Flags.HasFlag(FormattedTextFlags.Underline));
+            Assert.Equal(Color.FromRgb(255, 0, 255), segments[0].Color);
         }
 
-        [TestMethod]
+        [Fact]
         public void ParseMultipleStyles()
         {
             var format = "{*_artist}";
             var segments = FormattedTextParser
                 .ParseFormattedString(format, Colors.Black, new Mock<IAudioSession>().Object).ToList();
 
-            Assert.AreEqual(1, segments.Count);
-            Assert.IsTrue(segments[0].Flags.HasFlag(FormattedTextFlags.Underline));
-            Assert.IsTrue(segments[0].Flags.HasFlag(FormattedTextFlags.Bold));
+            Assert.Single(segments);
+            Assert.True(segments[0].Flags.HasFlag(FormattedTextFlags.Underline));
+            Assert.True(segments[0].Flags.HasFlag(FormattedTextFlags.Bold));
         }
     }
 }
diff --git a/src/AudioBand.Test/ViewModels/AlbumArtPopupViewModelTests.cs b/src/AudioBand.Test/ViewModels/AlbumArtPopupViewModelTests.cs
index fd38466f..cb572109 100644
--- a/src/AudioBand.Test/ViewModels/AlbumArtPopupViewModelTests.cs
+++ b/src/AudioBand.Test/ViewModels/AlbumArtPopupViewModelTests.cs
@@ -3,25 +3,23 @@
 using AudioBand.Models;
 using AudioBand.Settings;
 using AudioBand.ViewModels;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
+using Xunit;
 
 namespace AudioBand.Test
 {
-    [TestClass]
     public class AlbumArtPopupViewModelTests
     {
         private Mock<IAppSettings> _appSettings;
         private Mock<IMessageBus> _messageBus;
 
-        [TestInitialize]
-        public void TestInit()
+        public AlbumArtPopupViewModelTests()
         {
             _appSettings = new Mock<IAppSettings>();
             _messageBus = new Mock<IMessageBus>();
         }
 
-        [TestMethod]
+        [Fact]
         public void ListensForProfileChangesAndMapsProperly()
         {
             var first = new AlbumArtPopup() {Height = 10};
@@ -33,11 +31,11 @@ public void ListensForProfileChangesAndMapsProperly()
 
             var vm = new AlbumArtPopupViewModel(_appSettings.Object, _messageBus.Object);
 
-            Assert.AreEqual(first.Height, vm.Height);
+            Assert.Equal(first.Height, vm.Height);
             _appSettings.Raise(m => m.ProfileChanged += null, EventArgs.Empty);
 
-            Assert.IsFalse(vm.IsEditing);
-            Assert.AreEqual(second.Height, vm.Height);
+            Assert.False(vm.IsEditing);
+            Assert.Equal(second.Height, vm.Height);
         }
     }
 }
diff --git a/src/AudioBand.Test/ViewModels/AlbumArtViewModelTests.cs b/src/AudioBand.Test/ViewModels/AlbumArtViewModelTests.cs
index fa2313ba..c9c2edc7 100644
--- a/src/AudioBand.Test/ViewModels/AlbumArtViewModelTests.cs
+++ b/src/AudioBand.Test/ViewModels/AlbumArtViewModelTests.cs
@@ -1,28 +1,21 @@
 using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using AudioBand.AudioSource;
 using AudioBand.Messages;
 using AudioBand.Models;
 using AudioBand.Settings;
 using AudioBand.ViewModels;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
+using Xunit;
 
 namespace AudioBand.Test
 {
-    [TestClass]
     public class AlbumArtViewModelTests
     {
         private Mock<IAppSettings> _appSettings;
         private Mock<IDialogService> _dialog;
         private Mock<IMessageBus> _messageBus;
 
-        [TestInitialize]
-        public void TestInit()
+        public AlbumArtViewModelTests()
         {
             _appSettings = new Mock<IAppSettings>();
             _appSettings.SetupGet(m => m.AlbumArt).Returns(new AlbumArt());
@@ -30,7 +23,7 @@ public void TestInit()
             _messageBus = new Mock<IMessageBus>();
         }
 
-        [TestMethod]
+        [Fact]
         public void ListensToProfileChanges()
         {
             var first = new AlbumArt() {Height = 10};
@@ -42,12 +35,12 @@ public void ListensToProfileChanges()
             bool raised = false;
             vm.PropertyChanged += (sender, e) => raised = true;
 
-            Assert.AreEqual(vm.Height, first.Height);
+            Assert.Equal(vm.Height, first.Height);
             _appSettings.Raise(m => m.ProfileChanged += null, EventArgs.Empty);
 
-            Assert.IsFalse(vm.IsEditing);
-            Assert.IsTrue(raised);
-            Assert.AreEqual(second.Height, vm.Height);
+            Assert.False(vm.IsEditing);
+            Assert.True(raised);
+            Assert.Equal(second.Height, vm.Height);
         }
     }
 }
diff --git a/src/AudioBand.Test/ViewModels/AudioBandViewModelTests.cs b/src/AudioBand.Test/ViewModels/AudioBandViewModelTests.cs
index a569cf2a..182b8e45 100644
--- a/src/AudioBand.Test/ViewModels/AudioBandViewModelTests.cs
+++ b/src/AudioBand.Test/ViewModels/AudioBandViewModelTests.cs
@@ -1,30 +1,24 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using AudioBand.Messages;
 using AudioBand.Settings;
 using AudioBand.ViewModels;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
+using Xunit;
 
 namespace AudioBand.Test
 {
-    [TestClass]
     public class AudioBandViewModelTests
     {
         private Mock<IAppSettings> _appSettings;
         private Mock<IMessageBus> _messageBus;
 
-        [TestInitialize]
-        public void TestInit()
+        public AudioBandViewModelTests()
         {
             _messageBus = new Mock<IMessageBus>();
             _appSettings = new Mock<IAppSettings>();
         }
 
-        [TestMethod]
+        [Fact]
         public void AudioBandViewModelListensToProfileChanges()
         {
             var first = new Models.AudioBand(){Height = 10};
@@ -37,12 +31,12 @@ public void AudioBandViewModelListensToProfileChanges()
             bool raised = false;
             vm.PropertyChanged += (_, __) => raised = true;
 
-            Assert.AreEqual(first.Height, vm.Height);
+            Assert.Equal(first.Height, vm.Height);
             _appSettings.Raise(m => m.ProfileChanged += null, EventArgs.Empty);
 
-            Assert.IsTrue(raised);
-            Assert.IsFalse(vm.IsEditing);
-            Assert.AreEqual(second.Height, vm.Height);
+            Assert.True(raised);
+            Assert.False(vm.IsEditing);
+            Assert.Equal(second.Height, vm.Height);
         }
     }
 }
diff --git a/src/AudioBand.Test/ViewModels/AudioSourceSettingsCollectionTests.cs b/src/AudioBand.Test/ViewModels/AudioSourceSettingsCollectionTests.cs
index 425adfd9..e4db2e57 100644
--- a/src/AudioBand.Test/ViewModels/AudioSourceSettingsCollectionTests.cs
+++ b/src/AudioBand.Test/ViewModels/AudioSourceSettingsCollectionTests.cs
@@ -1,27 +1,25 @@
 using AudioBand.AudioSource;
 using AudioBand.Models;
 using AudioBand.ViewModels;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using System.Collections.Generic;
 using AudioBand.Messages;
+using Xunit;
 
 namespace AudioBand.Test
 {
-    [TestClass]
     public class AudioSourceSettingsCollectionTests
     {
         private Mock<IInternalAudioSource> _audioSourceMock;
         private Mock<IMessageBus> _messageBus;
 
-        [TestInitialize]
-        public void Init()
+        public AudioSourceSettingsCollectionTests()
         {
             _audioSourceMock = new Mock<IInternalAudioSource>();
             _messageBus = new Mock<IMessageBus>();
         }
 
-        [TestMethod]
+        [Fact]
         public void NoMatchingSettings()
         {
             _audioSourceMock.SetupGet(s => s.Settings).Returns(new List<AudioSourceSettingAttribute>());
@@ -37,11 +35,11 @@ public void NoMatchingSettings()
 
             var vm = new AudioSourceSettingsCollectionViewModel(_audioSourceMock.Object, settings, _messageBus.Object);
 
-            Assert.AreEqual(0, vm.SettingsList.Count);
-            Assert.AreEqual(name, vm.AudioSourceName);
+            Assert.Empty(vm.SettingsList);
+            Assert.Equal(name, vm.AudioSourceName);
         }
 
-        [TestMethod]
+        [Fact]
         public void MatchingSettingsShouldCreateVmsInOrder()
         {
             var setting1 = "Setting1";
@@ -69,15 +67,14 @@ public void MatchingSettingsShouldCreateVmsInOrder()
             var settings = new AudioSourceSettings { Settings = settingModels };
             var vm = new AudioSourceSettingsCollectionViewModel(_audioSourceMock.Object, settings, _messageBus.Object);
 
-            Assert.AreEqual(settingModels.Count, vm.SettingsList.Count);
-            Assert.AreEqual(settingModels[0].Name, vm.SettingsList[0].Name);
-            Assert.AreEqual(settingModels[1].Name, vm.SettingsList[1].Name);
-
-            Assert.AreEqual(settingModels[0].Value, vm.SettingsList[0].Value);
-            Assert.AreEqual(settingModels[1].Value, vm.SettingsList[1].Value);
+            Assert.Equal(settingModels.Count, vm.SettingsList.Count);
+            Assert.Equal(settingModels[0].Name, vm.SettingsList[0].Name);
+            Assert.Equal(settingModels[1].Name, vm.SettingsList[1].Name);
+            Assert.Equal(settingModels[0].Value, vm.SettingsList[0].Value);
+            Assert.Equal(settingModels[1].Value, vm.SettingsList[1].Value);
         }
 
-        [TestMethod]
+        [Fact]
         public void AudioSourceSettingUpdateNewValueIsWrittenBackToSettings()
         {
             var setting = "setting";
@@ -96,10 +93,10 @@ public void AudioSourceSettingUpdateNewValueIsWrittenBackToSettings()
             _audioSourceMock.Raise(s => s.SettingChanged += null, new SettingChangedEventArgs(setting));
 
             vm.EndEdit();
-            Assert.AreEqual(newSettingValue, settingModel.Value);
+            Assert.Equal(newSettingValue, settingModel.Value);
         }
        
-        [TestMethod]
+        [Fact]
         public void AudioSourceSettingsCalledInPriority()
         {
             var setting1 = new AudioSourceSettingAttribute("test1") { Priority = 10 };
diff --git a/src/AudioBand.Test/ViewModels/ButtonViewModels.cs b/src/AudioBand.Test/ViewModels/ButtonViewModels.cs
index b168b715..89cf7cbe 100644
--- a/src/AudioBand.Test/ViewModels/ButtonViewModels.cs
+++ b/src/AudioBand.Test/ViewModels/ButtonViewModels.cs
@@ -1,18 +1,16 @@
 using System;
 using System.ComponentModel;
-using System.Drawing;
 using System.Threading.Tasks;
 using AudioBand.AudioSource;
 using AudioBand.Messages;
 using AudioBand.Models;
 using AudioBand.Settings;
 using AudioBand.ViewModels;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
+using Xunit;
 
 namespace AudioBand.Test
 {
-    [TestClass]
     public class ButtonViewModels
     {
         private Mock<IAppSettings> _appSettings;
@@ -20,8 +18,7 @@ public class ButtonViewModels
         private Mock<IAudioSession> _session;
         private Mock<IMessageBus> _messageBus;
 
-        [TestInitialize]
-        public void TestInit()
+        public ButtonViewModels()
         {
             _appSettings = new Mock<IAppSettings>();
             _dialog = new Mock<IDialogService>();
@@ -29,7 +26,7 @@ public void TestInit()
             _messageBus = new Mock<IMessageBus>();
         }
 
-        [TestMethod]
+        [Fact]
         public void NextButtonListensforProfileChanges()
         {
             var first = new NextButton() {Height = 1};
@@ -42,16 +39,16 @@ public void NextButtonListensforProfileChanges()
             bool raised = false;
             vm.PropertyChanged += (_, __) => raised = true;
 
-            Assert.AreEqual(first.Height, vm.Height);
+            Assert.Equal(first.Height, vm.Height);
             _appSettings.Raise(m => m.ProfileChanged += null, EventArgs.Empty);
 
-            Assert.IsFalse(vm.IsEditing);
-            Assert.IsTrue(raised);
-            Assert.AreEqual(second.Height, vm.Height);
+            Assert.False(vm.IsEditing);
+            Assert.True(raised);
+            Assert.Equal(second.Height, vm.Height);
         }
 
 
-        [TestMethod]
+        [Fact]
         public async Task NextButtonCommandCallsNextTrack()
         {
             _appSettings.SetupGet(m => m.NextButton).Returns(new NextButton());
@@ -64,7 +61,7 @@ public async Task NextButtonCommandCallsNextTrack()
             audioSourceMock.Verify(m => m.NextTrackAsync());
         }
 
-        [TestMethod]
+        [Fact]
         public void PlayPauseButtonListensForProfileChanges()
         {
             var first = new PlayPauseButton() {Height = 1};
@@ -77,34 +74,34 @@ public void PlayPauseButtonListensForProfileChanges()
             bool raised = false;
             vm.PropertyChanged += (_, __) => raised = true;
 
-            Assert.AreEqual(first.Height, vm.Height);
+            Assert.Equal(first.Height, vm.Height);
             _appSettings.Raise(m => m.ProfileChanged += null, EventArgs.Empty);
 
-            Assert.IsFalse(vm.IsEditing);
-            Assert.IsTrue(raised);
-            Assert.AreEqual(second.Height, vm.Height);
+            Assert.False(vm.IsEditing);
+            Assert.True(raised);
+            Assert.Equal(second.Height, vm.Height);
         }
 
-        [TestMethod]
+        [Fact]
         public void PlayPauseButtonMarkedAsEditingWhenContentIsEdited()
         {
             _appSettings.SetupGet(m => m.PlayPauseButton).Returns(new PlayPauseButton());
             var viewModel = new PlayPauseButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object, _messageBus.Object);
 
             viewModel.PlayContent.Text = "";
-            Assert.IsTrue(viewModel.PlayContent.IsEditing);
-            Assert.IsTrue(viewModel.IsEditing);
+            Assert.True(viewModel.PlayContent.IsEditing);
+            Assert.True(viewModel.IsEditing);
             
             viewModel.EndEdit();
-            Assert.IsFalse(viewModel.IsEditing);
-            Assert.IsFalse(viewModel.PlayContent.IsEditing);
+            Assert.False(viewModel.IsEditing);
+            Assert.False(viewModel.PlayContent.IsEditing);
 
             viewModel.PauseContent.Text = "";
-            Assert.IsTrue(viewModel.IsEditing);
-            Assert.IsTrue(viewModel.PauseContent.IsEditing);
+            Assert.True(viewModel.IsEditing);
+            Assert.True(viewModel.PauseContent.IsEditing);
         }
 
-        [TestMethod]
+        [Fact]
         public void PlayPauseButtonListensToAudioSource()
         {
             _appSettings.SetupGet(m => m.PlayPauseButton).Returns(new PlayPauseButton());
@@ -112,15 +109,15 @@ public void PlayPauseButtonListensToAudioSource()
             var viewModel = new PlayPauseButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object, _messageBus.Object);
 
             _session.Raise(m => m.PropertyChanged+= null, null, new PropertyChangedEventArgs(nameof(IAudioSession.IsPlaying)));
-            Assert.IsTrue(viewModel.IsPlaying);
-            Assert.IsFalse(viewModel.IsPlayButtonShown);
+            Assert.True(viewModel.IsPlaying);
+            Assert.False(viewModel.IsPlayButtonShown);
 
             _session.Raise(m => m.PropertyChanged += null, null, new PropertyChangedEventArgs(nameof(IAudioSession.IsPlaying)));
-            Assert.IsFalse(viewModel.IsPlaying);
-            Assert.IsTrue(viewModel.IsPlayButtonShown);
+            Assert.False(viewModel.IsPlaying);
+            Assert.True(viewModel.IsPlayButtonShown);
         }
 
-        [TestMethod]
+        [Fact]
         public async Task PlayPauseButtonPlayAndPauseCommandWorks()
         {
             _appSettings.SetupGet(m => m.PlayPauseButton).Returns(new PlayPauseButton());
@@ -128,10 +125,10 @@ public async Task PlayPauseButtonPlayAndPauseCommandWorks()
             var isPlayingSequence = new[] {true, false};
             var index = 0;
             audioSourceMock.Setup(m => m.PlayTrackAsync())
-                .Callback(() => Assert.AreEqual(isPlayingSequence[index++], true))
+                .Callback(() => Assert.True(isPlayingSequence[index++]))
                 .Returns(Task.CompletedTask);
             audioSourceMock.Setup(m => m.PauseTrackAsync())
-                .Callback(() => Assert.AreEqual(isPlayingSequence[index++], false))
+                .Callback(() => Assert.False(isPlayingSequence[index++]))
                 .Returns(Task.CompletedTask);
 
             _session.SetupGet(m => m.CurrentAudioSource).Returns(audioSourceMock.Object);
@@ -144,7 +141,7 @@ public async Task PlayPauseButtonPlayAndPauseCommandWorks()
             await viewModel.PlayPauseTrackCommand.ExecuteAsync(null);
         }
 
-        [TestMethod]
+        [Fact]
         public void PreviousButtonListensForProfileChanges()
         {
             var first = new PreviousButton() { Height = 1 };
@@ -157,15 +154,15 @@ public void PreviousButtonListensForProfileChanges()
             bool raised = false;
             vm.PropertyChanged += (_, __) => raised = true;
 
-            Assert.AreEqual(first.Height, vm.Height);
+            Assert.Equal(first.Height, vm.Height);
             _appSettings.Raise(m => m.ProfileChanged += null, EventArgs.Empty);
 
-            Assert.IsFalse(vm.IsEditing);
-            Assert.IsTrue(raised);
-            Assert.AreEqual(second.Height, vm.Height);
+            Assert.False(vm.IsEditing);
+            Assert.True(raised);
+            Assert.Equal(second.Height, vm.Height);
         }
 
-        [TestMethod]
+        [Fact]
         public async Task PreviousButtonCommandCallsPreviousTrack()
         {
             _appSettings.SetupGet(m => m.PreviousButton).Returns(new PreviousButton());
@@ -178,7 +175,7 @@ public async Task PreviousButtonCommandCallsPreviousTrack()
             audioSourceMock.Verify(m => m.PreviousTrackAsync());
         }
 
-        [TestMethod]
+        [Fact]
         public void RepeatModeButtonListensForProfileChanges()
         {
             var first = new RepeatModeButton() { Height = 1 };
@@ -191,37 +188,37 @@ public void RepeatModeButtonListensForProfileChanges()
             bool raised = false;
             vm.PropertyChanged += (_, __) => raised = true;
 
-            Assert.AreEqual(first.Height, vm.Height);
+            Assert.Equal(first.Height, vm.Height);
             _appSettings.Raise(m => m.ProfileChanged += null, EventArgs.Empty);
 
-            Assert.IsFalse(vm.IsEditing);
-            Assert.IsTrue(raised);
-            Assert.AreEqual(second.Height, vm.Height);
+            Assert.False(vm.IsEditing);
+            Assert.True(raised);
+            Assert.Equal(second.Height, vm.Height);
         }
 
-        [TestMethod]
+        [Fact]
         public void RepeatModeButtonMarkedAsEditingWhenContentIsEditing()
         {
             _appSettings.SetupGet(m => m.RepeatModeButton).Returns(new RepeatModeButton());
             var viewModel = new RepeatModeButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object, _messageBus.Object);
 
-            Assert.IsFalse(viewModel.RepeatTrackContent.IsEditing);
-            Assert.IsFalse(viewModel.IsEditing);
+            Assert.False(viewModel.RepeatTrackContent.IsEditing);
+            Assert.False(viewModel.IsEditing);
 
             viewModel.RepeatTrackContent.Text = "test";
 
-            Assert.IsTrue(viewModel.RepeatTrackContent.IsEditing);
-            Assert.IsTrue(viewModel.IsEditing);
+            Assert.True(viewModel.RepeatTrackContent.IsEditing);
+            Assert.True(viewModel.IsEditing);
         }
 
-        [TestMethod]
+        [Fact]
         public async Task RepeatModeButtonCyclesRepeatMode()
         {
             var repeatSequence = new[] {RepeatMode.RepeatContext, RepeatMode.RepeatTrack, RepeatMode.Off};
             var index = 0;
             var audiosourceMock = new Mock<IInternalAudioSource>();
             audiosourceMock.Setup(m => m.SetRepeatModeAsync(It.IsAny<RepeatMode>()))
-                .Callback((RepeatMode mode) => Assert.AreEqual(repeatSequence[index++], mode))
+                .Callback((RepeatMode mode) => Assert.Equal(repeatSequence[index++], mode))
                 .Returns(Task.CompletedTask);
             _appSettings.SetupGet(m => m.RepeatModeButton).Returns(new RepeatModeButton());
             _session.SetupGet(m => m.CurrentAudioSource).Returns(audiosourceMock.Object);
@@ -233,7 +230,7 @@ public async Task RepeatModeButtonCyclesRepeatMode()
 
             var viewModel = new RepeatModeButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object, _messageBus.Object);
 
-            Assert.AreEqual(RepeatMode.Off, viewModel.RepeatMode);
+            Assert.Equal(RepeatMode.Off, viewModel.RepeatMode);
             await viewModel.CycleRepeatModeCommand.ExecuteAsync(null);
             _session.Raise(m => m.PropertyChanged += null, null, new PropertyChangedEventArgs(nameof(IAudioSession.RepeatMode)));
             await viewModel.CycleRepeatModeCommand.ExecuteAsync(null);
@@ -241,7 +238,7 @@ public async Task RepeatModeButtonCyclesRepeatMode()
             await viewModel.CycleRepeatModeCommand.ExecuteAsync(null);
         }
 
-        [TestMethod]
+        [Fact]
         public void ShuffleModeButtonListensForProfileChanges()
         {
             var first = new ShuffleModeButton() { Height = 1 };
@@ -254,34 +251,34 @@ public void ShuffleModeButtonListensForProfileChanges()
             bool raised = false;
             vm.PropertyChanged += (_, __) => raised = true;
 
-            Assert.AreEqual(first.Height, vm.Height);
+            Assert.Equal(first.Height, vm.Height);
             _appSettings.Raise(m => m.ProfileChanged += null, EventArgs.Empty);
 
-            Assert.IsFalse(vm.IsEditing);
-            Assert.IsTrue(raised);
-            Assert.AreEqual(second.Height, vm.Height);
+            Assert.False(vm.IsEditing);
+            Assert.True(raised);
+            Assert.Equal(second.Height, vm.Height);
         }
 
-        [TestMethod]
+        [Fact]
         public void ShuffleModeButtonMarkedAsEditingWhenContentIsEdited()
         {
             _appSettings.SetupGet(m => m.ShuffleModeButton).Returns(new ShuffleModeButton());
             var vm = new ShuffleModeButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object, _messageBus.Object);
 
             vm.ShuffleOnContent.Text = "A";
-            Assert.IsTrue(vm.ShuffleOnContent.IsEditing);
-            Assert.IsTrue(vm.IsEditing);
+            Assert.True(vm.ShuffleOnContent.IsEditing);
+            Assert.True(vm.IsEditing);
 
             vm.EndEdit();
-            Assert.IsFalse(vm.ShuffleOnContent.IsEditing);
-            Assert.IsFalse(vm.IsEditing);
+            Assert.False(vm.ShuffleOnContent.IsEditing);
+            Assert.False(vm.IsEditing);
 
             vm.ShuffleOffContent.Text = "...";
-            Assert.IsTrue(vm.ShuffleOffContent.IsEditing);
-            Assert.IsTrue(vm.IsEditing);
+            Assert.True(vm.ShuffleOffContent.IsEditing);
+            Assert.True(vm.IsEditing);
         }
 
-        [TestMethod]
+        [Fact]
         public async Task ShuffleModeButtonCommandTogglesShuffle()
         {
             _appSettings.SetupGet(m => m.ShuffleModeButton).Returns(new ShuffleModeButton());
@@ -295,7 +292,7 @@ public async Task ShuffleModeButtonCommandTogglesShuffle()
             var sequence = new[] {true, false};
             var index = 0;
             audioSourceMock.Setup(m => m.SetShuffleAsync(It.IsAny<bool>()))
-                .Callback((bool shuffle) => Assert.AreEqual(sequence[index++], shuffle))
+                .Callback((bool shuffle) => Assert.Equal(sequence[index++], shuffle))
                 .Returns(Task.CompletedTask);
 
             await vm.ToggleShuffleCommand.ExecuteAsync(null);
diff --git a/src/AudioBand.Test/ViewModels/CustomLabelsViewModelTests.cs b/src/AudioBand.Test/ViewModels/CustomLabelsViewModelTests.cs
index ae7b38a6..fa41a620 100644
--- a/src/AudioBand.Test/ViewModels/CustomLabelsViewModelTests.cs
+++ b/src/AudioBand.Test/ViewModels/CustomLabelsViewModelTests.cs
@@ -1,22 +1,18 @@
 using System;
-using System.Text;
 using System.Collections.Generic;
-using System.Runtime.Remoting.Messaging;
-using System.Threading.Tasks;
 using AudioBand.AudioSource;
 using AudioBand.Messages;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 using AudioBand.ViewModels;
 using AudioBand.Models;
 using Moq;
 using AudioBand.Settings;
+using Xunit;
 
 namespace AudioBand.Test
 {
     /// <summary>
     /// Summary description for CustomLabelsViewModel
     /// </summary>
-    [TestClass]
     public class CustomLabelsViewModelTests
     {
         private Mock<IDialogService> _dialogMock;
@@ -26,8 +22,7 @@ public class CustomLabelsViewModelTests
         private CustomLabel _label;
         private CustomLabelsViewModel _viewModel;
 
-        [TestInitialize]
-        public void Init()
+        public CustomLabelsViewModelTests()
         {
             _dialogMock = new Mock<IDialogService>();
             _appSettingsMock = new Mock<IAppSettings>();
@@ -38,15 +33,15 @@ public void Init()
             _viewModel = new CustomLabelsViewModel(_appSettingsMock.Object, _dialogMock.Object, _sessionMock.Object, _messageBus.Object);
         }
 
-        [TestMethod]
+        [Fact]
         public void AddLabel()
         {
             _viewModel.AddLabelCommand.Execute(null);
             
-            Assert.AreEqual(1, _viewModel.CustomLabels.Count);
+            Assert.Single(_viewModel.CustomLabels);
         }
 
-        [TestMethod]
+        [Fact]
         public void RemoveLabel_confirm()
         {
             _dialogMock.Setup(o => o.ShowConfirmationDialog(It.IsAny<ConfirmationDialogType>(), It.IsAny<object>())).Returns(true);
@@ -54,14 +49,14 @@ public void RemoveLabel_confirm()
             var newLabel = _viewModel.CustomLabels[0];
             _viewModel.RemoveLabelCommand.Execute(newLabel);
 
-            Assert.AreEqual(0, _viewModel.CustomLabels.Count);
+            Assert.Empty(_viewModel.CustomLabels);
             _dialogMock.Verify(o => o.ShowConfirmationDialog(
                 It.Is<ConfirmationDialogType>(type => type == ConfirmationDialogType.DeleteLabel),
                 It.Is<object[]>(data => data.Length == 1)), 
                 Times.Once);
         }
 
-        [TestMethod]
+        [Fact]
         public void RemoveLabel_deny()
         {
             _dialogMock.Setup(o => o.ShowConfirmationDialog(It.IsAny<ConfirmationDialogType>(), It.IsAny<object>())).Returns(false);
@@ -69,14 +64,14 @@ public void RemoveLabel_deny()
             var newLabel = _viewModel.CustomLabels[0];
             _viewModel.RemoveLabelCommand.Execute(newLabel);
 
-            Assert.AreEqual(1, _viewModel.CustomLabels.Count);
+            Assert.Single(_viewModel.CustomLabels);
             _dialogMock.Verify(o => o.ShowConfirmationDialog(
                 It.Is<ConfirmationDialogType>(type => type == ConfirmationDialogType.DeleteLabel),
                 It.Is<object[]>(data => data.Length == 1)),
                 Times.Once);
         }
 
-        [TestMethod]
+        [Fact]
         public void AddLabel_ThenCancel()
         {
             _viewModel.BeginEdit();
@@ -84,10 +79,10 @@ public void AddLabel_ThenCancel()
             var newLabel = _viewModel.CustomLabels[0];
             _viewModel.CancelEdit();
 
-            Assert.AreEqual(0, _viewModel.CustomLabels.Count);
+            Assert.Empty(_viewModel.CustomLabels);
         }
 
-        [TestMethod]
+        [Fact]
         public void RemoveLabel_ThenCancel()
         {
             _appSettingsMock.SetupGet(x => x.CustomLabels).Returns(new List<CustomLabel> { new CustomLabel() });
@@ -98,11 +93,11 @@ public void RemoveLabel_ThenCancel()
             _viewModel.RemoveLabelCommand.Execute(label);
             _viewModel.CancelEdit();
 
-            Assert.AreEqual(1, _viewModel.CustomLabels.Count);
-            Assert.AreEqual(label, _viewModel.CustomLabels[0]);
+            Assert.Single(_viewModel.CustomLabels);
+            Assert.Equal(label, _viewModel.CustomLabels[0]);
         }
 
-        [TestMethod]
+        [Fact]
         public void AddRemoveLabel_ThenCancel()
         {
             _viewModel.BeginEdit();
@@ -112,10 +107,10 @@ public void AddRemoveLabel_ThenCancel()
             _viewModel.RemoveLabelCommand.Execute(newLabel);
             _viewModel.CancelEdit();
 
-            Assert.AreEqual(0, _viewModel.CustomLabels.Count);
+            Assert.Empty(_viewModel.CustomLabels);
         }
 
-        [TestMethod, Ignore("Unable to setup sequence")]
+        [Fact(Skip = "Unable to setup sequence")]
         public void ProfileChangeRemovesAllLabelsAndAddsNewOnes()
         {
             var settingsMock = new Mock<IAppSettings>();
@@ -124,13 +119,13 @@ public void ProfileChangeRemovesAllLabelsAndAddsNewOnes()
                 .Returns(new List<CustomLabel> { new CustomLabel { Name = "second" } });
 
             var vm = new CustomLabelsViewModel(settingsMock.Object, new Mock<IDialogService>().Object, _sessionMock.Object, _messageBus.Object);
-            Assert.AreEqual(1, vm.CustomLabels.Count);
-            Assert.AreEqual("test", vm.CustomLabels[0].Name);
+            Assert.Single(vm.CustomLabels);
+            Assert.Equal("test", vm.CustomLabels[0].Name);
             _appSettingsMock.Raise(m => m.ProfileChanged += null, null, EventArgs.Empty);
-            Assert.AreEqual("second", vm.CustomLabels[0].Name);
+            Assert.Equal("second", vm.CustomLabels[0].Name);
         }
 
-        [TestMethod]
+        [Fact]
         public void ProfileChangeViewModelStillHasCurrentTrackData()
         {
             var settingsMock = new Mock<IAppSettings>();
@@ -140,7 +135,7 @@ public void ProfileChangeViewModelStillHasCurrentTrackData()
 
             var vm = new CustomLabelsViewModel(settingsMock.Object, new Mock<IDialogService>().Object, _sessionMock.Object, _messageBus.Object);
             _appSettingsMock.Raise(m => m.ProfileChanged += null, null, EventArgs.Empty);
-            Assert.IsTrue(vm.CustomLabels[0].IsPlaying);
+            Assert.True(vm.CustomLabels[0].IsPlaying);
         }
     }
 }
diff --git a/src/AudioBand.Test/ViewModels/ProgressBarViewModelTests.cs b/src/AudioBand.Test/ViewModels/ProgressBarViewModelTests.cs
index 2caac561..6c326c69 100644
--- a/src/AudioBand.Test/ViewModels/ProgressBarViewModelTests.cs
+++ b/src/AudioBand.Test/ViewModels/ProgressBarViewModelTests.cs
@@ -2,18 +2,17 @@
 using AudioBand.Models;
 using AudioBand.Settings;
 using AudioBand.ViewModels;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using System.Windows.Media;
 using AudioBand.AudioSource;
 using AudioBand.Messages;
+using Xunit;
 
 namespace AudioBand.Test
 {
-    [TestClass]
     public class ProgressBarViewModelTests
     {
-        [TestMethod]
+        [Fact]
         public void ListensForProfileChanges()
         {
             var settingsMock = new Mock<IAppSettings>();
@@ -28,12 +27,12 @@ public void ListensForProfileChanges()
             bool raised = false;
             vm.PropertyChanged += (_, __) => raised = true;
 
-            Assert.AreEqual(first.BackgroundColor, vm.BackgroundColor);
+            Assert.Equal(first.BackgroundColor, vm.BackgroundColor);
             settingsMock.Raise(m => m.ProfileChanged += null, EventArgs.Empty);
 
-            Assert.IsFalse(vm.IsEditing);
-            Assert.IsTrue(raised);
-            Assert.AreEqual(second.BackgroundColor, vm.BackgroundColor);
+            Assert.False(vm.IsEditing);
+            Assert.True(raised);
+            Assert.Equal(second.BackgroundColor, vm.BackgroundColor);
         }
     }
 }
diff --git a/src/AudioBand.Test/ViewModels/SettingsWindowViewModelTests.cs b/src/AudioBand.Test/ViewModels/SettingsWindowViewModelTests.cs
index 5b4537be..6b77c8d2 100644
--- a/src/AudioBand.Test/ViewModels/SettingsWindowViewModelTests.cs
+++ b/src/AudioBand.Test/ViewModels/SettingsWindowViewModelTests.cs
@@ -1,23 +1,16 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.Remoting;
-using System.Text;
-using System.Threading.Tasks;
-using System.Web.ModelBinding;
-using System.Windows.Controls;
-using System.Windows.Forms;
 using AudioBand.AudioSource;
 using AudioBand.Messages;
 using AudioBand.Models;
 using AudioBand.Settings;
 using AudioBand.ViewModels;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
+using Xunit;
 
 namespace AudioBand.Test
 {
-    [TestClass]
     public class SettingsWindowViewModelTests
     {
         private Mock<IAppSettings> _appSettings;
@@ -25,8 +18,7 @@ public class SettingsWindowViewModelTests
         private Mock<IViewModelContainer> _container;
         private Mock<IMessageBus> _messageBus;
 
-        [TestInitialize]
-        public void TestSetup()
+        public SettingsWindowViewModelTests()
         {
             _appSettings = new Mock<IAppSettings>();
             _appSettings.SetupGet(m => m.Profiles).Returns(new List<string>());
@@ -46,7 +38,7 @@ private class TestViewmodel : ViewModelBase
         {
         }
 
-        [TestMethod]
+        [Fact]
         public void HasUnsavedChangesWhenStartEditMessageIsPublished()
         {
             Action<EditStartMessage> handler = null;
@@ -55,22 +47,22 @@ public void HasUnsavedChangesWhenStartEditMessageIsPublished()
 
             var vm = CreateVm();
 
-            Assert.IsFalse(vm.HasUnsavedChanges);
+            Assert.False(vm.HasUnsavedChanges);
             handler(default(EditStartMessage));
-            Assert.IsTrue(vm.HasUnsavedChanges);
+            Assert.True(vm.HasUnsavedChanges);
         }
 
-        [TestMethod]
+        [Fact]
         public void SaveCommandCanExecuteBasedOnUnsavedChanges()
         {
             var vm = CreateVm();
 
-            Assert.IsFalse(vm.SaveCommand.CanExecute(null));
+            Assert.False(vm.SaveCommand.CanExecute(null));
             vm.HasUnsavedChanges = true;
-            Assert.IsTrue(vm.SaveCommand.CanExecute(null));
+            Assert.True(vm.SaveCommand.CanExecute(null));
         }
 
-        [TestMethod]
+        [Fact]
         public void SaveCommandEndsEditsAndSavesSettings()
         {
             var vm = CreateVm();
@@ -81,10 +73,10 @@ public void SaveCommandEndsEditsAndSavesSettings()
 
             _appSettings.Verify(m => m.Save(), Times.Once);
             _messageBus.Verify(m => m.Publish(It.Is<EditEndMessage>(msg => msg == EditEndMessage.Accepted), It.IsAny<string>()));
-            Assert.IsFalse(vm.HasUnsavedChanges);
+            Assert.False(vm.HasUnsavedChanges);
         }
 
-        [TestMethod]
+        [Fact]
         public void CloseCommandShowsDialogIfUnsavedChanges()
         {
             _dialog.Setup(m => m.ShowConfirmationDialog(It.IsAny<ConfirmationDialogType>(), It.IsAny<object[]>()))
@@ -97,7 +89,7 @@ public void CloseCommandShowsDialogIfUnsavedChanges()
             _dialog.Verify(m => m.ShowConfirmationDialog(It.Is<ConfirmationDialogType>(d => d == ConfirmationDialogType.DiscardChanges), It.IsAny<object[]>()));
         }
 
-        [TestMethod]
+        [Fact]
         public void CloseCommandShowsDialogIfUnsavedChanges_DiscardChangesCancelsEditsAndClosesWindow()
         {
             _dialog.Setup(m => m.ShowConfirmationDialog(It.IsAny<ConfirmationDialogType>(), It.IsAny<object[]>()))
@@ -108,11 +100,11 @@ public void CloseCommandShowsDialogIfUnsavedChanges_DiscardChangesCancelsEditsAn
 
             vm.CloseCommand.Execute(null);
             _messageBus.Verify(m => m.Publish(It.Is<SettingsWindowMessage>(msg => msg == SettingsWindowMessage.CloseWindow), It.IsAny<string>()));
-            Assert.IsFalse(vm.HasUnsavedChanges);
+            Assert.False(vm.HasUnsavedChanges);
             _messageBus.Verify(m => m.Publish(It.Is<EditEndMessage>(msg => msg == EditEndMessage.Cancelled), It.IsAny<string>()));
         }
 
-        [TestMethod]
+        [Fact]
         public void CloseCommandShowsDialogIfUnsavedChanges_CancelCloseDoesNotCloseWindow()
         {
             _dialog.Setup(m => m.ShowConfirmationDialog(It.IsAny<ConfirmationDialogType>(), It.IsAny<object[]>()))
@@ -125,16 +117,16 @@ public void CloseCommandShowsDialogIfUnsavedChanges_CancelCloseDoesNotCloseWindo
             _messageBus.Verify(m => m.Publish(It.Is<SettingsWindowMessage>(msg => msg == SettingsWindowMessage.CloseWindow), It.IsAny<string>()), Times.Never);
         }
 
-        [TestMethod]
+        [Fact]
         public void DisableDeleteProfileCommandWhenOnlyOneProfile()
         {
             _appSettings.SetupGet(m => m.Profiles).Returns(new List<string>{"profile 1"});
             var vm = CreateVm();
 
-            Assert.IsFalse(vm.DeleteProfileCommand.CanExecute(null));
+            Assert.False(vm.DeleteProfileCommand.CanExecute(null));
         }
 
-        [TestMethod]
+        [Fact]
         public void ProfilesCollectionMatchesSettings()
         {
             string profile1 = "profile 1";
@@ -142,25 +134,25 @@ public void ProfilesCollectionMatchesSettings()
             _appSettings.SetupGet(m => m.Profiles).Returns(new List<string> {profile1, profile2});
             var vm = CreateVm();
 
-            Assert.AreEqual(2, vm.Profiles.Count);
-            Assert.AreEqual(profile1, vm.Profiles[0]);
-            Assert.AreEqual(profile2, vm.Profiles[1]);
+            Assert.Equal(2, vm.Profiles.Count);
+            Assert.Equal(profile1, vm.Profiles[0]);
+            Assert.Equal(profile2, vm.Profiles[1]);
         }
 
-        [TestMethod]
+        [Fact]
         public void CreateProfileAddsProfileToSettingsAndViewModel()
         {
             _appSettings.Setup(m => m.CreateProfile(It.IsAny<string>()));
             var vm = CreateVm();
 
-            Assert.AreEqual(0, vm.Profiles.Count);
+            Assert.Empty(vm.Profiles);
             vm.AddProfileCommand.Execute(null);
 
-            Assert.AreEqual(1, vm.Profiles.Count);
+            Assert.Single(vm.Profiles);
             _appSettings.Verify(m => m.CreateProfile(It.IsAny<string>()), Times.Once);
         }
 
-        [TestMethod]
+        [Fact]
         public void SelectedProfileCommandUpdatesSettings()
         {
             string profile1 = "profile 1";
@@ -173,7 +165,7 @@ public void SelectedProfileCommandUpdatesSettings()
             _appSettings.VerifySet(m => m.CurrentProfile = It.Is<string>(x => x == profile2));
         }
 
-        [TestMethod]
+        [Fact]
         public void DeleteProfileConfirmationCancelDoesNotDelete()
         {
             string profile1 = "profile 1";
@@ -187,14 +179,14 @@ public void DeleteProfileConfirmationCancelDoesNotDelete()
             vm.SelectedProfileName = profile2;
             vm.DeleteProfileCommand.Execute(profile2);
 
-            Assert.AreEqual(2, vm.Profiles.Count);
-            Assert.AreEqual(profile2, vm.SelectedProfileName);
+            Assert.Equal(2, vm.Profiles.Count);
+            Assert.Equal(profile2, vm.SelectedProfileName);
             _dialog.Verify(m => m.ShowConfirmationDialog(It.Is<ConfirmationDialogType>(c => c == ConfirmationDialogType.DeleteProfile),
                 It.Is<object[]>(data => (string)data[0] == profile2)));
             _appSettings.Verify(m => m.DeleteProfile(It.IsAny<string>()), Times.Never);
         }
 
-        [TestMethod]
+        [Fact]
         public void DeleteProfileSelectsNewItem()
         {
             string profile1 = "profile 1";
@@ -208,11 +200,11 @@ public void DeleteProfileSelectsNewItem()
             vm.SelectedProfileName = profile2;
             vm.DeleteProfileCommand.Execute(profile2);
 
-            Assert.AreEqual(profile1, vm.SelectedProfileName);
+            Assert.Equal(profile1, vm.SelectedProfileName);
             _appSettings.Verify(m => m.DeleteProfile(It.Is<string>(x => x == profile2)), Times.Once);
         }
 
-        [TestMethod]
+        [Fact]
         public void SelectProfileEndsEdits()
         {
             string profile1 = "profile 1";
@@ -226,10 +218,10 @@ public void SelectProfileEndsEdits()
 
             vm.SelectedProfileName = profile2;
 
-            Assert.IsFalse(vm.IsEditing);
+            Assert.False(vm.IsEditing);
         }
 
-        [TestMethod]
+        [Fact]
         public void RenameProfileDialogAccepted()
         {
             string profile1 = "profile1";
@@ -245,12 +237,12 @@ public void RenameProfileDialogAccepted()
 
             _dialog.Verify(m => m.ShowRenameDialog(It.Is<string>(s => s == profile1), It.Is<IEnumerable<string>>(e => e.Contains(profile1))));
             _appSettings.Verify(m => m.RenameCurrentProfile(It.Is<string>(s => s == profile2)), Times.Once);
-            Assert.AreEqual(profile2, vm.SelectedProfileName);
-            Assert.AreEqual(profile2, vm.Profiles[0]);
-            Assert.AreEqual(1, vm.Profiles.Count);
+            Assert.Equal(profile2, vm.SelectedProfileName);
+            Assert.Equal(profile2, vm.Profiles[0]);
+            Assert.Single(vm.Profiles);
         }
 
-        [TestMethod]
+        [Fact]
         public void RenameProfileDialogCanceled()
         {
             string profile1 = "profile1";
@@ -262,11 +254,11 @@ public void RenameProfileDialogCanceled()
             vm.SelectedProfileName = profile1;
 
             _appSettings.Verify(m => m.RenameCurrentProfile(It.IsAny<string>()), Times.Never);
-            Assert.AreEqual(profile1, vm.SelectedProfileName);
-            Assert.AreEqual(profile1, vm.Profiles[0]);
+            Assert.Equal(profile1, vm.SelectedProfileName);
+            Assert.Equal(profile1, vm.Profiles[0]);
         }
 
-        [TestMethod]
+        [Fact]
         public void RenameProfileSameProfileIgnored()
         {
             string profile1 = "profile1";
@@ -278,8 +270,8 @@ public void RenameProfileSameProfileIgnored()
             vm.SelectedProfileName = profile1;
 
             _appSettings.Verify(m => m.RenameCurrentProfile(It.IsAny<string>()), Times.Never);
-            Assert.AreEqual(profile1, vm.SelectedProfileName);
-            Assert.AreEqual(profile1, vm.Profiles[0]);
+            Assert.Equal(profile1, vm.SelectedProfileName);
+            Assert.Equal(profile1, vm.Profiles[0]);
         }
     }
 }
diff --git a/src/AudioBand.Test/ViewModels/ViewModelBaseTests.cs b/src/AudioBand.Test/ViewModels/ViewModelBaseTests.cs
index 756b4d9b..83323518 100644
--- a/src/AudioBand.Test/ViewModels/ViewModelBaseTests.cs
+++ b/src/AudioBand.Test/ViewModels/ViewModelBaseTests.cs
@@ -1,12 +1,11 @@
 using AudioBand.ViewModels;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Xunit;
 
 namespace AudioBand.Test
 {
-    [TestClass]
     public class ViewModelBaseTests
     {
-        [TestMethod]
+        [Fact]
         public void SetPropertyWithChangedFieldCallsPropertyChanged()
         {
             string propertyName = null;
@@ -14,11 +13,11 @@ public void SetPropertyWithChangedFieldCallsPropertyChanged()
             vm.PropertyChanged += (o, e) => { propertyName = e.PropertyName; };
             vm.Field = 10;
 
-            Assert.AreEqual(nameof(ViewModel.Field), propertyName);
-            Assert.AreEqual(10, vm.Field);
+            Assert.Equal(nameof(ViewModel.Field), propertyName);
+            Assert.Equal(10, vm.Field);
         }
 
-        [TestMethod]
+        [Fact]
         public void SetPropertySameField()
         {
             int called = 0;
@@ -27,54 +26,54 @@ public void SetPropertySameField()
             vm.PropertyChanged += (o, e) => { propertyName = e.PropertyName; called++; };
             vm.Field = 0;
 
-            Assert.AreEqual(0, called);
-            Assert.AreEqual(null, propertyName);
-            Assert.AreEqual(0, vm.Field);
+            Assert.Equal(0, called);
+            Assert.Null(propertyName);
+            Assert.Equal(0, vm.Field);
         }
 
-        [TestMethod]
+        [Fact]
         public void SetPropertyWithTrackedStateAttributeAutomaticallyStartsEdit()
         {
             var vm = new ViewModel();
             vm.Field = 0;
 
-            Assert.IsFalse(vm.IsEditing);
+            Assert.False(vm.IsEditing);
             vm.Field = 1;
-            Assert.IsTrue(vm.IsEditing);
+            Assert.True(vm.IsEditing);
         }
 
-        [TestMethod]
+        [Fact]
         public void SetPropertyWithoutTrackedStateAttributeDoesNotStartEdit()
         {
             var vm = new ViewModel();
             vm.FieldNotTracked = 0;
 
-            Assert.IsFalse(vm.IsEditing);
+            Assert.False(vm.IsEditing);
             vm.FieldNotTracked = 1;
-            Assert.IsFalse(vm.IsEditing);
+            Assert.False(vm.IsEditing);
         }
 
-        [TestMethod]
+        [Fact]
         public void SetPropertyWithModelAutomaticallyStartsEdit()
         {
             var vm = new ViewModelWithModel();
             vm.Field = 0;
 
-            Assert.IsFalse(vm.IsEditing);
+            Assert.False(vm.IsEditing);
             vm.Field = 1;
-            Assert.IsTrue(vm.IsEditing);
+            Assert.True(vm.IsEditing);
         }
 
-        [TestMethod]
+        [Fact]
         public void ResetViewModelWithModelStartsEdit()
         {
             var vm = new ViewModelWithModel();
             vm.Reset();
             
-            Assert.IsTrue(vm.IsEditing);
+            Assert.True(vm.IsEditing);
         }
 
-        [TestMethod]
+        [Fact]
         public void ViewModelWithModelUnbindModelProperly()
         {
             var m = new Model();
@@ -89,7 +88,7 @@ public void ViewModelWithModelUnbindModelProperly()
                 }
             };
 
-            Assert.IsFalse(raised);
+            Assert.False(raised);
         }
 
         private class ViewModel : ViewModelBase

From 9fe4c958fd98e9edec63faaaf539c0d058ebcef6 Mon Sep 17 00:00:00 2001
From: Brandon Chong <brndnchong@gmail.com>
Date: Mon, 24 Jun 2019 14:14:46 -0700
Subject: [PATCH 15/17] Update test method naming

---
 .../Settings/SettingsMigrationTests.cs        |  2 +-
 .../TextFormatting/CustomTextParsingTests.cs  | 53 ++++++++++++-------
 .../ViewModels/AlbumArtPopupViewModelTests.cs |  2 +-
 .../ViewModels/AlbumArtViewModelTests.cs      |  2 +-
 .../ViewModels/AudioBandViewModelTests.cs     |  2 +-
 .../AudioSourceSettingsCollectionTests.cs     |  8 +--
 .../ViewModels/ButtonViewModels.cs            | 28 +++++-----
 .../ViewModels/CustomLabelsViewModelTests.cs  | 16 +++---
 .../ViewModels/ProgressBarViewModelTests.cs   |  2 +-
 .../SettingsWindowViewModelTests.cs           | 32 +++++------
 .../ViewModels/ViewModelBaseTests.cs          | 30 +++--------
 11 files changed, 87 insertions(+), 90 deletions(-)

diff --git a/src/AudioBand.Test/Settings/SettingsMigrationTests.cs b/src/AudioBand.Test/Settings/SettingsMigrationTests.cs
index 2c676617..9c28c433 100644
--- a/src/AudioBand.Test/Settings/SettingsMigrationTests.cs
+++ b/src/AudioBand.Test/Settings/SettingsMigrationTests.cs
@@ -281,7 +281,7 @@ public void MigrateV1ToV2_CustomText()
         }
 
         [Fact]
-        public void MigrateV2ToV3()
+        public void MigrateV2ToV3_MigratesSuccessfully()
         {
             string settingsFile = @"Version = ""2""
 AudioSource = ""Spotify""
diff --git a/src/AudioBand.Test/TextFormatting/CustomTextParsingTests.cs b/src/AudioBand.Test/TextFormatting/CustomTextParsingTests.cs
index 884ca61e..be90a96d 100644
--- a/src/AudioBand.Test/TextFormatting/CustomTextParsingTests.cs
+++ b/src/AudioBand.Test/TextFormatting/CustomTextParsingTests.cs
@@ -12,7 +12,7 @@ namespace AudioBand.Test
     public class CustomTextParsingTests
     {
         [Fact]
-        public void ParseNormal()
+        public void Parse_NormalTextFormat()
         {
             var format = "hello";
             var segments = FormattedTextParser.ParseFormattedString(format, Colors.Black, new Mock<IAudioSession>().Object).ToList();
@@ -23,7 +23,7 @@ public void ParseNormal()
         }
 
         [Fact]
-        public void ParseEmpty()
+        public void Parse_EmptyTextFormat_CreatesNoSegments()
         {
             var format = "";
             var segments = FormattedTextParser.ParseFormattedString(format, Colors.Black, new Mock<IAudioSession>().Object).ToList();
@@ -32,7 +32,7 @@ public void ParseEmpty()
         }
 
         [Fact]
-        public void ParseSinglePlaceholder()
+        public void Parse_SinglePlaceholder_CreatesPlaceholderSegment()
         {
             var format = "{artist}";
             var artist = "123";
@@ -45,7 +45,7 @@ public void ParseSinglePlaceholder()
         }
 
         [Fact]
-        public void ParsePlaceholderWithNormal()
+        public void Parse_PlaceholderTextWithNormal_CreatesPlaceholderAndNormalSegments()
         {
             var format = "{artist} song";
             var artist = "123";
@@ -61,7 +61,7 @@ public void ParsePlaceholderWithNormal()
         }
 
         [Fact]
-        public void ParseSingleNormalWithPlaceholder()
+        public void Parse_NormalWithPlaceholder_CreatesNormalAndPlaceholderSegments()
         {
             var format = "by {artist}";
             var artist = "123";
@@ -78,7 +78,7 @@ public void ParseSingleNormalWithPlaceholder()
         }
 
         [Fact]
-        public void ParseUnclosed()
+        public void Parse_FormatContainsPlaceholderWithUnclosedBrace_CreatesNormalSegment()
         {
             var format = "{artist";
             var segments = FormattedTextParser.ParseFormattedString(format, Colors.Black, new Mock<IAudioSession>().Object).ToList();
@@ -89,7 +89,7 @@ public void ParseUnclosed()
         }
 
         [Fact]
-        public void ParseOnlyClosing()
+        public void Parse_FormatOnlyClosingBrace_CreatesNormalSegment()
         {
             var format = "}";
             var segments = FormattedTextParser.ParseFormattedString(format, Colors.Black, new Mock<IAudioSession>().Object).ToList();
@@ -100,7 +100,7 @@ public void ParseOnlyClosing()
         }
 
         [Fact]
-        public void ParseComplex()
+        public void Parse_ComplexFormat_CreatesProperSegments()
         {
             var format = "this is {artist} and ";
             var artist = "123";
@@ -121,7 +121,7 @@ public void ParseComplex()
         }
 
         [Fact]
-        public void ParseInvalidFormat()
+        public void Parse_InvalidPlaceholder_CreatesSegmentWithInvalidValue()
         {
             var format = "{something}";
             var segments = FormattedTextParser.ParseFormattedString(format, Colors.Black, new Mock<IAudioSession>().Object).ToList();
@@ -133,7 +133,7 @@ public void ParseInvalidFormat()
         }
 
         [Fact]
-        public void ParseArtist()
+        public void Parse_ArtistPlaceholder_SubstitutesText()
         {
             var format = "{artist}";
             var artist = "123";
@@ -150,7 +150,7 @@ public void ParseArtist()
         }
 
         [Fact]
-        public void ParseSong()
+        public void Parse_SongPlaceholder_SubstitutesText()
         {
             var format = "{song}";
             var song = "the song";
@@ -163,7 +163,7 @@ public void ParseSong()
         }
 
         [Fact]
-        public void ParseAlbum()
+        public void Parse_AlbumPlaceholder_SubstitutesText()
         {
             var format = "{album}";
             var album = "the album";
@@ -176,7 +176,7 @@ public void ParseAlbum()
         }
 
         [Fact]
-        public void ParseTime()
+        public void Parse_TimePlaceholder_SubstitutesText()
         {
             var format = "{time}";
             var time = TimeSpan.FromSeconds(40);
@@ -189,7 +189,22 @@ public void ParseTime()
         }
 
         [Fact]
-        public void ParseLength()
+        public void Parse_RemainingTimePlaceholder_SubstitutesText()
+        {
+            var format = "{remaining}";
+            var time = TimeSpan.FromSeconds(40);
+            var length = TimeSpan.FromSeconds(60);
+            var mock = new Mock<IAudioSession>();
+            mock.SetupGet(m => m.SongProgress).Returns(time);
+            mock.SetupGet(m => m.SongLength).Returns(length);
+            var segments = FormattedTextParser.ParseFormattedString(format, Colors.Black, mock.Object).ToList();
+
+            Assert.Single(segments);
+            Assert.Equal("0:20", segments[0].Text);
+        }
+
+        [Fact]
+        public void Parse_LengthPlaceholder_SubstitutesText()
         {
             var format = "{length}";
             var time = TimeSpan.FromSeconds(80);
@@ -202,7 +217,7 @@ public void ParseLength()
         }
 
         [Fact]
-        public void ParseStyleBold()
+        public void Parse_StyleBold_SegmentContainsBoldFlag()
         {
             var format = "{*artist}";
             var mock = new Mock<IAudioSession>();
@@ -213,7 +228,7 @@ public void ParseStyleBold()
         }
 
         [Fact]
-        public void ParseStyleItalic()
+        public void Parse_StyleItalic_SegmentContainsItalicFlag()
         {
             var format = "{&artist}";
             var segments = FormattedTextParser
@@ -224,7 +239,7 @@ public void ParseStyleItalic()
         }
 
         [Fact]
-        public void ParseStyleUnderline()
+        public void Parse_StyleUnderline_SegmentContainsUnderlineFlag()
         {
             var format = "{_artist}";
             var segments = FormattedTextParser
@@ -235,7 +250,7 @@ public void ParseStyleUnderline()
         }
 
         [Fact]
-        public void ParseStyleWithColor()
+        public void Parse_StyleWithColor_SegmentContainsColorAndStyle()
         {
             var format = "{_artist:#ff00ff}";
             var segments = FormattedTextParser
@@ -247,7 +262,7 @@ public void ParseStyleWithColor()
         }
 
         [Fact]
-        public void ParseMultipleStyles()
+        public void Parse_MultipleStyles_SegmentContainsMatchingStyleFlags()
         {
             var format = "{*_artist}";
             var segments = FormattedTextParser
diff --git a/src/AudioBand.Test/ViewModels/AlbumArtPopupViewModelTests.cs b/src/AudioBand.Test/ViewModels/AlbumArtPopupViewModelTests.cs
index cb572109..a4064cdd 100644
--- a/src/AudioBand.Test/ViewModels/AlbumArtPopupViewModelTests.cs
+++ b/src/AudioBand.Test/ViewModels/AlbumArtPopupViewModelTests.cs
@@ -20,7 +20,7 @@ public AlbumArtPopupViewModelTests()
         }
 
         [Fact]
-        public void ListensForProfileChangesAndMapsProperly()
+        public void AlbumArtPopupViewModel_ProfileChangedEvent_ListensToProfileChanges()
         {
             var first = new AlbumArtPopup() {Height = 10};
             var second = new AlbumArtPopup() {Height = 20};
diff --git a/src/AudioBand.Test/ViewModels/AlbumArtViewModelTests.cs b/src/AudioBand.Test/ViewModels/AlbumArtViewModelTests.cs
index c9c2edc7..b26e3ca9 100644
--- a/src/AudioBand.Test/ViewModels/AlbumArtViewModelTests.cs
+++ b/src/AudioBand.Test/ViewModels/AlbumArtViewModelTests.cs
@@ -24,7 +24,7 @@ public AlbumArtViewModelTests()
         }
 
         [Fact]
-        public void ListensToProfileChanges()
+        public void AlbumArtViewModel_ProfileChangedEvent_ListensToProfileChanges()
         {
             var first = new AlbumArt() {Height = 10};
             var second = new AlbumArt() {Height = 20};
diff --git a/src/AudioBand.Test/ViewModels/AudioBandViewModelTests.cs b/src/AudioBand.Test/ViewModels/AudioBandViewModelTests.cs
index 182b8e45..13cd94f4 100644
--- a/src/AudioBand.Test/ViewModels/AudioBandViewModelTests.cs
+++ b/src/AudioBand.Test/ViewModels/AudioBandViewModelTests.cs
@@ -19,7 +19,7 @@ public AudioBandViewModelTests()
         }
 
         [Fact]
-        public void AudioBandViewModelListensToProfileChanges()
+        public void AudioBandViewModel_ProfileChangedEvent_ListensToProfileChanges()
         {
             var first = new Models.AudioBand(){Height = 10};
             var second = new Models.AudioBand(){Height = 20};
diff --git a/src/AudioBand.Test/ViewModels/AudioSourceSettingsCollectionTests.cs b/src/AudioBand.Test/ViewModels/AudioSourceSettingsCollectionTests.cs
index e4db2e57..03e69864 100644
--- a/src/AudioBand.Test/ViewModels/AudioSourceSettingsCollectionTests.cs
+++ b/src/AudioBand.Test/ViewModels/AudioSourceSettingsCollectionTests.cs
@@ -20,7 +20,7 @@ public AudioSourceSettingsCollectionTests()
         }
 
         [Fact]
-        public void NoMatchingSettings()
+        public void NoMatchingSettings_CreatesNoChildViewModels()
         {
             _audioSourceMock.SetupGet(s => s.Settings).Returns(new List<AudioSourceSettingAttribute>());
             var name = "test";
@@ -40,7 +40,7 @@ public void NoMatchingSettings()
         }
 
         [Fact]
-        public void MatchingSettingsShouldCreateVmsInOrder()
+        public void MatchingSettings_ShouldCreateChildViewModelsInOrder()
         {
             var setting1 = "Setting1";
             var setting2 = "setting2";
@@ -75,7 +75,7 @@ public void MatchingSettingsShouldCreateVmsInOrder()
         }
 
         [Fact]
-        public void AudioSourceSettingUpdateNewValueIsWrittenBackToSettings()
+        public void AudioSourceSettingUpdate_NewValueIsWrittenBackToSettings()
         {
             var setting = "setting";
 
@@ -97,7 +97,7 @@ public void AudioSourceSettingUpdateNewValueIsWrittenBackToSettings()
         }
        
         [Fact]
-        public void AudioSourceSettingsCalledInPriority()
+        public void AudioSourceSettingsUpdated_AudioSourceIsUpdatedInPriority()
         {
             var setting1 = new AudioSourceSettingAttribute("test1") { Priority = 10 };
             var setting2 = new AudioSourceSettingAttribute("test2") { Priority = 5 };
diff --git a/src/AudioBand.Test/ViewModels/ButtonViewModels.cs b/src/AudioBand.Test/ViewModels/ButtonViewModels.cs
index 89cf7cbe..177e7144 100644
--- a/src/AudioBand.Test/ViewModels/ButtonViewModels.cs
+++ b/src/AudioBand.Test/ViewModels/ButtonViewModels.cs
@@ -27,7 +27,7 @@ public ButtonViewModels()
         }
 
         [Fact]
-        public void NextButtonListensforProfileChanges()
+        public void NextButton_ProfilesChanged_ListensforProfileChanges()
         {
             var first = new NextButton() {Height = 1};
             var second = new NextButton() {Height = 2};
@@ -49,7 +49,7 @@ public void NextButtonListensforProfileChanges()
 
 
         [Fact]
-        public async Task NextButtonCommandCallsNextTrack()
+        public async Task NextButton_NextCommandExecuted_CallsNextTrack()
         {
             _appSettings.SetupGet(m => m.NextButton).Returns(new NextButton());
             var audioSourceMock = new Mock<IInternalAudioSource>();
@@ -62,7 +62,7 @@ public async Task NextButtonCommandCallsNextTrack()
         }
 
         [Fact]
-        public void PlayPauseButtonListensForProfileChanges()
+        public void PlayPauseButton_ProfileChanged_ListensForProfileChanges()
         {
             var first = new PlayPauseButton() {Height = 1};
             var second = new PlayPauseButton() {Height = 2};
@@ -83,7 +83,7 @@ public void PlayPauseButtonListensForProfileChanges()
         }
 
         [Fact]
-        public void PlayPauseButtonMarkedAsEditingWhenContentIsEdited()
+        public void PlayPauseButton_PropertiesInContentAreChanged_ViewModelIsMarkedAsEditing()
         {
             _appSettings.SetupGet(m => m.PlayPauseButton).Returns(new PlayPauseButton());
             var viewModel = new PlayPauseButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object, _messageBus.Object);
@@ -102,7 +102,7 @@ public void PlayPauseButtonMarkedAsEditingWhenContentIsEdited()
         }
 
         [Fact]
-        public void PlayPauseButtonListensToAudioSource()
+        public void PlayPauseButton_AudioSessionPlayStateChanged_ListensToEvent()
         {
             _appSettings.SetupGet(m => m.PlayPauseButton).Returns(new PlayPauseButton());
             _session.SetupSequence(m => m.IsPlaying).Returns(true).Returns(false);
@@ -118,7 +118,7 @@ public void PlayPauseButtonListensToAudioSource()
         }
 
         [Fact]
-        public async Task PlayPauseButtonPlayAndPauseCommandWorks()
+        public async Task PlayPauseButton_PlayAndPauseCommandExecuted_AudioSourceIsNotified()
         {
             _appSettings.SetupGet(m => m.PlayPauseButton).Returns(new PlayPauseButton());
             var audioSourceMock = new Mock<IInternalAudioSource>();
@@ -142,7 +142,7 @@ public async Task PlayPauseButtonPlayAndPauseCommandWorks()
         }
 
         [Fact]
-        public void PreviousButtonListensForProfileChanges()
+        public void PreviousButton_ProfileChanged_ListensForProfileChanges()
         {
             var first = new PreviousButton() { Height = 1 };
             var second = new PreviousButton() { Height = 2 };
@@ -163,7 +163,7 @@ public void PreviousButtonListensForProfileChanges()
         }
 
         [Fact]
-        public async Task PreviousButtonCommandCallsPreviousTrack()
+        public async Task PreviousButton_PreviousCommand_CallsPreviousTrackOnAudioSource()
         {
             _appSettings.SetupGet(m => m.PreviousButton).Returns(new PreviousButton());
             var audioSourceMock = new Mock<IInternalAudioSource>();
@@ -176,7 +176,7 @@ public async Task PreviousButtonCommandCallsPreviousTrack()
         }
 
         [Fact]
-        public void RepeatModeButtonListensForProfileChanges()
+        public void RepeatModeButton_ProfileChanged_ListensForProfileChanges()
         {
             var first = new RepeatModeButton() { Height = 1 };
             var second = new RepeatModeButton() { Height = 2 };
@@ -197,7 +197,7 @@ public void RepeatModeButtonListensForProfileChanges()
         }
 
         [Fact]
-        public void RepeatModeButtonMarkedAsEditingWhenContentIsEditing()
+        public void RepeatModeButton_ContentPropertiesAreModified_ViewModelIsMarkedAsEditing()
         {
             _appSettings.SetupGet(m => m.RepeatModeButton).Returns(new RepeatModeButton());
             var viewModel = new RepeatModeButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object, _messageBus.Object);
@@ -212,7 +212,7 @@ public void RepeatModeButtonMarkedAsEditingWhenContentIsEditing()
         }
 
         [Fact]
-        public async Task RepeatModeButtonCyclesRepeatMode()
+        public async Task RepeatModeButton_RepeatCommandExecuted_CyclesThroughRepeatModes()
         {
             var repeatSequence = new[] {RepeatMode.RepeatContext, RepeatMode.RepeatTrack, RepeatMode.Off};
             var index = 0;
@@ -239,7 +239,7 @@ public async Task RepeatModeButtonCyclesRepeatMode()
         }
 
         [Fact]
-        public void ShuffleModeButtonListensForProfileChanges()
+        public void ShuffleModeButton_ProfileChanged_ListensForProfileChanges()
         {
             var first = new ShuffleModeButton() { Height = 1 };
             var second = new ShuffleModeButton() { Height = 2 };
@@ -260,7 +260,7 @@ public void ShuffleModeButtonListensForProfileChanges()
         }
 
         [Fact]
-        public void ShuffleModeButtonMarkedAsEditingWhenContentIsEdited()
+        public void ShuffleModeButton_ContentIsEdited_ViewModelIsMarkedAsEditing()
         {
             _appSettings.SetupGet(m => m.ShuffleModeButton).Returns(new ShuffleModeButton());
             var vm = new ShuffleModeButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object, _messageBus.Object);
@@ -279,7 +279,7 @@ public void ShuffleModeButtonMarkedAsEditingWhenContentIsEdited()
         }
 
         [Fact]
-        public async Task ShuffleModeButtonCommandTogglesShuffle()
+        public async Task ShuffleModeButton_ShuffleCommandExecuted_TogglesShuffle()
         {
             _appSettings.SetupGet(m => m.ShuffleModeButton).Returns(new ShuffleModeButton());
             var vm = new ShuffleModeButtonViewModel(_appSettings.Object, _dialog.Object, _session.Object, _messageBus.Object);
diff --git a/src/AudioBand.Test/ViewModels/CustomLabelsViewModelTests.cs b/src/AudioBand.Test/ViewModels/CustomLabelsViewModelTests.cs
index fa41a620..2dafa58d 100644
--- a/src/AudioBand.Test/ViewModels/CustomLabelsViewModelTests.cs
+++ b/src/AudioBand.Test/ViewModels/CustomLabelsViewModelTests.cs
@@ -34,7 +34,7 @@ public CustomLabelsViewModelTests()
         }
 
         [Fact]
-        public void AddLabel()
+        public void AddLabel_CreatesNewViewModel()
         {
             _viewModel.AddLabelCommand.Execute(null);
             
@@ -42,7 +42,7 @@ public void AddLabel()
         }
 
         [Fact]
-        public void RemoveLabel_confirm()
+        public void RemoveLabel_DialogShownAndConfirmed_RemovesCorrectLabel()
         {
             _dialogMock.Setup(o => o.ShowConfirmationDialog(It.IsAny<ConfirmationDialogType>(), It.IsAny<object>())).Returns(true);
             _viewModel.AddLabelCommand.Execute(null);
@@ -57,7 +57,7 @@ public void RemoveLabel_confirm()
         }
 
         [Fact]
-        public void RemoveLabel_deny()
+        public void RemoveLabel_DialogShownAndCanceled_DoesNotRemoveLabel()
         {
             _dialogMock.Setup(o => o.ShowConfirmationDialog(It.IsAny<ConfirmationDialogType>(), It.IsAny<object>())).Returns(false);
             _viewModel.AddLabelCommand.Execute(null);
@@ -72,7 +72,7 @@ public void RemoveLabel_deny()
         }
 
         [Fact]
-        public void AddLabel_ThenCancel()
+        public void AddLabel_CancelMessageIsPublished_NewLabelIsRemoved()
         {
             _viewModel.BeginEdit();
             _viewModel.AddLabelCommand.Execute(null);
@@ -83,7 +83,7 @@ public void AddLabel_ThenCancel()
         }
 
         [Fact]
-        public void RemoveLabel_ThenCancel()
+        public void RemoveLabel_CancelMessageIsPublished_DeletedLabelIsAddedBack()
         {
             _appSettingsMock.SetupGet(x => x.CustomLabels).Returns(new List<CustomLabel> { new CustomLabel() });
             _dialogMock.Setup(o => o.ShowConfirmationDialog(It.IsAny<ConfirmationDialogType>(), It.IsAny<object>())).Returns(true);
@@ -98,7 +98,7 @@ public void RemoveLabel_ThenCancel()
         }
 
         [Fact]
-        public void AddRemoveLabel_ThenCancel()
+        public void AddRemoveLabel_CancelMessageIsPublished_NoChanges()
         {
             _viewModel.BeginEdit();
             _dialogMock.Setup(o => o.ShowConfirmationDialog(It.IsAny<ConfirmationDialogType>())).Returns(true);
@@ -111,7 +111,7 @@ public void AddRemoveLabel_ThenCancel()
         }
 
         [Fact(Skip = "Unable to setup sequence")]
-        public void ProfileChangeRemovesAllLabelsAndAddsNewOnes()
+        public void ProfileChanged_RemovesAllLabelsAndAddsNewOnes()
         {
             var settingsMock = new Mock<IAppSettings>();
             settingsMock.SetupSequence(m => m.CustomLabels)
@@ -126,7 +126,7 @@ public void ProfileChangeRemovesAllLabelsAndAddsNewOnes()
         }
 
         [Fact]
-        public void ProfileChangeViewModelStillHasCurrentTrackData()
+        public void ProfileChanged_NewLabelsHaveCorrectAudioSessionData()
         {
             var settingsMock = new Mock<IAppSettings>();
             settingsMock.SetupSequence(m => m.CustomLabels)
diff --git a/src/AudioBand.Test/ViewModels/ProgressBarViewModelTests.cs b/src/AudioBand.Test/ViewModels/ProgressBarViewModelTests.cs
index 6c326c69..c0daeb37 100644
--- a/src/AudioBand.Test/ViewModels/ProgressBarViewModelTests.cs
+++ b/src/AudioBand.Test/ViewModels/ProgressBarViewModelTests.cs
@@ -13,7 +13,7 @@ namespace AudioBand.Test
     public class ProgressBarViewModelTests
     {
         [Fact]
-        public void ListensForProfileChanges()
+        public void ProgressBarViewModel_ProfileChanged_ListensForProfileChanges()
         {
             var settingsMock = new Mock<IAppSettings>();
 
diff --git a/src/AudioBand.Test/ViewModels/SettingsWindowViewModelTests.cs b/src/AudioBand.Test/ViewModels/SettingsWindowViewModelTests.cs
index 6b77c8d2..966ab661 100644
--- a/src/AudioBand.Test/ViewModels/SettingsWindowViewModelTests.cs
+++ b/src/AudioBand.Test/ViewModels/SettingsWindowViewModelTests.cs
@@ -39,7 +39,7 @@ private class TestViewmodel : ViewModelBase
         }
 
         [Fact]
-        public void HasUnsavedChangesWhenStartEditMessageIsPublished()
+        public void StartEditMessageIsPublished_HasUnsavedChangesPropertyIsTrue()
         {
             Action<EditStartMessage> handler = null;
             _messageBus.Setup(m => m.Subscribe(It.IsAny<Action<EditStartMessage>>()))
@@ -53,7 +53,7 @@ public void HasUnsavedChangesWhenStartEditMessageIsPublished()
         }
 
         [Fact]
-        public void SaveCommandCanExecuteBasedOnUnsavedChanges()
+        public void UnsavedChangesIsTrue_SaveCommandCanExecuteIsTrue()
         {
             var vm = CreateVm();
 
@@ -63,7 +63,7 @@ public void SaveCommandCanExecuteBasedOnUnsavedChanges()
         }
 
         [Fact]
-        public void SaveCommandEndsEditsAndSavesSettings()
+        public void SaveCommandExecuted_PublishesEndsEditMessageAndSavesSettings()
         {
             var vm = CreateVm();
 
@@ -77,7 +77,7 @@ public void SaveCommandEndsEditsAndSavesSettings()
         }
 
         [Fact]
-        public void CloseCommandShowsDialogIfUnsavedChanges()
+        public void CloseCommandOnExecuted_ShowsDialogIfUnsavedChanges()
         {
             _dialog.Setup(m => m.ShowConfirmationDialog(It.IsAny<ConfirmationDialogType>(), It.IsAny<object[]>()))
                 .Returns(true);
@@ -90,7 +90,7 @@ public void CloseCommandShowsDialogIfUnsavedChanges()
         }
 
         [Fact]
-        public void CloseCommandShowsDialogIfUnsavedChanges_DiscardChangesCancelsEditsAndClosesWindow()
+        public void CloseCommandExecuted_ShowsDialogIfUnsavedChanges_DiscardChangesCancelsEditsAndClosesWindow()
         {
             _dialog.Setup(m => m.ShowConfirmationDialog(It.IsAny<ConfirmationDialogType>(), It.IsAny<object[]>()))
                 .Returns(true);
@@ -105,7 +105,7 @@ public void CloseCommandShowsDialogIfUnsavedChanges_DiscardChangesCancelsEditsAn
         }
 
         [Fact]
-        public void CloseCommandShowsDialogIfUnsavedChanges_CancelCloseDoesNotCloseWindow()
+        public void CloseCommandExecuted_ShowsDialogIfUnsavedChanges_CancelCloseDoesNotCloseWindow()
         {
             _dialog.Setup(m => m.ShowConfirmationDialog(It.IsAny<ConfirmationDialogType>(), It.IsAny<object[]>()))
                 .Returns(false);
@@ -118,7 +118,7 @@ public void CloseCommandShowsDialogIfUnsavedChanges_CancelCloseDoesNotCloseWindo
         }
 
         [Fact]
-        public void DisableDeleteProfileCommandWhenOnlyOneProfile()
+        public void OnlyOneProfile_DeleteProfileCommandCanExecuteIsFalse()
         {
             _appSettings.SetupGet(m => m.Profiles).Returns(new List<string>{"profile 1"});
             var vm = CreateVm();
@@ -127,7 +127,7 @@ public void DisableDeleteProfileCommandWhenOnlyOneProfile()
         }
 
         [Fact]
-        public void ProfilesCollectionMatchesSettings()
+        public void SettingsHasProfiles_ProfilesCollectionMatches()
         {
             string profile1 = "profile 1";
             string profile2 = "profile 2";
@@ -140,7 +140,7 @@ public void ProfilesCollectionMatchesSettings()
         }
 
         [Fact]
-        public void CreateProfileAddsProfileToSettingsAndViewModel()
+        public void CreateProfileCommandExecuted_AddsProfileToSettingsAndViewModel()
         {
             _appSettings.Setup(m => m.CreateProfile(It.IsAny<string>()));
             var vm = CreateVm();
@@ -153,7 +153,7 @@ public void CreateProfileAddsProfileToSettingsAndViewModel()
         }
 
         [Fact]
-        public void SelectedProfileCommandUpdatesSettings()
+        public void SelectedProfileCommandExecuted_UpdatesProfileInSettings()
         {
             string profile1 = "profile 1";
             string profile2 = "profile 2";
@@ -166,7 +166,7 @@ public void SelectedProfileCommandUpdatesSettings()
         }
 
         [Fact]
-        public void DeleteProfileConfirmationCancelDoesNotDelete()
+        public void DeleteProfileCommandExecuted_ConfirmationDialogCancelDoesNotDelete()
         {
             string profile1 = "profile 1";
             string profile2 = "profile 2";
@@ -187,7 +187,7 @@ public void DeleteProfileConfirmationCancelDoesNotDelete()
         }
 
         [Fact]
-        public void DeleteProfileSelectsNewItem()
+        public void DeleteProfileCommandExecuted_SelectsDifferentProfile()
         {
             string profile1 = "profile 1";
             string profile2 = "profile 2";
@@ -205,7 +205,7 @@ public void DeleteProfileSelectsNewItem()
         }
 
         [Fact]
-        public void SelectProfileEndsEdits()
+        public void SelectProfileCommandExecuted_PublishesEndsEditMessage()
         {
             string profile1 = "profile 1";
             string profile2 = "profile 2";
@@ -222,7 +222,7 @@ public void SelectProfileEndsEdits()
         }
 
         [Fact]
-        public void RenameProfileDialogAccepted()
+        public void RenameProfileCommandExecuted_DialogAcceptedRenamesProfile()
         {
             string profile1 = "profile1";
             string profile2 = "profile2";
@@ -243,7 +243,7 @@ public void RenameProfileDialogAccepted()
         }
 
         [Fact]
-        public void RenameProfileDialogCanceled()
+        public void RenameProfileCommandExecuted_DialogCanceledDoesNotRenameProfile()
         {
             string profile1 = "profile1";
 
@@ -259,7 +259,7 @@ public void RenameProfileDialogCanceled()
         }
 
         [Fact]
-        public void RenameProfileSameProfileIgnored()
+        public void RenameProfileCommandExecuted_NameNotChangedInDialogDoesNotChangeProfileName()
         {
             string profile1 = "profile1";
 
diff --git a/src/AudioBand.Test/ViewModels/ViewModelBaseTests.cs b/src/AudioBand.Test/ViewModels/ViewModelBaseTests.cs
index 83323518..1dd2dfa8 100644
--- a/src/AudioBand.Test/ViewModels/ViewModelBaseTests.cs
+++ b/src/AudioBand.Test/ViewModels/ViewModelBaseTests.cs
@@ -6,7 +6,7 @@ namespace AudioBand.Test
     public class ViewModelBaseTests
     {
         [Fact]
-        public void SetPropertyWithChangedFieldCallsPropertyChanged()
+        public void SetProperty_WithChangedField_CallsPropertyChanged()
         {
             string propertyName = null;
             var vm = new ViewModel();
@@ -18,7 +18,7 @@ public void SetPropertyWithChangedFieldCallsPropertyChanged()
         }
 
         [Fact]
-        public void SetPropertySameField()
+        public void SetProperty_SameField_DoesNotCallPropertyChanged()
         {
             int called = 0;
             string propertyName = null;
@@ -32,7 +32,7 @@ public void SetPropertySameField()
         }
 
         [Fact]
-        public void SetPropertyWithTrackedStateAttributeAutomaticallyStartsEdit()
+        public void SetProperty_WithTrackedStateAttribute_AutomaticallyStartsEdit()
         {
             var vm = new ViewModel();
             vm.Field = 0;
@@ -43,7 +43,7 @@ public void SetPropertyWithTrackedStateAttributeAutomaticallyStartsEdit()
         }
 
         [Fact]
-        public void SetPropertyWithoutTrackedStateAttributeDoesNotStartEdit()
+        public void SetProperty_WithoutTrackedStateAttribute_DoesNotStartEdit()
         {
             var vm = new ViewModel();
             vm.FieldNotTracked = 0;
@@ -54,7 +54,7 @@ public void SetPropertyWithoutTrackedStateAttributeDoesNotStartEdit()
         }
 
         [Fact]
-        public void SetPropertyWithModelAutomaticallyStartsEdit()
+        public void SetPropertyWithModel_AutomaticallyStartsEdit()
         {
             var vm = new ViewModelWithModel();
             vm.Field = 0;
@@ -65,7 +65,7 @@ public void SetPropertyWithModelAutomaticallyStartsEdit()
         }
 
         [Fact]
-        public void ResetViewModelWithModelStartsEdit()
+        public void ResetViewModelWithModel_StartsEdit()
         {
             var vm = new ViewModelWithModel();
             vm.Reset();
@@ -73,24 +73,6 @@ public void ResetViewModelWithModelStartsEdit()
             Assert.True(vm.IsEditing);
         }
 
-        [Fact]
-        public void ViewModelWithModelUnbindModelProperly()
-        {
-            var m = new Model();
-            var vm = new ViewModelWithModel(m);
-
-            bool raised = false;
-            vm.PropertyChanged += (sender, e) =>
-            {
-                if (e.PropertyName == nameof(ViewModelWithModel.Field))
-                {
-                    raised = true;
-                }
-            };
-
-            Assert.False(raised);
-        }
-
         private class ViewModel : ViewModelBase
         {
             private int _field = 0;

From 793c8ee95f9a4fa339e7af99d3a352e3f6c0fa97 Mon Sep 17 00:00:00 2001
From: Brandon Chong <brndnchong@gmail.com>
Date: Mon, 24 Jun 2019 15:04:44 -0700
Subject: [PATCH 16/17] Add check for invalid image path

- Github: fixes #192
---
 src/AudioBand.Test/Assets/imgsource.png       | Bin 0 -> 126 bytes
 src/AudioBand.Test/AudioBand.Test.csproj      |   6 ++
 .../AudioBand.Test.csproj.DotSettings         |   1 +
 .../PathToImageConverterTests.cs              |  57 ++++++++++++++++++
 .../PathToImageSourceConverter.cs             |  33 +++++++---
 5 files changed, 89 insertions(+), 8 deletions(-)
 create mode 100644 src/AudioBand.Test/Assets/imgsource.png
 create mode 100644 src/AudioBand.Test/ValueConveters/PathToImageConverterTests.cs

diff --git a/src/AudioBand.Test/Assets/imgsource.png b/src/AudioBand.Test/Assets/imgsource.png
new file mode 100644
index 0000000000000000000000000000000000000000..f6512b712c2c83446204b255c7b418fd4091c861
GIT binary patch
literal 126
zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V6Od#Ih<F907>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`0h7I;J!GcfQS24TkI`72U@g2J9Ijv*Ss$raj*o7j83k{yk-7+UH}r@HjA
RegH}{c)I$ztaD0e0svbq9yb60

literal 0
HcmV?d00001

diff --git a/src/AudioBand.Test/AudioBand.Test.csproj b/src/AudioBand.Test/AudioBand.Test.csproj
index 1a342f98..19087759 100644
--- a/src/AudioBand.Test/AudioBand.Test.csproj
+++ b/src/AudioBand.Test/AudioBand.Test.csproj
@@ -93,6 +93,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ValueConveters\PathToImageConverterTests.cs" />
     <Compile Include="ViewModels\AlbumArtPopupViewModelTests.cs" />
     <Compile Include="ViewModels\AlbumArtViewModelTests.cs" />
     <Compile Include="ViewModels\AudioBandViewModelTests.cs" />
@@ -138,6 +139,11 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Assets\imgsource.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/AudioBand.Test/AudioBand.Test.csproj.DotSettings b/src/AudioBand.Test/AudioBand.Test.csproj.DotSettings
index cd7ca864..bf95c7ff 100644
--- a/src/AudioBand.Test/AudioBand.Test.csproj.DotSettings
+++ b/src/AudioBand.Test/AudioBand.Test.csproj.DotSettings
@@ -1,4 +1,5 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=settings/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=textformatting/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=valueconveters/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=viewmodels/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/src/AudioBand.Test/ValueConveters/PathToImageConverterTests.cs b/src/AudioBand.Test/ValueConveters/PathToImageConverterTests.cs
new file mode 100644
index 00000000..88a43bbf
--- /dev/null
+++ b/src/AudioBand.Test/ValueConveters/PathToImageConverterTests.cs
@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Media;
+using AudioBand.ValueConverters;
+using Xunit;
+
+namespace AudioBand.Test
+{
+    public class PathToImageConverterTests
+    {
+        private PathToImageSourceConverter _converter = new PathToImageSourceConverter();
+        private string _sampleImagePath = Path.GetFullPath("Assets/imgsource.png");
+
+        [Fact]
+        void Convert_EmptyPath_ReturnsNull()
+        {
+            Assert.Null(_converter.Convert("", typeof(ImageSource), null, CultureInfo.CurrentCulture));
+        }
+
+        [Fact]
+        void Convert_Null_ReturnsNull()
+        {
+            Assert.Null(_converter.Convert((object)null, typeof(ImageSource), null, CultureInfo.CurrentCulture));
+        }
+
+        [Fact]
+        void Convert_NoFile_ReturnsNull()
+        {
+            Assert.Null(_converter.Convert("nonexistingfile.png", typeof(ImageSource), null, CultureInfo.CurrentCulture));
+        }
+
+        [Fact]
+        void Convert_ValidFile_ReturnsImageSource()
+        {
+            var imgSource = _converter.Convert(_sampleImagePath, typeof(ImageSource), null, CultureInfo.CurrentCulture);
+
+            Assert.NotNull(imgSource);
+            Assert.IsAssignableFrom<ImageSource>(imgSource);
+        }
+
+        [Fact]
+        void MultiConvert_InvalidFile_UsesFallback()
+        {
+            object fallback = new object();
+            var imgSource = _converter.Convert(new[] {"invalidfile.png", fallback}, typeof(ImageSource), null,
+                CultureInfo.CurrentCulture);
+
+            Assert.NotNull(imgSource);
+            Assert.Equal(fallback, imgSource);
+        }
+    }
+}
diff --git a/src/AudioBand/ValueConverters/PathToImageSourceConverter.cs b/src/AudioBand/ValueConverters/PathToImageSourceConverter.cs
index 6a0f58c1..ec7b4e48 100644
--- a/src/AudioBand/ValueConverters/PathToImageSourceConverter.cs
+++ b/src/AudioBand/ValueConverters/PathToImageSourceConverter.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Globalization;
+using System.IO;
 using System.Windows;
 using System.Windows.Data;
 using System.Windows.Media;
@@ -29,21 +30,26 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
                 return null;
             }
 
-            if (path.EndsWith(".svg"))
+            if (!File.Exists(path))
             {
-                try
+                return null;
+            }
+
+            try
+            {
+                if (path.EndsWith(".svg"))
                 {
                     var svgDrawing = new FileSvgReader(new WpfDrawingSettings()).Read(path);
                     svgDrawing.Freeze();
                     return new DrawingImage(svgDrawing);
                 }
-                catch
-                {
-                    return null;
-                }
-            }
 
-            return new BitmapImage(new Uri(path));
+                return new BitmapImage(new Uri(path));
+            }
+            catch
+            {
+                return null;
+            }
         }
 
         /// <inheritdoc />
@@ -53,8 +59,19 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu
         }
 
         /// <inheritdoc />
+        /// returns fallback value if invalid.
         public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
         {
+            if (values == null)
+            {
+                return null;
+            }
+
+            if (values.Length != 2)
+            {
+                return null;
+            }
+
             return Convert(values[0], targetType, parameter, culture) ?? values[1];
         }
 

From fbb5c131d1eb6e79ec63ffafcb67cb077a1e1ded Mon Sep 17 00:00:00 2001
From: Brandon Chong <brndnchong@gmail.com>
Date: Mon, 24 Jun 2019 19:03:39 -0700
Subject: [PATCH 17/17] Fix text not resetting to old value when changes are
 canceled

---
 src/AudioBand.Test/AudioBand.Test.csproj      |  1 +
 .../ViewModels/CustomLabelViewModelTests.cs   | 77 +++++++++++++++++++
 .../ViewModels/CustomLabelViewModel.cs        | 37 +++++++--
 3 files changed, 109 insertions(+), 6 deletions(-)
 create mode 100644 src/AudioBand.Test/ViewModels/CustomLabelViewModelTests.cs

diff --git a/src/AudioBand.Test/AudioBand.Test.csproj b/src/AudioBand.Test/AudioBand.Test.csproj
index 19087759..b4dca433 100644
--- a/src/AudioBand.Test/AudioBand.Test.csproj
+++ b/src/AudioBand.Test/AudioBand.Test.csproj
@@ -100,6 +100,7 @@
     <Compile Include="ViewModels\CustomLabelsViewModelTests.cs" />
     <Compile Include="Settings\SettingsMigrationTests.cs" />
     <Compile Include="ViewModels\AudioSourceSettingsCollectionTests.cs" />
+    <Compile Include="ViewModels\CustomLabelViewModelTests.cs" />
     <Compile Include="ViewModels\SettingsWindowViewModelTests.cs" />
     <Compile Include="TextFormatting\CustomTextParsingTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/src/AudioBand.Test/ViewModels/CustomLabelViewModelTests.cs b/src/AudioBand.Test/ViewModels/CustomLabelViewModelTests.cs
new file mode 100644
index 00000000..396aef52
--- /dev/null
+++ b/src/AudioBand.Test/ViewModels/CustomLabelViewModelTests.cs
@@ -0,0 +1,77 @@
+using System.Linq;
+using System.Windows.Media;
+using AudioBand.AudioSource;
+using AudioBand.Messages;
+using AudioBand.Models;
+using AudioBand.ViewModels;
+using Moq;
+using Xunit;
+
+namespace AudioBand.Test
+{
+    public class CustomLabelViewModelTests
+    {
+        private Mock<IDialogService> _dialogMock;
+        private Mock<IMessageBus> _messageBusMock;
+        private Mock<IAudioSession> _sessionMock;
+
+        public CustomLabelViewModelTests()
+        {
+            _dialogMock = new Mock<IDialogService>();
+            _messageBusMock = new Mock<IMessageBus>();
+            _sessionMock = new Mock<IAudioSession>();
+        }
+
+        [Fact]
+        void CustomLabel_TextFormatStringChanged_TextSegmentsMatch()
+        {
+            var songname = "song";
+            var artist = "artist";
+            var model = new CustomLabel { FormatString = "first format" };
+            _sessionMock.SetupGet(m => m.SongName).Returns(songname);
+            _sessionMock.SetupGet(m => m.SongArtist).Returns(artist);
+            var vm = new CustomLabelViewModel(model, _dialogMock.Object, _sessionMock.Object, _messageBusMock.Object);
+
+            var firstSegment = "second format with";
+            var secondSegment = "{artist}";
+            var thirdSegment = "and";
+            var forthSegment = "{song}";
+            vm.FormatString = firstSegment + secondSegment + thirdSegment + forthSegment;
+
+            var segments = vm.TextSegments.ToList();
+            Assert.Equal(4, segments.Count);
+            Assert.Equal(firstSegment, segments[0].Text);
+            Assert.Equal(artist, segments[1].Text);
+            Assert.Equal(thirdSegment, segments[2].Text);
+            Assert.Equal(songname, segments[3].Text);
+        }
+
+        [Fact]
+        void CustomLabel_TextFormatStringChangedThenCanceled_CorrectTextSegments()
+        {
+            var songname = "song";
+            var model = new CustomLabel {FormatString = "text format {song}"};
+            _sessionMock.SetupGet(m => m.SongName).Returns(songname);
+            var vm = new CustomLabelViewModel(model, _dialogMock.Object, _sessionMock.Object, _messageBusMock.Object);
+
+            Assert.Equal(2, vm.TextSegments.Count());
+            vm.FormatString = "new format string";
+            vm.CancelEdit();
+
+            Assert.Equal(2, vm.TextSegments.Count());
+            Assert.Equal(songname, vm.TextSegments.ToList()[1].Text);
+        }
+
+        [Fact]
+        void CustomLabel_ColorChangedThenCanceled_TextSegmentsHaveCorrectColor()
+        {
+            var model = new CustomLabel { FormatString = "text format {song}", Color = Colors.Blue };
+            var vm = new CustomLabelViewModel(model, _dialogMock.Object, _sessionMock.Object, _messageBusMock.Object);
+
+            vm.Color = Colors.Black;
+            vm.CancelEdit();
+
+            Assert.All(vm.TextSegments, segment => Assert.Equal(Colors.Blue, segment.Color));
+        }
+    }
+}
diff --git a/src/AudioBand/ViewModels/CustomLabelViewModel.cs b/src/AudioBand/ViewModels/CustomLabelViewModel.cs
index c427e15d..7cd5526c 100644
--- a/src/AudioBand/ViewModels/CustomLabelViewModel.cs
+++ b/src/AudioBand/ViewModels/CustomLabelViewModel.cs
@@ -219,18 +219,30 @@ protected override void OnPropertyChanged(string propertyName)
             switch (propertyName)
             {
                 case nameof(Model.Color):
-                    foreach (var textSegment in TextSegments)
-                    {
-                        textSegment.Color = Color;
-                    }
-
+                    RefreshSegmentColors();
                     break;
                 case nameof(Model.FormatString):
-                    TextSegments = FormattedTextParser.ParseFormattedString(FormatString, Color, _audioSession);
+                    ReParseSegments();
                     break;
             }
         }
 
+        /// <inheritdoc />
+        protected override void OnCancelEdit()
+        {
+            base.OnCancelEdit();
+            RefreshSegmentColors();
+            ReParseSegments();
+        }
+
+        /// <inheritdoc />
+        protected override void OnReset()
+        {
+            base.OnReset();
+            RefreshSegmentColors();
+            ReParseSegments();
+        }
+
         private void AudioSessionOnPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             if (e.PropertyName != nameof(IAudioSession.IsPlaying))
@@ -245,5 +257,18 @@ private void OnIsPlayingChanged(bool isPlaying)
         {
             IsPlaying = isPlaying;
         }
+
+        private void RefreshSegmentColors()
+        {
+            foreach (var textSegment in TextSegments)
+            {
+                textSegment.Color = Color;
+            }
+        }
+
+        private void ReParseSegments()
+        {
+            TextSegments = FormattedTextParser.ParseFormattedString(FormatString, Color, _audioSession);
+        }
     }
 }