From c4b6bc7918fbb949c57549b3a1210f4da0396f13 Mon Sep 17 00:00:00 2001
From: Craig Scott <craigscott@Craigs-MacBook-Air.local>
Date: Thu, 13 Sep 2018 10:14:12 -0700
Subject: [PATCH 1/3] Medium Button Added

---
 Gulps.xcodeproj/project.pbxproj               |  20 +-
 .../contents.xcworkspacedata                  |   7 +
 Gulps/AppDelegate.swift                       |   3 +
 Gulps/Base.lproj/InfoPlist.strings            |   0
 Gulps/Base.lproj/LaunchScreen.xib             |   0
 Gulps/Base.lproj/Main.storyboard              |  84 ++++-
 Gulps/Base.lproj/Onboarding.storyboard        | 299 +++++++++++-------
 Gulps/Gulps.entitlements                      |   0
 .../AppIcon.appiconset/Contents.json          |   0
 .../AppIcon.appiconset/Icon Copy-40.png       | Bin
 .../AppIcon.appiconset/Icon Copy-60.png       | Bin
 .../AppIcon.appiconset/Icon-120-1.png         | Bin
 .../AppIcon.appiconset/Icon-120.png           | Bin
 .../AppIcon.appiconset/Icon-180.png           | Bin
 .../AppIcon.appiconset/Icon-58.png            | Bin
 .../AppIcon.appiconset/Icon-80.png            | Bin
 .../AppIcon.appiconset/Icon-87.png            | Bin
 .../AppIcon.appiconset/Icon.png               | Bin
 Gulps/Images.xcassets/Contents.json           |   0
 .../big-tiny-icon.imageset/Contents.json      |   0
 .../big-tiny-icon.imageset/big-tiny-icon.pdf  | Bin
 .../blue-check-icon.imageset/Contents.json    |   0
 .../blue-check-icon.pdf                       | Bin
 .../calendar-icon.imageset/Contents.json      |   0
 .../calendar-icon.imageset/calendar-icon.pdf  | Bin
 .../check-icon.imageset/Contents.json         |   0
 .../check-icon.imageset/check-icon.pdf        | Bin
 .../drink-icon.imageset/Contents.json         |   0
 .../drink-icon.imageset/drink-icon.pdf        | Bin
 .../drop-bg.imageset/Contents.json            |   0
 .../drop-bg.imageset/drop-bg.pdf              | Bin
 .../drop.imageset/Contents.json               |   0
 Gulps/Images.xcassets/drop.imageset/drop.pdf  | Bin
 .../large-icon.imageset/Contents.json         |   0
 .../large-icon.imageset/large-icon.pdf        | Bin
 .../medium-icon.imageset/Contents.json        |  12 +
 .../small-icon.pdf                            | Bin
 .../medium-tiny-icon.imageset/Contents.json   |  12 +
 .../small-tiny-icon.pdf                       | Bin
 .../minus-icon.imageset/Contents.json         |   0
 .../minus-icon.imageset/minus-icon.pdf        | Bin
 .../next-icon.imageset/Contents.json          |   0
 .../next-icon.imageset/next-icon.pdf          | Bin
 .../plus-icon.imageset/Contents.json          |   0
 .../plus-icon.imageset/plus-icon.pdf          | Bin
 .../prev-icon.imageset/Contents.json          |   0
 .../prev-icon.imageset/prev-icon.pdf          | Bin
 .../sad.imageset/Contents.json                |   0
 Gulps/Images.xcassets/sad.imageset/sad.pdf    | Bin
 .../settings-icon.imageset/Contents.json      |   0
 .../settings-icon.imageset/settings-icon.pdf  | Bin
 .../small-icon.imageset/Contents.json         |  11 +-
 .../small-icon.imageset/small-icon copy.png   | Bin 0 -> 4378 bytes
 .../small-tiny-icon.imageset/Contents.json    |  11 +-
 .../small-tiny-icon.png                       | Bin 0 -> 4532 bytes
 .../smile.imageset/Contents.json              |   0
 .../Images.xcassets/smile.imageset/smile.pdf  | Bin
 .../star.imageset/Contents.json               |   0
 Gulps/Images.xcassets/star.imageset/star.pdf  | Bin
 .../stats-icon.imageset/Contents.json         |   0
 .../stats-icon.imageset/stats-icon.pdf        | Bin
 .../tiny-add.imageset/Contents.json           |   0
 .../tiny-add.imageset/tiny-add.pdf            | Bin
 .../tiny-check.imageset/Contents.json         |   0
 .../tiny-check.imageset/tiny-check.pdf        | Bin
 .../tiny-x.imageset/Contents.json             |   0
 .../tiny-x.imageset/tiny-x.pdf                | Bin
 Gulps/Info.plist                              |   0
 Gulps/Model/Entry.swift                       |   0
 Gulps/Model/EntryHandler.swift                |   0
 Gulps/Model/Gulp.swift                        |   0
 Gulps/Resources/Fonts/KaushanScript.ttf       | Bin
 Gulps/Resources/Fonts/Lato-Light.ttf          | Bin
 Gulps/Resources/drop.caf                      | Bin
 Gulps/Resources/en.lproj/Localizable.strings  |   2 +
 Gulps/Resources/it.lproj/Localizable.strings  |   1 +
 Gulps/Resources/ru.lproj/Localizable.strings  |   0
 Gulps/Resources/tr.lproj/Localizable.strings  |   0
 Gulps/Support/AnimatedShareButton.swift       |   0
 Gulps/Support/Colors.swift                    |   0
 Gulps/Support/Constants.swift                 |   4 +-
 Gulps/Support/Extensions.swift                |   0
 Gulps/Support/Globals.swift                   |   0
 ...KitHealper.swift => HealthKitHelper.swift} |   0
 Gulps/Support/NotificationHelper.swift        |  16 +-
 Gulps/Support/RLMSupport.swift                |   0
 Gulps/Support/Settings.swift                  |   4 +
 .../UINavigationController-StatusBar.swift    |   0
 Gulps/Support/WatchConnectivityHelper.swift   |   0
 .../CalendarViewController.swift              |   3 +
 .../ViewControllers/DrinkViewController.swift |  13 +
 .../FeedbackViewController.swift              |   0
 .../Onboarding/GoalViewController.swift       |   0
 .../Onboarding/GulpsViewController.swift      |  24 +-
 .../Onboarding/MeasureViewController.swift    |   0
 .../NotificationViewController.swift          |   0
 .../Onboarding/OnboardingViewController.swift |   0
 .../SettingsViewController.swift              |   7 +-
 .../CalendarViewController+Animations.swift   |   0
 .../DrinkViewController+Animations.swift      |  30 +-
 Gulps/it.lproj/InfoPlist.strings              |   0
 Gulps/it.lproj/Main.strings                   |   0
 Gulps/it.lproj/Onboarding.strings             |   0
 Gulps/ru.lproj/InfoPlist.strings              |   0
 Gulps/ru.lproj/LaunchScreen.strings           |   0
 Gulps/ru.lproj/Main.strings                   |   0
 Gulps/ru.lproj/Onboarding.strings             |   0
 Gulps/tr.lproj/InfoPlist.strings              |   0
 Gulps/tr.lproj/LaunchScreen.strings           |   0
 Gulps/tr.lproj/Main.strings                   |   0
 Gulps/tr.lproj/Onboarding.strings             |   0
 111 files changed, 411 insertions(+), 152 deletions(-)
 create mode 100644 Gulps.xcodeproj/project.xcworkspace/contents.xcworkspacedata
 mode change 100644 => 100755 Gulps/AppDelegate.swift
 mode change 100644 => 100755 Gulps/Base.lproj/InfoPlist.strings
 mode change 100644 => 100755 Gulps/Base.lproj/LaunchScreen.xib
 mode change 100644 => 100755 Gulps/Base.lproj/Main.storyboard
 mode change 100644 => 100755 Gulps/Base.lproj/Onboarding.storyboard
 mode change 100644 => 100755 Gulps/Gulps.entitlements
 mode change 100644 => 100755 Gulps/Images.xcassets/AppIcon.appiconset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/AppIcon.appiconset/Icon Copy-40.png
 mode change 100644 => 100755 Gulps/Images.xcassets/AppIcon.appiconset/Icon Copy-60.png
 mode change 100644 => 100755 Gulps/Images.xcassets/AppIcon.appiconset/Icon-120-1.png
 mode change 100644 => 100755 Gulps/Images.xcassets/AppIcon.appiconset/Icon-120.png
 mode change 100644 => 100755 Gulps/Images.xcassets/AppIcon.appiconset/Icon-180.png
 mode change 100644 => 100755 Gulps/Images.xcassets/AppIcon.appiconset/Icon-58.png
 mode change 100644 => 100755 Gulps/Images.xcassets/AppIcon.appiconset/Icon-80.png
 mode change 100644 => 100755 Gulps/Images.xcassets/AppIcon.appiconset/Icon-87.png
 mode change 100644 => 100755 Gulps/Images.xcassets/AppIcon.appiconset/Icon.png
 mode change 100644 => 100755 Gulps/Images.xcassets/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/big-tiny-icon.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/big-tiny-icon.imageset/big-tiny-icon.pdf
 mode change 100644 => 100755 Gulps/Images.xcassets/blue-check-icon.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/blue-check-icon.imageset/blue-check-icon.pdf
 mode change 100644 => 100755 Gulps/Images.xcassets/calendar-icon.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/calendar-icon.imageset/calendar-icon.pdf
 mode change 100644 => 100755 Gulps/Images.xcassets/check-icon.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/check-icon.imageset/check-icon.pdf
 mode change 100644 => 100755 Gulps/Images.xcassets/drink-icon.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/drink-icon.imageset/drink-icon.pdf
 mode change 100644 => 100755 Gulps/Images.xcassets/drop-bg.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/drop-bg.imageset/drop-bg.pdf
 mode change 100644 => 100755 Gulps/Images.xcassets/drop.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/drop.imageset/drop.pdf
 mode change 100644 => 100755 Gulps/Images.xcassets/large-icon.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/large-icon.imageset/large-icon.pdf
 create mode 100755 Gulps/Images.xcassets/medium-icon.imageset/Contents.json
 rename Gulps/Images.xcassets/{small-icon.imageset => medium-icon.imageset}/small-icon.pdf (100%)
 mode change 100644 => 100755
 create mode 100755 Gulps/Images.xcassets/medium-tiny-icon.imageset/Contents.json
 rename Gulps/Images.xcassets/{small-tiny-icon.imageset => medium-tiny-icon.imageset}/small-tiny-icon.pdf (100%)
 mode change 100644 => 100755
 mode change 100644 => 100755 Gulps/Images.xcassets/minus-icon.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/minus-icon.imageset/minus-icon.pdf
 mode change 100644 => 100755 Gulps/Images.xcassets/next-icon.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/next-icon.imageset/next-icon.pdf
 mode change 100644 => 100755 Gulps/Images.xcassets/plus-icon.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/plus-icon.imageset/plus-icon.pdf
 mode change 100644 => 100755 Gulps/Images.xcassets/prev-icon.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/prev-icon.imageset/prev-icon.pdf
 mode change 100644 => 100755 Gulps/Images.xcassets/sad.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/sad.imageset/sad.pdf
 mode change 100644 => 100755 Gulps/Images.xcassets/settings-icon.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/settings-icon.imageset/settings-icon.pdf
 mode change 100644 => 100755 Gulps/Images.xcassets/small-icon.imageset/Contents.json
 create mode 100755 Gulps/Images.xcassets/small-icon.imageset/small-icon copy.png
 mode change 100644 => 100755 Gulps/Images.xcassets/small-tiny-icon.imageset/Contents.json
 create mode 100755 Gulps/Images.xcassets/small-tiny-icon.imageset/small-tiny-icon.png
 mode change 100644 => 100755 Gulps/Images.xcassets/smile.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/smile.imageset/smile.pdf
 mode change 100644 => 100755 Gulps/Images.xcassets/star.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/star.imageset/star.pdf
 mode change 100644 => 100755 Gulps/Images.xcassets/stats-icon.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/stats-icon.imageset/stats-icon.pdf
 mode change 100644 => 100755 Gulps/Images.xcassets/tiny-add.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/tiny-add.imageset/tiny-add.pdf
 mode change 100644 => 100755 Gulps/Images.xcassets/tiny-check.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/tiny-check.imageset/tiny-check.pdf
 mode change 100644 => 100755 Gulps/Images.xcassets/tiny-x.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/tiny-x.imageset/tiny-x.pdf
 mode change 100644 => 100755 Gulps/Info.plist
 mode change 100644 => 100755 Gulps/Model/Entry.swift
 mode change 100644 => 100755 Gulps/Model/EntryHandler.swift
 mode change 100644 => 100755 Gulps/Model/Gulp.swift
 mode change 100644 => 100755 Gulps/Resources/Fonts/KaushanScript.ttf
 mode change 100644 => 100755 Gulps/Resources/Fonts/Lato-Light.ttf
 mode change 100644 => 100755 Gulps/Resources/drop.caf
 mode change 100644 => 100755 Gulps/Resources/en.lproj/Localizable.strings
 mode change 100644 => 100755 Gulps/Resources/it.lproj/Localizable.strings
 mode change 100644 => 100755 Gulps/Resources/ru.lproj/Localizable.strings
 mode change 100644 => 100755 Gulps/Resources/tr.lproj/Localizable.strings
 mode change 100644 => 100755 Gulps/Support/AnimatedShareButton.swift
 mode change 100644 => 100755 Gulps/Support/Colors.swift
 mode change 100644 => 100755 Gulps/Support/Constants.swift
 mode change 100644 => 100755 Gulps/Support/Extensions.swift
 mode change 100644 => 100755 Gulps/Support/Globals.swift
 rename Gulps/Support/{HealthKitHealper.swift => HealthKitHelper.swift} (100%)
 mode change 100644 => 100755
 mode change 100644 => 100755 Gulps/Support/NotificationHelper.swift
 mode change 100644 => 100755 Gulps/Support/RLMSupport.swift
 mode change 100644 => 100755 Gulps/Support/Settings.swift
 mode change 100644 => 100755 Gulps/Support/UINavigationController-StatusBar.swift
 mode change 100644 => 100755 Gulps/Support/WatchConnectivityHelper.swift
 mode change 100644 => 100755 Gulps/ViewControllers/CalendarViewController.swift
 mode change 100644 => 100755 Gulps/ViewControllers/DrinkViewController.swift
 mode change 100644 => 100755 Gulps/ViewControllers/FeedbackViewController.swift
 mode change 100644 => 100755 Gulps/ViewControllers/Onboarding/GoalViewController.swift
 mode change 100644 => 100755 Gulps/ViewControllers/Onboarding/GulpsViewController.swift
 mode change 100644 => 100755 Gulps/ViewControllers/Onboarding/MeasureViewController.swift
 mode change 100644 => 100755 Gulps/ViewControllers/Onboarding/NotificationViewController.swift
 mode change 100644 => 100755 Gulps/ViewControllers/Onboarding/OnboardingViewController.swift
 mode change 100644 => 100755 Gulps/ViewControllers/SettingsViewController.swift
 mode change 100644 => 100755 Gulps/ViewControllers/Support/CalendarViewController+Animations.swift
 mode change 100644 => 100755 Gulps/ViewControllers/Support/DrinkViewController+Animations.swift
 mode change 100644 => 100755 Gulps/it.lproj/InfoPlist.strings
 mode change 100644 => 100755 Gulps/it.lproj/Main.strings
 mode change 100644 => 100755 Gulps/it.lproj/Onboarding.strings
 mode change 100644 => 100755 Gulps/ru.lproj/InfoPlist.strings
 mode change 100644 => 100755 Gulps/ru.lproj/LaunchScreen.strings
 mode change 100644 => 100755 Gulps/ru.lproj/Main.strings
 mode change 100644 => 100755 Gulps/ru.lproj/Onboarding.strings
 mode change 100644 => 100755 Gulps/tr.lproj/InfoPlist.strings
 mode change 100644 => 100755 Gulps/tr.lproj/LaunchScreen.strings
 mode change 100644 => 100755 Gulps/tr.lproj/Main.strings
 mode change 100644 => 100755 Gulps/tr.lproj/Onboarding.strings

diff --git a/Gulps.xcodeproj/project.pbxproj b/Gulps.xcodeproj/project.pbxproj
index 96ae927..d4df8f9 100644
--- a/Gulps.xcodeproj/project.pbxproj
+++ b/Gulps.xcodeproj/project.pbxproj
@@ -53,9 +53,9 @@
 		65A234FF1AF253D1002A35F3 /* TodayViewController+Animation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A234FE1AF253D1002A35F3 /* TodayViewController+Animation.swift */; };
 		65C6AA5C1BF4AD3200BB80CF /* WatchConnectivityHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65C6AA5B1BF4AD3200BB80CF /* WatchConnectivityHelper.swift */; };
 		65C92DA51BB1648C00E2DFE7 /* HealthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65C92DA41BB1648C00E2DFE7 /* HealthKit.framework */; };
-		65C92DA71BB164D100E2DFE7 /* HealthKitHealper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65C92DA61BB164D100E2DFE7 /* HealthKitHealper.swift */; };
-		65C92DA81BB184DB00E2DFE7 /* HealthKitHealper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65C92DA61BB164D100E2DFE7 /* HealthKitHealper.swift */; };
-		65C92DA91BB184DC00E2DFE7 /* HealthKitHealper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65C92DA61BB164D100E2DFE7 /* HealthKitHealper.swift */; };
+		65C92DA71BB164D100E2DFE7 /* HealthKitHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65C92DA61BB164D100E2DFE7 /* HealthKitHelper.swift */; };
+		65C92DA81BB184DB00E2DFE7 /* HealthKitHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65C92DA61BB164D100E2DFE7 /* HealthKitHelper.swift */; };
+		65C92DA91BB184DC00E2DFE7 /* HealthKitHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65C92DA61BB164D100E2DFE7 /* HealthKitHelper.swift */; };
 		65E94C6C1BBC13B400A65B30 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 65E94C6A1BBC13B400A65B30 /* InfoPlist.strings */; };
 		65E94C6E1BBC13BF00A65B30 /* Gulps.entitlements in Resources */ = {isa = PBXBuildFile; fileRef = 6537A8481AF24D2000EC16E9 /* Gulps.entitlements */; };
 		65F44C211AF24B440093A3E9 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65F44C201AF24B440093A3E9 /* AppDelegate.swift */; };
@@ -77,6 +77,7 @@
 		65F55F2F1B5942A4008653F2 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 65F55F211B592D91008653F2 /* Localizable.strings */; };
 		65F55F321B5F965F008653F2 /* drop.caf in Resources */ = {isa = PBXBuildFile; fileRef = 65F55F311B5D0A0E008653F2 /* drop.caf */; };
 		78102F005B62795FB0E7170D /* Pods_GulpsTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 58E28A47EF2AA14E880CD719 /* Pods_GulpsTests.framework */; };
+		E14849EE214AD23C00B2D9C2 /* RLMSupport.swift in Sources */ = {isa = PBXBuildFile; fileRef = E14849ED214AD23B00B2D9C2 /* RLMSupport.swift */; };
 		FBB8EFB826571DA94722706E /* Pods_GulpsToday.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8CCE464AA359610B577E6289 /* Pods_GulpsToday.framework */; };
 /* End PBXBuildFile section */
 
@@ -208,7 +209,7 @@
 		65A235021AF2543B002A35F3 /* Gulps WatchKit Extension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Gulps WatchKit Extension.entitlements"; sourceTree = "<group>"; };
 		65C6AA5B1BF4AD3200BB80CF /* WatchConnectivityHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WatchConnectivityHelper.swift; sourceTree = "<group>"; };
 		65C92DA41BB1648C00E2DFE7 /* HealthKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HealthKit.framework; path = System/Library/Frameworks/HealthKit.framework; sourceTree = SDKROOT; };
-		65C92DA61BB164D100E2DFE7 /* HealthKitHealper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HealthKitHealper.swift; sourceTree = "<group>"; };
+		65C92DA61BB164D100E2DFE7 /* HealthKitHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HealthKitHelper.swift; sourceTree = "<group>"; };
 		65E94C6B1BBC13B400A65B30 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		65E94C6D1BBC13BF00A65B30 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		65F44C1B1AF24B440093A3E9 /* Gulps.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Gulps.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -244,6 +245,7 @@
 		85BE9125F183E330586CDDB6 /* Pods-GulpsToday.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GulpsToday.release.xcconfig"; path = "Pods/Target Support Files/Pods-GulpsToday/Pods-GulpsToday.release.xcconfig"; sourceTree = "<group>"; };
 		8CCE464AA359610B577E6289 /* Pods_GulpsToday.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GulpsToday.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		9DF54771E89C4A5561E72D70 /* Pods-Gulps.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Gulps.release.xcconfig"; path = "Pods/Target Support Files/Pods-Gulps/Pods-Gulps.release.xcconfig"; sourceTree = "<group>"; };
+		E14849ED214AD23B00B2D9C2 /* RLMSupport.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RLMSupport.swift; sourceTree = "<group>"; };
 		F8B4C7511CC6AFD599BF0ECB /* Pods-GulpsTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GulpsTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-GulpsTests/Pods-GulpsTests.debug.xcconfig"; sourceTree = "<group>"; };
 		FF3158CC554F243E9F4ABEB9 /* Pods-GulpsToday.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GulpsToday.debug.xcconfig"; path = "Pods/Target Support Files/Pods-GulpsToday/Pods-GulpsToday.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -341,7 +343,8 @@
 				6537A81D1AF24CC800EC16E9 /* Settings.swift */,
 				650DCE641AF3CD4100E12764 /* Constants.swift */,
 				6555BB671B0CAE1700CE436A /* AnimatedShareButton.swift */,
-				65C92DA61BB164D100E2DFE7 /* HealthKitHealper.swift */,
+				65C92DA61BB164D100E2DFE7 /* HealthKitHelper.swift */,
+				E14849ED214AD23B00B2D9C2 /* RLMSupport.swift */,
 				65C6AA5B1BF4AD3200BB80CF /* WatchConnectivityHelper.swift */,
 				655BE8C71BF6558E003232A8 /* UINavigationController-StatusBar.swift */,
 			);
@@ -1005,11 +1008,12 @@
 				6537A82A1AF24CC800EC16E9 /* EntryHandler.swift in Sources */,
 				65F44C211AF24B440093A3E9 /* AppDelegate.swift in Sources */,
 				6537A83A1AF24CC800EC16E9 /* NotificationViewController.swift in Sources */,
-				65C92DA71BB164D100E2DFE7 /* HealthKitHealper.swift in Sources */,
+				65C92DA71BB164D100E2DFE7 /* HealthKitHelper.swift in Sources */,
 				650DCE651AF3CD4100E12764 /* Constants.swift in Sources */,
 				6537A8311AF24CC800EC16E9 /* Extensions.swift in Sources */,
 				6537A8361AF24CC800EC16E9 /* DrinkViewController.swift in Sources */,
 				6537A8301AF24CC800EC16E9 /* NotificationHelper.swift in Sources */,
+				E14849EE214AD23C00B2D9C2 /* RLMSupport.swift in Sources */,
 				65C6AA5C1BF4AD3200BB80CF /* WatchConnectivityHelper.swift in Sources */,
 				6555BB681B0CAE1700CE436A /* AnimatedShareButton.swift in Sources */,
 			);
@@ -1023,7 +1027,7 @@
 				65A234FF1AF253D1002A35F3 /* TodayViewController+Animation.swift in Sources */,
 				6537A8431AF24CFD00EC16E9 /* Entry.swift in Sources */,
 				6537A8441AF24CFF00EC16E9 /* EntryHandler.swift in Sources */,
-				65C92DA81BB184DB00E2DFE7 /* HealthKitHealper.swift in Sources */,
+				65C92DA81BB184DB00E2DFE7 /* HealthKitHelper.swift in Sources */,
 				6537A83E1AF24CE800EC16E9 /* Settings.swift in Sources */,
 				65F44C4C1AF24B780093A3E9 /* TodayViewController.swift in Sources */,
 				6537A8411AF24CEF00EC16E9 /* Extensions.swift in Sources */,
@@ -1040,7 +1044,7 @@
 				653039D71BE0CE5E00263D77 /* Colors.swift in Sources */,
 				65F44C621AF24B8A0093A3E9 /* NotificationController.swift in Sources */,
 				653039891BDF703200263D77 /* ExtensionDelegate.swift in Sources */,
-				65C92DA91BB184DC00E2DFE7 /* HealthKitHealper.swift in Sources */,
+				65C92DA91BB184DC00E2DFE7 /* HealthKitHelper.swift in Sources */,
 				65F44C601AF24B8A0093A3E9 /* InterfaceController.swift in Sources */,
 				6537A83F1AF24CE900EC16E9 /* Settings.swift in Sources */,
 				653039921BDFE5FC00263D77 /* ComplicationController.swift in Sources */,
diff --git a/Gulps.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Gulps.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000..919434a
--- /dev/null
+++ b/Gulps.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>
diff --git a/Gulps/AppDelegate.swift b/Gulps/AppDelegate.swift
old mode 100644
new mode 100755
index 7f0a007..b197441
--- a/Gulps/AppDelegate.swift
+++ b/Gulps/AppDelegate.swift
@@ -100,6 +100,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, WCSessionDelegate {
 
   enum ShortcutType: String {
     case Big = "it.fancypixel.gulps.big"
+    case Medium = "it.fancypixel.gulps.medium"
     case Small = "it.fancypixel.gulps.small"
   }
 
@@ -112,6 +113,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate, WCSessionDelegate {
     if let type = ShortcutType(rawValue: item.type) {
       if (type == .Small) {
         EntryHandler.sharedHandler.addGulp(UserDefaults.groupUserDefaults().double(forKey: Constants.Gulp.small.key()))
+      } else if (type == .Medium){
+        EntryHandler.sharedHandler.addGulp(UserDefaults.groupUserDefaults().double(forKey: Constants.Gulp.medium.key()))
       } else if (type == .Big) {
         EntryHandler.sharedHandler.addGulp(UserDefaults.groupUserDefaults().double(forKey: Constants.Gulp.big.key()))
       }
diff --git a/Gulps/Base.lproj/InfoPlist.strings b/Gulps/Base.lproj/InfoPlist.strings
old mode 100644
new mode 100755
diff --git a/Gulps/Base.lproj/LaunchScreen.xib b/Gulps/Base.lproj/LaunchScreen.xib
old mode 100644
new mode 100755
diff --git a/Gulps/Base.lproj/Main.storyboard b/Gulps/Base.lproj/Main.storyboard
old mode 100644
new mode 100755
index 49510e3..ad39047
--- a/Gulps/Base.lproj/Main.storyboard
+++ b/Gulps/Base.lproj/Main.storyboard
@@ -94,6 +94,25 @@
                                     <action selector="selectionButtonAction:" destination="9pv-A4-QxB" eventType="touchUpInside" id="5Lu-Gy-RKQ"/>
                                 </connections>
                             </button>
+                            <button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bcX-tx-Vhr" userLabel="Medium Button">
+                                <rect key="frame" x="153" y="454" width="70" height="70"/>
+                                <color key="backgroundColor" red="0.21960784310000001" green="0.49019607840000001" blue="0.81176470590000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="70" id="O5W-Vq-zMW"/>
+                                    <constraint firstAttribute="height" constant="70" id="vKO-bn-vEO"/>
+                                </constraints>
+                                <state key="normal" image="medium-icon">
+                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                </state>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                        <integer key="value" value="35"/>
+                                    </userDefinedRuntimeAttribute>
+                                </userDefinedRuntimeAttributes>
+                                <connections>
+                                    <action selector="selectionButtonAction:" destination="9pv-A4-QxB" eventType="touchUpInside" id="CLi-Bm-rGf"/>
+                                </connections>
+                            </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fW6-sm-t8g" userLabel="Add Button">
                                 <rect key="frame" x="153" y="454" width="70" height="70"/>
                                 <color key="backgroundColor" red="0.2196078431372549" green="0.49019607843137253" blue="0.81176470588235294" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -146,6 +165,7 @@
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="xap-Vb-CbA" firstAttribute="leading" secondItem="tsR-hK-woN" secondAttribute="leading" constant="10" id="0Kf-6v-f86"/>
+                            <constraint firstItem="bcX-tx-Vhr" firstAttribute="top" secondItem="v5a-2l-qvB" secondAttribute="top" id="0Rd-W8-Dm2"/>
                             <constraint firstItem="fW6-sm-t8g" firstAttribute="top" relation="greaterThanOrEqual" secondItem="mEa-Xq-QB6" secondAttribute="bottom" id="4AF-N9-UE2"/>
                             <constraint firstItem="mEa-Xq-QB6" firstAttribute="leading" secondItem="tsR-hK-woN" secondAttribute="leadingMargin" id="5Kw-Si-2x9"/>
                             <constraint firstItem="4ug-Mw-9AY" firstAttribute="top" secondItem="fW6-sm-t8g" secondAttribute="bottom" priority="999" constant="30" id="6mW-Ks-Okm"/>
@@ -164,6 +184,7 @@
                             <constraint firstItem="mEa-Xq-QB6" firstAttribute="trailing" secondItem="tsR-hK-woN" secondAttribute="trailingMargin" id="j6h-Zi-1LS"/>
                             <constraint firstAttribute="centerX" secondItem="mEa-Xq-QB6" secondAttribute="centerX" id="oP9-VY-fG7"/>
                             <constraint firstItem="xap-Vb-CbA" firstAttribute="top" secondItem="Ia1-K6-d13" secondAttribute="bottom" constant="10" id="pAa-mt-Iaf"/>
+                            <constraint firstItem="bcX-tx-Vhr" firstAttribute="leading" secondItem="v5a-2l-qvB" secondAttribute="leading" id="r3P-Qe-hG0"/>
                             <constraint firstItem="uvx-n6-xp2" firstAttribute="top" secondItem="Ia1-K6-d13" secondAttribute="bottom" constant="8" id="x61-hZ-WvW"/>
                             <constraint firstItem="fW6-sm-t8g" firstAttribute="centerY" secondItem="v5a-2l-qvB" secondAttribute="centerY" id="zwb-N5-8xQ"/>
                         </constraints>
@@ -173,6 +194,7 @@
                         <outlet property="addButton" destination="fW6-sm-t8g" id="ikl-2M-eYC"/>
                         <outlet property="largeButton" destination="v5a-2l-qvB" id="dvl-3k-q65"/>
                         <outlet property="maskImage" destination="JPp-1k-zdE" id="5Xq-AA-c2u"/>
+                        <outlet property="mediumButton" destination="bcX-tx-Vhr" id="gDu-Zf-cV1"/>
                         <outlet property="meterContainerView" destination="mQX-uO-zkr" id="Xzc-Jh-LMx"/>
                         <outlet property="minusButton" destination="uvx-n6-xp2" id="Id3-s0-QqO"/>
                         <outlet property="percentageLabel" destination="mEa-Xq-QB6" id="VWN-Gf-0ip"/>
@@ -725,9 +747,52 @@ By the way, we’d love some feedback! How do you feel about Gulps? </string>
                                             </constraints>
                                         </tableViewCellContentView>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="PreferencesCll" id="XVN-Hr-Cdk">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="PreferencesCll" id="EhX-RL-Rh8">
                                         <rect key="frame" x="0.0" y="191.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="EhX-RL-Rh8" id="7x8-j0-Y5k">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="2" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="s5F-j1-JSB" userLabel="Medium Portion Text">
+                                                    <rect key="frame" x="245" y="0.0" width="90" height="43"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="90" id="idr-Pc-lug"/>
+                                                    </constraints>
+                                                    <color key="textColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                                                    <textInputTraits key="textInputTraits" autocorrectionType="no" keyboardType="decimalPad"/>
+                                                    <connections>
+                                                        <outlet property="delegate" destination="t9K-A9-XHF" id="rat-zk-41q"/>
+                                                    </connections>
+                                                </textField>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Medium gulp" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="l4S-LA-Tke">
+                                                    <rect key="frame" x="15" y="12" width="95" height="20"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Oz" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JaH-AL-TZk">
+                                                    <rect key="frame" x="341" y="13" width="19" height="17"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                    <color key="textColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="l4S-LA-Tke" firstAttribute="leading" secondItem="7x8-j0-Y5k" secondAttribute="leading" constant="15" id="2nX-XA-3fg"/>
+                                                <constraint firstAttribute="bottom" secondItem="s5F-j1-JSB" secondAttribute="bottom" id="GIy-0W-kfp"/>
+                                                <constraint firstAttribute="centerY" secondItem="l4S-LA-Tke" secondAttribute="centerY" id="L37-oD-bwi"/>
+                                                <constraint firstAttribute="trailing" secondItem="s5F-j1-JSB" secondAttribute="trailing" constant="40" id="O5B-mC-Ptz"/>
+                                                <constraint firstAttribute="trailing" secondItem="JaH-AL-TZk" secondAttribute="trailing" constant="15" id="Twa-ek-Wv7"/>
+                                                <constraint firstAttribute="centerY" secondItem="JaH-AL-TZk" secondAttribute="centerY" id="atM-M1-Cwh"/>
+                                                <constraint firstItem="s5F-j1-JSB" firstAttribute="top" secondItem="7x8-j0-Y5k" secondAttribute="top" id="sbB-1K-kWs"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="PreferencesCll" id="XVN-Hr-Cdk">
+                                        <rect key="frame" x="0.0" y="235.5" width="375" height="44"/>
+                                        <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="XVN-Hr-Cdk" id="Y7x-zR-Q8Y">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
@@ -769,7 +834,7 @@ By the way, we’d love some feedback! How do you feel about Gulps? </string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="PreferencesCll" id="Q2W-7p-buv">
-                                        <rect key="frame" x="0.0" y="235.5" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="279.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Q2W-7p-buv" id="MoA-It-qj5">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
@@ -816,7 +881,7 @@ By the way, we’d love some feedback! How do you feel about Gulps? </string>
                             <tableViewSection headerTitle="Notifications" id="Cqk-U1-F6w">
                                 <cells>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="PreferencesCll" id="Ii4-wt-fc6">
-                                        <rect key="frame" x="0.0" y="327.5" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="371.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Ii4-wt-fc6" id="1Hn-44-t70">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
@@ -846,7 +911,7 @@ By the way, we’d love some feedback! How do you feel about Gulps? </string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="PreferencesCll" textLabel="Pnc-7E-Kee" detailTextLabel="aBp-Ni-lCc" style="IBUITableViewCellStyleValue1" id="dxR-vc-Rwx">
-                                        <rect key="frame" x="0.0" y="371.5" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="415.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="dxR-vc-Rwx" id="iKk-wz-AiX">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
@@ -870,7 +935,7 @@ By the way, we’d love some feedback! How do you feel about Gulps? </string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="PreferencesCll" textLabel="f3c-OV-GHw" detailTextLabel="en4-wz-CaR" style="IBUITableViewCellStyleValue1" id="sFs-MK-DDj">
-                                        <rect key="frame" x="0.0" y="415.5" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="459.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="sFs-MK-DDj" id="9UG-1o-lam">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
@@ -894,7 +959,7 @@ By the way, we’d love some feedback! How do you feel about Gulps? </string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="PreferencesCll" textLabel="w1F-Cx-bRx" detailTextLabel="llL-4J-aC6" style="IBUITableViewCellStyleValue1" id="8v4-HN-MkF">
-                                        <rect key="frame" x="0.0" y="459.5" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="503.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="8v4-HN-MkF" id="wVD-TQ-jfH">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
@@ -922,7 +987,7 @@ By the way, we’d love some feedback! How do you feel about Gulps? </string>
                             <tableViewSection headerTitle="Apple Health" id="kL3-zV-Q1y">
                                 <cells>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="PreferencesCll" id="rtu-Sv-Asn">
-                                        <rect key="frame" x="0.0" y="551.5" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="595.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="rtu-Sv-Asn" id="NkK-Il-Fd3">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
@@ -964,6 +1029,7 @@ By the way, we’d love some feedback! How do you feel about Gulps? </string>
                         <outlet property="dailyGoalText" destination="Heo-vz-8M3" id="lHN-ai-OMb"/>
                         <outlet property="healthSwitch" destination="fU5-mD-m8k" id="83t-Hg-eil"/>
                         <outlet property="largePortionText" destination="SBF-ug-rBd" id="kj7-UV-Usx"/>
+                        <outlet property="mediumPortionText" destination="s5F-j1-JSB" id="rlg-b1-QZo"/>
                         <outlet property="notificationFromLabel" destination="aBp-Ni-lCc" id="LSm-ya-Pih"/>
                         <outlet property="notificationIntervalLabel" destination="llL-4J-aC6" id="GL4-VE-3Io"/>
                         <outlet property="notificationSwitch" destination="mua-Mo-rXC" id="Yto-mm-Dvj"/>
@@ -973,6 +1039,7 @@ By the way, we’d love some feedback! How do you feel about Gulps? </string>
                         <outletCollection property="uomLabels" destination="nbd-CS-kU7" collectionClass="NSMutableArray" id="yn9-xJ-SuH"/>
                         <outletCollection property="uomLabels" destination="RVh-z0-hYc" collectionClass="NSMutableArray" id="sey-OP-a1C"/>
                         <outletCollection property="uomLabels" destination="DT8-cB-ShB" collectionClass="NSMutableArray" id="kN2-it-PpW"/>
+                        <outletCollection property="uomLabels" destination="JaH-AL-TZk" collectionClass="NSMutableArray" id="EH0-Cb-i7p"/>
                     </connections>
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="gao-yG-C7y" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -1020,11 +1087,12 @@ By the way, we’d love some feedback! How do you feel about Gulps? </string>
         <image name="drink-icon" width="30" height="30"/>
         <image name="drop" width="300" height="300"/>
         <image name="large-icon" width="40" height="40"/>
+        <image name="medium-icon" width="40" height="40"/>
         <image name="minus-icon" width="24" height="24"/>
         <image name="plus-icon" width="40" height="40"/>
         <image name="sad" width="100" height="100"/>
         <image name="settings-icon" width="30" height="30"/>
-        <image name="small-icon" width="40" height="40"/>
+        <image name="small-icon" width="168" height="168"/>
         <image name="smile" width="100" height="100"/>
         <image name="star" width="50" height="50"/>
         <image name="tiny-add" width="20" height="20"/>
diff --git a/Gulps/Base.lproj/Onboarding.storyboard b/Gulps/Base.lproj/Onboarding.storyboard
old mode 100644
new mode 100755
index 8036731..93e7f35
--- a/Gulps/Base.lproj/Onboarding.storyboard
+++ b/Gulps/Base.lproj/Onboarding.storyboard
@@ -1,13 +1,21 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14F6a" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="By6-Ql-uIz">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="By6-Ql-uIz">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <customFonts key="customFonts">
-        <mutableArray key="KaushanScript.ttf">
+        <array key="Avenir.ttc">
+            <string>Avenir-Book</string>
+        </array>
+        <array key="KaushanScript.ttf">
             <string>KaushanScript-Regular</string>
-        </mutableArray>
+        </array>
     </customFonts>
     <scenes>
         <!--Onboarding View Controller-->
@@ -19,33 +27,33 @@
                         <viewControllerLayoutGuide type="bottom" id="a9y-6F-IFj"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="xIA-iZ-6Zs">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Hi there!" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="J5V-th-GOK">
-                                <rect key="frame" x="16" y="20" width="288" height="70"/>
+                                <rect key="frame" x="16" y="20" width="343" height="70"/>
                                 <fontDescription key="fontDescription" name="KaushanScript-Regular" family="Kaushan Script" pointSize="48"/>
-                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="I’m here to help you keep track of a simple healthy habit: 
drinking water." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dbP-89-LG1">
-                                <rect key="frame" x="16" y="140" width="288" height="66"/>
+                                <rect key="frame" x="16" y="140" width="343" height="66"/>
                                 <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="16"/>
-                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5VR-G1-bkD">
-                                <rect key="frame" x="0.0" y="468" width="320" height="100"/>
+                                <rect key="frame" x="0.0" y="567" width="375" height="100"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hyR-yx-vfK">
-                                        <rect key="frame" x="240" y="20" width="60" height="60"/>
-                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <rect key="frame" x="295" y="20" width="60" height="60"/>
+                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="60" id="DQN-JD-3BE"/>
                                             <constraint firstAttribute="width" constant="60" id="YEL-vf-sXW"/>
                                         </constraints>
                                         <state key="normal" image="next-icon">
-                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         </state>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -57,7 +65,7 @@
                                         </connections>
                                     </button>
                                 </subviews>
-                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="bottom" secondItem="hyR-yx-vfK" secondAttribute="bottom" constant="20" id="3ab-xY-wUg"/>
                                     <constraint firstAttribute="height" constant="100" id="CpB-GU-0HV"/>
@@ -65,7 +73,7 @@
                                 </constraints>
                             </view>
                         </subviews>
-                        <color key="backgroundColor" red="0.15686274509803921" green="0.39215686274509803" blue="0.77254901960784317" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="backgroundColor" red="0.15686274509803921" green="0.39215686274509803" blue="0.77254901960784317" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="dbP-89-LG1" firstAttribute="trailing" secondItem="xIA-iZ-6Zs" secondAttribute="trailingMargin" id="1Qy-OR-nxD"/>
                             <constraint firstItem="J5V-th-GOK" firstAttribute="leading" secondItem="xIA-iZ-6Zs" secondAttribute="leading" constant="16" id="8tS-36-5WV"/>
@@ -100,30 +108,30 @@
                         <viewControllerLayoutGuide type="bottom" id="9AR-mY-hKU"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="qHm-YP-hGh">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aNx-Gk-pr3" userLabel="Header">
-                                <rect key="frame" x="16" y="40" width="288" height="66"/>
+                                <rect key="frame" x="16" y="40" width="343" height="44"/>
                                 <string key="text">A couple of questions first:
 what measurement system do you prefer?</string>
                                 <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="16"/>
-                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qww-zt-6DG" userLabel="Controls">
-                                <rect key="frame" x="0.0" y="468" width="320" height="100"/>
+                                <rect key="frame" x="0.0" y="567" width="375" height="100"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dEP-tj-efq">
-                                        <rect key="frame" x="240" y="20" width="60" height="60"/>
-                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <rect key="frame" x="295" y="20" width="60" height="60"/>
+                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="60" id="HiL-kT-eIK"/>
                                             <constraint firstAttribute="width" constant="60" id="LkU-5J-Mly"/>
                                         </constraints>
                                         <inset key="contentEdgeInsets" minX="1" minY="0.0" maxX="0.0" maxY="0.0"/>
                                         <state key="normal" image="next-icon">
-                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         </state>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -136,14 +144,14 @@ what measurement system do you prefer?</string>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xmh-gA-cnz">
                                         <rect key="frame" x="20" y="20" width="60" height="60"/>
-                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="60" id="EGF-Pz-3li"/>
                                             <constraint firstAttribute="height" constant="60" id="oHu-LZ-d9d"/>
                                         </constraints>
                                         <inset key="contentEdgeInsets" minX="-5" minY="0.0" maxX="0.0" maxY="0.0"/>
                                         <state key="normal" image="prev-icon">
-                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         </state>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -155,7 +163,7 @@ what measurement system do you prefer?</string>
                                         </connections>
                                     </button>
                                 </subviews>
-                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstItem="xmh-gA-cnz" firstAttribute="leading" secondItem="qww-zt-6DG" secondAttribute="leading" constant="20" id="7cL-Ju-TYA"/>
                                     <constraint firstAttribute="trailing" secondItem="dEP-tj-efq" secondAttribute="trailing" constant="20" id="Kl6-of-P4l"/>
@@ -165,12 +173,12 @@ what measurement system do you prefer?</string>
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GKJ-7w-YfS" userLabel="Liters">
-                                <rect key="frame" x="0.0" y="146" width="320" height="60"/>
+                                <rect key="frame" x="0.0" y="124" width="375" height="60"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Liters" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hoW-cL-j0l">
                                         <rect key="frame" x="70" y="16" width="48" height="28"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check-icon" translatesAutoresizingMaskIntoConstraints="NO" id="YjV-vs-zoa">
@@ -181,9 +189,9 @@ what measurement system do you prefer?</string>
                                         </constraints>
                                     </imageView>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="SH2-qV-ied">
-                                        <rect key="frame" x="0.0" y="0.0" width="320" height="60"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="375" height="60"/>
                                         <state key="normal">
-                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         </state>
                                         <connections>
                                             <action selector="litersButtonAction" destination="G0M-tk-SWS" eventType="touchUpInside" id="ekG-du-Zzn"/>
@@ -203,7 +211,7 @@ what measurement system do you prefer?</string>
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8S4-OP-3D4" userLabel="Ounces">
-                                <rect key="frame" x="0.0" y="206" width="320" height="60"/>
+                                <rect key="frame" x="0.0" y="184" width="375" height="60"/>
                                 <subviews>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check-icon" translatesAutoresizingMaskIntoConstraints="NO" id="Naf-BJ-WFS">
                                         <rect key="frame" x="20" y="10" width="40" height="40"/>
@@ -215,13 +223,13 @@ what measurement system do you prefer?</string>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Ounces" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rUi-CZ-r3F">
                                         <rect key="frame" x="70" y="16" width="69" height="28"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="TKD-XC-gWJ">
-                                        <rect key="frame" x="0.0" y="0.0" width="320" height="60"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="375" height="60"/>
                                         <state key="normal">
-                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         </state>
                                         <connections>
                                             <action selector="ouncesButtonAction" destination="G0M-tk-SWS" eventType="touchUpInside" id="Joh-SQ-uzk"/>
@@ -241,7 +249,7 @@ what measurement system do you prefer?</string>
                                 </constraints>
                             </view>
                         </subviews>
-                        <color key="backgroundColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="backgroundColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="aNx-Gk-pr3" firstAttribute="top" secondItem="k5a-UD-A8v" secondAttribute="bottom" constant="20" id="3Oq-Mq-bPC"/>
                             <constraint firstItem="8S4-OP-3D4" firstAttribute="top" secondItem="GKJ-7w-YfS" secondAttribute="bottom" id="AAK-Oo-1x4"/>
@@ -281,29 +289,29 @@ what measurement system do you prefer?</string>
                         <viewControllerLayoutGuide type="bottom" id="hbR-Yb-Sx1"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="Nn4-vs-Hzu">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JSe-R9-wt9" userLabel="Header">
-                                <rect key="frame" x="16" y="40" width="288" height="110"/>
+                                <rect key="frame" x="16" y="40" width="343" height="88"/>
                                 <string key="text">I’ll keep track of your water consumption through gulps, you just need to set up your usual small gulp (a glass of water, usually 0,2 L or 8 oz) and big gulp (let’s say a bottle)</string>
                                 <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="16"/>
-                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VQR-RN-FoH" userLabel="Controls">
-                                <rect key="frame" x="0.0" y="468" width="320" height="100"/>
+                                <rect key="frame" x="0.0" y="567" width="375" height="100"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3E1-6i-418">
-                                        <rect key="frame" x="240" y="20" width="60" height="60"/>
-                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <rect key="frame" x="295" y="20" width="60" height="60"/>
+                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="60" id="OHM-AK-BEa"/>
                                             <constraint firstAttribute="height" constant="60" id="hsd-xT-c4d"/>
                                         </constraints>
                                         <inset key="contentEdgeInsets" minX="1" minY="0.0" maxX="0.0" maxY="0.0"/>
                                         <state key="normal" image="next-icon">
-                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         </state>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -316,14 +324,14 @@ what measurement system do you prefer?</string>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hjk-yP-pgN">
                                         <rect key="frame" x="20" y="20" width="60" height="60"/>
-                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="60" id="MTy-um-B71"/>
                                             <constraint firstAttribute="width" constant="60" id="nV6-gc-86T"/>
                                         </constraints>
                                         <inset key="contentEdgeInsets" minX="-5" minY="0.0" maxX="0.0" maxY="0.0"/>
                                         <state key="normal" image="prev-icon">
-                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         </state>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -335,7 +343,7 @@ what measurement system do you prefer?</string>
                                         </connections>
                                     </button>
                                 </subviews>
-                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstItem="hjk-yP-pgN" firstAttribute="leading" secondItem="VQR-RN-FoH" secondAttribute="leading" constant="20" id="0da-jJ-cCd"/>
                                     <constraint firstAttribute="bottom" secondItem="3E1-6i-418" secondAttribute="bottom" constant="20" id="N97-W6-nBy"/>
@@ -345,12 +353,12 @@ what measurement system do you prefer?</string>
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Xto-Uc-SOf" userLabel="Small gulp">
-                                <rect key="frame" x="0.0" y="170" width="320" height="60"/>
+                                <rect key="frame" x="0.0" y="148" width="375" height="60"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Small gulp" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WfK-EQ-Qob">
                                         <rect key="frame" x="70" y="16" width="95" height="28"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="small-icon" translatesAutoresizingMaskIntoConstraints="NO" id="Oe9-EU-gxI">
@@ -361,11 +369,11 @@ what measurement system do you prefer?</string>
                                         </constraints>
                                     </imageView>
                                     <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="0.2" placeholder="glass" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="e8D-nG-89R">
-                                        <rect key="frame" x="183" y="0.0" width="90" height="60"/>
+                                        <rect key="frame" x="238" y="0.0" width="90" height="60"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="90" id="2Zx-3z-dua"/>
                                         </constraints>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
                                         <textInputTraits key="textInputTraits" autocorrectionType="no" keyboardType="decimalPad"/>
                                         <connections>
@@ -373,9 +381,9 @@ what measurement system do you prefer?</string>
                                         </connections>
                                     </textField>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="oz" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wIJ-Qh-sXS">
-                                        <rect key="frame" x="283" y="19" width="17" height="22"/>
+                                        <rect key="frame" x="338" y="19" width="17" height="22"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="16"/>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                 </subviews>
@@ -392,8 +400,56 @@ what measurement system do you prefer?</string>
                                     <constraint firstAttribute="height" constant="60" id="tyP-Y3-3dV"/>
                                 </constraints>
                             </view>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="K2W-i9-scZ" userLabel="Medium Gulp">
+                                <rect key="frame" x="0.0" y="215" width="375" height="60"/>
+                                <subviews>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Medium gulp" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="A3t-c6-5Qq">
+                                        <rect key="frame" x="70" y="16" width="120.5" height="28"/>
+                                        <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="oz" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jrP-nj-Ojr" userLabel="Medium Gulp Label">
+                                        <rect key="frame" x="338" y="19" width="17" height="22"/>
+                                        <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="16"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="0.5" placeholder="bottle" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="1kq-kn-Uqc" userLabel="Medium Gulp Text">
+                                        <rect key="frame" x="238" y="0.0" width="90" height="60"/>
+                                        <constraints>
+                                            <constraint firstAttribute="width" constant="90" id="ltM-oh-Shx"/>
+                                        </constraints>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
+                                        <textInputTraits key="textInputTraits" autocorrectionType="no" keyboardType="decimalPad"/>
+                                        <connections>
+                                            <outlet property="delegate" destination="zCq-Eo-bzE" id="kKl-l7-y9G"/>
+                                        </connections>
+                                    </textField>
+                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="medium-icon" translatesAutoresizingMaskIntoConstraints="NO" id="glZ-Vb-CT3">
+                                        <rect key="frame" x="23" y="11" width="33" height="33"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="33" id="dNz-Kk-wA4"/>
+                                            <constraint firstAttribute="width" constant="33" id="f1I-VM-qtf"/>
+                                        </constraints>
+                                    </imageView>
+                                </subviews>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="60" id="3jt-eb-uie"/>
+                                    <constraint firstItem="1kq-kn-Uqc" firstAttribute="top" secondItem="K2W-i9-scZ" secondAttribute="top" id="5pC-Rm-7aW"/>
+                                    <constraint firstItem="jrP-nj-Ojr" firstAttribute="leading" secondItem="1kq-kn-Uqc" secondAttribute="trailing" constant="10" id="635-NF-bLc"/>
+                                    <constraint firstAttribute="centerY" secondItem="A3t-c6-5Qq" secondAttribute="centerY" id="I40-Lz-Qjh"/>
+                                    <constraint firstAttribute="bottom" secondItem="1kq-kn-Uqc" secondAttribute="bottom" id="M4r-oY-Esk"/>
+                                    <constraint firstItem="glZ-Vb-CT3" firstAttribute="top" secondItem="K2W-i9-scZ" secondAttribute="top" constant="11" id="McE-PM-hON"/>
+                                    <constraint firstAttribute="trailing" secondItem="jrP-nj-Ojr" secondAttribute="trailing" constant="20" id="UqM-gw-HHS"/>
+                                    <constraint firstItem="glZ-Vb-CT3" firstAttribute="leading" secondItem="K2W-i9-scZ" secondAttribute="leading" constant="23" id="Z6f-j8-yKM"/>
+                                    <constraint firstItem="A3t-c6-5Qq" firstAttribute="leading" secondItem="glZ-Vb-CT3" secondAttribute="trailing" constant="14" id="h2C-S3-9Wn"/>
+                                    <constraint firstAttribute="centerY" secondItem="jrP-nj-Ojr" secondAttribute="centerY" id="xOX-lY-MjI"/>
+                                </constraints>
+                            </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="plP-Gr-jkv" userLabel="Big gulp">
-                                <rect key="frame" x="0.0" y="230" width="320" height="60"/>
+                                <rect key="frame" x="0.0" y="283" width="375" height="60"/>
                                 <subviews>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="large-icon" translatesAutoresizingMaskIntoConstraints="NO" id="mCL-Fz-XGC">
                                         <rect key="frame" x="20" y="10" width="40" height="40"/>
@@ -405,21 +461,21 @@ what measurement system do you prefer?</string>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Big gulp" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kMj-hq-rjr">
                                         <rect key="frame" x="70" y="16" width="76" height="28"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="oz" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="s4e-zS-DTj">
-                                        <rect key="frame" x="283" y="19" width="17" height="22"/>
+                                        <rect key="frame" x="338" y="19" width="17" height="22"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="16"/>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="0.5" placeholder="bottle" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="gFP-R6-3l1">
-                                        <rect key="frame" x="183" y="0.0" width="90" height="60"/>
+                                        <rect key="frame" x="238" y="0.0" width="90" height="60"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="90" id="6lS-LW-dPX"/>
                                         </constraints>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
                                         <textInputTraits key="textInputTraits" autocorrectionType="no" keyboardType="decimalPad"/>
                                         <connections>
@@ -441,20 +497,24 @@ what measurement system do you prefer?</string>
                                 </constraints>
                             </view>
                         </subviews>
-                        <color key="backgroundColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="backgroundColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
+                            <constraint firstItem="K2W-i9-scZ" firstAttribute="trailing" secondItem="Xto-Uc-SOf" secondAttribute="trailing" id="EwV-hc-TYi"/>
                             <constraint firstItem="plP-Gr-jkv" firstAttribute="leading" secondItem="Nn4-vs-Hzu" secondAttribute="leading" id="FXT-Fy-7eB"/>
-                            <constraint firstItem="plP-Gr-jkv" firstAttribute="top" secondItem="Xto-Uc-SOf" secondAttribute="bottom" id="QEh-lf-0Ah"/>
+                            <constraint firstItem="plP-Gr-jkv" firstAttribute="top" secondItem="K2W-i9-scZ" secondAttribute="bottom" constant="8" id="JXz-P0-ftj"/>
                             <constraint firstAttribute="trailing" secondItem="Xto-Uc-SOf" secondAttribute="trailing" id="S0d-Uh-Bjp"/>
                             <constraint firstAttribute="trailing" secondItem="VQR-RN-FoH" secondAttribute="trailing" id="YDY-JR-dly"/>
                             <constraint firstItem="JSe-R9-wt9" firstAttribute="leading" secondItem="Nn4-vs-Hzu" secondAttribute="leadingMargin" id="YjM-mY-btl"/>
                             <constraint firstAttribute="bottom" secondItem="VQR-RN-FoH" secondAttribute="bottom" id="Zvw-nI-3t3"/>
                             <constraint firstItem="Xto-Uc-SOf" firstAttribute="top" secondItem="JSe-R9-wt9" secondAttribute="bottom" constant="20" id="bb3-6n-rNF"/>
+                            <constraint firstItem="K2W-i9-scZ" firstAttribute="top" secondItem="Xto-Uc-SOf" secondAttribute="bottom" constant="7" id="eEF-7x-8WO"/>
                             <constraint firstItem="VQR-RN-FoH" firstAttribute="leading" secondItem="Nn4-vs-Hzu" secondAttribute="leading" id="f2D-FG-SW0"/>
                             <constraint firstItem="Xto-Uc-SOf" firstAttribute="leading" secondItem="Nn4-vs-Hzu" secondAttribute="leading" id="h8t-eM-UFX"/>
                             <constraint firstItem="JSe-R9-wt9" firstAttribute="trailing" secondItem="Nn4-vs-Hzu" secondAttribute="trailingMargin" id="mEL-zs-osh"/>
                             <constraint firstItem="JSe-R9-wt9" firstAttribute="top" secondItem="c1S-tf-jdw" secondAttribute="bottom" constant="20" id="n4w-5n-rKr"/>
                             <constraint firstAttribute="trailing" secondItem="plP-Gr-jkv" secondAttribute="trailing" id="pFe-CU-7tG"/>
+                            <constraint firstItem="K2W-i9-scZ" firstAttribute="top" secondItem="Nn4-vs-Hzu" secondAttribute="top" constant="215" id="pQ5-X9-ueB"/>
+                            <constraint firstItem="K2W-i9-scZ" firstAttribute="leading" secondItem="Xto-Uc-SOf" secondAttribute="leading" id="puh-Gc-CEc"/>
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" id="41t-VR-ovH"/>
@@ -464,18 +524,22 @@ what measurement system do you prefer?</string>
                         <outlet property="bigGulpText" destination="gFP-R6-3l1" id="TMj-Dt-afJ"/>
                         <outlet property="bigSuffixLabel" destination="s4e-zS-DTj" id="ps4-9W-Sls"/>
                         <outlet property="headerLabel" destination="JSe-R9-wt9" id="Nqd-pL-tXb"/>
+                        <outlet property="mediumBackgroundView" destination="K2W-i9-scZ" id="vU9-wE-77N"/>
+                        <outlet property="mediumGulpText" destination="1kq-kn-Uqc" id="4jG-e9-evl"/>
+                        <outlet property="mediumSuffixLabel" destination="jrP-nj-Ojr" id="PQg-bJ-fgT"/>
                         <outlet property="smallBackgroundView" destination="Xto-Uc-SOf" id="0jp-8i-LAd"/>
                         <outlet property="smallGulpText" destination="e8D-nG-89R" id="qTw-4Q-9sJ"/>
                         <outlet property="smallSuffixLabel" destination="wIJ-Qh-sXS" id="MgS-5T-ssD"/>
                         <outletCollection property="viewArray" destination="JSe-R9-wt9" collectionClass="NSMutableArray" id="hVz-TU-olM"/>
-                        <outletCollection property="viewArray" destination="Xto-Uc-SOf" collectionClass="NSMutableArray" id="kQN-lc-w90"/>
-                        <outletCollection property="viewArray" destination="plP-Gr-jkv" collectionClass="NSMutableArray" id="5H3-44-7Ax"/>
                         <outletCollection property="viewArray" destination="VQR-RN-FoH" collectionClass="NSMutableArray" id="51c-on-y5l"/>
+                        <outletCollection property="viewArray" destination="Xto-Uc-SOf" collectionClass="NSMutableArray" id="P26-yF-ziC"/>
+                        <outletCollection property="viewArray" destination="K2W-i9-scZ" collectionClass="NSMutableArray" id="zBl-lR-CdN"/>
+                        <outletCollection property="viewArray" destination="plP-Gr-jkv" collectionClass="NSMutableArray" id="zuF-cr-H44"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="vUn-FA-zny" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="1686" y="443"/>
+            <point key="canvasLocation" x="1685.5" y="442.5"/>
         </scene>
         <!--Goal View Controller-->
         <scene sceneID="l6E-L5-1xE">
@@ -486,28 +550,28 @@ what measurement system do you prefer?</string>
                         <viewControllerLayoutGuide type="bottom" id="6PH-YY-LNP"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="BrG-6p-F5j">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Now, set your daily goal. An average goal is around 2 L or 64 oz per day, but it can vary with your build." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nbv-Ph-Ogi" userLabel="Header">
-                                <rect key="frame" x="16" y="40" width="288" height="66"/>
+                                <rect key="frame" x="16" y="40" width="343" height="66"/>
                                 <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="16"/>
-                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="k9q-l3-tAh" userLabel="Controls">
-                                <rect key="frame" x="0.0" y="468" width="320" height="100"/>
+                                <rect key="frame" x="0.0" y="567" width="375" height="100"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dFe-jD-qxw">
-                                        <rect key="frame" x="240" y="20" width="60" height="60"/>
-                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <rect key="frame" x="295" y="20" width="60" height="60"/>
+                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="60" id="1hT-A8-yvW"/>
                                             <constraint firstAttribute="width" constant="60" id="efS-Mn-XoS"/>
                                         </constraints>
                                         <inset key="contentEdgeInsets" minX="1" minY="0.0" maxX="0.0" maxY="0.0"/>
                                         <state key="normal" image="next-icon">
-                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         </state>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -520,14 +584,14 @@ what measurement system do you prefer?</string>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qra-1E-3OP">
                                         <rect key="frame" x="20" y="20" width="60" height="60"/>
-                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="60" id="3V3-Jh-pdB"/>
                                             <constraint firstAttribute="height" constant="60" id="ixG-LU-ND0"/>
                                         </constraints>
                                         <inset key="contentEdgeInsets" minX="-5" minY="0.0" maxX="0.0" maxY="0.0"/>
                                         <state key="normal" image="prev-icon">
-                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         </state>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -539,7 +603,7 @@ what measurement system do you prefer?</string>
                                         </connections>
                                     </button>
                                 </subviews>
-                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="100" id="2Qk-mT-eqb"/>
                                     <constraint firstAttribute="bottom" secondItem="qra-1E-3OP" secondAttribute="bottom" constant="20" id="Cyo-6t-qVC"/>
@@ -549,20 +613,20 @@ what measurement system do you prefer?</string>
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xdk-cL-gdm" userLabel="Goal">
-                                <rect key="frame" x="0.0" y="126" width="320" height="60"/>
+                                <rect key="frame" x="0.0" y="126" width="375" height="60"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Daily goal" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="K6E-SK-ldz">
                                         <rect key="frame" x="20" y="16" width="90" height="28"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="2.0" placeholder="goal" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="S54-HU-dVI">
-                                        <rect key="frame" x="181" y="0.0" width="90" height="60"/>
+                                        <rect key="frame" x="236" y="0.0" width="90" height="60"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="90" id="YtZ-tJ-fYE"/>
                                         </constraints>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
                                         <textInputTraits key="textInputTraits" autocorrectionType="no" keyboardType="decimalPad"/>
                                         <connections>
@@ -570,9 +634,9 @@ what measurement system do you prefer?</string>
                                         </connections>
                                     </textField>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="oz" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OlE-qk-N7s">
-                                        <rect key="frame" x="281" y="17" width="19" height="25"/>
+                                        <rect key="frame" x="336" y="17" width="19" height="25"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="18"/>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                 </subviews>
@@ -588,7 +652,7 @@ what measurement system do you prefer?</string>
                                 </constraints>
                             </view>
                         </subviews>
-                        <color key="backgroundColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="backgroundColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstAttribute="trailing" secondItem="xdk-cL-gdm" secondAttribute="trailing" id="HmS-ox-gNq"/>
                             <constraint firstItem="xdk-cL-gdm" firstAttribute="leading" secondItem="BrG-6p-F5j" secondAttribute="leading" id="LcX-wE-RGP"/>
@@ -626,28 +690,28 @@ what measurement system do you prefer?</string>
                         <viewControllerLayoutGuide type="bottom" id="4Dn-cW-4Td"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="GqB-jz-M2M">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="I can remind you to drink every once in a while. Since I don’t want to nag you, you’ll decide when:" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="T9n-t2-EOq" userLabel="Header">
-                                <rect key="frame" x="16" y="40" width="288" height="66"/>
+                                <rect key="frame" x="16" y="40" width="343" height="66"/>
                                 <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="16"/>
-                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="a51-1N-ixm" userLabel="Controls">
-                                <rect key="frame" x="0.0" y="468" width="320" height="100"/>
+                                <rect key="frame" x="0.0" y="567" width="375" height="100"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LWy-za-zrz">
-                                        <rect key="frame" x="240" y="20" width="60" height="60"/>
-                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <rect key="frame" x="295" y="20" width="60" height="60"/>
+                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="60" id="KAo-2i-IFn"/>
                                             <constraint firstAttribute="width" constant="60" id="xme-MY-hIZ"/>
                                         </constraints>
                                         <inset key="contentEdgeInsets" minX="1" minY="0.0" maxX="0.0" maxY="0.0"/>
                                         <state key="normal" image="blue-check-icon">
-                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         </state>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -660,14 +724,14 @@ what measurement system do you prefer?</string>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wB4-SV-rbT">
                                         <rect key="frame" x="20" y="20" width="60" height="60"/>
-                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="60" id="7Qb-Bt-TCl"/>
                                             <constraint firstAttribute="width" constant="60" id="g9Q-Ic-NIa"/>
                                         </constraints>
                                         <inset key="contentEdgeInsets" minX="-5" minY="0.0" maxX="0.0" maxY="0.0"/>
                                         <state key="normal" image="prev-icon">
-                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         </state>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -679,7 +743,7 @@ what measurement system do you prefer?</string>
                                         </connections>
                                     </button>
                                 </subviews>
-                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="bottom" secondItem="LWy-za-zrz" secondAttribute="bottom" constant="20" id="8LC-of-Zp3"/>
                                     <constraint firstItem="wB4-SV-rbT" firstAttribute="leading" secondItem="a51-1N-ixm" secondAttribute="leading" constant="20" id="HBk-1D-vkn"/>
@@ -689,17 +753,17 @@ what measurement system do you prefer?</string>
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GTt-h0-xq8" userLabel="On">
-                                <rect key="frame" x="0.0" y="126" width="320" height="50"/>
+                                <rect key="frame" x="0.0" y="126" width="375" height="50"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Remind me" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mVT-8Y-PAY">
                                         <rect key="frame" x="20" y="11" width="102" height="28"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="gl4-fV-2SB">
-                                        <rect key="frame" x="251" y="10" width="51" height="31"/>
-                                        <color key="onTintColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="calibratedRGB"/>
+                                        <rect key="frame" x="306" y="10" width="51" height="31"/>
+                                        <color key="onTintColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <connections>
                                             <action selector="enableNotifications:" destination="UpA-CQ-AM6" eventType="valueChanged" id="Mqf-mo-XDV"/>
                                         </connections>
@@ -714,24 +778,24 @@ what measurement system do you prefer?</string>
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QuN-dL-t69" userLabel="From">
-                                <rect key="frame" x="0.0" y="176" width="320" height="50"/>
+                                <rect key="frame" x="0.0" y="176" width="375" height="50"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="From" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TTz-34-edX">
                                         <rect key="frame" x="20" y="11" width="47" height="28"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="10:00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uxY-Gi-w4N">
-                                        <rect key="frame" x="249" y="11" width="51" height="28"/>
+                                        <rect key="frame" x="304" y="11" width="51" height="28"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Tqy-KV-8mT">
-                                        <rect key="frame" x="0.0" y="0.0" width="320" height="50"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
                                         <state key="normal">
-                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         </state>
                                         <connections>
                                             <action selector="openFromSelection:" destination="UpA-CQ-AM6" eventType="touchUpInside" id="etX-A4-bBW"/>
@@ -752,24 +816,24 @@ what measurement system do you prefer?</string>
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="n2T-25-lRf" userLabel="To">
-                                <rect key="frame" x="0.0" y="226" width="320" height="50"/>
+                                <rect key="frame" x="0.0" y="226" width="375" height="50"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="To" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sjg-oM-azP">
                                         <rect key="frame" x="20" y="11" width="22" height="28"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="22:00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0pm-Fb-nta">
-                                        <rect key="frame" x="249" y="11" width="51" height="28"/>
+                                        <rect key="frame" x="304" y="11" width="51" height="28"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="KXD-3s-NZ3">
-                                        <rect key="frame" x="0.0" y="0.0" width="320" height="50"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
                                         <state key="normal">
-                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         </state>
                                         <connections>
                                             <action selector="openToSelection:" destination="UpA-CQ-AM6" eventType="touchUpInside" id="WSM-Xs-pN8"/>
@@ -789,24 +853,24 @@ what measurement system do you prefer?</string>
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4ng-Ck-Uhi" userLabel="Every">
-                                <rect key="frame" x="0.0" y="276" width="320" height="50"/>
+                                <rect key="frame" x="0.0" y="276" width="375" height="50"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Every" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6pM-Tq-50n">
                                         <rect key="frame" x="20" y="11" width="49" height="28"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1 hour" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9Xn-gc-3Bx">
-                                        <rect key="frame" x="242" y="11" width="58" height="28"/>
+                                        <rect key="frame" x="297" y="11" width="58" height="28"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="RoW-Fv-Wot">
-                                        <rect key="frame" x="0.0" y="0.0" width="320" height="50"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
                                         <state key="normal">
-                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         </state>
                                         <connections>
                                             <action selector="openIntervalSelection:" destination="UpA-CQ-AM6" eventType="touchUpInside" id="duE-wd-xkc"/>
@@ -826,7 +890,7 @@ what measurement system do you prefer?</string>
                                 </constraints>
                             </view>
                         </subviews>
-                        <color key="backgroundColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="backgroundColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="4ng-Ck-Uhi" firstAttribute="leading" secondItem="GqB-jz-M2M" secondAttribute="leading" id="4fD-Q8-x55"/>
                             <constraint firstItem="a51-1N-ixm" firstAttribute="leading" secondItem="GqB-jz-M2M" secondAttribute="leading" id="AGY-Lq-A2e"/>
@@ -873,7 +937,6 @@ what measurement system do you prefer?</string>
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" navigationBarHidden="YES" id="By6-Ql-uIz" sceneMemberID="viewController">
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="y50-mX-m9k">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <nil name="viewControllers"/>
@@ -890,14 +953,10 @@ what measurement system do you prefer?</string>
         <image name="blue-check-icon" width="40" height="40"/>
         <image name="check-icon" width="40" height="40"/>
         <image name="large-icon" width="40" height="40"/>
+        <image name="medium-icon" width="40" height="40"/>
         <image name="next-icon" width="40" height="40"/>
         <image name="prev-icon" width="40" height="40"/>
-        <image name="small-icon" width="40" height="40"/>
+        <image name="small-icon" width="168" height="168"/>
     </resources>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4"/>
-    </simulatedMetricsContainer>
-    <color key="tintColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="calibratedRGB"/>
+    <color key="tintColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
 </document>
diff --git a/Gulps/Gulps.entitlements b/Gulps/Gulps.entitlements
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/AppIcon.appiconset/Contents.json b/Gulps/Images.xcassets/AppIcon.appiconset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/AppIcon.appiconset/Icon Copy-40.png b/Gulps/Images.xcassets/AppIcon.appiconset/Icon Copy-40.png
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/AppIcon.appiconset/Icon Copy-60.png b/Gulps/Images.xcassets/AppIcon.appiconset/Icon Copy-60.png
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/AppIcon.appiconset/Icon-120-1.png b/Gulps/Images.xcassets/AppIcon.appiconset/Icon-120-1.png
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/AppIcon.appiconset/Icon-120.png b/Gulps/Images.xcassets/AppIcon.appiconset/Icon-120.png
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/AppIcon.appiconset/Icon-180.png b/Gulps/Images.xcassets/AppIcon.appiconset/Icon-180.png
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/AppIcon.appiconset/Icon-58.png b/Gulps/Images.xcassets/AppIcon.appiconset/Icon-58.png
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/AppIcon.appiconset/Icon-80.png b/Gulps/Images.xcassets/AppIcon.appiconset/Icon-80.png
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/AppIcon.appiconset/Icon-87.png b/Gulps/Images.xcassets/AppIcon.appiconset/Icon-87.png
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/AppIcon.appiconset/Icon.png b/Gulps/Images.xcassets/AppIcon.appiconset/Icon.png
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/Contents.json b/Gulps/Images.xcassets/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/big-tiny-icon.imageset/Contents.json b/Gulps/Images.xcassets/big-tiny-icon.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/big-tiny-icon.imageset/big-tiny-icon.pdf b/Gulps/Images.xcassets/big-tiny-icon.imageset/big-tiny-icon.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/blue-check-icon.imageset/Contents.json b/Gulps/Images.xcassets/blue-check-icon.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/blue-check-icon.imageset/blue-check-icon.pdf b/Gulps/Images.xcassets/blue-check-icon.imageset/blue-check-icon.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/calendar-icon.imageset/Contents.json b/Gulps/Images.xcassets/calendar-icon.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/calendar-icon.imageset/calendar-icon.pdf b/Gulps/Images.xcassets/calendar-icon.imageset/calendar-icon.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/check-icon.imageset/Contents.json b/Gulps/Images.xcassets/check-icon.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/check-icon.imageset/check-icon.pdf b/Gulps/Images.xcassets/check-icon.imageset/check-icon.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/drink-icon.imageset/Contents.json b/Gulps/Images.xcassets/drink-icon.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/drink-icon.imageset/drink-icon.pdf b/Gulps/Images.xcassets/drink-icon.imageset/drink-icon.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/drop-bg.imageset/Contents.json b/Gulps/Images.xcassets/drop-bg.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/drop-bg.imageset/drop-bg.pdf b/Gulps/Images.xcassets/drop-bg.imageset/drop-bg.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/drop.imageset/Contents.json b/Gulps/Images.xcassets/drop.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/drop.imageset/drop.pdf b/Gulps/Images.xcassets/drop.imageset/drop.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/large-icon.imageset/Contents.json b/Gulps/Images.xcassets/large-icon.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/large-icon.imageset/large-icon.pdf b/Gulps/Images.xcassets/large-icon.imageset/large-icon.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/medium-icon.imageset/Contents.json b/Gulps/Images.xcassets/medium-icon.imageset/Contents.json
new file mode 100755
index 0000000..25e8e8f
--- /dev/null
+++ b/Gulps/Images.xcassets/medium-icon.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "small-icon.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Gulps/Images.xcassets/small-icon.imageset/small-icon.pdf b/Gulps/Images.xcassets/medium-icon.imageset/small-icon.pdf
old mode 100644
new mode 100755
similarity index 100%
rename from Gulps/Images.xcassets/small-icon.imageset/small-icon.pdf
rename to Gulps/Images.xcassets/medium-icon.imageset/small-icon.pdf
diff --git a/Gulps/Images.xcassets/medium-tiny-icon.imageset/Contents.json b/Gulps/Images.xcassets/medium-tiny-icon.imageset/Contents.json
new file mode 100755
index 0000000..2efb44d
--- /dev/null
+++ b/Gulps/Images.xcassets/medium-tiny-icon.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "small-tiny-icon.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Gulps/Images.xcassets/small-tiny-icon.imageset/small-tiny-icon.pdf b/Gulps/Images.xcassets/medium-tiny-icon.imageset/small-tiny-icon.pdf
old mode 100644
new mode 100755
similarity index 100%
rename from Gulps/Images.xcassets/small-tiny-icon.imageset/small-tiny-icon.pdf
rename to Gulps/Images.xcassets/medium-tiny-icon.imageset/small-tiny-icon.pdf
diff --git a/Gulps/Images.xcassets/minus-icon.imageset/Contents.json b/Gulps/Images.xcassets/minus-icon.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/minus-icon.imageset/minus-icon.pdf b/Gulps/Images.xcassets/minus-icon.imageset/minus-icon.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/next-icon.imageset/Contents.json b/Gulps/Images.xcassets/next-icon.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/next-icon.imageset/next-icon.pdf b/Gulps/Images.xcassets/next-icon.imageset/next-icon.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/plus-icon.imageset/Contents.json b/Gulps/Images.xcassets/plus-icon.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/plus-icon.imageset/plus-icon.pdf b/Gulps/Images.xcassets/plus-icon.imageset/plus-icon.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/prev-icon.imageset/Contents.json b/Gulps/Images.xcassets/prev-icon.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/prev-icon.imageset/prev-icon.pdf b/Gulps/Images.xcassets/prev-icon.imageset/prev-icon.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/sad.imageset/Contents.json b/Gulps/Images.xcassets/sad.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/sad.imageset/sad.pdf b/Gulps/Images.xcassets/sad.imageset/sad.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/settings-icon.imageset/Contents.json b/Gulps/Images.xcassets/settings-icon.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/settings-icon.imageset/settings-icon.pdf b/Gulps/Images.xcassets/settings-icon.imageset/settings-icon.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/small-icon.imageset/Contents.json b/Gulps/Images.xcassets/small-icon.imageset/Contents.json
old mode 100644
new mode 100755
index 25e8e8f..2fde336
--- a/Gulps/Images.xcassets/small-icon.imageset/Contents.json
+++ b/Gulps/Images.xcassets/small-icon.imageset/Contents.json
@@ -2,7 +2,16 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "small-icon.pdf"
+      "filename" : "small-icon copy.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {
diff --git a/Gulps/Images.xcassets/small-icon.imageset/small-icon copy.png b/Gulps/Images.xcassets/small-icon.imageset/small-icon copy.png
new file mode 100755
index 0000000000000000000000000000000000000000..1322f247ea4171a9d27a58813759fc2c5adaa02b
GIT binary patch
literal 4378
zcmd5=2~<;88U`VPfLldz10GRvP4ZqgNFV}DL{M1-tP~aU^729=AulFjA0R=k3PoEf
z+KN_G7PlfOiwea!qEso0f`TCEpcSiZRs;l*d10%aX{VjjIcJ)amwVs6|NWQme*b^(
z$u4itl@m>7o9OB3O>}qT`QYtw-D5l+|5dHd%*UGva<`9_dV1t}x<@}U(<xj}&p1}%
z=dbejSi?rJP%<pU1SmN&RE|sQ={Y(@%3&k~RRIDtSR&&PJBlw60f~@9T+i?TJ>*<e
zEOCogpuW+ben@l(!V(glmIIEFY+OMos)B*YP^nDGj^q%B^s@23ZkR#@hD1~$9HNWP
zAmH!e4RA393NXk_5(3ddz>Y<Rm>``2Ed!_^WJduR6p%>*AvS2wrb58ThlpEK2t{lk
zp6iG${Eb5tt5k9}g%S}FL5`r2F-0&1VzF2hkV>IaNw@?_86{J}ktCUN-lzs1szekL
zxk`e`0G&oyfQ6|zMBLNi5JKf+YGuk1m~g--k+7TskwINZLxS@6?EgX#pTGraV}dwD
z9v=T$XK3h{v{JPq9Cv3VuwN)1^+4$tB}XYfs1gfPAn1y4RHm9Y>XlOEgZ_-mA6Sly
zk1ZA=V}|8n3h5A@LWF`!(NNrm5|0WR^HVOyRG3nX{RUcN(_@&)*<1w*t56>PaESO;
zGe{tnM78&W=xoT2O|=Wq#UN*UU_yx~YD~(W1hPmF<Oe})D#)hONT3}X1V==1iV0yA
z{JX;Vmax4Qm@o`M6&#`mi~wG~fIk3%Wc*75)`r0fRW#tubLC<(6&k4;Qt#oxc9$tt
zuna-nc^o3{8(AU|vQZ}0o{CaMBoWF$NpuKANdgdtNK6(AAqYdn00oTE^*js-(?O?O
zKb#ms48e7bp~JRk!FKj^mXKtJ=Ku-sGD$FkM+^!O22DUiAQ2N9)#jy;;JFD)-`A@1
zN{DNuGifLtWkMt>jUgh@?WhomMT0;R$gsBqMJSyqq%(<t5MhfjMJS9DOcDwQqZGL;
zm<asr4HuJQ3VZ|b4Whk2?#|`n@QEZ+d_w87@<YIV1(yl2m`oCt4CxYUh~sQGiBg3r
zqDE5H7u_<_lS+UgTC-t9mv*=gI2;ucM+POo0`eaVXIN>37{yiMgc_y_=tqUvG@K+j
zzlNzYET+Unst8ztx&-4JGFpzjM_CMTxxgZv7!sL|)r&`cL&UHw7{$vVg-H3WV1%eb
z@?JP{SOMd;4^=2RL<EzCqY4!&1Vjof6oBP&sRV&_7*N7x!ja-K20x&}fS<SJH|_l{
zctWAQ2t-gCNeJUfM%QtbMTMy(p*;(-XVGxB*$YMk{C|V@yTSaibo*5%{Cm;(-!Xxr
zJ359LPWe~z55Mz<Y2m8d_@S!I{xd|!%QPFW9b?txzsvh!``DkYA39171^(U{Iy!_O
z%)0K_jR1ccyHlVtJcAUv8^iaGBK#u4b?3SGMILNxjQP~>hgsz>JDSHWA(%y;IL=#p
zteL>zg@i097@s#jleg7%#esm(8fMmh@u?rL-dQb{R;R~{3v6GzmN1~%SbD-|;*!+O
zbiaJ{{(EW*!;|J)`pao4QMbN2SJB$~ebnKvdV1X5p2h}8+`Q6`JyeQr#xzw|*VgXX
zx&Dg40-#PI_-*uczRLLPH~EY#{UU=`#M;|o(S3b=g4(Jd;|Lq4<?q)!r`hxPi|S40
zRY%^?<ZE39m+;xSIS&*U_l&DAnWITEij1@DTxWjA<~Af&<}8?V(?c7iS)Wk4OZ!;c
zzTn>7FnYqIrXuwv!#0L?&9Z|W?IA7e@~frl6wP3&U(ous&PFYUd{zPH)(fq>HeL}F
zF|G4Z`nSgRMQwM(Y}%UV*iAa0Tz^Z-0k`(a6WZQc5ZaXL!vzHw$(d90w<M`qspSoM
zjooMUOXGMyym`E}l%_GN_t~`nj&c2$9cxV&YJV`B>zRw(RBC#*mTu4t1Z)V1s5ZWc
z?9h)dcje{UxjnQh>p48}fn~n6zGsL#I-v@mto1c*nWOD7dNa_Y7jITiQy(r&&zUba
zw5&_jb|iG0J-Tfh7##d)g_J)2nL*Y^eL}t2F8vY4ofYW=F$Zv)*}|1gR(v?+OsY8{
zKmL{G^VITFnjo{6uV<t*-i@Et`({eexfc?PAnBz0x1g5KVvkjyhP12rgRA;!e3Q=2
zrh&yvC5GSFne>KLl^(vgZJN}i>1}#rTEo64i_%}`jGJ`Y@tyhki&xLYn|2DTz9t;3
zZ4OmUY->Je3#Tj(Kan5LePLh{{w_{Z_0B?Wo_k?p!*lU$mveDzNCyYU=Y&*;?}Mvf
zot$)Bx<NrtxVPr=&6(>4c6JlYTanYLHOm**jhnkGIm_qB)O_2ym+$duPa7oD<;p56
z!rS!9hF1I8E|qy&Q<wf7TI*GH?Jji?7G^$R<}f4nn{A;HhRNwq6Cb?{Xce5Np0;&x
zxMY!hbe73+%b36^`Pj7_Xvyk#-pwCwZfQ-)R*NW=y*qz$y>&8G8|xBdFPB_roKKB*
z?jbxK-{zq1A=Z38c<jp^o2DNqsWFJQ0ome*Rws6^)U+gYTjbX7-5>3IYqFJ-zT>o0
zQ>0y!DvvSOvOivIq_UNZt4f!CWHY^IZ>*9zq4+zpWU&$bZ!M)$BSCz$!`sOwT6Wta
zYyMqz`^1B@^R2Ub`?}APZWLr27?m$7OY$>dPfK&$_`1k{`;%n^reWLE`K4)IjPzi_
z9y_Gseq^qG<dRyuQ*Wtn-JtZClud2OgicvTK%(Qp5NogQ%8fogX3uJ`w>PaXTasb@
zX8P)AjjzDG*(FiGa`3Fh$`eQ9PieB1vDL`X*r6GYaTXg$WhtN6eU(v_SCjQ*!GZ#{
z6}N3~kosls2K}g+_qkKlvFgXfnh!Q@*5|NmttPD5>0R!;+$JWl^!d)SrZ0g^^&}%(
zi>`P-g=O-h0P<V#dBngbN~YS%ZNS(hH{^O4{e|(_9Shyv7N<|kt%%{K<yItpJ1elN
z$U1lZ{q1G@0-Vc#=nFJ#O7yPSZGOmpX41I&ySDsGPpax?Zl^!WODMhF+h2C1&Bx@K
z|MS614T$+2_0hGlhKH0T52%X?`Oo$jV?VB=i}oaxTJf{bn(iWHs=Lj*EIkIcoG=Pn
z`mAA+lvMm#9lku?w67a*czttgth!@H7e<U(oi;ziylS%MmTBLajCVDHWmj^G@5kmn
zx{%y^V1|F<7vnB|(kgv@(!FkCp&-qqg!i)D@{vdD#mtPZYvgoZ2S170`f=w2=_4B{
zsV|&NbTCP4FFNuQ<|UnV?S5<T)4+=BP3;a778AOx>l`cQ^+&y%Q`eYe!B47qx~C^v
zQ=RwtN}kp!Z%$cG2*1HX|6$o~O14>HXJSj*+tS_p>VHaVxn1|%W=@{-8A2gkzHNu^
zrMZ>;b=2e{?@L0@$%QpNUf%_})PGu(d%>{blU}yv!UA>sCzbxz51VTn4NE@#W_QW-
zeiffukOrCE#oW8Pcb&jftSN2(RkC18As@z`cprU{(M2xZY*V;*OZJyuNB^;nZg4U2
z=7p$xh!7K{9W;-4xo*$nennHQ=8WD8#Nq?r8~T<zVq5)Gv)rVo^1SpMJ+sK`5{r9J
zPR^Zrqk+?4ec3i|zO|>DLptB$dk=za=SHKt;@7KlX{$C6Ynxqf6!(@qRy*kjEr}|&
zM&bd}&ZzAYKNIn{(=-(t+VRGsb9V~`Az&ln!B!cufr6JVBzOBY&%e9YawRgwD`qSG
zSxB8UGdNE^qw@6LxrF>J#eCmawt{SG#1+xP<P7G9_@zuJnil?b94CDFV5qaxGuuV!
q%>mClny<3{`bXgVM|HuV!PUcV5BA1gSgHH>!hMA&FXuyk!ao67$FSxA

literal 0
HcmV?d00001

diff --git a/Gulps/Images.xcassets/small-tiny-icon.imageset/Contents.json b/Gulps/Images.xcassets/small-tiny-icon.imageset/Contents.json
old mode 100644
new mode 100755
index 2efb44d..9568ee6
--- a/Gulps/Images.xcassets/small-tiny-icon.imageset/Contents.json
+++ b/Gulps/Images.xcassets/small-tiny-icon.imageset/Contents.json
@@ -2,7 +2,16 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "small-tiny-icon.pdf"
+      "filename" : "small-tiny-icon.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {
diff --git a/Gulps/Images.xcassets/small-tiny-icon.imageset/small-tiny-icon.png b/Gulps/Images.xcassets/small-tiny-icon.imageset/small-tiny-icon.png
new file mode 100755
index 0000000000000000000000000000000000000000..120db7d3645ba012e4e632d2911f7874a83622d2
GIT binary patch
literal 4532
zcmdT|2~<<Z8csk|z-U#F7Esb)6_t=ZkYHF0tD3Ni;L7FZUJ}Vh5)#0IKwGT~V%4f3
zDyUcy^odwR!;&g)1qDH<AQ6<J1ti6afFSkVu+_fTzV@BIbKYrAZf5SxKmYR0_y02|
z+x@xT7!ykq6bgm$_3;Qq+SB@H>SW|su_EUp(ils9!sIBFgRTBS$L6>yQK+d2g5Xd^
zC}$-Tl!zPvo+JWth!sf@X%uRyYpfIiqaXz~0*VxfS-2n7<v6T>$HJ|qaflo#8{!Lm
z;$=`!JU1AOj{+GyoU03VX)F^_Ac7PCHdZ7Q%bBq(+=yN#($^0YaM%$MMHCC?t~ZDc
z<@jUS5*dW0InePSiAuyeG8{;BB9%t6$C8O8M*@*XAky(f5|ik}B$KdX9~@#$#)FxG
z9$sU%kT({NuTV&t1cFMXa!^qmB(g{XiNRnHh-3npj7KE!@;I>qh{cQLw&NN+AUP-#
zNEHH!7^~L^L`Y&3EF9wLXb2+dgj%tD3?>9HLM$L9kQ|8mkVXWh@7Vv9ATognQYHiu
zh&Y`8tWzYKkd`Yvm54iIf&EJHxCip!I4ML3gyfPK83=hQA+f@C+$*^v5c&m|Kd~GU
zpIFQTCk#ttWWo_Vc_0B2LL$V59EplF;ir@@QAp%`$?u>wF+G8ql*yJsfCBPB9u^MS
zY8swM!IK<=NsdekgGr{X(Z?WVawI$f95*55geNlaBvLSm#3WOgNT2A)BofC&5sL8u
z1@MQ$$d)kuWfEQt2+3GD4gg~Pg0P`j643$qQm_FrfJ_mO_4n{%OT-E&RxzTU!(sZ0
z<qALyLcSg>9O9dUK)_?t0g@wwPN(A`It=2eAP>SvKr{$X<dGp{jt;{BIKJLP0><c}
z)2|;*44wo;bWEVbgos26*%5;9bQ+J0C-bNv-U%jycsiLzC6OVjQv_)=Si~DYnE=U6
zK=`g!y;nR$Bbf|DKqOuS9*UqqcxnU$;sFK&ag9NyI)OZpMue$2EDvPD5}61<2qq8#
zkq|*Dj>KVq@rErCN@U0eAR9z^ciflFM&N@5LS#Z7=)DZ<>&d2*5ESra2a-OqMmWy&
z5y%x1S=?Bv20_tdJ)r<QLTe@f>eCL<0Vp9JZfsES8zBF=a7LA?_z<EJA=D^Uh{0r%
zo={ZsI8{c)<Pun+0%VYTB(fpn<;Z`W#aK2QYljd+Al9>b(YS9Q9}q`ENEsyH2)`E$
z50VMq2}cUZ0HpRoGC2zeO2kS?rhs@@SSAr+0jX3d00BJ)1f`faR$M0F$0{V)U$*6U
z?foHmG%C#zpnw1#cA_)zR7wOw11AatPa!)or~ug!B-19q|9^w`hr#^0bo)&v{Cm;(
z-!XxpKRQMkPWV^ykG^}1(!xu>@gr54`B#XJlxZeXJ0_~hf0y^8_9cI{e&{JV68Jl3
z==czFFzdS$Hv;5k;!XjHkqnX{H->=B1vbb<MC<F}9vqw5t&PfGx9Wo%FW#<LVs1wZ
zpIH%dJO%T4_N?t50TqFhcI~Zw->SwWCnPFDxN@q;EZa_tU6yac_s6c-v-5gSvJdUO
zshE)2`{LdC7tu3o_OHFXKg3el(Y5VszsPFh=DX|qODJ8hKU$a`7umO=D>LqH6J>Kl
zK1t<0{|x(v7X1a+%-@)U{<7xp(1>)!&i)H2R<{$i+N9TT(dPM>lXS1IyK1N@({E|3
zCl?v2n-fl`%cGkUG8P=D+w%0hx4&wm>6<-IZST$2d<GYZZiz5*)oivc|5$Uv+#Ybl
z5Vhm123BqH8!pXov2-75)h$VW$p3jti=RAHWneR}!6&1xE%?;Ti{84#$<o=W<=P;P
zk>;_cUXy&h?7e|hb@}B!E_Y^X7E9XSmgI`QX_0d?34;6h9WG0fQ#F~#dm~%zDG!~)
zAATZqDWIk(Z)=~S%1_R`8=2JJE;TsR*sW>LsqN7CZR+^mEYMA@!b_FWaW?0#R?QQr
zyeUIQJ$C{-W~o|;O*+oPxlh!sI-5!Kx`AyQB(Q4+WM!C$`8eOM+whSDUOV)h?RuEA
z)JQQ$SB4s}k}eBq;=_4Yn)~>z=<tAmc(c%^YG*Ek#f6v^)jBox>T5~sORbm>R~zOf
zrz=Y57AGD$a#(4?pQ1~2IA0Vzn4jL=3E99(n>*R-+H@9}?9E{{AC{%4Z6+`EuzZCQ
z6AKBwb?4MJ-1v;1-N$>)q!-dlA6#=86vRIfOggK?q)K(DbDb)0xQ~3t53`%SZSWj_
zlIWVY#dzsd>oxmbAovodsZ8B6ZC&8vBOrWO-K?y6x^S;S(^j>_z`_39qe$511Fs=n
z;!?q;M{kbzs#>X(hu>W<y7t4>ihCcHeWpI<XPY@Ci7+Fo1uili2+38D&jX=D$Gj}v
zS2Pd5R~uIuw6oUlj!?9X6CYAC&@|oNVL1W4FujpdD0Hk6ubh^eb;pHmo4Gmp9~gCV
zMC~nFPOU+!)irVC8vZ1F@ldwr+DYS^sPEDn>redPO$v1NU{)BGn3Pmj6{#M;X6udp
zZ28wLEg!!j^c)GG@!%=^d9-JH7M$=gP0g~lX4z!FDCv0!H}uC<i!XlQiRL;MmIpU)
z*{?NTVavae;pNniZn25^<horGbNQB-``z4(=iW6DYnthnwvE+Q&v!5fgLXBip(!?|
z(XD2bA@9RO4fk@S)Ra^5qwUw8zlxy=;kSl~{toEX4fQ|IubJAJIOBYN@t`wh$p1)!
ztRM8P8`!XV{|5A&!;OXb{=CAq0FRY&WoSF~s&P&9fj4%C8tXLOIkih$<uU!XXYvhA
z@|UcC<SF;>?0tElt83@#*Nv5ZX{|bWa^>=zjp>a`z|Om+nteH4JCo!$?;rHPfU!Go
z?Q}{pd@51-L}xgRI@FkVGL3rhY)99n3^HR%Z*6V+5zPUyqY(1|yL_m)p#9X&<^-4Y
zN^+LYWyXL<t|F4OBc`z1ZqQILr@k%cr>^9*>7@n6`ye-8Q=)a)mBh%`HyWqkwtZ64
zH$33C`@%QAd!pQ2AIXM)PB#TzT8eYq2jec6XH>sBxN*ak64BF>u}S+L6E3cEH3?;I
zP5ktW^={hX_rra2djkV({I+FuOM<MveU`mol@gs(fO@ctq8+|f)W7TTu4q+wrfeF&
ztG3zerRk|?=5Y?bE2ly}?T1{^rn#=?Lry63NXJ6+SML4Dh#D5Una~u~Z%+4WJ7L#&
zo0PS)>HhS*Qj2cZ+JKGg0*=Lp8Qs^W9WTh_G`e-&oN=$s{1q70?THODGK*z<CPbbs
zJ>6HdBR*tfSlEHJZWh7!^HKsX^{1*0?|na~=1hy@a^l^*(`ivhJ0G;qsj*nnx$2wK
zbzdc$n_u!|U_#W*27^4$1fxaRHW^xAUV7&BvA4Meglt}aE?2e1GB)V&;Y$Y3P@6lu
z&AXCb1^byavg4ywSx@?M4?LV|vgq^f5(}sDt$okFC`-_-(9G3f6h{ksZ$_B!wQr9d
zj4(|#+O&54^k()edA+;6Exw@e%FXUX=ajOQyR2utSdm<0sxUuiROaGFd6|6B*XEY<
zc4}jreeGA&G+p$@q2$?BLT_$bP?*y8boy|;)&|ARE3RDaWBU1e@1fV}tDf#HGyZ<@
zR!8T~rxA@kLdY@2pm=C;YeSeW5qu$+Sg3XVJ=)tFYL6GaO(D)c6Lm1k4KrXUeQJMr
zsb4(z%4fY7TY=h7cLUaCk%iw>O?NO%N6PX6$PL|`VBBGzP*Huf#bn(kc#2JC=De>i
zSo=}X{`phNcl3Tt+3TEC`R(JXup+b(v5=#=UXd>DXN5xr;?sLxd{|bcZNW4z8*1!}
z8CclkNl~jir|T<ZSXvgP>bZNZ+Ih7>b^U|h*(X)|xgBPAGX;}Gk9FRA%6eXzcu_DC
z3qkIYwMpt5mlxch@9*X;?Z32V4tD@0_;mfUS0|q-`}UMQf~`8J^*<(`g&QiZP?Us@
zn0>ifNqx7p7JFefem=`HV?|qVy}0&r-LoW%Dq+6{LvNbfaBji!5cHR~PgwZQ$}m`*
iy(sJN)-=6E|5WnH$8|p0$X_ogl&>e(<J_|Flz#$8iV;Zw

literal 0
HcmV?d00001

diff --git a/Gulps/Images.xcassets/smile.imageset/Contents.json b/Gulps/Images.xcassets/smile.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/smile.imageset/smile.pdf b/Gulps/Images.xcassets/smile.imageset/smile.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/star.imageset/Contents.json b/Gulps/Images.xcassets/star.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/star.imageset/star.pdf b/Gulps/Images.xcassets/star.imageset/star.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/stats-icon.imageset/Contents.json b/Gulps/Images.xcassets/stats-icon.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/stats-icon.imageset/stats-icon.pdf b/Gulps/Images.xcassets/stats-icon.imageset/stats-icon.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/tiny-add.imageset/Contents.json b/Gulps/Images.xcassets/tiny-add.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/tiny-add.imageset/tiny-add.pdf b/Gulps/Images.xcassets/tiny-add.imageset/tiny-add.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/tiny-check.imageset/Contents.json b/Gulps/Images.xcassets/tiny-check.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/tiny-check.imageset/tiny-check.pdf b/Gulps/Images.xcassets/tiny-check.imageset/tiny-check.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/tiny-x.imageset/Contents.json b/Gulps/Images.xcassets/tiny-x.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/tiny-x.imageset/tiny-x.pdf b/Gulps/Images.xcassets/tiny-x.imageset/tiny-x.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Info.plist b/Gulps/Info.plist
old mode 100644
new mode 100755
diff --git a/Gulps/Model/Entry.swift b/Gulps/Model/Entry.swift
old mode 100644
new mode 100755
diff --git a/Gulps/Model/EntryHandler.swift b/Gulps/Model/EntryHandler.swift
old mode 100644
new mode 100755
diff --git a/Gulps/Model/Gulp.swift b/Gulps/Model/Gulp.swift
old mode 100644
new mode 100755
diff --git a/Gulps/Resources/Fonts/KaushanScript.ttf b/Gulps/Resources/Fonts/KaushanScript.ttf
old mode 100644
new mode 100755
diff --git a/Gulps/Resources/Fonts/Lato-Light.ttf b/Gulps/Resources/Fonts/Lato-Light.ttf
old mode 100644
new mode 100755
diff --git a/Gulps/Resources/drop.caf b/Gulps/Resources/drop.caf
old mode 100644
new mode 100755
diff --git a/Gulps/Resources/en.lproj/Localizable.strings b/Gulps/Resources/en.lproj/Localizable.strings
old mode 100644
new mode 100755
index 2de35aa..e2353bb
--- a/Gulps/Resources/en.lproj/Localizable.strings
+++ b/Gulps/Resources/en.lproj/Localizable.strings
@@ -3,8 +3,10 @@
 "Liters" = "Liters";
 "Ounces" = "Ounces";
 "gulp.big" = "Big Gulp";
+"gulp.medium" = "Medium Gulp";
 "gulp.small" = "Small Gulp";
 
+
 /* Main */
 "drink title" = "Drink!";
 "undo poptip" = "Tap here to undo your latest action";
diff --git a/Gulps/Resources/it.lproj/Localizable.strings b/Gulps/Resources/it.lproj/Localizable.strings
old mode 100644
new mode 100755
index b9595db..a14c82c
--- a/Gulps/Resources/it.lproj/Localizable.strings
+++ b/Gulps/Resources/it.lproj/Localizable.strings
@@ -3,6 +3,7 @@
 "Liters" = "Litri";
 "Ounces" = "Once";
 "gulp.big" = "Big Gulp";
+"gulp.medium" = "Medium Gulp";
 "gulp.small" = "Small Gulp";
 
 /* Main */
diff --git a/Gulps/Resources/ru.lproj/Localizable.strings b/Gulps/Resources/ru.lproj/Localizable.strings
old mode 100644
new mode 100755
diff --git a/Gulps/Resources/tr.lproj/Localizable.strings b/Gulps/Resources/tr.lproj/Localizable.strings
old mode 100644
new mode 100755
diff --git a/Gulps/Support/AnimatedShareButton.swift b/Gulps/Support/AnimatedShareButton.swift
old mode 100644
new mode 100755
diff --git a/Gulps/Support/Colors.swift b/Gulps/Support/Colors.swift
old mode 100644
new mode 100755
diff --git a/Gulps/Support/Constants.swift b/Gulps/Support/Constants.swift
old mode 100644
new mode 100755
index 9816e6e..048b8c4
--- a/Gulps/Support/Constants.swift
+++ b/Gulps/Support/Constants.swift
@@ -53,13 +53,15 @@ public enum Constants {
   }
 
   public enum Gulp: Int {
-    case big, small, goal
+    case big, medium, small, goal
     public func key() -> String {
       switch self {
       case .big:
         return "GULP_BIG"
       case .small:
         return "GULP_SMALL"
+      case .medium:
+        return "GULP_MEDIUM"
       case .goal:
         return "PORTION_GOAL"
       }
diff --git a/Gulps/Support/Extensions.swift b/Gulps/Support/Extensions.swift
old mode 100644
new mode 100755
diff --git a/Gulps/Support/Globals.swift b/Gulps/Support/Globals.swift
old mode 100644
new mode 100755
diff --git a/Gulps/Support/HealthKitHealper.swift b/Gulps/Support/HealthKitHelper.swift
old mode 100644
new mode 100755
similarity index 100%
rename from Gulps/Support/HealthKitHealper.swift
rename to Gulps/Support/HealthKitHelper.swift
diff --git a/Gulps/Support/NotificationHelper.swift b/Gulps/Support/NotificationHelper.swift
old mode 100644
new mode 100755
index 0a510a7..3f54f7a
--- a/Gulps/Support/NotificationHelper.swift
+++ b/Gulps/Support/NotificationHelper.swift
@@ -53,7 +53,14 @@ class NotificationHelper {
     smallAction.activationMode = .background
     smallAction.isAuthenticationRequired = false
     smallAction.isDestructive = false
-
+    
+    let mediumAction = UIMutableUserNotificationAction()
+    mediumAction.identifier = "MEDIUM_ACTION"
+    mediumAction.title = "Medium Gulp"
+    mediumAction.activationMode = .background
+    mediumAction.isAuthenticationRequired = false
+    mediumAction.isDestructive = false
+    
     let bigAction = UIMutableUserNotificationAction()
     bigAction.identifier = "BIG_ACTION"
     bigAction.title = "Big Gulp"
@@ -63,8 +70,8 @@ class NotificationHelper {
 
     let gulpCategory = UIMutableUserNotificationCategory()
     gulpCategory.identifier = "GULP_CATEGORY"
-    gulpCategory.setActions([smallAction, bigAction], for: .default)
-    gulpCategory.setActions([smallAction, bigAction], for: .minimal)
+    gulpCategory.setActions([smallAction,mediumAction, bigAction], for: .default)
+    gulpCategory.setActions([smallAction, mediumAction, bigAction], for: .minimal)
 
     let categories = NSSet(object: gulpCategory) as! Set<UIUserNotificationCategory>
     let settings = UIUserNotificationSettings(types: [.alert, .sound], categories: categories)
@@ -79,6 +86,9 @@ class NotificationHelper {
       if (identifier == "SMALL_ACTION") {
         NotificationHelper.addGulp(Constants.Gulp.small.key())
       }
+      if (identifier == "MEDIUM_ACTION"){
+        NotificationHelper.addGulp(Constants.Gulp.medium.key())
+      }
     }
   }
 
diff --git a/Gulps/Support/RLMSupport.swift b/Gulps/Support/RLMSupport.swift
old mode 100644
new mode 100755
diff --git a/Gulps/Support/Settings.swift b/Gulps/Support/Settings.swift
old mode 100644
new mode 100755
index 74f327b..1b48f7f
--- a/Gulps/Support/Settings.swift
+++ b/Gulps/Support/Settings.swift
@@ -9,6 +9,7 @@ open class Settings {
       userDefaults.set(true, forKey: "DEFAULTS_INSTALLED")
       userDefaults.set(Constants.UnitsOfMeasure.liters.rawValue, forKey: Constants.General.unitOfMeasure.key())
       userDefaults.set(0.5, forKey: Constants.Gulp.big.key())
+      userDefaults.set(0.3, forKey: Constants.Gulp.medium.key())
       userDefaults.set(0.2, forKey: Constants.Gulp.small.key())
       userDefaults.set(2, forKey: Constants.Gulp.goal.key())
       userDefaults.set(false, forKey: Constants.Health.on.key())
@@ -23,6 +24,7 @@ open class Settings {
   open class func registerDefaultsForLiter() {
     let userDefaults = UserDefaults.groupUserDefaults()
     userDefaults.set(0.5, forKey: Constants.Gulp.big.key())
+    userDefaults.set(0.3, forKey: Constants.Gulp.medium.key())
     userDefaults.set(0.2, forKey: Constants.Gulp.small.key())
     userDefaults.set(2, forKey: Constants.Gulp.goal.key())
     userDefaults.synchronize()
@@ -31,6 +33,7 @@ open class Settings {
   open class func registerDefaultsForOunces() {
     let userDefaults = UserDefaults.groupUserDefaults()
     userDefaults.set(16, forKey: Constants.Gulp.big.key())
+    userDefaults.set(12, forKey: Constants.Gulp.medium.key())
     userDefaults.set(8, forKey: Constants.Gulp.small.key())
     userDefaults.set(64, forKey: Constants.Gulp.goal.key())
     userDefaults.synchronize()
@@ -42,6 +45,7 @@ open class Settings {
       Constants.Gulp.goal.key(): userDefaults.double(forKey: Constants.Gulp.goal.key()),
       Constants.WatchContext.current.key(): current,
       Constants.Gulp.small.key(): userDefaults.double(forKey: Constants.Gulp.small.key()),
+      Constants.Gulp.medium.key(): userDefaults.double(forKey: Constants.Gulp.medium.key()),
       Constants.Gulp.big.key(): userDefaults.double(forKey: Constants.Gulp.big.key())]
   }
 }
diff --git a/Gulps/Support/UINavigationController-StatusBar.swift b/Gulps/Support/UINavigationController-StatusBar.swift
old mode 100644
new mode 100755
diff --git a/Gulps/Support/WatchConnectivityHelper.swift b/Gulps/Support/WatchConnectivityHelper.swift
old mode 100644
new mode 100755
diff --git a/Gulps/ViewControllers/CalendarViewController.swift b/Gulps/ViewControllers/CalendarViewController.swift
old mode 100644
new mode 100755
index 3392b71..a377177
--- a/Gulps/ViewControllers/CalendarViewController.swift
+++ b/Gulps/ViewControllers/CalendarViewController.swift
@@ -28,6 +28,9 @@ class CalendarViewController: UIViewController {
     actionSheet?.addButton(withTitle: NSLocalizedString("gulp.small", comment: ""), type: .default) { _ in
       self.addExtraGulp(ofSize: .small)
     }
+    actionSheet?.addButton(withTitle: NSLocalizedString("gulp.medium", comment: ""), type: .default) { _ in
+      self.addExtraGulp(ofSize: .medium)
+    }
     actionSheet?.addButton(withTitle: NSLocalizedString("gulp.big", comment: ""), type: .default) { _ in
       self.addExtraGulp(ofSize: .big)
     }
diff --git a/Gulps/ViewControllers/DrinkViewController.swift b/Gulps/ViewControllers/DrinkViewController.swift
old mode 100644
new mode 100755
index ac01ff8..bc55092
--- a/Gulps/ViewControllers/DrinkViewController.swift
+++ b/Gulps/ViewControllers/DrinkViewController.swift
@@ -11,6 +11,7 @@ open class DrinkViewController: UIViewController, UIAlertViewDelegate, UIViewCon
   @IBOutlet open weak var addButton: UIButton!
   @IBOutlet open weak var smallButton: UIButton!
   @IBOutlet open weak var largeButton: UIButton!
+  @IBOutlet open weak var mediumButton: UIButton!
   @IBOutlet open weak var minusButton: UIButton!
   @IBOutlet weak var starButton: UIButton!
   @IBOutlet weak var meterContainerView: UIView!
@@ -140,8 +141,20 @@ open class DrinkViewController: UIViewController, UIAlertViewDelegate, UIViewCon
                                  popTipText: NSLocalizedString("undo poptip", comment: ""),
                                  inView: view,
                                  fromFrame: minusButton.frame)
+    
+    
+    if sender == smallButton{
+      updateCurrentEntry(userDefaults.double(forKey: Constants.Gulp.small.key()))
+    } else if sender == mediumButton{
+      updateCurrentEntry(userDefaults.double(forKey: Constants.Gulp.medium.key()))
+    } else if sender == largeButton{
+      updateCurrentEntry(userDefaults.double(forKey: Constants.Gulp.big.key()))
+    }
+    
+    /*
     let portion = smallButton == sender ? Constants.Gulp.small.key() : Constants.Gulp.big.key()
     updateCurrentEntry(userDefaults.double(forKey: portion))
+     */
   }
 
   @IBAction func removeGulpAction() {
diff --git a/Gulps/ViewControllers/FeedbackViewController.swift b/Gulps/ViewControllers/FeedbackViewController.swift
old mode 100644
new mode 100755
diff --git a/Gulps/ViewControllers/Onboarding/GoalViewController.swift b/Gulps/ViewControllers/Onboarding/GoalViewController.swift
old mode 100644
new mode 100755
diff --git a/Gulps/ViewControllers/Onboarding/GulpsViewController.swift b/Gulps/ViewControllers/Onboarding/GulpsViewController.swift
old mode 100644
new mode 100755
index f769d5e..807b176
--- a/Gulps/ViewControllers/Onboarding/GulpsViewController.swift
+++ b/Gulps/ViewControllers/Onboarding/GulpsViewController.swift
@@ -1,25 +1,35 @@
 import UIKit
 import pop
 
+// TO-DO: Fix timing of medium gulp onboarding
+
 class GulpsViewController: OnboardingViewController, UITextFieldDelegate {
 
   @IBOutlet weak var smallGulpText: UITextField!
   @IBOutlet weak var bigGulpText: UITextField!
   @IBOutlet weak var smallSuffixLabel: UILabel!
   @IBOutlet weak var bigSuffixLabel: UILabel!
+  @IBOutlet weak var mediumSuffixLabel: UILabel!
+  @IBOutlet weak var mediumGulpText: UITextField!
   @IBOutlet weak var headerLabel: UILabel!
   @IBOutlet weak var smallBackgroundView: UIView!
   @IBOutlet weak var bigBackgroundView: UIView!
-
+  @IBOutlet weak var mediumBackgroundView: UIView!
+    
+    
   let userDefaults = UserDefaults.groupUserDefaults()
 
   override func viewDidLoad() {
     super.viewDidLoad()
 
     self.smallGulpText.inputAccessoryView = Globals.numericToolbar(self, selector: #selector(GulpsViewController.dismissAndSave))
+    
+    self.mediumGulpText.inputAccessoryView = Globals.numericToolbar(self, selector: #selector(GulpsViewController.dismissAndSave))
+    
     self.bigGulpText.inputAccessoryView = Globals.numericToolbar(self, selector: #selector(GulpsViewController.dismissAndSave))
 
     self.smallBackgroundView.addGestureRecognizer(UITapGestureRecognizer(target: self.smallGulpText, action: #selector(UIResponder.becomeFirstResponder)))
+    self.mediumBackgroundView.addGestureRecognizer(UITapGestureRecognizer(target: self.mediumGulpText, action: #selector(UIResponder.becomeFirstResponder)))
     self.bigBackgroundView.addGestureRecognizer(UITapGestureRecognizer(target: self.bigGulpText, action: #selector(UIResponder.becomeFirstResponder)))
 
     NotificationCenter.default.addObserver(self, selector: #selector(GulpsViewController.keyboardWillShow(_:)), name: NSNotification.Name.UIKeyboardWillShow, object: nil)
@@ -30,19 +40,25 @@ class GulpsViewController: OnboardingViewController, UITextFieldDelegate {
     let numberFormatter = NumberFormatter()
     numberFormatter.numberStyle = .decimal
 
-    _ = [self.smallGulpText, self.bigGulpText].map({$0.resignFirstResponder()})
+    _ = [self.smallGulpText, self.mediumGulpText, self.bigGulpText].map({$0.resignFirstResponder()})
 
     var small = 0.0
+    var medium = 0.0
     var big = 0.0
     if let number = numberFormatter.number(from: self.smallGulpText.text ?? "0") {
       small = number.doubleValue
     }
+    
+    if let number = numberFormatter.number(from: self.mediumGulpText.text ?? "0") {
+      medium = number.doubleValue
+    }
 
     if let number = numberFormatter.number(from: self.bigGulpText.text ?? "0") {
       big = number.doubleValue
     }
 
     self.userDefaults.set(small, forKey: Constants.Gulp.small.key())
+    self.userDefaults.set(medium, forKey: Constants.Gulp.medium.key())
     self.userDefaults.set(big, forKey: Constants.Gulp.big.key())
     self.userDefaults.synchronize()
   }
@@ -59,17 +75,19 @@ class GulpsViewController: OnboardingViewController, UITextFieldDelegate {
     let numberFormatter = NumberFormatter()
     numberFormatter.numberStyle = .decimal
     self.smallGulpText.text = numberFormatter.string(for: self.userDefaults.double(forKey: Constants.Gulp.small.key()))
+    self.mediumGulpText.text = numberFormatter.string(for: self.userDefaults.double(forKey: Constants.Gulp.medium.key()))
     self.bigGulpText.text = numberFormatter.string(for: self.userDefaults.double(forKey: Constants.Gulp.big.key()))
     let unit = Constants.UnitsOfMeasure(rawValue: self.userDefaults.integer(forKey: Constants.General.unitOfMeasure.key()))
 
     if let unit = unit {
       self.smallSuffixLabel.text = unit.suffixForUnitOfMeasure()
+      self.mediumSuffixLabel.text = unit.suffixForUnitOfMeasure()
       self.bigSuffixLabel.text = unit.suffixForUnitOfMeasure()
     }
   }
 
   override func touchesEnded(_ touches: Set<UITouch>, with event: UIEvent?) {
-    _ = [self.smallGulpText, self.bigGulpText].map({$0.resignFirstResponder()})
+    _ = [self.smallGulpText, self.mediumGulpText, self.bigGulpText].map({$0.resignFirstResponder()})
   }
 
   @objc func keyboardWillShow(_ notification: Notification) {
diff --git a/Gulps/ViewControllers/Onboarding/MeasureViewController.swift b/Gulps/ViewControllers/Onboarding/MeasureViewController.swift
old mode 100644
new mode 100755
diff --git a/Gulps/ViewControllers/Onboarding/NotificationViewController.swift b/Gulps/ViewControllers/Onboarding/NotificationViewController.swift
old mode 100644
new mode 100755
diff --git a/Gulps/ViewControllers/Onboarding/OnboardingViewController.swift b/Gulps/ViewControllers/Onboarding/OnboardingViewController.swift
old mode 100644
new mode 100755
diff --git a/Gulps/ViewControllers/SettingsViewController.swift b/Gulps/ViewControllers/SettingsViewController.swift
old mode 100644
new mode 100755
index 5ca1484..5d76e11
--- a/Gulps/ViewControllers/SettingsViewController.swift
+++ b/Gulps/ViewControllers/SettingsViewController.swift
@@ -6,6 +6,7 @@ class SettingsViewController: UITableViewController, UIAlertViewDelegate, UIText
 
   @IBOutlet weak var unitOfMesureLabel: UILabel!
   @IBOutlet weak var smallPortionText: UITextField!
+  @IBOutlet weak var mediumPortionText: UITextField!
   @IBOutlet weak var largePortionText: UITextField!
   @IBOutlet weak var dailyGoalText: UITextField!
   @IBOutlet weak var notificationSwitch: UISwitch!
@@ -54,6 +55,7 @@ class SettingsViewController: UITableViewController, UIAlertViewDelegate, UIText
 
     _ = uomLabels.map({$0.text = suffix})
     largePortionText.text = numberFormatter.string(for: userDefaults.double(forKey: Constants.Gulp.big.key()))
+    mediumPortionText.text = numberFormatter.string(for: userDefaults.double(forKey: Constants.Gulp.medium.key()))
     smallPortionText.text = numberFormatter.string(for: userDefaults.double(forKey: Constants.Gulp.small.key()))
     dailyGoalText.text = numberFormatter.string(for: userDefaults.double(forKey: Constants.Gulp.goal.key()))
 
@@ -154,7 +156,7 @@ class SettingsViewController: UITableViewController, UIAlertViewDelegate, UIText
     if (section == 0) {
       return 1
     } else if (section == 1) {
-      return 3
+      return 4
     } else if (section == 2) {
       if UserDefaults.groupUserDefaults().bool(forKey: Constants.Notification.on.key()) {
         return 4
@@ -173,6 +175,9 @@ class SettingsViewController: UITableViewController, UIAlertViewDelegate, UIText
     if (textField == largePortionText) {
       storeText(largePortionText, toKey: Constants.Gulp.big.key())
     }
+    if (textField == mediumPortionText) {
+      storeText(mediumPortionText, toKey: Constants.Gulp.medium.key())
+    }
     if (textField == dailyGoalText) {
       storeText(dailyGoalText, toKey: Constants.Gulp.goal.key())
     }
diff --git a/Gulps/ViewControllers/Support/CalendarViewController+Animations.swift b/Gulps/ViewControllers/Support/CalendarViewController+Animations.swift
old mode 100644
new mode 100755
diff --git a/Gulps/ViewControllers/Support/DrinkViewController+Animations.swift b/Gulps/ViewControllers/Support/DrinkViewController+Animations.swift
old mode 100644
new mode 100755
index 1957143..559eebf
--- a/Gulps/ViewControllers/Support/DrinkViewController+Animations.swift
+++ b/Gulps/ViewControllers/Support/DrinkViewController+Animations.swift
@@ -4,6 +4,7 @@ extension DrinkViewController {
 
   func initAnimation() {
     smallButton.alpha = 0
+    mediumButton.alpha = 0
     largeButton.alpha = 0
     starButton.transform = CGAffineTransform(scaleX: 0.0001, y: 0.0001)
   }
@@ -30,7 +31,7 @@ extension DrinkViewController {
     starButton.pop_add(scale, forKey: "scale")
     starButton.layer.pop_add(rotate, forKey: "rotate")
   }
-
+  
   func expandAddButton() {
     addButton.isUserInteractionEnabled = false
 
@@ -41,7 +42,7 @@ extension DrinkViewController {
     rotate?.removedOnCompletion = true
     rotate?.completionBlock = { (_, _) in
       self.addButton.isUserInteractionEnabled = true
-      _ = [self.smallButton, self.largeButton].map({$0.isUserInteractionEnabled = true})
+      _ = [self.smallButton,self.mediumButton, self.largeButton].map({$0.isUserInteractionEnabled = true})
       self.expanded = true
     }
 
@@ -67,8 +68,8 @@ extension DrinkViewController {
     addButton.pop_add(color, forKey: "color")
     minusButton.pop_add(scaleMinus, forKey: "scaleMinus")
 
-    [smallButton, largeButton].forEach {$0.alpha = 1}
-    for button in [smallButton, largeButton] {
+    [smallButton,mediumButton, largeButton].forEach {$0.alpha = 1}
+    for button in [smallButton,mediumButton, largeButton] {
       let pop = POPSpringAnimation(propertyNamed: kPOPViewScaleXY)
       pop?.fromValue = NSValue(cgPoint: CGPoint(x: 0.1, y: 0.1))
       pop?.toValue = NSValue(cgPoint: CGPoint(x: 1, y: 1))
@@ -88,10 +89,18 @@ extension DrinkViewController {
     right?.fromValue = 0
     right?.toValue = 100
     largeButton.layer.pop_add(right, forKey: "right")
+    
+    let up = POPSpringAnimation(propertyNamed:
+        kPOPLayerTranslationY)
+    up?.springBounciness = 5
+    up?.fromValue = 0
+    up?.toValue = -100
+    mediumButton.layer.pop_add(up, forKey: "up")
+    
   }
 
   func contractAddButton() {
-    [smallButton, largeButton].forEach {$0.isUserInteractionEnabled = false}
+    [smallButton, mediumButton, largeButton].forEach {$0?.isUserInteractionEnabled = false}
     addButton.isUserInteractionEnabled = false
 
     let rotate = POPSpringAnimation(propertyNamed: kPOPLayerRotation)
@@ -124,7 +133,7 @@ extension DrinkViewController {
     addButton.pop_add(color, forKey: "color")
     minusButton.pop_add(scaleMinus, forKey: "scaleMinus")
 
-    for button in [smallButton, largeButton] {
+    for button in [smallButton, mediumButton, largeButton] {
       let pop = POPSpringAnimation(propertyNamed: kPOPViewScaleXY)
       pop?.fromValue = NSValue(cgPoint: CGPoint(x: 1, y: 1))
       pop?.toValue = NSValue(cgPoint: CGPoint(x: 0.1, y: 0.1))
@@ -144,5 +153,14 @@ extension DrinkViewController {
     right?.fromValue = 100
     right?.toValue = 0
     largeButton.layer.pop_add(right, forKey: "right")
+    
+    let up = POPBasicAnimation(propertyNamed:
+        kPOPLayerTranslationY)
+    up?.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseOut)
+    up?.fromValue = -100
+    up?.toValue = 0
+    mediumButton.layer.pop_add(up, forKey:
+        "up")
+    
   }
 }
diff --git a/Gulps/it.lproj/InfoPlist.strings b/Gulps/it.lproj/InfoPlist.strings
old mode 100644
new mode 100755
diff --git a/Gulps/it.lproj/Main.strings b/Gulps/it.lproj/Main.strings
old mode 100644
new mode 100755
diff --git a/Gulps/it.lproj/Onboarding.strings b/Gulps/it.lproj/Onboarding.strings
old mode 100644
new mode 100755
diff --git a/Gulps/ru.lproj/InfoPlist.strings b/Gulps/ru.lproj/InfoPlist.strings
old mode 100644
new mode 100755
diff --git a/Gulps/ru.lproj/LaunchScreen.strings b/Gulps/ru.lproj/LaunchScreen.strings
old mode 100644
new mode 100755
diff --git a/Gulps/ru.lproj/Main.strings b/Gulps/ru.lproj/Main.strings
old mode 100644
new mode 100755
diff --git a/Gulps/ru.lproj/Onboarding.strings b/Gulps/ru.lproj/Onboarding.strings
old mode 100644
new mode 100755
diff --git a/Gulps/tr.lproj/InfoPlist.strings b/Gulps/tr.lproj/InfoPlist.strings
old mode 100644
new mode 100755
diff --git a/Gulps/tr.lproj/LaunchScreen.strings b/Gulps/tr.lproj/LaunchScreen.strings
old mode 100644
new mode 100755
diff --git a/Gulps/tr.lproj/Main.strings b/Gulps/tr.lproj/Main.strings
old mode 100644
new mode 100755
diff --git a/Gulps/tr.lproj/Onboarding.strings b/Gulps/tr.lproj/Onboarding.strings
old mode 100644
new mode 100755

From f2033f6125f686ea8a306e81a746891c844d8f71 Mon Sep 17 00:00:00 2001
From: Craig Scott <craigscott@Craigs-MacBook-Air.local>
Date: Thu, 13 Sep 2018 17:01:24 -0700
Subject: [PATCH 2/3] Revert "Medium Button Added"

This reverts commit c4b6bc7918fbb949c57549b3a1210f4da0396f13.
---
 Gulps.xcodeproj/project.pbxproj               |  20 +-
 .../contents.xcworkspacedata                  |   7 -
 Gulps/AppDelegate.swift                       |   3 -
 Gulps/Base.lproj/InfoPlist.strings            |   0
 Gulps/Base.lproj/LaunchScreen.xib             |   0
 Gulps/Base.lproj/Main.storyboard              |  84 +----
 Gulps/Base.lproj/Onboarding.storyboard        | 299 +++++++-----------
 Gulps/Gulps.entitlements                      |   0
 .../AppIcon.appiconset/Contents.json          |   0
 .../AppIcon.appiconset/Icon Copy-40.png       | Bin
 .../AppIcon.appiconset/Icon Copy-60.png       | Bin
 .../AppIcon.appiconset/Icon-120-1.png         | Bin
 .../AppIcon.appiconset/Icon-120.png           | Bin
 .../AppIcon.appiconset/Icon-180.png           | Bin
 .../AppIcon.appiconset/Icon-58.png            | Bin
 .../AppIcon.appiconset/Icon-80.png            | Bin
 .../AppIcon.appiconset/Icon-87.png            | Bin
 .../AppIcon.appiconset/Icon.png               | Bin
 Gulps/Images.xcassets/Contents.json           |   0
 .../big-tiny-icon.imageset/Contents.json      |   0
 .../big-tiny-icon.imageset/big-tiny-icon.pdf  | Bin
 .../blue-check-icon.imageset/Contents.json    |   0
 .../blue-check-icon.pdf                       | Bin
 .../calendar-icon.imageset/Contents.json      |   0
 .../calendar-icon.imageset/calendar-icon.pdf  | Bin
 .../check-icon.imageset/Contents.json         |   0
 .../check-icon.imageset/check-icon.pdf        | Bin
 .../drink-icon.imageset/Contents.json         |   0
 .../drink-icon.imageset/drink-icon.pdf        | Bin
 .../drop-bg.imageset/Contents.json            |   0
 .../drop-bg.imageset/drop-bg.pdf              | Bin
 .../drop.imageset/Contents.json               |   0
 Gulps/Images.xcassets/drop.imageset/drop.pdf  | Bin
 .../large-icon.imageset/Contents.json         |   0
 .../large-icon.imageset/large-icon.pdf        | Bin
 .../medium-icon.imageset/Contents.json        |  12 -
 .../medium-tiny-icon.imageset/Contents.json   |  12 -
 .../minus-icon.imageset/Contents.json         |   0
 .../minus-icon.imageset/minus-icon.pdf        | Bin
 .../next-icon.imageset/Contents.json          |   0
 .../next-icon.imageset/next-icon.pdf          | Bin
 .../plus-icon.imageset/Contents.json          |   0
 .../plus-icon.imageset/plus-icon.pdf          | Bin
 .../prev-icon.imageset/Contents.json          |   0
 .../prev-icon.imageset/prev-icon.pdf          | Bin
 .../sad.imageset/Contents.json                |   0
 Gulps/Images.xcassets/sad.imageset/sad.pdf    | Bin
 .../settings-icon.imageset/Contents.json      |   0
 .../settings-icon.imageset/settings-icon.pdf  | Bin
 .../small-icon.imageset/Contents.json         |  11 +-
 .../small-icon.imageset/small-icon copy.png   | Bin 4378 -> 0 bytes
 .../small-icon.pdf                            | Bin
 .../small-tiny-icon.imageset/Contents.json    |  11 +-
 .../small-tiny-icon.pdf                       | Bin
 .../small-tiny-icon.png                       | Bin 4532 -> 0 bytes
 .../smile.imageset/Contents.json              |   0
 .../Images.xcassets/smile.imageset/smile.pdf  | Bin
 .../star.imageset/Contents.json               |   0
 Gulps/Images.xcassets/star.imageset/star.pdf  | Bin
 .../stats-icon.imageset/Contents.json         |   0
 .../stats-icon.imageset/stats-icon.pdf        | Bin
 .../tiny-add.imageset/Contents.json           |   0
 .../tiny-add.imageset/tiny-add.pdf            | Bin
 .../tiny-check.imageset/Contents.json         |   0
 .../tiny-check.imageset/tiny-check.pdf        | Bin
 .../tiny-x.imageset/Contents.json             |   0
 .../tiny-x.imageset/tiny-x.pdf                | Bin
 Gulps/Info.plist                              |   0
 Gulps/Model/Entry.swift                       |   0
 Gulps/Model/EntryHandler.swift                |   0
 Gulps/Model/Gulp.swift                        |   0
 Gulps/Resources/Fonts/KaushanScript.ttf       | Bin
 Gulps/Resources/Fonts/Lato-Light.ttf          | Bin
 Gulps/Resources/drop.caf                      | Bin
 Gulps/Resources/en.lproj/Localizable.strings  |   2 -
 Gulps/Resources/it.lproj/Localizable.strings  |   1 -
 Gulps/Resources/ru.lproj/Localizable.strings  |   0
 Gulps/Resources/tr.lproj/Localizable.strings  |   0
 Gulps/Support/AnimatedShareButton.swift       |   0
 Gulps/Support/Colors.swift                    |   0
 Gulps/Support/Constants.swift                 |   4 +-
 Gulps/Support/Extensions.swift                |   0
 Gulps/Support/Globals.swift                   |   0
 ...KitHelper.swift => HealthKitHealper.swift} |   0
 Gulps/Support/NotificationHelper.swift        |  16 +-
 Gulps/Support/RLMSupport.swift                |   0
 Gulps/Support/Settings.swift                  |   4 -
 .../UINavigationController-StatusBar.swift    |   0
 Gulps/Support/WatchConnectivityHelper.swift   |   0
 .../CalendarViewController.swift              |   3 -
 .../ViewControllers/DrinkViewController.swift |  13 -
 .../FeedbackViewController.swift              |   0
 .../Onboarding/GoalViewController.swift       |   0
 .../Onboarding/GulpsViewController.swift      |  24 +-
 .../Onboarding/MeasureViewController.swift    |   0
 .../NotificationViewController.swift          |   0
 .../Onboarding/OnboardingViewController.swift |   0
 .../SettingsViewController.swift              |   7 +-
 .../CalendarViewController+Animations.swift   |   0
 .../DrinkViewController+Animations.swift      |  30 +-
 Gulps/it.lproj/InfoPlist.strings              |   0
 Gulps/it.lproj/Main.strings                   |   0
 Gulps/it.lproj/Onboarding.strings             |   0
 Gulps/ru.lproj/InfoPlist.strings              |   0
 Gulps/ru.lproj/LaunchScreen.strings           |   0
 Gulps/ru.lproj/Main.strings                   |   0
 Gulps/ru.lproj/Onboarding.strings             |   0
 Gulps/tr.lproj/InfoPlist.strings              |   0
 Gulps/tr.lproj/LaunchScreen.strings           |   0
 Gulps/tr.lproj/Main.strings                   |   0
 Gulps/tr.lproj/Onboarding.strings             |   0
 111 files changed, 152 insertions(+), 411 deletions(-)
 delete mode 100644 Gulps.xcodeproj/project.xcworkspace/contents.xcworkspacedata
 mode change 100755 => 100644 Gulps/AppDelegate.swift
 mode change 100755 => 100644 Gulps/Base.lproj/InfoPlist.strings
 mode change 100755 => 100644 Gulps/Base.lproj/LaunchScreen.xib
 mode change 100755 => 100644 Gulps/Base.lproj/Main.storyboard
 mode change 100755 => 100644 Gulps/Base.lproj/Onboarding.storyboard
 mode change 100755 => 100644 Gulps/Gulps.entitlements
 mode change 100755 => 100644 Gulps/Images.xcassets/AppIcon.appiconset/Contents.json
 mode change 100755 => 100644 Gulps/Images.xcassets/AppIcon.appiconset/Icon Copy-40.png
 mode change 100755 => 100644 Gulps/Images.xcassets/AppIcon.appiconset/Icon Copy-60.png
 mode change 100755 => 100644 Gulps/Images.xcassets/AppIcon.appiconset/Icon-120-1.png
 mode change 100755 => 100644 Gulps/Images.xcassets/AppIcon.appiconset/Icon-120.png
 mode change 100755 => 100644 Gulps/Images.xcassets/AppIcon.appiconset/Icon-180.png
 mode change 100755 => 100644 Gulps/Images.xcassets/AppIcon.appiconset/Icon-58.png
 mode change 100755 => 100644 Gulps/Images.xcassets/AppIcon.appiconset/Icon-80.png
 mode change 100755 => 100644 Gulps/Images.xcassets/AppIcon.appiconset/Icon-87.png
 mode change 100755 => 100644 Gulps/Images.xcassets/AppIcon.appiconset/Icon.png
 mode change 100755 => 100644 Gulps/Images.xcassets/Contents.json
 mode change 100755 => 100644 Gulps/Images.xcassets/big-tiny-icon.imageset/Contents.json
 mode change 100755 => 100644 Gulps/Images.xcassets/big-tiny-icon.imageset/big-tiny-icon.pdf
 mode change 100755 => 100644 Gulps/Images.xcassets/blue-check-icon.imageset/Contents.json
 mode change 100755 => 100644 Gulps/Images.xcassets/blue-check-icon.imageset/blue-check-icon.pdf
 mode change 100755 => 100644 Gulps/Images.xcassets/calendar-icon.imageset/Contents.json
 mode change 100755 => 100644 Gulps/Images.xcassets/calendar-icon.imageset/calendar-icon.pdf
 mode change 100755 => 100644 Gulps/Images.xcassets/check-icon.imageset/Contents.json
 mode change 100755 => 100644 Gulps/Images.xcassets/check-icon.imageset/check-icon.pdf
 mode change 100755 => 100644 Gulps/Images.xcassets/drink-icon.imageset/Contents.json
 mode change 100755 => 100644 Gulps/Images.xcassets/drink-icon.imageset/drink-icon.pdf
 mode change 100755 => 100644 Gulps/Images.xcassets/drop-bg.imageset/Contents.json
 mode change 100755 => 100644 Gulps/Images.xcassets/drop-bg.imageset/drop-bg.pdf
 mode change 100755 => 100644 Gulps/Images.xcassets/drop.imageset/Contents.json
 mode change 100755 => 100644 Gulps/Images.xcassets/drop.imageset/drop.pdf
 mode change 100755 => 100644 Gulps/Images.xcassets/large-icon.imageset/Contents.json
 mode change 100755 => 100644 Gulps/Images.xcassets/large-icon.imageset/large-icon.pdf
 delete mode 100755 Gulps/Images.xcassets/medium-icon.imageset/Contents.json
 delete mode 100755 Gulps/Images.xcassets/medium-tiny-icon.imageset/Contents.json
 mode change 100755 => 100644 Gulps/Images.xcassets/minus-icon.imageset/Contents.json
 mode change 100755 => 100644 Gulps/Images.xcassets/minus-icon.imageset/minus-icon.pdf
 mode change 100755 => 100644 Gulps/Images.xcassets/next-icon.imageset/Contents.json
 mode change 100755 => 100644 Gulps/Images.xcassets/next-icon.imageset/next-icon.pdf
 mode change 100755 => 100644 Gulps/Images.xcassets/plus-icon.imageset/Contents.json
 mode change 100755 => 100644 Gulps/Images.xcassets/plus-icon.imageset/plus-icon.pdf
 mode change 100755 => 100644 Gulps/Images.xcassets/prev-icon.imageset/Contents.json
 mode change 100755 => 100644 Gulps/Images.xcassets/prev-icon.imageset/prev-icon.pdf
 mode change 100755 => 100644 Gulps/Images.xcassets/sad.imageset/Contents.json
 mode change 100755 => 100644 Gulps/Images.xcassets/sad.imageset/sad.pdf
 mode change 100755 => 100644 Gulps/Images.xcassets/settings-icon.imageset/Contents.json
 mode change 100755 => 100644 Gulps/Images.xcassets/settings-icon.imageset/settings-icon.pdf
 mode change 100755 => 100644 Gulps/Images.xcassets/small-icon.imageset/Contents.json
 delete mode 100755 Gulps/Images.xcassets/small-icon.imageset/small-icon copy.png
 rename Gulps/Images.xcassets/{medium-icon.imageset => small-icon.imageset}/small-icon.pdf (100%)
 mode change 100755 => 100644
 mode change 100755 => 100644 Gulps/Images.xcassets/small-tiny-icon.imageset/Contents.json
 rename Gulps/Images.xcassets/{medium-tiny-icon.imageset => small-tiny-icon.imageset}/small-tiny-icon.pdf (100%)
 mode change 100755 => 100644
 delete mode 100755 Gulps/Images.xcassets/small-tiny-icon.imageset/small-tiny-icon.png
 mode change 100755 => 100644 Gulps/Images.xcassets/smile.imageset/Contents.json
 mode change 100755 => 100644 Gulps/Images.xcassets/smile.imageset/smile.pdf
 mode change 100755 => 100644 Gulps/Images.xcassets/star.imageset/Contents.json
 mode change 100755 => 100644 Gulps/Images.xcassets/star.imageset/star.pdf
 mode change 100755 => 100644 Gulps/Images.xcassets/stats-icon.imageset/Contents.json
 mode change 100755 => 100644 Gulps/Images.xcassets/stats-icon.imageset/stats-icon.pdf
 mode change 100755 => 100644 Gulps/Images.xcassets/tiny-add.imageset/Contents.json
 mode change 100755 => 100644 Gulps/Images.xcassets/tiny-add.imageset/tiny-add.pdf
 mode change 100755 => 100644 Gulps/Images.xcassets/tiny-check.imageset/Contents.json
 mode change 100755 => 100644 Gulps/Images.xcassets/tiny-check.imageset/tiny-check.pdf
 mode change 100755 => 100644 Gulps/Images.xcassets/tiny-x.imageset/Contents.json
 mode change 100755 => 100644 Gulps/Images.xcassets/tiny-x.imageset/tiny-x.pdf
 mode change 100755 => 100644 Gulps/Info.plist
 mode change 100755 => 100644 Gulps/Model/Entry.swift
 mode change 100755 => 100644 Gulps/Model/EntryHandler.swift
 mode change 100755 => 100644 Gulps/Model/Gulp.swift
 mode change 100755 => 100644 Gulps/Resources/Fonts/KaushanScript.ttf
 mode change 100755 => 100644 Gulps/Resources/Fonts/Lato-Light.ttf
 mode change 100755 => 100644 Gulps/Resources/drop.caf
 mode change 100755 => 100644 Gulps/Resources/en.lproj/Localizable.strings
 mode change 100755 => 100644 Gulps/Resources/it.lproj/Localizable.strings
 mode change 100755 => 100644 Gulps/Resources/ru.lproj/Localizable.strings
 mode change 100755 => 100644 Gulps/Resources/tr.lproj/Localizable.strings
 mode change 100755 => 100644 Gulps/Support/AnimatedShareButton.swift
 mode change 100755 => 100644 Gulps/Support/Colors.swift
 mode change 100755 => 100644 Gulps/Support/Constants.swift
 mode change 100755 => 100644 Gulps/Support/Extensions.swift
 mode change 100755 => 100644 Gulps/Support/Globals.swift
 rename Gulps/Support/{HealthKitHelper.swift => HealthKitHealper.swift} (100%)
 mode change 100755 => 100644
 mode change 100755 => 100644 Gulps/Support/NotificationHelper.swift
 mode change 100755 => 100644 Gulps/Support/RLMSupport.swift
 mode change 100755 => 100644 Gulps/Support/Settings.swift
 mode change 100755 => 100644 Gulps/Support/UINavigationController-StatusBar.swift
 mode change 100755 => 100644 Gulps/Support/WatchConnectivityHelper.swift
 mode change 100755 => 100644 Gulps/ViewControllers/CalendarViewController.swift
 mode change 100755 => 100644 Gulps/ViewControllers/DrinkViewController.swift
 mode change 100755 => 100644 Gulps/ViewControllers/FeedbackViewController.swift
 mode change 100755 => 100644 Gulps/ViewControllers/Onboarding/GoalViewController.swift
 mode change 100755 => 100644 Gulps/ViewControllers/Onboarding/GulpsViewController.swift
 mode change 100755 => 100644 Gulps/ViewControllers/Onboarding/MeasureViewController.swift
 mode change 100755 => 100644 Gulps/ViewControllers/Onboarding/NotificationViewController.swift
 mode change 100755 => 100644 Gulps/ViewControllers/Onboarding/OnboardingViewController.swift
 mode change 100755 => 100644 Gulps/ViewControllers/SettingsViewController.swift
 mode change 100755 => 100644 Gulps/ViewControllers/Support/CalendarViewController+Animations.swift
 mode change 100755 => 100644 Gulps/ViewControllers/Support/DrinkViewController+Animations.swift
 mode change 100755 => 100644 Gulps/it.lproj/InfoPlist.strings
 mode change 100755 => 100644 Gulps/it.lproj/Main.strings
 mode change 100755 => 100644 Gulps/it.lproj/Onboarding.strings
 mode change 100755 => 100644 Gulps/ru.lproj/InfoPlist.strings
 mode change 100755 => 100644 Gulps/ru.lproj/LaunchScreen.strings
 mode change 100755 => 100644 Gulps/ru.lproj/Main.strings
 mode change 100755 => 100644 Gulps/ru.lproj/Onboarding.strings
 mode change 100755 => 100644 Gulps/tr.lproj/InfoPlist.strings
 mode change 100755 => 100644 Gulps/tr.lproj/LaunchScreen.strings
 mode change 100755 => 100644 Gulps/tr.lproj/Main.strings
 mode change 100755 => 100644 Gulps/tr.lproj/Onboarding.strings

diff --git a/Gulps.xcodeproj/project.pbxproj b/Gulps.xcodeproj/project.pbxproj
index d4df8f9..96ae927 100644
--- a/Gulps.xcodeproj/project.pbxproj
+++ b/Gulps.xcodeproj/project.pbxproj
@@ -53,9 +53,9 @@
 		65A234FF1AF253D1002A35F3 /* TodayViewController+Animation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A234FE1AF253D1002A35F3 /* TodayViewController+Animation.swift */; };
 		65C6AA5C1BF4AD3200BB80CF /* WatchConnectivityHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65C6AA5B1BF4AD3200BB80CF /* WatchConnectivityHelper.swift */; };
 		65C92DA51BB1648C00E2DFE7 /* HealthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65C92DA41BB1648C00E2DFE7 /* HealthKit.framework */; };
-		65C92DA71BB164D100E2DFE7 /* HealthKitHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65C92DA61BB164D100E2DFE7 /* HealthKitHelper.swift */; };
-		65C92DA81BB184DB00E2DFE7 /* HealthKitHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65C92DA61BB164D100E2DFE7 /* HealthKitHelper.swift */; };
-		65C92DA91BB184DC00E2DFE7 /* HealthKitHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65C92DA61BB164D100E2DFE7 /* HealthKitHelper.swift */; };
+		65C92DA71BB164D100E2DFE7 /* HealthKitHealper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65C92DA61BB164D100E2DFE7 /* HealthKitHealper.swift */; };
+		65C92DA81BB184DB00E2DFE7 /* HealthKitHealper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65C92DA61BB164D100E2DFE7 /* HealthKitHealper.swift */; };
+		65C92DA91BB184DC00E2DFE7 /* HealthKitHealper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65C92DA61BB164D100E2DFE7 /* HealthKitHealper.swift */; };
 		65E94C6C1BBC13B400A65B30 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 65E94C6A1BBC13B400A65B30 /* InfoPlist.strings */; };
 		65E94C6E1BBC13BF00A65B30 /* Gulps.entitlements in Resources */ = {isa = PBXBuildFile; fileRef = 6537A8481AF24D2000EC16E9 /* Gulps.entitlements */; };
 		65F44C211AF24B440093A3E9 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65F44C201AF24B440093A3E9 /* AppDelegate.swift */; };
@@ -77,7 +77,6 @@
 		65F55F2F1B5942A4008653F2 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 65F55F211B592D91008653F2 /* Localizable.strings */; };
 		65F55F321B5F965F008653F2 /* drop.caf in Resources */ = {isa = PBXBuildFile; fileRef = 65F55F311B5D0A0E008653F2 /* drop.caf */; };
 		78102F005B62795FB0E7170D /* Pods_GulpsTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 58E28A47EF2AA14E880CD719 /* Pods_GulpsTests.framework */; };
-		E14849EE214AD23C00B2D9C2 /* RLMSupport.swift in Sources */ = {isa = PBXBuildFile; fileRef = E14849ED214AD23B00B2D9C2 /* RLMSupport.swift */; };
 		FBB8EFB826571DA94722706E /* Pods_GulpsToday.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8CCE464AA359610B577E6289 /* Pods_GulpsToday.framework */; };
 /* End PBXBuildFile section */
 
@@ -209,7 +208,7 @@
 		65A235021AF2543B002A35F3 /* Gulps WatchKit Extension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Gulps WatchKit Extension.entitlements"; sourceTree = "<group>"; };
 		65C6AA5B1BF4AD3200BB80CF /* WatchConnectivityHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WatchConnectivityHelper.swift; sourceTree = "<group>"; };
 		65C92DA41BB1648C00E2DFE7 /* HealthKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HealthKit.framework; path = System/Library/Frameworks/HealthKit.framework; sourceTree = SDKROOT; };
-		65C92DA61BB164D100E2DFE7 /* HealthKitHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HealthKitHelper.swift; sourceTree = "<group>"; };
+		65C92DA61BB164D100E2DFE7 /* HealthKitHealper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HealthKitHealper.swift; sourceTree = "<group>"; };
 		65E94C6B1BBC13B400A65B30 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		65E94C6D1BBC13BF00A65B30 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		65F44C1B1AF24B440093A3E9 /* Gulps.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Gulps.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -245,7 +244,6 @@
 		85BE9125F183E330586CDDB6 /* Pods-GulpsToday.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GulpsToday.release.xcconfig"; path = "Pods/Target Support Files/Pods-GulpsToday/Pods-GulpsToday.release.xcconfig"; sourceTree = "<group>"; };
 		8CCE464AA359610B577E6289 /* Pods_GulpsToday.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GulpsToday.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		9DF54771E89C4A5561E72D70 /* Pods-Gulps.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Gulps.release.xcconfig"; path = "Pods/Target Support Files/Pods-Gulps/Pods-Gulps.release.xcconfig"; sourceTree = "<group>"; };
-		E14849ED214AD23B00B2D9C2 /* RLMSupport.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RLMSupport.swift; sourceTree = "<group>"; };
 		F8B4C7511CC6AFD599BF0ECB /* Pods-GulpsTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GulpsTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-GulpsTests/Pods-GulpsTests.debug.xcconfig"; sourceTree = "<group>"; };
 		FF3158CC554F243E9F4ABEB9 /* Pods-GulpsToday.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GulpsToday.debug.xcconfig"; path = "Pods/Target Support Files/Pods-GulpsToday/Pods-GulpsToday.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -343,8 +341,7 @@
 				6537A81D1AF24CC800EC16E9 /* Settings.swift */,
 				650DCE641AF3CD4100E12764 /* Constants.swift */,
 				6555BB671B0CAE1700CE436A /* AnimatedShareButton.swift */,
-				65C92DA61BB164D100E2DFE7 /* HealthKitHelper.swift */,
-				E14849ED214AD23B00B2D9C2 /* RLMSupport.swift */,
+				65C92DA61BB164D100E2DFE7 /* HealthKitHealper.swift */,
 				65C6AA5B1BF4AD3200BB80CF /* WatchConnectivityHelper.swift */,
 				655BE8C71BF6558E003232A8 /* UINavigationController-StatusBar.swift */,
 			);
@@ -1008,12 +1005,11 @@
 				6537A82A1AF24CC800EC16E9 /* EntryHandler.swift in Sources */,
 				65F44C211AF24B440093A3E9 /* AppDelegate.swift in Sources */,
 				6537A83A1AF24CC800EC16E9 /* NotificationViewController.swift in Sources */,
-				65C92DA71BB164D100E2DFE7 /* HealthKitHelper.swift in Sources */,
+				65C92DA71BB164D100E2DFE7 /* HealthKitHealper.swift in Sources */,
 				650DCE651AF3CD4100E12764 /* Constants.swift in Sources */,
 				6537A8311AF24CC800EC16E9 /* Extensions.swift in Sources */,
 				6537A8361AF24CC800EC16E9 /* DrinkViewController.swift in Sources */,
 				6537A8301AF24CC800EC16E9 /* NotificationHelper.swift in Sources */,
-				E14849EE214AD23C00B2D9C2 /* RLMSupport.swift in Sources */,
 				65C6AA5C1BF4AD3200BB80CF /* WatchConnectivityHelper.swift in Sources */,
 				6555BB681B0CAE1700CE436A /* AnimatedShareButton.swift in Sources */,
 			);
@@ -1027,7 +1023,7 @@
 				65A234FF1AF253D1002A35F3 /* TodayViewController+Animation.swift in Sources */,
 				6537A8431AF24CFD00EC16E9 /* Entry.swift in Sources */,
 				6537A8441AF24CFF00EC16E9 /* EntryHandler.swift in Sources */,
-				65C92DA81BB184DB00E2DFE7 /* HealthKitHelper.swift in Sources */,
+				65C92DA81BB184DB00E2DFE7 /* HealthKitHealper.swift in Sources */,
 				6537A83E1AF24CE800EC16E9 /* Settings.swift in Sources */,
 				65F44C4C1AF24B780093A3E9 /* TodayViewController.swift in Sources */,
 				6537A8411AF24CEF00EC16E9 /* Extensions.swift in Sources */,
@@ -1044,7 +1040,7 @@
 				653039D71BE0CE5E00263D77 /* Colors.swift in Sources */,
 				65F44C621AF24B8A0093A3E9 /* NotificationController.swift in Sources */,
 				653039891BDF703200263D77 /* ExtensionDelegate.swift in Sources */,
-				65C92DA91BB184DC00E2DFE7 /* HealthKitHelper.swift in Sources */,
+				65C92DA91BB184DC00E2DFE7 /* HealthKitHealper.swift in Sources */,
 				65F44C601AF24B8A0093A3E9 /* InterfaceController.swift in Sources */,
 				6537A83F1AF24CE900EC16E9 /* Settings.swift in Sources */,
 				653039921BDFE5FC00263D77 /* ComplicationController.swift in Sources */,
diff --git a/Gulps.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Gulps.xcodeproj/project.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index 919434a..0000000
--- a/Gulps.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:">
-   </FileRef>
-</Workspace>
diff --git a/Gulps/AppDelegate.swift b/Gulps/AppDelegate.swift
old mode 100755
new mode 100644
index b197441..7f0a007
--- a/Gulps/AppDelegate.swift
+++ b/Gulps/AppDelegate.swift
@@ -100,7 +100,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, WCSessionDelegate {
 
   enum ShortcutType: String {
     case Big = "it.fancypixel.gulps.big"
-    case Medium = "it.fancypixel.gulps.medium"
     case Small = "it.fancypixel.gulps.small"
   }
 
@@ -113,8 +112,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, WCSessionDelegate {
     if let type = ShortcutType(rawValue: item.type) {
       if (type == .Small) {
         EntryHandler.sharedHandler.addGulp(UserDefaults.groupUserDefaults().double(forKey: Constants.Gulp.small.key()))
-      } else if (type == .Medium){
-        EntryHandler.sharedHandler.addGulp(UserDefaults.groupUserDefaults().double(forKey: Constants.Gulp.medium.key()))
       } else if (type == .Big) {
         EntryHandler.sharedHandler.addGulp(UserDefaults.groupUserDefaults().double(forKey: Constants.Gulp.big.key()))
       }
diff --git a/Gulps/Base.lproj/InfoPlist.strings b/Gulps/Base.lproj/InfoPlist.strings
old mode 100755
new mode 100644
diff --git a/Gulps/Base.lproj/LaunchScreen.xib b/Gulps/Base.lproj/LaunchScreen.xib
old mode 100755
new mode 100644
diff --git a/Gulps/Base.lproj/Main.storyboard b/Gulps/Base.lproj/Main.storyboard
old mode 100755
new mode 100644
index ad39047..49510e3
--- a/Gulps/Base.lproj/Main.storyboard
+++ b/Gulps/Base.lproj/Main.storyboard
@@ -94,25 +94,6 @@
                                     <action selector="selectionButtonAction:" destination="9pv-A4-QxB" eventType="touchUpInside" id="5Lu-Gy-RKQ"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bcX-tx-Vhr" userLabel="Medium Button">
-                                <rect key="frame" x="153" y="454" width="70" height="70"/>
-                                <color key="backgroundColor" red="0.21960784310000001" green="0.49019607840000001" blue="0.81176470590000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="70" id="O5W-Vq-zMW"/>
-                                    <constraint firstAttribute="height" constant="70" id="vKO-bn-vEO"/>
-                                </constraints>
-                                <state key="normal" image="medium-icon">
-                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                </state>
-                                <userDefinedRuntimeAttributes>
-                                    <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
-                                        <integer key="value" value="35"/>
-                                    </userDefinedRuntimeAttribute>
-                                </userDefinedRuntimeAttributes>
-                                <connections>
-                                    <action selector="selectionButtonAction:" destination="9pv-A4-QxB" eventType="touchUpInside" id="CLi-Bm-rGf"/>
-                                </connections>
-                            </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fW6-sm-t8g" userLabel="Add Button">
                                 <rect key="frame" x="153" y="454" width="70" height="70"/>
                                 <color key="backgroundColor" red="0.2196078431372549" green="0.49019607843137253" blue="0.81176470588235294" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -165,7 +146,6 @@
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="xap-Vb-CbA" firstAttribute="leading" secondItem="tsR-hK-woN" secondAttribute="leading" constant="10" id="0Kf-6v-f86"/>
-                            <constraint firstItem="bcX-tx-Vhr" firstAttribute="top" secondItem="v5a-2l-qvB" secondAttribute="top" id="0Rd-W8-Dm2"/>
                             <constraint firstItem="fW6-sm-t8g" firstAttribute="top" relation="greaterThanOrEqual" secondItem="mEa-Xq-QB6" secondAttribute="bottom" id="4AF-N9-UE2"/>
                             <constraint firstItem="mEa-Xq-QB6" firstAttribute="leading" secondItem="tsR-hK-woN" secondAttribute="leadingMargin" id="5Kw-Si-2x9"/>
                             <constraint firstItem="4ug-Mw-9AY" firstAttribute="top" secondItem="fW6-sm-t8g" secondAttribute="bottom" priority="999" constant="30" id="6mW-Ks-Okm"/>
@@ -184,7 +164,6 @@
                             <constraint firstItem="mEa-Xq-QB6" firstAttribute="trailing" secondItem="tsR-hK-woN" secondAttribute="trailingMargin" id="j6h-Zi-1LS"/>
                             <constraint firstAttribute="centerX" secondItem="mEa-Xq-QB6" secondAttribute="centerX" id="oP9-VY-fG7"/>
                             <constraint firstItem="xap-Vb-CbA" firstAttribute="top" secondItem="Ia1-K6-d13" secondAttribute="bottom" constant="10" id="pAa-mt-Iaf"/>
-                            <constraint firstItem="bcX-tx-Vhr" firstAttribute="leading" secondItem="v5a-2l-qvB" secondAttribute="leading" id="r3P-Qe-hG0"/>
                             <constraint firstItem="uvx-n6-xp2" firstAttribute="top" secondItem="Ia1-K6-d13" secondAttribute="bottom" constant="8" id="x61-hZ-WvW"/>
                             <constraint firstItem="fW6-sm-t8g" firstAttribute="centerY" secondItem="v5a-2l-qvB" secondAttribute="centerY" id="zwb-N5-8xQ"/>
                         </constraints>
@@ -194,7 +173,6 @@
                         <outlet property="addButton" destination="fW6-sm-t8g" id="ikl-2M-eYC"/>
                         <outlet property="largeButton" destination="v5a-2l-qvB" id="dvl-3k-q65"/>
                         <outlet property="maskImage" destination="JPp-1k-zdE" id="5Xq-AA-c2u"/>
-                        <outlet property="mediumButton" destination="bcX-tx-Vhr" id="gDu-Zf-cV1"/>
                         <outlet property="meterContainerView" destination="mQX-uO-zkr" id="Xzc-Jh-LMx"/>
                         <outlet property="minusButton" destination="uvx-n6-xp2" id="Id3-s0-QqO"/>
                         <outlet property="percentageLabel" destination="mEa-Xq-QB6" id="VWN-Gf-0ip"/>
@@ -747,51 +725,8 @@ By the way, we’d love some feedback! How do you feel about Gulps? </string>
                                             </constraints>
                                         </tableViewCellContentView>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="PreferencesCll" id="EhX-RL-Rh8">
-                                        <rect key="frame" x="0.0" y="191.5" width="375" height="44"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="EhX-RL-Rh8" id="7x8-j0-Y5k">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="2" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="s5F-j1-JSB" userLabel="Medium Portion Text">
-                                                    <rect key="frame" x="245" y="0.0" width="90" height="43"/>
-                                                    <constraints>
-                                                        <constraint firstAttribute="width" constant="90" id="idr-Pc-lug"/>
-                                                    </constraints>
-                                                    <color key="textColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                    <textInputTraits key="textInputTraits" autocorrectionType="no" keyboardType="decimalPad"/>
-                                                    <connections>
-                                                        <outlet property="delegate" destination="t9K-A9-XHF" id="rat-zk-41q"/>
-                                                    </connections>
-                                                </textField>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Medium gulp" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="l4S-LA-Tke">
-                                                    <rect key="frame" x="15" y="12" width="95" height="20"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Oz" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JaH-AL-TZk">
-                                                    <rect key="frame" x="341" y="13" width="19" height="17"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                                    <color key="textColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                            </subviews>
-                                            <constraints>
-                                                <constraint firstItem="l4S-LA-Tke" firstAttribute="leading" secondItem="7x8-j0-Y5k" secondAttribute="leading" constant="15" id="2nX-XA-3fg"/>
-                                                <constraint firstAttribute="bottom" secondItem="s5F-j1-JSB" secondAttribute="bottom" id="GIy-0W-kfp"/>
-                                                <constraint firstAttribute="centerY" secondItem="l4S-LA-Tke" secondAttribute="centerY" id="L37-oD-bwi"/>
-                                                <constraint firstAttribute="trailing" secondItem="s5F-j1-JSB" secondAttribute="trailing" constant="40" id="O5B-mC-Ptz"/>
-                                                <constraint firstAttribute="trailing" secondItem="JaH-AL-TZk" secondAttribute="trailing" constant="15" id="Twa-ek-Wv7"/>
-                                                <constraint firstAttribute="centerY" secondItem="JaH-AL-TZk" secondAttribute="centerY" id="atM-M1-Cwh"/>
-                                                <constraint firstItem="s5F-j1-JSB" firstAttribute="top" secondItem="7x8-j0-Y5k" secondAttribute="top" id="sbB-1K-kWs"/>
-                                            </constraints>
-                                        </tableViewCellContentView>
-                                    </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="PreferencesCll" id="XVN-Hr-Cdk">
-                                        <rect key="frame" x="0.0" y="235.5" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="191.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="XVN-Hr-Cdk" id="Y7x-zR-Q8Y">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
@@ -834,7 +769,7 @@ By the way, we’d love some feedback! How do you feel about Gulps? </string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="PreferencesCll" id="Q2W-7p-buv">
-                                        <rect key="frame" x="0.0" y="279.5" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="235.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Q2W-7p-buv" id="MoA-It-qj5">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
@@ -881,7 +816,7 @@ By the way, we’d love some feedback! How do you feel about Gulps? </string>
                             <tableViewSection headerTitle="Notifications" id="Cqk-U1-F6w">
                                 <cells>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="PreferencesCll" id="Ii4-wt-fc6">
-                                        <rect key="frame" x="0.0" y="371.5" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="327.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Ii4-wt-fc6" id="1Hn-44-t70">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
@@ -911,7 +846,7 @@ By the way, we’d love some feedback! How do you feel about Gulps? </string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="PreferencesCll" textLabel="Pnc-7E-Kee" detailTextLabel="aBp-Ni-lCc" style="IBUITableViewCellStyleValue1" id="dxR-vc-Rwx">
-                                        <rect key="frame" x="0.0" y="415.5" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="371.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="dxR-vc-Rwx" id="iKk-wz-AiX">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
@@ -935,7 +870,7 @@ By the way, we’d love some feedback! How do you feel about Gulps? </string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="PreferencesCll" textLabel="f3c-OV-GHw" detailTextLabel="en4-wz-CaR" style="IBUITableViewCellStyleValue1" id="sFs-MK-DDj">
-                                        <rect key="frame" x="0.0" y="459.5" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="415.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="sFs-MK-DDj" id="9UG-1o-lam">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
@@ -959,7 +894,7 @@ By the way, we’d love some feedback! How do you feel about Gulps? </string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="PreferencesCll" textLabel="w1F-Cx-bRx" detailTextLabel="llL-4J-aC6" style="IBUITableViewCellStyleValue1" id="8v4-HN-MkF">
-                                        <rect key="frame" x="0.0" y="503.5" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="459.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="8v4-HN-MkF" id="wVD-TQ-jfH">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
@@ -987,7 +922,7 @@ By the way, we’d love some feedback! How do you feel about Gulps? </string>
                             <tableViewSection headerTitle="Apple Health" id="kL3-zV-Q1y">
                                 <cells>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="PreferencesCll" id="rtu-Sv-Asn">
-                                        <rect key="frame" x="0.0" y="595.5" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="551.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="rtu-Sv-Asn" id="NkK-Il-Fd3">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
@@ -1029,7 +964,6 @@ By the way, we’d love some feedback! How do you feel about Gulps? </string>
                         <outlet property="dailyGoalText" destination="Heo-vz-8M3" id="lHN-ai-OMb"/>
                         <outlet property="healthSwitch" destination="fU5-mD-m8k" id="83t-Hg-eil"/>
                         <outlet property="largePortionText" destination="SBF-ug-rBd" id="kj7-UV-Usx"/>
-                        <outlet property="mediumPortionText" destination="s5F-j1-JSB" id="rlg-b1-QZo"/>
                         <outlet property="notificationFromLabel" destination="aBp-Ni-lCc" id="LSm-ya-Pih"/>
                         <outlet property="notificationIntervalLabel" destination="llL-4J-aC6" id="GL4-VE-3Io"/>
                         <outlet property="notificationSwitch" destination="mua-Mo-rXC" id="Yto-mm-Dvj"/>
@@ -1039,7 +973,6 @@ By the way, we’d love some feedback! How do you feel about Gulps? </string>
                         <outletCollection property="uomLabels" destination="nbd-CS-kU7" collectionClass="NSMutableArray" id="yn9-xJ-SuH"/>
                         <outletCollection property="uomLabels" destination="RVh-z0-hYc" collectionClass="NSMutableArray" id="sey-OP-a1C"/>
                         <outletCollection property="uomLabels" destination="DT8-cB-ShB" collectionClass="NSMutableArray" id="kN2-it-PpW"/>
-                        <outletCollection property="uomLabels" destination="JaH-AL-TZk" collectionClass="NSMutableArray" id="EH0-Cb-i7p"/>
                     </connections>
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="gao-yG-C7y" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -1087,12 +1020,11 @@ By the way, we’d love some feedback! How do you feel about Gulps? </string>
         <image name="drink-icon" width="30" height="30"/>
         <image name="drop" width="300" height="300"/>
         <image name="large-icon" width="40" height="40"/>
-        <image name="medium-icon" width="40" height="40"/>
         <image name="minus-icon" width="24" height="24"/>
         <image name="plus-icon" width="40" height="40"/>
         <image name="sad" width="100" height="100"/>
         <image name="settings-icon" width="30" height="30"/>
-        <image name="small-icon" width="168" height="168"/>
+        <image name="small-icon" width="40" height="40"/>
         <image name="smile" width="100" height="100"/>
         <image name="star" width="50" height="50"/>
         <image name="tiny-add" width="20" height="20"/>
diff --git a/Gulps/Base.lproj/Onboarding.storyboard b/Gulps/Base.lproj/Onboarding.storyboard
old mode 100755
new mode 100644
index 93e7f35..8036731
--- a/Gulps/Base.lproj/Onboarding.storyboard
+++ b/Gulps/Base.lproj/Onboarding.storyboard
@@ -1,21 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="By6-Ql-uIz">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14F6a" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="By6-Ql-uIz">
     <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <customFonts key="customFonts">
-        <array key="Avenir.ttc">
-            <string>Avenir-Book</string>
-        </array>
-        <array key="KaushanScript.ttf">
+        <mutableArray key="KaushanScript.ttf">
             <string>KaushanScript-Regular</string>
-        </array>
+        </mutableArray>
     </customFonts>
     <scenes>
         <!--Onboarding View Controller-->
@@ -27,33 +19,33 @@
                         <viewControllerLayoutGuide type="bottom" id="a9y-6F-IFj"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="xIA-iZ-6Zs">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Hi there!" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="J5V-th-GOK">
-                                <rect key="frame" x="16" y="20" width="343" height="70"/>
+                                <rect key="frame" x="16" y="20" width="288" height="70"/>
                                 <fontDescription key="fontDescription" name="KaushanScript-Regular" family="Kaushan Script" pointSize="48"/>
-                                <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="I’m here to help you keep track of a simple healthy habit: 
drinking water." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dbP-89-LG1">
-                                <rect key="frame" x="16" y="140" width="343" height="66"/>
+                                <rect key="frame" x="16" y="140" width="288" height="66"/>
                                 <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="16"/>
-                                <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5VR-G1-bkD">
-                                <rect key="frame" x="0.0" y="567" width="375" height="100"/>
+                                <rect key="frame" x="0.0" y="468" width="320" height="100"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hyR-yx-vfK">
-                                        <rect key="frame" x="295" y="20" width="60" height="60"/>
-                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <rect key="frame" x="240" y="20" width="60" height="60"/>
+                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="60" id="DQN-JD-3BE"/>
                                             <constraint firstAttribute="width" constant="60" id="YEL-vf-sXW"/>
                                         </constraints>
                                         <state key="normal" image="next-icon">
-                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                         </state>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -65,7 +57,7 @@
                                         </connections>
                                     </button>
                                 </subviews>
-                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 <constraints>
                                     <constraint firstAttribute="bottom" secondItem="hyR-yx-vfK" secondAttribute="bottom" constant="20" id="3ab-xY-wUg"/>
                                     <constraint firstAttribute="height" constant="100" id="CpB-GU-0HV"/>
@@ -73,7 +65,7 @@
                                 </constraints>
                             </view>
                         </subviews>
-                        <color key="backgroundColor" red="0.15686274509803921" green="0.39215686274509803" blue="0.77254901960784317" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" red="0.15686274509803921" green="0.39215686274509803" blue="0.77254901960784317" alpha="1" colorSpace="calibratedRGB"/>
                         <constraints>
                             <constraint firstItem="dbP-89-LG1" firstAttribute="trailing" secondItem="xIA-iZ-6Zs" secondAttribute="trailingMargin" id="1Qy-OR-nxD"/>
                             <constraint firstItem="J5V-th-GOK" firstAttribute="leading" secondItem="xIA-iZ-6Zs" secondAttribute="leading" constant="16" id="8tS-36-5WV"/>
@@ -108,30 +100,30 @@
                         <viewControllerLayoutGuide type="bottom" id="9AR-mY-hKU"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="qHm-YP-hGh">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aNx-Gk-pr3" userLabel="Header">
-                                <rect key="frame" x="16" y="40" width="343" height="44"/>
+                                <rect key="frame" x="16" y="40" width="288" height="66"/>
                                 <string key="text">A couple of questions first:
 what measurement system do you prefer?</string>
                                 <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="16"/>
-                                <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qww-zt-6DG" userLabel="Controls">
-                                <rect key="frame" x="0.0" y="567" width="375" height="100"/>
+                                <rect key="frame" x="0.0" y="468" width="320" height="100"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dEP-tj-efq">
-                                        <rect key="frame" x="295" y="20" width="60" height="60"/>
-                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <rect key="frame" x="240" y="20" width="60" height="60"/>
+                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="60" id="HiL-kT-eIK"/>
                                             <constraint firstAttribute="width" constant="60" id="LkU-5J-Mly"/>
                                         </constraints>
                                         <inset key="contentEdgeInsets" minX="1" minY="0.0" maxX="0.0" maxY="0.0"/>
                                         <state key="normal" image="next-icon">
-                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                         </state>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -144,14 +136,14 @@ what measurement system do you prefer?</string>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xmh-gA-cnz">
                                         <rect key="frame" x="20" y="20" width="60" height="60"/>
-                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="60" id="EGF-Pz-3li"/>
                                             <constraint firstAttribute="height" constant="60" id="oHu-LZ-d9d"/>
                                         </constraints>
                                         <inset key="contentEdgeInsets" minX="-5" minY="0.0" maxX="0.0" maxY="0.0"/>
                                         <state key="normal" image="prev-icon">
-                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                         </state>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -163,7 +155,7 @@ what measurement system do you prefer?</string>
                                         </connections>
                                     </button>
                                 </subviews>
-                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 <constraints>
                                     <constraint firstItem="xmh-gA-cnz" firstAttribute="leading" secondItem="qww-zt-6DG" secondAttribute="leading" constant="20" id="7cL-Ju-TYA"/>
                                     <constraint firstAttribute="trailing" secondItem="dEP-tj-efq" secondAttribute="trailing" constant="20" id="Kl6-of-P4l"/>
@@ -173,12 +165,12 @@ what measurement system do you prefer?</string>
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GKJ-7w-YfS" userLabel="Liters">
-                                <rect key="frame" x="0.0" y="124" width="375" height="60"/>
+                                <rect key="frame" x="0.0" y="146" width="320" height="60"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Liters" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hoW-cL-j0l">
                                         <rect key="frame" x="70" y="16" width="48" height="28"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
-                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check-icon" translatesAutoresizingMaskIntoConstraints="NO" id="YjV-vs-zoa">
@@ -189,9 +181,9 @@ what measurement system do you prefer?</string>
                                         </constraints>
                                     </imageView>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="SH2-qV-ied">
-                                        <rect key="frame" x="0.0" y="0.0" width="375" height="60"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="320" height="60"/>
                                         <state key="normal">
-                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                         </state>
                                         <connections>
                                             <action selector="litersButtonAction" destination="G0M-tk-SWS" eventType="touchUpInside" id="ekG-du-Zzn"/>
@@ -211,7 +203,7 @@ what measurement system do you prefer?</string>
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8S4-OP-3D4" userLabel="Ounces">
-                                <rect key="frame" x="0.0" y="184" width="375" height="60"/>
+                                <rect key="frame" x="0.0" y="206" width="320" height="60"/>
                                 <subviews>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check-icon" translatesAutoresizingMaskIntoConstraints="NO" id="Naf-BJ-WFS">
                                         <rect key="frame" x="20" y="10" width="40" height="40"/>
@@ -223,13 +215,13 @@ what measurement system do you prefer?</string>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Ounces" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rUi-CZ-r3F">
                                         <rect key="frame" x="70" y="16" width="69" height="28"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
-                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="TKD-XC-gWJ">
-                                        <rect key="frame" x="0.0" y="0.0" width="375" height="60"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="320" height="60"/>
                                         <state key="normal">
-                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                         </state>
                                         <connections>
                                             <action selector="ouncesButtonAction" destination="G0M-tk-SWS" eventType="touchUpInside" id="Joh-SQ-uzk"/>
@@ -249,7 +241,7 @@ what measurement system do you prefer?</string>
                                 </constraints>
                             </view>
                         </subviews>
-                        <color key="backgroundColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="calibratedRGB"/>
                         <constraints>
                             <constraint firstItem="aNx-Gk-pr3" firstAttribute="top" secondItem="k5a-UD-A8v" secondAttribute="bottom" constant="20" id="3Oq-Mq-bPC"/>
                             <constraint firstItem="8S4-OP-3D4" firstAttribute="top" secondItem="GKJ-7w-YfS" secondAttribute="bottom" id="AAK-Oo-1x4"/>
@@ -289,29 +281,29 @@ what measurement system do you prefer?</string>
                         <viewControllerLayoutGuide type="bottom" id="hbR-Yb-Sx1"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="Nn4-vs-Hzu">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JSe-R9-wt9" userLabel="Header">
-                                <rect key="frame" x="16" y="40" width="343" height="88"/>
+                                <rect key="frame" x="16" y="40" width="288" height="110"/>
                                 <string key="text">I’ll keep track of your water consumption through gulps, you just need to set up your usual small gulp (a glass of water, usually 0,2 L or 8 oz) and big gulp (let’s say a bottle)</string>
                                 <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="16"/>
-                                <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VQR-RN-FoH" userLabel="Controls">
-                                <rect key="frame" x="0.0" y="567" width="375" height="100"/>
+                                <rect key="frame" x="0.0" y="468" width="320" height="100"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3E1-6i-418">
-                                        <rect key="frame" x="295" y="20" width="60" height="60"/>
-                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <rect key="frame" x="240" y="20" width="60" height="60"/>
+                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="60" id="OHM-AK-BEa"/>
                                             <constraint firstAttribute="height" constant="60" id="hsd-xT-c4d"/>
                                         </constraints>
                                         <inset key="contentEdgeInsets" minX="1" minY="0.0" maxX="0.0" maxY="0.0"/>
                                         <state key="normal" image="next-icon">
-                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                         </state>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -324,14 +316,14 @@ what measurement system do you prefer?</string>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hjk-yP-pgN">
                                         <rect key="frame" x="20" y="20" width="60" height="60"/>
-                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="60" id="MTy-um-B71"/>
                                             <constraint firstAttribute="width" constant="60" id="nV6-gc-86T"/>
                                         </constraints>
                                         <inset key="contentEdgeInsets" minX="-5" minY="0.0" maxX="0.0" maxY="0.0"/>
                                         <state key="normal" image="prev-icon">
-                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                         </state>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -343,7 +335,7 @@ what measurement system do you prefer?</string>
                                         </connections>
                                     </button>
                                 </subviews>
-                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 <constraints>
                                     <constraint firstItem="hjk-yP-pgN" firstAttribute="leading" secondItem="VQR-RN-FoH" secondAttribute="leading" constant="20" id="0da-jJ-cCd"/>
                                     <constraint firstAttribute="bottom" secondItem="3E1-6i-418" secondAttribute="bottom" constant="20" id="N97-W6-nBy"/>
@@ -353,12 +345,12 @@ what measurement system do you prefer?</string>
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Xto-Uc-SOf" userLabel="Small gulp">
-                                <rect key="frame" x="0.0" y="148" width="375" height="60"/>
+                                <rect key="frame" x="0.0" y="170" width="320" height="60"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Small gulp" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WfK-EQ-Qob">
                                         <rect key="frame" x="70" y="16" width="95" height="28"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
-                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="small-icon" translatesAutoresizingMaskIntoConstraints="NO" id="Oe9-EU-gxI">
@@ -369,11 +361,11 @@ what measurement system do you prefer?</string>
                                         </constraints>
                                     </imageView>
                                     <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="0.2" placeholder="glass" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="e8D-nG-89R">
-                                        <rect key="frame" x="238" y="0.0" width="90" height="60"/>
+                                        <rect key="frame" x="183" y="0.0" width="90" height="60"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="90" id="2Zx-3z-dua"/>
                                         </constraints>
-                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
                                         <textInputTraits key="textInputTraits" autocorrectionType="no" keyboardType="decimalPad"/>
                                         <connections>
@@ -381,9 +373,9 @@ what measurement system do you prefer?</string>
                                         </connections>
                                     </textField>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="oz" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wIJ-Qh-sXS">
-                                        <rect key="frame" x="338" y="19" width="17" height="22"/>
+                                        <rect key="frame" x="283" y="19" width="17" height="22"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="16"/>
-                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                 </subviews>
@@ -400,56 +392,8 @@ what measurement system do you prefer?</string>
                                     <constraint firstAttribute="height" constant="60" id="tyP-Y3-3dV"/>
                                 </constraints>
                             </view>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="K2W-i9-scZ" userLabel="Medium Gulp">
-                                <rect key="frame" x="0.0" y="215" width="375" height="60"/>
-                                <subviews>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Medium gulp" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="A3t-c6-5Qq">
-                                        <rect key="frame" x="70" y="16" width="120.5" height="28"/>
-                                        <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
-                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                        <nil key="highlightedColor"/>
-                                    </label>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="oz" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jrP-nj-Ojr" userLabel="Medium Gulp Label">
-                                        <rect key="frame" x="338" y="19" width="17" height="22"/>
-                                        <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="16"/>
-                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                        <nil key="highlightedColor"/>
-                                    </label>
-                                    <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="0.5" placeholder="bottle" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="1kq-kn-Uqc" userLabel="Medium Gulp Text">
-                                        <rect key="frame" x="238" y="0.0" width="90" height="60"/>
-                                        <constraints>
-                                            <constraint firstAttribute="width" constant="90" id="ltM-oh-Shx"/>
-                                        </constraints>
-                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                        <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
-                                        <textInputTraits key="textInputTraits" autocorrectionType="no" keyboardType="decimalPad"/>
-                                        <connections>
-                                            <outlet property="delegate" destination="zCq-Eo-bzE" id="kKl-l7-y9G"/>
-                                        </connections>
-                                    </textField>
-                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="medium-icon" translatesAutoresizingMaskIntoConstraints="NO" id="glZ-Vb-CT3">
-                                        <rect key="frame" x="23" y="11" width="33" height="33"/>
-                                        <constraints>
-                                            <constraint firstAttribute="height" constant="33" id="dNz-Kk-wA4"/>
-                                            <constraint firstAttribute="width" constant="33" id="f1I-VM-qtf"/>
-                                        </constraints>
-                                    </imageView>
-                                </subviews>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="60" id="3jt-eb-uie"/>
-                                    <constraint firstItem="1kq-kn-Uqc" firstAttribute="top" secondItem="K2W-i9-scZ" secondAttribute="top" id="5pC-Rm-7aW"/>
-                                    <constraint firstItem="jrP-nj-Ojr" firstAttribute="leading" secondItem="1kq-kn-Uqc" secondAttribute="trailing" constant="10" id="635-NF-bLc"/>
-                                    <constraint firstAttribute="centerY" secondItem="A3t-c6-5Qq" secondAttribute="centerY" id="I40-Lz-Qjh"/>
-                                    <constraint firstAttribute="bottom" secondItem="1kq-kn-Uqc" secondAttribute="bottom" id="M4r-oY-Esk"/>
-                                    <constraint firstItem="glZ-Vb-CT3" firstAttribute="top" secondItem="K2W-i9-scZ" secondAttribute="top" constant="11" id="McE-PM-hON"/>
-                                    <constraint firstAttribute="trailing" secondItem="jrP-nj-Ojr" secondAttribute="trailing" constant="20" id="UqM-gw-HHS"/>
-                                    <constraint firstItem="glZ-Vb-CT3" firstAttribute="leading" secondItem="K2W-i9-scZ" secondAttribute="leading" constant="23" id="Z6f-j8-yKM"/>
-                                    <constraint firstItem="A3t-c6-5Qq" firstAttribute="leading" secondItem="glZ-Vb-CT3" secondAttribute="trailing" constant="14" id="h2C-S3-9Wn"/>
-                                    <constraint firstAttribute="centerY" secondItem="jrP-nj-Ojr" secondAttribute="centerY" id="xOX-lY-MjI"/>
-                                </constraints>
-                            </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="plP-Gr-jkv" userLabel="Big gulp">
-                                <rect key="frame" x="0.0" y="283" width="375" height="60"/>
+                                <rect key="frame" x="0.0" y="230" width="320" height="60"/>
                                 <subviews>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="large-icon" translatesAutoresizingMaskIntoConstraints="NO" id="mCL-Fz-XGC">
                                         <rect key="frame" x="20" y="10" width="40" height="40"/>
@@ -461,21 +405,21 @@ what measurement system do you prefer?</string>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Big gulp" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kMj-hq-rjr">
                                         <rect key="frame" x="70" y="16" width="76" height="28"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
-                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="oz" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="s4e-zS-DTj">
-                                        <rect key="frame" x="338" y="19" width="17" height="22"/>
+                                        <rect key="frame" x="283" y="19" width="17" height="22"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="16"/>
-                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="0.5" placeholder="bottle" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="gFP-R6-3l1">
-                                        <rect key="frame" x="238" y="0.0" width="90" height="60"/>
+                                        <rect key="frame" x="183" y="0.0" width="90" height="60"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="90" id="6lS-LW-dPX"/>
                                         </constraints>
-                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
                                         <textInputTraits key="textInputTraits" autocorrectionType="no" keyboardType="decimalPad"/>
                                         <connections>
@@ -497,24 +441,20 @@ what measurement system do you prefer?</string>
                                 </constraints>
                             </view>
                         </subviews>
-                        <color key="backgroundColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="calibratedRGB"/>
                         <constraints>
-                            <constraint firstItem="K2W-i9-scZ" firstAttribute="trailing" secondItem="Xto-Uc-SOf" secondAttribute="trailing" id="EwV-hc-TYi"/>
                             <constraint firstItem="plP-Gr-jkv" firstAttribute="leading" secondItem="Nn4-vs-Hzu" secondAttribute="leading" id="FXT-Fy-7eB"/>
-                            <constraint firstItem="plP-Gr-jkv" firstAttribute="top" secondItem="K2W-i9-scZ" secondAttribute="bottom" constant="8" id="JXz-P0-ftj"/>
+                            <constraint firstItem="plP-Gr-jkv" firstAttribute="top" secondItem="Xto-Uc-SOf" secondAttribute="bottom" id="QEh-lf-0Ah"/>
                             <constraint firstAttribute="trailing" secondItem="Xto-Uc-SOf" secondAttribute="trailing" id="S0d-Uh-Bjp"/>
                             <constraint firstAttribute="trailing" secondItem="VQR-RN-FoH" secondAttribute="trailing" id="YDY-JR-dly"/>
                             <constraint firstItem="JSe-R9-wt9" firstAttribute="leading" secondItem="Nn4-vs-Hzu" secondAttribute="leadingMargin" id="YjM-mY-btl"/>
                             <constraint firstAttribute="bottom" secondItem="VQR-RN-FoH" secondAttribute="bottom" id="Zvw-nI-3t3"/>
                             <constraint firstItem="Xto-Uc-SOf" firstAttribute="top" secondItem="JSe-R9-wt9" secondAttribute="bottom" constant="20" id="bb3-6n-rNF"/>
-                            <constraint firstItem="K2W-i9-scZ" firstAttribute="top" secondItem="Xto-Uc-SOf" secondAttribute="bottom" constant="7" id="eEF-7x-8WO"/>
                             <constraint firstItem="VQR-RN-FoH" firstAttribute="leading" secondItem="Nn4-vs-Hzu" secondAttribute="leading" id="f2D-FG-SW0"/>
                             <constraint firstItem="Xto-Uc-SOf" firstAttribute="leading" secondItem="Nn4-vs-Hzu" secondAttribute="leading" id="h8t-eM-UFX"/>
                             <constraint firstItem="JSe-R9-wt9" firstAttribute="trailing" secondItem="Nn4-vs-Hzu" secondAttribute="trailingMargin" id="mEL-zs-osh"/>
                             <constraint firstItem="JSe-R9-wt9" firstAttribute="top" secondItem="c1S-tf-jdw" secondAttribute="bottom" constant="20" id="n4w-5n-rKr"/>
                             <constraint firstAttribute="trailing" secondItem="plP-Gr-jkv" secondAttribute="trailing" id="pFe-CU-7tG"/>
-                            <constraint firstItem="K2W-i9-scZ" firstAttribute="top" secondItem="Nn4-vs-Hzu" secondAttribute="top" constant="215" id="pQ5-X9-ueB"/>
-                            <constraint firstItem="K2W-i9-scZ" firstAttribute="leading" secondItem="Xto-Uc-SOf" secondAttribute="leading" id="puh-Gc-CEc"/>
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" id="41t-VR-ovH"/>
@@ -524,22 +464,18 @@ what measurement system do you prefer?</string>
                         <outlet property="bigGulpText" destination="gFP-R6-3l1" id="TMj-Dt-afJ"/>
                         <outlet property="bigSuffixLabel" destination="s4e-zS-DTj" id="ps4-9W-Sls"/>
                         <outlet property="headerLabel" destination="JSe-R9-wt9" id="Nqd-pL-tXb"/>
-                        <outlet property="mediumBackgroundView" destination="K2W-i9-scZ" id="vU9-wE-77N"/>
-                        <outlet property="mediumGulpText" destination="1kq-kn-Uqc" id="4jG-e9-evl"/>
-                        <outlet property="mediumSuffixLabel" destination="jrP-nj-Ojr" id="PQg-bJ-fgT"/>
                         <outlet property="smallBackgroundView" destination="Xto-Uc-SOf" id="0jp-8i-LAd"/>
                         <outlet property="smallGulpText" destination="e8D-nG-89R" id="qTw-4Q-9sJ"/>
                         <outlet property="smallSuffixLabel" destination="wIJ-Qh-sXS" id="MgS-5T-ssD"/>
                         <outletCollection property="viewArray" destination="JSe-R9-wt9" collectionClass="NSMutableArray" id="hVz-TU-olM"/>
+                        <outletCollection property="viewArray" destination="Xto-Uc-SOf" collectionClass="NSMutableArray" id="kQN-lc-w90"/>
+                        <outletCollection property="viewArray" destination="plP-Gr-jkv" collectionClass="NSMutableArray" id="5H3-44-7Ax"/>
                         <outletCollection property="viewArray" destination="VQR-RN-FoH" collectionClass="NSMutableArray" id="51c-on-y5l"/>
-                        <outletCollection property="viewArray" destination="Xto-Uc-SOf" collectionClass="NSMutableArray" id="P26-yF-ziC"/>
-                        <outletCollection property="viewArray" destination="K2W-i9-scZ" collectionClass="NSMutableArray" id="zBl-lR-CdN"/>
-                        <outletCollection property="viewArray" destination="plP-Gr-jkv" collectionClass="NSMutableArray" id="zuF-cr-H44"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="vUn-FA-zny" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="1685.5" y="442.5"/>
+            <point key="canvasLocation" x="1686" y="443"/>
         </scene>
         <!--Goal View Controller-->
         <scene sceneID="l6E-L5-1xE">
@@ -550,28 +486,28 @@ what measurement system do you prefer?</string>
                         <viewControllerLayoutGuide type="bottom" id="6PH-YY-LNP"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="BrG-6p-F5j">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Now, set your daily goal. An average goal is around 2 L or 64 oz per day, but it can vary with your build." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nbv-Ph-Ogi" userLabel="Header">
-                                <rect key="frame" x="16" y="40" width="343" height="66"/>
+                                <rect key="frame" x="16" y="40" width="288" height="66"/>
                                 <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="16"/>
-                                <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="k9q-l3-tAh" userLabel="Controls">
-                                <rect key="frame" x="0.0" y="567" width="375" height="100"/>
+                                <rect key="frame" x="0.0" y="468" width="320" height="100"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dFe-jD-qxw">
-                                        <rect key="frame" x="295" y="20" width="60" height="60"/>
-                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <rect key="frame" x="240" y="20" width="60" height="60"/>
+                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="60" id="1hT-A8-yvW"/>
                                             <constraint firstAttribute="width" constant="60" id="efS-Mn-XoS"/>
                                         </constraints>
                                         <inset key="contentEdgeInsets" minX="1" minY="0.0" maxX="0.0" maxY="0.0"/>
                                         <state key="normal" image="next-icon">
-                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                         </state>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -584,14 +520,14 @@ what measurement system do you prefer?</string>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qra-1E-3OP">
                                         <rect key="frame" x="20" y="20" width="60" height="60"/>
-                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="60" id="3V3-Jh-pdB"/>
                                             <constraint firstAttribute="height" constant="60" id="ixG-LU-ND0"/>
                                         </constraints>
                                         <inset key="contentEdgeInsets" minX="-5" minY="0.0" maxX="0.0" maxY="0.0"/>
                                         <state key="normal" image="prev-icon">
-                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                         </state>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -603,7 +539,7 @@ what measurement system do you prefer?</string>
                                         </connections>
                                     </button>
                                 </subviews>
-                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="100" id="2Qk-mT-eqb"/>
                                     <constraint firstAttribute="bottom" secondItem="qra-1E-3OP" secondAttribute="bottom" constant="20" id="Cyo-6t-qVC"/>
@@ -613,20 +549,20 @@ what measurement system do you prefer?</string>
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xdk-cL-gdm" userLabel="Goal">
-                                <rect key="frame" x="0.0" y="126" width="375" height="60"/>
+                                <rect key="frame" x="0.0" y="126" width="320" height="60"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Daily goal" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="K6E-SK-ldz">
                                         <rect key="frame" x="20" y="16" width="90" height="28"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
-                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="2.0" placeholder="goal" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="S54-HU-dVI">
-                                        <rect key="frame" x="236" y="0.0" width="90" height="60"/>
+                                        <rect key="frame" x="181" y="0.0" width="90" height="60"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="90" id="YtZ-tJ-fYE"/>
                                         </constraints>
-                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
                                         <textInputTraits key="textInputTraits" autocorrectionType="no" keyboardType="decimalPad"/>
                                         <connections>
@@ -634,9 +570,9 @@ what measurement system do you prefer?</string>
                                         </connections>
                                     </textField>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="oz" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OlE-qk-N7s">
-                                        <rect key="frame" x="336" y="17" width="19" height="25"/>
+                                        <rect key="frame" x="281" y="17" width="19" height="25"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="18"/>
-                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                 </subviews>
@@ -652,7 +588,7 @@ what measurement system do you prefer?</string>
                                 </constraints>
                             </view>
                         </subviews>
-                        <color key="backgroundColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="calibratedRGB"/>
                         <constraints>
                             <constraint firstAttribute="trailing" secondItem="xdk-cL-gdm" secondAttribute="trailing" id="HmS-ox-gNq"/>
                             <constraint firstItem="xdk-cL-gdm" firstAttribute="leading" secondItem="BrG-6p-F5j" secondAttribute="leading" id="LcX-wE-RGP"/>
@@ -690,28 +626,28 @@ what measurement system do you prefer?</string>
                         <viewControllerLayoutGuide type="bottom" id="4Dn-cW-4Td"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="GqB-jz-M2M">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="I can remind you to drink every once in a while. Since I don’t want to nag you, you’ll decide when:" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="T9n-t2-EOq" userLabel="Header">
-                                <rect key="frame" x="16" y="40" width="343" height="66"/>
+                                <rect key="frame" x="16" y="40" width="288" height="66"/>
                                 <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="16"/>
-                                <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="a51-1N-ixm" userLabel="Controls">
-                                <rect key="frame" x="0.0" y="567" width="375" height="100"/>
+                                <rect key="frame" x="0.0" y="468" width="320" height="100"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LWy-za-zrz">
-                                        <rect key="frame" x="295" y="20" width="60" height="60"/>
-                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <rect key="frame" x="240" y="20" width="60" height="60"/>
+                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="60" id="KAo-2i-IFn"/>
                                             <constraint firstAttribute="width" constant="60" id="xme-MY-hIZ"/>
                                         </constraints>
                                         <inset key="contentEdgeInsets" minX="1" minY="0.0" maxX="0.0" maxY="0.0"/>
                                         <state key="normal" image="blue-check-icon">
-                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                         </state>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -724,14 +660,14 @@ what measurement system do you prefer?</string>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wB4-SV-rbT">
                                         <rect key="frame" x="20" y="20" width="60" height="60"/>
-                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="60" id="7Qb-Bt-TCl"/>
                                             <constraint firstAttribute="width" constant="60" id="g9Q-Ic-NIa"/>
                                         </constraints>
                                         <inset key="contentEdgeInsets" minX="-5" minY="0.0" maxX="0.0" maxY="0.0"/>
                                         <state key="normal" image="prev-icon">
-                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                         </state>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -743,7 +679,7 @@ what measurement system do you prefer?</string>
                                         </connections>
                                     </button>
                                 </subviews>
-                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 <constraints>
                                     <constraint firstAttribute="bottom" secondItem="LWy-za-zrz" secondAttribute="bottom" constant="20" id="8LC-of-Zp3"/>
                                     <constraint firstItem="wB4-SV-rbT" firstAttribute="leading" secondItem="a51-1N-ixm" secondAttribute="leading" constant="20" id="HBk-1D-vkn"/>
@@ -753,17 +689,17 @@ what measurement system do you prefer?</string>
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GTt-h0-xq8" userLabel="On">
-                                <rect key="frame" x="0.0" y="126" width="375" height="50"/>
+                                <rect key="frame" x="0.0" y="126" width="320" height="50"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Remind me" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mVT-8Y-PAY">
                                         <rect key="frame" x="20" y="11" width="102" height="28"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
-                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="gl4-fV-2SB">
-                                        <rect key="frame" x="306" y="10" width="51" height="31"/>
-                                        <color key="onTintColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <rect key="frame" x="251" y="10" width="51" height="31"/>
+                                        <color key="onTintColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="calibratedRGB"/>
                                         <connections>
                                             <action selector="enableNotifications:" destination="UpA-CQ-AM6" eventType="valueChanged" id="Mqf-mo-XDV"/>
                                         </connections>
@@ -778,24 +714,24 @@ what measurement system do you prefer?</string>
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QuN-dL-t69" userLabel="From">
-                                <rect key="frame" x="0.0" y="176" width="375" height="50"/>
+                                <rect key="frame" x="0.0" y="176" width="320" height="50"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="From" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TTz-34-edX">
                                         <rect key="frame" x="20" y="11" width="47" height="28"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
-                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="10:00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uxY-Gi-w4N">
-                                        <rect key="frame" x="304" y="11" width="51" height="28"/>
+                                        <rect key="frame" x="249" y="11" width="51" height="28"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
-                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Tqy-KV-8mT">
-                                        <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="320" height="50"/>
                                         <state key="normal">
-                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                         </state>
                                         <connections>
                                             <action selector="openFromSelection:" destination="UpA-CQ-AM6" eventType="touchUpInside" id="etX-A4-bBW"/>
@@ -816,24 +752,24 @@ what measurement system do you prefer?</string>
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="n2T-25-lRf" userLabel="To">
-                                <rect key="frame" x="0.0" y="226" width="375" height="50"/>
+                                <rect key="frame" x="0.0" y="226" width="320" height="50"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="To" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sjg-oM-azP">
                                         <rect key="frame" x="20" y="11" width="22" height="28"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
-                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="22:00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0pm-Fb-nta">
-                                        <rect key="frame" x="304" y="11" width="51" height="28"/>
+                                        <rect key="frame" x="249" y="11" width="51" height="28"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
-                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="KXD-3s-NZ3">
-                                        <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="320" height="50"/>
                                         <state key="normal">
-                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                         </state>
                                         <connections>
                                             <action selector="openToSelection:" destination="UpA-CQ-AM6" eventType="touchUpInside" id="WSM-Xs-pN8"/>
@@ -853,24 +789,24 @@ what measurement system do you prefer?</string>
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4ng-Ck-Uhi" userLabel="Every">
-                                <rect key="frame" x="0.0" y="276" width="375" height="50"/>
+                                <rect key="frame" x="0.0" y="276" width="320" height="50"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Every" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6pM-Tq-50n">
                                         <rect key="frame" x="20" y="11" width="49" height="28"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
-                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1 hour" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9Xn-gc-3Bx">
-                                        <rect key="frame" x="297" y="11" width="58" height="28"/>
+                                        <rect key="frame" x="242" y="11" width="58" height="28"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
-                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="RoW-Fv-Wot">
-                                        <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="320" height="50"/>
                                         <state key="normal">
-                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                         </state>
                                         <connections>
                                             <action selector="openIntervalSelection:" destination="UpA-CQ-AM6" eventType="touchUpInside" id="duE-wd-xkc"/>
@@ -890,7 +826,7 @@ what measurement system do you prefer?</string>
                                 </constraints>
                             </view>
                         </subviews>
-                        <color key="backgroundColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="calibratedRGB"/>
                         <constraints>
                             <constraint firstItem="4ng-Ck-Uhi" firstAttribute="leading" secondItem="GqB-jz-M2M" secondAttribute="leading" id="4fD-Q8-x55"/>
                             <constraint firstItem="a51-1N-ixm" firstAttribute="leading" secondItem="GqB-jz-M2M" secondAttribute="leading" id="AGY-Lq-A2e"/>
@@ -937,6 +873,7 @@ what measurement system do you prefer?</string>
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" navigationBarHidden="YES" id="By6-Ql-uIz" sceneMemberID="viewController">
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="y50-mX-m9k">
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <nil name="viewControllers"/>
@@ -953,10 +890,14 @@ what measurement system do you prefer?</string>
         <image name="blue-check-icon" width="40" height="40"/>
         <image name="check-icon" width="40" height="40"/>
         <image name="large-icon" width="40" height="40"/>
-        <image name="medium-icon" width="40" height="40"/>
         <image name="next-icon" width="40" height="40"/>
         <image name="prev-icon" width="40" height="40"/>
-        <image name="small-icon" width="168" height="168"/>
+        <image name="small-icon" width="40" height="40"/>
     </resources>
-    <color key="tintColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+    <simulatedMetricsContainer key="defaultSimulatedMetrics">
+        <simulatedStatusBarMetrics key="statusBar"/>
+        <simulatedOrientationMetrics key="orientation"/>
+        <simulatedScreenMetrics key="destination" type="retina4"/>
+    </simulatedMetricsContainer>
+    <color key="tintColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="calibratedRGB"/>
 </document>
diff --git a/Gulps/Gulps.entitlements b/Gulps/Gulps.entitlements
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/AppIcon.appiconset/Contents.json b/Gulps/Images.xcassets/AppIcon.appiconset/Contents.json
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/AppIcon.appiconset/Icon Copy-40.png b/Gulps/Images.xcassets/AppIcon.appiconset/Icon Copy-40.png
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/AppIcon.appiconset/Icon Copy-60.png b/Gulps/Images.xcassets/AppIcon.appiconset/Icon Copy-60.png
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/AppIcon.appiconset/Icon-120-1.png b/Gulps/Images.xcassets/AppIcon.appiconset/Icon-120-1.png
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/AppIcon.appiconset/Icon-120.png b/Gulps/Images.xcassets/AppIcon.appiconset/Icon-120.png
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/AppIcon.appiconset/Icon-180.png b/Gulps/Images.xcassets/AppIcon.appiconset/Icon-180.png
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/AppIcon.appiconset/Icon-58.png b/Gulps/Images.xcassets/AppIcon.appiconset/Icon-58.png
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/AppIcon.appiconset/Icon-80.png b/Gulps/Images.xcassets/AppIcon.appiconset/Icon-80.png
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/AppIcon.appiconset/Icon-87.png b/Gulps/Images.xcassets/AppIcon.appiconset/Icon-87.png
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/AppIcon.appiconset/Icon.png b/Gulps/Images.xcassets/AppIcon.appiconset/Icon.png
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/Contents.json b/Gulps/Images.xcassets/Contents.json
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/big-tiny-icon.imageset/Contents.json b/Gulps/Images.xcassets/big-tiny-icon.imageset/Contents.json
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/big-tiny-icon.imageset/big-tiny-icon.pdf b/Gulps/Images.xcassets/big-tiny-icon.imageset/big-tiny-icon.pdf
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/blue-check-icon.imageset/Contents.json b/Gulps/Images.xcassets/blue-check-icon.imageset/Contents.json
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/blue-check-icon.imageset/blue-check-icon.pdf b/Gulps/Images.xcassets/blue-check-icon.imageset/blue-check-icon.pdf
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/calendar-icon.imageset/Contents.json b/Gulps/Images.xcassets/calendar-icon.imageset/Contents.json
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/calendar-icon.imageset/calendar-icon.pdf b/Gulps/Images.xcassets/calendar-icon.imageset/calendar-icon.pdf
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/check-icon.imageset/Contents.json b/Gulps/Images.xcassets/check-icon.imageset/Contents.json
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/check-icon.imageset/check-icon.pdf b/Gulps/Images.xcassets/check-icon.imageset/check-icon.pdf
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/drink-icon.imageset/Contents.json b/Gulps/Images.xcassets/drink-icon.imageset/Contents.json
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/drink-icon.imageset/drink-icon.pdf b/Gulps/Images.xcassets/drink-icon.imageset/drink-icon.pdf
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/drop-bg.imageset/Contents.json b/Gulps/Images.xcassets/drop-bg.imageset/Contents.json
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/drop-bg.imageset/drop-bg.pdf b/Gulps/Images.xcassets/drop-bg.imageset/drop-bg.pdf
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/drop.imageset/Contents.json b/Gulps/Images.xcassets/drop.imageset/Contents.json
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/drop.imageset/drop.pdf b/Gulps/Images.xcassets/drop.imageset/drop.pdf
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/large-icon.imageset/Contents.json b/Gulps/Images.xcassets/large-icon.imageset/Contents.json
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/large-icon.imageset/large-icon.pdf b/Gulps/Images.xcassets/large-icon.imageset/large-icon.pdf
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/medium-icon.imageset/Contents.json b/Gulps/Images.xcassets/medium-icon.imageset/Contents.json
deleted file mode 100755
index 25e8e8f..0000000
--- a/Gulps/Images.xcassets/medium-icon.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "small-icon.pdf"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/Gulps/Images.xcassets/medium-tiny-icon.imageset/Contents.json b/Gulps/Images.xcassets/medium-tiny-icon.imageset/Contents.json
deleted file mode 100755
index 2efb44d..0000000
--- a/Gulps/Images.xcassets/medium-tiny-icon.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "small-tiny-icon.pdf"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/Gulps/Images.xcassets/minus-icon.imageset/Contents.json b/Gulps/Images.xcassets/minus-icon.imageset/Contents.json
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/minus-icon.imageset/minus-icon.pdf b/Gulps/Images.xcassets/minus-icon.imageset/minus-icon.pdf
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/next-icon.imageset/Contents.json b/Gulps/Images.xcassets/next-icon.imageset/Contents.json
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/next-icon.imageset/next-icon.pdf b/Gulps/Images.xcassets/next-icon.imageset/next-icon.pdf
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/plus-icon.imageset/Contents.json b/Gulps/Images.xcassets/plus-icon.imageset/Contents.json
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/plus-icon.imageset/plus-icon.pdf b/Gulps/Images.xcassets/plus-icon.imageset/plus-icon.pdf
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/prev-icon.imageset/Contents.json b/Gulps/Images.xcassets/prev-icon.imageset/Contents.json
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/prev-icon.imageset/prev-icon.pdf b/Gulps/Images.xcassets/prev-icon.imageset/prev-icon.pdf
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/sad.imageset/Contents.json b/Gulps/Images.xcassets/sad.imageset/Contents.json
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/sad.imageset/sad.pdf b/Gulps/Images.xcassets/sad.imageset/sad.pdf
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/settings-icon.imageset/Contents.json b/Gulps/Images.xcassets/settings-icon.imageset/Contents.json
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/settings-icon.imageset/settings-icon.pdf b/Gulps/Images.xcassets/settings-icon.imageset/settings-icon.pdf
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/small-icon.imageset/Contents.json b/Gulps/Images.xcassets/small-icon.imageset/Contents.json
old mode 100755
new mode 100644
index 2fde336..25e8e8f
--- a/Gulps/Images.xcassets/small-icon.imageset/Contents.json
+++ b/Gulps/Images.xcassets/small-icon.imageset/Contents.json
@@ -2,16 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "small-icon copy.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "small-icon.pdf"
     }
   ],
   "info" : {
diff --git a/Gulps/Images.xcassets/small-icon.imageset/small-icon copy.png b/Gulps/Images.xcassets/small-icon.imageset/small-icon copy.png
deleted file mode 100755
index 1322f247ea4171a9d27a58813759fc2c5adaa02b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4378
zcmd5=2~<;88U`VPfLldz10GRvP4ZqgNFV}DL{M1-tP~aU^729=AulFjA0R=k3PoEf
z+KN_G7PlfOiwea!qEso0f`TCEpcSiZRs;l*d10%aX{VjjIcJ)amwVs6|NWQme*b^(
z$u4itl@m>7o9OB3O>}qT`QYtw-D5l+|5dHd%*UGva<`9_dV1t}x<@}U(<xj}&p1}%
z=dbejSi?rJP%<pU1SmN&RE|sQ={Y(@%3&k~RRIDtSR&&PJBlw60f~@9T+i?TJ>*<e
zEOCogpuW+ben@l(!V(glmIIEFY+OMos)B*YP^nDGj^q%B^s@23ZkR#@hD1~$9HNWP
zAmH!e4RA393NXk_5(3ddz>Y<Rm>``2Ed!_^WJduR6p%>*AvS2wrb58ThlpEK2t{lk
zp6iG${Eb5tt5k9}g%S}FL5`r2F-0&1VzF2hkV>IaNw@?_86{J}ktCUN-lzs1szekL
zxk`e`0G&oyfQ6|zMBLNi5JKf+YGuk1m~g--k+7TskwINZLxS@6?EgX#pTGraV}dwD
z9v=T$XK3h{v{JPq9Cv3VuwN)1^+4$tB}XYfs1gfPAn1y4RHm9Y>XlOEgZ_-mA6Sly
zk1ZA=V}|8n3h5A@LWF`!(NNrm5|0WR^HVOyRG3nX{RUcN(_@&)*<1w*t56>PaESO;
zGe{tnM78&W=xoT2O|=Wq#UN*UU_yx~YD~(W1hPmF<Oe})D#)hONT3}X1V==1iV0yA
z{JX;Vmax4Qm@o`M6&#`mi~wG~fIk3%Wc*75)`r0fRW#tubLC<(6&k4;Qt#oxc9$tt
zuna-nc^o3{8(AU|vQZ}0o{CaMBoWF$NpuKANdgdtNK6(AAqYdn00oTE^*js-(?O?O
zKb#ms48e7bp~JRk!FKj^mXKtJ=Ku-sGD$FkM+^!O22DUiAQ2N9)#jy;;JFD)-`A@1
zN{DNuGifLtWkMt>jUgh@?WhomMT0;R$gsBqMJSyqq%(<t5MhfjMJS9DOcDwQqZGL;
zm<asr4HuJQ3VZ|b4Whk2?#|`n@QEZ+d_w87@<YIV1(yl2m`oCt4CxYUh~sQGiBg3r
zqDE5H7u_<_lS+UgTC-t9mv*=gI2;ucM+POo0`eaVXIN>37{yiMgc_y_=tqUvG@K+j
zzlNzYET+Unst8ztx&-4JGFpzjM_CMTxxgZv7!sL|)r&`cL&UHw7{$vVg-H3WV1%eb
z@?JP{SOMd;4^=2RL<EzCqY4!&1Vjof6oBP&sRV&_7*N7x!ja-K20x&}fS<SJH|_l{
zctWAQ2t-gCNeJUfM%QtbMTMy(p*;(-XVGxB*$YMk{C|V@yTSaibo*5%{Cm;(-!Xxr
zJ359LPWe~z55Mz<Y2m8d_@S!I{xd|!%QPFW9b?txzsvh!``DkYA39171^(U{Iy!_O
z%)0K_jR1ccyHlVtJcAUv8^iaGBK#u4b?3SGMILNxjQP~>hgsz>JDSHWA(%y;IL=#p
zteL>zg@i097@s#jleg7%#esm(8fMmh@u?rL-dQb{R;R~{3v6GzmN1~%SbD-|;*!+O
zbiaJ{{(EW*!;|J)`pao4QMbN2SJB$~ebnKvdV1X5p2h}8+`Q6`JyeQr#xzw|*VgXX
zx&Dg40-#PI_-*uczRLLPH~EY#{UU=`#M;|o(S3b=g4(Jd;|Lq4<?q)!r`hxPi|S40
zRY%^?<ZE39m+;xSIS&*U_l&DAnWITEij1@DTxWjA<~Af&<}8?V(?c7iS)Wk4OZ!;c
zzTn>7FnYqIrXuwv!#0L?&9Z|W?IA7e@~frl6wP3&U(ous&PFYUd{zPH)(fq>HeL}F
zF|G4Z`nSgRMQwM(Y}%UV*iAa0Tz^Z-0k`(a6WZQc5ZaXL!vzHw$(d90w<M`qspSoM
zjooMUOXGMyym`E}l%_GN_t~`nj&c2$9cxV&YJV`B>zRw(RBC#*mTu4t1Z)V1s5ZWc
z?9h)dcje{UxjnQh>p48}fn~n6zGsL#I-v@mto1c*nWOD7dNa_Y7jITiQy(r&&zUba
zw5&_jb|iG0J-Tfh7##d)g_J)2nL*Y^eL}t2F8vY4ofYW=F$Zv)*}|1gR(v?+OsY8{
zKmL{G^VITFnjo{6uV<t*-i@Et`({eexfc?PAnBz0x1g5KVvkjyhP12rgRA;!e3Q=2
zrh&yvC5GSFne>KLl^(vgZJN}i>1}#rTEo64i_%}`jGJ`Y@tyhki&xLYn|2DTz9t;3
zZ4OmUY->Je3#Tj(Kan5LePLh{{w_{Z_0B?Wo_k?p!*lU$mveDzNCyYU=Y&*;?}Mvf
zot$)Bx<NrtxVPr=&6(>4c6JlYTanYLHOm**jhnkGIm_qB)O_2ym+$duPa7oD<;p56
z!rS!9hF1I8E|qy&Q<wf7TI*GH?Jji?7G^$R<}f4nn{A;HhRNwq6Cb?{Xce5Np0;&x
zxMY!hbe73+%b36^`Pj7_Xvyk#-pwCwZfQ-)R*NW=y*qz$y>&8G8|xBdFPB_roKKB*
z?jbxK-{zq1A=Z38c<jp^o2DNqsWFJQ0ome*Rws6^)U+gYTjbX7-5>3IYqFJ-zT>o0
zQ>0y!DvvSOvOivIq_UNZt4f!CWHY^IZ>*9zq4+zpWU&$bZ!M)$BSCz$!`sOwT6Wta
zYyMqz`^1B@^R2Ub`?}APZWLr27?m$7OY$>dPfK&$_`1k{`;%n^reWLE`K4)IjPzi_
z9y_Gseq^qG<dRyuQ*Wtn-JtZClud2OgicvTK%(Qp5NogQ%8fogX3uJ`w>PaXTasb@
zX8P)AjjzDG*(FiGa`3Fh$`eQ9PieB1vDL`X*r6GYaTXg$WhtN6eU(v_SCjQ*!GZ#{
z6}N3~kosls2K}g+_qkKlvFgXfnh!Q@*5|NmttPD5>0R!;+$JWl^!d)SrZ0g^^&}%(
zi>`P-g=O-h0P<V#dBngbN~YS%ZNS(hH{^O4{e|(_9Shyv7N<|kt%%{K<yItpJ1elN
z$U1lZ{q1G@0-Vc#=nFJ#O7yPSZGOmpX41I&ySDsGPpax?Zl^!WODMhF+h2C1&Bx@K
z|MS614T$+2_0hGlhKH0T52%X?`Oo$jV?VB=i}oaxTJf{bn(iWHs=Lj*EIkIcoG=Pn
z`mAA+lvMm#9lku?w67a*czttgth!@H7e<U(oi;ziylS%MmTBLajCVDHWmj^G@5kmn
zx{%y^V1|F<7vnB|(kgv@(!FkCp&-qqg!i)D@{vdD#mtPZYvgoZ2S170`f=w2=_4B{
zsV|&NbTCP4FFNuQ<|UnV?S5<T)4+=BP3;a778AOx>l`cQ^+&y%Q`eYe!B47qx~C^v
zQ=RwtN}kp!Z%$cG2*1HX|6$o~O14>HXJSj*+tS_p>VHaVxn1|%W=@{-8A2gkzHNu^
zrMZ>;b=2e{?@L0@$%QpNUf%_})PGu(d%>{blU}yv!UA>sCzbxz51VTn4NE@#W_QW-
zeiffukOrCE#oW8Pcb&jftSN2(RkC18As@z`cprU{(M2xZY*V;*OZJyuNB^;nZg4U2
z=7p$xh!7K{9W;-4xo*$nennHQ=8WD8#Nq?r8~T<zVq5)Gv)rVo^1SpMJ+sK`5{r9J
zPR^Zrqk+?4ec3i|zO|>DLptB$dk=za=SHKt;@7KlX{$C6Ynxqf6!(@qRy*kjEr}|&
zM&bd}&ZzAYKNIn{(=-(t+VRGsb9V~`Az&ln!B!cufr6JVBzOBY&%e9YawRgwD`qSG
zSxB8UGdNE^qw@6LxrF>J#eCmawt{SG#1+xP<P7G9_@zuJnil?b94CDFV5qaxGuuV!
q%>mClny<3{`bXgVM|HuV!PUcV5BA1gSgHH>!hMA&FXuyk!ao67$FSxA

diff --git a/Gulps/Images.xcassets/medium-icon.imageset/small-icon.pdf b/Gulps/Images.xcassets/small-icon.imageset/small-icon.pdf
old mode 100755
new mode 100644
similarity index 100%
rename from Gulps/Images.xcassets/medium-icon.imageset/small-icon.pdf
rename to Gulps/Images.xcassets/small-icon.imageset/small-icon.pdf
diff --git a/Gulps/Images.xcassets/small-tiny-icon.imageset/Contents.json b/Gulps/Images.xcassets/small-tiny-icon.imageset/Contents.json
old mode 100755
new mode 100644
index 9568ee6..2efb44d
--- a/Gulps/Images.xcassets/small-tiny-icon.imageset/Contents.json
+++ b/Gulps/Images.xcassets/small-tiny-icon.imageset/Contents.json
@@ -2,16 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "small-tiny-icon.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "small-tiny-icon.pdf"
     }
   ],
   "info" : {
diff --git a/Gulps/Images.xcassets/medium-tiny-icon.imageset/small-tiny-icon.pdf b/Gulps/Images.xcassets/small-tiny-icon.imageset/small-tiny-icon.pdf
old mode 100755
new mode 100644
similarity index 100%
rename from Gulps/Images.xcassets/medium-tiny-icon.imageset/small-tiny-icon.pdf
rename to Gulps/Images.xcassets/small-tiny-icon.imageset/small-tiny-icon.pdf
diff --git a/Gulps/Images.xcassets/small-tiny-icon.imageset/small-tiny-icon.png b/Gulps/Images.xcassets/small-tiny-icon.imageset/small-tiny-icon.png
deleted file mode 100755
index 120db7d3645ba012e4e632d2911f7874a83622d2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4532
zcmdT|2~<<Z8csk|z-U#F7Esb)6_t=ZkYHF0tD3Ni;L7FZUJ}Vh5)#0IKwGT~V%4f3
zDyUcy^odwR!;&g)1qDH<AQ6<J1ti6afFSkVu+_fTzV@BIbKYrAZf5SxKmYR0_y02|
z+x@xT7!ykq6bgm$_3;Qq+SB@H>SW|su_EUp(ils9!sIBFgRTBS$L6>yQK+d2g5Xd^
zC}$-Tl!zPvo+JWth!sf@X%uRyYpfIiqaXz~0*VxfS-2n7<v6T>$HJ|qaflo#8{!Lm
z;$=`!JU1AOj{+GyoU03VX)F^_Ac7PCHdZ7Q%bBq(+=yN#($^0YaM%$MMHCC?t~ZDc
z<@jUS5*dW0InePSiAuyeG8{;BB9%t6$C8O8M*@*XAky(f5|ik}B$KdX9~@#$#)FxG
z9$sU%kT({NuTV&t1cFMXa!^qmB(g{XiNRnHh-3npj7KE!@;I>qh{cQLw&NN+AUP-#
zNEHH!7^~L^L`Y&3EF9wLXb2+dgj%tD3?>9HLM$L9kQ|8mkVXWh@7Vv9ATognQYHiu
zh&Y`8tWzYKkd`Yvm54iIf&EJHxCip!I4ML3gyfPK83=hQA+f@C+$*^v5c&m|Kd~GU
zpIFQTCk#ttWWo_Vc_0B2LL$V59EplF;ir@@QAp%`$?u>wF+G8ql*yJsfCBPB9u^MS
zY8swM!IK<=NsdekgGr{X(Z?WVawI$f95*55geNlaBvLSm#3WOgNT2A)BofC&5sL8u
z1@MQ$$d)kuWfEQt2+3GD4gg~Pg0P`j643$qQm_FrfJ_mO_4n{%OT-E&RxzTU!(sZ0
z<qALyLcSg>9O9dUK)_?t0g@wwPN(A`It=2eAP>SvKr{$X<dGp{jt;{BIKJLP0><c}
z)2|;*44wo;bWEVbgos26*%5;9bQ+J0C-bNv-U%jycsiLzC6OVjQv_)=Si~DYnE=U6
zK=`g!y;nR$Bbf|DKqOuS9*UqqcxnU$;sFK&ag9NyI)OZpMue$2EDvPD5}61<2qq8#
zkq|*Dj>KVq@rErCN@U0eAR9z^ciflFM&N@5LS#Z7=)DZ<>&d2*5ESra2a-OqMmWy&
z5y%x1S=?Bv20_tdJ)r<QLTe@f>eCL<0Vp9JZfsES8zBF=a7LA?_z<EJA=D^Uh{0r%
zo={ZsI8{c)<Pun+0%VYTB(fpn<;Z`W#aK2QYljd+Al9>b(YS9Q9}q`ENEsyH2)`E$
z50VMq2}cUZ0HpRoGC2zeO2kS?rhs@@SSAr+0jX3d00BJ)1f`faR$M0F$0{V)U$*6U
z?foHmG%C#zpnw1#cA_)zR7wOw11AatPa!)or~ug!B-19q|9^w`hr#^0bo)&v{Cm;(
z-!XxpKRQMkPWV^ykG^}1(!xu>@gr54`B#XJlxZeXJ0_~hf0y^8_9cI{e&{JV68Jl3
z==czFFzdS$Hv;5k;!XjHkqnX{H->=B1vbb<MC<F}9vqw5t&PfGx9Wo%FW#<LVs1wZ
zpIH%dJO%T4_N?t50TqFhcI~Zw->SwWCnPFDxN@q;EZa_tU6yac_s6c-v-5gSvJdUO
zshE)2`{LdC7tu3o_OHFXKg3el(Y5VszsPFh=DX|qODJ8hKU$a`7umO=D>LqH6J>Kl
zK1t<0{|x(v7X1a+%-@)U{<7xp(1>)!&i)H2R<{$i+N9TT(dPM>lXS1IyK1N@({E|3
zCl?v2n-fl`%cGkUG8P=D+w%0hx4&wm>6<-IZST$2d<GYZZiz5*)oivc|5$Uv+#Ybl
z5Vhm123BqH8!pXov2-75)h$VW$p3jti=RAHWneR}!6&1xE%?;Ti{84#$<o=W<=P;P
zk>;_cUXy&h?7e|hb@}B!E_Y^X7E9XSmgI`QX_0d?34;6h9WG0fQ#F~#dm~%zDG!~)
zAATZqDWIk(Z)=~S%1_R`8=2JJE;TsR*sW>LsqN7CZR+^mEYMA@!b_FWaW?0#R?QQr
zyeUIQJ$C{-W~o|;O*+oPxlh!sI-5!Kx`AyQB(Q4+WM!C$`8eOM+whSDUOV)h?RuEA
z)JQQ$SB4s}k}eBq;=_4Yn)~>z=<tAmc(c%^YG*Ek#f6v^)jBox>T5~sORbm>R~zOf
zrz=Y57AGD$a#(4?pQ1~2IA0Vzn4jL=3E99(n>*R-+H@9}?9E{{AC{%4Z6+`EuzZCQ
z6AKBwb?4MJ-1v;1-N$>)q!-dlA6#=86vRIfOggK?q)K(DbDb)0xQ~3t53`%SZSWj_
zlIWVY#dzsd>oxmbAovodsZ8B6ZC&8vBOrWO-K?y6x^S;S(^j>_z`_39qe$511Fs=n
z;!?q;M{kbzs#>X(hu>W<y7t4>ihCcHeWpI<XPY@Ci7+Fo1uili2+38D&jX=D$Gj}v
zS2Pd5R~uIuw6oUlj!?9X6CYAC&@|oNVL1W4FujpdD0Hk6ubh^eb;pHmo4Gmp9~gCV
zMC~nFPOU+!)irVC8vZ1F@ldwr+DYS^sPEDn>redPO$v1NU{)BGn3Pmj6{#M;X6udp
zZ28wLEg!!j^c)GG@!%=^d9-JH7M$=gP0g~lX4z!FDCv0!H}uC<i!XlQiRL;MmIpU)
z*{?NTVavae;pNniZn25^<horGbNQB-``z4(=iW6DYnthnwvE+Q&v!5fgLXBip(!?|
z(XD2bA@9RO4fk@S)Ra^5qwUw8zlxy=;kSl~{toEX4fQ|IubJAJIOBYN@t`wh$p1)!
ztRM8P8`!XV{|5A&!;OXb{=CAq0FRY&WoSF~s&P&9fj4%C8tXLOIkih$<uU!XXYvhA
z@|UcC<SF;>?0tElt83@#*Nv5ZX{|bWa^>=zjp>a`z|Om+nteH4JCo!$?;rHPfU!Go
z?Q}{pd@51-L}xgRI@FkVGL3rhY)99n3^HR%Z*6V+5zPUyqY(1|yL_m)p#9X&<^-4Y
zN^+LYWyXL<t|F4OBc`z1ZqQILr@k%cr>^9*>7@n6`ye-8Q=)a)mBh%`HyWqkwtZ64
zH$33C`@%QAd!pQ2AIXM)PB#TzT8eYq2jec6XH>sBxN*ak64BF>u}S+L6E3cEH3?;I
zP5ktW^={hX_rra2djkV({I+FuOM<MveU`mol@gs(fO@ctq8+|f)W7TTu4q+wrfeF&
ztG3zerRk|?=5Y?bE2ly}?T1{^rn#=?Lry63NXJ6+SML4Dh#D5Una~u~Z%+4WJ7L#&
zo0PS)>HhS*Qj2cZ+JKGg0*=Lp8Qs^W9WTh_G`e-&oN=$s{1q70?THODGK*z<CPbbs
zJ>6HdBR*tfSlEHJZWh7!^HKsX^{1*0?|na~=1hy@a^l^*(`ivhJ0G;qsj*nnx$2wK
zbzdc$n_u!|U_#W*27^4$1fxaRHW^xAUV7&BvA4Meglt}aE?2e1GB)V&;Y$Y3P@6lu
z&AXCb1^byavg4ywSx@?M4?LV|vgq^f5(}sDt$okFC`-_-(9G3f6h{ksZ$_B!wQr9d
zj4(|#+O&54^k()edA+;6Exw@e%FXUX=ajOQyR2utSdm<0sxUuiROaGFd6|6B*XEY<
zc4}jreeGA&G+p$@q2$?BLT_$bP?*y8boy|;)&|ARE3RDaWBU1e@1fV}tDf#HGyZ<@
zR!8T~rxA@kLdY@2pm=C;YeSeW5qu$+Sg3XVJ=)tFYL6GaO(D)c6Lm1k4KrXUeQJMr
zsb4(z%4fY7TY=h7cLUaCk%iw>O?NO%N6PX6$PL|`VBBGzP*Huf#bn(kc#2JC=De>i
zSo=}X{`phNcl3Tt+3TEC`R(JXup+b(v5=#=UXd>DXN5xr;?sLxd{|bcZNW4z8*1!}
z8CclkNl~jir|T<ZSXvgP>bZNZ+Ih7>b^U|h*(X)|xgBPAGX;}Gk9FRA%6eXzcu_DC
z3qkIYwMpt5mlxch@9*X;?Z32V4tD@0_;mfUS0|q-`}UMQf~`8J^*<(`g&QiZP?Us@
zn0>ifNqx7p7JFefem=`HV?|qVy}0&r-LoW%Dq+6{LvNbfaBji!5cHR~PgwZQ$}m`*
iy(sJN)-=6E|5WnH$8|p0$X_ogl&>e(<J_|Flz#$8iV;Zw

diff --git a/Gulps/Images.xcassets/smile.imageset/Contents.json b/Gulps/Images.xcassets/smile.imageset/Contents.json
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/smile.imageset/smile.pdf b/Gulps/Images.xcassets/smile.imageset/smile.pdf
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/star.imageset/Contents.json b/Gulps/Images.xcassets/star.imageset/Contents.json
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/star.imageset/star.pdf b/Gulps/Images.xcassets/star.imageset/star.pdf
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/stats-icon.imageset/Contents.json b/Gulps/Images.xcassets/stats-icon.imageset/Contents.json
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/stats-icon.imageset/stats-icon.pdf b/Gulps/Images.xcassets/stats-icon.imageset/stats-icon.pdf
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/tiny-add.imageset/Contents.json b/Gulps/Images.xcassets/tiny-add.imageset/Contents.json
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/tiny-add.imageset/tiny-add.pdf b/Gulps/Images.xcassets/tiny-add.imageset/tiny-add.pdf
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/tiny-check.imageset/Contents.json b/Gulps/Images.xcassets/tiny-check.imageset/Contents.json
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/tiny-check.imageset/tiny-check.pdf b/Gulps/Images.xcassets/tiny-check.imageset/tiny-check.pdf
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/tiny-x.imageset/Contents.json b/Gulps/Images.xcassets/tiny-x.imageset/Contents.json
old mode 100755
new mode 100644
diff --git a/Gulps/Images.xcassets/tiny-x.imageset/tiny-x.pdf b/Gulps/Images.xcassets/tiny-x.imageset/tiny-x.pdf
old mode 100755
new mode 100644
diff --git a/Gulps/Info.plist b/Gulps/Info.plist
old mode 100755
new mode 100644
diff --git a/Gulps/Model/Entry.swift b/Gulps/Model/Entry.swift
old mode 100755
new mode 100644
diff --git a/Gulps/Model/EntryHandler.swift b/Gulps/Model/EntryHandler.swift
old mode 100755
new mode 100644
diff --git a/Gulps/Model/Gulp.swift b/Gulps/Model/Gulp.swift
old mode 100755
new mode 100644
diff --git a/Gulps/Resources/Fonts/KaushanScript.ttf b/Gulps/Resources/Fonts/KaushanScript.ttf
old mode 100755
new mode 100644
diff --git a/Gulps/Resources/Fonts/Lato-Light.ttf b/Gulps/Resources/Fonts/Lato-Light.ttf
old mode 100755
new mode 100644
diff --git a/Gulps/Resources/drop.caf b/Gulps/Resources/drop.caf
old mode 100755
new mode 100644
diff --git a/Gulps/Resources/en.lproj/Localizable.strings b/Gulps/Resources/en.lproj/Localizable.strings
old mode 100755
new mode 100644
index e2353bb..2de35aa
--- a/Gulps/Resources/en.lproj/Localizable.strings
+++ b/Gulps/Resources/en.lproj/Localizable.strings
@@ -3,10 +3,8 @@
 "Liters" = "Liters";
 "Ounces" = "Ounces";
 "gulp.big" = "Big Gulp";
-"gulp.medium" = "Medium Gulp";
 "gulp.small" = "Small Gulp";
 
-
 /* Main */
 "drink title" = "Drink!";
 "undo poptip" = "Tap here to undo your latest action";
diff --git a/Gulps/Resources/it.lproj/Localizable.strings b/Gulps/Resources/it.lproj/Localizable.strings
old mode 100755
new mode 100644
index a14c82c..b9595db
--- a/Gulps/Resources/it.lproj/Localizable.strings
+++ b/Gulps/Resources/it.lproj/Localizable.strings
@@ -3,7 +3,6 @@
 "Liters" = "Litri";
 "Ounces" = "Once";
 "gulp.big" = "Big Gulp";
-"gulp.medium" = "Medium Gulp";
 "gulp.small" = "Small Gulp";
 
 /* Main */
diff --git a/Gulps/Resources/ru.lproj/Localizable.strings b/Gulps/Resources/ru.lproj/Localizable.strings
old mode 100755
new mode 100644
diff --git a/Gulps/Resources/tr.lproj/Localizable.strings b/Gulps/Resources/tr.lproj/Localizable.strings
old mode 100755
new mode 100644
diff --git a/Gulps/Support/AnimatedShareButton.swift b/Gulps/Support/AnimatedShareButton.swift
old mode 100755
new mode 100644
diff --git a/Gulps/Support/Colors.swift b/Gulps/Support/Colors.swift
old mode 100755
new mode 100644
diff --git a/Gulps/Support/Constants.swift b/Gulps/Support/Constants.swift
old mode 100755
new mode 100644
index 048b8c4..9816e6e
--- a/Gulps/Support/Constants.swift
+++ b/Gulps/Support/Constants.swift
@@ -53,15 +53,13 @@ public enum Constants {
   }
 
   public enum Gulp: Int {
-    case big, medium, small, goal
+    case big, small, goal
     public func key() -> String {
       switch self {
       case .big:
         return "GULP_BIG"
       case .small:
         return "GULP_SMALL"
-      case .medium:
-        return "GULP_MEDIUM"
       case .goal:
         return "PORTION_GOAL"
       }
diff --git a/Gulps/Support/Extensions.swift b/Gulps/Support/Extensions.swift
old mode 100755
new mode 100644
diff --git a/Gulps/Support/Globals.swift b/Gulps/Support/Globals.swift
old mode 100755
new mode 100644
diff --git a/Gulps/Support/HealthKitHelper.swift b/Gulps/Support/HealthKitHealper.swift
old mode 100755
new mode 100644
similarity index 100%
rename from Gulps/Support/HealthKitHelper.swift
rename to Gulps/Support/HealthKitHealper.swift
diff --git a/Gulps/Support/NotificationHelper.swift b/Gulps/Support/NotificationHelper.swift
old mode 100755
new mode 100644
index 3f54f7a..0a510a7
--- a/Gulps/Support/NotificationHelper.swift
+++ b/Gulps/Support/NotificationHelper.swift
@@ -53,14 +53,7 @@ class NotificationHelper {
     smallAction.activationMode = .background
     smallAction.isAuthenticationRequired = false
     smallAction.isDestructive = false
-    
-    let mediumAction = UIMutableUserNotificationAction()
-    mediumAction.identifier = "MEDIUM_ACTION"
-    mediumAction.title = "Medium Gulp"
-    mediumAction.activationMode = .background
-    mediumAction.isAuthenticationRequired = false
-    mediumAction.isDestructive = false
-    
+
     let bigAction = UIMutableUserNotificationAction()
     bigAction.identifier = "BIG_ACTION"
     bigAction.title = "Big Gulp"
@@ -70,8 +63,8 @@ class NotificationHelper {
 
     let gulpCategory = UIMutableUserNotificationCategory()
     gulpCategory.identifier = "GULP_CATEGORY"
-    gulpCategory.setActions([smallAction,mediumAction, bigAction], for: .default)
-    gulpCategory.setActions([smallAction, mediumAction, bigAction], for: .minimal)
+    gulpCategory.setActions([smallAction, bigAction], for: .default)
+    gulpCategory.setActions([smallAction, bigAction], for: .minimal)
 
     let categories = NSSet(object: gulpCategory) as! Set<UIUserNotificationCategory>
     let settings = UIUserNotificationSettings(types: [.alert, .sound], categories: categories)
@@ -86,9 +79,6 @@ class NotificationHelper {
       if (identifier == "SMALL_ACTION") {
         NotificationHelper.addGulp(Constants.Gulp.small.key())
       }
-      if (identifier == "MEDIUM_ACTION"){
-        NotificationHelper.addGulp(Constants.Gulp.medium.key())
-      }
     }
   }
 
diff --git a/Gulps/Support/RLMSupport.swift b/Gulps/Support/RLMSupport.swift
old mode 100755
new mode 100644
diff --git a/Gulps/Support/Settings.swift b/Gulps/Support/Settings.swift
old mode 100755
new mode 100644
index 1b48f7f..74f327b
--- a/Gulps/Support/Settings.swift
+++ b/Gulps/Support/Settings.swift
@@ -9,7 +9,6 @@ open class Settings {
       userDefaults.set(true, forKey: "DEFAULTS_INSTALLED")
       userDefaults.set(Constants.UnitsOfMeasure.liters.rawValue, forKey: Constants.General.unitOfMeasure.key())
       userDefaults.set(0.5, forKey: Constants.Gulp.big.key())
-      userDefaults.set(0.3, forKey: Constants.Gulp.medium.key())
       userDefaults.set(0.2, forKey: Constants.Gulp.small.key())
       userDefaults.set(2, forKey: Constants.Gulp.goal.key())
       userDefaults.set(false, forKey: Constants.Health.on.key())
@@ -24,7 +23,6 @@ open class Settings {
   open class func registerDefaultsForLiter() {
     let userDefaults = UserDefaults.groupUserDefaults()
     userDefaults.set(0.5, forKey: Constants.Gulp.big.key())
-    userDefaults.set(0.3, forKey: Constants.Gulp.medium.key())
     userDefaults.set(0.2, forKey: Constants.Gulp.small.key())
     userDefaults.set(2, forKey: Constants.Gulp.goal.key())
     userDefaults.synchronize()
@@ -33,7 +31,6 @@ open class Settings {
   open class func registerDefaultsForOunces() {
     let userDefaults = UserDefaults.groupUserDefaults()
     userDefaults.set(16, forKey: Constants.Gulp.big.key())
-    userDefaults.set(12, forKey: Constants.Gulp.medium.key())
     userDefaults.set(8, forKey: Constants.Gulp.small.key())
     userDefaults.set(64, forKey: Constants.Gulp.goal.key())
     userDefaults.synchronize()
@@ -45,7 +42,6 @@ open class Settings {
       Constants.Gulp.goal.key(): userDefaults.double(forKey: Constants.Gulp.goal.key()),
       Constants.WatchContext.current.key(): current,
       Constants.Gulp.small.key(): userDefaults.double(forKey: Constants.Gulp.small.key()),
-      Constants.Gulp.medium.key(): userDefaults.double(forKey: Constants.Gulp.medium.key()),
       Constants.Gulp.big.key(): userDefaults.double(forKey: Constants.Gulp.big.key())]
   }
 }
diff --git a/Gulps/Support/UINavigationController-StatusBar.swift b/Gulps/Support/UINavigationController-StatusBar.swift
old mode 100755
new mode 100644
diff --git a/Gulps/Support/WatchConnectivityHelper.swift b/Gulps/Support/WatchConnectivityHelper.swift
old mode 100755
new mode 100644
diff --git a/Gulps/ViewControllers/CalendarViewController.swift b/Gulps/ViewControllers/CalendarViewController.swift
old mode 100755
new mode 100644
index a377177..3392b71
--- a/Gulps/ViewControllers/CalendarViewController.swift
+++ b/Gulps/ViewControllers/CalendarViewController.swift
@@ -28,9 +28,6 @@ class CalendarViewController: UIViewController {
     actionSheet?.addButton(withTitle: NSLocalizedString("gulp.small", comment: ""), type: .default) { _ in
       self.addExtraGulp(ofSize: .small)
     }
-    actionSheet?.addButton(withTitle: NSLocalizedString("gulp.medium", comment: ""), type: .default) { _ in
-      self.addExtraGulp(ofSize: .medium)
-    }
     actionSheet?.addButton(withTitle: NSLocalizedString("gulp.big", comment: ""), type: .default) { _ in
       self.addExtraGulp(ofSize: .big)
     }
diff --git a/Gulps/ViewControllers/DrinkViewController.swift b/Gulps/ViewControllers/DrinkViewController.swift
old mode 100755
new mode 100644
index bc55092..ac01ff8
--- a/Gulps/ViewControllers/DrinkViewController.swift
+++ b/Gulps/ViewControllers/DrinkViewController.swift
@@ -11,7 +11,6 @@ open class DrinkViewController: UIViewController, UIAlertViewDelegate, UIViewCon
   @IBOutlet open weak var addButton: UIButton!
   @IBOutlet open weak var smallButton: UIButton!
   @IBOutlet open weak var largeButton: UIButton!
-  @IBOutlet open weak var mediumButton: UIButton!
   @IBOutlet open weak var minusButton: UIButton!
   @IBOutlet weak var starButton: UIButton!
   @IBOutlet weak var meterContainerView: UIView!
@@ -141,20 +140,8 @@ open class DrinkViewController: UIViewController, UIAlertViewDelegate, UIViewCon
                                  popTipText: NSLocalizedString("undo poptip", comment: ""),
                                  inView: view,
                                  fromFrame: minusButton.frame)
-    
-    
-    if sender == smallButton{
-      updateCurrentEntry(userDefaults.double(forKey: Constants.Gulp.small.key()))
-    } else if sender == mediumButton{
-      updateCurrentEntry(userDefaults.double(forKey: Constants.Gulp.medium.key()))
-    } else if sender == largeButton{
-      updateCurrentEntry(userDefaults.double(forKey: Constants.Gulp.big.key()))
-    }
-    
-    /*
     let portion = smallButton == sender ? Constants.Gulp.small.key() : Constants.Gulp.big.key()
     updateCurrentEntry(userDefaults.double(forKey: portion))
-     */
   }
 
   @IBAction func removeGulpAction() {
diff --git a/Gulps/ViewControllers/FeedbackViewController.swift b/Gulps/ViewControllers/FeedbackViewController.swift
old mode 100755
new mode 100644
diff --git a/Gulps/ViewControllers/Onboarding/GoalViewController.swift b/Gulps/ViewControllers/Onboarding/GoalViewController.swift
old mode 100755
new mode 100644
diff --git a/Gulps/ViewControllers/Onboarding/GulpsViewController.swift b/Gulps/ViewControllers/Onboarding/GulpsViewController.swift
old mode 100755
new mode 100644
index 807b176..f769d5e
--- a/Gulps/ViewControllers/Onboarding/GulpsViewController.swift
+++ b/Gulps/ViewControllers/Onboarding/GulpsViewController.swift
@@ -1,35 +1,25 @@
 import UIKit
 import pop
 
-// TO-DO: Fix timing of medium gulp onboarding
-
 class GulpsViewController: OnboardingViewController, UITextFieldDelegate {
 
   @IBOutlet weak var smallGulpText: UITextField!
   @IBOutlet weak var bigGulpText: UITextField!
   @IBOutlet weak var smallSuffixLabel: UILabel!
   @IBOutlet weak var bigSuffixLabel: UILabel!
-  @IBOutlet weak var mediumSuffixLabel: UILabel!
-  @IBOutlet weak var mediumGulpText: UITextField!
   @IBOutlet weak var headerLabel: UILabel!
   @IBOutlet weak var smallBackgroundView: UIView!
   @IBOutlet weak var bigBackgroundView: UIView!
-  @IBOutlet weak var mediumBackgroundView: UIView!
-    
-    
+
   let userDefaults = UserDefaults.groupUserDefaults()
 
   override func viewDidLoad() {
     super.viewDidLoad()
 
     self.smallGulpText.inputAccessoryView = Globals.numericToolbar(self, selector: #selector(GulpsViewController.dismissAndSave))
-    
-    self.mediumGulpText.inputAccessoryView = Globals.numericToolbar(self, selector: #selector(GulpsViewController.dismissAndSave))
-    
     self.bigGulpText.inputAccessoryView = Globals.numericToolbar(self, selector: #selector(GulpsViewController.dismissAndSave))
 
     self.smallBackgroundView.addGestureRecognizer(UITapGestureRecognizer(target: self.smallGulpText, action: #selector(UIResponder.becomeFirstResponder)))
-    self.mediumBackgroundView.addGestureRecognizer(UITapGestureRecognizer(target: self.mediumGulpText, action: #selector(UIResponder.becomeFirstResponder)))
     self.bigBackgroundView.addGestureRecognizer(UITapGestureRecognizer(target: self.bigGulpText, action: #selector(UIResponder.becomeFirstResponder)))
 
     NotificationCenter.default.addObserver(self, selector: #selector(GulpsViewController.keyboardWillShow(_:)), name: NSNotification.Name.UIKeyboardWillShow, object: nil)
@@ -40,25 +30,19 @@ class GulpsViewController: OnboardingViewController, UITextFieldDelegate {
     let numberFormatter = NumberFormatter()
     numberFormatter.numberStyle = .decimal
 
-    _ = [self.smallGulpText, self.mediumGulpText, self.bigGulpText].map({$0.resignFirstResponder()})
+    _ = [self.smallGulpText, self.bigGulpText].map({$0.resignFirstResponder()})
 
     var small = 0.0
-    var medium = 0.0
     var big = 0.0
     if let number = numberFormatter.number(from: self.smallGulpText.text ?? "0") {
       small = number.doubleValue
     }
-    
-    if let number = numberFormatter.number(from: self.mediumGulpText.text ?? "0") {
-      medium = number.doubleValue
-    }
 
     if let number = numberFormatter.number(from: self.bigGulpText.text ?? "0") {
       big = number.doubleValue
     }
 
     self.userDefaults.set(small, forKey: Constants.Gulp.small.key())
-    self.userDefaults.set(medium, forKey: Constants.Gulp.medium.key())
     self.userDefaults.set(big, forKey: Constants.Gulp.big.key())
     self.userDefaults.synchronize()
   }
@@ -75,19 +59,17 @@ class GulpsViewController: OnboardingViewController, UITextFieldDelegate {
     let numberFormatter = NumberFormatter()
     numberFormatter.numberStyle = .decimal
     self.smallGulpText.text = numberFormatter.string(for: self.userDefaults.double(forKey: Constants.Gulp.small.key()))
-    self.mediumGulpText.text = numberFormatter.string(for: self.userDefaults.double(forKey: Constants.Gulp.medium.key()))
     self.bigGulpText.text = numberFormatter.string(for: self.userDefaults.double(forKey: Constants.Gulp.big.key()))
     let unit = Constants.UnitsOfMeasure(rawValue: self.userDefaults.integer(forKey: Constants.General.unitOfMeasure.key()))
 
     if let unit = unit {
       self.smallSuffixLabel.text = unit.suffixForUnitOfMeasure()
-      self.mediumSuffixLabel.text = unit.suffixForUnitOfMeasure()
       self.bigSuffixLabel.text = unit.suffixForUnitOfMeasure()
     }
   }
 
   override func touchesEnded(_ touches: Set<UITouch>, with event: UIEvent?) {
-    _ = [self.smallGulpText, self.mediumGulpText, self.bigGulpText].map({$0.resignFirstResponder()})
+    _ = [self.smallGulpText, self.bigGulpText].map({$0.resignFirstResponder()})
   }
 
   @objc func keyboardWillShow(_ notification: Notification) {
diff --git a/Gulps/ViewControllers/Onboarding/MeasureViewController.swift b/Gulps/ViewControllers/Onboarding/MeasureViewController.swift
old mode 100755
new mode 100644
diff --git a/Gulps/ViewControllers/Onboarding/NotificationViewController.swift b/Gulps/ViewControllers/Onboarding/NotificationViewController.swift
old mode 100755
new mode 100644
diff --git a/Gulps/ViewControllers/Onboarding/OnboardingViewController.swift b/Gulps/ViewControllers/Onboarding/OnboardingViewController.swift
old mode 100755
new mode 100644
diff --git a/Gulps/ViewControllers/SettingsViewController.swift b/Gulps/ViewControllers/SettingsViewController.swift
old mode 100755
new mode 100644
index 5d76e11..5ca1484
--- a/Gulps/ViewControllers/SettingsViewController.swift
+++ b/Gulps/ViewControllers/SettingsViewController.swift
@@ -6,7 +6,6 @@ class SettingsViewController: UITableViewController, UIAlertViewDelegate, UIText
 
   @IBOutlet weak var unitOfMesureLabel: UILabel!
   @IBOutlet weak var smallPortionText: UITextField!
-  @IBOutlet weak var mediumPortionText: UITextField!
   @IBOutlet weak var largePortionText: UITextField!
   @IBOutlet weak var dailyGoalText: UITextField!
   @IBOutlet weak var notificationSwitch: UISwitch!
@@ -55,7 +54,6 @@ class SettingsViewController: UITableViewController, UIAlertViewDelegate, UIText
 
     _ = uomLabels.map({$0.text = suffix})
     largePortionText.text = numberFormatter.string(for: userDefaults.double(forKey: Constants.Gulp.big.key()))
-    mediumPortionText.text = numberFormatter.string(for: userDefaults.double(forKey: Constants.Gulp.medium.key()))
     smallPortionText.text = numberFormatter.string(for: userDefaults.double(forKey: Constants.Gulp.small.key()))
     dailyGoalText.text = numberFormatter.string(for: userDefaults.double(forKey: Constants.Gulp.goal.key()))
 
@@ -156,7 +154,7 @@ class SettingsViewController: UITableViewController, UIAlertViewDelegate, UIText
     if (section == 0) {
       return 1
     } else if (section == 1) {
-      return 4
+      return 3
     } else if (section == 2) {
       if UserDefaults.groupUserDefaults().bool(forKey: Constants.Notification.on.key()) {
         return 4
@@ -175,9 +173,6 @@ class SettingsViewController: UITableViewController, UIAlertViewDelegate, UIText
     if (textField == largePortionText) {
       storeText(largePortionText, toKey: Constants.Gulp.big.key())
     }
-    if (textField == mediumPortionText) {
-      storeText(mediumPortionText, toKey: Constants.Gulp.medium.key())
-    }
     if (textField == dailyGoalText) {
       storeText(dailyGoalText, toKey: Constants.Gulp.goal.key())
     }
diff --git a/Gulps/ViewControllers/Support/CalendarViewController+Animations.swift b/Gulps/ViewControllers/Support/CalendarViewController+Animations.swift
old mode 100755
new mode 100644
diff --git a/Gulps/ViewControllers/Support/DrinkViewController+Animations.swift b/Gulps/ViewControllers/Support/DrinkViewController+Animations.swift
old mode 100755
new mode 100644
index 559eebf..1957143
--- a/Gulps/ViewControllers/Support/DrinkViewController+Animations.swift
+++ b/Gulps/ViewControllers/Support/DrinkViewController+Animations.swift
@@ -4,7 +4,6 @@ extension DrinkViewController {
 
   func initAnimation() {
     smallButton.alpha = 0
-    mediumButton.alpha = 0
     largeButton.alpha = 0
     starButton.transform = CGAffineTransform(scaleX: 0.0001, y: 0.0001)
   }
@@ -31,7 +30,7 @@ extension DrinkViewController {
     starButton.pop_add(scale, forKey: "scale")
     starButton.layer.pop_add(rotate, forKey: "rotate")
   }
-  
+
   func expandAddButton() {
     addButton.isUserInteractionEnabled = false
 
@@ -42,7 +41,7 @@ extension DrinkViewController {
     rotate?.removedOnCompletion = true
     rotate?.completionBlock = { (_, _) in
       self.addButton.isUserInteractionEnabled = true
-      _ = [self.smallButton,self.mediumButton, self.largeButton].map({$0.isUserInteractionEnabled = true})
+      _ = [self.smallButton, self.largeButton].map({$0.isUserInteractionEnabled = true})
       self.expanded = true
     }
 
@@ -68,8 +67,8 @@ extension DrinkViewController {
     addButton.pop_add(color, forKey: "color")
     minusButton.pop_add(scaleMinus, forKey: "scaleMinus")
 
-    [smallButton,mediumButton, largeButton].forEach {$0.alpha = 1}
-    for button in [smallButton,mediumButton, largeButton] {
+    [smallButton, largeButton].forEach {$0.alpha = 1}
+    for button in [smallButton, largeButton] {
       let pop = POPSpringAnimation(propertyNamed: kPOPViewScaleXY)
       pop?.fromValue = NSValue(cgPoint: CGPoint(x: 0.1, y: 0.1))
       pop?.toValue = NSValue(cgPoint: CGPoint(x: 1, y: 1))
@@ -89,18 +88,10 @@ extension DrinkViewController {
     right?.fromValue = 0
     right?.toValue = 100
     largeButton.layer.pop_add(right, forKey: "right")
-    
-    let up = POPSpringAnimation(propertyNamed:
-        kPOPLayerTranslationY)
-    up?.springBounciness = 5
-    up?.fromValue = 0
-    up?.toValue = -100
-    mediumButton.layer.pop_add(up, forKey: "up")
-    
   }
 
   func contractAddButton() {
-    [smallButton, mediumButton, largeButton].forEach {$0?.isUserInteractionEnabled = false}
+    [smallButton, largeButton].forEach {$0.isUserInteractionEnabled = false}
     addButton.isUserInteractionEnabled = false
 
     let rotate = POPSpringAnimation(propertyNamed: kPOPLayerRotation)
@@ -133,7 +124,7 @@ extension DrinkViewController {
     addButton.pop_add(color, forKey: "color")
     minusButton.pop_add(scaleMinus, forKey: "scaleMinus")
 
-    for button in [smallButton, mediumButton, largeButton] {
+    for button in [smallButton, largeButton] {
       let pop = POPSpringAnimation(propertyNamed: kPOPViewScaleXY)
       pop?.fromValue = NSValue(cgPoint: CGPoint(x: 1, y: 1))
       pop?.toValue = NSValue(cgPoint: CGPoint(x: 0.1, y: 0.1))
@@ -153,14 +144,5 @@ extension DrinkViewController {
     right?.fromValue = 100
     right?.toValue = 0
     largeButton.layer.pop_add(right, forKey: "right")
-    
-    let up = POPBasicAnimation(propertyNamed:
-        kPOPLayerTranslationY)
-    up?.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseOut)
-    up?.fromValue = -100
-    up?.toValue = 0
-    mediumButton.layer.pop_add(up, forKey:
-        "up")
-    
   }
 }
diff --git a/Gulps/it.lproj/InfoPlist.strings b/Gulps/it.lproj/InfoPlist.strings
old mode 100755
new mode 100644
diff --git a/Gulps/it.lproj/Main.strings b/Gulps/it.lproj/Main.strings
old mode 100755
new mode 100644
diff --git a/Gulps/it.lproj/Onboarding.strings b/Gulps/it.lproj/Onboarding.strings
old mode 100755
new mode 100644
diff --git a/Gulps/ru.lproj/InfoPlist.strings b/Gulps/ru.lproj/InfoPlist.strings
old mode 100755
new mode 100644
diff --git a/Gulps/ru.lproj/LaunchScreen.strings b/Gulps/ru.lproj/LaunchScreen.strings
old mode 100755
new mode 100644
diff --git a/Gulps/ru.lproj/Main.strings b/Gulps/ru.lproj/Main.strings
old mode 100755
new mode 100644
diff --git a/Gulps/ru.lproj/Onboarding.strings b/Gulps/ru.lproj/Onboarding.strings
old mode 100755
new mode 100644
diff --git a/Gulps/tr.lproj/InfoPlist.strings b/Gulps/tr.lproj/InfoPlist.strings
old mode 100755
new mode 100644
diff --git a/Gulps/tr.lproj/LaunchScreen.strings b/Gulps/tr.lproj/LaunchScreen.strings
old mode 100755
new mode 100644
diff --git a/Gulps/tr.lproj/Main.strings b/Gulps/tr.lproj/Main.strings
old mode 100755
new mode 100644
diff --git a/Gulps/tr.lproj/Onboarding.strings b/Gulps/tr.lproj/Onboarding.strings
old mode 100755
new mode 100644

From 80620dd379c00b56dbd7125071afcc049d7d008c Mon Sep 17 00:00:00 2001
From: Craig Scott <craigscott@craigs-macbook-air.local>
Date: Thu, 13 Sep 2018 17:04:47 -0700
Subject: [PATCH 3/3] Added Medium Button

---
 Gulps.xcodeproj/project.pbxproj               |  21 +-
 Gulps/AppDelegate.swift                       |   3 +
 Gulps/Base.lproj/InfoPlist.strings            |   0
 Gulps/Base.lproj/LaunchScreen.xib             |   0
 Gulps/Base.lproj/Main.storyboard              |  84 ++++-
 Gulps/Base.lproj/Onboarding.storyboard        | 299 +++++++++++-------
 Gulps/Gulps.entitlements                      |   0
 .../AppIcon.appiconset/Contents.json          |   0
 .../AppIcon.appiconset/Icon Copy-40.png       | Bin
 .../AppIcon.appiconset/Icon Copy-60.png       | Bin
 .../AppIcon.appiconset/Icon-120-1.png         | Bin
 .../AppIcon.appiconset/Icon-120.png           | Bin
 .../AppIcon.appiconset/Icon-180.png           | Bin
 .../AppIcon.appiconset/Icon-58.png            | Bin
 .../AppIcon.appiconset/Icon-80.png            | Bin
 .../AppIcon.appiconset/Icon-87.png            | Bin
 .../AppIcon.appiconset/Icon.png               | Bin
 Gulps/Images.xcassets/Contents.json           |   0
 .../big-tiny-icon.imageset/Contents.json      |   0
 .../big-tiny-icon.imageset/big-tiny-icon.pdf  | Bin
 .../blue-check-icon.imageset/Contents.json    |   0
 .../blue-check-icon.pdf                       | Bin
 .../calendar-icon.imageset/Contents.json      |   0
 .../calendar-icon.imageset/calendar-icon.pdf  | Bin
 .../check-icon.imageset/Contents.json         |   0
 .../check-icon.imageset/check-icon.pdf        | Bin
 .../drink-icon.imageset/Contents.json         |   0
 .../drink-icon.imageset/drink-icon.pdf        | Bin
 .../drop-bg.imageset/Contents.json            |   0
 .../drop-bg.imageset/drop-bg.pdf              | Bin
 .../drop.imageset/Contents.json               |   0
 Gulps/Images.xcassets/drop.imageset/drop.pdf  | Bin
 .../large-icon.imageset/Contents.json         |   0
 .../large-icon.imageset/large-icon.pdf        | Bin
 .../minus-icon.imageset/Contents.json         |   0
 .../minus-icon.imageset/minus-icon.pdf        | Bin
 .../next-icon.imageset/Contents.json          |   0
 .../next-icon.imageset/next-icon.pdf          | Bin
 .../plus-icon.imageset/Contents.json          |   0
 .../plus-icon.imageset/plus-icon.pdf          | Bin
 .../prev-icon.imageset/Contents.json          |   0
 .../prev-icon.imageset/prev-icon.pdf          | Bin
 .../sad.imageset/Contents.json                |   0
 Gulps/Images.xcassets/sad.imageset/sad.pdf    | Bin
 .../settings-icon.imageset/Contents.json      |   0
 .../settings-icon.imageset/settings-icon.pdf  | Bin
 .../small-icon.imageset/Contents.json         |  11 +-
 .../small-tiny-icon.imageset/Contents.json    |  11 +-
 .../smile.imageset/Contents.json              |   0
 .../Images.xcassets/smile.imageset/smile.pdf  | Bin
 .../star.imageset/Contents.json               |   0
 Gulps/Images.xcassets/star.imageset/star.pdf  | Bin
 .../stats-icon.imageset/Contents.json         |   0
 .../stats-icon.imageset/stats-icon.pdf        | Bin
 .../tiny-add.imageset/Contents.json           |   0
 .../tiny-add.imageset/tiny-add.pdf            | Bin
 .../tiny-check.imageset/Contents.json         |   0
 .../tiny-check.imageset/tiny-check.pdf        | Bin
 .../tiny-x.imageset/Contents.json             |   0
 .../tiny-x.imageset/tiny-x.pdf                | Bin
 Gulps/Info.plist                              |   0
 Gulps/Model/Entry.swift                       |   0
 Gulps/Model/EntryHandler.swift                |   0
 Gulps/Model/Gulp.swift                        |   0
 Gulps/Resources/Fonts/KaushanScript.ttf       | Bin
 Gulps/Resources/Fonts/Lato-Light.ttf          | Bin
 Gulps/Resources/drop.caf                      | Bin
 Gulps/Resources/en.lproj/Localizable.strings  |   2 +
 Gulps/Resources/it.lproj/Localizable.strings  |   1 +
 Gulps/Resources/ru.lproj/Localizable.strings  |   0
 Gulps/Resources/tr.lproj/Localizable.strings  |   0
 Gulps/Support/AnimatedShareButton.swift       |   0
 Gulps/Support/Colors.swift                    |   0
 Gulps/Support/Constants.swift                 |   4 +-
 Gulps/Support/Extensions.swift                |   0
 Gulps/Support/Globals.swift                   |   0
 Gulps/Support/NotificationHelper.swift        |  16 +-
 Gulps/Support/Settings.swift                  |   4 +
 .../UINavigationController-StatusBar.swift    |   0
 Gulps/Support/WatchConnectivityHelper.swift   |   0
 .../CalendarViewController.swift              |   3 +
 .../ViewControllers/DrinkViewController.swift |  13 +
 .../FeedbackViewController.swift              |   0
 .../Onboarding/GoalViewController.swift       |   0
 .../Onboarding/GulpsViewController.swift      |  24 +-
 .../Onboarding/MeasureViewController.swift    |   0
 .../NotificationViewController.swift          |   0
 .../Onboarding/OnboardingViewController.swift |   0
 .../SettingsViewController.swift              |   7 +-
 .../CalendarViewController+Animations.swift   |   0
 .../DrinkViewController+Animations.swift      |  30 +-
 Gulps/it.lproj/InfoPlist.strings              |   0
 Gulps/it.lproj/Main.strings                   |   0
 Gulps/it.lproj/Onboarding.strings             |   0
 Gulps/ru.lproj/InfoPlist.strings              |   0
 Gulps/ru.lproj/LaunchScreen.strings           |   0
 Gulps/ru.lproj/Main.strings                   |   0
 Gulps/ru.lproj/Onboarding.strings             |   0
 Gulps/tr.lproj/InfoPlist.strings              |   0
 Gulps/tr.lproj/LaunchScreen.strings           |   0
 Gulps/tr.lproj/Main.strings                   |   0
 Gulps/tr.lproj/Onboarding.strings             |   0
 102 files changed, 378 insertions(+), 155 deletions(-)
 mode change 100644 => 100755 Gulps/AppDelegate.swift
 mode change 100644 => 100755 Gulps/Base.lproj/InfoPlist.strings
 mode change 100644 => 100755 Gulps/Base.lproj/LaunchScreen.xib
 mode change 100644 => 100755 Gulps/Base.lproj/Main.storyboard
 mode change 100644 => 100755 Gulps/Base.lproj/Onboarding.storyboard
 mode change 100644 => 100755 Gulps/Gulps.entitlements
 mode change 100644 => 100755 Gulps/Images.xcassets/AppIcon.appiconset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/AppIcon.appiconset/Icon Copy-40.png
 mode change 100644 => 100755 Gulps/Images.xcassets/AppIcon.appiconset/Icon Copy-60.png
 mode change 100644 => 100755 Gulps/Images.xcassets/AppIcon.appiconset/Icon-120-1.png
 mode change 100644 => 100755 Gulps/Images.xcassets/AppIcon.appiconset/Icon-120.png
 mode change 100644 => 100755 Gulps/Images.xcassets/AppIcon.appiconset/Icon-180.png
 mode change 100644 => 100755 Gulps/Images.xcassets/AppIcon.appiconset/Icon-58.png
 mode change 100644 => 100755 Gulps/Images.xcassets/AppIcon.appiconset/Icon-80.png
 mode change 100644 => 100755 Gulps/Images.xcassets/AppIcon.appiconset/Icon-87.png
 mode change 100644 => 100755 Gulps/Images.xcassets/AppIcon.appiconset/Icon.png
 mode change 100644 => 100755 Gulps/Images.xcassets/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/big-tiny-icon.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/big-tiny-icon.imageset/big-tiny-icon.pdf
 mode change 100644 => 100755 Gulps/Images.xcassets/blue-check-icon.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/blue-check-icon.imageset/blue-check-icon.pdf
 mode change 100644 => 100755 Gulps/Images.xcassets/calendar-icon.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/calendar-icon.imageset/calendar-icon.pdf
 mode change 100644 => 100755 Gulps/Images.xcassets/check-icon.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/check-icon.imageset/check-icon.pdf
 mode change 100644 => 100755 Gulps/Images.xcassets/drink-icon.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/drink-icon.imageset/drink-icon.pdf
 mode change 100644 => 100755 Gulps/Images.xcassets/drop-bg.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/drop-bg.imageset/drop-bg.pdf
 mode change 100644 => 100755 Gulps/Images.xcassets/drop.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/drop.imageset/drop.pdf
 mode change 100644 => 100755 Gulps/Images.xcassets/large-icon.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/large-icon.imageset/large-icon.pdf
 mode change 100644 => 100755 Gulps/Images.xcassets/minus-icon.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/minus-icon.imageset/minus-icon.pdf
 mode change 100644 => 100755 Gulps/Images.xcassets/next-icon.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/next-icon.imageset/next-icon.pdf
 mode change 100644 => 100755 Gulps/Images.xcassets/plus-icon.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/plus-icon.imageset/plus-icon.pdf
 mode change 100644 => 100755 Gulps/Images.xcassets/prev-icon.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/prev-icon.imageset/prev-icon.pdf
 mode change 100644 => 100755 Gulps/Images.xcassets/sad.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/sad.imageset/sad.pdf
 mode change 100644 => 100755 Gulps/Images.xcassets/settings-icon.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/settings-icon.imageset/settings-icon.pdf
 mode change 100644 => 100755 Gulps/Images.xcassets/small-icon.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/small-tiny-icon.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/smile.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/smile.imageset/smile.pdf
 mode change 100644 => 100755 Gulps/Images.xcassets/star.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/star.imageset/star.pdf
 mode change 100644 => 100755 Gulps/Images.xcassets/stats-icon.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/stats-icon.imageset/stats-icon.pdf
 mode change 100644 => 100755 Gulps/Images.xcassets/tiny-add.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/tiny-add.imageset/tiny-add.pdf
 mode change 100644 => 100755 Gulps/Images.xcassets/tiny-check.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/tiny-check.imageset/tiny-check.pdf
 mode change 100644 => 100755 Gulps/Images.xcassets/tiny-x.imageset/Contents.json
 mode change 100644 => 100755 Gulps/Images.xcassets/tiny-x.imageset/tiny-x.pdf
 mode change 100644 => 100755 Gulps/Info.plist
 mode change 100644 => 100755 Gulps/Model/Entry.swift
 mode change 100644 => 100755 Gulps/Model/EntryHandler.swift
 mode change 100644 => 100755 Gulps/Model/Gulp.swift
 mode change 100644 => 100755 Gulps/Resources/Fonts/KaushanScript.ttf
 mode change 100644 => 100755 Gulps/Resources/Fonts/Lato-Light.ttf
 mode change 100644 => 100755 Gulps/Resources/drop.caf
 mode change 100644 => 100755 Gulps/Resources/en.lproj/Localizable.strings
 mode change 100644 => 100755 Gulps/Resources/it.lproj/Localizable.strings
 mode change 100644 => 100755 Gulps/Resources/ru.lproj/Localizable.strings
 mode change 100644 => 100755 Gulps/Resources/tr.lproj/Localizable.strings
 mode change 100644 => 100755 Gulps/Support/AnimatedShareButton.swift
 mode change 100644 => 100755 Gulps/Support/Colors.swift
 mode change 100644 => 100755 Gulps/Support/Constants.swift
 mode change 100644 => 100755 Gulps/Support/Extensions.swift
 mode change 100644 => 100755 Gulps/Support/Globals.swift
 mode change 100644 => 100755 Gulps/Support/NotificationHelper.swift
 mode change 100644 => 100755 Gulps/Support/Settings.swift
 mode change 100644 => 100755 Gulps/Support/UINavigationController-StatusBar.swift
 mode change 100644 => 100755 Gulps/Support/WatchConnectivityHelper.swift
 mode change 100644 => 100755 Gulps/ViewControllers/CalendarViewController.swift
 mode change 100644 => 100755 Gulps/ViewControllers/DrinkViewController.swift
 mode change 100644 => 100755 Gulps/ViewControllers/FeedbackViewController.swift
 mode change 100644 => 100755 Gulps/ViewControllers/Onboarding/GoalViewController.swift
 mode change 100644 => 100755 Gulps/ViewControllers/Onboarding/GulpsViewController.swift
 mode change 100644 => 100755 Gulps/ViewControllers/Onboarding/MeasureViewController.swift
 mode change 100644 => 100755 Gulps/ViewControllers/Onboarding/NotificationViewController.swift
 mode change 100644 => 100755 Gulps/ViewControllers/Onboarding/OnboardingViewController.swift
 mode change 100644 => 100755 Gulps/ViewControllers/SettingsViewController.swift
 mode change 100644 => 100755 Gulps/ViewControllers/Support/CalendarViewController+Animations.swift
 mode change 100644 => 100755 Gulps/ViewControllers/Support/DrinkViewController+Animations.swift
 mode change 100644 => 100755 Gulps/it.lproj/InfoPlist.strings
 mode change 100644 => 100755 Gulps/it.lproj/Main.strings
 mode change 100644 => 100755 Gulps/it.lproj/Onboarding.strings
 mode change 100644 => 100755 Gulps/ru.lproj/InfoPlist.strings
 mode change 100644 => 100755 Gulps/ru.lproj/LaunchScreen.strings
 mode change 100644 => 100755 Gulps/ru.lproj/Main.strings
 mode change 100644 => 100755 Gulps/ru.lproj/Onboarding.strings
 mode change 100644 => 100755 Gulps/tr.lproj/InfoPlist.strings
 mode change 100644 => 100755 Gulps/tr.lproj/LaunchScreen.strings
 mode change 100644 => 100755 Gulps/tr.lproj/Main.strings
 mode change 100644 => 100755 Gulps/tr.lproj/Onboarding.strings

diff --git a/Gulps.xcodeproj/project.pbxproj b/Gulps.xcodeproj/project.pbxproj
index 96ae927..71744b6 100644
--- a/Gulps.xcodeproj/project.pbxproj
+++ b/Gulps.xcodeproj/project.pbxproj
@@ -53,9 +53,9 @@
 		65A234FF1AF253D1002A35F3 /* TodayViewController+Animation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A234FE1AF253D1002A35F3 /* TodayViewController+Animation.swift */; };
 		65C6AA5C1BF4AD3200BB80CF /* WatchConnectivityHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65C6AA5B1BF4AD3200BB80CF /* WatchConnectivityHelper.swift */; };
 		65C92DA51BB1648C00E2DFE7 /* HealthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65C92DA41BB1648C00E2DFE7 /* HealthKit.framework */; };
-		65C92DA71BB164D100E2DFE7 /* HealthKitHealper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65C92DA61BB164D100E2DFE7 /* HealthKitHealper.swift */; };
-		65C92DA81BB184DB00E2DFE7 /* HealthKitHealper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65C92DA61BB164D100E2DFE7 /* HealthKitHealper.swift */; };
-		65C92DA91BB184DC00E2DFE7 /* HealthKitHealper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65C92DA61BB164D100E2DFE7 /* HealthKitHealper.swift */; };
+		65C92DA71BB164D100E2DFE7 /* HealthKitHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65C92DA61BB164D100E2DFE7 /* HealthKitHelper.swift */; };
+		65C92DA81BB184DB00E2DFE7 /* HealthKitHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65C92DA61BB164D100E2DFE7 /* HealthKitHelper.swift */; };
+		65C92DA91BB184DC00E2DFE7 /* HealthKitHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65C92DA61BB164D100E2DFE7 /* HealthKitHelper.swift */; };
 		65E94C6C1BBC13B400A65B30 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 65E94C6A1BBC13B400A65B30 /* InfoPlist.strings */; };
 		65E94C6E1BBC13BF00A65B30 /* Gulps.entitlements in Resources */ = {isa = PBXBuildFile; fileRef = 6537A8481AF24D2000EC16E9 /* Gulps.entitlements */; };
 		65F44C211AF24B440093A3E9 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65F44C201AF24B440093A3E9 /* AppDelegate.swift */; };
@@ -208,7 +208,7 @@
 		65A235021AF2543B002A35F3 /* Gulps WatchKit Extension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Gulps WatchKit Extension.entitlements"; sourceTree = "<group>"; };
 		65C6AA5B1BF4AD3200BB80CF /* WatchConnectivityHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WatchConnectivityHelper.swift; sourceTree = "<group>"; };
 		65C92DA41BB1648C00E2DFE7 /* HealthKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HealthKit.framework; path = System/Library/Frameworks/HealthKit.framework; sourceTree = SDKROOT; };
-		65C92DA61BB164D100E2DFE7 /* HealthKitHealper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HealthKitHealper.swift; sourceTree = "<group>"; };
+		65C92DA61BB164D100E2DFE7 /* HealthKitHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HealthKitHelper.swift; sourceTree = "<group>"; };
 		65E94C6B1BBC13B400A65B30 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		65E94C6D1BBC13BF00A65B30 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		65F44C1B1AF24B440093A3E9 /* Gulps.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Gulps.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -341,7 +341,7 @@
 				6537A81D1AF24CC800EC16E9 /* Settings.swift */,
 				650DCE641AF3CD4100E12764 /* Constants.swift */,
 				6555BB671B0CAE1700CE436A /* AnimatedShareButton.swift */,
-				65C92DA61BB164D100E2DFE7 /* HealthKitHealper.swift */,
+				65C92DA61BB164D100E2DFE7 /* HealthKitHelper.swift */,
 				65C6AA5B1BF4AD3200BB80CF /* WatchConnectivityHelper.swift */,
 				655BE8C71BF6558E003232A8 /* UINavigationController-StatusBar.swift */,
 			);
@@ -668,7 +668,6 @@
 					};
 					65F44C1A1AF24B440093A3E9 = {
 						CreatedOnToolsVersion = 6.3.1;
-						DevelopmentTeam = H72GR44F4M;
 						LastSwiftMigration = 0800;
 						ProvisioningStyle = Automatic;
 						SystemCapabilities = {
@@ -1005,7 +1004,7 @@
 				6537A82A1AF24CC800EC16E9 /* EntryHandler.swift in Sources */,
 				65F44C211AF24B440093A3E9 /* AppDelegate.swift in Sources */,
 				6537A83A1AF24CC800EC16E9 /* NotificationViewController.swift in Sources */,
-				65C92DA71BB164D100E2DFE7 /* HealthKitHealper.swift in Sources */,
+				65C92DA71BB164D100E2DFE7 /* HealthKitHelper.swift in Sources */,
 				650DCE651AF3CD4100E12764 /* Constants.swift in Sources */,
 				6537A8311AF24CC800EC16E9 /* Extensions.swift in Sources */,
 				6537A8361AF24CC800EC16E9 /* DrinkViewController.swift in Sources */,
@@ -1023,7 +1022,7 @@
 				65A234FF1AF253D1002A35F3 /* TodayViewController+Animation.swift in Sources */,
 				6537A8431AF24CFD00EC16E9 /* Entry.swift in Sources */,
 				6537A8441AF24CFF00EC16E9 /* EntryHandler.swift in Sources */,
-				65C92DA81BB184DB00E2DFE7 /* HealthKitHealper.swift in Sources */,
+				65C92DA81BB184DB00E2DFE7 /* HealthKitHelper.swift in Sources */,
 				6537A83E1AF24CE800EC16E9 /* Settings.swift in Sources */,
 				65F44C4C1AF24B780093A3E9 /* TodayViewController.swift in Sources */,
 				6537A8411AF24CEF00EC16E9 /* Extensions.swift in Sources */,
@@ -1040,7 +1039,7 @@
 				653039D71BE0CE5E00263D77 /* Colors.swift in Sources */,
 				65F44C621AF24B8A0093A3E9 /* NotificationController.swift in Sources */,
 				653039891BDF703200263D77 /* ExtensionDelegate.swift in Sources */,
-				65C92DA91BB184DC00E2DFE7 /* HealthKitHealper.swift in Sources */,
+				65C92DA91BB184DC00E2DFE7 /* HealthKitHelper.swift in Sources */,
 				65F44C601AF24B8A0093A3E9 /* InterfaceController.swift in Sources */,
 				6537A83F1AF24CE900EC16E9 /* Settings.swift in Sources */,
 				653039921BDFE5FC00263D77 /* ComplicationController.swift in Sources */,
@@ -1303,7 +1302,7 @@
 				CODE_SIGN_ENTITLEMENTS = Gulps/Gulps.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				DEVELOPMENT_TEAM = H72GR44F4M;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1329,7 +1328,7 @@
 				CODE_SIGN_ENTITLEMENTS = Gulps/Gulps.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				DEVELOPMENT_TEAM = H72GR44F4M;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
diff --git a/Gulps/AppDelegate.swift b/Gulps/AppDelegate.swift
old mode 100644
new mode 100755
index 7f0a007..b197441
--- a/Gulps/AppDelegate.swift
+++ b/Gulps/AppDelegate.swift
@@ -100,6 +100,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, WCSessionDelegate {
 
   enum ShortcutType: String {
     case Big = "it.fancypixel.gulps.big"
+    case Medium = "it.fancypixel.gulps.medium"
     case Small = "it.fancypixel.gulps.small"
   }
 
@@ -112,6 +113,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate, WCSessionDelegate {
     if let type = ShortcutType(rawValue: item.type) {
       if (type == .Small) {
         EntryHandler.sharedHandler.addGulp(UserDefaults.groupUserDefaults().double(forKey: Constants.Gulp.small.key()))
+      } else if (type == .Medium){
+        EntryHandler.sharedHandler.addGulp(UserDefaults.groupUserDefaults().double(forKey: Constants.Gulp.medium.key()))
       } else if (type == .Big) {
         EntryHandler.sharedHandler.addGulp(UserDefaults.groupUserDefaults().double(forKey: Constants.Gulp.big.key()))
       }
diff --git a/Gulps/Base.lproj/InfoPlist.strings b/Gulps/Base.lproj/InfoPlist.strings
old mode 100644
new mode 100755
diff --git a/Gulps/Base.lproj/LaunchScreen.xib b/Gulps/Base.lproj/LaunchScreen.xib
old mode 100644
new mode 100755
diff --git a/Gulps/Base.lproj/Main.storyboard b/Gulps/Base.lproj/Main.storyboard
old mode 100644
new mode 100755
index 49510e3..ad39047
--- a/Gulps/Base.lproj/Main.storyboard
+++ b/Gulps/Base.lproj/Main.storyboard
@@ -94,6 +94,25 @@
                                     <action selector="selectionButtonAction:" destination="9pv-A4-QxB" eventType="touchUpInside" id="5Lu-Gy-RKQ"/>
                                 </connections>
                             </button>
+                            <button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bcX-tx-Vhr" userLabel="Medium Button">
+                                <rect key="frame" x="153" y="454" width="70" height="70"/>
+                                <color key="backgroundColor" red="0.21960784310000001" green="0.49019607840000001" blue="0.81176470590000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="70" id="O5W-Vq-zMW"/>
+                                    <constraint firstAttribute="height" constant="70" id="vKO-bn-vEO"/>
+                                </constraints>
+                                <state key="normal" image="medium-icon">
+                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                </state>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                        <integer key="value" value="35"/>
+                                    </userDefinedRuntimeAttribute>
+                                </userDefinedRuntimeAttributes>
+                                <connections>
+                                    <action selector="selectionButtonAction:" destination="9pv-A4-QxB" eventType="touchUpInside" id="CLi-Bm-rGf"/>
+                                </connections>
+                            </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fW6-sm-t8g" userLabel="Add Button">
                                 <rect key="frame" x="153" y="454" width="70" height="70"/>
                                 <color key="backgroundColor" red="0.2196078431372549" green="0.49019607843137253" blue="0.81176470588235294" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -146,6 +165,7 @@
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="xap-Vb-CbA" firstAttribute="leading" secondItem="tsR-hK-woN" secondAttribute="leading" constant="10" id="0Kf-6v-f86"/>
+                            <constraint firstItem="bcX-tx-Vhr" firstAttribute="top" secondItem="v5a-2l-qvB" secondAttribute="top" id="0Rd-W8-Dm2"/>
                             <constraint firstItem="fW6-sm-t8g" firstAttribute="top" relation="greaterThanOrEqual" secondItem="mEa-Xq-QB6" secondAttribute="bottom" id="4AF-N9-UE2"/>
                             <constraint firstItem="mEa-Xq-QB6" firstAttribute="leading" secondItem="tsR-hK-woN" secondAttribute="leadingMargin" id="5Kw-Si-2x9"/>
                             <constraint firstItem="4ug-Mw-9AY" firstAttribute="top" secondItem="fW6-sm-t8g" secondAttribute="bottom" priority="999" constant="30" id="6mW-Ks-Okm"/>
@@ -164,6 +184,7 @@
                             <constraint firstItem="mEa-Xq-QB6" firstAttribute="trailing" secondItem="tsR-hK-woN" secondAttribute="trailingMargin" id="j6h-Zi-1LS"/>
                             <constraint firstAttribute="centerX" secondItem="mEa-Xq-QB6" secondAttribute="centerX" id="oP9-VY-fG7"/>
                             <constraint firstItem="xap-Vb-CbA" firstAttribute="top" secondItem="Ia1-K6-d13" secondAttribute="bottom" constant="10" id="pAa-mt-Iaf"/>
+                            <constraint firstItem="bcX-tx-Vhr" firstAttribute="leading" secondItem="v5a-2l-qvB" secondAttribute="leading" id="r3P-Qe-hG0"/>
                             <constraint firstItem="uvx-n6-xp2" firstAttribute="top" secondItem="Ia1-K6-d13" secondAttribute="bottom" constant="8" id="x61-hZ-WvW"/>
                             <constraint firstItem="fW6-sm-t8g" firstAttribute="centerY" secondItem="v5a-2l-qvB" secondAttribute="centerY" id="zwb-N5-8xQ"/>
                         </constraints>
@@ -173,6 +194,7 @@
                         <outlet property="addButton" destination="fW6-sm-t8g" id="ikl-2M-eYC"/>
                         <outlet property="largeButton" destination="v5a-2l-qvB" id="dvl-3k-q65"/>
                         <outlet property="maskImage" destination="JPp-1k-zdE" id="5Xq-AA-c2u"/>
+                        <outlet property="mediumButton" destination="bcX-tx-Vhr" id="gDu-Zf-cV1"/>
                         <outlet property="meterContainerView" destination="mQX-uO-zkr" id="Xzc-Jh-LMx"/>
                         <outlet property="minusButton" destination="uvx-n6-xp2" id="Id3-s0-QqO"/>
                         <outlet property="percentageLabel" destination="mEa-Xq-QB6" id="VWN-Gf-0ip"/>
@@ -725,9 +747,52 @@ By the way, we’d love some feedback! How do you feel about Gulps? </string>
                                             </constraints>
                                         </tableViewCellContentView>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="PreferencesCll" id="XVN-Hr-Cdk">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="PreferencesCll" id="EhX-RL-Rh8">
                                         <rect key="frame" x="0.0" y="191.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="EhX-RL-Rh8" id="7x8-j0-Y5k">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="2" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="s5F-j1-JSB" userLabel="Medium Portion Text">
+                                                    <rect key="frame" x="245" y="0.0" width="90" height="43"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="90" id="idr-Pc-lug"/>
+                                                    </constraints>
+                                                    <color key="textColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                                                    <textInputTraits key="textInputTraits" autocorrectionType="no" keyboardType="decimalPad"/>
+                                                    <connections>
+                                                        <outlet property="delegate" destination="t9K-A9-XHF" id="rat-zk-41q"/>
+                                                    </connections>
+                                                </textField>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Medium gulp" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="l4S-LA-Tke">
+                                                    <rect key="frame" x="15" y="12" width="95" height="20"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Oz" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JaH-AL-TZk">
+                                                    <rect key="frame" x="341" y="13" width="19" height="17"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                    <color key="textColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="l4S-LA-Tke" firstAttribute="leading" secondItem="7x8-j0-Y5k" secondAttribute="leading" constant="15" id="2nX-XA-3fg"/>
+                                                <constraint firstAttribute="bottom" secondItem="s5F-j1-JSB" secondAttribute="bottom" id="GIy-0W-kfp"/>
+                                                <constraint firstAttribute="centerY" secondItem="l4S-LA-Tke" secondAttribute="centerY" id="L37-oD-bwi"/>
+                                                <constraint firstAttribute="trailing" secondItem="s5F-j1-JSB" secondAttribute="trailing" constant="40" id="O5B-mC-Ptz"/>
+                                                <constraint firstAttribute="trailing" secondItem="JaH-AL-TZk" secondAttribute="trailing" constant="15" id="Twa-ek-Wv7"/>
+                                                <constraint firstAttribute="centerY" secondItem="JaH-AL-TZk" secondAttribute="centerY" id="atM-M1-Cwh"/>
+                                                <constraint firstItem="s5F-j1-JSB" firstAttribute="top" secondItem="7x8-j0-Y5k" secondAttribute="top" id="sbB-1K-kWs"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="PreferencesCll" id="XVN-Hr-Cdk">
+                                        <rect key="frame" x="0.0" y="235.5" width="375" height="44"/>
+                                        <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="XVN-Hr-Cdk" id="Y7x-zR-Q8Y">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
@@ -769,7 +834,7 @@ By the way, we’d love some feedback! How do you feel about Gulps? </string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="PreferencesCll" id="Q2W-7p-buv">
-                                        <rect key="frame" x="0.0" y="235.5" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="279.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Q2W-7p-buv" id="MoA-It-qj5">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
@@ -816,7 +881,7 @@ By the way, we’d love some feedback! How do you feel about Gulps? </string>
                             <tableViewSection headerTitle="Notifications" id="Cqk-U1-F6w">
                                 <cells>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="PreferencesCll" id="Ii4-wt-fc6">
-                                        <rect key="frame" x="0.0" y="327.5" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="371.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Ii4-wt-fc6" id="1Hn-44-t70">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
@@ -846,7 +911,7 @@ By the way, we’d love some feedback! How do you feel about Gulps? </string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="PreferencesCll" textLabel="Pnc-7E-Kee" detailTextLabel="aBp-Ni-lCc" style="IBUITableViewCellStyleValue1" id="dxR-vc-Rwx">
-                                        <rect key="frame" x="0.0" y="371.5" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="415.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="dxR-vc-Rwx" id="iKk-wz-AiX">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
@@ -870,7 +935,7 @@ By the way, we’d love some feedback! How do you feel about Gulps? </string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="PreferencesCll" textLabel="f3c-OV-GHw" detailTextLabel="en4-wz-CaR" style="IBUITableViewCellStyleValue1" id="sFs-MK-DDj">
-                                        <rect key="frame" x="0.0" y="415.5" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="459.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="sFs-MK-DDj" id="9UG-1o-lam">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
@@ -894,7 +959,7 @@ By the way, we’d love some feedback! How do you feel about Gulps? </string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="PreferencesCll" textLabel="w1F-Cx-bRx" detailTextLabel="llL-4J-aC6" style="IBUITableViewCellStyleValue1" id="8v4-HN-MkF">
-                                        <rect key="frame" x="0.0" y="459.5" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="503.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="8v4-HN-MkF" id="wVD-TQ-jfH">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
@@ -922,7 +987,7 @@ By the way, we’d love some feedback! How do you feel about Gulps? </string>
                             <tableViewSection headerTitle="Apple Health" id="kL3-zV-Q1y">
                                 <cells>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="PreferencesCll" id="rtu-Sv-Asn">
-                                        <rect key="frame" x="0.0" y="551.5" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="595.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="rtu-Sv-Asn" id="NkK-Il-Fd3">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
@@ -964,6 +1029,7 @@ By the way, we’d love some feedback! How do you feel about Gulps? </string>
                         <outlet property="dailyGoalText" destination="Heo-vz-8M3" id="lHN-ai-OMb"/>
                         <outlet property="healthSwitch" destination="fU5-mD-m8k" id="83t-Hg-eil"/>
                         <outlet property="largePortionText" destination="SBF-ug-rBd" id="kj7-UV-Usx"/>
+                        <outlet property="mediumPortionText" destination="s5F-j1-JSB" id="rlg-b1-QZo"/>
                         <outlet property="notificationFromLabel" destination="aBp-Ni-lCc" id="LSm-ya-Pih"/>
                         <outlet property="notificationIntervalLabel" destination="llL-4J-aC6" id="GL4-VE-3Io"/>
                         <outlet property="notificationSwitch" destination="mua-Mo-rXC" id="Yto-mm-Dvj"/>
@@ -973,6 +1039,7 @@ By the way, we’d love some feedback! How do you feel about Gulps? </string>
                         <outletCollection property="uomLabels" destination="nbd-CS-kU7" collectionClass="NSMutableArray" id="yn9-xJ-SuH"/>
                         <outletCollection property="uomLabels" destination="RVh-z0-hYc" collectionClass="NSMutableArray" id="sey-OP-a1C"/>
                         <outletCollection property="uomLabels" destination="DT8-cB-ShB" collectionClass="NSMutableArray" id="kN2-it-PpW"/>
+                        <outletCollection property="uomLabels" destination="JaH-AL-TZk" collectionClass="NSMutableArray" id="EH0-Cb-i7p"/>
                     </connections>
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="gao-yG-C7y" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -1020,11 +1087,12 @@ By the way, we’d love some feedback! How do you feel about Gulps? </string>
         <image name="drink-icon" width="30" height="30"/>
         <image name="drop" width="300" height="300"/>
         <image name="large-icon" width="40" height="40"/>
+        <image name="medium-icon" width="40" height="40"/>
         <image name="minus-icon" width="24" height="24"/>
         <image name="plus-icon" width="40" height="40"/>
         <image name="sad" width="100" height="100"/>
         <image name="settings-icon" width="30" height="30"/>
-        <image name="small-icon" width="40" height="40"/>
+        <image name="small-icon" width="168" height="168"/>
         <image name="smile" width="100" height="100"/>
         <image name="star" width="50" height="50"/>
         <image name="tiny-add" width="20" height="20"/>
diff --git a/Gulps/Base.lproj/Onboarding.storyboard b/Gulps/Base.lproj/Onboarding.storyboard
old mode 100644
new mode 100755
index 8036731..93e7f35
--- a/Gulps/Base.lproj/Onboarding.storyboard
+++ b/Gulps/Base.lproj/Onboarding.storyboard
@@ -1,13 +1,21 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14F6a" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="By6-Ql-uIz">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="By6-Ql-uIz">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <customFonts key="customFonts">
-        <mutableArray key="KaushanScript.ttf">
+        <array key="Avenir.ttc">
+            <string>Avenir-Book</string>
+        </array>
+        <array key="KaushanScript.ttf">
             <string>KaushanScript-Regular</string>
-        </mutableArray>
+        </array>
     </customFonts>
     <scenes>
         <!--Onboarding View Controller-->
@@ -19,33 +27,33 @@
                         <viewControllerLayoutGuide type="bottom" id="a9y-6F-IFj"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="xIA-iZ-6Zs">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Hi there!" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="J5V-th-GOK">
-                                <rect key="frame" x="16" y="20" width="288" height="70"/>
+                                <rect key="frame" x="16" y="20" width="343" height="70"/>
                                 <fontDescription key="fontDescription" name="KaushanScript-Regular" family="Kaushan Script" pointSize="48"/>
-                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="I’m here to help you keep track of a simple healthy habit: 
drinking water." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dbP-89-LG1">
-                                <rect key="frame" x="16" y="140" width="288" height="66"/>
+                                <rect key="frame" x="16" y="140" width="343" height="66"/>
                                 <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="16"/>
-                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5VR-G1-bkD">
-                                <rect key="frame" x="0.0" y="468" width="320" height="100"/>
+                                <rect key="frame" x="0.0" y="567" width="375" height="100"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hyR-yx-vfK">
-                                        <rect key="frame" x="240" y="20" width="60" height="60"/>
-                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <rect key="frame" x="295" y="20" width="60" height="60"/>
+                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="60" id="DQN-JD-3BE"/>
                                             <constraint firstAttribute="width" constant="60" id="YEL-vf-sXW"/>
                                         </constraints>
                                         <state key="normal" image="next-icon">
-                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         </state>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -57,7 +65,7 @@
                                         </connections>
                                     </button>
                                 </subviews>
-                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="bottom" secondItem="hyR-yx-vfK" secondAttribute="bottom" constant="20" id="3ab-xY-wUg"/>
                                     <constraint firstAttribute="height" constant="100" id="CpB-GU-0HV"/>
@@ -65,7 +73,7 @@
                                 </constraints>
                             </view>
                         </subviews>
-                        <color key="backgroundColor" red="0.15686274509803921" green="0.39215686274509803" blue="0.77254901960784317" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="backgroundColor" red="0.15686274509803921" green="0.39215686274509803" blue="0.77254901960784317" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="dbP-89-LG1" firstAttribute="trailing" secondItem="xIA-iZ-6Zs" secondAttribute="trailingMargin" id="1Qy-OR-nxD"/>
                             <constraint firstItem="J5V-th-GOK" firstAttribute="leading" secondItem="xIA-iZ-6Zs" secondAttribute="leading" constant="16" id="8tS-36-5WV"/>
@@ -100,30 +108,30 @@
                         <viewControllerLayoutGuide type="bottom" id="9AR-mY-hKU"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="qHm-YP-hGh">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aNx-Gk-pr3" userLabel="Header">
-                                <rect key="frame" x="16" y="40" width="288" height="66"/>
+                                <rect key="frame" x="16" y="40" width="343" height="44"/>
                                 <string key="text">A couple of questions first:
 what measurement system do you prefer?</string>
                                 <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="16"/>
-                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qww-zt-6DG" userLabel="Controls">
-                                <rect key="frame" x="0.0" y="468" width="320" height="100"/>
+                                <rect key="frame" x="0.0" y="567" width="375" height="100"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dEP-tj-efq">
-                                        <rect key="frame" x="240" y="20" width="60" height="60"/>
-                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <rect key="frame" x="295" y="20" width="60" height="60"/>
+                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="60" id="HiL-kT-eIK"/>
                                             <constraint firstAttribute="width" constant="60" id="LkU-5J-Mly"/>
                                         </constraints>
                                         <inset key="contentEdgeInsets" minX="1" minY="0.0" maxX="0.0" maxY="0.0"/>
                                         <state key="normal" image="next-icon">
-                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         </state>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -136,14 +144,14 @@ what measurement system do you prefer?</string>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xmh-gA-cnz">
                                         <rect key="frame" x="20" y="20" width="60" height="60"/>
-                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="60" id="EGF-Pz-3li"/>
                                             <constraint firstAttribute="height" constant="60" id="oHu-LZ-d9d"/>
                                         </constraints>
                                         <inset key="contentEdgeInsets" minX="-5" minY="0.0" maxX="0.0" maxY="0.0"/>
                                         <state key="normal" image="prev-icon">
-                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         </state>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -155,7 +163,7 @@ what measurement system do you prefer?</string>
                                         </connections>
                                     </button>
                                 </subviews>
-                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstItem="xmh-gA-cnz" firstAttribute="leading" secondItem="qww-zt-6DG" secondAttribute="leading" constant="20" id="7cL-Ju-TYA"/>
                                     <constraint firstAttribute="trailing" secondItem="dEP-tj-efq" secondAttribute="trailing" constant="20" id="Kl6-of-P4l"/>
@@ -165,12 +173,12 @@ what measurement system do you prefer?</string>
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GKJ-7w-YfS" userLabel="Liters">
-                                <rect key="frame" x="0.0" y="146" width="320" height="60"/>
+                                <rect key="frame" x="0.0" y="124" width="375" height="60"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Liters" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hoW-cL-j0l">
                                         <rect key="frame" x="70" y="16" width="48" height="28"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check-icon" translatesAutoresizingMaskIntoConstraints="NO" id="YjV-vs-zoa">
@@ -181,9 +189,9 @@ what measurement system do you prefer?</string>
                                         </constraints>
                                     </imageView>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="SH2-qV-ied">
-                                        <rect key="frame" x="0.0" y="0.0" width="320" height="60"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="375" height="60"/>
                                         <state key="normal">
-                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         </state>
                                         <connections>
                                             <action selector="litersButtonAction" destination="G0M-tk-SWS" eventType="touchUpInside" id="ekG-du-Zzn"/>
@@ -203,7 +211,7 @@ what measurement system do you prefer?</string>
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8S4-OP-3D4" userLabel="Ounces">
-                                <rect key="frame" x="0.0" y="206" width="320" height="60"/>
+                                <rect key="frame" x="0.0" y="184" width="375" height="60"/>
                                 <subviews>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check-icon" translatesAutoresizingMaskIntoConstraints="NO" id="Naf-BJ-WFS">
                                         <rect key="frame" x="20" y="10" width="40" height="40"/>
@@ -215,13 +223,13 @@ what measurement system do you prefer?</string>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Ounces" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rUi-CZ-r3F">
                                         <rect key="frame" x="70" y="16" width="69" height="28"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="TKD-XC-gWJ">
-                                        <rect key="frame" x="0.0" y="0.0" width="320" height="60"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="375" height="60"/>
                                         <state key="normal">
-                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         </state>
                                         <connections>
                                             <action selector="ouncesButtonAction" destination="G0M-tk-SWS" eventType="touchUpInside" id="Joh-SQ-uzk"/>
@@ -241,7 +249,7 @@ what measurement system do you prefer?</string>
                                 </constraints>
                             </view>
                         </subviews>
-                        <color key="backgroundColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="backgroundColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="aNx-Gk-pr3" firstAttribute="top" secondItem="k5a-UD-A8v" secondAttribute="bottom" constant="20" id="3Oq-Mq-bPC"/>
                             <constraint firstItem="8S4-OP-3D4" firstAttribute="top" secondItem="GKJ-7w-YfS" secondAttribute="bottom" id="AAK-Oo-1x4"/>
@@ -281,29 +289,29 @@ what measurement system do you prefer?</string>
                         <viewControllerLayoutGuide type="bottom" id="hbR-Yb-Sx1"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="Nn4-vs-Hzu">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JSe-R9-wt9" userLabel="Header">
-                                <rect key="frame" x="16" y="40" width="288" height="110"/>
+                                <rect key="frame" x="16" y="40" width="343" height="88"/>
                                 <string key="text">I’ll keep track of your water consumption through gulps, you just need to set up your usual small gulp (a glass of water, usually 0,2 L or 8 oz) and big gulp (let’s say a bottle)</string>
                                 <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="16"/>
-                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VQR-RN-FoH" userLabel="Controls">
-                                <rect key="frame" x="0.0" y="468" width="320" height="100"/>
+                                <rect key="frame" x="0.0" y="567" width="375" height="100"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3E1-6i-418">
-                                        <rect key="frame" x="240" y="20" width="60" height="60"/>
-                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <rect key="frame" x="295" y="20" width="60" height="60"/>
+                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="60" id="OHM-AK-BEa"/>
                                             <constraint firstAttribute="height" constant="60" id="hsd-xT-c4d"/>
                                         </constraints>
                                         <inset key="contentEdgeInsets" minX="1" minY="0.0" maxX="0.0" maxY="0.0"/>
                                         <state key="normal" image="next-icon">
-                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         </state>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -316,14 +324,14 @@ what measurement system do you prefer?</string>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hjk-yP-pgN">
                                         <rect key="frame" x="20" y="20" width="60" height="60"/>
-                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="60" id="MTy-um-B71"/>
                                             <constraint firstAttribute="width" constant="60" id="nV6-gc-86T"/>
                                         </constraints>
                                         <inset key="contentEdgeInsets" minX="-5" minY="0.0" maxX="0.0" maxY="0.0"/>
                                         <state key="normal" image="prev-icon">
-                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         </state>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -335,7 +343,7 @@ what measurement system do you prefer?</string>
                                         </connections>
                                     </button>
                                 </subviews>
-                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstItem="hjk-yP-pgN" firstAttribute="leading" secondItem="VQR-RN-FoH" secondAttribute="leading" constant="20" id="0da-jJ-cCd"/>
                                     <constraint firstAttribute="bottom" secondItem="3E1-6i-418" secondAttribute="bottom" constant="20" id="N97-W6-nBy"/>
@@ -345,12 +353,12 @@ what measurement system do you prefer?</string>
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Xto-Uc-SOf" userLabel="Small gulp">
-                                <rect key="frame" x="0.0" y="170" width="320" height="60"/>
+                                <rect key="frame" x="0.0" y="148" width="375" height="60"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Small gulp" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WfK-EQ-Qob">
                                         <rect key="frame" x="70" y="16" width="95" height="28"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="small-icon" translatesAutoresizingMaskIntoConstraints="NO" id="Oe9-EU-gxI">
@@ -361,11 +369,11 @@ what measurement system do you prefer?</string>
                                         </constraints>
                                     </imageView>
                                     <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="0.2" placeholder="glass" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="e8D-nG-89R">
-                                        <rect key="frame" x="183" y="0.0" width="90" height="60"/>
+                                        <rect key="frame" x="238" y="0.0" width="90" height="60"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="90" id="2Zx-3z-dua"/>
                                         </constraints>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
                                         <textInputTraits key="textInputTraits" autocorrectionType="no" keyboardType="decimalPad"/>
                                         <connections>
@@ -373,9 +381,9 @@ what measurement system do you prefer?</string>
                                         </connections>
                                     </textField>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="oz" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wIJ-Qh-sXS">
-                                        <rect key="frame" x="283" y="19" width="17" height="22"/>
+                                        <rect key="frame" x="338" y="19" width="17" height="22"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="16"/>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                 </subviews>
@@ -392,8 +400,56 @@ what measurement system do you prefer?</string>
                                     <constraint firstAttribute="height" constant="60" id="tyP-Y3-3dV"/>
                                 </constraints>
                             </view>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="K2W-i9-scZ" userLabel="Medium Gulp">
+                                <rect key="frame" x="0.0" y="215" width="375" height="60"/>
+                                <subviews>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Medium gulp" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="A3t-c6-5Qq">
+                                        <rect key="frame" x="70" y="16" width="120.5" height="28"/>
+                                        <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="oz" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jrP-nj-Ojr" userLabel="Medium Gulp Label">
+                                        <rect key="frame" x="338" y="19" width="17" height="22"/>
+                                        <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="16"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="0.5" placeholder="bottle" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="1kq-kn-Uqc" userLabel="Medium Gulp Text">
+                                        <rect key="frame" x="238" y="0.0" width="90" height="60"/>
+                                        <constraints>
+                                            <constraint firstAttribute="width" constant="90" id="ltM-oh-Shx"/>
+                                        </constraints>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
+                                        <textInputTraits key="textInputTraits" autocorrectionType="no" keyboardType="decimalPad"/>
+                                        <connections>
+                                            <outlet property="delegate" destination="zCq-Eo-bzE" id="kKl-l7-y9G"/>
+                                        </connections>
+                                    </textField>
+                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="medium-icon" translatesAutoresizingMaskIntoConstraints="NO" id="glZ-Vb-CT3">
+                                        <rect key="frame" x="23" y="11" width="33" height="33"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="33" id="dNz-Kk-wA4"/>
+                                            <constraint firstAttribute="width" constant="33" id="f1I-VM-qtf"/>
+                                        </constraints>
+                                    </imageView>
+                                </subviews>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="60" id="3jt-eb-uie"/>
+                                    <constraint firstItem="1kq-kn-Uqc" firstAttribute="top" secondItem="K2W-i9-scZ" secondAttribute="top" id="5pC-Rm-7aW"/>
+                                    <constraint firstItem="jrP-nj-Ojr" firstAttribute="leading" secondItem="1kq-kn-Uqc" secondAttribute="trailing" constant="10" id="635-NF-bLc"/>
+                                    <constraint firstAttribute="centerY" secondItem="A3t-c6-5Qq" secondAttribute="centerY" id="I40-Lz-Qjh"/>
+                                    <constraint firstAttribute="bottom" secondItem="1kq-kn-Uqc" secondAttribute="bottom" id="M4r-oY-Esk"/>
+                                    <constraint firstItem="glZ-Vb-CT3" firstAttribute="top" secondItem="K2W-i9-scZ" secondAttribute="top" constant="11" id="McE-PM-hON"/>
+                                    <constraint firstAttribute="trailing" secondItem="jrP-nj-Ojr" secondAttribute="trailing" constant="20" id="UqM-gw-HHS"/>
+                                    <constraint firstItem="glZ-Vb-CT3" firstAttribute="leading" secondItem="K2W-i9-scZ" secondAttribute="leading" constant="23" id="Z6f-j8-yKM"/>
+                                    <constraint firstItem="A3t-c6-5Qq" firstAttribute="leading" secondItem="glZ-Vb-CT3" secondAttribute="trailing" constant="14" id="h2C-S3-9Wn"/>
+                                    <constraint firstAttribute="centerY" secondItem="jrP-nj-Ojr" secondAttribute="centerY" id="xOX-lY-MjI"/>
+                                </constraints>
+                            </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="plP-Gr-jkv" userLabel="Big gulp">
-                                <rect key="frame" x="0.0" y="230" width="320" height="60"/>
+                                <rect key="frame" x="0.0" y="283" width="375" height="60"/>
                                 <subviews>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="large-icon" translatesAutoresizingMaskIntoConstraints="NO" id="mCL-Fz-XGC">
                                         <rect key="frame" x="20" y="10" width="40" height="40"/>
@@ -405,21 +461,21 @@ what measurement system do you prefer?</string>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Big gulp" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kMj-hq-rjr">
                                         <rect key="frame" x="70" y="16" width="76" height="28"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="oz" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="s4e-zS-DTj">
-                                        <rect key="frame" x="283" y="19" width="17" height="22"/>
+                                        <rect key="frame" x="338" y="19" width="17" height="22"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="16"/>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="0.5" placeholder="bottle" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="gFP-R6-3l1">
-                                        <rect key="frame" x="183" y="0.0" width="90" height="60"/>
+                                        <rect key="frame" x="238" y="0.0" width="90" height="60"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="90" id="6lS-LW-dPX"/>
                                         </constraints>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
                                         <textInputTraits key="textInputTraits" autocorrectionType="no" keyboardType="decimalPad"/>
                                         <connections>
@@ -441,20 +497,24 @@ what measurement system do you prefer?</string>
                                 </constraints>
                             </view>
                         </subviews>
-                        <color key="backgroundColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="backgroundColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
+                            <constraint firstItem="K2W-i9-scZ" firstAttribute="trailing" secondItem="Xto-Uc-SOf" secondAttribute="trailing" id="EwV-hc-TYi"/>
                             <constraint firstItem="plP-Gr-jkv" firstAttribute="leading" secondItem="Nn4-vs-Hzu" secondAttribute="leading" id="FXT-Fy-7eB"/>
-                            <constraint firstItem="plP-Gr-jkv" firstAttribute="top" secondItem="Xto-Uc-SOf" secondAttribute="bottom" id="QEh-lf-0Ah"/>
+                            <constraint firstItem="plP-Gr-jkv" firstAttribute="top" secondItem="K2W-i9-scZ" secondAttribute="bottom" constant="8" id="JXz-P0-ftj"/>
                             <constraint firstAttribute="trailing" secondItem="Xto-Uc-SOf" secondAttribute="trailing" id="S0d-Uh-Bjp"/>
                             <constraint firstAttribute="trailing" secondItem="VQR-RN-FoH" secondAttribute="trailing" id="YDY-JR-dly"/>
                             <constraint firstItem="JSe-R9-wt9" firstAttribute="leading" secondItem="Nn4-vs-Hzu" secondAttribute="leadingMargin" id="YjM-mY-btl"/>
                             <constraint firstAttribute="bottom" secondItem="VQR-RN-FoH" secondAttribute="bottom" id="Zvw-nI-3t3"/>
                             <constraint firstItem="Xto-Uc-SOf" firstAttribute="top" secondItem="JSe-R9-wt9" secondAttribute="bottom" constant="20" id="bb3-6n-rNF"/>
+                            <constraint firstItem="K2W-i9-scZ" firstAttribute="top" secondItem="Xto-Uc-SOf" secondAttribute="bottom" constant="7" id="eEF-7x-8WO"/>
                             <constraint firstItem="VQR-RN-FoH" firstAttribute="leading" secondItem="Nn4-vs-Hzu" secondAttribute="leading" id="f2D-FG-SW0"/>
                             <constraint firstItem="Xto-Uc-SOf" firstAttribute="leading" secondItem="Nn4-vs-Hzu" secondAttribute="leading" id="h8t-eM-UFX"/>
                             <constraint firstItem="JSe-R9-wt9" firstAttribute="trailing" secondItem="Nn4-vs-Hzu" secondAttribute="trailingMargin" id="mEL-zs-osh"/>
                             <constraint firstItem="JSe-R9-wt9" firstAttribute="top" secondItem="c1S-tf-jdw" secondAttribute="bottom" constant="20" id="n4w-5n-rKr"/>
                             <constraint firstAttribute="trailing" secondItem="plP-Gr-jkv" secondAttribute="trailing" id="pFe-CU-7tG"/>
+                            <constraint firstItem="K2W-i9-scZ" firstAttribute="top" secondItem="Nn4-vs-Hzu" secondAttribute="top" constant="215" id="pQ5-X9-ueB"/>
+                            <constraint firstItem="K2W-i9-scZ" firstAttribute="leading" secondItem="Xto-Uc-SOf" secondAttribute="leading" id="puh-Gc-CEc"/>
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" id="41t-VR-ovH"/>
@@ -464,18 +524,22 @@ what measurement system do you prefer?</string>
                         <outlet property="bigGulpText" destination="gFP-R6-3l1" id="TMj-Dt-afJ"/>
                         <outlet property="bigSuffixLabel" destination="s4e-zS-DTj" id="ps4-9W-Sls"/>
                         <outlet property="headerLabel" destination="JSe-R9-wt9" id="Nqd-pL-tXb"/>
+                        <outlet property="mediumBackgroundView" destination="K2W-i9-scZ" id="vU9-wE-77N"/>
+                        <outlet property="mediumGulpText" destination="1kq-kn-Uqc" id="4jG-e9-evl"/>
+                        <outlet property="mediumSuffixLabel" destination="jrP-nj-Ojr" id="PQg-bJ-fgT"/>
                         <outlet property="smallBackgroundView" destination="Xto-Uc-SOf" id="0jp-8i-LAd"/>
                         <outlet property="smallGulpText" destination="e8D-nG-89R" id="qTw-4Q-9sJ"/>
                         <outlet property="smallSuffixLabel" destination="wIJ-Qh-sXS" id="MgS-5T-ssD"/>
                         <outletCollection property="viewArray" destination="JSe-R9-wt9" collectionClass="NSMutableArray" id="hVz-TU-olM"/>
-                        <outletCollection property="viewArray" destination="Xto-Uc-SOf" collectionClass="NSMutableArray" id="kQN-lc-w90"/>
-                        <outletCollection property="viewArray" destination="plP-Gr-jkv" collectionClass="NSMutableArray" id="5H3-44-7Ax"/>
                         <outletCollection property="viewArray" destination="VQR-RN-FoH" collectionClass="NSMutableArray" id="51c-on-y5l"/>
+                        <outletCollection property="viewArray" destination="Xto-Uc-SOf" collectionClass="NSMutableArray" id="P26-yF-ziC"/>
+                        <outletCollection property="viewArray" destination="K2W-i9-scZ" collectionClass="NSMutableArray" id="zBl-lR-CdN"/>
+                        <outletCollection property="viewArray" destination="plP-Gr-jkv" collectionClass="NSMutableArray" id="zuF-cr-H44"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="vUn-FA-zny" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="1686" y="443"/>
+            <point key="canvasLocation" x="1685.5" y="442.5"/>
         </scene>
         <!--Goal View Controller-->
         <scene sceneID="l6E-L5-1xE">
@@ -486,28 +550,28 @@ what measurement system do you prefer?</string>
                         <viewControllerLayoutGuide type="bottom" id="6PH-YY-LNP"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="BrG-6p-F5j">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Now, set your daily goal. An average goal is around 2 L or 64 oz per day, but it can vary with your build." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nbv-Ph-Ogi" userLabel="Header">
-                                <rect key="frame" x="16" y="40" width="288" height="66"/>
+                                <rect key="frame" x="16" y="40" width="343" height="66"/>
                                 <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="16"/>
-                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="k9q-l3-tAh" userLabel="Controls">
-                                <rect key="frame" x="0.0" y="468" width="320" height="100"/>
+                                <rect key="frame" x="0.0" y="567" width="375" height="100"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dFe-jD-qxw">
-                                        <rect key="frame" x="240" y="20" width="60" height="60"/>
-                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <rect key="frame" x="295" y="20" width="60" height="60"/>
+                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="60" id="1hT-A8-yvW"/>
                                             <constraint firstAttribute="width" constant="60" id="efS-Mn-XoS"/>
                                         </constraints>
                                         <inset key="contentEdgeInsets" minX="1" minY="0.0" maxX="0.0" maxY="0.0"/>
                                         <state key="normal" image="next-icon">
-                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         </state>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -520,14 +584,14 @@ what measurement system do you prefer?</string>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qra-1E-3OP">
                                         <rect key="frame" x="20" y="20" width="60" height="60"/>
-                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="60" id="3V3-Jh-pdB"/>
                                             <constraint firstAttribute="height" constant="60" id="ixG-LU-ND0"/>
                                         </constraints>
                                         <inset key="contentEdgeInsets" minX="-5" minY="0.0" maxX="0.0" maxY="0.0"/>
                                         <state key="normal" image="prev-icon">
-                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         </state>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -539,7 +603,7 @@ what measurement system do you prefer?</string>
                                         </connections>
                                     </button>
                                 </subviews>
-                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="100" id="2Qk-mT-eqb"/>
                                     <constraint firstAttribute="bottom" secondItem="qra-1E-3OP" secondAttribute="bottom" constant="20" id="Cyo-6t-qVC"/>
@@ -549,20 +613,20 @@ what measurement system do you prefer?</string>
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xdk-cL-gdm" userLabel="Goal">
-                                <rect key="frame" x="0.0" y="126" width="320" height="60"/>
+                                <rect key="frame" x="0.0" y="126" width="375" height="60"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Daily goal" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="K6E-SK-ldz">
                                         <rect key="frame" x="20" y="16" width="90" height="28"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="2.0" placeholder="goal" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="S54-HU-dVI">
-                                        <rect key="frame" x="181" y="0.0" width="90" height="60"/>
+                                        <rect key="frame" x="236" y="0.0" width="90" height="60"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="90" id="YtZ-tJ-fYE"/>
                                         </constraints>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
                                         <textInputTraits key="textInputTraits" autocorrectionType="no" keyboardType="decimalPad"/>
                                         <connections>
@@ -570,9 +634,9 @@ what measurement system do you prefer?</string>
                                         </connections>
                                     </textField>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="oz" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OlE-qk-N7s">
-                                        <rect key="frame" x="281" y="17" width="19" height="25"/>
+                                        <rect key="frame" x="336" y="17" width="19" height="25"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="18"/>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                 </subviews>
@@ -588,7 +652,7 @@ what measurement system do you prefer?</string>
                                 </constraints>
                             </view>
                         </subviews>
-                        <color key="backgroundColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="backgroundColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstAttribute="trailing" secondItem="xdk-cL-gdm" secondAttribute="trailing" id="HmS-ox-gNq"/>
                             <constraint firstItem="xdk-cL-gdm" firstAttribute="leading" secondItem="BrG-6p-F5j" secondAttribute="leading" id="LcX-wE-RGP"/>
@@ -626,28 +690,28 @@ what measurement system do you prefer?</string>
                         <viewControllerLayoutGuide type="bottom" id="4Dn-cW-4Td"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="GqB-jz-M2M">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="I can remind you to drink every once in a while. Since I don’t want to nag you, you’ll decide when:" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="T9n-t2-EOq" userLabel="Header">
-                                <rect key="frame" x="16" y="40" width="288" height="66"/>
+                                <rect key="frame" x="16" y="40" width="343" height="66"/>
                                 <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="16"/>
-                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="a51-1N-ixm" userLabel="Controls">
-                                <rect key="frame" x="0.0" y="468" width="320" height="100"/>
+                                <rect key="frame" x="0.0" y="567" width="375" height="100"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LWy-za-zrz">
-                                        <rect key="frame" x="240" y="20" width="60" height="60"/>
-                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <rect key="frame" x="295" y="20" width="60" height="60"/>
+                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="60" id="KAo-2i-IFn"/>
                                             <constraint firstAttribute="width" constant="60" id="xme-MY-hIZ"/>
                                         </constraints>
                                         <inset key="contentEdgeInsets" minX="1" minY="0.0" maxX="0.0" maxY="0.0"/>
                                         <state key="normal" image="blue-check-icon">
-                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         </state>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -660,14 +724,14 @@ what measurement system do you prefer?</string>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wB4-SV-rbT">
                                         <rect key="frame" x="20" y="20" width="60" height="60"/>
-                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="60" id="7Qb-Bt-TCl"/>
                                             <constraint firstAttribute="width" constant="60" id="g9Q-Ic-NIa"/>
                                         </constraints>
                                         <inset key="contentEdgeInsets" minX="-5" minY="0.0" maxX="0.0" maxY="0.0"/>
                                         <state key="normal" image="prev-icon">
-                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         </state>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -679,7 +743,7 @@ what measurement system do you prefer?</string>
                                         </connections>
                                     </button>
                                 </subviews>
-                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="bottom" secondItem="LWy-za-zrz" secondAttribute="bottom" constant="20" id="8LC-of-Zp3"/>
                                     <constraint firstItem="wB4-SV-rbT" firstAttribute="leading" secondItem="a51-1N-ixm" secondAttribute="leading" constant="20" id="HBk-1D-vkn"/>
@@ -689,17 +753,17 @@ what measurement system do you prefer?</string>
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GTt-h0-xq8" userLabel="On">
-                                <rect key="frame" x="0.0" y="126" width="320" height="50"/>
+                                <rect key="frame" x="0.0" y="126" width="375" height="50"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Remind me" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mVT-8Y-PAY">
                                         <rect key="frame" x="20" y="11" width="102" height="28"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="gl4-fV-2SB">
-                                        <rect key="frame" x="251" y="10" width="51" height="31"/>
-                                        <color key="onTintColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="calibratedRGB"/>
+                                        <rect key="frame" x="306" y="10" width="51" height="31"/>
+                                        <color key="onTintColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <connections>
                                             <action selector="enableNotifications:" destination="UpA-CQ-AM6" eventType="valueChanged" id="Mqf-mo-XDV"/>
                                         </connections>
@@ -714,24 +778,24 @@ what measurement system do you prefer?</string>
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QuN-dL-t69" userLabel="From">
-                                <rect key="frame" x="0.0" y="176" width="320" height="50"/>
+                                <rect key="frame" x="0.0" y="176" width="375" height="50"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="From" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TTz-34-edX">
                                         <rect key="frame" x="20" y="11" width="47" height="28"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="10:00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uxY-Gi-w4N">
-                                        <rect key="frame" x="249" y="11" width="51" height="28"/>
+                                        <rect key="frame" x="304" y="11" width="51" height="28"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Tqy-KV-8mT">
-                                        <rect key="frame" x="0.0" y="0.0" width="320" height="50"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
                                         <state key="normal">
-                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         </state>
                                         <connections>
                                             <action selector="openFromSelection:" destination="UpA-CQ-AM6" eventType="touchUpInside" id="etX-A4-bBW"/>
@@ -752,24 +816,24 @@ what measurement system do you prefer?</string>
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="n2T-25-lRf" userLabel="To">
-                                <rect key="frame" x="0.0" y="226" width="320" height="50"/>
+                                <rect key="frame" x="0.0" y="226" width="375" height="50"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="To" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sjg-oM-azP">
                                         <rect key="frame" x="20" y="11" width="22" height="28"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="22:00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0pm-Fb-nta">
-                                        <rect key="frame" x="249" y="11" width="51" height="28"/>
+                                        <rect key="frame" x="304" y="11" width="51" height="28"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="KXD-3s-NZ3">
-                                        <rect key="frame" x="0.0" y="0.0" width="320" height="50"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
                                         <state key="normal">
-                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         </state>
                                         <connections>
                                             <action selector="openToSelection:" destination="UpA-CQ-AM6" eventType="touchUpInside" id="WSM-Xs-pN8"/>
@@ -789,24 +853,24 @@ what measurement system do you prefer?</string>
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4ng-Ck-Uhi" userLabel="Every">
-                                <rect key="frame" x="0.0" y="276" width="320" height="50"/>
+                                <rect key="frame" x="0.0" y="276" width="375" height="50"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Every" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6pM-Tq-50n">
                                         <rect key="frame" x="20" y="11" width="49" height="28"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1 hour" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9Xn-gc-3Bx">
-                                        <rect key="frame" x="242" y="11" width="58" height="28"/>
+                                        <rect key="frame" x="297" y="11" width="58" height="28"/>
                                         <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="RoW-Fv-Wot">
-                                        <rect key="frame" x="0.0" y="0.0" width="320" height="50"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
                                         <state key="normal">
-                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         </state>
                                         <connections>
                                             <action selector="openIntervalSelection:" destination="UpA-CQ-AM6" eventType="touchUpInside" id="duE-wd-xkc"/>
@@ -826,7 +890,7 @@ what measurement system do you prefer?</string>
                                 </constraints>
                             </view>
                         </subviews>
-                        <color key="backgroundColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="backgroundColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="4ng-Ck-Uhi" firstAttribute="leading" secondItem="GqB-jz-M2M" secondAttribute="leading" id="4fD-Q8-x55"/>
                             <constraint firstItem="a51-1N-ixm" firstAttribute="leading" secondItem="GqB-jz-M2M" secondAttribute="leading" id="AGY-Lq-A2e"/>
@@ -873,7 +937,6 @@ what measurement system do you prefer?</string>
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" navigationBarHidden="YES" id="By6-Ql-uIz" sceneMemberID="viewController">
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="y50-mX-m9k">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <nil name="viewControllers"/>
@@ -890,14 +953,10 @@ what measurement system do you prefer?</string>
         <image name="blue-check-icon" width="40" height="40"/>
         <image name="check-icon" width="40" height="40"/>
         <image name="large-icon" width="40" height="40"/>
+        <image name="medium-icon" width="40" height="40"/>
         <image name="next-icon" width="40" height="40"/>
         <image name="prev-icon" width="40" height="40"/>
-        <image name="small-icon" width="40" height="40"/>
+        <image name="small-icon" width="168" height="168"/>
     </resources>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4"/>
-    </simulatedMetricsContainer>
-    <color key="tintColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="calibratedRGB"/>
+    <color key="tintColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
 </document>
diff --git a/Gulps/Gulps.entitlements b/Gulps/Gulps.entitlements
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/AppIcon.appiconset/Contents.json b/Gulps/Images.xcassets/AppIcon.appiconset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/AppIcon.appiconset/Icon Copy-40.png b/Gulps/Images.xcassets/AppIcon.appiconset/Icon Copy-40.png
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/AppIcon.appiconset/Icon Copy-60.png b/Gulps/Images.xcassets/AppIcon.appiconset/Icon Copy-60.png
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/AppIcon.appiconset/Icon-120-1.png b/Gulps/Images.xcassets/AppIcon.appiconset/Icon-120-1.png
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/AppIcon.appiconset/Icon-120.png b/Gulps/Images.xcassets/AppIcon.appiconset/Icon-120.png
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/AppIcon.appiconset/Icon-180.png b/Gulps/Images.xcassets/AppIcon.appiconset/Icon-180.png
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/AppIcon.appiconset/Icon-58.png b/Gulps/Images.xcassets/AppIcon.appiconset/Icon-58.png
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/AppIcon.appiconset/Icon-80.png b/Gulps/Images.xcassets/AppIcon.appiconset/Icon-80.png
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/AppIcon.appiconset/Icon-87.png b/Gulps/Images.xcassets/AppIcon.appiconset/Icon-87.png
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/AppIcon.appiconset/Icon.png b/Gulps/Images.xcassets/AppIcon.appiconset/Icon.png
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/Contents.json b/Gulps/Images.xcassets/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/big-tiny-icon.imageset/Contents.json b/Gulps/Images.xcassets/big-tiny-icon.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/big-tiny-icon.imageset/big-tiny-icon.pdf b/Gulps/Images.xcassets/big-tiny-icon.imageset/big-tiny-icon.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/blue-check-icon.imageset/Contents.json b/Gulps/Images.xcassets/blue-check-icon.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/blue-check-icon.imageset/blue-check-icon.pdf b/Gulps/Images.xcassets/blue-check-icon.imageset/blue-check-icon.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/calendar-icon.imageset/Contents.json b/Gulps/Images.xcassets/calendar-icon.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/calendar-icon.imageset/calendar-icon.pdf b/Gulps/Images.xcassets/calendar-icon.imageset/calendar-icon.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/check-icon.imageset/Contents.json b/Gulps/Images.xcassets/check-icon.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/check-icon.imageset/check-icon.pdf b/Gulps/Images.xcassets/check-icon.imageset/check-icon.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/drink-icon.imageset/Contents.json b/Gulps/Images.xcassets/drink-icon.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/drink-icon.imageset/drink-icon.pdf b/Gulps/Images.xcassets/drink-icon.imageset/drink-icon.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/drop-bg.imageset/Contents.json b/Gulps/Images.xcassets/drop-bg.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/drop-bg.imageset/drop-bg.pdf b/Gulps/Images.xcassets/drop-bg.imageset/drop-bg.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/drop.imageset/Contents.json b/Gulps/Images.xcassets/drop.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/drop.imageset/drop.pdf b/Gulps/Images.xcassets/drop.imageset/drop.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/large-icon.imageset/Contents.json b/Gulps/Images.xcassets/large-icon.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/large-icon.imageset/large-icon.pdf b/Gulps/Images.xcassets/large-icon.imageset/large-icon.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/minus-icon.imageset/Contents.json b/Gulps/Images.xcassets/minus-icon.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/minus-icon.imageset/minus-icon.pdf b/Gulps/Images.xcassets/minus-icon.imageset/minus-icon.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/next-icon.imageset/Contents.json b/Gulps/Images.xcassets/next-icon.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/next-icon.imageset/next-icon.pdf b/Gulps/Images.xcassets/next-icon.imageset/next-icon.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/plus-icon.imageset/Contents.json b/Gulps/Images.xcassets/plus-icon.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/plus-icon.imageset/plus-icon.pdf b/Gulps/Images.xcassets/plus-icon.imageset/plus-icon.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/prev-icon.imageset/Contents.json b/Gulps/Images.xcassets/prev-icon.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/prev-icon.imageset/prev-icon.pdf b/Gulps/Images.xcassets/prev-icon.imageset/prev-icon.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/sad.imageset/Contents.json b/Gulps/Images.xcassets/sad.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/sad.imageset/sad.pdf b/Gulps/Images.xcassets/sad.imageset/sad.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/settings-icon.imageset/Contents.json b/Gulps/Images.xcassets/settings-icon.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/settings-icon.imageset/settings-icon.pdf b/Gulps/Images.xcassets/settings-icon.imageset/settings-icon.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/small-icon.imageset/Contents.json b/Gulps/Images.xcassets/small-icon.imageset/Contents.json
old mode 100644
new mode 100755
index 25e8e8f..2fde336
--- a/Gulps/Images.xcassets/small-icon.imageset/Contents.json
+++ b/Gulps/Images.xcassets/small-icon.imageset/Contents.json
@@ -2,7 +2,16 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "small-icon.pdf"
+      "filename" : "small-icon copy.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {
diff --git a/Gulps/Images.xcassets/small-tiny-icon.imageset/Contents.json b/Gulps/Images.xcassets/small-tiny-icon.imageset/Contents.json
old mode 100644
new mode 100755
index 2efb44d..9568ee6
--- a/Gulps/Images.xcassets/small-tiny-icon.imageset/Contents.json
+++ b/Gulps/Images.xcassets/small-tiny-icon.imageset/Contents.json
@@ -2,7 +2,16 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "small-tiny-icon.pdf"
+      "filename" : "small-tiny-icon.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {
diff --git a/Gulps/Images.xcassets/smile.imageset/Contents.json b/Gulps/Images.xcassets/smile.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/smile.imageset/smile.pdf b/Gulps/Images.xcassets/smile.imageset/smile.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/star.imageset/Contents.json b/Gulps/Images.xcassets/star.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/star.imageset/star.pdf b/Gulps/Images.xcassets/star.imageset/star.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/stats-icon.imageset/Contents.json b/Gulps/Images.xcassets/stats-icon.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/stats-icon.imageset/stats-icon.pdf b/Gulps/Images.xcassets/stats-icon.imageset/stats-icon.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/tiny-add.imageset/Contents.json b/Gulps/Images.xcassets/tiny-add.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/tiny-add.imageset/tiny-add.pdf b/Gulps/Images.xcassets/tiny-add.imageset/tiny-add.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/tiny-check.imageset/Contents.json b/Gulps/Images.xcassets/tiny-check.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/tiny-check.imageset/tiny-check.pdf b/Gulps/Images.xcassets/tiny-check.imageset/tiny-check.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/tiny-x.imageset/Contents.json b/Gulps/Images.xcassets/tiny-x.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/Gulps/Images.xcassets/tiny-x.imageset/tiny-x.pdf b/Gulps/Images.xcassets/tiny-x.imageset/tiny-x.pdf
old mode 100644
new mode 100755
diff --git a/Gulps/Info.plist b/Gulps/Info.plist
old mode 100644
new mode 100755
diff --git a/Gulps/Model/Entry.swift b/Gulps/Model/Entry.swift
old mode 100644
new mode 100755
diff --git a/Gulps/Model/EntryHandler.swift b/Gulps/Model/EntryHandler.swift
old mode 100644
new mode 100755
diff --git a/Gulps/Model/Gulp.swift b/Gulps/Model/Gulp.swift
old mode 100644
new mode 100755
diff --git a/Gulps/Resources/Fonts/KaushanScript.ttf b/Gulps/Resources/Fonts/KaushanScript.ttf
old mode 100644
new mode 100755
diff --git a/Gulps/Resources/Fonts/Lato-Light.ttf b/Gulps/Resources/Fonts/Lato-Light.ttf
old mode 100644
new mode 100755
diff --git a/Gulps/Resources/drop.caf b/Gulps/Resources/drop.caf
old mode 100644
new mode 100755
diff --git a/Gulps/Resources/en.lproj/Localizable.strings b/Gulps/Resources/en.lproj/Localizable.strings
old mode 100644
new mode 100755
index 2de35aa..e2353bb
--- a/Gulps/Resources/en.lproj/Localizable.strings
+++ b/Gulps/Resources/en.lproj/Localizable.strings
@@ -3,8 +3,10 @@
 "Liters" = "Liters";
 "Ounces" = "Ounces";
 "gulp.big" = "Big Gulp";
+"gulp.medium" = "Medium Gulp";
 "gulp.small" = "Small Gulp";
 
+
 /* Main */
 "drink title" = "Drink!";
 "undo poptip" = "Tap here to undo your latest action";
diff --git a/Gulps/Resources/it.lproj/Localizable.strings b/Gulps/Resources/it.lproj/Localizable.strings
old mode 100644
new mode 100755
index b9595db..a14c82c
--- a/Gulps/Resources/it.lproj/Localizable.strings
+++ b/Gulps/Resources/it.lproj/Localizable.strings
@@ -3,6 +3,7 @@
 "Liters" = "Litri";
 "Ounces" = "Once";
 "gulp.big" = "Big Gulp";
+"gulp.medium" = "Medium Gulp";
 "gulp.small" = "Small Gulp";
 
 /* Main */
diff --git a/Gulps/Resources/ru.lproj/Localizable.strings b/Gulps/Resources/ru.lproj/Localizable.strings
old mode 100644
new mode 100755
diff --git a/Gulps/Resources/tr.lproj/Localizable.strings b/Gulps/Resources/tr.lproj/Localizable.strings
old mode 100644
new mode 100755
diff --git a/Gulps/Support/AnimatedShareButton.swift b/Gulps/Support/AnimatedShareButton.swift
old mode 100644
new mode 100755
diff --git a/Gulps/Support/Colors.swift b/Gulps/Support/Colors.swift
old mode 100644
new mode 100755
diff --git a/Gulps/Support/Constants.swift b/Gulps/Support/Constants.swift
old mode 100644
new mode 100755
index 9816e6e..048b8c4
--- a/Gulps/Support/Constants.swift
+++ b/Gulps/Support/Constants.swift
@@ -53,13 +53,15 @@ public enum Constants {
   }
 
   public enum Gulp: Int {
-    case big, small, goal
+    case big, medium, small, goal
     public func key() -> String {
       switch self {
       case .big:
         return "GULP_BIG"
       case .small:
         return "GULP_SMALL"
+      case .medium:
+        return "GULP_MEDIUM"
       case .goal:
         return "PORTION_GOAL"
       }
diff --git a/Gulps/Support/Extensions.swift b/Gulps/Support/Extensions.swift
old mode 100644
new mode 100755
diff --git a/Gulps/Support/Globals.swift b/Gulps/Support/Globals.swift
old mode 100644
new mode 100755
diff --git a/Gulps/Support/NotificationHelper.swift b/Gulps/Support/NotificationHelper.swift
old mode 100644
new mode 100755
index 0a510a7..3f54f7a
--- a/Gulps/Support/NotificationHelper.swift
+++ b/Gulps/Support/NotificationHelper.swift
@@ -53,7 +53,14 @@ class NotificationHelper {
     smallAction.activationMode = .background
     smallAction.isAuthenticationRequired = false
     smallAction.isDestructive = false
-
+    
+    let mediumAction = UIMutableUserNotificationAction()
+    mediumAction.identifier = "MEDIUM_ACTION"
+    mediumAction.title = "Medium Gulp"
+    mediumAction.activationMode = .background
+    mediumAction.isAuthenticationRequired = false
+    mediumAction.isDestructive = false
+    
     let bigAction = UIMutableUserNotificationAction()
     bigAction.identifier = "BIG_ACTION"
     bigAction.title = "Big Gulp"
@@ -63,8 +70,8 @@ class NotificationHelper {
 
     let gulpCategory = UIMutableUserNotificationCategory()
     gulpCategory.identifier = "GULP_CATEGORY"
-    gulpCategory.setActions([smallAction, bigAction], for: .default)
-    gulpCategory.setActions([smallAction, bigAction], for: .minimal)
+    gulpCategory.setActions([smallAction,mediumAction, bigAction], for: .default)
+    gulpCategory.setActions([smallAction, mediumAction, bigAction], for: .minimal)
 
     let categories = NSSet(object: gulpCategory) as! Set<UIUserNotificationCategory>
     let settings = UIUserNotificationSettings(types: [.alert, .sound], categories: categories)
@@ -79,6 +86,9 @@ class NotificationHelper {
       if (identifier == "SMALL_ACTION") {
         NotificationHelper.addGulp(Constants.Gulp.small.key())
       }
+      if (identifier == "MEDIUM_ACTION"){
+        NotificationHelper.addGulp(Constants.Gulp.medium.key())
+      }
     }
   }
 
diff --git a/Gulps/Support/Settings.swift b/Gulps/Support/Settings.swift
old mode 100644
new mode 100755
index 74f327b..1b48f7f
--- a/Gulps/Support/Settings.swift
+++ b/Gulps/Support/Settings.swift
@@ -9,6 +9,7 @@ open class Settings {
       userDefaults.set(true, forKey: "DEFAULTS_INSTALLED")
       userDefaults.set(Constants.UnitsOfMeasure.liters.rawValue, forKey: Constants.General.unitOfMeasure.key())
       userDefaults.set(0.5, forKey: Constants.Gulp.big.key())
+      userDefaults.set(0.3, forKey: Constants.Gulp.medium.key())
       userDefaults.set(0.2, forKey: Constants.Gulp.small.key())
       userDefaults.set(2, forKey: Constants.Gulp.goal.key())
       userDefaults.set(false, forKey: Constants.Health.on.key())
@@ -23,6 +24,7 @@ open class Settings {
   open class func registerDefaultsForLiter() {
     let userDefaults = UserDefaults.groupUserDefaults()
     userDefaults.set(0.5, forKey: Constants.Gulp.big.key())
+    userDefaults.set(0.3, forKey: Constants.Gulp.medium.key())
     userDefaults.set(0.2, forKey: Constants.Gulp.small.key())
     userDefaults.set(2, forKey: Constants.Gulp.goal.key())
     userDefaults.synchronize()
@@ -31,6 +33,7 @@ open class Settings {
   open class func registerDefaultsForOunces() {
     let userDefaults = UserDefaults.groupUserDefaults()
     userDefaults.set(16, forKey: Constants.Gulp.big.key())
+    userDefaults.set(12, forKey: Constants.Gulp.medium.key())
     userDefaults.set(8, forKey: Constants.Gulp.small.key())
     userDefaults.set(64, forKey: Constants.Gulp.goal.key())
     userDefaults.synchronize()
@@ -42,6 +45,7 @@ open class Settings {
       Constants.Gulp.goal.key(): userDefaults.double(forKey: Constants.Gulp.goal.key()),
       Constants.WatchContext.current.key(): current,
       Constants.Gulp.small.key(): userDefaults.double(forKey: Constants.Gulp.small.key()),
+      Constants.Gulp.medium.key(): userDefaults.double(forKey: Constants.Gulp.medium.key()),
       Constants.Gulp.big.key(): userDefaults.double(forKey: Constants.Gulp.big.key())]
   }
 }
diff --git a/Gulps/Support/UINavigationController-StatusBar.swift b/Gulps/Support/UINavigationController-StatusBar.swift
old mode 100644
new mode 100755
diff --git a/Gulps/Support/WatchConnectivityHelper.swift b/Gulps/Support/WatchConnectivityHelper.swift
old mode 100644
new mode 100755
diff --git a/Gulps/ViewControllers/CalendarViewController.swift b/Gulps/ViewControllers/CalendarViewController.swift
old mode 100644
new mode 100755
index 3392b71..a377177
--- a/Gulps/ViewControllers/CalendarViewController.swift
+++ b/Gulps/ViewControllers/CalendarViewController.swift
@@ -28,6 +28,9 @@ class CalendarViewController: UIViewController {
     actionSheet?.addButton(withTitle: NSLocalizedString("gulp.small", comment: ""), type: .default) { _ in
       self.addExtraGulp(ofSize: .small)
     }
+    actionSheet?.addButton(withTitle: NSLocalizedString("gulp.medium", comment: ""), type: .default) { _ in
+      self.addExtraGulp(ofSize: .medium)
+    }
     actionSheet?.addButton(withTitle: NSLocalizedString("gulp.big", comment: ""), type: .default) { _ in
       self.addExtraGulp(ofSize: .big)
     }
diff --git a/Gulps/ViewControllers/DrinkViewController.swift b/Gulps/ViewControllers/DrinkViewController.swift
old mode 100644
new mode 100755
index ac01ff8..bc55092
--- a/Gulps/ViewControllers/DrinkViewController.swift
+++ b/Gulps/ViewControllers/DrinkViewController.swift
@@ -11,6 +11,7 @@ open class DrinkViewController: UIViewController, UIAlertViewDelegate, UIViewCon
   @IBOutlet open weak var addButton: UIButton!
   @IBOutlet open weak var smallButton: UIButton!
   @IBOutlet open weak var largeButton: UIButton!
+  @IBOutlet open weak var mediumButton: UIButton!
   @IBOutlet open weak var minusButton: UIButton!
   @IBOutlet weak var starButton: UIButton!
   @IBOutlet weak var meterContainerView: UIView!
@@ -140,8 +141,20 @@ open class DrinkViewController: UIViewController, UIAlertViewDelegate, UIViewCon
                                  popTipText: NSLocalizedString("undo poptip", comment: ""),
                                  inView: view,
                                  fromFrame: minusButton.frame)
+    
+    
+    if sender == smallButton{
+      updateCurrentEntry(userDefaults.double(forKey: Constants.Gulp.small.key()))
+    } else if sender == mediumButton{
+      updateCurrentEntry(userDefaults.double(forKey: Constants.Gulp.medium.key()))
+    } else if sender == largeButton{
+      updateCurrentEntry(userDefaults.double(forKey: Constants.Gulp.big.key()))
+    }
+    
+    /*
     let portion = smallButton == sender ? Constants.Gulp.small.key() : Constants.Gulp.big.key()
     updateCurrentEntry(userDefaults.double(forKey: portion))
+     */
   }
 
   @IBAction func removeGulpAction() {
diff --git a/Gulps/ViewControllers/FeedbackViewController.swift b/Gulps/ViewControllers/FeedbackViewController.swift
old mode 100644
new mode 100755
diff --git a/Gulps/ViewControllers/Onboarding/GoalViewController.swift b/Gulps/ViewControllers/Onboarding/GoalViewController.swift
old mode 100644
new mode 100755
diff --git a/Gulps/ViewControllers/Onboarding/GulpsViewController.swift b/Gulps/ViewControllers/Onboarding/GulpsViewController.swift
old mode 100644
new mode 100755
index f769d5e..807b176
--- a/Gulps/ViewControllers/Onboarding/GulpsViewController.swift
+++ b/Gulps/ViewControllers/Onboarding/GulpsViewController.swift
@@ -1,25 +1,35 @@
 import UIKit
 import pop
 
+// TO-DO: Fix timing of medium gulp onboarding
+
 class GulpsViewController: OnboardingViewController, UITextFieldDelegate {
 
   @IBOutlet weak var smallGulpText: UITextField!
   @IBOutlet weak var bigGulpText: UITextField!
   @IBOutlet weak var smallSuffixLabel: UILabel!
   @IBOutlet weak var bigSuffixLabel: UILabel!
+  @IBOutlet weak var mediumSuffixLabel: UILabel!
+  @IBOutlet weak var mediumGulpText: UITextField!
   @IBOutlet weak var headerLabel: UILabel!
   @IBOutlet weak var smallBackgroundView: UIView!
   @IBOutlet weak var bigBackgroundView: UIView!
-
+  @IBOutlet weak var mediumBackgroundView: UIView!
+    
+    
   let userDefaults = UserDefaults.groupUserDefaults()
 
   override func viewDidLoad() {
     super.viewDidLoad()
 
     self.smallGulpText.inputAccessoryView = Globals.numericToolbar(self, selector: #selector(GulpsViewController.dismissAndSave))
+    
+    self.mediumGulpText.inputAccessoryView = Globals.numericToolbar(self, selector: #selector(GulpsViewController.dismissAndSave))
+    
     self.bigGulpText.inputAccessoryView = Globals.numericToolbar(self, selector: #selector(GulpsViewController.dismissAndSave))
 
     self.smallBackgroundView.addGestureRecognizer(UITapGestureRecognizer(target: self.smallGulpText, action: #selector(UIResponder.becomeFirstResponder)))
+    self.mediumBackgroundView.addGestureRecognizer(UITapGestureRecognizer(target: self.mediumGulpText, action: #selector(UIResponder.becomeFirstResponder)))
     self.bigBackgroundView.addGestureRecognizer(UITapGestureRecognizer(target: self.bigGulpText, action: #selector(UIResponder.becomeFirstResponder)))
 
     NotificationCenter.default.addObserver(self, selector: #selector(GulpsViewController.keyboardWillShow(_:)), name: NSNotification.Name.UIKeyboardWillShow, object: nil)
@@ -30,19 +40,25 @@ class GulpsViewController: OnboardingViewController, UITextFieldDelegate {
     let numberFormatter = NumberFormatter()
     numberFormatter.numberStyle = .decimal
 
-    _ = [self.smallGulpText, self.bigGulpText].map({$0.resignFirstResponder()})
+    _ = [self.smallGulpText, self.mediumGulpText, self.bigGulpText].map({$0.resignFirstResponder()})
 
     var small = 0.0
+    var medium = 0.0
     var big = 0.0
     if let number = numberFormatter.number(from: self.smallGulpText.text ?? "0") {
       small = number.doubleValue
     }
+    
+    if let number = numberFormatter.number(from: self.mediumGulpText.text ?? "0") {
+      medium = number.doubleValue
+    }
 
     if let number = numberFormatter.number(from: self.bigGulpText.text ?? "0") {
       big = number.doubleValue
     }
 
     self.userDefaults.set(small, forKey: Constants.Gulp.small.key())
+    self.userDefaults.set(medium, forKey: Constants.Gulp.medium.key())
     self.userDefaults.set(big, forKey: Constants.Gulp.big.key())
     self.userDefaults.synchronize()
   }
@@ -59,17 +75,19 @@ class GulpsViewController: OnboardingViewController, UITextFieldDelegate {
     let numberFormatter = NumberFormatter()
     numberFormatter.numberStyle = .decimal
     self.smallGulpText.text = numberFormatter.string(for: self.userDefaults.double(forKey: Constants.Gulp.small.key()))
+    self.mediumGulpText.text = numberFormatter.string(for: self.userDefaults.double(forKey: Constants.Gulp.medium.key()))
     self.bigGulpText.text = numberFormatter.string(for: self.userDefaults.double(forKey: Constants.Gulp.big.key()))
     let unit = Constants.UnitsOfMeasure(rawValue: self.userDefaults.integer(forKey: Constants.General.unitOfMeasure.key()))
 
     if let unit = unit {
       self.smallSuffixLabel.text = unit.suffixForUnitOfMeasure()
+      self.mediumSuffixLabel.text = unit.suffixForUnitOfMeasure()
       self.bigSuffixLabel.text = unit.suffixForUnitOfMeasure()
     }
   }
 
   override func touchesEnded(_ touches: Set<UITouch>, with event: UIEvent?) {
-    _ = [self.smallGulpText, self.bigGulpText].map({$0.resignFirstResponder()})
+    _ = [self.smallGulpText, self.mediumGulpText, self.bigGulpText].map({$0.resignFirstResponder()})
   }
 
   @objc func keyboardWillShow(_ notification: Notification) {
diff --git a/Gulps/ViewControllers/Onboarding/MeasureViewController.swift b/Gulps/ViewControllers/Onboarding/MeasureViewController.swift
old mode 100644
new mode 100755
diff --git a/Gulps/ViewControllers/Onboarding/NotificationViewController.swift b/Gulps/ViewControllers/Onboarding/NotificationViewController.swift
old mode 100644
new mode 100755
diff --git a/Gulps/ViewControllers/Onboarding/OnboardingViewController.swift b/Gulps/ViewControllers/Onboarding/OnboardingViewController.swift
old mode 100644
new mode 100755
diff --git a/Gulps/ViewControllers/SettingsViewController.swift b/Gulps/ViewControllers/SettingsViewController.swift
old mode 100644
new mode 100755
index 5ca1484..5d76e11
--- a/Gulps/ViewControllers/SettingsViewController.swift
+++ b/Gulps/ViewControllers/SettingsViewController.swift
@@ -6,6 +6,7 @@ class SettingsViewController: UITableViewController, UIAlertViewDelegate, UIText
 
   @IBOutlet weak var unitOfMesureLabel: UILabel!
   @IBOutlet weak var smallPortionText: UITextField!
+  @IBOutlet weak var mediumPortionText: UITextField!
   @IBOutlet weak var largePortionText: UITextField!
   @IBOutlet weak var dailyGoalText: UITextField!
   @IBOutlet weak var notificationSwitch: UISwitch!
@@ -54,6 +55,7 @@ class SettingsViewController: UITableViewController, UIAlertViewDelegate, UIText
 
     _ = uomLabels.map({$0.text = suffix})
     largePortionText.text = numberFormatter.string(for: userDefaults.double(forKey: Constants.Gulp.big.key()))
+    mediumPortionText.text = numberFormatter.string(for: userDefaults.double(forKey: Constants.Gulp.medium.key()))
     smallPortionText.text = numberFormatter.string(for: userDefaults.double(forKey: Constants.Gulp.small.key()))
     dailyGoalText.text = numberFormatter.string(for: userDefaults.double(forKey: Constants.Gulp.goal.key()))
 
@@ -154,7 +156,7 @@ class SettingsViewController: UITableViewController, UIAlertViewDelegate, UIText
     if (section == 0) {
       return 1
     } else if (section == 1) {
-      return 3
+      return 4
     } else if (section == 2) {
       if UserDefaults.groupUserDefaults().bool(forKey: Constants.Notification.on.key()) {
         return 4
@@ -173,6 +175,9 @@ class SettingsViewController: UITableViewController, UIAlertViewDelegate, UIText
     if (textField == largePortionText) {
       storeText(largePortionText, toKey: Constants.Gulp.big.key())
     }
+    if (textField == mediumPortionText) {
+      storeText(mediumPortionText, toKey: Constants.Gulp.medium.key())
+    }
     if (textField == dailyGoalText) {
       storeText(dailyGoalText, toKey: Constants.Gulp.goal.key())
     }
diff --git a/Gulps/ViewControllers/Support/CalendarViewController+Animations.swift b/Gulps/ViewControllers/Support/CalendarViewController+Animations.swift
old mode 100644
new mode 100755
diff --git a/Gulps/ViewControllers/Support/DrinkViewController+Animations.swift b/Gulps/ViewControllers/Support/DrinkViewController+Animations.swift
old mode 100644
new mode 100755
index 1957143..559eebf
--- a/Gulps/ViewControllers/Support/DrinkViewController+Animations.swift
+++ b/Gulps/ViewControllers/Support/DrinkViewController+Animations.swift
@@ -4,6 +4,7 @@ extension DrinkViewController {
 
   func initAnimation() {
     smallButton.alpha = 0
+    mediumButton.alpha = 0
     largeButton.alpha = 0
     starButton.transform = CGAffineTransform(scaleX: 0.0001, y: 0.0001)
   }
@@ -30,7 +31,7 @@ extension DrinkViewController {
     starButton.pop_add(scale, forKey: "scale")
     starButton.layer.pop_add(rotate, forKey: "rotate")
   }
-
+  
   func expandAddButton() {
     addButton.isUserInteractionEnabled = false
 
@@ -41,7 +42,7 @@ extension DrinkViewController {
     rotate?.removedOnCompletion = true
     rotate?.completionBlock = { (_, _) in
       self.addButton.isUserInteractionEnabled = true
-      _ = [self.smallButton, self.largeButton].map({$0.isUserInteractionEnabled = true})
+      _ = [self.smallButton,self.mediumButton, self.largeButton].map({$0.isUserInteractionEnabled = true})
       self.expanded = true
     }
 
@@ -67,8 +68,8 @@ extension DrinkViewController {
     addButton.pop_add(color, forKey: "color")
     minusButton.pop_add(scaleMinus, forKey: "scaleMinus")
 
-    [smallButton, largeButton].forEach {$0.alpha = 1}
-    for button in [smallButton, largeButton] {
+    [smallButton,mediumButton, largeButton].forEach {$0.alpha = 1}
+    for button in [smallButton,mediumButton, largeButton] {
       let pop = POPSpringAnimation(propertyNamed: kPOPViewScaleXY)
       pop?.fromValue = NSValue(cgPoint: CGPoint(x: 0.1, y: 0.1))
       pop?.toValue = NSValue(cgPoint: CGPoint(x: 1, y: 1))
@@ -88,10 +89,18 @@ extension DrinkViewController {
     right?.fromValue = 0
     right?.toValue = 100
     largeButton.layer.pop_add(right, forKey: "right")
+    
+    let up = POPSpringAnimation(propertyNamed:
+        kPOPLayerTranslationY)
+    up?.springBounciness = 5
+    up?.fromValue = 0
+    up?.toValue = -100
+    mediumButton.layer.pop_add(up, forKey: "up")
+    
   }
 
   func contractAddButton() {
-    [smallButton, largeButton].forEach {$0.isUserInteractionEnabled = false}
+    [smallButton, mediumButton, largeButton].forEach {$0?.isUserInteractionEnabled = false}
     addButton.isUserInteractionEnabled = false
 
     let rotate = POPSpringAnimation(propertyNamed: kPOPLayerRotation)
@@ -124,7 +133,7 @@ extension DrinkViewController {
     addButton.pop_add(color, forKey: "color")
     minusButton.pop_add(scaleMinus, forKey: "scaleMinus")
 
-    for button in [smallButton, largeButton] {
+    for button in [smallButton, mediumButton, largeButton] {
       let pop = POPSpringAnimation(propertyNamed: kPOPViewScaleXY)
       pop?.fromValue = NSValue(cgPoint: CGPoint(x: 1, y: 1))
       pop?.toValue = NSValue(cgPoint: CGPoint(x: 0.1, y: 0.1))
@@ -144,5 +153,14 @@ extension DrinkViewController {
     right?.fromValue = 100
     right?.toValue = 0
     largeButton.layer.pop_add(right, forKey: "right")
+    
+    let up = POPBasicAnimation(propertyNamed:
+        kPOPLayerTranslationY)
+    up?.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseOut)
+    up?.fromValue = -100
+    up?.toValue = 0
+    mediumButton.layer.pop_add(up, forKey:
+        "up")
+    
   }
 }
diff --git a/Gulps/it.lproj/InfoPlist.strings b/Gulps/it.lproj/InfoPlist.strings
old mode 100644
new mode 100755
diff --git a/Gulps/it.lproj/Main.strings b/Gulps/it.lproj/Main.strings
old mode 100644
new mode 100755
diff --git a/Gulps/it.lproj/Onboarding.strings b/Gulps/it.lproj/Onboarding.strings
old mode 100644
new mode 100755
diff --git a/Gulps/ru.lproj/InfoPlist.strings b/Gulps/ru.lproj/InfoPlist.strings
old mode 100644
new mode 100755
diff --git a/Gulps/ru.lproj/LaunchScreen.strings b/Gulps/ru.lproj/LaunchScreen.strings
old mode 100644
new mode 100755
diff --git a/Gulps/ru.lproj/Main.strings b/Gulps/ru.lproj/Main.strings
old mode 100644
new mode 100755
diff --git a/Gulps/ru.lproj/Onboarding.strings b/Gulps/ru.lproj/Onboarding.strings
old mode 100644
new mode 100755
diff --git a/Gulps/tr.lproj/InfoPlist.strings b/Gulps/tr.lproj/InfoPlist.strings
old mode 100644
new mode 100755
diff --git a/Gulps/tr.lproj/LaunchScreen.strings b/Gulps/tr.lproj/LaunchScreen.strings
old mode 100644
new mode 100755
diff --git a/Gulps/tr.lproj/Main.strings b/Gulps/tr.lproj/Main.strings
old mode 100644
new mode 100755
diff --git a/Gulps/tr.lproj/Onboarding.strings b/Gulps/tr.lproj/Onboarding.strings
old mode 100644
new mode 100755