diff --git a/OpenRA.Game/Graphics/SpriteLoader.cs b/OpenRA.Game/Graphics/SpriteLoader.cs
index 8d2035d0b7..34343340c4 100644
--- a/OpenRA.Game/Graphics/SpriteLoader.cs
+++ b/OpenRA.Game/Graphics/SpriteLoader.cs
@@ -34,7 +34,7 @@ namespace OpenRA.Graphics
 			// TODO: Cleanly abstract file type detection
 			if (filename.ToLower().EndsWith("r8"))
 			{
-				var r8 = new R8Reader(FileSystem.Open(filename));
+				var r8 = new R8Reader(FileSystem.OpenWithExts(filename, exts));
 				return r8.Select(a => SheetBuilder.Add(a.Image, a.Size, a.Offset)).ToArray();
 			}
 
diff --git a/mods/d2k/sequences/aircraft.yaml b/mods/d2k/sequences/aircraft.yaml
index bdbf974858..4a4bffa6b3 100644
--- a/mods/d2k/sequences/aircraft.yaml
+++ b/mods/d2k/sequences/aircraft.yaml
@@ -1,27 +1,27 @@
 carryall:
-	idle: DATA.R8
+	idle: DATA
 		Start: 1923
 		Facings: -32
-	unload: DATA.R8
+	unload: DATA
 		Start: 1923
 		Facings: -32
-	icon: DATA.R8
+	icon: DATA
 		Start: 4029
 		Offset: -30,-24
 
 
 orni:
-	idle: DATA.R8
+	idle: DATA
 		Start: 1955
 		Facings: -32
 		Length: 3
 		Tick: 120
 		Transpose: true
-	icon: DATA.R8
+	icon: DATA
 		Start: 4031
 		Offset: -30,-24
 
 frigate:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2517
 		Facings: 1
\ No newline at end of file
diff --git a/mods/d2k/sequences/infantry.yaml b/mods/d2k/sequences/infantry.yaml
index 7747737bbe..c86c982526 100644
--- a/mods/d2k/sequences/infantry.yaml
+++ b/mods/d2k/sequences/infantry.yaml
@@ -1,441 +1,441 @@
 rifle:
-	stand: DATA.R8
+	stand: DATA
 		Start: 206
 		Facings: -8
 		Transpose: true
-	stand2: DATA.R8
+	stand2: DATA
 		Start: 206
 		Facings: -8
 		Transpose: true
-	stand3: DATA.R8
+	stand3: DATA
 		Start: 206
 		Facings: -8
 		Transpose: true
-	run: DATA.R8
+	run: DATA
 		Start: 214
 		Length: 6
 		Facings: -8
 		Tick: 110
 		Transpose: true
-	shoot: DATA.R8
+	shoot: DATA
 		Start: 254
 		Length: 6
 		Facings: -8
 		Transpose: true
-	prone-stand: DATA.R8
+	prone-stand: DATA
 		Start: 302
 		Facings: -8
 		Transpose: true
-	prone-run: DATA.R8
+	prone-run: DATA
 		Start: 310
 		Length: 3
 		Facings: -8
 		Transpose: true
 		Tick: 110
-	standup-0: DATA.R8
+	standup-0: DATA
 		Start: 302
 		Facings: -8
 		Transpose: true
 		Tick: 120
-	prone-shoot: DATA.R8
+	prone-shoot: DATA
 		Start: 334
 		Length: 6
 		Facings: -8
 		Transpose: true
-	die1: DATA.R8
+	die1: DATA
 		Start: 382
 		Length: 5
-	die2: DATA.R8
+	die2: DATA
 		Start: 387
 		Length: 7
 		Tick: 80
-	die3: DATA.R8
+	die3: DATA
 		Start: 394
 		Length: 7
-	die4: DATA.R8
+	die4: DATA
 		Start: 401
 		Length: 7
-	die5: DATA.R8
+	die5: DATA
 		Start: 408
 		Length: 7
-	die6: DATA.R8
+	die6: DATA
 		Start: 415
 		Length: 12
-	die-crushed: DATA.R8
+	die-crushed: DATA
 		Start: 430
 		Length: 12
 		Tick: 1600
-	icon: DATA.R8
+	icon: DATA
 		Start: 4011
 		Offset: -30,-24
 
 bazooka:
-	stand: DATA.R8
+	stand: DATA
 		Start: 458
 		Facings: -8
 		Transpose: true
-	stand2: DATA.R8
+	stand2: DATA
 		Start: 458
 		Facings: -8
 		Transpose: true
-	stand3: DATA.R8
+	stand3: DATA
 		Start: 458
 		Facings: -8
 		Transpose: true
-	run: DATA.R8
+	run: DATA
 		Start: 466
 		Length: 6
 		Facings: -8
 		Tick: 120
 		Transpose: true
-	shoot: DATA.R8
+	shoot: DATA
 		Start: 506
 		Length: 6
 		Facings: -8
 		Transpose: true
-	prone-stand: DATA.R8
+	prone-stand: DATA
 		Start: 562
 		Length: 1
 		Facings: -8
 		Transpose: true
-	prone-run: DATA.R8
+	prone-run: DATA
 		Start: 570
 		Length: 3
 		Facings: -8
 		Transpose: true
 		Tick: 120
-	standup-0: DATA.R8
+	standup-0: DATA
 		Start: 554
 		Length: 1
 		Facings: -8
 		Transpose: true
-	prone-shoot: DATA.R8
+	prone-shoot: DATA
 		Start: 586
 		Length: 6
 		Facings: -8
 		Transpose: true
-	die1: DATA.R8
+	die1: DATA
 		Start: 634
 		Length: 5
-	die2: DATA.R8
+	die2: DATA
 		Start: 639
 		Length: 7
-	die3: DATA.R8
+	die3: DATA
 		Start: 646
 		Length: 7
-	die4: DATA.R8
+	die4: DATA
 		Start: 653
 		Length: 7
-	die5: DATA.R8
+	die5: DATA
 		Start: 660
 		Length: 7
-	die6: DATA.R8
+	die6: DATA
 		Start: 660
 		Length: 7
-	die-crushed: DATA.R8
+	die-crushed: DATA
 		Start: 668
 		Length: 26
 		Tick: 1600
-	icon: DATA.R8
+	icon: DATA
 		Start: 4012
 		Offset: -30,-24
 
 engineer:
-	stand: DATA.R8
+	stand: DATA
 		Start: 1166
 		Facings: -8
 		Transpose: true
-	stand2: DATA.R8
+	stand2: DATA
 		Start: 1166
 		Facings: -8
 		Transpose: true
-	run: DATA.R8
+	run: DATA
 		Start: 1174
 		Length: 6
 		Facings: -8
 		Transpose: true
 		Tick: 120
-	die1: DATA.R8
+	die1: DATA
 		Start: 1342
 		Length: 5
-	die2: DATA.R8
+	die2: DATA
 		Start: 1347
 		Length: 7
-	die3: DATA.R8
+	die3: DATA
 		Start: 1354
 		Length: 7
-	die4: DATA.R8
+	die4: DATA
 		Start: 1361
 		Length: 7
-	die5: DATA.R8
+	die5: DATA
 		Start: 1368
 		Length: 7
-	die6: DATA.R8
+	die6: DATA
 		Start: 1368
 		Length: 7
-	die-crushed: DATA.R8
+	die-crushed: DATA
 		Start: 1376
 		Length: 26
 		Tick: 1600
-	icon: DATA.R8
+	icon: DATA
 		Start: 4013
 		Offset: -30,-24
 
 medic: # actually thumper
-	stand: DATA.R8
+	stand: DATA
 		Start: 1402
 		Facings: -8
 		Transpose: true
-	stand2: DATA.R8
+	stand2: DATA
 		Start: 1402
 		Facings: -8
 		Transpose: true
-	run: DATA.R8
+	run: DATA
 		Start: 1410
 		Length: 6
 		Facings: -8
 		Transpose: true
 		Tick: 120
-	heal: DATA.R8
+	heal: DATA
 		Start: 1458
 		Length: 5
 		Tick: 480
-	die1: DATA.R8
+	die1: DATA
 		Start: 1543
 		Length: 5
-	die2: DATA.R8
+	die2: DATA
 		Start: 1548
 		Length: 7
-	die3: DATA.R8
+	die3: DATA
 		Start: 1555
 		Length: 7
-	die4: DATA.R8
+	die4: DATA
 		Start: 1562
 		Length: 7
-	die5: DATA.R8
+	die5: DATA
 		Start: 1569
 		Length: 7
-	die6: DATA.R8
+	die6: DATA
 		Start: 1569
 		Length: 7
-	die-crushed: DATA.R8
+	die-crushed: DATA
 		Start: 1577
 		Length: 26
 		Tick: 1600
-	icon: DATA.R8
+	icon: DATA
 		Start: 4014
 		Offset: -30,-24
 
 thumping:
-	idle: DATA.R8
+	idle: DATA
 		Start: 1458
 		Length: 5
 		Tick: 150
-	make: DATA.R8
+	make: DATA
 		Start: 1458
 		Length: 5
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 1458
 		Length: 5
 		Tick: 150
-	icon: DATA.R8
+	icon: DATA
 		Frames: 4014
 		Offset: -30,-24
 
 fremen:
-	stand: DATA.R8
+	stand: DATA
 		Start: 694
 		Facings: -8
 		Transpose: true
-	stand2: DATA.R8
+	stand2: DATA
 		Start: 694
 		Facings: -8
 		Transpose: true
-	run: DATA.R8
+	run: DATA
 		Start: 702
 		Length: 6
 		Facings: -8
 		Transpose: true
 		Tick: 120
-	shoot: DATA.R8
+	shoot: DATA
 		Start: 742
 		Length: 6
 		Facings: -8
 		Transpose: true
-	prone-stand: DATA.R8
+	prone-stand: DATA
 		Start: 798
 		Length: 1
 		Facings: -8
 		Transpose: true
-	prone-run: DATA.R8
+	prone-run: DATA
 		Start: 806
 		Length: 3
 		Facings: -8
 		Transpose: true
 		Tick: 120
