diff --git a/.travis.yml b/.travis.yml
index 799053e..13e05d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode9.2
+osx_image: xcode10.3
 
 # xcode_project: FaveButtonDemo/FaveButtonDemo.xcodeproj
 # xcode_scheme: FaveButton
@@ -14,4 +14,4 @@ script:
   - xcodebuild -project FaveButtonDemo/FaveButtonDemo.xcodeproj -scheme "FaveButton" -sdk iphonesimulator11.2
       -configuration Release ONLY_ACTIVE_ARCH=NO build | xcpretty -c  
 
-# SWIFT_VERSION: 4.0
+# SWIFT_VERSION: 5.0
diff --git a/FaveButtonDemo/FaveButtonDemo.xcodeproj/project.pbxproj b/FaveButtonDemo/FaveButtonDemo.xcodeproj/project.pbxproj
index aa6adb5..3a4b9db 100644
--- a/FaveButtonDemo/FaveButtonDemo.xcodeproj/project.pbxproj
+++ b/FaveButtonDemo/FaveButtonDemo.xcodeproj/project.pbxproj
@@ -231,24 +231,24 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 1000;
+				LastUpgradeCheck = 1030;
 				ORGANIZATIONNAME = "Jansel Valentin";
 				TargetAttributes = {
 					26FEF3241D0E158100D75731 = {
 						CreatedOnToolsVersion = 7.3.1;
 						DevelopmentTeam = 9T9Q2EVV88;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1030;
 					};
 					26FEF33E1D0E159B00D75731 = {
 						CreatedOnToolsVersion = 7.3.1;
 						DevelopmentTeam = 9T9Q2EVV88;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1030;
 					};
 				};
 			};
 			buildConfigurationList = 26FEF3201D0E158100D75731 /* Build configuration list for PBXProject "FaveButtonDemo" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -353,6 +353,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -408,6 +409,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -467,8 +469,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.xhamr.DemoFaveButton;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -486,8 +487,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.xhamr.DemoFaveButton;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -509,8 +509,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -534,8 +533,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.xhamr.FaveButton;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
diff --git a/FaveButtonDemo/FaveButtonDemo.xcodeproj/xcshareddata/xcschemes/FaveButton.xcscheme b/FaveButtonDemo/FaveButtonDemo.xcodeproj/xcshareddata/xcschemes/FaveButton.xcscheme
index 9f6f0f3..f79ff43 100644
--- a/FaveButtonDemo/FaveButtonDemo.xcodeproj/xcshareddata/xcschemes/FaveButton.xcscheme
+++ b/FaveButtonDemo/FaveButtonDemo.xcodeproj/xcshareddata/xcschemes/FaveButton.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1030"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/FaveButtonDemo/FaveButtonDemo.xcodeproj/xcshareddata/xcschemes/FaveButtonDemo.xcscheme b/FaveButtonDemo/FaveButtonDemo.xcodeproj/xcshareddata/xcschemes/FaveButtonDemo.xcscheme
index ba4fff1..fe95c71 100644
--- a/FaveButtonDemo/FaveButtonDemo.xcodeproj/xcshareddata/xcschemes/FaveButtonDemo.xcscheme
+++ b/FaveButtonDemo/FaveButtonDemo.xcodeproj/xcshareddata/xcschemes/FaveButtonDemo.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1030"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/FaveButtonDemo/FaveButtonDemo/AppDelegate.swift b/FaveButtonDemo/FaveButtonDemo/AppDelegate.swift
index 6baf4bd..e7d5d4d 100644
--- a/FaveButtonDemo/FaveButtonDemo/AppDelegate.swift
+++ b/FaveButtonDemo/FaveButtonDemo/AppDelegate.swift
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         return true
     }
diff --git a/Source/Ring.swift b/Source/Ring.swift
index 3f167cd..4f6da8c 100644
--- a/Source/Ring.swift
+++ b/Source/Ring.swift
@@ -162,7 +162,7 @@ extension Ring{
             #if swift(>=4.2)
             $0.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeOut)
             #else
-            $0.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseOut)
+            $0.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeOut)
             #endif
             
         }
@@ -180,8 +180,8 @@ extension Ring{
             $0.fillMode            = CAMediaTimingFillMode.forwards
             $0.timingFunction      = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeOut)
             #else
-            $0.fillMode            = kCAFillModeForwards
-            $0.timingFunction      = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseOut)
+            $0.fillMode            = CAMediaTimingFillMode.forwards
+            $0.timingFunction      = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeOut)
             #endif
             $0.isRemovedOnCompletion = false
             
@@ -200,8 +200,8 @@ extension Ring{
             $0.fillMode             = CAMediaTimingFillMode.forwards
             $0.timingFunction       = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeOut)
             #else
-            $0.fillMode             = kCAFillModeForwards
-            $0.timingFunction       = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseOut)
+            $0.fillMode             = CAMediaTimingFillMode.forwards
+            $0.timingFunction       = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeOut)
             #endif
         }
         return animation
@@ -220,8 +220,8 @@ extension Ring{
             $0.fillMode             = CAMediaTimingFillMode.forwards
             $0.timingFunction       = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeOut)
             #else
-            $0.fillMode             = kCAFillModeForwards
-            $0.timingFunction       = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseOut)
+            $0.fillMode             = CAMediaTimingFillMode.forwards
+            $0.timingFunction       = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeOut)
             #endif
         }
         return animation