diff --git a/.gitignore b/.gitignore
index d976566..b04e7d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,8 @@
 # Created by https://www.gitignore.io/
 
+## Finder
+.DS_Store
+
 ## Build generated
 build/
 DerivedData
diff --git a/Chameleon.xcodeproj/project.pbxproj b/Chameleon.xcodeproj/project.pbxproj
index 271dce6..9f19c54 100755
--- a/Chameleon.xcodeproj/project.pbxproj
+++ b/Chameleon.xcodeproj/project.pbxproj
@@ -55,7 +55,9 @@
 		247EB8B91BB61F76009B4904 /* Chameleon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 240093F81BB4517400932727 /* Chameleon.framework */; };
 		24D08ECB1F00954100D9F1A7 /* FirstViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24D08EC91F00953A00D9F1A7 /* FirstViewController.swift */; };
 		24D08ECC1F00954100D9F1A7 /* SecondViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24D08ECA1F00953A00D9F1A7 /* SecondViewController.swift */; };
-		24D08ECD1F00958200D9F1A7 /* Chameleon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 240093F81BB4517400932727 /* Chameleon.framework */; };
+		E1AD475620F53A550039F76F /* Chameleon.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 240093F81BB4517400932727 /* Chameleon.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		E1AD475A20F53A630039F76F /* Chameleon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 240093F81BB4517400932727 /* Chameleon.framework */; };
+		E1AD475B20F53A630039F76F /* Chameleon.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 240093F81BB4517400932727 /* Chameleon.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -66,6 +68,20 @@
 			remoteGlobalIDString = 240093F71BB4517400932727;
 			remoteInfo = Chameleon;
 		};
+		E1AD475720F53A550039F76F /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 240093EF1BB4517400932727 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 240093F71BB4517400932727;
+			remoteInfo = Chameleon;
+		};
+		E1AD475C20F53A630039F76F /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 240093EF1BB4517400932727 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 240093F71BB4517400932727;
+			remoteInfo = Chameleon;
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -80,6 +96,28 @@
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		E1AD475920F53A550039F76F /* Embed Frameworks */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				E1AD475620F53A550039F76F /* Chameleon.framework in Embed Frameworks */,
+			);
+			name = "Embed Frameworks";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		E1AD475E20F53A630039F76F /* Embed Frameworks */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				E1AD475B20F53A630039F76F /* Chameleon.framework in Embed Frameworks */,
+			);
+			name = "Embed Frameworks";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
@@ -160,7 +198,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				24D08ECD1F00958200D9F1A7 /* Chameleon.framework in Frameworks */,
+				E1AD475A20F53A630039F76F /* Chameleon.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -356,10 +394,12 @@
 				246492F51F0094DB001E4F26 /* Sources */,
 				246492F61F0094DB001E4F26 /* Frameworks */,
 				246492F71F0094DB001E4F26 /* Resources */,
+				E1AD475E20F53A630039F76F /* Embed Frameworks */,
 			);
 			buildRules = (
 			);
 			dependencies = (
+				E1AD475D20F53A630039F76F /* PBXTargetDependency */,
 			);
 			name = "ChameleonDemo-Swift";
 			productName = "ChameleonDemo-Swift";
@@ -373,10 +413,12 @@
 				247EB8A31BB61EB3009B4904 /* Sources */,
 				247EB8A41BB61EB3009B4904 /* Frameworks */,
 				247EB8A51BB61EB3009B4904 /* Resources */,
+				E1AD475920F53A550039F76F /* Embed Frameworks */,
 			);
 			buildRules = (
 			);
 			dependencies = (
+				E1AD475820F53A550039F76F /* PBXTargetDependency */,
 			);
 			name = ChameleonDemo;
 			productName = ChameleonDemo;
@@ -390,7 +432,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0900;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0940;
 				ORGANIZATIONNAME = "Vicc Alexander";
 				TargetAttributes = {
 					0C8DABB01C07B5EA00B28FE2 = {
@@ -398,10 +440,11 @@
 					};
 					240093F71BB4517400932727 = {
 						CreatedOnToolsVersion = 7.0;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0940;
 					};
 					246492F81F0094DB001E4F26 = {
 						CreatedOnToolsVersion = 9.0;
+						LastSwiftMigration = 0940;
 					};
 					247EB8A61BB61EB3009B4904 = {
 						CreatedOnToolsVersion = 7.0;
@@ -528,6 +571,16 @@
 			target = 240093F71BB4517400932727 /* Chameleon */;
 			targetProxy = 0C6D34741C07B98400A7BF83 /* PBXContainerItemProxy */;
 		};
+		E1AD475820F53A550039F76F /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 240093F71BB4517400932727 /* Chameleon */;
+			targetProxy = E1AD475720F53A550039F76F /* PBXContainerItemProxy */;
+		};
+		E1AD475D20F53A630039F76F /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 240093F71BB4517400932727 /* Chameleon */;
+			targetProxy = E1AD475C20F53A630039F76F /* PBXContainerItemProxy */;
+		};
 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */
@@ -622,12 +675,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -678,12 +733,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -721,6 +778,7 @@
 			buildSettings = {
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -734,7 +792,8 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -743,6 +802,7 @@
 			buildSettings = {
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -755,13 +815,15 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.viccalexander.Chameleon;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
 		246493081F0094DB001E4F26 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -780,7 +842,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.viccalexander.ChameleonDemo-Swift";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -788,6 +851,7 @@
 		246493091F0094DB001E4F26 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -805,7 +869,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.viccalexander.ChameleonDemo-Swift";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -813,6 +878,7 @@
 		247EB8B61BB61EB3009B4904 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = ChameleonDemo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -826,6 +892,7 @@
 		247EB8B71BB61EB3009B4904 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = ChameleonDemo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
diff --git a/Chameleon.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Chameleon.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 0000000..18d9810
--- /dev/null
+++ b/Chameleon.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Chameleon.xcodeproj/xcshareddata/xcschemes/Chameleon.xcscheme b/Chameleon.xcodeproj/xcshareddata/xcschemes/Chameleon.xcscheme
index a813637..ef5dfef 100755
--- a/Chameleon.xcodeproj/xcshareddata/xcschemes/Chameleon.xcscheme
+++ b/Chameleon.xcodeproj/xcshareddata/xcschemes/Chameleon.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -37,7 +36,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Contents.json b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Contents.json
old mode 100755
new mode 100644
index 118c98f..c8477e6
--- a/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,38 +1,158 @@
 {
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
   "images" : [
     {
+      "filename" : "Icon-40.png",
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Icon-40@2x.png",
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Icon-60@2x.png",
+      "size" : "60x60",
       "idiom" : "iphone",
-      "size" : "29x29",
       "scale" : "2x"
     },
     {
+      "filename" : "Icon-72.png",
+      "size" : "72x72",
+      "idiom" : "ipad",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Icon-72@2x.png",
+      "size" : "72x72",
+      "idiom" : "ipad",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Icon-76.png",
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Icon-76@2x.png",
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Icon-Small-50.png",
+      "size" : "50x50",
+      "idiom" : "ipad",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Icon-Small-50@2x.png",
+      "size" : "50x50",
+      "idiom" : "ipad",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Icon-Small.png",
+      "size" : "29x29",
       "idiom" : "iphone",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Icon-Small@2x.png",
       "size" : "29x29",
-      "scale" : "3x"
+      "idiom" : "iphone",
+      "scale" : "2x"
     },
     {
+      "filename" : "Icon.png",
+      "size" : "57x57",
+      "idiom" : "iphone",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Icon@2x.png",
+      "size" : "57x57",
       "idiom" : "iphone",
-      "size" : "40x40",
       "scale" : "2x"
     },
     {
+      "filename" : "Icon-Small@3x.png",
+      "size" : "29x29",
       "idiom" : "iphone",
-      "size" : "40x40",
       "scale" : "3x"
     },
     {
+      "filename" : "Icon-40@3x.png",
+      "size" : "40x40",
       "idiom" : "iphone",
+      "scale" : "3x"
+    },
+    {
+      "filename" : "Icon-60@3x.png",
       "size" : "60x60",
+      "idiom" : "iphone",
+      "scale" : "3x"
+    },
+    {
+      "filename" : "Icon-40@2x.png",
+      "size" : "40x40",
+      "idiom" : "iphone",
       "scale" : "2x"
     },
     {
+      "filename" : "Icon-Small.png",
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Icon-Small@2x.png",
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Icon-83.5@2x.png",
+      "size" : "83.5x83.5",
+      "idiom" : "ipad",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "NotificationIcon@2x.png",
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "NotificationIcon@3x.png",
+      "size" : "20x20",
       "idiom" : "iphone",
-      "size" : "60x60",
       "scale" : "3x"
+    },
+    {
+      "filename" : "NotificationIcon~ipad.png",
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "NotificationIcon~ipad@2x.png",
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "ios-marketing.png",
+      "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "scale" : "1x"
     }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
+  ]
 }
\ No newline at end of file
diff --git a/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-40.png b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-40.png
new file mode 100644
index 0000000..a3157db
Binary files /dev/null and b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-40.png differ
diff --git a/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png
new file mode 100644
index 0000000..b187c73
Binary files /dev/null and b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png differ
diff --git a/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-40@3x.png b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-40@3x.png
new file mode 100644
index 0000000..ca3c72f
Binary files /dev/null and b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-40@3x.png differ
diff --git a/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png
new file mode 100644
index 0000000..ca3c72f
Binary files /dev/null and b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png differ
diff --git a/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png
new file mode 100644
index 0000000..abda1cc
Binary files /dev/null and b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png differ
diff --git a/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-72.png b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-72.png
new file mode 100644
index 0000000..3323b9f
Binary files /dev/null and b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-72.png differ
diff --git a/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-72@2x.png b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-72@2x.png
new file mode 100644
index 0000000..b60d97f
Binary files /dev/null and b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-72@2x.png differ
diff --git a/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-76.png b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-76.png
new file mode 100644
index 0000000..6b160f9
Binary files /dev/null and b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-76.png differ
diff --git a/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png
new file mode 100644
index 0000000..3204a3c
Binary files /dev/null and b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png differ
diff --git a/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png
new file mode 100644
index 0000000..bb2afdf
Binary files /dev/null and b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png differ
diff --git a/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-Small-50.png b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-Small-50.png
new file mode 100644
index 0000000..2261485
Binary files /dev/null and b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-Small-50.png differ
diff --git a/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-Small-50@2x.png b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-Small-50@2x.png
new file mode 100644
index 0000000..cb80cb5
Binary files /dev/null and b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-Small-50@2x.png differ
diff --git a/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-Small.png b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-Small.png
new file mode 100644
index 0000000..c676c0b
Binary files /dev/null and b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-Small.png differ
diff --git a/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png
new file mode 100644
index 0000000..84efb2e
Binary files /dev/null and b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png differ
diff --git a/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png
new file mode 100644
index 0000000..468d4cb
Binary files /dev/null and b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png differ
diff --git a/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon.png b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon.png
new file mode 100644
index 0000000..41b411d
Binary files /dev/null and b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon.png differ
diff --git a/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon@2x.png b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon@2x.png
new file mode 100644
index 0000000..e3c3a91
Binary files /dev/null and b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/Icon@2x.png differ
diff --git a/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/NotificationIcon@2x.png b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/NotificationIcon@2x.png
new file mode 100644
index 0000000..a3157db
Binary files /dev/null and b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/NotificationIcon@2x.png differ
diff --git a/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/NotificationIcon@3x.png b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/NotificationIcon@3x.png
new file mode 100644
index 0000000..7a1fff6
Binary files /dev/null and b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/NotificationIcon@3x.png differ
diff --git a/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/NotificationIcon~ipad.png b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/NotificationIcon~ipad.png
new file mode 100644
index 0000000..40f732b
Binary files /dev/null and b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/NotificationIcon~ipad.png differ
diff --git a/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/NotificationIcon~ipad@2x.png b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/NotificationIcon~ipad@2x.png
new file mode 100644
index 0000000..a3157db
Binary files /dev/null and b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/NotificationIcon~ipad@2x.png differ
diff --git a/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/ios-marketing.png b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/ios-marketing.png
new file mode 100644
index 0000000..80fa3bb
Binary files /dev/null and b/ChameleonDemo-ObjC/Assets.xcassets/AppIcon.appiconset/ios-marketing.png differ
diff --git a/ChameleonDemo-ObjC/Base.lproj/LaunchScreen.storyboard b/ChameleonDemo-ObjC/Base.lproj/LaunchScreen.storyboard
old mode 100755
new mode 100644
index 2e721e1..95b229f
--- a/ChameleonDemo-ObjC/Base.lproj/LaunchScreen.storyboard
+++ b/ChameleonDemo-ObjC/Base.lproj/LaunchScreen.storyboard
@@ -1,7 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8150" systemVersion="15A204g" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.19" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8122"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.16"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -13,10 +18,18 @@
                         <viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <animations/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <subviews>
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="logo" translatesAutoresizingMaskIntoConstraints="NO" id="H1p-zD-1W4">
+                                <rect key="frame" x="39.5" y="185.5" width="295" height="295"/>
+                            </imageView>
+                        </subviews>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstItem="H1p-zD-1W4" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="1d3-Nm-RQM"/>
+                            <constraint firstItem="H1p-zD-1W4" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="ypH-Je-3rG"/>
+                        </constraints>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -24,4 +37,7 @@
             <point key="canvasLocation" x="53" y="375"/>
         </scene>
     </scenes>
+    <resources>
+        <image name="logo" width="295" height="295"/>
+    </resources>
 </document>
diff --git a/ChameleonDemo-ObjC/Base.lproj/Main.storyboard b/ChameleonDemo-ObjC/Base.lproj/Main.storyboard
index d19da11..ddc2796 100755
--- a/ChameleonDemo-ObjC/Base.lproj/Main.storyboard
+++ b/ChameleonDemo-ObjC/Base.lproj/Main.storyboard
@@ -1,8 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9060" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="DDR-cw-uah">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="DDR-cw-uah">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9051"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--Chameleon-->
@@ -14,28 +18,28 @@
                         <viewControllerLayoutGuide type="bottom" id="bo3-pv-2fG"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="7XF-ox-U3N">
-                        <rect key="frame" x="0.0" y="64" width="600" height="536"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="603"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <stepper opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" maximumValue="100" translatesAutoresizingMaskIntoConstraints="NO" id="Fcl-sO-xGd">
                                 <rect key="frame" x="35" y="89" width="94" height="29"/>
-                                <animations/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             </stepper>
                             <progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" fixedFrame="YES" progress="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="uno-15-6FV">
                                 <rect key="frame" x="35" y="205" width="150" height="2"/>
-                                <animations/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             </progressView>
                             <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="tZl-0w-AEK">
                                 <rect key="frame" x="178" y="141" width="51" height="31"/>
-                                <animations/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             </switch>
                             <slider opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="0.5" minValue="0.0" maxValue="1" translatesAutoresizingMaskIntoConstraints="NO" id="sEd-ni-n9b">
                                 <rect key="frame" x="33" y="240" width="118" height="31"/>
-                                <animations/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             </slider>
                             <segmentedControl opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="OD8-BK-xRp">
                                 <rect key="frame" x="35" y="143" width="121" height="29"/>
-                                <animations/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <segments>
                                     <segment title="First"/>
                                     <segment title="Second"/>
@@ -43,16 +47,15 @@
                             </segmentedControl>
                             <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vd1-BC-0GS">
                                 <rect key="frame" x="181" y="240" width="46" height="30"/>
-                                <animations/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <state key="normal" title="Button"/>
                             </button>
                             <pageControl opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" numberOfPages="5" translatesAutoresizingMaskIntoConstraints="NO" id="02d-LT-XqT">
                                 <rect key="frame" x="137" y="85" width="90" height="37"/>
-                                <animations/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             </pageControl>
                         </subviews>
-                        <animations/>
-                        <color key="backgroundColor" red="0.80000000000000004" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="backgroundColor" red="0.80000000000000004" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
                     <navigationItem key="navigationItem" title="Chameleon" id="qSC-Xc-gWl"/>
                 </viewController>
@@ -66,10 +69,9 @@
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="DDR-cw-uah" sceneMemberID="viewController">
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" translucent="NO" id="hi6-Wf-Ozl">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+                        <rect key="frame" x="0.0" y="20" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
-                        <animations/>
-                        <color key="barTintColor" red="1" green="0.0" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="barTintColor" red="1" green="0.0" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </navigationBar>
                     <nil name="viewControllers"/>
                     <connections>
diff --git a/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Contents.json b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Contents.json
index 3ec886c..c8477e6 100644
--- a/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,54 +1,158 @@
 {
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
   "images" : [
     {
-      "idiom" : "iphone",
-      "size" : "20x20",
+      "filename" : "Icon-40.png",
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Icon-40@2x.png",
+      "size" : "40x40",
+      "idiom" : "ipad",
       "scale" : "2x"
     },
     {
+      "filename" : "Icon-60@2x.png",
+      "size" : "60x60",
       "idiom" : "iphone",
-      "size" : "20x20",
-      "scale" : "3x"
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Icon-72.png",
+      "size" : "72x72",
+      "idiom" : "ipad",
+      "scale" : "1x"
     },
     {
+      "filename" : "Icon-72@2x.png",
+      "size" : "72x72",
+      "idiom" : "ipad",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Icon-76.png",
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Icon-76@2x.png",
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Icon-Small-50.png",
+      "size" : "50x50",
+      "idiom" : "ipad",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Icon-Small-50@2x.png",
+      "size" : "50x50",
+      "idiom" : "ipad",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Icon-Small.png",
+      "size" : "29x29",
       "idiom" : "iphone",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Icon-Small@2x.png",
       "size" : "29x29",
+      "idiom" : "iphone",
       "scale" : "2x"
     },
     {
+      "filename" : "Icon.png",
+      "size" : "57x57",
       "idiom" : "iphone",
-      "size" : "29x29",
-      "scale" : "3x"
+      "scale" : "1x"
     },
     {
+      "filename" : "Icon@2x.png",
+      "size" : "57x57",
       "idiom" : "iphone",
-      "size" : "40x40",
       "scale" : "2x"
     },
     {
+      "filename" : "Icon-Small@3x.png",
+      "size" : "29x29",
       "idiom" : "iphone",
+      "scale" : "3x"
+    },
+    {
+      "filename" : "Icon-40@3x.png",
       "size" : "40x40",
+      "idiom" : "iphone",
       "scale" : "3x"
     },
     {
+      "filename" : "Icon-60@3x.png",
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "Demo-1.png",
+      "scale" : "3x"
+    },
+    {
+      "filename" : "Icon-40@2x.png",
+      "size" : "40x40",
+      "idiom" : "iphone",
       "scale" : "2x"
     },
     {
+      "filename" : "Icon-Small.png",
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Icon-Small@2x.png",
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Icon-83.5@2x.png",
+      "size" : "83.5x83.5",
+      "idiom" : "ipad",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "NotificationIcon@2x.png",
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "NotificationIcon@3x.png",
+      "size" : "20x20",
       "idiom" : "iphone",
-      "size" : "60x60",
       "scale" : "3x"
     },
     {
-      "idiom" : "ios-marketing",
+      "filename" : "NotificationIcon~ipad.png",
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "NotificationIcon~ipad@2x.png",
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "ios-marketing.png",
       "size" : "1024x1024",
+      "idiom" : "ios-marketing",
       "scale" : "1x"
     }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
+  ]
 }
\ No newline at end of file
diff --git a/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Demo-1.png b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Demo-1.png
deleted file mode 100644
index 02fd0b9..0000000
Binary files a/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Demo-1.png and /dev/null differ
diff --git a/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-40.png b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-40.png
new file mode 100644
index 0000000..a3157db
Binary files /dev/null and b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-40.png differ
diff --git a/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png
new file mode 100644
index 0000000..b187c73
Binary files /dev/null and b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png differ
diff --git a/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-40@3x.png b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-40@3x.png
new file mode 100644
index 0000000..ca3c72f
Binary files /dev/null and b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-40@3x.png differ
diff --git a/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png
new file mode 100644
index 0000000..ca3c72f
Binary files /dev/null and b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png differ
diff --git a/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png
new file mode 100644
index 0000000..abda1cc
Binary files /dev/null and b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png differ
diff --git a/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-72.png b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-72.png
new file mode 100644
index 0000000..3323b9f
Binary files /dev/null and b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-72.png differ
diff --git a/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-72@2x.png b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-72@2x.png
new file mode 100644
index 0000000..b60d97f
Binary files /dev/null and b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-72@2x.png differ
diff --git a/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-76.png b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-76.png
new file mode 100644
index 0000000..6b160f9
Binary files /dev/null and b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-76.png differ
diff --git a/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png
new file mode 100644
index 0000000..3204a3c
Binary files /dev/null and b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png differ
diff --git a/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png
new file mode 100644
index 0000000..bb2afdf
Binary files /dev/null and b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png differ
diff --git a/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-Small-50.png b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-Small-50.png
new file mode 100644
index 0000000..2261485
Binary files /dev/null and b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-Small-50.png differ
diff --git a/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-Small-50@2x.png b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-Small-50@2x.png
new file mode 100644
index 0000000..cb80cb5
Binary files /dev/null and b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-Small-50@2x.png differ
diff --git a/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-Small.png b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-Small.png
new file mode 100644
index 0000000..c676c0b
Binary files /dev/null and b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-Small.png differ
diff --git a/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png
new file mode 100644
index 0000000..84efb2e
Binary files /dev/null and b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png differ
diff --git a/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png
new file mode 100644
index 0000000..468d4cb
Binary files /dev/null and b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png differ
diff --git a/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon.png b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon.png
new file mode 100644
index 0000000..41b411d
Binary files /dev/null and b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon.png differ
diff --git a/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon@2x.png b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon@2x.png
new file mode 100644
index 0000000..e3c3a91
Binary files /dev/null and b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/Icon@2x.png differ
diff --git a/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/NotificationIcon@2x.png b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/NotificationIcon@2x.png
new file mode 100644
index 0000000..a3157db
Binary files /dev/null and b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/NotificationIcon@2x.png differ
diff --git a/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/NotificationIcon@3x.png b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/NotificationIcon@3x.png
new file mode 100644
index 0000000..7a1fff6
Binary files /dev/null and b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/NotificationIcon@3x.png differ
diff --git a/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/NotificationIcon~ipad.png b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/NotificationIcon~ipad.png
new file mode 100644
index 0000000..40f732b
Binary files /dev/null and b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/NotificationIcon~ipad.png differ
diff --git a/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/NotificationIcon~ipad@2x.png b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/NotificationIcon~ipad@2x.png
new file mode 100644
index 0000000..a3157db
Binary files /dev/null and b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/NotificationIcon~ipad@2x.png differ
diff --git a/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/ios-marketing.png b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/ios-marketing.png
new file mode 100644
index 0000000..80fa3bb
Binary files /dev/null and b/ChameleonDemo-Swift/Assets.xcassets/AppIcon.appiconset/ios-marketing.png differ
diff --git a/ChameleonDemo-Swift/FirstViewController.swift b/ChameleonDemo-Swift/FirstViewController.swift
index 01ef1aa..19f4de5 100644
--- a/ChameleonDemo-Swift/FirstViewController.swift
+++ b/ChameleonDemo-Swift/FirstViewController.swift
@@ -59,7 +59,7 @@ class FirstViewController: UITableViewController {
         let randomFlatColorContract = ContrastColorOf(randomFlatColor, returnFlat: true)
         // Nav bar
         navigationController?.navigationBar.barTintColor = randomFlatColor
-        navigationController?.navigationBar.titleTextAttributes = [NSForegroundColorAttributeName: randomFlatColorContract]
+        navigationController?.navigationBar.titleTextAttributes = [NSAttributedStringKey.foregroundColor: randomFlatColorContract]
         // Tab bar
         tabBarController?.tabBar.barTintColor = randomFlatColor
         tabBarController?.tabBar.tintColor = randomFlatColorContract
@@ -115,11 +115,11 @@ class FirstViewController: UITableViewController {
     
     // Generate a random color
     func generateRandomColor() -> UIColor {
-        let red = Float(arc4random_uniform(256))/255.0
-        let green = Float(arc4random_uniform(256))/255.0
-        let blue = Float(arc4random_uniform(256))/255.0
+        let red = CGFloat(arc4random_uniform(256))/255.0
+        let green = CGFloat(arc4random_uniform(256))/255.0
+        let blue = CGFloat(arc4random_uniform(256))/255.0
         
-        return UIColor(colorLiteralRed: red, green: green, blue: blue, alpha: 1.0)
+        return UIColor(red: red, green: green, blue: blue, alpha: 1.0)
     }
 }
 
diff --git a/ChameleonDemo-Swift/SecondViewController.swift b/ChameleonDemo-Swift/SecondViewController.swift
index a0f1246..5e5136b 100644
--- a/ChameleonDemo-Swift/SecondViewController.swift
+++ b/ChameleonDemo-Swift/SecondViewController.swift
@@ -42,7 +42,7 @@ class SecondViewController: UITableViewController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        navigationController?.navigationBar.titleTextAttributes = [NSForegroundColorAttributeName: tabBarController?.tabBar.tintColor ?? UIColor.gray]
+        navigationController?.navigationBar.titleTextAttributes = [NSAttributedStringKey.foregroundColor: tabBarController?.tabBar.tintColor ?? UIColor.gray]
         navigationController?.navigationBar.barTintColor = tabBarController?.tabBar.barTintColor ?? UIColor.lightGray
         sampleOneImageView.image = #imageLiteral(resourceName: "SampleImageOne")
         sampleTwoImageView.image = #imageLiteral(resourceName: "SampleImageTwo")
@@ -54,7 +54,7 @@ class SecondViewController: UITableViewController {
     }
     
     override func viewWillAppear(_ animated: Bool) {
-        navigationController?.navigationBar.titleTextAttributes = [NSForegroundColorAttributeName: tabBarController?.tabBar.tintColor ?? UIColor.gray]
+        navigationController?.navigationBar.titleTextAttributes = [NSAttributedStringKey.foregroundColor: tabBarController?.tabBar.tintColor ?? UIColor.gray]
         navigationController?.navigationBar.barTintColor = tabBarController?.tabBar.barTintColor ?? UIColor.lightGray
     }
     
diff --git a/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Contents.json b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Contents.json
old mode 100755
new mode 100644
index 36d2c80..c8477e6
--- a/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,68 +1,158 @@
 {
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
   "images" : [
     {
-      "idiom" : "iphone",
-      "size" : "29x29",
+      "filename" : "Icon-40.png",
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Icon-40@2x.png",
+      "size" : "40x40",
+      "idiom" : "ipad",
       "scale" : "2x"
     },
     {
+      "filename" : "Icon-60@2x.png",
+      "size" : "60x60",
       "idiom" : "iphone",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Icon-72.png",
+      "size" : "72x72",
+      "idiom" : "ipad",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Icon-72@2x.png",
+      "size" : "72x72",
+      "idiom" : "ipad",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Icon-76.png",
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Icon-76@2x.png",
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Icon-Small-50.png",
+      "size" : "50x50",
+      "idiom" : "ipad",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Icon-Small-50@2x.png",
+      "size" : "50x50",
+      "idiom" : "ipad",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Icon-Small.png",
       "size" : "29x29",
-      "scale" : "3x"
+      "idiom" : "iphone",
+      "scale" : "1x"
     },
     {
+      "filename" : "Icon-Small@2x.png",
+      "size" : "29x29",
       "idiom" : "iphone",
-      "size" : "40x40",
       "scale" : "2x"
     },
     {
+      "filename" : "Icon.png",
+      "size" : "57x57",
       "idiom" : "iphone",
-      "size" : "40x40",
-      "scale" : "3x"
+      "scale" : "1x"
     },
     {
+      "filename" : "Icon@2x.png",
+      "size" : "57x57",
       "idiom" : "iphone",
-      "size" : "60x60",
       "scale" : "2x"
     },
     {
+      "filename" : "Icon-Small@3x.png",
+      "size" : "29x29",
       "idiom" : "iphone",
+      "scale" : "3x"
+    },
+    {
+      "filename" : "Icon-40@3x.png",
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "scale" : "3x"
+    },
+    {
+      "filename" : "Icon-60@3x.png",
       "size" : "60x60",
+      "idiom" : "iphone",
       "scale" : "3x"
     },
     {
-      "idiom" : "ipad",
+      "filename" : "Icon-40@2x.png",
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Icon-Small.png",
       "size" : "29x29",
+      "idiom" : "ipad",
       "scale" : "1x"
     },
     {
-      "idiom" : "ipad",
+      "filename" : "Icon-Small@2x.png",
       "size" : "29x29",
+      "idiom" : "ipad",
       "scale" : "2x"
     },
     {
+      "filename" : "Icon-83.5@2x.png",
+      "size" : "83.5x83.5",
       "idiom" : "ipad",
-      "size" : "40x40",
-      "scale" : "1x"
+      "scale" : "2x"
     },
     {
-      "idiom" : "ipad",
-      "size" : "40x40",
+      "filename" : "NotificationIcon@2x.png",
+      "size" : "20x20",
+      "idiom" : "iphone",
       "scale" : "2x"
     },
     {
+      "filename" : "NotificationIcon@3x.png",
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "scale" : "3x"
+    },
+    {
+      "filename" : "NotificationIcon~ipad.png",
+      "size" : "20x20",
       "idiom" : "ipad",
-      "size" : "76x76",
       "scale" : "1x"
     },
     {
+      "filename" : "NotificationIcon~ipad@2x.png",
+      "size" : "20x20",
       "idiom" : "ipad",
-      "size" : "76x76",
       "scale" : "2x"
+    },
+    {
+      "filename" : "ios-marketing.png",
+      "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "scale" : "1x"
     }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
+  ]
 }
\ No newline at end of file
diff --git a/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-40.png b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-40.png
new file mode 100644
index 0000000..a3157db
Binary files /dev/null and b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-40.png differ
diff --git a/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png
new file mode 100644
index 0000000..b187c73
Binary files /dev/null and b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png differ
diff --git a/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-40@3x.png b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-40@3x.png
new file mode 100644
index 0000000..ca3c72f
Binary files /dev/null and b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-40@3x.png differ
diff --git a/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png
new file mode 100644
index 0000000..ca3c72f
Binary files /dev/null and b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png differ
diff --git a/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png
new file mode 100644
index 0000000..abda1cc
Binary files /dev/null and b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png differ
diff --git a/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-72.png b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-72.png
new file mode 100644
index 0000000..3323b9f
Binary files /dev/null and b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-72.png differ
diff --git a/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-72@2x.png b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-72@2x.png
new file mode 100644
index 0000000..b60d97f
Binary files /dev/null and b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-72@2x.png differ
diff --git a/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-76.png b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-76.png
new file mode 100644
index 0000000..6b160f9
Binary files /dev/null and b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-76.png differ
diff --git a/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png
new file mode 100644
index 0000000..3204a3c
Binary files /dev/null and b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png differ
diff --git a/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png
new file mode 100644
index 0000000..bb2afdf
Binary files /dev/null and b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png differ
diff --git a/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-Small-50.png b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-Small-50.png
new file mode 100644
index 0000000..2261485
Binary files /dev/null and b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-Small-50.png differ
diff --git a/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-Small-50@2x.png b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-Small-50@2x.png
new file mode 100644
index 0000000..cb80cb5
Binary files /dev/null and b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-Small-50@2x.png differ
diff --git a/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-Small.png b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-Small.png
new file mode 100644
index 0000000..c676c0b
Binary files /dev/null and b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-Small.png differ
diff --git a/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png
new file mode 100644
index 0000000..84efb2e
Binary files /dev/null and b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png differ
diff --git a/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png
new file mode 100644
index 0000000..468d4cb
Binary files /dev/null and b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png differ
diff --git a/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon.png b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon.png
new file mode 100644
index 0000000..41b411d
Binary files /dev/null and b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon.png differ
diff --git a/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon@2x.png b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon@2x.png
new file mode 100644
index 0000000..e3c3a91
Binary files /dev/null and b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/Icon@2x.png differ
diff --git a/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/NotificationIcon@2x.png b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/NotificationIcon@2x.png
new file mode 100644
index 0000000..a3157db
Binary files /dev/null and b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/NotificationIcon@2x.png differ
diff --git a/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/NotificationIcon@3x.png b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/NotificationIcon@3x.png
new file mode 100644
index 0000000..7a1fff6
Binary files /dev/null and b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/NotificationIcon@3x.png differ
diff --git a/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/NotificationIcon~ipad.png b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/NotificationIcon~ipad.png
new file mode 100644
index 0000000..40f732b
Binary files /dev/null and b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/NotificationIcon~ipad.png differ
diff --git a/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/NotificationIcon~ipad@2x.png b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/NotificationIcon~ipad@2x.png
new file mode 100644
index 0000000..a3157db
Binary files /dev/null and b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/NotificationIcon~ipad@2x.png differ
diff --git a/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/ios-marketing.png b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/ios-marketing.png
new file mode 100644
index 0000000..80fa3bb
Binary files /dev/null and b/ChameleonDemo/Assets.xcassets/AppIcon.appiconset/ios-marketing.png differ
diff --git a/ChameleonDemo/Base.lproj/LaunchScreen.storyboard b/ChameleonDemo/Base.lproj/LaunchScreen.storyboard
old mode 100755
new mode 100644
index 29e13cf..95b229f
--- a/ChameleonDemo/Base.lproj/LaunchScreen.storyboard
+++ b/ChameleonDemo/Base.lproj/LaunchScreen.storyboard
@@ -1,8 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8191" systemVersion="15A282b" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.19" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.16"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -14,10 +18,18 @@
                         <viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <animations/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <subviews>
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="logo" translatesAutoresizingMaskIntoConstraints="NO" id="H1p-zD-1W4">
+                                <rect key="frame" x="39.5" y="185.5" width="295" height="295"/>
+                            </imageView>
+                        </subviews>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstItem="H1p-zD-1W4" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="1d3-Nm-RQM"/>
+                            <constraint firstItem="H1p-zD-1W4" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="ypH-Je-3rG"/>
+                        </constraints>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -25,4 +37,7 @@
             <point key="canvasLocation" x="53" y="375"/>
         </scene>
     </scenes>
+    <resources>
+        <image name="logo" width="295" height="295"/>
+    </resources>
 </document>
diff --git a/Pod/Classes/Objective-C/UIColor+Chameleon.h b/Pod/Classes/Objective-C/UIColor+Chameleon.h
index 3d7879e..5ec8805 100755
--- a/Pod/Classes/Objective-C/UIColor+Chameleon.h
+++ b/Pod/Classes/Objective-C/UIColor+Chameleon.h
@@ -105,7 +105,7 @@ typedef NS_ENUM (NSInteger, UIShadeStyle) {
 
 #pragma mark - Light Shades
 
-#if UIKIT_DEFINE_AS_PROPERTIES
+#ifdef UIKIT_DEFINE_AS_PROPERTIES
 /**
  *  Returns a flat color object whose HSB values are 0.0, 0.0, 0.17 and whose alpha value is 1.0.
  *
@@ -447,7 +447,7 @@ typedef NS_ENUM (NSInteger, UIShadeStyle) {
 
 #pragma mark - Dark Shades
 
-#if UIKIT_DEFINE_AS_PROPERTIES
+#ifdef UIKIT_DEFINE_AS_PROPERTIES
 /**
  *  Returns a flat color object whose HSB values are 0.00, 0.00, 0.15 and whose alpha value is 1.0.
  *
@@ -787,7 +787,7 @@ typedef NS_ENUM (NSInteger, UIShadeStyle) {
 #endif
 
 #pragma mark - Randomizing Colors
-#if UIKIT_DEFINE_AS_PROPERTIES
+#ifdef UIKIT_DEFINE_AS_PROPERTIES
 /**
  *  Returns a randomly generated flat color object whose alpha value is 1.0.
  *