-	standup-0: DATA.R8
+	standup-0: DATA
 		Start: 790
 		Length: 1
 		Facings: -8
 		Transpose: true
 		Tick: 120
-	prone-shoot: DATA.R8
+	prone-shoot: DATA
 		Start: 822
 		Length: 6
 		Facings: -8
 		Transpose: true
-	die1: DATA.R8
+	die1: DATA
 		Start: 870
 		Length: 5
-	die2: DATA.R8
+	die2: DATA
 		Start: 875
 		Length: 7
-	die3: DATA.R8
+	die3: DATA
 		Start: 882
 		Length: 7
-	die4: DATA.R8
+	die4: DATA
 		Start: 889
 		Length: 7
-	die5: DATA.R8
+	die5: DATA
 		Start: 896
 		Length: 7
-	die6: DATA.R8
+	die6: DATA
 		Start: 896
 		Length: 7
-	die-crushed: DATA.R8
+	die-crushed: DATA
 		Start: 904
 		Length: 26
 		Tick: 1600
-	icon: DATA.R8
+	icon: DATA
 		Start: 4032
 		Offset: -30,-24
 
 saboteur:
-	stand: DATA.R8
+	stand: DATA
 		Start: 2149
 		Facings: -8
 		Transpose: true
-	stand2: DATA.R8
+	stand2: DATA
 		Start: 2149
 		Facings: -8
 		Transpose: true
-	stand3: DATA.R8
+	stand3: DATA
 		Start: 2149
 		Facings: -8
 		Transpose: true
-	run: DATA.R8
+	run: DATA
 		Start: 2157
 		Length: 6
 		Facings: -8
 		Transpose: true
 		Tick: 120
-	prone-stand: DATA.R8
+	prone-stand: DATA
 		Start: 2253
 		Length: 1
 		Facings: -8
 		Transpose: true
-	prone-run: DATA.R8
+	prone-run: DATA
 		Start: 2261
 		Length: 3
 		Facings: -8
 		Transpose: true
 		Tick: 120
-	standup-0: DATA.R8
+	standup-0: DATA
 		Start: 2245
 		Length: 1
 		Facings: -8
 		Transpose: true
 		Tick: 120
-	die1: DATA.R8
+	die1: DATA
 		Start: 2325
 		Length: 5
-	die2: DATA.R8
+	die2: DATA
 		Start: 2330
 		Length: 7
-	die3: DATA.R8
+	die3: DATA
 		Start: 2337
 		Length: 7
-	die4: DATA.R8
+	die4: DATA
 		Start: 2344
 		Length: 7
-	die5: DATA.R8
+	die5: DATA
 		Start: 2351
 		Length: 7
-	die6: DATA.R8
+	die6: DATA
 		Start: 2351
 		Length: 7
-	die-crushed: DATA.R8
+	die-crushed: DATA
 		Start: 2359
 		Length: 26
 		Tick: 1600
-	icon: DATA.R8
+	icon: DATA
 		Start: 4034
 		Offset: -30,-24
 
 sardaukar:
-	stand: DATA.R8
+	stand: DATA
 		Start: 930
 		Facings: -8
 		Transpose: true
-	stand2: DATA.R8
+	stand2: DATA
 		Start: 930
 		Facings: -8
 		Transpose: true
-	run: DATA.R8
+	run: DATA
 		Start: 938
 		Length: 6
 		Facings: -8
 		Transpose: true
 		Tick: 120
-	shoot: DATA.R8
+	shoot: DATA
 		Start: 978
 		Length: 6
 		Facings: -8
 		Transpose: true
-	prone-stand: DATA.R8
+	prone-stand: DATA
 		Start: 1034
 		Length: 1
 		Facings: -8
 		Transpose: true
-	prone-run: DATA.R8
+	prone-run: DATA
 		Start: 1042
 		Length: 3
 		Facings: -8
 		Transpose: true
 		Tick: 120
-	standup-0: DATA.R8
+	standup-0: DATA
 		Start: 1026
 		Length: 1
 		Facings: -8
 		Transpose: true
 		Tick: 120
-	prone-shoot: DATA.R8
+	prone-shoot: DATA
 		Start: 1058
 		Length: 6
 		Facings: 8
 		Transpose: true
-	die1: DATA.R8
+	die1: DATA
 		Start: 1106
 		Length: 5
-	die2: DATA.R8
+	die2: DATA
 		Start: 1111
 		Length: 7
-	die3: DATA.R8
+	die3: DATA
 		Start: 1118
 		Length: 7
-	die4: DATA.R8
+	die4: DATA
 		Start: 1125
 		Length: 7
-	die5: DATA.R8
+	die5: DATA
 		Start: 1132
 		Length: 7
-	die6: DATA.R8
+	die6: DATA
 		Start: 1132
 		Length: 7
-	die-crushed: DATA.R8
+	die-crushed: DATA
 		Start: 1140
 		Length: 26
 		Tick: 1600
-	icon: DATA.R8
+	icon: DATA
 		Start: 4015
 		Offset: -30,-24
diff --git a/mods/d2k/sequences/misc.yaml b/mods/d2k/sequences/misc.yaml
index 50e14f4796..ceedd4c11b 100644
--- a/mods/d2k/sequences/misc.yaml
+++ b/mods/d2k/sequences/misc.yaml
@@ -1,87 +1,87 @@
 explosion:
-	piff: DATA.R8
+	piff: DATA
 		Start: 3626
 		Length: 5
-	piffs: DATA.R8
+	piffs: DATA
 		Start: 3429
 		Length: 4
 		Tick: 80
 		BlendMode: Additive
-	small_explosion: DATA.R8
+	small_explosion: DATA
 		Start: 3403
 		Length: 15
 		BlendMode: Additive
-	med_explosion: DATA.R8
+	med_explosion: DATA
 		Start: 3390
 		Length: 12
 		BlendMode: Additive
-	tiny_explosion: DATA.R8
+	tiny_explosion: DATA
 		Start: 3386
 		Length: 4
 		Tick: 80
 		BlendMode: Additive
-	nuke: DATA.R8
+	nuke: DATA
 		Start: 3965
 		Length: 14
 		Tick: 60
 		BlendMode: Additive
-	mini_explosion: DATA.R8
+	mini_explosion: DATA
 		Start: 3403
 		Length: 15
 		Tick: 60
 		BlendMode: Additive
-	self_destruct: DATA.R8
+	self_destruct: DATA
 		Start: 3433
 		Length: 15
 		BlendMode: Additive
-	building: DATA.R8
+	building: DATA
 		Start: 3448
 		Length: 22
 		BlendMode: Additive
-	large_explosion: DATA.R8
+	large_explosion: DATA
 		Start: 3988
 		Length: 22
 		BlendMode: Additive
-	artillery: DATA.R8
+	artillery: DATA
 		Start: 3988
 		Length: 22
 		BlendMode: Additive
-	small_artillery: DATA.R8
+	small_artillery: DATA
 		Start: 3390
 		Length: 12
 		Tick: 60
 		BlendMode: Additive
-	small_napalm: DATA.R8
+	small_napalm: DATA
 		Start: 3421
 		Length: 8
 		BlendMode: Additive
-	shockwave: DATA.R8
+	shockwave: DATA
 		Start: 3687
 		Length: 6
 		BlendMode: Additive
 		Tick: 120
-	deviator: DATA.R8
+	deviator: DATA
 		Start: 3512
 		Length: 23
 		BlendMode: Additive
 		Tick: 60
 
 laserfire:
-	idle: DATA.R8
+	idle: DATA
 		Start: 3386
 		Length: 4
 		Tick: 80
 		BlendMode: Additive
 
 pips:
-	groups: DATA.R8
+	groups: DATA
 		Start: 17
 		Length: 10
-	tag-primary: DATA.R8
+	tag-primary: DATA
 		Start: 110
-	pip-empty: DATA.R8
+	pip-empty: DATA
 		Start: 15
-	pip-green: DATA.R8
+	pip-green: DATA
 		Start: 16
 
 clock:
@@ -105,19 +105,19 @@ rank:
 		Length: *
 
 overlay:
-	build-valid-arrakis: DATA.R8
+	build-valid-arrakis: DATA
 		Start: 0
 		Offset: -16,-16
-	build-invalid: DATA.R8
+	build-invalid: DATA
 		Start: 1
 		Offset: -16,-16
-	target-select: DATA.R8
+	target-select: DATA
 		Start: 2
 		Offset: -16,-16
-	target-valid-arrakis: DATA.R8
+	target-valid-arrakis: DATA
 		Start: 0
 		Offset: -16,-16
-	target-invalid: DATA.R8
+	target-invalid: DATA
 		Start: 1
 		Offset: -16,-16
 
@@ -131,29 +131,29 @@ rallypoint:
 		Length: *
 
 rpg:
-	idle: DATA.R8
+	idle: DATA
 		Start: 3015
 		Facings: -32
 
 120mm:
-	idle: DATA.R8
+	idle: DATA
 		Start: 3014
 		Length: 1
 		BlendMode: Additive
 
 155mm:
-	idle: DATA.R8
+	idle: DATA
 		Start: 3081
 		Length: 1
 
 crate-effects:
-	dollar: DATA.R8
+	dollar: DATA
 		Start: 3679
 		Length: 8
-	reveal-map: DATA.R8
+	reveal-map: DATA
 		Start: 3947
 		Length: 18
-	hide-map: DATA.R8
+	hide-map: DATA
 		Start: 3911
 		Length: 36
 	levelup: levelup
@@ -162,70 +162,70 @@ crate-effects:
 		Tick: 200
 
 allyrepair:
-	repair: DATA.R8
+	repair: DATA
 		Frames: 3, 39
 		Length: 2
 		Tick: 300
 
 missile:
-	idle: DATA.R8
+	idle: DATA
 		Start: 3088
 		Facings: -32
 
 missile2:
-	idle: DATA.R8
+	idle: DATA
 		Start: 3306
 		Facings: -32
 
 atomic:
-	up: DATA.R8
+	up: DATA
 		Start: 2147
 		Length: 1
