version: 1.3.5

Merge pull request #22 from viktorstrate/fix-grid-offset
Move crosshair and grid by 0.5 pixels
2019-05-29 14:25:36 +10:00 · 2019-05-29 14:23:53 +10:00 · 2019-05-28 15:47:46 +02:00 · 2019-03-04 10:42:15 +11:00 · 2019-03-04 10:30:35 +11:00 · 2019-02-21 22:22:31 +11:00
105 changed files with 1711 additions and 545 deletions
@@ -1,4 +1,4 @@
-github "SwiftyJSON/SwiftyJSON" "4.1.0"
+github "SwiftyJSON/SwiftyJSON" "4.2.0"
 github "acheronfail/MASShortcut" "2.3.6-custom"
 github "emaloney/CleanroomLogger" "6.0.2"
-github "sindresorhus/LaunchAtLogin" "v2.1.0"
+github "sindresorhus/LaunchAtLogin" "v2.5.0"
@@ -1,2 +1 @@
-* text=auto
-*.swift text eol=lf
+* text=auto eol=lf
@@ -0,0 +1,14 @@
+Pod::Spec.new do |s|
+	s.name = 'LaunchAtLogin'
+	s.version = '2.5.0'
+	s.summary = 'Add "Launch at Login" functionality to your sandboxed macOS app in seconds'
+	s.license = 'MIT'
+	s.homepage = 'https://github.com/sindresorhus/LaunchAtLogin'
+	s.social_media_url = 'https://twitter.com/sindresorhus'
+	s.authors = { 'Sindre Sorhus' => 'sindresorhus@gmail.com' }
+	s.source = { :git => 'https://github.com/sindresorhus/LaunchAtLogin.git', :tag => "v#{s.version}" }
+	s.source_files = 'LaunchAtLogin', 'LaunchAtLoginHelper'
+	s.resource = 'LaunchAtLogin/copy-helper.sh'
+	s.swift_version = '4.2'
+	s.platform = :macos, '10.12'
+end
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 51;
 	objects = {

 /* Begin PBXBuildFile section */
@@ -32,8 +32,8 @@
 		E32E9B741EB87EA3000FEEE9 /* LaunchAtLoginHelper.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LaunchAtLoginHelper.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		E32E9B761EB87EA3000FEEE9 /* main.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = main.swift; sourceTree = "<group>"; usesTabs = 1; };
 		E32E9B7F1EB87EA3000FEEE9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		E32E9B831EB87F57000FEEE9 /* LaunchAtLoginHelper.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = LaunchAtLoginHelper.entitlements; sourceTree = "<group>"; };
 		E32E9B921EB889AE000FEEE9 /* copy-helper.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; lineEnding = 0; path = "copy-helper.sh"; sourceTree = "<group>"; usesTabs = 1; };
+		E3B8C38A20C0003300272EC0 /* LaunchAtLoginHelper.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = LaunchAtLoginHelper.entitlements; sourceTree = "<group>"; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -89,7 +89,7 @@
 			children = (
 				E32E9B761EB87EA3000FEEE9 /* main.swift */,
 				E32E9B7F1EB87EA3000FEEE9 /* Info.plist */,
-				E32E9B831EB87F57000FEEE9 /* LaunchAtLoginHelper.entitlements */,
+				E3B8C38A20C0003300272EC0 /* LaunchAtLoginHelper.entitlements */,
 			);
 			path = LaunchAtLoginHelper;
 			sourceTree = "<group>";
@@ -151,17 +151,20 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 0930;
+				LastUpgradeCheck = 0940;
 				ORGANIZATIONNAME = "Sindre Sorhus";
 				TargetAttributes = {
 					E32E9B621EB87D7B000FEEE9 = {
 						CreatedOnToolsVersion = 8.3.2;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = "";
 					};
 					E32E9B731EB87EA3000FEEE9 = {
 						CreatedOnToolsVersion = 8.3.2;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = "";
 						SystemCapabilities = {
+							com.apple.HardenedRuntime = {
+								enabled = 1;
+							};
 							com.apple.Sandbox = {
 								enabled = 1;
 							};
@@ -170,7 +173,7 @@
 				};
 			};
 			buildConfigurationList = E32E9B5D1EB87D7B000FEEE9 /* Build configuration list for PBXProject "LaunchAtLogin" */;
-			compatibilityVersion = "Xcode 9.3";
+			compatibilityVersion = "Xcode 10.0";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
@@ -265,7 +268,7 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGN_IDENTITY = "-";
+				CODE_SIGN_IDENTITY = "";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = dwarf;
@@ -328,7 +331,7 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGN_IDENTITY = "-";
+				CODE_SIGN_IDENTITY = "";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -357,7 +360,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "Mac Developer";
+				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEFINES_MODULE = YES;
@@ -379,8 +382,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_COMPILATION_MODE = singlefile;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -388,7 +390,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "Mac Developer";
+				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEFINES_MODULE = YES;
@@ -408,8 +410,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -421,6 +422,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = YG56YK5RN5;
+				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = LaunchAtLoginHelper/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -430,8 +432,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -443,6 +444,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = YG56YK5RN5;
+				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = LaunchAtLoginHelper/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -452,8 +454,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "0940"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "0940"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -15,12 +13,10 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.0</string>
+	<string>2.5.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>MIT © Sindre Sorhus</string>
-	<key>NSPrincipalClass</key>
-	<string></string>
 </dict>
 </plist>
@@ -9,9 +9,14 @@ mkdir -p "$helper_dir"
 cp -rf "$origin_helper_path" "$helper_dir/"

 defaults write "$helper_path/Contents/Info" CFBundleIdentifier -string "$PRODUCT_BUNDLE_IDENTIFIER-LaunchAtLoginHelper"
-codesign --force --entitlements="$CODE_SIGN_ENTITLEMENTS" --sign="$EXPANDED_CODE_SIGN_IDENTITY_NAME" "$helper_path"
+
+if [[ -n $CODE_SIGN_ENTITLEMENTS ]]; then
+	codesign --force --entitlements="$CODE_SIGN_ENTITLEMENTS" --options=runtime --sign="$EXPANDED_CODE_SIGN_IDENTITY_NAME" "$helper_path"
+else
+	codesign --force --options=runtime --sign="$EXPANDED_CODE_SIGN_IDENTITY_NAME" "$helper_path"
+fi

 if [[ $CONFIGURATION == "Release" ]]; then
 	rm -rf "$origin_helper_path"
-	rm "$(dirname $origin_helper_path)/copy-helper.sh"
+	rm "$(dirname "$origin_helper_path")/copy-helper.sh"
 fi
@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -0,0 +1,21 @@
+# Before and after
+
+With `LaunchAtLogin`, you only have to do 2 steps instead of 13!
+
+```diff
+-  1. Create a new target that will be the helper app that launches your app
+-  2. Set `LSBackgroundOnly` to true in the `Info.plist` file
+-  3. Set `Skip Install` to `YES` in the build settings for the helper app
+-  4. Enable sandboxing for the helper app
+-  5. Add a new `Copy Files` build phase to the main app
+-  6. Select `Wrapper` as destination
+-  7. Enter `Contents/Library/LoginItems` as subpath
+-  8. Add the helper build product to the build phase
+-  9. Copy-paste some boilerplate code into the helper app
+- 10. Remember to replace `bundleid.of.main.app` and `MainExectuableName` with your own values
+- 11. Copy-paste some code to register the helper app into your main app
+- 12. Make sure the main app and helper app use the same code signing certificate
+- 13. Manually verify that you did everything correctly
+  1. Install this package
+  2. Add a new "Run Script Phase"
+```
@@ -1,45 +1,35 @@
 # LaunchAtLogin

-> Add "Launch at Login" functionality to your sandboxed macOS app in seconds
+> Add "Launch at Login" functionality to your macOS app in seconds

-It's usually quite a convoluted and error-prone process to add this. **No more!**
+It's usually quite a [convoluted and error-prone process](before-after.md) to add this. **No more!**

-```diff
-  1. Create a new target that will be the helper app that launches your app
-  2. Set `LSBackgroundOnly` to true in the `Info.plist` file
-  3. Set `Skip Install` to `YES` in the build settings for the helper app
-  4. Enable sandboxing for the helper app
-  5. Add a new `Copy Files` build phase to the main app
-  6. Select `Wrapper` as destination
-  7. Enter `Contents/Library/LoginItems` as subpath
-  8. Add the helper build product to the build phase
-  9. Copy-paste some boilerplate code into the helper app
- 10. Remember to replace `bundleid.of.main.app` and `MainExectuableName` with your own values
- 11. Copy-paste some code to register the helper app into your main app
- 12. Make sure the main app and helper app use the same code signing certificate
- 13. Manually verify that you did everything correctly
-+  1. Install this package
-+  2. Add a new "Run Script Phase"
-```
+This package works with both sandboxed and non-sandboxed apps and it's App Store compatible and used in my [Lungo](https://blog.sindresorhus.com/lungo-b364a6c2745f) and [Battery Indicator](https://sindresorhus.com/battery-indicator) apps.

-It's App Store compatible and used in my [Lungo](https://blog.sindresorhus.com/lungo-b364a6c2745f) and [Battery Indicator](https://sindresorhus.com/battery-indicator) app.
-
-You might also find my [`create-dmg`](https://github.com/sindresorhus/create-dmg) project useful.
+*You might also find my [`create-dmg`](https://github.com/sindresorhus/create-dmg) project useful if you're publishing your app outside the App Store.*


 ## Requirements

 - macOS 10.12+
- Xcode 9.3+
- Swift 4.1+
+- Xcode 10+
+- Swift 4.2+


-## Install with [Carthage](https://github.com/Carthage/Carthage#getting-started)
+## Install
+
+#### Carthage

 ```
 github "sindresorhus/LaunchAtLogin"
 ```

+#### CocoaPods
+
+```ruby
+pod 'LaunchAtLogin'
+```
+
 <a href="https://www.patreon.com/sindresorhus">
 	<img src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" width="160">
 </a>
@@ -49,8 +39,16 @@ github "sindresorhus/LaunchAtLogin"

 Add a new ["Run Script Phase"](http://stackoverflow.com/a/39633955/64949) below "Embed Frameworks" in "Build Phases" with the following:

+Carthage:
+
 ```sh
-./Carthage/Build/Mac/LaunchAtLogin.framework/Resources/copy-helper.sh
+"${PROJECT_DIR}/Carthage/Build/Mac/LaunchAtLogin.framework/Resources/copy-helper.sh"
+```
+
+CocoaPods:
+
+```sh
+"${PROJECT_DIR}/Pods/LaunchAtLogin/LaunchAtLogin/copy-helper.sh"
 ```

 Use it in your app:
@@ -77,7 +75,10 @@ The framework bundles the helper app needed to launch your app and copies it int

 ## Related

+- [Defaults](https://github.com/sindresorhus/Defaults) - Swifty and modern UserDefaults
+- [Preferences](https://github.com/sindresorhus/Preferences) - Add a preferences window to your macOS app in minutes
 - [DockProgress](https://github.com/sindresorhus/DockProgress) - Show progress in your app's Dock icon
+- [More…](https://github.com/search?q=user%3Asindresorhus+language%3Aswift)


 ## License
@@ -1 +0,0 @@
-3.0
@@ -1,6 +1,6 @@
 language: objective-c
-osx_image: xcode9.3
-xcode_sdk: iphonesimulator10.0
+osx_image: xcode10
+xcode_sdk: iphonesimulator12.0
 script:
 - set -o pipefail
 - travis_retry xcodebuild -workspace SwiftyJSON.xcworkspace -scheme "SwiftyJSON iOS" -destination "platform=iOS Simulator,name=iPhone 6" build-for-testing test | xcpretty
@@ -129,7 +129,7 @@
 				TargetAttributes = {
 					A82A1C1819D926B8009A653D = {
 						CreatedOnToolsVersion = 6.0.1;
-						LastSwiftMigration = 0820;
+						LastSwiftMigration = 0930;
 						ProvisioningStyle = Manual;
 					};
 				};
@@ -313,7 +313,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.swiftyjson.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -328,7 +329,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.swiftyjson.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -24,22 +24,6 @@ import Foundation

 // MARK: - Error
 // swiftlint:disable line_length
-/// Error domain
-@available(*, deprecated, message: "ErrorDomain is deprecated. Use `SwiftyJSONError.errorDomain` instead.", renamed: "SwiftyJSONError.errorDomain")
-public let ErrorDomain: String = "SwiftyJSONErrorDomain"
-
-/// Error code
-@available(*, deprecated, message: "ErrorUnsupportedType is deprecated. Use `SwiftyJSONError.unsupportedType` instead.", renamed: "SwiftyJSONError.unsupportedType")
-public let ErrorUnsupportedType: Int = 999
-@available(*, deprecated, message: "ErrorIndexOutOfBounds is deprecated. Use `SwiftyJSONError.indexOutOfBounds` instead.", renamed: "SwiftyJSONError.indexOutOfBounds")
-public let ErrorIndexOutOfBounds: Int = 900
-@available(*, deprecated, message: "ErrorWrongType is deprecated. Use `SwiftyJSONError.wrongType` instead.", renamed: "SwiftyJSONError.wrongType")
-public let ErrorWrongType: Int = 901
-@available(*, deprecated, message: "ErrorNotExist is deprecated. Use `SwiftyJSONError.notExist` instead.", renamed: "SwiftyJSONError.notExist")
-public let ErrorNotExist: Int = 500
-@available(*, deprecated, message: "ErrorInvalidJSON is deprecated. Use `SwiftyJSONError.invalidJSON` instead.", renamed: "SwiftyJSONError.invalidJSON")
-public let ErrorInvalidJSON: Int = 490
-
 public enum SwiftyJSONError: Int, Swift.Error {
    case unsupportedType = 999
    case indexOutOfBounds = 900
@@ -146,19 +130,6 @@ public struct JSON {
 		}
 	}

-	/**
-	 Creates a JSON from JSON string
-	
-	 - parameter json: Normal json string like '{"a":"b"}'
-	
-	 - returns: The created JSON
-	 */
-    @available(*, deprecated, message: "Use instead `init(parseJSON: )`")
-    public static func parse(_ json: String) -> JSON {
-        return json.data(using: String.Encoding.utf8)
-            .flatMap { try? JSON(data: $0) } ?? JSON(NSNull())
-    }
-
 	/**
 	 Creates a JSON using the object.
 	
@@ -592,14 +563,6 @@ extension JSON: Swift.ExpressibleByArrayLiteral {
    }
 }

-extension JSON: Swift.ExpressibleByNilLiteral {
-
-    @available(*, deprecated, message: "use JSON.null instead. Will be removed in future versions")
-    public init(nilLiteral: ()) {
-        self.init(NSNull() as Any)
-    }
-}
-
 // MARK: - Raw

 extension JSON: Swift.RawRepresentable {
@@ -1,15 +1,16 @@
 Pod::Spec.new do |s|
  s.name        = "SwiftyJSON"
-  s.version     = "4.1.0"
+  s.version     = "4.2.0"
  s.summary     = "SwiftyJSON makes it easy to deal with JSON data in Swift"
  s.homepage    = "https://github.com/SwiftyJSON/SwiftyJSON"
  s.license     = { :type => "MIT" }
  s.authors     = { "lingoer" => "lingoerer@gmail.com", "tangplin" => "tangplin@gmail.com" }

  s.requires_arc = true
+  s.swift_version = "4.2"
  s.osx.deployment_target = "10.9"
  s.ios.deployment_target = "8.0"
-  s.watchos.deployment_target = "2.0"
+  s.watchos.deployment_target = "3.0"
  s.tvos.deployment_target = "9.0"
  s.source   = { :git => "https://github.com/SwiftyJSON/SwiftyJSON.git", :tag => s.version }
  s.source_files = "Source/*.swift"
@@ -471,14 +471,17 @@
 						TestTargetID = 2E4FEFDA19575BE100351305;
 					};
 					7236B4EC1BAC14150020529B = {
+						LastSwiftMigration = 1000;
 						ProvisioningStyle = Automatic;
 					};
 					9C7DFC5A1A9102BD005AA3F7 = {
 						CreatedOnToolsVersion = 6.1.1;
+						LastSwiftMigration = 1000;
 						ProvisioningStyle = Automatic;
 					};
 					9C7DFC641A9102BD005AA3F7 = {
 						CreatedOnToolsVersion = 6.1.1;
+						LastSwiftMigration = 1000;
 					};
 					A81D162B1E5743B000C62C5F = {
 						CreatedOnToolsVersion = 8.2.1;
@@ -486,8 +489,10 @@
 					};
 					A8580F731BCF5C5B00DA927B = {
 						CreatedOnToolsVersion = 7.1;
+						LastSwiftMigration = 1000;
 					};
 					E4D7CCDE1B9465A700EE7221 = {
+						LastSwiftMigration = 1000;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -936,6 +941,7 @@
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -961,6 +967,7 @@
 				PRODUCT_NAME = SwiftyJSON;
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -993,6 +1000,7 @@
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -1019,6 +1027,7 @@
 				PRODUCT_NAME = "$(PROJECT_NAME)";
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -1041,6 +1050,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -1059,6 +1069,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.swiftyjson.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -1092,6 +1103,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 4.2;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
 			name = Debug;
@@ -1110,6 +1122,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.tangplin.SwiftyJSON-tvOS-Tests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
+				SWIFT_VERSION = 4.2;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
 			name = Release;
@@ -1136,8 +1149,9 @@
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "watchsimulator watchos";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 4;
-				WATCHOS_DEPLOYMENT_TARGET = 2.0;
+				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = Debug;
 		};
@@ -1162,8 +1176,9 @@
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "watchsimulator watchos";
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 4;
-				WATCHOS_DEPLOYMENT_TARGET = 2.0;
+				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = Release;
 		};
@@ -127,7 +127,7 @@ class PerformanceTests: XCTestCase {
        self.measure {
            autoreleasepool {
                if let dictionary = json.dictionary {
-                    XCTAssertTrue(dictionary.count > 0)
+                    XCTAssertTrue(dictionary.count == 100001)
                } else {
                    XCTFail("dictionary should not be nil")
                }
@@ -1,21 +1,674 @@
-MIT License
+GNU GENERAL PUBLIC LICENSE
+                      Version 3, 29 June 2007

-Copyright (c) 2018 acheronfail
+ Copyright (C) 2007 Free Software Foundation, Inc. {http://fsf.org/}
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.

-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+                            Preamble

-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    {one line to give the program's name and a brief idea of what it does.}
+    Copyright (C) {year}  {name of author}
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see {http://www.gnu.org/licenses/}.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    {{project}}  Copyright (C) {{year}}  {{fullname}}
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+{http://www.gnu.org/licenses/}.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+{http://www.gnu.org/philosophy/why-not-lgpl.html}.
@@ -7,7 +7,9 @@
 	objects = {

 /* Begin PBXBuildFile section */
+		15349DB820BAE3F70071CAA1 /* NSBezierPath.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15349DB720BAE3F70071CAA1 /* NSBezierPath.swift */; };
 		15492103207B53AE00E45BBC /* Util.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15492102207B53AE00E45BBC /* Util.swift */; };
+		15493F6720BE6E0F007B2BA5 /* CGImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15493F6620BE6E0F007B2BA5 /* CGImage.swift */; };
 		155D2C03204F61220087478B /* Credits.rtfd in Resources */ = {isa = PBXBuildFile; fileRef = 155D2C02204F61220087478B /* Credits.rtfd */; };
 		159F304E2079A111000BD387 /* AppDelegateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 159F304D2079A111000BD387 /* AppDelegateTests.swift */; };
 		159F30522079A147000BD387 /* PPStateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 159F30512079A147000BD387 /* PPStateTests.swift */; };
@@ -35,6 +37,7 @@
 		BAA17B7A20B14CC100625455 /* MASShortcut.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BAA17B7220B14CC100625455 /* MASShortcut.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		BAA17B7C20B14CEB00625455 /* SwiftyJSON.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BAA17B7B20B14CEB00625455 /* SwiftyJSON.framework */; };
 		BAA17B7D20B14CEB00625455 /* SwiftyJSON.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BAA17B7B20B14CEB00625455 /* SwiftyJSON.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		BAB6F14F221ABB3500EA11D4 /* ShowAndHideCursor.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAB6F14E221ABB3500EA11D4 /* ShowAndHideCursor.swift */; };
 /* End PBXBuildFile section */

 /* Begin PBXContainerItemProxy section */
@@ -65,16 +68,18 @@
 /* End PBXCopyFilesBuildPhase section */

 /* Begin PBXFileReference section */
+		15349DB720BAE3F70071CAA1 /* NSBezierPath.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSBezierPath.swift; sourceTree = "<group>"; };
 		15492102207B53AE00E45BBC /* Util.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Util.swift; sourceTree = "<group>"; };
+		15493F6620BE6E0F007B2BA5 /* CGImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CGImage.swift; sourceTree = "<group>"; };
 		155D2C02204F61220087478B /* Credits.rtfd */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; path = Credits.rtfd; sourceTree = "<group>"; };
 		159F304D2079A111000BD387 /* AppDelegateTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegateTests.swift; sourceTree = "<group>"; };
 		159F30512079A147000BD387 /* PPStateTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PPStateTests.swift; sourceTree = "<group>"; };
 		15A8D9712083624600D55A9B /* Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Helpers.swift; sourceTree = "<group>"; };
-		15B4E870207994AF0024FDE4 /* PixelPickerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PixelPickerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		15B4E870207994AF0024FDE4 /* Pixel PickerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Pixel PickerTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		15B4E874207994AF0024FDE4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		15FC8CC7204E2E2C000B5E1E /* PPState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PPState.swift; sourceTree = "<group>"; };
-		15FF0CCC204A231800E04103 /* Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "Bridging-Header.h"; path = "PixelPicker/Bridging-Header.h"; sourceTree = "<group>"; };
-		B3B4C2BD1E25894B009F8E4E /* PixelPicker.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PixelPicker.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		15FF0CCC204A231800E04103 /* Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "Bridging-Header.h"; path = "Pixel Picker/Bridging-Header.h"; sourceTree = "<group>"; };
+		B3B4C2BD1E25894B009F8E4E /* Pixel Picker.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Pixel Picker.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		B3B4C2C01E25894B009F8E4E /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		B3B4C2C21E25894B009F8E4E /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		B3B4C2C71E25894B009F8E4E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -96,6 +101,7 @@
 		BAA17B7120B14CC000625455 /* CleanroomLogger.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CleanroomLogger.framework; path = Carthage/Build/Mac/CleanroomLogger.framework; sourceTree = "<group>"; };
 		BAA17B7220B14CC100625455 /* MASShortcut.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MASShortcut.framework; path = Carthage/Build/Mac/MASShortcut.framework; sourceTree = "<group>"; };
 		BAA17B7B20B14CEB00625455 /* SwiftyJSON.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftyJSON.framework; path = Carthage/Build/Mac/SwiftyJSON.framework; sourceTree = "<group>"; };
+		BAB6F14E221ABB3500EA11D4 /* ShowAndHideCursor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShowAndHideCursor.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -133,7 +139,7 @@
 			path = OverlayPanel;
 			sourceTree = "<group>";
 		};
-		15B4E871207994AF0024FDE4 /* PixelPickerTests */ = {
+		15B4E871207994AF0024FDE4 /* Pixel PickerTests */ = {
 			isa = PBXGroup;
 			children = (
 				159F304D2079A111000BD387 /* AppDelegateTests.swift */,
@@ -141,7 +147,7 @@
 				15A8D9712083624600D55A9B /* Helpers.swift */,
 				15B4E874207994AF0024FDE4 /* Info.plist */,
 			);
-			path = PixelPickerTests;
+			path = "Pixel PickerTests";
 			sourceTree = "<group>";
 		};
 		B3B4C2B41E25894B009F8E4E = {
@@ -152,8 +158,8 @@
 				BAA17B6F20B14CC000625455 /* LaunchAtLogin.framework */,
 				BAA17B7220B14CC100625455 /* MASShortcut.framework */,
 				15FF0CCC204A231800E04103 /* Bridging-Header.h */,
-				B3B4C2BF1E25894B009F8E4E /* PixelPicker */,
-				15B4E871207994AF0024FDE4 /* PixelPickerTests */,
+				B3B4C2BF1E25894B009F8E4E /* Pixel Picker */,
+				15B4E871207994AF0024FDE4 /* Pixel PickerTests */,
 				B3B4C2BE1E25894B009F8E4E /* Products */,
 				BA22232520AFEC1B0001069C /* Frameworks */,
 			);
@@ -162,17 +168,19 @@
 		B3B4C2BE1E25894B009F8E4E /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				B3B4C2BD1E25894B009F8E4E /* PixelPicker.app */,
-				15B4E870207994AF0024FDE4 /* PixelPickerTests.xctest */,
+				B3B4C2BD1E25894B009F8E4E /* Pixel Picker.app */,
+				15B4E870207994AF0024FDE4 /* Pixel PickerTests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
-		B3B4C2BF1E25894B009F8E4E /* PixelPicker */ = {
+		B3B4C2BF1E25894B009F8E4E /* Pixel Picker */ = {
 			isa = PBXGroup;
 			children = (
+				15493F6620BE6E0F007B2BA5 /* CGImage.swift */,
 				BA74C13420A6F1BE00306B27 /* ShowAndHideCursor.h */,
 				BA74C13220A6F16C00306B27 /* ShowAndHideCursor.m */,
+				BAB6F14E221ABB3500EA11D4 /* ShowAndHideCursor.swift */,
 				BA71817320AE2DCC00619700 /* PPMenuShortcutView.h */,
 				BA71817120AE2DB400619700 /* PPMenuShortcutView.m */,
 				B3B4C2C01E25894B009F8E4E /* AppDelegate.swift */,
@@ -180,6 +188,7 @@
 				BA74C14D20ADA33E00306B27 /* PPColor.swift */,
 				15FC8CC7204E2E2C000B5E1E /* PPState.swift */,
 				159ED10B207EB2EF005489ED /* OverlayPanel */,
+				15349DB720BAE3F70071CAA1 /* NSBezierPath.swift */,
 				BA74C14120AA409D00306B27 /* NSColor.swift */,
 				15492102207B53AE00E45BBC /* Util.swift */,
 				B3B4C2C21E25894B009F8E4E /* Assets.xcassets */,
@@ -187,7 +196,7 @@
 				155D2C02204F61220087478B /* Credits.rtfd */,
 				B3B4C2C71E25894B009F8E4E /* Info.plist */,
 			);
-			path = PixelPicker;
+			path = "Pixel Picker";
 			sourceTree = "<group>";
 		};
 		BA22232520AFEC1B0001069C /* Frameworks */ = {
@@ -201,9 +210,9 @@
 /* End PBXGroup section */

 /* Begin PBXNativeTarget section */
-		15B4E86F207994AF0024FDE4 /* PixelPickerTests */ = {
+		15B4E86F207994AF0024FDE4 /* Pixel PickerTests */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 15B4E877207994AF0024FDE4 /* Build configuration list for PBXNativeTarget "PixelPickerTests" */;
+			buildConfigurationList = 15B4E877207994AF0024FDE4 /* Build configuration list for PBXNativeTarget "Pixel PickerTests" */;
 			buildPhases = (
 				15B4E86C207994AF0024FDE4 /* Sources */,
 				15B4E86D207994AF0024FDE4 /* Frameworks */,
@@ -214,14 +223,14 @@
 			dependencies = (
 				15B4E876207994AF0024FDE4 /* PBXTargetDependency */,
 			);
-			name = PixelPickerTests;
+			name = "Pixel PickerTests";
 			productName = PixelPickerTests;
-			productReference = 15B4E870207994AF0024FDE4 /* PixelPickerTests.xctest */;
+			productReference = 15B4E870207994AF0024FDE4 /* Pixel PickerTests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
-		B3B4C2BC1E25894B009F8E4E /* PixelPicker */ = {
+		B3B4C2BC1E25894B009F8E4E /* Pixel Picker */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = B3B4C2CA1E25894B009F8E4E /* Build configuration list for PBXNativeTarget "PixelPicker" */;
+			buildConfigurationList = B3B4C2CA1E25894B009F8E4E /* Build configuration list for PBXNativeTarget "Pixel Picker" */;
 			buildPhases = (
 				B3B4C2B91E25894B009F8E4E /* Sources */,
 				B3B4C2BA1E25894B009F8E4E /* Frameworks */,
@@ -233,9 +242,9 @@
 			);
 			dependencies = (
 			);
-			name = PixelPicker;
+			name = "Pixel Picker";
 			productName = PixelPicker;
-			productReference = B3B4C2BD1E25894B009F8E4E /* PixelPicker.app */;
+			productReference = B3B4C2BD1E25894B009F8E4E /* Pixel Picker.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -250,22 +259,23 @@
 				TargetAttributes = {
 					15B4E86F207994AF0024FDE4 = {
 						CreatedOnToolsVersion = 9.3;
+						LastSwiftMigration = 1000;
 						ProvisioningStyle = Automatic;
 						TestTargetID = B3B4C2BC1E25894B009F8E4E;
 					};
 					B3B4C2BC1E25894B009F8E4E = {
 						CreatedOnToolsVersion = 8.2.1;
-						DevelopmentTeam = UNR5C68RPX;
-						LastSwiftMigration = 0920;
+						LastSwiftMigration = 1000;
 						ProvisioningStyle = Automatic;
 					};
 				};
 			};
-			buildConfigurationList = B3B4C2B81E25894B009F8E4E /* Build configuration list for PBXProject "PixelPicker" */;
+			buildConfigurationList = B3B4C2B81E25894B009F8E4E /* Build configuration list for PBXProject "Pixel Picker" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -274,8 +284,8 @@
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				B3B4C2BC1E25894B009F8E4E /* PixelPicker */,
-				15B4E86F207994AF0024FDE4 /* PixelPickerTests */,
+				B3B4C2BC1E25894B009F8E4E /* Pixel Picker */,
+				15B4E86F207994AF0024FDE4 /* Pixel PickerTests */,
 			);
 		};
 /* End PBXProject section */
@@ -313,7 +323,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "./Carthage/Build/Mac/LaunchAtLogin.framework/Resources/copy-helper.sh";
+			shellScript = "\"${PROJECT_DIR}/Carthage/Build/Mac/LaunchAtLogin.framework/Resources/copy-helper.sh\"\n";
 		};
 /* End PBXShellScriptBuildPhase section */

@@ -333,6 +343,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				BA74C13320A6F16C00306B27 /* ShowAndHideCursor.m in Sources */,
+				15349DB820BAE3F70071CAA1 /* NSBezierPath.swift in Sources */,
 				BA71817220AE2DB400619700 /* PPMenuShortcutView.m in Sources */,
 				B3B4C2C11E25894B009F8E4E /* AppDelegate.swift in Sources */,
 				BA22232920B04D660001069C /* AppDelegate+Menu.swift in Sources */,
@@ -341,7 +352,9 @@
 				BA74C13120A6E95900306B27 /* PPOverlayPanel.swift in Sources */,
 				BA74C14020AA390400306B27 /* PPOverlayPreview.swift in Sources */,
 				BA74C14420AA609500306B27 /* PPOverlayWrapper.swift in Sources */,
+				BAB6F14F221ABB3500EA11D4 /* ShowAndHideCursor.swift in Sources */,
 				BA74C0F820A692D100306B27 /* PPOverlayController.swift in Sources */,
+				15493F6720BE6E0F007B2BA5 /* CGImage.swift in Sources */,
 				BA74C14220AA409D00306B27 /* NSColor.swift in Sources */,
 				15492103207B53AE00E45BBC /* Util.swift in Sources */,
 			);
@@ -352,7 +365,7 @@
 /* Begin PBXTargetDependency section */
 		15B4E876207994AF0024FDE4 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = B3B4C2BC1E25894B009F8E4E /* PixelPicker */;
+			target = B3B4C2BC1E25894B009F8E4E /* Pixel Picker */;
 			targetProxy = 15B4E875207994AF0024FDE4 /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
@@ -375,14 +388,15 @@
 					"$(PROJECT_DIR)/Carthage/Build/Mac",
 				);
 				GCC_C_LANGUAGE_STANDARD = gnu11;
-				INFOPLIST_FILE = PixelPickerTests/Info.plist;
+				INFOPLIST_FILE = "Pixel PickerTests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				PRODUCT_BUNDLE_IDENTIFIER = com.acheronfail.PixelPickerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 4.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PixelPicker.app/Contents/MacOS/PixelPicker";
+				SWIFT_OBJC_BRIDGING_HEADER = "Pixel Picker/Bridging-Header.h";
+				SWIFT_VERSION = 4.2;
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Pixel Picker.app/Contents/MacOS/Pixel Picker";
 			};
 			name = Debug;
 		};
