diff --git a/Template/KITPROJECT.xcodeproj/project.pbxproj b/Template/KITPROJECT.xcodeproj/project.pbxproj
index 6b68feb..f6ff7a5 100644
--- a/Template/KITPROJECT.xcodeproj/project.pbxproj
+++ b/Template/KITPROJECT.xcodeproj/project.pbxproj
@@ -441,7 +441,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1020;
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1200;
 				ORGANIZATIONNAME = "KITORGANIZATION";
 				TargetAttributes = {
 					3D9C428F22745894000A6585 = {
@@ -761,6 +761,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;
@@ -827,6 +828,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;
diff --git a/Template/KITPROJECT.xcodeproj/xcshareddata/xcschemes/KITPROJECT-iOS.xcscheme b/Template/KITPROJECT.xcodeproj/xcshareddata/xcschemes/KITPROJECT-iOS.xcscheme
index 63065a3..b3faae9 100644
--- a/Template/KITPROJECT.xcodeproj/xcshareddata/xcschemes/KITPROJECT-iOS.xcscheme
+++ b/Template/KITPROJECT.xcodeproj/xcshareddata/xcschemes/KITPROJECT-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,8 +26,17 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      codeCoverageEnabled = "YES"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "3D9C428F22745894000A6585"
+            BuildableName = "KITPROJECT.framework"
+            BlueprintName = "KITPROJECT-iOS"
+            ReferencedContainer = "container:KITPROJECT.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO"
@@ -42,17 +51,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "3D9C428F22745894000A6585"
-            BuildableName = "KITPROJECT.framework"
-            BlueprintName = "KITPROJECT-iOS"
-            ReferencedContainer = "container:KITPROJECT.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -73,8 +71,6 @@
             ReferencedContainer = "container:KITPROJECT.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Template/KITPROJECT.xcodeproj/xcshareddata/xcschemes/KITPROJECT-macOS.xcscheme b/Template/KITPROJECT.xcodeproj/xcshareddata/xcschemes/KITPROJECT-macOS.xcscheme
index 3412a52..fa8aff8 100644
--- a/Template/KITPROJECT.xcodeproj/xcshareddata/xcschemes/KITPROJECT-macOS.xcscheme
+++ b/Template/KITPROJECT.xcodeproj/xcshareddata/xcschemes/KITPROJECT-macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,8 +26,17 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      codeCoverageEnabled = "YES"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "3D9C42C422745A07000A6585"
+            BuildableName = "KITPROJECT.framework"
+            BlueprintName = "KITPROJECT-macOS"
+            ReferencedContainer = "container:KITPROJECT.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO"
@@ -42,17 +51,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "3D9C42C422745A07000A6585"
-            BuildableName = "KITPROJECT.framework"
-            BlueprintName = "KITPROJECT-macOS"
-            ReferencedContainer = "container:KITPROJECT.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -73,8 +71,6 @@
             ReferencedContainer = "container:KITPROJECT.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Template/KITPROJECT.xcodeproj/xcshareddata/xcschemes/KITPROJECT-tvOS.xcscheme b/Template/KITPROJECT.xcodeproj/xcshareddata/xcschemes/KITPROJECT-tvOS.xcscheme
index e6a9eba..995e419 100644
--- a/Template/KITPROJECT.xcodeproj/xcshareddata/xcschemes/KITPROJECT-tvOS.xcscheme
+++ b/Template/KITPROJECT.xcodeproj/xcshareddata/xcschemes/KITPROJECT-tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,8 +26,17 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      codeCoverageEnabled = "YES"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "3D9C42A82274599D000A6585"
+            BuildableName = "KITPROJECT.framework"
+            BlueprintName = "KITPROJECT-tvOS"
+            ReferencedContainer = "container:KITPROJECT.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO"
@@ -42,17 +51,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "3D9C42A82274599D000A6585"
-            BuildableName = "KITPROJECT.framework"
-            BlueprintName = "KITPROJECT-tvOS"
-            ReferencedContainer = "container:KITPROJECT.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -73,8 +71,6 @@
             ReferencedContainer = "container:KITPROJECT.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Template/KITPROJECT.xcodeproj/xcshareddata/xcschemes/KITPROJECT-watchOS.xcscheme b/Template/KITPROJECT.xcodeproj/xcshareddata/xcschemes/KITPROJECT-watchOS.xcscheme
index 157415e..a847d80 100644
--- a/Template/KITPROJECT.xcodeproj/xcshareddata/xcschemes/KITPROJECT-watchOS.xcscheme
+++ b/Template/KITPROJECT.xcodeproj/xcshareddata/xcschemes/KITPROJECT-watchOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,12 +26,10 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      codeCoverageEnabled = "YES"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -52,8 +50,6 @@
             ReferencedContainer = "container:KITPROJECT.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"