diff --git a/logo/ico_512.png b/logo/ico_512.png
new file mode 100644
index 00000000..34b324c1
Binary files /dev/null and b/logo/ico_512.png differ
diff --git a/logo/installer_background.png b/logo/installer_background.png
new file mode 100644
index 00000000..41020b31
Binary files /dev/null and b/logo/installer_background.png differ
diff --git a/logo/installer_background.svg b/logo/installer_background.svg
new file mode 100644
index 00000000..7024faaa
--- /dev/null
+++ b/logo/installer_background.svg
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="493"
+   height="312"
+   viewBox="0 0 130.43958 82.550002"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="installer_background.svg"
+   inkscape:export-filename="E:\Code\audio-band\logo\installer_background.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.979899"
+     inkscape:cx="151.27031"
+     inkscape:cy="179.12216"
+     inkscape:document-units="mm"
+     inkscape:current-layer="_602653904-3"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     inkscape:window-x="-8"
+     inkscape:window-y="193"
+     inkscape:window-maximized="1"
+     units="px" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-214.44998)"
+     sodipodi:insensitive="true">
+    <rect
+       style="opacity:0.97000002;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4.23333311;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect819"
+       width="130.43959"
+       height="82.550003"
+       x="0"
+       y="214.44998" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Layer 2">
+    <g
+       transform="matrix(0.00999984,0,0,0.00999984,15.992956,52.202383)"
+       style="clip-rule:evenodd;fill-rule:evenodd;image-rendering:optimizeQuality;shape-rendering:geometricPrecision;text-rendering:geometricPrecision"
+       id="Layer_x0020_1">
+      <metadata
+         id="CorelCorpID_0Corel-Layer" />
+      <g
+         id="_602653904">
+        <g
+           transform="translate(-359.08318,-1719.8192)"
+           style="clip-rule:evenodd;fill-rule:evenodd;image-rendering:optimizeQuality;shape-rendering:geometricPrecision;text-rendering:geometricPrecision"
+           id="Layer_x0020_1-7">
+          <metadata
+             id="CorelCorpID_0Corel-Layer-1" />
+          <g
+             id="_602653904-3">
+            <g
+               id="g11"
+               transform="translate(-555.63382,-498.93658)">
+              <path
+                 inkscape:connector-curvature="0"
+                 class="fil1"
+                 d="m 1537,879 c 70,157 70,337 0,494 v 0 c -5,12 -8,24 -8,38 0,51 41,93 92,93 39,0 73,-24 86,-58 90,-201 90,-432 3,-634 -12,-37 -47,-64 -88,-64 -51,0 -93,42 -93,93 0,14 3,26 8,38 z m -483,366 156,-90 v 0 c 5,-3 10,-8 13,-13 10,-18 4,-40 -13,-50 l -156,-90 -152,-88 c -6,-4 -14,-6 -22,-6 -20,0 -36,16 -36,36 v 180 179 0 c 0,6 2,12 5,18 10,17 32,23 49,14 l 154,-89 c 1,-1 1,-1 2,-1 z M 634,772 c -196,196 -196,514 0,710 196,196 514,196 710,0 36,-37 36,-96 0,-133 -37,-36 -96,-36 -133,0 v 0 c -123,123 -322,123 -444,0 -123,-122 -123,-321 0,-444 122,-123 321,-123 444,0 37,37 96,37 133,0 36,-37 36,-96 0,-133 v 0 C 1148,576 830,576 634,772 Z M 431,570 c -4,4 -9,9 -14,14 -4,5 -9,10 -13,15 -5,5 -9,10 -14,15 -4,5 -8,10 -13,15 -4,6 -8,11 -12,16 -4,5 -8,10 -12,16 -4,5 -8,10 -11,16 -4,5 -8,11 -11,16 v 0 c -4,6 -8,11 -11,17 -3,5 -7,11 -10,16 -3,6 -7,11 -10,17 -3,6 -6,11 -9,17 v 0 c -3,6 -6,12 -9,17 v 0 c -3,6 -5,12 -8,18 v 0 c -3,6 -5,11 -8,17 -3,6 -5,12 -7,18 v 0 c -3,6 -5,12 -7,18 v 0 c -3,6 -5,12 -7,18 v 0 c -2,6 -4,12 -6,18 v 0 c -2,6 -4,12 -6,18 v 0 c -1,6 -3,12 -5,18 v 0 c -2,6 -3,13 -5,19 v 0 c -1,6 -3,12 -4,18 v 0 c -1,6 -2,13 -4,19 v 0 c -1,6 -2,12 -3,18 v 0 c -1,7 -2,13 -3,19 v 0 c -1,6 -2,13 -2,19 v 0 c -1,6 -2,12 -2,19 v 0 c -1,6 -2,12 -2,18 v 0 c -1,7 -1,13 -1,19 v 0 c 0,7 -1,13 -1,19 v 0 c 0,13 0,25 0,38 v 0 c 0,6 1,13 1,19 v 0 c 0,6 0,12 1,19 v 0 c 0,6 1,12 2,19 v 0 c 0,6 1,12 2,18 v 0 c 0,7 1,13 2,19 1,6 2,13 3,19 v 0 c 1,6 2,12 3,18 v 0 c 3,13 5,25 8,37 v 0 c 2,7 3,13 5,19 v 0 c 2,6 4,12 5,18 v 0 c 4,12 8,24 12,36 v 0 c 38,109 100,210 186,297 2,1 4,3 6,5 3,3 5,5 8,8 2,2 5,4 7,6 2,3 5,5 8,7 2,2 4,4 6,6 3,3 5,5 8,7 2,2 5,4 7,6 3,2 5,4 8,7 2,2 5,4 7,6 3,2 5,4 8,6 2,2 5,4 7,5 3,2 5,4 8,6 2,2 5,4 8,6 2,2 5,3 7,5 3,2 6,4 8,6 3,2 5,3 8,5 2,2 5,4 8,6 3,1 5,3 7,4 3,2 6,4 9,6 2,1 5,3 8,4 2,2 5,4 8,5 3,2 5,3 8,5 3,1 5,3 8,5 3,1 5,2 7,3 12,7 24,13 37,19 1,1 3,2 5,2 4,2 7,4 10,5 3,1 5,2 7,3 3,2 7,3 10,4 2,1 5,2 7,3 3,2 7,3 10,4 3,1 5,2 7,3 3,1 7,3 10,4 3,1 5,2 7,2 4,2 7,3 11,4 2,1 4,1 6,2 4,1 7,3 11,4 l 7,2 c 3,1 7,2 10,3 3,1 5,1 7,2 4,1 7,2 11,3 2,0 4,1 6,1 4,1 8,2 12,3 1,1 3,1 5,1 4,1 8,2 13,3 l 2,1 c 28,6 56,10 84,13 h 1 c 5,1 10,1 15,1 l 3,1 c 5,0 9,0 14,1 h 4 c 4,0 9,0 14,1 h 4 c 4,0 9,0 14,0 h 3 c 5,0 10,0 15,0 h 3 c 5,0 10,0 15,0 h 2 c 5,-1 11,-1 16,-1 h 1 c 157,-9 312,-64 442,-167 v 0 c 24,-19 48,-40 70,-62 37,-37 37,-97 0,-134 -36,-37 -96,-37 -133,0 -234,234 -613,234 -846,0 -234,-234 -234,-612 0,-846 233,-234 612,-234 846,0 v 0 l 1,1 c 37,37 97,37 133,0 37,-37 37,-97 0,-133 l -1,-1 v 0 C 1448,474 1334,408 1212,371 v 0 c -6,-1 -12,-3 -18,-5 v 0 c -6,-1 -13,-3 -19,-4 v 0 c -18,-5 -37,-9 -55,-12 v 0 c -25,-4 -50,-7 -75,-9 v 0 c -13,-1 -26,-1 -38,-2 v 0 c -7,0 -13,0 -19,0 v 0 c -6,0 -13,0 -19,0 v 0 c -6,0 -13,1 -19,1 v 0 c -6,0 -12,1 -19,1 v 0 c -6,1 -12,1 -19,2 v 0 c -6,0 -12,1 -18,2 v 0 c -7,0 -13,1 -19,2 v 0 c -6,1 -13,2 -19,3 v 0 c -6,1 -12,2 -18,3 v 0 c -7,2 -13,3 -19,4 v 0 c -6,2 -12,3 -18,5 v 0 c -7,1 -13,3 -19,4 v 0 c -6,2 -12,4 -18,5 v 0 c -6,2 -12,4 -18,6 v 0 c -6,2 -12,4 -18,6 v 0 c -6,2 -12,4 -18,7 v 0 c -6,2 -12,4 -18,7 v 0 c -6,2 -12,5 -18,7 v 0 c -6,3 -12,5 -17,8 v 0 c -6,3 -12,5 -18,8 v 0 c -6,3 -11,6 -17,9 v 0 c -6,3 -11,6 -17,9 -6,3 -11,7 -17,10 v 0 c -6,3 -11,7 -17,10 v 0 c -5,4 -11,7 -16,11 v 0 c -6,3 -11,7 -16,11 v 0 c -6,4 -11,7 -16,11 -6,4 -11,8 -16,12 v 0 c -5,4 -11,8 -16,13 -5,4 -10,8 -15,12 v 0 c -5,5 -10,9 -15,14 -5,4 -10,9 -15,13 -5,5 -10,10 -15,15 z m 1047,652 c 6,-31 9,-63 9,-95 0,-33 -3,-65 -9,-96 v 0 c -8,-43 -45,-75 -89,-75 -50,0 -90,42 -90,93 0,6 0,12 1,18 v 0 c 4,19 6,39 6,60 0,20 -2,40 -6,60 v 0 c -1,5 -1,11 -1,17 0,52 40,94 90,94 44,0 81,-33 89,-76 z m 444,419 h 1 c 0,-1 1,-2 1,-3 84,-152 131,-327 131,-512 0,-187 -48,-362 -133,-515 -15,-30 -46,-50 -82,-50 -52,0 -94,41 -94,93 0,17 5,33 13,47 70,126 110,271 110,425 0,153 -39,296 -108,421 v 0 c -8,14 -12,30 -12,47 0,52 41,94 93,94 34,0 64,-19 80,-47 z M 1759,701 Z"
+                 id="path9" />
+            </g>
+            <path
+               inkscape:connector-curvature="0"
+               class="fil2"
+               d="m -766.16049,2064.6962 v -93.5663 c 0,-13.1952 -2.39913,-25.1909 -7.1974,-36.5868 -4.79827,-11.3958 -11.99567,-21.5922 -20.39264,-29.9891 -8.39697,-8.397 -17.9935,-14.9946 -29.38939,-19.7929 -11.39589,-4.7982 -23.99134,-7.1974 -36.5868,-7.1974 -12.59545,0 -25.19091,2.3992 -36.58679,7.1974 -11.39589,4.7983 -20.99243,11.3959 -29.3894,19.7929 -8.99675,8.3969 -15.59437,18.5933 -20.39264,29.9891 -4.79827,11.3959 -7.1974,23.3916 -7.1974,36.5868 v 93.5663 z m 93.56624,186.5327 h -93.56624 v -93.5663 h -187.13246 v 93.5663 h -93.56625 v -280.099 c 0,-25.7907 5.3981,-50.3818 14.9946,-73.1735 9.5965,-22.7918 22.7918,-42.5846 40.1855,-59.3786 16.79394,-16.7939 36.5868,-30.5889 58.77879,-40.1855 22.79178,-9.5965 47.3829,-14.9946 73.17359,-14.9946 25.79069,0 50.38182,5.3981 73.17359,14.9946 22.192,9.5966 42.58464,23.3916 59.37857,40.1855 16.79394,16.794 29.98918,36.5868 40.1855,59.3786 9.59654,22.7917 14.39481,47.3828 14.39481,73.1735 z m 325.68246,-40.1855 c -7.1974,5.9978 -14.99459,12.5954 -23.39156,17.9935 -7.79718,5.9978 -16.79394,10.7961 -25.19091,14.9946 -8.99675,4.1985 -18.59329,7.7972 -27.59004,10.1963 -9.59653,2.3991 -19.19307,3.5987 -29.38939,3.5987 -20.99243,0 -41.38507,-3.5987 -60.57814,-11.3959 -18.59329,-7.1974 -35.38723,-17.9935 -49.78204,-32.3883 -13.79502,-13.795 -25.1909,-31.1888 -33.58787,-50.9816 -7.79719,-20.3927 -11.99567,-42.5846 -11.99567,-67.7756 v -193.1303 h 88.76796 v 193.1303 c 0,11.3959 1.79935,22.192 5.39805,31.1888 3.5987,9.5965 8.39697,17.3937 14.39481,23.3915 5.99783,6.5977 13.19524,11.3959 21.59221,14.3949 7.79718,3.5987 16.79393,4.7982 25.79069,4.7982 9.59654,0 17.9935,-1.7993 26.39047,-5.9978 7.79719,-4.1985 14.99459,-10.1963 20.99243,-16.794 6.59761,-7.1974 11.39588,-14.9945 14.3948,-23.9913 3.5987,-8.397 5.39805,-17.3937 5.39805,-26.9903 v -193.1303 h 88.76797 v 349.0741 h -20.99243 z m 456.43529,40.1855 H 87.931287 l -34.78746,-47.9827 c -8.396973,7.7972 -17.393723,14.9946 -26.990263,21.5922 -9.59654,6.5976 -19.1930703,12.5954 -29.9891803,17.3937 -10.1963157,4.7983 -20.9924197,8.9968 -31.7885227,11.3959 -10.796105,2.9989 -22.191992,4.1985 -33.587879,4.1985 -24.591125,0 -47.382902,-4.1985 -68.975112,-13.795 -22.19198,-8.9968 -40.78527,-22.192 -56.97943,-38.3862 -16.19415,-16.1941 -28.78961,-35.987 -38.38614,-58.179 -9.59654,-22.7918 -13.79502,-47.3829 -13.79502,-73.7734 0,-26.3904 4.19848,-50.9816 13.79502,-73.1736 9.59653,-22.7918 22.19199,-42.5846 38.38614,-58.7788 16.19416,-16.7939 34.78745,-29.3893 56.97943,-38.9859 21.59221,-9.5965 44.383987,-13.795 68.975112,-13.795 7.797185,0 16.194155,0.5998 24.591124,1.7994 8.396971,1.1995 16.194157,3.5987 23.991343,5.9978 8.39697,2.9989 15.5943747,7.1974 22.7917747,11.9957 6.59762,4.7982 12.5954503,10.7961 17.3937203,17.3937 V 1763.0051 H 109.5235 Z m -89.967556,-177.536 c 0,-11.9956 -2.39913,-23.9913 -7.1974,-35.3872 -4.1984903,-11.3959 -10.7961003,-21.5923 -18.5932903,-30.589 -8.3969697,-8.397 -17.9935057,-15.5944 -28.7896097,-20.9924 -10.196321,-5.3981 -22.191992,-7.7972 -34.187662,-7.7972 -11.995671,0 -23.391558,1.7993 -34.187662,6.5976 -10.7961,4.1985 -20.39264,10.1963 -28.18983,18.5933 -7.79718,7.7972 -14.3948,17.9935 -18.59329,29.9892 -4.79826,11.3959 -7.1974,24.5912 -7.1974,39.5857 0,13.1953 2.39914,25.1909 7.1974,36.5868 4.19849,11.3959 10.79611,21.5922 18.59329,30.589 7.79719,8.397 17.39373,15.5944 28.18983,20.3926 10.796104,4.7983 22.191991,7.1974 34.187662,7.1974 11.99567,0 23.991341,-2.3991 34.187662,-7.7971 10.796104,-5.3981 20.39264,-12.5955 28.7896097,-20.9925 7.79719,-8.9967 14.3948,-19.193 18.5932903,-30.5889 4.79827,-11.3959 7.1974,-23.3916 7.1974,-35.3873 z M 282.26118,1807.3891 c 0,7.7972 -1.79935,15.5943 -4.79827,22.7918 -2.99892,7.1974 -7.1974,13.795 -12.59545,18.5932 -5.39806,5.3981 -11.99567,9.5966 -19.19308,13.1953 -7.1974,2.9989 -14.99459,4.7982 -23.39156,4.7982 -8.39696,0 -16.19415,-1.7993 -23.39155,-4.7982 -7.19741,-3.5987 -13.79502,-7.7972 -18.59329,-13.1953 -5.39805,-4.7982 -9.59654,-11.3958 -13.19524,-18.5932 -2.99892,-7.1975 -4.79827,-14.9946 -4.79827,-22.7918 0,-8.397 1.79935,-16.1942 4.79827,-23.3916 3.5987,-7.1974 7.79719,-13.1952 13.19524,-18.5933 4.79827,-5.398 11.39588,-9.5965 18.59329,-13.1952 7.1974,-2.9989 14.99459,-4.1985 23.39155,-4.1985 8.39697,0 16.19416,1.1996 23.39156,4.1985 7.19741,3.5987 13.79502,7.7972 19.19308,13.1952 5.39805,5.3981 9.59653,11.3959 12.59545,18.5933 2.99892,7.1974 4.79827,14.9946 4.79827,23.3916 z m -15.59437,443.8398 h -89.36775 v -349.0741 h 89.36775 z m 406.05345,-177.536 c 0,26.3905 -4.79827,50.3819 -14.3948,73.1736 -8.99675,22.192 -22.19199,41.9849 -37.78636,58.179 -16.19416,16.1942 -35.38723,29.3894 -56.97944,38.986 -21.59221,8.9967 -44.98377,13.795 -69.57489,13.795 -24.59113,0 -47.3829,-4.7983 -68.97511,-13.795 -22.19199,-9.5966 -40.78528,-22.7918 -56.97944,-38.986 -16.19415,-16.1941 -28.7896,-35.987 -38.38614,-58.179 -9.59654,-22.7917 -13.79502,-46.7831 -13.79502,-73.1736 0,-26.3904 4.19848,-50.9816 13.79502,-73.7734 9.59654,-22.7918 22.19199,-41.9848 38.38614,-58.7787 16.19416,-16.1942 34.78745,-28.7896 56.97944,-38.3862 21.59221,-9.5965 44.38398,-13.795 68.97511,-13.795 24.59112,0 47.98268,4.1985 69.57489,13.1952 21.59221,8.397 40.78528,20.9925 56.97944,37.1866 15.59437,16.1942 28.78961,35.987 37.78636,58.7788 9.59653,22.1919 14.3948,47.9827 14.3948,75.5727 z m -89.96753,0 c 0,-14.3948 -2.39913,-27.59 -7.1974,-38.9859 -4.79827,-11.3959 -10.7961,-21.5923 -18.59329,-29.9892 -8.39697,-8.397 -17.99351,-14.9946 -28.78961,-19.1931 -10.19632,-4.7983 -22.19199,-6.5976 -34.18766,-6.5976 -11.99567,0 -23.39156,1.7993 -34.18766,6.5976 -10.79611,4.1985 -20.39264,10.7961 -28.18983,19.1931 -7.79719,8.3969 -14.3948,18.5933 -18.59329,29.9892 -4.79827,11.3959 -7.1974,24.5911 -7.1974,38.9859 0,13.1953 2.39913,25.7907 7.1974,37.7864 4.19849,11.3959 10.7961,21.5922 18.59329,29.9892 7.79719,8.3969 17.39372,14.9946 28.18983,19.7928 10.7961,4.7983 22.19199,7.1974 34.18766,7.1974 11.99567,0 23.99134,-2.3991 34.18766,-6.5976 10.7961,-4.7982 20.39264,-10.7961 28.78961,-19.1931 7.79719,-8.3969 13.79502,-18.5932 18.59329,-29.9891 4.79827,-11.9957 7.1974,-24.5912 7.1974,-38.986 z m 709.54397,37.7864 c 0,19.1931 -3.5987,37.1866 -10.7961,54.5803 -7.7972,16.7939 -17.3937,31.1887 -30.589,44.384 -12.5954,12.5954 -26.9902,22.7918 -44.384,29.9892 -16.7939,7.1974 -34.7874,10.7961 -54.5803,10.7961 H 918.03178 v -467.8312 h 233.91552 c 19.7929,0 37.7864,4.1985 54.5803,11.3959 17.3938,7.1974 31.7886,17.3937 44.384,29.9892 13.1953,13.1952 22.7918,27.59 30.589,44.384 7.1974,17.3937 10.7961,35.3872 10.7961,54.5802 0,8.9968 -1.1996,17.9935 -3.5987,26.9903 -2.3992,8.9967 -5.3981,17.9935 -10.1963,26.3904 -4.1985,8.397 -9.5966,16.1942 -15.5944,23.3916 -5.9978,6.5976 -12.5955,12.5954 -19.7929,16.7939 7.1974,4.1985 14.3948,10.1963 20.3927,16.794 5.9978,7.1974 11.3959,14.9946 15.5943,23.3916 4.1985,8.9967 7.7972,17.3937 10.1964,26.9902 1.7993,8.9968 2.9989,17.9936 2.9989,26.9903 z m -280.6987,46.1833 h 140.3493 c 6.5977,0 13.1953,-1.1995 18.5933,-3.5987 5.3981,-2.3991 10.7961,-5.398 14.9946,-9.5965 4.1985,-4.1985 7.1974,-9.5965 9.5965,-14.9946 2.3992,-5.398 3.5987,-11.9957 3.5987,-17.9935 0,-6.5976 -1.1995,-12.5955 -3.5987,-18.5933 -2.3991,-5.398 -5.398,-10.7961 -9.5965,-14.9946 -4.1985,-4.1985 -9.5965,-7.1974 -14.9946,-9.5965 -5.398,-2.3991 -11.9956,-3.5987 -18.5933,-3.5987 H 1011.598 Z m 0,-186.5327 h 140.3493 c 6.5977,0 13.1953,-1.1995 18.5933,-3.5987 5.3981,-2.3991 10.7961,-5.9978 14.9946,-10.1963 4.1985,-4.1985 7.1974,-8.9967 9.5965,-14.9946 2.3992,-5.9978 3.5987,-11.9956 3.5987,-18.5933 0,-6.5976 -1.1995,-12.5954 -3.5987,-17.9935 -2.3991,-5.9978 -5.398,-10.7961 -9.5965,-14.9945 -4.1985,-4.1985 -9.5965,-7.7972 -14.9946,-9.5966 -5.398,-2.9989 -11.9956,-3.5987 -18.5933,-3.5987 H 1011.598 Z m 680.7543,280.099 h -21.5922 l -34.7875,-47.9827 c -8.3969,7.7972 -17.3937,14.9946 -26.9902,21.5922 -9.5965,6.5976 -19.1931,12.5954 -29.9892,17.3937 -10.1963,4.7983 -20.9924,8.9968 -31.7885,11.3959 -10.7961,2.9989 -22.192,4.1985 -33.5879,4.1985 -24.5911,0 -47.3829,-4.1985 -68.9751,-11.9957 -22.192,-8.397 -40.7853,-20.3926 -56.9794,-35.987 -16.1942,-16.1942 -28.7896,-35.3872 -38.3862,-58.179 -9.5965,-22.7918 -13.795,-48.5825 -13.795,-77.9719 0,-26.9902 4.1985,-52.1812 13.795,-74.973 9.5966,-22.7917 22.192,-41.9848 38.3862,-58.1789 16.1941,-16.794 34.7874,-29.3894 56.9794,-38.3862 21.5922,-8.9967 44.384,-13.1952 68.9751,-13.1952 11.3959,0 22.7918,1.1996 33.5879,4.1985 11.3959,2.3991 22.192,6.5976 32.3883,11.3959 10.1963,5.398 20.3926,10.7961 29.9892,17.9935 9.5965,6.5976 17.9935,13.795 26.3904,21.5922 l 34.7875,-41.3851 h 21.5922 z m -89.9675,-177.536 c 0,-11.9956 -2.3992,-23.9913 -7.1974,-35.3872 -4.1985,-11.3959 -10.7961,-21.5923 -18.5933,-30.589 -8.397,-8.397 -17.9935,-15.5944 -28.7896,-20.9924 -10.1964,-5.3981 -22.192,-7.7972 -34.1877,-7.7972 -11.9957,0 -23.3916,1.7993 -34.1877,5.9978 -10.7961,4.1985 -20.3926,10.1963 -28.1898,17.9935 -7.7972,8.397 -14.3948,18.5933 -18.5933,29.9893 -4.7982,11.9956 -7.1974,25.7907 -7.1974,40.7852 0,14.9946 2.3992,28.7897 7.1974,40.7853 4.1985,11.3959 10.7961,21.5922 18.5933,29.9892 7.7972,7.7972 17.3937,13.795 28.1898,17.9935 10.7961,4.1985 22.192,5.9978 34.1877,5.9978 11.9957,0 23.9913,-2.3991 34.1877,-7.7971 10.7961,-5.3981 20.3926,-12.5955 28.7896,-20.9925 7.7972,-8.9967 14.3948,-19.193 18.5933,-30.5889 4.7982,-11.3959 7.1974,-23.3916 7.1974,-35.3873 z m 246.511,177.536 h -88.768 v -349.0741 h 21.5922 l 29.3894,33.5879 c 14.3948,-12.5954 30.589,-22.7918 48.5825,-29.9892 17.9935,-7.1974 37.1866,-10.1963 56.9794,-10.1963 20.9925,0 41.3851,3.5987 59.9784,11.9957 19.1931,7.7972 35.987,19.1931 49.782,33.5879 14.3948,14.3948 25.1909,30.5889 33.5879,49.782 8.397,19.193 11.9957,39.5857 11.9957,61.1779 v 199.1282 h -88.768 v -199.1282 c 0,-9.5965 -1.7993,-17.9935 -5.398,-26.3905 -3.5987,-7.7972 -8.397,-14.9946 -14.3948,-20.9924 -5.9979,-5.9979 -13.1953,-10.7961 -20.9925,-14.3948 -8.3969,-3.5987 -16.7939,-5.3981 -25.7907,-5.3981 -9.5965,0 -17.9935,1.7994 -26.3904,5.3981 -8.397,3.5987 -15.5944,8.3969 -21.5922,14.3948 -5.9979,5.9978 -10.7961,13.1952 -14.3948,20.9924 -3.5987,8.397 -5.3981,16.794 -5.3981,26.3905 z m 624.3747,0 h -21.5922 l -34.7875,-47.9827 c -8.397,7.7972 -17.3937,14.9946 -26.9902,21.5922 -8.9968,6.5976 -19.1931,12.5954 -29.3894,17.3937 -10.7961,4.7983 -21.5922,8.9968 -32.3883,11.3959 -10.7962,2.9989 -22.192,4.1985 -33.5879,4.1985 -24.5911,0 -47.3829,-4.1985 -68.9751,-13.795 -21.5922,-8.9968 -40.7853,-22.192 -56.9795,-38.3862 -16.1941,-16.1941 -28.7896,-35.987 -38.3861,-58.179 -8.9968,-22.7918 -13.795,-47.3829 -13.795,-73.7734 0,-26.3904 4.7982,-50.9816 13.795,-73.1736 9.5965,-22.7918 22.192,-42.5846 38.3861,-58.7788 16.1942,-16.7939 35.3873,-29.3893 56.9795,-38.9859 21.5922,-9.5965 44.384,-13.795 68.9751,-13.795 7.7972,0 16.1941,0.5998 24.5911,1.7994 8.397,1.1995 16.1942,3.5987 24.5911,5.9978 7.7972,2.9989 14.9946,7.1974 22.192,11.9957 7.1974,4.7982 12.5955,10.7961 17.3937,17.3937 v -163.1411 h 89.9676 z m -89.9676,-177.536 c 0,-11.9956 -2.3991,-23.9913 -6.5976,-35.3872 -4.7982,-11.3959 -11.3959,-21.5923 -19.1931,-30.589 -8.3969,-8.397 -17.3937,-15.5944 -28.1898,-20.9924 -10.7961,-5.3981 -22.192,-7.7972 -34.7874,-7.7972 -11.9957,0 -23.3916,1.7993 -34.1877,6.5976 -10.7961,4.1985 -20.3926,10.1963 -28.1898,18.5933 -7.7972,7.7972 -14.3948,17.9935 -18.5933,29.9892 -4.7983,11.3959 -7.1974,24.5912 -7.1974,39.5857 0,13.1953 2.3991,25.1909 7.1974,36.5868 4.1985,11.3959 10.7961,21.5922 18.5933,30.589 7.7972,8.397 17.3937,15.5944 28.1898,20.3926 10.7961,4.7983 22.192,7.1974 34.1877,7.1974 12.5954,0 23.9913,-2.3991 34.7874,-7.7971 10.7961,-5.3981 19.7929,-12.5955 28.1898,-20.9925 7.7972,-8.9967 14.3949,-19.193 19.1931,-30.5889 4.1985,-11.3959 6.5976,-23.3916 6.5976,-35.3873 z"
+               id="path13"
+               style="stroke-width:1" />
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/logo/installer_banner.png b/logo/installer_banner.png
new file mode 100644
index 00000000..8c61a683
Binary files /dev/null and b/logo/installer_banner.png differ
diff --git a/logo/installer_banner.svg b/logo/installer_banner.svg
new file mode 100644
index 00000000..58144d9e
--- /dev/null
+++ b/logo/installer_banner.svg
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Creator: CorelDRAW X7 -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xml:space="preserve"
+   width="493"
+   height="58"
+   version="1.1"
+   style="clip-rule:evenodd;fill-rule:evenodd;image-rendering:optimizeQuality;shape-rendering:geometricPrecision;text-rendering:geometricPrecision"
+   viewBox="0 0 13044.169 1534.8854"
+   id="svg15"
+   sodipodi:docname="installer_banner.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   inkscape:export-filename="E:\Code\audio-band\logo\installer_banner.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"><metadata
+   id="metadata19"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1027"
+   id="namedview17"
+   showgrid="false"
+   inkscape:zoom="1.7333998"
+   inkscape:cx="241.03224"
+   inkscape:cy="110.96022"
+   inkscape:window-x="-8"
+   inkscape:window-y="193"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="layer7"
+   units="px"
+   fit-margin-top="0"
+   fit-margin-left="0"
+   fit-margin-right="0"
+   fit-margin-bottom="0" />
+ <defs
+   id="defs4">
+  <style
+   type="text/css"
+   id="style2">
+   <![CDATA[
+    .fil0 {fill:#1D1819}
+    .fil1 {fill:#1D1819;fill-rule:nonzero}
+   ]]>
+  </style>
+ </defs>
+ 
+<g
+   inkscape:groupmode="layer"
+   id="layer7"
+   inkscape:label="Layer 2"><rect
+     style="opacity:0.97000002;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:100.03218079;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:100.03218557, 100.03218557;stroke-dashoffset:0;stroke-opacity:1"
+     id="rect1117"
+     width="13046.526"
+     height="1534.8854"
+     x="-1.17845"
+     y="4.0259065e-06" /></g><g
+   inkscape:groupmode="layer"
+   id="layer6"
+   inkscape:label="Layer 1"
+   sodipodi:insensitive="true"><g
+     style="clip-rule:evenodd;fill-rule:evenodd;image-rendering:optimizeQuality;shape-rendering:geometricPrecision;text-rendering:geometricPrecision"
+     id="Layer_x0020_1"
+     transform="translate(-1.42845,-598.86462)">
+  <metadata
+   id="CorelCorpID_0Corel-Layer" />
+  <g
+   id="_853208464"
+   transform="matrix(0.7138026,0,0,0.71933704,0.07154935,598.86461)"
+   style="stroke-width:1.39554787">
+   <g
+   id="g9"
+   style="stroke-width:1.39554787"
+   transform="translate(15468.156)">
+    <path
+   class="fil0"
+   d="m 1811,732 c 96,212 96,457 0,669 v 0 c -7,16 -11,34 -11,52 0,69 57,125 126,125 52,0 98,-32 116,-78 121,-272 122,-585 4,-858 -17,-51 -64,-87 -120,-87 -69,0 -125,56 -125,125 0,19 4,36 11,52 z m -654,496 211,-122 v 0 c 7,-4 13,-10 18,-18 13,-24 5,-54 -18,-67 L 1157,899 950,780 c -8,-6 -18,-9 -29,-9 -27,0 -49,22 -49,49 v 243 244 0 c 0,8 2,16 7,24 13,24 43,32 67,18 l 208,-120 c 1,0 2,-1 3,-1 z M 587,587 c -265,266 -265,696 0,962 266,266 697,266 962,0 50,-50 50,-130 0,-180 -49,-49 -130,-49 -179,0 v 0 c -167,167 -436,167 -603,0 -166,-166 -166,-436 0,-602 167,-166 436,-166 603,0 49,50 130,50 179,0 50,-50 50,-130 0,-180 v 0 C 1284,322 853,322 587,587 Z M 313,312 c -7,7 -13,14 -19,20 -7,7 -13,14 -19,20 -6,7 -12,14 -18,21 -6,7 -12,14 -17,21 -6,6 -12,14 -17,21 -6,7 -11,14 -16,21 -6,7 -11,15 -16,22 -5,7 -10,14 -15,22 v 0 c -5,7 -10,15 -14,22 -5,8 -10,15 -14,23 -4,7 -9,15 -13,23 -4,7 -9,15 -13,23 v 0 c -4,7 -8,15 -12,23 v 0 c -3,8 -7,16 -11,24 v 0 c -3,8 -7,15 -10,23 -4,8 -7,16 -11,24 v 0 c -3,8 -6,16 -9,25 v 0 c -3,8 -6,16 -9,24 v 0 c -3,8 -5,16 -8,24 v 0 c -3,9 -5,17 -8,25 v 0 c -2,8 -5,17 -7,25 v 0 c -2,8 -4,17 -6,25 v 0 c -2,8 -4,17 -6,25 v 0 c -2,8 -4,17 -5,25 v 0 c -2,8 -3,17 -5,25 v 0 c -1,9 -2,17 -4,26 v 0 c -1,8 -2,17 -3,25 v 0 c -1,9 -2,17 -3,26 v 0 c -1,8 -1,17 -2,25 v 0 c -1,9 -1,17 -1,26 v 0 c -1,8 -1,17 -1,25 v 0 c -1,17 -1,34 0,51 v 0 c 0,9 0,17 1,26 v 0 c 0,9 0,17 1,26 v 0 c 1,8 1,17 2,25 v 0 c 1,9 2,17 3,26 v 0 c 1,8 2,16 3,25 2,8 3,17 4,25 v 0 c 2,9 3,17 5,26 v 0 c 3,16 7,33 11,50 v 0 c 2,8 4,16 6,25 v 0 c 2,8 5,16 7,25 v 0 c 5,16 10,32 16,49 v 0 c 51,146 136,284 253,401 2,3 5,5 7,7 4,4 8,8 11,11 3,3 6,6 9,9 4,3 7,6 11,9 3,3 6,6 9,8 3,4 7,7 11,10 3,3 6,5 9,8 4,3 7,6 10,9 4,2 7,5 11,8 3,3 6,5 10,8 3,3 7,5 10,8 3,2 7,5 10,8 4,2 7,5 11,7 3,3 7,5 10,8 4,2 7,5 11,7 3,3 7,5 10,7 4,3 8,5 11,8 4,2 7,4 10,6 4,2 8,5 12,7 3,2 7,5 10,7 4,2 8,4 12,6 3,2 7,4 10,6 4,3 8,5 12,7 3,2 6,4 9,5 17,9 33,17 50,25 2,1 5,3 7,4 5,2 9,4 14,6 3,1 6,3 9,4 4,2 9,4 14,6 3,1 6,3 9,4 4,2 9,4 14,6 3,1 6,2 9,3 4,2 9,4 14,5 3,1 6,3 9,4 5,1 10,3 14,5 3,1 6,2 9,3 5,1 10,3 15,4 l 9,3 c 5,2 10,3 15,4 3,1 5,2 8,3 5,1 11,3 16,4 2,1 5,1 7,2 6,1 11,3 17,4 2,1 4,1 6,2 6,1 12,2 18,4 h 3 c 37,8 75,14 113,18 h 2 c 7,1 14,1 20,2 h 4 c 7,1 13,1 20,2 h 5 c 6,0 12,1 19,1 h 5 c 6,0 13,0 19,0 h 4 c 7,1 14,1 21,0 h 3 c 7,0 14,0 21,0 h 3 c 7,0 14,-1 21,-1 h 1 c 213,-12 423,-87 600,-226 v 0 c 33,-26 65,-54 95,-85 50,-50 50,-131 0,-181 -50,-50 -131,-50 -180,0 -317,317 -831,317 -1147,0 -317,-316 -317,-830 0,-1147 316,-316 830,-316 1147,0 v 0 l 1,2 c 50,50 131,50 181,0 50,-50 50,-131 0,-181 l -2,-1 v -1 C 1691,182 1536,93 1371,44 v 0 c -8,-2 -17,-5 -25,-7 v 0 c -8,-2 -17,-4 -25,-6 v 0 c -25,-7 -50,-12 -75,-16 v 0 C 1212,9 1178,5 1144,3 v 0 c -17,-1 -34,-2 -51,-3 v 0 c -9,0 -17,0 -26,0 v 0 c -8,0 -17,0 -25,0 v 0 c -9,1 -18,1 -26,1 v 0 c -9,1 -17,1 -26,2 v 0 c -8,0 -17,1 -25,2 v 0 c -9,1 -17,2 -26,3 v 0 c -8,1 -17,2 -25,3 v 0 c -9,1 -17,3 -25,4 v 0 c -9,1 -17,3 -26,5 v 0 c -8,1 -16,3 -25,5 v 0 c -8,2 -17,4 -25,6 v 0 c -8,2 -17,4 -25,6 v 0 c -8,2 -16,5 -25,7 v 0 c -8,2 -16,5 -24,8 v 0 c -8,2 -17,5 -25,8 v 0 c -8,3 -16,6 -24,9 v 0 c -8,3 -16,6 -24,9 v 0 c -8,3 -16,7 -24,10 v 0 c -8,4 -16,7 -24,11 v 0 c -8,4 -16,7 -24,11 v 0 c -7,4 -15,8 -23,12 v 0 c -8,4 -15,8 -23,13 -8,4 -15,8 -23,13 v 0 c -8,4 -15,9 -23,13 v 0 c -7,5 -14,10 -22,15 v 0 c -7,5 -15,10 -22,15 v 0 c -7,5 -14,10 -22,15 -7,6 -14,11 -21,16 v 0 c -7,6 -14,12 -21,17 -7,6 -14,12 -21,18 v 0 c -7,6 -14,12 -20,18 -7,6 -14,12 -20,18 -7,7 -14,13 -20,19 z m 1419,885 c 8,-42 12,-85 12,-129 0,-44 -4,-88 -12,-130 l -1,1 c -10,-59 -60,-103 -120,-103 -68,0 -122,57 -122,127 0,8 0,16 2,24 h -1 c 5,26 8,53 8,81 0,28 -3,55 -8,81 h 1 c -2,8 -2,16 -2,24 0,70 54,126 122,126 60,0 110,-44 120,-102 z m 602,568 v -1 c 1,-1 2,-2 3,-4 112,-206 176,-442 176,-693 0,-254 -65,-492 -179,-699 -21,-40 -64,-68 -112,-68 -70,0 -127,57 -127,127 0,23 7,45 18,63 94,171 148,368 148,577 0,207 -53,401 -146,571 v 0 c -10,19 -17,40 -17,64 0,69 57,126 127,126 46,0 87,-25 109,-63 z M 2113,490 Z"
+   id="path7"
+   inkscape:connector-curvature="0"
+   style="fill:#1d1819;stroke-width:1.39554787" />
+   </g>
+   
+  </g>
+ </g></g></svg>
\ No newline at end of file
diff --git a/logo/logo_512.png b/logo/logo_512.png
index 0c738ef7..3a067435 100644
Binary files a/logo/logo_512.png and b/logo/logo_512.png differ
diff --git a/src/AudioBand.AudioSource/AudioBand.AudioSource.csproj b/src/AudioBand.AudioSource/AudioBand.AudioSource.csproj
index 2ce713ca..59cabdbe 100644
--- a/src/AudioBand.AudioSource/AudioBand.AudioSource.csproj
+++ b/src/AudioBand.AudioSource/AudioBand.AudioSource.csproj
@@ -46,6 +46,37 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>..\AudioBandRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DocumentationFile>bin\Debug\AudioBand.AudioSource.xml</DocumentationFile>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>..\AudioBandRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile>bin\Release\AudioBand.AudioSource.xml</DocumentationFile>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>..\AudioBandRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Test|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Test\</OutputPath>
+    <DefineConstants>CODE_ANALYSIS;CODE_ANALYSIS;DEBUG;TRACE</DefineConstants>
+    <DocumentationFile>bin\Debug\AudioBand.AudioSource.xml</DocumentationFile>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>..\AudioBandRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
diff --git a/src/AudioBand.Logging/AudioBand.Logging.csproj b/src/AudioBand.Logging/AudioBand.Logging.csproj
index 2bc28b3c..6e5a9557 100644
--- a/src/AudioBand.Logging/AudioBand.Logging.csproj
+++ b/src/AudioBand.Logging/AudioBand.Logging.csproj
@@ -42,6 +42,34 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>..\AudioBandRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DocumentationFile>bin\Debug\AudioBand.Logging.xml</DocumentationFile>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>..\AudioBandRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>..\AudioBandRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Test|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Test\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>..\AudioBandRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/src/AudioBand.Test/AudioBand.Test.csproj b/src/AudioBand.Test/AudioBand.Test.csproj
index 73136727..7331766e 100644
--- a/src/AudioBand.Test/AudioBand.Test.csproj
+++ b/src/AudioBand.Test/AudioBand.Test.csproj
@@ -51,6 +51,33 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Test|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Test\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
diff --git a/src/AudioBand.Test/AudioBandViewModelTests.cs b/src/AudioBand.Test/AudioBandViewModelTests.cs
index cbe7861e..6f3adeaf 100644
--- a/src/AudioBand.Test/AudioBandViewModelTests.cs
+++ b/src/AudioBand.Test/AudioBandViewModelTests.cs
@@ -29,7 +29,7 @@ public void AudioBandViewModelListensToProfileChanges()
             _appSettings.SetupSequence(m => m.AudioBand)
                 .Returns(first)
                 .Returns(second);
-            var vm = new AudioBandViewModel(_appSettings.Object);
+            var vm = new AudioBandViewModel(_appSettings.Object, new Mock<IDialogService>().Object);
 
             bool raised = false;
             vm.PropertyChanged += (_, __) => raised = true;
diff --git a/src/AudioBand.sln b/src/AudioBand.sln
index f7bc850a..34643bd1 100644
--- a/src/AudioBand.sln
+++ b/src/AudioBand.sln
@@ -19,58 +19,118 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AudioSourceHost", "AudioSou
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AudioBand.Logging", "AudioBand.Logging\AudioBand.Logging.csproj", "{D8E1D3E5-D0AB-43C4-8AF6-60C14C5C6843}"
 EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "AudioBandInstaller", "AudioBandInstaller\AudioBandInstaller.wixproj", "{4E9EEE47-23F6-45B7-9DDB-A34731D6AE4A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
 		Test|Any CPU = Test|Any CPU
+		Test|x64 = Test|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{B69832AD-8373-47AC-A52A-183238903896}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B69832AD-8373-47AC-A52A-183238903896}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B69832AD-8373-47AC-A52A-183238903896}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B69832AD-8373-47AC-A52A-183238903896}.Debug|x64.Build.0 = Debug|Any CPU
 		{B69832AD-8373-47AC-A52A-183238903896}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B69832AD-8373-47AC-A52A-183238903896}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B69832AD-8373-47AC-A52A-183238903896}.Release|x64.ActiveCfg = Release|Any CPU
