Index: factories/bakery.dat
===================================================================
--- factories/bakery.dat	(revision 2002)
+++ factories/bakery.dat	(working copy)
@@ -20,9 +20,9 @@
 Passenger_boost=800
 
 Smoke=industry_smoke
-SmokeTile=0,2
-SmokeOffset=4,-60
-SmokeSpeed=96
+SmokeTile[0]=0,2
+SmokeOffset[0]=4,-57
+#SmokeUplift=0
 
 # total flour input 500
 InputGood[0]=flour
Index: factories/Cementmill.dat
===================================================================
--- factories/Cementmill.dat	(revision 2002)
+++ factories/Cementmill.dat	(working copy)
@@ -20,9 +20,9 @@
 Passenger_boost=500
 
 Smoke=industry_smoke
-SmokeTile=0,0
-SmokeOffset=3,-63
-SmokeSpeed=64
+SmokeTile[0]=0,0
+SmokeOffset[0]=3,-73
+#SmokeUplift=0
 
 # stone input 350 (assume some stone from quarry intended for concrete factory.)
 InputGood[0]=Stone
Index: factories/textile_factory.dat
===================================================================
--- factories/textile_factory.dat	(revision 2002)
+++ factories/textile_factory.dat	(working copy)
@@ -19,6 +19,11 @@
 Passenger_demand=40
 Passenger_boost=500
 
+Smoke=industry_smoke
+SmokeTile[0]=0,0
+SmokeOffset[0]=21,-72
+#SmokeUplift=0
+
 # total wool input 660
 InputGood[0]=wool
 InputCapacity[0]=6600
Index: factories/ethanol_plant.dat
===================================================================
--- factories/ethanol_plant.dat	(revision 2002)
+++ factories/ethanol_plant.dat	(working copy)
@@ -15,6 +15,11 @@
 Passenger_demand=20
 Passenger_boost=500
 
+Smoke=industry_smoke
+SmokeTile[0]=0,1
+SmokeOffset[0]=-9,-68
+#SmokeUplift=0
+
 # average input 540 * 1.5 = 810t
 # supplies 2 modern gas stations
 
Index: factories/powerplants/old_powerplant_kraftwerk.dat
===================================================================
--- factories/powerplants/old_powerplant_kraftwerk.dat	(revision 2002)
+++ factories/powerplants/old_powerplant_kraftwerk.dat	(working copy)
@@ -23,10 +23,9 @@
 Passenger_boost=800
 
 Smoke=industry_smoke
-SmokeTile=0,0
-SmokeOffset=-42,-98
-# Tweak!
-SmokeSpeed=4
+SmokeTile[0]=0,1
+SmokeOffset[0]=-9,-67
+#SmokeUplift=0
 
 InputGood[0]=Kohle
 InputCapacity[0]=8000
Index: factories/powerplants/geothermal_powerplant_kraftwerk.dat
===================================================================
--- factories/powerplants/geothermal_powerplant_kraftwerk.dat	(revision 2002)
+++ factories/powerplants/geothermal_powerplant_kraftwerk.dat	(working copy)
@@ -18,10 +18,12 @@
 pax_level=3
 level=3
 
-Smoke=industry_smoke
-SmokeTile=1,1
-SmokeOffset=0,-36
-SmokeSpeed=10
+Smoke=Steam_ship
+SmokeTile[0]=1,1
+SmokeOffset[0]=7,-28
+SmokeTile[1]=1,1
+SmokeOffset[1]=-8,-28
+#SmokeUplift=0
 
 needs_ground=1
 climates=tundra,rocky,arctic
Index: factories/powerplants/waste_incinerator_kraftwerk.dat
===================================================================
--- factories/powerplants/waste_incinerator_kraftwerk.dat	(revision 2002)
+++ factories/powerplants/waste_incinerator_kraftwerk.dat	(working copy)
@@ -20,9 +20,9 @@
 Passenger_boost=500
 
 Smoke=industry_smoke