@@ -403,14 +417,15 @@
 					"$(PROJECT_DIR)/Carthage/Build/Mac",
 				);
 				GCC_C_LANGUAGE_STANDARD = gnu11;
-				INFOPLIST_FILE = PixelPickerTests/Info.plist;
+				INFOPLIST_FILE = "Pixel PickerTests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				PRODUCT_BUNDLE_IDENTIFIER = com.acheronfail.PixelPickerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 4.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PixelPicker.app/Contents/MacOS/PixelPicker";
+				SWIFT_OBJC_BRIDGING_HEADER = "Pixel Picker/Bridging-Header.h";
+				SWIFT_VERSION = 4.2;
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Pixel Picker.app/Contents/MacOS/Pixel Picker";
 			};
 			name = Release;
 		};
@@ -538,21 +553,21 @@
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				DEVELOPMENT_TEAM = UNR5C68RPX;
+				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Carthage/Build/Mac",
 				);
 				GCC_C_LANGUAGE_STANDARD = c11;
-				INFOPLIST_FILE = PixelPicker/Info.plist;
+				INFOPLIST_FILE = "Pixel Picker/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.acheronfail.pixel-picker";
+				PRODUCT_MODULE_NAME = PixelPicker;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_OBJC_BRIDGING_HEADER = "PixelPicker/Bridging-Header.h";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_OBJC_BRIDGING_HEADER = "Pixel Picker/Bridging-Header.h";
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -564,28 +579,28 @@
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				DEVELOPMENT_TEAM = UNR5C68RPX;
+				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Carthage/Build/Mac",
 				);
 				GCC_C_LANGUAGE_STANDARD = c11;
-				INFOPLIST_FILE = PixelPicker/Info.plist;
+				INFOPLIST_FILE = "Pixel Picker/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.acheronfail.pixel-picker";
+				PRODUCT_MODULE_NAME = PixelPicker;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_OBJC_BRIDGING_HEADER = "PixelPicker/Bridging-Header.h";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_OBJC_BRIDGING_HEADER = "Pixel Picker/Bridging-Header.h";
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
 /* End XCBuildConfiguration section */

 /* Begin XCConfigurationList section */
