diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 00000000..919434a6
--- /dev/null
+++ b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>
diff --git a/Chameleon.xcodeproj/project.pbxproj b/Chameleon.xcodeproj/project.pbxproj
index 271dce67..206f6f09 100755
--- a/Chameleon.xcodeproj/project.pbxproj
+++ b/Chameleon.xcodeproj/project.pbxproj
@@ -414,6 +414,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -660,6 +661,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -709,6 +711,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -734,7 +737,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -755,7 +758,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.viccalexander.Chameleon;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -780,7 +783,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.viccalexander.ChameleonDemo-Swift";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -805,7 +808,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.viccalexander.ChameleonDemo-Swift";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -819,7 +822,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.viccalexander.ChameleonDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -832,7 +835,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.viccalexander.ChameleonDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
diff --git a/Chameleon.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Chameleon.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 00000000..18d98100
--- /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/ChameleonDemo-Swift/AppDelegate.swift b/ChameleonDemo-Swift/AppDelegate.swift
index 6c8e9c5c..66438b64 100644
--- a/ChameleonDemo-Swift/AppDelegate.swift
+++ b/ChameleonDemo-Swift/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 {
         return true
     }
 
diff --git a/ChameleonDemo-Swift/FirstViewController.swift b/ChameleonDemo-Swift/FirstViewController.swift
index 01ef1aaa..2d5b6768 100644
--- a/ChameleonDemo-Swift/FirstViewController.swift
+++ b/ChameleonDemo-Swift/FirstViewController.swift
@@ -56,24 +56,24 @@ class FirstViewController: UITableViewController {
     func initChameleonColors() {
         
         let randomFlatColor = UIColor.randomFlat
-        let randomFlatColorContract = ContrastColorOf(randomFlatColor, returnFlat: true)
+        let randomFlatColorContract = ContrastColorOf(randomFlatColor(), returnFlat: true)
         // Nav bar
-        navigationController?.navigationBar.barTintColor = randomFlatColor
-        navigationController?.navigationBar.titleTextAttributes = [NSForegroundColorAttributeName: randomFlatColorContract]
+        navigationController?.navigationBar.barTintColor = randomFlatColor()
+        navigationController?.navigationBar.titleTextAttributes = [NSAttributedString.Key.foregroundColor: randomFlatColorContract]
         // Tab bar
-        tabBarController?.tabBar.barTintColor = randomFlatColor
+        tabBarController?.tabBar.barTintColor = randomFlatColor()
         tabBarController?.tabBar.tintColor = randomFlatColorContract
         // Refresh button
         refreshButton.tintColor = randomFlatColorContract
         // Random flat color
         randomFlatColorLabel.text = "Aa \u{25A0}"
-        randomFlatColorLabel.textColor = randomFlatColor
+        randomFlatColorLabel.textColor = randomFlatColor()
         // Complementary flat color
         complementaryFlatColorLabel.text = "Aa \u{25A0}"
-        complementaryFlatColorLabel.textColor = ComplementaryFlatColorOf(randomFlatColor)
+        complementaryFlatColorLabel.textColor = ComplementaryFlatColorOf(randomFlatColor())
         // Contrast flat color
         contrastFlatColorLabel.text = "Aa \u{25A0}"
-        contrastFlatColorLabel.textColor = ContrastColorOf(randomFlatColor, returnFlat: true)
+        contrastFlatColorLabel.textColor = ContrastColorOf(randomFlatColor(), returnFlat: true)
         // Flattening non-flat color
         let randomColor = generateRandomColor() // custom method, not part of Chameleon
         flatteningNonFlatColorLabel.text = "Aa \u{25A0}"
@@ -82,16 +82,16 @@ class FirstViewController: UITableViewController {
         beforeFlatteningColorLabel.textColor = randomColor
         // Lighter color > not yet reliable
         lighterColorLabel.text = "Aa \u{25A0}"
-        lighterColorLabel.textColor = randomFlatColor.lighten(byPercentage: 0.5)
+        lighterColorLabel.textColor = randomFlatColor().lighten(byPercentage: 0.5)
         // Darker color > not yet reliable
         darkerColorLabel.text = "Aa \u{25A0}"
-        darkerColorLabel.textColor = randomFlatColor.darken(byPercentage: 0.5)
+        darkerColorLabel.textColor = randomFlatColor().darken(byPercentage: 0.5)
         // Gradient color
-        let firstRandomColor = UIColor.randomFlat
-        let secondRandomColor = UIColor.randomFlat
-        let thirdRandomColor = UIColor.randomFlat
+        let firstRandomColor = UIColor.randomFlat()
+        let secondRandomColor = UIColor.randomFlat()
+        let thirdRandomColor = UIColor.randomFlat()
         let gradientColor = GradientColor(.leftToRight, frame: gradientColorLabel.frame, colors: [firstRandomColor, secondRandomColor, thirdRandomColor])
-        let gradientColorLargeFrame = GradientColor(.leftToRight, frame: gradientWithContrastLabel.frame, colors: [firstRandomColor, secondRandomColor, thirdRandomColor])
+        let gradientColorLargeFrame = GradientColor(.leftToRight, frame: gradientWithContrastLabel.frame, colors: [firstRandomColor,secondRandomColor,thirdRandomColor])
         gradientColorLabel.text = "Aa \u{25A0}"
         gradientColorLabel.textColor = gradientColor
         // Gradient backgorund with contrast text
@@ -119,7 +119,7 @@ class FirstViewController: UITableViewController {
         let green = Float(arc4random_uniform(256))/255.0
         let blue = Float(arc4random_uniform(256))/255.0
         
-        return UIColor(colorLiteralRed: red, green: green, blue: blue, alpha: 1.0)
+        return UIColor(_colorLiteralRed: red, green: green, blue: blue, alpha: 1.0)
     }
 }
 
diff --git a/ChameleonDemo-Swift/SecondViewController.swift b/ChameleonDemo-Swift/SecondViewController.swift
index a0f12468..565679b6 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 = [NSAttributedString.Key.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 = [NSAttributedString.Key.foregroundColor: tabBarController?.tabBar.tintColor ?? UIColor.gray]
         navigationController?.navigationBar.barTintColor = tabBarController?.tabBar.barTintColor ?? UIColor.lightGray
     }
     
diff --git a/Package.swift b/Package.swift
new file mode 100644
index 00000000..b91bb919
--- /dev/null
+++ b/Package.swift
@@ -0,0 +1,37 @@
+// swift-tools-version:5.3
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "Chameleon",
+    platforms: [
+        .iOS(.v8)
+    ],
+    products: [
+        .library(
+            name: "Chameleon",
+            targets: ["Chameleon"]),
+        .library(
+            name: "ChameleonSwift",
+            targets: ["ChameleonSwift"]),
+    ],
+    dependencies: [
+    ],
+    targets: [
+        .target(
+            name: "Chameleon",
+            path:"Pod/Classes/Objective-C"
+        ),
+//        .target(
+//            name: "Chameleons",
+//           // dependencies: ["Chameleon/Default"],
+//            path:"Chameleon", resources: [.process("Chameleon/Info.plist")]
+//        ),
+        .target(
+            name: "ChameleonSwift",
+            dependencies: ["Chameleon"],
+            path:"Pod/Classes/Swift"
+        )
+    ]
+)
diff --git a/Pod/Classes/Swift/ChameleonShorthand.swift b/Pod/Classes/Swift/ChameleonShorthand.swift
index a33d633d..fcc14213 100755
--- a/Pod/Classes/Swift/ChameleonShorthand.swift
+++ b/Pod/Classes/Swift/ChameleonShorthand.swift
@@ -132,7 +132,7 @@ Returns a randomly generated flat color object whose alpha value is 1.0.
 - returns: A flat UIColor object in the HSB colorspace.
 */
 public func RandomFlatColor() -> UIColor {
-    return UIColor.randomFlat
+    return UIColor.randomFlat()
 }
 
 public func ClearColor() -> UIColor {
@@ -143,195 +143,195 @@ public func ClearColor() -> UIColor {
 // MARK: - Light Shades Shorthand
 
 public func FlatBlack() -> UIColor {
-	return UIColor.flatBlack 
+	return UIColor.flatBlack()
 }
 
 public func FlatBlue() -> UIColor {
-	return UIColor.flatBlue 
+	return UIColor.flatBlue()
 }
 
 public func FlatBrown() -> UIColor {
-	return UIColor.flatBrown 
+	return UIColor.flatBrown()
 }
 
 public func FlatCoffee() -> UIColor {
-	return UIColor.flatCoffee 
+	return UIColor.flatCoffee()
 }
 
 public func FlatForestGreen() -> UIColor {
-	return UIColor.flatForestGreen 
+	return UIColor.flatForestGreen()
 }
 
 public func FlatGray() -> UIColor {
-	return UIColor.flatGray 
+	return UIColor.flatGray()
 }
 
 public func FlatGreen() -> UIColor {
-	return UIColor.flatGreen 
+	return UIColor.flatGreen()
 }
 
 public func FlatLime() -> UIColor {
-	return UIColor.flatLime 
+	return UIColor.flatLime()
 }
 
 public func FlatMagenta() -> UIColor {
-	return UIColor.flatMagenta 
+	return UIColor.flatMagenta()
 }
 
 public func FlatMaroon() -> UIColor {
-	return UIColor.flatMaroon 
+	return UIColor.flatMaroon()
 }
 
 public func FlatMint() -> UIColor {
-	return UIColor.flatMint 
+	return UIColor.flatMint()
 }
 
 public func FlatNavyBlue() -> UIColor {
-	return UIColor.flatNavyBlue 
+	return UIColor.flatNavyBlue()
 }
 
 public func FlatOrange() -> UIColor {
-	return UIColor.flatOrange 
+	return UIColor.flatOrange()
 }
 
 public func FlatPink() -> UIColor {
-	return UIColor.flatPink 
+	return UIColor.flatPink()
 }
 
 public func FlatPlum() -> UIColor {
-	return UIColor.flatPlum 
+	return UIColor.flatPlum()
 }
 
 public func FlatPowderBlue() -> UIColor {
-	return UIColor.flatPowderBlue 
+	return UIColor.flatPowderBlue()
 }
 
 public func FlatPurple() -> UIColor {
-	return UIColor.flatPurple 
+	return UIColor.flatPurple()
 }
 
 public func FlatRed() -> UIColor {
-	return UIColor.flatRed 
+	return UIColor.flatRed()
 }
 
 public func FlatSand() -> UIColor {
-	return UIColor.flatSand 
+	return UIColor.flatSand()
 }
 
 public func FlatSkyBlue() -> UIColor {
-	return UIColor.flatSkyBlue 
+	return UIColor.flatSkyBlue()
 }
 
 public func FlatTeal() -> UIColor {
-	return UIColor.flatTeal 
+	return UIColor.flatTeal()
 }
 
 public func FlatWatermelon() -> UIColor {
-	return UIColor.flatWatermelon 
+	return UIColor.flatWatermelon()
 }
 
 public func FlatWhite() -> UIColor {
-	return UIColor.flatWhite 
+	return UIColor.flatWhite()
 }
 
 public func FlatYellow() -> UIColor {
-	return UIColor.flatYellow 
+	return UIColor.flatYellow()
 }
 
 // MARK: - Chameleon - Dark Shades Shorthand
 
 public func FlatBlackDark() -> UIColor {
-	return UIColor.flatBlackDark 
+	return UIColor.flatBlackDark()
 }
 
 public func FlatBlueDark() -> UIColor {
-	return UIColor.flatBlueDark
+	return UIColor.flatBlueDark()
 }
 
 public func FlatBrownDark() -> UIColor {
-	return UIColor.flatBrownDark
+	return UIColor.flatBrownDark()
 }
 
 public func FlatCoffeeDark() -> UIColor {
-	return UIColor.flatCoffeeDark
+	return UIColor.flatCoffeeDark()
 }
 
 public func FlatForestGreenDark() -> UIColor {
-	return UIColor.flatForestGreenDark
+	return UIColor.flatForestGreenDark()
 }
 
 public func FlatGrayDark() -> UIColor {
-	return UIColor.flatGrayDark
+    return UIColor.flatGrayDark()
 }
 
 public func FlatGreenDark() -> UIColor {
-	return UIColor.flatGreenDark
+    return UIColor.flatGreenDark()
 }
 
 public func FlatLimeDark() -> UIColor {
-	return UIColor.flatLimeDark
+    return UIColor.flatLimeDark()
 }
 
 public func FlatMagentaDark() -> UIColor {
-	return UIColor.flatMagentaDark
+    return UIColor.flatMagentaDark()
 }
 
 public func FlatMaroonDark() -> UIColor {
-	return UIColor.flatMaroonDark
+    return UIColor.flatMaroonDark()
 }
 
 public func FlatMintDark() -> UIColor {
-	return UIColor.flatMintDark
+    return UIColor.flatMintDark()
 }
 
 public func FlatNavyBlueDark() -> UIColor {
-	return UIColor.flatNavyBlueDark
+    return UIColor.flatNavyBlueDark()
 }
 
 public func FlatOrangeDark() -> UIColor {
-	return UIColor.flatOrangeDark
+    return UIColor.flatOrangeDark()
 }
 
 public func FlatPinkDark() -> UIColor {
-	return UIColor.flatPinkDark
+    return UIColor.flatPinkDark()
 }
 
 public func FlatPlumDark() -> UIColor {
-	return UIColor.flatPlumDark
+    return UIColor.flatPlumDark()
 }
 
 public func FlatPowderBlueDark() -> UIColor {
-	return UIColor.flatPowderBlueDark
+    return UIColor.flatPowderBlueDark()
 }
 
 public func FlatPurpleDark() -> UIColor {
-	return UIColor.flatPurpleDark
+    return UIColor.flatPurpleDark()
 }
 
 public func FlatRedDark() -> UIColor {
-	return UIColor.flatRedDark
+    return UIColor.flatRedDark()
 }
 
 public func FlatSandDark() -> UIColor {
-	return UIColor.flatSandDark
+    return UIColor.flatSandDark()
 }
 
 public func FlatSkyBlueDark() -> UIColor {
-	return UIColor.flatSkyBlueDark
+    return UIColor.flatSkyBlueDark()
 }
 
 public func FlatTealDark() -> UIColor {
-	return UIColor.flatTealDark
+    return UIColor.flatTealDark()
 }
 
 public func FlatWatermelonDark() -> UIColor {
-	return UIColor.flatWatermelonDark
+    return UIColor.flatWatermelonDark()
 }
 
 public func FlatWhiteDark() -> UIColor {
-	return UIColor.flatWhiteDark
+    return UIColor.flatWhiteDark()
 }
 
 public func FlatYellowDark() -> UIColor {
-	return UIColor.flatYellowDark
+    return UIColor.flatYellowDark()
 }