diff --git a/Artify/Artify.xcodeproj/project.pbxproj b/Artify/Artify.xcodeproj/project.pbxproj
index 3506942..dd13500 100644
--- a/Artify/Artify.xcodeproj/project.pbxproj
+++ b/Artify/Artify.xcodeproj/project.pbxproj
@@ -538,7 +538,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
@@ -592,7 +592,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -608,7 +608,7 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				DEVELOPMENT_TEAM = D54Y88Y9CY;
+				DEVELOPMENT_TEAM = 3X57WP8E8V;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/Action\"",
@@ -630,7 +630,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" -DDEBUG";
 				PRODUCT_BUNDLE_IDENTIFIER = com.art.Artify;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -647,7 +647,7 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				DEVELOPMENT_TEAM = D54Y88Y9CY;
+				DEVELOPMENT_TEAM = 3X57WP8E8V;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/Action\"",
@@ -669,7 +669,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" -DPRODUCTION";
 				PRODUCT_BUNDLE_IDENTIFIER = com.art.Artify;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -685,6 +685,7 @@
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEVELOPMENT_TEAM = 3X57WP8E8V;
 				INFOPLIST_FILE = ArtifyTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -705,6 +706,7 @@
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEVELOPMENT_TEAM = 3X57WP8E8V;
 				INFOPLIST_FILE = ArtifyTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
diff --git a/Artify/Artify/Resources/Assets/Assets.xcassets/github.imageset/Contents.json b/Artify/Artify/Resources/Assets/Assets.xcassets/github.imageset/Contents.json
index 6c9c9b0..7844a51 100644
--- a/Artify/Artify/Resources/Assets/Assets.xcassets/github.imageset/Contents.json
+++ b/Artify/Artify/Resources/Assets/Assets.xcassets/github.imageset/Contents.json
@@ -14,5 +14,8 @@
   "info" : {
     "version" : 1,
     "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
   }
 }
\ No newline at end of file
diff --git a/Artify/Artify/Resources/Assets/Assets.xcassets/github_logo.imageset/Contents.json b/Artify/Artify/Resources/Assets/Assets.xcassets/github_logo.imageset/Contents.json
index 7c67995..3632533 100644
--- a/Artify/Artify/Resources/Assets/Assets.xcassets/github_logo.imageset/Contents.json
+++ b/Artify/Artify/Resources/Assets/Assets.xcassets/github_logo.imageset/Contents.json
@@ -14,5 +14,8 @@
   "info" : {
     "version" : 1,
     "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
   }
 }
\ No newline at end of file
diff --git a/Artify/Artify/Resources/Assets/Assets.xcassets/link.imageset/Contents.json b/Artify/Artify/Resources/Assets/Assets.xcassets/link.imageset/Contents.json
index 0c67898..600b2d6 100644
--- a/Artify/Artify/Resources/Assets/Assets.xcassets/link.imageset/Contents.json
+++ b/Artify/Artify/Resources/Assets/Assets.xcassets/link.imageset/Contents.json
@@ -14,5 +14,8 @@
   "info" : {
     "version" : 1,
     "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
   }
 }
\ No newline at end of file
diff --git a/Artify/Artify/Resources/Xibs/Base.lproj/Main.storyboard b/Artify/Artify/Resources/Xibs/Base.lproj/Main.storyboard
index 138af0a..7f856cf 100644
--- a/Artify/Artify/Resources/Xibs/Base.lproj/Main.storyboard
+++ b/Artify/Artify/Resources/Xibs/Base.lproj/Main.storyboard
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14113"/>
-        <capability name="box content view" minToolsVersion="7.0"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.18"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-        <capability name="system font weights other than Regular or Bold" minToolsVersion="7.0"/>
     </dependencies>
     <scenes>
         <!--Application-->
@@ -688,7 +686,7 @@
             <objects>
                 <customObject id="n55-FE-Pbo" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
                 <windowController storyboardIdentifier="AboutWindowController" id="BoU-bI-MRc" sceneMemberID="viewController">