-	down: DATA.R8
+	down: DATA
 		Start: 2148
 		Length: 1
 
 fire:
-	1: DATA.R8
+	1: DATA
 		Start: 3712
 		Length: 10
 		Offset: 0,-3
 		BlendMode: Additive
-	2: DATA.R8
+	2: DATA
 		Start: 3723
 		Length: 11
 		Offset: 0,-3
 		BlendMode: Additive
-	3: DATA.R8
+	3: DATA
 		Start: 3885
 		Length: 13
 		Offset: 0,-3
 		BlendMode: Additive
-	4: DATA.R8
+	4: DATA
 		Start: 3712
 		Length: 10
 		Offset: 0,-3
 		BlendMode: Additive
 
 smoke_m:
-	idle: DATA.R8
+	idle: DATA
 		Start: 3418
 		Length: 2
 		BlendMode: Additive
-	loop: DATA.R8
+	loop: DATA
 		Start: 3418
 		Length: 2
 		BlendMode: Additive
-	end: DATA.R8
+	end: DATA
 		Start: 3418
 		Length: 3
 		BlendMode: Additive
 
 bombs:
-	open: DATA.R8
+	open: DATA
 		Start: 3280
 		Length: 4
-	idle: DATA.R8
+	idle: DATA
 		Start: 3280
 		Length: 4
 
@@ -248,59 +248,59 @@ waypoint:
 		Length: *
 
 sietch:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2998
 
 doubleblast:
-	idle: DATA.R8
+	idle: DATA
 		Start: 3279
 		Facings: -16
 		BlendMode: Additive
 
 doubleblastbullet:
-	idle: DATA.R8
+	idle: DATA
 		Start: 3248
 		Facings: -16
 		BlendMode: Additive
 
 icon:
-	paratroopers: DATA.R8
+	paratroopers: DATA
 		Start: 4029
 		Offset: -30,-24
-	ornistrike: DATA.R8
+	ornistrike: DATA
 		Start: 4031
 		Offset: -30,-24
-	deathhand: DATA.R8
+	deathhand: DATA
 		Start: 4035
 		Offset: -30,-24
 
 crate:
-	idle: DATA.R8
+	idle: DATA
 		Start: 102
 		ZOffset: -511
 		Offset: -16,-16
-	land: DATA.R8
+	land: DATA
 		Start: 102
 		ZOffset: -511
 		Offset: -16,-16
 
 spicebloom:
-	make: DATA.R8
+	make: DATA
 		Start: 107
 		Length: 3
 		Offset: -16,-16
-	active: DATA.R8
+	active: DATA
 		Start: 109
 		Length: 1
 		ZOffset: -511
 		Offset: -16,-16
-	idle: DATA.R8
+	idle: DATA
 		Start: 109
 		ZOffset: -511
 		Offset: -16,-16
 
 moveflsh:
-	idle: DATA.R8
+	idle: DATA
 		Start: 3621
 		Length: 5
 		Tick: 80
diff --git a/mods/d2k/sequences/structures.yaml b/mods/d2k/sequences/structures.yaml
index 03825fad21..61995dceb0 100644
--- a/mods/d2k/sequences/structures.yaml
+++ b/mods/d2k/sequences/structures.yaml
@@ -1,1618 +1,1618 @@
 walla:
-	idle: DATA.R8
+	idle: DATA
 		Frames: 2527, 2530, 2528, 2538, 2531, 2532, 2542, 2535, 2529, 2539, 2533, 2534, 2540, 2536, 2537, 2541
 		Length: 16
 		Offset: -16,16
-	scratched-idle: DATA.R8
+	scratched-idle: DATA
 		Frames: 2527, 2530, 2528, 2538, 2531, 2532, 2542, 2535, 2529, 2539, 2533, 2534, 2540, 2536, 2537, 2541
 		Length: 16
 		Offset: -16,16
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Frames: 2543, 2546, 2544, 2554, 2547, 2548, 2558, 2551, 2545, 2555, 2549, 2550, 2556, 2552, 2553, 2557
 		Length: 16
 		Offset: -16,16
-	critical-idle: DATA.R8
+	critical-idle: DATA
 		Frames: 2543, 2546, 2544, 2554, 2547, 2548, 2558, 2551, 2545, 2555, 2549, 2550, 2556, 2552, 2553, 2557
 		Length: 16
 		Offset: -16,16
-	icon: DATA.R8
+	icon: DATA
 		Start: 4063
 		Offset: -30,-24
 
 wallh:
-	idle: DATA.R8
+	idle: DATA
 		Frames: 2687, 2690, 2688, 2698, 2691, 2692, 2702, 2695, 2689, 2699, 2693, 2694, 2700, 2696, 2697, 2701
 		Length: 16
 		Offset: -16,16
-	scratched-idle: DATA.R8
+	scratched-idle: DATA
 		Frames: 2687, 2690, 2688, 2698, 2691, 2692, 2702, 2695, 2689, 2699, 2693, 2694, 2700, 2696, 2697, 2701
 		Length: 16
 		Offset: -16,16
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Frames: 2703, 2706, 2704, 2714, 2707, 2708, 2718, 2711, 2705, 2715, 2709, 2710, 2716, 2712, 2713, 2717
 		Length: 16
 		Offset: -16,16
-	critical-idle: DATA.R8
+	critical-idle: DATA
 		Frames: 2703, 2706, 2704, 2714, 2707, 2708, 2718, 2711, 2705, 2715, 2709, 2710, 2716, 2712, 2713, 2717
 		Length: 16
 		Offset: -16,16
-	icon: DATA.R8
+	icon: DATA
 		Start: 4064
 		Offset: -30,-24
 
 wallo:
-	idle: DATA.R8
+	idle: DATA
 		Frames: 2847, 2850, 2848, 2858, 2851, 2852, 2862, 2855, 2849, 2859, 2853, 2854, 2860, 2856, 2857, 2861
 		Length: 16
 		Offset: -16,16
-	scratched-idle: DATA.R8
+	scratched-idle: DATA
 		Frames: 2847, 2850, 2848, 2858, 2851, 2852, 2862, 2855, 2849, 2859, 2853, 2854, 2860, 2856, 2857, 2861
 		Length: 16
 		Offset: -16,16
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Frames: 2863, 2866, 2864, 2874, 2867, 2868, 2878, 2871, 2865, 2875, 2869, 2870, 2876, 2872, 2873, 2877
 		Length: 16
 		Offset: -16,16
-	critical-idle: DATA.R8
+	critical-idle: DATA
 		Frames: 2863, 2866, 2864, 2874, 2867, 2868, 2878, 2871, 2865, 2875, 2869, 2870, 2876, 2872, 2873, 2877
 		Length: 16
 		Offset: -16,16
-	icon: DATA.R8
+	icon: DATA
 		Start: 4065
 		Offset: -30,-24
 
 guntowera:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2573
 		Facings: 1
 		Offset: -24,24
-	recoil: DATA.R8
+	recoil: DATA
 		Start: 2573
 		Facings: 1
 		Offset: -24,24
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2573
 		Facings: 1
 		Offset: -24,24
-	damaged-recoil: DATA.R8
+	damaged-recoil: DATA
 		Start: 2573
 		Facings: 1
 		Offset: -24,24
-	turret: DATA.R8
+	turret: DATA
 		Start: 2589
 		Facings: -32
 		Offset: -24,24
-	muzzle: DATA.R8
+	muzzle: DATA
 		Frames: 3775, 3775, 3776, 3776, 3777, 3777, 3778, 3778, 3779, 3779, 3780, 3780, 3781, 3781, 3782, 3782, 3783, 3783, 3784, 3784, 3785, 3785, 3786, 3786, 3787, 3787, 3788, 3788, 3789, 3789, 3790, 3790, 3791, 3791, 3792, 3792, 3793, 3793, 3794, 3794, 3795, 3795, 3796, 3796, 3797, 3797, 3798, 3798, 3799, 3799, 3800, 3800, 3801, 3801, 3802, 3802, 3803, 3803, 3804, 3804, 3805, 3805, 3806, 3806
 		Facings: -32
 		Length: 2
 		BlendMode: Additive
-	icon: DATA.R8
+	icon: DATA
 		Start: 4069
 		Offset: -30,-24
 
 guntowerh:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2733
 		Facings: 1
 		Offset: -24,24
-	recoil: DATA.R8
+	recoil: DATA
 		Start: 2733
 		Facings: 1
 		Offset: -24,24
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2733
 		Facings: 1
 		Offset: -24,24
-	damaged-recoil: DATA.R8
+	damaged-recoil: DATA
 		Start: 2733
 		Facings: 1
 		Offset: -24,24
-	turret: DATA.R8
+	turret: DATA
 		Start: 2749
 		Facings: -32
 		Offset: -24,24
-	muzzle: DATA.R8
+	muzzle: DATA
 		Frames: 3775, 3775, 3776, 3776, 3777, 3777, 3778, 3778, 3779, 3779, 3780, 3780, 3781, 3781, 3782, 3782, 3783, 3783, 3784, 3784, 3785, 3785, 3786, 3786, 3787, 3787, 3788, 3788, 3789, 3789, 3790, 3790, 3791, 3791, 3792, 3792, 3793, 3793, 3794, 3794, 3795, 3795, 3796, 3796, 3797, 3797, 3798, 3798, 3799, 3799, 3800, 3800, 3801, 3801, 3802, 3802, 3803, 3803, 3804, 3804, 3805, 3805, 3806, 3806
 		Facings: -32
 		Length: 2
 		BlendMode: Additive
-	icon: DATA.R8
+	icon: DATA
 		Frames: 4070
 		Offset: -30,-24
 
 guntowero:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2893
 		Facings: 1
 		Offset: -24,24
-	recoil: DATA.R8
+	recoil: DATA
 		Start: 2893
 		Facings: 1
 		Offset: -24,24
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2893
 		Facings: 1
 		Offset: -24,24
-	damaged-recoil: DATA.R8
+	damaged-recoil: DATA
 		Start: 2893
 		Facings: 1
 		Offset: -24,24
-	turret: DATA.R8
+	turret: DATA
 		Start: 2909
 		Facings: -32
 		Offset: -24,24