-		15B4E877207994AF0024FDE4 /* Build configuration list for PBXNativeTarget "PixelPickerTests" */ = {
+		15B4E877207994AF0024FDE4 /* Build configuration list for PBXNativeTarget "Pixel PickerTests" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				15B4E878207994AF0024FDE4 /* Debug */,
@@ -594,7 +609,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		B3B4C2B81E25894B009F8E4E /* Build configuration list for PBXProject "PixelPicker" */ = {
+		B3B4C2B81E25894B009F8E4E /* Build configuration list for PBXProject "Pixel Picker" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				B3B4C2C81E25894B009F8E4E /* Debug */,
@@ -603,7 +618,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		B3B4C2CA1E25894B009F8E4E /* Build configuration list for PBXNativeTarget "PixelPicker" */ = {
+		B3B4C2CA1E25894B009F8E4E /* Build configuration list for PBXNativeTarget "Pixel Picker" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				B3B4C2CB1E25894B009F8E4E /* Debug */,
@@ -2,6 +2,6 @@
 <Workspace
   version = "1.0">
   <FileRef
-      location = "self:/Users/cosmotherly/dev/pixel-picker/PixelPicker.xcodeproj">
+      location = "self:/Users/cosmotherly/src/pixel-picker/Pixel Picker.xcodeproj">
   </FileRef>
 </Workspace>
@@ -15,9 +15,9 @@
            <BuildableReference
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "B3B4C2BC1E25894B009F8E4E"
-               BuildableName = "PixelPicker.app"
-               BlueprintName = "PixelPicker"
-               ReferencedContainer = "container:PixelPicker.xcodeproj">
+               BuildableName = "Pixel Picker.app"
+               BlueprintName = "Pixel Picker"
+               ReferencedContainer = "container:Pixel Picker.xcodeproj">
            </BuildableReference>
         </BuildActionEntry>
      </BuildActionEntries>
@@ -34,9 +34,9 @@
            <BuildableReference
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "15B4E86F207994AF0024FDE4"
-               BuildableName = "PixelPickerTests.xctest"
-               BlueprintName = "PixelPickerTests"
-               ReferencedContainer = "container:PixelPicker.xcodeproj">
+               BuildableName = "Pixel PickerTests.xctest"
+               BlueprintName = "Pixel PickerTests"
+               ReferencedContainer = "container:Pixel Picker.xcodeproj">
            </BuildableReference>
         </TestableReference>
      </Testables>
@@ -44,9 +44,9 @@
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "B3B4C2BC1E25894B009F8E4E"
-            BuildableName = "PixelPicker.app"
-            BlueprintName = "PixelPicker"
-            ReferencedContainer = "container:PixelPicker.xcodeproj">
+            BuildableName = "Pixel Picker.app"
+            BlueprintName = "Pixel Picker"
+            ReferencedContainer = "container:Pixel Picker.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
      <EnvironmentVariables>
@@ -79,9 +79,9 @@
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "B3B4C2BC1E25894B009F8E4E"
-            BuildableName = "PixelPicker.app"
-            BlueprintName = "PixelPicker"
-            ReferencedContainer = "container:PixelPicker.xcodeproj">
+            BuildableName = "Pixel Picker.app"
+            BlueprintName = "Pixel Picker"
+            ReferencedContainer = "container:Pixel Picker.xcodeproj">
         </BuildableReference>
      </BuildableProductRunnable>
      <AdditionalOptions>
@@ -98,9 +98,9 @@
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "B3B4C2BC1E25894B009F8E4E"
-            BuildableName = "PixelPicker.app"
-            BlueprintName = "PixelPicker"
-            ReferencedContainer = "container:PixelPicker.xcodeproj">
+            BuildableName = "Pixel Picker.app"
+            BlueprintName = "Pixel Picker"
+            ReferencedContainer = "container:Pixel Picker.xcodeproj">
         </BuildableReference>
      </BuildableProductRunnable>
   </ProfileAction>
@@ -1,6 +1,6 @@
 //
 //  AppDelegate+Menu.swift
-//  PixelPicker
+//  Pixel Picker
 //

 /**
@@ -10,8 +10,18 @@

 import LaunchAtLogin

-// The modifiers available to use to toggle "concentrationMode".
-let concentrationModifiers: [(String, NSEvent.ModifierFlags)] = [
+// The settings available for displaying a grid in the picker's preview.
+enum GridSetting {
+    case never, always, inFocusMode
+    static let withNames: [(String, GridSetting)] = [
+        ("Only in Focus Mode", .inFocusMode),
+        ("Always", .always),
+        ("Never", .never)
+    ]
+}
+
+// The modifiers available to use to toggle "focusMode".
+let focusModifiers: [(String, NSEvent.ModifierFlags)] = [
    ("fn Function", .function),
    ("⌘ Command", .command),
    ("⌃ Control", .control),
@@ -19,6 +29,15 @@ let concentrationModifiers: [(String, NSEvent.ModifierFlags)] = [
    ("⇧ Shift ", .shift)
 ]

+// The available status item images that the user may pick from.
+let statusItemImages: [(String, String)] =  [
+    ("Magnifying Glass (Default)", "icon-default"),
+    ("Palette", "icon-palette"),
+    ("Dropper", "icon-dropper"),
+    ("Magnifying Glass Dropper", "icon-mag-dropper"),
+    ("Magnifying Glass Dropper Flat", "icon-mag-dropper-flat")
+]
+
 extension AppDelegate: NSMenuDelegate {
    // Unregister the activating shortcut when the menu is opened/closed so it can't be called when
    // setting a new shortcut. Also start a run loop observer so we know when the modifierFlags have
@@ -58,22 +77,27 @@ extension AppDelegate: NSMenuDelegate {
        }
    }

-    // TODO: look into only updating the menu rather than rebuilding it each time.
-    // Might not be worth it - it doesn't seem expensive to build it every time it's opened...
+    // This rebuilds the context menu from scratch. For the sake of simplicity, we re-create the
+    // menu from scratch each time. It's not an expensive operation, and is only called when the
+    // user opens the menu.
    func rebuildContextMenu() {
        contextMenu.removeAllItems()

        let pickItem = contextMenu.addItem(withTitle: "Pick a pixel!", action: #selector(showPicker), keyEquivalent: "")
-        pickItem.image = ICON
+        pickItem.image = PPState.shared.statusItemImage(withName: PPState.shared.statusItemImageName)

        buildRecentPicks()

        contextMenu.addItem(.separator())
+        buildAppIconMenu()
+        buildShowGridMenu()
+        buildColorSpaceItem()
        buildColorFormatsMenu()
-        buildMagnificationItem()
-        buildConcentrationMenu()
+        buildMagnificationMenu()
+        buildFocusModeModifierMenu()
        buildFloatPrecisionSlider()
        buildShortcutMenuItem()
+        buildUseUppercaseItem()
        buildLaunchAtLoginItem()

        contextMenu.addItem(.separator())
@@ -81,7 +105,71 @@ extension AppDelegate: NSMenuDelegate {
        contextMenu.addItem(withTitle: "Quit \(APP_NAME)", action: #selector(quitApplication), keyEquivalent: "")
    }

-    private func buildMagnificationItem() {
+    // Choose the status item icon.
+    private func buildAppIconMenu() {
+        let submenu = NSMenu()
+        for (name, imageName) in statusItemImages {
+            let item = submenu.addItem(withTitle: name, action: #selector(selectAppIcon(_:)), keyEquivalent: "")
+            item.representedObject = imageName
+            item.state = PPState.shared.statusItemImageName == imageName ? .on : .off
+            item.image = PPState.shared.statusItemImage(withName: imageName)
+        }
+
+        let item = contextMenu.addItem(withTitle: "App Icon", action: nil, keyEquivalent: "")
+        item.submenu = submenu
+    }
+
+    @objc private func selectAppIcon(_ sender: NSMenuItem) {
+        if let imageName = sender.representedObject as? String {
+            menuBarItem.image = PPState.shared.statusItemImage(withName: imageName)
+            PPState.shared.statusItemImageName = imageName
+        }
+    }
+
+    // Choose whether to always draw a grid, never draw one, or only draw one when in focus mode.
+    private func buildShowGridMenu() {
+        let submenu = NSMenu()
+        for (title, setting) in GridSetting.withNames {
+            let item = submenu.addItem(withTitle: title, action: #selector(selectGridSetting(_:)), keyEquivalent: "")
+            item.representedObject = setting
+            item.state = PPState.shared.gridSetting == setting ? .on : .off
+        }
+
+        let item = contextMenu.addItem(withTitle: "Show Grid", action: nil, keyEquivalent: "")
+        item.submenu = submenu
+    }
+
+    @objc private func selectGridSetting(_ sender: NSMenuItem) {
+        if let setting = sender.representedObject as? GridSetting {
+            PPState.shared.gridSetting = setting
+        }
+    }
+
+    // A menu that allows choosing what color space the picker will use.
+    private func buildColorSpaceItem() {
+        let submenu = NSMenu()
+
+        let defaultItem = submenu.addItem(withTitle: "Default (infer from screen)", action: #selector(setColorSpace(_:)), keyEquivalent: "")
+        defaultItem.state = PPState.shared.colorSpace == nil ? .on : .off
+        submenu.addItem(.separator())
+        for (title, name) in PPColor.colorSpaceNames {
+            let item = submenu.addItem(withTitle: title, action: #selector(setColorSpace(_:)), keyEquivalent: "")
+            item.representedObject = name
+            item.state = PPState.shared.colorSpace == name ? .on : .off
+        }
+
+        let item = contextMenu.addItem(withTitle: "Color Space", action: nil, keyEquivalent: "")
+        item.submenu = submenu
+    }
+
+    // If the selected color space is nil, then the preview will just infer the color space from
+    // the screen the picker is currently on.
+    @objc private func setColorSpace(_ sender: NSMenuItem) {
+        PPState.shared.colorSpace = sender.representedObject as? String
+    }
+
+    // A menu which allows the magnification level of the picker to be adjusted.
+    private func buildMagnificationMenu() {
        let submenu = NSMenu()
        for i in stride(from: 4, through: 24, by: 2) {
            let item = submenu.addItem(withTitle: "\(i)x", action: #selector(selectMagnification(_:)), keyEquivalent: "")
@@ -98,6 +186,17 @@ extension AppDelegate: NSMenuDelegate {
        }
    }

+    // Format hex colors to uppercase.
+    private func buildUseUppercaseItem() {
+        let item = contextMenu.addItem(withTitle: "Uppercase Hex Digits", action: #selector(setUseUppercase(_:)), keyEquivalent: "")
+        item.state = PPState.shared.useUppercase ? .on : .off
+    }
+
+    @objc private func setUseUppercase(_ sender: NSMenuItem) {
+        PPState.shared.useUppercase = sender.state != .on
+    }
+
+    // Simple launch app at login menu item.
    private func buildLaunchAtLoginItem() {
        let item = contextMenu.addItem(withTitle: "Launch \(APP_NAME) at Login", action: #selector(launchAtLogin(_:)), keyEquivalent: "")
        item.state = LaunchAtLogin.isEnabled ? .on : .off
@@ -132,7 +231,7 @@ extension AppDelegate: NSMenuDelegate {
            copyToPasteboard(stringValue: value)
        }
    }
-    
+
    // Simply creates a circle NSImage with the given size and color.
    private func circleImage(withSize size: CGFloat, color: NSColor) -> NSImage {
        let image = NSImage(size: NSSize(width: size, height: size))
@@ -142,7 +241,7 @@ extension AppDelegate: NSMenuDelegate {
        image.unlockFocus()
        return image
    }
-    
+
    // A slider to change the float precision.
    private func buildFloatPrecisionSlider() {
        contextMenu.addItem(withTitle: "Float Precision (\(PPState.shared.floatPrecision))", action: nil, keyEquivalent: "")
@@ -161,28 +260,27 @@ extension AppDelegate: NSMenuDelegate {
        item.view!.autoresizingMask = .width
        item.view!.addSubview(slider)
    }
-    
+
    // Called when the slider is updated.
    @objc private func sliderUpdate(_ sender: NSSlider) {
        let newValue = UInt(sender.intValue)
-        
+
        // Update slider title.
        if let item = contextMenu.item(withTitle: "Float Precision (\(PPState.shared.floatPrecision))") {
            item.title = "Float Precision (\(newValue))"
        }
-        
+
        // Update state.
        PPState.shared.floatPrecision = newValue

        // Update recent picks list with new precision.
        updateMenuItems()
    }
-    
+
    // Build a submenu with each case in the PPColor enum.
-    // TODO: with Swift 4.2, we shouldn't need to resort to the hacky "iterateEnum" approach.
    private func buildColorFormatsMenu() {
        let submenu = NSMenu()
-        for format in iterateEnum(PPColor.self) {
+        for format in PPColor.allCases {
            let formatItem = submenu.addItem(withTitle: format.rawValue, action: #selector(selectFormat(_:)), keyEquivalent: "")
            formatItem.representedObject = format
            if PPState.shared.chosenFormat == format { formatItem.state = .on }
@@ -191,47 +289,44 @@ extension AppDelegate: NSMenuDelegate {
        let item = contextMenu.addItem(withTitle: "Color Format", action: nil, keyEquivalent: "")
        item.submenu = submenu
    }
-    
+
    // Set the selected format as the default.
    @objc private func selectFormat(_ sender: NSMenuItem) {
        if let format = sender.representedObject as? PPColor {
            PPState.shared.chosenFormat = format
-            sender.menu?.items.forEach({ $0.state = .off })
-            sender.state = .on
        }
    }
-    
-    // Builds and adds the concentration modifier submenu.
-    private func buildConcentrationMenu() {
+
+    // Builds and adds the focus modifier submenu.
+    private func buildFocusModeModifierMenu() {
        let submenu = NSMenu()
-        for (name, modifier) in concentrationModifiers {
+        for (name, modifier) in focusModifiers {
            let modifierItem = submenu.addItem(withTitle: name, action: #selector(selectModifier(_:)), keyEquivalent: "")
            modifierItem.representedObject = modifier
-            if PPState.shared.concentrationModeModifier == modifier { modifierItem.state = .on }
+            if PPState.shared.focusModeModifier == modifier { modifierItem.state = .on }
        }

-        let item = contextMenu.addItem(withTitle: "Concentration Modifier", action: nil, keyEquivalent: "")
+        let item = contextMenu.addItem(withTitle: "Focus Mode Modifier", action: nil, keyEquivalent: "")
        item.submenu = submenu
    }
-    
-    // Set the chosen modifier to toggle "concentrationMode".
+
+    // Set the chosen modifier to toggle "focusMode".
    @objc private func selectModifier(_ sender: NSMenuItem) {
        if let modifier = sender.representedObject as? NSEvent.ModifierFlags {
-            PPState.shared.concentrationModeModifier = modifier
-            sender.menu?.items.forEach({ $0.state = .off })
-            sender.state = .on
+            PPState.shared.focusModeModifier = modifier
        }
    }
-    
+
    // Builds and adds the MASShortcutView to be used in the menu.
    // Uses a custom view to handle events correctly (since it's inside a NSMenu).
    private func buildShortcutMenuItem() {
        contextMenu.addItem(withTitle: "Picker Shortcut", action: nil, keyEquivalent: "")

        let shortcutView = MASShortcutView()
+        shortcutView.style = .flat
        shortcutView.shortcutValue = PPState.shared.activatingShortcut
        shortcutView.shortcutValueChange = { PPState.shared.activatingShortcut = $0?.shortcutValue }
-        
+
        let item = contextMenu.addItem(withTitle: "Shortcut", action: nil, keyEquivalent: "")
        item.view = PPMenuShortcutView(shortcut: shortcutView)
    }
@@ -1,14 +1,11 @@
 //
 //  AppDelegate.swift
-//  PixelPicker
+//  Pixel Picker
 //

 import MASShortcut
 import CleanroomLogger

-// The app's menu bar item.
-let ICON = setupMenuBarIcon(NSImage(named: NSImage.Name(rawValue: "icon")))
-
@NSApplicationMain class AppDelegate: NSObject, NSApplicationDelegate {

    // This controller manages the pixel picker itself.
@@ -27,9 +24,11 @@ let ICON = setupMenuBarIcon(NSImage(named: NSImage.Name(rawValue: "icon")))
        var logConfigurations: [LogConfiguration] = [
            RotatingLogFileConfiguration(minimumSeverity: minimumSeverity, daysToKeep: 7, directoryPath: defaultLogPath().path)
        ]
+
        #if DEBUG
        logConfigurations.append(XcodeLogConfiguration(minimumSeverity: .debug))
        #endif
+
        Log.enable(configuration: logConfigurations)
        PPState.shared.loadFromDisk()
    }
@@ -38,7 +37,7 @@ let ICON = setupMenuBarIcon(NSImage(named: NSImage.Name(rawValue: "icon")))
    func applicationDidFinishLaunching(_ aNotification: Notification) {
        contextMenu.delegate = self

-        menuBarItem.image = ICON
+        menuBarItem.image = PPState.shared.statusItemImage(withName: PPState.shared.statusItemImageName)
        menuBarItem.action = #selector(onMenuClick)
        menuBarItem.sendAction(on: [.leftMouseUp, .rightMouseUp])

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "dropper.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "dropper-1.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "dropper-2.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "mag_dropper_flat.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "mag_dropper_flat-1.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "mag_dropper_flat-2.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "mag_dropper.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "mag_dropper-1.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "mag_dropper-2.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "palette.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "palette-1.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "palette-2.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
@@ -1,6 +1,6 @@
 //
 //  Bridging-Header.h
-//  PixelPicker
+//  Pixel Picker
 //

 #ifndef Bridging_Header_h
@@ -0,0 +1,61 @@
+//
+//  CGImage.swift
+//  Pixel Picker
+//
+
+import CleanroomLogger
+
+extension CGImage {
+    // In order to get the color at a given pixel from a CGImage, we need to convert the CGImage's
+    // data to a bitmap and draw it. We do so via a CGContext, and then manually extract the data at
+    // the desired pixel.
+    func colorAt(x: Int, y: Int) -> NSColor {
+        assert(0 <= x && x < self.width)
+        assert(0 <= y && y < self.height)
+
+        let bitmapBytesPerRow = width * 4
+        let bitmapByteCount = bitmapBytesPerRow * Int(self.height)
+
+        // Allocate memory for image data. This is the destination in memory where any drawing to
+        // the bitmap context will be rendered.
+        let bitmapInfo = CGBitmapInfo(rawValue: CGImageAlphaInfo.premultipliedFirst.rawValue)
+        let bitmapData = malloc(bitmapByteCount)
+
+        // Since we manually allocate memeory for the data, we must ensure that the same memory is
+        // freed after we've used it.
+        defer { free(bitmapData) }
+
+        // Create the bitmap context.
+        let context = CGContext(
+            data: bitmapData,
+            width: self.width,
+            height: self.height,
+            bitsPerComponent: 8,
+            bytesPerRow: bitmapBytesPerRow,
+            space: CGColorSpaceCreateDeviceRGB(),
+            bitmapInfo: bitmapInfo.rawValue
+        )
+
+        // Extract the pixel data from the right offset.
+        if context != nil {
+            // First, we draw the image data onto the context we created.
+            let rect = CGRect(x: 0, y: 0, width: self.width, height: self.height)
+            context!.draw(self, in: rect)
+
+            // Then we extract the data at the right spot.
+            let data = context!.data!
+            let offset = 4 * (y * width + x)
+
+            let a = CGFloat(data.load(fromByteOffset: offset,     as: UInt8.self)) / 255.0
+            let r = CGFloat(data.load(fromByteOffset: offset + 1, as: UInt8.self)) / 255.0
+            let g = CGFloat(data.load(fromByteOffset: offset + 2, as: UInt8.self)) / 255.0
+            let b = CGFloat(data.load(fromByteOffset: offset + 3, as: UInt8.self)) / 255.0
+            return NSColor(red: r, green: g, blue: b, alpha: a)
+        }
+
+        // Creating the context failed, so return a default color instead.
+        // Hopefully, this should never happen.
+        Log.error?.message("Failed to create CGContext!")
+        return NSColor.black
+    }
+}
@@ -1,9 +1,9 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1561\cocoasubrtf400
-{\fonttbl\f0\fswiss\fcharset0 ArialMT;\f1\fnil\fcharset0 AppleColorEmoji;\f2\fmodern\fcharset0 Courier;
-}
+{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf200
+{\fonttbl\f0\fswiss\fcharset0 ArialMT;\f1\fnil\fcharset0 AppleColorEmoji;\f2\fswiss\fcharset0 Arial-BoldMT;
+\f3\fswiss\fcharset0 Arial-ItalicMT;\f4\fmodern\fcharset0 Courier;}
 {\colortbl;\red255\green255\blue255;\red0\green0\blue0;\red230\green230\blue230;}
 {\*\expandedcolortbl;;\cssrgb\c0\c0\c0;\csgray\c92143;}
-\margl1440\margr1440\vieww12800\viewh10340\viewkind0
+\paperw12240\paperh15840\margl1440\margr1440\vieww12800\viewh10340\viewkind0
 \deftab720
 \pard\pardeftab720\qc\partightenfactor0

@@ -16,8 +16,8 @@
 \f0 \
 \

-\b\fs28 PixelPicker makes use of the following open source libraries
-\b0\fs26\fsmilli13333 \
+\f2\b\fs28 Pixel Picker makes use of the following open source libraries
+\f0\b0\fs26\fsmilli13333 \
 \pard\pardeftab720\qc\partightenfactor0
 {\field{\*\fldinst{HYPERLINK "https://github.com/emaloney/CleanroomLogger"}}{\fldrslt \cf2 CleanroomLogger}}\
 \pard\pardeftab720\qc\partightenfactor0
@@ -29,36 +29,36 @@
 \
 \pard\pardeftab720\qc\partightenfactor0

-\b\fs36 \cf2 Experimental Overrides
-\b0 \
+\f2\b\fs36 \cf2 Experimental Overrides
+\f0\b0 \
 \pard\pardeftab720\qc\partightenfactor0

-\fs26\fsmilli13333 \cf2 These are experimental options that haven't made it into PixelPickers's UI yet, and may be toggled via the Terminal. Each override is listed as 
-\b key: 
-\i\b0 type
-\i0  which you can enable like:\
+\fs26\fsmilli13333 \cf2 These are experimental options that haven't made it into Pixel Pickers's UI yet, and may be toggled via the Terminal. Each override is listed as 
+\f2\b key: 
+\f3\i\b0 type
+\f0\i0  which you can enable like:\
 \pard\pardeftab720\qc\partightenfactor0

-\f2\fs20 \cf2 \cb3 defaults write com.acheronfail.pixel-picker debugMode -bool true
+\f4\fs20 \cf2 \cb3 defaults write com.acheronfail.pixel-picker debugMode -bool true
 \f0\fs26\fsmilli13333 \cb1 \
 \
 \pard\pardeftab720\qc\partightenfactor0

-\b \cf0 \kerning1\expnd0\expndtw0 leftClickActivates
-\b0 \cf2 \expnd0\expndtw0\kerning0
+\f2\b \cf0 \kerning1\expnd0\expndtw0 leftClickActivates
+\f0\b0 \cf2 \expnd0\expndtw0\kerning0
 : 
-\i \cf0 \kerning1\expnd0\expndtw0 Bool = false\
+\f3\i \cf0 \kerning1\expnd0\expndtw0 Bool = false\
 \pard\pardeftab720\qc\partightenfactor0

-\i0 \cf2 \expnd0\expndtw0\kerning0
+\f0\i0 \cf2 \expnd0\expndtw0\kerning0
 Swaps the left and right click buttons when clicking on the menu bar icon. So left-clicking will activate the picker, and right-clicking will open the dropdown menu.\
 \
 \pard\pardeftab720\qc\partightenfactor0

-\b \cf0 \kerning1\expnd0\expndtw0 debugMode
-\b0 \cf2 \expnd0\expndtw0\kerning0
+\f2\b \cf0 \kerning1\expnd0\expndtw0 debugMode
+\f0\b0 \cf2 \expnd0\expndtw0\kerning0
 : 
-\i \cf0 \kerning1\expnd0\expndtw0 Bool = false
-\i0 \cf2 \expnd0\expndtw0\kerning0
+\f3\i \cf0 \kerning1\expnd0\expndtw0 Bool = false
+\f0\i0 \cf2 \expnd0\expndtw0\kerning0
 \
-Set this to true to enable debug logging. This results in a higher level of logs being written to ~/Library/Preferences/PixelPicker/logs/.}
+Set this to true to enable debug logging. This results in a higher level of logs being written to ~/Library/Preferences/Pixel Picker/logs/.}
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.2</string>
+	<string>1.3.5</string>
 	<key>CFBundleVersion</key>
-	<string>3</string>
+	<string>15</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>
@@ -0,0 +1,22 @@
+//
+//  NSBezierPath.swift
+//  Pixel Picker
+//
+
+// Extend NSBezierPath to allow easy conversion to a CGPath.
+// https://developer.apple.com/library/content/documentation/Cocoa/Conceptual/CocoaDrawingGuide/Paths/Paths.html#//apple_ref/doc/uid/TP40003290-CH206-SW2
+extension NSBezierPath {
+    var cgPath: CGPath {
+        let path = CGMutablePath()
+        var points = [CGPoint](repeating: .zero, count: 3)
+        for i in 0 ..< self.elementCount {
+            switch self.element(at: i, associatedPoints: &points) {
+            case .moveTo: path.move(to: points[0])
+            case .lineTo: path.addLine(to: points[0])
+            case .curveTo: path.addCurve(to: points[2], control1: points[0], control2: points[1])
+            case .closePath: path.closeSubpath()
+            }
+        }
+        return path
+    }
+}
@@ -1,6 +1,6 @@
 //
 //  NSColor.swift
-//  PixelPicker
+//  Pixel Picker
 //

 import SwiftyJSON
@@ -26,6 +26,16 @@ extension NSColor {
        return nil
    }

+    // Creates an NSImage with the given size and color.
+    func image(withSize size: NSSize) -> NSImage {
+        let image = NSImage(size: size)
+        image.lockFocus()
+        self.set()
+        NSRect(origin: NSPoint.zero, size: size).fill()
+        image.unlockFocus()
+        return image
+    }
+
    // Returns either black or white, whichever will contrast the most with the given color.
    // See https://stackoverflow.com/a/3943023/5552584
    func bestContrastingColor() -> NSColor {
@@ -1,6 +1,6 @@
 //
 //  PPOverlayController.swift
-//  PixelPicker
+//  Pixel Picker
 //

 import CleanroomLogger
@@ -15,27 +15,28 @@ class PPOverlayController: NSWindowController {

    // Outlets relating to the picker's info box.
    @IBOutlet weak var infoPanel: PPOverlayPanel!
-    @IBOutlet weak var infoBox: NSBox!
+    @IBOutlet weak var infoWrapper: NSView!
    @IBOutlet weak var infoFormatField: NSTextField!
    @IBOutlet weak var infoDetailField: NSTextField!

    // This mode increases the picker's size, increases the magnification and also slows down move
    // events to make it easier to pick the right pixel. We dissociate the mouse (input) from the
-    // mouse cursor while the concentrationMode is active. This is so we can slow it down.
-    var concentrationMode: Bool = false {
+    // mouse cursor while the focusMode is active. This is so we can slow it down.
+    var focusMode: Bool = false {
        didSet {
            if isEnabled {
-                panelSize = concentrationMode ? 300 : 150
+                panelSize = focusMode ? PPOverlayController.panelSizeLarge : PPOverlayController.panelSizeNormal
                overlayPanel.activate(withSize: panelSize, infoPanel: infoPanel)
                wrapper.layer?.cornerRadius = PPState.shared.paschaModeEnabled ? 0 : panelSize / 2
-                CGAssociateMouseAndMouseCursorPosition(boolean_t(truncating: concentrationMode ? 0 : 1))
+                CGAssociateMouseAndMouseCursorPosition(boolean_t(truncating: focusMode ? 0 : 1))
            }
        }
    }

-    // The size of the pixel picker.
-    // TODO: use constants rather than hard-coded values.
-    private var panelSize: CGFloat = 150
+    // The current and different sizes of the pixel picker.
+    private static let panelSizeNormal: CGFloat = 150
+    private static let panelSizeLarge: CGFloat = 300
+    private var panelSize: CGFloat = PPOverlayController.panelSizeNormal

    // The app that was last active before the picker was activated. We keep track
    // of this in order to fully restore first responder status after picking a pixel.
@@ -55,12 +56,17 @@ class PPOverlayController: NSWindowController {
                startMonitoringEvents()
            } else {
                stopMonitoringEvents()
-                concentrationMode = false
+                focusMode = false
            }
        }
    }

    override func awakeFromNib() {
+        // Setup the info window.
+        infoWrapper.wantsLayer = true
+        infoWrapper.layer?.cornerRadius = 8
+        infoWrapper.layer?.backgroundColor = NSColor.black.cgColor
+
        // For some reason if we don't listen for events this way we miss the escape key.
        NSEvent.addLocalMonitorForEvents(matching: [.keyDown]) {
            if self.isEnabled { self.keyDown(with: $0) }
@@ -84,40 +90,49 @@ class PPOverlayController: NSWindowController {
    // When the user clicks, animate the cursor out, save the picked color and copy it.
    override func mouseDown(with event: NSEvent) {
        hidePicker(animate: true)
-
-        let pickedColor = PPPickedColor(color: lastHighlightedColor, format: PPState.shared.chosenFormat)
-        PPState.shared.addRecentPick(pickedColor)
-        copyToPasteboard(stringValue: pickedColor.asString)
+        pickColor()
    }

-    // Close picker immediately when the user presses the escape key.
+    // Listen to key events.
    override func keyDown(with event: NSEvent) {
-        if event.keyCode == kVK_Escape { hidePicker(animate: false) }
-        if event.keyCode == kVK_Space {
-            let format = PPState.shared.chosenFormat
-            PPState.shared.chosenFormat = event.modifierFlags.contains(.shift) ? format.previous() : format.next()
+        switch Int(event.keyCode) {
+        // Close immediately on escape.
+        case kVK_Escape:
+            hidePicker(animate: false)
+        // Act as if the user clicked on space.
+        case kVK_Space:
+            hidePicker(animate: true)
+            pickColor()
+        // Cycle between formats when the user presses the left or right arrow keys.
+        case kVK_LeftArrow:
+            PPState.shared.chosenFormat = PPState.shared.chosenFormat.previous()
            updateInfoPanel(lastHighlightedColor, lastHighlightedColor.bestContrastingColor())
+        case kVK_RightArrow:
+            PPState.shared.chosenFormat = PPState.shared.chosenFormat.next()
+            updateInfoPanel(lastHighlightedColor, lastHighlightedColor.bestContrastingColor())
+        default:
+            break
        }
    }

-    // Enable "concentrationMode" when correct modifier flag is changed.
+    // Enable "focusMode" when correct modifier flag is changed.
    override func flagsChanged(with event: NSEvent) {
        if isEnabled {
-            concentrationMode = event.modifierFlags.contains(PPState.shared.concentrationModeModifier)
+            focusMode = event.modifierFlags.contains(PPState.shared.focusModeModifier)
            updatePreview(aroundPoint: lastMouseLocation)
        }
    }

-    // Move the picker with the mouse, and if "concentrationMode" is active then
+    // Move the picker with the mouse, and if "focusMode" is active then
    // slow it down to make it easier to pick the correct pixel.
    override func mouseMoved(with event: NSEvent) {
        if isEnabled {
            let currentMouseLocation = NSEvent.mouseLocation
            var nextMouseLocation = currentMouseLocation

-            // Slow down tracking speed when concentration mode is active.
-            if concentrationMode {
-                let speed: CGFloat = concentrationMode ? 0.1 : 0.5
+            // Slow down tracking speed when focusMode is active.
+            if focusMode {
+                let speed: CGFloat = focusMode ? 0.1 : 0.5
                let x = lastMouseLocation.x + (event.deltaX * speed)
                let y = lastMouseLocation.y - (event.deltaY * speed)

@@ -141,6 +156,12 @@ class PPOverlayController: NSWindowController {
        }
    }

+    func pickColor() {
+        let pickedColor = PPPickedColor(color: lastHighlightedColor, format: PPState.shared.chosenFormat)
+        PPState.shared.addRecentPick(pickedColor)
+        copyToPasteboard(stringValue: pickedColor.asString)
+    }
+
    // Show the picker, save the previously active application, and hide the cursor.
    func showPicker() {
        if overlayPanel.isVisible || infoPanel.isVisible { return }
@@ -209,7 +230,7 @@ class PPOverlayController: NSWindowController {

    // Updates the info panel with the correct colors and text.
    func updateInfoPanel(_ color: NSColor, _ contrastingColor: NSColor) {
-        infoBox.fillColor = color.alphaComponent == 0 ? NSColor.black : color
+        infoWrapper.layer?.backgroundColor = color.cgColor
        infoFormatField.textColor = contrastingColor
        infoDetailField.textColor = contrastingColor
        infoFormatField.stringValue = PPState.shared.chosenFormat.rawValue
@@ -230,13 +251,20 @@ class PPOverlayController: NSWindowController {
        // Ensure the overlayPanel is always the key window.
        if !overlayPanel.isKeyWindow {
            overlayPanel.activate(withSize: panelSize, infoPanel: infoPanel)
+            // Reset the cursor state to ensure it's hidden (the foremost application changes then
+            // WindowServer resets our "SetsCursorInBackground" magic).
+            ShowCursor()
+            HideCursor()
        }

+        // Center the mouse in the picker window.
+        overlayPanel.setFrameOrigin(NSPoint(x: point.x - (panelSize / 2), y: point.y - (panelSize / 2)))
        let normalisedPoint = NSPoint(x: round(point.x * 2) / 2, y: round(point.y * 2) / 2)
        if let screenShot = getScreenShot(aroundPoint: normalisedPoint) {
+
            // Calculate a zoomed rect which will crop the screenshot we took.
            let magnification = CGFloat(PPState.shared.magnificationLevel)
-            let zoomReciprocal: CGFloat = 1.0 / (concentrationMode ? magnification * 2.5 : magnification)
+            let zoomReciprocal: CGFloat = 1.0 / (focusMode ? magnification * 2.5 : magnification)
            let currentSize = CGFloat(screenShot.width) + 1
            let origin = floor(currentSize * ((1 - zoomReciprocal) / 2))
            let x = origin + (isHalf(normalisedPoint.x) ? 1 : 0)
@@ -244,28 +272,66 @@ class PPOverlayController: NSWindowController {

            // Ensure preview size is an odd number (so there's a middle pixel).
            let zoomedSize = floor(ensureOdd(currentSize * zoomReciprocal))
-            let middle = zoomedSize / 2
-
            let croppedRect = CGRect(x: x, y: y, width: zoomedSize, height: zoomedSize)
            let zoomedImage: CGImage = screenShot.cropping(to: croppedRect)!
+            let pixelSize = panelSize / zoomedSize

-            // Extract the middle pixel color from the zoomed image.
-            let bitmap = NSBitmapImageRep(cgImage: zoomedImage)
-            bitmap.colorSpaceName = .calibratedRGB
-            if let colorAtPixel = bitmap.colorAt(x: Int(middle), y: Int(middle)) {
-                let contrastingColor = colorAtPixel.bestContrastingColor()
+            // Convert the preview to the correct color space, and update the overlay.

-                preview.layer?.contents = NSImage(cgImage: zoomedImage, size: NSSize(width: panelSize, height: panelSize))
-                preview.updateCrosshair(panelSize / zoomedSize, middle, contrastingColor.cgColor)
-                wrapper.update(contrastingColor.cgColor)
-                updateInfoPanel(colorAtPixel, contrastingColor)
-
-                // Save color under pixel (used when copied).
-                lastHighlightedColor = colorAtPixel
+            // User has chosen a custom color space.
+            if let colorSpace = getChosenColorSpace(point) {
+                if colorSpace == zoomedImage.colorSpace {
+                    return updatePreview(zoomedImage, pixelSize, zoomedSize)
+                } else if let image = zoomedImage.copy(colorSpace: colorSpace) {
+                    return updatePreview(image, pixelSize, zoomedSize)
+                }
            }
+
+            // No custom color space chosen, so use the screen's one.
+            if let colorSpace = getScreenColorSpace(point) {
+                if colorSpace == zoomedImage.colorSpace {
+                    return updatePreview(zoomedImage, pixelSize, zoomedSize)
+                } else if let image = zoomedImage.copy(colorSpace: colorSpace) {
+                    return updatePreview(image, pixelSize, zoomedSize)
+                }
+            }
+
+            // If that also didn't work, then just return the image in its default color space.
+            return updatePreview(zoomedImage, pixelSize, zoomedSize)
+        }
+    }
+
+    private func updatePreview(_ image: CGImage, _ pixelSize: CGFloat, _ numberOfPixels: CGFloat) {
+        let middlePosition = numberOfPixels / 2
+
+        // Extract the middle pixel color from the prepared image.
+        let colorAtPixel = image.colorAt(x: Int(middlePosition), y: Int(middlePosition))
+        let contrastingColor = colorAtPixel.bestContrastingColor()
+
+        // Update picker border and info panel.
+        wrapper.update(contrastingColor.cgColor)
+        updateInfoPanel(colorAtPixel, contrastingColor)
+
+        // Update the picker preview.
+        preview.layer?.contents = image
+        preview.updateCrosshair(pixelSize, middlePosition, contrastingColor.cgColor)
+        let showGrid = PPState.shared.gridSetting == .always || (focusMode && PPState.shared.gridSetting == .inFocusMode)
+        preview.updateGrid(cellSize: pixelSize, numberOfCells: Int(numberOfPixels), shouldDisplay: showGrid)
+
+        // Save color under pixel (used when copied).
+        lastHighlightedColor = colorAtPixel
+    }
+
+    private func getScreenColorSpace(_ point: NSPoint) -> CGColorSpace? {
+        return getScreenFromPoint(point)?.colorSpace?.cgColorSpace
+    }
+
+    // Gets the colorspace in which to display the preview and retreive color values.
+    private func getChosenColorSpace(_ point: NSPoint) -> CGColorSpace? {
+        if let name = PPState.shared.colorSpace, let colorSpace = CGColorSpace(name: name as CFString) {
+            return colorSpace
        }

-        // Center the mouse in the picker window.
-        overlayPanel.setFrameOrigin(NSPoint(x: normalisedPoint.x - (panelSize / 2), y: normalisedPoint.y - (panelSize / 2)))
+        return nil
    }
 }
@@ -3,7 +3,6 @@
    <dependencies>
        <deployment identifier="macosx"/>
        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14109"/>
-        <capability name="box content view" minToolsVersion="7.0"/>
        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
    </dependencies>
    <objects>
@@ -21,10 +20,10 @@
        </customObject>
        <customObject id="ECQ-9M-Pkg" customClass="PPOverlayController" customModule="PixelPicker" customModuleProvider="target">
            <connections>
-                <outlet property="infoBox" destination="rpe-Xh-gaO" id="BYW-qP-HLd"/>
                <outlet property="infoDetailField" destination="Re2-GH-fyd" id="K03-75-cf9"/>
                <outlet property="infoFormatField" destination="1fa-UE-yMM" id="Nan-fO-kbu"/>
                <outlet property="infoPanel" destination="OMO-LB-w57" id="GGj-Y6-LfU"/>
+                <outlet property="infoWrapper" destination="HED-rR-FDP" id="21H-Tc-c4W"/>
                <outlet property="overlayPanel" destination="gZA-A3-IZ5" id="DUd-MU-oD4"/>
                <outlet property="preview" destination="oj3-ml-2qo" id="xLc-pu-U90"/>
                <outlet property="window" destination="gZA-A3-IZ5" id="GLv-sO-WxM"/>
@@ -35,7 +34,7 @@
            <windowStyleMask key="styleMask" utility="YES" nonactivatingPanel="YES"/>
            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
            <rect key="contentRect" x="196" y="132" width="101" height="101"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1178"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1028"/>
            <view key="contentView" id="acW-WA-gq2" customClass="PPOverlayWrapper" customModule="PixelPicker" customModuleProvider="target">
                <rect key="frame" x="0.0" y="0.0" width="101" height="101"/>
                <autoresizingMask key="autoresizingMask"/>
@@ -56,50 +55,35 @@
        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" oneShot="NO" showsToolbarButton="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" id="OMO-LB-w57" customClass="PPOverlayPanel" customModule="PixelPicker" customModuleProvider="target">
            <windowStyleMask key="styleMask" utility="YES" nonactivatingPanel="YES"/>
            <rect key="contentRect" x="926" y="538" width="100" height="50"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1178"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1028"/>
            <view key="contentView" id="HED-rR-FDP">
                <rect key="frame" x="0.0" y="0.0" width="100" height="50"/>
                <autoresizingMask key="autoresizingMask"/>
                <subviews>
-                    <box boxType="custom" borderType="none" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="rpe-Xh-gaO">
-                        <rect key="frame" x="0.0" y="0.0" width="100" height="50"/>
-                        <view key="contentView" id="g1f-dN-SYl">
-                            <rect key="frame" x="0.0" y="0.0" width="100" height="50"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                            <subviews>
-                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1fa-UE-yMM">
-                                    <rect key="frame" x="-2" y="28" width="104" height="17"/>
-                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Label" id="RkG-Wy-Shq">
-                                        <font key="font" metaFont="system"/>
-                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                    </textFieldCell>
-                                </textField>
-                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Re2-GH-fyd">
-                                    <rect key="frame" x="-2" y="5" width="104" height="14"/>
-                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Label" id="IYd-1Y-7cd">
-                                        <font key="font" metaFont="smallSystem"/>
-                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                    </textFieldCell>
-                                </textField>
-                            </subviews>
-                            <constraints>
-                                <constraint firstItem="1fa-UE-yMM" firstAttribute="top" secondItem="g1f-dN-SYl" secondAttribute="top" constant="5" id="OMX-Uf-gxc"/>
-                                <constraint firstAttribute="trailing" secondItem="1fa-UE-yMM" secondAttribute="trailing" id="YWA-wF-wWD"/>
-                                <constraint firstItem="Re2-GH-fyd" firstAttribute="leading" secondItem="g1f-dN-SYl" secondAttribute="leading" id="def-Ev-ONx"/>
-                                <constraint firstItem="1fa-UE-yMM" firstAttribute="leading" secondItem="g1f-dN-SYl" secondAttribute="leading" id="j0J-F5-ipt"/>
-                                <constraint firstAttribute="bottom" secondItem="Re2-GH-fyd" secondAttribute="bottom" constant="5" id="ktF-UW-gVI"/>
-                                <constraint firstAttribute="trailing" secondItem="Re2-GH-fyd" secondAttribute="trailing" id="t9s-4R-bFb"/>
-                            </constraints>
-                        </view>
-                    </box>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1fa-UE-yMM">
+                        <rect key="frame" x="-2" y="25" width="104" height="17"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Label" id="RkG-Wy-Shq">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Re2-GH-fyd">
+                        <rect key="frame" x="-2" y="8" width="104" height="14"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Label" id="IYd-1Y-7cd">
+                            <font key="font" metaFont="smallSystem"/>
+                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
                </subviews>
                <constraints>
-                    <constraint firstItem="rpe-Xh-gaO" firstAttribute="leading" secondItem="HED-rR-FDP" secondAttribute="leading" id="Buc-en-Way"/>
-                    <constraint firstItem="rpe-Xh-gaO" firstAttribute="top" secondItem="HED-rR-FDP" secondAttribute="top" id="NrK-e2-suw"/>
-                    <constraint firstAttribute="bottom" secondItem="rpe-Xh-gaO" secondAttribute="bottom" id="WSu-Ro-a4K"/>
-                    <constraint firstAttribute="trailing" secondItem="rpe-Xh-gaO" secondAttribute="trailing" id="myM-UI-QfA"/>
+                    <constraint firstItem="1fa-UE-yMM" firstAttribute="leading" secondItem="HED-rR-FDP" secondAttribute="leading" id="23z-pW-nAx"/>
+                    <constraint firstItem="1fa-UE-yMM" firstAttribute="top" secondItem="HED-rR-FDP" secondAttribute="top" constant="8" id="G1j-j5-iWY"/>
+                    <constraint firstItem="Re2-GH-fyd" firstAttribute="leading" secondItem="HED-rR-FDP" secondAttribute="leading" id="aZf-QY-Lpd"/>
+                    <constraint firstAttribute="bottom" secondItem="Re2-GH-fyd" secondAttribute="bottom" constant="8" id="amm-jV-oWa"/>
+                    <constraint firstAttribute="trailing" secondItem="1fa-UE-yMM" secondAttribute="trailing" id="flM-Te-2qj"/>
+                    <constraint firstAttribute="trailing" secondItem="Re2-GH-fyd" secondAttribute="trailing" id="jWO-5f-uxW"/>
                </constraints>
            </view>
            <point key="canvasLocation" x="236" y="230"/>
@@ -1,6 +1,6 @@
 //
 //  PPOverlayPanel.swift
-//  PixelPicker
+//  Pixel Picker
 //

 // This class is in charge of managing the panels which are brought to the front
@@ -0,0 +1,74 @@
+//
+//  PPOverlayPreview.swift
+//  Pixel Picker
+//
+
+// This class is in charge of rendering the pixel preview.
+class PPOverlayPreview: NSView, CALayerDelegate {
+    // A grid that's optionally shown in the preview.
+    private var grid: CAShapeLayer = CAShapeLayer()
+    private var lastCellSize: CGFloat?
+    private var lastNumberOfCells: Int?
+
+    // The small pixel-box in the centre of the picker.
+    var crosshair: CAShapeLayer = CAShapeLayer()
+    
+    override var wantsUpdateLayer: Bool {
+        get { return true }
+    }
+
+    override func awakeFromNib() {
+        // Make layers contents resize to fill, and disable antialiasing.
+        wantsLayer = true
+        layer?.magnificationFilter = .nearest
+        layer?.contentsGravity = .resizeAspectFill
+        layer?.delegate = self
+
+        // Add the grid shape layers to the view.
+        grid.strokeColor = NSColor.gray.cgColor
+        grid.fillColor = nil
+        layer?.addSublayer(grid)
+
+        // Prepare crosshair shape layers.
+        crosshair.strokeColor = NSColor.black.cgColor
+        crosshair.fillColor = nil
+        layer?.addSublayer(crosshair)
+    }
+
+    // Update the crosshair with the correct color, position and size.
+    func updateCrosshair(_ pixelSize: CGFloat, _ middle: CGFloat, _ color: CGColor) {
+        let pos: CGFloat = (pixelSize * middle) - (pixelSize / 2) + 0.5
+        let pixelRect = NSMakeRect(pos, pos, pixelSize, pixelSize)
+        
+        crosshair.path = CGPath(rect: pixelRect, transform: nil)
+        crosshair.strokeColor = color
+        setNeedsDisplay(pixelRect)
+    }
+
+    // Redraws the grid in the preview.
+    func updateGrid(cellSize size: CGFloat, numberOfCells n: Int, shouldDisplay: Bool) {
+        // Disable implicit animations within this transaction.
+        CATransaction.setDisableActions(true)
+        grid.opacity = shouldDisplay ? 0.25 : 0
+
+        // Only redraw the grid if we need to display it and the dimensions have changed since last
+        // the last time we drew it.
+        guard shouldDisplay && (size != lastCellSize || n != lastNumberOfCells) else { return }
+        lastCellSize = size
+        lastNumberOfCells = n
+
+        let path = NSBezierPath()
+        let start = CGFloat(0) + 0.5
+        let end = CGFloat(n) * size + 0.5
+
+        for i in 1..<n {
+            let pos = CGFloat(i) * size + 0.5
+            path.move(to: NSPoint(x: pos, y: start))
+            path.line(to: NSPoint(x: pos, y: end))
+            path.move(to: NSPoint(x: start, y: pos))
+            path.line(to: NSPoint(x: end, y: pos))
+        }
+
+        grid.path = path.cgPath
+    }
+}
@@ -1,6 +1,6 @@
 //
 //  PPOverlayWrapper.swift
-//  PixelPicker
+//  Pixel Picker
 //

 // This class is basically the content view of the overlay panel.
@@ -1,46 +1,34 @@
 //
 //  PPColor.swift
-//  PixelPicker
+//  Pixel Picker
 //

 import SwiftyJSON

-// This allows us to iterate over the raw values of an enum.
-// TODO: use `CaseIterable` when Swift 4.2 comes out
-func iterateEnum<T: Hashable>(_: T.Type) -> AnyIterator<T> {
-    var i = 0
-    return AnyIterator {
-        let next = withUnsafeBytes(of: &i) { $0.load(as: T.self) }
-        if next.hashValue != i { return nil }
-        i += 1
-        return next
-    }
-}
-
 // Each time the user picks a pixel we save it as the format and the color.
 struct PPPickedColor {
    let color: NSColor
    let format: PPColor
-    
+
    init(color: NSColor, format: PPColor) {
        self.color = color
        self.format = format
    }
-    
+
    init?(fromJSON json: JSON) {
        guard
            let formatString = json["format"].string,
            let format = PPColor(rawValue: formatString),
            let color = NSColor.deserialize(fromJson: json["color"])
            else { return nil }
-        
+
        self.init(color: color, format: format)
    }
-    
+
    var asString: String {
        return format.asString(withColor: color)
    }
-    
+
    var asJSON: JSON {
        return [
            "color": NSColor.serialize(self.color),
@@ -51,7 +39,7 @@ struct PPPickedColor {

 // This enum is responsible for each of the color formats PixelPicker supports,
 // as well as being responsible for formatting them as strings, etc.
-enum PPColor: String {
+enum PPColor: String, CaseIterable {
    case genericHex                = "Generic Hex"
    case generic8Bit               = "Generic 8-Bit"
    case genericDecimal            = "Generic Decimal"
@@ -60,6 +48,7 @@ enum PPColor: String {
    case cssRgba                   = "CSS RGBA"
    case cssHsl                    = "CSS HSL"
    case cssHsla                   = "CSS HSLA"
+    case dart                      = "Dart / Flutter"
    case swiftNSColorRgb           = "Swift NSColor RGB"
    case swiftNSColorDeviceRgb     = "Swift NSColor Device RGB"
    case swiftNSColorCalibratedRgb = "Swift NSColor Calibrated RGB"
@@ -91,21 +80,22 @@ enum PPColor: String {
        let f = self.insertFloatPrecisionFormatter
        let c = colorInCorrectColorSpace(passedColor)
        switch self {
-        case .genericHex:                return self.formatAsHex(c, "%2X")
+        case .genericHex:                return self.formatAsHex(c, "%06x")
        case .generic8Bit:               return self.formatAs8Bit(c, "%u, %u, %u")
        case .genericDecimal:            return self.formatAsDecimal(c, f("%f, %f, %f"), .rgb)
-        case .cssHex:                    return self.formatAsHex(c, "#%2X")
+        case .cssHex:                    return self.formatAsHex(c, "#%06x")
        case .cssRgb:                    return self.formatAs8Bit(c, "rgb(%u, %u, %u)")
        case .cssRgba:                   return self.formatAs8Bit(c, "rgba(%u, %u, %u, 1)")
        case .cssHsl:                    return self.formatAsHSL(c, "hsl(%u, %u%%, %u%%)")
        case .cssHsla:                   return self.formatAsHSL(c, "hsla(%u, %u%%, %u%%, 1)")
+        case .dart:                      return self.formatAsHex(c, "ff%06x", prefix: "const Color(0x", suffix: ")")
        case .swiftNSColorRgb:           return self.formatAsDecimal(c, f("NSColor(red: %f, green: %f, blue: %f, alpha: 1.000)"), .rgb)
        case .swiftNSColorDeviceRgb:     return self.formatAsDecimal(c, f("NSColor(deviceRed: %f, green: %f, blue: %f, alpha: 1.000)"), .rgb)
        case .swiftNSColorCalibratedRgb: return self.formatAsDecimal(c, f("NSColor(calibratedRed: %f, green: %f, blue: %f, alpha: 1.000)"), .rgb)
        case .swiftNSColorDeviceHsb:     return self.formatAsDecimal(c, f("NSColor(deviceHue: %f, saturation: %f, brightness: %f, alpha: 1.000)"), .hsb)
        case .swiftNSColorCalibratedHsb: return self.formatAsDecimal(c, f("NSColor(calibratedHue: %f, saturation: %f, brightness: %f, alpha: 1.000)"), .hsb)
-        case .swiftUIColorRgb:           return self.formatAsDecimal(c, f("NSColor(red: %f, green: %f, blue: %f, alpha: 1.000)"), .rgb)
-        case .swiftUIColorHsb:           return self.formatAsDecimal(c, f("NSColor(hue: %f, saturation: %f, brightness: %f, alpha: 1.000)"), .hsb)
+        case .swiftUIColorRgb:           return self.formatAsDecimal(c, f("UIColor(red: %f, green: %f, blue: %f, alpha: 1.000)"), .rgb)
+        case .swiftUIColorHsb:           return self.formatAsDecimal(c, f("UIColor(hue: %f, saturation: %f, brightness: %f, alpha: 1.000)"), .hsb)
        case .objCNSColorRgb:            return self.formatAsDecimal(c, f("[NSColor colorWithSRGBRed: %f green: %f blue: %f alpha:1.000]"), .rgb)
        case .objCNSColorDeviceRgb:      return self.formatAsDecimal(c, f("[NSColor colorWithDeviceRed: %f green: %f blue: %f alpha:1.000]"), .rgb)
        case .objCNSColorCalibratedRgb:  return self.formatAsDecimal(c, f("[NSColor colorWithCalibratedRed: %f green: %f blue: %f alpha:1.000]"), .rgb)
@@ -119,8 +109,8 @@ enum PPColor: String {
        case .javaRgba:                  return self.formatAs8Bit(c, "new Color(%u, %u, %u, 255)")
        case .androidRgb:                return self.formatAs8Bit(c, "Color.rgb(%u, %u, %u)")
        case .androidArgb:               return self.formatAs8Bit(c, "Color.argb(255, %u, %u, %u)")
-        case .androidXmlRgb:             return self.formatAsHex(c, "<color name=\"color_name\">#%2X</color>")
-        case .androidXmlArgb:            return self.formatAsHex(c, "<color name=\"color_name\">#ff%2X</color>")
+        case .androidXmlRgb:             return self.formatAsHex(c, "#%06x", prefix: "<color name=\"color_name\">", suffix: "</color>")
+        case .androidXmlArgb:            return self.formatAsHex(c, "#ff%06x", prefix: "<color name=\"color_name\">", suffix: "</color>")
        case .cgColorRgb:                return self.formatAsDecimal(c, f("CGColorCreateGenericRGB(%f, %f, %f, 1.000)"), .rgb)
        case .openGlRgb:                 return self.formatAsDecimal(c, f("glColor3f(%f, %f, %f)"), .rgb)
        case .openGlRgba:                return self.formatAsDecimal(c, f("glColor4f(%f, %f, %f, 1.000)"), .rgb)
@@ -133,10 +123,11 @@ enum PPColor: String {
        switch self {
        // Hexadecimal-like formats.
        case .cssHex:                    fallthrough
+        case .dart:                      fallthrough
        case .androidXmlRgb:             fallthrough
        case .androidXmlArgb:            fallthrough
        case .cgColorRgb:                fallthrough
-        case .genericHex:                return self.formatAsHex(color, "%2X")
+        case .genericHex:                return self.formatAsHex(color, "%06x")
        // CSS HSL is a unique format.
        case .cssHsl:                    fallthrough
        case .cssHsla:                   return self.formatAsHSL(color, "%u, %u%%, %u%%")
@@ -170,19 +161,18 @@ enum PPColor: String {
        case .objCUIColorHsb:            return self.formatAsDecimal(color, self.insertFloatPrecisionFormatter("%f, %f, %f"), .rgb)
        }
    }
-    
+
    // Returns the PPColor that sits after this one.
    func next() -> PPColor {
-        return next(withArray: iterateEnum(PPColor.self).map({ $0 }))
+        return next(withArray: PPColor.allCases)
    }
-    
+
    // Same as next() but backwards.
    func previous() -> PPColor {
-        return next(withArray: iterateEnum(PPColor.self).reversed())
+        return next(withArray: PPColor.allCases.reversed())
    }
-    
-    // Finds the next element after this element in the given array.
-    // This method should only be passed the result of iterateEnum(PPColor.self).
+
+    // Finds the next PPColor after this one in the list of PPColors.
    private func next(withArray array: [PPColor]) -> PPColor {
        var found = false
        for x in array {
@@ -192,26 +182,27 @@ enum PPColor: String {

        return array.first!
    }
-    
+
    // A tiny enum that describes which components should be used when formatting.
    private enum Components {
        case rgb
        case hsb
    }
-    
+
    // Replaces "%f" with "%.3f" (if "3" is the current precision level).
    private func insertFloatPrecisionFormatter(_ input: String) -> String {
        return input.replacingOccurrences(of: "%f", with: String(format: "%%.%uf", PPState.shared.floatPrecision))
    }
-    
+
    // Formats the colors as a hex value, eg: "D3504E".
-    private func formatAsHex(_ color: NSColor, _ template: String) -> String {
-        let a = Int(color.redComponent * 255) << 16
-        let b = Int(color.greenComponent * 255) << 8
-        let c = Int(color.blueComponent * 255) << 0
-        return String(format: template, a | b | c)
+    private func formatAsHex(_ color: NSColor, _ template: String, prefix: String = "", suffix: String = "") -> String {
+        let r = min(Int(color.redComponent   * 0x100), 0x0ff) << 16
+        let g = min(Int(color.greenComponent * 0x100), 0x0ff) << 8
+        let b = min(Int(color.blueComponent  * 0x100), 0x0ff) << 0
+        let result = String(format: template, (r | g | b))
+        return prefix + (PPState.shared.useUppercase ? result.uppercased() : result) + suffix
    }
-    
+
    // Formats the color as decimal values, eg: "0.145, 0.361, 0.722".
    private func formatAsDecimal(_ color: NSColor, _ template: String, _ cmp: Components) -> String {
        let a = cmp == .rgb ? color.redComponent   : color.hueComponent
@@ -219,23 +210,23 @@ enum PPColor: String {
        let c = cmp == .rgb ? color.blueComponent  : color.brightnessComponent
        return String(format: template, a, b, c)
    }
-    
+
    // Formats the color as 8-bit values, eg: "158, 198, 117".
    private func formatAs8Bit(_ color: NSColor, _ template: String) -> String {
-        let a = Int(color.redComponent * 255)
-        let b = Int(color.greenComponent * 255)
-        let c = Int(color.blueComponent * 255)
-        return String(format: template, a, b, c)
+        let r = min(Int(color.redComponent   * 0x100), 0x0ff)
+        let g = min(Int(color.greenComponent * 0x100), 0x0ff)
+        let b = min(Int(color.blueComponent  * 0x100), 0x0ff)
+        return String(format: template, r, g, b)
    }
-    
+
    // Special formatter since CSS uses a unique style here, eg: "35, 79%, 47%".
    private func formatAsHSL(_ color: NSColor, _ template: String) -> String {
-        let a = Int(color.hueComponent * 360)
-        let b = Int(color.saturationComponent * 100)
-        let c = Int(color.brightnessComponent * 100)
-        return String(format: template, a, b, c)
+        let h = min(Int(color.hueComponent * 360), 359)
+        let s = Int(color.saturationComponent * 100)
+        let b = Int(color.brightnessComponent * 100)
+        return String(format: template, h, s, b)
    }
-    
+
    // Returns a new color in the correct colorspace for the format.
    private func colorInCorrectColorSpace(_ color: NSColor) -> NSColor {
        switch self {
@@ -253,4 +244,29 @@ enum PPColor: String {
            return color
        }
    }
+
+    // Available CGColorSpaces that can be chosen.
+    // NOTE: the commented out color spaces don't work at all on my screens, they may work for other
+    // screens, but here they're left out since they're probably not common/necessary. If you're
+    // reading this and you want to use them, make an issue on GitHub and then we can test them.
+    static let colorSpaceNames = [
+        // ("Generic CMYK",           CGColorSpace.genericCMYK as String),
+        ("Generic XYZ",            CGColorSpace.genericXYZ as String),
+        ("Generic RGB Linear",     CGColorSpace.genericRGBLinear as String),
+        // ("Generic Gray Gamma 2.2", CGColorSpace.genericGrayGamma2_2 as String),
+        ("ACESCG Linear",          CGColorSpace.acescgLinear as String),
+        ("Adobe RGB 1998",         CGColorSpace.adobeRGB1998 as String),
+        ("DCIP3",                  CGColorSpace.dcip3 as String),
+        ("Display P3",             CGColorSpace.displayP3 as String),
+        // ("Linear Gray",            CGColorSpace.linearGray as String),
+        ("Linear sRGB",            CGColorSpace.linearSRGB as String),
+        // ("Extended Linear Gray",   CGColorSpace.extendedLinearGray as String),
+        ("Extended Linear sRGB",   CGColorSpace.extendedLinearSRGB as String),
+        // ("Extended Gray",          CGColorSpace.extendedGray as String),
+        ("Extended sRGB",          CGColorSpace.extendedSRGB as String),
+        ("ITUR 2020",              CGColorSpace.itur_2020 as String),
+        ("ITUR 709",               CGColorSpace.itur_709 as String),
+        ("ROMM RGB",               CGColorSpace.rommrgb as String),
+        ("sRGB",                   CGColorSpace.sRGB as String)
+    ]
 }
@@ -1,6 +1,6 @@
 //
 //  CarbonEventInterceptor.h
-//  PixelPicker
+//  Pixel Picker
 //

 #ifndef CarbonEventInterceptor_h
@@ -1,11 +1,14 @@
 //
 //  CarbonEventInterceptor.m
-//  PixelPicker
+//  Pixel Picker
 //

 #import "PPMenuShortcutView.h"
 #import "PixelPicker-Swift.h"

+// The trailing end of the cancel button in the MASShortcutView (within the NSMenuItem).
+CGFloat cancelBoundary = 15;
+
 // In order to have a MASShortcutView inside our menubar dropdown menu, we need to
 // perform some hacks. Basically, we catch all the key and mouse events, and then
 // use those to manually control the shortcut view (the MASShortcutView doesn't work
@@ -44,6 +47,21 @@
    return self;
 }

+-(void)drawRect:(NSRect)dirtyRect
+{
+    [super drawRect:dirtyRect];
+
+    // Draw a border around the view.
+    // Currently we don't use any of MASShortcut's custom drawing styles since they don't draw
+    // nicely with macOS 10.14's new dark interface style.
+    CGFloat xInset = 20;
+    CGFloat yInset = 1;
+    NSRect borderRect = NSMakeRect(self.frame.origin.x + xInset, self.frame.origin.y + yInset, self.frame.size.width - xInset - cancelBoundary, self.frame.size.height - (yInset * 2));
+    NSBezierPath *border = [NSBezierPath bezierPathWithRoundedRect:borderRect xRadius:3 yRadius:3];
+    [[[NSColor scrollBarColor] colorWithAlphaComponent:0.5] set];
+    [border stroke];
+}
+
 // This is called when the NSMenu is opened, so it's a good time to register our
 // intercepting event handlers to catch all keyboard events inside the NSMenu.
 - (void)viewDidMoveToWindow
@@ -95,7 +113,7 @@
    // End of the MASShortcutView.
    CGFloat end = start + shortcutView.frame.size.width;
    // Start of the cancel button in the MASShortcutView.
-    CGFloat cancelStart = end - 20;
+    CGFloat cancelStart = end - cancelBoundary;

    if (shortcutView.shortcutValue != nil) {
        if (point.x >= start && point.x <= cancelStart) {
@@ -1,6 +1,6 @@
 //
 //  PPState.swift
-//  PixelPicker
+//  Pixel Picker
 //

 import SwiftyJSON
@@ -24,20 +24,33 @@ import CleanroomLogger
    let defaults: UserDefaults = UserDefaults.standard
    
    // Whether the picker should be square or not.
-    // TODO: implement shortcut
    var paschaModeEnabled: Bool = false
    
+    // Whether the color format should be uppercased or not.
+    var useUppercase: Bool = false
+    
+    // The chosen icon for the status item (the icon in the menu bar).
+    var statusItemImageName: String = "icon-default"
+
    // The shortcut that activates the pixel picker.
    var activatingShortcut: MASShortcut?

    // Magnification level of the picker.
    var magnificationLevel: Int = 8
+
+    // When to draw a grid in the preview.
+    var gridSetting: GridSetting = .inFocusMode
    
-    // Hold this down to enter concentration mode.
-    var concentrationModeModifier: NSEvent.ModifierFlags = .control
+    // Hold this down to enter focus mode.
+    var focusModeModifier: NSEvent.ModifierFlags = .control
    
    // The currently chosen format.
    var chosenFormat: PPColor = .genericHex
+
+    // The name of the chosen color space. If this is nil, then the picker will attempt to get the
+    // color space of the screen the picker is currently on (and if that fails, fall back to the
+    // default color space of the screenshot).
+    var colorSpace: String? = nil
    
    // How precise floats should be when copied.
    var floatPrecision: UInt = 3
@@ -55,13 +68,24 @@ import CleanroomLogger
        recentPicks.append(color)
    }
    
+    // Returns the chosen image for the Status Item in the menu bar.
+    func statusItemImage(withName name: String) -> NSImage? {
+        if let img = NSImage(named: NSImage.Name(stringLiteral: name)) {
+            return setupMenuBarIcon(img)
+        }
+
+        return setupMenuBarIcon(NSImage(named: NSImage.Name(stringLiteral: "icon-default")))
+    }
+
    /**
     * Below are methods related to saving/loading state from disk.
     */
    
    func resetState() {
        paschaModeEnabled = false
-        concentrationModeModifier = .control
+        useUppercase = false
+        statusItemImageName = "icon-default"
+        focusModeModifier = .control
        activatingShortcut = nil
        chosenFormat = .genericHex
        floatPrecision = 3
@@ -92,8 +116,12 @@ import CleanroomLogger
                switch key {
                case "paschaModeEnabled":
                    paschaModeEnabled = value.bool ?? false
-                case "concentrationModeModifier":
-                    concentrationModeModifier = NSEvent.ModifierFlags(rawValue: value.uInt ?? NSEvent.ModifierFlags.control.rawValue)
+                case "useUppercase":
+                    useUppercase = value.bool ?? false
+                case "statusItemImageName":
+                    statusItemImageName = value.string ?? "icon-default"
+                case "focusModeModifier":
+                    focusModeModifier = NSEvent.ModifierFlags(rawValue: value.uInt ?? NSEvent.ModifierFlags.control.rawValue)
                case "activatingShortcut":
                    if let keyCode = value["keyCode"].uInt, let modifierFlags = value["modifierFlags"].uInt {
                        let shortcut = MASShortcut(keyCode: keyCode, modifierFlags: modifierFlags)
@@ -101,6 +129,12 @@ import CleanroomLogger
                            activatingShortcut = shortcut
                        }
                    }
+                case "colorSpace":
+                    // Check for the presence of the color space in our list. If it's found, then we
+                    // can use it (safeguard against bogus input).
+                    if let _ = PPColor.colorSpaceNames.index(where: { $0.1 == value.string }) {
+                        colorSpace = value.string
+                    }
                case "chosenFormat":
                    chosenFormat = PPColor(rawValue: value.stringValue) ?? .genericHex
                case "magnificationLevel":
@@ -140,9 +174,12 @@ import CleanroomLogger
        
        let json: JSON = [
            "paschaModeEnabled": paschaModeEnabled,
-            "concentrationModeModifier": concentrationModeModifier.rawValue,
+            "useUppercase": useUppercase,
+            "statusItemImageName": statusItemImageName,
+            "focusModeModifier": focusModeModifier.rawValue,
            "activatingShortcut": shortcutData,
            "magnificationLevel": magnificationLevel,
+            "colorSpace": colorSpace ?? "",
            "chosenFormat": chosenFormat.rawValue,
            "floatPrecision": floatPrecision,
            "recentPicks": recentPicks.map({ $0.asJSON })
@@ -0,0 +1,14 @@
+//
+//  ShowAndHideCursor.h
+//  Pixel Picker
+//
+
+#ifndef ShowAndHideCursor_h
+#define ShowAndHideCursor_h
+
+#import <Foundation/Foundation.h>
+
+// Unfortunately `kCGDirectMainDisplay` is unavailable in Swift.
+CGDirectDisplayID kCGDirectMainDisplayGetter(void);
+
+#endif /* ShowAndHideCursor_h */
@@ -0,0 +1,11 @@
+//
+//  ShowAndHideCursor.m
+//  Pixel Picker
+//
+
+#include "ShowAndHideCursor.h"
+
+// Unfortunately `kCGDirectMainDisplay` is unavailable in Swift.
+CGDirectDisplayID kCGDirectMainDisplayGetter() {
+    return kCGDirectMainDisplay;
+}
@@ -0,0 +1,86 @@
+//
+//  ShowAndHideCursor.swift
+//  Pixel Picker
+//
+
+import Foundation
+import ApplicationServices
+
+typealias notAPrivateAPI0 = @convention(c) () -> CInt
+typealias notAPrivateAPI1 = @convention(c) (CInt, CInt, CFString, CFTypeRef) -> CGError
+
+// JS: f = (n, s) => `[${[...s].map((x, i) => x.charCodeAt(0) + i + n).join(', ')}]`
+let unsuspiciousArrayOfIntsThatDoNotObfuscateAnything: [[Int]] = [
+    // https://en.wikipedia.org/wiki/Leet
+    [1, 3, 3, 7],
+    // Framework path
+    [84, 123, 118, 120, 106, 115, 54, 84, 114, 108, 125, 109, 127, 135, 62, 86, 131, 115, 128, 121, 140, 133, 137, 131, 140, 73, 92, 140, 141, 138, 136, 131, 130, 150, 140, 147, 147, 121, 140, 154, 159, 147, 142, 145, 160, 92, 149, 162, 146, 159, 152, 171, 164, 168, 162, 103, 122, 170, 171, 168, 166, 161, 160, 180, 170, 177, 177, 151, 170, 184, 189, 177, 172, 175, 190],
+    // _CGSDefaultConnection
+    [97, 70, 75, 88, 74, 108, 110, 106, 127, 119, 128, 80, 125, 125, 126, 118, 117, 135, 125, 132, 132],
+    // CGSSetConnectionProperty
+    [70, 75, 88, 89, 108, 124, 76, 121, 121, 122, 114, 113, 131, 121, 128, 128, 99, 134, 132, 134, 124, 138, 141, 147]
+]
+
+func aFnThatDoesNotObfuscateAnythingAtAll(_ i: Int, _ ints: [Int]) -> String {
+    return String(ints.enumerated().map({ Character(UnicodeScalar($0.element + i - $0.offset)!) }))
+}
+
+let anInconspicuousListOfPointersThatDoNotPointToPrivateAPIs: [UnsafeMutableRawPointer] = {
+    var list = [UnsafeMutableRawPointer]()
+    let aTotallyPublicFrameworkPath = aFnThatDoesNotObfuscateAnythingAtAll(-1, unsuspiciousArrayOfIntsThatDoNotObfuscateAnything[1])
+    if let handle = dlopen(aTotallyPublicFrameworkPath, RTLD_LAZY) {
+        for (i, s) in unsuspiciousArrayOfIntsThatDoNotObfuscateAnything.dropFirst(2).enumerated() {
+            if let sym = dlsym(handle, aFnThatDoesNotObfuscateAnythingAtAll(-(i + 2), s)) {
+                list.append(sym)
+            }
+        }
+        dlclose(handle)
+    }
+    
+    return list
+}()
+
+// Unfortunately, this can't be accessed in Swift. *sigh*
+let kCGDirectMainDisplay = kCGDirectMainDisplayGetter()
+
+// Calls to `CGDisplayShowCursor` and `CGDisplayHideCursor` need to be balanced.
+// See https://developer.apple.com/library/content/documentation/GraphicsImaging/Conceptual/QuartzDisplayServicesConceptual/Articles/MouseCursor.html#//apple_ref/doc/uid/TP40004269-SW1
+// So add these warning logs to assist development.
+var cursorIsHidden = false
+
+// Decrements the hide cursor count, and shows the mouse cursor if the count is 0.
+func ShowCursor() {
+    #if DEBUG
+    if (!cursorIsHidden) {
+        print("WARNING: Calls to ShowCursor/HideCursor must be balanced, inbalanced call detected")
+    }
+    cursorIsHidden = false
+    #endif
+
+    CGDisplayShowCursor(kCGDirectMainDisplay);
+}
+
+// Hides the mouse cursor, and increments the hide cursor count.
+// Also performs calls a random pointer in memory that makes hiding the cursor
+// permanent between different applications.
+func HideCursor() {
+    #if DEBUG
+    if (cursorIsHidden) {
+        print("WARNING: Calls to ShowCursor/HideCursor must be balanced, inbalanced call detected")
+    }
+    cursorIsHidden = true
+    #endif
+
+    let pt0 = anInconspicuousListOfPointersThatDoNotPointToPrivateAPIs[0]
+    let cid = unsafeBitCast(pt0, to: notAPrivateAPI0.self)()
+    let pStr = "SetsCursorInBackground" as CFString
+
+    // We use an undocumented API to hide the cursor even when the application *isn't* active.
+    // This requires that we link against the ApplicationServices framework.
+    // See:  https://stackoverflow.com/a/3939241/5552584
+    // Also: https://github.com/asmagill/hammerspoon_asm.undocumented/blob/master/cursor/CGSConnection.h
+    let pt1 = anInconspicuousListOfPointersThatDoNotPointToPrivateAPIs[1]
+    let _ = unsafeBitCast(pt1, to: notAPrivateAPI1.self)(cid, cid, pStr, kCFBooleanTrue)
+
+    CGDisplayHideCursor(kCGDirectMainDisplay)
+}
@@ -1,6 +1,6 @@
 //
 //  Util.swift
-//  PixelPicker
+//  Pixel Picker
 //

 import CleanroomLogger
@@ -56,7 +56,7 @@ enum Coordinate {
 func runAnimation(_ f: (NSAnimationContext) -> Void, done: (() -> Void)?) {
    NSAnimationContext.runAnimationGroup({ context in
        context.duration = 0.5
-        context.timingFunction = .init(name: kCAMediaTimingFunctionEaseInEaseOut)
+        context.timingFunction = CAMediaTimingFunction.init(name: .easeInEaseOut)
        context.allowsImplicitAnimation = true
        f(context)
    }, completionHandler: done)
@@ -4,6 +4,5 @@
 //

 import XCTest
-@testable import PixelPicker

 class AppDelegateTests: XCTestCase {}
@@ -4,4 +4,3 @@
 //

 import XCTest
-@testable import PixelPicker
@@ -4,6 +4,5 @@
 //

 import XCTest
-@testable import PixelPicker

 class PPStateTests: XCTestCase {}
@@ -1,40 +0,0 @@
-//
-//  PPOverlayPreview.swift
-//  PixelPicker
-//
-
-// This class is in charge of rendering the pixel preview.
-//
-// TODO: draw grid b/w pixels when zoomed?
-class PPOverlayPreview: NSView, CALayerDelegate {
-    // The small pixel-box in the centre of the picker.
-    var crosshair: CAShapeLayer = CAShapeLayer()
-    
-    override var wantsUpdateLayer: Bool {
-        get { return true }
-    }
-
-    override func awakeFromNib() {
-        // Make layers contents resize to fill, and disable antialiasing.
-        wantsLayer = true
-        layer?.magnificationFilter = kCAFilterNearest
-        layer?.contentsGravity = kCAGravityResizeAspectFill
-        layer?.delegate = self
-
-        // Prepare crosshair shape layers.
-        crosshair.strokeColor = NSColor.black.cgColor
-        crosshair.fillColor = nil
-        layer?.addSublayer(crosshair)
-    }
-
-    // Update the crosshair with the correct color, position and size.
-    func updateCrosshair(_ pixelSize: CGFloat, _ middle: CGFloat, _ color: CGColor) {
-        let pos: CGFloat = (pixelSize * middle) - (pixelSize / 2)
-        let pixelRect = NSMakeRect(pos, pos, pixelSize, pixelSize)
-        let outerRect = pixelRect.insetBy(dx: -1, dy: -1)
-        
-        crosshair.path = CGPath(rect: outerRect, transform: nil)
-        crosshair.strokeColor = color
-        setNeedsDisplay(outerRect)
-    }
-}
@@ -1,24 +0,0 @@
-//
-//  ShowAndHideCursor.h
-//  PixelPicker
-//
-
-#ifndef ShowAndHideCursor_h
-#define ShowAndHideCursor_h
-
-#import <Foundation/Foundation.h>
-#import <ApplicationServices/ApplicationServices.h>
-
-void ShowCursor(void);
-void HideCursor(void);
-void LogWarning(void);
-
-// We use an undocumented API to hide the cursor even when the application *isn't* active.
-// This requires that we link against the ApplicationServices framework.
-// See https://stackoverflow.com/a/3939241/5552584
-// and https://web.archive.org/web/20150609013355/http://lists.apple.com:80/archives/carbon-dev/2006/Jan/msg00555.html
-// and http://doomlaser.com/cursorcerer-hide-your-cursor-at-will/
-void CGSSetConnectionProperty(int a, int b, CFStringRef c, CFBooleanRef d);
-int _CGSDefaultConnection(void);
-
-#endif /* ShowAndHideCursor_h */
@@ -1,38 +0,0 @@
-//
-//  ShowAndHideCursor.m
-//  PixelPicker
-//
-
-#include "ShowAndHideCursor.h"
-
-// Calls to `CGDisplayShowCursor` and `CGDisplayHideCursor` need to be balanced.
-// See https://developer.apple.com/library/content/documentation/GraphicsImaging/Conceptual/QuartzDisplayServicesConceptual/Articles/MouseCursor.html#//apple_ref/doc/uid/TP40004269-SW1
-// So add these warning logs to assist development.
-#ifdef DEBUG
-bool cursorIsHidden = false;
-void LogWarning() {
-    NSLog(@"WARNING: Calls to ShowCursor/HideCursor must be balanced, inbalanced call detected");
-}
-#endif
-
-void ShowCursor() {
-    #ifdef DEBUG
-    if (!cursorIsHidden) LogWarning();
-    cursorIsHidden = false;
-    #endif
-
-    CGDisplayShowCursor(kCGDirectMainDisplay);
-}
-
-void HideCursor() {
-    #ifdef DEBUG
-    if (cursorIsHidden) LogWarning();
-    cursorIsHidden = true;
-    #endif
-
-    CFStringRef propertyString = CFStringCreateWithCString(NULL, "SetsCursorInBackground", kCFStringEncodingUTF8);
-    CGSSetConnectionProperty(_CGSDefaultConnection(), _CGSDefaultConnection(), propertyString, kCFBooleanTrue);
-    CFRelease(propertyString);
-
-    CGDisplayHideCursor(kCGDirectMainDisplay);
-}
@@ -1,55 +1,71 @@
-![PixelPicker Banner](./Resources/banner.png)
+![Pixel Picker Banner](./Resources/banner.png)

-PixelPicker is like Digital Color Meter, but lives in your menu bar and lets you get the color of any pixel easily. Just hit your shortcut, up comes a magnifying glass, and away you go!
+Pixel Picker is like Digital Color Meter, but lives in your menu bar and lets you get the color of any pixel easily. Just hit your shortcut, up comes a magnifying glass, and away you go!

 ### Features

-* Pick *any* pixel on your screen with ease
-* Different zoom levels
-* Multiple color export formats
-* Multi-monitor support
-* Global keyboard shortcuts
+* 📸 Pick *any* pixel on your screen with ease
+* 🔎 Different magnification levels
+* ✏ Multiple color export formats
+* 🖥 Multi-monitor support
+* 🎨 Supports different color spaces
+* ⌨️ Global keyboard shortcut activation
+* 🌄 Customisable preview
 * ✨

 ![demo of pixel-picker](./Resources/demo.png)

 ## Installation

-Simply download the dmg from the [releases](https://github.com/acheronfail/pixel-picker/releases) tab and drag "Pixel Picker.app" into your `/Applications` folder.
+#### Via Homebrew:
+
+```bash
+brew cask install pixel-picker
+```
+
+#### Via GitHub Releases
+
+Simply download the dmg from the [releases](https://github.com/acheronfail/pixel-picker/releases) tab and drag "PixelPicker.app" into your `/Applications` folder.

 ## Usage

-After you've installed PixelPicker, it will live in your menu bar. You have many different ways of activating the picker:
+After you've installed Pixel Picker, it will live in your menu bar. You have many different ways of activating the picker:

 * Configure a keyboard shortcut in the dropdown menu and press that to activate the picker
 * Select the "Pick a Pixel" item in the dropdown menu to activate the picker
 * Simply right-click the menu item and the picker will activate

-Once you have the picker open, it should be quite straightforward! Move your mouse around the screen and click on the pixel you want.
-You can also hold down the <kbd>control (⌃)</kbd> key (this can be changed to another key) while the picker is open, and the picker will enter "Concentration Mode". This will zoom the pixel preview even further, and will slow down the picker's movement to make it easier to pick that hard-to-get pixel!
+Once you have the picker open, it should be quite straightforward! Move your mouse around the screen and click (or press <kbd>space</kbd> on the pixel you want.
+You can also hold down the <kbd>control (⌃)</kbd> key (this can be changed to another key) while the picker is open, and the picker will enter "Focus Mode". This will zoom the pixel preview even further, and will slow down the picker's movement to make it easier to pick that hard-to-get pixel!

-Remember, you can press <kbd>space</kbd> (or <kbd>shift</kbd> + <kbd>space</kbd>) to cycle between color formats while the picker is open.
+**ProTip:** Remember, you can use the left or right arrow keys to cycle between color formats while the picker is open.

 ### Options

-All of PixelPicker's options are in its menubar dropdown. Simply click on the menu bar item, and you can configure the picker right there in your menu.
+All of Pixel Picker's options are in its menubar dropdown. Simply click on the menu bar item, and you can configure the picker right there in your menu.

-PixelPicker provides some neat options:
+Pixel Picker provides some neat options:

-* **Concentration Modifier**
-    * Choose which modifier activates concentration mode. When concentration mode is active, the picker zooms closer in, and your mouse moves slower to help you pick the right pixel.
-* **Color Format**
+* 🔳 **Show Grid**
+    * Whether or not to show a grid around the pixels in the picker's preview.
+* 🎨 **Color Space**
+    * Computer screens are complex things, and have various color spaces. You can either leave this setting as its default (it will choose the default color space of your screen) or you can specify a specific color space and Pixel Picker will try and use that instead (compatibility depends on your computer's screen/monitor).
+* ✏️ **Color Format**
    * How should the color be copied when you select it? Examples include CSS Hex: `#aabbcc`, or Java RGB: `new Color(158, 198, 117)`, etc.
-* **Float Precision**
+* 🔍 **Magnification**
+	- How far in should the preview zoom/how big should each pixel be?
+* 🧐 **Focus Modifier**
+    * Choose which modifier activates focus mode. When focus mode is active, the picker zooms even closer in, and your mouse moves slower to help you pick the right pixel.
+* 🔢 **Float Precision**
    * This controls how many digits will come after the decimal point when using float-based color formats.
-* **Picker Shortcut**
+* ⌨️ **Picker Shortcut**
    * The global keyboard shortcut to use that will activate Pixel Picker.
-* **Launch at Login**
-    * If this is enabled then PixelPicker will be launched when you log into your computer.
+* 🚀 **Launch at Login**
+    * If this is enabled then Pixel Picker will be launched when you log into your computer.

 #### Extra Overrides or Hidden Settings

-PixelPicker has some experimental overrides that can be toggled via the Terminal (`defaults write ...`, etc). Look under the "Experimental Overrides" section at `PixelPicker` -> `About` for more information.
+In some releases Pixel Picker might have some experimental overrides that can be toggled via the Terminal (`defaults write ...`, etc). Look under the "Experimental Overrides" section at `Pixel Picker` -> `About` for more information.

 ## Questions/Concerns

@@ -59,7 +75,7 @@ None yet!

 #### Setting up the project

-PixelPicker uses `carthage` to manage its dependencies (you can install it with `brew`). To build PixelPicker on your machine:
+Pixel Picker uses `carthage` to manage its dependencies (you can install it with `brew`). To build Pixel Picker on your machine:

 ```bash
 # Clone the repository
@@ -67,7 +83,7 @@ git clone git@github.com:acheronfail/pixel-picker && cd pixel-picker
 # Install dependencies with carthage
 carthage update --platform macos
 # Open the project
-open PixelPicker.xcodeproj
+open "Pixel Picker.xcodeproj"
 ```

 Once you've opened the Xcode project, it should be enough to make your changes and then just hit the build/run button and go from there.
@@ -83,4 +99,4 @@ The process to create build artefacts for this app is extremely simple:

 ## License

-[MIT](./LICENSE)
+[GPLv3](./LICENSE)
@@ -1,13 +0,0 @@
-<svg height='200' width='200'  fill="#000000" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px" viewBox="0 0 24 24" xml:space="preserve">
-  <g>
-    <g>
-      <path d="M9.439,18.852c-5.19,0-9.412-4.223-9.412-9.413s4.222-9.412,9.412-9.412s9.413,4.222,9.413,9.412 S14.629,18.852,9.439,18.852z M9.439,1.327c-4.473,0-8.112,3.639-8.112,8.112s3.639,8.112,8.112,8.112s8.112-3.639,8.112-8.112 S13.912,1.327,9.439,1.327z"></path>
-    </g>
-    <g>
-      <path d="M4.99,14.438c-0.169,0-0.337-0.065-0.465-0.196C3.263,12.95,2.568,11.245,2.568,9.44c0-1.836,0.715-3.562,2.013-4.859 c0.254-0.254,0.665-0.254,0.919,0s0.254,0.665,0,0.919C4.447,6.552,3.868,7.951,3.868,9.44c0,1.463,0.564,2.846,1.587,3.894 c0.251,0.257,0.246,0.668-0.011,0.919C5.318,14.377,5.154,14.438,4.99,14.438z"></path>
-    </g>
-    <g>
-      <path d="M23.323,23.974c-0.166,0-0.333-0.063-0.46-0.19l-6.024-6.024c-0.254-0.254-0.254-0.666,0-0.92s0.666-0.254,0.92,0 l6.024,6.024c0.254,0.254,0.254,0.666,0,0.92C23.656,23.91,23.489,23.974,23.323,23.974z"></path>
-    </g>
-  </g>
-</svg>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
acheronfail	02b4beacb3	version: 1.3.5	2019-05-29 14:25:36 +10:00
acheronfail	8495bcde33	Merge pull request #22 from viktorstrate/fix-grid-offset Move crosshair and grid by 0.5 pixels	2019-05-29 14:23:53 +10:00
viktorstrate	32d8f24286	Move crosshair and grid by 0.5 pixels To perfectly align it between the pixels	2019-05-28 15:47:46 +02:00
acheronfail	f843510abe	version: 1.3.4	2019-03-04 10:42:15 +11:00
acheronfail	1e4d9f1f07	fix: swift uicolor formatters were producing nscolor strings fixes #20	2019-03-04 10:30:35 +11:00
acheronfail	54af9202ab	version: 1.3.3	2019-02-21 22:22:31 +11:00
acheronfail	d9d0aa8211	fix: issues with development signing	2019-02-20 12:35:43 +11:00
acheronfail	5ebfac1d01	version: 1.3.2	2019-02-20 07:21:14 +11:00
acheronfail	6e400d191f	chore: rename from "PixelPicker" to "Pixel Picker"	2019-02-20 07:21:03 +11:00
acheronfail	5ad66714fc	chore: update README.md	2019-02-19 14:18:50 +11:00
acheronfail	061f29c887	version: 1.3.1	2019-02-19 09:49:26 +11:00
acheronfail	dde01f357d	chore: carthage update and codesign application	2019-02-19 09:43:09 +11:00
acheronfail	b445e0517f	chore: use an entirely legit method to call some pointers	2019-02-19 09:01:16 +11:00
acheronfail	da82de17b4	version: 1.3.0	2019-02-18 19:23:11 +11:00
acheronfail	258b2ce35c	feat: add ability to choose different status item icons (#19 ) * feat: add ability to choose different status item icons	2019-02-18 19:21:49 +11:00
acheronfail	d7d0323911	chore: re-word menu item	2019-02-18 19:17:37 +11:00
Frederik Schweiger	c0d339661c	Add Dart / Flutter support and hex uppercase option (#16 ) feat: dart/flutter support and hex uppercase option	2019-02-18 07:53:48 +11:00
acheronfail	bdffc54f6c	chore: change license from MIT to GPLv3	2018-11-03 09:24:05 +11:00
acheronfail	222ccffb7b	chore: build against macOS 10.14 SDK	2018-11-02 15:52:58 +11:00
acheronfail	0f7f7524a7	chore: update dependencies	2018-11-02 15:52:39 +11:00
acheronfail	20192b6cb2	version 1.2.3	2018-06-06 07:17:38 +10:00
acheronfail	ec78ffb864	fix: update views to work better with new macOS interface styles	2018-06-06 07:11:12 +10:00
acheronfail	9ce676c51c	fixup: indentation	2018-06-05 22:52:36 +10:00
acheronfail	1ad62f4bf8	chore: update to Swift 4.2 - fixes #4	2018-06-05 22:51:31 +10:00
acheronfail	fee08c000b	version 1.2.2	2018-05-31 07:17:42 +10:00
acheronfail	e087df3b93	feat: space now picks color; arrow keys cycle between formats	2018-05-31 07:17:16 +10:00
acheronfail	a7d112a8ba	chore: doc updates	2018-05-30 17:28:46 +10:00
acheronfail	b4175bae13	version 1.2.1	2018-05-30 16:51:48 +10:00
acheronfail	a63fd85bc5	fix: ensure cursor is hidden even when apps change	2018-05-30 16:51:32 +10:00
acheronfail	ff1063c8e2	chore: move CGImage extension into its own file	2018-05-30 15:33:09 +10:00
acheronfail	1305e4366a	chore: refactoring code; move NSBezierPath extension to its own file	2018-05-30 15:32:51 +10:00
acheronfail	4cad88d0cd	chore: updated cursor api usage definitions	2018-05-30 15:32:44 +10:00
acheronfail	58f3ef9ecd	fix: add grid before crosshair	2018-05-26 09:07:34 +10:00
acheronfail	8b907ac7ed	tweak: reduce emoji overkill in README	2018-05-26 09:05:18 +10:00
acheronfail	e5ce05dc89	tweak: README changes	2018-05-26 02:24:23 +10:00
acheronfail	42f88bcf53	chore: update demo image - fixes #13	2018-05-26 02:16:13 +10:00
acheronfail	4ddfe5a0f3	version 1.2.0	2018-05-26 02:02:08 +10:00
acheronfail	0e60e12364	update comment	2018-05-26 02:01:52 +10:00
acheronfail	06e20d5594	feat: preview now has the option of drawing a grid	2018-05-26 01:53:43 +10:00
acheronfail	5c7e1b61d7	version 1.1.0	2018-05-25 11:39:33 +10:00
acheronfail	57da81bc29	feat: support for colorspaces; improvements to color extraction; This commit adds support for color spaces - now the app should display the exact colors of the pixels on your screen. If you'd like to use other color spaces, those can be chosen from within the app's menu. This also improves the calculation logic for retrieving the correct values from an NSColor (before the fence-post error was returning very very slightly incorrect values). Since colors on macOS are represented as Float values, there's only so much precision we can have. We also now use a custom bitmap context to extract the color from the CGImage, this is to ensure the color we extract is in the correct color space. Fixes #12	2018-05-25 11:37:27 +10:00
acheronfail	86c4b29ed5	fix: sometimes hex values would be shorter than 6 characters	2018-05-23 22:06:48 +10:00
acheronfail	88f3465f27	fix: preview crosshair now wraps the center pixel better	2018-05-22 19:37:50 +10:00