-                    <window key="window" title="About Artify" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" showsToolbarButton="NO" frameAutosaveName="" animationBehavior="default" titlebarAppearsTransparent="YES" id="0j7-1n-gVt">
+                    <window key="window" title="About Artify" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" frameAutosaveName="" animationBehavior="default" titlebarAppearsTransparent="YES" id="0j7-1n-gVt">
                         <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
                         <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
                         <rect key="contentRect" x="478" y="552" width="510" height="278"/>
@@ -713,14 +711,6 @@
                         <rect key="frame" x="0.0" y="0.0" width="518" height="280"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
-                            <box horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" boxType="custom" borderType="none" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="Evb-YZ-M3L">
-                                <rect key="frame" x="0.0" y="0.0" width="518" height="280"/>
-                                <view key="contentView" id="RCt-PB-bCQ">
-                                    <rect key="frame" x="0.0" y="0.0" width="518" height="280"/>
-                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                </view>
-                                <color key="fillColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                            </box>
                             <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="FjZ-51-4oe">
                                 <rect key="frame" x="36" y="76" width="128" height="128"/>
                                 <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="about" id="LyL-Ff-PBV"/>
@@ -729,7 +719,7 @@
                                 <rect key="frame" x="198" y="205" width="148" height="57"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="ARTIFY" id="cn1-G1-Q2m">
                                     <font key="font" metaFont="systemThin" size="48"/>
-                                    <color key="textColor" red="0.14901960780000001" green="0.14901960780000001" blue="0.14901960780000001" alpha="1" colorSpace="calibratedRGB"/>
+                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
@@ -737,7 +727,7 @@
                                 <rect key="frame" x="198" y="188" width="108" height="17"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="Version 0.4 (500)" id="Cv4-Sk-4HJ">
                                     <font key="font" metaFont="systemLight" size="13"/>
-                                    <color key="textColor" white="0.25" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                                    <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
@@ -745,7 +735,7 @@
                                 <rect key="frame" x="198" y="155" width="98" height="19"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="Developed by" id="JAC-J6-aoH">
                                     <font key="font" metaFont="system" size="15"/>
-                                    <color key="textColor" white="0.14999999999999999" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
@@ -753,7 +743,7 @@
                                 <rect key="frame" x="198" y="122" width="137" height="19"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="Wanna contribute ?" id="HFb-ta-86o">
                                     <font key="font" metaFont="system" size="15"/>
-                                    <color key="textColor" white="0.14999999999999999" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
@@ -762,12 +752,12 @@
                                 <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="github" id="H5b-Ew-J2z"/>
                             </imageView>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Svq-l2-not">
-                                <rect key="frame" x="382" y="67" width="114" height="43"/>
+                                <rect key="frame" x="367" y="72" width="112" height="35"/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="110" id="73a-Xd-WHm"/>
-                                    <constraint firstAttribute="height" constant="38" id="LmU-a9-kZp"/>
+                                    <constraint firstAttribute="height" constant="32" id="LmU-a9-kZp"/>
                                 </constraints>
-                                <buttonCell key="cell" type="bevel" title="Artify Core" bezelStyle="regularSquare" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="k5Z-Kc-Td6">
+                                <buttonCell key="cell" type="squareTextured" title="Artify Core" bezelStyle="texturedSquare" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="k5Z-Kc-Td6">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
@@ -776,12 +766,12 @@
                                 </connections>
                             </button>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="bRp-wG-Ypx">
-                                <rect key="frame" x="260" y="67" width="114" height="43"/>
+                                <rect key="frame" x="261" y="72" width="96" height="35"/>
                                 <constraints>
-                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="110" id="Pd4-cJ-xst"/>
-                                    <constraint firstAttribute="height" constant="38" id="m8H-H8-2mS"/>
+                                    <constraint firstAttribute="width" constant="94" id="5Yy-jl-Kz7"/>
+                                    <constraint firstAttribute="height" constant="32" id="VJk-BK-wiU"/>
                                 </constraints>
-                                <buttonCell key="cell" type="bevel" title="Artify macOS" bezelStyle="regularSquare" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="LpC-oz-2bx">
+                                <buttonCell key="cell" type="squareTextured" title="Artify macOS" bezelStyle="texturedSquare" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="LpC-oz-2bx">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
@@ -798,12 +788,12 @@
                                 <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="link" id="eRh-Fz-uhp"/>
                             </imageView>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3U1-Ss-zVL">
-                                <rect key="frame" x="260" y="18" width="114" height="43"/>
+                                <rect key="frame" x="261" y="22" width="96" height="35"/>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="38" id="GJp-J0-7GK"/>
-                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="110" id="nal-X2-ZGg"/>
+                                    <constraint firstAttribute="height" constant="32" id="GJp-J0-7GK"/>
+                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="94" id="nal-X2-ZGg"/>
                                 </constraints>
-                                <buttonCell key="cell" type="bevel" title="nghiatran.me" bezelStyle="regularSquare" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="G0L-aA-c0z">
+                                <buttonCell key="cell" type="squareTextured" title="nghiatran.me" bezelStyle="texturedSquare" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="G0L-aA-c0z">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
@@ -815,7 +805,7 @@
                                 <rect key="frame" x="296" y="155" width="96" height="19"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="NGHIA TRAN" id="Vzt-rF-NdM">
                                     <font key="font" metaFont="systemMedium" size="15"/>
-                                    <color key="textColor" white="0.14628906250000001" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
@@ -825,7 +815,7 @@
                                     <constraint firstAttribute="height" constant="24" id="MdE-Jo-68F"/>
                                     <constraint firstAttribute="width" constant="24" id="bs1-cz-ri3"/>
                                 </constraints>
-                                <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="github_logo" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="tGa-BE-9iX">
+                                <buttonCell key="cell" type="bevel" bezelStyle="regularSquare" image="github_logo" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="tGa-BE-9iX">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
@@ -837,16 +827,13 @@
                         <constraints>
                             <constraint firstItem="Tjo-6I-Wra" firstAttribute="leading" secondItem="Z6h-12-uxG" secondAttribute="trailing" constant="8" id="1et-Nm-U9m"/>
                             <constraint firstItem="klj-F7-bpM" firstAttribute="leading" secondItem="FjZ-51-4oe" secondAttribute="trailing" constant="36" id="1ua-mH-dq3"/>
-                            <constraint firstAttribute="trailing" secondItem="Evb-YZ-M3L" secondAttribute="trailing" id="2La-A5-kc5"/>
                             <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="JU0-xk-5XQ" secondAttribute="trailing" constant="24" id="3hJ-OC-itP"/>
                             <constraint firstItem="kni-Z9-ma5" firstAttribute="leading" secondItem="klj-F7-bpM" secondAttribute="leading" id="5cI-p8-gZi"/>
                             <constraint firstItem="bRp-wG-Ypx" firstAttribute="leading" secondItem="UIX-Cq-C9l" secondAttribute="trailing" constant="12" id="BeZ-VQ-a9Y"/>
                             <constraint firstItem="JU0-xk-5XQ" firstAttribute="leading" secondItem="JMK-uR-fYw" secondAttribute="leading" id="Fv9-uR-X7E"/>
                             <constraint firstItem="tWs-Gm-mJ4" firstAttribute="top" secondItem="UIX-Cq-C9l" secondAttribute="bottom" constant="28" id="G5q-wZ-uvQ"/>
                             <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Svq-l2-not" secondAttribute="trailing" constant="24" id="G6X-mj-xRB"/>