-	muzzle: DATA.R8
+	muzzle: DATA
 		Frames: 3775, 3775, 3776, 3776, 3777, 3777, 3778, 3778, 3779, 3779, 3780, 3780, 3781, 3781, 3782, 3782, 3783, 3783, 3784, 3784, 3785, 3785, 3786, 3786, 3787, 3787, 3788, 3788, 3789, 3789, 3790, 3790, 3791, 3791, 3792, 3792, 3793, 3793, 3794, 3794, 3795, 3795, 3796, 3796, 3797, 3797, 3798, 3798, 3799, 3799, 3800, 3800, 3801, 3801, 3802, 3802, 3803, 3803, 3804, 3804, 3805, 3805, 3806, 3806
 		Facings: -32
 		Length: 2
 		BlendMode: Additive
-	icon: DATA.R8
+	icon: DATA
 		Start: 4071
 		Offset: -30,-24
 
 rockettowera:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2733
 		Facings: 1
 		Offset: -24,24
-	recoil: DATA.R8
+	recoil: DATA
 		Start: 2733
 		Facings: 1
 		Offset: -24,24
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2733
 		Facings: 1
 		Offset: -24,24
-	damaged-recoil: DATA.R8
+	damaged-recoil: DATA
 		Start: 2733
 		Facings: 1
 		Offset: -24,24
-	turret: DATA.R8
+	turret: DATA
 		Start: 2637
 		Facings: -32
 		Offset: -24,24
-	icon: DATA.R8
+	icon: DATA
 		Start: 4075
 		Offset: -30,-24
 
 rockettowerh:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2781
 		Facings: 1
 		Offset: -24,24
-	recoil: DATA.R8
+	recoil: DATA
 		Start: 2781
 		Facings: 1
 		Offset: -24,24
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2781
 		Facings: 1
 		Offset: -24,24
-	damaged-recoil: DATA.R8
+	damaged-recoil: DATA
 		Start: 2781
 		Facings: 1
 		Offset: -24,24
-	turret: DATA.R8
+	turret: DATA
 		Start: 2797
 		Facings: -32
 		Offset: -24,24
-	icon: DATA.R8
+	icon: DATA
 		Start: 4076
 		Offset: -30,-24
 
 rockettowero:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2941
 		Facings: 1
 		Offset: -24,24
-	recoil: DATA.R8
+	recoil: DATA
 		Start: 2941
 		Facings: 1
 		Offset: -24,24
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2941
 		Facings: 1
 		Offset: -24,24
-	damaged-recoil: DATA.R8
+	damaged-recoil: DATA
 		Start: 2941
 		Facings: 1
 		Offset: -24,24
-	turret: DATA.R8
+	turret: DATA
 		Start: 2957
 		Facings: -32
 		Offset: -24,24
-	icon: DATA.R8
+	icon: DATA
 		Start: 4077
 		Offset: -30,-24
 
 conyarda:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2559
 		Offset: -48,64
-	make: DATA.R8
+	make: DATA
 		Start: 4109
 		Length: 30
 		Offset: -48,64
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4139
 		Length: 12
 		Offset: -48,64
 		Tick: 170
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2560
 		Offset: -48,64
-#	build: DATA.R8 # TODO: overlay
+#	build: DATA # TODO: overlay
 #		Start: 4436
 #		Length: 14
 #		Offset: -48,64
-#	damaged-build: DATA.R8  # TODO: overlay
+#	damaged-build: DATA  # TODO: overlay
 #		Start: 4436
 #		Length: 14
 #		Offset: -48,64
-	bib: BLOXBASE.R8
+	bib: BLOXBASE
 		Frames: 611, 612, 613, 631, 632, 633
 		Length: 6
 		Offset: -16,-16
-	icon: DATA.R8
+	icon: DATA
 		Start: 4046
 		Offset: -30,-24
 
 repaira:
-	make: DATA.R8
+	make: DATA
 		Start: 4370
 		Length: 10
 		Offset: -48,48
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4380
 		Length: 10
 		Offset: -48,48
 		Tick: 100
-	idle: DATA.R8
+	idle: DATA
 		Start: 2571
 		Offset: -48,48
 		ZOffset: -1c511
-#	active: DATA.R8 # TODO: overlay
+#	active: DATA # TODO: overlay
 #		Start: 4746
 #		Length: 14
 #		Offset: -48,48
 #		ZOffset: -1c511
-#	damaged-active: DATA.R8 # TODO: overlay
+#	damaged-active: DATA # TODO: overlay
 #		Start: 4746
 #		Length: 14
 #		Tick: 60
 #		Offset: -48,48
 #		ZOffset: -1c511
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2572
 		Offset: -48,48
 		ZOffset: -1c511
-	icon: DATA.R8
+	icon: DATA
 		Start: 4096
 		Offset: -30,-24
 
 repairh:
-	make: DATA.R8
+	make: DATA
 		Start: 4370
 		Length: 10
 		Offset: -48,48
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4380
 		Length: 10
 		Offset: -48,48
 		Tick: 100
-	idle: DATA.R8
+	idle: DATA
 		Start: 2731
 		Offset: -48,48
 		ZOffset: -1c511
-#	active: DATA.R8 # TODO: overlay
+#	active: DATA # TODO: overlay
 #		Start: 4746
 #		Length: 14
 #		Offset: -48,48
 #		ZOffset: -1c511
-#	damaged-active: DATA.R8 # TODO: overlay
+#	damaged-active: DATA # TODO: overlay
 #		Start: 4746
 #		Length: 14
 #		Tick: 60
 #		Offset: -48,48
 #		ZOffset: -1c511
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2732
 		Offset: -48,48
 		ZOffset: -1c511
-	icon: DATA.R8
+	icon: DATA
 		Start: 4097
 		Offset: -30,-24
 
 repairo:
-	make: DATA.R8
+	make: DATA
 		Start: 4370
 		Length: 10
 		Offset: -48,48
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4380
 		Length: 10
 		Offset: -48,48
 		Tick: 100
-	idle: DATA.R8
+	idle: DATA
 		Start: 2891
 		Offset: -48,48
 		ZOffset: -1c511
-#	active: DATA.R8 # TODO: overlay
+#	active: DATA # TODO: overlay
 #		Start: 4746
 #		Length: 14
 #		Offset: -48,48
 #		ZOffset: -1c511
-#	damaged-active: DATA.R8 # TODO: overlay
+#	damaged-active: DATA # TODO: overlay
 #		Start: 4746
 #		Length: 14
 #		Tick: 60
 #		Offset: -48,48
 #		ZOffset: -1c511
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2892
 		Offset: -48,48
 		ZOffset: -1c511
-	icon: DATA.R8
+	icon: DATA
 		Start: 4098
 		Offset: -30,-24
 
 starporta:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2671
 		ZOffset: -1c511
 		Offset: -48,64
-	active: DATA.R8
+	active: DATA
 		Start: 2671
 		Length: 1
 		ZOffset: -1c511
 		Offset: -48,64
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2672
 		ZOffset: -1c511
 		Offset: -48,64
-	damaged-active: DATA.R8
+	damaged-active: DATA
 		Start: 2672
 		ZOffset: -1c511
 		Offset: -48,64
-	make: DATA.R8
+	make: DATA
 		Start: 4347
 		Length: 11
 		Offset: -48,64
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4358
 		Length: 11
 		Offset: -48,64
 		Tick: 100
-	bib: BLOXBASE.R8
+	bib: BLOXBASE
 		Frames: 611, 612, 613, 631, 632, 633
 		Length: 6
 		Offset: -16,-16
-	icon: DATA.R8
+	icon: DATA
 		Start: 4092
 		Offset: -30,-24
 
 pwra:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2523
 		Offset: -32,64
-	make: DATA.R8
+	make: DATA
 		Start: 4151
 		Length: 12
 		Offset: -32,64
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4163
 		Length: 12
 		Offset: -32,64
 		Tick: 100
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2524
 		Offset: -32,64
-	idle-zaps: DATA.R8
+	idle-zaps: DATA
 		Start: 4492
 		Length: 10
 		Offset: -32,64
 		Tick: 200
-	damaged-idle-zaps: DATA.R8
+	damaged-idle-zaps: DATA
 		Start: 4497
 		Length: 5
 		Offset: -32,64
 		Tick: 200
-	bib: BLOXBASE.R8
+	bib: BLOXBASE
 		Frames: 617, 618, 637, 638
 		Length: 4
 		Offset: -16,-16
-	icon: DATA.R8
+	icon: DATA
 		Start: 4056
 		Offset: -30,-24
 
 barra:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2525
 		Offset: -32,64
-	make: DATA.R8
+	make: DATA
 		Start: 4213
 		Length: 8
 		Offset: -32,64
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4221
 		Length: 9
 		Offset: -32,64
 		Tick: 100
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2526
 		Offset: -32,64
-	bib: BLOXBASE.R8
+	bib: BLOXBASE
 		Frames: 617, 618, 637, 638
 		Length: 4
 		Offset: -16,-16
-	icon: DATA.R8
+	icon: DATA
 		Start: 4059
 		Offset: -30,-24
 
 radara:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2521
 		Offset: -48,80
-	make: DATA.R8
+	make: DATA
 		Start: 4254
 		Length: 9
 		Offset: -48,80
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4263
 		Length: 10
 		Offset: -48,80
 		Tick: 100
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2522
 		Offset: -48,80
-	idle-dish: DATA.R8
+	idle-dish: DATA
 		Start: 4522
 		Length: 30
 		Offset: -48,80
-	bib: BLOXBASE.R8
+	bib: BLOXBASE
 		Frames: 611, 612, 613, 631, 632, 633
 		Length: 6
 		Offset: -16,-16
-	icon: DATA.R8
+	icon: DATA
 		Start: 4072
 		Offset: -30,-24
 
 refa:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2561
 		Length: 1
 		Offset: -48,64
-	make: DATA.R8
+	make: DATA
 		Start: 4231
 		Length: 11
 		Offset: -48,64
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4241
 		Length: 12
 		Offset: -48,64
 		Tick: 100
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2561
 		Offset: -48,64
