diff --git a/App/App.Debug.entitlements b/App/App.Debug.entitlements
index ea12f56..11b79bf 100644
--- a/App/App.Debug.entitlements
+++ b/App/App.Debug.entitlements
@@ -1,45 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-	<dict>
-		<key>com.apple.security.app-sandbox</key>
-		<true />
-		<key>com.apple.security.automation.apple-events</key>
-		<true />
-		<key>com.apple.security.device.camera</key>
-		<true />
-		<key>com.apple.security.device.microphone</key>
-		<true />
-		<key>com.apple.security.device.audio-input</key>
-		<true />
-		<key>com.apple.security.files.user-selected.read-write</key>
-		<true />
-		<key>com.apple.security.inherit</key>
-		<true />
-		<key>com.apple.security.network.client</key>
-		<true />
-		<key>com.apple.security.network.server</key>
-		<true />
-		<key>com.apple.security.personal-information.addressbook</key>
-		<true />
-		<key>com.apple.security.personal-information.calendars</key>
-		<true />
-		<key>com.apple.security.personal-information.health</key>
-		<true />
-		<key>com.apple.security.personal-information.location</key>
-		<true />
-		<key>com.apple.security.temporary-exception.apple-events</key>
-		<array>
-			<string>com.apple.Terminal</string>
-		</array>
-		<key>com.apple.security.temporary-exception.files.absolute-path.read-write</key>
-		<array>
-			<string>/Users/*/Library/Messages/</string>
-		</array>
-		<key>com.apple.security.temporary-exception.mach-lookup.global-name</key>
-		<array>
-			<string>$(PRODUCT_BUNDLE_IDENTIFIER)-spks</string>
-			<string>$(PRODUCT_BUNDLE_IDENTIFIER)-spki</string>
-		</array>
-	</dict>
-</plist>
\ No newline at end of file
+<dict>
+	<key>com.apple.security.files.user-selected.read-write</key>
+	<true/>
+	<key>com.apple.security.inherit</key>
+	<true/>
+	<key>com.apple.security.personal-information.health</key>
+	<true/>
+	<key>com.apple.security.temporary-exception.apple-events</key>
+	<array>
+		<string>com.apple.Terminal</string>
+	</array>
+	<key>com.apple.security.temporary-exception.files.absolute-path.read-write</key>
+	<array>
+		<string>/Users/*/Library/Messages/</string>
+	</array>
+	<key>com.apple.security.temporary-exception.mach-lookup.global-name</key>
+	<array>
+		<string>$(PRODUCT_BUNDLE_IDENTIFIER)-spks</string>
+		<string>$(PRODUCT_BUNDLE_IDENTIFIER)-spki</string>
+	</array>
+</dict>
+</plist>
diff --git a/App/App.entitlements b/App/App.entitlements
index 98b4523..2bdd123 100644
--- a/App/App.entitlements
+++ b/App/App.entitlements
@@ -1,47 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-	<dict>
-		<key>com.apple.developer.weatherkit</key>
-		<true />
-		<key>com.apple.security.app-sandbox</key>
-		<true />
-		<key>com.apple.security.automation.apple-events</key>
-		<true />
-		<key>com.apple.security.device.camera</key>
-		<true />
-		<key>com.apple.security.device.microphone</key>
-		<true />
-		<key>com.apple.security.device.audio-input</key>
-		<true />
-		<key>com.apple.security.files.user-selected.read-write</key>
-		<true />
-		<key>com.apple.security.inherit</key>
-		<true />
-		<key>com.apple.security.network.client</key>
-		<true />
-		<key>com.apple.security.network.server</key>
-		<true />
-		<key>com.apple.security.personal-information.addressbook</key>
-		<true />
-		<key>com.apple.security.personal-information.calendars</key>
-		<true />
-		<key>com.apple.security.personal-information.health</key>
-		<true />
-		<key>com.apple.security.personal-information.location</key>
-		<true />
-		<key>com.apple.security.temporary-exception.apple-events</key>
-		<array>
-			<string>com.apple.Terminal</string>
-		</array>
-		<key>com.apple.security.temporary-exception.files.absolute-path.read-write</key>
-		<array>
-			<string>/Users/*/Library/Messages/</string>
-		</array>
-		<key>com.apple.security.temporary-exception.mach-lookup.global-name</key>
-		<array>
-			<string>$(PRODUCT_BUNDLE_IDENTIFIER)-spks</string>
-			<string>$(PRODUCT_BUNDLE_IDENTIFIER)-spki</string>
-		</array>
-	</dict>
-</plist>
\ No newline at end of file
+<dict>
+	<key>com.apple.developer.weatherkit</key>
+	<true/>
+	<key>com.apple.security.inherit</key>
+	<true/>
+	<key>com.apple.security.personal-information.health</key>
+	<true/>
+	<key>com.apple.security.temporary-exception.apple-events</key>
+	<array>
+		<string>com.apple.Terminal</string>
+	</array>
+	<key>com.apple.security.temporary-exception.files.absolute-path.read-write</key>
+	<array>
+		<string>/Users/*/Library/Messages/</string>
+	</array>
+	<key>com.apple.security.temporary-exception.mach-lookup.global-name</key>
+	<array>
+		<string>$(PRODUCT_BUNDLE_IDENTIFIER)-spks</string>
+		<string>$(PRODUCT_BUNDLE_IDENTIFIER)-spki</string>
+	</array>
+</dict>
+</plist>
diff --git a/iMCP.xcodeproj/project.pbxproj b/iMCP.xcodeproj/project.pbxproj
index 7e2ea78..4d877ed 100644
--- a/iMCP.xcodeproj/project.pbxproj
+++ b/iMCP.xcodeproj/project.pbxproj
@@ -195,7 +195,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
 				LastSwiftUpdateCheck = 1620;
