diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml
index 4c4c35108b..61cb8319b7 100644
--- a/mods/ra/rules/defaults.yaml
+++ b/mods/ra/rules/defaults.yaml
@@ -268,6 +268,8 @@
 	BodyOrientation:
 		UseClassicFacingFudge: True
 	HitShape:
+	EditorTilesetFilter:
+		Categories: Vehicle
 
 ^Tank:
 	Inherits: ^Vehicle
@@ -384,6 +386,8 @@
 	HitShape:
 		Type: Circle
 			Radius: 128
+	EditorTilesetFilter:
+		Categories: Infantry
 
 ^Soldier:
 	Inherits: ^Infantry
@@ -420,6 +424,8 @@
 	Wanders:
 		MinMoveDelay: 150
 		MaxMoveDelay: 750
+	EditorTilesetFilter:
+		Categories: Civilian infantry
 
 ^ArmedCivilian:
 	Inherits@AUTOTARGET: ^AutoTargetGround
@@ -469,6 +475,7 @@
 	MustBeDestroyed:
 	EditorTilesetFilter:
 		ExcludeTilesets: INTERIOR
+		Categories: Naval
 	Voiced:
 		VoiceSet: VehicleVoice
 	WithFacingSpriteBody:
@@ -525,6 +532,8 @@
 	Voiced:
 		VoiceSet: GenericVoice
 	HitShape:
+	EditorTilesetFilter:
+		Categories: Aircraft
 
 ^Plane:
 	Inherits: ^NeutralPlane
@@ -581,6 +590,8 @@
 	Tooltip:
 		GenericName: Structure
 	Demolishable:
+	EditorTilesetFilter:
+		Categories: Building
 
 ^Building:
 	Inherits: ^BasicBuilding
@@ -621,6 +632,8 @@
 	Explodes:
 		Weapon: SmallBuildingExplode
 		EmptyWeapon: SmallBuildingExplode
+	EditorTilesetFilter:
+		Categories: Defense
 
 ^Wall:
 	Inherits@1: ^ExistsInWorld
@@ -654,6 +667,8 @@
 	FrozenUnderFogUpdatedByGps:
 	Health:
 		HP: 100
+	EditorTilesetFilter:
+		Categories: Wall
 
 ^Gate:
 	Inherits: ^BasicBuilding
@@ -677,6 +692,8 @@
 		OpeningSound: cashturn.aud
 		ClosingSound: cashturn.aud
 		TerrainTypes: Clear, Road
+	EditorTilesetFilter:
+		Categories: Gate
 
 ^TechBuilding:
 	Inherits: ^BasicBuilding
@@ -689,6 +706,8 @@
 		Name: Civilian Building
 		GenericVisibility: None
 	FrozenUnderFog:
+	EditorTilesetFilter:
+		Categories: Tech building  
 
 ^FakeBuilding:
 	Inherits: ^Building
@@ -708,6 +727,8 @@
 		ZOffset: 256
 	-EmitInfantryOnSell:
 	-MustBeDestroyed:
+	 EditorTilesetFilter:
+		Categories: Fake
 
 ^InfiltratableFake:
 	Targetable:
@@ -745,6 +766,7 @@
 		Palette: terrain
 	EditorTilesetFilter:
 		ExcludeTilesets: INTERIOR
+		Categories: Civilian building
 	SpawnActorOnDeath@1:
 		Actor: c1
 		Probability: 40
@@ -808,6 +830,7 @@
 	ScriptTriggers:
 	EditorTilesetFilter:
 		ExcludeTilesets: INTERIOR
+		Categories: Tree
 
 ^TreeHusk:
 	Inherits@1: ^SpriteActor
@@ -821,6 +844,8 @@
 		ShowOwnerRow: false
 	FrozenUnderFog:
 	ScriptTriggers:
+	EditorTilesetFilter:
+		Categories: Tree
 
 ^BasicHusk:
 	Inherits@1: ^SpriteActor
@@ -833,6 +858,8 @@
 	ScriptTriggers:
 	WithFacingSpriteBody:
 	HitShape:
+	EditorTilesetFilter:
+		Categories: Husk
 
 ^Husk:
 	Inherits: ^BasicHusk
@@ -869,6 +896,8 @@
 		Spins: False
 		Moves: True
 		Velocity: 86
+	EditorTilesetFilter:
+		Categories: Husk
 
 ^HelicopterHusk:
 	Inherits: ^BasicHusk
@@ -923,6 +952,7 @@
 	ScriptTriggers:
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
+		Categories: Rock
 
 ^DesertCivBuilding:
 	Inherits: ^CivBuilding
@@ -961,6 +991,8 @@
 		ShadowSequence: idle
 		RequiresCondition: parachute
 	ConditionManager:
+	EditorTilesetFilter:
+		Categories: System
 
 ^Mine:
 	Inherits: ^SpriteActor
@@ -989,6 +1021,8 @@
 	Immobile:
 		OccupiesSpace: true
 	HitShape:
+	EditorTilesetFilter:
+		Categories: System
 
 ^DisabledOverlay:
 	WithColoredOverlay@IDISABLE:
diff --git a/mods/ra/rules/misc.yaml b/mods/ra/rules/misc.yaml
index 2888f56e0c..237c2700de 100644
--- a/mods/ra/rules/misc.yaml
+++ b/mods/ra/rules/misc.yaml
@@ -150,6 +150,8 @@ CAMERA:
 	WithSpriteBody:
 	RenderSpritesEditorOnly:
 		Image: camera
+	EditorTilesetFilter:
+		Categories: System
 
 camera.paradrop:
 	Inherits: CAMERA
@@ -192,6 +194,8 @@ FLARE:
 		Name: Flare
 		ShowOwnerRow: false
 	AutoSelectionSize:
+	EditorTilesetFilter:
+		Categories: System
 
 MINE:
 	Inherits@1: ^SpriteActor
@@ -208,6 +212,8 @@ MINE:
 	RadarColorFromTerrain:
 		Terrain: Ore
 	SeedsResource:
+	EditorTilesetFilter:
+		Categories: Resource spawn
 
 GMINE:
 	Inherits@1: ^SpriteActor
@@ -225,6 +231,8 @@ GMINE:
 		Terrain: Gems
 	SeedsResource:
 		ResourceType: Gems
+	EditorTilesetFilter:
+		Categories: Resource spawn
 
 RAILMINE:
 	Inherits@1: ^SpriteActor
@@ -239,6 +247,7 @@ RAILMINE:
 		Dimensions: 2,1
 	EditorTilesetFilter:
 		ExcludeTilesets: INTERIOR
+		Categories: Civilian building
 
 QUEE:
 	Inherits@1: ^SpriteActor
@@ -253,6 +262,7 @@ QUEE:
 	AppearsOnRadar:
 	EditorTilesetFilter:
 		RequireTilesets: INTERIOR
+		Categories: Critter
 
 LAR1:
 	Inherits@1: ^SpriteActor
@@ -269,6 +279,7 @@ LAR1:
 	AppearsOnRadar:
 	EditorTilesetFilter:
 		RequireTilesets: INTERIOR
+		Categories: Critter
 
 LAR2:
 	Inherits@1: LAR1
@@ -347,6 +358,8 @@ mpspawn:
 	RenderSpritesEditorOnly:
 	BodyOrientation:
 		QuantizedFacings: 1
+	EditorTilesetFilter:
+		Categories: System
 
 waypoint:
 	EditorOnlyTooltip:
@@ -358,6 +371,8 @@ waypoint:
 	RenderSpritesEditorOnly:
 	BodyOrientation:
 		QuantizedFacings: 1
+	EditorTilesetFilter:
+		Categories: System
 
 ^fact.colorpicker:
 	Inherits: FACT
@@ -379,3 +394,5 @@ CTFLAG:
 	-Selectable:
 	-SelectionDecorations:
 	-Targetable:
+	EditorTilesetFilter:
+		Categories: System
\ No newline at end of file