diff --git a/mods/d2k/rules/arrakis.yaml b/mods/d2k/rules/arrakis.yaml
index fafde1bb88..623591415b 100644
--- a/mods/d2k/rules/arrakis.yaml
+++ b/mods/d2k/rules/arrakis.yaml
@@ -69,8 +69,7 @@ sietch:
 	-DamagedWithoutFoundation:
 	-GivesBuildableArea:
 	-Sellable:
-	-ExternalCapturable:
-	-ExternalCapturableBar:
+	-Capturable:
 	Power:
 		Amount: 0
 	ProvidesPrerequisite@buildingname:
diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml
index de51f9918a..9850182443 100644
--- a/mods/d2k/rules/defaults.yaml
+++ b/mods/d2k/rules/defaults.yaml
@@ -248,8 +248,8 @@
 		BuildSounds: BUILD1.WAV
 		Adjacent: 3
 	GivesBuildableArea:
-	ExternalCapturable:
-	ExternalCapturableBar:
+	Capturable:
+		CaptureThreshold: 1.0
 	SoundOnDamageTransition:
 		DamagedSounds: EXPLSML1.WAV
 		DestroyedSounds: EXPLHG1.WAV
diff --git a/mods/d2k/rules/infantry.yaml b/mods/d2k/rules/infantry.yaml
index 9395c5dc85..b7b252590e 100644
--- a/mods/d2k/rules/infantry.yaml
+++ b/mods/d2k/rules/infantry.yaml
@@ -42,10 +42,8 @@ engineer:
 	Passenger:
 		PipType: Yellow
 	EngineerRepair:
-	ExternalCaptures:
-		Type: building
 	Captures:
-		CaptureTypes: husk
+		CaptureTypes: building, husk
 	-AutoTarget:
 	AttractsWorms:
 		Intensity: 180
@@ -139,8 +137,8 @@ fremen:
 	WithInfantryBody:
 		AttackSequence: shoot
 	Cloak:
-		InitialDelay: 250
-		CloakDelay: 250
+		InitialDelay: 85
+		CloakDelay: 85
 		CloakSound: STEALTH1.WAV
 		UncloakSound: STEALTH2.WAV
 		IsPlayerPalette: true
@@ -236,6 +234,13 @@ saboteur:
 	-AutoTarget:
 	AttractsWorms:
 		Intensity: 120
+	Cloak:
+		InitialDelay: 85
+		CloakDelay: 85
+		CloakSound: STEALTH1.WAV
+		UncloakSound: STEALTH2.WAV
+		UncloakOnMove: true
+		IsPlayerPalette: true
 	Voiced:
 		VoiceSet: SaboteurVoice