-				LastUpgradeCheck = 1630;
+				LastUpgradeCheck = 2620;
 				TargetAttributes = {
 					F8F44E6C2D59038D0075D79C = {
 						CreatedOnToolsVersion = 16.2;
@@ -305,11 +305,11 @@
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
 				);
+				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -320,6 +320,7 @@
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
+				STRING_CATALOG_GENERATE_SYMBOLS = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
@@ -377,6 +378,7 @@
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
+				STRING_CATALOG_GENERATE_SYMBOLS = YES;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
 			};
@@ -387,17 +389,27 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
-				CODE_SIGN_ENTITLEMENTS = App/App.Debug.entitlements;
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
+				AUTOMATION_APPLE_EVENTS = YES;
 				CODE_SIGNING_ALLOWED = NO;
 				CODE_SIGNING_REQUIRED = NO;
+				CODE_SIGN_ENTITLEMENTS = App/App.Debug.entitlements;
+				CODE_SIGN_IDENTITY = "-";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = 8;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = "";
+				ENABLE_APP_SANDBOX = YES;
 				ENABLE_HARDENED_RUNTIME = YES;
+				ENABLE_INCOMING_NETWORK_CONNECTIONS = YES;
+				ENABLE_OUTGOING_NETWORK_CONNECTIONS = YES;
 				ENABLE_PREVIEWS = YES;
+				ENABLE_RESOURCE_ACCESS_AUDIO_INPUT = YES;
+				ENABLE_RESOURCE_ACCESS_CALENDARS = YES;
+				ENABLE_RESOURCE_ACCESS_CAMERA = YES;
+				ENABLE_RESOURCE_ACCESS_CONTACTS = YES;
+				ENABLE_RESOURCE_ACCESS_LOCATION = YES;
+				ENABLE_USER_SELECTED_FILES = readwrite;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = App/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = iMCP;
@@ -442,7 +454,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
-				AUTOMATION_APPLE_EVENTS = NO;
+				AUTOMATION_APPLE_EVENTS = YES;
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
@@ -451,18 +463,19 @@
 				DEVELOPMENT_TEAM = "";
 				ENABLE_APP_SANDBOX = YES;
 				ENABLE_HARDENED_RUNTIME = YES;
-				ENABLE_INCOMING_NETWORK_CONNECTIONS = NO;
-				ENABLE_OUTGOING_NETWORK_CONNECTIONS = NO;
+				ENABLE_INCOMING_NETWORK_CONNECTIONS = YES;
+				ENABLE_OUTGOING_NETWORK_CONNECTIONS = YES;
 				ENABLE_PREVIEWS = YES;
 				ENABLE_RESOURCE_ACCESS_AUDIO_INPUT = YES;
 				ENABLE_RESOURCE_ACCESS_BLUETOOTH = NO;
-				ENABLE_RESOURCE_ACCESS_CALENDARS = NO;
+				ENABLE_RESOURCE_ACCESS_CALENDARS = YES;
 				ENABLE_RESOURCE_ACCESS_CAMERA = YES;
 				ENABLE_RESOURCE_ACCESS_CONTACTS = YES;
 				ENABLE_RESOURCE_ACCESS_LOCATION = YES;
 				ENABLE_RESOURCE_ACCESS_PHOTO_LIBRARY = NO;
 				ENABLE_RESOURCE_ACCESS_PRINTING = NO;
 				ENABLE_RESOURCE_ACCESS_USB = NO;
+				ENABLE_USER_SELECTED_FILES = readwrite;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = App/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = iMCP;
@@ -497,8 +510,8 @@
 				SDKROOT = auto;
 				SUPPORTED_PLATFORMS = macosx;
 				SUPPORTS_MACCATALYST = NO;
-				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "WEATHERKIT_AVAILABLE $(inherited)";
+				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
 				XROS_DEPLOYMENT_TARGET = 2.2;
 			};
diff --git a/iMCP.xcodeproj/xcshareddata/xcschemes/iMCP.xcscheme b/iMCP.xcodeproj/xcshareddata/xcschemes/iMCP.xcscheme
index 7081445..db26684 100644
--- a/iMCP.xcodeproj/xcshareddata/xcschemes/iMCP.xcscheme
+++ b/iMCP.xcodeproj/xcshareddata/xcschemes/iMCP.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1630"
+   LastUpgradeVersion = "2620"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"