diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml
index 9b785d638e..4e431cdd3e 100644
--- a/mods/cnc/rules/defaults.yaml
+++ b/mods/cnc/rules/defaults.yaml
@@ -325,9 +325,11 @@
 		LandWhenIdle: false
 		AirborneCondition: airborne
 		CruisingCondition: cruising
+		CanHover: True
+		TakeOffOnResupply: true
+		VTOL: true
 		LandableTerrainTypes: Clear, Rough, Road, Beach, Tiberium, BlueTiberium
 		Crushes: crate, infantry
-		FlightDynamics: VTOL, Slide, Hover, MoveIntoShroud, TakeOffOnCreation, TakeOffOnResupply, TurnToDock
 		InitialFacing: 224
 	HiddenUnderFog:
 		Type: GroundPosition
@@ -1087,7 +1089,8 @@
 		Offset: 43, 128, 0
 		ZOffset: -129
 	Aircraft:
-		FlightDynamics: VTOL, Slide, Hover, MoveIntoShroud, TakeOffOnCreation
+		CanHover: True
+		VTOL: true
 	FallsToEarth:
 		Spins: True
 		Moves: False
diff --git a/mods/d2k/rules/aircraft.yaml b/mods/d2k/rules/aircraft.yaml
index 2858327663..09075d8d0f 100644
--- a/mods/d2k/rules/aircraft.yaml
+++ b/mods/d2k/rules/aircraft.yaml
@@ -9,7 +9,6 @@ carryall.reinforce:
 	Armor:
 		Type: light
 	Aircraft:
-		FlightDynamics: VTOL, Slide, MoveIntoShroud, TakeOffOnCreation
 		CruiseAltitude: 2160
 		CruisingCondition: cruising
 		InitialFacing: 0
@@ -19,6 +18,8 @@ carryall.reinforce:
 		Repulsable: False
 		LandWhenIdle: False
 		AirborneCondition: airborne
+		CanSlide: True
+		VTOL: true
 		IdleTurnSpeed: 1
 	Targetable@GROUND:
 		TargetTypes: Ground, Vehicle
@@ -76,12 +77,14 @@ frigate:
 	Tooltip:
 		Name: Frigate
 	Aircraft:
-		FlightDynamics: VTOL, Hover, MoveIntoShroud, TakeOffOnCreation
 		Speed: 189
 		TurnSpeed: 1
 		Repulsable: False
 		MaximumPitch: 20
 		CruiseAltitude: 2048
+		VTOL: true
+		CanHover: true
+		CanSlide: true
 	-AppearsOnRadar:
 	Cargo:
 		MaxWeight: 20
@@ -99,7 +102,6 @@ ornithopter:
 	Armor:
 		Type: light
 	Aircraft:
-		FlightDynamics: MoveIntoShroud, TakeOffOnCreation
 		Speed: 224
 		TurnSpeed: 2
 		Repulsable: False
@@ -131,7 +133,8 @@ carryall.husk:
 	Aircraft:
 		TurnSpeed: 4
 		Speed: 144
-		FlightDynamics: VTOL, Slide, MoveIntoShroud, TakeOffOnCreation
+		CanSlide: True
+		VTOL: true
 	RenderSprites:
 		Image: carryall
 
@@ -144,6 +147,7 @@ carryall.huskVTOL:
 		Velocity: 0c128
 	Aircraft:
 		TurnSpeed: 4
-		FlightDynamics: VTOL, Slide, MoveIntoShroud, TakeOffOnCreation
+		CanSlide: True
+		VTOL: true
 	RenderSprites:
 		Image: carryall
diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml
index eb7f28a4f2..28a8d56e2e 100644
--- a/mods/ra/rules/defaults.yaml
+++ b/mods/ra/rules/defaults.yaml
@@ -626,12 +626,14 @@
 	Tooltip:
 		GenericName: Helicopter
 	Aircraft:
+		CanHover: True
 		CruisingCondition: cruising
 		WaitDistanceFromResupplyBase: 4c0
+		TakeOffOnResupply: true
+		VTOL: true
 		LandableTerrainTypes: Clear, Rough, Road, Ore, Beach, Gems
 		Crushes: crate, mine, infantry
 		InitialFacing: 224
-		FlightDynamics: VTOL, Slide, Hover, MoveIntoShroud, TakeOffOnCreation, TakeOffOnResupply, TurnToDock
 	GpsDot:
 		String: Helicopter
 	Hovers@CRUISING:
@@ -1043,7 +1045,8 @@
 	Tooltip:
 		GenericName: Destroyed Helicopter
 	Aircraft:
-		FlightDynamics: VTOL, Slide, Hover, MoveIntoShroud, TakeOffOnCreation
+		CanHover: True
+		VTOL: true
 	FallsToEarth:
 		Explosion: UnitExplodeHeli
 	BodyOrientation:
diff --git a/mods/ts/rules/aircraft.yaml b/mods/ts/rules/aircraft.yaml
index b55c7743c2..b39c3d3eb2 100644
--- a/mods/ts/rules/aircraft.yaml
+++ b/mods/ts/rules/aircraft.yaml
@@ -49,7 +49,7 @@ DSHP:
 		IdealSeparation: 1275
 		CruiseAltitude: 12c512
 		AltitudeVelocity: 256
-		FlightDynamics: VTOL, Hover, MoveIntoShroud, TakeOffOnCreation, TurnToDock
+		MoveIntoShroud: true
 	Health:
 		HP: 20000
 	Armor:
@@ -90,7 +90,8 @@ ORCA:
 		TakeoffSounds: orcaup1.aud
 		LandingSounds: orcadwn1.aud
 		AltitudeVelocity: 128
-		FlightDynamics: VTOL, Hover, TakeOffOnCreation, TakeOffOnResupply, TurnToDock
+		CanSlide: false
+		TakeOffOnResupply: true
 	Health:
 		HP: 20000
 	Armor:
@@ -144,6 +145,8 @@ ORCAB:
 		CruisingCondition: cruising
 		TakeoffSounds: orcaup1.aud
 		LandingSounds: orcadwn1.aud
+		CanHover: false
+		CanSlide: false
 	ReturnOnIdle:
 	Health:
 		HP: 26000
@@ -199,7 +202,6 @@ ORCATRAN:
 		TakeoffSounds: orcaup1.aud
 		LandingSounds: orcadwn1.aud
 		IdealSeparation: 1275
-		FlightDynamics: VTOL, Hover, MoveIntoShroud, TakeOffOnCreation, TurnToDock
 	Health:
 		HP: 20000
 	Armor:
@@ -281,6 +283,8 @@ SCRIN:
 		AirborneCondition: airborne
 		TakeoffSounds: dropup1.aud
 		LandingSounds: dropdwn1.aud
+		CanHover: false
+		CanSlide: false
 	ReturnOnIdle:
 	Health:
 		HP: 28000
@@ -332,7 +336,8 @@ APACHE:
 	Aircraft:
 		TurnSpeed: 5
 		Speed: 130
-		FlightDynamics: VTOL, Hover, TakeOffOnCreation, TakeOffOnResupply, TurnToDock
+		CanSlide: false
+		TakeOffOnResupply: true
 	Health:
 		HP: 22500
 	Armor:
@@ -384,7 +389,7 @@ HUNTER:
 		Speed: 355
 		CruiseAltitude: 3c128
 		CruisingCondition: cruising
-		FlightDynamics: VTOL, Slide, Hover, MoveIntoShroud, TakeOffOnCreation
+		MoveIntoShroud: true
 	AttackAircraft:
 		FacingTolerance: 128
 		AttackType: Hover
diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml
index 667ae23e46..e6da920f84 100644
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -880,7 +880,10 @@
 		MaximumPitch: 120
 		LandableTerrainTypes: Clear, Road, Rail, DirtRoad, Rough, Tiberium, BlueTiberium, Veins
 		Crushes: crate, infantry
-		FlightDynamics: VTOL, TakeOffOnCreation, TakeOffOnResupply, TurnToDock
+		MoveIntoShroud: false
+		CanHover: true
+		CanSlide: true
+		VTOL: true
 	Voiced:
 		VoiceSet: Heli
 	HiddenUnderFog:
diff --git a/mods/ts/rules/gdi-infantry.yaml b/mods/ts/rules/gdi-infantry.yaml
index 81c8da6efa..d973817b65 100644
--- a/mods/ts/rules/gdi-infantry.yaml
+++ b/mods/ts/rules/gdi-infantry.yaml
@@ -174,7 +174,8 @@ JUMPJET.Husk:
 		Explosion:
 	Aircraft:
 		Speed: 186
-		FlightDynamics: VTOL, Slide, Hover, MoveIntoShroud
+		CanHover: True
+		VTOL: true
 	RenderSprites:
 		Image: jumpjet
 	WithSpriteBody: