diff --git a/.gitmodules b/.gitmodules
index a43e3bde9..a1aaafca6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,7 +3,7 @@
 	url = https://github.com/opa334/ChOma
 [submodule "BaseBin/XPF"]
 	path = BaseBin/XPF
-	url = https://github.com/opa334/XPF
+	url = https://github.com/m1zole/XPF
 [submodule "Exploits/kfd/src/kfd"]
 	path = Application/Dopamine/Dopamine/Exploits/kfd/kfd
 	url = https://github.com/opa334/kfd
diff --git a/Application/Dopamine/Exploits/kfd/Info.plist b/Application/Dopamine/Exploits/kfd/Info.plist
index b5aa64a22..eb7a9c278 100644
--- a/Application/Dopamine/Exploits/kfd/Info.plist
+++ b/Application/Dopamine/Exploits/kfd/Info.plist
@@ -11,7 +11,14 @@
 			<key>DPSupportExclude</key>
 			<array/>
 			<key>DPSupportInclude</key>
-			<array/>
+			<array>
+				<dict>
+					<key>Builds</key>
+					<array>
+						<string>21A5248v</string>
+					</array>
+				</dict>
+			</array>
 			<key>DPSupportedRanges</key>
 			<array>
 				<dict>
diff --git a/Application/Dopamine/Exploits/kfd/kfd.m b/Application/Dopamine/Exploits/kfd/kfd.m
index 5cf1e6107..429ee7baf 100644
--- a/Application/Dopamine/Exploits/kfd/kfd.m
+++ b/Application/Dopamine/Exploits/kfd/kfd.m
@@ -212,6 +212,19 @@ int exploit_init(const char *flavor)
         .device__ARM_TT_L1_INDEX_MASK = kconstant(ARM_TT_L1_INDEX_MASK),
     };
 
+    if (@available(iOS 17.0, *)) {
+        dynamic_system_info.vm_map__hint        = vm_map__pmap + 0x70;
+        dynamic_system_info.vm_map__hole_hint   = vm_map__pmap + 0x78;
+        dynamic_system_info.vm_map__holes_list  = vm_map__pmap + 0x80;
+        dynamic_system_info.vm_map__object_size = vm_map__pmap + 0x90;
+
+        dynamic_system_info.IOSurface__isa                 =   0x0;
+        dynamic_system_info.IOSurface__pixelFormat         =  0xac;
+        dynamic_system_info.IOSurface__allocSize           =  0xb4;
+        dynamic_system_info.IOSurface__useCountPtr         =  0xc8;
+        dynamic_system_info.IOSurface__indexedTimestampPtr = 0x390;
+        dynamic_system_info.IOSurface__readDisplacement    =  0x18;
+    }
     if (isiOS15) {
         dynamic_system_info.proc__task = 0x10;
     }
diff --git a/Application/Dopamine/Jailbreak/DOBootstrapper.m b/Application/Dopamine/Jailbreak/DOBootstrapper.m
index 5743bb760..a10def63e 100644
--- a/Application/Dopamine/Jailbreak/DOBootstrapper.m
+++ b/Application/Dopamine/Jailbreak/DOBootstrapper.m
@@ -341,7 +341,10 @@ - (void)patchBasebinDaemonPlists
 - (NSString *)bootstrapVersion
 {
     uint64_t cfver = (((uint64_t)kCFCoreFoundationVersionNumber / 100) * 100);
-    if (cfver >= 2000) {
+    if (cfver == 2000) {
+        cfver -= 100;
+    }
+    if (cfver > 2000) {
         return nil;
     }
     return [NSString stringWithFormat:@"%llu", cfver];
diff --git a/Application/Makefile b/Application/Makefile
index f11b636c5..30690d079 100644
--- a/Application/Makefile
+++ b/Application/Makefile
@@ -4,7 +4,7 @@ all: Dopamine.ipa
 
 Dopamine.ipa: build/Build/Products/Debug-iphoneos/Dopamine.app
 	@echo Ad-Hoc signing Dopamine
-	xattr -rc build/Build/Products/Debug-iphoneos/Dopamine.app
+	xattr -c build/Build/Products/Debug-iphoneos/Dopamine.app
 	ldid -SDopamine/Dopamine.entitlements build/Build/Products/Debug-iphoneos/Dopamine.app/Dopamine
 	ldid -s build/Build/Products/Debug-iphoneos/Dopamine.app
 	rm -rf Payload Dopamine.ipa
@@ -17,10 +17,10 @@ Dopamine.ipa: build/Build/Products/Debug-iphoneos/Dopamine.app
 
 ifeq ($(NIGHTLY), 1)
 build/Build/Products/Debug-iphoneos/Dopamine.app: FORCE
-	xcodebuild -scheme Dopamine -derivedDataPath build -destination 'generic/platform=iOS' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO GCC_PREPROCESSOR_DEFINITIONS='NIGHTLY=1 COMMIT_HASH=\"$(COMMIT_HASH)\"'
+	xcodebuild -scheme Dopamine -derivedDataPath build -destination 'generic/platform=iOS' PRODUCT_BUNDLE_IDENTIFIER="com.opa334.Dopamine" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO GCC_PREPROCESSOR_DEFINITIONS='NIGHTLY=1 COMMIT_HASH=\"$(COMMIT_HASH)\"'
 else
 build/Build/Products/Debug-iphoneos/Dopamine.app: FORCE
-	xcodebuild -scheme Dopamine -derivedDataPath build -destination 'generic/platform=iOS' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
+	xcodebuild -scheme Dopamine -derivedDataPath build -destination 'generic/platform=iOS' PRODUCT_BUNDLE_IDENTIFIER="com.opa334.Dopamine" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
 endif
 
 clean:
@@ -29,4 +29,4 @@ clean:
 build_clean:
 	rm -rf Payload build
 
-FORCE: ;
\ No newline at end of file
+FORCE: ;
diff --git a/BaseBin/XPF b/BaseBin/XPF
index a524ce94e..2c3b20040 160000
--- a/BaseBin/XPF
+++ b/BaseBin/XPF
@@ -1 +1 @@
-Subproject commit a524ce94e9fe9aec59360bca0b1172bec3e992d9
+Subproject commit 2c3b200402c95675aaad8625b791041437bbe9c6
diff --git a/BaseBin/libjailbreak/src/info.c b/BaseBin/libjailbreak/src/info.c
index 885f88651..9ed5a86e3 100644
--- a/BaseBin/libjailbreak/src/info.c
+++ b/BaseBin/libjailbreak/src/info.c
@@ -261,6 +261,10 @@ void jbinfo_initialize_hardcoded_offsets(void)
 										gSystemInfo.kernelStruct.proc.textvp  = 0x350;
 									}
 								}
+                                if (strcmp(xnuVersion, "23.0.0") >= 0) {
+                                    gSystemInfo.kernelStruct.task.threads     = 0x58;
+                                    gSystemInfo.kernelStruct.vm_map.flags     = 0xc8;
+                                }
 							}
 						}
 					}