diff --git a/mods/cnc/cursors.yaml b/mods/cnc/cursors.yaml
index ada0b6beb5..96ed001f37 100644
--- a/mods/cnc/cursors.yaml
+++ b/mods/cnc/cursors.yaml
@@ -111,7 +111,7 @@ Cursors:
 			Start: 136
 		joystick-tl-blocked:
 			Start: 137
-# Cursors that need minimap variants
+		# Cursors that need minimap variants
 		deploy:
 			Start: 53
 			Length: 9
diff --git a/mods/d2k/cursors.yaml b/mods/d2k/cursors.yaml
index d99b9122f5..949f708d5a 100644
--- a/mods/d2k/cursors.yaml
+++ b/mods/d2k/cursors.yaml
@@ -233,7 +233,7 @@ Cursors:
 			Start: 236
 			X: 24
 			Y: 24
-# Cursors that need minimap variants
+		# Cursors that need minimap variants
 		deploy:
 			Start: 96
 			Length: 8
diff --git a/mods/ra/cursors.yaml b/mods/ra/cursors.yaml
index ebc8e9fcce..8368d95623 100644
--- a/mods/ra/cursors.yaml
+++ b/mods/ra/cursors.yaml
@@ -166,7 +166,7 @@ Cursors:
 			Start: 130
 		joystick-tl-blocked:
 			Start: 131
-# Cursors that need minimap variants
+		# Cursors that need minimap variants
 		deploy:
 			Start: 59
 			Length: 9
diff --git a/mods/ra/sequences/misc.yaml b/mods/ra/sequences/misc.yaml
index 9a09432774..83e3969421 100644
--- a/mods/ra/sequences/misc.yaml
+++ b/mods/ra/sequences/misc.yaml
@@ -101,10 +101,10 @@ pips:
 		Offset: 9, 5
 	medic:
 		Start: 20
-#	ready:
-#		Start: 3
-#	hold:
-#		Start: 4
+	#ready:
+	#	Start: 3
+	#hold:
+	#	Start: 4
 	tag-fake:
 		Start: 18
 		Offset: 0, 2
diff --git a/mods/ts/audio/voices.yaml b/mods/ts/audio/voices.yaml
index 74046f1479..abbc19876b 100644
--- a/mods/ts/audio/voices.yaml
+++ b/mods/ts/audio/voices.yaml
@@ -3,7 +3,7 @@ Infantry:
 		Select: 15-i000, 15-i004, 15-i012, 15-i048
 		Move: 15-i018, 15-i024, 15-i044
 		Attack: 15-i044, 15-i050, 15-i044, 15-i046
-#		Feedback: 15-i058, 15-i064 # TODO
+		#Feedback: 15-i058, 15-i064 # TODO
 		Die: dedman1, dedman3, dedman4, dedman5, dedman6
 		Burned: dedman2
 		Zapped: electro1
@@ -14,7 +14,7 @@ Rocket:
 		Select: 15-i000, 15-i032, 15-i048
 		Move: 15-i008, 15-i014, 15-i026
 		Attack: 15-i008, 15-i014, 15-i026, 15-i050, 15-i060
-#		Feedback: 15-i058, 15-i064 #TODO
+		#Feedback: 15-i058, 15-i064 #TODO
 		Die: dedman1, dedman3, dedman4, dedman5, dedman6
 		Burned: dedman2
 		Zapped: electro1
@@ -65,7 +65,7 @@ JumpJet:
 		Select: 15-i000, 15-i004, 15-i012, 15-i048
 		Move: 15-i018, 15-i024, 15-i044
 		Attack: 15-i044, 15-i050, 15-i044, 15-i046
-#		Feedback: 15-i058, 15-i064
+		#Feedback: 15-i058, 15-i064
 		Die: dedman1, dedman3, dedman4, dedman5, dedman6
 		Burned: dedman2
 		Zapped: electro1