+		{B69832AD-8373-47AC-A52A-183238903896}.Release|x64.Build.0 = Release|Any CPU
 		{B69832AD-8373-47AC-A52A-183238903896}.Test|Any CPU.ActiveCfg = Test|Any CPU
 		{B69832AD-8373-47AC-A52A-183238903896}.Test|Any CPU.Build.0 = Test|Any CPU
+		{B69832AD-8373-47AC-A52A-183238903896}.Test|x64.ActiveCfg = Test|Any CPU
+		{B69832AD-8373-47AC-A52A-183238903896}.Test|x64.Build.0 = Test|Any CPU
 		{30F2BFEA-788A-494D-88E7-F2070528EBEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{30F2BFEA-788A-494D-88E7-F2070528EBEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{30F2BFEA-788A-494D-88E7-F2070528EBEA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{30F2BFEA-788A-494D-88E7-F2070528EBEA}.Debug|x64.Build.0 = Debug|Any CPU
 		{30F2BFEA-788A-494D-88E7-F2070528EBEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{30F2BFEA-788A-494D-88E7-F2070528EBEA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{30F2BFEA-788A-494D-88E7-F2070528EBEA}.Release|x64.ActiveCfg = Release|Any CPU
+		{30F2BFEA-788A-494D-88E7-F2070528EBEA}.Release|x64.Build.0 = Release|Any CPU
 		{30F2BFEA-788A-494D-88E7-F2070528EBEA}.Test|Any CPU.ActiveCfg = Test|Any CPU
 		{30F2BFEA-788A-494D-88E7-F2070528EBEA}.Test|Any CPU.Build.0 = Test|Any CPU
+		{30F2BFEA-788A-494D-88E7-F2070528EBEA}.Test|x64.ActiveCfg = Test|Any CPU
+		{30F2BFEA-788A-494D-88E7-F2070528EBEA}.Test|x64.Build.0 = Test|Any CPU
 		{43B57D81-7FAE-40D0-921E-E29F7E848288}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{43B57D81-7FAE-40D0-921E-E29F7E848288}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{43B57D81-7FAE-40D0-921E-E29F7E848288}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{43B57D81-7FAE-40D0-921E-E29F7E848288}.Debug|x64.Build.0 = Debug|Any CPU
 		{43B57D81-7FAE-40D0-921E-E29F7E848288}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{43B57D81-7FAE-40D0-921E-E29F7E848288}.Release|Any CPU.Build.0 = Release|Any CPU
+		{43B57D81-7FAE-40D0-921E-E29F7E848288}.Release|x64.ActiveCfg = Release|Any CPU
+		{43B57D81-7FAE-40D0-921E-E29F7E848288}.Release|x64.Build.0 = Release|Any CPU
 		{43B57D81-7FAE-40D0-921E-E29F7E848288}.Test|Any CPU.ActiveCfg = Test|Any CPU
+		{43B57D81-7FAE-40D0-921E-E29F7E848288}.Test|x64.ActiveCfg = Test|Any CPU
+		{43B57D81-7FAE-40D0-921E-E29F7E848288}.Test|x64.Build.0 = Test|Any CPU
 		{E5E9CB59-C8CF-4042-9C13-F216153334B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E5E9CB59-C8CF-4042-9C13-F216153334B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5E9CB59-C8CF-4042-9C13-F216153334B6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E5E9CB59-C8CF-4042-9C13-F216153334B6}.Debug|x64.Build.0 = Debug|Any CPU
 		{E5E9CB59-C8CF-4042-9C13-F216153334B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E5E9CB59-C8CF-4042-9C13-F216153334B6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5E9CB59-C8CF-4042-9C13-F216153334B6}.Release|x64.ActiveCfg = Release|Any CPU
+		{E5E9CB59-C8CF-4042-9C13-F216153334B6}.Release|x64.Build.0 = Release|Any CPU
 		{E5E9CB59-C8CF-4042-9C13-F216153334B6}.Test|Any CPU.ActiveCfg = Test|Any CPU
 		{E5E9CB59-C8CF-4042-9C13-F216153334B6}.Test|Any CPU.Build.0 = Test|Any CPU
+		{E5E9CB59-C8CF-4042-9C13-F216153334B6}.Test|x64.ActiveCfg = Test|Any CPU
+		{E5E9CB59-C8CF-4042-9C13-F216153334B6}.Test|x64.Build.0 = Test|Any CPU
 		{6D881B7B-3F3F-4613-A83F-75E31EEA5252}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6D881B7B-3F3F-4613-A83F-75E31EEA5252}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6D881B7B-3F3F-4613-A83F-75E31EEA5252}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6D881B7B-3F3F-4613-A83F-75E31EEA5252}.Debug|x64.Build.0 = Debug|Any CPU
 		{6D881B7B-3F3F-4613-A83F-75E31EEA5252}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6D881B7B-3F3F-4613-A83F-75E31EEA5252}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6D881B7B-3F3F-4613-A83F-75E31EEA5252}.Release|x64.ActiveCfg = Release|Any CPU
