diff --git a/CircleMenu.xcodeproj/project.pbxproj b/CircleMenu.xcodeproj/project.pbxproj
index 07dee7d..e437432 100755
--- a/CircleMenu.xcodeproj/project.pbxproj
+++ b/CircleMenu.xcodeproj/project.pbxproj
@@ -399,7 +399,7 @@
 			buildSettings = {
 				CLANG_ANALYZER_NONNULL = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 207;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -412,10 +412,10 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
+				MARKETING_VERSION = 4.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.ramotion.CircleMenu;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -427,7 +427,7 @@
 			buildSettings = {
 				CLANG_ANALYZER_NONNULL = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 207;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -440,10 +440,10 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
+				MARKETING_VERSION = 4.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.ramotion.CircleMenu;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -502,7 +502,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -552,7 +552,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -563,16 +563,17 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CURRENT_PROJECT_VERSION = 207;
 				INFOPLIST_FILE = CircleMenu/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 4.1.0;
 				OTHER_SWIFT_FLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = com.ramotion.dev;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -582,16 +583,17 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CURRENT_PROJECT_VERSION = 207;
 				INFOPLIST_FILE = CircleMenu/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 4.1.0;
 				OTHER_SWIFT_FLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = com.ramotion.dev;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -607,7 +609,6 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.ramotion.CircleMenuTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CircleMenuDemo.app/CircleMenuDemo";
 			};
 			name = Debug;
@@ -624,7 +625,6 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.ramotion.CircleMenuTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CircleMenuDemo.app/CircleMenuDemo";
 			};
 			name = Release;
