diff --git a/AppIcon/FeelsAppIcon.png b/AppIcon/FeelsAppIcon.png
new file mode 100644
index 0000000..8c5e788
Binary files /dev/null and b/AppIcon/FeelsAppIcon.png differ
diff --git a/AppIcon/FeelsAppIcon.pxd/QuickLook/Icon.tiff b/AppIcon/FeelsAppIcon.pxd/QuickLook/Icon.tiff
new file mode 100644
index 0000000..1c2ee50
Binary files /dev/null and b/AppIcon/FeelsAppIcon.pxd/QuickLook/Icon.tiff differ
diff --git a/AppIcon/FeelsAppIcon.pxd/QuickLook/Thumbnail.tiff b/AppIcon/FeelsAppIcon.pxd/QuickLook/Thumbnail.tiff
new file mode 100644
index 0000000..9d40b4d
Binary files /dev/null and b/AppIcon/FeelsAppIcon.pxd/QuickLook/Thumbnail.tiff differ
diff --git a/AppIcon/FeelsAppIcon.pxd/data/037FC241-C7B6-48CD-8B9E-A6209F15D855 b/AppIcon/FeelsAppIcon.pxd/data/037FC241-C7B6-48CD-8B9E-A6209F15D855
new file mode 100644
index 0000000..5ee56d3
Binary files /dev/null and b/AppIcon/FeelsAppIcon.pxd/data/037FC241-C7B6-48CD-8B9E-A6209F15D855 differ
diff --git a/AppIcon/FeelsAppIcon.pxd/data/CA1CB11B-005F-444E-8DF6-2C6EF5D01F51 b/AppIcon/FeelsAppIcon.pxd/data/CA1CB11B-005F-444E-8DF6-2C6EF5D01F51
new file mode 100644
index 0000000..a39e26a
Binary files /dev/null and b/AppIcon/FeelsAppIcon.pxd/data/CA1CB11B-005F-444E-8DF6-2C6EF5D01F51 differ
diff --git a/AppIcon/FeelsAppIcon.pxd/metadata.info b/AppIcon/FeelsAppIcon.pxd/metadata.info
new file mode 100644
index 0000000..7a3a3b5
Binary files /dev/null and b/AppIcon/FeelsAppIcon.pxd/metadata.info differ
diff --git a/Feels.xcodeproj/xcuserdata/treyt.xcuserdatad/xcschemes/xcschememanagement.plist b/Feels.xcodeproj/xcuserdata/treyt.xcuserdatad/xcschemes/xcschememanagement.plist
index ed7ab37..14118e7 100644
--- a/Feels.xcodeproj/xcuserdata/treyt.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/Feels.xcodeproj/xcuserdata/treyt.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -12,12 +12,12 @@
 		<key>Feels (macOS).xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>0</integer>
+			<integer>2</integer>
 		</dict>
 		<key>FeelsWidgetExtension.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>0</integer>
 		</dict>
 		<key>PlaygroundChart (Playground) 1.xcscheme</key>
 		<dict>