+		{6D881B7B-3F3F-4613-A83F-75E31EEA5252}.Release|x64.Build.0 = Release|Any CPU
 		{6D881B7B-3F3F-4613-A83F-75E31EEA5252}.Test|Any CPU.ActiveCfg = Test|Any CPU
+		{6D881B7B-3F3F-4613-A83F-75E31EEA5252}.Test|x64.ActiveCfg = Test|Any CPU
+		{6D881B7B-3F3F-4613-A83F-75E31EEA5252}.Test|x64.Build.0 = Test|Any CPU
 		{741DB79C-921D-4D91-85F1-CD10C746F46E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{741DB79C-921D-4D91-85F1-CD10C746F46E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{741DB79C-921D-4D91-85F1-CD10C746F46E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{741DB79C-921D-4D91-85F1-CD10C746F46E}.Debug|x64.Build.0 = Debug|Any CPU
 		{741DB79C-921D-4D91-85F1-CD10C746F46E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{741DB79C-921D-4D91-85F1-CD10C746F46E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{741DB79C-921D-4D91-85F1-CD10C746F46E}.Release|x64.ActiveCfg = Release|Any CPU
+		{741DB79C-921D-4D91-85F1-CD10C746F46E}.Release|x64.Build.0 = Release|Any CPU
 		{741DB79C-921D-4D91-85F1-CD10C746F46E}.Test|Any CPU.ActiveCfg = Test|Any CPU
+		{741DB79C-921D-4D91-85F1-CD10C746F46E}.Test|x64.ActiveCfg = Test|Any CPU
+		{741DB79C-921D-4D91-85F1-CD10C746F46E}.Test|x64.Build.0 = Test|Any CPU
 		{D3F92C3E-E546-4A6B-ADA2-FACD95E229F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D3F92C3E-E546-4A6B-ADA2-FACD95E229F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D3F92C3E-E546-4A6B-ADA2-FACD95E229F7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D3F92C3E-E546-4A6B-ADA2-FACD95E229F7}.Debug|x64.Build.0 = Debug|Any CPU
 		{D3F92C3E-E546-4A6B-ADA2-FACD95E229F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D3F92C3E-E546-4A6B-ADA2-FACD95E229F7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D3F92C3E-E546-4A6B-ADA2-FACD95E229F7}.Release|x64.ActiveCfg = Release|Any CPU
+		{D3F92C3E-E546-4A6B-ADA2-FACD95E229F7}.Release|x64.Build.0 = Release|Any CPU
 		{D3F92C3E-E546-4A6B-ADA2-FACD95E229F7}.Test|Any CPU.ActiveCfg = Test|Any CPU
 		{D3F92C3E-E546-4A6B-ADA2-FACD95E229F7}.Test|Any CPU.Build.0 = Test|Any CPU
+		{D3F92C3E-E546-4A6B-ADA2-FACD95E229F7}.Test|x64.ActiveCfg = Test|Any CPU
+		{D3F92C3E-E546-4A6B-ADA2-FACD95E229F7}.Test|x64.Build.0 = Test|Any CPU
 		{D8E1D3E5-D0AB-43C4-8AF6-60C14C5C6843}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D8E1D3E5-D0AB-43C4-8AF6-60C14C5C6843}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D8E1D3E5-D0AB-43C4-8AF6-60C14C5C6843}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D8E1D3E5-D0AB-43C4-8AF6-60C14C5C6843}.Debug|x64.Build.0 = Debug|Any CPU
 		{D8E1D3E5-D0AB-43C4-8AF6-60C14C5C6843}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D8E1D3E5-D0AB-43C4-8AF6-60C14C5C6843}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D8E1D3E5-D0AB-43C4-8AF6-60C14C5C6843}.Release|x64.ActiveCfg = Release|Any CPU
+		{D8E1D3E5-D0AB-43C4-8AF6-60C14C5C6843}.Release|x64.Build.0 = Release|Any CPU
 		{D8E1D3E5-D0AB-43C4-8AF6-60C14C5C6843}.Test|Any CPU.ActiveCfg = Test|Any CPU
 		{D8E1D3E5-D0AB-43C4-8AF6-60C14C5C6843}.Test|Any CPU.Build.0 = Test|Any CPU
+		{D8E1D3E5-D0AB-43C4-8AF6-60C14C5C6843}.Test|x64.ActiveCfg = Test|Any CPU
+		{D8E1D3E5-D0AB-43C4-8AF6-60C14C5C6843}.Test|x64.Build.0 = Test|Any CPU
+		{4E9EEE47-23F6-45B7-9DDB-A34731D6AE4A}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{4E9EEE47-23F6-45B7-9DDB-A34731D6AE4A}.Debug|x64.ActiveCfg = Debug|x64
+		{4E9EEE47-23F6-45B7-9DDB-A34731D6AE4A}.Release|Any CPU.ActiveCfg = Release|x64
+		{4E9EEE47-23F6-45B7-9DDB-A34731D6AE4A}.Release|x64.ActiveCfg = Release|x64
+		{4E9EEE47-23F6-45B7-9DDB-A34731D6AE4A}.Release|x64.Build.0 = Release|x64
+		{4E9EEE47-23F6-45B7-9DDB-A34731D6AE4A}.Test|Any CPU.ActiveCfg = Release|x64
+		{4E9EEE47-23F6-45B7-9DDB-A34731D6AE4A}.Test|x64.ActiveCfg = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/AudioBand/AudioBand.csproj b/src/AudioBand/AudioBand.csproj
index d51e1dbe..5205809e 100644
--- a/src/AudioBand/AudioBand.csproj
+++ b/src/AudioBand/AudioBand.csproj
@@ -55,6 +55,34 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>..\AudioBandRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;DESKBAND_WPF</DefineConstants>
+    <DocumentationFile>bin\Debug\AudioBand.xml</DocumentationFile>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>..\AudioBandRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE;DESKBAND_WPF</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>..\AudioBandRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Test|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Test\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;DESKBAND_WPF</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>..\AudioBandRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -71,6 +99,7 @@
     <Compile Include="AudioSource\AudioSourceProxy.cs" />
     <Compile Include="AudioSource\IAudioSourceManager.cs" />
     <Compile Include="AudioSource\IInternalAudioSource.cs" />
+    <Compile Include="Behaviors\CanvasPositioning.cs" />
     <Compile Include="Behaviors\Fallback.cs" />
     <Compile Include="Behaviors\RedirectScrolling.cs" />
     <Compile Include="Behaviors\SliderClickAndDrag.cs" />
@@ -82,6 +111,7 @@
     <Compile Include="CSDeskBand\CSDeskBand.cs" />
     <Compile Include="Deskband.cs" />
     <Compile Include="Extensions\ColorExtensions.cs" />
+    <Compile Include="Extensions\DescriptorIgnoreAttribute.cs" />
     <Compile Include="Extensions\EnumExtensions.cs" />
     <Compile Include="Extensions\ImageExtensions.cs" />
     <Compile Include="Extensions\ObjectExtensions.cs" />
@@ -97,9 +127,12 @@
     <Compile Include="Models\ButtonContent.cs" />
     <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" />
+    <Compile Include="Models\PositionAnchors.cs" />
     <Compile Include="Models\PreviousButton.cs" />
     <Compile Include="Models\ProgressBar.cs" />
     <Compile Include="Models\CustomLabel.cs" />
@@ -115,7 +148,7 @@
     <Compile Include="Resources\Theming\IThemeResources.cs" />
     <Compile Include="Resources\Theming\LightThemeResources.cs" />
     <Compile Include="Resources\SharedDictionary.cs" />
-    <Compile Include="Resources\Theming\ThemeResource.cs" />
+    <Compile Include="Resources\Theming\ThemeResourceExtension.cs" />
     <Compile Include="Resources\Theming\ThemeDictionary.cs" />
     <Compile Include="Resources\Theming\ThemeResourceKey.cs" />
     <Compile Include="Settings\IAppSettings.cs" />
@@ -149,6 +182,7 @@
     <Compile Include="Settings\Models\v3\SettingsV3.cs" />
     <Compile Include="Settings\Profiles\SettingsV3Profile.cs" />
     <Compile Include="TaskbarHook.cs" />
+    <Compile Include="ValueConverters\FlagToBoolConverter.cs" />
     <Compile Include="ValueConverters\Converters.cs" />
     <Compile Include="ValueConverters\MultiConverters.cs" />
     <Compile Include="ValueConverters\PathToImageSourceConverter.cs" />
@@ -164,6 +198,7 @@
     <Compile Include="ViewModels\CustomLabelsViewModel.cs" />
     <Compile Include="ViewModels\AboutDialogViewModel.cs" />
     <Compile Include="ViewModels\IDialogService.cs" />
+    <Compile Include="ViewModels\LayoutViewModelBase.cs" />
     <Compile Include="ViewModels\PlayPauseButtonViewModel.cs" />
     <Compile Include="ViewModels\PreviousButtonViewModel.cs" />
     <Compile Include="ViewModels\PropertyChangeBindingAttribute.cs" />
