diff --git a/Mixonomer/Assets.xcassets/AppIcon.appiconset/100.png b/Mixonomer/Assets.xcassets/AppIcon.appiconset/100.png
new file mode 100644
index 0000000..0b28430
Binary files /dev/null and b/Mixonomer/Assets.xcassets/AppIcon.appiconset/100.png differ
diff --git a/Mixonomer/Assets.xcassets/AppIcon.appiconset/1024.png b/Mixonomer/Assets.xcassets/AppIcon.appiconset/1024.png
new file mode 100644
index 0000000..ccc0618
Binary files /dev/null and b/Mixonomer/Assets.xcassets/AppIcon.appiconset/1024.png differ
diff --git a/Mixonomer/Assets.xcassets/AppIcon.appiconset/114.png b/Mixonomer/Assets.xcassets/AppIcon.appiconset/114.png
new file mode 100644
index 0000000..50255bc
Binary files /dev/null and b/Mixonomer/Assets.xcassets/AppIcon.appiconset/114.png differ
diff --git a/Mixonomer/Assets.xcassets/AppIcon.appiconset/120.png b/Mixonomer/Assets.xcassets/AppIcon.appiconset/120.png
new file mode 100644
index 0000000..8dab269
Binary files /dev/null and b/Mixonomer/Assets.xcassets/AppIcon.appiconset/120.png differ
diff --git a/Mixonomer/Assets.xcassets/AppIcon.appiconset/128.png b/Mixonomer/Assets.xcassets/AppIcon.appiconset/128.png
new file mode 100644
index 0000000..1ba3ba6
Binary files /dev/null and b/Mixonomer/Assets.xcassets/AppIcon.appiconset/128.png differ
diff --git a/Mixonomer/Assets.xcassets/AppIcon.appiconset/144.png b/Mixonomer/Assets.xcassets/AppIcon.appiconset/144.png
new file mode 100644
index 0000000..986d037
Binary files /dev/null and b/Mixonomer/Assets.xcassets/AppIcon.appiconset/144.png differ
diff --git a/Mixonomer/Assets.xcassets/AppIcon.appiconset/152.png b/Mixonomer/Assets.xcassets/AppIcon.appiconset/152.png
new file mode 100644
index 0000000..a12290b
Binary files /dev/null and b/Mixonomer/Assets.xcassets/AppIcon.appiconset/152.png differ
diff --git a/Mixonomer/Assets.xcassets/AppIcon.appiconset/16.png b/Mixonomer/Assets.xcassets/AppIcon.appiconset/16.png
new file mode 100644
index 0000000..c90ce2e
Binary files /dev/null and b/Mixonomer/Assets.xcassets/AppIcon.appiconset/16.png differ
diff --git a/Mixonomer/Assets.xcassets/AppIcon.appiconset/167.png b/Mixonomer/Assets.xcassets/AppIcon.appiconset/167.png
new file mode 100644
index 0000000..be5e7c5
Binary files /dev/null and b/Mixonomer/Assets.xcassets/AppIcon.appiconset/167.png differ
diff --git a/Mixonomer/Assets.xcassets/AppIcon.appiconset/172.png b/Mixonomer/Assets.xcassets/AppIcon.appiconset/172.png
new file mode 100644
index 0000000..c37a181
Binary files /dev/null and b/Mixonomer/Assets.xcassets/AppIcon.appiconset/172.png differ
diff --git a/Mixonomer/Assets.xcassets/AppIcon.appiconset/180.png b/Mixonomer/Assets.xcassets/AppIcon.appiconset/180.png
new file mode 100644
index 0000000..00848a9
Binary files /dev/null and b/Mixonomer/Assets.xcassets/AppIcon.appiconset/180.png differ
diff --git a/Mixonomer/Assets.xcassets/AppIcon.appiconset/196.png b/Mixonomer/Assets.xcassets/AppIcon.appiconset/196.png
new file mode 100644
index 0000000..137c2b8
Binary files /dev/null and b/Mixonomer/Assets.xcassets/AppIcon.appiconset/196.png differ
diff --git a/Mixonomer/Assets.xcassets/AppIcon.appiconset/20.png b/Mixonomer/Assets.xcassets/AppIcon.appiconset/20.png
new file mode 100644
index 0000000..c622678
Binary files /dev/null and b/Mixonomer/Assets.xcassets/AppIcon.appiconset/20.png differ
diff --git a/Mixonomer/Assets.xcassets/AppIcon.appiconset/216.png b/Mixonomer/Assets.xcassets/AppIcon.appiconset/216.png
new file mode 100644
index 0000000..300803a
Binary files /dev/null and b/Mixonomer/Assets.xcassets/AppIcon.appiconset/216.png differ
diff --git a/Mixonomer/Assets.xcassets/AppIcon.appiconset/256.png b/Mixonomer/Assets.xcassets/AppIcon.appiconset/256.png
new file mode 100644
index 0000000..68d07e4
Binary files /dev/null and b/Mixonomer/Assets.xcassets/AppIcon.appiconset/256.png differ
diff --git a/Mixonomer/Assets.xcassets/AppIcon.appiconset/29.png b/Mixonomer/Assets.xcassets/AppIcon.appiconset/29.png
new file mode 100644
index 0000000..465206c
Binary files /dev/null and b/Mixonomer/Assets.xcassets/AppIcon.appiconset/29.png differ
diff --git a/Mixonomer/Assets.xcassets/AppIcon.appiconset/32.png b/Mixonomer/Assets.xcassets/AppIcon.appiconset/32.png
new file mode 100644
index 0000000..5724973
Binary files /dev/null and b/Mixonomer/Assets.xcassets/AppIcon.appiconset/32.png differ
diff --git a/Mixonomer/Assets.xcassets/AppIcon.appiconset/40.png b/Mixonomer/Assets.xcassets/AppIcon.appiconset/40.png
new file mode 100644
index 0000000..5874b87
Binary files /dev/null and b/Mixonomer/Assets.xcassets/AppIcon.appiconset/40.png differ
diff --git a/Mixonomer/Assets.xcassets/AppIcon.appiconset/48.png b/Mixonomer/Assets.xcassets/AppIcon.appiconset/48.png
new file mode 100644
index 0000000..7e29e69
Binary files /dev/null and b/Mixonomer/Assets.xcassets/AppIcon.appiconset/48.png differ
diff --git a/Mixonomer/Assets.xcassets/AppIcon.appiconset/50.png b/Mixonomer/Assets.xcassets/AppIcon.appiconset/50.png
new file mode 100644
index 0000000..6e3d198
Binary files /dev/null and b/Mixonomer/Assets.xcassets/AppIcon.appiconset/50.png differ
diff --git a/Mixonomer/Assets.xcassets/AppIcon.appiconset/512.png b/Mixonomer/Assets.xcassets/AppIcon.appiconset/512.png
new file mode 100644
index 0000000..02a7b18
Binary files /dev/null and b/Mixonomer/Assets.xcassets/AppIcon.appiconset/512.png differ
diff --git a/Mixonomer/Assets.xcassets/AppIcon.appiconset/55.png b/Mixonomer/Assets.xcassets/AppIcon.appiconset/55.png
new file mode 100644
index 0000000..926a55f
Binary files /dev/null and b/Mixonomer/Assets.xcassets/AppIcon.appiconset/55.png differ
diff --git a/Mixonomer/Assets.xcassets/AppIcon.appiconset/57.png b/Mixonomer/Assets.xcassets/AppIcon.appiconset/57.png
new file mode 100644
index 0000000..6e56eb5
Binary files /dev/null and b/Mixonomer/Assets.xcassets/AppIcon.appiconset/57.png differ
diff --git a/Mixonomer/Assets.xcassets/AppIcon.appiconset/58.png b/Mixonomer/Assets.xcassets/AppIcon.appiconset/58.png
new file mode 100644
index 0000000..34fdfb0
Binary files /dev/null and b/Mixonomer/Assets.xcassets/AppIcon.appiconset/58.png differ
diff --git a/Mixonomer/Assets.xcassets/AppIcon.appiconset/60.png b/Mixonomer/Assets.xcassets/AppIcon.appiconset/60.png
new file mode 100644
index 0000000..d613a2d
Binary files /dev/null and b/Mixonomer/Assets.xcassets/AppIcon.appiconset/60.png differ
diff --git a/Mixonomer/Assets.xcassets/AppIcon.appiconset/64.png b/Mixonomer/Assets.xcassets/AppIcon.appiconset/64.png
new file mode 100644
index 0000000..d4a4ebd
Binary files /dev/null and b/Mixonomer/Assets.xcassets/AppIcon.appiconset/64.png differ
diff --git a/Mixonomer/Assets.xcassets/AppIcon.appiconset/72.png b/Mixonomer/Assets.xcassets/AppIcon.appiconset/72.png
new file mode 100644
index 0000000..6925484
Binary files /dev/null and b/Mixonomer/Assets.xcassets/AppIcon.appiconset/72.png differ
diff --git a/Mixonomer/Assets.xcassets/AppIcon.appiconset/76.png b/Mixonomer/Assets.xcassets/AppIcon.appiconset/76.png
new file mode 100644
index 0000000..ea78a14
Binary files /dev/null and b/Mixonomer/Assets.xcassets/AppIcon.appiconset/76.png differ
diff --git a/Mixonomer/Assets.xcassets/AppIcon.appiconset/80.png b/Mixonomer/Assets.xcassets/AppIcon.appiconset/80.png
new file mode 100644
index 0000000..8f916c8
Binary files /dev/null and b/Mixonomer/Assets.xcassets/AppIcon.appiconset/80.png differ
diff --git a/Mixonomer/Assets.xcassets/AppIcon.appiconset/87.png b/Mixonomer/Assets.xcassets/AppIcon.appiconset/87.png
new file mode 100644
index 0000000..1e48934
Binary files /dev/null and b/Mixonomer/Assets.xcassets/AppIcon.appiconset/87.png differ
diff --git a/Mixonomer/Assets.xcassets/AppIcon.appiconset/88.png b/Mixonomer/Assets.xcassets/AppIcon.appiconset/88.png
new file mode 100644
index 0000000..d338945
Binary files /dev/null and b/Mixonomer/Assets.xcassets/AppIcon.appiconset/88.png differ
diff --git a/Mixonomer/Assets.xcassets/AppIcon.appiconset/Contents.json b/Mixonomer/Assets.xcassets/AppIcon.appiconset/Contents.json
index 90d4201..04de9d4 100644
--- a/Mixonomer/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/Mixonomer/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,103 +1,330 @@
 {
   "images" : [
     {
+      "filename" : "40.png",
       "idiom" : "iphone",
-      "size" : "20x20",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
-      "size" : "20x20",
+      "filename" : "60.png",
       "idiom" : "iphone",
-      "filename" : "MusicToolsIcon60.png",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "20x20"
     },
     {
+      "filename" : "29.png",
       "idiom" : "iphone",
-      "size" : "29x29",
-      "scale" : "2x"
+      "scale" : "1x",
+      "size" : "29x29"
     },
     {
+      "filename" : "58.png",
       "idiom" : "iphone",
-      "size" : "29x29",
-      "scale" : "3x"
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
+      "filename" : "87.png",
       "idiom" : "iphone",
-      "size" : "40x40",
-      "scale" : "2x"
+      "scale" : "3x",
+      "size" : "29x29"
     },
     {
+      "filename" : "80.png",
       "idiom" : "iphone",
-      "size" : "40x40",
-      "scale" : "3x"
+      "scale" : "2x",
+      "size" : "40x40"
     },
     {
-      "size" : "60x60",
+      "filename" : "120.png",
       "idiom" : "iphone",
-      "filename" : "MusicToolsIcon120.png",
-      "scale" : "2x"
+      "scale" : "3x",
+      "size" : "40x40"
     },
     {
-      "size" : "60x60",
+      "filename" : "57.png",
       "idiom" : "iphone",
-      "filename" : "MusicToolsIcon180.png",
-      "scale" : "3x"
+      "scale" : "1x",
+      "size" : "57x57"
     },
     {
+      "filename" : "114.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "57x57"
+    },
+    {
+      "filename" : "120.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "180.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "20.png",
       "idiom" : "ipad",
-      "size" : "20x20",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "20x20"
     },
     {
+      "filename" : "40.png",
       "idiom" : "ipad",
-      "size" : "20x20",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
+      "filename" : "29.png",
       "idiom" : "ipad",
-      "size" : "29x29",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "29x29"
     },
     {
+      "filename" : "58.png",
       "idiom" : "ipad",
-      "size" : "29x29",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
+      "filename" : "40.png",
       "idiom" : "ipad",
-      "size" : "40x40",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "40x40"
     },
     {
+      "filename" : "80.png",
       "idiom" : "ipad",
-      "size" : "40x40",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "40x40"
     },
     {
-      "size" : "76x76",
+      "filename" : "50.png",
       "idiom" : "ipad",
-      "filename" : "MusicToolsIcon76.png",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "50x50"
     },
     {
+      "filename" : "100.png",
       "idiom" : "ipad",
-      "size" : "76x76",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "50x50"
     },
     {
+      "filename" : "72.png",
       "idiom" : "ipad",
-      "size" : "83.5x83.5",
-      "scale" : "2x"
+      "scale" : "1x",
+      "size" : "72x72"
     },
     {
-      "size" : "1024x1024",
+      "filename" : "144.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "72x72"
+    },
+    {
+      "filename" : "76.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "152.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "167.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
+    },
+    {
+      "filename" : "1024.png",
       "idiom" : "ios-marketing",
-      "filename" : "MusicToolsIcon1024.png",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "1024x1024"
+    },
+    {
+      "filename" : "48.png",
+      "idiom" : "watch",
+      "role" : "notificationCenter",
+      "scale" : "2x",
+      "size" : "24x24",
+      "subtype" : "38mm"
+    },
+    {
+      "filename" : "55.png",
+      "idiom" : "watch",
+      "role" : "notificationCenter",
+      "scale" : "2x",
+      "size" : "27.5x27.5",
+      "subtype" : "42mm"
+    },
+    {
+      "filename" : "58.png",
+      "idiom" : "watch",
+      "role" : "companionSettings",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "87.png",
+      "idiom" : "watch",
+      "role" : "companionSettings",
+      "scale" : "3x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "watch",
+      "role" : "notificationCenter",
+      "scale" : "2x",
+      "size" : "33x33",
+      "subtype" : "45mm"
+    },
+    {
+      "filename" : "80.png",
+      "idiom" : "watch",
+      "role" : "appLauncher",
+      "scale" : "2x",
+      "size" : "40x40",
+      "subtype" : "38mm"
+    },
+    {
+      "filename" : "88.png",
+      "idiom" : "watch",
+      "role" : "appLauncher",
+      "scale" : "2x",
+      "size" : "44x44",
+      "subtype" : "40mm"
+    },
+    {
+      "idiom" : "watch",
+      "role" : "appLauncher",
+      "scale" : "2x",
+      "size" : "46x46",
+      "subtype" : "41mm"
+    },
+    {
+      "filename" : "100.png",
+      "idiom" : "watch",
+      "role" : "appLauncher",
+      "scale" : "2x",
+      "size" : "50x50",
+      "subtype" : "44mm"
+    },
+    {
+      "idiom" : "watch",
+      "role" : "appLauncher",
+      "scale" : "2x",
+      "size" : "51x51",
+      "subtype" : "45mm"
+    },
+    {
+      "filename" : "172.png",
+      "idiom" : "watch",
+      "role" : "quickLook",
+      "scale" : "2x",
+      "size" : "86x86",
+      "subtype" : "38mm"
+    },
+    {
+      "filename" : "196.png",
+      "idiom" : "watch",
+      "role" : "quickLook",
+      "scale" : "2x",
+      "size" : "98x98",
+      "subtype" : "42mm"
+    },
+    {
+      "filename" : "216.png",
+      "idiom" : "watch",
+      "role" : "quickLook",
+      "scale" : "2x",
+      "size" : "108x108",
+      "subtype" : "44mm"
+    },
+    {
+      "idiom" : "watch",
+      "role" : "quickLook",
+      "scale" : "2x",
+      "size" : "117x117",
+      "subtype" : "45mm"
+    },
+    {
+      "filename" : "1024.png",
+      "idiom" : "watch-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
+    },
+    {
+      "filename" : "16.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "16x16"
+    },
+    {
+      "filename" : "32.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "16x16"
+    },
+    {
+      "filename" : "32.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "32x32"
+    },
+    {
+      "filename" : "64.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "32x32"
+    },
+    {
+      "filename" : "128.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "128x128"
+    },
+    {
+      "filename" : "256.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "128x128"
+    },
+    {
+      "filename" : "256.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "256x256"
+    },
+    {
+      "filename" : "512.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "256x256"
+    },
+    {
+      "filename" : "512.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "512x512"
+    },
+    {
+      "filename" : "1024.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "512x512"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/Mixonomer/Assets.xcassets/AppIcon.appiconset/MusicToolsIcon1024.png b/Mixonomer/Assets.xcassets/AppIcon.appiconset/MusicToolsIcon1024.png
deleted file mode 100644
index 326d083..0000000
Binary files a/Mixonomer/Assets.xcassets/AppIcon.appiconset/MusicToolsIcon1024.png and /dev/null differ
diff --git a/Mixonomer/Assets.xcassets/AppIcon.appiconset/MusicToolsIcon120.png b/Mixonomer/Assets.xcassets/AppIcon.appiconset/MusicToolsIcon120.png
deleted file mode 100644
index 0eb6700..0000000
Binary files a/Mixonomer/Assets.xcassets/AppIcon.appiconset/MusicToolsIcon120.png and /dev/null differ
diff --git a/Mixonomer/Assets.xcassets/AppIcon.appiconset/MusicToolsIcon180.png b/Mixonomer/Assets.xcassets/AppIcon.appiconset/MusicToolsIcon180.png
deleted file mode 100644
index fe811ce..0000000
Binary files a/Mixonomer/Assets.xcassets/AppIcon.appiconset/MusicToolsIcon180.png and /dev/null differ
diff --git a/Mixonomer/Assets.xcassets/AppIcon.appiconset/MusicToolsIcon60.png b/Mixonomer/Assets.xcassets/AppIcon.appiconset/MusicToolsIcon60.png
deleted file mode 100644
index 62bd1b6..0000000
Binary files a/Mixonomer/Assets.xcassets/AppIcon.appiconset/MusicToolsIcon60.png and /dev/null differ
diff --git a/Mixonomer/Assets.xcassets/AppIcon.appiconset/MusicToolsIcon76.png b/Mixonomer/Assets.xcassets/AppIcon.appiconset/MusicToolsIcon76.png
deleted file mode 100644
index 536b0ab..0000000
Binary files a/Mixonomer/Assets.xcassets/AppIcon.appiconset/MusicToolsIcon76.png and /dev/null differ
diff --git a/Mixonomer/Assets.xcassets/Contents.json b/Mixonomer/Assets.xcassets/Contents.json
index da4a164..73c0059 100644
--- a/Mixonomer/Assets.xcassets/Contents.json
+++ b/Mixonomer/Assets.xcassets/Contents.json
@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/Mixonomer/Assets.xcassets/MusicToolsLogo.imageset/1024.png b/Mixonomer/Assets.xcassets/MusicToolsLogo.imageset/1024.png
new file mode 100644
index 0000000..e90b3e2
Binary files /dev/null and b/Mixonomer/Assets.xcassets/MusicToolsLogo.imageset/1024.png differ
diff --git a/Mixonomer/Assets.xcassets/MusicToolsLogo.imageset/Contents.json b/Mixonomer/Assets.xcassets/MusicToolsLogo.imageset/Contents.json
index 3c5822e..08cc0b5 100644
--- a/Mixonomer/Assets.xcassets/MusicToolsLogo.imageset/Contents.json
+++ b/Mixonomer/Assets.xcassets/MusicToolsLogo.imageset/Contents.json
@@ -5,8 +5,8 @@
       "scale" : "1x"
     },
     {
+      "filename" : "1024.png",
       "idiom" : "universal",
-      "filename" : "MusicToolsIcon1024.png",
       "scale" : "2x"
     },
     {
@@ -15,7 +15,7 @@
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/Mixonomer/Assets.xcassets/MusicToolsLogo.imageset/MusicToolsIcon1024.png b/Mixonomer/Assets.xcassets/MusicToolsLogo.imageset/MusicToolsIcon1024.png
deleted file mode 100644
index 326d083..0000000
Binary files a/Mixonomer/Assets.xcassets/MusicToolsLogo.imageset/MusicToolsIcon1024.png and /dev/null differ
diff --git a/res/Icon-1024.png b/res/Icon-1024.png
new file mode 100644
index 0000000..29bbded
Binary files /dev/null and b/res/Icon-1024.png differ
diff --git a/res/Icon.xcf b/res/Icon.xcf
new file mode 100644
index 0000000..0231ba8
Binary files /dev/null and b/res/Icon.xcf differ