@@ -76,7 +76,7 @@ Weed:
 		Select: 15-i000, 15-i006, 15-i040, 15-i042
 		Move: 15-i024, 15-i044
 		Attack: 15-i006, 15-i046
-#		Feedback: 15-i058, 15-i064 # TODO
+		#Feedback: 15-i058, 15-i064 # TODO
 		Die: dedman1, dedman3, dedman4, dedman5, dedman6
 		Burned: dedman2
 		Zapped: electro1
@@ -87,7 +87,7 @@ Spy:
 		Select: 21-i000, 21-i002, 21-i004
 		Move: 21-i010, 21-i012, 21-i016
 		Action: 21-i010, 21-i012, 21-i022
-#		Feedback: 21-i000, 21-i002 # TODO
+		#Feedback: 21-i000, 21-i002 # TODO
 		Die: dedman1, dedman3, dedman4, dedman5, dedman6
 		Burned: dedman2
 		Zapped: electro1
diff --git a/mods/ts/maps/sunstroke/map.yaml b/mods/ts/maps/sunstroke/map.yaml
index ad61a2ff5f..9558a86a34 100644
--- a/mods/ts/maps/sunstroke/map.yaml
+++ b/mods/ts/maps/sunstroke/map.yaml
@@ -114,16 +114,16 @@ Actors:
 		Owner: Neutral
 		Health: 38
 		Facing: 160
-#	Actor13: cabhut
-#		Location: 138,-12
-#		Owner: Neutral
-#		Health: 100
-#		Facing: 160
-#	Actor14: cabhut
-#		Location: 63,-16
-#		Owner: Neutral
-#		Health: 100
-#		Facing: 160
+	#Actor13: cabhut
+	#	Location: 138,-12
+	#	Owner: Neutral
+	#	Health: 100
+	#	Facing: 160
+	#Actor14: cabhut
+	#	Location: 63,-16
+	#	Owner: Neutral
+	#	Health: 100
+	#	Facing: 160
 	Actor15: ca0011
 		Location: 110,26
 		Owner: Neutral
diff --git a/mods/ts/mod.yaml b/mods/ts/mod.yaml
index a65d3b2b94..687088afe7 100644
--- a/mods/ts/mod.yaml
+++ b/mods/ts/mod.yaml
@@ -11,7 +11,7 @@ Packages:
 	$ts: ts
 	./mods/common: common
 
-# Tiberian Sun
+	# Tiberian Sun
 	~scores.mix
 	~sidenc01.mix
 	~sidenc02.mix
@@ -35,7 +35,7 @@ Packages:
 	~speech02.mix: speech-nod
 	~tem.mix
 	~temperat.mix
-# Firestorm
+	# Firestorm
 	~scores01.mix
 	~expand01.mix
 	~sounds01.mix
diff --git a/mods/ts/rules/civilian-structures.yaml b/mods/ts/rules/civilian-structures.yaml
index eea26cf4f2..8cdb4194c9 100644
--- a/mods/ts/rules/civilian-structures.yaml
+++ b/mods/ts/rules/civilian-structures.yaml
@@ -1398,7 +1398,7 @@ GALITE:
 		MaxHeightDelta: 3
 	Power:
 		Amount: 0
-# TODO: should use terrain lighting instead, depends on https://github.com/OpenRA/OpenRA/issues/3605
+	# TODO: should use terrain lighting instead, depends on https://github.com/OpenRA/OpenRA/issues/3605
 	WithIdleOverlay@LIGHTING:
 		Sequence: lighting
 		Palette: alpha
diff --git a/mods/ts/sequences/misc.yaml b/mods/ts/sequences/misc.yaml
index 4ad1901fc9..f581a722e4 100644
--- a/mods/ts/sequences/misc.yaml
+++ b/mods/ts/sequences/misc.yaml
@@ -116,7 +116,7 @@ pips:
 		Tick: 300
 		Offset: 0, -6
 
-# TODO:
+	# TODO:
 	pip-empty-building:
 	pip-green-building:
 		Start: 1