@@ -282,6 +317,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Resources\ContextMenuStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Resources\NavigationPaneStyles.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -310,6 +349,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Resources\Tooltips.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\Settings\AlbumArtSettingsView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -358,6 +401,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\Settings\LayoutSettingsTemplate.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\Settings\PlaybackButtonSettingsView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/src/AudioBand/Behaviors/CanvasPositioning.cs b/src/AudioBand/Behaviors/CanvasPositioning.cs
new file mode 100644
index 00000000..3dd81cd3
--- /dev/null
+++ b/src/AudioBand/Behaviors/CanvasPositioning.cs
@@ -0,0 +1,141 @@
+using System.Windows;
+using System.Windows.Controls;
+using AudioBand.Models;
+
+namespace AudioBand.Behaviors
+{
+    /// <summary>
+    /// Attached properties for changing <see cref="Canvas"/> positioning based on <see cref="PositionAnchor"/> values.
+    /// </summary>
+    public static class CanvasPositioning
+    {
+        /// <summary>
+        /// Identifies the <see cref="GetAnchor"/> attached property.
+        /// </summary>
+        public static readonly DependencyProperty AnchorProperty
+            = DependencyProperty.RegisterAttached("Anchor", typeof(PositionAnchor), typeof(CanvasPositioning), new PropertyMetadata(PositionAnchor.TopLeft, AnchorPropertyChangedCallback));
+
+        /// <summary>
+        /// Identifies the <see cref="GetAnchorXDistance"/> attached property.
+        /// </summary>
+        public static readonly DependencyProperty AnchorXDistanceProperty
+            = DependencyProperty.RegisterAttached("AnchorXDistance", typeof(double), typeof(CanvasPositioning), new PropertyMetadata(0.0, AnchorXPropertyChangedCallback));
+
+        /// <summary>
+        /// Identifies the <see cref="GetAnchorYDistance"/> attached property.
+        /// </summary>
+        public static readonly DependencyProperty AnchorYDistanceProperty
+            = DependencyProperty.RegisterAttached("AnchorYDistance", typeof(double), typeof(CanvasPositioning), new PropertyMetadata(0.0, AnchorYPropertyChangedCallback));
+
+        /// <summary>
+        /// Gets the value of the <see cref="AnchorProperty"/> property.
+        /// </summary>
+        /// <param name="d">The element.</param>
+        /// <returns>The anchor value.</returns>
+        public static PositionAnchor GetAnchor(UIElement d)
+        {
+            return (PositionAnchor)d.GetValue(AnchorProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the <see cref="AnchorProperty"/> property.
+        /// </summary>
+        /// <param name="d">The element.</param>
+        /// <param name="anchor">The value to set.</param>
+        public static void SetAnchor(UIElement d, PositionAnchor anchor)
+        {
+            d.SetValue(AnchorProperty, anchor);
+        }
+
+        /// <summary>
+        /// Gets the value of the <see cref="AnchorXDistanceProperty"/> property.
+        /// </summary>
+        /// <param name="d">The element.</param>
+        /// <returns>The anchor x distance.</returns>
+        public static double GetAnchorXDistance(UIElement d)
+        {
+            return (double)d.GetValue(AnchorXDistanceProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the <see cref="AnchorXDistanceProperty"/> property.
+        /// </summary>
+        /// <param name="d">The element.</param>
+        /// <param name="value">The value to set.</param>
+        public static void SetAnchorXDistance(UIElement d, double value)
+        {
+            d.SetValue(AnchorXDistanceProperty, value);
+        }
+
+        /// <summary>
+        /// Gets the value of the <see cref="AnchorYDistanceProperty"/> property.
+        /// </summary>
+        /// <param name="d">The element.</param>
+        /// <returns>The anchor y distance.</returns>
+        public static double GetAnchorYDistance(UIElement d)
+        {
+            return (double)d.GetValue(AnchorYDistanceProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the <see cref="AnchorYDistanceProperty"/> property.
+        /// </summary>
+        /// <param name="d">The element.</param>
+        /// <param name="value">The value to set.</param>
+        public static void SetAnchorYDistance(UIElement d, double value)
+        {
+            d.SetValue(AnchorYDistanceProperty, value);
+        }
+
+        private static void AnchorPropertyChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            d.SetValue(Canvas.LeftProperty, DependencyProperty.UnsetValue);
+            d.SetValue(Canvas.RightProperty, DependencyProperty.UnsetValue);
+            d.SetValue(Canvas.TopProperty, DependencyProperty.UnsetValue);
+            d.SetValue(Canvas.BottomProperty, DependencyProperty.UnsetValue);
+
+            UpdateX((UIElement)d);
+            UpdateY((UIElement)d);
+        }
+
+        private static void AnchorXPropertyChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            UpdateX((UIElement)d);
+        }
+
+        private static void AnchorYPropertyChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            UpdateY((UIElement)d);
+        }
+
+        private static void UpdateX(UIElement element)
+        {
+            var anchor = GetAnchor(element);
+            var x = GetAnchorXDistance(element);
+
+            if (anchor.HasFlag(PositionAnchor.Left))
+            {
+                Canvas.SetLeft(element, x);
+            }
+            else if (anchor.HasFlag(PositionAnchor.Right))
+            {
+                Canvas.SetRight(element, x);
+            }
+        }
+
+        private static void UpdateY(UIElement element)
+        {
+            var anchor = GetAnchor(element);
+            var y = GetAnchorYDistance(element);
+
+            if (anchor.HasFlag(PositionAnchor.Top))
+            {
+                Canvas.SetTop(element, y);
+            }
+            else if (anchor.HasFlag(PositionAnchor.Bottom))
+            {
+                Canvas.SetBottom(element, y);
+            }
+        }
+    }
+}
diff --git a/src/AudioBand/Extensions/DescriptorIgnoreAttribute.cs b/src/AudioBand/Extensions/DescriptorIgnoreAttribute.cs
new file mode 100644
index 00000000..ca82f86e
--- /dev/null
+++ b/src/AudioBand/Extensions/DescriptorIgnoreAttribute.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace AudioBand.Extensions
+{
+    /// <summary>
+    /// Marks enum field as ignored.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Field)]
+    public class DescriptorIgnoreAttribute : Attribute
+    {
+    }
+}
diff --git a/src/AudioBand/Extensions/EnumExtensions.cs b/src/AudioBand/Extensions/EnumExtensions.cs
index 6b9c6901..cd5fb519 100644
--- a/src/AudioBand/Extensions/EnumExtensions.cs
+++ b/src/AudioBand/Extensions/EnumExtensions.cs
@@ -27,6 +27,7 @@ string GetDescription(FieldInfo fieldInfo)
 
             return enumType
                 .GetFields(BindingFlags.Static | BindingFlags.Public)
+                .Where(field => field.GetCustomAttribute<DescriptorIgnoreAttribute>() == null)
                 .Select(field => new EnumDescriptor<T>((T)field.GetValue(null), GetDescription(field)));
         }
     }
diff --git a/src/AudioBand/Models/AlbumArt.cs b/src/AudioBand/Models/AlbumArt.cs
index 20d1b744..f488ead9 100644
--- a/src/AudioBand/Models/AlbumArt.cs
+++ b/src/AudioBand/Models/AlbumArt.cs
@@ -3,58 +3,19 @@
     /// <summary>
     /// Model for the album art.
     /// </summary>
-    public class AlbumArt : ModelBase
+    public class AlbumArt : LayoutModelBase
     {
-        private bool _isVisible = true;
-        private double _width = 30;
-        private double _height = 30;
-        private double _xPosition = 245;
-        private double _yPosition = 0;
         private string _placeholderPath = "";
 
         /// <summary>
-        /// Gets or sets a value indicating whether the album art is visible.
+        /// Initializes a new instance of the <see cref="AlbumArt"/> class.
         /// </summary>
-        public bool IsVisible
+        public AlbumArt()
         {
-            get => _isVisible;
-            set => SetProperty(ref _isVisible, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the width of the album art.
-        /// </summary>
-        public double Width
-        {
-            get => _width;
-            set => SetProperty(ref _width, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the height of the album art.
-        /// </summary>
-        public double Height
-        {
-            get => _height;
-            set => SetProperty(ref _height, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the x position of the album art.
-        /// </summary>
-        public double XPosition
-        {
-            get => _xPosition;
-            set => SetProperty(ref _xPosition, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the y position of the album art.
-        /// </summary>
-        public double YPosition
-        {
-            get => _yPosition;
-            set => SetProperty(ref _yPosition, value);
+            Width = 30;
+            Height = 30;
+            XPosition = 245;
+            YPosition = 0;
         }
 
         /// <summary>
diff --git a/src/AudioBand/Models/AudioBand.cs b/src/AudioBand/Models/AudioBand.cs
index 2a4426db..c6f7c634 100644
--- a/src/AudioBand/Models/AudioBand.cs
+++ b/src/AudioBand/Models/AudioBand.cs
@@ -1,4 +1,6 @@
-namespace AudioBand.Models
+using System.Windows.Media;
+
+namespace AudioBand.Models
 {
     /// <summary>
     /// The model for the toolbar.
@@ -7,6 +9,7 @@ public class AudioBand : ModelBase
     {
         private double _width = 500;
         private double _height = 30;
+        private Color _backgroundColor = Colors.Transparent;
 
         /// <summary>
         /// Gets or sets the width of the toolbar.
@@ -25,5 +28,14 @@ public double Height
             get => _height;
             set => SetProperty(ref _height, value);
         }
+
+        /// <summary>
+        /// Gets or sets the background color of the toolbar.
+        /// </summary>
+        public Color BackgroundColor
+        {
+            get => _backgroundColor;
+            set => SetProperty(ref _backgroundColor, value);
+        }
     }
 }
diff --git a/src/AudioBand/Models/ButtonModelBase.cs b/src/AudioBand/Models/ButtonModelBase.cs
index bfbaa808..1278da14 100644
--- a/src/AudioBand/Models/ButtonModelBase.cs
+++ b/src/AudioBand/Models/ButtonModelBase.cs
@@ -5,62 +5,12 @@ namespace AudioBand.Models
     /// <summary>
     /// Base model for buttons.
     /// </summary>
-    public class ButtonModelBase : ModelBase
+    public class ButtonModelBase : LayoutModelBase
     {
-        private bool _isVisible = true;
-        private double _width;
-        private double _height;
-        private double _xPosition;
-        private double _yPosition;
         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 a value indicating whether the button is visible.
-        /// </summary>
-        public bool IsVisible
-        {
-            get => _isVisible;
-            set => SetProperty(ref _isVisible, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the width of the button.
-        /// </summary>
-        public double Width
-        {
-            get => _width;
-            set => SetProperty(ref _width, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the height of the button.
-        /// </summary>
-        public double Height
-        {
-            get => _height;
-            set => SetProperty(ref _height, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the x position of the button.
-        /// </summary>
-        public double XPosition
-        {
-            get => _xPosition;
-            set => SetProperty(ref _xPosition, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the y position of the button.
-        /// </summary>
-        public double YPosition
-        {
-            get => _yPosition;
-            set => SetProperty(ref _yPosition, value);
-        }
-
         /// <summary>
         /// Gets or sets the background color.
         /// </summary>
diff --git a/src/AudioBand/Models/CustomLabel.cs b/src/AudioBand/Models/CustomLabel.cs
index dbf844b9..d0c21aa8 100644
--- a/src/AudioBand/Models/CustomLabel.cs
+++ b/src/AudioBand/Models/CustomLabel.cs
@@ -5,13 +5,8 @@ namespace AudioBand.Models
     /// <summary>
     /// Model for a custom label.
     /// </summary>
-    public class CustomLabel : ModelBase
+    public class CustomLabel : LayoutModelBase
     {
-        private bool _isVisible = true;
-        private double _width = 220;
-        private double _height = 15;
-        private double _xPosition = 0;
-        private double _yPosition = 0;
         private string _fontFamily = "Segoe UI";
         private float _fontSize = 8.5f;
         private Color _color = Colors.White;
@@ -25,6 +20,17 @@ public class CustomLabel : ModelBase
         private double _leftFadeOffset = 0.1;
         private double _rightFadeOffset = 0.9;
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CustomLabel"/> class.
+        /// </summary>
+        public CustomLabel()
+        {
+            Width = 220;
+            Height = 15;
+            YPosition = 0;
+            XPosition = 0;
+        }
+
         /// <summary>
         /// Specifies the alignment of the text in the label.
         /// </summary>
@@ -46,51 +52,6 @@ public enum TextAlignment
             Center,
         }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether if the label is visible.
-        /// </summary>
-        public bool IsVisible
-        {
-            get => _isVisible;
-            set => SetProperty(ref _isVisible, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the width of the label.
-        /// </summary>
-        public double Width
-        {
-            get => _width;
-            set => SetProperty(ref _width, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the height of the label.
-        /// </summary>
-        public double Height
-        {
-            get => _height;
-            set => SetProperty(ref _height, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the x position of the label.
-        /// </summary>
-        public double XPosition
-        {
-            get => _xPosition;
-            set => SetProperty(ref _xPosition, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the y position of the label.
-        /// </summary>
-        public double YPosition
-        {
-            get => _yPosition;
-            set => SetProperty(ref _yPosition, value);
-        }
-
         /// <summary>
         /// Gets or sets the font family of the label.
         /// </summary>
diff --git a/src/AudioBand/Models/LayoutModelBase.cs b/src/AudioBand/Models/LayoutModelBase.cs
new file mode 100644
index 00000000..2fe85784
--- /dev/null
+++ b/src/AudioBand/Models/LayoutModelBase.cs
@@ -0,0 +1,69 @@
+namespace AudioBand.Models
+{
+    /// <summary>
+    /// Base model that contains support for layout.
+    /// </summary>
+    public class LayoutModelBase : ModelBase
+    {
+        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);
+        }
+
+        /// <summary>
+        /// Gets or sets the width.
+        /// </summary>
+        public double Width
+        {
+            get => _width;
+            set => SetProperty(ref _width, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the height.
+        /// </summary>
+        public double Height
+        {
+            get => _height;
+            set => SetProperty(ref _height, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the x position.
+        /// </summary>
+        public double XPosition
+        {
+            get => _xPosition;
+            set => SetProperty(ref _xPosition, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the y position.
+        /// </summary>
+        public double YPosition
+        {
+            get => _yPosition;
+            set => SetProperty(ref _yPosition, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the positioning.
+        /// </summary>
+        public PositionAnchor Anchor
+        {
+            get => _positionAnchor;
+            set => SetProperty(ref _positionAnchor, value);
+        }
+    }
+}
diff --git a/src/AudioBand/Models/PositionAnchor.cs b/src/AudioBand/Models/PositionAnchor.cs
new file mode 100644
index 00000000..3edf4cb9
--- /dev/null
+++ b/src/AudioBand/Models/PositionAnchor.cs
@@ -0,0 +1,61 @@
+using System;
+using System.ComponentModel;
+using AudioBand.Extensions;
+
+namespace AudioBand.Models
+{
+    /// <summary>
+    /// Specifies the anchor behavior of the position of controls.
+    /// </summary>
+    [Flags]
+    public enum PositionAnchor
+    {
+        /// <summary>
+        /// Anchor to the top.
+        /// </summary>
+        [DescriptorIgnore]
+        Top = 1,
+
+        /// <summary>
+        /// Anchor to the right.
+        /// </summary>
+        [DescriptorIgnore]
+        Right = 1 << 1,
+
+        /// <summary>
+        /// Anchor to the bottom.
+        /// </summary>
+        [DescriptorIgnore]
+        Bottom = 1 << 2,
+
+        /// <summary>
+        /// Anchor to the left.
+        /// </summary>
+        [DescriptorIgnore]
+        Left = 1 << 3,
+
+        /// <summary>
+        /// Anchor to top left.
+        /// </summary>
+        [Description("Relative to top left")]
+        TopLeft = Top | Left,
+
+        /// <summary>
+        /// Anchor to top right.
+        /// </summary>
+        [Description("Relative to top right")]
+        TopRight = Top | Right,
+
+        /// <summary>
+        /// Anchor to bottom right.
+        /// </summary>
+        [Description("Relative to bottom right")]
+        BottomRight = Bottom | Right,
+
+        /// <summary>
+        /// Anchor to bottom left.
+        /// </summary>
+        [Description("Relative to bottom left")]
+        BottomLeft = Bottom | Left,
+    }
+}
diff --git a/src/AudioBand/Models/PositionAnchors.cs b/src/AudioBand/Models/PositionAnchors.cs
new file mode 100644
index 00000000..3a2e7d35
--- /dev/null
+++ b/src/AudioBand/Models/PositionAnchors.cs
@@ -0,0 +1,16 @@
+using System.Collections.Generic;
+using AudioBand.Extensions;
+
+namespace AudioBand.Models
+{
+    /// <summary>
+    /// Static properties for <see cref="PositionAnchor"/>.
+    /// </summary>
+    public static class PositionAnchors
+    {
+        /// <summary>
+        /// Gets the values for a <see cref="PositionAnchor"/>.
+        /// </summary>
+        public static IEnumerable<EnumDescriptor<PositionAnchor>> Values { get; } = typeof(PositionAnchor).GetEnumDescriptors<PositionAnchor>();
+    }
+}
diff --git a/src/AudioBand/Models/ProgressBar.cs b/src/AudioBand/Models/ProgressBar.cs
index 5b4637c0..99ae31cc 100644
--- a/src/AudioBand/Models/ProgressBar.cs
+++ b/src/AudioBand/Models/ProgressBar.cs
@@ -5,16 +5,22 @@ namespace AudioBand.Models
     /// <summary>
     /// Model for the progress bar.
     /// </summary>
-    public class ProgressBar : ModelBase
+    public class ProgressBar : LayoutModelBase
     {
         private Color _foregroundColor = Colors.DodgerBlue;
         private Color _backgroundColor = Colors.DimGray;
         private Color _hoverColor = Colors.DeepSkyBlue;
-        private bool _isVisible = true;
-        private double _xPosition = 325;
-        private double _yPosition = 22;
-        private double _width = 130;
-        private double _height = 4;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ProgressBar"/> class.
+        /// </summary>
+        public ProgressBar()
+        {
+            Width = 130;
+            Height = 4;
+            XPosition = 325;
+            YPosition = 22;
+        }
 
         /// <summary>
         /// Gets or sets the foreground color.
@@ -42,50 +48,5 @@ public Color HoverColor
             get => _hoverColor;
             set => SetProperty(ref _hoverColor, value);
         }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the progress bar is visible.
-        /// </summary>
-        public bool IsVisible
-        {
-            get => _isVisible;
-            set => SetProperty(ref _isVisible, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the width of the progress bar.
-        /// </summary>
-        public double Width
-        {
-            get => _width;
-            set => SetProperty(ref _width, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the height of the progress bar.
-        /// </summary>
-        public double Height
-        {
-            get => _height;
-            set => SetProperty(ref _height, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the x position of the progress bar.
-        /// </summary>
-        public double XPosition
-        {
-            get => _xPosition;
-            set => SetProperty(ref _xPosition, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the y position of the progress bar.
-        /// </summary>
-        public double YPosition
-        {
-            get => _yPosition;
-            set => SetProperty(ref _yPosition, value);
-        }
     }
 }
diff --git a/src/AudioBand/NativeMethods.cs b/src/AudioBand/NativeMethods.cs
index fc53aade..056e5a4f 100644
--- a/src/AudioBand/NativeMethods.cs
+++ b/src/AudioBand/NativeMethods.cs
@@ -50,27 +50,35 @@ public static void SetWindowAppId(IntPtr hwnd, string appId)
             PROPVARIANT.ClearProp(appid);
         }
 
-        // Fix blur in windows 1903 causing lag by falling back to old blur behind.
-        public static void FixWindowComposition(Window w)
+        public static void DisableAcrylic(Window w)
         {
-            var win1903 = new Version(10, 0, 18362);
-            if (Environment.OSVersion.Version < win1903)
-            {
-                return;
-            }
+            ChangeComposition(w, AccentState.ACCENT_ENABLE_BLURBEHIND);
+        }
 
-            var accent = default(AccentPolicy);
-            accent.AccentFlags = 2;
-            accent.AccentState = AccentState.ACCENT_ENABLE_BLURBEHIND;
+        public static void EnableAcrylic(Window w)
+        {
+            ChangeComposition(w, AccentState.ACCENT_ENABLE_ACRYLICBLURBEHIND);
+        }
+
+        private static void ChangeComposition(Window w, AccentState state)
+        {
+            var accent = new AccentPolicy
+            {
+                AccentState = state,
+                AccentFlags = 2,
+                GradientColor = 0x00FFFFFF,
+            };
 
             var accentStructSize = Marshal.SizeOf(accent);
             var accentPtr = Marshal.AllocHGlobal(accentStructSize);
             Marshal.StructureToPtr(accent, accentPtr, false);
 
-            var data = default(WindowCompositionAttributeData);
-            data.Attribute = WindowCompositionAttribute.WCA_ACCENT_POLICY;
-            data.SizeOfData = accentStructSize;
-            data.Data = accentPtr;
+            var data = new WindowCompositionAttributeData
+            {
+                Attribute = WindowCompositionAttribute.WCA_ACCENT_POLICY,
+                SizeOfData = accentStructSize,
+                Data = accentPtr,
+            };
 
             SetWindowCompositionAttribute(new WindowInteropHelper(w).Handle, ref data);
             Marshal.FreeHGlobal(accentPtr);
diff --git a/src/AudioBand/Resources/ButtonStyles.xaml b/src/AudioBand/Resources/ButtonStyles.xaml
index b47b1d66..8a69c0b5 100644
--- a/src/AudioBand/Resources/ButtonStyles.xaml
+++ b/src/AudioBand/Resources/ButtonStyles.xaml
@@ -30,7 +30,8 @@
                         <Border.RenderTransform>
                             <ScaleTransform ScaleX="1" ScaleY="1"/>
                         </Border.RenderTransform>
-                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" Margin="4" TextBlock.Foreground="{TemplateBinding Foreground}"/>
+                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          Margin="4" TextBlock.Foreground="{TemplateBinding Foreground}"/>
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
                                 <VisualStateGroup.Transitions>
@@ -85,8 +86,8 @@
                         <Rectangle x:Name="RevealHoverLightLayer" Opacity="0"
                                    HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
                                    Fill="{StaticResource RevealHoverLightBrush}"/>
-                        <Border x:Name="Border" BorderBrush="{fluentWpf:RevealBrush Color={StaticResource ButtonRevealColor}, Size=70}"
-                                BorderThickness="1" Background="Transparent">
+                        <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}"/>
@@ -145,7 +146,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Button}">
                     <Border x:Name="Border" Background="{TemplateBinding Background}" Padding="6" RenderTransformOrigin="0.5,0.5"
-                            BorderBrush="{fluentWpf:RevealBrush Color={StaticResource ButtonRevealColor}, Size=50}"
+                            BorderBrush="{StaticResource RevealBorderBrush}"
                             BorderThickness="1">
                         <Border.RenderTransform>
                             <ScaleTransform/>
diff --git a/src/AudioBand/Resources/ComboBoxStyles.xaml b/src/AudioBand/Resources/ComboBoxStyles.xaml
index 44e51bec..a355f219 100644
--- a/src/AudioBand/Resources/ComboBoxStyles.xaml
+++ b/src/AudioBand/Resources/ComboBoxStyles.xaml
@@ -89,7 +89,9 @@
                                      VerticalContentAlignment="Center" Foreground="{TemplateBinding Foreground}"
                                      Focusable="True" Background="Transparent"
                                      Visibility="Hidden"
-                                     IsReadOnly="{TemplateBinding IsReadOnly}"/>
+                                     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">
@@ -104,7 +106,7 @@
                                     <FrameworkElement.RenderTransform>
                                         <ScaleTransform x:Name="PopupTransform"/>
                                     </FrameworkElement.RenderTransform>
-                                    <ScrollViewer Margin="0, 4" VerticalScrollBarVisibility="Auto">
+                                    <ScrollViewer Margin="0, 4" VerticalScrollBarVisibility="Auto" CanContentScroll="True">
                                         <VirtualizingStackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Contained"/>
                                     </ScrollViewer>
                                 </Border>
diff --git a/src/AudioBand/Resources/ContextMenuStyles.xaml b/src/AudioBand/Resources/ContextMenuStyles.xaml
new file mode 100644
index 00000000..546bf264
--- /dev/null
+++ b/src/AudioBand/Resources/ContextMenuStyles.xaml
@@ -0,0 +1,100 @@
+<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">
+    <ResourceDictionary.MergedDictionaries>
+        <resources:SharedDictionary Source="Shared.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+    <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"/>
+    </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="Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Border Padding="0, 8" Background="{TemplateBinding Background}" Margin="8" Effect="{StaticResource DropShadowEffect}"
+                            BorderThickness="1" BorderBrush="{theme:ThemeResource SystemChromeHighColor}"
+                            RenderTransformOrigin="0.5, 1">
+                        <StackPanel Orientation="Vertical" IsItemsHost="True" Style="{StaticResource ContextStackPanelStyle}"/>
+                        <FrameworkElement.RenderTransform>
+                            <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.EasingFunction>
+                                            <CubicEase EasingMode="EaseOut"/>
+                                        </DoubleAnimation.EasingFunction>
+                                    </DoubleAnimation>
+                                </Storyboard>
+                            </BeginStoryboard>
+                        </EventTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style TargetType="{x:Type MenuItem}">
+        <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.ColumnDefinitions>
+                            <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}"/>
+                            </Border>
+                        </Popup>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="HasItems" Value="True">
+                            <Setter TargetName="ItemsArrow" Property="Visibility" Value="Visible"/>
+                        </Trigger>
+                        <Trigger Property="Icon" Value="{x:Null}">
+                            <Setter TargetName="IconContent" Property="Visibility" Value="Collapsed"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Foreground" Value="{theme:ThemeResource SystemBaseMediumLowColor}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="{theme:ThemeResource SystemListMediumColor}"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/AudioBand/Resources/NavigationPaneStyles.xaml b/src/AudioBand/Resources/NavigationPaneStyles.xaml
index 7ce37b0e..6ce96978 100644
--- a/src/AudioBand/Resources/NavigationPaneStyles.xaml
+++ b/src/AudioBand/Resources/NavigationPaneStyles.xaml
@@ -44,7 +44,7 @@
                                    Opacity="0" StrokeThickness="0"
                                    HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
                                    Fill="{StaticResource RevealHoverLightBrush}"/>
-                        <Border x:Name="Border" BorderBrush="{fluentWpf:RevealBrush Color={StaticResource ButtonRevealColor}, Size=50}"
+                        <Border x:Name="Border" BorderBrush="{StaticResource RevealBorderBrush}"
                                 BorderThickness="0,1,1,1" Background="{TemplateBinding Background}"/>
                         <DockPanel LastChildFill="True">
                             <Rectangle DockPanel.Dock="Left" Fill="{theme:ThemeResource SystemAccentColor}" Width="5" Height="25"
@@ -96,7 +96,7 @@
                                    Opacity="0" StrokeThickness="0"
                                    HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
                                    Fill="{StaticResource RevealHoverLightBrush}"/>
-                        <Border BorderBrush="{fluentWpf:RevealBrush Color={StaticResource ButtonRevealColor}, Size=50}"
+                        <Border BorderBrush="{StaticResource RevealBorderBrush}"
                                 Background="{TemplateBinding Background}" BorderThickness="1"/>
                         <DockPanel>
                             <TextBlock x:Name="ExpanderIcon" DockPanel.Dock="Left"
diff --git a/src/AudioBand/Resources/PasswordBoxStyles.xaml b/src/AudioBand/Resources/PasswordBoxStyles.xaml
index b6f39bb8..fbbb3945 100644
--- a/src/AudioBand/Resources/PasswordBoxStyles.xaml
+++ b/src/AudioBand/Resources/PasswordBoxStyles.xaml
@@ -20,6 +20,7 @@
         <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"/>
diff --git a/src/AudioBand/Resources/SettingsWindowStyle.xaml b/src/AudioBand/Resources/SettingsWindowStyle.xaml
index c9e8601e..40b30c29 100644
--- a/src/AudioBand/Resources/SettingsWindowStyle.xaml
+++ b/src/AudioBand/Resources/SettingsWindowStyle.xaml
@@ -10,6 +10,8 @@
         <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"/>
@@ -27,7 +29,7 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ListBox}">
-                    <ItemsPresenter Margin="0,0,1,0"/>
+                    <ItemsPresenter/>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
diff --git a/src/AudioBand/Resources/Shared.xaml b/src/AudioBand/Resources/Shared.xaml
index a9f208b8..81972fe7 100644
--- a/src/AudioBand/Resources/Shared.xaml
+++ b/src/AudioBand/Resources/Shared.xaml
@@ -3,6 +3,7 @@
                     xmlns:o="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
                     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">
     <ResourceDictionary.MergedDictionaries>
         <resources:SharedDictionary Source="pack://application:,,,/FluentWPF;component/Styles/Controls.xaml" />
@@ -38,4 +39,44 @@
         <GradientStop Color="#44FFFFFF" Offset="0"/>
         <GradientStop Color="Transparent" Offset="0.8"/>
     </RadialGradientBrush>
+    <ContextMenu x:Key="StandardInputContextMenu">
+        <MenuItem Command="ApplicationCommands.Cut">
+            <MenuItem.Icon>
+                <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE8C6;"/>
+            </MenuItem.Icon>
+        </MenuItem>
+        <MenuItem Command="ApplicationCommands.Copy">
+            <MenuItem.Icon>
+                <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE8C8;"/>
+            </MenuItem.Icon>
+        </MenuItem>
+        <MenuItem Command="ApplicationCommands.Paste">
+            <MenuItem.Icon>
+                <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE77F;"/>
+            </MenuItem.Icon>
+        </MenuItem>
+    </ContextMenu>
+    <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.GradientStops>
+            <GradientStop Color="{theme:ThemeResource SystemBaseMediumColor}"/>
+            <GradientStop Color="Transparent" Offset="1"/>
+        </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)" />
+            </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)" />
+            </MultiBinding>
+        </RadialGradientBrush.GradientOrigin>
+    </RadialGradientBrush>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/AudioBand/Resources/Strings.xaml b/src/AudioBand/Resources/Strings.xaml
index eec653a9..b537eb93 100644
--- a/src/AudioBand/Resources/Strings.xaml
+++ b/src/AudioBand/Resources/Strings.xaml
@@ -18,6 +18,8 @@
     <sys:String x:Key="DisplaySectionText">Display</sys:String>
     <sys:String x:Key="BackgroundColorSectionText">Background Colors</sys:String>
     <sys:String x:Key="OtherSectionText">Other</sys:String>
+    <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 -->
     <sys:String x:Key="PlayButtonContentSectionText">Play button content</sys:String>
@@ -45,6 +47,7 @@
     <sys:String x:Key="ShuffleModeButtonOnContentSectionText">Shuffle on button content</sys:String>
 
     <!-- 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>
     <sys:String x:Key="CustomLabelFontSizeDescription">Font Size</sys:String>
@@ -135,6 +138,8 @@ Using style and color : {*artist:#a9a9a9}</sys:String>
     <sys:String x:Key="AudioBandAboutDialogProjectPre">Check out the project site to report issues and get more help</sys:String>
     <sys:String x:Key="AudioBandAboutDialogLicenseLinkText">License</sys:String>
     <sys:String x:Key="AudioBandAboutDialogThirdPartyLicenseLink">Third party licenses</sys:String>
+    <sys:String x:Key="AudioBandAboutDialogSettingsLinkText">AudioBand settings folder</sys:String>
+    <sys:String x:Key="AudioBandAboutDialogLogsLink">AudioBand log</sys:String>
     <sys:String x:Key="RenameProfileDialogTitle">Renaming profile {0}</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>
diff --git a/src/AudioBand/Resources/TextBoxStyles.xaml b/src/AudioBand/Resources/TextBoxStyles.xaml
index 192d7ca0..50dedff0 100644
--- a/src/AudioBand/Resources/TextBoxStyles.xaml
+++ b/src/AudioBand/Resources/TextBoxStyles.xaml
@@ -6,6 +6,7 @@
     <ResourceDictionary.MergedDictionaries>
         <local:SharedDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/controls.textbox.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"/>
@@ -20,6 +21,7 @@
         <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"/>
diff --git a/src/AudioBand/Resources/Theming/ThemeResource.cs b/src/AudioBand/Resources/Theming/ThemeResourceExtension.cs
similarity index 72%
rename from src/AudioBand/Resources/Theming/ThemeResource.cs
rename to src/AudioBand/Resources/Theming/ThemeResourceExtension.cs
index a8149f75..35a4fc4d 100644
--- a/src/AudioBand/Resources/Theming/ThemeResource.cs
+++ b/src/AudioBand/Resources/Theming/ThemeResourceExtension.cs
@@ -2,6 +2,8 @@
 using System.Windows;
 using System.Windows.Data;
 using System.Windows.Markup;
+using System.Windows.Media;
+using AudioBand.ValueConverters;
 
 namespace AudioBand.Resources.Theming
 {
@@ -9,7 +11,7 @@ namespace AudioBand.Resources.Theming
     /// Markup extension for theme resources.
     /// </summary>
     [MarkupExtensionReturnType(typeof(BindingExpression))]
-    public class ThemeResource : MarkupExtension
+    public class ThemeResourceExtension : MarkupExtension
     {
         private static readonly Lazy<ThemeDictionary> ThemeDictionaryInstance = new Lazy<ThemeDictionary>();
         private static readonly Lazy<FallbackThemeDictionary> FallbackInstance = new Lazy<FallbackThemeDictionary>();
@@ -18,19 +20,19 @@ public class ThemeResource : MarkupExtension
         private readonly ThemeResourceKey _themeKey;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ThemeResource"/> class.
+        /// Initializes a new instance of the <see cref="ThemeResourceExtension"/> class.
         /// </summary>
         /// <param name="key">The resource key.</param>
-        public ThemeResource(string key)
+        public ThemeResourceExtension(string key)
         {
             _key = key;
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ThemeResource"/> class.
+        /// Initializes a new instance of the <see cref="ThemeResourceExtension"/> class.
         /// </summary>
         /// <param name="key">The resource key.</param>
-        public ThemeResource(ThemeResourceKey key)
+        public ThemeResourceExtension(ThemeResourceKey key)
         {
             _themeKey = key;
         }
@@ -50,6 +52,13 @@ public override object ProvideValue(IServiceProvider serviceProvider)
                 Path = new PropertyPath($"[{_key ?? _themeKey.ToString()}]"),
             };
 
+            var target = serviceProvider.GetService(typeof(IProvideValueTarget)) as IProvideValueTarget;
+            var property = target?.TargetProperty as DependencyProperty;
+            if (property?.PropertyType == typeof(Color))
+            {
+                binding.Converter = Converters.BrushToColor;
+            }
+
             return binding.ProvideValue(serviceProvider);
         }
     }
diff --git a/src/AudioBand/Resources/Tooltips.xaml b/src/AudioBand/Resources/Tooltips.xaml
new file mode 100644
index 00000000..a6b8e039
--- /dev/null
+++ b/src/AudioBand/Resources/Tooltips.xaml
@@ -0,0 +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">
+    <ResourceDictionary.MergedDictionaries>
+        <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="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ToolTip}">
+                    <Border BorderThickness="1" BorderBrush="{theme:ThemeResource SystemChromeHighColor}" Margin="4" Padding="4"
+                            Background="{TemplateBinding Background}">
+                        <Border.Effect>
+                            <DropShadowEffect ShadowDepth="0" Opacity="0.3"/>
+                        </Border.Effect>
+                        <ContentPresenter/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/AudioBand/Settings/AppSettings.cs b/src/AudioBand/Settings/AppSettings.cs
index 22795b21..6e2b0f20 100644
--- a/src/AudioBand/Settings/AppSettings.cs
+++ b/src/AudioBand/Settings/AppSettings.cs
@@ -283,7 +283,7 @@ private void LoadSettingsFromPath(string path)
             }
             else
             {
-                // Check for new settings that were added to the current configuration version.
+                // Fix any null values
                 var initial = new SettingsV3();
                 var settings = tomlFile.Get<SettingsV3>();
                 new MapperConfiguration(cfg => cfg.AddProfile<SettingsV3Profile>()).CreateMapper().Map(settings, initial);
diff --git a/src/AudioBand/Settings/Migrations/V2ToV3.cs b/src/AudioBand/Settings/Migrations/V2ToV3.cs
index b180d1b4..21707816 100644
--- a/src/AudioBand/Settings/Migrations/V2ToV3.cs
+++ b/src/AudioBand/Settings/Migrations/V2ToV3.cs
@@ -28,6 +28,7 @@ private MapperConfiguration GetMapConfig()
             var config = new MapperConfiguration(cfg =>
             {
                 cfg.CreateMap<Models.V2.CustomLabelSettings, CustomLabel>()
+                    .ForMember(dest => dest.Anchor, opt => opt.MapFrom(source => PositionAnchor.TopLeft))
                     .ForMember(dest => dest.ScrollBehavior, opt => opt.Ignore())
                     .ForMember(dest => dest.TextOverflow, opt => opt.Ignore())
                     .ForMember(dest => dest.LeftFadeOffset, opt => opt.Ignore())
@@ -35,6 +36,7 @@ private MapperConfiguration GetMapConfig()
                     .ForMember(dest => dest.FadeEffect, opt => opt.Ignore());
                 cfg.CreateMap<Models.V2.AudioSourceSettings, AudioSourceSettings>();
                 cfg.CreateMap<Models.V2.NextButtonSettings, NextButton>()
+                    .ForMember(dest => dest.Anchor, opt => opt.MapFrom(source => PositionAnchor.TopLeft))
                     .ForMember(dest => dest.Content, opt => opt.MapFrom(source => new ButtonContent()))
                     .ForPath(dest => dest.Content.ImagePath, opt => opt.MapFrom(source => source.ImagePath))
                     .ForPath(dest => dest.Content.HoveredImagePath, opt => opt.MapFrom(source => source.ImagePath))
@@ -49,6 +51,7 @@ private MapperConfiguration GetMapConfig()
                     .ForPath(dest => dest.Content.HoveredTextColor, opt => opt.Ignore())
                     .ForPath(dest => dest.Content.ClickedTextColor, opt => opt.Ignore());
                 cfg.CreateMap<Models.V2.PreviousButtonSettings, PreviousButton>()
+                    .ForMember(dest => dest.Anchor, opt => opt.MapFrom(source => PositionAnchor.TopLeft))
                     .ForMember(dest => dest.Content, opt => opt.MapFrom(source => new ButtonContent()))
                     .ForPath(dest => dest.Content.ImagePath, opt => opt.MapFrom(source => source.ImagePath))
                     .ForPath(dest => dest.Content.HoveredImagePath, opt => opt.MapFrom(source => source.ImagePath))
@@ -63,6 +66,7 @@ private MapperConfiguration GetMapConfig()
                     .ForPath(dest => dest.Content.HoveredTextColor, opt => opt.Ignore())
                     .ForPath(dest => dest.Content.ClickedTextColor, opt => opt.Ignore());
                 cfg.CreateMap<Models.V2.PlayPauseButtonSettings, PlayPauseButton>()
+                    .ForMember(dest => dest.Anchor, opt => opt.MapFrom(source => PositionAnchor.TopLeft))
                     .ForMember(dest => dest.BackgroundColor, opt => opt.Ignore())
                     .ForMember(dest => dest.HoveredBackgroundColor, opt => opt.Ignore())
                     .ForMember(dest => dest.ClickedBackgroundColor, opt => opt.Ignore())
@@ -87,7 +91,12 @@ private MapperConfiguration GetMapConfig()
                     .ForPath(dest => dest.PauseContent.HoveredTextColor, opt => opt.Ignore())
                     .ForPath(dest => dest.PauseContent.ClickedTextColor, opt => opt.Ignore());
                 cfg.CreateMap<Models.V2.ProgressBarSettings, ProgressBar>()
+                    .ForMember(dest => dest.Anchor, opt => opt.MapFrom(source => PositionAnchor.TopLeft))
                     .ForMember(dest => dest.HoverColor, opt => opt.Ignore());
+                cfg.CreateMap<Models.V2.AudioBandSettings, AudioBand.Models.AudioBand>()
+                    .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.Settings, ProfileV3>()
                     .ForMember(dest => dest.AlbumArtPopupSettings, opt => opt.MapFrom(source => source.AlbumArtPopupSettings))
                     .ForMember(dest => dest.AlbumArtSettings, opt => opt.MapFrom(source => source.AlbumArtSettings))
diff --git a/src/AudioBand/Settings/Profiles/SettingsV3Profile.cs b/src/AudioBand/Settings/Profiles/SettingsV3Profile.cs
index ad7abe8e..95beb86a 100644
--- a/src/AudioBand/Settings/Profiles/SettingsV3Profile.cs
+++ b/src/AudioBand/Settings/Profiles/SettingsV3Profile.cs
@@ -1,11 +1,12 @@
-using AudioBand.Models;
+using System.Collections.Generic;
+using AudioBand.Models;
 using AudioBand.Settings.Models.v3;
 using AutoMapper;
 
 namespace AudioBand.Settings.Profiles
 {
     /// <summary>
-    /// Fixes new values that are added to the configuration.
+    /// Fixes null settings.
     /// </summary>
     internal class SettingsV3Profile : Profile
     {
@@ -16,7 +17,15 @@ public SettingsV3Profile()
         {
             CreateMap<SettingsV3, SettingsV3>();
             CreateMap<ProfileV3, ProfileV3>()
-                .ForMember(dest => dest.RepeatModeButtonSettings, opt => opt.NullSubstitute(new RepeatModeButton())) // Repeat mode button was added after
+                .ForMember(dest => dest.AlbumArtPopupSettings, opt => opt.NullSubstitute(new AlbumArtPopup()))
+                .ForMember(dest => dest.AlbumArtSettings, opt => opt.NullSubstitute(new AlbumArt()))
+                .ForMember(dest => dest.AudioBandSettings, opt => opt.NullSubstitute(new AudioBand.Models.AudioBand()))
+                .ForMember(dest => dest.CustomLabelSettings, opt => opt.NullSubstitute(new List<CustomLabel>()))
+                .ForMember(dest => dest.NextButtonSettings, opt => opt.NullSubstitute(new NextButton()))
+                .ForMember(dest => dest.PlayPauseButtonSettings, opt => opt.NullSubstitute(new PlayPauseButton()))
+                .ForMember(dest => dest.PreviousButtonSettings, opt => opt.NullSubstitute(new PreviousButton()))
+                .ForMember(dest => dest.ProgressBarSettings, opt => opt.NullSubstitute(new ProgressBar()))
+                .ForMember(dest => dest.RepeatModeButtonSettings, opt => opt.NullSubstitute(new RepeatModeButton()))
                 .ForMember(dest => dest.ShuffleModeButtonSettings, opt => opt.NullSubstitute(new ShuffleModeButton()));
         }
     }
diff --git a/src/AudioBand/ValueConverters/Converters.cs b/src/AudioBand/ValueConverters/Converters.cs
index bab95d5e..9344ba01 100644
--- a/src/AudioBand/ValueConverters/Converters.cs
+++ b/src/AudioBand/ValueConverters/Converters.cs
@@ -1,4 +1,6 @@
-namespace AudioBand.ValueConverters
+using System.Windows.Data;
+
+namespace AudioBand.ValueConverters
 {
     /// <summary>
     /// Static class that contains converts.
@@ -69,5 +71,15 @@ public static class Converters
         /// Gets a <see cref="EmptyStringToBoolConverter"/>.
         /// </summary>
         public static EmptyStringToBoolConverter EmptyStringToBool { get; } = new EmptyStringToBoolConverter();
+
+        /// <summary>
+        /// Gets a brush to color converter.
+        /// </summary>
+        public static IValueConverter BrushToColor { get; } = new ReverseConverter(new ColorToBrushConverter());
+
+        /// <summary>
+        /// Gets a <see cref="FlagToBoolConverter"/>.
+        /// </summary>
+        public static FlagToBoolConverter HasFlag { get; } = new FlagToBoolConverter();
     }
 }
diff --git a/src/AudioBand/ValueConverters/FlagToBoolConverter.cs b/src/AudioBand/ValueConverters/FlagToBoolConverter.cs
new file mode 100644
index 00000000..9c25bf0b
--- /dev/null
+++ b/src/AudioBand/ValueConverters/FlagToBoolConverter.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace AudioBand.ValueConverters
+{
+    /// <summary>
+    /// Converts enum flag to bool.
+    /// </summary>
+    [ValueConversion(typeof(Enum), typeof(bool))]
+    public class FlagToBoolConverter : IValueConverter
+    {
+        /// <inheritdoc />
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value == null || value == DependencyProperty.UnsetValue || parameter == null)
+            {
+                return false;
+            }
+
+            return ((Enum)value).HasFlag((Enum)parameter);
+        }
+
+        /// <inheritdoc />
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/src/AudioBand/ValueConverters/ReverseConverter.cs b/src/AudioBand/ValueConverters/ReverseConverter.cs
index 6d94db94..29078e74 100644
--- a/src/AudioBand/ValueConverters/ReverseConverter.cs
+++ b/src/AudioBand/ValueConverters/ReverseConverter.cs
@@ -12,21 +12,27 @@ namespace AudioBand.ValueConverters
     [ContentProperty("Converter")]
     public class ReverseConverter : IValueConverter
     {
+        private readonly IValueConverter _converter;
+
         /// <summary>
-        /// Gets or sets he converter to revrse.
+        /// Initializes a new instance of the <see cref="ReverseConverter"/> class with the converter to reverse.
         /// </summary>
-        public IValueConverter Converter { get; set; }
+        /// <param name="converter">The converter to reverse.</param>
+        public ReverseConverter(IValueConverter converter)
+        {
+            _converter = converter;
+        }
 
         /// <inheritdoc/>
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            return Converter.ConvertBack(value, targetType, parameter, culture);
+            return _converter.ConvertBack(value, targetType, parameter, culture);
         }
 
         /// <inheritdoc/>
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            return Converter.Convert(value, targetType, parameter, culture);
+            return _converter.Convert(value, targetType, parameter, culture);
         }
     }
 }
diff --git a/src/AudioBand/ValueConverters/TimeSpanToMsConverter.cs b/src/AudioBand/ValueConverters/TimeSpanToMsConverter.cs
index 871755e0..25a7530e 100644
--- a/src/AudioBand/ValueConverters/TimeSpanToMsConverter.cs
+++ b/src/AudioBand/ValueConverters/TimeSpanToMsConverter.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Globalization;
+using System.Windows;
 using System.Windows.Data;
 
 namespace AudioBand.ValueConverters
@@ -13,12 +14,22 @@ public class TimeSpanToMsConverter : IValueConverter
         /// <inheritdoc />
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
+            if (value == null || value == DependencyProperty.UnsetValue)
+            {
+                return 0;
+            }
+
             return ((TimeSpan)value).TotalMilliseconds;
         }
 
         /// <inheritdoc />
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
         {
+            if (value == null || value == DependencyProperty.UnsetValue)
+            {
+                return TimeSpan.Zero;
+            }
+
             return TimeSpan.FromMilliseconds((double)value);
         }
     }
diff --git a/src/AudioBand/ViewModels/AboutDialogViewModel.cs b/src/AudioBand/ViewModels/AboutDialogViewModel.cs
index 75edd71e..fd9b4974 100644
--- a/src/AudioBand/ViewModels/AboutDialogViewModel.cs
+++ b/src/AudioBand/ViewModels/AboutDialogViewModel.cs
@@ -1,5 +1,8 @@
-using System.Diagnostics;
+using System;
+using System.Diagnostics;
+using System.IO;
 using System.Reflection;
+using System.Windows.Input;
 using AudioBand.Commands;
 
 namespace AudioBand.ViewModels
@@ -9,14 +12,6 @@ namespace AudioBand.ViewModels
     /// </summary>
     public class AboutDialogViewModel : ViewModelBase
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AboutDialogViewModel"/> class.
-        /// </summary>
-        public AboutDialogViewModel()
-        {
-            OpenLinkCommand = new RelayCommand<string>(OpenLinkCommandOnExecute);
-        }
-
         /// <summary>
         /// Gets the current audioband version.
         /// </summary>
@@ -40,9 +35,29 @@ public AboutDialogViewModel()
         /// <summary>
         /// Gets the command to open the link to the project.
         /// </summary>
-        public RelayCommand<string> OpenLinkCommand { get; }
+        public ICommand OpenLinkCommand { get; } = new RelayCommand<string>(OpenLinkCommandOnExecute);
+
+        /// <summary>
+        /// Gets the command to open the settings folder.
+        /// </summary>
+        public ICommand OpenSettingsFolderCommand { get; } = new RelayCommand(OpenSettingsFolderCommandOnExecute);
+
+        /// <summary>
+        /// Gets the command to open the audioband logs.
+        /// </summary>
+        public ICommand OpenLog { get; } = new RelayCommand(OpenLogCommandOnExecute);
+
+        private static void OpenLogCommandOnExecute(object obj)
+        {
+            Process.Start(Path.Combine(Path.GetTempPath(), "AudioBand.log"));
+        }
+
+        private static void OpenSettingsFolderCommandOnExecute(object obj)
+        {
+            Process.Start(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "AudioBand"));
+        }
 
-        private void OpenLinkCommandOnExecute(string link)
+        private static void OpenLinkCommandOnExecute(string link)
         {
             Process.Start(link);
         }
diff --git a/src/AudioBand/ViewModels/AlbumArtViewModel.cs b/src/AudioBand/ViewModels/AlbumArtViewModel.cs
index 3ad6bdfa..50c9453d 100644
--- a/src/AudioBand/ViewModels/AlbumArtViewModel.cs
+++ b/src/AudioBand/ViewModels/AlbumArtViewModel.cs
@@ -12,7 +12,7 @@ namespace AudioBand.ViewModels
     /// <summary>
     /// View model for the album art.
     /// </summary>
-    public class AlbumArtViewModel : ViewModelBase<AlbumArt>
+    public class AlbumArtViewModel : LayoutViewModelBase<AlbumArt>
     {
         private readonly IAppSettings _appsettings;
         private IAudioSource _audioSource;
@@ -32,56 +32,6 @@ public AlbumArtViewModel(IAppSettings appsettings, IDialogService dialogService)
             appsettings.ProfileChanged += AppsettingsOnProfileChanged;
         }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether it is visible.
-        /// </summary>
-        [PropertyChangeBinding(nameof(Models.AlbumArt.IsVisible))]
-        public bool IsVisible
-        {
-            get => Model.IsVisible;
-            set => SetProperty(nameof(Model.IsVisible), value);
-        }
-
-        /// <summary>
-        /// Gets or sets the width.
-        /// </summary>
-        [PropertyChangeBinding(nameof(Models.AlbumArt.Width))]
-        public double Width
-        {
-            get => Model.Width;
-            set => SetProperty(nameof(Model.Width), value);
-        }
-
-        /// <summary>
-        /// Gets or sets the height.
-        /// </summary>
-        [PropertyChangeBinding(nameof(Models.AlbumArt.Height))]
-        public double Height
-        {
-            get => Model.Height;
-            set => SetProperty(nameof(Model.Height), value);
-        }
-
-        /// <summary>
-        /// Gets or sets the x position.
-        /// </summary>
-        [PropertyChangeBinding(nameof(Models.AlbumArt.XPosition))]
-        public double XPosition
-        {
-            get => Model.XPosition;
-            set => SetProperty(nameof(Model.XPosition), value);
-        }
-
-        /// <summary>
-        /// Gets or sets the y position.
-        /// </summary>
-        [PropertyChangeBinding(nameof(Models.AlbumArt.YPosition))]
-        public double YPosition
-        {
-            get => Model.YPosition;
-            set => SetProperty(nameof(Model.YPosition), value);
-        }
-
         /// <summary>
         /// Gets or sets the placeholder path.
         /// </summary>
diff --git a/src/AudioBand/ViewModels/AudioBandViewModel.cs b/src/AudioBand/ViewModels/AudioBandViewModel.cs
index a127feb4..f31efca6 100644
--- a/src/AudioBand/ViewModels/AudioBandViewModel.cs
+++ b/src/AudioBand/ViewModels/AudioBandViewModel.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Diagnostics;
+using System.Windows.Media;
 using AudioBand.Settings;
 
 namespace AudioBand.ViewModels
@@ -15,9 +16,11 @@ public class AudioBandViewModel : ViewModelBase<Models.AudioBand>
         /// Initializes a new instance of the <see cref="AudioBandViewModel"/> class.
         /// </summary>
         /// <param name="appsettings">The app settings.</param>
-        public AudioBandViewModel(IAppSettings appsettings)
+        /// <param name="dialogService">The dialog service.</param>
+        public AudioBandViewModel(IAppSettings appsettings, IDialogService dialogService)
             : base(appsettings.AudioBand)
         {
+            DialogService = dialogService;
             _appsettings = appsettings;
             appsettings.ProfileChanged += AppsettingsOnProfileChanged;
         }
@@ -42,6 +45,21 @@ public double Height
             set => SetProperty(nameof(Model.Height), value);
         }
 
+        /// <summary>
+        /// Gets or sets the background color.
+        /// </summary>
+        [PropertyChangeBinding(nameof(Models.AudioBand.BackgroundColor))]
+        public Color BackgroundColor
+        {
+            get => Model.BackgroundColor;
+            set => SetProperty(nameof(Model.BackgroundColor), value);
+        }
+
+        /// <summary>
+        /// Gets the dialog service.
+        /// </summary>
+        public IDialogService DialogService { get; }
+
         private void AppsettingsOnProfileChanged(object sender, EventArgs e)
         {
             Debug.Assert(IsEditing == false, "Should not be editing");
diff --git a/src/AudioBand/ViewModels/ButtonViewModelBase.cs b/src/AudioBand/ViewModels/ButtonViewModelBase.cs
index 9d61bc30..69ff8944 100644
--- a/src/AudioBand/ViewModels/ButtonViewModelBase.cs
+++ b/src/AudioBand/ViewModels/ButtonViewModelBase.cs
@@ -10,7 +10,7 @@ namespace AudioBand.ViewModels
     /// Base view model for buttons.
     /// </summary>
     /// <typeparam name="TButton">The button model.</typeparam>
-    public class ButtonViewModelBase<TButton> : ViewModelBase<TButton>
+    public class ButtonViewModelBase<TButton> : LayoutViewModelBase<TButton>
         where TButton : ButtonModelBase, new()
     {
         private readonly List<ButtonContentViewModel> _contentViewModels = new List<ButtonContentViewModel>();
@@ -26,56 +26,6 @@ public ButtonViewModelBase(TButton model, IDialogService dialogService)
             DialogService = dialogService;
         }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether the button is visible.
-        /// </summary>
-        [PropertyChangeBinding(nameof(ButtonModelBase.IsVisible))]
-        public bool IsVisible
-        {
-            get => Model.IsVisible;
-            set => SetProperty(nameof(Model.IsVisible), value);
-        }
-
-        /// <summary>
-        /// Gets or sets the width.
-        /// </summary>
-        [PropertyChangeBinding(nameof(ButtonModelBase.Width))]
-        public double Width
-        {
-            get => Model.Width;
-            set => SetProperty(nameof(Model.Width), value);
-        }
-
-        /// <summary>
-        /// Gets or sets the height.
-        /// </summary>
-        [PropertyChangeBinding(nameof(ButtonModelBase.Height))]
-        public double Height
-        {
-            get => Model.Height;
-            set => SetProperty(nameof(Model.Height), value);
-        }
-
-        /// <summary>
-        /// Gets or sets the x position.
-        /// </summary>
-        [PropertyChangeBinding(nameof(ButtonModelBase.XPosition))]
-        public double XPosition
-        {
-            get => Model.XPosition;
-            set => SetProperty(nameof(Model.XPosition), value);
-        }
-
-        /// <summary>
-        /// Gets or sets the y position.
-        /// </summary>
-        [PropertyChangeBinding(nameof(ButtonModelBase.YPosition))]
-        public double YPosition
-        {
-            get => Model.YPosition;
-            set => SetProperty(nameof(Model.YPosition), value);
-        }
-
         /// <summary>
         /// Gets or sets the background color.
         /// </summary>
diff --git a/src/AudioBand/ViewModels/CustomLabelViewModel.cs b/src/AudioBand/ViewModels/CustomLabelViewModel.cs
index ad601917..b759bf80 100644
--- a/src/AudioBand/ViewModels/CustomLabelViewModel.cs
+++ b/src/AudioBand/ViewModels/CustomLabelViewModel.cs
@@ -13,7 +13,7 @@ namespace AudioBand.ViewModels
     /// <summary>
     /// The view model for a custom label.
     /// </summary>
-    public class CustomLabelViewModel : ViewModelBase<CustomLabel>
+    public class CustomLabelViewModel : LayoutViewModelBase<CustomLabel>
     {
         private readonly FormattedTextParser _parser;
         private IAudioSource _audioSource;
@@ -92,56 +92,6 @@ public TextAlignment TextAlignment
             set => SetProperty(nameof(Model.Alignment), value);
         }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether the text is visible.
-        /// </summary>
-        [PropertyChangeBinding(nameof(CustomLabel.IsVisible))]
-        public bool IsVisible
-        {
-            get => Model.IsVisible;
-            set => SetProperty(nameof(Model.IsVisible), value);
-        }
-
-        /// <summary>
-        /// Gets or sets the width.
-        /// </summary>
-        [PropertyChangeBinding(nameof(CustomLabel.Width))]
-        public double Width
-        {
-            get => Model.Width;
-            set => SetProperty(nameof(Model.Width), value);
-        }
-
-        /// <summary>
-        /// Gets or sets the height.
-        /// </summary>
-        [PropertyChangeBinding(nameof(CustomLabel.Height))]
-        public double Height
-        {
-            get => Model.Height;
-            set => SetProperty(nameof(Model.Height), value);
-        }
-
-        /// <summary>
-        /// Gets or sets the x position.
-        /// </summary>
-        [PropertyChangeBinding(nameof(CustomLabel.XPosition))]
-        public double XPosition
-        {
-            get => Model.XPosition;
-            set => SetProperty(nameof(Model.XPosition), value);
-        }
-
-        /// <summary>
-        /// Gets or sets the y position.
-        /// </summary>
-        [PropertyChangeBinding(nameof(CustomLabel.YPosition))]
-        public double YPosition
-        {
-            get => Model.YPosition;
-            set => SetProperty(nameof(Model.YPosition), value);
-        }
-
         /// <summary>
         /// Gets or sets the scroll speed.
         /// </summary>
diff --git a/src/AudioBand/ViewModels/LayoutViewModelBase.cs b/src/AudioBand/ViewModels/LayoutViewModelBase.cs
new file mode 100644
index 00000000..e0bdaec0
--- /dev/null
+++ b/src/AudioBand/ViewModels/LayoutViewModelBase.cs
@@ -0,0 +1,81 @@
+using AudioBand.Models;
+
+namespace AudioBand.ViewModels
+{
+    /// <summary>
+    /// Base view model for <see cref="LayoutModelBase"/>.
+    /// </summary>
+    /// <typeparam name="TModel">A <see cref="LayoutModelBase"/> object.</typeparam>
+    public class LayoutViewModelBase<TModel> : ViewModelBase<TModel>
+        where TModel : LayoutModelBase, new()
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LayoutViewModelBase{TModel}"/> class.
+        /// </summary>
+        /// <param name="model">The model.</param>
+        public LayoutViewModelBase(TModel model)
+            : base(model)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether it is visible.
+        /// </summary>
+        [PropertyChangeBinding(nameof(LayoutModelBase.IsVisible))]
+        public bool IsVisible
+        {
+            get => Model.IsVisible;
+            set => SetProperty(nameof(Model.IsVisible), value);
+        }
+
+        /// <summary>
+        /// Gets or sets the width.
+        /// </summary>
+        [PropertyChangeBinding(nameof(LayoutModelBase.Width))]
+        public double Width
+        {
+            get => Model.Width;
+            set => SetProperty(nameof(Model.Width), value);
+        }
+
+        /// <summary>
+        /// Gets or sets the height.
+        /// </summary>
+        [PropertyChangeBinding(nameof(LayoutModelBase.Height))]
+        public double Height
+        {
+            get => Model.Height;
+            set => SetProperty(nameof(Model.Height), value);
+        }
+
+        /// <summary>
+        /// Gets or sets the x position.
+        /// </summary>
+        [PropertyChangeBinding(nameof(LayoutModelBase.XPosition))]
+        public double XPosition
+        {
+            get => Model.XPosition;
+            set => SetProperty(nameof(Model.XPosition), value);
+        }
+
+        /// <summary>
+        /// Gets or sets the y position.
+        /// </summary>
+        [PropertyChangeBinding(nameof(LayoutModelBase.YPosition))]
+        public double YPosition
+        {
+            get => Model.YPosition;
+            set => SetProperty(nameof(Model.YPosition), value);
+        }
+
+        /// <summary>
+        /// Gets or sets the relative positioning.
+        /// </summary>
+        [PropertyChangeBinding(nameof(LayoutModelBase.Anchor))]
+        public PositionAnchor Anchor
+        {
+            get => Model.Anchor;
+            set => SetProperty(nameof(Model.Anchor), value);
+        }
+    }
+}
diff --git a/src/AudioBand/ViewModels/ProgressBarViewModel.cs b/src/AudioBand/ViewModels/ProgressBarViewModel.cs
index 1adbd736..8a9bae66 100644
--- a/src/AudioBand/ViewModels/ProgressBarViewModel.cs
+++ b/src/AudioBand/ViewModels/ProgressBarViewModel.cs
@@ -1,11 +1,7 @@
 using System;
 using System.Diagnostics;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Input;
 using System.Windows.Media;
 using AudioBand.AudioSource;
-using AudioBand.Commands;
 using AudioBand.Models;
 using AudioBand.Settings;
 
@@ -14,7 +10,7 @@ namespace AudioBand.ViewModels
     /// <summary>
     /// View model for the progress bar.
     /// </summary>
-    public class ProgressBarViewModel : ViewModelBase<ProgressBar>
+    public class ProgressBarViewModel : LayoutViewModelBase<ProgressBar>
     {
         private readonly IAppSettings _appsettings;
         private IAudioSource _audioSource;
@@ -65,58 +61,6 @@ public Color HoverColor
             set => SetProperty(nameof(Model.HoverColor), value);
         }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether the bar is visible.
-        /// </summary>
-        [PropertyChangeBinding(nameof(ProgressBar.IsVisible))]
-        public bool IsVisible
-        {
-            get => Model.IsVisible;
-            set => SetProperty(nameof(Model.IsVisible), value);
-        }
-
-        /// <summary>
-        /// Gets or sets the width.
-        /// </summary>
-        [PropertyChangeBinding(nameof(ProgressBar.Width))]
-        [AlsoNotify(nameof(Size))]
-        public double Width
-        {
-            get => Model.Width;
-            set => SetProperty(nameof(Model.Width), value);
-        }
-
-        /// <summary>
-        /// Gets or sets the height.
-        /// </summary>
-        [PropertyChangeBinding(nameof(ProgressBar.Height))]
-        [AlsoNotify(nameof(Size))]
-        public double Height
-        {
-            get => Model.Height;
-            set => SetProperty(nameof(Model.Height), value);
-        }
-
-        /// <summary>
-        /// Gets or sets the x position.
-        /// </summary>
-        [PropertyChangeBinding(nameof(ProgressBar.XPosition))]
-        public double XPosition
-        {
-            get => Model.XPosition;
-            set => SetProperty(nameof(Model.XPosition), value);
-        }
-
-        /// <summary>
-        /// Gets or sets the y position.
-        /// </summary>
-        [PropertyChangeBinding(nameof(ProgressBar.YPosition))]
-        public double YPosition
-        {
-            get => Model.YPosition;
-            set => SetProperty(nameof(Model.YPosition), value);
-        }
-
         /// <summary>
         /// Gets or sets the track progress.
         /// </summary>
diff --git a/src/AudioBand/Views/AudioBandToolbar.xaml b/src/AudioBand/Views/AudioBandToolbar.xaml
index 9266da40..5d658bbb 100644
--- a/src/AudioBand/Views/AudioBandToolbar.xaml
+++ b/src/AudioBand/Views/AudioBandToolbar.xaml
@@ -12,9 +12,10 @@
              xmlns:resources="clr-namespace:AudioBand.Resources"
              xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:models="clr-namespace:AudioBand.Models"
+             xmlns:views="clr-namespace:AudioBand.Views"
              mc:Ignorable="d"
              HorizontalAlignment="Stretch" VerticalAlignment="Stretch" 
-             Background="Transparent"
+             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}">
     <UserControl.Resources>
@@ -116,11 +117,13 @@
         </Canvas.Resources>
         <Viewbox x:Name="AlbumArt" DataContext="{Binding ViewModels.AlbumArtViewModel}"
                      Width="{Binding Width}" Height="{Binding Height}"
-                     Canvas.Left="{Binding XPosition}" Canvas.Top="{Binding YPosition}"
                      Visibility="{Binding IsVisible, Converter={x:Static converters:Converters.BoolToVisibility}}"
                      ToolTipService.InitialShowDelay="500" ToolTipService.ShowDuration="999999"
                      ToolTipService.HasDropShadow="True"
-                     RenderOptions.BitmapScalingMode="Fant">
+                     RenderOptions.BitmapScalingMode="Fant"
+                     behaviors:CanvasPositioning.Anchor="{Binding Anchor}"
+                     behaviors:CanvasPositioning.AnchorXDistance="{Binding XPosition}"
+                     behaviors:CanvasPositioning.AnchorYDistance="{Binding YPosition}">
             <Image>
                 <Image.Style>
                     <Style TargetType="{x:Type Image}">
@@ -183,7 +186,9 @@
         <Button x:Name="PlayPauseButton" DataContext="{Binding ViewModels.PlayPauseButtonViewModel}"
                 Width="{Binding Width}"
                 Height="{Binding Height}"
-                Canvas.Left="{Binding XPosition}" Canvas.Top="{Binding YPosition}"
+                behaviors:CanvasPositioning.Anchor="{Binding Anchor}"
+                behaviors:CanvasPositioning.AnchorXDistance="{Binding XPosition}"
+                behaviors:CanvasPositioning.AnchorYDistance="{Binding YPosition}"
                 Visibility="{Binding IsVisible, Converter={x:Static converters:Converters.BoolToVisibility}}"
                 Style="{StaticResource ToolbarPlayPauseButtonStyle}"
                 Command="{Binding PlayPauseTrackCommand}"/>
@@ -191,34 +196,44 @@
                 Width="{Binding Width}"
                 Height="{Binding Height}"
                 Visibility="{Binding IsVisible, Converter={x:Static converters:Converters.BoolToVisibility}}"
-                Canvas.Left="{Binding XPosition}" Canvas.Top="{Binding YPosition}"
+                behaviors:CanvasPositioning.Anchor="{Binding Anchor}"
+                behaviors:CanvasPositioning.AnchorXDistance="{Binding XPosition}"
+                behaviors:CanvasPositioning.AnchorYDistance="{Binding YPosition}"
                 Style="{StaticResource ToolbarNextButtonStyle}"
                 Command="{Binding NextTrackCommand}"/>
         <Button x:Name="PreviousButton" DataContext="{Binding ViewModels.PreviousButtonViewModel}"
                 Width="{Binding Width}"
                 Height="{Binding Height}"
                 Visibility="{Binding IsVisible, Converter={x:Static converters:Converters.BoolToVisibility}}"
-                Canvas.Left="{Binding XPosition}" Canvas.Top="{Binding YPosition}"
+                behaviors:CanvasPositioning.Anchor="{Binding Anchor}"
+                behaviors:CanvasPositioning.AnchorXDistance="{Binding XPosition}"
+                behaviors:CanvasPositioning.AnchorYDistance="{Binding YPosition}"
                 Style="{StaticResource ToolbarPreviousButtonStyle}"
                 Command="{Binding PreviousTrackCommand}"/>
         <Button x:Name="RepeatModeButton" DataContext="{Binding ViewModels.RepeatModeButtonViewModel}"
                 Width="{Binding Width}"
                 Height="{Binding Height}"
                 Visibility="{Binding IsVisible, Converter={x:Static converters:Converters.BoolToVisibility}}"
-                Canvas.Left="{Binding XPosition}" Canvas.Top="{Binding YPosition}"
+                behaviors:CanvasPositioning.Anchor="{Binding Anchor}"
+                behaviors:CanvasPositioning.AnchorXDistance="{Binding XPosition}"
+                behaviors:CanvasPositioning.AnchorYDistance="{Binding YPosition}"
                 Style="{StaticResource ToolbarRepeatModeButtonStyle}"
                 Command="{Binding CycleRepeatModeCommand}"/>
         <Button x:Name="ShuffleModeButton" DataContext="{Binding ViewModels.ShuffleModeButtonViewModel}"
                 Width="{Binding Width}"
                 Height="{Binding Height}"
                 Visibility="{Binding IsVisible, Converter={x:Static converters:Converters.BoolToVisibility}}"
-                Canvas.Left="{Binding XPosition}" Canvas.Top="{Binding YPosition}"
+                behaviors:CanvasPositioning.Anchor="{Binding Anchor}"
+                behaviors:CanvasPositioning.AnchorXDistance="{Binding XPosition}"
+                behaviors:CanvasPositioning.AnchorYDistance="{Binding YPosition}"
                 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}}"
-                Canvas.Left="{Binding XPosition}" Canvas.Top="{Binding YPosition}"
+                behaviors:CanvasPositioning.Anchor="{Binding Anchor}"
+                behaviors:CanvasPositioning.AnchorXDistance="{Binding XPosition}"
+                behaviors:CanvasPositioning.AnchorYDistance="{Binding YPosition}"
                 Style="{StaticResource ProgressBarStyle}"
                 Minimum="0" Maximum="{Binding TrackLength, Converter={x:Static converters:Converters.TimeSpanToMs}, Mode=OneWay}">
             <i:Interaction.Behaviors>
@@ -226,7 +241,8 @@
                 <behaviors:SliderClickAndDrag/>
             </i:Interaction.Behaviors>
         </Slider>
-        <ItemsControl x:Name="CustomLabels" ItemsSource="{Binding ViewModels.CustomLabelsViewModel.CustomLabels}">
+        <ItemsControl x:Name="CustomLabels" ItemsSource="{Binding ViewModels.CustomLabelsViewModel.CustomLabels}"
+                                        Width="{Binding ViewModels.AudioBandViewModel.Width}" Height="{Binding ViewModels.AudioBandViewModel.Height}">
             <ItemsControl.ItemsPanel>
                 <ItemsPanelTemplate>
                     <Canvas/>
@@ -234,8 +250,9 @@
             </ItemsControl.ItemsPanel>
             <ItemsControl.ItemContainerStyle>
                 <Style TargetType="ContentPresenter">
-                    <Setter Property="Canvas.Left" Value="{Binding XPosition}" />
-                    <Setter Property="Canvas.Top" Value="{Binding YPosition}" />
+                    <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>
diff --git a/src/AudioBand/Views/AudioBandToolbar.xaml.cs b/src/AudioBand/Views/AudioBandToolbar.xaml.cs
index 681493db..4200872e 100644
--- a/src/AudioBand/Views/AudioBandToolbar.xaml.cs
+++ b/src/AudioBand/Views/AudioBandToolbar.xaml.cs
@@ -33,6 +33,7 @@ private void OnSizeChanged(object sender, SizeChangedEventArgs e)
             var deskbandSize = new DeskBandSize((int)Math.Round(ActualWidth * scale), (int)Math.Round(ActualHeight * scale));
             _options.MinHorizontalSize = deskbandSize;
             _options.HorizontalSize = deskbandSize;
+            _options.MaxHorizontalHeight = deskbandSize.Height;
         }
     }
 }
diff --git a/src/AudioBand/Views/Dialogs/AboutDialog.xaml b/src/AudioBand/Views/Dialogs/AboutDialog.xaml
index 6e3c5efc..0802041b 100644
--- a/src/AudioBand/Views/Dialogs/AboutDialog.xaml
+++ b/src/AudioBand/Views/Dialogs/AboutDialog.xaml
@@ -89,7 +89,16 @@
                         <Run Text="{StaticResource AudioBandAboutDialogThirdPartyLicenseLink}"/>
                     </Hyperlink>
                 </TextBlock>
-                <TextBlock Text="Icons from MahApps.Metro.IconPacks"/>
+                <TextBlock>
+                    <Hyperlink Command="{Binding OpenSettingsFolderCommand}">
+                        <Run Text="{StaticResource AudioBandAboutDialogSettingsLinkText}"/>
+                    </Hyperlink>
+                </TextBlock>
+                <TextBlock>
+                    <Hyperlink Command="{Binding OpenLog}">
+                        <Run Text="{StaticResource AudioBandAboutDialogLogsLink}"/>
+                    </Hyperlink>
+                </TextBlock>
                 <TextBlock Text="Logo by @mirzazulfan"/>
             </StackPanel>
             <Button Grid.Row="1" Content="{StaticResource OkButtonText}" IsDefault="True" IsCancel="True" Width="80"
diff --git a/src/AudioBand/Views/Settings/AlbumArtSettingsView.xaml b/src/AudioBand/Views/Settings/AlbumArtSettingsView.xaml
index 4bd6e019..42d666a3 100644
--- a/src/AudioBand/Views/Settings/AlbumArtSettingsView.xaml
+++ b/src/AudioBand/Views/Settings/AlbumArtSettingsView.xaml
@@ -12,23 +12,12 @@
                     <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}">
-            <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 YPosition, Mode=TwoWay}"/>
-            </UniformGrid>
+            <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}"/>
diff --git a/src/AudioBand/Views/Settings/ButtonBaseTemplate.xaml b/src/AudioBand/Views/Settings/ButtonBaseTemplate.xaml
index 7aa9f319..d6911c37 100644
--- a/src/AudioBand/Views/Settings/ButtonBaseTemplate.xaml
+++ b/src/AudioBand/Views/Settings/ButtonBaseTemplate.xaml
@@ -2,10 +2,6 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:AudioBand.Views.Settings"
                     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:viewModels="clr-namespace:AudioBand.ViewModels"
                     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                     mc:Ignorable="d">
@@ -15,24 +11,12 @@
                 <ResourceDictionary.MergedDictionaries>
                     <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">
-            <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}"/>
-            </UniformGrid>
+            <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}"/>
diff --git a/src/AudioBand/Views/Settings/CustomLabelSettingsView.xaml b/src/AudioBand/Views/Settings/CustomLabelSettingsView.xaml
index 6d266e5a..c882d5d0 100644
--- a/src/AudioBand/Views/Settings/CustomLabelSettingsView.xaml
+++ b/src/AudioBand/Views/Settings/CustomLabelSettingsView.xaml
@@ -7,7 +7,8 @@
              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:resources="clr-namespace:AudioBand.Resources"
+             xmlns:theming="clr-namespace:AudioBand.Resources.Theming">
     <DataTemplate DataType="{x:Type viewmodels:CustomLabelViewModel}">
         <DataTemplate.Resources>
             <ResourceDictionary>
@@ -16,26 +17,15 @@
                     <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 DisplaySectionText}" Style="{StaticResource TitleTextBlock}"/>
+            <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"/>
-            <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 YPosition, Mode=TwoWay}"/>
-            </UniformGrid>
+            <ContentPresenter Content="{Binding}" ContentTemplate="{StaticResource LayoutSettingsTemplate}" Margin="{StaticResource SectionMargin}"/>
 
             <TextBlock Text="{StaticResource CustomLabelFormatSectionText}" Style="{StaticResource TitleTextBlock}" Margin="{StaticResource SectionMargin}"/>
             <TextBlock Style="{StaticResource DescriptionTextBlock}" x:Name="CustomLabelFormatHelpLink" Focusable="False">
@@ -75,8 +65,12 @@
             <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 Background="White" BorderBrush="Gray" BorderThickness="1" Padding="4">
-                    <TextBlock>
+                <Border BorderThickness="1" BorderBrush="{theming:ThemeResource SystemChromeHighColor}" Margin="4" Padding="4"
+                        Background="{theming:ThemeResource SystemChromeMediumLowColor}">
+                    <Border.Effect>
+                        <DropShadowEffect ShadowDepth="0" Opacity="0.3"/>
+                    </Border.Effect>
+                    <TextBlock Foreground="{theming:ThemeResource SystemBaseHighColor}" FontSize="{StaticResource BodyFontSize}">
                         <TextBlock Text="{StaticResource CustomLabelFormatHelpText}"/><LineBreak/>
                         <Bold>Tags</Bold> <LineBreak/>
                         <TextBlock Text="{StaticResource CustomLabelFormatHelpTextTags}"/><LineBreak/>
@@ -120,7 +114,7 @@
                 <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}}"/>
+                <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}"/>
diff --git a/src/AudioBand/Views/Settings/GeneralSettingsView.xaml b/src/AudioBand/Views/Settings/GeneralSettingsView.xaml
index 28b055ea..b31a3ad7 100644
--- a/src/AudioBand/Views/Settings/GeneralSettingsView.xaml
+++ b/src/AudioBand/Views/Settings/GeneralSettingsView.xaml
@@ -3,7 +3,8 @@
              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:settings="clr-namespace:AudioBand.Views.Settings">
     <DataTemplate DataType="{x:Type viewmodels:AudioBandViewModel}">
         <DataTemplate.Resources>
             <ResourceDictionary>
@@ -20,6 +21,7 @@
             <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 Text="{StaticResource OtherSectionText}" Style="{StaticResource TitleTextBlock}" Margin="{StaticResource SectionMargin}"/>
             <Button HorizontalAlignment="Left" Content="{StaticResource ResetButtonText}" Command="{Binding ResetCommand}"/>
diff --git a/src/AudioBand/Views/Settings/LayoutSettingsTemplate.xaml b/src/AudioBand/Views/Settings/LayoutSettingsTemplate.xaml
new file mode 100644
index 00000000..4808bada
--- /dev/null
+++ b/src/AudioBand/Views/Settings/LayoutSettingsTemplate.xaml
@@ -0,0 +1,39 @@
+<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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                    mc:Ignorable="d">
+    <DataTemplate x:Key="LayoutSettingsTemplate">
+        <DataTemplate.Resources>
+            <ResourceDictionary>
+                <ResourceDictionary.MergedDictionaries>
+                    <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}"/>
+            </UniformGrid>
+            <TextBlock Text="{StaticResource PositionAnchorDescription}" Style="{StaticResource DescriptionTextBlock}"/>
+            <ComboBox ItemsSource="{x:Static models:PositionAnchors.Values}" ItemTemplate="{StaticResource EnumDescriptorItemTemplate}"
+                      SelectedValue="{Binding Anchor}" SelectedValuePath="Value"/>
+        </StackPanel>
+    </DataTemplate>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/AudioBand/Views/Settings/ProgressBarSettingsView.xaml b/src/AudioBand/Views/Settings/ProgressBarSettingsView.xaml
index 202c5c6e..4f2bf974 100644
--- a/src/AudioBand/Views/Settings/ProgressBarSettingsView.xaml
+++ b/src/AudioBand/Views/Settings/ProgressBarSettingsView.xaml
@@ -12,23 +12,12 @@
                     <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}">
-            <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 YPosition, Mode=TwoWay}"/>
-            </UniformGrid>
+            <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}"/>
diff --git a/src/AudioBand/Views/Settings/SettingsWindow.xaml b/src/AudioBand/Views/Settings/SettingsWindow.xaml
index dae59aa4..a8fe7189 100644
--- a/src/AudioBand/Views/Settings/SettingsWindow.xaml
+++ b/src/AudioBand/Views/Settings/SettingsWindow.xaml
@@ -56,10 +56,23 @@
             <Border x:Name="CustomFallback" Grid.RowSpan="3" Background="{theme:ThemeResource SystemChromeMediumColor}">
                 <Border.Style>
                     <Style TargetType="{x:Type Border}">
-                        <Setter Property="Opacity" Value="0.8"/>
+                        <Setter Property="Opacity" Value="0.6"/>
                         <Style.Triggers>
                             <DataTrigger Binding="{Binding ElementName=Window, Path=IsActive}" Value="False">
-                                <Setter Property="Opacity" Value="1"/>
+                                <DataTrigger.EnterActions>
+                                    <BeginStoryboard>
+                                        <Storyboard>
+                                            <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"/>
+                                        </Storyboard>
+                                    </BeginStoryboard>
+                                </DataTrigger.ExitActions>
                             </DataTrigger>
                         </Style.Triggers>
                     </Style>
@@ -132,7 +145,7 @@
                     </RadioButton>
                     <Expander Style="{StaticResource NavigationPaneExpander}">
                         <Expander.Header>
-                            <Grid Margin="1,0">
+                            <Grid>
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="*"/>
                                     <ColumnDefinition Width="Auto"/>
@@ -140,7 +153,7 @@
                                 <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}"
+                                <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"/>
@@ -171,7 +184,7 @@
                                             <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}"
+                                            <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}">
@@ -350,10 +363,3 @@
         </Grid>
     </DockPanel>
 </fw:AcrylicWindow>
-
-
-
-
-
-
-
diff --git a/src/AudioBand/Views/Settings/SettingsWindow.xaml.cs b/src/AudioBand/Views/Settings/SettingsWindow.xaml.cs
index f945947b..9e6fc268 100644
--- a/src/AudioBand/Views/Settings/SettingsWindow.xaml.cs
+++ b/src/AudioBand/Views/Settings/SettingsWindow.xaml.cs
@@ -2,6 +2,7 @@
 using System.ComponentModel;
 using System.Windows;
 using System.Windows.Input;
+using System.Windows.Interop;
 using AudioBand.Commands;
 using AudioBand.Messages;
 using AudioBand.ViewModels;
@@ -105,7 +106,32 @@ private void ViewModelOnPropertyChanged(object sender, PropertyChangedEventArgs
 
         private void OnLoaded(object sender, RoutedEventArgs e)
         {
-            NativeMethods.FixWindowComposition(this);
+            // Windows 10 1903 acrylic fix
+            var win1903 = new Version(10, 0, 18362);
+            if (Environment.OSVersion.Version < win1903)
+            {
+                return;
+            }
+
+            ((HwndSource)PresentationSource.FromVisual(this)).AddHook(Hook);
+        }
+
+        private IntPtr Hook(IntPtr hwnd, int msg, IntPtr wparam, IntPtr lparam, ref bool handled)
+        {
+            const int WM_ENTERSIZEMOVE = 0x0231;
+            const int WM_EXITSIZEMOVE = 0x0232;
+
+            switch (msg)
+            {
+                case WM_ENTERSIZEMOVE:
+                    NativeMethods.DisableAcrylic(this);
+                    break;
+                case WM_EXITSIZEMOVE:
+                    NativeMethods.EnableAcrylic(this);
+                    break;
+            }
+
+            return IntPtr.Zero;
         }
     }
 }
diff --git a/src/AudioBand/audioband.ico b/src/AudioBand/audioband.ico
index cb54c906..50745cdf 100644
Binary files a/src/AudioBand/audioband.ico and b/src/AudioBand/audioband.ico differ
diff --git a/src/AudioBandInstaller/.gitignore b/src/AudioBandInstaller/.gitignore
new file mode 100644
index 00000000..d70e3cce
--- /dev/null
+++ b/src/AudioBandInstaller/.gitignore
@@ -0,0 +1,4 @@
+AudioBandHeatGenerated.wxs
+iTunesHeatGenerated.wxs
+MusicBeeHeatGenerated.wxs
+SpotifyHeatGenerated.wxs
\ No newline at end of file
diff --git a/src/AudioBandInstaller/AudioBandCOM.wxs b/src/AudioBandInstaller/AudioBandCOM.wxs
new file mode 100644
index 00000000..74e00e34
--- /dev/null
+++ b/src/AudioBandInstaller/AudioBandCOM.wxs
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Fragment>
+        <DirectoryRef Id="AUDIOBANDINSTALLFOLDER">
+            <Component Id="cmpA061ABA0545D00747466BC45748B0A5B" Guid="*">
+                <Class Id="{957D8782-5B07-4126-9B24-1E917BAAAD64}" Context="InprocServer32" Description="Audio Band" ThreadingModel="both" ForeignServer="mscoree.dll">
+                    <ProgId Id="AudioBand.Deskband" Description="AudioBand.Deskband" />
+                </Class>
+                <File Id="fil156C3D28E6AA0B19E3597B0E7D9FC3C1" KeyPath="yes" Source="$(var.AudioBandHarvestPath)\AudioBand.dll" />
+                <RegistryValue Root="HKCR" Key="CLSID\{957D8782-5B07-4126-9B24-1E917BAAAD64}\Implemented Categories\{00021492-0000-0000-c000-000000000046}" Value="" Type="string" Action="write" />
+                <RegistryValue Root="HKCR" Key="CLSID\{957D8782-5B07-4126-9B24-1E917BAAAD64}\Implemented Categories\{62C8FE65-4EBB-45e7-B440-6E39B2CDBF29}" Value="" Type="string" Action="write" />
+                <RegistryValue Root="HKCR" Key="CLSID\{957D8782-5B07-4126-9B24-1E917BAAAD64}\InprocServer32\1.0.0.0" Name="Class" Value="AudioBand.Deskband" Type="string" Action="write" />
+                <RegistryValue Root="HKCR" Key="CLSID\{957D8782-5B07-4126-9B24-1E917BAAAD64}\InprocServer32\1.0.0.0" Name="Assembly" Value="AudioBand, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" Type="string" Action="write" />
+                <RegistryValue Root="HKCR" Key="CLSID\{957D8782-5B07-4126-9B24-1E917BAAAD64}\InprocServer32\1.0.0.0" Name="RuntimeVersion" Value="v4.0.30319" Type="string" Action="write" />
+                <RegistryValue Root="HKCR" Key="CLSID\{957D8782-5B07-4126-9B24-1E917BAAAD64}\InprocServer32\1.0.0.0" Name="CodeBase" Value="file:///[#fil156C3D28E6AA0B19E3597B0E7D9FC3C1]" Type="string" Action="write" />
+                <RegistryValue Root="HKCR" Key="CLSID\{957D8782-5B07-4126-9B24-1E917BAAAD64}\InprocServer32" Name="Class" Value="AudioBand.Deskband" Type="string" Action="write" />
+                <RegistryValue Root="HKCR" Key="CLSID\{957D8782-5B07-4126-9B24-1E917BAAAD64}\InprocServer32" Name="Assembly" Value="AudioBand, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" Type="string" Action="write" />
+                <RegistryValue Root="HKCR" Key="CLSID\{957D8782-5B07-4126-9B24-1E917BAAAD64}\InprocServer32" Name="RuntimeVersion" Value="v4.0.30319" Type="string" Action="write" />
+                <RegistryValue Root="HKCR" Key="CLSID\{957D8782-5B07-4126-9B24-1E917BAAAD64}\InprocServer32" Name="CodeBase" Value="file:///[#fil156C3D28E6AA0B19E3597B0E7D9FC3C1]" Type="string" Action="write" />
+            </Component>
+        </DirectoryRef>
+    </Fragment>
+    <Fragment>
+        <ComponentGroup Id="AudioBandCOM">
+            <ComponentRef Id="cmpA061ABA0545D00747466BC45748B0A5B" />
+        </ComponentGroup>
+    </Fragment>
+</Wix>
\ No newline at end of file
diff --git a/src/AudioBandInstaller/AudioBandHeatXsl.xslt b/src/AudioBandInstaller/AudioBandHeatXsl.xslt
new file mode 100644
index 00000000..c92aff44
--- /dev/null
+++ b/src/AudioBandInstaller/AudioBandHeatXsl.xslt
@@ -0,0 +1,21 @@
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:msxsl="urn:schemas-microsoft-com:xslt"
+                exclude-result-prefixes="msxsl"
+                xmlns:wix="http://schemas.microsoft.com/wix/2006/wi"
+                xmlns:my="my:my">
+
+  <xsl:output method="xml" indent="yes" />
+
+  <xsl:strip-space elements="*"/>
+
+  <xsl:template match="@*|node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
+  <xsl:key name="audiobandDllFile" match="wix:Component[wix:File[@Source = '$(var.AudioBandHarvestPath)\AudioBand.dll']]" use="@Id"/>
+  <!-- Remove file reference to audioband.dll, it will be added by AudioBandCOM.wxs-->
+  <xsl:template match="*[self::wix:Component or self::wix:ComponentRef][key('audiobandDllFile', @Id)]" />
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/AudioBandInstaller/AudioBandInstaller.wixproj b/src/AudioBandInstaller/AudioBandInstaller.wixproj
new file mode 100644
index 00000000..7fcaecd2
--- /dev/null
+++ b/src/AudioBandInstaller/AudioBandInstaller.wixproj
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
+    <ProductVersion>3.10</ProductVersion>
+    <ProjectGuid>4e9eee47-23f6-45b7-9ddb-a34731d6ae4a</ProjectGuid>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputName>AudioBand</OutputName>
+    <OutputType>Package</OutputType>
+    <InstallerPlatform>x64</InstallerPlatform>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>Debug</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="InstallerUI.wxs" />
+    <Compile Include="Product.wxs" />
+    <Compile Include="AudioBandHeatGenerated.wxs" />
+    <Compile Include="iTunesHeatGenerated.wxs" />
+    <Compile Include="MusicBeeHeatGenerated.wxs" />
+    <Compile Include="SpotifyHeatGenerated.wxs" />
+    <Compile Include="AudioBandCOM.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixUIExtension">
+      <HintPath>$(WixToolPath)WixUIExtension.dll</HintPath>
+      <Name>WixUIExtension</Name>
+    </WixExtension>
+    <WixExtension Include="WixUtilExtension">
+      <HintPath>$(WixToolPath)WixUtilExtension.dll</HintPath>
+      <Name>WixUtilExtension</Name>
+    </WixExtension>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\AudioBand.AudioSource\AudioBand.AudioSource.csproj">
+      <Name>AudioBand.AudioSource</Name>
+      <Project>{30f2bfea-788a-494d-88e7-f2070528ebea}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\AudioBand.Logging\AudioBand.Logging.csproj">
+      <Name>AudioBand.Logging</Name>
+      <Project>{d8e1d3e5-d0ab-43c4-8af6-60c14c5c6843}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\AudioBand\AudioBand.csproj">
+      <Name>AudioBand</Name>
+      <Project>{b69832ad-8373-47ac-a52a-183238903896}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\AudioSourceHost\AudioSourceHost.csproj">
+      <Name>AudioSourceHost</Name>
+      <Project>{d3f92c3e-e546-4a6b-ada2-facd95e229f7}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\iTunesAudioSource\iTunesAudioSource.csproj">
+      <Name>iTunesAudioSource</Name>
+      <Project>{6d881b7b-3f3f-4613-a83f-75e31eea5252}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>AudioSourcesFolder</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\MusicBeeAudioSource\MusicBeeAudioSource.csproj">
+      <Name>MusicBeeAudioSource</Name>
+      <Project>{741db79c-921d-4d91-85f1-cd10c746f46e}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>AudioSourcesFolder</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\SpotifyAudioSource\SpotifyAudioSource.csproj">
+      <Name>SpotifyAudioSource</Name>
+      <Project>{43b57d81-7fae-40d0-921e-e29f7e848288}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>AudioSourcesFolder</RefTargetDir>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="audioband.ico" />
+    <Content Include="AudioBandHeatXsl.xslt" />
+    <Content Include="AudioSourcesXsl.xslt" />
+    <Content Include="installer_background.bmp" />
+    <Content Include="installer_banner.bmp" />
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
+  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
+    <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
+  </Target>
+  <PropertyGroup>
+    <DefineConstants>AudioBandHarvestPath=..\Audioband\bin\$(Configuration);ITunesHarvestPath=..\iTunesAudioSource\bin\$(Configuration)\iTunes;MusicBeeHarvestPath=..\MusicBeeAudioSource\bin\$(Configuration)\MusicBee;SpotifyHarvestPath=..\SpotifyAudioSource\bin\$(Configuration)\spotify</DefineConstants>
+  </PropertyGroup>
+  <Target Name="AfterResolveReferences">
+    <HeatDirectory Directory="..\Audioband\bin\$(Configuration)" PreprocessorVariable="var.AudioBandHarvestPath" OutputFile="$(ProjectDir)\AudioBandHeatGenerated.wxs" ComponentGroupName="AudioBandFiles" DirectoryRefId="AUDIOBANDINSTALLFOLDER" AutogenerateGuids="true" ToolPath="$(WixToolPath)" SuppressFragments="true" SuppressRegistry="true" SuppressRootDirectory="true" Transforms="$(ProjectDir)\AudioBandHeatXsl.xslt" />
+    <HeatFile File="..\Audioband\bin\$(Configuration)\AudioBand.dll" PreprocessorVariable="var.AudioBandHarvestPath" OutputFile="$(ProjectDir)\AudioBandCOM.wxs" ComponentGroupName="AudioBandCOM" DirectoryRefId="AUDIOBANDINSTALLFOLDER" AutogenerateGuids="true" ToolPath="$(WixToolPath)" SuppressRootDirectory="true" GenerateGuidsNow="true" SuppressFragments="true" />
+    <HeatDirectory Directory="..\iTunesAudioSource\bin\$(Configuration)\iTunes" PreprocessorVariable="var.ITunesHarvestPath" OutputFile="$(ProjectDir)\iTunesHeatGenerated.wxs" ComponentGroupName="iTunesFiles" DirectoryRefId="AUDIOSOURCESFOLDER" AutogenerateGuids="true" ToolPath="$(WixToolPath)" SuppressFragments="true" SuppressRegistry="true" SuppressRootDirectory="false" Transforms="$(ProjectDir)\AudioSourcesXsl.xslt" />
+    <HeatDirectory Directory="..\MusicBeeAudioSource\bin\$(Configuration)\MusicBee" PreprocessorVariable="var.MusicBeeHarvestPath" OutputFile="$(ProjectDir)\MusicBeeHeatGenerated.wxs" ComponentGroupName="MusicBeeFiles" DirectoryRefId="AUDIOSOURCESFOLDER" AutogenerateGuids="true" ToolPath="$(WixToolPath)" SuppressFragments="true" SuppressRegistry="true" SuppressRootDirectory="false" Transforms="$(ProjectDir)\AudioSourcesXsl.xslt" />
+    <HeatDirectory Directory="..\SpotifyAudioSource\bin\$(Configuration)\spotify" PreprocessorVariable="var.SpotifyHarvestPath" OutputFile="$(ProjectDir)\SpotifyHeatGenerated.wxs" ComponentGroupName="SpotifyFiles" DirectoryRefId="AUDIOSOURCESFOLDER" AutogenerateGuids="true" ToolPath="$(WixToolPath)" SuppressFragments="true" SuppressRegistry="true" SuppressRootDirectory="false" Transforms="$(ProjectDir)\AudioSourcesXsl.xslt" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/src/AudioBandInstaller/AudioSourcesXsl.xslt b/src/AudioBandInstaller/AudioSourcesXsl.xslt
new file mode 100644
index 00000000..198ab904
--- /dev/null
+++ b/src/AudioBandInstaller/AudioSourcesXsl.xslt
@@ -0,0 +1,22 @@
+<?xml version="1.0" ?>
+<xsl:stylesheet version="1.0"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:wix="http://schemas.microsoft.com/wix/2006/wi">
+
+  <!-- Copy all attributes and elements to the output. -->
+  <xsl:template match="@*|*">
+    <xsl:copy>
+      <xsl:apply-templates select="@*" />
+      <xsl:apply-templates select="*" />
+    </xsl:copy>
+  </xsl:template>
+
+  <xsl:output method="xml" indent="yes" />
+
+  <!-- Key for AudioBand.AudioSource library files -->
+  <xsl:key name="audiosourcelib-component" match="wix:Component[wix:File[contains(@Source, 'AudioBand.AudioSource')]]" use="@Id"/>
+
+  <!-- Remove components containing audiosource library files-->
+  <xsl:template match="wix:Component[key('audiosourcelib-component', @Id)]"/>
+  <xsl:template match="wix:ComponentRef[key('audiosourcelib-component', @Id)]"/>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/AudioBandInstaller/InstallerUI.wxs b/src/AudioBandInstaller/InstallerUI.wxs
new file mode 100644
index 00000000..f606659c
--- /dev/null
+++ b/src/AudioBandInstaller/InstallerUI.wxs
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Fragment>
+    <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+    <!--
+First-time install dialog sequence:
+- WixUI_WelcomeDlg
+- WixUI_LicenseAgreementDlg
+- WixUI_SetupTypeDlg
+- WixUI_VerifyReadyDlg
+- WixUI_CustomizeDlg
+- WixUI_DiskCostDlg
+- WixUI_BrowseDlg
+
+Maintenance dialog sequence:
+- WixUI_MaintenanceWelcomeDlg
+- WixUI_MaintenanceTypeDlg
+- WixUI_CustomizeDlg
+- WixUI_VerifyReadyDlg
+
+Patch dialog sequence:
+ - WixUI_WelcomeDlg
+ - WixUI_VerifyReadyDlg
+-->
+    <UI Id="AudiobandUI">
+      <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
+      <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
+      <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
+
+      <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
+      <Property Id="WixUI_Mode" Value="Mondo" />
+
+      <DialogRef Id="ErrorDlg" />
+      <DialogRef Id="FatalError" />
+      <DialogRef Id="FilesInUse" />
+      <DialogRef Id="MsiRMFilesInUse" />
+      <DialogRef Id="PrepareDlg" />
+      <DialogRef Id="ProgressDlg" />
+      <DialogRef Id="ResumeDlg" />
+      <DialogRef Id="UserExit" />
+
+      <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
+
+      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="SetupTypeDlg">NOT Installed AND NOT PATCH</Publish>
+      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish>
+
+      <Publish Dialog="SetupTypeDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
+      <Publish Dialog="SetupTypeDlg" Control="TypicalButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+      <Publish Dialog="SetupTypeDlg" Control="CustomButton" Event="NewDialog" Value="CustomizeDlg">1</Publish>
+      <Publish Dialog="SetupTypeDlg" Control="CompleteButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+
+      <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="1">WixUI_InstallMode = "Change"</Publish>
+      <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2">WixUI_InstallMode = "InstallCustom"</Publish>
+      <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+
+      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="1">WixUI_InstallMode = "InstallCustom"</Publish>
+      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2">WixUI_InstallMode = "InstallTypical" OR WixUI_InstallMode = "InstallComplete"</Publish>
+      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="3">WixUI_InstallMode = "Change"</Publish>
+      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="4">WixUI_InstallMode = "Repair" OR WixUI_InstallMode = "Remove"</Publish>
+      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">WixUI_InstallMode = "Update"</Publish>
+
+      <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
+
+      <Publish Dialog="MaintenanceTypeDlg" Control="ChangeButton" Event="NewDialog" Value="CustomizeDlg">1</Publish>
+      <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+      <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+      <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
+    </UI>
+
+    <UIRef Id="WixUI_Common" />
+  </Fragment>
+</Wix>
diff --git a/src/AudioBandInstaller/Product.wxs b/src/AudioBandInstaller/Product.wxs
new file mode 100644
index 00000000..142c14bd
Binary files /dev/null and b/src/AudioBandInstaller/Product.wxs differ
diff --git a/src/AudioBandInstaller/audioband.ico b/src/AudioBandInstaller/audioband.ico
new file mode 100644
index 00000000..50745cdf
Binary files /dev/null and b/src/AudioBandInstaller/audioband.ico differ
diff --git a/src/AudioBandInstaller/installer_background.bmp b/src/AudioBandInstaller/installer_background.bmp
new file mode 100644
index 00000000..491dddf2
Binary files /dev/null and b/src/AudioBandInstaller/installer_background.bmp differ
diff --git a/src/AudioBandInstaller/installer_banner.bmp b/src/AudioBandInstaller/installer_banner.bmp
new file mode 100644
index 00000000..a738eaec
Binary files /dev/null and b/src/AudioBandInstaller/installer_banner.bmp differ
diff --git a/src/AudioSourceHost/AudioSourceHost.csproj b/src/AudioSourceHost/AudioSourceHost.csproj
index b335b537..88d85e7d 100644
--- a/src/AudioSourceHost/AudioSourceHost.csproj
+++ b/src/AudioSourceHost/AudioSourceHost.csproj
@@ -47,6 +47,34 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>..\AudioBandRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DocumentationFile>bin\Debug\AudioSourceHost.xml</DocumentationFile>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>..\AudioBandRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>..\AudioBandRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Test|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Test\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>..\AudioBandRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
diff --git a/src/MusicBeeAudioSource/MusicBeeAudioSource.csproj b/src/MusicBeeAudioSource/MusicBeeAudioSource.csproj
index 47799736..44f9cebf 100644
--- a/src/MusicBeeAudioSource/MusicBeeAudioSource.csproj
+++ b/src/MusicBeeAudioSource/MusicBeeAudioSource.csproj
@@ -43,6 +43,34 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>..\AudioBandRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>..\AudioBandRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>..\AudioBandRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Test|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Test\</OutputPath>
+    <DefineConstants>CODE_ANALYSIS;CODE_ANALYSIS;DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>..\AudioBandRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -88,6 +116,10 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>(robocopy "$(TargetDir)\" "$(SolutionDir)AudioBand\$(OutDir)AudioSources\MusicBee\\" /xf AudioBand.AudioSource.dll)  ^&amp; IF %25ERRORLEVEL%25 LEQ 1 exit 0</PostBuildEvent>
+    <PostBuildEvent>if NOT "$(Configuration)" == "Release" (
+  (robocopy "$(TargetDir)\" "$(SolutionDir)AudioBand\$(OutDir)AudioSources\MusicBee\\" /xf AudioBand.AudioSource.*)  ^&amp; IF %25ERRORLEVEL%25 LEQ 1 exit 0
+) ELSE (
+  (robocopy "$(TargetDir)\" "$(TargetDir)MusicBee\\" /xf AudioBand.AudioSource.*) ^&amp; IF %25ERRORLEVEL%25 LEQ 1 exit 0
+)</PostBuildEvent>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/SpotifyAudioSource/SpotifyAudioSource.csproj b/src/SpotifyAudioSource/SpotifyAudioSource.csproj
index 0f3306f7..28b8c203 100644
--- a/src/SpotifyAudioSource/SpotifyAudioSource.csproj
+++ b/src/SpotifyAudioSource/SpotifyAudioSource.csproj
@@ -46,6 +46,34 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>..\AudioBandRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>..\AudioBandRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>..\AudioBandRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Test|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Test\</OutputPath>
+    <DefineConstants>CODE_ANALYSIS;CODE_ANALYSIS;DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>..\AudioBandRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -94,6 +122,10 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>(robocopy "$(TargetDir)\" "$(SolutionDir)AudioBand\$(OutDir)AudioSources\spotify\\" /xf AudioBand.AudioSource.dll)  ^&amp; IF %25ERRORLEVEL%25 LEQ 1 exit 0</PostBuildEvent>
+    <PostBuildEvent>if NOT "$(Configuration)" == "Release" (
+  (robocopy "$(TargetDir)\" "$(SolutionDir)AudioBand\$(OutDir)AudioSources\spotify\\" /xf AudioBand.AudioSource.*)  ^&amp; IF %25ERRORLEVEL%25 LEQ 1 exit 0
+) ELSE (
+  (robocopy "$(TargetDir)\" "$(TargetDir)spotify\\" /xf AudioBand.AudioSource.*) ^&amp; IF %25ERRORLEVEL%25 LEQ 1 exit 0
+)</PostBuildEvent>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/iTunesAudioSource/iTunesAudioSource.csproj b/src/iTunesAudioSource/iTunesAudioSource.csproj
index ba52933a..05d0b239 100644
--- a/src/iTunesAudioSource/iTunesAudioSource.csproj
+++ b/src/iTunesAudioSource/iTunesAudioSource.csproj
@@ -43,6 +43,34 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>..\AudioBandRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>..\AudioBandRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>..\AudioBandRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Test|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Test\</OutputPath>
+    <DefineConstants>CODE_ANALYSIS;CODE_ANALYSIS;DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>..\AudioBandRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Interop.iTunesLib">
       <HintPath>.\Interop.iTunesLib.dll</HintPath>
@@ -83,6 +111,10 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>(robocopy "$(TargetDir)\" "$(SolutionDir)AudioBand\$(OutDir)AudioSources\iTunes\\" /xf AudioBand.AudioSource.dll)  ^&amp; IF %25ERRORLEVEL%25 LEQ 1 exit 0</PostBuildEvent>
+    <PostBuildEvent>if NOT "$(Configuration)" == "Release" (
+  (robocopy "$(TargetDir)\" "$(SolutionDir)AudioBand\$(OutDir)AudioSources\iTunes\\" /xf AudioBand.AudioSource.*)  ^&amp; IF %25ERRORLEVEL%25 LEQ 1 exit 0
+) ELSE (
+  (robocopy "$(TargetDir)\" "$(TargetDir)iTunes\\" /xf AudioBand.AudioSource.*) ^&amp; IF %25ERRORLEVEL%25 LEQ 1 exit 0
+)</PostBuildEvent>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tools/createicon.ps1 b/tools/createicon.ps1
index c694bd48..cba3aab5 100644
--- a/tools/createicon.ps1
+++ b/tools/createicon.ps1
@@ -1,5 +1,9 @@
+param (
+    [string]$source
+)
+
 $sizes = 16, 32, 48, 128, 256
-$image = [System.IO.Path]::GetFullPath($args[0])
+$image = [System.IO.Path]::GetFullPath($source)
 if (!$image) {
     Write-Error "Missing image argument"
     exit
diff --git a/tools/extractversion.ps1 b/tools/extractversion.ps1
new file mode 100644
index 00000000..ec9710de
--- /dev/null
+++ b/tools/extractversion.ps1
@@ -0,0 +1,12 @@
+param(
+    [Parameter(Mandatory = $true)][string]$versionString
+)
+
+$pattern = "^v(?<major>0|[1-9]\d*)\.(?<minor>0|[1-9]\d*)\.(?<patch>0|[1-9]\d*)(-(?<prerelease>0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))?$"
+$version = [regex]::Match($versionString, $pattern)
+if ($version.Success) {
+    $env:AUDIOBAND_VERSION_MAJOR = $version.Groups["major"]
+    $env:AUDIOBAND_VERSION_MINOR = $version.Groups["minor"]
+    $env:AUDIOBAND_VERSION_PATCH = $version.Groups["patch"]
+    $env:AUDIOBAND_VERSION_PRERELEASE = $version.Groups["prerelease"]
+}
\ No newline at end of file
diff --git a/tools/patchinstaller.ps1 b/tools/patchinstaller.ps1
new file mode 100644
index 00000000..6c855836
--- /dev/null
+++ b/tools/patchinstaller.ps1
@@ -0,0 +1,20 @@
+param(
+    [Parameter(Mandatory = $true)][string]$major,
+    [Parameter(Mandatory = $true)][string]$minor,
+    [Parameter(Mandatory = $true)][string]$patch
+)
+
+$productVersionToken = '<?define ProductVersion = "0.0.0"?>'
+$productIdToken = '<?define ProductId = "{CE7B5507-834E-4C1C-85D7-15598EBC52C4}"?>'
+
+$newVersion = "$major.$minor.$patch"
+Write-Host "Updating version to $newVersion"
+
+$newGuid = [guid]::NewGuid()
+Write-Host "Creating new GUID $newGuid"
+
+$targetFile = $PSScriptRoot + '/../src/AudioBandInstaller/Product.wxs'
+$versionReplace = "<?define ProductVersion = '$newVersion'?>"
+$guidReplace = "<?define ProductId = '$newGuid'?>"
+
+(Get-Content "$targetFile").replace("$productVersionToken", "$versionReplace").replace("$productIdToken", "$guidReplace") | Set-Content -Encoding UTF8 "$targetFile"
\ No newline at end of file