diff --git a/mods/d2k/rules/arrakis.yaml b/mods/d2k/rules/arrakis.yaml
index 94b3e24de3..7ad057029b 100644
--- a/mods/d2k/rules/arrakis.yaml
+++ b/mods/d2k/rules/arrakis.yaml
@@ -25,6 +25,8 @@ spicebloom.spawnpoint:
 	HitShape:
 		Type: Circle
 			Radius: 1
+	EditorTilesetFilter:
+		Categories: System
 
 spicebloom:
 	HiddenUnderShroud:
@@ -59,6 +61,8 @@ spicebloom:
 	HitShape:
 		Type: Circle
 			Radius: 512
+	EditorTilesetFilter:
+		Categories: System
 
 sandworm:
 	Inherits@1: ^SpriteActor
diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml
index c1cb3ba939..7680b9f97f 100644
--- a/mods/d2k/rules/defaults.yaml
+++ b/mods/d2k/rules/defaults.yaml
@@ -198,6 +198,8 @@
 		Duration: 100
 		Radius: 2c512
 	HitShape:
+	EditorTilesetFilter:
+		Categories: Vehicle
 
 ^Tank:
 	Inherits: ^Vehicle
@@ -217,6 +219,8 @@
 	ScriptTriggers:
 	WithFacingSpriteBody:
 	HitShape:
+	EditorTilesetFilter:
+		Categories: Husk
 
 ^VehicleHusk:
 	Inherits: ^Husk
@@ -255,6 +259,8 @@
 		Name: Destroyed Tower
 	ScriptTriggers:
 	HitShape:
+	EditorTilesetFilter:
+		Categories: Husk
 
 ^Infantry:
 	Inherits@1: ^ExistsInWorld
@@ -329,6 +335,8 @@
 	HitShape:
 		Type: Circle
 			Radius: 96
+	EditorTilesetFilter:
+		Categories: Infantry
 
 ^Plane:
 	Inherits@1: ^ExistsInWorld
@@ -345,6 +353,8 @@
 	WithFacingSpriteBody:
 	WithShadow:
 	HitShape:
+	EditorTilesetFilter:
+		Categories: Aircraft
 
 ^Building:
 	Inherits@1: ^ExistsInWorld
@@ -412,6 +422,8 @@
 	RevealOnDeath:
 		Duration: 100
 		Radius: 4c768
+	EditorTilesetFilter:
+		Categories: Building
 
 ^Defense:
 	Inherits: ^Building
@@ -436,6 +448,8 @@
 	RevealOnFire:
 	Targetable:
 		TargetTypes: Ground, C4, Structure, Defense
+	EditorTilesetFilter:
+		Categories: Defense
 
 ^DisabledOverlay:
 	WithColoredOverlay@IDISABLE:
diff --git a/mods/d2k/rules/misc.yaml b/mods/d2k/rules/misc.yaml
index 092c9b2223..5bb109e94e 100644
--- a/mods/d2k/rules/misc.yaml
+++ b/mods/d2k/rules/misc.yaml
@@ -136,6 +136,8 @@ crate:
 	Passenger:
 	CustomSelectionSize:
 		CustomBounds: 20,20
+	EditorTilesetFilter:
+		Categories: System
 
 mpspawn:
 	EditorOnlyTooltip:
@@ -147,6 +149,8 @@ mpspawn:
 	WithSpriteBody:
 	BodyOrientation:
 		QuantizedFacings: 1
+	EditorTilesetFilter:
+		Categories: System
 
 waypoint:
 	EditorOnlyTooltip:
@@ -158,6 +162,8 @@ waypoint:
 	WithSpriteBody:
 	BodyOrientation:
 		QuantizedFacings: 1
+	EditorTilesetFilter:
+		Categories: System
 
 ^carryall.colorpicker:
 	Inherits: carryall
@@ -181,6 +187,8 @@ camera:
 	RevealsShroud:
 		Range: 6c768
 		Type: CenterPosition
+	EditorTilesetFilter:
+		Categories: System
 
 wormspawner:
 	EditorOnlyTooltip:
@@ -193,6 +201,8 @@ wormspawner:
 	BodyOrientation:
 		QuantizedFacings: 1
 	WormSpawner:
+	EditorTilesetFilter:
+		Categories: System
 
 upgrade.conyard:
 	AlwaysVisible:
diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml
index 78a735c47c..25938bc0d6 100644
--- a/mods/d2k/rules/structures.yaml
+++ b/mods/d2k/rules/structures.yaml
@@ -721,6 +721,8 @@ wall:
 		Type: Rectangle
 			TopLeft: -512, -512
 			BottomRight: 512, 512
+	EditorTilesetFilter:
+		Categories: Wall
 
 medium_gun_turret:
 	Inherits: ^Defense