-                            <constraint firstItem="Evb-YZ-M3L" firstAttribute="top" secondItem="aZ6-qO-1F8" secondAttribute="top" id="GRX-NP-coU"/>
                             <constraint firstItem="JU0-xk-5XQ" firstAttribute="top" secondItem="JMK-uR-fYw" secondAttribute="bottom" constant="14" id="HY6-jh-bzW"/>
-                            <constraint firstAttribute="bottom" secondItem="Evb-YZ-M3L" secondAttribute="bottom" id="ORb-pn-utw"/>
                             <constraint firstItem="tWs-Gm-mJ4" firstAttribute="centerX" secondItem="UIX-Cq-C9l" secondAttribute="centerX" id="Oua-1y-Ckl"/>
                             <constraint firstItem="Svq-l2-not" firstAttribute="centerY" secondItem="bRp-wG-Ypx" secondAttribute="centerY" id="RHS-99-hhG"/>
                             <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="3U1-Ss-zVL" secondAttribute="trailing" constant="24" id="UKE-Sh-1FX"/>
@@ -859,7 +846,6 @@
                             <constraint firstItem="klj-F7-bpM" firstAttribute="top" secondItem="aZ6-qO-1F8" secondAttribute="top" constant="18" id="bcf-Wd-69r"/>
                             <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Z6h-12-uxG" secondAttribute="trailing" constant="24" id="d0i-SS-JM3"/>
                             <constraint firstItem="UIX-Cq-C9l" firstAttribute="top" secondItem="JU0-xk-5XQ" secondAttribute="bottom" constant="22" id="eN5-LM-325"/>
-                            <constraint firstItem="Evb-YZ-M3L" firstAttribute="leading" secondItem="aZ6-qO-1F8" secondAttribute="leading" id="evb-CF-f6Y"/>
                             <constraint firstItem="UIX-Cq-C9l" firstAttribute="leading" secondItem="JU0-xk-5XQ" secondAttribute="leading" id="fNC-xT-gkC"/>
                             <constraint firstItem="3U1-Ss-zVL" firstAttribute="centerY" secondItem="tWs-Gm-mJ4" secondAttribute="centerY" id="pYF-NG-ZEa"/>
                             <constraint firstItem="kni-Z9-ma5" firstAttribute="top" secondItem="klj-F7-bpM" secondAttribute="bottom" id="s68-aR-Sxe"/>
diff --git a/Artify/Artify/Source/Scenes/About/AboutWindowController.swift b/Artify/Artify/Source/Scenes/About/AboutWindowController.swift
index 2df3bf6..e1530b0 100644
--- a/Artify/Artify/Source/Scenes/About/AboutWindowController.swift
+++ b/Artify/Artify/Source/Scenes/About/AboutWindowController.swift
@@ -9,7 +9,7 @@
 import Cocoa
 import artify_core
 
-class AboutWindowController: NSViewController {
+final class AboutWindowController: NSViewController {
 
     @IBOutlet weak var verionLbl: NSTextField!
 
diff --git a/artify-core/artify-core.xcodeproj/project.pbxproj b/artify-core/artify-core.xcodeproj/project.pbxproj
index d4ba173..012947d 100644
--- a/artify-core/artify-core.xcodeproj/project.pbxproj
+++ b/artify-core/artify-core.xcodeproj/project.pbxproj
@@ -717,7 +717,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = D54Y88Y9CY;
+				DEVELOPMENT_TEAM = 3X57WP8E8V;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -733,7 +733,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.art.artify-core";
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -754,7 +754,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = D54Y88Y9CY;
+				DEVELOPMENT_TEAM = 3X57WP8E8V;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -770,7 +770,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.art.artify-core";
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -786,6 +786,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEVELOPMENT_TEAM = 3X57WP8E8V;
 				INFOPLIST_FILE = "artify-coreTests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -804,6 +805,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEVELOPMENT_TEAM = 3X57WP8E8V;
 				INFOPLIST_FILE = "artify-coreTests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",