diff --git a/CircleMenu/Assets.xcassets/AppIcon.appiconset/Contents.json b/CircleMenu/Assets.xcassets/AppIcon.appiconset/Contents.json
old mode 100755
new mode 100644
index 19882d5..4e536a9
--- a/CircleMenu/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/CircleMenu/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,48 +1,153 @@
 {
   "images" : [
     {
-      "idiom" : "iphone",
       "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "notification-icon@2x.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "notification-icon@3x.png",
       "scale" : "3x"
     },
     {
+      "size" : "29x29",
       "idiom" : "iphone",
+      "filename" : "icon-small.png",
+      "scale" : "1x"
+    },
+    {
       "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "icon-small@2x.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "icon-small@3x.png",
       "scale" : "3x"
     },
     {
-      "idiom" : "iphone",
       "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "icon-40@2x.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "icon-40@3x.png",
       "scale" : "3x"
     },
     {
+      "size" : "57x57",
       "idiom" : "iphone",
-      "size" : "60x60",
+      "filename" : "icon.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "57x57",
+      "idiom" : "iphone",
+      "filename" : "icon@2x.png",
       "scale" : "2x"
     },
     {
+      "size" : "60x60",
       "idiom" : "iphone",
+      "filename" : "icon-60@2x.png",
+      "scale" : "2x"
+    },
+    {
       "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "icon-60@3x.png",
       "scale" : "3x"
     },
     {
-      "idiom" : "ios-marketing",
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "notification-icon~ipad.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "notification-icon~ipad@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "icon-small.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "icon-small@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "icon-40.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "icon-40@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "50x50",
+      "idiom" : "ipad",
+      "filename" : "icon-small-50.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "50x50",
+      "idiom" : "ipad",
+      "filename" : "icon-small-50@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "72x72",
+      "idiom" : "ipad",
+      "filename" : "icon-72.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "72x72",
+      "idiom" : "ipad",
+      "filename" : "icon-72@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "icon-76.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "icon-76@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "83.5x83.5",
+      "idiom" : "ipad",
+      "filename" : "icon-83.5@2x.png",
+      "scale" : "2x"
+    },
+    {
       "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "ios-marketing.png",
       "scale" : "1x"
     }
   ],
diff --git a/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-40.png b/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-40.png
new file mode 100644
index 0000000..d310de1
Binary files /dev/null and b/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-40.png differ
diff --git a/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png b/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png
new file mode 100644
index 0000000..496e190
Binary files /dev/null and b/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png differ
diff --git a/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png b/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png
new file mode 100644
index 0000000..fdc46e9
Binary files /dev/null and b/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png differ
diff --git a/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png b/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png
new file mode 100644
index 0000000..fdc46e9
Binary files /dev/null and b/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png differ
diff --git a/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png b/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png
new file mode 100644
index 0000000..24c44ea
Binary files /dev/null and b/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png differ
diff --git a/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-72.png b/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-72.png
new file mode 100644
index 0000000..3782ea7
Binary files /dev/null and b/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-72.png differ
diff --git a/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-72@2x.png b/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-72@2x.png
new file mode 100644
index 0000000..0ecef4b
Binary files /dev/null and b/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-72@2x.png differ
diff --git a/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-76.png b/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-76.png
new file mode 100644
index 0000000..a19d577
Binary files /dev/null and b/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-76.png differ
diff --git a/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png b/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png
new file mode 100644
index 0000000..8cdef38
Binary files /dev/null and b/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png differ
diff --git a/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png b/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png
new file mode 100644
index 0000000..42172eb
Binary files /dev/null and b/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png differ
diff --git a/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-small-50.png b/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-small-50.png
new file mode 100644
index 0000000..4746fc6
Binary files /dev/null and b/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-small-50.png differ
diff --git a/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-small-50@2x.png b/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-small-50@2x.png
new file mode 100644
index 0000000..98e0cee
Binary files /dev/null and b/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-small-50@2x.png differ
diff --git a/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-small.png b/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-small.png
new file mode 100644
index 0000000..fdd5e98
Binary files /dev/null and b/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-small.png differ
diff --git a/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-small@2x.png b/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-small@2x.png
new file mode 100644
index 0000000..2ea2ab3
Binary files /dev/null and b/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-small@2x.png differ
diff --git a/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-small@3x.png b/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-small@3x.png
new file mode 100644
index 0000000..b8e49ac
Binary files /dev/null and b/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon-small@3x.png differ
diff --git a/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon.png b/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon.png
new file mode 100644
index 0000000..454322d
Binary files /dev/null and b/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon.png differ
diff --git a/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon@2x.png b/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon@2x.png
new file mode 100644
index 0000000..ae7074c
Binary files /dev/null and b/CircleMenu/Assets.xcassets/AppIcon.appiconset/icon@2x.png differ
diff --git a/CircleMenu/Assets.xcassets/AppIcon.appiconset/ios-marketing.png b/CircleMenu/Assets.xcassets/AppIcon.appiconset/ios-marketing.png
new file mode 100644
index 0000000..2574a32
Binary files /dev/null and b/CircleMenu/Assets.xcassets/AppIcon.appiconset/ios-marketing.png differ
diff --git a/CircleMenu/Assets.xcassets/AppIcon.appiconset/notification-icon@2x.png b/CircleMenu/Assets.xcassets/AppIcon.appiconset/notification-icon@2x.png
new file mode 100644
index 0000000..d310de1
Binary files /dev/null and b/CircleMenu/Assets.xcassets/AppIcon.appiconset/notification-icon@2x.png differ
diff --git a/CircleMenu/Assets.xcassets/AppIcon.appiconset/notification-icon@3x.png b/CircleMenu/Assets.xcassets/AppIcon.appiconset/notification-icon@3x.png
new file mode 100644
index 0000000..0ea3815
Binary files /dev/null and b/CircleMenu/Assets.xcassets/AppIcon.appiconset/notification-icon@3x.png differ
diff --git a/CircleMenu/Assets.xcassets/AppIcon.appiconset/notification-icon~ipad.png b/CircleMenu/Assets.xcassets/AppIcon.appiconset/notification-icon~ipad.png
new file mode 100644
index 0000000..be2419b
Binary files /dev/null and b/CircleMenu/Assets.xcassets/AppIcon.appiconset/notification-icon~ipad.png differ
diff --git a/CircleMenu/Assets.xcassets/AppIcon.appiconset/notification-icon~ipad@2x.png b/CircleMenu/Assets.xcassets/AppIcon.appiconset/notification-icon~ipad@2x.png
new file mode 100644
index 0000000..d310de1
Binary files /dev/null and b/CircleMenu/Assets.xcassets/AppIcon.appiconset/notification-icon~ipad@2x.png differ
diff --git a/CircleMenu/Assets.xcassets/modeColors.colorset/Contents.json b/CircleMenu/Assets.xcassets/modeColors.colorset/Contents.json
new file mode 100644
index 0000000..cbe5d6a
--- /dev/null
+++ b/CircleMenu/Assets.xcassets/modeColors.colorset/Contents.json
@@ -0,0 +1,56 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "colors" : [
+    {
+      "idiom" : "universal",
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0.059",
+          "alpha" : "1.000",
+          "blue" : "0.153",
+          "green" : "0.078"
+        }
+      }
+    },
+    {
+      "idiom" : "universal",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0.451",
+          "alpha" : "1.000",
+          "blue" : "0.545",
+          "green" : "0.471"
+        }
+      }
+    },
+    {
+      "idiom" : "universal",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0.059",
+          "alpha" : "1.000",
+          "blue" : "0.153",
+          "green" : "0.078"
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/CircleMenu/Base.lproj/Main.storyboard b/CircleMenu/Base.lproj/Main.storyboard
index 746e6e1..64fe552 100755
--- a/CircleMenu/Base.lproj/Main.storyboard
+++ b/CircleMenu/Base.lproj/Main.storyboard
@@ -1,7 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15400" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15404"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -14,10 +16,11 @@
                         <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eLo-Wn-oPF" customClass="CircleMenu" customModule="CircleMenuDemo" customModuleProvider="target">
+                                <rect key="frame" x="177" y="418" 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="HWk-Xa-dX7"/>
@@ -54,9 +57,13 @@
                         </constraints>
                     </view>
                     <nil key="simulatedStatusBarMetrics"/>
+                    <connections>
+                        <outlet property="circleMenu" destination="eLo-Wn-oPF" id="2Xe-UJ-sTc"/>
+                    </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
             </objects>
+            <point key="canvasLocation" x="132" y="138"/>
         </scene>
     </scenes>
     <resources>
diff --git a/CircleMenu/Info.plist b/CircleMenu/Info.plist
index 222b28c..eeb11df 100755
--- a/CircleMenu/Info.plist
+++ b/CircleMenu/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/CircleMenu/ViewController.swift b/CircleMenu/ViewController.swift
index 7e8081b..6c355fc 100755
--- a/CircleMenu/ViewController.swift
+++ b/CircleMenu/ViewController.swift
@@ -20,14 +20,103 @@ extension UIColor {
 
 class ViewController: UIViewController, CircleMenuDelegate {
 
-    //    let colors = [UIColor.redColor(), UIColor.grayColor(), UIColor.greenColor(), UIColor.purpleColor()]
-    let items: [(icon: String, color: UIColor)] = [
-        ("icon_home", UIColor(red: 0.19, green: 0.57, blue: 1, alpha: 1)),
-        ("icon_search", UIColor(red: 0.22, green: 0.74, blue: 0, alpha: 1)),
-        ("notifications-btn", UIColor(red: 0.96, green: 0.23, blue: 0.21, alpha: 1)),
-        ("settings-btn", UIColor(red: 0.51, green: 0.15, blue: 1, alpha: 1)),
-        ("nearby-btn", UIColor(red: 1, green: 0.39, blue: 0, alpha: 1))
-    ]
+    @IBOutlet weak var circleMenu: CircleMenu!
+    
+    // Set the colors for the light and dark modes of iOS 13.
+    // Also, falls back to normal UIColors for pre-iOS 13 devices
+
+    var colorForHome: UIColor {
+        if #available(iOS 13, *) {
+            switch traitCollection.userInterfaceStyle {
+            case .dark:
+                return .systemTeal
+            case .light, .unspecified:
+                return .systemBlue
+            @unknown default:
+                return .systemTeal
+            }
+        }
+        return UIColor(red: 0.19, green: 0.57, blue: 1, alpha: 1)
+    }
+
+    var colorForSearch: UIColor {
+        if #available(iOS 13, *) {
+            switch traitCollection.userInterfaceStyle {
+            case .dark:
+                return .systemGreen
+            case .light, .unspecified:
+                return .systemGreen
+            @unknown default:
+                return .systemGreen
+            }
+        }
+        return UIColor(red: 0.22, green: 0.74, blue: 0, alpha: 1)
+    }
+
+    var colorForNotifications: UIColor {
+        if #available(iOS 13, *) {
+            switch traitCollection.userInterfaceStyle {
+            case .dark:
+                return .systemRed
+            case .light, .unspecified:
+                return .systemRed
+            @unknown default:
+                return .systemRed
+            }
+        }
+        return UIColor(red: 0.96, green: 0.23, blue: 0.21, alpha: 1)
+    }
+
+    var colorForSettings: UIColor {
+        if #available(iOS 13, *) {
+            switch traitCollection.userInterfaceStyle {
+            case .dark:
+                return .systemPurple
+            case .light, .unspecified:
+                return .systemPurple
+            @unknown default:
+                return .systemPurple
+            }
+        }
+        return UIColor(red: 0.51, green: 0.15, blue: 1, alpha: 1)
+    }
+
+    var colorForNearby: UIColor {
+        if #available(iOS 13, *) {
+            switch traitCollection.userInterfaceStyle {
+            case .dark:
+                return .systemOrange
+            case .light, .unspecified:
+                return .systemOrange
+            @unknown default:
+                return .systemOrange
+            }
+        }
+        return UIColor(red: 1, green: 0.39, blue: 0, alpha: 1)
+    }
+
+    // Set the colors for the light and dark modes of iOS 13 from
+    // the named colors (iOS 11+) defined in the Assets.xcassets bundle.
+
+    var colorForBackground: UIColor {
+        if #available(iOS 13, *) {
+                switch traitCollection.userInterfaceStyle {
+                case .dark:
+                    return UIColor(named: "modeColors")!
+                case .light, .unspecified:
+                    return UIColor(named: "modeColors")!
+                @unknown default:
+                    return UIColor(named: "modeColors")!
+                }
+            } else {
+                return UIColor(red: 0.059, green: 0.078, blue: 0.153, alpha: 1)
+            }
+        }
+
+    var items: [(icon: String, color: UIColor)] = []
+
+    // -------------------------------------------------------
+
     override func viewDidLoad() {
         super.viewDidLoad()
 
@@ -43,6 +132,37 @@ class ViewController: UIViewController, CircleMenuDelegate {
         //        button.delegate = self
         //        button.layer.cornerRadius = button.frame.size.width / 2.0
         //        view.addSubview(button)
+
+        items = [
+            ("icon_home", colorForHome),
+            ("icon_search", colorForSearch),
+            ("notifications-btn", colorForNotifications),
+            ("settings-btn", colorForSettings),
+            ("nearby-btn", colorForNearby)
+        ]
+
+        self.view.backgroundColor = colorForBackground
+
+    }
+
+    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+        super.traitCollectionDidChange(previousTraitCollection)
+
+        // Do any special light/dark mod changes when this fires ...
+
+        if #available(iOS 13, *) {
+                switch traitCollection.userInterfaceStyle {
+                case .dark:
+                    circleMenu.buttons?.first?.backgroundColor = .systemTeal
+                case .light, .unspecified:
+                    circleMenu.buttons?.first?.backgroundColor = .systemBlue
+                @unknown default:
+                    circleMenu.buttons?.first?.backgroundColor = .systemTeal
+                }
+            } else {
+                circleMenu.buttons?.first?.backgroundColor = UIColor(red:1, green:0.787, blue:0.011, alpha: 1)
+            }
+
     }
 
     // MARK: <CircleMenuDelegate>