diff --git a/FeelsWatch WatchKit Extension/DebugInfo.plist b/FeelsWatch WatchKit Extension/DebugInfo.plist
new file mode 100644
index 0000000..602d4b4
--- /dev/null
+++ b/FeelsWatch WatchKit Extension/DebugInfo.plist	
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSExtension</key>
+	<dict>
+		<key>NSExtensionAttributes</key>
+		<dict>
+			<key>WKAppBundleIdentifier</key>
+			<string>com.88oak.FeelsDebug.watchkitapp</string>
+		</dict>
+		<key>NSExtensionPointIdentifier</key>
+		<string>com.apple.watchkit</string>
+	</dict>
+</dict>
+</plist>
diff --git a/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Contents.json b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Contents.json
index 9221b9b..7a04230 100644
--- a/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,94 +1,155 @@
 {
   "images" : [
     {
+      "filename" : "Icon-40.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "20x20"
     },
     {
+      "filename" : "Icon-60.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "20x20"
     },
     {
+      "filename" : "Icon-29.png",
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "Icon-58.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "29x29"
     },
     {
+      "filename" : "Icon-87.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "29x29"
     },
     {
+      "filename" : "Icon-80.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "40x40"
     },
     {
+      "filename" : "Icon-120.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "40x40"
     },
     {
+      "filename" : "Icon-57.png",
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "size" : "57x57"
+    },
+    {
+      "filename" : "Icon-114.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "57x57"
+    },
+    {
+      "filename" : "Icon-121.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "60x60"
     },
     {
+      "filename" : "Icon-180.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "60x60"
     },
     {
+      "filename" : "Icon-20.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "20x20"
     },
     {
+      "filename" : "Icon-41.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "20x20"
     },
     {
+      "filename" : "Icon-30.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "29x29"
     },
     {
+      "filename" : "Icon-59.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "29x29"
     },
     {
+      "filename" : "Icon-42.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "40x40"
     },
     {
+      "filename" : "Icon-81.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "40x40"
     },
     {
+      "filename" : "Icon-76.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "76x76"
     },
     {
+      "filename" : "Icon-152.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "76x76"
     },
     {
+      "filename" : "Icon-167.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "83.5x83.5"
     },
     {
+      "filename" : "Icon-1024.png",
       "idiom" : "ios-marketing",
       "scale" : "1x",
       "size" : "1024x1024"
+    },
+    {
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "16x16"
+    },
+    {
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "32x32"
+    },
+    {
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "128x128"
+    },
+    {
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "256x256"
+    },
+    {
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "512x512"
     }
   ],
   "info" : {
diff --git a/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-1024.png b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-1024.png
new file mode 100644
index 0000000..be299c3
Binary files /dev/null and b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-1024.png differ
diff --git a/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-114.png b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-114.png
new file mode 100644
index 0000000..aa882b6
Binary files /dev/null and b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-114.png differ
diff --git a/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-120.png b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-120.png
new file mode 100644
index 0000000..65740c9
Binary files /dev/null and b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-120.png differ
diff --git a/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-121.png b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-121.png
new file mode 100644
index 0000000..65740c9
Binary files /dev/null and b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-121.png differ
diff --git a/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-152.png b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-152.png
new file mode 100644
index 0000000..4210df3
Binary files /dev/null and b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-152.png differ
diff --git a/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-167.png b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-167.png
new file mode 100644
index 0000000..23fcf13
Binary files /dev/null and b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-167.png differ
diff --git a/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-180.png b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-180.png
new file mode 100644
index 0000000..2ae8486
Binary files /dev/null and b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-180.png differ
diff --git a/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-20.png b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-20.png
new file mode 100644
index 0000000..910a0e1
Binary files /dev/null and b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-20.png differ
diff --git a/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-29.png b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-29.png
new file mode 100644
index 0000000..cc98c02
Binary files /dev/null and b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-29.png differ
diff --git a/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-30.png b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-30.png
new file mode 100644
index 0000000..cc98c02
Binary files /dev/null and b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-30.png differ
diff --git a/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-40.png b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-40.png
new file mode 100644
index 0000000..d6efcef
Binary files /dev/null and b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-40.png differ
diff --git a/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-41.png b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-41.png
new file mode 100644
index 0000000..d6efcef
Binary files /dev/null and b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-41.png differ
diff --git a/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-42.png b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-42.png
new file mode 100644
index 0000000..d6efcef
Binary files /dev/null and b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-42.png differ
diff --git a/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-57.png b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-57.png
new file mode 100644
index 0000000..534c731
Binary files /dev/null and b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-57.png differ
diff --git a/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-58.png b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-58.png
new file mode 100644
index 0000000..994a841
Binary files /dev/null and b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-58.png differ
diff --git a/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-59.png b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-59.png
new file mode 100644
index 0000000..994a841
Binary files /dev/null and b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-59.png differ
diff --git a/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-60.png b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-60.png
new file mode 100644
index 0000000..58e023f
Binary files /dev/null and b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-60.png differ
diff --git a/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-76.png b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-76.png
new file mode 100644
index 0000000..3583a0c
Binary files /dev/null and b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-76.png differ
diff --git a/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-80.png b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-80.png
new file mode 100644
index 0000000..d331317
Binary files /dev/null and b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-80.png differ
diff --git a/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-81.png b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-81.png
new file mode 100644
index 0000000..d331317
Binary files /dev/null and b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-81.png differ
diff --git a/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-87.png b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-87.png
new file mode 100644
index 0000000..2a8567d
Binary files /dev/null and b/FeelsWidget/Assets.xcassets/AppIcon.appiconset/Icon-87.png differ
diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/Contents.json b/Shared/Assets.xcassets/AppIcon.appiconset/Contents.json
index c136eaf..a6b13f4 100644
--- a/Shared/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/Shared/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,91 +1,109 @@
 {
   "images" : [
     {
+      "filename" : "Icon-40.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "20x20"
     },
     {
+      "filename" : "Icon-60.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "20x20"
     },
     {
+      "filename" : "Icon-58.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "29x29"
     },
     {
+      "filename" : "Icon-87.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "29x29"
     },
     {
+      "filename" : "Icon-80.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "40x40"
     },
     {
+      "filename" : "Icon-120.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "40x40"
     },
     {
+      "filename" : "Icon-121.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "60x60"
     },
     {
+      "filename" : "Icon-180.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "60x60"
     },
     {
+      "filename" : "Icon-20.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "20x20"
     },
     {
+      "filename" : "Icon-41.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "20x20"
     },
     {
+      "filename" : "Icon-29.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "29x29"
     },
     {
+      "filename" : "Icon-59.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "29x29"
     },
     {
+      "filename" : "Icon-42.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "40x40"
     },
     {
+      "filename" : "Icon-81.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "40x40"
     },
     {
+      "filename" : "Icon-76.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "76x76"
     },
     {
+      "filename" : "Icon-152.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "76x76"
     },
     {
+      "filename" : "Icon-167.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "83.5x83.5"
     },
     {
+      "filename" : "Icon-1024.png",
       "idiom" : "ios-marketing",
       "scale" : "1x",
       "size" : "1024x1024"
diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/Icon-1024.png b/Shared/Assets.xcassets/AppIcon.appiconset/Icon-1024.png
new file mode 100644
index 0000000..be299c3
Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/Icon-1024.png differ
diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/Icon-120.png b/Shared/Assets.xcassets/AppIcon.appiconset/Icon-120.png
new file mode 100644
index 0000000..65740c9
Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/Icon-120.png differ
diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/Icon-121.png b/Shared/Assets.xcassets/AppIcon.appiconset/Icon-121.png
new file mode 100644
index 0000000..65740c9
Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/Icon-121.png differ
diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/Icon-152.png b/Shared/Assets.xcassets/AppIcon.appiconset/Icon-152.png
new file mode 100644
index 0000000..4210df3
Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/Icon-152.png differ
diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/Icon-167.png b/Shared/Assets.xcassets/AppIcon.appiconset/Icon-167.png
new file mode 100644
index 0000000..23fcf13
Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/Icon-167.png differ
diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/Icon-180.png b/Shared/Assets.xcassets/AppIcon.appiconset/Icon-180.png
new file mode 100644
index 0000000..2ae8486
Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/Icon-180.png differ
diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/Icon-20.png b/Shared/Assets.xcassets/AppIcon.appiconset/Icon-20.png
new file mode 100644
index 0000000..910a0e1
Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/Icon-20.png differ
diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/Icon-29.png b/Shared/Assets.xcassets/AppIcon.appiconset/Icon-29.png
new file mode 100644
index 0000000..cc98c02
Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/Icon-29.png differ
diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/Icon-40.png b/Shared/Assets.xcassets/AppIcon.appiconset/Icon-40.png
new file mode 100644
index 0000000..d6efcef
Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/Icon-40.png differ
diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/Icon-41.png b/Shared/Assets.xcassets/AppIcon.appiconset/Icon-41.png
new file mode 100644
index 0000000..d6efcef
Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/Icon-41.png differ
diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/Icon-42.png b/Shared/Assets.xcassets/AppIcon.appiconset/Icon-42.png
new file mode 100644
index 0000000..d6efcef
Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/Icon-42.png differ
diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/Icon-58.png b/Shared/Assets.xcassets/AppIcon.appiconset/Icon-58.png
new file mode 100644
index 0000000..994a841
Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/Icon-58.png differ
diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/Icon-59.png b/Shared/Assets.xcassets/AppIcon.appiconset/Icon-59.png
new file mode 100644
index 0000000..994a841
Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/Icon-59.png differ
diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/Icon-60.png b/Shared/Assets.xcassets/AppIcon.appiconset/Icon-60.png
new file mode 100644
index 0000000..58e023f
Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/Icon-60.png differ
diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/Icon-76.png b/Shared/Assets.xcassets/AppIcon.appiconset/Icon-76.png
new file mode 100644
index 0000000..3583a0c
Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/Icon-76.png differ
diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/Icon-80.png b/Shared/Assets.xcassets/AppIcon.appiconset/Icon-80.png
new file mode 100644
index 0000000..d331317
Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/Icon-80.png differ
diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/Icon-81.png b/Shared/Assets.xcassets/AppIcon.appiconset/Icon-81.png
new file mode 100644
index 0000000..d331317
Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/Icon-81.png differ
diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/Icon-87.png b/Shared/Assets.xcassets/AppIcon.appiconset/Icon-87.png
new file mode 100644
index 0000000..2a8567d
Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/Icon-87.png differ