diff --git a/Extension/Info.plist b/Extension/Info.plist
index 85e60c9..b7e3d6e 100644
--- a/Extension/Info.plist
+++ b/Extension/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.6.2</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>20</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSExtension</key>
diff --git a/Swimat.xcodeproj/project.pbxproj b/Swimat.xcodeproj/project.pbxproj
index b2dd1af..a15d3f8 100644
--- a/Swimat.xcodeproj/project.pbxproj
+++ b/Swimat.xcodeproj/project.pbxproj
@@ -399,7 +399,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0820;
-				LastUpgradeCheck = 1130;
+				LastUpgradeCheck = 1220;
 				ORGANIZATIONNAME = jintin;
 				TargetAttributes = {
 					2F5745D81D8A83C500094D06 = {
@@ -618,6 +618,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -678,6 +679,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -713,10 +715,12 @@
 				CODE_SIGN_ENTITLEMENTS = "Swimat/Supporting Files/Swimat.entitlements";
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
+				CURRENT_PROJECT_VERSION = 21;
 				DEVELOPMENT_TEAM = 2HR4N2E675;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = Swimat/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				MARKETING_VERSION = 1.7.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jintin.Swimat;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -731,10 +735,12 @@
 				CODE_SIGN_ENTITLEMENTS = "Swimat/Supporting Files/Swimat.entitlements";
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
+				CURRENT_PROJECT_VERSION = 21;
 				DEVELOPMENT_TEAM = 2HR4N2E675;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = Swimat/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				MARKETING_VERSION = 1.7.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jintin.Swimat;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -781,11 +787,13 @@
 				CODE_SIGN_ENTITLEMENTS = "Extension/Supporting Files/Extension.entitlements";
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
+				CURRENT_PROJECT_VERSION = 21;
 				DEVELOPMENT_TEAM = 2HR4N2E675;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = Extension/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MARKETING_VERSION = 1.7.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jintin.Swimat.Extension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -799,11 +807,13 @@
 				CODE_SIGN_ENTITLEMENTS = "Extension/Supporting Files/Extension.entitlements";
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
+				CURRENT_PROJECT_VERSION = 21;
 				DEVELOPMENT_TEAM = 2HR4N2E675;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = Extension/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MARKETING_VERSION = 1.7.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jintin.Swimat.Extension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
diff --git a/Swimat.xcodeproj/xcshareddata/xcschemes/CLI.xcscheme b/Swimat.xcodeproj/xcshareddata/xcschemes/CLI.xcscheme
index 789ce1f..4624410 100644
--- a/Swimat.xcodeproj/xcshareddata/xcschemes/CLI.xcscheme
+++ b/Swimat.xcodeproj/xcshareddata/xcschemes/CLI.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1220"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Swimat.xcodeproj/xcshareddata/xcschemes/Extension.xcscheme b/Swimat.xcodeproj/xcshareddata/xcschemes/Extension.xcscheme
index 1bdd00b..853d540 100644
--- a/Swimat.xcodeproj/xcshareddata/xcschemes/Extension.xcscheme
+++ b/Swimat.xcodeproj/xcshareddata/xcschemes/Extension.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1220"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction
diff --git a/Swimat.xcodeproj/xcshareddata/xcschemes/Swimat.xcscheme b/Swimat.xcodeproj/xcshareddata/xcschemes/Swimat.xcscheme
index c25fa04..a9e5eef 100755
--- a/Swimat.xcodeproj/xcshareddata/xcschemes/Swimat.xcscheme
+++ b/Swimat.xcodeproj/xcshareddata/xcschemes/Swimat.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1220"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Swimat.xcodeproj/xcshareddata/xcschemes/SwimatTests.xcscheme b/Swimat.xcodeproj/xcshareddata/xcschemes/SwimatTests.xcscheme
index 617f33c..7288a0c 100644
--- a/Swimat.xcodeproj/xcshareddata/xcschemes/SwimatTests.xcscheme
+++ b/Swimat.xcodeproj/xcshareddata/xcschemes/SwimatTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1220"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -11,15 +11,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "2F5745D81D8A83C500094D06"
-            BuildableName = "Swimat.app"
-            BlueprintName = "Swimat"
-            ReferencedContainer = "container:Swimat.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -60,15 +51,6 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "2F5745D81D8A83C500094D06"
-            BuildableName = "Swimat.app"
-            BlueprintName = "Swimat"
-            ReferencedContainer = "container:Swimat.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">
diff --git a/Swimat/Info.plist b/Swimat/Info.plist
index e5bf3c2..c44f341 100644
--- a/Swimat/Info.plist
+++ b/Swimat/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.6.2</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>20</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.developer-tools</string>
 	<key>LSMinimumSystemVersion</key>