diff --git a/CircleMenuLib/CircleMenu.swift b/CircleMenuLib/CircleMenu.swift
index 2858fe4..ddf3f82 100755
--- a/CircleMenuLib/CircleMenu.swift
+++ b/CircleMenuLib/CircleMenu.swift
@@ -199,10 +199,8 @@ open class CircleMenu: UIButton {
             return false
         }
 
-        for button in buttons {
-            if button.alpha == 0 {
-                return false
-            }
+        for button in buttons where button.alpha == 0 {
+            return false
         }
         return true
 
@@ -353,7 +351,7 @@ open class CircleMenu: UIButton {
         guard let platform = self.platform else { return }
 
         delegate?.circleMenu?(self, buttonWillSelected: sender, atIndex: sender.tag)
-        
+
         let strokeWidth: CGFloat
         if let radius = self.subButtonsRadius {
             strokeWidth = radius * 2
@@ -415,7 +413,7 @@ open class CircleMenu: UIButton {
         }
     }
 
-    fileprivate func tapBounceAnimation(duration: TimeInterval, completion: ((Bool)->())? = nil) {
+    fileprivate func tapBounceAnimation(duration: TimeInterval, completion: ((Bool) -> Void)? = nil) {
         transform = CGAffineTransform(scaleX: 0.9, y: 0.9)
         UIView.animate(withDuration: duration, delay: 0, usingSpringWithDamping: 0.3, initialSpringVelocity: 5,
                        options: UIView.AnimationOptions.curveLinear,
diff --git a/CircleMenuLib/CircleMenuButton/CircleMenuButton.swift b/CircleMenuLib/CircleMenuButton/CircleMenuButton.swift
index c5953aa..728684e 100755
--- a/CircleMenuLib/CircleMenuButton/CircleMenuButton.swift
+++ b/CircleMenuLib/CircleMenuButton/CircleMenuButton.swift
@@ -173,7 +173,7 @@ internal extension CircleMenuButton {
             }, completion: { (_) -> Void in
                 self.alpha = 0
 
-                if let _ = self.container {
+                if self.container != nil {
                     self.container?.removeFromSuperview() // remove container
                 }
         })
diff --git a/CircleMenuTests/CircleMenuTests.swift b/CircleMenuTests/CircleMenuTests.swift
index 1bd2bc2..466145a 100755
--- a/CircleMenuTests/CircleMenuTests.swift
+++ b/CircleMenuTests/CircleMenuTests.swift
@@ -60,7 +60,9 @@ class CircleMenuTests: XCTestCase {
         circleMenu.onTap()
 
         // when
-        circleMenu.buttonHandler((circleMenu.buttons?.first)! as! CircleMenuButton)
+        if let button = (circleMenu.buttons?.first)! as? CircleMenuButton {
+            circleMenu.buttonHandler(button)
+        }
 
         // then
         XCTAssertNil(circleMenu.buttons, "button is removed")