diff --git a/mods/ts/maps/arivruns/map.yaml b/mods/ts/maps/arivruns/map.yaml
index 9f9afa2fe8..aead5c973a 100644
--- a/mods/ts/maps/arivruns/map.yaml
+++ b/mods/ts/maps/arivruns/map.yaml
@@ -1552,16 +1552,16 @@ Actors:
 		Owner: Neutral
 	Actor620: tuntop04
 		Owner: Neutral
-		Location: 145,5
+		Location: 146,5
 	Actor621: tuntop04
 		Owner: Neutral
-		Location: 116,9
+		Location: 117,9
 	Actor622: tuntop02
 		Owner: Neutral
-		Location: 144,-19
+		Location: 146,-19
 	Actor623: tuntop02
 		Owner: Neutral
-		Location: 115,-15
+		Location: 117,-15
 	Actor494: bridge1
 		Owner: Neutral
 		Location: 232,0
diff --git a/mods/ts/maps/springs/map.yaml b/mods/ts/maps/springs/map.yaml
index 5fb470c3ca..73d51e0f05 100644
--- a/mods/ts/maps/springs/map.yaml
+++ b/mods/ts/maps/springs/map.yaml
@@ -806,49 +806,49 @@ Actors:
 		Owner: Neutral
 	Actor219: tuntop03
 		Owner: Neutral
-		Location: 68,-5
+		Location: 68,-4
 	Actor220: tuntop04
 		Owner: Neutral
-		Location: 73,-12
+		Location: 74,-12
 	Actor221: tuntop04
 		Owner: Neutral
-		Location: 107,-7
+		Location: 108,-7
 	Actor222: tuntop03
 		Owner: Neutral
-		Location: 109,4
+		Location: 109,5
 	Actor224: tuntop04
 		Owner: Neutral
-		Location: 87,28
+		Location: 88,28
 	Actor225: tuntop03
 		Owner: Neutral
-		Location: 73,34
+		Location: 73,35
 	Actor227: tuntop01
 		Owner: Neutral
-		Location: 60,34
+		Location: 60,35
 	Actor228: tuntop04
 		Owner: Neutral
-		Location: 42,13
+		Location: 43,13
 	Actor233: tuntop03
 		Owner: Neutral
-		Location: 93,-37
+		Location: 93,-36
 	Actor237: tuntop02
 		Owner: Neutral
-		Location: 107,-16
+		Location: 108,-16
 	Actor238: tuntop01
 		Owner: Neutral
-		Location: 77,-37
+		Location: 77,-36
 	Actor239: tuntop01
 		Owner: Neutral
-		Location: 95,4
+		Location: 95,5
 	Actor240: tuntop02
 		Owner: Neutral
 		Location: 73,-28
 	Actor234: tuntop02
 		Owner: Neutral
-		Location: 42,-2
+		Location: 43,-2
 	Actor236: tuntop01
 		Owner: Neutral
-		Location: 51,-5
+		Location: 51,-4
 	Actor235: tuntop02
 		Owner: Neutral
 		Location: 88,13
diff --git a/mods/ts/maps/sunstroke/map.png b/mods/ts/maps/sunstroke/map.png
index dbec7ee702..0bacd1cd87 100644
Binary files a/mods/ts/maps/sunstroke/map.png and b/mods/ts/maps/sunstroke/map.png differ
diff --git a/mods/ts/maps/sunstroke/map.yaml b/mods/ts/maps/sunstroke/map.yaml
index 0ca6d2b19f..178a4b1e8f 100644
--- a/mods/ts/maps/sunstroke/map.yaml
+++ b/mods/ts/maps/sunstroke/map.yaml
@@ -2564,6 +2564,9 @@ Actors:
 		Owner: Creeps
 		Location: 58,23
 		Facing: 92
+	Actor741: tuntop04
+		Owner: Neutral
+		Location: 183,-43
 
 Rules: rules.yaml
 
diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml
index 635212b4bb..a9c635d3ba 100644
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -870,9 +870,19 @@
 		TerrainType: Rail
 
 ^Tunnel:
-	Inherits: ^TerrainOverlay
+	RenderSprites:
+		Palette: terraindecoration
+	WithSpriteBody:
+	BodyOrientation:
+		UseClassicPerspectiveFudge: False
+		QuantizedFacings: 1
+	Building:
+		Dimensions: 3, 3
+		Footprint: ___ ___ ___
 	CustomSelectionSize:
-		CustomBounds: 220,220
+		CustomBounds: 144, 144
+	Targetable:
+	AlwaysVisible:
 
 ^Gate:
 	Inherits: ^Building
diff --git a/mods/ts/sequences/misc.yaml b/mods/ts/sequences/misc.yaml
index 555bdaca70..4ad1901fc9 100644
--- a/mods/ts/sequences/misc.yaml
+++ b/mods/ts/sequences/misc.yaml
@@ -614,24 +614,28 @@ tracks16:
 
 ^tuntop:
 	idle:
-		Offset: 0, -13, 42
 		ZRamp: 1
 		UseTilesetExtension: true
-		# Disabled to avoid glitches until shadow rendering is fixed
-		# Appears to be unused in the original game too
-		# ShadowStart: 1
 
 tuntop01:
 	Inherits: ^tuntop
+	idle:
+		Offset: 24, -49, 36
 
 tuntop02:
 	Inherits: ^tuntop
+	idle:
+		Offset: -24, -49, 36
 
 tuntop03:
 	Inherits: ^tuntop
+	idle:
+		Offset: 24, -49, 24
 
 tuntop04:
 	Inherits: ^tuntop
+	idle:
+		Offset: -24, -49, 24
 
 dig:
 	idle: