diff --git a/Sulfur.xcodeproj/project.pbxproj b/Sulfur.xcodeproj/project.pbxproj
index db766f1..9437d43 100644
--- a/Sulfur.xcodeproj/project.pbxproj
+++ b/Sulfur.xcodeproj/project.pbxproj
@@ -827,11 +827,18 @@
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
-				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx";
+				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
 				SUPPORTS_MACCATALYST = YES;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				TARGETED_DEVICE_FAMILY = "1,2,6";
+				VALID_ARCHS = "arm64 x86_64";
+				"VALID_ARCHS[sdk=iphoneos*]" = "arm64 arm64e";
+				"VALID_ARCHS[sdk=iphonesimulator*]" = "arm64 x86_64";
+				"VALID_ARCHS[sdk=macosx*]" = "arm64 x86_64";
 			};
 			name = Debug;
 		};
@@ -884,12 +891,19 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;
-				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx";
+				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
 				SUPPORTS_MACCATALYST = YES;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				TARGETED_DEVICE_FAMILY = "1,2,6";
 				VALIDATE_PRODUCT = YES;
+				VALID_ARCHS = "arm64 x86_64";
+				"VALID_ARCHS[sdk=iphoneos*]" = "arm64 arm64e";
+				"VALID_ARCHS[sdk=iphonesimulator*]" = "arm64 x86_64";
+				"VALID_ARCHS[sdk=macosx*]" = "arm64 x86_64";
 			};
 			name = Release;
 		};
@@ -925,11 +939,13 @@
 				PRODUCT_BUNDLE_IDENTIFIER = me.cranci.sulfur;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = YES;
-				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2,6";
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
 		};
@@ -965,11 +981,13 @@
 				PRODUCT_BUNDLE_IDENTIFIER = me.cranci.sulfur;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = YES;
-				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2,6";
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
 		};
diff --git a/macbuild.sh b/macbuild.sh
index cf6cebc..905525e 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -16,30 +16,29 @@ cd build
 xcodebuild -project "$WORKING_LOCATION/$APPLICATION_NAME.xcodeproj" \
     -scheme "$APPLICATION_NAME" \
     -configuration Release \
-    -derivedDataPath "$WORKING_LOCATION/build/DerivedDataApp_arm64" \
-    -destination 'platform=macOS,variant=Mac Catalyst' \
-    -arch arm64 \
+    -derivedDataPath "$WORKING_LOCATION/build/DerivedDataApp-x86_64" \
+    -destination 'platform=macOS,arch=x86_64,variant=Mac Catalyst' \
     clean build \
     CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGN_ENTITLEMENTS="" CODE_SIGNING_ALLOWED="NO"
 
 xcodebuild -project "$WORKING_LOCATION/$APPLICATION_NAME.xcodeproj" \
     -scheme "$APPLICATION_NAME" \
     -configuration Release \
-    -derivedDataPath "$WORKING_LOCATION/build/DerivedDataApp_x86_64" \
-    -destination 'platform=macOS,variant=Mac Catalyst' \
-    -arch x86_64 \
+    -derivedDataPath "$WORKING_LOCATION/build/DerivedDataApp-arm64" \
+    -destination 'platform=macOS,arch=arm64,variant=Mac Catalyst' \
     clean build \
     CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGN_ENTITLEMENTS="" CODE_SIGNING_ALLOWED="NO"
 
-ARM64_APP_PATH="$WORKING_LOCATION/build/DerivedDataApp_arm64/Build/Products/Release-maccatalyst/$APPLICATION_NAME.app"
-X86_64_APP_PATH="$WORKING_LOCATION/build/DerivedDataApp_x86_64/Build/Products/Release-maccatalyst/$APPLICATION_NAME.app"
+DD_APP_PATH_X86_64="$WORKING_LOCATION/build/DerivedDataApp-x86_64/Build/Products/Release-maccatalyst/$APPLICATION_NAME.app"
+DD_APP_PATH_ARM64="$WORKING_LOCATION/build/DerivedDataApp-arm64/Build/Products/Release-maccatalyst/$APPLICATION_NAME.app"
 TARGET_APP="$WORKING_LOCATION/build/$APPLICATION_NAME.app"
 
-cp -r "$ARM64_APP_PATH" "$TARGET_APP"
+rm -rf "$TARGET_APP"
+cp -r "$DD_APP_PATH_ARM64" "$TARGET_APP"
 
 lipo -create \
-    "$ARM64_APP_PATH/Contents/MacOS/$APPLICATION_NAME" \
-    "$X86_64_APP_PATH/Contents/MacOS/$APPLICATION_NAME" \
+    "$DD_APP_PATH_X86_64/Contents/MacOS/$APPLICATION_NAME" \
+    "$DD_APP_PATH_ARM64/Contents/MacOS/$APPLICATION_NAME" \
     -output "$TARGET_APP/Contents/MacOS/$APPLICATION_NAME"
 
 codesign --remove "$TARGET_APP"
@@ -47,5 +46,5 @@ if [ -e "$TARGET_APP/_CodeSignature" ]; then
     rm -rf "$TARGET_APP/_CodeSignature"
 fi
 
-echo "Mac Catalyst universal binary build completed: $TARGET_APP"
-lipo -info "$TARGET_APP/Contents/MacOS/$APPLICATION_NAME"
+echo "Universal Mac Catalyst build completed: $TARGET_APP"
+lipo -archs "$TARGET_APP/Contents/MacOS/$APPLICATION_NAME"