-SmokeTile=1,0
-SmokeOffset=11,-59
-SmokeSpeed=128
+SmokeTile[0]=1,0
+SmokeOffset[0]=10,-70
+#SmokeUplift=0
 
 InputGood[0]=waste
 InputCapacity[0]=8000
Index: factories/powerplants/oilkraftwerk.dat
===================================================================
--- factories/powerplants/oilkraftwerk.dat	(revision 2002)
+++ factories/powerplants/oilkraftwerk.dat	(working copy)
@@ -12,9 +12,9 @@
 intro_month=1
 
 Smoke=industry_smoke
-SmokeTile=0,0
-SmokeOffset=-5,-58
-SmokeSpeed=256
+SmokeTile[0]=0,1
+SmokeOffset[0]=27,-84
+#SmokeUplift=0
 
 Electricity_amount=800
 Electricity_boost=0
Index: factories/classical_goods_factory.dat
===================================================================
--- factories/classical_goods_factory.dat	(revision 2002)
+++ factories/classical_goods_factory.dat	(working copy)
@@ -19,6 +19,11 @@
 Passenger_demand=20
 Passenger_boost=500
 
+Smoke=industry_smoke
+SmokeTile[0]=0,2
+SmokeOffset[0]=-13,-80
+#SmokeUplift=0
+
 # plastik consumable input 400
 InputGood[0]=Plastik
 InputCapacity[0]=1500
Index: factories/steel_mill.dat
===================================================================
--- factories/steel_mill.dat	(revision 2002)
+++ factories/steel_mill.dat	(working copy)
@@ -21,11 +21,9 @@
 Passenger_boost=500
 
 Smoke=industry_smoke
-SmokeTile=0,0
-# x - <- -> +
-# from the approximate middle of the 128x128 tile, in 64x64 scale
-SmokeOffset=3,-29
-SmokeSpeed=128
+SmokeTile[0]=0,0
+SmokeOffset[0]=3,-41
+#SmokeUplift=0
 
 InputGood[0]=Eisenerz
 InputCapacity[0]=12000
Index: factories/grain_mill.dat
===================================================================
--- factories/grain_mill.dat	(revision 2002)
+++ factories/grain_mill.dat	(working copy)
@@ -18,6 +18,13 @@
 Passenger_demand=20
 Passenger_boost=500
 
+Smoke=industry_smoke
+SmokeTile[0]=0,0
+SmokeOffset[0]=-4,-62
+SmokeTile[1]=0,0
+SmokeOffset[1]=4,-62
+#SmokeUplift=0
+
 #total input 560t
 InputGood[0]=grain
 InputCapacity[0]=3500
Index: factories/Papierfabrik.dat
===================================================================
--- factories/Papierfabrik.dat	(revision 2002)
+++ factories/Papierfabrik.dat	(working copy)
@@ -19,11 +19,6 @@
 Passenger_demand=20
 Passenger_boost=500
 
-Smoke=industry_smoke
-SmokeTile=0,0
-SmokeOffset=-16,-6
-SmokeSpeed=96
-
 #total input 240
 InputGood[0]=Holz
 InputCapacity[0]=4500
Index: factories/Raffinerie.dat
===================================================================
--- factories/Raffinerie.dat	(revision 2002)
+++ factories/Raffinerie.dat	(working copy)
@@ -16,6 +16,11 @@
 Passenger_demand=100
 Passenger_boost=500
 
+Smoke=industry_smoke
+SmokeTile[0]=1,0
+SmokeOffset[0]=-2,-53
+#SmokeUplift=0
+
 #Average input total 1600t
 InputGood[0]=Oel
 InputCapacity[0]=12000
Index: factories/Glass_factory.dat
===================================================================
--- factories/Glass_factory.dat	(revision 2002)
+++ factories/Glass_factory.dat	(working copy)
@@ -24,9 +24,9 @@
 OutputCapacity[0]=800
 
 Smoke=industry_smoke
-SmokeTile=0,0
-SmokeOffset=8,-48
-SmokeSpeed=64
+SmokeTile[0]=0,0
+SmokeOffset[0]=8,-57
+#SmokeUplift=0
 
 #total coal input (210)
 InputGood[0]=Kohle