diff --git a/mods/ts/mod.yaml b/mods/ts/mod.yaml
index d87b20f569..60125cb8fc 100644
--- a/mods/ts/mod.yaml
+++ b/mods/ts/mod.yaml
@@ -90,8 +90,8 @@ Chrome:
 	mods/ts/chrome.yaml
 
 Assemblies:
-	mods/ra/OpenRA.Mods.RA.dll
 	mods/d2k/OpenRA.Mods.D2k.dll
+	mods/ra/OpenRA.Mods.RA.dll
 	mods/ts/OpenRA.Mods.TS.dll
 
 ChromeLayout:
diff --git a/mods/ts/rules/structures.yaml b/mods/ts/rules/structures.yaml
index 6614b9edf8..5ea2d05bff 100644
--- a/mods/ts/rules/structures.yaml
+++ b/mods/ts/rules/structures.yaml
@@ -104,8 +104,8 @@ GAPILE:
 	PrimaryBuilding:
 	IronCurtainable:
 	ProductionBar:
-	WithIdleOverlay@LIGHTS:
-		Sequence: idle-lights
+	WithProductionOverlay@LIGHTS:
+		Sequence: production-lights
 	WithIdleOverlay@LIGHT:
 		Sequence: idle-light
 	WithIdleOverlay@FLAG:
@@ -142,10 +142,10 @@ GAWEAP:
 	Production:
 		Produces: Vehicle
 	ProductionBar:
-	WithIdleOverlay@LIGHTS1:
-		Sequence: idle-lights1
-	WithIdleOverlay@LIGHTS2:
-		Sequence: idle-lights2
+	WithProductionOverlay@WHITELIGHTS:
+		Sequence: production-lights-white
+	WithProductionOverlay@REDLIGHTS:
+		Sequence: production-lights-red
 	WithIdleOverlay@TURBINES:
 		Sequence: idle-turbines
 
@@ -211,8 +211,8 @@ NAHAND:
 	ProductionBar:
 	WithIdleOverlay@LIGHTS:
 		Sequence: idle-lights
-	WithIdleOverlay@LIGHT:
-		Sequence: idle-light
+	WithProductionOverlay@LIGHT:
+		Sequence: production-light
 
 NAWEAP:
 	Inherits: ^Building
@@ -245,8 +245,8 @@ NAWEAP:
 	Production:
 		Produces: Vehicle
 	ProductionBar:
-	WithIdleOverlay@LIGHTS:
-		Sequence: idle-lights
+	WithProductionOverlay@LIGHTS:
+		Sequence: production-lights
 
 GASAND:
 	Inherits: ^Wall
diff --git a/mods/ts/sequences/structures.yaml b/mods/ts/sequences/structures.yaml
index c7d9f00f60..1dc543c348 100644
--- a/mods/ts/sequences/structures.yaml
+++ b/mods/ts/sequences/structures.yaml
@@ -103,11 +103,11 @@ gapile:
 	critical-idle: gtpile
 		Start: 2
 		ShadowStart: 5
-	idle-lights: gtpile_a
+	production-lights: gtpile_a
 		Start: 0
 		Length: 7
 		Tick: 200
-	damaged-idle-lights: gtpile_a
+	damaged-production-lights: gtpile_a
 		Start:7
 		Length: 7
 		Tick: 200
@@ -142,22 +142,22 @@ gaweap:
 	dead: gtweap
 		Start: 2
 		ShadowStart: 5
-	idle-lights1: gtweap_a
+	production-lights-white: gtweap_a
 		Start: 0
 		Length: 8
 		Tick: 100
 		ZOffset: 2048
-	damaged-idle-lights1: gtweap_a
+	damaged-production-lights-white: gtweap_a
 		Start: 8
 		Length: 8
 		Tick: 100
 		ZOffset: 2048
-	idle-lights2: gtweap_b
+	production-lights-red: gtweap_b
 		Start: 0
 		Length: 4
 		Tick: 120
 		ZOffset: 2048
-	damaged-idle-lights2: gtweap_b
+	damaged-production-lights-red: gtweap_b
 		Start: 4
 		Length: 4
 		Tick: 120
@@ -232,11 +232,11 @@ nahand:
 	critical-idle: nthand
 		Start: 2
 		ShadowStart: 5
-	idle-light: nthand_a
+	production-light: nthand_a
 		Start: 0
 		Length: 5
 		Tick: 100
-	damaged-idle-light: nthand_a
+	damaged-production-light: nthand_a
 		Start: 5
 		Length: 5
 		Tick: 100
@@ -265,12 +265,12 @@ naweap:
 	dead: ntweap
 		Start: 2
 		ShadowStart: 5
-	idle-lights: ntweap_a
+	production-lights: ntweap_a
 		Start: 0
 		Length: 16
 		Tick: 100
 		ZOffset: 2048
-	damaged-idle-lights: ntweap_a
+	damaged-production-lights: ntweap_a
 		Start: 16
 		Length: 16
 		Tick: 100