-	idle-top: DATA.R8
+	idle-top: DATA
 		Start: 2562
 		Offset: -48,64
-	damaged-idle-top: DATA.R8
+	damaged-idle-top: DATA
 		Start: 2563
 		Offset: -48,64
-	bib: BLOXBASE.R8
+	bib: BLOXBASE
 		Frames: 611, 612, 613, 631, 632, 633
 		Length: 6
 		Offset: -16,-16
-	icon: DATA.R8
+	icon: DATA
 		Start: 4066
 		Offset: -30,-24
 
 siloa:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2566
 		Length: 4
 		Offset: -16,16
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2569
 		Length: 1
 		Offset: -16,16
-	make: DATA.R8
+	make: DATA
 		Start: 4313
 		Length: 7
 		Offset: -16,16
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4320
 		Length: 7
 		Offset: -16,16
 		Tick: 200
-	icon: DATA.R8
+	icon: DATA
 		Start: 4084
 		Offset: -30,-24
 
 hightecha:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2564
 		Offset: -48,80
-	make: DATA.R8
+	make: DATA
 		Start: 4274
 		Length: 10
 		Offset: -48,80
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4284
 		Length: 10
 		Offset: -48,80
 		Tick: 100
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2565
 		Offset: -48,80
-	idle-welding: DATA.R8
+	idle-welding: DATA
 		Start: 4614
 		Length: 30
 		Offset: -48,80
 		Tick: 500
 		BlendMode: Additive
-	bib: BLOXBASE.R8
+	bib: BLOXBASE
 		Frames: 611, 612, 613, 631, 632, 633
 		Length: 6
 		Offset: -16,-16
-	icon: DATA.R8
+	icon: DATA
 		Start: 4078
 		Offset: -30,-24
 
 researcha:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2669
 		Offset: -48,80
-	make: DATA.R8
+	make: DATA
 		Start: 4391
 		Length: 10
 		Offset: -48,80
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4401
 		Length: 11
 		Offset: -48,80
 		Tick: 100
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2670
 		Offset: -48,80
-	idle-lights: DATA.R8
+	idle-lights: DATA
 		Start: 4760
 		Length: 60
 		Tick: 80
 		Offset: -48,80
-	bib: BLOXBASE.R8
+	bib: BLOXBASE
 		Frames: 611, 612, 613, 631, 632, 633
 		Length: 6
 		Offset: -16,-16
-	icon: DATA.R8
+	icon: DATA
 		Start: 4099
 		Offset: -30,-24
 
 researchh:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2829
 		Offset: -48,80
-	make: DATA.R8
+	make: DATA
 		Start: 4391
 		Length: 10
 		Offset: -48,80
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4401
 		Length: 11
 		Offset: -48,80
 		Tick: 100
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2830
 		Offset: -48,80
-	idle-lights: DATA.R8
+	idle-lights: DATA
 		Start: 4760
 		Length: 60
 		Tick: 80
 		Offset: -48,80
-	bib: BLOXBASE.R8
+	bib: BLOXBASE
 		Frames: 611, 612, 613, 631, 632, 633
 		Length: 6
 		Offset: -16,-16
-	icon: DATA.R8
+	icon: DATA
 		Start: 4100
 		Offset: -30,-24
 
 researcho:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2989
 		Offset: -48,80
-	make: DATA.R8
+	make: DATA
 		Start: 4391
 		Length: 10
 		Offset: -48,80
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4401
 		Length: 11
 		Offset: -48,80
 		Tick: 100
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2990
 		Offset: -48,80
-	idle-lights: DATA.R8
+	idle-lights: DATA
 		Start: 4760
 		Length: 60
 		Tick: 80
 		Offset: -48,80
-	bib: BLOXBASE.R8
+	bib: BLOXBASE
 		Frames: 611, 612, 613, 631, 632, 633
 		Length: 6
 		Offset: -16,-16
-	icon: DATA.R8
+	icon: DATA
 		Start: 4101
 		Offset: -30,-24
 
 palacea:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2676
 		Offset: -48,48
-	make: DATA.R8
+	make: DATA
 		Start: 4413
 		Length: 11
 		Offset: -48,64
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4424
 		Length: 11
 		Offset: -48,64
 		Tick: 100
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2677
 		Offset: -48,48
-	bib: BLOXBASE.R8
+	bib: BLOXBASE
 		Frames: 611, 612, 613, 631, 632, 633
 		Length: 6
 		Offset: -16,-16
-	icon: DATA.R8
+	icon: DATA
 		Start: 4102
 		Offset: -30,-24
 
 lighta:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2673
 		Length: 1
 		Offset: -48,64
-	make: DATA.R8
+	make: DATA
 		Start: 4295
 		Length: 8
 		Offset: -48,64
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4303
 		Length: 9
 		Offset: -48,64
 		Tick: 100
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2673
 		Offset: -48,64
-	build-top: DATA.R8
+	build-top: DATA
 		Start: 2674
 		Length: 1
 		Offset: -48,64
-	damaged-build-top: DATA.R8
+	damaged-build-top: DATA
 		Start: 2675
 		Length: 1
 		Offset: -48,64
-	idle-top: DATA.R8
+	idle-top: DATA
 		Start: 2674
 		Offset: -48,64
-	damaged-idle-top: DATA.R8
+	damaged-idle-top: DATA
 		Start: 2675
 		Offset: -48,64
-	idle-welding: DATA.R8
+	idle-welding: DATA
 		Start: 4644
 		Length: 30
 		Offset: -48,64
 		Tick: 200
 		BlendMode: Additive
-	bib: BLOXBASE.R8
+	bib: BLOXBASE
 		Frames: 611, 612, 613, 631, 632, 633
 		Length: 6
 		Offset: -16,-16
-	icon: DATA.R8
+	icon: DATA
 		Start: 4081
 		Offset: -30,-24
 
 heavya:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2518
 		Length: 1
 		Offset: -48,80
-	make: DATA.R8
+	make: DATA
 		Start: 4328
 		Length: 9
 		Offset: -48,80
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4337
 		Length: 9
 		Offset: -48,80
 		Tick: 100
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2518
 		Offset: -48,80
-	build-top: DATA.R8
+	build-top: DATA
 		Start: 2519
 		Length: 1
 		Offset: -48,80
-	damaged-build-top: DATA.R8
+	damaged-build-top: DATA
 		Start: 2520
 		Length: 1
 		Offset: -48,80
-	idle-top: DATA.R8
+	idle-top: DATA
 		Start: 2519
 		Offset: -48,80
-	damaged-idle-top: DATA.R8
+	damaged-idle-top: DATA
 		Start: 2520
 		Offset: -48,80
-	idle-welding: DATA.R8
+	idle-welding: DATA
 		Start: 4674
 		Length: 47
 		Offset: -48,80
 		Tick: 200
 		BlendMode: Additive
-	bib: BLOXBASE.R8
+	bib: BLOXBASE
 		Frames: 611, 612, 613, 631, 632, 633
 		Length: 6
 		Offset: -16,-16
-	icon: DATA.R8
+	icon: DATA
 		Start: 4087
 		Offset: -30,-24
 
 conyardh:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2719
 		Offset: -48,64
-	make: DATA.R8
+	make: DATA
 		Start: 4109
 		Length: 30
 		Offset: -48,64
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4139
 		Length: 12
 		Offset: -48,64
 		Tick: 170
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2720
 		Offset: -48,64
-#	build: DATA.R8  # TODO: overlay
+#	build: DATA  # TODO: overlay
 #		Start: 4450
 #		Length: 14
 #		Offset: -48,64
-#	damaged-build: DATA.R8  # TODO: overlay
+#	damaged-build: DATA  # TODO: overlay
 #		Start: 4450
 #		Length: 14
 #		Offset: -48,64
-	bib: BLOXBASE.R8
+	bib: BLOXBASE
 		Frames: 611, 612, 613, 631, 632, 633
 		Length: 6
 		Offset: -16,-16
-	icon: DATA.R8
+	icon: DATA
 		Start: 4047
 		Offset: -30,-24
 
 starporth:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2831
 		ZOffset: -1c511
 		Offset: -48,64
-	active: DATA.R8
+	active: DATA
 		Start: 2831
 		Length: 1
 		Offset: -48,64
 		ZOffset: -1c511
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2832
 		Offset: -48,64
 		ZOffset: -1c511
-	damaged-active: DATA.R8
+	damaged-active: DATA
 		Start: 2832
 		Offset: -48,64
 		ZOffset: -1c511
-	make: DATA.R8
+	make: DATA
 		Start: 4347
 		Length: 11
 		Offset: -48,64
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4358
 		Length: 11
 		Offset: -48,64
 		Tick: 100
-	bib: BLOXBASE.R8
+	bib: BLOXBASE
 		Frames: 611, 612, 613, 631, 632, 633
 		Length: 6
 		Offset: -16,-16
-	icon: DATA.R8
+	icon: DATA
 		Start: 4093
 		Offset: -30,-24
 
 pwrh:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2683
 		Offset: -32,64
-	make: DATA.R8
+	make: DATA
 		Start: 4151
 		Length: 12
 		Offset: -32,64
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4163
 		Length: 12
 		Offset: -32,64
 		Tick: 100
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2684
 		Offset: -32,64
-	idle-zaps: DATA.R8
+	idle-zaps: DATA
 		Start: 4502
 		Length: 10
 		Offset: -32,64
 		Tick: 200
-	damaged-idle-zaps: DATA.R8
+	damaged-idle-zaps: DATA
 		Start: 4507
 		Length: 5
 		Offset: -32,64
 		Tick: 200
-	bib: BLOXBASE.R8
+	bib: BLOXBASE
 		Frames: 617, 618, 637, 638
 		Length: 4
 		Offset: -16,-16
-	icon: DATA.R8
+	icon: DATA
 		Start: 4057
 		Offset: -30,-24
 
 barrh:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2685
 		Offset: -32,64
-	make: DATA.R8
+	make: DATA
 		Start: 4213
 		Length: 8
 		Offset: -32,64
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4221
 		Length: 9
 		Offset: -32,64
 		Tick: 100
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2686
 		Offset: -32,64
-	bib: BLOXBASE.R8
+	bib: BLOXBASE
 		Frames: 617, 618, 637, 638
 		Length: 4
 		Offset: -16,-16
-	icon: DATA.R8
+	icon: DATA
 		Start: 4060
 		Offset: -30,-24
 
 radarh:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2681
 		Offset: -48,80
-	make: DATA.R8
+	make: DATA
 		Start: 4254
 		Length: 9
 		Offset: -48,80
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4263
 		Length: 10
 		Offset: -48,80
 		Tick: 100
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2682
 		Offset: -48,80
-	idle-dish: DATA.R8
+	idle-dish: DATA
 		Start: 4553
 		Length: 30
 		Offset: -48,80
-	bib: BLOXBASE.R8
+	bib: BLOXBASE
 		Frames: 611, 612, 613, 631, 632, 633
 		Length: 6
 		Offset: -16,-16
-	icon: DATA.R8
+	icon: DATA
 		Start: 4073
 		Offset: -30,-24
 
 refh:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2721
 		Length: 1
 		Offset: -48,64
-	make: DATA.R8
+	make: DATA
 		Start: 4231
 		Length: 11
 		Offset: -48,64
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4241
 		Length: 12
 		Offset: -48,64
 		Tick: 100
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2721
 		Offset: -48,64
-	idle-top: DATA.R8
+	idle-top: DATA
 		Start: 2722
 		Offset: -48,64
-	damaged-idle-top: DATA.R8
+	damaged-idle-top: DATA
 		Start: 2723
 		Offset: -48,64
-	bib: BLOXBASE.R8
+	bib: BLOXBASE
 		Frames: 611, 612, 613, 631, 632, 633
 		Length: 6
 		Offset: -16,-16
-	icon: DATA.R8
+	icon: DATA
 		Start: 4067
 		Offset: -30,-24
 
 siloh:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2726
 		Length: 4
 		Offset: -16,16
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2730
 		Length: 1
 		Offset: -16,16
-	make: DATA.R8
+	make: DATA
 		Start: 4313
 		Length: 7
 		Offset: -16,16
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4320
 		Length: 7
 		Offset: -16,16
 		Tick: 200
-	icon: DATA.R8
+	icon: DATA
 		Start: 4085
 		Offset: -30,-24
 
 hightechh:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2724
 		Offset: -48,80
-	make: DATA.R8
+	make: DATA
 		Start: 4274
 		Length: 10
 		Offset: -48,80
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4284
 		Length: 10
 		Offset: -48,80
 		Tick: 100
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2725
 		Offset: -48,80
-	idle-welding: DATA.R8
+	idle-welding: DATA
 		Start: 4614
 		Length: 30
 		Offset: -48,80
 		Tick: 500
 		BlendMode: Additive
-	bib: BLOXBASE.R8
+	bib: BLOXBASE
 		Frames: 611, 612, 613, 631, 632, 633
 		Length: 6
 		Offset: -16,-16
-	icon: DATA.R8
+	icon: DATA
 		Start: 4079
 		Offset: -30,-24
 
 palaceh:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2836
 		Offset: -48,64
-	make: DATA.R8
+	make: DATA
 		Start: 4413
 		Length: 11
 		Offset: -48,64
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4424
 		Length: 11
 		Offset: -48,64
 		Tick: 100
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2837
 		Offset: -48,64
-#	active: DATA.R8 # TODO: overlay
+#	active: DATA # TODO: overlay
 #		Start: 4820
 #		Length: 20
 #		Offset: -48,64
-	damaged-active: DATA.R8
+	damaged-active: DATA
 		Start: 4820
 		Length: 20
 		Offset: -48,64
-	bib: BLOXBASE.R8
+	bib: BLOXBASE
 		Frames: 611, 612, 613, 631, 632, 633
 		Length: 6
 		Offset: -16,-16
-	icon: DATA.R8
+	icon: DATA
 		Start: 4103
 		Offset: -30,-24
 
 lighth:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2833
 		Length: 1
 		Offset: -48,64
-	make: DATA.R8
+	make: DATA
 		Start: 4295
 		Length: 8
 		Offset: -48,64
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4303
 		Length: 9
 		Offset: -48,64
 		Tick: 100
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2833
 		Offset: -48,64
-	build-top: DATA.R8
+	build-top: DATA
 		Start: 2834
 		Length: 1
 		Offset: -48,64
-	damaged-build-top: DATA.R8
+	damaged-build-top: DATA
 		Start: 2835
 		Length: 1
 		Offset: -48,64
-	idle-top: DATA.R8
+	idle-top: DATA
 		Start: 2834
 		Offset: -48,64
-	damaged-idle-top: DATA.R8
+	damaged-idle-top: DATA
 		Start: 2835
 		Offset: -48,64
-	idle-welding: DATA.R8
+	idle-welding: DATA
 		Start: 4644
 		Length: 30
 		Offset: -48,64
 		Tick: 200
 		BlendMode: Additive
-	bib: BLOXBASE.R8
+	bib: BLOXBASE
 		Frames: 611, 612, 613, 631, 632, 633
 		Length: 6
 		Offset: -16,-16
-	icon: DATA.R8
+	icon: DATA
 		Start: 4082
 		Offset: -30,-24
 
 heavyh:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2678
 		Length: 1
 		Offset: -48,80
-	make: DATA.R8
+	make: DATA
 		Start: 4328
 		Length: 9
 		Offset: -48,80
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4337
 		Length: 9
 		Offset: -48,80
 		Tick: 100
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2678
 		Offset: -48,80
-	build-top: DATA.R8
+	build-top: DATA
 		Start: 2679
 		Length: 1
 		Offset: -48,80
-	damaged-build-top: DATA.R8
+	damaged-build-top: DATA
 		Start: 2680
 		Length: 1
 		Offset: -48,80
-	idle-top: DATA.R8
+	idle-top: DATA
 		Start: 2679
 		Offset: -48,80
-	damaged-idle-top: DATA.R8
+	damaged-idle-top: DATA
 		Start: 2680
 		Offset: -48,80
-	idle-welding: DATA.R8
+	idle-welding: DATA
 		Start: 4674
 		Length: 47
 		Offset: -48,80
 		Tick: 200
 		BlendMode: Additive
-	bib: BLOXBASE.R8
+	bib: BLOXBASE
 		Frames: 611, 612, 613, 631, 632, 633
 		Length: 6
 		Offset: -16,-16
-	icon: DATA.R8
+	icon: DATA
 		Start: 4088
 		Offset: -30,-24
 
 conyardo:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2879
 		Offset: -48,64
-	make: DATA.R8
+	make: DATA
 		Start: 4109
 		Length: 30
 		Offset: -48,64
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4139
 		Length: 12
 		Offset: -48,64
 		Tick: 170
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2880
 		Offset: -48,64
-#	build: DATA.R8 # TODO: overlay
+#	build: DATA # TODO: overlay
 #		Start: 4464
 #		Length: 14
 #		Offset: -48,64
-#	damaged-build: DATA.R8 # TODO: overlay
+#	damaged-build: DATA # TODO: overlay
 #		Start: 4464
 #		Length: 14
 #		Offset: -48,64
-	bib: BLOXBASE.R8
+	bib: BLOXBASE
 		Frames: 611, 612, 613, 631, 632, 633
 		Length: 6
 		Offset: -16,-16
-	icon: DATA.R8
+	icon: DATA
 		Start: 4048
 		Offset: -30,-24
 
 starporto:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2991
 		Offset: -48,64
 		ZOffset: -1c511
-	active: DATA.R8
+	active: DATA
 		Start: 2991
 		Length: 1
 		Offset: -48,64
 		ZOffset: -1c511
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2992
 		Offset: -48,64
 		ZOffset: -1c511
-	damaged-active: DATA.R8
+	damaged-active: DATA
 		Start: 2992
 		Offset: -48,64
 		ZOffset: -1c511
-	make: DATA.R8
+	make: DATA
 		Start: 4347
 		Length: 11
 		Offset: -48,64
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4358
 		Length: 11
 		Offset: -48,64
 		Tick: 100
-	bib: BLOXBASE.R8
+	bib: BLOXBASE
 		Frames: 611, 612, 613, 631, 632, 633
 		Length: 6
 		Offset: -16,-16
-	icon: DATA.R8
+	icon: DATA
 		Start: 4094
 		Offset: -30,-24
 
 pwro:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2843
 		Length: 1
 		Offset: -32,64
-	make: DATA.R8
+	make: DATA
 		Start: 4151
 		Length: 12
 		Offset: -32,64
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4163
 		Length: 12
 		Offset: -32,64
 		Tick: 100
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2844
 		Offset: -32,64
-	idle-zaps: DATA.R8
+	idle-zaps: DATA
 		Start: 4512
 		Length: 10
 		Offset: -32,64
 		Tick: 200
-	damaged-idle-zaps: DATA.R8
+	damaged-idle-zaps: DATA
 		Start: 4517
 		Length: 5
 		Offset: -32,64
 		Tick: 200
-	bib: BLOXBASE.R8
+	bib: BLOXBASE
 		Frames: 617, 618, 637, 638
 		Length: 4
 		Offset: -16,-16
-	icon: DATA.R8
+	icon: DATA
 		Start: 4058
 		Offset: -30,-24
 
 barro:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2845
 		Offset: -32,64
-	make: DATA.R8
+	make: DATA
 		Start: 4213
 		Length: 8
 		Offset: -32,64
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4221
 		Length: 9
 		Offset: -32,64
 		Tick: 100
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2846
 		Offset: -32,64
-	bib: BLOXBASE.R8
+	bib: BLOXBASE
 		Frames: 617, 618, 637, 638
 		Length: 4
 		Offset: -16,-16
-	icon: DATA.R8
+	icon: DATA
 		Start: 4061
 		Offset: -30,-24
 
 radaro:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2841
 		Offset: -48,80
-	make: DATA.R8
+	make: DATA
 		Start: 4254
 		Length: 9
 		Offset: -48,80
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4263
 		Length: 10
 		Offset: -48,80
 		Tick: 100
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2842
 		Offset: -48,80
-	idle-dish: DATA.R8
+	idle-dish: DATA
 		Start: 4583
 		Length: 30
 		Offset: -48,80
-	bib: BLOXBASE.R8
+	bib: BLOXBASE
 		Frames: 611, 612, 613, 631, 632, 633
 		Length: 6
 		Offset: -16,-16
-	icon: DATA.R8
+	icon: DATA
 		Start: 4074
 		Offset: -30,-24
 
 refo:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2881
 		Length: 1
 		Offset: -48,64
-	make: DATA.R8
+	make: DATA
 		Start: 4231
 		Length: 11
 		Offset: -48,64
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4241
 		Length: 12
 		Offset: -48,64
 		Tick: 100
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2881
 		Offset: -48,64
-	idle-top: DATA.R8
+	idle-top: DATA
 		Start: 2882
 		Offset: -48,64
-	damaged-idle-top: DATA.R8
+	damaged-idle-top: DATA
 		Start: 2883
 		Offset: -48,64
-	bib: BLOXBASE.R8
+	bib: BLOXBASE
 		Frames: 611, 612, 613, 631, 632, 633
 		Length: 6
 		Offset: -16,-16
-	icon: DATA.R8
+	icon: DATA
 		Start: 4068
 		Offset: -30,-24
 
 siloo:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2886
 		Length: 4
 		Offset: -16,16
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2890
 		Length: 1
 		Offset: -16,16
-	make: DATA.R8
+	make: DATA
 		Start: 4313
 		Length: 7
 		Offset: -16,16
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4320
 		Length: 7
 		Offset: -16,16
 		Tick: 200
-	icon: DATA.R8
+	icon: DATA
 		Start: 4086
 		Offset: -30,-24
 
 hightecho:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2884
 		Offset: -48,80
-	make: DATA.R8
+	make: DATA
 		Start: 4274
 		Length: 10
 		Offset: -48,80
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4284
 		Length: 10
 		Offset: -48,80
 		Tick: 100
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2885
 		Offset: -48,80
-	idle-welding: DATA.R8
+	idle-welding: DATA
 		Start: 4614
 		Length: 30
 		Offset: -48,80
 		Tick: 500
 		BlendMode: Additive
-	bib: BLOXBASE.R8
+	bib: BLOXBASE
 		Frames: 611, 612, 613, 631, 632, 633
 		Length: 6
 		Offset: -16,-16
-	icon: DATA.R8
+	icon: DATA
 		Start: 4080
 		Offset: -30,-24
 
 palaceo:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2996
 		Offset: -48,64
-	make: DATA.R8
+	make: DATA
 		Start: 4413
 		Length: 11
 		Offset: -48,64
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4424
 		Length: 11
 		Offset: -48,64
 		Tick: 100
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2997
 		Offset: -48,64
-	bib: BLOXBASE.R8
+	bib: BLOXBASE
 		Frames: 611, 612, 613, 631, 632, 633
 		Length: 6
 		Offset: -16,-16
-	icon: DATA.R8
+	icon: DATA
 		Start: 4104
 		Offset: -30,-24
 
 lighto:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2993
 		Length: 1
 		Offset: -48,64
-	make: DATA.R8
+	make: DATA
 		Start: 4295
 		Length: 8
 		Offset: -48,64
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4303
 		Length: 9
 		Offset: -48,64
 		Tick: 100
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2993
 		Offset: -48,64
-	build-top: DATA.R8
+	build-top: DATA
 		Start: 2994
 		Length: 1
 		Offset: -48,64
-	damaged-build-top: DATA.R8
+	damaged-build-top: DATA
 		Start: 2995
 		Length: 1
 		Offset: -48,64
-	idle-top: DATA.R8
+	idle-top: DATA
 		Start: 2994
 		Offset: -48,64
-	damaged-idle-top: DATA.R8
+	damaged-idle-top: DATA
 		Start: 2995
 		Offset: -48,64
-	idle-welding: DATA.R8
+	idle-welding: DATA
 		Start: 4644
 		Length: 30
 		Offset: -48,64
 		Tick: 200
 		BlendMode: Additive
-	bib: BLOXBASE.R8
+	bib: BLOXBASE
 		Frames: 611, 612, 613, 631, 632, 633
 		Length: 6
 		Offset: -16,-16
-	icon: DATA.R8
+	icon: DATA
 		Start: 4083
 		Offset: -30,-24
 
 heavyo:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2838
 		Length: 1
 		Offset: -48,80
-	make: DATA.R8
+	make: DATA
 		Start: 4328
 		Length: 9
 		Offset: -48,80
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4337
 		Length: 9
 		Offset: -48,80
 		Tick: 100
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 2838
 		Offset: -48,80
-	build-top: DATA.R8
+	build-top: DATA
 		Start: 2839
 		Length: 1
 		Offset: -48,80
-	damaged-build-top: DATA.R8
+	damaged-build-top: DATA
 		Start: 2840
 		Length: 1
 		Offset: -48,80
-	idle-top: DATA.R8
+	idle-top: DATA
 		Start: 2839
 		Offset: -48,80
-	damaged-idle-top: DATA.R8
+	damaged-idle-top: DATA
 		Start: 2840
 		Offset: -48,80
-	idle-welding: DATA.R8
+	idle-welding: DATA
 		Start: 4674
 		Length: 47
 		Offset: -48,80
 		Tick: 200
 		BlendMode: Additive
-	bib: BLOXBASE.R8
+	bib: BLOXBASE
 		Frames: 611, 612, 613, 631, 632, 633
 		Length: 6
 		Offset: -16,-16
-	icon: DATA.R8
+	icon: DATA
 		Start: 4089
 		Offset: -30,-24
 
 palacec: # TODO: unused
-	idle: DATA.R8
+	idle: DATA
 		Start: 3004
 		Offset: -48,64
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 3005
 		Offset: -48,64
-	bib: BLOXBASE.R8
+	bib: BLOXBASE
 		Frames: 611, 612, 613, 631, 632, 633
 		Length: 6
 		Offset: -16,-16
 	icon: palacecicon
 		Start: 0
-	make: DATA.R8
+	make: DATA
 		Start: 4413
 		Length: 11
 		Offset: -48,64
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4424
 		Length: 11
 		Offset: -48,64
 		Tick: 100
 
 starportc: # TODO: unused
-	idle: DATA.R8
+	idle: DATA
 		Start: 2999
 		Offset: -48,64
 		ZOffset: -1c511
-	active: DATA.R8
+	active: DATA
 		Start: 2999
 		Length: 1
 		Offset: -48,64
 		ZOffset: -1c511
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 3000
 		Offset: -48,64
 		ZOffset: -1c511
-	damaged-active: DATA.R8
+	damaged-active: DATA
 		Start: 3000
 		Offset: -48,64
 		ZOffset: -1c511
-	make: DATA.R8
+	make: DATA
 		Start: 4347
 		Length: 11
 		Offset: -48,64
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4358
 		Length: 11
 		Offset: -48,64
 		Tick: 100
-	bib: BLOXBASE.R8
+	bib: BLOXBASE
 		Frames: 611, 612, 613, 631, 632, 633
 		Length: 6
 		Offset: -16,-16
-	icon: DATA.R8 # TODO: blank
+	icon: DATA # TODO: blank
 		Start: 4020
 		Offset: -30,-24
 
 heavyc: # TODO: unused
-	idle: DATA.R8
+	idle: DATA
 		Start: 3001
 		Length: 1
 		Offset: -48,64
-	make: DATA.R8
+	make: DATA
 		Start: 4328
 		Length: 9
 		Offset: -48,80
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4337
 		Length: 9
 		Offset: -48,80
 		Tick: 100
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 3001
 		Offset: -48,64
-	build-top: DATA.R8
+	build-top: DATA
 		Start: 3002
 		Length: 1
 		Offset: -48,64
-	damaged-build-top: DATA.R8
+	damaged-build-top: DATA
 		Start: 3003
 		Length: 1
 		Offset: -48,64
-	idle-top: DATA.R8
+	idle-top: DATA
 		Start: 3002
 		Offset: -48,64
-	damaged-idle-top: DATA.R8
+	damaged-idle-top: DATA
 		Start: 3003
 		Offset: -48,64
-	idle-welding: DATA.R8
+	idle-welding: DATA
 		Start: 4674
 		Length: 47
 		Offset: -48,80
 		Tick: 200
 		BlendMode: Additive
-	bib: BLOXBASE.R8
+	bib: BLOXBASE
 		Frames: 611, 612, 613, 631, 632, 633
 		Length: 6
 		Offset: -16,-16
-	icon: DATA.R8 # TODO: blank
+	icon: DATA # TODO: blank
 		Start: 4020
 		Offset: -30,-24
 
 conyardc: # TODO: unused
-	idle: DATA.R8
+	idle: DATA
 		Start: 3006
 		Offset: -48,64
-	make: DATA.R8
+	make: DATA
 		Start: 4109
 		Length: 30
 		Offset: -48,64
-	crumble-overlay: DATA.R8
+	crumble-overlay: DATA
 		Start: 4139
 		Length: 12
 		Offset: -48,64
 		Tick: 200
-	damaged-idle: DATA.R8
+	damaged-idle: DATA
 		Start: 3007
 		Offset: -48,64
-#	build: DATA.R8  # TODO: overlay
+#	build: DATA  # TODO: overlay
 #		Start: 4478
 #		Length: 14
 #		Offset: -48,64
-#	damaged-build: DATA.R8  # TODO: overlay
+#	damaged-build: DATA  # TODO: overlay
 #		Start: 4478
 #		Length: 14
 #		Offset: -48,64
-	bib: BLOXBASE.R8
+	bib: BLOXBASE
 		Frames: 611, 612, 613, 631, 632, 633
 		Length: 6
 		Offset: -16,-16
-	icon: DATA.R8
+	icon: DATA
 		Start: 4049
 		Offset: -30,-24
 
 plates: # TODO: unused
-	idle: DATA.R8
+	idle: DATA
 		Start: 3008
 		Length: 6
-	4-plates-icon: DATA.R8
+	4-plates-icon: DATA
 		Start: 4050
 		Offset: -30,-24
-	6-plates-icon: DATA.R8
+	6-plates-icon: DATA
 		Start: 4053
 		Offset: -30,-24
diff --git a/mods/d2k/sequences/vehicles.yaml b/mods/d2k/sequences/vehicles.yaml
index 3d8fe4debf..c562658597 100644
--- a/mods/d2k/sequences/vehicles.yaml
+++ b/mods/d2k/sequences/vehicles.yaml
@@ -1,174 +1,174 @@
 dmcv:
-	idle: DATA.R8
+	idle: DATA
 		Start: 1795
 		Facings: -32
-	icon: DATA.R8
+	icon: DATA
 		Start: 4023
 		Offset: -30,-24
 
 harvester:
-	idle: DATA.R8
+	idle: DATA
 		Start: 1699
 		Facings: -32
-	harvest: DATA.R8
+	harvest: DATA
 		Start: 3631
 		Length: 6
 		Facings: -8
 		Tick: 80
 		ZOffset: 1
-	dock: DATA.R8
+	dock: DATA
 		Start: 3370
 		Length: 10
-	dock-loop: DATA.R8
+	dock-loop: DATA
 		Start: 3380
 		Length: 1
-	icon: DATA.R8
+	icon: DATA
 		Start: 4019
 		Offset: -30,-24
 
 trike:
-	idle: DATA.R8
+	idle: DATA
 		Start: 1635
 		Facings: -32
-	unload: DATA.R8
+	unload: DATA
 		Start: 1635
 		Facings: -32
-	muzzle: DATA.R8
+	muzzle: DATA
 		Frames: 3839, 3839, 3840, 3840, 3841, 3841, 3842, 3842, 3843, 3843, 3844, 3844, 3845, 3845, 3846, 3846, 3847, 3847, 3848, 3848, 3849, 3849, 3850, 3850, 3851, 3851, 3852, 3852, 3853, 3853, 3854, 3854, 3855, 3855, 3856, 3856, 3857, 3857, 3858, 3858, 3859, 3859, 3860, 3860, 3861, 3861, 3862, 3862, 3863, 3863, 3864, 3864, 3865, 3865, 3866, 3866, 3867, 3867, 3868, 3868, 3869, 3869, 3870, 3870
 		Facings: -32
 		Length: 2
 		BlendMode: Additive
-	icon: DATA.R8
+	icon: DATA
 		Start: 4041
 		Offset: -30,-24
 
 quad:
-	idle: DATA.R8
+	idle: DATA
 		Start: 1667
 		Facings: -32
-	unload: DATA.R8
+	unload: DATA
 		Start: 1667
 		Facings: -32
-	icon: DATA.R8
+	icon: DATA
 		Start: 4018
 		Offset: -30,-24
 
 siegetank:
-	idle: DATA.R8
+	idle: DATA
 		Start: 1763
 		Facings: -32
-	turret: DATA.R8
+	turret: DATA
 		Start: 1891
 		Facings: -32
-	muzzle: DATA.R8
+	muzzle: DATA
 		Start: 3418
 		Length: 3
 		BlendMode: Additive
-	icon: DATA.R8
+	icon: DATA
 		Start: 4026
 		Offset: -30,-24
 
 missiletank:
-	idle: DATA.R8
+	idle: DATA
 		Start: 1603
 		Facings: -32
-	icon: DATA.R8
+	icon: DATA
 		Start: 4024
 		Offset: -30,-24
 
 sonictank:
-	idle: DATA.R8
+	idle: DATA
 		Start: 1827
 		Facings: -32
-	icon: DATA.R8
+	icon: DATA
 		Start: 4027
 		Offset: -30,-24
 
 combata:
-	idle: DATA.R8
+	idle: DATA
 		Start: 1731
 		Facings: -32
-	turret: DATA.R8
+	turret: DATA
 		Start: 1859
 		Facings: -32
-	muzzle: DATA.R8
+	muzzle: DATA
 		Frames: 3775, 3775, 3776, 3776, 3777, 3777, 3778, 3778, 3779, 3779, 3780, 3780, 3781, 3781, 3782, 3782, 3783, 3783, 3784, 3784, 3785, 3785, 3786, 3786, 3787, 3787, 3788, 3788, 3789, 3789, 3790, 3790, 3791, 3791, 3792, 3792, 3793, 3793, 3794, 3794, 3795, 3795, 3796, 3796, 3797, 3797, 3798, 3798, 3799, 3799, 3800, 3800, 3801, 3801, 3802, 3802, 3803, 3803, 3804, 3804, 3805, 3805, 3806, 3806
 		Facings: -32
 		Length: 2
 		BlendMode: Additive
-	icon: DATA.R8
+	icon: DATA
 		Start: 4020
 		Offset: -30,-24
 
 combath:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2051
 		Facings: -32
-	turret: DATA.R8
+	turret: DATA
 		Start: 2115
 		Facings: -32
-	muzzle: DATA.R8
+	muzzle: DATA
 		Frames: 3775, 3775, 3776, 3776, 3777, 3777, 3778, 3778, 3779, 3779, 3780, 3780, 3781, 3781, 3782, 3782, 3783, 3783, 3784, 3784, 3785, 3785, 3786, 3786, 3787, 3787, 3788, 3788, 3789, 3789, 3790, 3790, 3791, 3791, 3792, 3792, 3793, 3793, 3794, 3794, 3795, 3795, 3796, 3796, 3797, 3797, 3798, 3798, 3799, 3799, 3800, 3800, 3801, 3801, 3802, 3802, 3803, 3803, 3804, 3804, 3805, 3805, 3806, 3806
 		Facings: -32
 		Length: 2
 		BlendMode: Additive
-	icon: DATA.R8
+	icon: DATA
 		Start: 4021
 		Offset: -30,-24
 
 devast:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2083
 		Facings: -32
-	muzzle: DATA.R8
+	muzzle: DATA
 		Frames: 3807, 3807, 3808, 3808, 3809, 3809, 3810, 3810, 3810, 3811, 3811, 3812, 3812, 3813, 3813, 3814, 3814, 3815, 3816, 3816, 3817, 3817, 3818, 3819, 3819, 3820, 3820, 3821, 3821, 3822, 3822, 3823, 3823, 3824, 3824, 3825, 3825, 3826, 3826, 3827, 3827, 3828, 3828, 3829, 3829, 3830, 3830, 3831, 3831, 3832, 3832, 3832, 3833, 3833, 3834, 3834, 3835, 3835, 3836, 3836, 3837, 3837, 3838, 3838
 		Facings: -32
 		Length: 2
 		BlendMode: Additive
-	icon: DATA.R8
+	icon: DATA
 		Start: 4028
 		Offset: -30,-24
 
 combato:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2453
 		Facings: -32
-	turret: DATA.R8
+	turret: DATA
 		Start: 2485
 		Facings: -32
-	muzzle: DATA.R8
+	muzzle: DATA
 		Frames: 3775, 3775, 3776, 3776, 3777, 3777, 3778, 3778, 3779, 3779, 3780, 3780, 3781, 3781, 3782, 3782, 3783, 3783, 3784, 3784, 3785, 3785, 3786, 3786, 3787, 3787, 3788, 3788, 3789, 3789, 3790, 3790, 3791, 3791, 3792, 3792, 3793, 3793, 3794, 3794, 3795, 3795, 3796, 3796, 3797, 3797, 3798, 3798, 3799, 3799, 3800, 3800, 3801, 3801, 3802, 3802, 3803, 3803, 3804, 3804, 3805, 3805, 3806, 3806
 		Facings: -32
 		Length: 2
 		BlendMode: Additive
-	icon: DATA.R8
+	icon: DATA
 		Start: 4022
 		Offset: -30,-24
 
 raider:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2421
 		Facings: -32
-	unload: DATA.R8
+	unload: DATA
 		Start: 2421
 		Facings: -32
-	muzzle: DATA.R8
+	muzzle: DATA
 		Frames: 3743, 3743, 3744, 3744, 3745, 3745, 3746, 3746, 3747, 3747, 3748, 3748, 3749, 3749, 3750, 3750, 3751, 3751, 3752, 3752, 3753, 3753, 3754, 3754, 3755, 3755, 3756, 3756, 3757, 3757, 3758, 3758, 3759, 3759, 3760, 3760, 3761, 3761, 3762, 3762, 3763, 3763, 3764, 3764, 3765, 3765, 3766, 3766, 3767, 3767, 3768, 3768, 3769, 3769, 3770, 3770, 3771, 3771, 3772, 3772, 3773, 3773, 3774, 3774
 		Facings: -32
 		Length: 2
 		BlendMode: Additive
-	icon: DATA.R8
+	icon: DATA
 		Start: 4017
 		Offset: -30,-24
 
 stealthraider:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2421
 		Facings: -32
-	unload: DATA.R8
+	unload: DATA
 		Start: 2421
 		Facings: -32
-	muzzle: DATA.R8
+	muzzle: DATA
 		Frames: 3743, 3743, 3744, 3744, 3745, 3745, 3746, 3746, 3747, 3747, 3748, 3748, 3749, 3749, 3750, 3750, 3751, 3751, 3752, 3752, 3753, 3753, 3754, 3754, 3755, 3755, 3756, 3756, 3757, 3757, 3758, 3758, 3759, 3759, 3760, 3760, 3761, 3761, 3762, 3762, 3763, 3763, 3764, 3764, 3765, 3765, 3766, 3766, 3767, 3767, 3768, 3768, 3769, 3769, 3770, 3770, 3771, 3771, 3772, 3772, 3773, 3773, 3774, 3774
 		Facings: -32
 		Length: 2
@@ -177,9 +177,9 @@ stealthraider:
 		Start: 0
 
 deviatortank:
-	idle: DATA.R8
+	idle: DATA
 		Start: 2389
 		Facings: -32
-	icon: DATA.R8
+	icon: DATA
 		Start: 4025
 		Offset: -30,-24
\ No newline at end of file