(svn r24118) -Release: 1.2.0

(svn r24117) [1.2] -Update: some documentation
(svn r24116) [1.2] -Backport from trunk:
2025-08-13 17:49:10 +00:00 · 2012-04-15 11:54:19 +00:00 · 2012-04-15 11:49:54 +00:00 · 2012-04-15 08:50:23 +00:00 · 2012-03-31 21:50:52 +00:00 · 2012-03-31 17:55:38 +00:00
263 changed files with 13408 additions and 9239 deletions
--- a/Makefile.bundle.in
+++ b/Makefile.bundle.in
@@ -85,7 +85,7 @@ endif
 	$(Q)cp "$(BIN_DIR)/scripts/"*             "$(BUNDLE_DIR)/scripts/"
 ifdef MENU_DIR
 	$(Q)cp "$(ROOT_DIR)/media/openttd.desktop" "$(BUNDLE_DIR)/media/"
-	$(Q)$(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.translation.awk" "$(SRC_DIR)/lang/"*.txt | $(SORT) >> "$(BUNDLE_DIR)/media/openttd.desktop"
+	$(Q)$(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.translation.awk" "$(SRC_DIR)/lang/"*.txt | $(SORT) |  $(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.filter.awk" >> "$(BUNDLE_DIR)/media/openttd.desktop"
 	$(Q)sed s/=openttd/=$(BINARY_NAME)/g "$(BUNDLE_DIR)/media/openttd.desktop" > "$(ROOT_DIR)/media/openttd.desktop.install"
 endif
 ifeq ($(TTD), openttd.exe)
--- a/Makefile.grf.in
+++ b/Makefile.grf.in
@@ -66,7 +66,7 @@ $(OBJS_DIR)/openttd.grf: $(PNG_FILES) $(NFO_FILES) $(OBJS_DIR)/sprites
 	$(Q) gcc -I$(GRF_DIR) -C -E - < "$(GRF_DIR)/openttd.nfo" | sed -e '/^#/d' -e '/^$$/d' > $(OBJS_DIR)/sprites/openttd.nfo
 	$(Q) $(NFORENUM) -s $(OBJS_DIR)/sprites/openttd.nfo
 	$(E) '$(STAGE) Compiling openttd.grf'
-	$(Q) $(GRFCODEC) -s -e -p1 $(OBJS_DIR)/openttd.grf
+	$(Q) $(GRFCODEC) -n -s -e -p1 $(OBJS_DIR)/openttd.grf

 # Clean up temporary files.
 clean:
--- a/Makefile.in
+++ b/Makefile.in
@@ -126,6 +126,13 @@ lang:
 mrproper:
 	@for dir in $(DIRS); do \
 		$(MAKE) -C $$dir mrproper; \
+	done
+# Don't be tempted to merge these two for loops. Doing that breaks make
+# --dry-run, since make has this "feature" that it always runs commands
+# containing $(MAKE), even when --dry-run is passed. The objective is of
+# course to also get a dry-run of submakes, but make is not smart enough
+# to see that a for loop runs both a submake and an actual command.
+	@for dir in $(DIRS); do \
 		rm -f $$dir/Makefile; \
 	done
 	$(Q)rm -rf objs
--- a/Makefile.src.in
+++ b/Makefile.src.in
@@ -292,7 +292,7 @@ depend: $(DEPS)

 clean:
 	$(E) '$(STAGE) Cleaning up object files'
-	$(Q)rm -f $(DEPS) $(OBJS) $(TTD) $(DEPEND) $(TTD:%=$(BIN_DIR)/%) $(CONFIG_CACHE_COMPILER) $(CONFIG_CACHE_LINKER) $(CONFIG_CACHE_ENDIAN) $(CONFIG_CACHE_SOURCE) $(ENDIAN_TARGETS)
+	$(Q)rm -f $(DEPS) $(OBJS) $(TTD) $(DEPEND) $(TTD:%=$(BIN_DIR)/%) $(BIN_DIR)/baseset/openttd.32.bmp $(CONFIG_CACHE_COMPILER) $(CONFIG_CACHE_LINKER) $(CONFIG_CACHE_ENDIAN) $(CONFIG_CACHE_SOURCE) $(ENDIAN_TARGETS)

 mrproper: clean
 	$(Q)rm -f $(SRC_DIR)/rev.cpp $(SRC_DIR)/os/windows/ottdres.rc
--- a/bin/ai/compat_0.7.nut
+++ b/bin/ai/compat_0.7.nut
@@ -350,3 +350,20 @@ AIEvent.AI_ET_ENGINE_AVAILABLE <- AIEvent.ET_ENGINE_AVAILABLE;
 AIEvent.AI_ET_STATION_FIRST_VEHICLE <- AIEvent.ET_STATION_FIRST_VEHICLE;
 AIEvent.AI_ET_DISASTER_ZEPPELINER_CRASHED <- AIEvent.ET_DISASTER_ZEPPELINER_CRASHED;
 AIEvent.AI_ET_DISASTER_ZEPPELINER_CLEARED <- AIEvent.ET_DISASTER_ZEPPELINER_CLEARED;
+AIOrder.AIOF_NONE <- AIOrder.OF_NONE
+AIOrder.AIOF_NON_STOP_INTERMEDIATE <- AIOrder.OF_NON_STOP_INTERMEDIATE
+AIOrder.AIOF_NON_STOP_DESTINATION <- AIOrder.OF_NON_STOP_DESTINATION
+AIOrder.AIOF_UNLOAD <- AIOrder.OF_UNLOAD
+AIOrder.AIOF_TRANSFER <- AIOrder.OF_TRANSFER
+AIOrder.AIOF_NO_UNLOAD <- AIOrder.OF_NO_UNLOAD
+AIOrder.AIOF_FULL_LOAD <- AIOrder.OF_FULL_LOAD
+AIOrder.AIOF_FULL_LOAD_ANY <- AIOrder.OF_FULL_LOAD_ANY
+AIOrder.AIOF_NO_LOAD <- AIOrder.OF_NO_LOAD
+AIOrder.AIOF_SERVICE_IF_NEEDED <- AIOrder.OF_SERVICE_IF_NEEDED
+AIOrder.AIOF_STOP_IN_DEPOT <- AIOrder.OF_STOP_IN_DEPOT
+AIOrder.AIOF_GOTO_NEAREST_DEPOT <- AIOrder.OF_GOTO_NEAREST_DEPOT
+AIOrder.AIOF_NON_STOP_FLAGS <- AIOrder.OF_NON_STOP_FLAGS
+AIOrder.AIOF_UNLOAD_FLAGS <- AIOrder.OF_UNLOAD_FLAGS
+AIOrder.AIOF_LOAD_FLAGS <- AIOrder.OF_LOAD_FLAGS
+AIOrder.AIOF_DEPOT_FLAGS <- AIOrder.OF_DEPOT_FLAGS
+AIOrder.AIOF_INVALID <- AIOrder.OF_INVALID
--- a/bin/ai/compat_1.0.nut
+++ b/bin/ai/compat_1.0.nut
@@ -102,3 +102,20 @@ AIEvent.AI_ET_ENGINE_AVAILABLE <- AIEvent.ET_ENGINE_AVAILABLE;
 AIEvent.AI_ET_STATION_FIRST_VEHICLE <- AIEvent.ET_STATION_FIRST_VEHICLE;
 AIEvent.AI_ET_DISASTER_ZEPPELINER_CRASHED <- AIEvent.ET_DISASTER_ZEPPELINER_CRASHED;
 AIEvent.AI_ET_DISASTER_ZEPPELINER_CLEARED <- AIEvent.ET_DISASTER_ZEPPELINER_CLEARED;
+AIOrder.AIOF_NONE <- AIOrder.OF_NONE
+AIOrder.AIOF_NON_STOP_INTERMEDIATE <- AIOrder.OF_NON_STOP_INTERMEDIATE
+AIOrder.AIOF_NON_STOP_DESTINATION <- AIOrder.OF_NON_STOP_DESTINATION
+AIOrder.AIOF_UNLOAD <- AIOrder.OF_UNLOAD
+AIOrder.AIOF_TRANSFER <- AIOrder.OF_TRANSFER
+AIOrder.AIOF_NO_UNLOAD <- AIOrder.OF_NO_UNLOAD
+AIOrder.AIOF_FULL_LOAD <- AIOrder.OF_FULL_LOAD
+AIOrder.AIOF_FULL_LOAD_ANY <- AIOrder.OF_FULL_LOAD_ANY
+AIOrder.AIOF_NO_LOAD <- AIOrder.OF_NO_LOAD
+AIOrder.AIOF_SERVICE_IF_NEEDED <- AIOrder.OF_SERVICE_IF_NEEDED
+AIOrder.AIOF_STOP_IN_DEPOT <- AIOrder.OF_STOP_IN_DEPOT
+AIOrder.AIOF_GOTO_NEAREST_DEPOT <- AIOrder.OF_GOTO_NEAREST_DEPOT
+AIOrder.AIOF_NON_STOP_FLAGS <- AIOrder.OF_NON_STOP_FLAGS
+AIOrder.AIOF_UNLOAD_FLAGS <- AIOrder.OF_UNLOAD_FLAGS
+AIOrder.AIOF_LOAD_FLAGS <- AIOrder.OF_LOAD_FLAGS
+AIOrder.AIOF_DEPOT_FLAGS <- AIOrder.OF_DEPOT_FLAGS
+AIOrder.AIOF_INVALID <- AIOrder.OF_INVALID
--- a/bin/ai/compat_1.1.nut
+++ b/bin/ai/compat_1.1.nut
@@ -39,3 +39,20 @@ AIEvent.AI_ET_STATION_FIRST_VEHICLE <- AIEvent.ET_STATION_FIRST_VEHICLE;
 AIEvent.AI_ET_DISASTER_ZEPPELINER_CRASHED <- AIEvent.ET_DISASTER_ZEPPELINER_CRASHED;
 AIEvent.AI_ET_DISASTER_ZEPPELINER_CLEARED <- AIEvent.ET_DISASTER_ZEPPELINER_CLEARED;
 AIEvent.AI_ET_TOWN_FOUNDED <- AIEvent.ET_TOWN_FOUNDED;
+AIOrder.AIOF_NONE <- AIOrder.OF_NONE
+AIOrder.AIOF_NON_STOP_INTERMEDIATE <- AIOrder.OF_NON_STOP_INTERMEDIATE
+AIOrder.AIOF_NON_STOP_DESTINATION <- AIOrder.OF_NON_STOP_DESTINATION
+AIOrder.AIOF_UNLOAD <- AIOrder.OF_UNLOAD
+AIOrder.AIOF_TRANSFER <- AIOrder.OF_TRANSFER
+AIOrder.AIOF_NO_UNLOAD <- AIOrder.OF_NO_UNLOAD
+AIOrder.AIOF_FULL_LOAD <- AIOrder.OF_FULL_LOAD
+AIOrder.AIOF_FULL_LOAD_ANY <- AIOrder.OF_FULL_LOAD_ANY
+AIOrder.AIOF_NO_LOAD <- AIOrder.OF_NO_LOAD
+AIOrder.AIOF_SERVICE_IF_NEEDED <- AIOrder.OF_SERVICE_IF_NEEDED
+AIOrder.AIOF_STOP_IN_DEPOT <- AIOrder.OF_STOP_IN_DEPOT
+AIOrder.AIOF_GOTO_NEAREST_DEPOT <- AIOrder.OF_GOTO_NEAREST_DEPOT
+AIOrder.AIOF_NON_STOP_FLAGS <- AIOrder.OF_NON_STOP_FLAGS
+AIOrder.AIOF_UNLOAD_FLAGS <- AIOrder.OF_UNLOAD_FLAGS
+AIOrder.AIOF_LOAD_FLAGS <- AIOrder.OF_LOAD_FLAGS
+AIOrder.AIOF_DEPOT_FLAGS <- AIOrder.OF_DEPOT_FLAGS
+AIOrder.AIOF_INVALID <- AIOrder.OF_INVALID
--- a/bin/ai/regression/regression.nut
+++ b/bin/ai/regression/regression.nut
@@ -923,12 +923,12 @@ function Regression::Order()
 	print("--Order--");
 	print("  GetOrderCount():       " + AIOrder.GetOrderCount(12));
 	print("  GetOrderDestination(): " + AIOrder.GetOrderDestination(12, 1));
-	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33416, AIOrder.AIOF_TRANSFER));
-	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33416, AIOrder.AIOF_TRANSFER | AIOrder.AIOF_UNLOAD));
-	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33416, AIOrder.AIOF_TRANSFER | AIOrder.AIOF_FULL_LOAD));
-	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33417, AIOrder.AIOF_SERVICE_IF_NEEDED));
-	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33417, AIOrder.AIOF_STOP_IN_DEPOT));
-	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(0, AIOrder.AIOF_SERVICE_IF_NEEDED | AIOrder.AIOF_GOTO_NEAREST_DEPOT));
+	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33416, AIOrder.OF_TRANSFER));
+	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33416, AIOrder.OF_TRANSFER | AIOrder.OF_UNLOAD));
+	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33416, AIOrder.OF_TRANSFER | AIOrder.OF_FULL_LOAD));
+	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33417, AIOrder.OF_SERVICE_IF_NEEDED));
+	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33417, AIOrder.OF_STOP_IN_DEPOT));
+	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(0, AIOrder.OF_SERVICE_IF_NEEDED | AIOrder.OF_GOTO_NEAREST_DEPOT));
 	print("  IsValidConditionalOrder(): " + AIOrder.IsValidConditionalOrder(AIOrder.OC_LOAD_PERCENTAGE, AIOrder.CF_EQUALS));
 	print("  IsValidConditionalOrder(): " + AIOrder.IsValidConditionalOrder(AIOrder.OC_RELIABILITY, AIOrder.CF_IS_TRUE));
 	print("  IsValidConditionalOrder(): " + AIOrder.IsValidConditionalOrder(AIOrder.OC_REQUIRES_SERVICE, AIOrder.CF_IS_FALSE));
@@ -940,8 +940,8 @@ function Regression::Order()
 	print("  IsConditionalOrder():  " + AIOrder.IsConditionalOrder(12, 1));
 	print("  IsCurrentOrderPartOfOrderList(): " + AIOrder.IsCurrentOrderPartOfOrderList(12));
 	print("  GetOrderFlags():       " + AIOrder.GetOrderFlags(12, 1));
-	print("  AppendOrder():         " + AIOrder.AppendOrder(12, 33416, AIOrder.AIOF_TRANSFER));
-	print("  InsertOrder():         " + AIOrder.InsertOrder(12, 0, 33416, AIOrder.AIOF_TRANSFER));
+	print("  AppendOrder():         " + AIOrder.AppendOrder(12, 33416, AIOrder.OF_TRANSFER));
+	print("  InsertOrder():         " + AIOrder.InsertOrder(12, 0, 33416, AIOrder.OF_TRANSFER));
 	print("  GetOrderCount():       " + AIOrder.GetOrderCount(12));
 	print("  IsValidVehicleOrder(): " + AIOrder.IsValidVehicleOrder(12, 1));
 	print("  IsGotoStationOrder():  " + AIOrder.IsGotoStationOrder(12, 1));
@@ -953,7 +953,7 @@ function Regression::Order()
 	print("  GetOrderFlags():       " + AIOrder.GetOrderFlags(12, 1));
 	print("  GetOrderJumpTo():      " + AIOrder.GetOrderJumpTo(12, 1));
 	print("  RemoveOrder():         " + AIOrder.RemoveOrder(12, 0));
-	print("  SetOrderFlags():       " + AIOrder.SetOrderFlags(12, 0, AIOrder.AIOF_FULL_LOAD));
+	print("  SetOrderFlags():       " + AIOrder.SetOrderFlags(12, 0, AIOrder.OF_FULL_LOAD));
 	print("  GetOrderFlags():       " + AIOrder.GetOrderFlags(12, 0));
 	print("  GetOrderDestination(): " + AIOrder.GetOrderDestination(12, 0));
 	print("  CopyOrders():          " + AIOrder.CopyOrders(12, 1));
@@ -961,12 +961,12 @@ function Regression::Order()
 	print("  ShareOrders():         " + AIOrder.ShareOrders(13, 1));
 	print("  ShareOrders():         " + AIOrder.ShareOrders(13, 12));
 	print("  UnshareOrders():       " + AIOrder.UnshareOrders(13));
-	print("  AppendOrder():         " + AIOrder.AppendOrder(12, 33421, AIOrder.AIOF_NONE));
+	print("  AppendOrder():         " + AIOrder.AppendOrder(12, 33421, AIOrder.OF_NONE));

 	print("  GetStopLocation():     " + AIOrder.GetStopLocation(13, 0));
 	print("  BuildVehicle():        " + AIVehicle.BuildVehicle(23596, 8));
 	print("  BuildRailStation():    " + AIRail.BuildRailStation(7958, AIRail.RAILTRACK_NE_SW, 1, 1, AIStation.STATION_NEW));
-	print("  AppendOrder():         " + AIOrder.AppendOrder(20, 7958, AIOrder.AIOF_NONE));
+	print("  AppendOrder():         " + AIOrder.AppendOrder(20, 7958, AIOrder.OF_NONE));
 	print("  GetOrderCount():       " + AIOrder.GetOrderCount(20));
 	print("  GetStopLocation():     " + AIOrder.GetStopLocation(20, 0));
 	print("  SetStopLocation():     " + AIOrder.SetStopLocation(20, 0, AIOrder.STOPLOCATION_MIDDLE));
--- a/bin/ai/regression/run.sh
+++ b/bin/ai/regression/run.sh
@@ -25,7 +25,7 @@ fi
 if [ -n "$gdb" ]; then
 	$gdb ./openttd -x -c ai/regression/regression.cfg $params -g ai/regression/regression.sav
 else
-	./openttd -x -c ai/regression/regression.cfg $params -g ai/regression/regression.sav -d script=2 2>&1 | awk '{ gsub("0x(\\(nil\\)|0+)(x0)?", "0x00000000", $0); gsub("^dbg: \\[script\\]", "", $0); gsub("^ ", "ERROR: ", $0); gsub("ERROR: \\[1\\] ", "", $0); gsub("\\[P\\] ", "", $0); print $0; }' > tmp.regression
+	./openttd -x -c ai/regression/regression.cfg $params -g ai/regression/regression.sav -d script=2 -d misc=9 2>&1 | awk '{ gsub("0x(\\(nil\\)|0+)(x0)?", "0x00000000", $0); gsub("^dbg: \\[script\\]", "", $0); gsub("^ ", "ERROR: ", $0); gsub("ERROR: \\[1\\] ", "", $0); gsub("\\[P\\] ", "", $0); print $0; }' | grep -v '^dbg: \[.*\]' > tmp.regression
 fi

 ret=0
--- a/bin/baseset/openttd.grf
+++ b/bin/baseset/openttd.grf
--- a/bin/baseset/opntitle.dat
+++ b/bin/baseset/opntitle.dat
--- a/bin/baseset/orig_dos.obg
+++ b/bin/baseset/orig_dos.obg
@@ -55,7 +55,7 @@ TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF     = ed446637e034104c5559b32c18afe78d
 TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF     = e30e8a398ae86c03dc534a8ac7dfb3b6
-OPENTTD.GRF  = 39704043e69f463d6300605004891d91
+OPENTTD.GRF  = 51f9d2b8a29a079e83486db13509336c

 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
--- a/bin/baseset/orig_dos_de.obg
+++ b/bin/baseset/orig_dos_de.obg
@@ -55,7 +55,7 @@ TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF     = ed446637e034104c5559b32c18afe78d
 TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF     = fcde1d7e8a74197d72a62695884b909e
-OPENTTD.GRF  = 39704043e69f463d6300605004891d91
+OPENTTD.GRF  = 51f9d2b8a29a079e83486db13509336c

 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
--- a/bin/baseset/orig_win.obg
+++ b/bin/baseset/orig_win.obg
@@ -55,7 +55,7 @@ TRGIR.GRF    = 0c2484ff6be49fc63a83be6ab5c38f32
 TRGCR.GRF    = 3668f410c761a050b5e7095a2b14879b
 TRGHR.GRF    = 06bf2b7a31766f048baac2ebe43457b1
 TRGTR.GRF    = de53650517fe661ceaa3138c6edb0eb8
-OPENTTD.GRF  = 39704043e69f463d6300605004891d91
+OPENTTD.GRF  = 51f9d2b8a29a079e83486db13509336c

 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,90 @@
+1.2.0 (2012-04-15)
+------------------------------------------------------------------------
+- Fix: When starting GS or AI, always use the settings of the game, not the new-game settings [FS#5142] (r24108)
+- Fix: Provide translated comments in the desktop file without language name postfix (r24100)
+- Fix: Cloning orders of aircraft with limited range failed [FS#5131] (r24086)
+
+
+1.2.0-RC4 (2012-04-01)
+------------------------------------------------------------------------
+- Fix: Reversing trains while they were entering or leaving a depot could lead to stuck trains [FS#5093] (r24078, r24071)
+- Fix: The 'last joined' server was not properly selected anymore [FS#5098] (r24070)
+- Fix: Immediately start querying the last joined server instead of waiting for the requery loop [FS#5097] (r24069, r24062)
+- Fix: Make the full snowedness level of houses the same as roads and rails [FS#5121] (r24064)
+- Fix: With certain versions of GCC and compiler flags the compiler could reorder some code badly causing the 32bpp depot flag not working [FS#5125] (r24063)
+- Fix: Do not freeze aircraft mid-flight when skipping to an out-of-range destination [FS#5123] (r24060)
+- Fix: Wrong numbering of string parameters causing wrong capacities to be shown [FS#5124] (r24058)
+- Fix: Crash when timetabling a maximum travel speed of 0 [FS#5111] (r24053)
+- Fix: [NewGRF] Imported GRF sounds were inserted into the wrong slots [FS#5107] (r24052)
+- Fix: [NewGRF] Realsprites inside the action 11 block were not skipped correctly (r24050)
+- Fix: Improve error messages for the placement restrictions of banks, water towers and toy shops [FS#5095] (r24040)
+
+
+1.2.0-RC3 (2012-03-18)
+------------------------------------------------------------------------
+- Feature: Allow display of baseset textfiles (r24037)
+- Feature: Increase the station class limit from 32 to 256 (r24031)
+- Fix: After opening a text window with the monospaced font, all other text started glitching (r24038)
+- Fix: [NoAI] Reset 'is random' status of temporary variable during saveload as it is not always written to when loading an AI which means it wouldd be taking the 'is random' setting of another AI (r24033)
+- Fix: [NoAI] Make AIEngine::IsArticulated return true if the articulated callback flag is set, do not try to run the callback (r24029)
+- Fix: Pass cases down into the list of cargos [FS#5090] (r24024, r24023, r24022)
+
+
+1.2.0-RC2 (2012-03-04)
+------------------------------------------------------------------------
+- Fix: [Script] AI used in names in API for GSOrder [FS#5088] (r24006)
+- Fix: Improve rounding when converting display speeds to internal speeds [FS#5079] (r23995)
+- Fix: Also reset the font glyph cache when switching blitters (r23992, r23987)
+- Fix: [NewGRF] Also display the cargo subtype for vehicles which have no capacity, but a subtype [FS#5076] (r23991)
+- Fix: Zero the offsets of disabled zoomlevels, so they do not influence offset calculations (r23989)
+- Fix: Invalid reads when scaling an odd-sized sprite smaller (r23986)
+- Fix: Inconsistent quit/abandon/exit game/scenario/editor strings [FS#5074] (r23985)
+- Fix: Fix the order of lights on the helipad [FS#5082] (r23984)
+- Fix: Tarred heightmaps would not be found [FS#5083] (r23983)
+- Fix: Do not load a game during UpdateWindows as that might trigger changing the blitter which triggers re-entrant locking (r23980, r23977)
+- Fix: [SDL] Palette update was done too late making switching from 8bpp -> 32bpp look ugly (r23978)
+- Fix: Sprites of different zoom levels were not always padded correctly to a common size (r23976)
+- Fix: Also save the maximum travel speed for the current vehicle order (r23973)
+
+
+1.2.0-RC1 (2012-02-19)
+------------------------------------------------------------------------
+- Feature: [NewGRF] Customisable tunnel portals for rail types (r23952)
+- Feature: Timetabled maximum travel speeds for non-flying vehicles (r23947)
+- Feature: Readme/licence/changelog viewer for AI and game scripts [FS#5047] (r23936)
+- Feature: [NewGRF] 32bpp sprites in GRFs (r23897)
+- Feature: [NewGRF] Support for RealSprites with multiple zoom levels (r23890)
+- Feature: [NewGRF] Support for container version 2 (r23887)
+- Fix: Refittability should never depend on the current capacity of a vehicle [FS#5070] (r23965)
+- Fix: Do not look for missing sprites twice during startup [FS#5072] (r23963)
+- Fix: [Script] Infinite recursion within a script was not caught properly, so they could cause crashes of OpenTTD instead of the AI [FS#5068] (r23962)
+- Fix: [NewGRF] Make the properties for always/never refittable cargo types not behave incremental, but reset them on reassignment (r23960)
+- Fix: [Network] Do not allow chat messages from pre-active clients. As they have not got the savegame yet, they will not have the interface to send them either (r23958)
+- Fix: [Network] Allow sending chat to pre-active clients as the clients start accepting once they send 'map ok' to the server, which is the same moment we change their status to pre-active [FS#4990] (r23957)
+- Fix: When the population of a town changes the town view might even have to change size due to different cargo requirements [FS#5062] (r23953)
+- Fix: [NoGo] Never show GSGoal::Question() to spectators [FS#5063] (r23950)
+- Fix: Better rounding when converting internal speed to displayed speed (r23945)
+- Fix: Also list DEITY signs in the signlist in the scenario editor [FS#5061] (r23943)
+- Fix: Infrastructure cache of standard road stops would get messed up when buying a company with them (r23942)
+- Fix: Scale infrastructure cost of rail tracks by the total number of all tracks and not independently for each rail type (r23931)
+- Fix: [Script] Do not close the parameter window when a script starts [FS#4944] (r23930)
+- Fix: Do not accelerate, for smoke purposes, when you reached the track's maximum speed [FS#5053]
+- Fix: 32bpp animated blitter was optimised a bit too far regarding not needing to update the colour mapping when (re)initialising the palette [FS#5056] (r23927)
+- Fix: [NoGo] Some news messages would cause an assertion to be triggered due to a missing proper location for the viewport of the news message, so only allow building when valid data for the viewport is provided or no viewport is used [FS#5054] (r23924)
+- Fix: Consider only the middle tile of a lock for lock-infrastructure costs. The other two tiles may be owned by other companies. Also do not count the middle tile of a lock as canal, independent of whether it is build on ground or river slope (r23920)
+- Fix: [NewGRF] When determining the first refittable cargotype according to CTT order, do not rely on the GRF assigning the refit_mask property. Also check for GRFs setting the default_cargo or refittable-cargo-classes or -types properties (r23916)
+- Fix: [NewGRF] Do not test validity of cargobits using a mask of cargoslots (r23914)
+- Fix: [NewGRF] When testing whether a engine shall only carry the default cargo, check ctt_include_mask for being empty before applying cargo translation (r23912)
+- Fix: [SDL] Handle the SDL_VIDEOEXPOSE event to solve issues with SDL 1.3 (r23910)
+- Fix: [SDL] Fix keyboard-related segfault when compiling against SDL 1.3 (r23909)
+- Fix: [Makefile] Make sure bin/baseset/openttd.32.bmp is removed on make clean (r23908)
+- Fix: [Makefile] Let "make clean --dry-run" not delete Makefiles (r23907)
+- Fix: [Windows installer] OpenMSX got downloaded to and extracted in the wrong (non-existent) folder [FS#5045] (r23905)
+- Fix: Memory leak everytime one clicked a savegame in the load GUI (r23901)
+- Fix: [NewGRF] It was not possible to import sounds from a NewGRF later in the load order (r23883)
+- Remove: PNG sprite loader; use 32bpp sprites in a NewGRF (r23898)
+
+
 1.2.0-beta4 (2012-02-04)
 ------------------------------------------------------------------------
 - Feature: [NewGRF] Give NewGRF defined level crossings and rail depots access to the townzone (r23866)
--- a/config.lib
+++ b/config.lib
@@ -57,8 +57,8 @@ set_default() {
 	enable_translator="0"
 	enable_unicode="1"
 	enable_console="1";
-	enable_assert="1"
-	enable_strip="0"
+	enable_assert="0"
+	enable_strip="1"
 	enable_universal="0"
 	enable_osx_g5="0"
 	enable_cocoa_quartz="1"
@@ -1159,11 +1159,11 @@ make_compiler_cflags() {
 		if [ -z "$first_time_icc_check" ]; then
 			first_time_icc_check=no
 			if [ $cc_version -lt 90 ]; then
-				log 1 "WARNING: you seem to be using very old version of ICC"
+				log 1 "WARNING: you seem to be using a very old version of ICC"
 				log 1 "WARNING: OpenTTD hasn't been tested with this version"
 				sleep 5
 			elif [ $cc_version -lt 120 ]; then
-				log 1 "WARNING: you seem to be using unsupported ICC version"
+				log 1 "WARNING: you seem to be using an unsupported ICC version"
 				log 1 "WARNING: ICC older than 12.0 is known to fail to compile OpenTTD"
 				sleep 5
 			fi
@@ -1236,6 +1236,58 @@ make_compiler_cflags() {
 				features="$features lto"
 			fi
 		fi
+	elif [ `basename $1 | grep 'clang'` ]; then
+		# Enable some things only for certain clang versions
+		cc_version="`$1 -v 2>&1 | head -n 1 | sed s@[^0-9]@@g | cut -c 1-2`"
+
+		# aliasing rules are not held in openttd code
+		flags="$flags -fno-strict-aliasing"
+
+		# -W alone doesn't enable all warnings enabled by -Wall; on the other hand,
+		# -Weverything enables too many useless warnings that can't be disabled (as of 3.0)
+		flags="$flags -Wall -W"
+
+		# warning: unused parameter '...'
+		flags="$flags -Wno-unused-parameter"
+
+		# warning: expression result unused
+		flags="$flags -Wno-unused-value"
+
+		# warning: multi-character character constant
+		flags="$flags -Wno-multichar"
+
+		# warning: explicitly assigning a variable of type '...' to itself
+		# it happens when using the FOR_ALL_WINDOWS_FROM_BACK_FROM macro
+		flags="$flags -Wno-self-assign"
+
+		if [ "$cc_version" -lt "30" ]; then
+			# warning: equality comparison with extraneous parentheses
+			flags="$flags -Wno-parentheses"
+			# warning: operands of ? are integers of different signs: 'unsigned int' and 'int'
+			flags="$flags -Wno-sign-compare"
+		fi
+
+		if [ "$cc_version" -ge "30" ]; then
+			# warning: equality comparison with extraneous parentheses
+			# this warning could be useful, but it warns about code in squirrel
+			flags="$flags -Wno-parentheses-equality"
+		fi
+
+		if [ "$with_ccache" != "0" -o "$with_distcc" != "0" ]; then
+			# ccache and distcc run separate preprocess and compile passes,
+			# both are fed with the same CFLAGS. Unfortunately, clang
+			# complains about -I when compiling preprocessed files:
+			# "clang: warning: argument unused during compilation: '-I /usr/include'"
+			flags="$flags -Qunused-arguments"
+		fi
+
+		if [ "$enable_assert" -eq "0" ]; then
+			# do not warn about unused variables when building without asserts
+			flags="$flags -Wno-unused-variable"
+		fi
+
+		# rdynamic is used to get useful stack traces from crash reports.
+		ldflags="$ldflags -rdynamic"
 	else
 		# Enable some things only for certain GCC versions
 		cc_version=`$1 -dumpversion | cut -c 1,3`
@@ -3068,9 +3120,9 @@ detect_grfcodec() {
 	log 2 "  returned $version"
 	log 2 "  exit code $ret"

-	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "846" ]; then
-		if [ -n "$version" ] && [ "$version" -lt "846" ]; then
-			log 1 "checking grfcodec... needs at least version 5.1.3 (r846), disabled"
+	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "913" ]; then
+		if [ -n "$version" ] && [ "$version" -lt "913" ]; then
+			log 1 "checking grfcodec... needs at least version 5.1.4 (r913), disabled"
 		else
 			log 1 "checking grfcodec... not found"
 		fi
@@ -3110,9 +3162,9 @@ detect_nforenum() {
 	log 2 "  returned $version"
 	log 2 "  exit code $ret"

-	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "846" ]; then
-		if [ -n "$version" ] && [ "$version" -lt "846" ]; then
-			log 1 "checking nforenum... needs at least version 5.1.3 (r846), disabled"
+	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "913" ]; then
+		if [ -n "$version" ] && [ "$version" -lt "913" ]; then
+			log 1 "checking nforenum... needs at least version 5.1.4 (r913), disabled"
 		else
 			log 1 "checking nforenum... not found"
 		fi
--- a/known-bugs.txt
+++ b/known-bugs.txt
@@ -1,6 +1,6 @@
 OpenTTD's known bugs
-Last updated:    2012-02-04
-Release version: 1.2.0-beta4
+Last updated:    2012-04-15
+Release version: 1.2.0
 ------------------------------------------------------------------------


@@ -39,6 +39,7 @@ officially supporting Mac OS X again. For now it remains unsupported and
 we only apply bug fixes provided by the community but we are unable to fix
 these bugs ourselves.

+- 5154	Crash about old language when there is an error in misc settings
 - 4857	[OSX] No support for detecting mono space font
 - 4847	[OSX] No support for bootstrap downloading of base graphics
 - 4744  [OSX] Crash when switching to full screen with OS X Lion
--- a/media/extra_grf/airport_preview.nfo
+++ b/media/extra_grf/airport_preview.nfo
@@ -8,12 +8,12 @@
 //
   -1 * 0	 0C "Airport previews"
   -1 * 0	 05 16 09
-   -1 sprites/airport_preview.png 50 8 09 140 230 0 0
-   -1 sprites/airport_preview.png 290 8 09 140 230 0 0
-   -1 sprites/airport_preview.png 530 8 09 140 230 0 0
-   -1 sprites/airport_preview.png 2 168 09 140 230 0 0
-   -1 sprites/airport_preview.png 242 168 09 140 230 0 0
-   -1 sprites/airport_preview.png 482 168 09 140 230 0 0
-   -1 sprites/airport_preview.png 2 328 09 140 230 0 0
-   -1 sprites/airport_preview.png 242 328 09 140 230 0 0
-   -1 sprites/airport_preview.png 482 328 09 140 230 0 0
+   -1 sprites/airport_preview.png 8bpp  50    8 230 140   0   0 normal
+   -1 sprites/airport_preview.png 8bpp 290    8 230 140   0   0 normal
+   -1 sprites/airport_preview.png 8bpp 530    8 230 140   0   0 normal
+   -1 sprites/airport_preview.png 8bpp   2  168 230 140   0   0 normal
+   -1 sprites/airport_preview.png 8bpp 242  168 230 140   0   0 normal
+   -1 sprites/airport_preview.png 8bpp 482  168 230 140   0   0 normal
+   -1 sprites/airport_preview.png 8bpp   2  328 230 140   0   0 normal
+   -1 sprites/airport_preview.png 8bpp 242  328 230 140   0   0 normal
+   -1 sprites/airport_preview.png 8bpp 482  328 230 140   0   0 normal
--- a/media/extra_grf/airports.nfo
+++ b/media/extra_grf/airports.nfo
@@ -8,18 +8,18 @@
 //
   -1 * 0	 0C "Extra airport graphics"
   -1 * 3	 05 10 0F
-   -1 sprites/airports.png 18 8 09 31 64 -31 0
-   -1 sprites/airports.png 98 8 09 31 64 -31 0
-   -1 sprites/airports.png 178 8 09 31 64 -31 0
-   -1 sprites/airports.png 258 8 09 31 64 -31 0
-   -1 sprites/airports.png 338 8 09 31 64 -31 0
-   -1 sprites/airports.png 418 8 09 31 64 -31 0
-   -1 sprites/airports.png 498 8 09 55 64 -2 -38
-   -1 sprites/airports.png 578 8 09 17 18 16 -1
-   -1 sprites/airports.png 610 8 09 55 64 -2 -38
-   -1 sprites/airports.png 690 8 09 17 18 -30 1
-   -1 sprites/airports.png 722 8 09 55 64 -2 -38
-   -1 sprites/airports.png 2 88 09 55 64 -2 -38
-   -1 sprites/airports.png 82 88 09 31 64 -31 0
-   -1 sprites/airports.png 162 88 09 31 64 -31 0
-   -1 sprites/airports.png 242 88 09 31 64 -31 0
+   -1 sprites/airports.png 8bpp  18    8  64  31 -31   0 normal
+   -1 sprites/airports.png 8bpp  98    8  64  31 -31   0 normal
+   -1 sprites/airports.png 8bpp 178    8  64  31 -31   0 normal
+   -1 sprites/airports.png 8bpp 258    8  64  31 -31   0 normal
+   -1 sprites/airports.png 8bpp 338    8  64  31 -31   0 normal
+   -1 sprites/airports.png 8bpp 418    8  64  31 -31   0 normal
+   -1 sprites/airports.png 8bpp 498    8  64  55  -2 -38 normal
+   -1 sprites/airports.png 8bpp 578    8  18  17  16  -1 normal
+   -1 sprites/airports.png 8bpp 610    8  64  55  -2 -38 normal
+   -1 sprites/airports.png 8bpp 690    8  18  17 -30   1 normal
+   -1 sprites/airports.png 8bpp 722    8  64  55  -2 -38 normal
+   -1 sprites/airports.png 8bpp   2   88  64  55  -2 -38 normal
+   -1 sprites/airports.png 8bpp  82   88  64  31 -31   0 normal
+   -1 sprites/airports.png 8bpp 162   88  64  31 -31   0 normal
+   -1 sprites/airports.png 8bpp 242   88  64  31 -31   0 normal
--- a/media/extra_grf/aqueduct.nfo
+++ b/media/extra_grf/aqueduct.nfo
@@ -10,22 +10,22 @@
 // temperate aqueduct
   -1 * 6	 07 83 01 \7! 00 09
   -1 * 3	 05 12 08
-   -1 sprites/aqueduct.png  34  8 09 32 61 -30 -9
-   -1 sprites/aqueduct.png 114  8 09 31 62 -29 -9
-   -1 sprites/aqueduct.png 194  8 09 32 61 -30 -9
-   -1 sprites/aqueduct.png 274  8 09 31 62 -29 -9
-   -1 sprites/aqueduct.png 354  8 09 32 61 -30 -4
-   -1 sprites/aqueduct.png 434  8 09 31 62 -29 -4
-   -1 sprites/aqueduct.png 514  8 09 23 33 -31  0
-   -1 sprites/aqueduct.png 562  8 09 23 33   0  1
+   -1 sprites/aqueduct.png 8bpp  34    8  61  32 -30  -9 normal
+   -1 sprites/aqueduct.png 8bpp 114    8  62  31 -29  -9 normal
+   -1 sprites/aqueduct.png 8bpp 194    8  61  32 -30  -9 normal
+   -1 sprites/aqueduct.png 8bpp 274    8  62  31 -29  -9 normal
+   -1 sprites/aqueduct.png 8bpp 354    8  61  32 -30  -4 normal
+   -1 sprites/aqueduct.png 8bpp 434    8  62  31 -29  -4 normal
+   -1 sprites/aqueduct.png 8bpp 514    8  33  23 -31   0 normal
+   -1 sprites/aqueduct.png 8bpp 562    8  33  23   0   1 normal
 // non-temperate aqueduct
   -1 * 6	 07 83 01 \7= 00 09
   -1 * 3	 05 12 08
-   -1 sprites/aqueduct.png  34 48 09 32 61 -30 -9
-   -1 sprites/aqueduct.png 114 48 09 31 62 -29 -9
-   -1 sprites/aqueduct.png 194 48 09 32 61 -30 -9
-   -1 sprites/aqueduct.png 274 48 09 31 62 -29 -9
-   -1 sprites/aqueduct.png 354 48 09 32 61 -30 -4
-   -1 sprites/aqueduct.png 434 48 09 31 62 -29 -4
-   -1 sprites/aqueduct.png 514 48 09 23 33 -31  0
-   -1 sprites/aqueduct.png 562 48 09 23 33   0  1
+   -1 sprites/aqueduct.png 8bpp  34   48  61  32 -30  -9 normal
+   -1 sprites/aqueduct.png 8bpp 114   48  62  31 -29  -9 normal
+   -1 sprites/aqueduct.png 8bpp 194   48  61  32 -30  -9 normal
+   -1 sprites/aqueduct.png 8bpp 274   48  62  31 -29  -9 normal
+   -1 sprites/aqueduct.png 8bpp 354   48  61  32 -30  -4 normal
+   -1 sprites/aqueduct.png 8bpp 434   48  62  31 -29  -4 normal
+   -1 sprites/aqueduct.png 8bpp 514   48  33  23 -31   0 normal
+   -1 sprites/aqueduct.png 8bpp 562   48  33  23   0   1 normal
--- a/media/extra_grf/autorail.nfo
+++ b/media/extra_grf/autorail.nfo
@@ -8,58 +8,58 @@
 //
   -1 * 0	 0C "Autorail graphics"
   -1 * 3	 05 13 37
-   -1 sprites/autorail.png 18 8 09 31 64 -31 7
-   -1 sprites/autorail.png 98 8 09 31 64 -31 -1
-   -1 sprites/autorail.png 178 8 09 39 64 -31 -1
-   -1 sprites/autorail.png 258 8 09 47 64 -31 -9
-   -1 sprites/autorail.png 338 8 09 31 64 -31 -5
-   -1 sprites/autorail.png 418 8 09 23 64 -31 7
-   -1 sprites/autorail.png 498 8 09 18 64 -31 4
-   -1 sprites/autorail.png 578 8 09 31 64 -31 -1
-   -1 sprites/autorail.png 658 8 09 31 64 -31 7
-   -1 sprites/autorail.png 2 72 09 31 64 -31 -1
-   -1 sprites/autorail.png 82 72 09 23 64 -31 7
-   -1 sprites/autorail.png 162 72 09 18 64 -31 4
-   -1 sprites/autorail.png 242 72 09 31 64 -31 -1
-   -1 sprites/autorail.png 322 72 09 39 64 -31 -1
-   -1 sprites/autorail.png 402 72 09 47 64 -31 -9
-   -1 sprites/autorail.png 482 72 09 31 64 -31 -5
-   -1 sprites/autorail.png 562 72 09 31 64 -31 7
-   -1 sprites/autorail.png 642 72 09 31 64 -31 -1
-   -1 sprites/autorail.png 722 72 09 47 64 -31 -9
-   -1 sprites/autorail.png 2 136 09 26 64 -31 4
-   -1 sprites/autorail.png 82 136 09 23 64 -31 4
-   -1 sprites/autorail.png 162 136 09 31 64 -31 -3
-   -1 sprites/autorail.png 242 136 09 26 64 -31 4
-   -1 sprites/autorail.png 322 136 09 23 64 -31 4
-   -1 sprites/autorail.png 402 136 09 31 64 -31 -3
-   -1 sprites/autorail.png 482 136 09 31 64 -31 7
-   -1 sprites/autorail.png 562 136 09 31 64 -31 -1
-   -1 sprites/autorail.png 642 136 09 15 64 -31 7
-   -1 sprites/autorail.png 722 136 09 31 64 -31 7
-   -1 sprites/autorail.png 2 184 09 39 64 -31 -1
-   -1 sprites/autorail.png 82 184 09 31 64 -31 -1
-   -1 sprites/autorail.png 162 184 09 31 64 -31 7
-   -1 sprites/autorail.png 242 184 09 39 64 -31 -1
-   -1 sprites/autorail.png 322 184 09 31 64 -31 -1
-   -1 sprites/autorail.png 402 184 09 31 64 -31 7
-   -1 sprites/autorail.png 482 184 09 31 64 -31 -1
-   -1 sprites/autorail.png 562 184 09 31 64 -31 -1
-   -1 sprites/autorail.png 642 184 09 31 64 -31 -1
-   -1 sprites/autorail.png 722 184 09 23 64 -31 7
-   -1 sprites/autorail.png 2 248 09 15 64 -31 7
-   -1 sprites/autorail.png 82 248 09 39 64 -31 -1
-   -1 sprites/autorail.png 162 248 09 47 64 -31 -9
-   -1 sprites/autorail.png 242 248 09 31 64 -31 7
-   -1 sprites/autorail.png 322 248 09 31 64 -31 -1
-   -1 sprites/autorail.png 402 248 09 31 64 -31 -1
-   -1 sprites/autorail.png 482 248 09 31 64 -31 -1
-   -1 sprites/autorail.png 562 248 09 23 64 -31 7
-   -1 sprites/autorail.png 642 248 09 15 64 -31 7
-   -1 sprites/autorail.png 722 248 09 39 64 -31 -1
-   -1 sprites/autorail.png 2 312 09 47 64 -31 -9
-   -1 sprites/autorail.png 82 312 09 31 64 -31 -1
-   -1 sprites/autorail.png 162 312 09 31 64 -31 -1
-   -1 sprites/autorail.png 242 312 09 23 64 -31 7
-   -1 sprites/autorail.png 322 312 09 31 64 -31 7
-   -1 sprites/autorail.png 402 312 09 31 64 -31 7
+   -1 sprites/autorail.png 8bpp  18    8  64  31 -31   7 normal
+   -1 sprites/autorail.png 8bpp  98    8  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 178    8  64  39 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 258    8  64  47 -31  -9 normal
+   -1 sprites/autorail.png 8bpp 338    8  64  31 -31  -5 normal
+   -1 sprites/autorail.png 8bpp 418    8  64  23 -31   7 normal
+   -1 sprites/autorail.png 8bpp 498    8  64  18 -31   4 normal
+   -1 sprites/autorail.png 8bpp 578    8  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 658    8  64  31 -31   7 normal
+   -1 sprites/autorail.png 8bpp   2   72  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp  82   72  64  23 -31   7 normal
+   -1 sprites/autorail.png 8bpp 162   72  64  18 -31   4 normal
+   -1 sprites/autorail.png 8bpp 242   72  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 322   72  64  39 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 402   72  64  47 -31  -9 normal
+   -1 sprites/autorail.png 8bpp 482   72  64  31 -31  -5 normal
+   -1 sprites/autorail.png 8bpp 562   72  64  31 -31   7 normal
+   -1 sprites/autorail.png 8bpp 642   72  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 722   72  64  47 -31  -9 normal
+   -1 sprites/autorail.png 8bpp   2  136  64  26 -31   4 normal
+   -1 sprites/autorail.png 8bpp  82  136  64  23 -31   4 normal
+   -1 sprites/autorail.png 8bpp 162  136  64  31 -31  -3 normal
+   -1 sprites/autorail.png 8bpp 242  136  64  26 -31   4 normal
+   -1 sprites/autorail.png 8bpp 322  136  64  23 -31   4 normal
+   -1 sprites/autorail.png 8bpp 402  136  64  31 -31  -3 normal
+   -1 sprites/autorail.png 8bpp 482  136  64  31 -31   7 normal
+   -1 sprites/autorail.png 8bpp 562  136  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 642  136  64  15 -31   7 normal
+   -1 sprites/autorail.png 8bpp 722  136  64  31 -31   7 normal
+   -1 sprites/autorail.png 8bpp   2  184  64  39 -31  -1 normal
+   -1 sprites/autorail.png 8bpp  82  184  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 162  184  64  31 -31   7 normal
+   -1 sprites/autorail.png 8bpp 242  184  64  39 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 322  184  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 402  184  64  31 -31   7 normal
+   -1 sprites/autorail.png 8bpp 482  184  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 562  184  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 642  184  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 722  184  64  23 -31   7 normal
+   -1 sprites/autorail.png 8bpp   2  248  64  15 -31   7 normal
+   -1 sprites/autorail.png 8bpp  82  248  64  39 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 162  248  64  47 -31  -9 normal
+   -1 sprites/autorail.png 8bpp 242  248  64  31 -31   7 normal
+   -1 sprites/autorail.png 8bpp 322  248  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 402  248  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 482  248  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 562  248  64  23 -31   7 normal
+   -1 sprites/autorail.png 8bpp 642  248  64  15 -31   7 normal
+   -1 sprites/autorail.png 8bpp 722  248  64  39 -31  -1 normal
+   -1 sprites/autorail.png 8bpp   2  312  64  47 -31  -9 normal
+   -1 sprites/autorail.png 8bpp  82  312  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 162  312  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 242  312  64  23 -31   7 normal
+   -1 sprites/autorail.png 8bpp 322  312  64  31 -31   7 normal
+   -1 sprites/autorail.png 8bpp 402  312  64  31 -31   7 normal
--- a/media/extra_grf/canals.nfo
+++ b/media/extra_grf/canals.nfo
@@ -9,107 +9,107 @@
   -1 * 0	 0C "Canal graphics by George / PaulC"
   -1 * 3	 05 08 41
 // Canal slopes
-   -1 sprites/canal_locks.png 66 8 09 23 64 -31 0
-   -1 sprites/canal_locks.png 146 8 09 39 64 -31 -8
-   -1 sprites/canal_locks.png 226 8 09 23 64 -31 0
-   -1 sprites/canal_locks.png 306 8 09 39 64 -31 -8
+   -1 sprites/canal_locks.png 8bpp  66    8  64  23 -31   0 normal
+   -1 sprites/canal_locks.png 8bpp 146    8  64  39 -31  -8 normal
+   -1 sprites/canal_locks.png 8bpp 226    8  64  23 -31   0 normal
+   -1 sprites/canal_locks.png 8bpp 306    8  64  39 -31  -8 normal
 // Lock sides
-   -1 sprites/canal_locks.png 386 8 09 26 40 -7 -12
-   -1 sprites/canal_locks.png 434 8 09 33 42 -31 -13
-   -1 sprites/canal_locks.png 482 8 09 25 40 -31 -12
-   -1 sprites/canal_locks.png 530 8 09 34 42 -9 -14
-   -1 sprites/canal_locks.png 578 8 09 27 32 -1 -17
-   -1 sprites/canal_locks.png 626 8 09 35 32 -29 -17
-   -1 sprites/canal_locks.png 674 8 09 27 32 -29 -17
-   -1 sprites/canal_locks.png 722 8 09 35 32 -1 -17
-   -1 sprites/canal_locks.png 2 72 09 44 40 -7 -24
-   -1 sprites/canal_locks.png 50 72 09 33 42 -31 -13
-   -1 sprites/canal_locks.png 98 72 09 32 40 -31 -12
-   -1 sprites/canal_locks.png 146 72 09 31 41 -8 -12
-   -1 sprites/canal_locks.png 194 72 09 32 34 -1 -13
-   -1 sprites/canal_locks.png 242 72 09 34 38 -35 -17
-   -1 sprites/canal_locks.png 290 72 09 44 34 -29 -26
-   -1 sprites/canal_locks.png 338 72 09 34 38 -1 -17
-   -1 sprites/canal_locks.png 386 72 09 24 42 -9 -4
-   -1 sprites/canal_locks.png 434 72 09 24 43 -31 -4
-   -1 sprites/canal_locks.png 482 72 09 24 53 -31 -4
-   -1 sprites/canal_locks.png 546 72 09 37 43 -10 -16
-   -1 sprites/canal_locks.png 594 72 09 26 38 -1 -9
-   -1 sprites/canal_locks.png 642 72 09 37 34 -29 -18
-   -1 sprites/canal_locks.png 690 72 09 26 38 -35 -9
-   -1 sprites/canal_locks.png 738 72 09 23 32 -1 -5
-   -1 sprites/canal_locks.png 2 136 09 26 40 -7 -12
-   -1 sprites/canal_locks.png 50 136 09 33 42 -31 -13
-   -1 sprites/canal_locks.png 98 136 09 25 40 -31 -12
-   -1 sprites/canal_locks.png 146 136 09 34 42 -9 -14
-   -1 sprites/canal_locks.png 194 136 09 27 32 -1 -17
-   -1 sprites/canal_locks.png 242 136 09 35 32 -29 -17
-   -1 sprites/canal_locks.png 290 136 09 27 32 -29 -17
-   -1 sprites/canal_locks.png 338 136 09 35 32 -1 -17
-   -1 sprites/canal_locks.png 386 136 09 32 40 -7 -12
-   -1 sprites/canal_locks.png 434 136 09 33 42 -31 -13
-   -1 sprites/canal_locks.png 482 136 09 32 40 -31 -12
-   -1 sprites/canal_locks.png 530 136 09 31 41 -8 -12
-   -1 sprites/canal_locks.png 578 136 09 32 34 -1 -13
-   -1 sprites/canal_locks.png 626 136 09 34 38 -35 -17
-   -1 sprites/canal_locks.png 674 136 09 32 34 -29 -14
-   -1 sprites/canal_locks.png 722 136 09 34 38 -1 -17
-   -1 sprites/canal_locks.png 2 184 09 24 42 -9 -4
-   -1 sprites/canal_locks.png 50 184 09 24 43 -31 -4
-   -1 sprites/canal_locks.png 98 184 09 24 53 -31 -4
-   -1 sprites/canal_locks.png 162 184 09 25 43 -10 -4
-   -1 sprites/canal_locks.png 210 184 09 26 38 -1 -9
-   -1 sprites/canal_locks.png 258 184 09 25 34 -29 -6
-   -1 sprites/canal_locks.png 306 184 09 26 38 -35 -9
-   -1 sprites/canal_locks.png 354 184 09 23 32 -1 -5
+   -1 sprites/canal_locks.png 8bpp 386    8  40  26  -7 -12 normal
+   -1 sprites/canal_locks.png 8bpp 434    8  42  33 -31 -13 normal
+   -1 sprites/canal_locks.png 8bpp 482    8  40  25 -31 -12 normal
+   -1 sprites/canal_locks.png 8bpp 530    8  42  34  -9 -14 normal
+   -1 sprites/canal_locks.png 8bpp 578    8  32  27  -1 -17 normal
+   -1 sprites/canal_locks.png 8bpp 626    8  32  35 -29 -17 normal
+   -1 sprites/canal_locks.png 8bpp 674    8  32  27 -29 -17 normal
+   -1 sprites/canal_locks.png 8bpp 722    8  32  35  -1 -17 normal
+   -1 sprites/canal_locks.png 8bpp   2   72  40  44  -7 -24 normal
+   -1 sprites/canal_locks.png 8bpp  50   72  42  33 -31 -13 normal
+   -1 sprites/canal_locks.png 8bpp  98   72  40  32 -31 -12 normal
+   -1 sprites/canal_locks.png 8bpp 146   72  41  31  -8 -12 normal
+   -1 sprites/canal_locks.png 8bpp 194   72  34  32  -1 -13 normal
+   -1 sprites/canal_locks.png 8bpp 242   72  38  34 -35 -17 normal
+   -1 sprites/canal_locks.png 8bpp 290   72  34  44 -29 -26 normal
+   -1 sprites/canal_locks.png 8bpp 338   72  38  34  -1 -17 normal
+   -1 sprites/canal_locks.png 8bpp 386   72  42  24  -9  -4 normal
+   -1 sprites/canal_locks.png 8bpp 434   72  43  24 -31  -4 normal
+   -1 sprites/canal_locks.png 8bpp 482   72  53  24 -31  -4 normal
+   -1 sprites/canal_locks.png 8bpp 546   72  43  37 -10 -16 normal
+   -1 sprites/canal_locks.png 8bpp 594   72  38  26  -1  -9 normal
+   -1 sprites/canal_locks.png 8bpp 642   72  34  37 -29 -18 normal
+   -1 sprites/canal_locks.png 8bpp 690   72  38  26 -35  -9 normal
+   -1 sprites/canal_locks.png 8bpp 738   72  32  23  -1  -5 normal
+   -1 sprites/canal_locks.png 8bpp   2  136  40  26  -7 -12 normal
+   -1 sprites/canal_locks.png 8bpp  50  136  42  33 -31 -13 normal
+   -1 sprites/canal_locks.png 8bpp  98  136  40  25 -31 -12 normal
+   -1 sprites/canal_locks.png 8bpp 146  136  42  34  -9 -14 normal
+   -1 sprites/canal_locks.png 8bpp 194  136  32  27  -1 -17 normal
+   -1 sprites/canal_locks.png 8bpp 242  136  32  35 -29 -17 normal
+   -1 sprites/canal_locks.png 8bpp 290  136  32  27 -29 -17 normal
+   -1 sprites/canal_locks.png 8bpp 338  136  32  35  -1 -17 normal
+   -1 sprites/canal_locks.png 8bpp 386  136  40  32  -7 -12 normal
+   -1 sprites/canal_locks.png 8bpp 434  136  42  33 -31 -13 normal
+   -1 sprites/canal_locks.png 8bpp 482  136  40  32 -31 -12 normal
+   -1 sprites/canal_locks.png 8bpp 530  136  41  31  -8 -12 normal
+   -1 sprites/canal_locks.png 8bpp 578  136  34  32  -1 -13 normal
+   -1 sprites/canal_locks.png 8bpp 626  136  38  34 -35 -17 normal
+   -1 sprites/canal_locks.png 8bpp 674  136  34  32 -29 -14 normal
+   -1 sprites/canal_locks.png 8bpp 722  136  38  34  -1 -17 normal
+   -1 sprites/canal_locks.png 8bpp   2  184  42  24  -9  -4 normal
+   -1 sprites/canal_locks.png 8bpp  50  184  43  24 -31  -4 normal
+   -1 sprites/canal_locks.png 8bpp  98  184  53  24 -31  -4 normal
+   -1 sprites/canal_locks.png 8bpp 162  184  43  25 -10  -4 normal
+   -1 sprites/canal_locks.png 8bpp 210  184  38  26  -1  -9 normal
+   -1 sprites/canal_locks.png 8bpp 258  184  34  25 -29  -6 normal
+   -1 sprites/canal_locks.png 8bpp 306  184  38  26 -35  -9 normal
+   -1 sprites/canal_locks.png 8bpp 354  184  32  23  -1  -5 normal
 // Canal edges (temperate)
-   -1 sprites/canals.png  30  10 09 22 45 -11 -1
-   -1 sprites/canals.png  94  10 09 21 41  -8 10
-   -1 sprites/canals.png 142  10 09 21 42 -31 10
-   -1 sprites/canals.png 190  10 09 22 43 -31 -1
-   -1 sprites/canals.png 238  10 09 22 22  11  4
-   -1 sprites/canals.png 270  10 09 16 24 -11 15
-   -1 sprites/canals.png 302  10 09 23 23 -31  4
-   -1 sprites/canals.png 334  10 09 18 24 -11 -1
-   -1 sprites/canals.png 366  10 09 11 12  21 10
-   -1 sprites/canals.png 398  10 09 10 19  -8 21
-   -1 sprites/canals.png 430  10 09 10 11 -31 10
-   -1 sprites/canals.png 446  10 09 16 24 -11 -6
+   -1 sprites/canals.png 8bpp  30   10  45  22 -11  -1 normal
+   -1 sprites/canals.png 8bpp  94   10  41  21  -8  10 normal
+   -1 sprites/canals.png 8bpp 142   10  42  21 -31  10 normal
+   -1 sprites/canals.png 8bpp 190   10  43  22 -31  -1 normal
+   -1 sprites/canals.png 8bpp 238   10  22  22  11   4 normal
+   -1 sprites/canals.png 8bpp 270   10  24  16 -11  15 normal
+   -1 sprites/canals.png 8bpp 302   10  23  23 -31   4 normal
+   -1 sprites/canals.png 8bpp 334   10  24  18 -11  -1 normal
+   -1 sprites/canals.png 8bpp 366   10  12  11  21  10 normal
+   -1 sprites/canals.png 8bpp 398   10  19  10  -8  21 normal
+   -1 sprites/canals.png 8bpp 430   10  11  10 -31  10 normal
+   -1 sprites/canals.png 8bpp 446   10  24  16 -11  -6 normal
 // Canal icon
-   -1 sprites/canal_locks.png 50 232 09 20 20 0 0
+   -1 sprites/canal_locks.png 8bpp  50  232  20  20   0   0 normal

 // Differentiation for the climates starts here

 // Canal edges (arctic snowy)
   -1 * 4        01 05 01 \b12
-   -1 sprites/canals.png  30  40 09 22 45 -11 -1
-   -1 sprites/canals.png  94  40 09 21 41  -8 10
-   -1 sprites/canals.png 142  40 09 21 42 -31 10
-   -1 sprites/canals.png 190  40 09 22 43 -31 -1
-   -1 sprites/canals.png 238  40 09 22 22  11  4
-   -1 sprites/canals.png 270  40 09 16 24 -11 15
-   -1 sprites/canals.png 302  40 09 23 23 -31  4
-   -1 sprites/canals.png 334  40 09 18 24 -11 -1
-   -1 sprites/canals.png 366  40 09 11 12  21 10
-   -1 sprites/canals.png 398  40 09 10 19  -8 21
-   -1 sprites/canals.png 430  40 09 10 11 -31 10
-   -1 sprites/canals.png 446  40 09 16 24 -11 -6
+   -1 sprites/canals.png 8bpp  30   40  45  22 -11  -1 normal
+   -1 sprites/canals.png 8bpp  94   40  41  21  -8  10 normal
+   -1 sprites/canals.png 8bpp 142   40  42  21 -31  10 normal
+   -1 sprites/canals.png 8bpp 190   40  43  22 -31  -1 normal
+   -1 sprites/canals.png 8bpp 238   40  22  22  11   4 normal
+   -1 sprites/canals.png 8bpp 270   40  24  16 -11  15 normal
+   -1 sprites/canals.png 8bpp 302   40  23  23 -31   4 normal
+   -1 sprites/canals.png 8bpp 334   40  24  18 -11  -1 normal
+   -1 sprites/canals.png 8bpp 366   40  12  11  21  10 normal
+   -1 sprites/canals.png 8bpp 398   40  19  10  -8  21 normal
+   -1 sprites/canals.png 8bpp 430   40  11  10 -31  10 normal
+   -1 sprites/canals.png 8bpp 446   40  24  16 -11  -6 normal
   -1 * 7        02 05 10 01 00 00 00

 // Canal edges (arctic normal)
   -1 * 4        01 05 01 \b12
-   -1 sprites/canals.png  30  70 09 22 45 -11 -1
-   -1 sprites/canals.png  94  70 09 21 41  -8 10
-   -1 sprites/canals.png 142  70 09 21 42 -31 10
-   -1 sprites/canals.png 190  70 09 22 43 -31 -1
-   -1 sprites/canals.png 238  70 09 22 22  11  4
-   -1 sprites/canals.png 270  70 09 16 24 -11 15
-   -1 sprites/canals.png 302  70 09 23 23 -31  4
-   -1 sprites/canals.png 334  70 09 18 24 -11 -1
-   -1 sprites/canals.png 366  70 09 11 12  21 10
-   -1 sprites/canals.png 398  70 09 10 19  -8 21
-   -1 sprites/canals.png 430  70 09 10 11 -31 10
-   -1 sprites/canals.png 446  70 09 16 24 -11 -6
+   -1 sprites/canals.png 8bpp  30   70  45  22 -11  -1 normal
+   -1 sprites/canals.png 8bpp  94   70  41  21  -8  10 normal
+   -1 sprites/canals.png 8bpp 142   70  42  21 -31  10 normal
+   -1 sprites/canals.png 8bpp 190   70  43  22 -31  -1 normal
+   -1 sprites/canals.png 8bpp 238   70  22  22  11   4 normal
+   -1 sprites/canals.png 8bpp 270   70  24  16 -11  15 normal
+   -1 sprites/canals.png 8bpp 302   70  23  23 -31   4 normal
+   -1 sprites/canals.png 8bpp 334   70  24  18 -11  -1 normal
+   -1 sprites/canals.png 8bpp 366   70  12  11  21  10 normal
+   -1 sprites/canals.png 8bpp 398   70  19  10  -8  21 normal
+   -1 sprites/canals.png 8bpp 430   70  11  10 -31  10 normal
+   -1 sprites/canals.png 8bpp 446   70  24  16 -11  -6 normal
   -1 * 7        02 05 11 01 00 00 00
 // Choose the right arctic canal edges
   -1 * 14       02 05 12 81 81 00 FF 01 10 00 04 04 11 00
@@ -118,34 +118,34 @@

 // Canal edges (tropic desert)
   -1 * 4        01 05 01 \b12
-   -1 sprites/canals.png  30 100 09 22 45 -11 -1
-   -1 sprites/canals.png  94 100 09 21 41  -8 10
-   -1 sprites/canals.png 142 100 09 21 42 -31 10
-   -1 sprites/canals.png 190 100 09 22 43 -31 -1
-   -1 sprites/canals.png 238 100 09 22 22  11  4
-   -1 sprites/canals.png 270 100 09 16 24 -11 15
-   -1 sprites/canals.png 302 100 09 23 23 -31  4
-   -1 sprites/canals.png 334 100 09 18 24 -11 -1
-   -1 sprites/canals.png 366 100 09 11 12  21 10
-   -1 sprites/canals.png 398 100 09 10 19  -8 21
-   -1 sprites/canals.png 430 100 09 10 11 -31 10
-   -1 sprites/canals.png 446 100 09 16 24 -11 -6
+   -1 sprites/canals.png 8bpp  30  100  45  22 -11  -1 normal
+   -1 sprites/canals.png 8bpp  94  100  41  21  -8  10 normal
+   -1 sprites/canals.png 8bpp 142  100  42  21 -31  10 normal
+   -1 sprites/canals.png 8bpp 190  100  43  22 -31  -1 normal
+   -1 sprites/canals.png 8bpp 238  100  22  22  11   4 normal
+   -1 sprites/canals.png 8bpp 270  100  24  16 -11  15 normal
+   -1 sprites/canals.png 8bpp 302  100  23  23 -31   4 normal
+   -1 sprites/canals.png 8bpp 334  100  24  18 -11  -1 normal
+   -1 sprites/canals.png 8bpp 366  100  12  11  21  10 normal
+   -1 sprites/canals.png 8bpp 398  100  19  10  -8  21 normal
+   -1 sprites/canals.png 8bpp 430  100  11  10 -31  10 normal
+   -1 sprites/canals.png 8bpp 446  100  24  16 -11  -6 normal
   -1 * 7        02 05 13 01 00 00 00

 // Canal edges (tropic rainforest)
   -1 * 4        01 05 01 \b12
-   -1 sprites/canals.png  30 130 09 22 45 -11 -1
-   -1 sprites/canals.png  94 130 09 21 41  -8 10
-   -1 sprites/canals.png 142 130 09 21 42 -31 10
-   -1 sprites/canals.png 190 130 09 22 43 -31 -1
-   -1 sprites/canals.png 238 130 09 22 22  11  4
-   -1 sprites/canals.png 270 130 09 16 24 -11 15
-   -1 sprites/canals.png 302 130 09 23 23 -31  4
-   -1 sprites/canals.png 334 130 09 18 24 -11 -1
-   -1 sprites/canals.png 366 130 09 11 12  21 10
-   -1 sprites/canals.png 398 130 09 10 19  -8 21
-   -1 sprites/canals.png 430 130 09 10 11 -31 10
-   -1 sprites/canals.png 446 130 09 16 24 -11 -6
+   -1 sprites/canals.png 8bpp  30  130  45  22 -11  -1 normal
+   -1 sprites/canals.png 8bpp  94  130  41  21  -8  10 normal
+   -1 sprites/canals.png 8bpp 142  130  42  21 -31  10 normal
+   -1 sprites/canals.png 8bpp 190  130  43  22 -31  -1 normal
+   -1 sprites/canals.png 8bpp 238  130  22  22  11   4 normal
+   -1 sprites/canals.png 8bpp 270  130  24  16 -11  15 normal
+   -1 sprites/canals.png 8bpp 302  130  23  23 -31   4 normal
+   -1 sprites/canals.png 8bpp 334  130  24  18 -11  -1 normal
+   -1 sprites/canals.png 8bpp 366  130  12  11  21  10 normal
+   -1 sprites/canals.png 8bpp 398  130  19  10  -8  21 normal
+   -1 sprites/canals.png 8bpp 430  130  11  10 -31  10 normal
+   -1 sprites/canals.png 8bpp 446  130  24  16 -11  -6 normal
   -1 * 7        02 05 14 01 00 00 00
 // Choose the right tropic canal edges
   -1 * 14       02 05 15 81 81 00 FF 01 13 00 01 01 14 00
@@ -154,18 +154,18 @@

 // Canal edges (toyland)
   -1 * 4        01 05 01 \b12
-   -1 sprites/canals.png  30 160 09 22 45 -11 -1
-   -1 sprites/canals.png  94 160 09 21 41  -8 10
-   -1 sprites/canals.png 142 160 09 21 42 -31 10
-   -1 sprites/canals.png 190 160 09 22 43 -31 -1
-   -1 sprites/canals.png 238 160 09 22 22  11  4
-   -1 sprites/canals.png 270 160 09 16 24 -11 15
-   -1 sprites/canals.png 302 160 09 23 23 -31  4
-   -1 sprites/canals.png 334 160 09 18 24 -11 -1
-   -1 sprites/canals.png 366 160 09 11 12  21 10
-   -1 sprites/canals.png 398 160 09 10 19  -8 21
-   -1 sprites/canals.png 430 160 09 10 11 -31 10
-   -1 sprites/canals.png 446 160 09 16 24 -11 -6
+   -1 sprites/canals.png 8bpp  30  160  45  22 -11  -1 normal
+   -1 sprites/canals.png 8bpp  94  160  41  21  -8  10 normal
+   -1 sprites/canals.png 8bpp 142  160  42  21 -31  10 normal
+   -1 sprites/canals.png 8bpp 190  160  43  22 -31  -1 normal
+   -1 sprites/canals.png 8bpp 238  160  22  22  11   4 normal
+   -1 sprites/canals.png 8bpp 270  160  24  16 -11  15 normal
+   -1 sprites/canals.png 8bpp 302  160  23  23 -31   4 normal
+   -1 sprites/canals.png 8bpp 334  160  24  18 -11  -1 normal
+   -1 sprites/canals.png 8bpp 366  160  12  11  21  10 normal
+   -1 sprites/canals.png 8bpp 398  160  19  10  -8  21 normal
+   -1 sprites/canals.png 8bpp 430  160  11  10 -31  10 normal
+   -1 sprites/canals.png 8bpp 446  160  24  16 -11  -6 normal
   -1 * 7        02 05 16 01 00 00 00
   -1 * 6        07 83 01 \7! 03 01
   -1 * 7        03 05 01 02 00 16 00
--- a/media/extra_grf/chars.nfo
+++ b/media/extra_grf/chars.nfo
--- a/media/extra_grf/chars.png
+++ b/media/extra_grf/chars.png
--- a/media/extra_grf/elrails.nfo
+++ b/media/extra_grf/elrails.nfo
@@ -8,51 +8,51 @@
 //
   -1 * 0	 0C "Electrified rail by Michael Blunck"
   -1 * 3	 05 05 30
-   -1 sprites/elrails.png 66 8 01 16 32 -29 -2
-   -1 sprites/elrails.png 114 8 01 16 32 -1 -2
-   -1 sprites/elrails.png 162 8 01 1 32 -1 -2
-   -1 sprites/elrails.png 210 8 01 16 1 0 -3
-   -1 sprites/elrails.png 226 8 01 24 32 -29 -2
-   -1 sprites/elrails.png 274 8 01 9 32 -1 6
-   -1 sprites/elrails.png 322 8 01 9 32 -29 6
-   -1 sprites/elrails.png 370 8 01 24 32 -1 -2
-   -1 sprites/elrails.png 418 8 01 16 32 -29 -2
-   -1 sprites/elrails.png 466 8 01 16 32 -1 -2
-   -1 sprites/elrails.png 514 8 01 1 32 -1 -2
-   -1 sprites/elrails.png 562 8 01 16 1 0 -3
-   -1 sprites/elrails.png 578 8 01 24 32 -29 -2
-   -1 sprites/elrails.png 626 8 01 9 32 -1 6
-   -1 sprites/elrails.png 674 8 01 9 32 -29 6
-   -1 sprites/elrails.png 722 8 01 24 32 -1 -2
-   -1 sprites/elrails.png 2 56 01 16 32 -29 -2
-   -1 sprites/elrails.png 50 56 01 16 32 -1 -2
-   -1 sprites/elrails.png 98 56 01 1 32 -1 -2
-   -1 sprites/elrails.png 146 56 01 16 1 0 -3
-   -1 sprites/elrails.png 162 56 01 24 32 -29 -2
-   -1 sprites/elrails.png 210 56 01 9 32 -1 6
-   -1 sprites/elrails.png 258 56 01 9 32 -29 6
-   -1 sprites/elrails.png 306 56 01 24 32 -1 -2
-   -1 sprites/elrails.png 354 56 01 8 16 -29 6
-   -1 sprites/elrails.png 386 56 01 8 16 -1 -2
-   -1 sprites/elrails.png 418 56 01 8 16 -13 -2
-   -1 sprites/elrails.png 450 56 01 8 16 15 6
-   -1 sprites/elrails.png 482 56 01 16 8 -7 -14
-   -1 sprites/elrails.png 498 56 01 18 8 0 -17
-   -1 sprites/elrails.png 514 56 01 16 8 0 -14
-   -1 sprites/elrails.png 530 56 01 18 8 -7 -17
-   -1 sprites/elrails.png 546 56 01 16 2 0 -15
-   -1 sprites/elrails.png 562 56 01 18 2 0 -16
-   -1 sprites/elrails.png 578 56 01 16 8 0 -15
-   -1 sprites/elrails.png 594 56 01 16 8 -7 -15
-   -1 sprites/elrails.png 610 56 09 16 13 4 2
-   -1 sprites/elrails.png 642 56 09 16 20 0 2
-   -1 sprites/elrails.png 674 56 09 16 20 0 2
-   -1 sprites/elrails.png 706 56 09 16 20 0 2
-   -1 sprites/elrails.png 738 56 03 30 38 -3 -14
-   -1 sprites/elrails.png 2 104 03 44 72 -16 -8
-   -1 sprites/elrails.png 82 104 03 35 44 -21 -2
-   -1 sprites/elrails.png 146 104 03 44 72 -16 -35
-   -1 sprites/elrails.png 226 104 09 19 20 0 1
-   -1 sprites/elrails.png 258 104 03 32 32 0 0
-   -1 sprites/elrails.png 306 104 01 22 12 -9 -18
-   -1 sprites/elrails.png 338 104 01 22 12 -1 -18
+   -1 sprites/elrails.png 8bpp  66    8  32  16 -29  -2 normal
+   -1 sprites/elrails.png 8bpp 114    8  32  16  -1  -2 normal
+   -1 sprites/elrails.png 8bpp 162    8  32   1  -1  -2 normal
+   -1 sprites/elrails.png 8bpp 210    8   1  16   0  -3 normal
+   -1 sprites/elrails.png 8bpp 226    8  32  24 -29  -2 normal
+   -1 sprites/elrails.png 8bpp 274    8  32   9  -1   6 normal
+   -1 sprites/elrails.png 8bpp 322    8  32   9 -29   6 normal
+   -1 sprites/elrails.png 8bpp 370    8  32  24  -1  -2 normal
+   -1 sprites/elrails.png 8bpp 418    8  32  16 -29  -2 normal
+   -1 sprites/elrails.png 8bpp 466    8  32  16  -1  -2 normal
+   -1 sprites/elrails.png 8bpp 514    8  32   1  -1  -2 normal
+   -1 sprites/elrails.png 8bpp 562    8   1  16   0  -3 normal
+   -1 sprites/elrails.png 8bpp 578    8  32  24 -29  -2 normal
+   -1 sprites/elrails.png 8bpp 626    8  32   9  -1   6 normal
+   -1 sprites/elrails.png 8bpp 674    8  32   9 -29   6 normal
+   -1 sprites/elrails.png 8bpp 722    8  32  24  -1  -2 normal
+   -1 sprites/elrails.png 8bpp   2   56  32  16 -29  -2 normal
+   -1 sprites/elrails.png 8bpp  50   56  32  16  -1  -2 normal
+   -1 sprites/elrails.png 8bpp  98   56  32   1  -1  -2 normal
+   -1 sprites/elrails.png 8bpp 146   56   1  16   0  -3 normal
+   -1 sprites/elrails.png 8bpp 162   56  32  24 -29  -2 normal
+   -1 sprites/elrails.png 8bpp 210   56  32   9  -1   6 normal
+   -1 sprites/elrails.png 8bpp 258   56  32   9 -29   6 normal
+   -1 sprites/elrails.png 8bpp 306   56  32  24  -1  -2 normal
+   -1 sprites/elrails.png 8bpp 354   56  16   8 -29   6 normal
+   -1 sprites/elrails.png 8bpp 386   56  16   8  -1  -2 normal
+   -1 sprites/elrails.png 8bpp 418   56  16   8 -13  -2 normal
+   -1 sprites/elrails.png 8bpp 450   56  16   8  15   6 normal
+   -1 sprites/elrails.png 8bpp 482   56   8  16  -7 -14 normal
+   -1 sprites/elrails.png 8bpp 498   56   8  18   0 -17 normal
+   -1 sprites/elrails.png 8bpp 514   56   8  16   0 -14 normal
+   -1 sprites/elrails.png 8bpp 530   56   8  18  -7 -17 normal
+   -1 sprites/elrails.png 8bpp 546   56   2  16   0 -15 normal
+   -1 sprites/elrails.png 8bpp 562   56   2  18   0 -16 normal
+   -1 sprites/elrails.png 8bpp 578   56   8  16   0 -15 normal
+   -1 sprites/elrails.png 8bpp 594   56   8  16  -7 -15 normal
+   -1 sprites/elrails.png 8bpp 610   56  13  16   4   2 normal
+   -1 sprites/elrails.png 8bpp 642   56  20  16   0   2 normal
+   -1 sprites/elrails.png 8bpp 674   56  20  16   0   2 normal
+   -1 sprites/elrails.png 8bpp 706   56  20  16   0   2 normal
+   -1 sprites/elrails.png 8bpp 738   56  38  30  -3 -14 normal
+   -1 sprites/elrails.png 8bpp   2  104  72  44 -16  -8 normal
+   -1 sprites/elrails.png 8bpp  82  104  44  35 -21  -2 normal
+   -1 sprites/elrails.png 8bpp 146  104  72  44 -16 -35 normal
+   -1 sprites/elrails.png 8bpp 226  104  20  19   0   1 normal
+   -1 sprites/elrails.png 8bpp 258  104  32  32   0   0 normal
+   -1 sprites/elrails.png 8bpp 306  104  12  22  -9 -18 normal
+   -1 sprites/elrails.png 8bpp 338  104  12  22  -1 -18 normal
--- a/media/extra_grf/fix_graphics.nfo
+++ b/media/extra_grf/fix_graphics.nfo
@@ -12,194 +12,194 @@
   -1 * 6	 07 83 01 \7= 03 3D
 // Fix missing wheels on the wood trucks
   -1 * 14	 0A 04 01 87 0C 01 89 0C 01 07 0E 01 09 0E
-   -1 sprites/fix_graphics.png 82 8 09 16 22 -6 -7
-   -1 sprites/fix_graphics.png 114 8 09 16 22 -14 -7
-   -1 sprites/fix_graphics.png 146 8 09 16 22 -6 -7
-   -1 sprites/fix_graphics.png 178 8 09 16 22 -14 -7
+   -1 sprites/fix_graphics.png 8bpp  82    8  22  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 114    8  22  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 146    8  22  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 178    8  22  16 -14  -7 normal
 // Show correct graphics for various 3rd generation trucks
   -1 * 5	 0A 01 28 C4 0D
-   -1 sprites/fix_graphics.png 226 8 01 18 8 -3 -10
-   -1 sprites/fix_graphics.png 242 8 09 16 20 -14 -7
-   -1 sprites/fix_graphics.png 274 8 01 12 28 -14 -6
-   -1 sprites/fix_graphics.png 322 8 09 16 20 -6 -7
-   -1 sprites/fix_graphics.png 354 8 01 18 8 -3 -10
-   -1 sprites/fix_graphics.png 370 8 09 16 20 -14 -7
-   -1 sprites/fix_graphics.png 402 8 01 12 28 -14 -6
-   -1 sprites/fix_graphics.png 450 8 09 16 20 -6 -7
-   -1 sprites/fix_graphics.png 482 8 01 18 8 -3 -10
-   -1 sprites/fix_graphics.png 498 8 09 16 20 -14 -7
-   -1 sprites/fix_graphics.png 530 8 01 12 28 -14 -6
-   -1 sprites/fix_graphics.png 578 8 09 16 20 -6 -7
-   -1 sprites/fix_graphics.png 610 8 01 18 8 -3 -10
-   -1 sprites/fix_graphics.png 626 8 09 16 20 -14 -7
-   -1 sprites/fix_graphics.png 658 8 01 12 28 -14 -6
-   -1 sprites/fix_graphics.png 706 8 09 16 20 -6 -7
-   -1 sprites/fix_graphics.png 738 8 01 18 8 -3 -10
-   -1 sprites/fix_graphics.png 754 8 09 16 22 -14 -7
-   -1 sprites/fix_graphics.png 2 40 01 12 28 -14 -6
-   -1 sprites/fix_graphics.png 50 40 09 16 22 -6 -7
-   -1 sprites/fix_graphics.png 82 40 01 18 8 -3 -10
-   -1 sprites/fix_graphics.png 98 40 09 16 22 -14 -7
-   -1 sprites/fix_graphics.png 130 40 01 12 28 -14 -6
-   -1 sprites/fix_graphics.png 178 40 09 16 22 -6 -7
-   -1 sprites/fix_graphics.png 210 40 01 18 8 -3 -10
-   -1 sprites/fix_graphics.png 226 40 09 16 22 -14 -7
-   -1 sprites/fix_graphics.png 258 40 01 12 28 -14 -6
-   -1 sprites/fix_graphics.png 306 40 09 16 22 -6 -7
-   -1 sprites/fix_graphics.png 338 40 01 18 8 -3 -10
-   -1 sprites/fix_graphics.png 354 40 09 16 22 -14 -7
-   -1 sprites/fix_graphics.png 386 40 01 12 28 -14 -6
-   -1 sprites/fix_graphics.png 434 40 09 16 22 -6 -7
-   -1 sprites/fix_graphics.png 466 40 01 18 8 -3 -10
-   -1 sprites/fix_graphics.png 482 40 09 16 20 -14 -7
-   -1 sprites/fix_graphics.png 514 40 01 12 28 -14 -6
-   -1 sprites/fix_graphics.png 562 40 09 16 20 -6 -7
-   -1 sprites/fix_graphics.png 594 40 01 18 8 -3 -10
-   -1 sprites/fix_graphics.png 610 40 09 16 20 -14 -7
-   -1 sprites/fix_graphics.png 642 40 01 12 28 -14 -6
-   -1 sprites/fix_graphics.png 690 40 09 16 20 -6 -7
+   -1 sprites/fix_graphics.png 8bpp 226    8   8  18  -3 -10 normal
+   -1 sprites/fix_graphics.png 8bpp 242    8  20  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 274    8  28  12 -14  -6 normal
+   -1 sprites/fix_graphics.png 8bpp 322    8  20  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 354    8   8  18  -3 -10 normal
+   -1 sprites/fix_graphics.png 8bpp 370    8  20  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 402    8  28  12 -14  -6 normal
+   -1 sprites/fix_graphics.png 8bpp 450    8  20  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 482    8   8  18  -3 -10 normal
+   -1 sprites/fix_graphics.png 8bpp 498    8  20  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 530    8  28  12 -14  -6 normal
+   -1 sprites/fix_graphics.png 8bpp 578    8  20  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 610    8   8  18  -3 -10 normal
+   -1 sprites/fix_graphics.png 8bpp 626    8  20  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 658    8  28  12 -14  -6 normal
+   -1 sprites/fix_graphics.png 8bpp 706    8  20  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 738    8   8  18  -3 -10 normal
+   -1 sprites/fix_graphics.png 8bpp 754    8  22  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp   2   40  28  12 -14  -6 normal
+   -1 sprites/fix_graphics.png 8bpp  50   40  22  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp  82   40   8  18  -3 -10 normal
+   -1 sprites/fix_graphics.png 8bpp  98   40  22  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 130   40  28  12 -14  -6 normal
+   -1 sprites/fix_graphics.png 8bpp 178   40  22  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 210   40   8  18  -3 -10 normal
+   -1 sprites/fix_graphics.png 8bpp 226   40  22  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 258   40  28  12 -14  -6 normal
+   -1 sprites/fix_graphics.png 8bpp 306   40  22  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 338   40   8  18  -3 -10 normal
+   -1 sprites/fix_graphics.png 8bpp 354   40  22  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 386   40  28  12 -14  -6 normal
+   -1 sprites/fix_graphics.png 8bpp 434   40  22  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 466   40   8  18  -3 -10 normal
+   -1 sprites/fix_graphics.png 8bpp 482   40  20  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 514   40  28  12 -14  -6 normal
+   -1 sprites/fix_graphics.png 8bpp 562   40  20  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 594   40   8  18  -3 -10 normal
+   -1 sprites/fix_graphics.png 8bpp 610   40  20  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 642   40  28  12 -14  -6 normal
+   -1 sprites/fix_graphics.png 8bpp 690   40  20  16  -6  -7 normal
 // Fix clipping on the 2nd generation paper truck
   -1 * 14	 0A 04 01 9D 0C 01 9F 0C 01 A1 0C 01 A3 0C
-   -1 sprites/fix_graphics.png 738 40 09 16 22 -14 -7
-   -1 sprites/fix_graphics.png 770 40 09 16 22 -6 -7
-   -1 sprites/fix_graphics.png 2 72 09 16 22 -14 -7
-   -1 sprites/fix_graphics.png 34 72 09 16 22 -6 -7
+   -1 sprites/fix_graphics.png 8bpp 738   40  22  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 770   40  22  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp   2   72  22  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp  34   72  22  16  -6  -7 normal
 // Fix clipping on the 1st generation paper truck
   -1 * 14	 0A 04 01 5D 0D 01 5F 0D 01 61 0D 01 63 0D
-   -1 sprites/fix_graphics.png 82 72 09 16 22 -14 -7
-   -1 sprites/fix_graphics.png 114 72 09 17 22 -5 -7
-   -1 sprites/fix_graphics.png 146 72 09 17 22 -14 -8
-   -1 sprites/fix_graphics.png 178 72 09 16 22 -6 -7
+   -1 sprites/fix_graphics.png 8bpp  82   72  22  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 114   72  22  17  -5  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 146   72  22  17 -14  -8 normal
+   -1 sprites/fix_graphics.png 8bpp 178   72  22  16  -6  -7 normal
 // Fix clipping on the 3rd generation paper truck
   -1 * 14	 0A 04 01 1D 0E 01 1F 0E 01 21 0E 01 23 0E
-   -1 sprites/fix_graphics.png 226 72 09 16 22 -14 -7
-   -1 sprites/fix_graphics.png 258 72 09 16 22 -6 -7
-   -1 sprites/fix_graphics.png 290 72 09 16 22 -14 -7
-   -1 sprites/fix_graphics.png 322 72 09 16 22 -6 -7
+   -1 sprites/fix_graphics.png 8bpp 226   72  22  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 258   72  22  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 290   72  22  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 322   72  22  16  -6  -7 normal

 // Fix clipping on the toyland toy van in the German DOS graphics
   -1 * 6 07 83 01 \7! 03 02
   -1 * 5 0A 01 01 5D 0C
-   -1 sprites/fix_graphics.png 18 296 09 16 20 -14 -7
+   -1 sprites/fix_graphics.png 8bpp  18  296  20  16 -14  -7 normal

 // Non-toyland specific
   -1 * 6	 07 83 01 \7= 03 08
 // Fix offsets for the monorail bridge heads
   -1 * 8	 0A 02 01 EA 10 02 EC 10
-   -1 sprites/fix_graphics.png 370 72 09 35 48 -23 -7
-   -1 sprites/fix_graphics.png 434 72 09 35 48 -23 -7
-   -1 sprites/fix_graphics.png 498 72 09 21 49 -24 3
+   -1 sprites/fix_graphics.png 8bpp 370   72  48  35 -23  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 434   72  48  35 -23  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 498   72  49  21 -24   3 normal
 // Fix offsets for the maglev bridge heads
   -1 * 8	 0A 02 01 12 11 02 14 11
-   -1 sprites/fix_graphics.png 322 486 09 35 48 -23 -7
-   -1 sprites/fix_graphics.png 386 486 09 35 48 -23 -7
-   -1 sprites/fix_graphics.png 450 486 09 21 49 -24 3
+   -1 sprites/fix_graphics.png 8bpp 322  486  48  35 -23  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 386  486  48  35 -23  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 450  486  49  21 -24   3 normal

 // Toyland specific
   -1 * 6	 07 83 01 \7! 03 0F
 // Fix offsets for the toyland monorail bridge heads
   -1 * 8	 0A 02 01 EA 10 02 EC 10
-   -1 sprites/fix_graphics.png 610 630 09 35 48 -23 -7
-   -1 sprites/fix_graphics.png 674 630 09 35 48 -23 -7
-   -1 sprites/fix_graphics.png 738 630 09 21 49 -24 3
+   -1 sprites/fix_graphics.png 8bpp 610  630  48  35 -23  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 674  630  48  35 -23  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 738  630  49  21 -24   3 normal
 // Fix offsets for the toyland maglev bridge heads
   -1 * 8	 0A 02 01 12 11 02 14 11
-   -1 sprites/fix_graphics.png 18 678 09 35 48 -23 -7
-   -1 sprites/fix_graphics.png 82 678 09 35 48 -23 -7
-   -1 sprites/fix_graphics.png 146 678 09 21 49 -24 3
+   -1 sprites/fix_graphics.png 8bpp  18  678  48  35 -23  -7 normal
+   -1 sprites/fix_graphics.png 8bpp  82  678  48  35 -23  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 146  678  49  21 -24   3 normal
 // Fix colours for toyland maglev junction overlays
   -1 * 5	 0A 01 06 91 04
-   -1 sprites/fix_graphics.png 338 630 09 16 30 -14 8
-   -1 sprites/fix_graphics.png 386 630 09 16 30 -14 8
-   -1 sprites/fix_graphics.png 434 630 01 7 40 -19 4
-   -1 sprites/fix_graphics.png 482 630 01 7 40 -19 20
-   -1 sprites/fix_graphics.png 530 630 01 19 12 11 6
-   -1 sprites/fix_graphics.png 562 630 01 19 12 -21 6
+   -1 sprites/fix_graphics.png 8bpp 338  630  30  16 -14   8 normal
+   -1 sprites/fix_graphics.png 8bpp 386  630  30  16 -14   8 normal
+   -1 sprites/fix_graphics.png 8bpp 434  630  40   7 -19   4 normal
+   -1 sprites/fix_graphics.png 8bpp 482  630  40   7 -19  20 normal
+   -1 sprites/fix_graphics.png 8bpp 530  630  12  19  11   6 normal
+   -1 sprites/fix_graphics.png 8bpp 562  630  12  19 -21   6 normal

 // Fix transparency of cinema
   -1 * 5	 0A 01 02 34 11
-   -1 sprites/fix_graphics.png 578 72 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 658 72 09 47 50 -28 -20
+   -1 sprites/fix_graphics.png 8bpp 578   72  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 658   72  50  47 -28 -20 normal

 // Fix misaligned undergrounds for temperate monorail
   -1 * 6	 07 83 01 \7! 00 06
   -1 * 5	 0A 01 05 4C 04
-   -1 sprites/fix_graphics.png 2 136 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 136 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 162 136 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 242 136 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 322 136 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 8bpp   2  136  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp  82  136  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 162  136  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 242  136  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 322  136  64  31 -31   0 normal

 // Fix misaligned undergrounds for arctic monorail
   -1 * 6	 07 83 01 \7! 01 06
   -1 * 5	 0A 01 05 4C 04
-   -1 sprites/fix_graphics.png 434 136 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 514 136 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 594 136 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 674 136 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 2 184 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 8bpp 434  136  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 514  136  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 594  136  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 674  136  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp   2  184  64  31 -31   0 normal

 // Fix misaligned undergrounds for tropical/desert monorail/maglev
   -1 * 6	 07 83 01 \7! 02 10
   -1 * 11	 0A 03 05 4C 04 05 66 04 05 B8 04
-   -1 sprites/fix_graphics.png 114 184 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 194 184 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 274 184 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 354 184 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 434 184 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 514 184 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 594 184 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 674 184 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 2 232 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 232 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 162 232 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 242 232 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 322 232 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 402 232 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 482 232 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 8bpp 114  184  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 194  184  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 274  184  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 354  184  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 434  184  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 514  184  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 594  184  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 674  184  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp   2  232  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp  82  232  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 162  232  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 242  232  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 322  232  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 402  232  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 482  232  64  31 -31   0 normal

 // Fix misaligned X crossing for snow-covered monorail
   -1 * 6	 07 83 01 \7! 01 02
   -1 * 5	 0A 01 01 65 04
-   -1 sprites/fix_graphics.png 594 232 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 8bpp 594  232  64  31 -31   0 normal

 // Fix offsets for the tropical house
   -1 * 5	 0A 01 01 FF 11
-   -1 sprites/fix_graphics.png 706 232 09 47 64 -31 -16
+   -1 sprites/fix_graphics.png 8bpp 706  232  64  47 -31 -16 normal

 // Graphics metadata pixel higher than actual graphics
   -1 * 6	 12 01 00 01 AC E2
-   -1 sprites/fix_graphics.png 66 296 01 10 9 0 0
+   -1 sprites/fix_graphics.png 8bpp  66  296   9  10   0   0 normal

 // Non-toyland specific
   -1 * 6	 07 83 01 \7= 03 0A
 // Fix offsets for the tubular bridge pillars
   -1 * 5	 0A 01 04 05 0A
-   -1 sprites/fix_graphics.png 98 296 09 9 4 2 -1
-   -1 sprites/fix_graphics.png 114 296 09 9 4 2 -1
-   -1 sprites/fix_graphics.png 130 296 09 9 4 -4 0
-   -1 sprites/fix_graphics.png 146 296 09 9 4 -4 0
+   -1 sprites/fix_graphics.png 8bpp  98  296   4   9   2  -1 normal
+   -1 sprites/fix_graphics.png 8bpp 114  296   4   9   2  -1 normal
+   -1 sprites/fix_graphics.png 8bpp 130  296   4   9  -4   0 normal
+   -1 sprites/fix_graphics.png 8bpp 146  296   4   9  -4   0 normal
 // Fix offsets for the cantilever bridge pillars
   -1 * 5	 0A 01 04 DD 09
-   -1 sprites/fix_graphics.png 178 296 09 11 10 2 -3
-   -1 sprites/fix_graphics.png 194 296 09 12 10 2 -2
-   -1 sprites/fix_graphics.png 210 296 09 11 10 -10 -1
-   -1 sprites/fix_graphics.png 226 296 09 11 10 -10 -1
+   -1 sprites/fix_graphics.png 8bpp 178  296  10  11   2  -3 normal
+   -1 sprites/fix_graphics.png 8bpp 194  296  10  12   2  -2 normal
+   -1 sprites/fix_graphics.png 8bpp 210  296  10  11 -10  -1 normal
+   -1 sprites/fix_graphics.png 8bpp 226  296  10  11 -10  -1 normal

 // Toyland specific
   -1 * 6	 07 83 01 \7! 03 0A
 // Fix offsets for the toyland tubular bridge pillars
   -1 * 5	 0A 01 04 05 0A
-   -1 sprites/fix_graphics.png 248 296 09 9 4 2 -1
-   -1 sprites/fix_graphics.png 264 296 09 9 4 2 -1
-   -1 sprites/fix_graphics.png 280 296 09 9 4 -4 0
-   -1 sprites/fix_graphics.png 296 296 09 9 4 -4 0
+   -1 sprites/fix_graphics.png 8bpp 248  296   4   9   2  -1 normal
+   -1 sprites/fix_graphics.png 8bpp 264  296   4   9   2  -1 normal
+   -1 sprites/fix_graphics.png 8bpp 280  296   4   9  -4   0 normal
+   -1 sprites/fix_graphics.png 8bpp 296  296   4   9  -4   0 normal
 // Fix offsets for the toyland cantilever bridge pillars
   -1 * 5	 0A 01 04 DD 09
-   -1 sprites/fix_graphics.png 328 296 09 11 10 2 -3
-   -1 sprites/fix_graphics.png 344 296 09 12 10 2 -2
-   -1 sprites/fix_graphics.png 360 296 09 11 10 -10 -1
-   -1 sprites/fix_graphics.png 376 296 09 11 10 -10 -1
+   -1 sprites/fix_graphics.png 8bpp 328  296  10  11   2  -3 normal
+   -1 sprites/fix_graphics.png 8bpp 344  296  10  12   2  -2 normal
+   -1 sprites/fix_graphics.png 8bpp 360  296  10  11 -10  -1 normal
+   -1 sprites/fix_graphics.png 8bpp 376  296  10  11 -10  -1 normal

 // Wrong, non-translated colours in tubular bridge in 'normal' climates
 // Toyland has separate sprites which are not colour translated, thus
@@ -208,169 +208,169 @@
   -1 * 6	 07 83 01 \7= 03 \b22
 // Main tubular bridge sprites
   -1 * 5	 0A 01 \b6 \w2559
-   -1 sprites/fix_graphics.png 2 330 09 40 32 -30 -26
-   -1 sprites/fix_graphics.png 52 330 09 50 44 -42 -26
-   -1 sprites/fix_graphics.png 116 330 09 45 46 -42 -21
-   -1 sprites/fix_graphics.png 180 330 09 45 46 -2 -20
-   -1 sprites/fix_graphics.png 244 330 09 50 44 0 -25
-   -1 sprites/fix_graphics.png 308 330 09 41 32 0 -25
+   -1 sprites/fix_graphics.png 8bpp   2  330  32  40 -30 -26 normal
+   -1 sprites/fix_graphics.png 8bpp  52  330  44  50 -42 -26 normal
+   -1 sprites/fix_graphics.png 8bpp 116  330  46  45 -42 -21 normal
+   -1 sprites/fix_graphics.png 8bpp 180  330  46  45  -2 -20 normal
+   -1 sprites/fix_graphics.png 8bpp 244  330  44  50   0 -25 normal
+   -1 sprites/fix_graphics.png 8bpp 308  330  32  41   0 -25 normal
 // start rail bridge
   -1 * 5	 0A 01 01 \w2569
-   -1 sprites/fix_graphics.png 350 330 09 29 52 -25 -4
+   -1 sprites/fix_graphics.png 8bpp 350  330  52  29 -25  -4 normal
 // start rail + road bridge
   -1 * 5	 0A 01 02 \w2574
-   -1 sprites/fix_graphics.png 420 330 09 29 50 -25 -4
-   -1 sprites/fix_graphics.png 489 330 09 29 52 -25 -4
+   -1 sprites/fix_graphics.png 8bpp 420  330  50  29 -25  -4 normal
+   -1 sprites/fix_graphics.png 8bpp 489  330  52  29 -25  -4 normal
 // start road + monorail bridge
   -1 * 5	 0A 01 02 \w2580
-   -1 sprites/fix_graphics.png 559 330 09 29 50 -25 -4
-   -1 sprites/fix_graphics.png 629 330 09 29 52 -25 -4
+   -1 sprites/fix_graphics.png 8bpp 559  330  50  29 -25  -4 normal
+   -1 sprites/fix_graphics.png 8bpp 629  330  52  29 -25  -4 normal
 // start monrail + maglev bridge
   -1 * 5	 0A 01 02 \w2586
-   -1 sprites/fix_graphics.png 699 330 09 29 50 -25 -4
-   -1 sprites/fix_graphics.png 489 283 09 29 52 -25 -4
+   -1 sprites/fix_graphics.png 8bpp 699  330  50  29 -25  -4 normal
+   -1 sprites/fix_graphics.png 8bpp 489  283  52  29 -25  -4 normal
 // start maglev bridge
   -1 * 5	 0A 01 01 \w2592
-   -1 sprites/fix_graphics.png 559 283 09 29 50 -25 -4
+   -1 sprites/fix_graphics.png 8bpp 559  283  50  29 -25  -4 normal
 // GUI sprite
   -1 * 5	 0A 01 01 \w2600
-   -1 sprites/fix_graphics.png 433 298 09 15 40 0 5
+   -1 sprites/fix_graphics.png 8bpp 433  298  40  15   0   5 normal

 // Remove road markings from tropical rail crossings
   -1 * 6	 07 83 01 \7! 02 19
   -1 * 14	 0A 04 04 5A 05 08 62 05 08 6E 05 04 7A 05
-   -1 sprites/fix_graphics.png 2 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 162 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 242 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 322 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 402 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 482 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 562 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 642 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 722 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 2 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 162 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 242 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 322 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 402 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 482 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 562 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 642 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 722 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 2 486 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 486 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 162 486 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 242 486 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 8bpp   2  390  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp  82  390  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 162  390  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 242  390  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 322  390  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 402  390  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 482  390  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 562  390  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 642  390  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 722  390  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp   2  438  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp  82  438  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 162  438  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 242  438  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 322  438  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 402  438  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 482  438  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 562  438  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 642  438  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 722  438  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp   2  486  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp  82  486  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 162  486  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 242  486  64  31 -31   0 normal

 // Fix transparency of steel mill
   -1 * 5	 0A 01 06 46 08
-   -1 sprites/fix_graphics.png 162 870 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 242 870 09 51 64 -31 -21
-   -1 sprites/fix_graphics.png 322 870 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 402 870 09 58 49 -29 -29
-   -1 sprites/fix_graphics.png 466 870 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 546 870 09 42 45 -18 -12
+   -1 sprites/fix_graphics.png 8bpp 162  870  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 242  870  64  51 -31 -21 normal
+   -1 sprites/fix_graphics.png 8bpp 322  870  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 402  870  49  58 -29 -29 normal
+   -1 sprites/fix_graphics.png 8bpp 466  870  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 546  870  45  42 -18 -12 normal
   -1 * 5	 0A 01 0A 4D 08
-   -1 sprites/fix_graphics.png 610 486 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 690 486 09 61 59 -31 -33
-   -1 sprites/fix_graphics.png 2 566 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 566 09 50 51 -25 -21
-   -1 sprites/fix_graphics.png 606 870 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 686 870 09 46 64 -31 -16
-   -1 sprites/fix_graphics.png 2 945 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 945 09 51 50 -29 -21
-   -1 sprites/fix_graphics.png 146 945 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 226 945 09 42 47 -18 -12
+   -1 sprites/fix_graphics.png 8bpp 610  486  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 690  486  59  61 -31 -33 normal
+   -1 sprites/fix_graphics.png 8bpp   2  566  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp  82  566  51  50 -25 -21 normal
+   -1 sprites/fix_graphics.png 8bpp 606  870  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 686  870  64  46 -31 -16 normal
+   -1 sprites/fix_graphics.png 8bpp   2  945  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp  82  945  50  51 -29 -21 normal
+   -1 sprites/fix_graphics.png 8bpp 146  945  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 226  945  47  42 -18 -12 normal
   -1 * 5	 0A 01 04 58 08
-   -1 sprites/fix_graphics.png 162 566 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 242 566 09 52 59 -31 -24
-   -1 sprites/fix_graphics.png 306 566 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 386 566 09 44 51 -25 -15
+   -1 sprites/fix_graphics.png 8bpp 162  566  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 242  566  59  52 -31 -24 normal
+   -1 sprites/fix_graphics.png 8bpp 306  566  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 386  566  51  44 -25 -15 normal

 // Fix transparency of oil well
   -1 * 5	 0A 01 07 7D 08
-   -1 sprites/fix_graphics.png 2 630 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 482 566 09 50 31 -11 -28
-   -1 sprites/fix_graphics.png 530 566 09 47 31 -11 -25
-   -1 sprites/fix_graphics.png 578 566 09 47 31 -11 -25
-   -1 sprites/fix_graphics.png 626 566 09 47 31 -11 -25
-   -1 sprites/fix_graphics.png 674 566 09 49 31 -11 -27
-   -1 sprites/fix_graphics.png 722 566 09 52 31 -11 -30
+   -1 sprites/fix_graphics.png 8bpp   2  630  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 482  566  31  50 -11 -28 normal
+   -1 sprites/fix_graphics.png 8bpp 530  566  31  47 -11 -25 normal
+   -1 sprites/fix_graphics.png 8bpp 578  566  31  47 -11 -25 normal
+   -1 sprites/fix_graphics.png 8bpp 626  566  31  47 -11 -25 normal
+   -1 sprites/fix_graphics.png 8bpp 674  566  31  49 -11 -27 normal
+   -1 sprites/fix_graphics.png 8bpp 722  566  31  52 -11 -30 normal
   -1 * 6	 07 83 01 \7! 01 02
   -1 * 5	 0A 01 01 7D 08
-   -1 sprites/fix_graphics.png 114 630 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 8bpp 114  630  64  31 -31   0 normal
   -1 * 6	 07 83 01 \7! 02 02
   -1 * 5	 0A 01 01 7D 08
-   -1 sprites/fix_graphics.png 226 630 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 8bpp 226  630  64  31 -31   0 normal

 // Fix city airport's grass for temperate
   -1 * 6	 07 83 01 \7! 00 0A
   -1 * 5	 0A 01 09 4C 0A
-   -1 sprites/fix_graphics.png 242 678 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 322 678 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 402 678 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 482 678 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 562 678 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 642 678 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 722 678 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 2 726 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 726 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 8bpp 242  678  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 322  678  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 402  678  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 482  678  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 562  678  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 642  678  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 722  678  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp   2  726  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp  82  726  64  31 -31   0 normal

 // Fix city airport's grass for arctic
   -1 * 6	 07 83 01 \7! 01 0A
   -1 * 5	 0A 01 09 4C 0A
-   -1 sprites/fix_graphics.png 194 726 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 274 726 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 354 726 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 434 726 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 514 726 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 594 726 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 674 726 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 2 774 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 774 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 8bpp 194  726  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 274  726  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 354  726  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 434  726  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 514  726  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 594  726  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 674  726  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp   2  774  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp  82  774  64  31 -31   0 normal

 // Fix city airport's grass for tropical
   -1 * 6	 07 83 01 \7! 02 0A
   -1 * 5	 0A 01 09 4C 0A
-   -1 sprites/fix_graphics.png 194 774 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 274 774 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 354 774 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 434 774 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 514 774 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 594 774 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 674 774 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 2 822 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 822 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 8bpp 194  774  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 274  774  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 354  774  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 434  774  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 514  774  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 594  774  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 674  774  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp   2  822  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp  82  822  64  31 -31   0 normal

 // Fix city airport's grass for toyland
   -1 * 6	 07 83 01 \7! 03 0A
   -1 * 5	 0A 01 09 4C 0A
-   -1 sprites/fix_graphics.png 194 822 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 274 822 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 354 822 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 434 822 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 514 822 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 594 822 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 674 822 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 2 870 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 870 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 8bpp 194  822  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 274  822  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 354  822  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 434  822  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 514  822  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 594  822  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 674  822  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp   2  870  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp  82  870  64  31 -31   0 normal

 // Wrong, non-translated colours in arctic buildings
   -1 * 8	 0A 02 01 1F 06 01 DB 11
-   -1 sprites/fix_graphics.png 305 945 09 29 59 -29 -12
-   -1 sprites/fix_graphics.png 369 945 09 29 59 -29 -12
+   -1 sprites/fix_graphics.png 8bpp 305  945  59  29 -29 -12 normal
+   -1 sprites/fix_graphics.png 8bpp 369  945  59  29 -29 -12 normal
   -1 * 8	 0A 02 01 76 11 01 E6 11
-   -1 sprites/fix_graphics.png 449 945 09 69 64 -31 -38
-   -1 sprites/fix_graphics.png 529 945 09 69 64 -31 -38
+   -1 sprites/fix_graphics.png 8bpp 449  945  64  69 -31 -38 normal
+   -1 sprites/fix_graphics.png 8bpp 529  945  64  69 -31 -38 normal
   -1 * 8	 0A 02 02 7E 11 01 E1 11
-   -1 sprites/fix_graphics.png 625 945 03 75 54 -25 -47
-   -1 sprites/fix_graphics.png 2 1037 09 75 54 -25 -47
-   -1 sprites/fix_graphics.png 66 1037 09 75 54 -25 -47
+   -1 sprites/fix_graphics.png 8bpp 625  945  54  75 -25 -47 normal
+   -1 sprites/fix_graphics.png 8bpp   2 1037  54  75 -25 -47 normal
+   -1 sprites/fix_graphics.png 8bpp  66 1037  54  75 -25 -47 normal

 // Fix buoy in-game; don't show black outline
   -1 * 4        01 05 01 \b1
-   -1 sprites/fix_graphics.png 575 490 09 11 7 7 4
+   -1 sprites/fix_graphics.png 8bpp 575  490   7  11   7   4 normal
   -1 * 7        02 05 17 01 00 00 00
   -1 * 7        03 05 01 08 00 17 00
--- a/media/extra_grf/flags.nfo
+++ b/media/extra_grf/flags.nfo
@@ -8,39 +8,39 @@
 //
   -1 * 0	 0C "Flag graphics"
   -1 * 3	 05 14 24
-   -1 sprites/flags.png 34 8 09 8 11 0 0
-   -1 sprites/flags.png 50 8 09 8 11 0 0
-   -1 sprites/flags.png 66 8 09 8 11 0 0
-   -1 sprites/flags.png 82 8 09 8 11 0 0
-   -1 sprites/flags.png 98 8 09 8 11 0 0
-   -1 sprites/flags.png 114 8 09 8 11 0 0
-   -1 sprites/flags.png 130 8 09 8 11 0 0
-   -1 sprites/flags.png 146 8 09 8 11 0 0
-   -1 sprites/flags.png 162 8 09 8 11 0 0
-   -1 sprites/flags.png 178 8 09 8 11 0 0
-   -1 sprites/flags.png 194 8 09 8 11 0 0
-   -1 sprites/flags.png 210 8 09 8 11 0 0
-   -1 sprites/flags.png 226 8 09 8 11 0 0
-   -1 sprites/flags.png 242 8 09 8 11 0 0
-   -1 sprites/flags.png 258 8 09 8 11 0 0
-   -1 sprites/flags.png 274 8 09 8 11 0 0
-   -1 sprites/flags.png 290 8 09 8 11 0 0
-   -1 sprites/flags.png 306 8 09 8 11 0 0
-   -1 sprites/flags.png 322 8 09 8 11 0 0
-   -1 sprites/flags.png 338 8 09 8 11 0 0
-   -1 sprites/flags.png 354 8 09 8 11 0 0
-   -1 sprites/flags.png 370 8 09 8 11 0 0
-   -1 sprites/flags.png 386 8 09 8 11 0 0
-   -1 sprites/flags.png 402 8 09 8 11 0 0
-   -1 sprites/flags.png 418 8 09 8 11 0 0
-   -1 sprites/flags.png 434 8 09 8 11 0 0
-   -1 sprites/flags.png 450 8 09 8 11 0 0
-   -1 sprites/flags.png 466 8 09 8 11 0 0
-   -1 sprites/flags.png 482 8 09 8 11 0 0
-   -1 sprites/flags.png 498 8 09 8 11 0 0
-   -1 sprites/flags.png 514 8 09 8 11 0 0
-   -1 sprites/flags.png 530 8 09 8 11 0 0
-   -1 sprites/flags.png 546 8 09 8 11 0 0
-   -1 sprites/flags.png 562 8 09 8 11 0 0
-   -1 sprites/flags.png 578 8 09 8 11 0 0
-   -1 sprites/flags.png 594 8 09 8 11 0 0
+   -1 sprites/flags.png 8bpp  34    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp  50    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp  66    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp  82    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp  98    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 114    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 130    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 146    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 162    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 178    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 194    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 210    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 226    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 242    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 258    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 274    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 290    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 306    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 322    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 338    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 354    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 370    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 386    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 402    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 418    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 434    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 450    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 466    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 482    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 498    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 514    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 530    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 546    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 562    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 578    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 594    8  11   8   0   0 normal
--- a/media/extra_grf/foundations.nfo
+++ b/media/extra_grf/foundations.nfo
@@ -9,369 +9,369 @@
   -1 * 0	 0C "Foundations. Non-halftile ones by Marcin Grzegorczyk"
   -1 * 6	 07 83 01 \7! 00 5B
   -1 * 3	 05 06 5A
-   -1 sprites/foundations.png 82 8 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 8 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 8 09 32 64 -31 -9
-   -1 sprites/foundations.png 322 8 09 32 64 -31 -9
-   -1 sprites/foundations.png 402 8 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 8 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 8 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 8 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 8 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 72 09 32 64 -31 -9
-   -1 sprites/foundations.png 82 72 09 32 64 -31 -9
-   -1 sprites/foundations.png 162 72 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 72 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 72 09 32 64 -31 -9
-   -1 sprites/foundations.png 402 72 09 32 64 -31 -9
-   -1 sprites/foundations.png 482 72 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 72 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 72 09 32 64 -31 -9
-   -1 sprites/foundations.png 722 72 09 32 64 -31 -9
-   -1 sprites/foundations.png 2 136 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 136 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 136 09 32 64 -31 -9
-   -1 sprites/foundations.png 242 136 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 136 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 136 09 32 64 -31 -9
-   -1 sprites/foundations.png 482 136 09 32 64 -31 -9
-   -1 sprites/foundations.png 562 136 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 136 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 136 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 200 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 200 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 200 09 32 64 -31 -9
-   -1 sprites/foundations.png 242 200 09 32 64 -31 -9
-   -1 sprites/foundations.png 322 200 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 200 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 200 09 32 64 -31 -9
-   -1 sprites/foundations.png 562 200 09 32 64 -31 -9
-   -1 sprites/foundations.png 642 200 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 200 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 264 09 32 64 -31 -9
-   -1 sprites/foundations.png 82 264 09 32 64 -31 -9
-   -1 sprites/foundations.png 162 264 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 264 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 264 09 32 64 -31 -9
-   -1 sprites/foundations.png 402 264 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 264 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 264 09 32 64 -31 -9
-   -1 sprites/foundations.png 642 264 09 32 64 -31 -9
-   -1 sprites/foundations.png 722 264 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 328 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 328 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 328 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 328 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 328 09 32 64 -31 -9
-   -1 sprites/foundations.png 402 328 09 32 64 -31 -9
-   -1 sprites/foundations.png 482 328 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 328 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 328 09 32 64 -31 -9
-   -1 sprites/foundations.png 722 328 09 32 64 -31 -9
-   -1 sprites/foundations.png 2 392 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 392 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 392 09 32 64 -31 -9
-   -1 sprites/foundations.png 242 392 09 32 64 -31 -9
-   -1 sprites/foundations.png 322 392 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 392 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 392 09 32 64 -31 -9
-   -1 sprites/foundations.png 562 392 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 392 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 392 09 32 64 -31 -9
-   -1 sprites/foundations.png 2 456 09 32 64 -31 -9
-   -1 sprites/foundations.png 82 456 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 456 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 456 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 456 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 456 09 40 64 -15 -17
-   -1 sprites/foundations.png 482 456 09 33 64 -31 -25
-   -1 sprites/foundations.png 562 456 09 40 64 -47 -17
-   -1 sprites/foundations.png 642 456 09 33 64 -31 -9
-   -1 sprites/foundations.png 722 456 09 40 64 -15 -17
-   -1 sprites/foundations.png 2 520 09 33 64 -31 -25
-   -1 sprites/foundations.png 82 520 09 40 64 -47 -17
-   -1 sprites/foundations.png 162 520 09 33 64 -31 -9
-   -1 sprites/foundations.png 242 520 09 40 64 -15 -17
-   -1 sprites/foundations.png 322 520 09 33 64 -31 -25
-   -1 sprites/foundations.png 402 520 09 40 64 -47 -17
-   -1 sprites/foundations.png 482 520 09 33 64 -31 -9
-   -1 sprites/foundations.png 562 520 09 40 64 -15 -17
-   -1 sprites/foundations.png 642 520 09 33 64 -31 -25
-   -1 sprites/foundations.png 722 520 09 40 64 -47 -17
-   -1 sprites/foundations.png 2 584 09 33 64 -31 -9
+   -1 sprites/foundations.png 8bpp  82    8  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162    8  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242    8  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322    8  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402    8  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482    8  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562    8  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642    8  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722    8  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2   72  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82   72  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162   72  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242   72  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322   72  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402   72  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482   72  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562   72  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642   72  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722   72  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2  136  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82  136  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162  136  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  136  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322  136  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402  136  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482  136  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562  136  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642  136  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722  136  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2  200  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82  200  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162  200  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  200  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322  200  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402  200  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482  200  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562  200  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642  200  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722  200  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2  264  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82  264  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162  264  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  264  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322  264  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402  264  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482  264  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562  264  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642  264  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722  264  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2  328  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82  328  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162  328  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  328  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322  328  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402  328  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482  328  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562  328  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642  328  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722  328  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2  392  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82  392  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162  392  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  392  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322  392  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402  392  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482  392  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562  392  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642  392  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722  392  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2  456  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82  456  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162  456  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  456  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322  456  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402  456  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp 482  456  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp 562  456  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp 642  456  64  33 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722  456  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp   2  520  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp  82  520  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp 162  520  64  33 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  520  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp 322  520  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp 402  520  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp 482  520  64  33 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562  520  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp 642  520  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp 722  520  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp   2  584  64  33 -31  -9 normal
   -1 * 6	 07 83 01 \7! 01 5B
   -1 * 3	 05 06 5A
-   -1 sprites/foundations.png 114 584 09 40 64 -31 -9
-   -1 sprites/foundations.png 194 584 09 40 64 -31 -9
-   -1 sprites/foundations.png 274 584 09 32 64 -31 -9
-   -1 sprites/foundations.png 354 584 09 32 64 -31 -9
-   -1 sprites/foundations.png 434 584 09 40 64 -31 -9
-   -1 sprites/foundations.png 514 584 09 40 64 -31 -9
-   -1 sprites/foundations.png 594 584 09 40 64 -31 -9
-   -1 sprites/foundations.png 674 584 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 648 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 648 09 32 64 -31 -9
-   -1 sprites/foundations.png 162 648 09 32 64 -31 -9
-   -1 sprites/foundations.png 242 648 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 648 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 648 09 32 64 -31 -9
-   -1 sprites/foundations.png 482 648 09 32 64 -31 -9
-   -1 sprites/foundations.png 562 648 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 648 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 648 09 32 64 -31 -9
-   -1 sprites/foundations.png 2 712 09 32 64 -31 -9
-   -1 sprites/foundations.png 82 712 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 712 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 712 09 32 64 -31 -9
-   -1 sprites/foundations.png 322 712 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 712 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 712 09 32 64 -31 -9
-   -1 sprites/foundations.png 562 712 09 32 64 -31 -9
-   -1 sprites/foundations.png 642 712 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 712 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 776 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 776 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 776 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 776 09 32 64 -31 -9
-   -1 sprites/foundations.png 322 776 09 32 64 -31 -9
-   -1 sprites/foundations.png 402 776 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 776 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 776 09 32 64 -31 -9
-   -1 sprites/foundations.png 642 776 09 32 64 -31 -9
-   -1 sprites/foundations.png 722 776 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 840 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 840 09 32 64 -31 -9
-   -1 sprites/foundations.png 162 840 09 32 64 -31 -9
-   -1 sprites/foundations.png 242 840 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 840 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 840 09 32 64 -31 -9
-   -1 sprites/foundations.png 482 840 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 840 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 840 09 32 64 -31 -9
-   -1 sprites/foundations.png 722 840 09 32 64 -31 -9
-   -1 sprites/foundations.png 2 904 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 904 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 904 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 904 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 904 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 904 09 32 64 -31 -9
-   -1 sprites/foundations.png 482 904 09 32 64 -31 -9
-   -1 sprites/foundations.png 562 904 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 904 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 904 09 32 64 -31 -9
-   -1 sprites/foundations.png 2 968 09 32 64 -31 -9
-   -1 sprites/foundations.png 82 968 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 968 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 968 09 32 64 -31 -9
-   -1 sprites/foundations.png 322 968 09 32 64 -31 -9
-   -1 sprites/foundations.png 402 968 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 968 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 968 09 32 64 -31 -9
-   -1 sprites/foundations.png 642 968 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 968 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 1032 09 32 64 -31 -9
-   -1 sprites/foundations.png 82 1032 09 32 64 -31 -9
-   -1 sprites/foundations.png 162 1032 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 1032 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 1032 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 1032 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 1032 09 40 64 -15 -17
-   -1 sprites/foundations.png 562 1032 09 33 64 -31 -25
-   -1 sprites/foundations.png 642 1032 09 40 64 -47 -17
-   -1 sprites/foundations.png 722 1032 09 33 64 -31 -9
-   -1 sprites/foundations.png 2 1096 09 40 64 -15 -17
-   -1 sprites/foundations.png 82 1096 09 33 64 -31 -25
-   -1 sprites/foundations.png 162 1096 09 40 64 -47 -17
-   -1 sprites/foundations.png 242 1096 09 33 64 -31 -9
-   -1 sprites/foundations.png 322 1096 09 40 64 -15 -17
-   -1 sprites/foundations.png 402 1096 09 33 64 -31 -25
-   -1 sprites/foundations.png 482 1096 09 40 64 -47 -17
-   -1 sprites/foundations.png 562 1096 09 33 64 -31 -9
-   -1 sprites/foundations.png 642 1096 09 40 64 -15 -17
-   -1 sprites/foundations.png 722 1096 09 33 64 -31 -25
-   -1 sprites/foundations.png 2 1160 09 40 64 -47 -17
-   -1 sprites/foundations.png 82 1160 09 33 64 -31 -9
+   -1 sprites/foundations.png 8bpp 114  584  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 194  584  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 274  584  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 354  584  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 434  584  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 514  584  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 594  584  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 674  584  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2  648  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82  648  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162  648  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  648  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322  648  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402  648  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482  648  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562  648  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642  648  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722  648  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2  712  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82  712  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162  712  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  712  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322  712  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402  712  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482  712  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562  712  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642  712  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722  712  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2  776  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82  776  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162  776  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  776  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322  776  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402  776  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482  776  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562  776  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642  776  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722  776  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2  840  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82  840  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162  840  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  840  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322  840  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402  840  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482  840  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562  840  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642  840  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722  840  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2  904  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82  904  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162  904  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  904  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322  904  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402  904  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482  904  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562  904  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642  904  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722  904  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2  968  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82  968  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162  968  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  968  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322  968  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402  968  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482  968  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562  968  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642  968  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722  968  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1032  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1032  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 1032  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 1032  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1032  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1032  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 1032  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp 562 1032  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp 642 1032  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp 722 1032  64  33 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1096  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp  82 1096  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp 162 1096  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp 242 1096  64  33 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1096  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp 402 1096  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp 482 1096  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp 562 1096  64  33 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 1096  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp 722 1096  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp   2 1160  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp  82 1160  64  33 -31  -9 normal
   -1 * 6	 07 83 01 \7! 02 5B
   -1 * 3	 05 06 5A
-   -1 sprites/foundations.png 194 1160 09 40 64 -31 -9
-   -1 sprites/foundations.png 274 1160 09 40 64 -31 -9
-   -1 sprites/foundations.png 354 1160 09 32 64 -31 -9
-   -1 sprites/foundations.png 434 1160 09 32 64 -31 -9
-   -1 sprites/foundations.png 514 1160 09 40 64 -31 -9
-   -1 sprites/foundations.png 594 1160 09 40 64 -31 -9
-   -1 sprites/foundations.png 674 1160 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 1224 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 1224 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 1224 09 32 64 -31 -9
-   -1 sprites/foundations.png 242 1224 09 32 64 -31 -9
-   -1 sprites/foundations.png 322 1224 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 1224 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 1224 09 32 64 -31 -9
-   -1 sprites/foundations.png 562 1224 09 32 64 -31 -9
-   -1 sprites/foundations.png 642 1224 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 1224 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 1288 09 32 64 -31 -9
-   -1 sprites/foundations.png 82 1288 09 32 64 -31 -9
-   -1 sprites/foundations.png 162 1288 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 1288 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 1288 09 32 64 -31 -9
-   -1 sprites/foundations.png 402 1288 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 1288 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 1288 09 32 64 -31 -9
-   -1 sprites/foundations.png 642 1288 09 32 64 -31 -9
-   -1 sprites/foundations.png 722 1288 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 1352 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 1352 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 1352 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 1352 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 1352 09 32 64 -31 -9
-   -1 sprites/foundations.png 402 1352 09 32 64 -31 -9
-   -1 sprites/foundations.png 482 1352 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 1352 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 1352 09 32 64 -31 -9
-   -1 sprites/foundations.png 722 1352 09 32 64 -31 -9
-   -1 sprites/foundations.png 2 1416 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 1416 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 1416 09 32 64 -31 -9
-   -1 sprites/foundations.png 242 1416 09 32 64 -31 -9
-   -1 sprites/foundations.png 322 1416 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 1416 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 1416 09 32 64 -31 -9
-   -1 sprites/foundations.png 562 1416 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 1416 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 1416 09 32 64 -31 -9
-   -1 sprites/foundations.png 2 1480 09 32 64 -31 -9
-   -1 sprites/foundations.png 82 1480 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 1480 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 1480 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 1480 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 1480 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 1480 09 32 64 -31 -9
-   -1 sprites/foundations.png 562 1480 09 32 64 -31 -9
-   -1 sprites/foundations.png 642 1480 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 1480 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 1544 09 32 64 -31 -9
-   -1 sprites/foundations.png 82 1544 09 32 64 -31 -9
-   -1 sprites/foundations.png 162 1544 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 1544 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 1544 09 32 64 -31 -9
-   -1 sprites/foundations.png 402 1544 09 32 64 -31 -9
-   -1 sprites/foundations.png 482 1544 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 1544 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 1544 09 32 64 -31 -9
-   -1 sprites/foundations.png 722 1544 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 1608 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 1608 09 32 64 -31 -9
-   -1 sprites/foundations.png 162 1608 09 32 64 -31 -9
-   -1 sprites/foundations.png 242 1608 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 1608 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 1608 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 1608 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 1608 09 40 64 -15 -17
-   -1 sprites/foundations.png 642 1608 09 33 64 -31 -25
-   -1 sprites/foundations.png 722 1608 09 40 64 -47 -17
-   -1 sprites/foundations.png 2 1672 09 33 64 -31 -9
-   -1 sprites/foundations.png 82 1672 09 40 64 -15 -17
-   -1 sprites/foundations.png 162 1672 09 33 64 -31 -25
-   -1 sprites/foundations.png 242 1672 09 40 64 -47 -17
-   -1 sprites/foundations.png 322 1672 09 33 64 -31 -9
-   -1 sprites/foundations.png 402 1672 09 40 64 -15 -17
-   -1 sprites/foundations.png 482 1672 09 33 64 -31 -25
-   -1 sprites/foundations.png 562 1672 09 40 64 -47 -17
-   -1 sprites/foundations.png 642 1672 09 33 64 -31 -9
-   -1 sprites/foundations.png 722 1672 09 40 64 -15 -17
-   -1 sprites/foundations.png 2 1736 09 33 64 -31 -25
-   -1 sprites/foundations.png 82 1736 09 40 64 -47 -17
-   -1 sprites/foundations.png 162 1736 09 33 64 -31 -9
+   -1 sprites/foundations.png 8bpp 194 1160  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 274 1160  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 354 1160  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 434 1160  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 514 1160  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 594 1160  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 674 1160  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1224  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1224  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 1224  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 1224  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1224  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1224  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 1224  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 1224  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 1224  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 1224  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1288  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1288  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 1288  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 1288  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1288  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1288  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 1288  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 1288  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 1288  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 1288  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1352  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1352  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 1352  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 1352  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1352  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1352  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 1352  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 1352  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 1352  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 1352  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1416  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1416  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 1416  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 1416  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1416  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1416  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 1416  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 1416  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 1416  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 1416  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1480  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1480  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 1480  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 1480  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1480  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1480  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 1480  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 1480  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 1480  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 1480  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1544  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1544  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 1544  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 1544  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1544  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1544  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 1544  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 1544  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 1544  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 1544  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1608  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1608  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 1608  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 1608  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1608  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1608  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 1608  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 1608  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp 642 1608  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp 722 1608  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp   2 1672  64  33 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1672  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp 162 1672  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp 242 1672  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp 322 1672  64  33 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1672  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp 482 1672  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp 562 1672  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp 642 1672  64  33 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 1672  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp   2 1736  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp  82 1736  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp 162 1736  64  33 -31  -9 normal
   -1 * 6	 07 83 01 \7! 03 5B
   -1 * 3	 05 06 5A
-   -1 sprites/foundations.png 274 1736 09 40 64 -31 -9
-   -1 sprites/foundations.png 354 1736 09 40 64 -31 -9
-   -1 sprites/foundations.png 434 1736 09 32 64 -31 -9
-   -1 sprites/foundations.png 514 1736 09 32 64 -31 -9
-   -1 sprites/foundations.png 594 1736 09 40 64 -31 -9
-   -1 sprites/foundations.png 674 1736 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 1800 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 1800 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 1800 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 1800 09 32 64 -31 -9
-   -1 sprites/foundations.png 322 1800 09 32 64 -31 -9
-   -1 sprites/foundations.png 402 1800 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 1800 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 1800 09 32 64 -31 -9
-   -1 sprites/foundations.png 642 1800 09 32 64 -31 -9
-   -1 sprites/foundations.png 722 1800 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 1864 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 1864 09 32 64 -31 -9
-   -1 sprites/foundations.png 162 1864 09 32 64 -31 -9
-   -1 sprites/foundations.png 242 1864 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 1864 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 1864 09 32 64 -31 -9
-   -1 sprites/foundations.png 482 1864 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 1864 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 1864 09 32 64 -31 -9
-   -1 sprites/foundations.png 722 1864 09 32 64 -31 -9
-   -1 sprites/foundations.png 2 1928 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 1928 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 1928 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 1928 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 1928 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 1928 09 32 64 -31 -9
-   -1 sprites/foundations.png 482 1928 09 32 64 -31 -9
-   -1 sprites/foundations.png 562 1928 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 1928 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 1928 09 32 64 -31 -9
-   -1 sprites/foundations.png 2 1992 09 32 64 -31 -9
-   -1 sprites/foundations.png 82 1992 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 1992 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 1992 09 32 64 -31 -9
-   -1 sprites/foundations.png 322 1992 09 32 64 -31 -9
-   -1 sprites/foundations.png 402 1992 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 1992 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 1992 09 32 64 -31 -9
-   -1 sprites/foundations.png 642 1992 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 1992 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 2056 09 32 64 -31 -9
-   -1 sprites/foundations.png 82 2056 09 32 64 -31 -9
-   -1 sprites/foundations.png 162 2056 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 2056 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 2056 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 2056 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 2056 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 2056 09 32 64 -31 -9
-   -1 sprites/foundations.png 642 2056 09 32 64 -31 -9
-   -1 sprites/foundations.png 722 2056 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 2120 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 2120 09 32 64 -31 -9
-   -1 sprites/foundations.png 162 2120 09 32 64 -31 -9
-   -1 sprites/foundations.png 242 2120 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 2120 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 2120 09 32 64 -31 -9
-   -1 sprites/foundations.png 482 2120 09 32 64 -31 -9
-   -1 sprites/foundations.png 562 2120 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 2120 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 2120 09 32 64 -31 -9
-   -1 sprites/foundations.png 2 2184 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 2184 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 2184 09 32 64 -31 -9
-   -1 sprites/foundations.png 242 2184 09 32 64 -31 -9
-   -1 sprites/foundations.png 322 2184 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 2184 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 2184 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 2184 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 2184 09 40 64 -15 -17
-   -1 sprites/foundations.png 722 2184 09 33 64 -31 -25
-   -1 sprites/foundations.png 2 2248 09 40 64 -47 -17
-   -1 sprites/foundations.png 82 2248 09 33 64 -31 -9
-   -1 sprites/foundations.png 162 2248 09 40 64 -15 -17
-   -1 sprites/foundations.png 242 2248 09 33 64 -31 -25
-   -1 sprites/foundations.png 322 2248 09 40 64 -47 -17
-   -1 sprites/foundations.png 402 2248 09 33 64 -31 -9
-   -1 sprites/foundations.png 482 2248 09 40 64 -15 -17
-   -1 sprites/foundations.png 562 2248 09 33 64 -31 -25
-   -1 sprites/foundations.png 642 2248 09 40 64 -47 -17
-   -1 sprites/foundations.png 722 2248 09 33 64 -31 -9
-   -1 sprites/foundations.png 2 2312 09 40 64 -15 -17
-   -1 sprites/foundations.png 82 2312 09 33 64 -31 -25
-   -1 sprites/foundations.png 162 2312 09 40 64 -47 -17
-   -1 sprites/foundations.png 242 2312 09 33 64 -31 -9
+   -1 sprites/foundations.png 8bpp 274 1736  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 354 1736  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 434 1736  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 514 1736  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 594 1736  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 674 1736  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1800  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1800  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 1800  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 1800  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1800  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1800  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 1800  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 1800  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 1800  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 1800  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1864  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1864  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 1864  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 1864  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1864  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1864  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 1864  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 1864  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 1864  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 1864  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1928  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1928  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 1928  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 1928  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1928  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1928  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 1928  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 1928  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 1928  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 1928  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1992  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1992  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 1992  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 1992  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1992  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1992  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 1992  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 1992  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 1992  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 1992  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 2056  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 2056  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 2056  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 2056  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 2056  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 2056  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 2056  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 2056  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 2056  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 2056  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 2120  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 2120  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 2120  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 2120  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 2120  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 2120  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 2120  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 2120  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 2120  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 2120  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 2184  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 2184  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 2184  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 2184  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 2184  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 2184  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 2184  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 2184  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 2184  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp 722 2184  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp   2 2248  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp  82 2248  64  33 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 2248  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp 242 2248  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp 322 2248  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp 402 2248  64  33 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 2248  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp 562 2248  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp 642 2248  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp 722 2248  64  33 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 2312  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp  82 2312  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp 162 2312  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp 242 2312  64  33 -31  -9 normal
--- a/media/extra_grf/mono.nfo
+++ b/media/extra_grf/mono.nfo
@@ -8,233 +8,233 @@
 //
   -1 * 0	 0C "Monospaced characters (Liberation Mono)"
   -1 * 0 12 01 03 60 20 00
-   -1 sprites/mono.png  10  30 01 13 7 0 0
-   -1 sprites/mono.png  25  30 01 13 7 0 0
-   -1 sprites/mono.png  40  30 01 13 7 0 0
-   -1 sprites/mono.png  55  30 01 13 7 0 0
-   -1 sprites/mono.png  70  30 01 13 7 0 0
-   -1 sprites/mono.png  85  30 01 13 7 0 0
-   -1 sprites/mono.png 100  30 01 13 7 0 0
-   -1 sprites/mono.png 115  30 01 13 7 0 0
-   -1 sprites/mono.png 130  30 01 13 7 0 0
-   -1 sprites/mono.png 145  30 01 13 7 0 0
-   -1 sprites/mono.png 160  30 01 13 7 0 0
-   -1 sprites/mono.png 175  30 01 13 7 0 0
-   -1 sprites/mono.png 190  30 01 13 7 0 0
-   -1 sprites/mono.png 205  30 01 13 7 0 0
-   -1 sprites/mono.png 220  30 01 13 7 0 0
-   -1 sprites/mono.png 235  30 01 13 7 0 0
-   -1 sprites/mono.png 250  30 01 13 7 0 0
-   -1 sprites/mono.png 265  30 01 13 7 0 0
-   -1 sprites/mono.png 280  30 01 13 7 0 0
-   -1 sprites/mono.png 295  30 01 13 7 0 0
-   -1 sprites/mono.png 310  30 01 13 7 0 0
-   -1 sprites/mono.png 325  30 01 13 7 0 0
-   -1 sprites/mono.png 340  30 01 13 7 0 0
-   -1 sprites/mono.png 355  30 01 13 7 0 0
-   -1 sprites/mono.png 370  30 01 13 7 0 0
-   -1 sprites/mono.png 385  30 01 13 7 0 0
-   -1 sprites/mono.png 400  30 01 13 7 0 0
-   -1 sprites/mono.png 415  30 01 13 7 0 0
-   -1 sprites/mono.png 430  30 01 13 7 0 0
-   -1 sprites/mono.png 445  30 01 13 7 0 0
-   -1 sprites/mono.png 460  30 01 13 7 0 0
-   -1 sprites/mono.png 475  30 01 13 7 0 0
-   -1 sprites/mono.png  10  50 01 13 7 0 0
-   -1 sprites/mono.png  25  50 01 13 7 0 0
-   -1 sprites/mono.png  40  50 01 13 7 0 0
-   -1 sprites/mono.png  55  50 01 13 7 0 0
-   -1 sprites/mono.png  70  50 01 13 7 0 0
-   -1 sprites/mono.png  85  50 01 13 7 0 0
-   -1 sprites/mono.png 100  50 01 13 7 0 0
-   -1 sprites/mono.png 115  50 01 13 7 0 0
-   -1 sprites/mono.png 130  50 01 13 7 0 0
-   -1 sprites/mono.png 145  50 01 13 7 0 0
-   -1 sprites/mono.png 160  50 01 13 7 0 0
-   -1 sprites/mono.png 175  50 01 13 7 0 0
-   -1 sprites/mono.png 190  50 01 13 7 0 0
-   -1 sprites/mono.png 205  50 01 13 7 0 0
-   -1 sprites/mono.png 220  50 01 13 7 0 0
-   -1 sprites/mono.png 235  50 01 13 7 0 0
-   -1 sprites/mono.png 250  50 01 13 7 0 0
-   -1 sprites/mono.png 265  50 01 13 7 0 0
-   -1 sprites/mono.png 280  50 01 13 7 0 0
-   -1 sprites/mono.png 295  50 01 13 7 0 0
-   -1 sprites/mono.png 310  50 01 13 7 0 0
-   -1 sprites/mono.png 325  50 01 13 7 0 0
-   -1 sprites/mono.png 340  50 01 13 7 0 0
-   -1 sprites/mono.png 355  50 01 13 7 0 0
-   -1 sprites/mono.png 370  50 01 13 7 0 0
-   -1 sprites/mono.png 385  50 01 13 7 0 0
-   -1 sprites/mono.png 400  50 01 13 7 0 0
-   -1 sprites/mono.png 415  50 01 13 7 0 0
-   -1 sprites/mono.png 430  50 01 13 7 0 0
-   -1 sprites/mono.png 445  50 01 13 7 0 0
-   -1 sprites/mono.png 460  50 01 13 7 0 0
-   -1 sprites/mono.png 475  50 01 13 7 0 0
-   -1 sprites/mono.png  10  70 01 13 7 0 0
-   -1 sprites/mono.png  25  70 01 13 7 0 0
-   -1 sprites/mono.png  40  70 01 13 7 0 0
-   -1 sprites/mono.png  55  70 01 13 7 0 0
-   -1 sprites/mono.png  70  70 01 13 7 0 0
-   -1 sprites/mono.png  85  70 01 13 7 0 0
-   -1 sprites/mono.png 100  70 01 13 7 0 0
-   -1 sprites/mono.png 115  70 01 13 7 0 0
-   -1 sprites/mono.png 130  70 01 13 7 0 0
-   -1 sprites/mono.png 145  70 01 13 7 0 0
-   -1 sprites/mono.png 160  70 01 13 7 0 0
-   -1 sprites/mono.png 175  70 01 13 7 0 0
-   -1 sprites/mono.png 190  70 01 13 7 0 0
-   -1 sprites/mono.png 205  70 01 13 7 0 0
-   -1 sprites/mono.png 220  70 01 13 7 0 0
-   -1 sprites/mono.png 235  70 01 13 7 0 0
-   -1 sprites/mono.png 250  70 01 13 7 0 0
-   -1 sprites/mono.png 265  70 01 13 7 0 0
-   -1 sprites/mono.png 280  70 01 13 7 0 0
-   -1 sprites/mono.png 295  70 01 13 7 0 0
-   -1 sprites/mono.png 310  70 01 13 7 0 0
-   -1 sprites/mono.png 325  70 01 13 7 0 0
-   -1 sprites/mono.png 340  70 01 13 7 0 0
-   -1 sprites/mono.png 355  70 01 13 7 0 0
-   -1 sprites/mono.png 370  70 01 13 7 0 0
-   -1 sprites/mono.png 385  70 01 13 7 0 0
-   -1 sprites/mono.png 400  70 01 13 7 0 0
-   -1 sprites/mono.png 415  70 01 13 7 0 0
-   -1 sprites/mono.png 430  70 01 13 7 0 0
-   -1 sprites/mono.png 445  70 01 13 7 0 0
-   -1 sprites/mono.png 460  70 01 13 7 0 0
-   -1 sprites/mono.png 475  70 01 13 7 0 0
+   -1 sprites/mono.png 8bpp  10   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  25   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  40   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  55   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  70   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  85   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 100   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 115   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 130   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 145   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 160   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 175   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 190   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 205   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 220   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 235   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 250   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 265   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 280   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 295   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 310   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 325   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 340   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 355   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 370   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 385   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 400   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 415   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 430   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 445   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 460   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 475   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  10   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  25   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  40   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  55   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  70   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  85   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 100   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 115   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 130   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 145   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 160   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 175   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 190   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 205   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 220   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 235   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 250   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 265   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 280   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 295   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 310   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 325   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 340   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 355   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 370   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 385   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 400   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 415   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 430   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 445   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 460   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 475   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  10   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  25   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  40   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  55   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  70   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  85   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 100   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 115   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 130   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 145   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 160   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 175   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 190   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 205   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 220   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 235   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 250   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 265   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 280   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 295   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 310   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 325   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 340   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 355   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 370   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 385   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 400   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 415   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 430   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 445   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 460   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 475   70   7  13   0   0 normal

   -1 * 0 12 01 03 80 80 00
-   -1 sprites/mono.png  10  90 01 13 7 0 0
-   -1 sprites/mono.png  25  90 01 13 7 0 0
-   -1 sprites/mono.png  40  90 01 13 7 0 0
-   -1 sprites/mono.png  55  90 01 13 7 0 0
-   -1 sprites/mono.png  70  90 01 13 7 0 0
-   -1 sprites/mono.png  85  90 01 13 7 0 0
-   -1 sprites/mono.png 100  90 01 13 7 0 0
-   -1 sprites/mono.png 115  90 01 13 7 0 0
-   -1 sprites/mono.png 130  90 01 13 7 0 0
-   -1 sprites/mono.png 145  90 01 13 7 0 0
-   -1 sprites/mono.png 160  90 01 13 7 0 0
-   -1 sprites/mono.png 175  90 01 13 7 0 0
-   -1 sprites/mono.png 190  90 01 13 7 0 0
-   -1 sprites/mono.png 205  90 01 13 7 0 0
-   -1 sprites/mono.png 220  90 01 13 7 0 0
-   -1 sprites/mono.png 235  90 01 13 7 0 0
-   -1 sprites/mono.png 250  90 01 13 7 0 0
-   -1 sprites/mono.png 265  90 01 13 7 0 0
-   -1 sprites/mono.png 280  90 01 13 7 0 0
-   -1 sprites/mono.png 295  90 01 13 7 0 0
-   -1 sprites/mono.png 310  90 01 13 7 0 0
-   -1 sprites/mono.png 325  90 01 13 7 0 0
-   -1 sprites/mono.png 340  90 01 13 7 0 0
-   -1 sprites/mono.png 355  90 01 13 7 0 0
-   -1 sprites/mono.png 370  90 01 13 7 0 0
-   -1 sprites/mono.png 385  90 01 13 7 0 0
-   -1 sprites/mono.png 400  90 01 13 7 0 0
-   -1 sprites/mono.png 415  90 01 13 7 0 0
-   -1 sprites/mono.png 430  90 01 13 7 0 0
-   -1 sprites/mono.png 445  90 01 13 7 0 0
-   -1 sprites/mono.png 460  90 01 13 7 0 0
-   -1 sprites/mono.png 475  90 01 13 7 0 0
-   -1 sprites/mono.png  10 110 01 13 7 0 0
-   -1 sprites/mono.png  25 110 01 13 7 0 0
-   -1 sprites/mono.png  40 110 01 13 7 0 0
-   -1 sprites/mono.png  55 110 01 13 7 0 0
-   -1 sprites/mono.png  70 110 01 13 7 0 0
-   -1 sprites/mono.png  85 110 01 13 7 0 0
-   -1 sprites/mono.png 100 110 01 13 7 0 0
-   -1 sprites/mono.png 115 110 01 13 7 0 0
-   -1 sprites/mono.png 130 110 01 13 7 0 0
-   -1 sprites/mono.png 145 110 01 13 7 0 0
-   -1 sprites/mono.png 160 110 01 13 7 0 0
-   -1 sprites/mono.png 175 110 01 13 7 0 0
-   -1 sprites/mono.png 190 110 01 13 7 0 0
-   -1 sprites/mono.png 205 110 01 13 7 0 0
-   -1 sprites/mono.png 220 110 01 13 7 0 0
-   -1 sprites/mono.png 235 110 01 13 7 0 0
-   -1 sprites/mono.png 250 110 01 13 7 0 0
-   -1 sprites/mono.png 265 110 01 13 7 0 0
-   -1 sprites/mono.png 280 110 01 13 7 0 0
-   -1 sprites/mono.png 295 110 01 13 7 0 0
-   -1 sprites/mono.png 310 110 01 13 7 0 0
-   -1 sprites/mono.png 325 110 01 13 7 0 0
-   -1 sprites/mono.png 340 110 01 13 7 0 0
-   -1 sprites/mono.png 355 110 01 13 7 0 0
-   -1 sprites/mono.png 370 110 01 13 7 0 0
-   -1 sprites/mono.png 385 110 01 13 7 0 0
-   -1 sprites/mono.png 400 110 01 13 7 0 0
-   -1 sprites/mono.png 415 110 01 13 7 0 0
-   -1 sprites/mono.png 430 110 01 13 7 0 0
-   -1 sprites/mono.png 445 110 01 13 7 0 0
-   -1 sprites/mono.png 460 110 01 13 7 0 0
-   -1 sprites/mono.png 475 110 01 13 7 0 0
-   -1 sprites/mono.png  10 130 01 13 7 0 0
-   -1 sprites/mono.png  25 130 01 13 7 0 0
-   -1 sprites/mono.png  40 130 01 13 7 0 0
-   -1 sprites/mono.png  55 130 01 13 7 0 0
-   -1 sprites/mono.png  70 130 01 13 7 0 0
-   -1 sprites/mono.png  85 130 01 13 7 0 0
-   -1 sprites/mono.png 100 130 01 13 7 0 0
-   -1 sprites/mono.png 115 130 01 13 7 0 0
-   -1 sprites/mono.png 130 130 01 13 7 0 0
-   -1 sprites/mono.png 145 130 01 13 7 0 0
-   -1 sprites/mono.png 160 130 01 13 7 0 0
-   -1 sprites/mono.png 175 130 01 13 7 0 0
-   -1 sprites/mono.png 190 130 01 13 7 0 0
-   -1 sprites/mono.png 205 130 01 13 7 0 0
-   -1 sprites/mono.png 220 130 01 13 7 0 0
-   -1 sprites/mono.png 235 130 01 13 7 0 0
-   -1 sprites/mono.png 250 130 01 13 7 0 0
-   -1 sprites/mono.png 265 130 01 13 7 0 0
-   -1 sprites/mono.png 280 130 01 13 7 0 0
-   -1 sprites/mono.png 295 130 01 13 7 0 0
-   -1 sprites/mono.png 310 130 01 13 7 0 0
-   -1 sprites/mono.png 325 130 01 13 7 0 0
-   -1 sprites/mono.png 340 130 01 13 7 0 0
-   -1 sprites/mono.png 355 130 01 13 7 0 0
-   -1 sprites/mono.png 370 130 01 13 7 0 0
-   -1 sprites/mono.png 385 130 01 13 7 0 0
-   -1 sprites/mono.png 400 130 01 13 7 0 0
-   -1 sprites/mono.png 415 130 01 13 7 0 0
-   -1 sprites/mono.png 430 130 01 13 7 0 0
-   -1 sprites/mono.png 445 130 01 13 7 0 0
-   -1 sprites/mono.png 460 130 01 13 7 0 0
-   -1 sprites/mono.png 475 130 01 13 7 0 0
-   -1 sprites/mono.png  10 150 01 13 7 0 0
-   -1 sprites/mono.png  25 150 01 13 7 0 0
-   -1 sprites/mono.png  40 150 01 13 7 0 0
-   -1 sprites/mono.png  55 150 01 13 7 0 0
-   -1 sprites/mono.png  70 150 01 13 7 0 0
-   -1 sprites/mono.png  85 150 01 13 7 0 0
-   -1 sprites/mono.png 100 150 01 13 7 0 0
-   -1 sprites/mono.png 115 150 01 13 7 0 0
-   -1 sprites/mono.png 130 150 01 13 7 0 0
-   -1 sprites/mono.png 145 150 01 13 7 0 0
-   -1 sprites/mono.png 160 150 01 13 7 0 0
-   -1 sprites/mono.png 175 150 01 13 7 0 0
-   -1 sprites/mono.png 190 150 01 13 7 0 0
-   -1 sprites/mono.png 205 150 01 13 7 0 0
-   -1 sprites/mono.png 220 150 01 13 7 0 0
-   -1 sprites/mono.png 235 150 01 13 7 0 0
-   -1 sprites/mono.png 250 150 01 13 7 0 0
-   -1 sprites/mono.png 265 150 01 13 7 0 0
-   -1 sprites/mono.png 280 150 01 13 7 0 0
-   -1 sprites/mono.png 295 150 01 13 7 0 0
-   -1 sprites/mono.png 310 150 01 13 7 0 0
-   -1 sprites/mono.png 325 150 01 13 7 0 0
-   -1 sprites/mono.png 340 150 01 13 7 0 0
-   -1 sprites/mono.png 355 150 01 13 7 0 0
-   -1 sprites/mono.png 370 150 01 13 7 0 0
-   -1 sprites/mono.png 385 150 01 13 7 0 0
-   -1 sprites/mono.png 400 150 01 13 7 0 0
-   -1 sprites/mono.png 415 150 01 13 7 0 0
-   -1 sprites/mono.png 430 150 01 13 7 0 0
-   -1 sprites/mono.png 445 150 01 13 7 0 0
-   -1 sprites/mono.png 460 150 01 13 7 0 0
-   -1 sprites/mono.png 475 150 01 13 7 0 0
+   -1 sprites/mono.png 8bpp  10   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  25   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  40   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  55   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  70   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  85   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 100   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 115   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 130   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 145   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 160   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 175   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 190   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 205   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 220   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 235   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 250   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 265   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 280   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 295   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 310   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 325   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 340   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 355   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 370   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 385   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 400   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 415   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 430   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 445   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 460   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 475   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  10  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  25  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  40  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  55  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  70  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  85  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 100  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 115  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 130  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 145  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 160  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 175  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 190  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 205  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 220  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 235  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 250  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 265  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 280  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 295  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 310  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 325  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 340  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 355  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 370  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 385  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 400  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 415  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 430  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 445  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 460  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 475  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  10  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  25  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  40  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  55  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  70  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  85  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 100  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 115  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 130  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 145  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 160  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 175  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 190  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 205  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 220  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 235  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 250  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 265  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 280  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 295  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 310  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 325  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 340  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 355  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 370  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 385  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 400  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 415  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 430  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 445  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 460  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 475  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  10  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  25  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  40  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  55  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  70  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  85  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 100  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 115  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 130  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 145  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 160  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 175  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 190  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 205  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 220  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 235  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 250  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 265  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 280  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 295  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 310  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 325  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 340  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 355  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 370  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 385  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 400  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 415  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 430  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 445  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 460  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 475  150   7  13   0   0 normal

 //U+0178 Latin Capital Letter Y With Diaeresis (only needed for mono as it is in the base set, but relocated by some code)
   -1 * 0 12 01 03 01 78 01
-   -1 sprites/mono.png 370 230 01 13 7 0 0
+   -1 sprites/mono.png 8bpp 370  230   7  13   0   0 normal
--- a/media/extra_grf/mono.png
+++ b/media/extra_grf/mono.png
--- a/media/extra_grf/oneway.nfo
+++ b/media/extra_grf/oneway.nfo
@@ -8,9 +8,9 @@
 //
   -1 * 0	 0C "One way road graphics"
   -1 * 3	 05 09 06
-   -1 sprites/oneway.png 34 8 01 16 24 -12 -8
-   -1 sprites/oneway.png 66 8 01 16 24 -12 -8
-   -1 sprites/oneway.png 98 8 01 16 24 -12 -8
-   -1 sprites/oneway.png 130 8 01 16 24 -12 -8
-   -1 sprites/oneway.png 162 8 01 16 24 -12 -8
-   -1 sprites/oneway.png 194 8 01 16 24 -12 -8
+   -1 sprites/oneway.png 8bpp  34    8  24  16 -12  -8 normal
+   -1 sprites/oneway.png 8bpp  66    8  24  16 -12  -8 normal
+   -1 sprites/oneway.png 8bpp  98    8  24  16 -12  -8 normal
+   -1 sprites/oneway.png 8bpp 130    8  24  16 -12  -8 normal
+   -1 sprites/oneway.png 8bpp 162    8  24  16 -12  -8 normal
+   -1 sprites/oneway.png 8bpp 194    8  24  16 -12  -8 normal
--- a/media/extra_grf/openttd.nfo
+++ b/media/extra_grf/openttd.nfo
@@ -1,6 +1,6 @@
 // Automatically generated by GRFCODEC. Do not modify!
-// (Info version 7)
-// Format: spritenum.pngfile xpos ypos compression ysize xsize xrel yrel
+// (Info version 32)
+// Format: spritenum imagefile depth xpos ypos xsize ysize xrel yrel zoom flags
 //
 // $Id$
 //
@@ -14,13 +14,6 @@
 // allowing it to be used.
 //

-//
-// -- NFO Renum 'settings' --
-// Do not make nforenum warn about the fact that we use a reserved GRF ID
-// @@WARNING DISABLE 101
-// -- End of NFO Renum 'settings' --
-//
-
 //
 // Number of sprites, it is wrong, but GRFcodec automagically gets it right.
 //
@@ -110,3 +103,4 @@
 #include "rivers/arctic.nfo"
 #include "rivers/tropic.nfo"
 #include "rivers/toyland.nfo"
+#include "tunnel_portals.nfo"
--- a/media/extra_grf/openttdgui.nfo
+++ b/media/extra_grf/openttdgui.nfo
@@ -5,179 +5,168 @@
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 // See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
-//
-// -- NFO Renum 'settings' --
-// Do not make nforenum warn about the fact that we use more sprites.
-// We are the 'authority' on how many sprites may be used.
-// @@WARNING DISABLE 60
-// -- End of NFO Renum 'settings' --
 //
   -1 * 0	 0C "OpenTTD GUI graphics"
   -1 * 3	 05 15 A2
-   -1 sprites/openttdgui.png 66 8 09 31 64 -31 7
-   -1 sprites/openttdgui.png 146 8 09 31 64 -31 7
-   -1 sprites/openttdgui.png 226 8 09 31 64 -31 7
-   -1 sprites/openttdgui.png 306 8 09 31 64 -31 7
-   -1 sprites/openttdgui.png 386 8 09 31 64 -31 -1
-   -1 sprites/openttdgui.png 466 8 09 39 64 -31 -1
-   -1 sprites/openttdgui.png 546 8 09 31 64 -31 -1
-   -1 sprites/openttdgui.png 626 8 09 23 64 -31 7
-   -1 sprites/openttdgui.png 706 8 09 31 64 -31 7
-   -1 sprites/openttdgui.png 2 72 09 23 64 -31 7
-   -1 sprites/openttdgui.png 82 72 09 31 64 -31 7
-   -1 sprites/openttdgui.png 162 72 09 39 64 -31 -1
-   -1 sprites/openttdgui.png 242 72 01 26 23 0 0
-   -1 sprites/openttdgui.png 274 72 09 26 24 0 0
-   -1 sprites/openttdgui.png 306 72 01 8 4 28 16
-   -1 sprites/openttdgui.png 322 72 01 9 4 0 1
-   -1 sprites/openttdgui.png 338 72 09 23 32 0 1
-   -1 sprites/openttdgui.png 386 72 01 8 4 -31 15
-   -1 sprites/openttdgui.png 402 72 01 9 4 -3 0
-   -1 sprites/openttdgui.png 418 72 09 23 32 -31 0
-   -1 sprites/openttdgui.png 466 72 01 8 4 28 16
-   -1 sprites/openttdgui.png 482 72 01 9 4 0 1
-   -1 sprites/openttdgui.png 498 72 09 23 32 0 1
-   -1 sprites/openttdgui.png 546 72 01 8 4 -31 15
-   -1 sprites/openttdgui.png 562 72 01 9 4 -3 0
-   -1 sprites/openttdgui.png 578 72 09 23 32 -31 0
-   -1 sprites/openttdgui.png 626 72 01 8 4 28 16
-   -1 sprites/openttdgui.png 642 72 01 9 4 0 1
-   -1 sprites/openttdgui.png 658 72 09 23 32 0 1
-   -1 sprites/openttdgui.png 706 72 01 8 4 -31 15
-   -1 sprites/openttdgui.png 722 72 01 9 4 -3 0
-   -1 sprites/openttdgui.png 738 72 09 23 32 -31 0
-   -1 sprites/openttdgui.png 786 72 01 8 4 28 16
-   -1 sprites/openttdgui.png 2 136 01 9 4 0 1
-   -1 sprites/openttdgui.png 18 136 09 23 32 0 1
-   -1 sprites/openttdgui.png 66 136 01 8 4 -31 15
-   -1 sprites/openttdgui.png 82 136 01 9 4 -3 0
-   -1 sprites/openttdgui.png 98 136 09 23 32 -31 0
-   -1 sprites/openttdgui.png 146 136 09 10 10 0 0
-   -1 sprites/openttdgui.png 162 136 01 8 8 0 0
-   -1 sprites/openttdgui.png 178 136 09 9 7 0 0
-   -1 sprites/openttdgui.png 194 136 01 7 9 0 0
-   -1 sprites/openttdgui.png 210 136 01 7 9 0 0
-   -1 sprites/openttdgui.png 226 136 01 10 10 0 0
-   -1 sprites/openttdgui.png 242 136 09 7 7 0 0
-   -1 sprites/openttdgui.png 258 136 09 4 7 1 2
-   -1 sprites/openttdgui.png 274 136 09 4 7 1 2
-   -1 sprites/openttdgui.png 290 136 09 7 4 1 1
-   -1 sprites/openttdgui.png 306 136 09 7 4 2 1
-   -1 sprites/openttdgui.png 322 136 01 8 8 1 1
-   -1 sprites/openttdgui.png 338 136 01 9 9 0 0
-   -1 sprites/openttdgui.png 354 136 01 8 7 0 0
-   -1 sprites/openttdgui.png 370 136 01 8 8 0 0
-   -1 sprites/openttdgui.png 386 136 09 13 20 0 4
-   -1 sprites/openttdgui.png 418 136 03 36 56 0 0
-   -1 sprites/openttdgui.png 482 136 01 20 20 0 0
-   -1 sprites/openttdgui.png 514 136 01 32 32 0 0
-   -1 sprites/openttdgui.png 562 136 09 16 20 0 3
-   -1 sprites/openttdgui.png 594 136 03 43 56 0 0
-   -1 sprites/openttdgui.png 658 136 01 19 20 0 1
-   -1 sprites/openttdgui.png 690 136 01 32 32 0 0
-   -1 sprites/openttdgui.png 738 136 01 20 20 0 0
-   -1 sprites/openttdgui.png 2 200 01 31 31 1 1
-   -1 sprites/openttdgui.png 50 200 09 15 20 0 3
-   -1 sprites/openttdgui.png 82 200 03 36 56 0 0
-   -1 sprites/openttdgui.png 146 200 01 20 20 0 0
-   -1 sprites/openttdgui.png 178 200 01 32 32 0 0
-   -1 sprites/openttdgui.png 226 200 01 20 20 0 0
-   -1 sprites/openttdgui.png 258 200 01 32 32 0 0
-   -1 sprites/openttdgui.png 306 200 09 11 19 0 6
-   -1 sprites/openttdgui.png 338 200 03 36 56 0 0
-   -1 sprites/openttdgui.png 402 200 01 20 20 0 0
-   -1 sprites/openttdgui.png 434 200 01 32 32 0 0
-   -1 sprites/openttdgui.png 482 200 01 20 20 0 0
-   -1 sprites/openttdgui.png 514 200 01 32 32 0 0
-   -1 sprites/openttdgui.png 562 200 09 20 20 0 0
-   -1 sprites/openttdgui.png 594 200 09 20 20 0 0
-   -1 sprites/openttdgui.png 626 200 03 32 52 0 0
-   -1 sprites/openttdgui.png 690 200 09 33 29 -27 -16
-   -1 sprites/openttdgui.png 738 200 09 39 35 -29 -29
-   -1 sprites/openttdgui.png 2 264 09 34 29 1 -17
-   -1 sprites/openttdgui.png 50 264 09 39 34 -3 -28
-   -1 sprites/openttdgui.png 98 264 09 13 20 0 4
-   -1 sprites/openttdgui.png 130 264 03 36 56 0 0
-   -1 sprites/openttdgui.png 194 264 09 13 20 0 4
-   -1 sprites/openttdgui.png 226 264 03 36 56 0 0
-   -1 sprites/openttdgui.png 290 264 01 18 39 -9 -9
-   -1 sprites/openttdgui.png 338 264 01 44 72 -16 -35
-   -1 sprites/openttdgui.png 418 264 01 20 20 0 0
-   -1 sprites/openttdgui.png 450 264 01 44 72 -16 -35
-   -1 sprites/openttdgui.png 530 264 09 18 18 1 1
-   -1 sprites/openttdgui.png 562 264 01 20 20 0 0
-   -1 sprites/openttdgui.png 594 264 01 32 32 0 0
-   -1 sprites/openttdgui.png 642 264 01 18 18 0 0
-   -1 sprites/openttdgui.png 674 264 01 18 18 0 0
-   -1 sprites/openttdgui.png 706 264 01 18 18 0 0
-   -1 sprites/openttdgui.png 738 264 01 18 18 0 0
-   -1 sprites/openttdgui.png 770 264 01 18 18 0 0
-   -1 sprites/openttdgui.png 2 328 01 18 18 0 0
-   -1 sprites/openttdgui.png 34 328 01 18 18 0 0
-   -1 sprites/openttdgui.png 66 328 01 18 18 0 0
-   -1 sprites/openttdgui.png 98 328 01 18 18 0 0
-   -1 sprites/openttdgui.png 130 328 01 18 18 0 0
-   -1 sprites/openttdgui.png 162 328 01 18 18 0 0
-   -1 sprites/openttdgui.png 194 328 01 18 18 0 0
-   -1 sprites/openttdgui.png 226 328 01 18 18 0 0
-   -1 sprites/openttdgui.png 258 328 09 16 16 0 0
-   -1 sprites/openttdgui.png 290 328 01 16 16 0 0
-   -1 sprites/openttdgui.png 322 328 01 16 16 0 0
-   -1 sprites/openttdgui.png 354 328 01 16 16 0 0
-   -1 sprites/openttdgui.png 386 328 09 31 35 0 0
-   -1 sprites/openttdgui.png 434 328 01 30 33 0 0
-   -1 sprites/openttdgui.png 482 328 01 33 36 0 0
-   -1 sprites/openttdgui.png 530 328 01 33 37 0 0
-   -1 sprites/openttdgui.png 578 328 09 18 18 0 0
-   -1 sprites/openttdgui.png 610 328 09 18 18 0 0
-   -1 sprites/openttdgui.png 642 328 09 18 18 0 0
-   -1 sprites/openttdgui.png 674 328 09 18 18 0 0
-   -1 sprites/openttdgui.png 706 328 09 18 18 0 0
-   -1 sprites/openttdgui.png 738 328 09 18 18 0 0
-   -1 sprites/openttdgui.png 770 328 09 18 18 0 0
-   -1 sprites/openttdgui.png 2 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 34 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 66 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 98 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 130 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 162 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 194 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 226 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 258 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 290 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 322 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 354 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 386 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 418 376 01 20 20 0 0
-   -1 sprites/openttdgui.png 450 376 01 22 19 0 0
-   -1 sprites/openttdgui.png 482 376 01 20 20 0 0
-   -1 sprites/openttdgui.png 514 376 01 44 54 -16 -35
-   -1 sprites/openttdgui.png 578 376 01 7 7 3 4
-   -1 sprites/openttdgui.png 594 376 01 7 7 3 4
-   -1 sprites/openttdgui.png 610 376 01 9 10 2 3
-   -1 sprites/openttdgui.png 626 376 01 9 10 2 3
-   -1 sprites/openttdgui.png 642 376 01 7 11 2 1
-   -1 sprites/openttdgui.png 658 376 01 9 9 3 3
-   -1 sprites/openttdgui.png 674 376 09 20 20 0 0
-   -1 sprites/openttdgui.png 706 376 09 20 20 0 0
-   -1 sprites/openttdgui.png 738 376 09 32 32 0 0
-   -1 sprites/openttdgui.png 786 376 09 10 10 0 0
-   -1 sprites/openttdgui.png 2 440 09 10 10 0 0
-   -1 sprites/openttdgui.png 18 440 09 7 7 0 0
-   -1 sprites/openttdgui.png 34 440 09 13 14 4 4
-   -1 sprites/openttdgui.png 66 440 09 8 7 0 0
-   -1 sprites/openttdgui.png 82 440 09 8 7 0 0
-   -1 sprites/openttdgui.png 98 440 09 8 7 0 0
-   -1 sprites/openttdgui.png 114 440 01 8 8 0 0
-   -1 sprites/openttdgui.png 130 440 01 8 8 0 0
-   -1 sprites/openttdgui.png 146 440 01 8 8 0 0
-   -1 sprites/openttdgui.png 162 440 01 8 8 0 0
-   -1 sprites/openttdgui.png 178 440 01 10 8 0 0
-   -1 sprites/openttdgui.png 194 440 09 10 13 0 -2
-   -1 sprites/openttdgui.png 215 440 09 10 9 0 0
-   -1 sprites/openttdgui.png 232 440 09 10 8 0 0
-
-// -- NFO Renum 'settings' --
-// Undo disabling the warning
-// @@WARNING ENABLE 60
-// -- End of NFO Renum 'settings' --
+   -1 sprites/openttdgui.png 8bpp  66    8  64  31 -31   7 normal
+   -1 sprites/openttdgui.png 8bpp 146    8  64  31 -31   7 normal
+   -1 sprites/openttdgui.png 8bpp 226    8  64  31 -31   7 normal
+   -1 sprites/openttdgui.png 8bpp 306    8  64  31 -31   7 normal
+   -1 sprites/openttdgui.png 8bpp 386    8  64  31 -31  -1 normal
+   -1 sprites/openttdgui.png 8bpp 466    8  64  39 -31  -1 normal
+   -1 sprites/openttdgui.png 8bpp 546    8  64  31 -31  -1 normal
+   -1 sprites/openttdgui.png 8bpp 626    8  64  23 -31   7 normal
+   -1 sprites/openttdgui.png 8bpp 706    8  64  31 -31   7 normal
+   -1 sprites/openttdgui.png 8bpp   2   72  64  23 -31   7 normal
+   -1 sprites/openttdgui.png 8bpp  82   72  64  31 -31   7 normal
+   -1 sprites/openttdgui.png 8bpp 162   72  64  39 -31  -1 normal
+   -1 sprites/openttdgui.png 8bpp 242   72  23  26   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 274   72  24  26   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 306   72   4   8  28  16 normal
+   -1 sprites/openttdgui.png 8bpp 322   72   4   9   0   1 normal
+   -1 sprites/openttdgui.png 8bpp 338   72  32  23   0   1 normal
+   -1 sprites/openttdgui.png 8bpp 386   72   4   8 -31  15 normal
+   -1 sprites/openttdgui.png 8bpp 402   72   4   9  -3   0 normal
+   -1 sprites/openttdgui.png 8bpp 418   72  32  23 -31   0 normal
+   -1 sprites/openttdgui.png 8bpp 466   72   4   8  28  16 normal
+   -1 sprites/openttdgui.png 8bpp 482   72   4   9   0   1 normal
+   -1 sprites/openttdgui.png 8bpp 498   72  32  23   0   1 normal
+   -1 sprites/openttdgui.png 8bpp 546   72   4   8 -31  15 normal
+   -1 sprites/openttdgui.png 8bpp 562   72   4   9  -3   0 normal
+   -1 sprites/openttdgui.png 8bpp 578   72  32  23 -31   0 normal
+   -1 sprites/openttdgui.png 8bpp 626   72   4   8  28  16 normal
+   -1 sprites/openttdgui.png 8bpp 642   72   4   9   0   1 normal
+   -1 sprites/openttdgui.png 8bpp 658   72  32  23   0   1 normal
+   -1 sprites/openttdgui.png 8bpp 706   72   4   8 -31  15 normal
+   -1 sprites/openttdgui.png 8bpp 722   72   4   9  -3   0 normal
+   -1 sprites/openttdgui.png 8bpp 738   72  32  23 -31   0 normal
+   -1 sprites/openttdgui.png 8bpp 786   72   4   8  28  16 normal
+   -1 sprites/openttdgui.png 8bpp   2  136   4   9   0   1 normal
+   -1 sprites/openttdgui.png 8bpp  18  136  32  23   0   1 normal
+   -1 sprites/openttdgui.png 8bpp  66  136   4   8 -31  15 normal
+   -1 sprites/openttdgui.png 8bpp  82  136   4   9  -3   0 normal
+   -1 sprites/openttdgui.png 8bpp  98  136  32  23 -31   0 normal
+   -1 sprites/openttdgui.png 8bpp 146  136  10  10   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 162  136   8   8   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 178  136   7   9   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 194  136   9   7   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 210  136   9   7   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 226  136  10  10   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 242  136   7   7   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 258  136   7   4   1   2 normal
+   -1 sprites/openttdgui.png 8bpp 274  136   7   4   1   2 normal
+   -1 sprites/openttdgui.png 8bpp 290  136   4   7   1   1 normal
+   -1 sprites/openttdgui.png 8bpp 306  136   4   7   2   1 normal
+   -1 sprites/openttdgui.png 8bpp 322  136   8   8   1   1 normal
+   -1 sprites/openttdgui.png 8bpp 338  136   9   9   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 354  136   7   8   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 370  136   8   8   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 386  136  20  13   0   4 normal
+   -1 sprites/openttdgui.png 8bpp 418  136  56  36   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 482  136  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 514  136  32  32   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 562  136  20  16   0   3 normal
+   -1 sprites/openttdgui.png 8bpp 594  136  56  43   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 658  136  20  19   0   1 normal
+   -1 sprites/openttdgui.png 8bpp 690  136  32  32   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 738  136  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp   2  200  31  31   1   1 normal
+   -1 sprites/openttdgui.png 8bpp  50  200  20  15   0   3 normal
+   -1 sprites/openttdgui.png 8bpp  82  200  56  36   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 146  200  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 178  200  32  32   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 226  200  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 258  200  32  32   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 306  200  19  11   0   6 normal
+   -1 sprites/openttdgui.png 8bpp 338  200  56  36   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 402  200  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 434  200  32  32   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 482  200  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 514  200  32  32   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 562  200  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 594  200  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 626  200  52  32   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 690  200  29  33 -27 -16 normal
+   -1 sprites/openttdgui.png 8bpp 738  200  35  39 -29 -29 normal
+   -1 sprites/openttdgui.png 8bpp   2  264  29  34   1 -17 normal
+   -1 sprites/openttdgui.png 8bpp  50  264  34  39  -3 -28 normal
+   -1 sprites/openttdgui.png 8bpp  98  264  20  13   0   4 normal
+   -1 sprites/openttdgui.png 8bpp 130  264  56  36   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 194  264  20  13   0   4 normal
+   -1 sprites/openttdgui.png 8bpp 226  264  56  36   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 290  264  39  18  -9  -9 normal
+   -1 sprites/openttdgui.png 8bpp 338  264  72  44 -16 -35 normal
+   -1 sprites/openttdgui.png 8bpp 418  264  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 450  264  72  44 -16 -35 normal
+   -1 sprites/openttdgui.png 8bpp 530  264  18  18   1   1 normal
+   -1 sprites/openttdgui.png 8bpp 562  264  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 594  264  32  32   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 642  264  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 674  264  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 706  264  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 738  264  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 770  264  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp   2  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp  34  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp  66  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp  98  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 130  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 162  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 194  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 226  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 258  328  16  16   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 290  328  16  16   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 322  328  16  16   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 354  328  16  16   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 386  328  35  31   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 434  328  33  30   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 482  328  36  33   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 530  328  37  33   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 578  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 610  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 642  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 674  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 706  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 738  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 770  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp   2  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp  34  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp  66  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp  98  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 130  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 162  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 194  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 226  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 258  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 290  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 322  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 354  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 386  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 418  376  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 450  376  19  22   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 482  376  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 514  376  54  44 -16 -35 normal
+   -1 sprites/openttdgui.png 8bpp 578  376   7   7   3   4 normal
+   -1 sprites/openttdgui.png 8bpp 594  376   7   7   3   4 normal
+   -1 sprites/openttdgui.png 8bpp 610  376  10   9   2   3 normal
+   -1 sprites/openttdgui.png 8bpp 626  376  10   9   2   3 normal
+   -1 sprites/openttdgui.png 8bpp 642  376  11   7   2   1 normal
+   -1 sprites/openttdgui.png 8bpp 658  376   9   9   3   3 normal
+   -1 sprites/openttdgui.png 8bpp 674  376  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 706  376  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 738  376  32  32   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 786  376  10  10   0   0 normal
+   -1 sprites/openttdgui.png 8bpp   2  440  10  10   0   0 normal
+   -1 sprites/openttdgui.png 8bpp  18  440   7   7   0   0 normal
+   -1 sprites/openttdgui.png 8bpp  34  440  14  13   4   4 normal
+   -1 sprites/openttdgui.png 8bpp  66  440   7   8   0   0 normal
+   -1 sprites/openttdgui.png 8bpp  82  440   7   8   0   0 normal
+   -1 sprites/openttdgui.png 8bpp  98  440   7   8   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 114  440   8   8   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 130  440   8   8   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 146  440   8   8   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 162  440   8   8   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 178  440   8  10   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 194  440  13  10   0  -2 normal
+   -1 sprites/openttdgui.png 8bpp 215  440   9  10   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 232  440   8  10   0   0 normal
--- a/media/extra_grf/openttdgui.png
+++ b/media/extra_grf/openttdgui.png
--- a/media/extra_grf/rivers/arctic.nfo
+++ b/media/extra_grf/rivers/arctic.nfo
@@ -8,271 +8,271 @@
 //
   -1 * 0	 0C "Arctic river graphics by andythenorth (Andrew Parkhouse)"
   -1 * 4	 01 05 01 3C
-   -1 sprites/arctic_snowy.png  10  10 09 19 38  -5  0
-   -1 sprites/arctic_snowy.png  58  10 09 18 38  -5 13
-   -1 sprites/arctic_snowy.png 106  10 09 18 38 -31 13
-   -1 sprites/arctic_snowy.png 154  10 09 19 38 -31  0
-   -1 sprites/arctic_snowy.png 202  10 09  9 19  14 11
-   -1 sprites/arctic_snowy.png 234  10 09  9 16  -7 22
-   -1 sprites/arctic_snowy.png 266  10 09  9 19 -31 11
-   -1 sprites/arctic_snowy.png 298  10 09  9 16  -7  0
-   -1 sprites/arctic_snowy.png 330  10 09  6  8  25 13
-   -1 sprites/arctic_snowy.png 346  10 09  4 12  -5 27
-   -1 sprites/arctic_snowy.png 364  10 09  6  8 -31 13
-   -1 sprites/arctic_snowy.png 380  10 09  5 12  -5  0
+   -1 sprites/arctic_snowy.png 8bpp  10   10  38  19  -5   0 normal
+   -1 sprites/arctic_snowy.png 8bpp  58   10  38  18  -5  13 normal
+   -1 sprites/arctic_snowy.png 8bpp 106   10  38  18 -31  13 normal
+   -1 sprites/arctic_snowy.png 8bpp 154   10  38  19 -31   0 normal
+   -1 sprites/arctic_snowy.png 8bpp 202   10  19   9  14  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 234   10  16   9  -7  22 normal
+   -1 sprites/arctic_snowy.png 8bpp 266   10  19   9 -31  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 298   10  16   9  -7   0 normal
+   -1 sprites/arctic_snowy.png 8bpp 330   10   8   6  25  13 normal
+   -1 sprites/arctic_snowy.png 8bpp 346   10  12   4  -5  27 normal
+   -1 sprites/arctic_snowy.png 8bpp 364   10   8   6 -31  13 normal
+   -1 sprites/arctic_snowy.png 8bpp 380   10  12   5  -5   0 normal

-   -1 sprites/arctic_snowy.png  10  40 09 11 40  -7  0
-   -1 sprites/arctic_snowy.png  58  40 09 18 39  -6  5
-   -1 sprites/arctic_snowy.png 106  40 09 11 38 -31 12
-   -1 sprites/arctic_snowy.png 154  40 09 18 39 -31  0
-   -1 sprites/arctic_snowy.png 202  40 09  6 20  13  5
-   -1 sprites/arctic_snowy.png 234  40 09  7 13  -6 16
-   -1 sprites/arctic_snowy.png 266  40 09  6 20 -31 12
-   -1 sprites/arctic_snowy.png 298  40 09  7 13  -5  0
-   -1 sprites/arctic_snowy.png 330  40 09  5  8  25  6
-   -1 sprites/arctic_snowy.png 346  40 09  3 12  -5 20
-   -1 sprites/arctic_snowy.png 364  40 09  4  8 -31 13
-   -1 sprites/arctic_snowy.png 380  40 09  4 15  -7  0
+   -1 sprites/arctic_snowy.png 8bpp  10   40  40  11  -7   0 normal
+   -1 sprites/arctic_snowy.png 8bpp  58   40  39  18  -6   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 106   40  38  11 -31  12 normal
+   -1 sprites/arctic_snowy.png 8bpp 154   40  39  18 -31   0 normal
+   -1 sprites/arctic_snowy.png 8bpp 202   40  20   6  13   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 234   40  13   7  -6  16 normal
+   -1 sprites/arctic_snowy.png 8bpp 266   40  20   6 -31  12 normal
+   -1 sprites/arctic_snowy.png 8bpp 298   40  13   7  -5   0 normal
+   -1 sprites/arctic_snowy.png 8bpp 330   40   8   5  25   6 normal
+   -1 sprites/arctic_snowy.png 8bpp 346   40  12   3  -5  20 normal
+   -1 sprites/arctic_snowy.png 8bpp 364   40   8   4 -31  13 normal
+   -1 sprites/arctic_snowy.png 8bpp 380   40  15   4  -7   0 normal

-   -1 sprites/arctic_snowy.png  10  70 09 20 38  -5 -8
-   -1 sprites/arctic_snowy.png  58  70 09 26 38  -5  5
-   -1 sprites/arctic_snowy.png 106  70 09 20 37 -31 11
-   -1 sprites/arctic_snowy.png 154  70 09 27 38 -31 -8
-   -1 sprites/arctic_snowy.png 202  70 09  9 16  17  3
-   -1 sprites/arctic_snowy.png 234  70 09  9 15  -7 22
-   -1 sprites/arctic_snowy.png 266  70 09  9 16 -31 11
-   -1 sprites/arctic_snowy.png 298  70 09  9 15  -6 -8
-   -1 sprites/arctic_snowy.png 330  70 09  7  8  25  5
-   -1 sprites/arctic_snowy.png 346  70 09  5 10  -4 27
-   -1 sprites/arctic_snowy.png 364  70 09  7  8 -31 11
-   -1 sprites/arctic_snowy.png 380  70 09  6 12  -5 -8
+   -1 sprites/arctic_snowy.png 8bpp  10   70  38  20  -5  -8 normal
+   -1 sprites/arctic_snowy.png 8bpp  58   70  38  26  -5   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 106   70  37  20 -31  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 154   70  38  27 -31  -8 normal
+   -1 sprites/arctic_snowy.png 8bpp 202   70  16   9  17   3 normal
+   -1 sprites/arctic_snowy.png 8bpp 234   70  15   9  -7  22 normal
+   -1 sprites/arctic_snowy.png 8bpp 266   70  16   9 -31  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 298   70  15   9  -6  -8 normal
+   -1 sprites/arctic_snowy.png 8bpp 330   70   8   7  25   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 346   70  10   5  -4  27 normal
+   -1 sprites/arctic_snowy.png 8bpp 364   70   8   7 -31  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 380   70  12   6  -5  -8 normal

-   -1 sprites/arctic_snowy.png  10 100 09 18 39  -6  0
-   -1 sprites/arctic_snowy.png  58 100 09 11 38  -5 12
-   -1 sprites/arctic_snowy.png 106 100 09 18 39 -31  5
-   -1 sprites/arctic_snowy.png 154 100 09 11 40 -32  0
-   -1 sprites/arctic_snowy.png 202 100 09  6 20  13 12
-   -1 sprites/arctic_snowy.png 234 100 09  7 13  -5 16
-   -1 sprites/arctic_snowy.png 266 100 09  6 20 -31  5
-   -1 sprites/arctic_snowy.png 298 100 09  7 13  -6  0
-   -1 sprites/arctic_snowy.png 330 100 09  4  8  26 13
-   -1 sprites/arctic_snowy.png 346 100 09  3 12  -5 20
-   -1 sprites/arctic_snowy.png 364 100 09  5  8 -31  6
-   -1 sprites/arctic_snowy.png 380 100 09  4 15  -6  0
+   -1 sprites/arctic_snowy.png 8bpp  10  100  39  18  -6   0 normal
+   -1 sprites/arctic_snowy.png 8bpp  58  100  38  11  -5  12 normal
+   -1 sprites/arctic_snowy.png 8bpp 106  100  39  18 -31   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 154  100  40  11 -32   0 normal
+   -1 sprites/arctic_snowy.png 8bpp 202  100  20   6  13  12 normal
+   -1 sprites/arctic_snowy.png 8bpp 234  100  13   7  -5  16 normal
+   -1 sprites/arctic_snowy.png 8bpp 266  100  20   6 -31   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 298  100  13   7  -6   0 normal
+   -1 sprites/arctic_snowy.png 8bpp 330  100   8   4  26  13 normal
+   -1 sprites/arctic_snowy.png 8bpp 346  100  12   3  -5  20 normal
+   -1 sprites/arctic_snowy.png 8bpp 364  100   8   5 -31   6 normal
+   -1 sprites/arctic_snowy.png 8bpp 380  100  15   4  -6   0 normal

-   -1 sprites/arctic_snowy.png  10 130 09 27 38  -5 -8
-   -1 sprites/arctic_snowy.png  58 130 09 20 37  -4 11
-   -1 sprites/arctic_snowy.png 106 130 09 26 37 -31  5
-   -1 sprites/arctic_snowy.png 154 130 09 20 38 -31 -8
-   -1 sprites/arctic_snowy.png 202 130 09  9 16  17 11
-   -1 sprites/arctic_snowy.png 234 130 09  9 15  -6 22
-   -1 sprites/arctic_snowy.png 266 130 09  9 16 -31  3
-   -1 sprites/arctic_snowy.png 298 130 09  9 15  -7 -8
-   -1 sprites/arctic_snowy.png 330 130 09  7  8  25 11
-   -1 sprites/arctic_snowy.png 346 130 09  5 10  -4 26
-   -1 sprites/arctic_snowy.png 364 130 09  7  8 -31  5
-   -1 sprites/arctic_snowy.png 380 130 09  6 12  -5 -8
+   -1 sprites/arctic_snowy.png 8bpp  10  130  38  27  -5  -8 normal
+   -1 sprites/arctic_snowy.png 8bpp  58  130  37  20  -4  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 106  130  37  26 -31   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 154  130  38  20 -31  -8 normal
+   -1 sprites/arctic_snowy.png 8bpp 202  130  16   9  17  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 234  130  15   9  -6  22 normal
+   -1 sprites/arctic_snowy.png 8bpp 266  130  16   9 -31   3 normal
+   -1 sprites/arctic_snowy.png 8bpp 298  130  15   9  -7  -8 normal
+   -1 sprites/arctic_snowy.png 8bpp 330  130   8   7  25  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 346  130  10   5  -4  26 normal
+   -1 sprites/arctic_snowy.png 8bpp 364  130   8   7 -31   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 380  130  12   6  -5  -8 normal
   -1 * 7	 02 05 30 01 00 00 00

   -1 * 4	 01 05 01 3C
-   -1 sprites/arctic_brown.png  10  10 09 19 38  -5  0
-   -1 sprites/arctic_brown.png  58  10 09 18 38  -5 13
-   -1 sprites/arctic_brown.png 106  10 09 18 38 -31 13
-   -1 sprites/arctic_brown.png 154  10 09 19 38 -31  0
-   -1 sprites/arctic_brown.png 202  10 09  9 19  14 11
-   -1 sprites/arctic_brown.png 234  10 09  9 16  -7 22
-   -1 sprites/arctic_brown.png 266  10 09  9 19 -31 11
-   -1 sprites/arctic_brown.png 298  10 09  9 16  -7  0
-   -1 sprites/arctic_brown.png 330  10 09  6  8  25 13
-   -1 sprites/arctic_brown.png 346  10 09  4 12  -5 27
-   -1 sprites/arctic_brown.png 364  10 09  6  8 -31 13
-   -1 sprites/arctic_brown.png 380  10 09  5 12  -5  0
+   -1 sprites/arctic_brown.png 8bpp  10   10  38  19  -5   0 normal
+   -1 sprites/arctic_brown.png 8bpp  58   10  38  18  -5  13 normal
+   -1 sprites/arctic_brown.png 8bpp 106   10  38  18 -31  13 normal
+   -1 sprites/arctic_brown.png 8bpp 154   10  38  19 -31   0 normal
+   -1 sprites/arctic_brown.png 8bpp 202   10  19   9  14  11 normal
+   -1 sprites/arctic_brown.png 8bpp 234   10  16   9  -7  22 normal
+   -1 sprites/arctic_brown.png 8bpp 266   10  19   9 -31  11 normal
+   -1 sprites/arctic_brown.png 8bpp 298   10  16   9  -7   0 normal
+   -1 sprites/arctic_brown.png 8bpp 330   10   8   6  25  13 normal
+   -1 sprites/arctic_brown.png 8bpp 346   10  12   4  -5  27 normal
+   -1 sprites/arctic_brown.png 8bpp 364   10   8   6 -31  13 normal
+   -1 sprites/arctic_brown.png 8bpp 380   10  12   5  -5   0 normal

-   -1 sprites/arctic_brown.png  10  40 09 11 40  -7  0
-   -1 sprites/arctic_brown.png  58  40 09 18 39  -6  5
-   -1 sprites/arctic_brown.png 106  40 09 11 38 -31 12
-   -1 sprites/arctic_brown.png 154  40 09 18 39 -31  0
-   -1 sprites/arctic_brown.png 202  40 09  6 20  13  5
-   -1 sprites/arctic_brown.png 234  40 09  7 13  -6 16
-   -1 sprites/arctic_brown.png 266  40 09  6 20 -31 12
-   -1 sprites/arctic_brown.png 298  40 09  7 13  -5  0
-   -1 sprites/arctic_brown.png 330  40 09  5  8  25  6
-   -1 sprites/arctic_brown.png 346  40 09  3 12  -5 20
-   -1 sprites/arctic_brown.png 364  40 09  4  8 -31 13
-   -1 sprites/arctic_brown.png 380  40 09  4 15  -7  0
+   -1 sprites/arctic_brown.png 8bpp  10   40  40  11  -7   0 normal
+   -1 sprites/arctic_brown.png 8bpp  58   40  39  18  -6   5 normal
+   -1 sprites/arctic_brown.png 8bpp 106   40  38  11 -31  12 normal
+   -1 sprites/arctic_brown.png 8bpp 154   40  39  18 -31   0 normal
+   -1 sprites/arctic_brown.png 8bpp 202   40  20   6  13   5 normal
+   -1 sprites/arctic_brown.png 8bpp 234   40  13   7  -6  16 normal
+   -1 sprites/arctic_brown.png 8bpp 266   40  20   6 -31  12 normal
+   -1 sprites/arctic_brown.png 8bpp 298   40  13   7  -5   0 normal
+   -1 sprites/arctic_brown.png 8bpp 330   40   8   5  25   6 normal
+   -1 sprites/arctic_brown.png 8bpp 346   40  12   3  -5  20 normal
+   -1 sprites/arctic_brown.png 8bpp 364   40   8   4 -31  13 normal
+   -1 sprites/arctic_brown.png 8bpp 380   40  15   4  -7   0 normal

-   -1 sprites/arctic_brown.png  10  70 09 20 38  -5 -8
-   -1 sprites/arctic_brown.png  58  70 09 26 38  -5  5
-   -1 sprites/arctic_brown.png 106  70 09 20 37 -31 11
-   -1 sprites/arctic_brown.png 154  70 09 27 38 -31 -8
-   -1 sprites/arctic_brown.png 202  70 09  9 16  17  3
-   -1 sprites/arctic_brown.png 234  70 09  9 15  -7 22
-   -1 sprites/arctic_brown.png 266  70 09  9 16 -31 11
-   -1 sprites/arctic_brown.png 298  70 09  9 15  -6 -8
-   -1 sprites/arctic_brown.png 330  70 09  7  8  25  5
-   -1 sprites/arctic_brown.png 346  70 09  5 10  -4 27
-   -1 sprites/arctic_brown.png 364  70 09  7  8 -31 11
-   -1 sprites/arctic_brown.png 380  70 09  6 12  -5 -8
+   -1 sprites/arctic_brown.png 8bpp  10   70  38  20  -5  -8 normal
+   -1 sprites/arctic_brown.png 8bpp  58   70  38  26  -5   5 normal
+   -1 sprites/arctic_brown.png 8bpp 106   70  37  20 -31  11 normal
+   -1 sprites/arctic_brown.png 8bpp 154   70  38  27 -31  -8 normal
+   -1 sprites/arctic_brown.png 8bpp 202   70  16   9  17   3 normal
+   -1 sprites/arctic_brown.png 8bpp 234   70  15   9  -7  22 normal
+   -1 sprites/arctic_brown.png 8bpp 266   70  16   9 -31  11 normal
+   -1 sprites/arctic_brown.png 8bpp 298   70  15   9  -6  -8 normal
+   -1 sprites/arctic_brown.png 8bpp 330   70   8   7  25   5 normal
+   -1 sprites/arctic_brown.png 8bpp 346   70  10   5  -4  27 normal
+   -1 sprites/arctic_brown.png 8bpp 364   70   8   7 -31  11 normal
+   -1 sprites/arctic_brown.png 8bpp 380   70  12   6  -5  -8 normal

-   -1 sprites/arctic_brown.png  10 100 09 18 39  -6  0
-   -1 sprites/arctic_brown.png  58 100 09 11 38  -5 12
-   -1 sprites/arctic_brown.png 106 100 09 18 39 -31  5
-   -1 sprites/arctic_brown.png 154 100 09 11 40 -32  0
-   -1 sprites/arctic_brown.png 202 100 09  6 20  13 12
-   -1 sprites/arctic_brown.png 234 100 09  7 13  -5 16
-   -1 sprites/arctic_brown.png 266 100 09  6 20 -31  5
-   -1 sprites/arctic_brown.png 298 100 09  7 13  -6  0
-   -1 sprites/arctic_brown.png 330 100 09  4  8  26 13
-   -1 sprites/arctic_brown.png 346 100 09  3 12  -5 20
-   -1 sprites/arctic_brown.png 364 100 09  5  8 -31  6
-   -1 sprites/arctic_brown.png 380 100 09  4 15  -6  0
+   -1 sprites/arctic_brown.png 8bpp  10  100  39  18  -6   0 normal
+   -1 sprites/arctic_brown.png 8bpp  58  100  38  11  -5  12 normal
+   -1 sprites/arctic_brown.png 8bpp 106  100  39  18 -31   5 normal
+   -1 sprites/arctic_brown.png 8bpp 154  100  40  11 -32   0 normal
+   -1 sprites/arctic_brown.png 8bpp 202  100  20   6  13  12 normal
+   -1 sprites/arctic_brown.png 8bpp 234  100  13   7  -5  16 normal
+   -1 sprites/arctic_brown.png 8bpp 266  100  20   6 -31   5 normal
+   -1 sprites/arctic_brown.png 8bpp 298  100  13   7  -6   0 normal
+   -1 sprites/arctic_brown.png 8bpp 330  100   8   4  26  13 normal
+   -1 sprites/arctic_brown.png 8bpp 346  100  12   3  -5  20 normal
+   -1 sprites/arctic_brown.png 8bpp 364  100   8   5 -31   6 normal
+   -1 sprites/arctic_brown.png 8bpp 380  100  15   4  -6   0 normal

-   -1 sprites/arctic_brown.png  10 130 09 27 38  -5 -8
-   -1 sprites/arctic_brown.png  58 130 09 20 37  -4 11
-   -1 sprites/arctic_brown.png 106 130 09 26 37 -31  5
-   -1 sprites/arctic_brown.png 154 130 09 20 38 -31 -8
-   -1 sprites/arctic_brown.png 202 130 09  9 16  17 11
-   -1 sprites/arctic_brown.png 234 130 09  9 15  -6 22
-   -1 sprites/arctic_brown.png 266 130 09  9 16 -31  3
-   -1 sprites/arctic_brown.png 298 130 09  9 15  -7 -8
-   -1 sprites/arctic_brown.png 330 130 09  7  8  25 11
-   -1 sprites/arctic_brown.png 346 130 09  5 10  -4 26
-   -1 sprites/arctic_brown.png 364 130 09  7  8 -31  5
-   -1 sprites/arctic_brown.png 380 130 09  6 12  -5 -8
+   -1 sprites/arctic_brown.png 8bpp  10  130  38  27  -5  -8 normal
+   -1 sprites/arctic_brown.png 8bpp  58  130  37  20  -4  11 normal
+   -1 sprites/arctic_brown.png 8bpp 106  130  37  26 -31   5 normal
+   -1 sprites/arctic_brown.png 8bpp 154  130  38  20 -31  -8 normal
+   -1 sprites/arctic_brown.png 8bpp 202  130  16   9  17  11 normal
+   -1 sprites/arctic_brown.png 8bpp 234  130  15   9  -6  22 normal
+   -1 sprites/arctic_brown.png 8bpp 266  130  16   9 -31   3 normal
+   -1 sprites/arctic_brown.png 8bpp 298  130  15   9  -7  -8 normal
+   -1 sprites/arctic_brown.png 8bpp 330  130   8   7  25  11 normal
+   -1 sprites/arctic_brown.png 8bpp 346  130  10   5  -4  26 normal
+   -1 sprites/arctic_brown.png 8bpp 364  130   8   7 -31   5 normal
+   -1 sprites/arctic_brown.png 8bpp 380  130  12   6  -5  -8 normal
   -1 * 7	 02 05 31 01 00 00 00

   -1 * 4	 01 05 01 3C
-   -1 sprites/arctic_snowy.png  10 210 09 19 38  -5  0
-   -1 sprites/arctic_snowy.png  58 210 09 18 38  -5 13
-   -1 sprites/arctic_snowy.png 106 210 09 18 38 -31 13
-   -1 sprites/arctic_snowy.png 154 210 09 19 38 -31  0
-   -1 sprites/arctic_snowy.png 202 210 09  9 19  14 11
-   -1 sprites/arctic_snowy.png 234 210 09  9 16  -7 22
-   -1 sprites/arctic_snowy.png 266 210 09  9 19 -31 11
-   -1 sprites/arctic_snowy.png 298 210 09  9 16  -7  0
-   -1 sprites/arctic_snowy.png 330 210 09  6  8  25 13
-   -1 sprites/arctic_snowy.png 346 210 09  4 12  -5 27
-   -1 sprites/arctic_snowy.png 364 210 09  6  8 -31 13
-   -1 sprites/arctic_snowy.png 380 210 09  5 12  -5  0
+   -1 sprites/arctic_snowy.png 8bpp  10  210  38  19  -5   0 normal
+   -1 sprites/arctic_snowy.png 8bpp  58  210  38  18  -5  13 normal
+   -1 sprites/arctic_snowy.png 8bpp 106  210  38  18 -31  13 normal
+   -1 sprites/arctic_snowy.png 8bpp 154  210  38  19 -31   0 normal
+   -1 sprites/arctic_snowy.png 8bpp 202  210  19   9  14  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 234  210  16   9  -7  22 normal
+   -1 sprites/arctic_snowy.png 8bpp 266  210  19   9 -31  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 298  210  16   9  -7   0 normal
+   -1 sprites/arctic_snowy.png 8bpp 330  210   8   6  25  13 normal
+   -1 sprites/arctic_snowy.png 8bpp 346  210  12   4  -5  27 normal
+   -1 sprites/arctic_snowy.png 8bpp 364  210   8   6 -31  13 normal
+   -1 sprites/arctic_snowy.png 8bpp 380  210  12   5  -5   0 normal

-   -1 sprites/arctic_snowy.png  10 240 09 11 40  -7  0
-   -1 sprites/arctic_snowy.png  58 240 09 18 39  -6  5
-   -1 sprites/arctic_snowy.png 106 240 09 11 38 -31 12
-   -1 sprites/arctic_snowy.png 154 240 09 18 39 -31  0
-   -1 sprites/arctic_snowy.png 202 240 09  6 20  13  5
-   -1 sprites/arctic_snowy.png 234 240 09  7 13  -6 16
-   -1 sprites/arctic_snowy.png 266 240 09  6 20 -31 12
-   -1 sprites/arctic_snowy.png 298 240 09  7 13  -5  0
-   -1 sprites/arctic_snowy.png 330 240 09  5  8  25  6
-   -1 sprites/arctic_snowy.png 346 240 09  3 12  -5 20
-   -1 sprites/arctic_snowy.png 364 240 09  4  8 -31 13
-   -1 sprites/arctic_snowy.png 380 240 09  4 15  -7  0
+   -1 sprites/arctic_snowy.png 8bpp  10  240  40  11  -7   0 normal
+   -1 sprites/arctic_snowy.png 8bpp  58  240  39  18  -6   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 106  240  38  11 -31  12 normal
+   -1 sprites/arctic_snowy.png 8bpp 154  240  39  18 -31   0 normal
+   -1 sprites/arctic_snowy.png 8bpp 202  240  20   6  13   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 234  240  13   7  -6  16 normal
+   -1 sprites/arctic_snowy.png 8bpp 266  240  20   6 -31  12 normal
+   -1 sprites/arctic_snowy.png 8bpp 298  240  13   7  -5   0 normal
+   -1 sprites/arctic_snowy.png 8bpp 330  240   8   5  25   6 normal
+   -1 sprites/arctic_snowy.png 8bpp 346  240  12   3  -5  20 normal
+   -1 sprites/arctic_snowy.png 8bpp 364  240   8   4 -31  13 normal
+   -1 sprites/arctic_snowy.png 8bpp 380  240  15   4  -7   0 normal

-   -1 sprites/arctic_snowy.png  10 270 09 20 38  -5 -8
-   -1 sprites/arctic_snowy.png  58 270 09 26 38  -5  5
-   -1 sprites/arctic_snowy.png 106 270 09 20 37 -31 11
-   -1 sprites/arctic_snowy.png 154 270 09 27 38 -31 -8
-   -1 sprites/arctic_snowy.png 202 270 09  9 16  17  3
-   -1 sprites/arctic_snowy.png 234 270 09  9 15  -7 22
-   -1 sprites/arctic_snowy.png 266 270 09  9 16 -31 11
-   -1 sprites/arctic_snowy.png 298 270 09  9 15  -6 -8
-   -1 sprites/arctic_snowy.png 330 270 09  7  8  25  5
-   -1 sprites/arctic_snowy.png 346 270 09  5 10  -4 27
-   -1 sprites/arctic_snowy.png 364 270 09  7  8 -31 11
-   -1 sprites/arctic_snowy.png 380 270 09  6 12  -5 -8
+   -1 sprites/arctic_snowy.png 8bpp  10  270  38  20  -5  -8 normal
+   -1 sprites/arctic_snowy.png 8bpp  58  270  38  26  -5   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 106  270  37  20 -31  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 154  270  38  27 -31  -8 normal
+   -1 sprites/arctic_snowy.png 8bpp 202  270  16   9  17   3 normal
+   -1 sprites/arctic_snowy.png 8bpp 234  270  15   9  -7  22 normal
+   -1 sprites/arctic_snowy.png 8bpp 266  270  16   9 -31  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 298  270  15   9  -6  -8 normal
+   -1 sprites/arctic_snowy.png 8bpp 330  270   8   7  25   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 346  270  10   5  -4  27 normal
+   -1 sprites/arctic_snowy.png 8bpp 364  270   8   7 -31  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 380  270  12   6  -5  -8 normal

-   -1 sprites/arctic_snowy.png  10 300 09 18 39  -6  0
-   -1 sprites/arctic_snowy.png  58 300 09 11 38  -5 12
-   -1 sprites/arctic_snowy.png 106 300 09 18 39 -31  5
-   -1 sprites/arctic_snowy.png 154 300 09 11 40 -32  0
-   -1 sprites/arctic_snowy.png 202 300 09  6 20  13 12
-   -1 sprites/arctic_snowy.png 234 300 09  7 13  -5 16
-   -1 sprites/arctic_snowy.png 266 300 09  6 20 -31  5
-   -1 sprites/arctic_snowy.png 298 300 09  7 13  -6  0
-   -1 sprites/arctic_snowy.png 330 300 09  4  8  26 13
-   -1 sprites/arctic_snowy.png 346 300 09  3 12  -5 20
-   -1 sprites/arctic_snowy.png 364 300 09  5  8 -31  6
-   -1 sprites/arctic_snowy.png 380 300 09  4 15  -6  0
+   -1 sprites/arctic_snowy.png 8bpp  10  300  39  18  -6   0 normal
+   -1 sprites/arctic_snowy.png 8bpp  58  300  38  11  -5  12 normal
+   -1 sprites/arctic_snowy.png 8bpp 106  300  39  18 -31   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 154  300  40  11 -32   0 normal
+   -1 sprites/arctic_snowy.png 8bpp 202  300  20   6  13  12 normal
+   -1 sprites/arctic_snowy.png 8bpp 234  300  13   7  -5  16 normal
+   -1 sprites/arctic_snowy.png 8bpp 266  300  20   6 -31   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 298  300  13   7  -6   0 normal
+   -1 sprites/arctic_snowy.png 8bpp 330  300   8   4  26  13 normal
+   -1 sprites/arctic_snowy.png 8bpp 346  300  12   3  -5  20 normal
+   -1 sprites/arctic_snowy.png 8bpp 364  300   8   5 -31   6 normal
+   -1 sprites/arctic_snowy.png 8bpp 380  300  15   4  -6   0 normal

-   -1 sprites/arctic_snowy.png  10 330 09 27 38  -5 -8
-   -1 sprites/arctic_snowy.png  58 330 09 20 37  -4 11
-   -1 sprites/arctic_snowy.png 106 330 09 26 37 -31  5
-   -1 sprites/arctic_snowy.png 154 330 09 20 38 -31 -8
-   -1 sprites/arctic_snowy.png 202 330 09  9 16  17 11
-   -1 sprites/arctic_snowy.png 234 330 09  9 15  -6 22
-   -1 sprites/arctic_snowy.png 266 330 09  9 16 -31  3
-   -1 sprites/arctic_snowy.png 298 330 09  9 15  -7 -8
-   -1 sprites/arctic_snowy.png 330 330 09  7  8  25 11
-   -1 sprites/arctic_snowy.png 346 330 09  5 10  -4 26
-   -1 sprites/arctic_snowy.png 364 330 09  7  8 -31  5
-   -1 sprites/arctic_snowy.png 380 330 09  6 12  -5 -8
+   -1 sprites/arctic_snowy.png 8bpp  10  330  38  27  -5  -8 normal
+   -1 sprites/arctic_snowy.png 8bpp  58  330  37  20  -4  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 106  330  37  26 -31   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 154  330  38  20 -31  -8 normal
+   -1 sprites/arctic_snowy.png 8bpp 202  330  16   9  17  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 234  330  15   9  -6  22 normal
+   -1 sprites/arctic_snowy.png 8bpp 266  330  16   9 -31   3 normal
+   -1 sprites/arctic_snowy.png 8bpp 298  330  15   9  -7  -8 normal
+   -1 sprites/arctic_snowy.png 8bpp 330  330   8   7  25  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 346  330  10   5  -4  26 normal
+   -1 sprites/arctic_snowy.png 8bpp 364  330   8   7 -31   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 380  330  12   6  -5  -8 normal
   -1 * 7	 02 05 32 01 00 00 00

   -1 * 4	 01 05 01 3C
-   -1 sprites/arctic_brown.png  10 210 09 19 38  -5  0
-   -1 sprites/arctic_brown.png  58 210 09 18 38  -5 13
-   -1 sprites/arctic_brown.png 106 210 09 18 38 -31 13
-   -1 sprites/arctic_brown.png 154 210 09 19 38 -31  0
-   -1 sprites/arctic_brown.png 202 210 09  9 19  14 11
-   -1 sprites/arctic_brown.png 234 210 09  9 16  -7 22
-   -1 sprites/arctic_brown.png 266 210 09  9 19 -31 11
-   -1 sprites/arctic_brown.png 298 210 09  9 16  -7  0
-   -1 sprites/arctic_brown.png 330 210 09  6  8  25 13
-   -1 sprites/arctic_brown.png 346 210 09  4 12  -5 27
-   -1 sprites/arctic_brown.png 364 210 09  6  8 -31 13
-   -1 sprites/arctic_brown.png 380 210 09  5 12  -5  0
+   -1 sprites/arctic_brown.png 8bpp  10  210  38  19  -5   0 normal
+   -1 sprites/arctic_brown.png 8bpp  58  210  38  18  -5  13 normal
+   -1 sprites/arctic_brown.png 8bpp 106  210  38  18 -31  13 normal
+   -1 sprites/arctic_brown.png 8bpp 154  210  38  19 -31   0 normal
+   -1 sprites/arctic_brown.png 8bpp 202  210  19   9  14  11 normal
+   -1 sprites/arctic_brown.png 8bpp 234  210  16   9  -7  22 normal
+   -1 sprites/arctic_brown.png 8bpp 266  210  19   9 -31  11 normal
+   -1 sprites/arctic_brown.png 8bpp 298  210  16   9  -7   0 normal
+   -1 sprites/arctic_brown.png 8bpp 330  210   8   6  25  13 normal
+   -1 sprites/arctic_brown.png 8bpp 346  210  12   4  -5  27 normal
+   -1 sprites/arctic_brown.png 8bpp 364  210   8   6 -31  13 normal
+   -1 sprites/arctic_brown.png 8bpp 380  210  12   5  -5   0 normal

-   -1 sprites/arctic_brown.png  10 240 09 11 40  -7  0
-   -1 sprites/arctic_brown.png  58 240 09 18 39  -6  5
-   -1 sprites/arctic_brown.png 106 240 09 11 38 -31 12
-   -1 sprites/arctic_brown.png 154 240 09 18 39 -31  0
-   -1 sprites/arctic_brown.png 202 240 09  6 20  13  5
-   -1 sprites/arctic_brown.png 234 240 09  7 13  -6 16
-   -1 sprites/arctic_brown.png 266 240 09  6 20 -31 12
-   -1 sprites/arctic_brown.png 298 240 09  7 13  -5  0
-   -1 sprites/arctic_brown.png 330 240 09  5  8  25  6
-   -1 sprites/arctic_brown.png 346 240 09  3 12  -5 20
-   -1 sprites/arctic_brown.png 364 240 09  4  8 -31 13
-   -1 sprites/arctic_brown.png 380 240 09  4 15  -7  0
+   -1 sprites/arctic_brown.png 8bpp  10  240  40  11  -7   0 normal
+   -1 sprites/arctic_brown.png 8bpp  58  240  39  18  -6   5 normal
+   -1 sprites/arctic_brown.png 8bpp 106  240  38  11 -31  12 normal
+   -1 sprites/arctic_brown.png 8bpp 154  240  39  18 -31   0 normal
+   -1 sprites/arctic_brown.png 8bpp 202  240  20   6  13   5 normal
+   -1 sprites/arctic_brown.png 8bpp 234  240  13   7  -6  16 normal
+   -1 sprites/arctic_brown.png 8bpp 266  240  20   6 -31  12 normal
+   -1 sprites/arctic_brown.png 8bpp 298  240  13   7  -5   0 normal
+   -1 sprites/arctic_brown.png 8bpp 330  240   8   5  25   6 normal
+   -1 sprites/arctic_brown.png 8bpp 346  240  12   3  -5  20 normal
+   -1 sprites/arctic_brown.png 8bpp 364  240   8   4 -31  13 normal
+   -1 sprites/arctic_brown.png 8bpp 380  240  15   4  -7   0 normal

-   -1 sprites/arctic_brown.png  10 270 09 20 38  -5 -8
-   -1 sprites/arctic_brown.png  58 270 09 26 38  -5  5
-   -1 sprites/arctic_brown.png 106 270 09 20 37 -31 11
-   -1 sprites/arctic_brown.png 154 270 09 27 38 -31 -8
-   -1 sprites/arctic_brown.png 202 270 09  9 16  17  3
-   -1 sprites/arctic_brown.png 234 270 09  9 15  -7 22
-   -1 sprites/arctic_brown.png 266 270 09  9 16 -31 11
-   -1 sprites/arctic_brown.png 298 270 09  9 15  -6 -8
-   -1 sprites/arctic_brown.png 330 270 09  7  8  25  5
-   -1 sprites/arctic_brown.png 346 270 09  5 10  -4 27
-   -1 sprites/arctic_brown.png 364 270 09  7  8 -31 11
-   -1 sprites/arctic_brown.png 380 270 09  6 12  -5 -8
+   -1 sprites/arctic_brown.png 8bpp  10  270  38  20  -5  -8 normal
+   -1 sprites/arctic_brown.png 8bpp  58  270  38  26  -5   5 normal
+   -1 sprites/arctic_brown.png 8bpp 106  270  37  20 -31  11 normal
+   -1 sprites/arctic_brown.png 8bpp 154  270  38  27 -31  -8 normal
+   -1 sprites/arctic_brown.png 8bpp 202  270  16   9  17   3 normal
+   -1 sprites/arctic_brown.png 8bpp 234  270  15   9  -7  22 normal
+   -1 sprites/arctic_brown.png 8bpp 266  270  16   9 -31  11 normal
+   -1 sprites/arctic_brown.png 8bpp 298  270  15   9  -6  -8 normal
+   -1 sprites/arctic_brown.png 8bpp 330  270   8   7  25   5 normal
+   -1 sprites/arctic_brown.png 8bpp 346  270  10   5  -4  27 normal
+   -1 sprites/arctic_brown.png 8bpp 364  270   8   7 -31  11 normal
+   -1 sprites/arctic_brown.png 8bpp 380  270  12   6  -5  -8 normal

-   -1 sprites/arctic_brown.png  10 300 09 18 39  -6  0
-   -1 sprites/arctic_brown.png  58 300 09 11 38  -5 12
-   -1 sprites/arctic_brown.png 106 300 09 18 39 -31  5
-   -1 sprites/arctic_brown.png 154 300 09 11 40 -32  0
-   -1 sprites/arctic_brown.png 202 300 09  6 20  13 12
-   -1 sprites/arctic_brown.png 234 300 09  7 13  -5 16
-   -1 sprites/arctic_brown.png 266 300 09  6 20 -31  5
-   -1 sprites/arctic_brown.png 298 300 09  7 13  -6  0
-   -1 sprites/arctic_brown.png 330 300 09  4  8  26 13
-   -1 sprites/arctic_brown.png 346 300 09  3 12  -5 20
-   -1 sprites/arctic_brown.png 364 300 09  5  8 -31  6
-   -1 sprites/arctic_brown.png 380 300 09  4 15  -6  0
+   -1 sprites/arctic_brown.png 8bpp  10  300  39  18  -6   0 normal
+   -1 sprites/arctic_brown.png 8bpp  58  300  38  11  -5  12 normal
+   -1 sprites/arctic_brown.png 8bpp 106  300  39  18 -31   5 normal
+   -1 sprites/arctic_brown.png 8bpp 154  300  40  11 -32   0 normal
+   -1 sprites/arctic_brown.png 8bpp 202  300  20   6  13  12 normal
+   -1 sprites/arctic_brown.png 8bpp 234  300  13   7  -5  16 normal
+   -1 sprites/arctic_brown.png 8bpp 266  300  20   6 -31   5 normal
+   -1 sprites/arctic_brown.png 8bpp 298  300  13   7  -6   0 normal
+   -1 sprites/arctic_brown.png 8bpp 330  300   8   4  26  13 normal
+   -1 sprites/arctic_brown.png 8bpp 346  300  12   3  -5  20 normal
+   -1 sprites/arctic_brown.png 8bpp 364  300   8   5 -31   6 normal
+   -1 sprites/arctic_brown.png 8bpp 380  300  15   4  -6   0 normal

-   -1 sprites/arctic_brown.png  10 330 09 27 38  -5 -8
-   -1 sprites/arctic_brown.png  58 330 09 20 37  -4 11
-   -1 sprites/arctic_brown.png 106 330 09 26 37 -31  5
-   -1 sprites/arctic_brown.png 154 330 09 20 38 -31 -8
-   -1 sprites/arctic_brown.png 202 330 09  9 16  17 11
-   -1 sprites/arctic_brown.png 234 330 09  9 15  -6 22
-   -1 sprites/arctic_brown.png 266 330 09  9 16 -31  3
-   -1 sprites/arctic_brown.png 298 330 09  9 15  -7 -8
-   -1 sprites/arctic_brown.png 330 330 09  7  8  25 11
-   -1 sprites/arctic_brown.png 346 330 09  5 10  -4 26
-   -1 sprites/arctic_brown.png 364 330 09  7  8 -31  5
-   -1 sprites/arctic_brown.png 380 330 09  6 12  -5 -8
+   -1 sprites/arctic_brown.png 8bpp  10  330  38  27  -5  -8 normal
+   -1 sprites/arctic_brown.png 8bpp  58  330  37  20  -4  11 normal
+   -1 sprites/arctic_brown.png 8bpp 106  330  37  26 -31   5 normal
+   -1 sprites/arctic_brown.png 8bpp 154  330  38  20 -31  -8 normal
+   -1 sprites/arctic_brown.png 8bpp 202  330  16   9  17  11 normal
+   -1 sprites/arctic_brown.png 8bpp 234  330  15   9  -6  22 normal
+   -1 sprites/arctic_brown.png 8bpp 266  330  16   9 -31   3 normal
+   -1 sprites/arctic_brown.png 8bpp 298  330  15   9  -7  -8 normal
+   -1 sprites/arctic_brown.png 8bpp 330  330   8   7  25  11 normal
+   -1 sprites/arctic_brown.png 8bpp 346  330  10   5  -4  26 normal
+   -1 sprites/arctic_brown.png 8bpp 364  330   8   7 -31   5 normal
+   -1 sprites/arctic_brown.png 8bpp 380  330  12   6  -5  -8 normal
   -1 * 7	 02 05 33 01 00 00 00

   -1 * 14	 02 05 34 81 81 00 FF 01 30 00 04 04 31 00
--- a/media/extra_grf/rivers/rapids.nfo
+++ b/media/extra_grf/rivers/rapids.nfo
@@ -8,115 +8,115 @@
 //
   -1 * 0	 0C "Rapid graphics"
   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10  10 09 23 64 -31  0
-   -1 sprites/rapids.png  90  10 09 39 64 -31 -8
-   -1 sprites/rapids.png 170  10 09 23 64 -31  0
-   -1 sprites/rapids.png 250  10 09 39 64 -31 -8
+   -1 sprites/rapids.png 8bpp  10   10  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90   10  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170   10  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250   10  64  39 -31  -8 normal
   -1 * 7	 02 05 00 01 00 00 00

   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10  60 09 23 64 -31  0
-   -1 sprites/rapids.png  90  60 09 39 64 -31 -8
-   -1 sprites/rapids.png 170  60 09 23 64 -31  0
-   -1 sprites/rapids.png 250  60 09 39 64 -31 -8
+   -1 sprites/rapids.png 8bpp  10   60  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90   60  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170   60  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250   60  64  39 -31  -8 normal
   -1 * 7	 02 05 01 01 00 00 00

   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 110 09 23 64 -31  0
-   -1 sprites/rapids.png  90 110 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 110 09 23 64 -31  0
-   -1 sprites/rapids.png 250 110 09 39 64 -31 -8
+   -1 sprites/rapids.png 8bpp  10  110  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  110  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  110  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  110  64  39 -31  -8 normal
   -1 * 7	 02 05 02 01 00 00 00

   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 160 09 23 64 -31  0
-   -1 sprites/rapids.png  90 160 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 160 09 23 64 -31  0
-   -1 sprites/rapids.png 250 160 09 39 64 -31 -8
+   -1 sprites/rapids.png 8bpp  10  160  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  160  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  160  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  160  64  39 -31  -8 normal
   -1 * 7	 02 05 03 01 00 00 00

   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 210 09 23 64 -31  0
-   -1 sprites/rapids.png  90 210 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 210 09 23 64 -31  0
-   -1 sprites/rapids.png 250 210 09 39 64 -31 -8
+   -1 sprites/rapids.png 8bpp  10  210  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  210  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  210  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  210  64  39 -31  -8 normal
   -1 * 7	 02 05 04 01 00 00 00

   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 260 09 23 64 -31  0
-   -1 sprites/rapids.png  90 260 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 260 09 23 64 -31  0
-   -1 sprites/rapids.png 250 260 09 39 64 -31 -8
+   -1 sprites/rapids.png 8bpp  10  260  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  260  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  260  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  260  64  39 -31  -8 normal
   -1 * 7	 02 05 05 01 00 00 00

   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 310 09 23 64 -31  0
-   -1 sprites/rapids.png  90 310 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 310 09 23 64 -31  0
-   -1 sprites/rapids.png 250 310 09 39 64 -31 -8
+   -1 sprites/rapids.png 8bpp  10  310  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  310  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  310  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  310  64  39 -31  -8 normal
   -1 * 7	 02 05 06 01 00 00 00

   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 360 09 23 64 -31  0
-   -1 sprites/rapids.png  90 360 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 360 09 23 64 -31  0
-   -1 sprites/rapids.png 250 360 09 39 64 -31 -8
+   -1 sprites/rapids.png 8bpp  10  360  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  360  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  360  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  360  64  39 -31  -8 normal
   -1 * 7	 02 05 07 01 00 00 00

   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 410 09 23 64 -31  0
-   -1 sprites/rapids.png  90 410 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 410 09 23 64 -31  0
-   -1 sprites/rapids.png 250 410 09 39 64 -31 -8
+   -1 sprites/rapids.png 8bpp  10  410  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  410  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  410  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  410  64  39 -31  -8 normal
   -1 * 7	 02 05 08 01 00 00 00

   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 460 09 23 64 -31  0
-   -1 sprites/rapids.png  90 460 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 460 09 23 64 -31  0
-   -1 sprites/rapids.png 250 460 09 39 64 -31 -8
+   -1 sprites/rapids.png 8bpp  10  460  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  460  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  460  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  460  64  39 -31  -8 normal
   -1 * 7	 02 05 09 01 00 00 00

   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 510 09 23 64 -31  0
-   -1 sprites/rapids.png  90 510 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 510 09 23 64 -31  0
-   -1 sprites/rapids.png 250 510 09 39 64 -31 -8
+   -1 sprites/rapids.png 8bpp  10  510  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  510  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  510  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  510  64  39 -31  -8 normal
   -1 * 7	 02 05 0A 01 00 00 00

   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 560 09 23 64 -31  0
-   -1 sprites/rapids.png  90 560 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 560 09 23 64 -31  0
-   -1 sprites/rapids.png 250 560 09 39 64 -31 -8
+   -1 sprites/rapids.png 8bpp  10  560  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  560  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  560  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  560  64  39 -31  -8 normal
   -1 * 7	 02 05 0B 01 00 00 00

   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 610 09 23 64 -31  0
-   -1 sprites/rapids.png  90 610 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 610 09 23 64 -31  0
-   -1 sprites/rapids.png 250 610 09 39 64 -31 -8
+   -1 sprites/rapids.png 8bpp  10  610  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  610  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  610  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  610  64  39 -31  -8 normal
   -1 * 7	 02 05 0C 01 00 00 00

   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 660 09 23 64 -31  0
-   -1 sprites/rapids.png  90 660 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 660 09 23 64 -31  0
-   -1 sprites/rapids.png 250 660 09 39 64 -31 -8
+   -1 sprites/rapids.png 8bpp  10  660  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  660  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  660  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  660  64  39 -31  -8 normal
   -1 * 7	 02 05 0D 01 00 00 00

   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 710 09 23 64 -31  0
-   -1 sprites/rapids.png  90 710 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 710 09 23 64 -31  0
-   -1 sprites/rapids.png 250 710 09 39 64 -31 -8
+   -1 sprites/rapids.png 8bpp  10  710  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  710  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  710  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  710  64  39 -31  -8 normal
   -1 * 7	 02 05 0E 01 00 00 00

   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 760 09 23 64 -31  0
-   -1 sprites/rapids.png  90 760 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 760 09 23 64 -31  0
-   -1 sprites/rapids.png 250 760 09 39 64 -31 -8
+   -1 sprites/rapids.png 8bpp  10  760  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  760  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  760  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  760  64  39 -31  -8 normal
   -1 * 7	 02 05 0F 01 00 00 00

   -1 * 39	 02 05 10 80 00 01 10
--- a/media/extra_grf/rivers/temperate.nfo
+++ b/media/extra_grf/rivers/temperate.nfo
@@ -8,137 +8,137 @@
 //
   -1 * 0	 0C "Temperate river graphics by andythenorth (Andrew Parkhouse)"
   -1 * 4	 01 05 01 3C
-   -1 sprites/temperate.png  10  10 09 19 38  -5  0
-   -1 sprites/temperate.png  58  10 09 18 38  -5 13
-   -1 sprites/temperate.png 106  10 09 18 38 -31 13
-   -1 sprites/temperate.png 154  10 09 19 38 -31  0
-   -1 sprites/temperate.png 202  10 09  9 19  14 11
-   -1 sprites/temperate.png 234  10 09  9 16  -7 22
-   -1 sprites/temperate.png 266  10 09  9 19 -31 11
-   -1 sprites/temperate.png 298  10 09  9 16  -7  0
-   -1 sprites/temperate.png 330  10 09  6  8  25 13
-   -1 sprites/temperate.png 346  10 09  4 12  -5 27
-   -1 sprites/temperate.png 364  10 09  6  8 -31 13
-   -1 sprites/temperate.png 380  10 09  5 12  -5  0
+   -1 sprites/temperate.png 8bpp  10   10  38  19  -5   0 normal
+   -1 sprites/temperate.png 8bpp  58   10  38  18  -5  13 normal
+   -1 sprites/temperate.png 8bpp 106   10  38  18 -31  13 normal
+   -1 sprites/temperate.png 8bpp 154   10  38  19 -31   0 normal
+   -1 sprites/temperate.png 8bpp 202   10  19   9  14  11 normal
+   -1 sprites/temperate.png 8bpp 234   10  16   9  -7  22 normal
+   -1 sprites/temperate.png 8bpp 266   10  19   9 -31  11 normal
+   -1 sprites/temperate.png 8bpp 298   10  16   9  -7   0 normal
+   -1 sprites/temperate.png 8bpp 330   10   8   6  25  13 normal
+   -1 sprites/temperate.png 8bpp 346   10  12   4  -5  27 normal
+   -1 sprites/temperate.png 8bpp 364   10   8   6 -31  13 normal
+   -1 sprites/temperate.png 8bpp 380   10  12   5  -5   0 normal

-   -1 sprites/temperate.png  10  40 09 11 40  -7  0
-   -1 sprites/temperate.png  58  40 09 18 39  -6  5
-   -1 sprites/temperate.png 106  40 09 11 38 -31 12
-   -1 sprites/temperate.png 154  40 09 18 39 -31  0
-   -1 sprites/temperate.png 202  40 09  6 20  13  5
-   -1 sprites/temperate.png 234  40 09  7 13  -6 16
-   -1 sprites/temperate.png 266  40 09  6 20 -31 12
-   -1 sprites/temperate.png 298  40 09  7 13  -5  0
-   -1 sprites/temperate.png 330  40 09  5  8  25  6
-   -1 sprites/temperate.png 346  40 09  3 12  -5 20
-   -1 sprites/temperate.png 364  40 09  4  8 -31 13
-   -1 sprites/temperate.png 380  40 09  4 15  -7  0
+   -1 sprites/temperate.png 8bpp  10   40  40  11  -7   0 normal
+   -1 sprites/temperate.png 8bpp  58   40  39  18  -6   5 normal
+   -1 sprites/temperate.png 8bpp 106   40  38  11 -31  12 normal
+   -1 sprites/temperate.png 8bpp 154   40  39  18 -31   0 normal
+   -1 sprites/temperate.png 8bpp 202   40  20   6  13   5 normal
+   -1 sprites/temperate.png 8bpp 234   40  13   7  -6  16 normal
+   -1 sprites/temperate.png 8bpp 266   40  20   6 -31  12 normal
+   -1 sprites/temperate.png 8bpp 298   40  13   7  -5   0 normal
+   -1 sprites/temperate.png 8bpp 330   40   8   5  25   6 normal
+   -1 sprites/temperate.png 8bpp 346   40  12   3  -5  20 normal
+   -1 sprites/temperate.png 8bpp 364   40   8   4 -31  13 normal
+   -1 sprites/temperate.png 8bpp 380   40  15   4  -7   0 normal

-   -1 sprites/temperate.png  10  70 09 20 38  -5 -8
-   -1 sprites/temperate.png  58  70 09 26 38  -5  5
-   -1 sprites/temperate.png 106  70 09 20 37 -31 11
-   -1 sprites/temperate.png 154  70 09 27 38 -31 -8
-   -1 sprites/temperate.png 202  70 09  9 16  17  3
-   -1 sprites/temperate.png 234  70 09  9 15  -7 22
-   -1 sprites/temperate.png 266  70 09  9 16 -31 11
-   -1 sprites/temperate.png 298  70 09  9 15  -6 -8
-   -1 sprites/temperate.png 330  70 09  7  8  25  5
-   -1 sprites/temperate.png 346  70 09  5 10  -4 27
-   -1 sprites/temperate.png 364  70 09  7  8 -31 11
-   -1 sprites/temperate.png 380  70 09  6 12  -5 -8
+   -1 sprites/temperate.png 8bpp  10   70  38  20  -5  -8 normal
+   -1 sprites/temperate.png 8bpp  58   70  38  26  -5   5 normal
+   -1 sprites/temperate.png 8bpp 106   70  37  20 -31  11 normal
+   -1 sprites/temperate.png 8bpp 154   70  38  27 -31  -8 normal
+   -1 sprites/temperate.png 8bpp 202   70  16   9  17   3 normal
+   -1 sprites/temperate.png 8bpp 234   70  15   9  -7  22 normal
+   -1 sprites/temperate.png 8bpp 266   70  16   9 -31  11 normal
+   -1 sprites/temperate.png 8bpp 298   70  15   9  -6  -8 normal
+   -1 sprites/temperate.png 8bpp 330   70   8   7  25   5 normal
+   -1 sprites/temperate.png 8bpp 346   70  10   5  -4  27 normal
+   -1 sprites/temperate.png 8bpp 364   70   8   7 -31  11 normal
+   -1 sprites/temperate.png 8bpp 380   70  12   6  -5  -8 normal

-   -1 sprites/temperate.png  10 100 09 18 39  -6  0
-   -1 sprites/temperate.png  58 100 09 11 38  -5 12
-   -1 sprites/temperate.png 106 100 09 18 39 -31  5
-   -1 sprites/temperate.png 154 100 09 11 40 -32  0
-   -1 sprites/temperate.png 202 100 09  6 20  13 12
-   -1 sprites/temperate.png 234 100 09  7 13  -5 16
-   -1 sprites/temperate.png 266 100 09  6 20 -31  5
-   -1 sprites/temperate.png 298 100 09  7 13  -6  0
-   -1 sprites/temperate.png 330 100 09  4  8  26 13
-   -1 sprites/temperate.png 346 100 09  3 12  -5 20
-   -1 sprites/temperate.png 364 100 09  5  8 -31  6
-   -1 sprites/temperate.png 380 100 09  4 15  -6  0
+   -1 sprites/temperate.png 8bpp  10  100  39  18  -6   0 normal
+   -1 sprites/temperate.png 8bpp  58  100  38  11  -5  12 normal
+   -1 sprites/temperate.png 8bpp 106  100  39  18 -31   5 normal
+   -1 sprites/temperate.png 8bpp 154  100  40  11 -32   0 normal
+   -1 sprites/temperate.png 8bpp 202  100  20   6  13  12 normal
+   -1 sprites/temperate.png 8bpp 234  100  13   7  -5  16 normal
+   -1 sprites/temperate.png 8bpp 266  100  20   6 -31   5 normal
+   -1 sprites/temperate.png 8bpp 298  100  13   7  -6   0 normal
+   -1 sprites/temperate.png 8bpp 330  100   8   4  26  13 normal
+   -1 sprites/temperate.png 8bpp 346  100  12   3  -5  20 normal
+   -1 sprites/temperate.png 8bpp 364  100   8   5 -31   6 normal
+   -1 sprites/temperate.png 8bpp 380  100  15   4  -6   0 normal

-   -1 sprites/temperate.png  10 130 09 27 38  -5 -8
-   -1 sprites/temperate.png  58 130 09 20 37  -4 11
-   -1 sprites/temperate.png 106 130 09 26 37 -31  5
-   -1 sprites/temperate.png 154 130 09 20 38 -31 -8
-   -1 sprites/temperate.png 202 130 09  9 16  17 11
-   -1 sprites/temperate.png 234 130 09  9 15  -6 22
-   -1 sprites/temperate.png 266 130 09  9 16 -31  3
-   -1 sprites/temperate.png 298 130 09  9 15  -7 -8
-   -1 sprites/temperate.png 330 130 09  7  8  25 11
-   -1 sprites/temperate.png 346 130 09  5 10  -4 26
-   -1 sprites/temperate.png 364 130 09  7  8 -31  5
-   -1 sprites/temperate.png 380 130 09  6 12  -5 -8
+   -1 sprites/temperate.png 8bpp  10  130  38  27  -5  -8 normal
+   -1 sprites/temperate.png 8bpp  58  130  37  20  -4  11 normal
+   -1 sprites/temperate.png 8bpp 106  130  37  26 -31   5 normal
+   -1 sprites/temperate.png 8bpp 154  130  38  20 -31  -8 normal
+   -1 sprites/temperate.png 8bpp 202  130  16   9  17  11 normal
+   -1 sprites/temperate.png 8bpp 234  130  15   9  -6  22 normal
+   -1 sprites/temperate.png 8bpp 266  130  16   9 -31   3 normal
+   -1 sprites/temperate.png 8bpp 298  130  15   9  -7  -8 normal
+   -1 sprites/temperate.png 8bpp 330  130   8   7  25  11 normal
+   -1 sprites/temperate.png 8bpp 346  130  10   5  -4  26 normal
+   -1 sprites/temperate.png 8bpp 364  130   8   7 -31   5 normal
+   -1 sprites/temperate.png 8bpp 380  130  12   6  -5  -8 normal
   -1 * 7	 02 05 20 01 00 00 00

   -1 * 4	 01 05 01 3C
-   -1 sprites/temperate.png  10 210 09 19 38  -5  0
-   -1 sprites/temperate.png  58 210 09 18 38  -5 13
-   -1 sprites/temperate.png 106 210 09 18 38 -31 13
-   -1 sprites/temperate.png 154 210 09 19 38 -31  0
-   -1 sprites/temperate.png 202 210 09  9 19  14 11
-   -1 sprites/temperate.png 234 210 09  9 16  -7 22
-   -1 sprites/temperate.png 266 210 09  9 19 -31 11
-   -1 sprites/temperate.png 298 210 09  9 16  -7  0
-   -1 sprites/temperate.png 330 210 09  6  8  25 13
-   -1 sprites/temperate.png 346 210 09  4 12  -5 27
-   -1 sprites/temperate.png 364 210 09  6  8 -31 13
-   -1 sprites/temperate.png 380 210 09  5 12  -5  0
+   -1 sprites/temperate.png 8bpp  10  210  38  19  -5   0 normal
+   -1 sprites/temperate.png 8bpp  58  210  38  18  -5  13 normal
+   -1 sprites/temperate.png 8bpp 106  210  38  18 -31  13 normal
+   -1 sprites/temperate.png 8bpp 154  210  38  19 -31   0 normal
+   -1 sprites/temperate.png 8bpp 202  210  19   9  14  11 normal
+   -1 sprites/temperate.png 8bpp 234  210  16   9  -7  22 normal
+   -1 sprites/temperate.png 8bpp 266  210  19   9 -31  11 normal
+   -1 sprites/temperate.png 8bpp 298  210  16   9  -7   0 normal
+   -1 sprites/temperate.png 8bpp 330  210   8   6  25  13 normal
+   -1 sprites/temperate.png 8bpp 346  210  12   4  -5  27 normal
+   -1 sprites/temperate.png 8bpp 364  210   8   6 -31  13 normal
+   -1 sprites/temperate.png 8bpp 380  210  12   5  -5   0 normal

-   -1 sprites/temperate.png  10 240 09 11 40  -7  0
-   -1 sprites/temperate.png  58 240 09 18 39  -6  5
-   -1 sprites/temperate.png 106 240 09 11 38 -31 12
-   -1 sprites/temperate.png 154 240 09 18 39 -31  0
-   -1 sprites/temperate.png 202 240 09  6 20  13  5
-   -1 sprites/temperate.png 234 240 09  7 13  -6 16
-   -1 sprites/temperate.png 266 240 09  6 20 -31 12
-   -1 sprites/temperate.png 298 240 09  7 13  -5  0
-   -1 sprites/temperate.png 330 240 09  5  8  25  6
-   -1 sprites/temperate.png 346 240 09  3 12  -5 20
-   -1 sprites/temperate.png 364 240 09  4  8 -31 13
-   -1 sprites/temperate.png 380 240 09  4 15  -7  0
+   -1 sprites/temperate.png 8bpp  10  240  40  11  -7   0 normal
+   -1 sprites/temperate.png 8bpp  58  240  39  18  -6   5 normal
+   -1 sprites/temperate.png 8bpp 106  240  38  11 -31  12 normal
+   -1 sprites/temperate.png 8bpp 154  240  39  18 -31   0 normal
+   -1 sprites/temperate.png 8bpp 202  240  20   6  13   5 normal
+   -1 sprites/temperate.png 8bpp 234  240  13   7  -6  16 normal
+   -1 sprites/temperate.png 8bpp 266  240  20   6 -31  12 normal
+   -1 sprites/temperate.png 8bpp 298  240  13   7  -5   0 normal
+   -1 sprites/temperate.png 8bpp 330  240   8   5  25   6 normal
+   -1 sprites/temperate.png 8bpp 346  240  12   3  -5  20 normal
+   -1 sprites/temperate.png 8bpp 364  240   8   4 -31  13 normal
+   -1 sprites/temperate.png 8bpp 380  240  15   4  -7   0 normal

-   -1 sprites/temperate.png  10 270 09 20 38  -5 -8
-   -1 sprites/temperate.png  58 270 09 26 38  -5  5
-   -1 sprites/temperate.png 106 270 09 20 37 -31 11
-   -1 sprites/temperate.png 154 270 09 27 38 -31 -8
-   -1 sprites/temperate.png 202 270 09  9 16  17  3
-   -1 sprites/temperate.png 234 270 09  9 15  -7 22
-   -1 sprites/temperate.png 266 270 09  9 16 -31 11
-   -1 sprites/temperate.png 298 270 09  9 15  -6 -8
-   -1 sprites/temperate.png 330 270 09  7  8  25  5
-   -1 sprites/temperate.png 346 270 09  5 10  -4 27
-   -1 sprites/temperate.png 364 270 09  7  8 -31 11
-   -1 sprites/temperate.png 380 270 09  6 12  -5 -8
+   -1 sprites/temperate.png 8bpp  10  270  38  20  -5  -8 normal
+   -1 sprites/temperate.png 8bpp  58  270  38  26  -5   5 normal
+   -1 sprites/temperate.png 8bpp 106  270  37  20 -31  11 normal
+   -1 sprites/temperate.png 8bpp 154  270  38  27 -31  -8 normal
+   -1 sprites/temperate.png 8bpp 202  270  16   9  17   3 normal
+   -1 sprites/temperate.png 8bpp 234  270  15   9  -7  22 normal
+   -1 sprites/temperate.png 8bpp 266  270  16   9 -31  11 normal
+   -1 sprites/temperate.png 8bpp 298  270  15   9  -6  -8 normal
+   -1 sprites/temperate.png 8bpp 330  270   8   7  25   5 normal
+   -1 sprites/temperate.png 8bpp 346  270  10   5  -4  27 normal
+   -1 sprites/temperate.png 8bpp 364  270   8   7 -31  11 normal
+   -1 sprites/temperate.png 8bpp 380  270  12   6  -5  -8 normal

-   -1 sprites/temperate.png  10 300 09 18 39  -6  0
-   -1 sprites/temperate.png  58 300 09 11 38  -5 12
-   -1 sprites/temperate.png 106 300 09 18 39 -31  5
-   -1 sprites/temperate.png 154 300 09 11 40 -32  0
-   -1 sprites/temperate.png 202 300 09  6 20  13 12
-   -1 sprites/temperate.png 234 300 09  7 13  -5 16
-   -1 sprites/temperate.png 266 300 09  6 20 -31  5
-   -1 sprites/temperate.png 298 300 09  7 13  -6  0
-   -1 sprites/temperate.png 330 300 09  4  8  26 13
-   -1 sprites/temperate.png 346 300 09  3 12  -5 20
-   -1 sprites/temperate.png 364 300 09  5  8 -31  6
-   -1 sprites/temperate.png 380 300 09  4 15  -6  0
+   -1 sprites/temperate.png 8bpp  10  300  39  18  -6   0 normal
+   -1 sprites/temperate.png 8bpp  58  300  38  11  -5  12 normal
+   -1 sprites/temperate.png 8bpp 106  300  39  18 -31   5 normal
+   -1 sprites/temperate.png 8bpp 154  300  40  11 -32   0 normal
+   -1 sprites/temperate.png 8bpp 202  300  20   6  13  12 normal
+   -1 sprites/temperate.png 8bpp 234  300  13   7  -5  16 normal
+   -1 sprites/temperate.png 8bpp 266  300  20   6 -31   5 normal
+   -1 sprites/temperate.png 8bpp 298  300  13   7  -6   0 normal
+   -1 sprites/temperate.png 8bpp 330  300   8   4  26  13 normal
+   -1 sprites/temperate.png 8bpp 346  300  12   3  -5  20 normal
+   -1 sprites/temperate.png 8bpp 364  300   8   5 -31   6 normal
+   -1 sprites/temperate.png 8bpp 380  300  15   4  -6   0 normal

-   -1 sprites/temperate.png  10 330 09 27 38  -5 -8
-   -1 sprites/temperate.png  58 330 09 20 37  -4 11
-   -1 sprites/temperate.png 106 330 09 26 37 -31  5
-   -1 sprites/temperate.png 154 330 09 20 38 -31 -8
-   -1 sprites/temperate.png 202 330 09  9 16  17 11
-   -1 sprites/temperate.png 234 330 09  9 15  -6 22
-   -1 sprites/temperate.png 266 330 09  9 16 -31  3
-   -1 sprites/temperate.png 298 330 09  9 15  -7 -8
-   -1 sprites/temperate.png 330 330 09  7  8  25 11
-   -1 sprites/temperate.png 346 330 09  5 10  -4 26
-   -1 sprites/temperate.png 364 330 09  7  8 -31  5
-   -1 sprites/temperate.png 380 330 09  6 12  -5 -8
+   -1 sprites/temperate.png 8bpp  10  330  38  27  -5  -8 normal
+   -1 sprites/temperate.png 8bpp  58  330  37  20  -4  11 normal
+   -1 sprites/temperate.png 8bpp 106  330  37  26 -31   5 normal
+   -1 sprites/temperate.png 8bpp 154  330  38  20 -31  -8 normal
+   -1 sprites/temperate.png 8bpp 202  330  16   9  17  11 normal
+   -1 sprites/temperate.png 8bpp 234  330  15   9  -6  22 normal
+   -1 sprites/temperate.png 8bpp 266  330  16   9 -31   3 normal
+   -1 sprites/temperate.png 8bpp 298  330  15   9  -7  -8 normal
+   -1 sprites/temperate.png 8bpp 330  330   8   7  25  11 normal
+   -1 sprites/temperate.png 8bpp 346  330  10   5  -4  26 normal
+   -1 sprites/temperate.png 8bpp 364  330   8   7 -31   5 normal
+   -1 sprites/temperate.png 8bpp 380  330  12   6  -5  -8 normal
   -1 * 7	 02 05 21 01 00 00 00

   -1 * 14	 02 05 22 81 80 00 FF 01 20 00 00 00 21 00
--- a/media/extra_grf/rivers/toyland.nfo
+++ b/media/extra_grf/rivers/toyland.nfo
@@ -8,137 +8,137 @@
 //
   -1 * 0	 0C "Toyland river graphics by andythenorth (Andrew Parkhouse)"
   -1 * 4	 01 05 01 3C
-   -1 sprites/toyland.png  10  10 09 19 38  -5  0
-   -1 sprites/toyland.png  58  10 09 18 38  -5 13
-   -1 sprites/toyland.png 106  10 09 18 38 -31 13
-   -1 sprites/toyland.png 154  10 09 19 38 -31  0
-   -1 sprites/toyland.png 202  10 09  9 19  14 11
-   -1 sprites/toyland.png 234  10 09  9 16  -7 22
-   -1 sprites/toyland.png 266  10 09  9 19 -31 11
-   -1 sprites/toyland.png 298  10 09  9 16  -7  0
-   -1 sprites/toyland.png 330  10 09  6  8  25 13
-   -1 sprites/toyland.png 346  10 09  4 12  -5 27
-   -1 sprites/toyland.png 364  10 09  6  8 -31 13
-   -1 sprites/toyland.png 380  10 09  5 12  -5  0
+   -1 sprites/toyland.png 8bpp  10   10  38  19  -5   0 normal
+   -1 sprites/toyland.png 8bpp  58   10  38  18  -5  13 normal
+   -1 sprites/toyland.png 8bpp 106   10  38  18 -31  13 normal
+   -1 sprites/toyland.png 8bpp 154   10  38  19 -31   0 normal
+   -1 sprites/toyland.png 8bpp 202   10  19   9  14  11 normal
+   -1 sprites/toyland.png 8bpp 234   10  16   9  -7  22 normal
+   -1 sprites/toyland.png 8bpp 266   10  19   9 -31  11 normal
+   -1 sprites/toyland.png 8bpp 298   10  16   9  -7   0 normal
+   -1 sprites/toyland.png 8bpp 330   10   8   6  25  13 normal
+   -1 sprites/toyland.png 8bpp 346   10  12   4  -5  27 normal
+   -1 sprites/toyland.png 8bpp 364   10   8   6 -31  13 normal
+   -1 sprites/toyland.png 8bpp 380   10  12   5  -5   0 normal

-   -1 sprites/toyland.png  10  40 09 11 40  -7  0
-   -1 sprites/toyland.png  58  40 09 18 39  -6  5
-   -1 sprites/toyland.png 106  40 09 11 38 -31 12
-   -1 sprites/toyland.png 154  40 09 18 39 -31  0
-   -1 sprites/toyland.png 202  40 09  6 20  13  5
-   -1 sprites/toyland.png 234  40 09  7 13  -6 16
-   -1 sprites/toyland.png 266  40 09  6 20 -31 12
-   -1 sprites/toyland.png 298  40 09  7 13  -5  0
-   -1 sprites/toyland.png 330  40 09  5  8  25  6
-   -1 sprites/toyland.png 346  40 09  3 12  -5 20
-   -1 sprites/toyland.png 364  40 09  4  8 -31 13
-   -1 sprites/toyland.png 380  40 09  4 15  -7  0
+   -1 sprites/toyland.png 8bpp  10   40  40  11  -7   0 normal
+   -1 sprites/toyland.png 8bpp  58   40  39  18  -6   5 normal
+   -1 sprites/toyland.png 8bpp 106   40  38  11 -31  12 normal
+   -1 sprites/toyland.png 8bpp 154   40  39  18 -31   0 normal
+   -1 sprites/toyland.png 8bpp 202   40  20   6  13   5 normal
+   -1 sprites/toyland.png 8bpp 234   40  13   7  -6  16 normal
+   -1 sprites/toyland.png 8bpp 266   40  20   6 -31  12 normal
+   -1 sprites/toyland.png 8bpp 298   40  13   7  -5   0 normal
+   -1 sprites/toyland.png 8bpp 330   40   8   5  25   6 normal
+   -1 sprites/toyland.png 8bpp 346   40  12   3  -5  20 normal
+   -1 sprites/toyland.png 8bpp 364   40   8   4 -31  13 normal
+   -1 sprites/toyland.png 8bpp 380   40  15   4  -7   0 normal

-   -1 sprites/toyland.png  10  70 09 20 38  -5 -8
-   -1 sprites/toyland.png  58  70 09 26 38  -5  5
-   -1 sprites/toyland.png 106  70 09 20 37 -31 11
-   -1 sprites/toyland.png 154  70 09 27 38 -31 -8
-   -1 sprites/toyland.png 202  70 09  9 16  17  3
-   -1 sprites/toyland.png 234  70 09  9 15  -7 22
-   -1 sprites/toyland.png 266  70 09  9 16 -31 11
-   -1 sprites/toyland.png 298  70 09  9 15  -6 -8
-   -1 sprites/toyland.png 330  70 09  7  8  25  5
-   -1 sprites/toyland.png 346  70 09  5 10  -4 27
-   -1 sprites/toyland.png 364  70 09  7  8 -31 11
-   -1 sprites/toyland.png 380  70 09  6 12  -5 -8
+   -1 sprites/toyland.png 8bpp  10   70  38  20  -5  -8 normal
+   -1 sprites/toyland.png 8bpp  58   70  38  26  -5   5 normal
+   -1 sprites/toyland.png 8bpp 106   70  37  20 -31  11 normal
+   -1 sprites/toyland.png 8bpp 154   70  38  27 -31  -8 normal
+   -1 sprites/toyland.png 8bpp 202   70  16   9  17   3 normal
+   -1 sprites/toyland.png 8bpp 234   70  15   9  -7  22 normal
+   -1 sprites/toyland.png 8bpp 266   70  16   9 -31  11 normal
+   -1 sprites/toyland.png 8bpp 298   70  15   9  -6  -8 normal
+   -1 sprites/toyland.png 8bpp 330   70   8   7  25   5 normal
+   -1 sprites/toyland.png 8bpp 346   70  10   5  -4  27 normal
+   -1 sprites/toyland.png 8bpp 364   70   8   7 -31  11 normal
+   -1 sprites/toyland.png 8bpp 380   70  12   6  -5  -8 normal

-   -1 sprites/toyland.png  10 100 09 18 39  -6  0
-   -1 sprites/toyland.png  58 100 09 11 38  -5 12
-   -1 sprites/toyland.png 106 100 09 18 39 -31  5
-   -1 sprites/toyland.png 154 100 09 11 40 -32  0
-   -1 sprites/toyland.png 202 100 09  6 20  13 12
-   -1 sprites/toyland.png 234 100 09  7 13  -5 16
-   -1 sprites/toyland.png 266 100 09  6 20 -31  5
-   -1 sprites/toyland.png 298 100 09  7 13  -6  0
-   -1 sprites/toyland.png 330 100 09  4  8  26 13
-   -1 sprites/toyland.png 346 100 09  3 12  -5 20
-   -1 sprites/toyland.png 364 100 09  5  8 -31  6
-   -1 sprites/toyland.png 380 100 09  4 15  -6  0
+   -1 sprites/toyland.png 8bpp  10  100  39  18  -6   0 normal
+   -1 sprites/toyland.png 8bpp  58  100  38  11  -5  12 normal
+   -1 sprites/toyland.png 8bpp 106  100  39  18 -31   5 normal
+   -1 sprites/toyland.png 8bpp 154  100  40  11 -32   0 normal
+   -1 sprites/toyland.png 8bpp 202  100  20   6  13  12 normal
+   -1 sprites/toyland.png 8bpp 234  100  13   7  -5  16 normal
+   -1 sprites/toyland.png 8bpp 266  100  20   6 -31   5 normal
+   -1 sprites/toyland.png 8bpp 298  100  13   7  -6   0 normal
+   -1 sprites/toyland.png 8bpp 330  100   8   4  26  13 normal
+   -1 sprites/toyland.png 8bpp 346  100  12   3  -5  20 normal
+   -1 sprites/toyland.png 8bpp 364  100   8   5 -31   6 normal
+   -1 sprites/toyland.png 8bpp 380  100  15   4  -6   0 normal

-   -1 sprites/toyland.png  10 130 09 27 38  -5 -8
-   -1 sprites/toyland.png  58 130 09 20 37  -4 11
-   -1 sprites/toyland.png 106 130 09 26 37 -31  5
-   -1 sprites/toyland.png 154 130 09 20 38 -31 -8
-   -1 sprites/toyland.png 202 130 09  9 16  17 11
-   -1 sprites/toyland.png 234 130 09  9 15  -6 22
-   -1 sprites/toyland.png 266 130 09  9 16 -31  3
-   -1 sprites/toyland.png 298 130 09  9 15  -7 -8
-   -1 sprites/toyland.png 330 130 09  7  8  25 11
-   -1 sprites/toyland.png 346 130 09  5 10  -4 26
-   -1 sprites/toyland.png 364 130 09  7  8 -31  5
-   -1 sprites/toyland.png 380 130 09  6 12  -5 -8
+   -1 sprites/toyland.png 8bpp  10  130  38  27  -5  -8 normal
+   -1 sprites/toyland.png 8bpp  58  130  37  20  -4  11 normal
+   -1 sprites/toyland.png 8bpp 106  130  37  26 -31   5 normal
+   -1 sprites/toyland.png 8bpp 154  130  38  20 -31  -8 normal
+   -1 sprites/toyland.png 8bpp 202  130  16   9  17  11 normal
+   -1 sprites/toyland.png 8bpp 234  130  15   9  -6  22 normal
+   -1 sprites/toyland.png 8bpp 266  130  16   9 -31   3 normal
+   -1 sprites/toyland.png 8bpp 298  130  15   9  -7  -8 normal
+   -1 sprites/toyland.png 8bpp 330  130   8   7  25  11 normal
+   -1 sprites/toyland.png 8bpp 346  130  10   5  -4  26 normal
+   -1 sprites/toyland.png 8bpp 364  130   8   7 -31   5 normal
+   -1 sprites/toyland.png 8bpp 380  130  12   6  -5  -8 normal
   -1 * 7	 02 05 50 01 00 00 00

   -1 * 4	 01 05 01 3C
-   -1 sprites/toyland.png  10 210 09 19 38  -5  0
-   -1 sprites/toyland.png  58 210 09 18 38  -5 13
-   -1 sprites/toyland.png 106 210 09 18 38 -31 13
-   -1 sprites/toyland.png 154 210 09 19 38 -31  0
-   -1 sprites/toyland.png 202 210 09  9 19  14 11
-   -1 sprites/toyland.png 234 210 09  9 16  -7 22
-   -1 sprites/toyland.png 266 210 09  9 19 -31 11
-   -1 sprites/toyland.png 298 210 09  9 16  -7  0
-   -1 sprites/toyland.png 330 210 09  6  8  25 13
-   -1 sprites/toyland.png 346 210 09  4 12  -5 27
-   -1 sprites/toyland.png 364 210 09  6  8 -31 13
-   -1 sprites/toyland.png 380 210 09  5 12  -5  0
+   -1 sprites/toyland.png 8bpp  10  210  38  19  -5   0 normal
+   -1 sprites/toyland.png 8bpp  58  210  38  18  -5  13 normal
+   -1 sprites/toyland.png 8bpp 106  210  38  18 -31  13 normal
+   -1 sprites/toyland.png 8bpp 154  210  38  19 -31   0 normal
+   -1 sprites/toyland.png 8bpp 202  210  19   9  14  11 normal
+   -1 sprites/toyland.png 8bpp 234  210  16   9  -7  22 normal
+   -1 sprites/toyland.png 8bpp 266  210  19   9 -31  11 normal
+   -1 sprites/toyland.png 8bpp 298  210  16   9  -7   0 normal
+   -1 sprites/toyland.png 8bpp 330  210   8   6  25  13 normal
+   -1 sprites/toyland.png 8bpp 346  210  12   4  -5  27 normal
+   -1 sprites/toyland.png 8bpp 364  210   8   6 -31  13 normal
+   -1 sprites/toyland.png 8bpp 380  210  12   5  -5   0 normal

-   -1 sprites/toyland.png  10 240 09 11 40  -7  0
-   -1 sprites/toyland.png  58 240 09 18 39  -6  5
-   -1 sprites/toyland.png 106 240 09 11 38 -31 12
-   -1 sprites/toyland.png 154 240 09 18 39 -31  0
-   -1 sprites/toyland.png 202 240 09  6 20  13  5
-   -1 sprites/toyland.png 234 240 09  7 13  -6 16
-   -1 sprites/toyland.png 266 240 09  6 20 -31 12
-   -1 sprites/toyland.png 298 240 09  7 13  -5  0
-   -1 sprites/toyland.png 330 240 09  5  8  25  6
-   -1 sprites/toyland.png 346 240 09  3 12  -5 20
-   -1 sprites/toyland.png 364 240 09  4  8 -31 13
-   -1 sprites/toyland.png 380 240 09  4 15  -7  0
+   -1 sprites/toyland.png 8bpp  10  240  40  11  -7   0 normal
+   -1 sprites/toyland.png 8bpp  58  240  39  18  -6   5 normal
+   -1 sprites/toyland.png 8bpp 106  240  38  11 -31  12 normal
+   -1 sprites/toyland.png 8bpp 154  240  39  18 -31   0 normal
+   -1 sprites/toyland.png 8bpp 202  240  20   6  13   5 normal
+   -1 sprites/toyland.png 8bpp 234  240  13   7  -6  16 normal
+   -1 sprites/toyland.png 8bpp 266  240  20   6 -31  12 normal
+   -1 sprites/toyland.png 8bpp 298  240  13   7  -5   0 normal
+   -1 sprites/toyland.png 8bpp 330  240   8   5  25   6 normal
+   -1 sprites/toyland.png 8bpp 346  240  12   3  -5  20 normal
+   -1 sprites/toyland.png 8bpp 364  240   8   4 -31  13 normal
+   -1 sprites/toyland.png 8bpp 380  240  15   4  -7   0 normal

-   -1 sprites/toyland.png  10 270 09 20 38  -5 -8
-   -1 sprites/toyland.png  58 270 09 26 38  -5  5
-   -1 sprites/toyland.png 106 270 09 20 37 -31 11
-   -1 sprites/toyland.png 154 270 09 27 38 -31 -8
-   -1 sprites/toyland.png 202 270 09  9 16  17  3
-   -1 sprites/toyland.png 234 270 09  9 15  -7 22
-   -1 sprites/toyland.png 266 270 09  9 16 -31 11
-   -1 sprites/toyland.png 298 270 09  9 15  -6 -8
-   -1 sprites/toyland.png 330 270 09  7  8  25  5
-   -1 sprites/toyland.png 346 270 09  5 10  -4 27
-   -1 sprites/toyland.png 364 270 09  7  8 -31 11
-   -1 sprites/toyland.png 380 270 09  6 12  -5 -8
+   -1 sprites/toyland.png 8bpp  10  270  38  20  -5  -8 normal
+   -1 sprites/toyland.png 8bpp  58  270  38  26  -5   5 normal
+   -1 sprites/toyland.png 8bpp 106  270  37  20 -31  11 normal
+   -1 sprites/toyland.png 8bpp 154  270  38  27 -31  -8 normal
+   -1 sprites/toyland.png 8bpp 202  270  16   9  17   3 normal
+   -1 sprites/toyland.png 8bpp 234  270  15   9  -7  22 normal
+   -1 sprites/toyland.png 8bpp 266  270  16   9 -31  11 normal
+   -1 sprites/toyland.png 8bpp 298  270  15   9  -6  -8 normal
+   -1 sprites/toyland.png 8bpp 330  270   8   7  25   5 normal
+   -1 sprites/toyland.png 8bpp 346  270  10   5  -4  27 normal
+   -1 sprites/toyland.png 8bpp 364  270   8   7 -31  11 normal
+   -1 sprites/toyland.png 8bpp 380  270  12   6  -5  -8 normal

-   -1 sprites/toyland.png  10 300 09 18 39  -6  0
-   -1 sprites/toyland.png  58 300 09 11 38  -5 12
-   -1 sprites/toyland.png 106 300 09 18 39 -31  5
-   -1 sprites/toyland.png 154 300 09 11 40 -32  0
-   -1 sprites/toyland.png 202 300 09  6 20  13 12
-   -1 sprites/toyland.png 234 300 09  7 13  -5 16
-   -1 sprites/toyland.png 266 300 09  6 20 -31  5
-   -1 sprites/toyland.png 298 300 09  7 13  -6  0
-   -1 sprites/toyland.png 330 300 09  4  8  26 13
-   -1 sprites/toyland.png 346 300 09  3 12  -5 20
-   -1 sprites/toyland.png 364 300 09  5  8 -31  6
-   -1 sprites/toyland.png 380 300 09  4 15  -6  0
+   -1 sprites/toyland.png 8bpp  10  300  39  18  -6   0 normal
+   -1 sprites/toyland.png 8bpp  58  300  38  11  -5  12 normal
+   -1 sprites/toyland.png 8bpp 106  300  39  18 -31   5 normal
+   -1 sprites/toyland.png 8bpp 154  300  40  11 -32   0 normal
+   -1 sprites/toyland.png 8bpp 202  300  20   6  13  12 normal
+   -1 sprites/toyland.png 8bpp 234  300  13   7  -5  16 normal
+   -1 sprites/toyland.png 8bpp 266  300  20   6 -31   5 normal
+   -1 sprites/toyland.png 8bpp 298  300  13   7  -6   0 normal
+   -1 sprites/toyland.png 8bpp 330  300   8   4  26  13 normal
+   -1 sprites/toyland.png 8bpp 346  300  12   3  -5  20 normal
+   -1 sprites/toyland.png 8bpp 364  300   8   5 -31   6 normal
+   -1 sprites/toyland.png 8bpp 380  300  15   4  -6   0 normal

-   -1 sprites/toyland.png  10 330 09 27 38  -5 -8
-   -1 sprites/toyland.png  58 330 09 20 37  -4 11
-   -1 sprites/toyland.png 106 330 09 26 37 -31  5
-   -1 sprites/toyland.png 154 330 09 20 38 -31 -8
-   -1 sprites/toyland.png 202 330 09  9 16  17 11
-   -1 sprites/toyland.png 234 330 09  9 15  -6 22
-   -1 sprites/toyland.png 266 330 09  9 16 -31  3
-   -1 sprites/toyland.png 298 330 09  9 15  -7 -8
-   -1 sprites/toyland.png 330 330 09  7  8  25 11
-   -1 sprites/toyland.png 346 330 09  5 10  -4 26
-   -1 sprites/toyland.png 364 330 09  7  8 -31  5
-   -1 sprites/toyland.png 380 330 09  6 12  -5 -8
+   -1 sprites/toyland.png 8bpp  10  330  38  27  -5  -8 normal
+   -1 sprites/toyland.png 8bpp  58  330  37  20  -4  11 normal
+   -1 sprites/toyland.png 8bpp 106  330  37  26 -31   5 normal
+   -1 sprites/toyland.png 8bpp 154  330  38  20 -31  -8 normal
+   -1 sprites/toyland.png 8bpp 202  330  16   9  17  11 normal
+   -1 sprites/toyland.png 8bpp 234  330  15   9  -6  22 normal
+   -1 sprites/toyland.png 8bpp 266  330  16   9 -31   3 normal
+   -1 sprites/toyland.png 8bpp 298  330  15   9  -7  -8 normal
+   -1 sprites/toyland.png 8bpp 330  330   8   7  25  11 normal
+   -1 sprites/toyland.png 8bpp 346  330  10   5  -4  26 normal
+   -1 sprites/toyland.png 8bpp 364  330   8   7 -31   5 normal
+   -1 sprites/toyland.png 8bpp 380  330  12   6  -5  -8 normal
   -1 * 7	 02 05 51 01 00 00 00

   -1 * 14	 02 05 52 81 80 00 FF 01 50 00 00 00 51 00
--- a/media/extra_grf/rivers/tropic.nfo
+++ b/media/extra_grf/rivers/tropic.nfo
@@ -8,271 +8,271 @@
 //
   -1 * 0	 0C "Tropic river graphics by andythenorth (Andrew Parkhouse)"
   -1 * 4	 01 05 01 3C
-   -1 sprites/tropic_desert.png  10  10 09 19 38  -5  0
-   -1 sprites/tropic_desert.png  58  10 09 18 38  -5 13
-   -1 sprites/tropic_desert.png 106  10 09 18 38 -31 13
-   -1 sprites/tropic_desert.png 154  10 09 19 38 -31  0
-   -1 sprites/tropic_desert.png 202  10 09  9 19  14 11
-   -1 sprites/tropic_desert.png 234  10 09  9 16  -7 22
-   -1 sprites/tropic_desert.png 266  10 09  9 19 -31 11
-   -1 sprites/tropic_desert.png 298  10 09  9 16  -7  0
-   -1 sprites/tropic_desert.png 330  10 09  6  8  25 13
-   -1 sprites/tropic_desert.png 346  10 09  4 12  -5 27
-   -1 sprites/tropic_desert.png 364  10 09  6  8 -31 13
-   -1 sprites/tropic_desert.png 380  10 09  5 12  -5  0
+   -1 sprites/tropic_desert.png 8bpp  10   10  38  19  -5   0 normal
+   -1 sprites/tropic_desert.png 8bpp  58   10  38  18  -5  13 normal
+   -1 sprites/tropic_desert.png 8bpp 106   10  38  18 -31  13 normal
+   -1 sprites/tropic_desert.png 8bpp 154   10  38  19 -31   0 normal
+   -1 sprites/tropic_desert.png 8bpp 202   10  19   9  14  11 normal
+   -1 sprites/tropic_desert.png 8bpp 234   10  16   9  -7  22 normal
+   -1 sprites/tropic_desert.png 8bpp 266   10  19   9 -31  11 normal
+   -1 sprites/tropic_desert.png 8bpp 298   10  16   9  -7   0 normal
+   -1 sprites/tropic_desert.png 8bpp 330   10   8   6  25  13 normal
+   -1 sprites/tropic_desert.png 8bpp 346   10  12   4  -5  27 normal
+   -1 sprites/tropic_desert.png 8bpp 364   10   8   6 -31  13 normal
+   -1 sprites/tropic_desert.png 8bpp 380   10  12   5  -5   0 normal

-   -1 sprites/tropic_desert.png  10  40 09 11 40  -7  0
-   -1 sprites/tropic_desert.png  58  40 09 18 39  -6  5
-   -1 sprites/tropic_desert.png 106  40 09 11 38 -31 12
-   -1 sprites/tropic_desert.png 154  40 09 18 39 -31  0
-   -1 sprites/tropic_desert.png 202  40 09  6 20  13  5
-   -1 sprites/tropic_desert.png 234  40 09  7 13  -6 16
-   -1 sprites/tropic_desert.png 266  40 09  6 20 -31 12
-   -1 sprites/tropic_desert.png 298  40 09  7 13  -5  0
-   -1 sprites/tropic_desert.png 330  40 09  5  8  25  6
-   -1 sprites/tropic_desert.png 346  40 09  3 12  -5 20
-   -1 sprites/tropic_desert.png 364  40 09  4  8 -31 13
-   -1 sprites/tropic_desert.png 380  40 09  4 15  -7  0
+   -1 sprites/tropic_desert.png 8bpp  10   40  40  11  -7   0 normal
+   -1 sprites/tropic_desert.png 8bpp  58   40  39  18  -6   5 normal
+   -1 sprites/tropic_desert.png 8bpp 106   40  38  11 -31  12 normal
+   -1 sprites/tropic_desert.png 8bpp 154   40  39  18 -31   0 normal
+   -1 sprites/tropic_desert.png 8bpp 202   40  20   6  13   5 normal
+   -1 sprites/tropic_desert.png 8bpp 234   40  13   7  -6  16 normal
+   -1 sprites/tropic_desert.png 8bpp 266   40  20   6 -31  12 normal
+   -1 sprites/tropic_desert.png 8bpp 298   40  13   7  -5   0 normal
+   -1 sprites/tropic_desert.png 8bpp 330   40   8   5  25   6 normal
+   -1 sprites/tropic_desert.png 8bpp 346   40  12   3  -5  20 normal
+   -1 sprites/tropic_desert.png 8bpp 364   40   8   4 -31  13 normal
+   -1 sprites/tropic_desert.png 8bpp 380   40  15   4  -7   0 normal

-   -1 sprites/tropic_desert.png  10  70 09 20 38  -5 -8
-   -1 sprites/tropic_desert.png  58  70 09 26 38  -5  5
-   -1 sprites/tropic_desert.png 106  70 09 20 37 -31 11
-   -1 sprites/tropic_desert.png 154  70 09 27 38 -31 -8
-   -1 sprites/tropic_desert.png 202  70 09  9 16  17  3
-   -1 sprites/tropic_desert.png 234  70 09  9 15  -7 22
-   -1 sprites/tropic_desert.png 266  70 09  9 16 -31 11
-   -1 sprites/tropic_desert.png 298  70 09  9 15  -6 -8
-   -1 sprites/tropic_desert.png 330  70 09  7  8  25  5
-   -1 sprites/tropic_desert.png 346  70 09  5 10  -4 27
-   -1 sprites/tropic_desert.png 364  70 09  7  8 -31 11
-   -1 sprites/tropic_desert.png 380  70 09  6 12  -5 -8
+   -1 sprites/tropic_desert.png 8bpp  10   70  38  20  -5  -8 normal
+   -1 sprites/tropic_desert.png 8bpp  58   70  38  26  -5   5 normal
+   -1 sprites/tropic_desert.png 8bpp 106   70  37  20 -31  11 normal
+   -1 sprites/tropic_desert.png 8bpp 154   70  38  27 -31  -8 normal
+   -1 sprites/tropic_desert.png 8bpp 202   70  16   9  17   3 normal
+   -1 sprites/tropic_desert.png 8bpp 234   70  15   9  -7  22 normal
+   -1 sprites/tropic_desert.png 8bpp 266   70  16   9 -31  11 normal
+   -1 sprites/tropic_desert.png 8bpp 298   70  15   9  -6  -8 normal
+   -1 sprites/tropic_desert.png 8bpp 330   70   8   7  25   5 normal
+   -1 sprites/tropic_desert.png 8bpp 346   70  10   5  -4  27 normal
+   -1 sprites/tropic_desert.png 8bpp 364   70   8   7 -31  11 normal
+   -1 sprites/tropic_desert.png 8bpp 380   70  12   6  -5  -8 normal

-   -1 sprites/tropic_desert.png  10 100 09 18 39  -6  0
-   -1 sprites/tropic_desert.png  58 100 09 11 38  -5 12
-   -1 sprites/tropic_desert.png 106 100 09 18 39 -31  5
-   -1 sprites/tropic_desert.png 154 100 09 11 40 -32  0
-   -1 sprites/tropic_desert.png 202 100 09  6 20  13 12
-   -1 sprites/tropic_desert.png 234 100 09  7 13  -5 16
-   -1 sprites/tropic_desert.png 266 100 09  6 20 -31  5
-   -1 sprites/tropic_desert.png 298 100 09  7 13  -6  0
-   -1 sprites/tropic_desert.png 330 100 09  4  8  26 13
-   -1 sprites/tropic_desert.png 346 100 09  3 12  -5 20
-   -1 sprites/tropic_desert.png 364 100 09  5  8 -31  6
-   -1 sprites/tropic_desert.png 380 100 09  4 15  -6  0
+   -1 sprites/tropic_desert.png 8bpp  10  100  39  18  -6   0 normal
+   -1 sprites/tropic_desert.png 8bpp  58  100  38  11  -5  12 normal
+   -1 sprites/tropic_desert.png 8bpp 106  100  39  18 -31   5 normal
+   -1 sprites/tropic_desert.png 8bpp 154  100  40  11 -32   0 normal
+   -1 sprites/tropic_desert.png 8bpp 202  100  20   6  13  12 normal
+   -1 sprites/tropic_desert.png 8bpp 234  100  13   7  -5  16 normal
+   -1 sprites/tropic_desert.png 8bpp 266  100  20   6 -31   5 normal
+   -1 sprites/tropic_desert.png 8bpp 298  100  13   7  -6   0 normal
+   -1 sprites/tropic_desert.png 8bpp 330  100   8   4  26  13 normal
+   -1 sprites/tropic_desert.png 8bpp 346  100  12   3  -5  20 normal
+   -1 sprites/tropic_desert.png 8bpp 364  100   8   5 -31   6 normal
+   -1 sprites/tropic_desert.png 8bpp 380  100  15   4  -6   0 normal

-   -1 sprites/tropic_desert.png  10 130 09 27 38  -5 -8
-   -1 sprites/tropic_desert.png  58 130 09 20 37  -4 11
-   -1 sprites/tropic_desert.png 106 130 09 26 37 -31  5
-   -1 sprites/tropic_desert.png 154 130 09 20 38 -31 -8
-   -1 sprites/tropic_desert.png 202 130 09  9 16  17 11
-   -1 sprites/tropic_desert.png 234 130 09  9 15  -6 22
-   -1 sprites/tropic_desert.png 266 130 09  9 16 -31  3
-   -1 sprites/tropic_desert.png 298 130 09  9 15  -7 -8
-   -1 sprites/tropic_desert.png 330 130 09  7  8  25 11
-   -1 sprites/tropic_desert.png 346 130 09  5 10  -4 26
-   -1 sprites/tropic_desert.png 364 130 09  7  8 -31  5
-   -1 sprites/tropic_desert.png 380 130 09  6 12  -5 -8
+   -1 sprites/tropic_desert.png 8bpp  10  130  38  27  -5  -8 normal
+   -1 sprites/tropic_desert.png 8bpp  58  130  37  20  -4  11 normal
+   -1 sprites/tropic_desert.png 8bpp 106  130  37  26 -31   5 normal
+   -1 sprites/tropic_desert.png 8bpp 154  130  38  20 -31  -8 normal
+   -1 sprites/tropic_desert.png 8bpp 202  130  16   9  17  11 normal
+   -1 sprites/tropic_desert.png 8bpp 234  130  15   9  -6  22 normal
+   -1 sprites/tropic_desert.png 8bpp 266  130  16   9 -31   3 normal
+   -1 sprites/tropic_desert.png 8bpp 298  130  15   9  -7  -8 normal
+   -1 sprites/tropic_desert.png 8bpp 330  130   8   7  25  11 normal
+   -1 sprites/tropic_desert.png 8bpp 346  130  10   5  -4  26 normal
+   -1 sprites/tropic_desert.png 8bpp 364  130   8   7 -31   5 normal
+   -1 sprites/tropic_desert.png 8bpp 380  130  12   6  -5  -8 normal
   -1 * 7	 02 05 40 01 00 00 00

   -1 * 4	 01 05 01 3C
-   -1 sprites/tropic_forest.png  10  10 09 19 38  -5  0
-   -1 sprites/tropic_forest.png  58  10 09 18 38  -5 13
-   -1 sprites/tropic_forest.png 106  10 09 18 38 -31 13
-   -1 sprites/tropic_forest.png 154  10 09 19 38 -31  0
-   -1 sprites/tropic_forest.png 202  10 09  9 19  14 11
-   -1 sprites/tropic_forest.png 234  10 09  9 16  -7 22
-   -1 sprites/tropic_forest.png 266  10 09  9 19 -31 11
-   -1 sprites/tropic_forest.png 298  10 09  9 16  -7  0
-   -1 sprites/tropic_forest.png 330  10 09  6  8  25 13
-   -1 sprites/tropic_forest.png 346  10 09  4 12  -5 27
-   -1 sprites/tropic_forest.png 364  10 09  6  8 -31 13
-   -1 sprites/tropic_forest.png 380  10 09  5 12  -5  0
+   -1 sprites/tropic_forest.png 8bpp  10   10  38  19  -5   0 normal
+   -1 sprites/tropic_forest.png 8bpp  58   10  38  18  -5  13 normal
+   -1 sprites/tropic_forest.png 8bpp 106   10  38  18 -31  13 normal
+   -1 sprites/tropic_forest.png 8bpp 154   10  38  19 -31   0 normal
+   -1 sprites/tropic_forest.png 8bpp 202   10  19   9  14  11 normal
+   -1 sprites/tropic_forest.png 8bpp 234   10  16   9  -7  22 normal
+   -1 sprites/tropic_forest.png 8bpp 266   10  19   9 -31  11 normal
+   -1 sprites/tropic_forest.png 8bpp 298   10  16   9  -7   0 normal
+   -1 sprites/tropic_forest.png 8bpp 330   10   8   6  25  13 normal
+   -1 sprites/tropic_forest.png 8bpp 346   10  12   4  -5  27 normal
+   -1 sprites/tropic_forest.png 8bpp 364   10   8   6 -31  13 normal
+   -1 sprites/tropic_forest.png 8bpp 380   10  12   5  -5   0 normal

-   -1 sprites/tropic_forest.png  10  40 09 11 40  -7  0
-   -1 sprites/tropic_forest.png  58  40 09 18 39  -6  5
-   -1 sprites/tropic_forest.png 106  40 09 11 38 -31 12
-   -1 sprites/tropic_forest.png 154  40 09 18 39 -31  0
-   -1 sprites/tropic_forest.png 202  40 09  6 20  13  5
-   -1 sprites/tropic_forest.png 234  40 09  7 13  -6 16
-   -1 sprites/tropic_forest.png 266  40 09  6 20 -31 12
-   -1 sprites/tropic_forest.png 298  40 09  7 13  -5  0
-   -1 sprites/tropic_forest.png 330  40 09  5  8  25  6
-   -1 sprites/tropic_forest.png 346  40 09  3 12  -5 20
-   -1 sprites/tropic_forest.png 364  40 09  4  8 -31 13
-   -1 sprites/tropic_forest.png 380  40 09  4 15  -7  0
+   -1 sprites/tropic_forest.png 8bpp  10   40  40  11  -7   0 normal
+   -1 sprites/tropic_forest.png 8bpp  58   40  39  18  -6   5 normal
+   -1 sprites/tropic_forest.png 8bpp 106   40  38  11 -31  12 normal
+   -1 sprites/tropic_forest.png 8bpp 154   40  39  18 -31   0 normal
+   -1 sprites/tropic_forest.png 8bpp 202   40  20   6  13   5 normal
+   -1 sprites/tropic_forest.png 8bpp 234   40  13   7  -6  16 normal
+   -1 sprites/tropic_forest.png 8bpp 266   40  20   6 -31  12 normal
+   -1 sprites/tropic_forest.png 8bpp 298   40  13   7  -5   0 normal
+   -1 sprites/tropic_forest.png 8bpp 330   40   8   5  25   6 normal
+   -1 sprites/tropic_forest.png 8bpp 346   40  12   3  -5  20 normal
+   -1 sprites/tropic_forest.png 8bpp 364   40   8   4 -31  13 normal
+   -1 sprites/tropic_forest.png 8bpp 380   40  15   4  -7   0 normal

-   -1 sprites/tropic_forest.png  10  70 09 20 38  -5 -8
-   -1 sprites/tropic_forest.png  58  70 09 26 38  -5  5
-   -1 sprites/tropic_forest.png 106  70 09 20 37 -31 11
-   -1 sprites/tropic_forest.png 154  70 09 27 38 -31 -8
-   -1 sprites/tropic_forest.png 202  70 09  9 16  17  3
-   -1 sprites/tropic_forest.png 234  70 09  9 15  -7 22
-   -1 sprites/tropic_forest.png 266  70 09  9 16 -31 11
-   -1 sprites/tropic_forest.png 298  70 09  9 15  -6 -8
-   -1 sprites/tropic_forest.png 330  70 09  7  8  25  5
-   -1 sprites/tropic_forest.png 346  70 09  5 10  -4 27
-   -1 sprites/tropic_forest.png 364  70 09  7  8 -31 11
-   -1 sprites/tropic_forest.png 380  70 09  6 12  -5 -8
+   -1 sprites/tropic_forest.png 8bpp  10   70  38  20  -5  -8 normal
+   -1 sprites/tropic_forest.png 8bpp  58   70  38  26  -5   5 normal
+   -1 sprites/tropic_forest.png 8bpp 106   70  37  20 -31  11 normal
+   -1 sprites/tropic_forest.png 8bpp 154   70  38  27 -31  -8 normal
+   -1 sprites/tropic_forest.png 8bpp 202   70  16   9  17   3 normal
+   -1 sprites/tropic_forest.png 8bpp 234   70  15   9  -7  22 normal
+   -1 sprites/tropic_forest.png 8bpp 266   70  16   9 -31  11 normal
+   -1 sprites/tropic_forest.png 8bpp 298   70  15   9  -6  -8 normal
+   -1 sprites/tropic_forest.png 8bpp 330   70   8   7  25   5 normal
+   -1 sprites/tropic_forest.png 8bpp 346   70  10   5  -4  27 normal
+   -1 sprites/tropic_forest.png 8bpp 364   70   8   7 -31  11 normal
+   -1 sprites/tropic_forest.png 8bpp 380   70  12   6  -5  -8 normal

-   -1 sprites/tropic_forest.png  10 100 09 18 39  -6  0
-   -1 sprites/tropic_forest.png  58 100 09 11 38  -5 12
-   -1 sprites/tropic_forest.png 106 100 09 18 39 -31  5
-   -1 sprites/tropic_forest.png 154 100 09 11 40 -32  0
-   -1 sprites/tropic_forest.png 202 100 09  6 20  13 12
-   -1 sprites/tropic_forest.png 234 100 09  7 13  -5 16
-   -1 sprites/tropic_forest.png 266 100 09  6 20 -31  5
-   -1 sprites/tropic_forest.png 298 100 09  7 13  -6  0
-   -1 sprites/tropic_forest.png 330 100 09  4  8  26 13
-   -1 sprites/tropic_forest.png 346 100 09  3 12  -5 20
-   -1 sprites/tropic_forest.png 364 100 09  5  8 -31  6
-   -1 sprites/tropic_forest.png 380 100 09  4 15  -6  0
+   -1 sprites/tropic_forest.png 8bpp  10  100  39  18  -6   0 normal
+   -1 sprites/tropic_forest.png 8bpp  58  100  38  11  -5  12 normal
+   -1 sprites/tropic_forest.png 8bpp 106  100  39  18 -31   5 normal
+   -1 sprites/tropic_forest.png 8bpp 154  100  40  11 -32   0 normal
+   -1 sprites/tropic_forest.png 8bpp 202  100  20   6  13  12 normal
+   -1 sprites/tropic_forest.png 8bpp 234  100  13   7  -5  16 normal
+   -1 sprites/tropic_forest.png 8bpp 266  100  20   6 -31   5 normal
+   -1 sprites/tropic_forest.png 8bpp 298  100  13   7  -6   0 normal
+   -1 sprites/tropic_forest.png 8bpp 330  100   8   4  26  13 normal
+   -1 sprites/tropic_forest.png 8bpp 346  100  12   3  -5  20 normal
+   -1 sprites/tropic_forest.png 8bpp 364  100   8   5 -31   6 normal
+   -1 sprites/tropic_forest.png 8bpp 380  100  15   4  -6   0 normal

-   -1 sprites/tropic_forest.png  10 130 09 27 38  -5 -8
-   -1 sprites/tropic_forest.png  58 130 09 20 37  -4 11
-   -1 sprites/tropic_forest.png 106 130 09 26 37 -31  5
-   -1 sprites/tropic_forest.png 154 130 09 20 38 -31 -8
-   -1 sprites/tropic_forest.png 202 130 09  9 16  17 11
-   -1 sprites/tropic_forest.png 234 130 09  9 15  -6 22
-   -1 sprites/tropic_forest.png 266 130 09  9 16 -31  3
-   -1 sprites/tropic_forest.png 298 130 09  9 15  -7 -8
-   -1 sprites/tropic_forest.png 330 130 09  7  8  25 11
-   -1 sprites/tropic_forest.png 346 130 09  5 10  -4 26
-   -1 sprites/tropic_forest.png 364 130 09  7  8 -31  5
-   -1 sprites/tropic_forest.png 380 130 09  6 12  -5 -8
+   -1 sprites/tropic_forest.png 8bpp  10  130  38  27  -5  -8 normal
+   -1 sprites/tropic_forest.png 8bpp  58  130  37  20  -4  11 normal
+   -1 sprites/tropic_forest.png 8bpp 106  130  37  26 -31   5 normal
+   -1 sprites/tropic_forest.png 8bpp 154  130  38  20 -31  -8 normal
+   -1 sprites/tropic_forest.png 8bpp 202  130  16   9  17  11 normal
+   -1 sprites/tropic_forest.png 8bpp 234  130  15   9  -6  22 normal
+   -1 sprites/tropic_forest.png 8bpp 266  130  16   9 -31   3 normal
+   -1 sprites/tropic_forest.png 8bpp 298  130  15   9  -7  -8 normal
+   -1 sprites/tropic_forest.png 8bpp 330  130   8   7  25  11 normal
+   -1 sprites/tropic_forest.png 8bpp 346  130  10   5  -4  26 normal
+   -1 sprites/tropic_forest.png 8bpp 364  130   8   7 -31   5 normal
+   -1 sprites/tropic_forest.png 8bpp 380  130  12   6  -5  -8 normal
   -1 * 7	 02 05 41 01 00 00 00

   -1 * 4	 01 05 01 3C
-   -1 sprites/tropic_desert.png  10 210 09 19 38  -5  0
-   -1 sprites/tropic_desert.png  58 210 09 18 38  -5 13
-   -1 sprites/tropic_desert.png 106 210 09 18 38 -31 13
-   -1 sprites/tropic_desert.png 154 210 09 19 38 -31  0
-   -1 sprites/tropic_desert.png 202 210 09  9 19  14 11
-   -1 sprites/tropic_desert.png 234 210 09  9 16  -7 22
-   -1 sprites/tropic_desert.png 266 210 09  9 19 -31 11
-   -1 sprites/tropic_desert.png 298 210 09  9 16  -7  0
-   -1 sprites/tropic_desert.png 330 210 09  6  8  25 13
-   -1 sprites/tropic_desert.png 346 210 09  4 12  -5 27
-   -1 sprites/tropic_desert.png 364 210 09  6  8 -31 13
-   -1 sprites/tropic_desert.png 380 210 09  5 12  -5  0
+   -1 sprites/tropic_desert.png 8bpp  10  210  38  19  -5   0 normal
+   -1 sprites/tropic_desert.png 8bpp  58  210  38  18  -5  13 normal
+   -1 sprites/tropic_desert.png 8bpp 106  210  38  18 -31  13 normal
+   -1 sprites/tropic_desert.png 8bpp 154  210  38  19 -31   0 normal
+   -1 sprites/tropic_desert.png 8bpp 202  210  19   9  14  11 normal
+   -1 sprites/tropic_desert.png 8bpp 234  210  16   9  -7  22 normal
+   -1 sprites/tropic_desert.png 8bpp 266  210  19   9 -31  11 normal
+   -1 sprites/tropic_desert.png 8bpp 298  210  16   9  -7   0 normal
+   -1 sprites/tropic_desert.png 8bpp 330  210   8   6  25  13 normal
+   -1 sprites/tropic_desert.png 8bpp 346  210  12   4  -5  27 normal
+   -1 sprites/tropic_desert.png 8bpp 364  210   8   6 -31  13 normal
+   -1 sprites/tropic_desert.png 8bpp 380  210  12   5  -5   0 normal

-   -1 sprites/tropic_desert.png  10 240 09 11 40  -7  0
-   -1 sprites/tropic_desert.png  58 240 09 18 39  -6  5
-   -1 sprites/tropic_desert.png 106 240 09 11 38 -31 12
-   -1 sprites/tropic_desert.png 154 240 09 18 39 -31  0
-   -1 sprites/tropic_desert.png 202 240 09  6 20  13  5
-   -1 sprites/tropic_desert.png 234 240 09  7 13  -6 16
-   -1 sprites/tropic_desert.png 266 240 09  6 20 -31 12
-   -1 sprites/tropic_desert.png 298 240 09  7 13  -5  0
-   -1 sprites/tropic_desert.png 330 240 09  5  8  25  6
-   -1 sprites/tropic_desert.png 346 240 09  3 12  -5 20
-   -1 sprites/tropic_desert.png 364 240 09  4  8 -31 13
-   -1 sprites/tropic_desert.png 380 240 09  4 15  -7  0
+   -1 sprites/tropic_desert.png 8bpp  10  240  40  11  -7   0 normal
+   -1 sprites/tropic_desert.png 8bpp  58  240  39  18  -6   5 normal
+   -1 sprites/tropic_desert.png 8bpp 106  240  38  11 -31  12 normal
+   -1 sprites/tropic_desert.png 8bpp 154  240  39  18 -31   0 normal
+   -1 sprites/tropic_desert.png 8bpp 202  240  20   6  13   5 normal
+   -1 sprites/tropic_desert.png 8bpp 234  240  13   7  -6  16 normal
+   -1 sprites/tropic_desert.png 8bpp 266  240  20   6 -31  12 normal
+   -1 sprites/tropic_desert.png 8bpp 298  240  13   7  -5   0 normal
+   -1 sprites/tropic_desert.png 8bpp 330  240   8   5  25   6 normal
+   -1 sprites/tropic_desert.png 8bpp 346  240  12   3  -5  20 normal
+   -1 sprites/tropic_desert.png 8bpp 364  240   8   4 -31  13 normal
+   -1 sprites/tropic_desert.png 8bpp 380  240  15   4  -7   0 normal

-   -1 sprites/tropic_desert.png  10 270 09 20 38  -5 -8
-   -1 sprites/tropic_desert.png  58 270 09 26 38  -5  5
-   -1 sprites/tropic_desert.png 106 270 09 20 37 -31 11
-   -1 sprites/tropic_desert.png 154 270 09 27 38 -31 -8
-   -1 sprites/tropic_desert.png 202 270 09  9 16  17  3
-   -1 sprites/tropic_desert.png 234 270 09  9 15  -7 22
-   -1 sprites/tropic_desert.png 266 270 09  9 16 -31 11
-   -1 sprites/tropic_desert.png 298 270 09  9 15  -6 -8
-   -1 sprites/tropic_desert.png 330 270 09  7  8  25  5
-   -1 sprites/tropic_desert.png 346 270 09  5 10  -4 27
-   -1 sprites/tropic_desert.png 364 270 09  7  8 -31 11
-   -1 sprites/tropic_desert.png 380 270 09  6 12  -5 -8
+   -1 sprites/tropic_desert.png 8bpp  10  270  38  20  -5  -8 normal
+   -1 sprites/tropic_desert.png 8bpp  58  270  38  26  -5   5 normal
+   -1 sprites/tropic_desert.png 8bpp 106  270  37  20 -31  11 normal
+   -1 sprites/tropic_desert.png 8bpp 154  270  38  27 -31  -8 normal
+   -1 sprites/tropic_desert.png 8bpp 202  270  16   9  17   3 normal
+   -1 sprites/tropic_desert.png 8bpp 234  270  15   9  -7  22 normal
+   -1 sprites/tropic_desert.png 8bpp 266  270  16   9 -31  11 normal
+   -1 sprites/tropic_desert.png 8bpp 298  270  15   9  -6  -8 normal
+   -1 sprites/tropic_desert.png 8bpp 330  270   8   7  25   5 normal
+   -1 sprites/tropic_desert.png 8bpp 346  270  10   5  -4  27 normal
+   -1 sprites/tropic_desert.png 8bpp 364  270   8   7 -31  11 normal
+   -1 sprites/tropic_desert.png 8bpp 380  270  12   6  -5  -8 normal

-   -1 sprites/tropic_desert.png  10 300 09 18 39  -6  0
-   -1 sprites/tropic_desert.png  58 300 09 11 38  -5 12
-   -1 sprites/tropic_desert.png 106 300 09 18 39 -31  5
-   -1 sprites/tropic_desert.png 154 300 09 11 40 -32  0
-   -1 sprites/tropic_desert.png 202 300 09  6 20  13 12
-   -1 sprites/tropic_desert.png 234 300 09  7 13  -5 16
-   -1 sprites/tropic_desert.png 266 300 09  6 20 -31  5
-   -1 sprites/tropic_desert.png 298 300 09  7 13  -6  0
-   -1 sprites/tropic_desert.png 330 300 09  4  8  26 13
-   -1 sprites/tropic_desert.png 346 300 09  3 12  -5 20
-   -1 sprites/tropic_desert.png 364 300 09  5  8 -31  6
-   -1 sprites/tropic_desert.png 380 300 09  4 15  -6  0
+   -1 sprites/tropic_desert.png 8bpp  10  300  39  18  -6   0 normal
+   -1 sprites/tropic_desert.png 8bpp  58  300  38  11  -5  12 normal
+   -1 sprites/tropic_desert.png 8bpp 106  300  39  18 -31   5 normal
+   -1 sprites/tropic_desert.png 8bpp 154  300  40  11 -32   0 normal
+   -1 sprites/tropic_desert.png 8bpp 202  300  20   6  13  12 normal
+   -1 sprites/tropic_desert.png 8bpp 234  300  13   7  -5  16 normal
+   -1 sprites/tropic_desert.png 8bpp 266  300  20   6 -31   5 normal
+   -1 sprites/tropic_desert.png 8bpp 298  300  13   7  -6   0 normal
+   -1 sprites/tropic_desert.png 8bpp 330  300   8   4  26  13 normal
+   -1 sprites/tropic_desert.png 8bpp 346  300  12   3  -5  20 normal
+   -1 sprites/tropic_desert.png 8bpp 364  300   8   5 -31   6 normal
+   -1 sprites/tropic_desert.png 8bpp 380  300  15   4  -6   0 normal

-   -1 sprites/tropic_desert.png  10 330 09 27 38  -5 -8
-   -1 sprites/tropic_desert.png  58 330 09 20 37  -4 11
-   -1 sprites/tropic_desert.png 106 330 09 26 37 -31  5
-   -1 sprites/tropic_desert.png 154 330 09 20 38 -31 -8
-   -1 sprites/tropic_desert.png 202 330 09  9 16  17 11
-   -1 sprites/tropic_desert.png 234 330 09  9 15  -6 22
-   -1 sprites/tropic_desert.png 266 330 09  9 16 -31  3
-   -1 sprites/tropic_desert.png 298 330 09  9 15  -7 -8
-   -1 sprites/tropic_desert.png 330 330 09  7  8  25 11
-   -1 sprites/tropic_desert.png 346 330 09  5 10  -4 26
-   -1 sprites/tropic_desert.png 364 330 09  7  8 -31  5
-   -1 sprites/tropic_desert.png 380 330 09  6 12  -5 -8
+   -1 sprites/tropic_desert.png 8bpp  10  330  38  27  -5  -8 normal
+   -1 sprites/tropic_desert.png 8bpp  58  330  37  20  -4  11 normal
+   -1 sprites/tropic_desert.png 8bpp 106  330  37  26 -31   5 normal
+   -1 sprites/tropic_desert.png 8bpp 154  330  38  20 -31  -8 normal
+   -1 sprites/tropic_desert.png 8bpp 202  330  16   9  17  11 normal
+   -1 sprites/tropic_desert.png 8bpp 234  330  15   9  -6  22 normal
+   -1 sprites/tropic_desert.png 8bpp 266  330  16   9 -31   3 normal
+   -1 sprites/tropic_desert.png 8bpp 298  330  15   9  -7  -8 normal
+   -1 sprites/tropic_desert.png 8bpp 330  330   8   7  25  11 normal
+   -1 sprites/tropic_desert.png 8bpp 346  330  10   5  -4  26 normal
+   -1 sprites/tropic_desert.png 8bpp 364  330   8   7 -31   5 normal
+   -1 sprites/tropic_desert.png 8bpp 380  330  12   6  -5  -8 normal
   -1 * 7	 02 05 42 01 00 00 00

   -1 * 4	 01 05 01 3C
-   -1 sprites/tropic_forest.png  10 210 09 19 38  -5  0
-   -1 sprites/tropic_forest.png  58 210 09 18 38  -5 13
-   -1 sprites/tropic_forest.png 106 210 09 18 38 -31 13
-   -1 sprites/tropic_forest.png 154 210 09 19 38 -31  0
-   -1 sprites/tropic_forest.png 202 210 09  9 19  14 11
-   -1 sprites/tropic_forest.png 234 210 09  9 16  -7 22
-   -1 sprites/tropic_forest.png 266 210 09  9 19 -31 11
-   -1 sprites/tropic_forest.png 298 210 09  9 16  -7  0
-   -1 sprites/tropic_forest.png 330 210 09  6  8  25 13
-   -1 sprites/tropic_forest.png 346 210 09  4 12  -5 27
-   -1 sprites/tropic_forest.png 364 210 09  6  8 -31 13
-   -1 sprites/tropic_forest.png 380 210 09  5 12  -5  0
+   -1 sprites/tropic_forest.png 8bpp  10  210  38  19  -5   0 normal
+   -1 sprites/tropic_forest.png 8bpp  58  210  38  18  -5  13 normal
+   -1 sprites/tropic_forest.png 8bpp 106  210  38  18 -31  13 normal
+   -1 sprites/tropic_forest.png 8bpp 154  210  38  19 -31   0 normal
+   -1 sprites/tropic_forest.png 8bpp 202  210  19   9  14  11 normal
+   -1 sprites/tropic_forest.png 8bpp 234  210  16   9  -7  22 normal
+   -1 sprites/tropic_forest.png 8bpp 266  210  19   9 -31  11 normal
+   -1 sprites/tropic_forest.png 8bpp 298  210  16   9  -7   0 normal
+   -1 sprites/tropic_forest.png 8bpp 330  210   8   6  25  13 normal
+   -1 sprites/tropic_forest.png 8bpp 346  210  12   4  -5  27 normal
+   -1 sprites/tropic_forest.png 8bpp 364  210   8   6 -31  13 normal
+   -1 sprites/tropic_forest.png 8bpp 380  210  12   5  -5   0 normal

-   -1 sprites/tropic_forest.png  10 240 09 11 40  -7  0
-   -1 sprites/tropic_forest.png  58 240 09 18 39  -6  5
-   -1 sprites/tropic_forest.png 106 240 09 11 38 -31 12
-   -1 sprites/tropic_forest.png 154 240 09 18 39 -31  0
-   -1 sprites/tropic_forest.png 202 240 09  6 20  13  5
-   -1 sprites/tropic_forest.png 234 240 09  7 13  -6 16
-   -1 sprites/tropic_forest.png 266 240 09  6 20 -31 12
-   -1 sprites/tropic_forest.png 298 240 09  7 13  -5  0
-   -1 sprites/tropic_forest.png 330 240 09  5  8  25  6
-   -1 sprites/tropic_forest.png 346 240 09  3 12  -5 20
-   -1 sprites/tropic_forest.png 364 240 09  4  8 -31 13
-   -1 sprites/tropic_forest.png 380 240 09  4 15  -7  0
+   -1 sprites/tropic_forest.png 8bpp  10  240  40  11  -7   0 normal
+   -1 sprites/tropic_forest.png 8bpp  58  240  39  18  -6   5 normal
+   -1 sprites/tropic_forest.png 8bpp 106  240  38  11 -31  12 normal
+   -1 sprites/tropic_forest.png 8bpp 154  240  39  18 -31   0 normal
+   -1 sprites/tropic_forest.png 8bpp 202  240  20   6  13   5 normal
+   -1 sprites/tropic_forest.png 8bpp 234  240  13   7  -6  16 normal
+   -1 sprites/tropic_forest.png 8bpp 266  240  20   6 -31  12 normal
+   -1 sprites/tropic_forest.png 8bpp 298  240  13   7  -5   0 normal
+   -1 sprites/tropic_forest.png 8bpp 330  240   8   5  25   6 normal
+   -1 sprites/tropic_forest.png 8bpp 346  240  12   3  -5  20 normal
+   -1 sprites/tropic_forest.png 8bpp 364  240   8   4 -31  13 normal
+   -1 sprites/tropic_forest.png 8bpp 380  240  15   4  -7   0 normal

-   -1 sprites/tropic_forest.png  10 270 09 20 38  -5 -8
-   -1 sprites/tropic_forest.png  58 270 09 26 38  -5  5
-   -1 sprites/tropic_forest.png 106 270 09 20 37 -31 11
-   -1 sprites/tropic_forest.png 154 270 09 27 38 -31 -8
-   -1 sprites/tropic_forest.png 202 270 09  9 16  17  3
-   -1 sprites/tropic_forest.png 234 270 09  9 15  -7 22
-   -1 sprites/tropic_forest.png 266 270 09  9 16 -31 11
-   -1 sprites/tropic_forest.png 298 270 09  9 15  -6 -8
-   -1 sprites/tropic_forest.png 330 270 09  7  8  25  5
-   -1 sprites/tropic_forest.png 346 270 09  5 10  -4 27
-   -1 sprites/tropic_forest.png 364 270 09  7  8 -31 11
-   -1 sprites/tropic_forest.png 380 270 09  6 12  -5 -8
+   -1 sprites/tropic_forest.png 8bpp  10  270  38  20  -5  -8 normal
+   -1 sprites/tropic_forest.png 8bpp  58  270  38  26  -5   5 normal
+   -1 sprites/tropic_forest.png 8bpp 106  270  37  20 -31  11 normal
+   -1 sprites/tropic_forest.png 8bpp 154  270  38  27 -31  -8 normal
+   -1 sprites/tropic_forest.png 8bpp 202  270  16   9  17   3 normal
+   -1 sprites/tropic_forest.png 8bpp 234  270  15   9  -7  22 normal
+   -1 sprites/tropic_forest.png 8bpp 266  270  16   9 -31  11 normal
+   -1 sprites/tropic_forest.png 8bpp 298  270  15   9  -6  -8 normal
+   -1 sprites/tropic_forest.png 8bpp 330  270   8   7  25   5 normal
+   -1 sprites/tropic_forest.png 8bpp 346  270  10   5  -4  27 normal
+   -1 sprites/tropic_forest.png 8bpp 364  270   8   7 -31  11 normal
+   -1 sprites/tropic_forest.png 8bpp 380  270  12   6  -5  -8 normal

-   -1 sprites/tropic_forest.png  10 300 09 18 39  -6  0
-   -1 sprites/tropic_forest.png  58 300 09 11 38  -5 12
-   -1 sprites/tropic_forest.png 106 300 09 18 39 -31  5
-   -1 sprites/tropic_forest.png 154 300 09 11 40 -32  0
-   -1 sprites/tropic_forest.png 202 300 09  6 20  13 12
-   -1 sprites/tropic_forest.png 234 300 09  7 13  -5 16
-   -1 sprites/tropic_forest.png 266 300 09  6 20 -31  5
-   -1 sprites/tropic_forest.png 298 300 09  7 13  -6  0
-   -1 sprites/tropic_forest.png 330 300 09  4  8  26 13
-   -1 sprites/tropic_forest.png 346 300 09  3 12  -5 20
-   -1 sprites/tropic_forest.png 364 300 09  5  8 -31  6
-   -1 sprites/tropic_forest.png 380 300 09  4 15  -6  0
+   -1 sprites/tropic_forest.png 8bpp  10  300  39  18  -6   0 normal
+   -1 sprites/tropic_forest.png 8bpp  58  300  38  11  -5  12 normal
+   -1 sprites/tropic_forest.png 8bpp 106  300  39  18 -31   5 normal
+   -1 sprites/tropic_forest.png 8bpp 154  300  40  11 -32   0 normal
+   -1 sprites/tropic_forest.png 8bpp 202  300  20   6  13  12 normal
+   -1 sprites/tropic_forest.png 8bpp 234  300  13   7  -5  16 normal
+   -1 sprites/tropic_forest.png 8bpp 266  300  20   6 -31   5 normal
+   -1 sprites/tropic_forest.png 8bpp 298  300  13   7  -6   0 normal
+   -1 sprites/tropic_forest.png 8bpp 330  300   8   4  26  13 normal
+   -1 sprites/tropic_forest.png 8bpp 346  300  12   3  -5  20 normal
+   -1 sprites/tropic_forest.png 8bpp 364  300   8   5 -31   6 normal
+   -1 sprites/tropic_forest.png 8bpp 380  300  15   4  -6   0 normal

-   -1 sprites/tropic_forest.png  10 330 09 27 38  -5 -8
-   -1 sprites/tropic_forest.png  58 330 09 20 37  -4 11
-   -1 sprites/tropic_forest.png 106 330 09 26 37 -31  5
-   -1 sprites/tropic_forest.png 154 330 09 20 38 -31 -8
-   -1 sprites/tropic_forest.png 202 330 09  9 16  17 11
-   -1 sprites/tropic_forest.png 234 330 09  9 15  -6 22
-   -1 sprites/tropic_forest.png 266 330 09  9 16 -31  3
-   -1 sprites/tropic_forest.png 298 330 09  9 15  -7 -8
-   -1 sprites/tropic_forest.png 330 330 09  7  8  25 11
-   -1 sprites/tropic_forest.png 346 330 09  5 10  -4 26
-   -1 sprites/tropic_forest.png 364 330 09  7  8 -31  5
-   -1 sprites/tropic_forest.png 380 330 09  6 12  -5 -8
+   -1 sprites/tropic_forest.png 8bpp  10  330  38  27  -5  -8 normal
+   -1 sprites/tropic_forest.png 8bpp  58  330  37  20  -4  11 normal
+   -1 sprites/tropic_forest.png 8bpp 106  330  37  26 -31   5 normal
+   -1 sprites/tropic_forest.png 8bpp 154  330  38  20 -31  -8 normal
+   -1 sprites/tropic_forest.png 8bpp 202  330  16   9  17  11 normal
+   -1 sprites/tropic_forest.png 8bpp 234  330  15   9  -6  22 normal
+   -1 sprites/tropic_forest.png 8bpp 266  330  16   9 -31   3 normal
+   -1 sprites/tropic_forest.png 8bpp 298  330  15   9  -7  -8 normal
+   -1 sprites/tropic_forest.png 8bpp 330  330   8   7  25  11 normal
+   -1 sprites/tropic_forest.png 8bpp 346  330  10   5  -4  26 normal
+   -1 sprites/tropic_forest.png 8bpp 364  330   8   7 -31   5 normal
+   -1 sprites/tropic_forest.png 8bpp 380  330  12   6  -5  -8 normal
   -1 * 7	 02 05 43 01 00 00 00

   -1 * 14	 02 05 44 81 81 00 FF 01 40 00 01 01 41 00
--- a/media/extra_grf/roadstops.nfo
+++ b/media/extra_grf/roadstops.nfo
@@ -8,11 +8,11 @@
 //
   -1 * 0	 0C "Road stop graphics"
   -1 * 3	 05 11 08
-   -1 sprites/roadstops.png 34 8 09 23 13 5 -11
-   -1 sprites/roadstops.png 66 8 09 15 13 5 -2
-   -1 sprites/roadstops.png 98 8 09 19 21 -20 -7
-   -1 sprites/roadstops.png 130 8 09 17 22 -25 -4
-   -1 sprites/roadstops.png 162 8 09 25 32 -5 -9
-   -1 sprites/roadstops.png 210 8 09 26 28 -3 -12
-   -1 sprites/roadstops.png 258 8 09 25 29 -24 -12
-   -1 sprites/roadstops.png 306 8 09 25 32 -25 -9
+   -1 sprites/roadstops.png 8bpp  34    8  13  23   5 -11 normal
+   -1 sprites/roadstops.png 8bpp  66    8  13  15   5  -2 normal
+   -1 sprites/roadstops.png 8bpp  98    8  21  19 -20  -7 normal
+   -1 sprites/roadstops.png 8bpp 130    8  22  17 -25  -4 normal
+   -1 sprites/roadstops.png 8bpp 162    8  32  25  -5  -9 normal
+   -1 sprites/roadstops.png 8bpp 210    8  28  26  -3 -12 normal
+   -1 sprites/roadstops.png 8bpp 258    8  29  25 -24 -12 normal
+   -1 sprites/roadstops.png 8bpp 306    8  32  25 -25  -9 normal
--- a/media/extra_grf/shore.nfo
+++ b/media/extra_grf/shore.nfo
@@ -5,71 +5,57 @@
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 // See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
-//
-
-//
-// -- NFO Renum 'settings' --
-// Do not make nforenum warn about the fact that we use an incorrect number of shores
-// @@WARNING DISABLE 60
-// -- End of NFO Renum 'settings' --
 //

   -1 * 6	 07 83 01 \7! 00 0C
   -1 * 54	 0C "Missing shore tile graphics for the temperate climate"
   -1 * 3	 05 0D 0A
-   -1 sprites/shore.png 82 8 09 15 64 -31 0
-   -1 sprites/shore.png 162 8 09 31 64 -31 -8
-   -1 sprites/shore.png 242 8 09 23 64 -31 0
-   -1 sprites/shore.png 322 8 09 47 64 -31 -16
-   -1 sprites/shore.png 402 8 09 31 64 -31 -8
-   -1 sprites/shore.png 482 8 09 39 64 -31 -8
-   -1 sprites/shore.png 562 8 09 31 64 -31 -8
-   -1 sprites/shore.png 642 8 09 31 64 -31 -8
-   -1 sprites/shore.png 722 8 09 32 64 -31 -1
-   -1 sprites/shore.png 2 72 09 31 64 -31 -8
+   -1 sprites/shore.png 8bpp  82    8  64  15 -31   0 normal
+   -1 sprites/shore.png 8bpp 162    8  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp 242    8  64  23 -31   0 normal
+   -1 sprites/shore.png 8bpp 322    8  64  47 -31 -16 normal
+   -1 sprites/shore.png 8bpp 402    8  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp 482    8  64  39 -31  -8 normal
+   -1 sprites/shore.png 8bpp 562    8  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp 642    8  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp 722    8  64  32 -31  -1 normal
+   -1 sprites/shore.png 8bpp   2   72  64  31 -31  -8 normal
   -1 * 6	 07 83 01 \7! 01 0C
   -1 * 55	 0C "Missing shore tile graphics for the sub-arctic climate"
   -1 * 3	 05 0D 0A
-   -1 sprites/shore.png 130 72 09 15 64 -31 0
-   -1 sprites/shore.png 210 72 09 31 64 -31 -8
-   -1 sprites/shore.png 290 72 09 23 64 -31 0
-   -1 sprites/shore.png 370 72 09 47 64 -31 -16
-   -1 sprites/shore.png 450 72 09 31 64 -31 -8
-   -1 sprites/shore.png 530 72 09 39 64 -31 -8
-   -1 sprites/shore.png 610 72 09 31 64 -31 -8
-   -1 sprites/shore.png 690 72 09 31 64 -31 -8
-   -1 sprites/shore.png 2 136 09 32 64 -31 -1
-   -1 sprites/shore.png 82 136 09 31 64 -31 -8
+   -1 sprites/shore.png 8bpp 130   72  64  15 -31   0 normal
+   -1 sprites/shore.png 8bpp 210   72  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp 290   72  64  23 -31   0 normal
+   -1 sprites/shore.png 8bpp 370   72  64  47 -31 -16 normal
+   -1 sprites/shore.png 8bpp 450   72  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp 530   72  64  39 -31  -8 normal
+   -1 sprites/shore.png 8bpp 610   72  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp 690   72  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp   2  136  64  32 -31  -1 normal
+   -1 sprites/shore.png 8bpp  82  136  64  31 -31  -8 normal
   -1 * 6	 07 83 01 \7! 02 0C
   -1 * 57	 0C "Missing shore tile graphics for the sub-tropical climate"
   -1 * 3	 05 0D 0A
-   -1 sprites/shore.png 210 136 09 15 64 -31 0
-   -1 sprites/shore.png 290 136 09 31 64 -31 -8
-   -1 sprites/shore.png 370 136 09 23 64 -31 0
-   -1 sprites/shore.png 450 136 09 47 64 -31 -16
-   -1 sprites/shore.png 530 136 09 31 64 -31 -8
-   -1 sprites/shore.png 610 136 09 39 64 -31 -8
-   -1 sprites/shore.png 690 136 09 31 64 -31 -8
-   -1 sprites/shore.png 2 200 09 31 64 -31 -8
-   -1 sprites/shore.png 82 200 09 32 64 -31 -1
-   -1 sprites/shore.png 162 200 09 31 64 -31 -8
+   -1 sprites/shore.png 8bpp 210  136  64  15 -31   0 normal
+   -1 sprites/shore.png 8bpp 290  136  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp 370  136  64  23 -31   0 normal
+   -1 sprites/shore.png 8bpp 450  136  64  47 -31 -16 normal
+   -1 sprites/shore.png 8bpp 530  136  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp 610  136  64  39 -31  -8 normal
+   -1 sprites/shore.png 8bpp 690  136  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp   2  200  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp  82  200  64  32 -31  -1 normal
+   -1 sprites/shore.png 8bpp 162  200  64  31 -31  -8 normal
   -1 * 6	 07 83 01 \7! 03 0C
   -1 * 44	 0C "Missing shore tile graphics for the toyland climate"
   -1 * 3	 05 0D 0A
-   -1 sprites/shore.png 290 200 09 15 64 -31 0
-   -1 sprites/shore.png 370 200 09 31 64 -31 -8
-   -1 sprites/shore.png 450 200 09 23 64 -31 0
-   -1 sprites/shore.png 530 200 09 47 64 -31 -16
-   -1 sprites/shore.png 610 200 09 31 64 -31 -8
-   -1 sprites/shore.png 690 200 09 39 64 -31 -8
-   -1 sprites/shore.png 2 264 09 31 64 -31 -8
-   -1 sprites/shore.png 82 264 09 31 64 -31 -8
-   -1 sprites/shore.png 162 264 09 32 64 -31 -1
-   -1 sprites/shore.png 242 264 09 31 64 -31 -8
-
-//
-// -- NFO Renum 'settings' --
-// Reset warning about incorrect number of shores
-// @@WARNING ENABLE 60
-// -- End of NFO Renum 'settings' --
-//
+   -1 sprites/shore.png 8bpp 290  200  64  15 -31   0 normal
+   -1 sprites/shore.png 8bpp 370  200  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp 450  200  64  23 -31   0 normal
+   -1 sprites/shore.png 8bpp 530  200  64  47 -31 -16 normal
+   -1 sprites/shore.png 8bpp 610  200  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp 690  200  64  39 -31  -8 normal
+   -1 sprites/shore.png 8bpp   2  264  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp  82  264  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp 162  264  64  32 -31  -1 normal
+   -1 sprites/shore.png 8bpp 242  264  64  31 -31  -8 normal
--- a/media/extra_grf/signals.nfo
+++ b/media/extra_grf/signals.nfo
@@ -8,486 +8,486 @@
 //
   -1 * 0	 0C "Pre-signal, semaphore, and PBS graphics by Michael Blunck"
   -1 * 3	 05 04 F0
-   -1 sprites/signals.png 66 8 01 21 6 -2 -19
-   -1 sprites/signals.png 82 8 01 21 6 -2 -19
-   -1 sprites/signals.png 98 8 01 21 6 -2 -19
-   -1 sprites/signals.png 114 8 01 21 6 -2 -19
-   -1 sprites/signals.png 130 8 01 21 6 -2 -19
-   -1 sprites/signals.png 146 8 01 21 6 -2 -19
-   -1 sprites/signals.png 162 8 01 21 6 -2 -19
-   -1 sprites/signals.png 178 8 01 21 6 -2 -19
-   -1 sprites/signals.png 194 8 01 21 6 -2 -19
-   -1 sprites/signals.png 210 8 01 21 6 -2 -19
-   -1 sprites/signals.png 226 8 01 21 6 -2 -19
-   -1 sprites/signals.png 242 8 01 21 6 -2 -19
-   -1 sprites/signals.png 258 8 01 21 6 -2 -19
-   -1 sprites/signals.png 274 8 01 21 6 -2 -19
-   -1 sprites/signals.png 290 8 01 21 6 -2 -19
-   -1 sprites/signals.png 306 8 01 21 6 -2 -19
-   -1 sprites/signals.png 322 8 01 21 6 -2 -19
-   -1 sprites/signals.png 338 8 01 21 6 -2 -19
-   -1 sprites/signals.png 354 8 01 21 6 -2 -19
-   -1 sprites/signals.png 370 8 01 21 6 -2 -19
-   -1 sprites/signals.png 386 8 01 21 6 -2 -19
-   -1 sprites/signals.png 402 8 01 21 6 -2 -19
-   -1 sprites/signals.png 418 8 01 21 6 -2 -19
-   -1 sprites/signals.png 434 8 01 21 6 -2 -19
-   -1 sprites/signals.png 450 8 01 21 6 -2 -19
-   -1 sprites/signals.png 466 8 01 21 6 -2 -19
-   -1 sprites/signals.png 482 8 01 21 6 -2 -19
-   -1 sprites/signals.png 498 8 01 21 6 -2 -19
-   -1 sprites/signals.png 514 8 01 21 6 -2 -19
-   -1 sprites/signals.png 530 8 01 21 6 -2 -19
-   -1 sprites/signals.png 546 8 01 21 6 -2 -19
-   -1 sprites/signals.png 562 8 01 21 6 -2 -19
-   -1 sprites/signals.png 578 8 01 21 6 -2 -19
-   -1 sprites/signals.png 594 8 01 21 6 -2 -19
-   -1 sprites/signals.png 610 8 01 21 6 -2 -19
-   -1 sprites/signals.png 626 8 01 21 6 -2 -19
-   -1 sprites/signals.png 642 8 01 21 6 -2 -19
-   -1 sprites/signals.png 658 8 01 21 6 -2 -19
-   -1 sprites/signals.png 674 8 01 21 6 -2 -19
-   -1 sprites/signals.png 690 8 01 21 6 -2 -19
-   -1 sprites/signals.png 706 8 01 21 6 -2 -19
-   -1 sprites/signals.png 722 8 01 21 6 -2 -19
-   -1 sprites/signals.png 738 8 01 21 6 -2 -19
-   -1 sprites/signals.png 754 8 01 21 6 -2 -19
-   -1 sprites/signals.png 770 8 01 21 6 -2 -19
-   -1 sprites/signals.png 786 8 01 21 6 -2 -19
-   -1 sprites/signals.png 2 40 01 21 6 -2 -19
-   -1 sprites/signals.png 18 40 01 21 6 -2 -19
-   -1 sprites/signals.png 34 40 01 21 10 -6 -19
-   -1 sprites/signals.png 50 40 01 23 7 -3 -21
-   -1 sprites/signals.png 66 40 01 21 10 1 -19
-   -1 sprites/signals.png 82 40 01 21 9 1 -19
-   -1 sprites/signals.png 98 40 01 21 9 1 -19
-   -1 sprites/signals.png 114 40 01 23 6 1 -21
-   -1 sprites/signals.png 130 40 01 21 10 -7 -19
-   -1 sprites/signals.png 146 40 01 21 10 -7 -19
-   -1 sprites/signals.png 162 40 01 21 2 1 -19
-   -1 sprites/signals.png 178 40 01 24 2 1 -22
-   -1 sprites/signals.png 194 40 01 23 2 1 -21
-   -1 sprites/signals.png 210 40 01 26 2 1 -24
-   -1 sprites/signals.png 226 40 01 21 11 -7 -19
-   -1 sprites/signals.png 242 40 01 21 8 -4 -19
-   -1 sprites/signals.png 258 40 01 21 11 1 -19
-   -1 sprites/signals.png 274 40 01 21 8 1 -19
-   -1 sprites/signals.png 290 40 01 21 12 -6 -19
-   -1 sprites/signals.png 322 40 01 23 9 -3 -21
-   -1 sprites/signals.png 338 40 01 21 12 -1 -19
-   -1 sprites/signals.png 370 40 01 21 11 -1 -19
-   -1 sprites/signals.png 386 40 01 21 11 -1 -19
-   -1 sprites/signals.png 402 40 01 23 8 -1 -21
-   -1 sprites/signals.png 418 40 01 21 12 -7 -19
-   -1 sprites/signals.png 450 40 01 21 12 -7 -19
-   -1 sprites/signals.png 482 40 01 21 4 1 -19
-   -1 sprites/signals.png 498 40 01 24 4 1 -22
-   -1 sprites/signals.png 514 40 01 23 4 -1 -21
-   -1 sprites/signals.png 530 40 01 26 4 -1 -24
-   -1 sprites/signals.png 546 40 01 21 13 -7 -19
-   -1 sprites/signals.png 578 40 01 21 10 -4 -19
-   -1 sprites/signals.png 594 40 01 21 13 -1 -19
-   -1 sprites/signals.png 626 40 01 21 10 -1 -19
-   -1 sprites/signals.png 642 40 01 21 11 -6 -19
-   -1 sprites/signals.png 658 40 01 23 8 -3 -21
-   -1 sprites/signals.png 674 40 01 21 11 0 -19
-   -1 sprites/signals.png 690 40 01 21 10 0 -19
-   -1 sprites/signals.png 706 40 01 21 10 0 -19
-   -1 sprites/signals.png 722 40 01 23 7 0 -21
-   -1 sprites/signals.png 738 40 01 21 11 -7 -19
-   -1 sprites/signals.png 754 40 01 21 11 -7 -19
-   -1 sprites/signals.png 770 40 01 21 4 1 -19
-   -1 sprites/signals.png 786 40 01 24 4 1 -22
-   -1 sprites/signals.png 2 88 01 23 4 -1 -21
-   -1 sprites/signals.png 18 88 01 26 4 -1 -24
-   -1 sprites/signals.png 34 88 01 21 12 -7 -19
-   -1 sprites/signals.png 66 88 01 21 9 -4 -19
-   -1 sprites/signals.png 82 88 01 21 12 0 -19
-   -1 sprites/signals.png 114 88 01 21 9 0 -19
-   -1 sprites/signals.png 130 88 01 21 11 -6 -19
-   -1 sprites/signals.png 146 88 01 23 8 -3 -21
-   -1 sprites/signals.png 162 88 01 21 11 0 -19
-   -1 sprites/signals.png 178 88 01 21 10 0 -19
-   -1 sprites/signals.png 194 88 01 21 10 0 -19
-   -1 sprites/signals.png 210 88 01 23 7 0 -21
-   -1 sprites/signals.png 226 88 01 21 11 -7 -19
-   -1 sprites/signals.png 242 88 01 21 11 -7 -19
-   -1 sprites/signals.png 258 88 01 21 4 1 -19
-   -1 sprites/signals.png 274 88 01 24 4 1 -22
-   -1 sprites/signals.png 290 88 01 23 4 -1 -21
-   -1 sprites/signals.png 306 88 01 26 4 -1 -24
-   -1 sprites/signals.png 322 88 01 21 12 -7 -19
-   -1 sprites/signals.png 354 88 01 21 9 -4 -19
-   -1 sprites/signals.png 370 88 01 21 12 0 -19
-   -1 sprites/signals.png 402 88 01 21 9 0 -19
-   -1 sprites/signals.png 418 88 01 19 6 -2 -17
-   -1 sprites/signals.png 434 88 01 19 6 -2 -17
-   -1 sprites/signals.png 450 88 01 19 6 -2 -17
-   -1 sprites/signals.png 466 88 01 19 6 -2 -17
-   -1 sprites/signals.png 482 88 01 19 6 -2 -17
-   -1 sprites/signals.png 498 88 01 19 6 -2 -17
-   -1 sprites/signals.png 514 88 01 19 6 -2 -17
-   -1 sprites/signals.png 530 88 01 19 6 -2 -17
-   -1 sprites/signals.png 546 88 01 19 6 -2 -17
-   -1 sprites/signals.png 562 88 01 19 6 -2 -17
-   -1 sprites/signals.png 578 88 01 19 6 -2 -17
-   -1 sprites/signals.png 594 88 01 19 6 -2 -17
-   -1 sprites/signals.png 610 88 01 19 6 -2 -17
-   -1 sprites/signals.png 626 88 01 19 6 -2 -17
-   -1 sprites/signals.png 642 88 01 19 6 -2 -17
-   -1 sprites/signals.png 658 88 01 19 6 -2 -17
-   -1 sprites/signals.png 674 88 01 19 6 -2 -17
-   -1 sprites/signals.png 690 88 01 19 6 -2 -17
-   -1 sprites/signals.png 706 88 01 19 6 -2 -17
-   -1 sprites/signals.png 722 88 01 19 6 -2 -17
-   -1 sprites/signals.png 738 88 01 19 6 -2 -17
-   -1 sprites/signals.png 754 88 01 19 6 -2 -17
-   -1 sprites/signals.png 770 88 01 19 6 -2 -17
-   -1 sprites/signals.png 786 88 01 19 6 -2 -17
-   -1 sprites/signals.png 2 136 01 19 6 -2 -17
-   -1 sprites/signals.png 18 136 01 19 6 -2 -17
-   -1 sprites/signals.png 34 136 01 19 6 -2 -17
-   -1 sprites/signals.png 50 136 01 19 6 -2 -17
-   -1 sprites/signals.png 66 136 01 19 6 -2 -17
-   -1 sprites/signals.png 82 136 01 19 6 -2 -17
-   -1 sprites/signals.png 98 136 01 19 6 -2 -17
-   -1 sprites/signals.png 114 136 01 19 6 -2 -17
-   -1 sprites/signals.png 130 136 01 21 6 -2 -19
-   -1 sprites/signals.png 146 136 01 21 6 -2 -19
-   -1 sprites/signals.png 162 136 01 21 6 -2 -19
-   -1 sprites/signals.png 178 136 01 21 6 -2 -19
-   -1 sprites/signals.png 194 136 01 21 6 -2 -19
-   -1 sprites/signals.png 210 136 01 21 6 -2 -19
-   -1 sprites/signals.png 226 136 01 21 6 -2 -19
-   -1 sprites/signals.png 242 136 01 21 6 -2 -19
-   -1 sprites/signals.png 258 136 01 21 6 -2 -19
-   -1 sprites/signals.png 274 136 01 21 6 -2 -19
-   -1 sprites/signals.png 290 136 01 21 6 -2 -19
-   -1 sprites/signals.png 306 136 01 21 6 -2 -19
-   -1 sprites/signals.png 322 136 01 21 6 -2 -19
-   -1 sprites/signals.png 338 136 01 21 6 -2 -19
-   -1 sprites/signals.png 354 136 01 21 6 -2 -19
-   -1 sprites/signals.png 370 136 01 21 6 -2 -19
-   -1 sprites/signals.png 386 136 01 21 6 -2 -19
-   -1 sprites/signals.png 402 136 01 21 6 -2 -19
-   -1 sprites/signals.png 418 136 01 21 6 -2 -19
-   -1 sprites/signals.png 434 136 01 21 6 -2 -19
-   -1 sprites/signals.png 450 136 01 21 6 -2 -19
-   -1 sprites/signals.png 466 136 01 21 6 -2 -19
-   -1 sprites/signals.png 482 136 01 21 6 -2 -19
-   -1 sprites/signals.png 498 136 01 21 6 -2 -19
-   -1 sprites/signals.png 514 136 01 21 6 -2 -19
-   -1 sprites/signals.png 530 136 01 21 6 -2 -19
-   -1 sprites/signals.png 546 136 01 21 6 -2 -19
-   -1 sprites/signals.png 562 136 01 21 6 -2 -19
-   -1 sprites/signals.png 578 136 01 21 6 -2 -19
-   -1 sprites/signals.png 594 136 01 21 6 -2 -19
-   -1 sprites/signals.png 610 136 01 21 6 -2 -19
-   -1 sprites/signals.png 626 136 01 21 6 -2 -19
-   -1 sprites/signals.png 642 136 01 21 10 -6 -19
-   -1 sprites/signals.png 658 136 01 23 7 -3 -21
-   -1 sprites/signals.png 674 136 01 21 10 1 -19
-   -1 sprites/signals.png 690 136 01 21 9 1 -19
-   -1 sprites/signals.png 706 136 01 21 9 1 -19
-   -1 sprites/signals.png 722 136 01 23 6 1 -21
-   -1 sprites/signals.png 738 136 01 21 10 -7 -19
-   -1 sprites/signals.png 754 136 01 21 10 -7 -19
-   -1 sprites/signals.png 770 136 01 21 2 1 -19
-   -1 sprites/signals.png 786 136 01 24 2 1 -22
-   -1 sprites/signals.png 2 184 01 23 2 1 -21
-   -1 sprites/signals.png 18 184 01 26 2 1 -24
-   -1 sprites/signals.png 34 184 01 21 11 -7 -19
-   -1 sprites/signals.png 50 184 01 21 8 -4 -19
-   -1 sprites/signals.png 66 184 01 21 11 1 -19
-   -1 sprites/signals.png 82 184 01 21 8 1 -19
-   -1 sprites/signals.png 98 184 01 21 12 -6 -19
-   -1 sprites/signals.png 130 184 01 23 9 -3 -21
-   -1 sprites/signals.png 146 184 01 21 12 -1 -19
-   -1 sprites/signals.png 178 184 01 21 11 -1 -19
-   -1 sprites/signals.png 194 184 01 21 11 -1 -19
-   -1 sprites/signals.png 210 184 01 23 8 -1 -21
-   -1 sprites/signals.png 226 184 01 21 12 -7 -19
-   -1 sprites/signals.png 258 184 01 21 12 -7 -19
-   -1 sprites/signals.png 290 184 01 21 4 -1 -19
-   -1 sprites/signals.png 306 184 01 24 4 -1 -22
-   -1 sprites/signals.png 322 184 01 23 4 1 -21
-   -1 sprites/signals.png 338 184 01 26 4 1 -24
-   -1 sprites/signals.png 354 184 01 21 13 -7 -19
-   -1 sprites/signals.png 386 184 01 21 10 -4 -19
-   -1 sprites/signals.png 402 184 01 21 13 -1 -19
-   -1 sprites/signals.png 434 184 01 21 10 -1 -19
-   -1 sprites/signals.png 450 184 01 21 11 -6 -19
-   -1 sprites/signals.png 466 184 01 23 8 -3 -21
-   -1 sprites/signals.png 482 184 01 21 11 0 -19
-   -1 sprites/signals.png 498 184 01 21 10 0 -19
-   -1 sprites/signals.png 514 184 01 21 10 0 -19
-   -1 sprites/signals.png 530 184 01 23 7 0 -21
-   -1 sprites/signals.png 546 184 01 21 11 -7 -19
-   -1 sprites/signals.png 562 184 01 21 11 -7 -19
-   -1 sprites/signals.png 578 184 01 21 4 1 -19
-   -1 sprites/signals.png 594 184 01 24 4 1 -22
-   -1 sprites/signals.png 610 184 01 23 4 -1 -21
-   -1 sprites/signals.png 626 184 01 26 4 -1 -24
-   -1 sprites/signals.png 642 184 01 21 12 -7 -19
-   -1 sprites/signals.png 674 184 01 21 9 -4 -19
-   -1 sprites/signals.png 690 184 01 21 12 0 -19
-   -1 sprites/signals.png 722 184 01 21 9 0 -19
-   -1 sprites/signals.png 738 184 01 21 11 -6 -19
-   -1 sprites/signals.png 754 184 01 23 8 -3 -21
-   -1 sprites/signals.png 770 184 01 21 11 0 -19
-   -1 sprites/signals.png 786 184 01 21 10 0 -19
-   -1 sprites/signals.png 2 232 01 21 10 0 -19
-   -1 sprites/signals.png 18 232 01 23 7 0 -21
-   -1 sprites/signals.png 34 232 01 21 11 -7 -19
-   -1 sprites/signals.png 50 232 01 21 11 -7 -19
-   -1 sprites/signals.png 66 232 01 21 4 1 -19
-   -1 sprites/signals.png 82 232 01 24 4 1 -22
-   -1 sprites/signals.png 98 232 01 23 4 -1 -21
-   -1 sprites/signals.png 114 232 01 26 4 -1 -24
-   -1 sprites/signals.png 130 232 01 21 12 -7 -19
-   -1 sprites/signals.png 162 232 01 21 9 -4 -19
-   -1 sprites/signals.png 178 232 01 21 12 0 -19
-   -1 sprites/signals.png 210 232 01 21 9 0 -19
+   -1 sprites/signals.png 8bpp  66    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  82    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  98    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 114    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 130    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 146    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 162    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 178    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 194    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 210    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 226    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 242    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 258    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 274    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 290    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 306    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 322    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 338    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 354    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 370    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 386    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 402    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 418    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 434    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 450    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 466    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 482    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 498    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 514    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 530    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 546    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 562    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 578    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 594    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 610    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 626    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 642    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 658    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 674    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 690    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 706    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 722    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 738    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 754    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 770    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 786    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp   2   40   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  18   40   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  34   40  10  21  -6 -19 normal
+   -1 sprites/signals.png 8bpp  50   40   7  23  -3 -21 normal
+   -1 sprites/signals.png 8bpp  66   40  10  21   1 -19 normal
+   -1 sprites/signals.png 8bpp  82   40   9  21   1 -19 normal
+   -1 sprites/signals.png 8bpp  98   40   9  21   1 -19 normal
+   -1 sprites/signals.png 8bpp 114   40   6  23   1 -21 normal
+   -1 sprites/signals.png 8bpp 130   40  10  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 146   40  10  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 162   40   2  21   1 -19 normal
+   -1 sprites/signals.png 8bpp 178   40   2  24   1 -22 normal
+   -1 sprites/signals.png 8bpp 194   40   2  23   1 -21 normal
+   -1 sprites/signals.png 8bpp 210   40   2  26   1 -24 normal
+   -1 sprites/signals.png 8bpp 226   40  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 242   40   8  21  -4 -19 normal
+   -1 sprites/signals.png 8bpp 258   40  11  21   1 -19 normal
+   -1 sprites/signals.png 8bpp 274   40   8  21   1 -19 normal
+   -1 sprites/signals.png 8bpp 290   40  12  21  -6 -19 normal
+   -1 sprites/signals.png 8bpp 322   40   9  23  -3 -21 normal
+   -1 sprites/signals.png 8bpp 338   40  12  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 370   40  11  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 386   40  11  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 402   40   8  23  -1 -21 normal
+   -1 sprites/signals.png 8bpp 418   40  12  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 450   40  12  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 482   40   4  21   1 -19 normal
+   -1 sprites/signals.png 8bpp 498   40   4  24   1 -22 normal
+   -1 sprites/signals.png 8bpp 514   40   4  23  -1 -21 normal
+   -1 sprites/signals.png 8bpp 530   40   4  26  -1 -24 normal
+   -1 sprites/signals.png 8bpp 546   40  13  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 578   40  10  21  -4 -19 normal
+   -1 sprites/signals.png 8bpp 594   40  13  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 626   40  10  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 642   40  11  21  -6 -19 normal
+   -1 sprites/signals.png 8bpp 658   40   8  23  -3 -21 normal
+   -1 sprites/signals.png 8bpp 674   40  11  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 690   40  10  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 706   40  10  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 722   40   7  23   0 -21 normal
+   -1 sprites/signals.png 8bpp 738   40  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 754   40  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 770   40   4  21   1 -19 normal
+   -1 sprites/signals.png 8bpp 786   40   4  24   1 -22 normal
+   -1 sprites/signals.png 8bpp   2   88   4  23  -1 -21 normal
+   -1 sprites/signals.png 8bpp  18   88   4  26  -1 -24 normal
+   -1 sprites/signals.png 8bpp  34   88  12  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp  66   88   9  21  -4 -19 normal
+   -1 sprites/signals.png 8bpp  82   88  12  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 114   88   9  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 130   88  11  21  -6 -19 normal
+   -1 sprites/signals.png 8bpp 146   88   8  23  -3 -21 normal
+   -1 sprites/signals.png 8bpp 162   88  11  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 178   88  10  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 194   88  10  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 210   88   7  23   0 -21 normal
+   -1 sprites/signals.png 8bpp 226   88  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 242   88  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 258   88   4  21   1 -19 normal
+   -1 sprites/signals.png 8bpp 274   88   4  24   1 -22 normal
+   -1 sprites/signals.png 8bpp 290   88   4  23  -1 -21 normal
+   -1 sprites/signals.png 8bpp 306   88   4  26  -1 -24 normal
+   -1 sprites/signals.png 8bpp 322   88  12  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 354   88   9  21  -4 -19 normal
+   -1 sprites/signals.png 8bpp 370   88  12  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 402   88   9  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 418   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 434   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 450   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 466   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 482   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 498   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 514   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 530   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 546   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 562   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 578   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 594   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 610   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 626   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 642   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 658   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 674   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 690   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 706   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 722   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 738   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 754   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 770   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 786   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp   2  136   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp  18  136   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp  34  136   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp  50  136   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp  66  136   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp  82  136   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp  98  136   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 114  136   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 130  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 146  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 162  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 178  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 194  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 210  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 226  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 242  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 258  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 274  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 290  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 306  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 322  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 338  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 354  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 370  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 386  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 402  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 418  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 434  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 450  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 466  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 482  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 498  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 514  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 530  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 546  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 562  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 578  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 594  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 610  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 626  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 642  136  10  21  -6 -19 normal
+   -1 sprites/signals.png 8bpp 658  136   7  23  -3 -21 normal
+   -1 sprites/signals.png 8bpp 674  136  10  21   1 -19 normal
+   -1 sprites/signals.png 8bpp 690  136   9  21   1 -19 normal
+   -1 sprites/signals.png 8bpp 706  136   9  21   1 -19 normal
+   -1 sprites/signals.png 8bpp 722  136   6  23   1 -21 normal
+   -1 sprites/signals.png 8bpp 738  136  10  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 754  136  10  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 770  136   2  21   1 -19 normal
+   -1 sprites/signals.png 8bpp 786  136   2  24   1 -22 normal
+   -1 sprites/signals.png 8bpp   2  184   2  23   1 -21 normal
+   -1 sprites/signals.png 8bpp  18  184   2  26   1 -24 normal
+   -1 sprites/signals.png 8bpp  34  184  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp  50  184   8  21  -4 -19 normal
+   -1 sprites/signals.png 8bpp  66  184  11  21   1 -19 normal
+   -1 sprites/signals.png 8bpp  82  184   8  21   1 -19 normal
+   -1 sprites/signals.png 8bpp  98  184  12  21  -6 -19 normal
+   -1 sprites/signals.png 8bpp 130  184   9  23  -3 -21 normal
+   -1 sprites/signals.png 8bpp 146  184  12  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 178  184  11  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 194  184  11  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 210  184   8  23  -1 -21 normal
+   -1 sprites/signals.png 8bpp 226  184  12  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 258  184  12  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 290  184   4  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 306  184   4  24  -1 -22 normal
+   -1 sprites/signals.png 8bpp 322  184   4  23   1 -21 normal
+   -1 sprites/signals.png 8bpp 338  184   4  26   1 -24 normal
+   -1 sprites/signals.png 8bpp 354  184  13  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 386  184  10  21  -4 -19 normal
+   -1 sprites/signals.png 8bpp 402  184  13  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 434  184  10  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 450  184  11  21  -6 -19 normal
+   -1 sprites/signals.png 8bpp 466  184   8  23  -3 -21 normal
+   -1 sprites/signals.png 8bpp 482  184  11  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 498  184  10  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 514  184  10  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 530  184   7  23   0 -21 normal
+   -1 sprites/signals.png 8bpp 546  184  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 562  184  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 578  184   4  21   1 -19 normal
+   -1 sprites/signals.png 8bpp 594  184   4  24   1 -22 normal
+   -1 sprites/signals.png 8bpp 610  184   4  23  -1 -21 normal
+   -1 sprites/signals.png 8bpp 626  184   4  26  -1 -24 normal
+   -1 sprites/signals.png 8bpp 642  184  12  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 674  184   9  21  -4 -19 normal
+   -1 sprites/signals.png 8bpp 690  184  12  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 722  184   9  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 738  184  11  21  -6 -19 normal
+   -1 sprites/signals.png 8bpp 754  184   8  23  -3 -21 normal
+   -1 sprites/signals.png 8bpp 770  184  11  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 786  184  10  21   0 -19 normal
+   -1 sprites/signals.png 8bpp   2  232  10  21   0 -19 normal
+   -1 sprites/signals.png 8bpp  18  232   7  23   0 -21 normal
+   -1 sprites/signals.png 8bpp  34  232  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp  50  232  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp  66  232   4  21   1 -19 normal
+   -1 sprites/signals.png 8bpp  82  232   4  24   1 -22 normal
+   -1 sprites/signals.png 8bpp  98  232   4  23  -1 -21 normal
+   -1 sprites/signals.png 8bpp 114  232   4  26  -1 -24 normal
+   -1 sprites/signals.png 8bpp 130  232  12  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 162  232   9  21  -4 -19 normal
+   -1 sprites/signals.png 8bpp 178  232  12  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 210  232   9  21   0 -19 normal
   -1 * 6	 07 85 01 \70 3B F2
   -1 * 6	 07 86 01 \70 04 F1
   -1 * 3	 05 04 F0
-   -1 sprites/signals.png 274 232 01 21 6 -2 -19
-   -1 sprites/signals.png 290 232 01 21 6 -2 -19
-   -1 sprites/signals.png 306 232 01 21 6 -2 -19
-   -1 sprites/signals.png 322 232 01 21 6 -2 -19
-   -1 sprites/signals.png 338 232 01 21 6 -2 -19
-   -1 sprites/signals.png 354 232 01 21 6 -2 -19
-   -1 sprites/signals.png 370 232 01 21 6 -2 -19
-   -1 sprites/signals.png 386 232 01 21 6 -2 -19
-   -1 sprites/signals.png 402 232 01 21 6 -2 -19
-   -1 sprites/signals.png 418 232 01 21 6 -2 -19
-   -1 sprites/signals.png 434 232 01 21 6 -2 -19
-   -1 sprites/signals.png 450 232 01 21 6 -2 -19
-   -1 sprites/signals.png 466 232 01 21 6 -2 -19
-   -1 sprites/signals.png 482 232 01 21 6 -2 -19
-   -1 sprites/signals.png 498 232 01 21 6 -2 -19
-   -1 sprites/signals.png 514 232 01 21 6 -2 -19
-   -1 sprites/signals.png 530 232 01 21 6 -2 -19
-   -1 sprites/signals.png 546 232 01 21 6 -2 -19
-   -1 sprites/signals.png 562 232 01 21 6 -2 -19
-   -1 sprites/signals.png 578 232 01 21 6 -2 -19
-   -1 sprites/signals.png 594 232 01 21 6 -2 -19
-   -1 sprites/signals.png 610 232 01 21 6 -2 -19
-   -1 sprites/signals.png 626 232 01 21 6 -2 -19
-   -1 sprites/signals.png 642 232 01 21 6 -2 -19
-   -1 sprites/signals.png 658 232 01 21 6 -2 -19
-   -1 sprites/signals.png 674 232 01 21 6 -2 -19
-   -1 sprites/signals.png 690 232 01 21 6 -2 -19
-   -1 sprites/signals.png 706 232 01 21 6 -2 -19
-   -1 sprites/signals.png 722 232 01 21 6 -2 -19
-   -1 sprites/signals.png 738 232 01 21 6 -2 -19
-   -1 sprites/signals.png 754 232 01 21 6 -2 -19
-   -1 sprites/signals.png 770 232 01 21 6 -2 -19
-   -1 sprites/signals.png 786 232 01 21 6 -2 -19
-   -1 sprites/signals.png 2 280 01 21 6 -2 -19
-   -1 sprites/signals.png 18 280 01 21 6 -2 -19
-   -1 sprites/signals.png 34 280 01 21 6 -2 -19
-   -1 sprites/signals.png 50 280 01 21 6 -2 -19
-   -1 sprites/signals.png 66 280 01 21 6 -2 -19
-   -1 sprites/signals.png 82 280 01 21 6 -2 -19
-   -1 sprites/signals.png 98 280 01 21 6 -2 -19
-   -1 sprites/signals.png 114 280 01 21 6 -2 -19
-   -1 sprites/signals.png 130 280 01 21 6 -2 -19
-   -1 sprites/signals.png 146 280 01 21 6 -2 -19
-   -1 sprites/signals.png 162 280 01 21 6 -2 -19
-   -1 sprites/signals.png 178 280 01 21 6 -2 -19
-   -1 sprites/signals.png 194 280 01 21 6 -2 -19
-   -1 sprites/signals.png 210 280 01 21 6 -2 -19
-   -1 sprites/signals.png 226 280 01 21 6 -2 -19
-   -1 sprites/signals.png 242 280 01 21 10 -7 -19
-   -1 sprites/signals.png 258 280 01 23 10 -8 -21
-   -1 sprites/signals.png 274 280 01 23 10 -7 -21
-   -1 sprites/signals.png 290 280 01 26 7 -5 -24
-   -1 sprites/signals.png 306 280 01 21 10 -7 -19
-   -1 sprites/signals.png 322 280 01 23 10 -6 -21
-   -1 sprites/signals.png 338 280 01 23 10 1 -21
-   -1 sprites/signals.png 354 280 01 26 7 2 -24
-   -1 sprites/signals.png 370 280 01 23 3 0 -21
-   -1 sprites/signals.png 386 280 01 26 3 0 -24
-   -1 sprites/signals.png 402 280 01 21 3 0 -19
-   -1 sprites/signals.png 418 280 01 24 3 0 -22
-   -1 sprites/signals.png 434 280 01 21 12 0 -19
-   -1 sprites/signals.png 466 280 01 24 9 0 -22
-   -1 sprites/signals.png 482 280 01 21 12 -9 -19
-   -1 sprites/signals.png 514 280 01 24 9 -6 -22
-   -1 sprites/signals.png 530 280 01 21 12 -9 -19
-   -1 sprites/signals.png 562 280 01 23 11 -9 -21
-   -1 sprites/signals.png 578 280 01 23 11 -7 -21
-   -1 sprites/signals.png 594 280 01 26 9 -5 -24
-   -1 sprites/signals.png 610 280 01 21 12 -7 -19
-   -1 sprites/signals.png 642 280 01 23 11 -6 -21
-   -1 sprites/signals.png 658 280 01 23 11 0 -21
-   -1 sprites/signals.png 674 280 01 26 9 0 -24
-   -1 sprites/signals.png 690 280 01 23 5 0 -21
-   -1 sprites/signals.png 706 280 01 26 5 0 -24
-   -1 sprites/signals.png 722 280 01 21 5 -2 -19
-   -1 sprites/signals.png 738 280 01 24 5 -2 -22
-   -1 sprites/signals.png 754 280 01 21 13 -1 -19
-   -1 sprites/signals.png 786 280 01 24 10 -1 -22
-   -1 sprites/signals.png 2 328 01 21 13 -9 -19
-   -1 sprites/signals.png 34 328 01 24 10 -6 -22
-   -1 sprites/signals.png 50 328 01 21 11 -8 -19
-   -1 sprites/signals.png 66 328 01 23 10 -8 -21
-   -1 sprites/signals.png 82 328 01 23 10 -7 -21
-   -1 sprites/signals.png 98 328 01 26 8 -5 -24
-   -1 sprites/signals.png 114 328 01 21 11 -7 -19
-   -1 sprites/signals.png 130 328 01 23 10 -6 -21
-   -1 sprites/signals.png 146 328 01 23 10 1 -21
-   -1 sprites/signals.png 162 328 01 26 8 1 -24
-   -1 sprites/signals.png 178 328 01 23 5 0 -21
-   -1 sprites/signals.png 194 328 01 26 5 0 -24
-   -1 sprites/signals.png 210 328 01 21 5 -2 -19
-   -1 sprites/signals.png 226 328 01 24 5 -2 -22
-   -1 sprites/signals.png 242 328 01 21 12 0 -19
-   -1 sprites/signals.png 274 328 01 24 9 0 -22
-   -1 sprites/signals.png 290 328 01 21 12 -9 -19
-   -1 sprites/signals.png 322 328 01 24 9 -6 -22
-   -1 sprites/signals.png 338 328 01 21 11 -8 -19
-   -1 sprites/signals.png 354 328 01 23 10 -8 -21
-   -1 sprites/signals.png 370 328 01 23 10 -7 -21
-   -1 sprites/signals.png 386 328 01 26 8 -5 -24
-   -1 sprites/signals.png 402 328 01 21 11 -7 -19
-   -1 sprites/signals.png 418 328 01 23 10 -6 -21
-   -1 sprites/signals.png 434 328 01 23 10 1 -21
-   -1 sprites/signals.png 450 328 01 26 8 1 -24
-   -1 sprites/signals.png 466 328 01 23 5 0 -21
-   -1 sprites/signals.png 482 328 01 26 5 0 -24
-   -1 sprites/signals.png 498 328 01 21 5 -2 -19
-   -1 sprites/signals.png 514 328 01 24 5 -2 -22
-   -1 sprites/signals.png 530 328 01 21 12 0 -19
-   -1 sprites/signals.png 562 328 01 24 9 0 -22
-   -1 sprites/signals.png 578 328 01 21 12 -9 -19
-   -1 sprites/signals.png 610 328 01 24 9 -6 -22
-   -1 sprites/signals.png 626 328 01 19 6 -2 -17
-   -1 sprites/signals.png 642 328 01 19 6 -2 -17
-   -1 sprites/signals.png 658 328 01 19 6 -2 -17
-   -1 sprites/signals.png 674 328 01 19 6 -2 -17
-   -1 sprites/signals.png 690 328 01 19 6 -2 -17
-   -1 sprites/signals.png 706 328 01 19 6 -2 -17
-   -1 sprites/signals.png 722 328 01 19 6 -2 -17
-   -1 sprites/signals.png 738 328 01 19 6 -2 -17
-   -1 sprites/signals.png 754 328 01 19 6 -2 -17
-   -1 sprites/signals.png 770 328 01 19 6 -2 -17
-   -1 sprites/signals.png 786 328 01 19 6 -2 -17
-   -1 sprites/signals.png 2 376 01 19 6 -2 -17
-   -1 sprites/signals.png 18 376 01 19 6 -2 -17
-   -1 sprites/signals.png 34 376 01 19 6 -2 -17
-   -1 sprites/signals.png 50 376 01 19 6 -2 -17
-   -1 sprites/signals.png 66 376 01 19 6 -2 -17
-   -1 sprites/signals.png 82 376 01 19 6 -2 -17
-   -1 sprites/signals.png 98 376 01 19 6 -2 -17
-   -1 sprites/signals.png 114 376 01 19 6 -2 -17
-   -1 sprites/signals.png 130 376 01 19 6 -2 -17
-   -1 sprites/signals.png 146 376 01 19 6 -2 -17
-   -1 sprites/signals.png 162 376 01 19 6 -2 -17
-   -1 sprites/signals.png 178 376 01 19 6 -2 -17
-   -1 sprites/signals.png 194 376 01 19 6 -2 -17
-   -1 sprites/signals.png 210 376 01 19 6 -2 -17
-   -1 sprites/signals.png 226 376 01 19 6 -2 -17
-   -1 sprites/signals.png 242 376 01 19 6 -2 -17
-   -1 sprites/signals.png 258 376 01 19 6 -2 -17
-   -1 sprites/signals.png 274 376 01 19 6 -2 -17
-   -1 sprites/signals.png 290 376 01 19 6 -2 -17
-   -1 sprites/signals.png 306 376 01 19 6 -2 -17
-   -1 sprites/signals.png 322 376 01 19 6 -2 -17
-   -1 sprites/signals.png 338 376 01 21 6 -2 -19
-   -1 sprites/signals.png 354 376 01 21 6 -2 -19
-   -1 sprites/signals.png 370 376 01 21 6 -2 -19
-   -1 sprites/signals.png 386 376 01 21 6 -2 -19
-   -1 sprites/signals.png 402 376 01 21 6 -2 -19
-   -1 sprites/signals.png 418 376 01 21 6 -2 -19
-   -1 sprites/signals.png 434 376 01 21 6 -2 -19
-   -1 sprites/signals.png 450 376 01 21 6 -2 -19
-   -1 sprites/signals.png 466 376 01 21 6 -2 -19
-   -1 sprites/signals.png 482 376 01 21 6 -2 -19
-   -1 sprites/signals.png 498 376 01 21 6 -2 -19
-   -1 sprites/signals.png 514 376 01 21 6 -2 -19
-   -1 sprites/signals.png 530 376 01 21 6 -2 -19
-   -1 sprites/signals.png 546 376 01 21 6 -2 -19
-   -1 sprites/signals.png 562 376 01 21 6 -2 -19
-   -1 sprites/signals.png 578 376 01 21 6 -2 -19
-   -1 sprites/signals.png 594 376 01 21 6 -2 -19
-   -1 sprites/signals.png 610 376 01 21 6 -2 -19
-   -1 sprites/signals.png 626 376 01 21 6 -2 -19
-   -1 sprites/signals.png 642 376 01 21 6 -2 -19
-   -1 sprites/signals.png 658 376 01 21 6 -2 -19
-   -1 sprites/signals.png 674 376 01 21 6 -2 -19
-   -1 sprites/signals.png 690 376 01 21 6 -2 -19
-   -1 sprites/signals.png 706 376 01 21 6 -2 -19
-   -1 sprites/signals.png 722 376 01 21 6 -2 -19
-   -1 sprites/signals.png 738 376 01 21 6 -2 -19
-   -1 sprites/signals.png 754 376 01 21 6 -2 -19
-   -1 sprites/signals.png 770 376 01 21 6 -2 -19
-   -1 sprites/signals.png 786 376 01 21 6 -2 -19
-   -1 sprites/signals.png 2 408 01 21 6 -2 -19
-   -1 sprites/signals.png 18 408 01 21 6 -2 -19
-   -1 sprites/signals.png 34 408 01 21 6 -2 -19
-   -1 sprites/signals.png 50 408 01 21 10 -7 -19
-   -1 sprites/signals.png 66 408 01 23 10 -8 -21
-   -1 sprites/signals.png 82 408 01 23 10 -7 -21
-   -1 sprites/signals.png 98 408 01 26 7 -5 -24
-   -1 sprites/signals.png 114 408 01 21 10 -7 -19
-   -1 sprites/signals.png 130 408 01 23 10 -6 -21
-   -1 sprites/signals.png 146 408 01 23 10 1 -21
-   -1 sprites/signals.png 162 408 01 26 7 2 -24
-   -1 sprites/signals.png 178 408 01 23 3 0 -21
-   -1 sprites/signals.png 194 408 01 26 3 0 -24
-   -1 sprites/signals.png 210 408 01 21 3 0 -19
-   -1 sprites/signals.png 226 408 01 24 3 0 -22
-   -1 sprites/signals.png 242 408 01 21 12 0 -19
-   -1 sprites/signals.png 274 408 01 24 9 0 -22
-   -1 sprites/signals.png 290 408 01 21 12 -9 -19
-   -1 sprites/signals.png 322 408 01 24 9 -6 -22
-   -1 sprites/signals.png 338 408 01 21 12 -9 -19
-   -1 sprites/signals.png 370 408 01 23 11 -9 -21
-   -1 sprites/signals.png 386 408 01 23 11 -7 -21
-   -1 sprites/signals.png 402 408 01 26 9 -5 -24
-   -1 sprites/signals.png 418 408 01 21 12 -7 -19
-   -1 sprites/signals.png 450 408 01 23 11 -6 -21
-   -1 sprites/signals.png 466 408 01 23 11 0 -21
-   -1 sprites/signals.png 482 408 01 26 9 0 -24
-   -1 sprites/signals.png 498 408 01 23 5 -1 -21
-   -1 sprites/signals.png 514 408 01 26 5 -1 -24
-   -1 sprites/signals.png 530 408 01 21 5 -1 -19
-   -1 sprites/signals.png 546 408 01 24 5 -1 -22
-   -1 sprites/signals.png 562 408 01 21 13 -1 -19
-   -1 sprites/signals.png 594 408 01 24 10 -1 -22
-   -1 sprites/signals.png 610 408 01 21 13 -9 -19
-   -1 sprites/signals.png 642 408 01 24 10 -6 -22
-   -1 sprites/signals.png 658 408 01 21 11 -8 -19
-   -1 sprites/signals.png 674 408 01 23 10 -8 -21
-   -1 sprites/signals.png 690 408 01 23 10 -7 -21
-   -1 sprites/signals.png 706 408 01 26 8 -5 -24
-   -1 sprites/signals.png 722 408 01 21 11 -7 -19
-   -1 sprites/signals.png 738 408 01 23 10 -6 -21
-   -1 sprites/signals.png 754 408 01 23 10 1 -21
-   -1 sprites/signals.png 770 408 01 26 8 1 -24
-   -1 sprites/signals.png 786 408 01 23 5 0 -21
-   -1 sprites/signals.png 2 456 01 26 5 0 -24
-   -1 sprites/signals.png 18 456 01 21 5 -2 -19
-   -1 sprites/signals.png 34 456 01 24 5 -2 -22
-   -1 sprites/signals.png 50 456 01 21 12 0 -19
-   -1 sprites/signals.png 82 456 01 24 9 0 -22
-   -1 sprites/signals.png 98 456 01 21 12 -9 -19
-   -1 sprites/signals.png 130 456 01 24 9 -6 -22
-   -1 sprites/signals.png 146 456 01 21 11 -8 -19
-   -1 sprites/signals.png 162 456 01 23 10 -8 -21
-   -1 sprites/signals.png 178 456 01 23 10 -7 -21
-   -1 sprites/signals.png 194 456 01 26 8 -5 -24
-   -1 sprites/signals.png 210 456 01 21 11 -7 -19
-   -1 sprites/signals.png 226 456 01 23 10 -6 -21
-   -1 sprites/signals.png 242 456 01 23 10 1 -21
-   -1 sprites/signals.png 258 456 01 26 8 1 -24
-   -1 sprites/signals.png 274 456 01 23 5 0 -21
-   -1 sprites/signals.png 290 456 01 26 5 0 -24
-   -1 sprites/signals.png 306 456 01 21 5 -2 -19
-   -1 sprites/signals.png 322 456 01 24 5 -2 -22
-   -1 sprites/signals.png 338 456 01 21 12 0 -19
-   -1 sprites/signals.png 370 456 01 24 9 0 -22
-   -1 sprites/signals.png 386 456 01 21 12 -9 -19
-   -1 sprites/signals.png 418 456 01 24 9 -6 -22
+   -1 sprites/signals.png 8bpp 274  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 290  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 306  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 322  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 338  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 354  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 370  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 386  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 402  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 418  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 434  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 450  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 466  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 482  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 498  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 514  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 530  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 546  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 562  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 578  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 594  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 610  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 626  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 642  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 658  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 674  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 690  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 706  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 722  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 738  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 754  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 770  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 786  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp   2  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  18  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  34  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  50  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  66  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  82  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  98  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 114  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 130  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 146  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 162  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 178  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 194  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 210  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 226  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 242  280  10  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 258  280  10  23  -8 -21 normal
+   -1 sprites/signals.png 8bpp 274  280  10  23  -7 -21 normal
+   -1 sprites/signals.png 8bpp 290  280   7  26  -5 -24 normal
+   -1 sprites/signals.png 8bpp 306  280  10  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 322  280  10  23  -6 -21 normal
+   -1 sprites/signals.png 8bpp 338  280  10  23   1 -21 normal
+   -1 sprites/signals.png 8bpp 354  280   7  26   2 -24 normal
+   -1 sprites/signals.png 8bpp 370  280   3  23   0 -21 normal
+   -1 sprites/signals.png 8bpp 386  280   3  26   0 -24 normal
+   -1 sprites/signals.png 8bpp 402  280   3  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 418  280   3  24   0 -22 normal
+   -1 sprites/signals.png 8bpp 434  280  12  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 466  280   9  24   0 -22 normal
+   -1 sprites/signals.png 8bpp 482  280  12  21  -9 -19 normal
+   -1 sprites/signals.png 8bpp 514  280   9  24  -6 -22 normal
+   -1 sprites/signals.png 8bpp 530  280  12  21  -9 -19 normal
+   -1 sprites/signals.png 8bpp 562  280  11  23  -9 -21 normal
+   -1 sprites/signals.png 8bpp 578  280  11  23  -7 -21 normal
+   -1 sprites/signals.png 8bpp 594  280   9  26  -5 -24 normal
+   -1 sprites/signals.png 8bpp 610  280  12  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 642  280  11  23  -6 -21 normal
+   -1 sprites/signals.png 8bpp 658  280  11  23   0 -21 normal
+   -1 sprites/signals.png 8bpp 674  280   9  26   0 -24 normal
+   -1 sprites/signals.png 8bpp 690  280   5  23   0 -21 normal
+   -1 sprites/signals.png 8bpp 706  280   5  26   0 -24 normal
+   -1 sprites/signals.png 8bpp 722  280   5  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 738  280   5  24  -2 -22 normal
+   -1 sprites/signals.png 8bpp 754  280  13  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 786  280  10  24  -1 -22 normal
+   -1 sprites/signals.png 8bpp   2  328  13  21  -9 -19 normal
+   -1 sprites/signals.png 8bpp  34  328  10  24  -6 -22 normal
+   -1 sprites/signals.png 8bpp  50  328  11  21  -8 -19 normal
+   -1 sprites/signals.png 8bpp  66  328  10  23  -8 -21 normal
+   -1 sprites/signals.png 8bpp  82  328  10  23  -7 -21 normal
+   -1 sprites/signals.png 8bpp  98  328   8  26  -5 -24 normal
+   -1 sprites/signals.png 8bpp 114  328  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 130  328  10  23  -6 -21 normal
+   -1 sprites/signals.png 8bpp 146  328  10  23   1 -21 normal
+   -1 sprites/signals.png 8bpp 162  328   8  26   1 -24 normal
+   -1 sprites/signals.png 8bpp 178  328   5  23   0 -21 normal
+   -1 sprites/signals.png 8bpp 194  328   5  26   0 -24 normal
+   -1 sprites/signals.png 8bpp 210  328   5  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 226  328   5  24  -2 -22 normal
+   -1 sprites/signals.png 8bpp 242  328  12  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 274  328   9  24   0 -22 normal
+   -1 sprites/signals.png 8bpp 290  328  12  21  -9 -19 normal
+   -1 sprites/signals.png 8bpp 322  328   9  24  -6 -22 normal
+   -1 sprites/signals.png 8bpp 338  328  11  21  -8 -19 normal
+   -1 sprites/signals.png 8bpp 354  328  10  23  -8 -21 normal
+   -1 sprites/signals.png 8bpp 370  328  10  23  -7 -21 normal
+   -1 sprites/signals.png 8bpp 386  328   8  26  -5 -24 normal
+   -1 sprites/signals.png 8bpp 402  328  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 418  328  10  23  -6 -21 normal
+   -1 sprites/signals.png 8bpp 434  328  10  23   1 -21 normal
+   -1 sprites/signals.png 8bpp 450  328   8  26   1 -24 normal
+   -1 sprites/signals.png 8bpp 466  328   5  23   0 -21 normal
+   -1 sprites/signals.png 8bpp 482  328   5  26   0 -24 normal
+   -1 sprites/signals.png 8bpp 498  328   5  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 514  328   5  24  -2 -22 normal
+   -1 sprites/signals.png 8bpp 530  328  12  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 562  328   9  24   0 -22 normal
+   -1 sprites/signals.png 8bpp 578  328  12  21  -9 -19 normal
+   -1 sprites/signals.png 8bpp 610  328   9  24  -6 -22 normal
+   -1 sprites/signals.png 8bpp 626  328   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 642  328   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 658  328   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 674  328   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 690  328   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 706  328   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 722  328   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 738  328   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 754  328   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 770  328   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 786  328   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp   2  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp  18  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp  34  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp  50  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp  66  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp  82  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp  98  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 114  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 130  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 146  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 162  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 178  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 194  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 210  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 226  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 242  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 258  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 274  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 290  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 306  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 322  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 338  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 354  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 370  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 386  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 402  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 418  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 434  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 450  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 466  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 482  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 498  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 514  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 530  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 546  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 562  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 578  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 594  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 610  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 626  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 642  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 658  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 674  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 690  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 706  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 722  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 738  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 754  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 770  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 786  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp   2  408   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  18  408   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  34  408   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  50  408  10  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp  66  408  10  23  -8 -21 normal
+   -1 sprites/signals.png 8bpp  82  408  10  23  -7 -21 normal
+   -1 sprites/signals.png 8bpp  98  408   7  26  -5 -24 normal
+   -1 sprites/signals.png 8bpp 114  408  10  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 130  408  10  23  -6 -21 normal
+   -1 sprites/signals.png 8bpp 146  408  10  23   1 -21 normal
+   -1 sprites/signals.png 8bpp 162  408   7  26   2 -24 normal
+   -1 sprites/signals.png 8bpp 178  408   3  23   0 -21 normal
+   -1 sprites/signals.png 8bpp 194  408   3  26   0 -24 normal
+   -1 sprites/signals.png 8bpp 210  408   3  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 226  408   3  24   0 -22 normal
+   -1 sprites/signals.png 8bpp 242  408  12  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 274  408   9  24   0 -22 normal
+   -1 sprites/signals.png 8bpp 290  408  12  21  -9 -19 normal
+   -1 sprites/signals.png 8bpp 322  408   9  24  -6 -22 normal
+   -1 sprites/signals.png 8bpp 338  408  12  21  -9 -19 normal
+   -1 sprites/signals.png 8bpp 370  408  11  23  -9 -21 normal
+   -1 sprites/signals.png 8bpp 386  408  11  23  -7 -21 normal
+   -1 sprites/signals.png 8bpp 402  408   9  26  -5 -24 normal
+   -1 sprites/signals.png 8bpp 418  408  12  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 450  408  11  23  -6 -21 normal
+   -1 sprites/signals.png 8bpp 466  408  11  23   0 -21 normal
+   -1 sprites/signals.png 8bpp 482  408   9  26   0 -24 normal
+   -1 sprites/signals.png 8bpp 498  408   5  23  -1 -21 normal
+   -1 sprites/signals.png 8bpp 514  408   5  26  -1 -24 normal
+   -1 sprites/signals.png 8bpp 530  408   5  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 546  408   5  24  -1 -22 normal
+   -1 sprites/signals.png 8bpp 562  408  13  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 594  408  10  24  -1 -22 normal
+   -1 sprites/signals.png 8bpp 610  408  13  21  -9 -19 normal
+   -1 sprites/signals.png 8bpp 642  408  10  24  -6 -22 normal
+   -1 sprites/signals.png 8bpp 658  408  11  21  -8 -19 normal
+   -1 sprites/signals.png 8bpp 674  408  10  23  -8 -21 normal
+   -1 sprites/signals.png 8bpp 690  408  10  23  -7 -21 normal
+   -1 sprites/signals.png 8bpp 706  408   8  26  -5 -24 normal
+   -1 sprites/signals.png 8bpp 722  408  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 738  408  10  23  -6 -21 normal
+   -1 sprites/signals.png 8bpp 754  408  10  23   1 -21 normal
+   -1 sprites/signals.png 8bpp 770  408   8  26   1 -24 normal
+   -1 sprites/signals.png 8bpp 786  408   5  23   0 -21 normal
+   -1 sprites/signals.png 8bpp   2  456   5  26   0 -24 normal
+   -1 sprites/signals.png 8bpp  18  456   5  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  34  456   5  24  -2 -22 normal
+   -1 sprites/signals.png 8bpp  50  456  12  21   0 -19 normal
+   -1 sprites/signals.png 8bpp  82  456   9  24   0 -22 normal
+   -1 sprites/signals.png 8bpp  98  456  12  21  -9 -19 normal
+   -1 sprites/signals.png 8bpp 130  456   9  24  -6 -22 normal
+   -1 sprites/signals.png 8bpp 146  456  11  21  -8 -19 normal
+   -1 sprites/signals.png 8bpp 162  456  10  23  -8 -21 normal
+   -1 sprites/signals.png 8bpp 178  456  10  23  -7 -21 normal
+   -1 sprites/signals.png 8bpp 194  456   8  26  -5 -24 normal
+   -1 sprites/signals.png 8bpp 210  456  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 226  456  10  23  -6 -21 normal
+   -1 sprites/signals.png 8bpp 242  456  10  23   1 -21 normal
+   -1 sprites/signals.png 8bpp 258  456   8  26   1 -24 normal
+   -1 sprites/signals.png 8bpp 274  456   5  23   0 -21 normal
+   -1 sprites/signals.png 8bpp 290  456   5  26   0 -24 normal
+   -1 sprites/signals.png 8bpp 306  456   5  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 322  456   5  24  -2 -22 normal
+   -1 sprites/signals.png 8bpp 338  456  12  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 370  456   9  24   0 -22 normal
+   -1 sprites/signals.png 8bpp 386  456  12  21  -9 -19 normal
+   -1 sprites/signals.png 8bpp 418  456   9  24  -6 -22 normal
--- a/media/extra_grf/sloped_tracks.nfo
+++ b/media/extra_grf/sloped_tracks.nfo
@@ -8,15 +8,15 @@
 //
   -1 * 0	 0C "Sloped tracks"
   -1 * 3	 05 0F 0C
-   -1 sprites/sloped_tracks.png 50 8 09 29 42 -19 -3
-   -1 sprites/sloped_tracks.png 98 8 09 13 41 -20 5
-   -1 sprites/sloped_tracks.png 146 8 09 14 42 -19 5
-   -1 sprites/sloped_tracks.png 194 8 09 29 42 -21 -3
-   -1 sprites/sloped_tracks.png 242 8 09 25 33 -15 -1
-   -1 sprites/sloped_tracks.png 290 8 09 10 33 -15 7
-   -1 sprites/sloped_tracks.png 338 8 09 10 34 -15 7
-   -1 sprites/sloped_tracks.png 386 8 09 25 34 -15 -1
-   -1 sprites/sloped_tracks.png 434 8 09 23 31 -13 -1
-   -1 sprites/sloped_tracks.png 482 8 09 10 32 -15 7
-   -1 sprites/sloped_tracks.png 530 8 09 10 31 -15 7
-   -1 sprites/sloped_tracks.png 578 8 09 23 31 -16 -1
+   -1 sprites/sloped_tracks.png 8bpp  50    8  42  29 -19  -3 normal
+   -1 sprites/sloped_tracks.png 8bpp  98    8  41  13 -20   5 normal
+   -1 sprites/sloped_tracks.png 8bpp 146    8  42  14 -19   5 normal
+   -1 sprites/sloped_tracks.png 8bpp 194    8  42  29 -21  -3 normal
+   -1 sprites/sloped_tracks.png 8bpp 242    8  33  25 -15  -1 normal
+   -1 sprites/sloped_tracks.png 8bpp 290    8  33  10 -15   7 normal
+   -1 sprites/sloped_tracks.png 8bpp 338    8  34  10 -15   7 normal
+   -1 sprites/sloped_tracks.png 8bpp 386    8  34  25 -15  -1 normal
+   -1 sprites/sloped_tracks.png 8bpp 434    8  31  23 -13  -1 normal
+   -1 sprites/sloped_tracks.png 8bpp 482    8  32  10 -15   7 normal
+   -1 sprites/sloped_tracks.png 8bpp 530    8  31  10 -15   7 normal
+   -1 sprites/sloped_tracks.png 8bpp 578    8  31  23 -16  -1 normal
--- a/media/extra_grf/tramtracks.nfo
+++ b/media/extra_grf/tramtracks.nfo
@@ -8,116 +8,116 @@
 //
   -1 * 0	 0C "Tram track graphics by PikkaBird"
   -1 * 3	 05 0B 71
-   -1 sprites/tramtracks.png 18 8 09 13 20 0 4
-   -1 sprites/tramtracks.png 50 8 09 13 20 0 4
-   -1 sprites/tramtracks.png 82 8 03 36 64 -18 -8
-   -1 sprites/tramtracks.png 162 8 03 36 62 -16 -8
-   -1 sprites/tramtracks.png 242 8 09 31 64 -31 0
-   -1 sprites/tramtracks.png 322 8 09 31 64 -31 0
-   -1 sprites/tramtracks.png 402 8 09 31 64 -31 0
-   -1 sprites/tramtracks.png 482 8 09 31 64 -31 0
-   -1 sprites/tramtracks.png 562 8 09 31 64 -31 0
-   -1 sprites/tramtracks.png 642 8 09 31 64 -31 0
-   -1 sprites/tramtracks.png 722 8 09 31 64 -31 0
-   -1 sprites/tramtracks.png 2 56 09 31 64 -31 0
-   -1 sprites/tramtracks.png 82 56 09 31 64 -31 0
-   -1 sprites/tramtracks.png 162 56 09 31 64 -31 0
-   -1 sprites/tramtracks.png 242 56 09 31 64 -31 0
-   -1 sprites/tramtracks.png 322 56 09 39 64 -31 -8
-   -1 sprites/tramtracks.png 402 56 09 23 64 -31 0
-   -1 sprites/tramtracks.png 482 56 09 23 64 -31 0
-   -1 sprites/tramtracks.png 562 56 09 39 64 -31 -8
-   -1 sprites/tramtracks.png 642 56 09 31 64 -31 0
-   -1 sprites/tramtracks.png 722 56 09 31 64 -31 0
-   -1 sprites/tramtracks.png 2 120 09 31 64 -31 0
-   -1 sprites/tramtracks.png 82 120 09 31 64 -31 0
-   -1 sprites/tramtracks.png 162 120 09 31 64 -31 0
-   -1 sprites/tramtracks.png 242 120 09 31 64 -31 0
-   -1 sprites/tramtracks.png 322 120 09 31 64 -31 0
-   -1 sprites/tramtracks.png 402 120 09 31 64 -31 0
-   -1 sprites/tramtracks.png 482 120 09 31 64 -31 0
-   -1 sprites/tramtracks.png 562 120 09 31 64 -31 0
-   -1 sprites/tramtracks.png 642 120 09 31 64 -31 0
-   -1 sprites/tramtracks.png 722 120 09 31 64 -31 0
-   -1 sprites/tramtracks.png 2 168 09 31 64 -31 0
-   -1 sprites/tramtracks.png 82 168 09 31 64 -31 0
-   -1 sprites/tramtracks.png 162 168 09 31 64 -31 0
-   -1 sprites/tramtracks.png 242 168 09 31 64 -31 0
-   -1 sprites/tramtracks.png 322 168 09 31 64 -31 0
-   -1 sprites/tramtracks.png 402 168 09 31 64 -31 0
-   -1 sprites/tramtracks.png 482 168 09 31 64 -31 0
-   -1 sprites/tramtracks.png 562 168 09 39 64 -31 -8
-   -1 sprites/tramtracks.png 642 168 09 23 64 -31 0
-   -1 sprites/tramtracks.png 722 168 09 23 64 -31 0
-   -1 sprites/tramtracks.png 2 232 09 39 64 -31 -8
-   -1 sprites/tramtracks.png 82 232 09 31 64 -31 0
-   -1 sprites/tramtracks.png 162 232 09 31 64 -31 0
-   -1 sprites/tramtracks.png 242 232 09 31 64 -31 0
-   -1 sprites/tramtracks.png 322 232 09 31 64 -31 0
-   -1 sprites/tramtracks.png 402 232 09 31 64 -31 0
-   -1 sprites/tramtracks.png 482 232 09 31 64 -31 0
-   -1 sprites/tramtracks.png 562 232 09 20 20 0 0
-   -1 sprites/tramtracks.png 594 232 09 31 64 -31 0
-   -1 sprites/tramtracks.png 674 232 09 64 62 2 -49
-   -1 sprites/tramtracks.png 2 312 09 31 64 -31 0
-   -1 sprites/tramtracks.png 82 312 09 64 62 -62 -49
-   -1 sprites/tramtracks.png 162 312 09 64 62 -62 -49
-   -1 sprites/tramtracks.png 242 312 09 64 62 2 -49
-   -1 sprites/tramtracks.png 322 312 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 402 312 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 482 312 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 562 312 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 642 312 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 722 312 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 2 392 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 82 392 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 162 392 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 242 392 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 322 392 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 402 392 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 482 392 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 562 392 09 56 64 -31 -25
-   -1 sprites/tramtracks.png 642 392 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 722 392 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 2 472 09 56 64 -31 -25
-   -1 sprites/tramtracks.png 82 472 09 56 64 -31 -25
-   -1 sprites/tramtracks.png 162 472 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 242 472 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 322 472 09 56 64 -31 -25
-   -1 sprites/tramtracks.png 402 472 09 31 64 -31 0
-   -1 sprites/tramtracks.png 482 472 09 31 64 -31 0
-   -1 sprites/tramtracks.png 562 472 09 31 64 -31 0
-   -1 sprites/tramtracks.png 642 472 09 31 64 -31 0
-   -1 sprites/tramtracks.png 722 472 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 2 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 82 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 162 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 242 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 322 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 402 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 482 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 562 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 642 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 722 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 2 616 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 82 616 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 162 616 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 242 616 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 322 616 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 402 616 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 482 616 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 562 616 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 642 616 09 56 64 -31 -25
-   -1 sprites/tramtracks.png 722 616 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 2 696 09 56 64 -31 -25
-   -1 sprites/tramtracks.png 82 696 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 162 696 09 56 64 -31 -25
-   -1 sprites/tramtracks.png 242 696 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 322 696 09 56 64 -31 -25
-   -1 sprites/tramtracks.png 402 696 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 482 696 09 31 64 -31 0
-   -1 sprites/tramtracks.png 562 696 09 31 64 -31 0
-   -1 sprites/tramtracks.png 642 696 09 39 64 -31 -8
-   -1 sprites/tramtracks.png 722 696 09 23 64 -31 0
-   -1 sprites/tramtracks.png 2 776 09 23 64 -31 0
-   -1 sprites/tramtracks.png 82 776 09 39 64 -31 -8
+   -1 sprites/tramtracks.png 8bpp  18    8  20  13   0   4 normal
+   -1 sprites/tramtracks.png 8bpp  50    8  20  13   0   4 normal
+   -1 sprites/tramtracks.png 8bpp  82    8  64  36 -18  -8 normal
+   -1 sprites/tramtracks.png 8bpp 162    8  62  36 -16  -8 normal
+   -1 sprites/tramtracks.png 8bpp 242    8  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 322    8  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 402    8  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 482    8  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 562    8  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 642    8  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 722    8  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp   2   56  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp  82   56  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 162   56  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 242   56  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 322   56  64  39 -31  -8 normal
+   -1 sprites/tramtracks.png 8bpp 402   56  64  23 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 482   56  64  23 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 562   56  64  39 -31  -8 normal
+   -1 sprites/tramtracks.png 8bpp 642   56  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 722   56  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp   2  120  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp  82  120  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 162  120  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 242  120  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 322  120  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 402  120  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 482  120  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 562  120  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 642  120  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 722  120  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp   2  168  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp  82  168  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 162  168  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 242  168  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 322  168  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 402  168  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 482  168  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 562  168  64  39 -31  -8 normal
+   -1 sprites/tramtracks.png 8bpp 642  168  64  23 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 722  168  64  23 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp   2  232  64  39 -31  -8 normal
+   -1 sprites/tramtracks.png 8bpp  82  232  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 162  232  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 242  232  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 322  232  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 402  232  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 482  232  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 562  232  20  20   0   0 normal
+   -1 sprites/tramtracks.png 8bpp 594  232  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 674  232  62  64   2 -49 normal
+   -1 sprites/tramtracks.png 8bpp   2  312  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp  82  312  62  64 -62 -49 normal
+   -1 sprites/tramtracks.png 8bpp 162  312  62  64 -62 -49 normal
+   -1 sprites/tramtracks.png 8bpp 242  312  62  64   2 -49 normal
+   -1 sprites/tramtracks.png 8bpp 322  312  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 402  312  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 482  312  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 562  312  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 642  312  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 722  312  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp   2  392  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp  82  392  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 162  392  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 242  392  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 322  392  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 402  392  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 482  392  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 562  392  64  56 -31 -25 normal
+   -1 sprites/tramtracks.png 8bpp 642  392  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 722  392  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp   2  472  64  56 -31 -25 normal
+   -1 sprites/tramtracks.png 8bpp  82  472  64  56 -31 -25 normal
+   -1 sprites/tramtracks.png 8bpp 162  472  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 242  472  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 322  472  64  56 -31 -25 normal
+   -1 sprites/tramtracks.png 8bpp 402  472  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 482  472  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 562  472  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 642  472  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 722  472  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp   2  552  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp  82  552  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 162  552  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 242  552  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 322  552  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 402  552  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 482  552  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 562  552  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 642  552  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 722  552  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp   2  616  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp  82  616  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 162  616  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 242  616  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 322  616  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 402  616  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 482  616  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 562  616  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 642  616  64  56 -31 -25 normal
+   -1 sprites/tramtracks.png 8bpp 722  616  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp   2  696  64  56 -31 -25 normal
+   -1 sprites/tramtracks.png 8bpp  82  696  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 162  696  64  56 -31 -25 normal
+   -1 sprites/tramtracks.png 8bpp 242  696  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 322  696  64  56 -31 -25 normal
+   -1 sprites/tramtracks.png 8bpp 402  696  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 482  696  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 562  696  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 642  696  64  39 -31  -8 normal
+   -1 sprites/tramtracks.png 8bpp 722  696  64  23 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp   2  776  64  23 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp  82  776  64  39 -31  -8 normal
--- a/media/extra_grf/tunnel_portals.nfo
+++ b/media/extra_grf/tunnel_portals.nfo
@@ -0,0 +1,74 @@
+//
+// $Id$
+//
+// This file is part of OpenTTD.
+// OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+// OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+//
+
+   -1 * 63	 0C "Tunnel portal overlays for railtypes by Snail (Jacopo Coletto)"
+
+// Tropical sprites.
+   -1 * 6	 07 83 01 \7! 02 11
+   -1 * 3	 05 17 10
+   -1 sprites/tunnel_portals.png 8bpp   5   88  35  33 -31  -2 normal
+   -1 sprites/tunnel_portals.png 8bpp  43   88  40  37  -7 -38 normal
+   -1 sprites/tunnel_portals.png 8bpp  86   88  35  21 -31   0 normal
+   -1 sprites/tunnel_portals.png 8bpp 124   88  40  22  -7 -29 normal
+   -1 sprites/tunnel_portals.png 8bpp 168   88  35  21  -2   0 normal
+   -1 sprites/tunnel_portals.png 8bpp 206   88  40  22 -31 -29 normal
+   -1 sprites/tunnel_portals.png 8bpp 249   88  35  33  -2  -2 normal
+   -1 sprites/tunnel_portals.png 8bpp 287   88  40  37 -31 -38 normal
+   -1 sprites/tunnel_portals.png 8bpp   5  170  35  33 -31  -2 normal
+   -1 sprites/tunnel_portals.png 8bpp  43  170  40  37  -7 -38 normal
+   -1 sprites/tunnel_portals.png 8bpp  86  170  35  21 -31   0 normal
+   -1 sprites/tunnel_portals.png 8bpp 124  170  40  22  -7 -29 normal
+   -1 sprites/tunnel_portals.png 8bpp 168  170  35  21  -2   0 normal
+   -1 sprites/tunnel_portals.png 8bpp 206  170  40  22 -31 -29 normal
+   -1 sprites/tunnel_portals.png 8bpp 249  170  35  33  -2  -2 normal
+   -1 sprites/tunnel_portals.png 8bpp 287  170  40  37 -31 -38 normal
+
+// Temperate grass + snow sprites.
+   -1 * 6	 07 83 01 \7= 02 25
+   -1 * 3	 05 17 10
+   -1 sprites/tunnel_portals.png 8bpp   5    6  35  33 -31  -2 normal
+   -1 sprites/tunnel_portals.png 8bpp  43    6  40  37  -7 -38 normal
+   -1 sprites/tunnel_portals.png 8bpp  86    6  35  21 -31   0 normal
+   -1 sprites/tunnel_portals.png 8bpp 124    6  40  22  -7 -29 normal
+   -1 sprites/tunnel_portals.png 8bpp 168    6  35  21  -2   0 normal
+   -1 sprites/tunnel_portals.png 8bpp 206    6  40  22 -31 -29 normal
+   -1 sprites/tunnel_portals.png 8bpp 249    6  35  33  -2  -2 normal
+   -1 sprites/tunnel_portals.png 8bpp 287    6  40  37 -31 -38 normal
+   -1 sprites/tunnel_portals.png 8bpp   5  129  35  33 -31  -2 normal
+   -1 sprites/tunnel_portals.png 8bpp  43  129  40  37  -7 -38 normal
+   -1 sprites/tunnel_portals.png 8bpp  86  129  35  21 -31   0 normal
+   -1 sprites/tunnel_portals.png 8bpp 124  129  40  22  -7 -29 normal
+   -1 sprites/tunnel_portals.png 8bpp 168  129  35  21  -2   0 normal
+   -1 sprites/tunnel_portals.png 8bpp 206  129  40  22 -31 -29 normal
+   -1 sprites/tunnel_portals.png 8bpp 249  129  35  33  -2  -2 normal
+   -1 sprites/tunnel_portals.png 8bpp 287  129  40  37 -31 -38 normal
+
+// Arctic grass sprites.
+   -1 * 6	 07 83 01 \7! 01 09
+   -1 * 4	 05 97 08 00
+   -1 sprites/tunnel_portals.png 8bpp   5   47  35  33 -31  -2 normal
+   -1 sprites/tunnel_portals.png 8bpp  43   47  40  37  -7 -38 normal
+   -1 sprites/tunnel_portals.png 8bpp  86   47  35  21 -31   0 normal
+   -1 sprites/tunnel_portals.png 8bpp 124   47  40  22  -7 -29 normal
+   -1 sprites/tunnel_portals.png 8bpp 168   47  35  21  -2   0 normal
+   -1 sprites/tunnel_portals.png 8bpp 206   47  40  22 -31 -29 normal
+   -1 sprites/tunnel_portals.png 8bpp 249   47  35  33  -2  -2 normal
+   -1 sprites/tunnel_portals.png 8bpp 287   47  40  37 -31 -38 normal
+
+// Toyland sprites.
+   -1 * 6	 07 83 01 \7! 03 09
+   -1 * 4	 05 97 08 00
+   -1 sprites/tunnel_portals.png 8bpp   5  211  35  33 -31  -2 normal
+   -1 sprites/tunnel_portals.png 8bpp  43  211  40  37  -7 -38 normal
+   -1 sprites/tunnel_portals.png 8bpp  86  211  35  21 -31   0 normal
+   -1 sprites/tunnel_portals.png 8bpp 124  211  40  22  -7 -29 normal
+   -1 sprites/tunnel_portals.png 8bpp 168  211  35  21  -2   0 normal
+   -1 sprites/tunnel_portals.png 8bpp 206  211  40  22 -31 -29 normal
+   -1 sprites/tunnel_portals.png 8bpp 249  211  35  33  -2  -2 normal
+   -1 sprites/tunnel_portals.png 8bpp 287  211  40  37 -31 -38 normal
--- a/media/extra_grf/tunnel_portals.png
+++ b/media/extra_grf/tunnel_portals.png
--- a/media/openttd.desktop.filter.awk
+++ b/media/openttd.desktop.filter.awk
@@ -0,0 +1,13 @@
+# $Id: openttd.desktop.translation.awk 19884 2010-05-22 19:59:37Z rubidium $
+
+# This file is part of OpenTTD.
+# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+# OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Awk script to automatically remove duplicate Comment[i]= lines
+#
+
+BEGIN { FS = "="; last = "" }
+{ if (last != $1) { print $0 }; last = $1 }
--- a/media/openttd.desktop.translation.awk
+++ b/media/openttd.desktop.translation.awk
@@ -6,10 +6,10 @@
 # See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.

 #
-# Awk script to automatically generate a single comment line
-# for a translated desktop shortcut. If it does not exist there
+# Awk script to automatically generate a comment lines for
+# a translated desktop shortcut. If it does not exist there
 # is no output.
 #

 /##isocode/ { lang = $2; next }
-/STR_DESKTOP_SHORTCUT_COMMENT/ { sub("^[^:]*:", "", $0); print "Comment[" lang "]=" $0; next}
+/STR_DESKTOP_SHORTCUT_COMMENT/ { sub("^[^:]*:", "", $0); print "Comment[" lang "]=" $0; sub("_.*", "", lang); print "Comment[" lang "]=" $0; next}
--- a/os/debian/changelog
+++ b/os/debian/changelog
@@ -1,3 +1,33 @@
+openttd (1.2.0) unstable; urgency=low
+
+  * New upstream release 1.2.0
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 15 Apr 2012 14:00:00 +0200
+
+openttd (1.2.0~RC4) unstable; urgency=low
+
+  * New upstream release 1.2.0-RC4
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 01 Apr 2012 00:00:00 +0200
+
+openttd (1.2.0~RC3) unstable; urgency=low
+
+  * New upstream release 1.2.0-RC3
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 18 Mar 2012 18:00:00 +0100
+
+openttd (1.2.0~RC2) unstable; urgency=low
+
+  * New upstream release 1.2.0-RC2
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 04 Mar 2012 18:00:00 +0100
+
+openttd (1.2.0~RC1) unstable; urgency=low
+
+  * New upstream release 1.2.0-RC1
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 19 Feb 2012 23:00:00 +0100
+
 openttd (1.2.0~beta4) unstable; urgency=low

  * New upstream release 1.2.0-beta4
--- a/os/os2/installer/make_installer.cmd
+++ b/os/os2/installer/make_installer.cmd
@@ -1,6 +1,6 @@
@echo off

-set OPENTTD_VERSION=1.2.0-beta4
+set OPENTTD_VERSION=1.2.0
 set OPENSFX_VERSION=0.8.0
 set NOSOUND_VERSION=0.8.0
 set OPENGFX_VERSION=1.2.0
--- a/os/rpm/openttd.spec
+++ b/os/rpm/openttd.spec
@@ -1,40 +1,58 @@
-%define dedicated       0
+#
+# spec file for package openttd
+#
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007-2012 The OpenTTD developers
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.

-%define binname         openttd
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#

-%define srcver          1.2.0
-
-%if %{dedicated}
-Name:           %{binname}-dedicated
-%else
-Name:           %{binname}
-%endif
-Version:        %{srcver}
-Release:        1%{?dist}
+Name:           openttd
+Version:        1.2.beta4
+Release:        0
+%define srcver  1.2.0-beta4
+Summary:        An open source reimplementation of Chris Sawyer's Transport Tycoon Deluxe
+License:        GPL-2.0
 Group:          Amusements/Games/Strategy/Other
-License:        GPLv2
-URL:            http://www.openttd.org
-Summary:        An open source clone of Chris Sawyer's Transport Tycoon Deluxe
+Url:            http://www.openttd.org

-Source:         openttd%{?branch:-%{branch}}-%{srcver}-source.tar.bz2
+Source:         http://binaries.openttd.org/releases/%{srcver}/%{name}-%{srcver}-source.tar.gz

-# the main package works with the exact same data package version only
-Requires:       %{binname}-data = %{version}
+%if 0%{?suse_version} || 0%{?mdkversion}
+Recommends:     %{name}-gui
+%endif

 BuildRequires:  gcc-c++
 BuildRequires:  libpng-devel
 BuildRequires:  zlib-devel

+%if 0%{?suse_version} || 0%{?mdkversion}
+BuildRequires:  update-alternatives
+Requires:       update-alternatives
+%else
+BuildRequires:  chkconfig
+Requires:       chkconfig
+%endif
+
 %if 0%{?mdkversion}
-BuildRequires:  liblzo-devel
 BuildRequires:  liblzma-devel
+BuildRequires:  liblzo-devel
 %else
 BuildRequires:  lzo-devel
 BuildRequires:  xz-devel
 %endif

-#needed by libdrm
-%if 0%{?rhel_version} >= 600
+# OBS workaround: needed by libdrm
+%if 0%{?rhel_version} >= 600 || 0%{?centos_version} >= 600
 BuildRequires:  kernel
 %endif

@@ -43,44 +61,18 @@ BuildRequires:  kernel
 BuildRequires:  pkg-config
 %endif

-# Desktop specific tags, not needed for dedicated
-%if !%{dedicated}
-BuildRequires:  fontconfig-devel
-BuildRequires:  SDL-devel
-
+# bulding openttd.grf is not required as it is a) part of source and
+# b) required only, if you want to use the original set
+%if 0%{?with_grfcodec}
 BuildRequires:  grfcodec
-
-# vendor specific dependencies
- %if !0%{?rhel_version}
-BuildRequires:  libicu-devel
- %endif
- %if 0%{?rhel_version} || 0%{?fedora}
-BuildRequires:  freetype-devel
- %endif
- %if 0%{?suse_version} || 0%{?mdkversion}
-BuildRequires:  freetype2-devel
- %endif
- %if 0%{?suse_version}
-BuildRequires:  update-desktop-files
- %endif
-%endif
-
-%if %{dedicated}
-Conflicts:      %{binname} %{binname}-gui
-%else
-Provides:       %{binname}-gui
-Conflicts:      %{binname}-dedicated
-Requires:       openttd-opensfx
-# recommends works for suse (not sles9) and mandriva, only
- %if 0%{?suse_version} || 0%{?mdkversion}
-# require timidity is part of openmsx
-Recommends:     openttd-openmsx
- %endif
 %endif
 # Recommends would fit better but not well supported...
-Requires:       openttd-opengfx >= 0.3.2
+Requires:       openttd-opengfx >= 0.4.2

-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Obsoletes:      %{name}-data < %{version}
+Provides:       %{name}-data = %{version}
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build

 %description
 OpenTTD is a reimplementation of the Microprose game "Transport Tycoon Deluxe"
@@ -92,70 +84,161 @@ OpenTTD is licensed under the GNU General Public License version 2.0. For more
 information, see the file 'COPYING' included with every release and source
 download of the game.

-# the subpackage data needs only to build once, the dedicated version
-# can reuse the data package of the gui package
-%if !%{dedicated}
-%package data
-Summary:        Data package for OpenTTD
+%package gui
+Summary:        OpenTTD GUI/Client (requires SDL)
 Group:          Amusements/Games/Strategy/Other
- %if 0%{?suse_version} >= 1120 || 0%{?fedora} || 0%{?mdkversion}
-BuildArch:      noarch
- %endif
-BuildRequires:  grfcodec

-%description data
+Requires:       %{name}
+Conflicts:      %{name}-dedicated
+
+BuildRequires:  SDL-devel
+BuildRequires:  fontconfig-devel
+
+%if 0%{?rhel_version} != 600
+BuildRequires:  libicu-devel
+%endif
+%if 0%{?rhel_version} || 0%{?fedora}
+BuildRequires:  freetype-devel
+%endif
+%if 0%{?suse_version} || 0%{?mdkversion}
+BuildRequires:  freetype2-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires:  update-desktop-files
+%else
+BuildRequires:  desktop-file-utils
+Requires:       hicolor-icon-theme
+%endif
+
+%if 0%{?suse_version} || 0%{?mdkversion}
+Recommends:     openttd-openmsx
+Recommends:     openttd-opensfx
+%endif
+
+%description gui
+OpenTTD is a reimplementation of the Microprose game "Transport Tycoon Deluxe"
+with lots of new features and enhancements. To play the game you need either
+the original data from the game or install the recommend subackages OpenGFX for
+free graphics, OpenSFX for free sounds and OpenMSX for free music.
+
+This subpackage provides the binary which needs SDL.
+
+%package dedicated
+Summary:        OpenTTD Dedicated Server binary (without SDL)
+Group:          Amusements/Games/Strategy/Other
+
+Requires:       %{name}
+Conflicts:      %{name}-gui
+
+%description dedicated
 OpenTTD is a reimplementation of the Microprose game "Transport Tycoon Deluxe"
 with lots of new features and enhancements. To play the game you need either
 the original data from the game or the required package OpenGFX and OpenSFX.

-This package is required by openttd gui and openttd dedicated package. This
-way it is possible to install a openttd version without SDL requirement.
-
-%endif
+This subpackage provides the binary without dependency of SDL.

 %prep
 %setup -qn openttd%{?branch:-%{branch}}-%{srcver}

 # we build the grfs from sources but validate the result with the existing data
-md5sum bin/baseset/* > validate.data
+%if 0%{?with_grfcodec}
+md5sum bin/data/* > validate.data
+%endif

 %build
+# first, we build the dedicated binary and copy it to dedicated/
 ./configure \
        --prefix-dir="%{_prefix}" \
-        --binary-name="%{binname}" \
        --binary-dir="bin" \
-        --data-dir="share/%{binname}" \
-        --doc-dir="share/doc/%{binname}" \
+        --data-dir="share/%{name}" \
+        --enable-dedicated
+make %{?_smp_mflags} BUNDLE_DIR="dedicated" bundle
+
+# then, we build the common gui version which we install the usual way
+./configure \
+        --prefix-dir="%{_prefix}" \
+        --binary-name="%{name}" \
+        --binary-dir="bin" \
+        --data-dir="share/%{name}" \
+        --doc-dir="share/doc/%{name}" \
        --menu-name="OpenTTD%{?branch: %{branch}}" \
-        --menu-group="Game;StrategyGame;" \
-        --enable-dedicated="%{dedicated}" \
+        --menu-group="Game;StrategyGame;"

 make %{?_smp_mflags}

 %install
-%if %{dedicated}
-# dedicated package needs binary only
-install -D -m0755 bin/openttd %{buildroot}/%{_bindir}/%{binname}
+# install the dedicated binary
+install -D -m0755 dedicated/openttd %{buildroot}%{_bindir}/%{name}-dedicated
+# install the gui binary and rename to openttd-gui
+make install INSTALL_DIR=%{buildroot}
+mv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}-gui
+# we need a dummy target for /etc/alternatives/openttd
+mkdir -p %{buildroot}%{_sysconfdir}/alternatives
+touch %{buildroot}%{_sysconfdir}/alternatives/%{name}
+ln -s -f /etc/alternatives/%{name} %{buildroot}%{_bindir}/%{name}
+
+%if 0%{?suse_version}
+%suse_update_desktop_file -r %{name} Game StrategyGame
 %else
-make install INSTALL_DIR="%{buildroot}"
- %if 0%{?suse_version}
-%suse_update_desktop_file -r %{binname} Game StrategyGame
- %endif
+%if 0%{?fedora} || 0%{?rhel_version} >= 600 || 0%{?centos_version} >= 600
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
+        --add-category=StrategyGame \
+        media/openttd.desktop
+%endif
 %endif

-%clean
-rm -rf "%{buildroot}"
-
+%if 0%{?with_grfcodec}
 %check
 md5sum -c validate.data
+%endif

+%post gui
+/usr/sbin/update-alternatives --install %{_bindir}/%{name} %{name} %{_bindir}/%{name}-gui 10
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%post dedicated
+/usr/sbin/update-alternatives --install %{_bindir}/%{name} %{name} %{_bindir}/%{name}-dedicated 0
+
+%preun gui
+if [ "$1" = 0 ] ; then
+    /usr/sbin/update-alternatives --remove %{name} %{_bindir}/%{name}-gui
+fi
+
+%preun dedicated
+if [ "$1" = 0 ] ; then
+    /usr/sbin/update-alternatives --remove %{name} %{_bindir}/%{name}-dedicated
+fi
+
+%postun gui
+if [ "$1" -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans gui
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+# we need a file in the main package so it will be made
 %files
-%attr(755, root, root) %{_bindir}/%{binname}
-
-# all other files are for the gui version only, also no
-# subpackage needed for the dedicated version
-%if !%{dedicated}
 %defattr(-, root, root)
+%dir %{_datadir}/doc/%{name}
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/lang
+%dir %{_datadir}/%{name}/baseset
+%dir %{_datadir}/%{name}/scripts
+%dir %{_datadir}/%{name}/ai
+%{_datadir}/doc/%{name}/*
+%{_datadir}/%{name}/lang/*
+%{_datadir}/%{name}/baseset/*
+%{_datadir}/%{name}/scripts/*
+%{_datadir}/%{name}/ai/*
+%doc %{_mandir}/man6/%{name}.6.*
+
+%files gui
+%defattr(-, root, root)
+%ghost %{_sysconfdir}/alternatives/%{name}
+%ghost %{_bindir}/%{name}
+%{_bindir}/%{name}-gui
 %dir %{_datadir}/icons/hicolor
 %dir %{_datadir}/icons/hicolor/16x16
 %dir %{_datadir}/icons/hicolor/16x16/apps
@@ -169,29 +252,19 @@ md5sum -c validate.data
 %dir %{_datadir}/icons/hicolor/128x128/apps
 %dir %{_datadir}/icons/hicolor/256x256
 %dir %{_datadir}/icons/hicolor/256x256/apps
-%{_datadir}/applications/%{binname}.desktop
-%{_datadir}/icons/hicolor/16x16/apps/%{binname}.png
-%{_datadir}/icons/hicolor/32x32/apps/%{binname}.png
-%{_datadir}/icons/hicolor/48x48/apps/%{binname}.png
-%{_datadir}/icons/hicolor/64x64/apps/%{binname}.png
-%{_datadir}/icons/hicolor/128x128/apps/%{binname}.png
-%{_datadir}/icons/hicolor/256x256/apps/%{binname}.png
-%{_datadir}/pixmaps/%{binname}.32.xpm
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
+%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
+%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
+%{_datadir}/pixmaps/%{name}.32.xpm

-%files data
+%files dedicated
 %defattr(-, root, root)
-%dir %{_datadir}/doc/%{binname}
-%dir %{_datadir}/%{binname}
-%dir %{_datadir}/%{binname}/lang
-%dir %{_datadir}/%{binname}/baseset
-%dir %{_datadir}/%{binname}/scripts
-%dir %{_datadir}/%{binname}/ai
-%{_datadir}/doc/%{binname}/*
-%{_datadir}/%{binname}/lang/*
-%{_datadir}/%{binname}/baseset/*
-%{_datadir}/%{binname}/scripts/*
-%{_datadir}/%{binname}/ai/*
-%doc %{_mandir}/man6/%{binname}.6.*
-%endif
+%ghost %{_bindir}/%{name}
+%ghost %{_sysconfdir}/alternatives/%{name}
+%{_bindir}/%{name}-dedicated

 %changelog
--- a/os/windows/installer/install.nsi
+++ b/os/windows/installer/install.nsi
@@ -2,8 +2,7 @@
 !define APPV_MAJOR 1
 !define APPV_MINOR 2
 !define APPV_MAINT 0
-!define APPV_BUILD 3
-!define APPV_EXTRA "-beta4"
+!define APPV_BUILD 8

 !define APPNAME "OpenTTD"   ; Define application name
 !define APPVERSION "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}${APPV_EXTRA}"  ; Define application version
@@ -281,17 +280,17 @@ SectionEnd
 Section "Download OpenMSX (free music set)" Section5
 	SetOverwrite try

-	NSISdl::download "http://binaries.openttd.org/installer/openmsx-${OPENMSX_BASE_VERSION}.7z" "$INSTDIR\gm\openmsx.7z"
+	NSISdl::download "http://binaries.openttd.org/installer/openmsx-${OPENMSX_BASE_VERSION}.7z" "$INSTDIR\baseset\openmsx.7z"
 	Pop $R0 ;Get the return value
 	StrCmp $R0 "success" +3
 		MessageBox MB_OK "Downloading of OpenMSX failed"
 		Goto Done

 	; Let's extract the files
-	SetOutPath "$INSTDIR\gm\"
-	NSIS7z::Extract "$INSTDIR\gm\openmsx.7z"
+	SetOutPath "$INSTDIR\baseset\"
+	NSIS7z::Extract "$INSTDIR\baseset\openmsx.7z"

-	Delete "$INSTDIR\gm\openmsx.7z"
+	Delete "$INSTDIR\baseset\openmsx.7z"
 	SetOutPath "$INSTDIR\"
 Done:

--- a/projects/openttd_vs100.vcxproj
+++ b/projects/openttd_vs100.vcxproj
@@ -102,7 +102,7 @@
      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <ExceptionHandling>Sync</ExceptionHandling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -204,7 +204,7 @@
      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <ExceptionHandling>Sync</ExceptionHandling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -573,6 +573,8 @@
    <ClInclude Include="..\src\terraform_gui.h" />
    <ClInclude Include="..\src\textbuf_gui.h" />
    <ClInclude Include="..\src\texteff.hpp" />
+    <ClInclude Include="..\src\textfile_gui.h" />
+    <ClInclude Include="..\src\textfile_type.h" />
    <ClInclude Include="..\src\tgp.h" />
    <ClInclude Include="..\src\tile_cmd.h" />
    <ClInclude Include="..\src\tile_type.h" />
@@ -684,6 +686,7 @@
    <ClCompile Include="..\src\statusbar_gui.cpp" />
    <ClCompile Include="..\src\subsidy_gui.cpp" />
    <ClCompile Include="..\src\terraform_gui.cpp" />
+    <ClCompile Include="..\src\textfile_gui.cpp" />
    <ClCompile Include="..\src\timetable_gui.cpp" />
    <ClCompile Include="..\src\toolbar_gui.cpp" />
    <ClCompile Include="..\src\town_gui.cpp" />
@@ -1079,8 +1082,6 @@
    <ClInclude Include="..\src\video\video_driver.hpp" />
    <ClCompile Include="..\src\spriteloader\grf.cpp" />
    <ClInclude Include="..\src\spriteloader\grf.hpp" />
-    <ClCompile Include="..\src\spriteloader\png.cpp" />
-    <ClInclude Include="..\src\spriteloader\png.hpp" />
    <ClInclude Include="..\src\spriteloader\spriteloader.hpp" />
    <ClCompile Include="..\src\newgrf.cpp" />
    <ClCompile Include="..\src\newgrf_airport.cpp" />
--- a/projects/openttd_vs100.vcxproj.filters
+++ b/projects/openttd_vs100.vcxproj.filters
@@ -948,6 +948,12 @@
    <ClInclude Include="..\src\texteff.hpp">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="..\src\textfile_gui.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\textfile_type.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
    <ClInclude Include="..\src\tgp.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -1281,6 +1287,9 @@
    <ClCompile Include="..\src\terraform_gui.cpp">
      <Filter>GUI Source Code</Filter>
    </ClCompile>
+    <ClCompile Include="..\src\textfile_gui.cpp">
+      <Filter>GUI Source Code</Filter>
+    </ClCompile>
    <ClCompile Include="..\src\timetable_gui.cpp">
      <Filter>GUI Source Code</Filter>
    </ClCompile>
@@ -2466,12 +2475,6 @@
    <ClInclude Include="..\src\spriteloader\grf.hpp">
      <Filter>Sprite loaders</Filter>
    </ClInclude>
-    <ClCompile Include="..\src\spriteloader\png.cpp">
-      <Filter>Sprite loaders</Filter>
-    </ClCompile>
-    <ClInclude Include="..\src\spriteloader\png.hpp">
-      <Filter>Sprite loaders</Filter>
-    </ClInclude>
    <ClInclude Include="..\src\spriteloader\spriteloader.hpp">
      <Filter>Sprite loaders</Filter>
    </ClInclude>
--- a/projects/openttd_vs100.vcxproj.in
+++ b/projects/openttd_vs100.vcxproj.in
@@ -102,7 +102,7 @@
      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <ExceptionHandling>Sync</ExceptionHandling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -204,7 +204,7 @@
      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <ExceptionHandling>Sync</ExceptionHandling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -52,7 +52,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -257,7 +257,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -1566,6 +1566,14 @@
 				RelativePath=".\..\src\texteff.hpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\textfile_gui.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\textfile_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\tgp.h"
 				>
@@ -2018,6 +2026,10 @@
 				RelativePath=".\..\src\terraform_gui.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\textfile_gui.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\timetable_gui.cpp"
 				>
@@ -3666,14 +3678,6 @@
 				RelativePath=".\..\src\spriteloader\grf.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\spriteloader\png.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\spriteloader\png.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\spriteloader\spriteloader.hpp"
 				>
--- a/projects/openttd_vs80.vcproj.in
+++ b/projects/openttd_vs80.vcproj.in
@@ -52,7 +52,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -257,7 +257,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -53,7 +53,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -255,7 +255,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -1563,6 +1563,14 @@
 				RelativePath=".\..\src\texteff.hpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\textfile_gui.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\textfile_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\tgp.h"
 				>
@@ -2015,6 +2023,10 @@
 				RelativePath=".\..\src\terraform_gui.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\textfile_gui.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\timetable_gui.cpp"
 				>
@@ -3663,14 +3675,6 @@
 				RelativePath=".\..\src\spriteloader\grf.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\spriteloader\png.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\spriteloader\png.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\spriteloader\spriteloader.hpp"
 				>
--- a/projects/openttd_vs90.vcproj.in
+++ b/projects/openttd_vs90.vcproj.in
@@ -53,7 +53,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -255,7 +255,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
--- a/readme.txt
+++ b/readme.txt
@@ -1,6 +1,6 @@
 OpenTTD readme
-Last updated:    2012-02-04
-Release version: 1.2.0-beta4
+Last updated:    2012-04-15
+Release version: 1.2.0
 ------------------------------------------------------------------------


@@ -501,6 +501,8 @@ The following compilers are known to compile OpenTTD:
    Versions 4.4 - 4.6 give bogus warnings about freeing non-heap objects.
    Versions 4.5 and later give invalid warnings when lto is enabled.
  - Intel C++ Compiler (ICC) 12.0.
+  - Clang/LLVM 2.9 - 3.0
+    Version 2.9 gives bogus warnings about code nonconformity.

 The following compilers are known not to compile OpenTTD:
  - Microsoft Visual C++ (MSVC) 2003 and earlier.
@@ -510,7 +512,7 @@ The following compilers are known not to compile OpenTTD:
    Version 10.0 and earlier fail a configure check and fail with recent system
        headers.
    Version 10.1 fails to compile station_gui.cpp.
-    Version 11.1 fails with internal error when compiling network.cpp.
+    Version 11.1 fails with an internal error when compiling network.cpp.
  - Clang/LLVM 2.8 and earlier.
  - (Open) Watcom.

@@ -647,7 +649,7 @@ Retired Developers:
  Serge Paquet (vurlix)           - Assistant project manager, coder (0.1 - 0.3.3)
  Dominik Scherer (dominik81)     - Lead programmer, GUI expert (0.3.0 - 0.3.6)
  Benedikt Brüggemeier (skidd13)  - Bug fixer and code reworker
-  Patric Stout (TrueBrain)        - Programmer (0.3 - pre0.7), sys op (active)
+  Patric Stout (TrueBrain)        - NoProgrammer (0.3 - 1.2), sys op (active)

 Thanks to:
  Josef Drexler                   - For his great work on TTDPatch.
@@ -665,6 +667,8 @@ Thanks to:
  George                          - Canal graphics
  Andrew Parkhouse (andythenorth) - River graphics
  David Dallaston (Pikka)         - Tram tracks
+  Marcin Grzegorczyk              - Foundations for tracks on slopes",
+  Daniel Blödorn (Bluescreen)     - Title game
  All Translators                 - For their support to make OpenTTD a truly international game
  Bug Reporters                   - Thanks for all bug reports
  Chris Sawyer                    - For an amazing game!
--- a/source.list
+++ b/source.list
@@ -306,6 +306,8 @@ tar_type.h
 terraform_gui.h
 textbuf_gui.h
 texteff.hpp
+textfile_gui.h
+textfile_type.h
 tgp.h
 tile_cmd.h
 tile_type.h
@@ -436,6 +438,7 @@ station_gui.cpp
 statusbar_gui.cpp
 subsidy_gui.cpp
 terraform_gui.cpp
+textfile_gui.cpp
 timetable_gui.cpp
 toolbar_gui.cpp
 town_gui.cpp
@@ -868,10 +871,6 @@ video/video_driver.hpp
 # Sprite loaders
 spriteloader/grf.cpp
 spriteloader/grf.hpp
-#if PNG
-spriteloader/png.cpp
-spriteloader/png.hpp
-#end
 spriteloader/spriteloader.hpp

 # NewGRF
--- a/src/3rdparty/squirrel/squirrel/sqvm.h
+++ b/src/3rdparty/squirrel/squirrel/sqvm.h
@@ -200,6 +200,10 @@ inline SQObjectPtr &stack_get(HSQUIRRELVM v,SQInteger idx){return ((idx>=0)?(v->

 #define PUSH_CALLINFO(v,nci){ \
 	if(v->_callsstacksize == v->_alloccallsstacksize) { \
+		if (v->_callsstacksize > 65535) {\
+			v->Raise_Error(_SC("stack overflow"));\
+			return false;\
+		}\
 		v->GrowCallStack(); \
 	} \
 	v->ci = &v->_callsstack[v->_callsstacksize]; \
--- a/src/ai/ai_core.cpp
+++ b/src/ai/ai_core.cpp
@@ -39,7 +39,7 @@
 	/* Clients shouldn't start AIs */
 	if (_networking && !_network_server) return;

-	AIConfig *config = AIConfig::GetConfig(company);
+	AIConfig *config = AIConfig::GetConfig(company, AIConfig::SSS_FORCE_GAME);
 	AIInfo *info = config->GetInfo();
 	if (info == NULL || (rerandomise_ai && config->IsRandom())) {
 		info = AI::scanner_info->SelectRandomAI();
@@ -283,7 +283,7 @@
 {
 	/* Find the first company which doesn't exist yet */
 	for (CompanyID c = COMPANY_FIRST; c < MAX_COMPANIES; c++) {
-		if (!Company::IsValidID(c)) return AIConfig::GetConfig(c)->GetSetting("start_date");
+		if (!Company::IsValidID(c)) return AIConfig::GetConfig(c, AIConfig::SSS_FORCE_GAME)->GetSetting("start_date");
 	}

 	/* Currently no AI can be started, check again in a year. */
--- a/src/ai/ai_gui.cpp
+++ b/src/ai/ai_gui.cpp
@@ -23,6 +23,7 @@
 #include "../network/network.h"
 #include "../settings_func.h"
 #include "../network/network_content.h"
+#include "../textfile_gui.h"

 #include "ai.hpp"
 #include "../script/api/script_log.hpp"
@@ -517,11 +518,7 @@ struct AISettingsWindow : public Window {
 	 */
 	virtual void OnInvalidateData(int data = 0, bool gui_scope = true)
 	{
-		if (_game_mode == GM_NORMAL && Company::IsValidID(this->slot)) {
-			delete this;
-		} else {
-			this->RebuildVisibleSettings();
-		}
+		this->RebuildVisibleSettings();
 	}
 };

@@ -563,6 +560,40 @@ static void ShowAISettingsWindow(CompanyID slot)
 	new AISettingsWindow(&_ai_settings_desc, slot);
 }

+
+/** Window for displaying the textfile of a AI. */
+struct ScriptTextfileWindow : public TextfileWindow {
+	CompanyID slot; ///< View the textfile of this CompanyID slot.
+
+	ScriptTextfileWindow(TextfileType file_type, CompanyID slot) : TextfileWindow(file_type), slot(slot)
+	{
+		this->GetWidget<NWidgetCore>(WID_TF_CAPTION)->SetDataTip(STR_TEXTFILE_README_CAPTION + file_type, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS);
+
+		const char *textfile = GetConfig(slot)->GetTextfile(file_type, slot);
+		this->LoadTextfile(textfile, (slot == OWNER_DEITY) ? GAME_DIR : AI_DIR);
+	}
+
+	/* virtual */ void SetStringParameters(int widget) const
+	{
+		if (widget == WID_TF_CAPTION) {
+			SetDParam(0, (slot == OWNER_DEITY) ? STR_CONTENT_TYPE_GAME_SCRIPT : STR_CONTENT_TYPE_AI);
+			SetDParamStr(1, GetConfig(slot)->GetName());
+		}
+	}
+};
+
+/**
+ * Open the AI version of the textfile window.
+ * @param file_type The type of textfile to display.
+ * @param slot The slot the Script is using.
+ */
+void ShowScriptTextfileWindow(TextfileType file_type, CompanyID slot)
+{
+	DeleteWindowByClass(WC_TEXTFILE);
+	new ScriptTextfileWindow(file_type, slot);
+}
+
+
 /** Widgets for the configure AI window. */
 static const NWidgetPart _nested_ai_config_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
@@ -596,6 +627,11 @@ static const NWidgetPart _nested_ai_config_widgets[] = {
 			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_AIC_CHANGE), SetFill(1, 0), SetMinimalSize(93, 12), SetDataTip(STR_AI_CONFIG_CHANGE, STR_AI_CONFIG_CHANGE_TOOLTIP),
 			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_AIC_CONFIGURE), SetFill(1, 0), SetMinimalSize(93, 12), SetDataTip(STR_AI_CONFIG_CONFIGURE, STR_AI_CONFIG_CONFIGURE_TOOLTIP),
 			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_AIC_CLOSE), SetFill(1, 0), SetMinimalSize(93, 12), SetDataTip(STR_AI_SETTINGS_CLOSE, STR_NULL),
+			EndContainer(),
+		NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(7, 0, 7),
+			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_AIC_TEXTFILE + TFT_README), SetFill(1, 0), SetResize(1, 0), SetDataTip(STR_TEXTFILE_VIEW_README, STR_NULL),
+			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_AIC_TEXTFILE + TFT_CHANGELOG), SetFill(1, 0), SetResize(1, 0), SetDataTip(STR_TEXTFILE_VIEW_CHANGELOG, STR_NULL),
+			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_AIC_TEXTFILE + TFT_LICENSE), SetFill(1, 0), SetResize(1, 0), SetDataTip(STR_TEXTFILE_VIEW_LICENCE, STR_NULL),
 		EndContainer(),
 		NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_AIC_CONTENT_DOWNLOAD), SetFill(1, 0), SetMinimalSize(279, 12), SetPadding(0, 7, 9, 7), SetDataTip(STR_INTRO_ONLINE_CONTENT, STR_INTRO_TOOLTIP_ONLINE_CONTENT),
 	EndContainer(),
@@ -732,6 +768,13 @@ struct AIConfigWindow : public Window {

 	virtual void OnClick(Point pt, int widget, int click_count)
 	{
+		if (widget >= WID_AIC_TEXTFILE && widget < WID_AIC_TEXTFILE + TFT_END) {
+			if (this->selected_slot == INVALID_COMPANY || GetConfig(this->selected_slot) == NULL) return;
+
+			ShowScriptTextfileWindow((TextfileType)(widget - WID_AIC_TEXTFILE), this->selected_slot);
+			return;
+		}
+
 		switch (widget) {
 			case WID_AIC_DECREASE:
 			case WID_AIC_INCREASE: {
@@ -822,6 +865,10 @@ struct AIConfigWindow : public Window {
 		this->SetWidgetDisabledState(WID_AIC_CONFIGURE, this->selected_slot == INVALID_COMPANY || GetConfig(this->selected_slot)->GetConfigList()->size() == 0);
 		this->SetWidgetDisabledState(WID_AIC_MOVE_UP, this->selected_slot == OWNER_DEITY || this->selected_slot == INVALID_COMPANY || !IsEditable((CompanyID)(this->selected_slot - 1)));
 		this->SetWidgetDisabledState(WID_AIC_MOVE_DOWN, this->selected_slot == OWNER_DEITY || this->selected_slot == INVALID_COMPANY || !IsEditable((CompanyID)(this->selected_slot + 1)));
+
+		for (TextfileType tft = TFT_BEGIN; tft < TFT_END; tft++) {
+			this->SetWidgetDisabledState(WID_AIC_TEXTFILE + tft, this->selected_slot == INVALID_COMPANY || (GetConfig(this->selected_slot)->GetTextfile(tft, this->selected_slot) == NULL));
+		}
 	}
 };

--- a/src/ai/ai_instance.cpp
+++ b/src/ai/ai_instance.cpp
@@ -222,7 +222,7 @@ void AIInstance::Died()

 	ShowAIDebugWindow(_current_company);

-	const AIInfo *info = AIConfig::GetConfig(_current_company)->GetInfo();
+	const AIInfo *info = AIConfig::GetConfig(_current_company, AIConfig::SSS_FORCE_GAME)->GetInfo();
 	if (info != NULL) {
 		ShowErrorMessage(STR_ERROR_AI_PLEASE_REPORT_CRASH, INVALID_STRING_ID, WL_WARNING);

--- a/src/aircraft_cmd.cpp
+++ b/src/aircraft_cmd.cpp
@@ -1894,7 +1894,7 @@ static bool AircraftEventHandler(Aircraft *v, int loop)

 	if (v->current_order.IsType(OT_LOADING) || v->current_order.IsType(OT_LEAVESTATION)) return true;

-	if (v->state == FLYING) {
+	if (v->state >= ENDTAKEOFF && v->state <= HELIENDLANDING) {
 		/* If we are flying, unconditionally clear the 'dest too far' state. */
 		AircraftHandleDestTooFar(v, false);
 	} else if (v->acache.cached_max_range_sqr != 0) {
--- a/src/articulated_vehicles.cpp
+++ b/src/articulated_vehicles.cpp
@@ -54,6 +54,16 @@ static EngineID GetNextArticulatedPart(uint index, EngineID front_type, Vehicle
 	return GetNewEngineID(front_engine->GetGRF(), front_engine->type, callback);
 }

+/**
+ * Does a NewGRF report that this should be an articulated vehicle?
+ * @param engine_type The engine to check.
+ * @return True iff the articulated engine callback flag is set.
+ */
+bool IsArticulatedEngine(EngineID engine_type)
+{
+	return HasBit(EngInfo(engine_type)->callback_mask, CBM_VEHICLE_ARTIC_ENGINE);
+}
+
 /**
 * Count the number of articulated parts of an engine.
 * @param engine_type The engine to get the number of parts of.
@@ -109,13 +119,13 @@ static inline uint16 GetVehicleDefaultCapacity(EngineID engine, CargoID *cargo_t
 */
 static inline uint32 GetAvailableVehicleCargoTypes(EngineID engine, bool include_initial_cargo_type)
 {
-	uint32 cargoes = 0;
-	CargoID initial_cargo_type;
+	const Engine *e = Engine::Get(engine);
+	if (!e->CanCarryCargo()) return 0;

-	if (GetVehicleDefaultCapacity(engine, &initial_cargo_type) > 0) {
-		const EngineInfo *ei = EngInfo(engine);
-		cargoes = ei->refit_mask;
-		if (include_initial_cargo_type && initial_cargo_type < NUM_CARGO) SetBit(cargoes, initial_cargo_type);
+	uint32 cargoes = e->info.refit_mask;
+
+	if (include_initial_cargo_type) {
+		SetBit(cargoes, e->GetDefaultCargoType());
 	}

 	return cargoes;
@@ -240,7 +250,7 @@ bool IsArticulatedVehicleCarryingDifferentCargoes(const Vehicle *v, CargoID *car
 	CargoID first_cargo = CT_INVALID;

 	do {
-		if (v->cargo_cap > 0 && v->cargo_type != CT_INVALID) {
+		if (v->cargo_type != CT_INVALID && v->GetEngine()->CanCarryCargo()) {
 			if (first_cargo == CT_INVALID) first_cargo = v->cargo_type;
 			if (first_cargo != v->cargo_type) {
 				if (cargo_type != NULL) *cargo_type = CT_INVALID;
--- a/src/articulated_vehicles.h
+++ b/src/articulated_vehicles.h
@@ -23,6 +23,7 @@ uint32 GetUnionOfArticulatedRefitMasks(EngineID engine, bool include_initial_car
 uint32 GetIntersectionOfArticulatedRefitMasks(EngineID engine, bool include_initial_cargo_type);
 bool IsArticulatedVehicleCarryingDifferentCargoes(const Vehicle *v, CargoID *cargo_type);
 bool IsArticulatedVehicleRefittable(EngineID engine);
+bool IsArticulatedEngine(EngineID engine_type);
 void CheckConsistencyOfArticulatedVehicle(const Vehicle *v);


--- a/src/autoreplace_cmd.cpp
+++ b/src/autoreplace_cmd.cpp
@@ -206,7 +206,7 @@ static CargoID GetNewCargoTypeForReplace(Vehicle *v, EngineID engine_type, bool
 		 * now we will figure out what cargo the train is carrying and refit to fit this */

 		for (v = v->First(); v != NULL; v = v->Next()) {
-			if (v->cargo_cap == 0) continue;
+			if (!v->GetEngine()->CanCarryCargo()) continue;
 			/* Now we found a cargo type being carried on the train and we will see if it is possible to carry to this one */
 			if (HasBit(available_cargo_types, v->cargo_type)) return v->cargo_type;
 		}
--- a/src/base_media_base.h
+++ b/src/base_media_base.h
@@ -15,6 +15,8 @@
 #include "fileio_func.h"
 #include "core/smallmap_type.hpp"
 #include "gfx_type.h"
+#include "textfile_type.h"
+#include "textfile_gui.h"

 /* Forward declare these; can't do 'struct X' in functions as older GCCs barf on that */
 struct IniFile;
@@ -33,7 +35,7 @@ struct MD5File {
 	uint8 hash[16];              ///< md5 sum of the file
 	const char *missing_warning; ///< warning when this file is missing

-	ChecksumResult CheckMD5(Subdirectory subdir) const;
+	ChecksumResult CheckMD5(Subdirectory subdir, size_t max_size) const;
 };

 /**
@@ -129,6 +131,36 @@ struct BaseSet {
 		/* Then fall back */
 		return this->description.Begin()->second;
 	}
+
+	/**
+	 * Calculate and check the MD5 hash of the supplied file.
+	 * @param file The file get the hash of.
+	 * @param subdir The sub directory to get the files from.
+	 * @return
+	 * - #CR_MATCH if the MD5 hash matches
+	 * - #CR_MISMATCH if the MD5 does not match
+	 * - #CR_NO_FILE if the file misses
+	 */
+	static MD5File::ChecksumResult CheckMD5(const MD5File *file, Subdirectory subdir)
+	{
+		return file->CheckMD5(subdir, SIZE_MAX);
+	}
+
+	/**
+	 * Search a textfile file next to this base media.
+	 * @param type The type of the textfile to search for.
+	 * @return The filename for the textfile, \c NULL otherwise.
+	 */
+	const char *GetTextfile(TextfileType type) const
+	{
+		for (uint i = 0; i < NUM_FILES; i++) {
+			const char *textfile = ::GetTextfile(type, BASESET_DIR, this->files[i].filename);
+			if (textfile != NULL) {
+				return textfile;
+			}
+		}
+		return NULL;
+	}
 };

 /**
@@ -209,6 +241,8 @@ struct GraphicsSet : BaseSet<GraphicsSet, MAX_GFT, true> {
 	BlitterType blitter;       ///< Blitter of this graphics set

 	bool FillSetDetails(struct IniFile *ini, const char *path, const char *full_filename);
+
+	static MD5File::ChecksumResult CheckMD5(const MD5File *file, Subdirectory subdir);
 };

 /** All data/functions related with replacing the base graphics. */
--- a/src/base_media_func.h
+++ b/src/base_media_func.h
@@ -131,7 +131,7 @@ bool BaseSet<T, Tnum_files, Tsearch_in_tars>::FillSetDetails(IniFile *ini, const
 			file->missing_warning = strdup(item->value);
 		}

-		switch (file->CheckMD5(BASESET_DIR)) {
+		switch (T::CheckMD5(file, BASESET_DIR)) {
 			case MD5File::CR_MATCH:
 				this->valid_files++;
 				/* FALL THROUGH */
--- a/src/blitter/32bpp_anim.cpp
+++ b/src/blitter/32bpp_anim.cpp
@@ -417,10 +417,9 @@ void Blitter_32bppAnim::PaletteAnimate(const Palette &palette)

 	this->palette = palette;
 	/* If first_dirty is 0, it is for 8bpp indication to send the new
-	 *  palette. As we dont do that for 32bpp, ignore that request
-	 *  completely */
-	if (this->palette.first_dirty == 0) return;
-	assert(this->palette.first_dirty == PALETTE_ANIM_START);
+	 *  palette. However, only the animation colours might possibly change.
+	 *  Especially when going between toyland and non-toyland. */
+	assert(this->palette.first_dirty == PALETTE_ANIM_START || this->palette.first_dirty == 0);

 	const uint16 *anim = this->anim_buf;
 	uint32 *dst = (uint32 *)_screen.dst_ptr;
--- a/src/blitter/32bpp_optimized.cpp
+++ b/src/blitter/32bpp_optimized.cpp
@@ -207,55 +207,6 @@ void Blitter_32bppOptimized::Draw(Blitter::BlitterParams *bp, BlitterMode mode,
 	}
 }

-/**
- * Resizes the sprite in a very simple way, takes every n-th pixel and every n-th row
- *
- * @param sprite_src sprite to resize
- * @param zoom resizing scale
- * @return resized sprite
- */
-static const SpriteLoader::Sprite *ResizeSprite(const SpriteLoader::Sprite *sprite_src, ZoomLevel zoom)
-{
-	SpriteLoader::Sprite *sprite = MallocT<SpriteLoader::Sprite>(1);
-
-	if (zoom == ZOOM_LVL_NORMAL) {
-		memcpy(sprite, sprite_src, sizeof(*sprite));
-		uint size = sprite_src->height * sprite_src->width;
-		sprite->data = MallocT<SpriteLoader::CommonPixel>(size);
-		memcpy(sprite->data, sprite_src->data, size * sizeof(SpriteLoader::CommonPixel));
-		return sprite;
-	}
-
-	sprite->height = UnScaleByZoom(sprite_src->height, zoom);
-	sprite->width  = UnScaleByZoom(sprite_src->width,  zoom);
-	sprite->x_offs = UnScaleByZoom(sprite_src->x_offs, zoom);
-	sprite->y_offs = UnScaleByZoom(sprite_src->y_offs, zoom);
-
-	uint size = sprite->height * sprite->width;
-	SpriteLoader::CommonPixel *dst = sprite->data = CallocT<SpriteLoader::CommonPixel>(size);
-
-	const SpriteLoader::CommonPixel *src = (SpriteLoader::CommonPixel *)sprite_src->data;
-	const SpriteLoader::CommonPixel *src_end = src + sprite_src->height * sprite_src->width;
-
-	uint scaled_1 = ScaleByZoom(1, zoom);
-
-	for (uint y = 0; y < sprite->height; y++) {
-		if (src >= src_end) src = src_end - sprite_src->width;
-
-		const SpriteLoader::CommonPixel *src_ln = src + sprite_src->width * scaled_1;
-		for (uint x = 0; x < sprite->width; x++) {
-			if (src >= src_ln) src = src_ln - 1;
-			*dst = *src;
-			dst++;
-			src += scaled_1;
-		}
-
-		src = src_ln;
-	}
-
-	return sprite;
-}
-
 Sprite *Blitter_32bppOptimized::Encode(SpriteLoader::Sprite *sprite, AllocatorProc *allocator)
 {
 	/* streams of pixels (a, r, g, b channels)
@@ -287,7 +238,7 @@ Sprite *Blitter_32bppOptimized::Encode(SpriteLoader::Sprite *sprite, AllocatorPr
 	}

 	for (ZoomLevel z = zoom_min; z <= zoom_max; z++) {
-		const SpriteLoader::Sprite *src_orig = ResizeSprite(sprite, z);
+		const SpriteLoader::Sprite *src_orig = &sprite[z];

 		uint size = src_orig->height * src_orig->width;

@@ -371,9 +322,6 @@ Sprite *Blitter_32bppOptimized::Encode(SpriteLoader::Sprite *sprite, AllocatorPr

 		lengths[z][0] = (byte *)dst_px_ln - (byte *)dst_px_orig[z]; // all are aligned to 4B boundary
 		lengths[z][1] = (byte *)dst_n_ln  - (byte *)dst_n_orig[z];
-
-		free(src_orig->data);
-		free(src_orig);
 	}

 	uint len = 0; // total length of data
@@ -389,6 +337,7 @@ Sprite *Blitter_32bppOptimized::Encode(SpriteLoader::Sprite *sprite, AllocatorPr
 	dest_sprite->y_offs = sprite->y_offs;

 	SpriteData *dst = (SpriteData *)dest_sprite->data;
+	memset(dst, 0, sizeof(*dst));

 	for (ZoomLevel z = zoom_min; z <= zoom_max; z++) {
 		dst->offset[z][0] = z == zoom_min ? 0 : lengths[z - 1][1] + dst->offset[z - 1][1];
--- a/src/blitter/8bpp_optimized.cpp
+++ b/src/blitter/8bpp_optimized.cpp
@@ -130,7 +130,7 @@ Sprite *Blitter_8bppOptimized::Encode(SpriteLoader::Sprite *sprite, AllocatorPro
 	}

 	for (ZoomLevel i = zoom_min; i <= zoom_max; i++) {
-		memory += UnScaleByZoom(sprite->height, i) * UnScaleByZoom(sprite->width, i);
+		memory += sprite[i].width * sprite[i].height;
 	}

 	/* We have no idea how much memory we really need, so just guess something */
@@ -141,6 +141,7 @@ Sprite *Blitter_8bppOptimized::Encode(SpriteLoader::Sprite *sprite, AllocatorPro
 	 * and the memory usage is quite low. */
 	static ReusableBuffer<byte> temp_buffer;
 	SpriteData *temp_dst = (SpriteData *)temp_buffer.Allocate(memory);
+	memset(temp_dst, 0, sizeof(*temp_dst));
 	byte *dst = temp_dst->data;

 	/* Make the sprites per zoom-level */
@@ -150,9 +151,8 @@ Sprite *Blitter_8bppOptimized::Encode(SpriteLoader::Sprite *sprite, AllocatorPro
 		temp_dst->offset[i] = offset;

 		/* cache values, because compiler can't cache it */
-		int scaled_height = UnScaleByZoom(sprite->height, i);
-		int scaled_width  = UnScaleByZoom(sprite->width,  i);
-		int scaled_1      =   ScaleByZoom(1,              i);
+		int scaled_height = sprite[i].height;
+		int scaled_width  = sprite[i].width;

 		for (int y = 0; y < scaled_height; y++) {
 			uint trans = 0;
@@ -161,18 +161,10 @@ Sprite *Blitter_8bppOptimized::Encode(SpriteLoader::Sprite *sprite, AllocatorPro
 			byte *count_dst = NULL;

 			/* Store the scaled image */
-			const SpriteLoader::CommonPixel *src = &sprite->data[ScaleByZoom(y, i) * sprite->width];
-			const SpriteLoader::CommonPixel *src_end = &src[sprite->width];
+			const SpriteLoader::CommonPixel *src = &sprite[i].data[y * sprite[i].width];

 			for (int x = 0; x < scaled_width; x++) {
-				uint colour = 0;
-
-				/* Get the colour keeping in mind the zoom-level */
-				for (int j = 0; j < scaled_1; j++) {
-					if (src->m != 0) colour = src->m;
-					/* Because of the scaling it might happen we read outside the buffer. Avoid that. */
-					if (++src == src_end) break;
-				}
+				uint colour = src++->m;

 				if (last_colour == 0 || colour == 0 || pixels == 255) {
 					if (count_dst != NULL) {
--- a/src/company_base.h
+++ b/src/company_base.h
@@ -35,6 +35,14 @@ struct CompanyInfrastructure {
 	uint32 water;              ///< Count of company owned track bits for canals.
 	uint32 station;            ///< Count of company owned station tiles.
 	uint32 airport;            ///< Count of company owned airports.
+
+	/** Get total sum of all owned track bits. */
+	uint32 GetRailTotal() const
+	{
+		uint32 total = 0;
+		for (RailType rt =  RAILTYPE_BEGIN; rt < RAILTYPE_END; rt++) total += this->rail[rt];
+		return total;
+	}
 };

 typedef Pool<Company, CompanyByte, 1, MAX_COMPANIES> CompanyPool;
--- a/src/company_gui.cpp
+++ b/src/company_gui.cpp
@@ -1588,8 +1588,9 @@ struct CompanyInfrastructureWindow : Window
 		const Company *c = Company::Get((CompanyID)this->window_number);
 		Money total;

+		uint32 rail_total = c->infrastructure.GetRailTotal();
 		for (RailType rt = RAILTYPE_BEGIN; rt != RAILTYPE_END; rt++) {
-			if (HasBit(this->railtypes, rt)) total += RailMaintenanceCost(rt, c->infrastructure.rail[rt]);
+			if (HasBit(this->railtypes, rt)) total += RailMaintenanceCost(rt, c->infrastructure.rail[rt], rail_total);
 		}
 		total += SignalMaintenanceCost(c->infrastructure.signal);

@@ -1675,9 +1676,10 @@ struct CompanyInfrastructureWindow : Window
 				/* Find the maximum count that is displayed. */
 				uint32 max_val = 1000;  // Some random number to reserve enough space.
 				Money max_cost = 10000; // Some random number to reserve enough space.
+				uint32 rail_total = c->infrastructure.GetRailTotal();
 				for (RailType rt = RAILTYPE_BEGIN; rt < RAILTYPE_END; rt++) {
 					max_val = max(max_val, c->infrastructure.rail[rt]);
-					max_cost = max(max_cost, RailMaintenanceCost(rt, c->infrastructure.rail[rt]));
+					max_cost = max(max_cost, RailMaintenanceCost(rt, c->infrastructure.rail[rt], rail_total));
 				}
 				max_val = max(max_val, c->infrastructure.signal);
 				max_cost = max(max_cost, SignalMaintenanceCost(c->infrastructure.signal));
@@ -1739,12 +1741,13 @@ struct CompanyInfrastructureWindow : Window

 				break;

-			case WID_CI_RAIL_COUNT:
+			case WID_CI_RAIL_COUNT: {
 				/* Draw infrastructure count for each valid railtype. */
+				uint32 rail_total = c->infrastructure.GetRailTotal();
 				for (RailType rt = RAILTYPE_BEGIN; rt != RAILTYPE_END; rt++) {
 					if (HasBit(this->railtypes, rt)) {
 						SetDParam(0, c->infrastructure.rail[rt]);
-						SetDParam(1, RailMaintenanceCost(rt, c->infrastructure.rail[rt]) * 12); // Convert to per year
+						SetDParam(1, RailMaintenanceCost(rt, c->infrastructure.rail[rt], rail_total) * 12); // Convert to per year
 						DrawString(r.left, r.right, y += FONT_HEIGHT_NORMAL, _settings_game.economy.infrastructure_maintenance ? STR_COMPANY_INFRASTRUCTURE_VIEW_COST : STR_WHITE_COMMA);
 					}
 				}
@@ -1754,6 +1757,7 @@ struct CompanyInfrastructureWindow : Window
 					DrawString(r.left, r.right, y += FONT_HEIGHT_NORMAL, _settings_game.economy.infrastructure_maintenance ? STR_COMPANY_INFRASTRUCTURE_VIEW_COST : STR_WHITE_COMMA);
 				}
 				break;
+			}

 			case WID_CI_ROAD_DESC:
 				DrawString(r.left, r.right, y, STR_COMPANY_INFRASTRUCTURE_VIEW_ROAD_SECT);
--- a/src/company_manager_face.h
+++ b/src/company_manager_face.h
@@ -28,7 +28,7 @@ enum GenderEthnicity {
 	GE_BF = 1 << ETHNICITY_BLACK | 1 << GENDER_FEMALE, ///< A female of African origin (black)
 	GE_END,
 };
-DECLARE_ENUM_AS_BIT_SET(GenderEthnicity); ///< See GenderRace as a bitset
+DECLARE_ENUM_AS_BIT_SET(GenderEthnicity) ///< See GenderRace as a bitset

 /** Bitgroups of the CompanyManagerFace variable */
 enum CompanyManagerFaceVariable {
@@ -52,7 +52,7 @@ enum CompanyManagerFaceVariable {
 	CMFV_GLASSES,
 	CMFV_END,
 };
-DECLARE_POSTFIX_INCREMENT(CompanyManagerFaceVariable);
+DECLARE_POSTFIX_INCREMENT(CompanyManagerFaceVariable)

 /** Information about the valid values of CompanyManagerFace bitgroups as well as the sprites to draw */
 struct CompanyManagerFaceBitsInfo {
--- a/src/core/alloc_type.hpp
+++ b/src/core/alloc_type.hpp
@@ -180,4 +180,38 @@ public:
 	inline void operator delete[](void *ptr) { free(ptr); }
 };

+/**
+ * A smart pointer class that free()'s the pointer on destruction.
+ * @tparam T Storage type.
+ */
+template <typename T>
+class AutoFreePtr
+{
+	T *ptr; ///< Stored pointer.
+
+public:
+	AutoFreePtr(T *ptr) : ptr(ptr) {}
+	~AutoFreePtr() { free(this->ptr); }
+
+	/**
+	 * Take ownership of a new pointer and free the old one if needed.
+	 * @param ptr NEw pointer.
+	 */
+	inline void Assign(T *ptr)
+	{
+		free(this->ptr);
+		this->ptr = ptr;
+	}
+
+	/** Dereference pointer. */
+	inline T *operator ->() { return this->ptr; }
+	/** Dereference pointer. */
+	inline const T *operator ->() const { return this->ptr; }
+
+	/** Cast to underlaying regular pointer. */
+	inline operator T *() { return this->ptr; }
+	/** Cast to underlaying regular pointer. */
+	inline operator const T *() const { return this->ptr; }
+};
+
 #endif /* ALLOC_TYPE_HPP */
--- a/src/core/pool_func.hpp
+++ b/src/core/pool_func.hpp
@@ -107,7 +107,11 @@ DEFINE_POOL_METHOD(inline void *)::AllocateItem(size_t size, size_t index)
 		assert(sizeof(Titem) == size);
 		item = (Titem *)this->alloc_cache;
 		this->alloc_cache = this->alloc_cache->next;
-		if (Tzero) MemSetT(item, 0);
+		if (Tzero) {
+			/* Explicitly casting to (void *) prevets a clang warning -
+			 * we are actually memsetting a (not-yet-constructed) object */
+			memset((void *)item, 0, sizeof(Titem));
+		}
 	} else if (Tzero) {
 		item = (Titem *)CallocT<byte>(size);
 	} else {
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -597,8 +597,9 @@ static void CompaniesGenStatistics()
 			cur_company.Change(c->index);

 			CommandCost cost(EXPENSES_PROPERTY);
+			uint32 rail_total = c->infrastructure.GetRailTotal();
 			for (RailType rt = RAILTYPE_BEGIN; rt < RAILTYPE_END; rt++) {
-				if (c->infrastructure.rail[rt] != 0) cost.AddCost(RailMaintenanceCost(rt, c->infrastructure.rail[rt]));
+				if (c->infrastructure.rail[rt] != 0) cost.AddCost(RailMaintenanceCost(rt, c->infrastructure.rail[rt], rail_total));
 			}
 			cost.AddCost(SignalMaintenanceCost(c->infrastructure.signal));
 			for (RoadType rt = ROADTYPE_BEGIN; rt < ROADTYPE_END; rt++) {
--- a/src/engine_gui.cpp
+++ b/src/engine_gui.cpp
@@ -166,19 +166,20 @@ static StringID GetAircraftEngineInfoString(const Engine *e)
 	uint capacity = e->GetDisplayDefaultCapacity(&mail_capacity);
 	uint16 range = e->GetRange();

-	SetDParam(0, e->GetCost());
-	SetDParam(1, e->GetDisplayMaxSpeed());
-	SetDParam(2, cargo);
-	SetDParam(3, capacity);
-	SetDParam(7, range);
+	uint i = 0;
+	SetDParam(i++, e->GetCost());
+	SetDParam(i++, e->GetDisplayMaxSpeed());
+	if (range > 0) SetDParam(i++, range);
+	SetDParam(i++, cargo);
+	SetDParam(i++, capacity);

 	if (mail_capacity > 0) {
-		SetDParam(4, CT_MAIL);
-		SetDParam(5, mail_capacity);
-		SetDParam(6, e->GetRunningCost());
+		SetDParam(i++, CT_MAIL);
+		SetDParam(i++, mail_capacity);
+		SetDParam(i++, e->GetRunningCost());
 		return range > 0 ? STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_CAPACITY_RUNCOST : STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST;
 	} else {
-		SetDParam(4, e->GetRunningCost());
+		SetDParam(i++, e->GetRunningCost());
 		return range > 0 ? STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_RUNCOST : STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST;
 	}
 }
--- a/src/fileio.cpp
+++ b/src/fileio.cpp
@@ -683,6 +683,7 @@ uint TarScanner::DoScan(Subdirectory sd)
 	}
 	if (mode & TarScanner::SCENARIO) {
 		num += fs.DoScan(SCENARIO_DIR);
+		num += fs.DoScan(HEIGHTMAP_DIR);
 	}
 	DEBUG(misc, 1, "Scan complete, found %d files", num);
 	return num;
--- a/src/fios_gui.cpp
+++ b/src/fios_gui.cpp
@@ -27,6 +27,7 @@
 #include "landscape_type.h"
 #include "date_func.h"
 #include "core/geometry_func.hpp"
+#include "gamelog.h"

 #include "widgets/fios_widget.h"

@@ -60,7 +61,7 @@ void LoadCheckData::Clear()
 	}
 	companies.Clear();

-	free(this->gamelog_action);
+	GamelogFree(this->gamelog_action, this->gamelog_actions);
 	this->gamelog_action = NULL;
 	this->gamelog_actions = 0;

--- a/src/fontcache.cpp
+++ b/src/fontcache.cpp
@@ -974,6 +974,14 @@ void UninitFreeType()
 	_library = NULL;
 }

+/**
+ * Reset cached glyphs.
+ */
+void ClearFontCache()
+{
+	ResetGlyphCache(true);
+	ResetGlyphCache(false);
+}

 static FT_Face GetFontFace(FontSize size)
 {
@@ -1152,7 +1160,7 @@ const Sprite *GetGlyph(FontSize size, WChar key)
 	if (width > 256 || height > 256) usererror("Font glyph is too large");

 	/* FreeType has rendered the glyph, now we allocate a sprite and copy the image into it */
-	sprite.AllocateData(width * height);
+	sprite.AllocateData(ZOOM_LVL_NORMAL, width * height);
 	sprite.type = ST_FONT;
 	sprite.width = width;
 	sprite.height = height;
--- a/src/fontcache.h
+++ b/src/fontcache.h
@@ -44,6 +44,7 @@ extern FreeTypeSettings _freetype;

 void InitFreeType(bool monospace);
 void UninitFreeType();
+void ClearFontCache();
 const Sprite *GetGlyph(FontSize size, uint32 key);
 uint GetGlyphWidth(FontSize size, uint32 key);
 bool GetDrawGlyphShadow();
@@ -65,6 +66,7 @@ bool SetFallbackFont(FreeTypeSettings *settings, const char *language_isocode, i
 /* Stub for initializiation */
 static inline void InitFreeType(bool monospace) { extern void ResetFontSizes(bool monospace); ResetFontSizes(monospace); }
 static inline void UninitFreeType() {}
+static inline void ClearFontCache() {}

 /** Get the Sprite for a glyph */
 static inline const Sprite *GetGlyph(FontSize size, uint32 key)
--- a/src/game/game_core.cpp
+++ b/src/game/game_core.cpp
@@ -72,7 +72,7 @@
 	/* Clients shouldn't start GameScripts */
 	if (_networking && !_network_server) return;

-	GameConfig *config = GameConfig::GetConfig();
+	GameConfig *config = GameConfig::GetConfig(GameConfig::SSS_FORCE_GAME);
 	GameInfo *info = config->GetInfo();
 	if (info == NULL) return;

--- a/src/gamelog.cpp
+++ b/src/gamelog.cpp
@@ -64,14 +64,12 @@ void GamelogStopAction()
 }

 /**
- * Resets and frees all memory allocated - used before loading or starting a new game
+ * Frees the memory allocated by a gamelog
 */
-void GamelogReset()
+void GamelogFree(LoggedAction *gamelog_action, uint gamelog_actions)
 {
-	assert(_gamelog_action_type == GLAT_NONE);
-
-	for (uint i = 0; i < _gamelog_actions; i++) {
-		const LoggedAction *la = &_gamelog_action[i];
+	for (uint i = 0; i < gamelog_actions; i++) {
+		const LoggedAction *la = &gamelog_action[i];
 		for (uint j = 0; j < la->changes; j++) {
 			const LoggedChange *lc = &la->change[j];
 			if (lc->ct == GLCT_SETTING) free(lc->setting.name);
@@ -79,7 +77,16 @@ void GamelogReset()
 		free(la->change);
 	}

-	free(_gamelog_action);
+	free(gamelog_action);
+}
+
+/**
+ * Resets and frees all memory allocated - used before loading or starting a new game
+ */
+void GamelogReset()
+{
+	assert(_gamelog_action_type == GLAT_NONE);
+	GamelogFree(_gamelog_action, _gamelog_actions);

 	_gamelog_action  = NULL;
 	_gamelog_actions = 0;
--- a/src/gamelog.h
+++ b/src/gamelog.h
@@ -30,6 +30,7 @@ enum GamelogActionType {
 void GamelogStartAction(GamelogActionType at);
 void GamelogStopAction();

+void GamelogFree(struct LoggedAction *gamelog_action, uint gamelog_actions);
 void GamelogReset();

 /**
--- a/src/gfx.cpp
+++ b/src/gfx.cpp
@@ -45,6 +45,7 @@ SwitchMode _switch_mode;  ///< The next mainloop command.
 PauseModeByte _pause_mode;
 Palette _cur_palette;

+static Dimension _max_char_size[FS_END]; ///< Cache of the maximum size of any character of a font.
 static int _max_char_height; ///< Cache of the height of the largest font
 static int _max_char_width;  ///< Cache of the width of the largest font
 static byte _stringwidth_table[FS_END][224]; ///< Cache containing width of often used characters. @see GetCharacterWidth()
@@ -1551,20 +1552,25 @@ void DoPaletteAnimations()
 */
 void LoadStringWidthTable(bool monospace)
 {
-	_max_char_height = 0;
-	_max_char_width  = 0;
-
 	for (FontSize fs = monospace ? FS_MONO : FS_BEGIN; fs < (monospace ? FS_END : FS_MONO); fs++) {
-		_max_char_height = max<int>(_max_char_height, GetCharacterHeight(fs));
+		_max_char_size[fs].width = 0;
+		_max_char_size[fs].height = GetCharacterHeight(fs);
 		for (uint i = 0; i != 224; i++) {
 			_stringwidth_table[fs][i] = GetGlyphWidth(fs, i + 32);
-			_max_char_width = max<int>(_max_char_width, _stringwidth_table[fs][i]);
+			_max_char_size[fs].width = max<int>(_max_char_size[fs].width, _stringwidth_table[fs][i]);
 		}
+
+		/* Needed because they need to be 1 more than the widest. */
+		_max_char_size[fs].width++;
+		_max_char_size[fs].height++;
 	}

-	/* Needed because they need to be 1 more than the widest. */
-	_max_char_height++;
-	_max_char_width++;
+	_max_char_width  = 0;
+	_max_char_height = 0;
+	for (FontSize fs = FS_BEGIN; fs < FS_END; fs++) {
+		_max_char_width = max<int>(_max_char_width, _max_char_size[fs].width);
+		_max_char_height = max<int>(_max_char_height, _max_char_size[fs].height);
+	}

 	ReInitAllWindows();
 }
@@ -1732,10 +1738,11 @@ void DrawDirtyBlocks()
 		_modal_progress_paint_mutex->BeginCritical();
 		_modal_progress_work_mutex->BeginCritical();

-		if (_switch_mode != SM_NONE && !HasModalProgress()) {
-			SwitchToMode(_switch_mode);
-			_switch_mode = SM_NONE;
-		}
+		/* When we ended with the modal progress, do not draw the blocks.
+		 * Simply let the next run do so, otherwise we would be loading
+		 * the new state (and possibly change the blitter) when we hold
+		 * the drawing lock, which we must not do. */
+		if (_switch_mode != SM_NONE && !HasModalProgress()) return;
 	}

 	y = 0;
--- a/src/gfxinit.cpp
+++ b/src/gfxinit.cpp
@@ -52,7 +52,16 @@ static uint LoadGrfFile(const char *filename, uint load_index, int file_index)

 	DEBUG(sprite, 2, "Reading grf-file '%s'", filename);

-	while (LoadNextSprite(load_index, file_index, sprite_id)) {
+	byte container_ver = GetGRFContainerVersion();
+	if (container_ver == 0) usererror("Base grf '%s' is corrupt", filename);
+	ReadGRFSpriteOffsets(container_ver);
+	if (container_ver >= 2) {
+		/* Read compression. */
+		byte compression = FioReadByte();
+		if (compression != 0) usererror("Unsupported compression format");
+	}
+
+	while (LoadNextSprite(load_index, file_index, sprite_id, container_ver)) {
 		load_index++;
 		sprite_id++;
 		if (load_index >= MAX_SPRITES) {
@@ -80,11 +89,20 @@ static void LoadGrfFileIndexed(const char *filename, const SpriteID *index_tbl,

 	DEBUG(sprite, 2, "Reading indexed grf-file '%s'", filename);

+	byte container_ver = GetGRFContainerVersion();
+	if (container_ver == 0) usererror("Base grf '%s' is corrupt", filename);
+	ReadGRFSpriteOffsets(container_ver);
+	if (container_ver >= 2) {
+		/* Read compression. */
+		byte compression = FioReadByte();
+		if (compression != 0) usererror("Unsupported compression format");
+	}
+
 	while ((start = *index_tbl++) != END) {
 		uint end = *index_tbl++;

 		do {
-			bool b = LoadNextSprite(start, file_index, sprite_id);
+			bool b = LoadNextSprite(start, file_index, sprite_id, container_ver);
 			assert(b);
 			sprite_id++;
 		} while (++start <= end);
@@ -119,7 +137,7 @@ void CheckExternalFiles()
 		/* Not all files were loaded successfully, see which ones */
 		add_pos += seprintf(add_pos, last, "Trying to load graphics set '%s', but it is incomplete. The game will probably not run correctly until you properly install this set or select another one. See section 4.1 of readme.txt.\n\nThe following files are corrupted or missing:\n", used_set->name);
 		for (uint i = 0; i < GraphicsSet::NUM_FILES; i++) {
-			MD5File::ChecksumResult res = used_set->files[i].CheckMD5(BASESET_DIR);
+			MD5File::ChecksumResult res = GraphicsSet::CheckMD5(&used_set->files[i], BASESET_DIR);
 			if (res != MD5File::CR_MATCH) add_pos += seprintf(add_pos, last, "\t%s is %s (%s)\n", used_set->files[i].filename, res == MD5File::CR_MISMATCH ? "corrupt" : "missing", used_set->files[i].missing_warning);
 		}
 		add_pos += seprintf(add_pos, last, "\n");
@@ -132,7 +150,7 @@ void CheckExternalFiles()
 		assert_compile(SoundsSet::NUM_FILES == 1);
 		/* No need to loop each file, as long as there is only a single
 		 * sound file. */
-		add_pos += seprintf(add_pos, last, "\t%s is %s (%s)\n", sounds_set->files->filename, sounds_set->files->CheckMD5(BASESET_DIR) == MD5File::CR_MISMATCH ? "corrupt" : "missing", sounds_set->files->missing_warning);
+		add_pos += seprintf(add_pos, last, "\t%s is %s (%s)\n", sounds_set->files->filename, SoundsSet::CheckMD5(sounds_set->files, BASESET_DIR) == MD5File::CR_MISMATCH ? "corrupt" : "missing", sounds_set->files->missing_warning);
 	}

 	if (add_pos != error_msg) ShowInfoF("%s", error_msg);
@@ -238,6 +256,7 @@ void GfxLoadSprites()
 	DEBUG(sprite, 2, "Loading sprite set %d", _settings_game.game_creation.landscape);

 	SwitchNewGRFBlitter();
+	ClearFontCache();
 	GfxInitSpriteMem();
 	LoadSpriteTables();
 	GfxInitPalettes();
@@ -262,22 +281,47 @@ bool GraphicsSet::FillSetDetails(IniFile *ini, const char *path, const char *ful
 	return ret;
 }

-
 /**
- * Calculate and check the MD5 hash of the supplied filename.
- * @param subdir The sub directory to get the files from
+ * Calculate and check the MD5 hash of the supplied GRF.
+ * @param file The file get the hash of.
+ * @param subdir The sub directory to get the files from.
 * @return
 * - #CR_MATCH if the MD5 hash matches
 * - #CR_MISMATCH if the MD5 does not match
 * - #CR_NO_FILE if the file misses
 */
-MD5File::ChecksumResult MD5File::CheckMD5(Subdirectory subdir) const
+/* static */ MD5File::ChecksumResult GraphicsSet::CheckMD5(const MD5File *file, Subdirectory subdir)
+{
+	size_t size = 0;
+	FILE *f = FioFOpenFile(file->filename, "rb", subdir, &size);
+	if (f == NULL) return MD5File::CR_NO_FILE;
+
+	size_t max = GRFGetSizeOfDataSection(f);
+
+	FioFCloseFile(f);
+
+	return file->CheckMD5(subdir, max);
+}
+
+
+/**
+ * Calculate and check the MD5 hash of the supplied filename.
+ * @param subdir The sub directory to get the files from
+ * @param max_size Only calculate the hash for this many bytes from the file start.
+ * @return
+ * - #CR_MATCH if the MD5 hash matches
+ * - #CR_MISMATCH if the MD5 does not match
+ * - #CR_NO_FILE if the file misses
+ */
+MD5File::ChecksumResult MD5File::CheckMD5(Subdirectory subdir, size_t max_size) const
 {
 	size_t size;
 	FILE *f = FioFOpenFile(this->filename, "rb", subdir, &size);

 	if (f == NULL) return CR_NO_FILE;

+	size = min(size, max_size);
+
 	Md5 checksum;
 	uint8 buffer[1024];
 	uint8 digest[16];
--- a/src/goal.cpp
+++ b/src/goal.cpp
@@ -140,7 +140,7 @@ CommandCost CmdGoalQuestion(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
 	if (type >= GOAL_QUESTION_TYPE_COUNT) return CMD_ERROR;

 	if (flags & DC_EXEC) {
-		if (company == _local_company || (company == INVALID_COMPANY && Company::IsValidID(_local_company))) ShowGoalQuestion(uniqueid, type, p2, text);
+		if ((company != INVALID_COMPANY && company == _local_company) || (company == INVALID_COMPANY && Company::IsValidID(_local_company))) ShowGoalQuestion(uniqueid, type, p2, text);
 	}

 	return CommandCost();
--- a/src/industry_cmd.cpp
+++ b/src/industry_cmd.cpp
@@ -1455,7 +1455,7 @@ static CommandCost CheckIfIndustryIsAllowed(TileIndex tile, int type, const Town
 	}

 	if ((GetIndustrySpec(type)->behaviour & INDUSTRYBEH_ONLY_NEARTOWN) && DistanceMax(t->xy, tile) > 9) {
-		return_cmd_error(STR_ERROR_SITE_UNSUITABLE);
+		return_cmd_error(STR_ERROR_CAN_ONLY_BE_BUILT_NEAR_TOWN_CENTER);
 	}

 	return CommandCost();
--- a/src/landscape.cpp
+++ b/src/landscape.cpp
@@ -769,6 +769,7 @@ static void GenerateTerrain(int type, uint flag)
 	uint32 r = Random();

 	const Sprite *templ = GetSprite((((r >> 24) * _genterrain_tbl_1[type]) >> 8) + _genterrain_tbl_2[type] + 4845, ST_MAPGEN);
+	if (templ == NULL) usererror("Map generator sprites could not be loaded");

 	uint x = r & MapMaxX();
 	uint y = (r >> MapLogX()) & MapMaxY();
--- a/src/lang/afrikaans.txt
+++ b/src/lang/afrikaans.txt
@@ -338,6 +338,7 @@ STR_SCENEDIT_TOOLBAR_PLACE_OBJECT                               :{BLACK}Plaas vo
 ############ range for SE file menu starts
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Stoor draaiboek
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Laai draaiboek
+STR_SCENEDIT_FILE_MENU_SAVE_HEIGHTMAP                           :Stoor hoogtekaart
 STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Laai Hoogtekaart
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Verlaat redigeerder
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
@@ -355,16 +356,18 @@ STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :Dorp name verto
 STR_SETTINGS_MENU_STATION_NAMES_DISPLAYED                       :Stasie name vertoon
 STR_SETTINGS_MENU_WAYPOINTS_DISPLAYED                           :Wegwyser name vertoon
 STR_SETTINGS_MENU_SIGNS_DISPLAYED                               :Tekens vertoon
+STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS                         :Vertoon mededinger tekens en name
 STR_SETTINGS_MENU_FULL_ANIMATION                                :Volle animasie
 STR_SETTINGS_MENU_FULL_DETAIL                                   :Volle besonderhede
 STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS                         :Deurskynende geboue
-STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Deurskynend stasie tekens
+STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Deurskynende stasie tekens
 ############ range ends here

 ############ range for file menu starts
 STR_FILE_MENU_SAVE_GAME                                         :Stoor spel
 STR_FILE_MENU_LOAD_GAME                                         :Laai spel
 STR_FILE_MENU_QUIT_GAME                                         :Verlaat spel
+STR_FILE_MENU_SEPARATOR                                         :
 STR_FILE_MENU_EXIT                                              :Gaan uit
 ############ range ends here

@@ -442,9 +445,9 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU                              :Boodskap Geskid
 STR_ABOUT_MENU_LAND_BLOCK_INFO                                  :Gebied informasie
 STR_ABOUT_MENU_SEPARATOR                                        :
 STR_ABOUT_MENU_TOGGLE_CONSOLE                                   :Tokkel terminaal
-STR_ABOUT_MENU_AI_DEBUG                                         :AI ontfout
-STR_ABOUT_MENU_SCREENSHOT                                       :Skermskoot (Ctrl-S)
-STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Vergrote skermskoot
+STR_ABOUT_MENU_AI_DEBUG                                         :AI / GameScript ontfout
+STR_ABOUT_MENU_SCREENSHOT                                       :Skermskoot
+STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Ten volle vergrote skermskoot
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :Groot Skermskoot (Ctrl+G)
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :Oor 'OpenTTD'
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :"Sprite" rigter
@@ -846,7 +849,7 @@ STR_NEWS_ROAD_REBUILDING                                        :{BIG_FONT}{BLAC
 # Extra view window
 STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Gesigswerf {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Kopie na gesigswerf
-STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Kopie die lokasie van die wereldwerf na die gesigswerf
+STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Kopieer die ligging van die hoof vertoning na die gesigswerf
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Deeg van gesigswerf
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT                             :{BLACK}Deeg die lokasie van die gesigspunt na die hoofskerm

@@ -856,19 +859,19 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Geld een
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Geld eendheid keuse

 ############ start of currency region
-STR_GAME_OPTIONS_CURRENCY_GBP                                   :Pond (£)
-STR_GAME_OPTIONS_CURRENCY_USD                                   :Dollar ($)
-STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro (€)
-STR_GAME_OPTIONS_CURRENCY_JPY                                   :Yen (¥)
+STR_GAME_OPTIONS_CURRENCY_GBP                                   :Britse Pond (GBP)
+STR_GAME_OPTIONS_CURRENCY_USD                                   :Amerikaanse Dollar (USD)
+STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro (EUR)
+STR_GAME_OPTIONS_CURRENCY_JPY                                   :Japanese Yen (JPY)
 STR_GAME_OPTIONS_CURRENCY_ATS                                   :Austrian Shilling (ATS)
 STR_GAME_OPTIONS_CURRENCY_BEF                                   :Belgian Franc (BEF)
 STR_GAME_OPTIONS_CURRENCY_CHF                                   :Swiss Franc (CHF)
 STR_GAME_OPTIONS_CURRENCY_CZK                                   :Czech Koruna (CZK)
 STR_GAME_OPTIONS_CURRENCY_DEM                                   :Deutschmark (DEM)
 STR_GAME_OPTIONS_CURRENCY_DKK                                   :Danish Krone (DKK)
-STR_GAME_OPTIONS_CURRENCY_ESP                                   :Peseta (ESP)
+STR_GAME_OPTIONS_CURRENCY_ESP                                   :Spaanse Peseta (ESP)
 STR_GAME_OPTIONS_CURRENCY_FIM                                   :Finnish Markka (FIM)
-STR_GAME_OPTIONS_CURRENCY_FRF                                   :Franc (FRF)
+STR_GAME_OPTIONS_CURRENCY_FRF                                   :Franse Frank (FRF)
 STR_GAME_OPTIONS_CURRENCY_GRD                                   :Greek Drachma (GRD)
 STR_GAME_OPTIONS_CURRENCY_HUF                                   :Hungarian Forint (HUF)
 STR_GAME_OPTIONS_CURRENCY_ISK                                   :Icelandic Krona (ISK)
@@ -1052,6 +1055,9 @@ STR_SEA_LEVEL_MEDIUM                                            :Gemiddel
 STR_SEA_LEVEL_HIGH                                              :Hoog

 STR_RIVERS_NONE                                                 :Geen
+STR_RIVERS_FEW                                                  :Min
+STR_RIVERS_MODERATE                                             :Middelmatig
+STR_RIVERS_LOT                                                  :Baie

 STR_DISASTER_NONE                                               :Geen
 STR_DISASTER_REDUCED                                            :Verminder
@@ -1103,9 +1109,10 @@ STR_CONFIG_SETTING_BUILDONSLOPES                                :{LTBLUE}Laat bo
 STR_CONFIG_SETTING_AUTOSLOPE                                    :{LTBLUE}Laat terraforming toe onder geboue, spoore, ens. (autoslope): {ORANGE}{STRING}
 STR_CONFIG_SETTING_CATCHMENT                                    :{LTBLUE}Laat meer realisties grootte opvangsgebied toe: {ORANGE}{STRING}
 STR_CONFIG_SETTING_EXTRADYNAMITE                                :{LTBLUE}Laat verwydering van meer stad-besite paaie, bruge, ens toe: {ORANGE}{STRING}
+STR_CONFIG_SETTING_TRAIN_LENGTH                                 :{LTBLUE}Maksimum lengte van treine: {ORANGE}{STRING} teels{P 0:1 "" s}
 STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL                     :{LTBLUE}Trein versnelling model: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL              :{LTBLUE}Pad voertuig versnelling model: {ORANGE}{STRING}
-STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS                        :{LTBLUE}Hoë steil die helling is vir treine {ORANGE}{STRING}%
+STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS                        :{LTBLUE}Steilheid van die helling vir treine {ORANGE}{STRING}%
 STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS                 :{LTBLUE}Hoë steil die helling is vir pad voertuie {ORANGE}{STRING}%
 STR_CONFIG_SETTING_FORBID_90_DEG                                :{LTBLUE}Verbied triene en skepe om 90 graad draaie te maak: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS                        :{LTBLUE}Laat toe dat stasies lanks mekaar gebind kan word: {ORANGE}{STRING}
@@ -1141,7 +1148,7 @@ STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD                            :{LTBLUE}Laat de
 STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD                      :{LTBLUE}Laat deur-ry padhalte toe op paaie wat deur ander deelnemers besit word: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ADJACENT_STATIONS                            :{LTBLUE}Laat die gebou van aangrensende stasies toe: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DYNAMIC_ENGINES                              :{LTBLUE}Ontsper veeltallige NewGRF enjin stelle: {ORANGE}{STRING}
-STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES            :{WHITE}Die verandering van die stelling is nie moontlik nie waneer daar voertuie is.
+STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES            :{WHITE}Verandering van stelling nie moontlik wanneer daar voertuie is nie

 STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS                        :{LTBLUE}Lughawes verval nooit nie: {ORANGE}{STRING}

@@ -1879,8 +1886,8 @@ STR_STATION_BUILD_COVERAGE_OFF                                  :{BLACK}Af
 STR_STATION_BUILD_COVERAGE_ON                                   :{BLACK}Aan
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}Moenie die dekking area van die voorgestelde bouterrein verlig nie
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}Verlig dekking area van die voorgestelde bouterrein
-STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Aanvaar: {GOLD}{STRING}
-STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Voorraad: {GOLD}{STRING}
+STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Aanvaar: {GOLD}{CARGO_LIST}
+STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Voorraad: {GOLD}{CARGO_LIST}

 # Join station window
 STR_JOIN_STATION_CAPTION                                        :{WHITE}Sluit by stasie aan
@@ -2003,9 +2010,9 @@ STR_STATION_BUILD_BUS_ORIENTATION                               :{WHITE}Bus Stas
 STR_STATION_BUILD_BUS_ORIENTATION_TOOLTIP                       :{BLACK}Kies bus stasie orientasie
 STR_STATION_BUILD_TRUCK_ORIENTATION                             :{WHITE}Vragmotor Stasie Orientasie
 STR_STATION_BUILD_TRUCK_ORIENTATION_TOOLTIP                     :{BLACK}Kies vragmotor laai area orientasie
-STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION                    :{WHITE}Passasier Trem Orientasie
+STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION                    :{WHITE}Passasier Trem Stasie Orientasie
 STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION_TOOLTIP            :{BLACK}Kies passasier trem stasie orientasie
-STR_STATION_BUILD_CARGO_TRAM_ORIENTATION                        :{WHITE}Vrag Trem Orientasie
+STR_STATION_BUILD_CARGO_TRAM_ORIENTATION                        :{WHITE}Vrag Trem Stasie Orientasie
 STR_STATION_BUILD_CARGO_TRAM_ORIENTATION_TOOLTIP                :{BLACK}Kies vrag trem stasie orientasie

 # Waterways toolbar (last two for SE only)
@@ -2133,6 +2140,7 @@ STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Bou
 STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Fonds

 # Industry cargoes window
+STR_INDUSTRY_CARGOES_PRODUCERS                                  :{WHITE}Vervaardiging van nywerhede
 STR_INDUSTRY_CARGOES_CUSTOMERS                                  :{WHITE}Aanvaar nywerhede
 STR_INDUSTRY_CARGOES_HOUSES                                     :{WHITE}Huise

@@ -2170,6 +2178,8 @@ STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Sneeu-bedekte l
 STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Woestyn

 STR_LAI_RAIL_DESCRIPTION_TRACK                                  :{STRING} spoor
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :{STRING} spoor met kombinasie-seine
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :{STRING} spoor met roete seine
 STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :{STRING} trein diensstasie

 STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Pad
@@ -2355,9 +2365,6 @@ STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Beweeg A
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Beweeg die gekose NewGRF af in die lys
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}'n Lys van die NewGRF lêers wat installer. Kliek 'n lêer om sy parameter te verander.

-# Additional textfiles accompanying NewGRFs
-STR_NEWGRF_SETTINGS_VIEW_LICENSE                                :{BLACK}Lisensie
-
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Stel parameters
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Tokkel pallet
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Tokkel die pallet van die geselekteurde NewGRF.{}Doen dit wanneer die grafika van hierdie NewGRF pink lyk in die speletjie.
@@ -2386,8 +2393,6 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parameter {NUM}
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Hoeveelheid parameters: {ORANGE}{NUM}

-# NewGRF textfile window
-
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Inspekteer - {STRING}

@@ -2527,6 +2532,32 @@ STR_GOALS_NONE                                                  :{ORANGE}- Geen
 STR_GOALS_COMPANY_TITLE                                         :{BLACK}Maatskappy doelwitte:
 STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}kliek op doel om kern oorsig van industrie/stad/teël te middel. Ctrl+Kliek open 'n nuwe siens poort by industrie/stad/teël lokasie

+# Goal question window
+STR_GOAL_QUESTION_CAPTION_QUESTION                              :Vraag
+STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Inligting
+STR_GOAL_QUESTION_CAPTION_WARNING                               :Waarskuwing
+STR_GOAL_QUESTION_CAPTION_ERROR                                 :Fout
+
+### Start of Goal Question button list
+STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Kanselleer
+STR_GOAL_QUESTION_BUTTON_OK                                     :OK
+STR_GOAL_QUESTION_BUTTON_NO                                     :Nee
+STR_GOAL_QUESTION_BUTTON_YES                                    :Ja
+STR_GOAL_QUESTION_BUTTON_DECLINE                                :Keur af
+STR_GOAL_QUESTION_BUTTON_ACCEPT                                 :Aanvaar
+STR_GOAL_QUESTION_BUTTON_IGNORE                                 :Ignoreer
+STR_GOAL_QUESTION_BUTTON_RETRY                                  :Probeer weer
+STR_GOAL_QUESTION_BUTTON_PREVIOUS                               :Vorige
+STR_GOAL_QUESTION_BUTTON_NEXT                                   :Volgende
+STR_GOAL_QUESTION_BUTTON_STOP                                   :Stop
+STR_GOAL_QUESTION_BUTTON_START                                  :Begin
+STR_GOAL_QUESTION_BUTTON_GO                                     :Gaan
+STR_GOAL_QUESTION_BUTTON_CONTINUE                               :Gaan voort
+STR_GOAL_QUESTION_BUTTON_RESTART                                :Begin weer
+STR_GOAL_QUESTION_BUTTON_POSTPONE                               :Stel uit
+STR_GOAL_QUESTION_BUTTON_SURRENDER                              :Gee oor
+STR_GOAL_QUESTION_BUTTON_CLOSE                                  :Maak toe
+
 # Subsidies window
 STR_SUBSIDIES_CAPTION                                           :{WHITE}Subsidiee
 STR_SUBSIDIES_OFFERED_TITLE                                     :{BLACK}Subsidiee op aanbod vir diens opneming:
@@ -2555,7 +2586,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM                                  :{YELLOW}({CARGO

 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Aanvaar
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Wys lys van aanvaarde vrag
-STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}Aanvaar: {WHITE}{STRING}
+STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}Aanvaar: {WHITE}{CARGO_LIST}

 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Graderings
 STR_STATION_VIEW_RATINGS_TOOLTIP                                :{BLACK}Toon stasie graderings
@@ -2620,6 +2651,7 @@ STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Leen {CU
 STR_FINANCES_BORROW_TOOLTIP                                     :{BLACK}Vermeer groote van lening
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}Terugbetaal {CURRENCY_LONG}
 STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}Terugbetaal deel van lening
+STR_FINANCES_INFRASTRUCTURE_BUTTON                              :{BLACK}Infrastruktuur

 # Company view
 STR_COMPANY_VIEW_CAPTION                                        :{WHITE}{COMPANY} {BLACK}{COMPANY_NUM}
@@ -2635,6 +2667,13 @@ STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Geen
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Maatskappy waarde: {WHITE}{CURRENCY_LONG}
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% besit by {COMPANY})
+STR_COMPANY_VIEW_INFRASTRUCTURE                                 :{GOLD}Infrastruktuur:
+STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL                            :{WHITE}{COMMA} spoor stuk{P "" s}
+STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD                            :{WHITE}{COMMA} pad stuk{P "" s}
+STR_COMPANY_VIEW_INFRASTRUCTURE_WATER                           :{WHITE}{COMMA} water teel{P "" s}
+STR_COMPANY_VIEW_INFRASTRUCTURE_STATION                         :{WHITE}{COMMA} stasie teel{P "" s}
+STR_COMPANY_VIEW_INFRASTRUCTURE_AIRPORT                         :{WHITE}{COMMA} lughawe{P "" s}
+STR_COMPANY_VIEW_INFRASTRUCTURE_NONE                            :{WHITE}Geen

 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Bou HK
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Bou maatskappy hoofkantore
@@ -2642,6 +2681,7 @@ STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Wys HK
 STR_COMPANY_VIEW_VIEW_HQ_TOOLTIP                                :{BLACK}Vertoon maatskappy hoofkantore
 STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Beweeg HQ
 STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Herbou maatskappy hoofkwartiers elders vir 1% koste van maatskappy waarde
+STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON                          :{BLACK}Besonderhede

 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Nuwe Gesig
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Kies nuwe gesig vir bestuurder
@@ -2663,6 +2703,16 @@ STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Bestuurder se N
 STR_BUY_COMPANY_MESSAGE                                         :{WHITE}Ons is opsoek na 'n vervoer maatskappy wat ons se maatskappy sal oorvat.{}{}Wil jy {COMPANY} koop vir {CURRENCY_LONG}?

 # Company infrastructure window
+STR_COMPANY_INFRASTRUCTURE_VIEW_CAPTION                         :{WHITE}Infrastruktuur van {COMPANY}
+STR_COMPANY_INFRASTRUCTURE_VIEW_RAIL_SECT                       :{GOLD}Spoor dele:
+STR_COMPANY_INFRASTRUCTURE_VIEW_ROAD_SECT                       :{GOLD}Pad dele:
+STR_COMPANY_INFRASTRUCTURE_VIEW_ROAD                            :{WHITE}Pad
+STR_COMPANY_INFRASTRUCTURE_VIEW_TRAMWAY                         :{WHITE}Tremweg
+STR_COMPANY_INFRASTRUCTURE_VIEW_WATER_SECT                      :{GOLD}Water teels:
+STR_COMPANY_INFRASTRUCTURE_VIEW_CANALS                          :{WHITE}Kanale
+STR_COMPANY_INFRASTRUCTURE_VIEW_STATION_SECT                    :{GOLD}Stasies:
+STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS                        :{WHITE}Stasie teels
+STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS                        :{WHITE}Lughawens
 STR_COMPANY_INFRASTRUCTURE_VIEW_COST                            :{WHITE}{1:CURRENCY_LONG}/jr ({0:COMMA})
 STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL                           :{WHITE}{CURRENCY_LONG}/jr

@@ -2767,6 +2817,8 @@ STR_BUY_VEHICLE_AIRCRAFT_CAPTION                                :Nuwe Vliegtuig
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Kos: {GOLD}{CURRENCY_LONG}{BLACK} Gewig: {GOLD}{WEIGHT_SHORT}
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Spoed: {GOLD}{VELOCITY}{BLACK}   Krag: {GOLD}{POWER}
 STR_PURCHASE_INFO_SPEED                                         :{BLACK}Spoed: {GOLD}{VELOCITY}
+STR_PURCHASE_INFO_SPEED_OCEAN                                   :{BLACK}Spoed op oseaan: {GOLD}{VELOCITY}
+STR_PURCHASE_INFO_SPEED_CANAL                                   :{BLACK}Spoed op kanaal/rivier: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Loopkoste: {GOLD}{CURRENCY_LONG}/jr
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Kapasiteit: {GOLD}{CARGO_LONG} {STRING}
 STR_PURCHASE_INFO_REFITTABLE                                    :(herstelbaar)
@@ -2777,9 +2829,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Gewig: {
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Kos: {GOLD}{CURRENCY_LONG}{BLACK} Spoed: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Kapasiteit: {GOLD}{CARGO_LONG}, {CARGO_LONG}
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Self Krag Waens: {GOLD}+{POWER}{BLACK} Gewig: {GOLD}+{WEIGHT_SHORT}
-STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Herpasbaar na: {GOLD}
+STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Herpasbaar na: {GOLD}{STRING}
 STR_PURCHASE_INFO_ALL_TYPES                                     :Alle vrag tipes
-STR_PURCHASE_INFO_ALL_BUT                                       :Alles behalwe {GOLD}
+STR_PURCHASE_INFO_ALL_BUT                                       :Alles behalwe {CARGO_LIST}
 STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}Maks. Traktiewe Poging: {GOLD}{FORCE}

 STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP                              :{BLACK}Trein voertuig keuse lys - kliek op voertuig vir inligting
@@ -3022,7 +3074,7 @@ STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR                     :{BLACK}Wins hie
 STR_VEHICLE_INFO_RELIABILITY_BREAKDOWNS                         :{BLACK}Betroubaarheid: {LTBLUE}{COMMA}%  {BLACK}Brekings sedert laaste diens: {LTBLUE}{COMMA}

 STR_VEHICLE_INFO_BUILT_VALUE                                    :{LTBLUE}{ENGINE} {BLACK}Gebou: {LTBLUE}{NUM}{BLACK} Waarde: {LTBLUE}{CURRENCY_LONG}
-STR_VEHICLE_INFO_NO_CAPACITY                                    :{BLACK}Kapasiteit: {LTBLUE}Geen
+STR_VEHICLE_INFO_NO_CAPACITY                                    :{BLACK}Kapasiteit: {LTBLUE}Geen{STRING}
 STR_VEHICLE_INFO_CAPACITY                                       :{BLACK}Kapasiteit: {LTBLUE}{CARGO_LONG}{3:STRING}
 STR_VEHICLE_INFO_CAPACITY_MULT                                  :{BLACK}Kapasiteit: {LTBLUE}{CARGO_LONG}{3:STRING} (x{4:NUM})
 STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK}Kapasiteit: {LTBLUE}{CARGO_LONG}, {CARGO_LONG}{STRING}
@@ -3118,6 +3170,8 @@ STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}verander

 STR_ORDER_REFIT                                                 :{BLACK}Herpas
 STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Kies watter vrag tipe te herpas na in die opdraag. CTRL-kliek om herpas instruksie te verwyder
+STR_ORDER_DROP_REFIT_AUTO                                       :Vaste vrag
+STR_ORDER_DROP_REFIT_AUTO_ANY                                   :Beskikbare vrag

 STR_ORDER_SERVICE                                               :{BLACK}Diens
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Beweeg altyd
@@ -3134,6 +3188,7 @@ STR_ORDER_CONDITIONAL_MAX_SPEED                                 :Maksimum spoed
 STR_ORDER_CONDITIONAL_AGE                                       :Voertuig oderdome (jare)
 STR_ORDER_CONDITIONAL_REQUIRES_SERVICE                          :Benodig diens
 STR_ORDER_CONDITIONAL_UNCONDITIONALLY                           :Altyd
+STR_ORDER_CONDITIONAL_REMAINING_LIFETIME                        :Oorblywende leeftyd (jare)

 STR_ORDER_CONDITIONAL_COMPARATOR_TOOLTIP                        :{BLACK}Hoe om die voertuig data te vergelyk met die gegeewe waarde
 STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS                         :is gelyk aan
@@ -3250,6 +3305,10 @@ STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Verander
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Reinig Tyd
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Vee uit die totaal van tyd vir die gespesiveerde opdrag

+STR_TIMETABLE_CHANGE_SPEED                                      :{BLACK}Verander Spoedgrens
+
+STR_TIMETABLE_CLEAR_SPEED                                       :{BLACK}Verwyder Spoedgrens
+
 STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Herstel Laat Teller
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Herstel die laat teller, so dat die voertuig op tyd is

@@ -3335,6 +3394,12 @@ STR_AI_SETTINGS_CLOSE                                           :{BLACK}Maak toe
 STR_AI_SETTINGS_RESET                                           :{BLACK}Herstel
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}

+
+# Textfile window
+STR_TEXTFILE_LICENCE_CAPTION                                    :{WHITE}{STRING} lisensie van {STRING}
+STR_TEXTFILE_VIEW_LICENCE                                       :{BLACK}Lisensie
+
+
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINY_FONT}{WHITE}{NUM}%{UP_ARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UP_ARROW}
@@ -3383,7 +3448,7 @@ STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... kan

 STR_ERROR_HEIGHTMAP_TOO_LARGE                                   :{WHITE}... beeld is te groot

-STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Skaal waaskuwing
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Skaal waarskuwing
 STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Om die kaart te veel te verstel is nie aanbeveel. Gaan voort met die generasie?

 # Soundset messages
@@ -3413,6 +3478,7 @@ STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}... gebi
 STR_ERROR_CLEARING_LIMIT_REACHED                                :{WHITE}... teël skoonmaak limiet bereik
 STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Naam moet unike wees
 STR_ERROR_GENERIC_OBJECT_IN_THE_WAY                             :{WHITE}{1:STRING} in die pad
+STR_ERROR_NOT_ALLOWED_WHILE_PAUSED                              :{WHITE}Nie toegelaat terwyl onderbreek

 # Local authority errors
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS                 :{WHITE}{TOWN} plaaslike raad weier om dit te toelaat
@@ -3526,7 +3592,7 @@ STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Kan nie
 STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Kan nie trein wegpunt van hier werwyder nie...
 STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST                        :{WHITE}Moet eers die spoor wegwyser verwyder
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}... baken in die pad
-STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}... baken is in gebruik!
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}... baken is in gebruik deur ander maatskappy!

 # Depot related errors
 STR_ERROR_CAN_T_BUILD_TRAIN_DEPOT                               :{WHITE}Kan nie trein depot hier bou nie...
@@ -3539,7 +3605,7 @@ STR_ERROR_CAN_T_RENAME_DEPOT                                    :{WHITE}Kan nie
 STR_ERROR_TRAIN_MUST_BE_STOPPED_INSIDE_DEPOT                    :{WHITE}Trein moet binne in 'n depot gestop word
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}... moet gestop binne 'n pad voertuig depot wees
 STR_ERROR_SHIP_MUST_BE_STOPPED_INSIDE_DEPOT                     :{WHITE}Skip moet in 'n depot gestop wees
-STR_ERROR_AIRCRAFT_MUST_BE_STOPPED_INSIDE_HANGAR                :{WHITE}Vliegtuig moet in hangar gestop wees
+STR_ERROR_AIRCRAFT_MUST_BE_STOPPED_INSIDE_HANGAR                :{WHITE}... moet binne hangar gestop word

 STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Treine kan slegs verander word as hulle in die depot gestop is
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Trein te lank
@@ -3562,7 +3628,7 @@ STR_ERROR_AUTOREPLACE_MONEY_LIMIT                               :(geld perk)
 # Rail construction errors
 STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}Onmoontlike spoor kombinasie
 STR_ERROR_MUST_REMOVE_SIGNALS_FIRST                             :{WHITE}Moet eers die sein verwyder
-STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Geen geskikte spoor
+STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Geen geskikte treinspoor
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Moet eers spoor verwyder
 STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Pad is een rigting of geblok
 STR_ERROR_CAN_T_BUILD_SIGNALS_HERE                              :{WHITE}Kan nie seinligte hier bou nie...
@@ -3714,8 +3780,8 @@ STR_ERROR_TOO_FAR_FROM_PREVIOUS_DESTINATION                     :{WHITE}... te v

 # Timetable related errors
 STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}Kan nie voertuig 'n rooster gee nie...
-STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Voertuie kan slegs by stasies wag.
-STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}Die voertuig stop nie by die stasie nie.
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Voertuie kan slegs by stasies wag
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}Die voertuig stop nie by hierdie stasie nie.

 # Sign related errors
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}... te veel tekens
@@ -4163,6 +4229,7 @@ STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
 STR_JUST_CURRENCY_SHORT                                         :{CURRENCY_SHORT}
 STR_JUST_CURRENCY_LONG                                          :{CURRENCY_LONG}
+STR_JUST_CARGO_LIST                                             :{CARGO_LIST}
 STR_JUST_INT                                                    :{NUM}
 STR_JUST_DATE_TINY                                              :{DATE_TINY}
 STR_JUST_DATE_SHORT                                             :{DATE_SHORT}
@@ -4197,6 +4264,7 @@ STR_BLACK_RAW_STRING                                            :{BLACK}{STRING}
 STR_GREEN_STRING                                                :{GREEN}{STRING}
 STR_ORANGE_STRING                                               :{ORANGE}{STRING}
 STR_RED_STRING                                                  :{RED}{STRING}
+STR_LTBLUE_STRING                                               :{LTBLUE}{STRING}
 STR_WHITE_STRING                                                :{WHITE}{STRING}
 STR_TINY_BLACK_HEIGHT                                           :{TINY_FONT}{BLACK}{HEIGHT}
 STR_TINY_BLACK_VEHICLE                                          :{TINY_FONT}{BLACK}{VEHICLE}
--- a/src/lang/arabic_egypt.txt
+++ b/src/lang/arabic_egypt.txt
@@ -287,6 +287,7 @@ STR_SORT_BY_INTRO_DATE                                          :بداية ال
 STR_SORT_BY_RUNNING_COST                                        :تكلفة التشغيل
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :القوة/تكلفة التشغيل
 STR_SORT_BY_CARGO_CAPACITY                                      :سعة الشحن
+STR_SORT_BY_RANGE                                               :مدى

 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}ايقاف اللعبة
@@ -348,6 +349,7 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :انهاء
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :خيارات اللعبة
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :خيارات الصعوبة
 STR_SETTINGS_MENU_CONFIG_SETTINGS                               :اعدادات متقدمة
+STR_SETTINGS_MENU_SCRIPT_SETTINGS                               :الذكاء الصناعي/ اعدادات اللعبة
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :إعدادات جرافيك جديده
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :خيارات الشفافية
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :عرض اسماء المدن
@@ -365,6 +367,7 @@ STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :اسماء ال
 STR_FILE_MENU_SAVE_GAME                                         :حفظ
 STR_FILE_MENU_LOAD_GAME                                         :تحميل
 STR_FILE_MENU_QUIT_GAME                                         :اغلاق اللعبة
+STR_FILE_MENU_SEPARATOR                                         :
 STR_FILE_MENU_EXIT                                              :خروج
 ############ range ends here

@@ -380,6 +383,7 @@ STR_TOWN_MENU_FOUND_TOWN                                        :جد المدي

 ############ range for subsidies menu starts
 STR_SUBSIDIES_MENU_SUBSIDIES                                    :العروض
+STR_SUBSIDIES_MENU_GOAL                                         :الاهداف الحالية
 ############ range ends here

 ############ range for graph menu starts
@@ -444,6 +448,7 @@ STR_ABOUT_MENU_TOGGLE_CONSOLE                                   :توقل كون
 STR_ABOUT_MENU_AI_DEBUG                                         :مكتشف اخطاء الذكاء الصناعي
 STR_ABOUT_MENU_SCREENSHOT                                       :صورة من الشاشة - Ctrl-S -
 STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :صورة للشاشة مصغرة
+STR_ABOUT_MENU_DEFAULTZOOM_SCREENSHOT                           :تقريب الشاشة القياسي
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :صورة كبيرة لكامل الخريطة -Ctrl-G -
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :حول 'OpenTTD'
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :موائم العفريتات
@@ -747,6 +752,8 @@ STR_NEWS_MESSAGE_TYPE_CHANGES_OF_CARGO_ACCEPTANCE               :{YELLOW}تغي
 STR_NEWS_MESSAGE_TYPE_SUBSIDIES                                 :{YELLOW}العروض
 STR_NEWS_MESSAGE_TYPE_GENERAL_INFORMATION                       :{YELLOW}معلومات عامة

+STR_NEWS_CUSTOM_ITEM                                            :{BIG_FONT}{BLACK}{STRING}
+
 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BIG_FONT}{BLACK} ... المواطنون يحتفلون{} اول قطار وصل في {STATION}!
 STR_NEWS_FIRST_BUS_ARRIVAL                                      :{BIG_FONT}{BLACK}يحتفل الأهالي ...{}بوصول اول باص للمحطة ...{STATION}!
 STR_NEWS_FIRST_TRUCK_ARRIVAL                                    :{BIG_FONT}{BLACK}الأهالي يحتفلون ... {}بوصول اول عربة الى .. {STATION}!
@@ -821,6 +828,7 @@ STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}{VEHICLE
 STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}{VEHICLE} لا يستطيع ايجاد طريق للمواصلة
 STR_NEWS_VEHICLE_IS_LOST                                        :{WHITE}{VEHICLE} تائه
 STR_NEWS_VEHICLE_IS_UNPROFITABLE                                :{WHITE}{VEHICLE} دخل العربة السنة السابقة {CURRENCY_LONG}
+STR_NEWS_AIRCRAFT_DEST_TOO_FAR                                  :{WHITE}{VEHICLE}لا يمكن الوصول للمحطة التالية لانها خارج المدى

 STR_NEWS_ORDER_REFIT_FAILED                                     :{WHITE}امرالاستبدال توقف {VEHICLE}
 STR_NEWS_VEHICLE_AUTORENEW_FAILED                               :{WHITE}فشل تطبيق الاستبدال الذاتي ل{VEHICLE}{}{STRING}
@@ -1155,6 +1163,7 @@ STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD                      :{LTBLUE} الس
 STR_CONFIG_SETTING_ADJACENT_STATIONS                            :{LTBLUE}السماح ببناء محطات متلاصقة{ORANGE}{STRING}
 STR_CONFIG_SETTING_DYNAMIC_ENGINES                              :{LTBLUE}السماح بتعدد محركات NewGFR {ORANGE}{STRING}
 STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES            :{WHITE}تغير هذا الخيار غير متاح عندما يكون هناك عربات
+STR_CONFIG_SETTING_INFRASTRUCTURE_MAINTENANCE                   :{LTBLUE}صيانة البنية التحتية: {ORANGE}{STRING}

 STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS                        :{LTBLUE} المطارات لا تنتهي صلاحيتها {ORANGE}{STRING}

@@ -1172,6 +1181,7 @@ STR_CONFIG_SETTING_ERRMSG_DURATION                              :{LTBLUE}زمن
 STR_CONFIG_SETTING_HOVER_DELAY                                  :{LTBLUE}تاخير احداث الهوفر: {ORANGE}{STRING}
 STR_CONFIG_SETTING_HOVER_DELAY_DISABLED                         :{LTBLUE}عرض التلميحات: {ORANGE}اضغط يمين
 STR_CONFIG_SETTING_POPULATION_IN_LABEL                          :{LTBLUE}أعرض عدد السكان مع الاسم على العلامة: {ORANGE}{STRING}
+STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS                         :{LTBLUE}سمك الخطوط في العرض: {ORANGE}{STRING}

 STR_CONFIG_SETTING_LAND_GENERATOR                               :{LTBLUE}مولد الأرض: {ORANGE}{STRING}
 STR_CONFIG_SETTING_LAND_GENERATOR_ORIGINAL                      :الأصلي
@@ -1263,6 +1273,7 @@ STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT                           :{LTBLUE}حظر
 STR_CONFIG_SETTING_AI_BUILDS_SHIPS                              :{LTBLUE}حظر السفن على الحاسوب: {ORANGE}{STRING}

 STR_CONFIG_SETTING_AI_IN_MULTIPLAYER                            :{LTBLUE} السماح بالذكاء الصناعي في اللعب الجماعي : {ORANGE}{STRING}
+STR_CONFIG_SETTING_SCRIPT_MAX_OPCODES                           :{LTBLUE}#opcodes قبل تعليق الاسكربت: {ORANGE}{STRING}

 STR_CONFIG_SETTING_SERVINT_ISPERCENT                            :{LTBLUE}فترات الصيانة بالنسبة المئوية : {ORANGE}{STRING}
 STR_CONFIG_SETTING_SERVINT_TRAINS                               :{LTBLUE}فترات الصيانة القياسية للقطارات: {ORANGE}{STRING} يوم / %
@@ -1355,6 +1366,7 @@ STR_CONFIG_SETTING_VEHICLES_ROUTING                             :{ORANGE} الم
 STR_CONFIG_SETTING_VEHICLES_TRAINS                              :{ORANGE} قطارات
 STR_CONFIG_SETTING_ECONOMY_TOWNS                                :{ORANGE} مدن
 STR_CONFIG_SETTING_ECONOMY_INDUSTRIES                           :{ORANGE} مصانع
+STR_CONFIG_SETTING_ECONOMY_SCRIPTS                              :{ORANGE}الاسكربت

 STR_CONFIG_SETTING_PATHFINDER_OPF                               :اصلي
 STR_CONFIG_SETTING_PATHFINDER_NPF                               :NPF
@@ -1367,6 +1379,20 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS                           :{LTBLUE}الع

 STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}عدل قيمة التغيير

+# Config errors
+STR_CONFIG_ERROR                                                :{WHITE}خطا في ملف الاعدادات
+STR_CONFIG_ERROR_ARRAY                                          :{WHITE}خطا في الجملة '{STRING}'
+STR_CONFIG_ERROR_INVALID_VALUE                                  :{WHITE}... قيمة غير صحيحة '{STRING}' لـ '{STRING}'
+STR_CONFIG_ERROR_TRAILING_CHARACTERS                            :{WHITE}... حروف في نهاية الاعدادات '{STRING}'
+STR_CONFIG_ERROR_DUPLICATE_GRFID                                :{WHITE}... تجاهل الاضافات الجديدة '{STRING}': متطابق مع اضافة '{STRING}'
+STR_CONFIG_ERROR_INVALID_GRF                                    :{WHITE}...تجاهل الاضافة الجديده '{STRING}': {STRING}
+STR_CONFIG_ERROR_INVALID_GRF_NOT_FOUND                          :غير متوفر
+STR_CONFIG_ERROR_INVALID_GRF_UNSAFE                             :غير امن للاستخدام
+STR_CONFIG_ERROR_INVALID_GRF_SYSTEM                             :نظام الاضافات الجديدة
+STR_CONFIG_ERROR_INVALID_GRF_INCOMPATIBLE                       :غير متطابق مع هذه النسخة من OpenTTD
+STR_CONFIG_ERROR_INVALID_GRF_UNKNOWN                            :مجهول
+STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_LEVEL             :{WHITE}... نسبة الضغط '{STRING}' غير صحيحة
+
 # Intro window
 STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}

@@ -1903,8 +1929,8 @@ STR_STATION_BUILD_COVERAGE_OFF                                  :{BLACK}غلق
 STR_STATION_BUILD_COVERAGE_ON                                   :{BLACK}فتح
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}لا توضح منطقة التغطية للموقح المقترح
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}وضح منطقة التغطيةللموقع المقترح
-STR_STATION_BUILD_ACCEPTS_CARGO                                 :{GOLD}{STRING}{BLACK}يقبل:
-STR_STATION_BUILD_SUPPLIES_CARGO                                :{GOLD}{STRING}{BLACK}الموارد:
+STR_STATION_BUILD_ACCEPTS_CARGO                                 :{GOLD}{CARGO_LIST}{BLACK}يقبل:
+STR_STATION_BUILD_SUPPLIES_CARGO                                :{GOLD}{CARGO_LIST}{BLACK}الموارد:

 # Join station window
 STR_JOIN_STATION_CAPTION                                        :{WHITE}اربط المحطات
@@ -2097,7 +2123,7 @@ STR_OBJECT_CLASS_TRNS                                           :النواقل

 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}اشجار
-STR_PLANT_TREE_TOOLTIP                                          :{BLACK} اختر نوع الشجر لزراعتة
+STR_PLANT_TREE_TOOLTIP                                          :{BLACK} اختر نوع الشجر لزراعتة, اذا المربع يحتوي على اشجار فهذا الامر يضيف المزيد
 STR_TREES_RANDOM_TYPE                                           :{BLACK}شجر عشوائي
 STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}ضع شجر عشوائي
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}زراعة اشجار عشوائيا
@@ -2413,11 +2439,6 @@ STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}تحري
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}حرك الملف المختار الى الاسفل في القائمة
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}قائمة ملفات NewGRF المركبة. اضغط على الملف لتغييرة.

-# Additional textfiles accompanying NewGRFs
-STR_NEWGRF_SETTINGS_VIEW_README                                 :{BLACK}اعرض ملف التعليمات ريدمي
-STR_NEWGRF_SETTINGS_VIEW_CHANGELOG                              :{BLACK}اعرض سجل التغييرات
-STR_NEWGRF_SETTINGS_VIEW_LICENSE                                :{BLACK}الرخصة
-
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}اضبط الاعدادات
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}فتح/اغلاق اللوحة
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}فتح / اغلاق لوحة NewGRF المختارة.{} افعل هذا عندما تكون الرسومات الجديدة وردية اللون.
@@ -2448,11 +2469,6 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :نمط {NUM}
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}عدد الانماط: {ORANGE}{NUM}

-# NewGRF textfile window
-STR_NEWGRF_README_CAPTION                                       :{WHITE}اعرض ملف القرائة للمحتوى الجديد {STRING}
-STR_NEWGRF_CHANGELOG_CAPTION                                    :{WHITE}اعرض ملف التغييرات للمحتوى الجديد {STRING}
-STR_NEWGRF_LICENSE_CAPTION                                      :{WHITE}رخصة المحتوى الجديد {STRING}
-
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}نظرة فاحصة - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}الاساس
@@ -2618,6 +2634,17 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_NEW_BUILDINGS                :{YELLOW} مول
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_EXCLUSIVE_TRANSPORT          :{YELLOW} اشتري حقوق النقل لسنة كاملة في هذة المدينة و المصانع التابعة لها. البلدية سوف تسمح للركاب و البضائع باستخدام محطاتك فقط. {}التكلفة: {CURRENCY_LONG}
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{YELLOW} ارشي السلطات المحلية لزيادة كفائة الشركة. هناك عقاب شديد اذا ما اكتشفت الرشوة. {} التكلفة: {CURRENCY_LONG}

+# Goal window
+STR_GOALS_TEXT                                                  :{ORANGE}{STRING}
+
+# Goal question window
+STR_GOAL_QUESTION_CAPTION_QUESTION                              :اسئله
+STR_GOAL_QUESTION_CAPTION_INFORMATION                           :معلومات
+STR_GOAL_QUESTION_CAPTION_WARNING                               :تحذير
+STR_GOAL_QUESTION_CAPTION_ERROR                                 :خطا
+
+### Start of Goal Question button list
+
 # Subsidies window
 STR_SUBSIDIES_CAPTION                                           :{WHITE}العروض
 STR_SUBSIDIES_OFFERED_TITLE                                     :{BLACK}العروض المتاحة للخدمة:
@@ -2646,7 +2673,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM                                  :{YELLOW}({CARGO

 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}يستقبل
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}عرض لائحة بالبضائع المقبولة
-STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}يقبل: {WHITE}{STRING}
+STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}يقبل: {WHITE}{CARGO_LIST}

 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}معدل النقل
 STR_STATION_VIEW_RATINGS_TOOLTIP                                :{BLACK}اظهار معدل النقل للمحطة
@@ -2745,7 +2772,7 @@ STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}غير

 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}اشتري 25% من أسهم الشركة
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}بيع 25% من أسهم الشركة
-STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}اشتري 25% من اسهم هذه الشركة
+STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}اشتري 25% من اسهم هذه الشركة, + مفتاح الاعلى لاظهار التكلفه
 STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}بيع 25% من اسهم هذه الشركة

 STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :اسم الشركة
@@ -2753,6 +2780,8 @@ STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :اسم صاحب

 STR_BUY_COMPANY_MESSAGE                                         :{WHITE}نحن نبحث عن شركة لتشتري شركتنا. {}{} عل ترغب في شراء {COMPANY} بـ {CURRENCY_LONG}؟

+# Company infrastructure window
+
 # Industry directory
 STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}صناعات
 STR_INDUSTRY_DIRECTORY_NONE                                     :{ORANGE}-بدون-
@@ -2866,9 +2895,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}الوز
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}التكلفة: {GOLD}{CURRENCY_LONG}{BLACK} السرعة : {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK} السعة {GOLD}{CARGO_LONG}, {CARGO_LONG}
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK} العربات ذات الطاقة: {GOLD}+{POWER}{BLACK} الوزن: {GOLD}+{WEIGHT_SHORT}
-STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}يمكن تعديلها الى: {GOLD}
+STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}يمكن تعديلها الى: {GOLD}{STRING}
 STR_PURCHASE_INFO_ALL_TYPES                                     :كل انواع الحمولة
-STR_PURCHASE_INFO_ALL_BUT                                       :الكل الا {GOLD}
+STR_PURCHASE_INFO_ALL_BUT                                       :الكل الا {CARGO_LIST}
 STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}تأثير الجذب القصى: {GOLD}{FORCE}

 STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP                              :{BLACK}قائمة اختيار القطارات - اضغط على العربة لعرض معلوماتها
@@ -3110,7 +3139,7 @@ STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR                     :{BLACK} دخل
 STR_VEHICLE_INFO_RELIABILITY_BREAKDOWNS                         :{BLACK} الاعتمادية {LTBLUE}{COMMA} % {BLACK} الاعطال منذ اخر صيانة {LTBLUE}{COMMA}

 STR_VEHICLE_INFO_BUILT_VALUE                                    :{LTBLUE}{ENGINE} {BLACK} بني {LTBLUE}{NUM}{BLACK} القيمة {LTBLUE}{CURRENCY_LONG}
-STR_VEHICLE_INFO_NO_CAPACITY                                    :{BLACK}السعة: {LTBLUE}بدون
+STR_VEHICLE_INFO_NO_CAPACITY                                    :{BLACK}السعة: {LTBLUE}بدون{STRING}
 STR_VEHICLE_INFO_CAPACITY                                       :{BLACK} السعة {LTBLUE}{CARGO_LONG}{3:STRING}
 STR_VEHICLE_INFO_CAPACITY_MULT                                  :{BLACK} السعة {LTBLUE}{CARGO_LONG}{3:STRING} (x{4:NUM})
 STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK} السعة {LTBLUE}{CARGO_LONG}, {CARGO_LONG}{STRING}
@@ -3319,6 +3348,7 @@ STR_ORDER_STOP_LOCATION_NEAR_END                                :[قرب الن
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[وسط]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[النهاية القصوى]

+
 STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :اقفز الى الأمر {COMMA}
 STR_ORDER_CONDITIONAL_NUM                                       :اقفز للامر{COMMA} عندما {STRING} {STRING} {COMMA}
 STR_ORDER_CONDITIONAL_TRUE_FALSE                                :اقفز للامر {COMMA} عندما {STRING} {STRING}
@@ -3335,7 +3365,9 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}جدول
 STR_TIMETABLE_NO_TRAVEL                                         :لا رحيل
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :المغادرة (ذاتي: بواسطة الامر اليدوي التالي)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :مسافر (ليس هناك جدولة)
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :سافر بمعدل {2:VELOCITY} (بدون جدوله)
 STR_TIMETABLE_TRAVEL_FOR                                        :مسافر لـ {STRING}
+STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :سافر لي {STRING} بمعدل {VELOCITY}
 STR_TIMETABLE_STAY_FOR                                          :ويبقى لـ {STRING}
 STR_TIMETABLE_AND_TRAVEL_FOR                                    :ويسافر لـ {STRING}
 STR_TIMETABLE_DAYS                                              :{COMMA}يوم
@@ -3359,6 +3391,12 @@ STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}غير
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}مسح الوقت
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}مسح مقدار الوقت للامر

+STR_TIMETABLE_CHANGE_SPEED                                      :{BLACK}غير تحديد السرعة
+STR_TIMETABLE_CHANGE_SPEED_TOOLTIP                              :{BLACK}غير السرعة القصوى للامر المختار
+
+STR_TIMETABLE_CLEAR_SPEED                                       :{BLACK}ازل تحديد السرعة
+STR_TIMETABLE_CLEAR_SPEED_TOOLTIP                               :{BLACK}ازل السرعة القصوى للرحلة من الامر المختار
+
 STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}اعد ضبط العداد التأخير
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}عدل وقت التاخير للعداد حتى تصل المركبة في الوقت المحدد

@@ -3400,7 +3438,6 @@ STR_AI_DEBUG_CONTINUE                                           :{BLACK}استم
 STR_AI_DEBUG_CONTINUE_TOOLTIP                                   :{BLACK}عدم توقيف ومواصلة الذكاء الصناعي
 STR_AI_DEBUG_SELECT_AI_TOOLTIP                                  :{BLACK}عرض صائد الاخطاء لهذه الاضافة

-
 STR_ERROR_AI_NO_AI_FOUND                                        :لا يوجد اضافات مناسبة للتحميل {} هذه اضافة غبية ولن تفعل شيئا لك {} تستطيع تحميل اضافات من الشبكة عن طريق نظام التحميل
 STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}واحد من الذكاء الصناعي فشل. الرجاء ابلاغ المبرمج عنه مصحوبا بصورة من شاشة مصحح الاخطاء.
 STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW} شاشة اخطاء الذكاء الصناعي متوفرة فقط في الخادم
@@ -3415,6 +3452,8 @@ STR_AI_CONFIG_MOVE_UP_TOOLTIP                                   :{BLACK}انقل
 STR_AI_CONFIG_MOVE_DOWN                                         :{BLACK}انقل للاسفل
 STR_AI_CONFIG_MOVE_DOWN_TOOLTIP                                 :{BLACK}انقل الذكاء الاصطناعي المختار للاسفل

+
+STR_AI_CONFIG_CHANGE_NONE                                       :
 STR_AI_CONFIG_CONFIGURE                                         :{BLACK} اعداد
 STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK} اعداد خواص الذكاء الصناعي

@@ -3435,6 +3474,16 @@ STR_AI_SETTINGS_CLOSE                                           :{BLACK} اغل
 STR_AI_SETTINGS_RESET                                           :{BLACK} اعادة ضبط
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}

+
+# Textfile window
+STR_TEXTFILE_README_CAPTION                                     :{WHITE}{STRING}اقراني {STRING}
+STR_TEXTFILE_CHANGELOG_CAPTION                                  :{WHITE}{STRING} سجل التغيير ل{STRING}
+STR_TEXTFILE_LICENCE_CAPTION                                    :{WHITE}{STRING}رخصة {STRING}
+STR_TEXTFILE_VIEW_README                                        :{BLACK}اعرض ملف التعليمات ريدمي
+STR_TEXTFILE_VIEW_CHANGELOG                                     :{BLACK}اعرض سجل التغييرات
+STR_TEXTFILE_VIEW_LICENCE                                       :{BLACK}الرخصة
+
+
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINY_FONT}{WHITE}{NUM}%{UP_ARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UP_ARROW}
@@ -4276,6 +4325,7 @@ STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
 STR_JUST_CURRENCY_SHORT                                         :{CURRENCY_SHORT}
 STR_JUST_CURRENCY_LONG                                          :{CURRENCY_LONG}
+STR_JUST_CARGO_LIST                                             :{CARGO_LIST}
 STR_JUST_INT                                                    :{NUM}
 STR_JUST_DATE_TINY                                              :{DATE_TINY}
 STR_JUST_DATE_SHORT                                             :{DATE_SHORT}
@@ -4291,6 +4341,7 @@ STR_TINY_BLACK_COMA                                             :{TINY_FONT}{BLA
 STR_TINY_COMMA                                                  :{TINY_FONT}{COMMA}
 STR_BLUE_COMMA                                                  :{BLUE}{COMMA}
 STR_RED_COMMA                                                   :{RED}{COMMA}
+STR_WHITE_COMMA                                                 :{WHITE}{COMMA}
 STR_TINY_BLACK_DECIMAL                                          :{TINY_FONT}{BLACK}{DECIMAL}
 STR_COMPANY_MONEY                                               :{WHITE}{CURRENCY_LONG}
 STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
@@ -4309,6 +4360,7 @@ STR_BLACK_RAW_STRING                                            :{BLACK}{STRING}
 STR_GREEN_STRING                                                :{GREEN}{STRING}
 STR_ORANGE_STRING                                               :{ORANGE}{STRING}
 STR_RED_STRING                                                  :{RED}{STRING}
+STR_LTBLUE_STRING                                               :{LTBLUE}{STRING}
 STR_WHITE_STRING                                                :{WHITE}{STRING}
 STR_TINY_BLACK_HEIGHT                                           :{TINY_FONT}{BLACK}{HEIGHT}
 STR_TINY_BLACK_VEHICLE                                          :{TINY_FONT}{BLACK}{VEHICLE}
--- a/src/lang/belarusian.txt
+++ b/src/lang/belarusian.txt
@@ -606,7 +606,7 @@ STR_SORT_BY_RANGE                                               :Далёкас
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Паўза
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Паскорыць гульню
 STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Наладкі
-STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME                      :{BLACK}Захаваньне гульні{}Галоўнае мэню{}Выхад
+STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME                      :{BLACK}Захаваньне гульні, галоўнае мэню, выхад
 STR_TOOLBAR_TOOLTIP_DISPLAY_MAP                                 :{BLACK}Паказаць мапу, вакно прагляду цi сьпiс знакаў
 STR_TOOLBAR_TOOLTIP_DISPLAY_TOWN_DIRECTORY                      :{BLACK}Сьпiс гарадоў
 STR_TOOLBAR_TOOLTIP_DISPLAY_SUBSIDIES                           :{BLACK}Паказаць субсыдыі
@@ -633,7 +633,7 @@ STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION                      :{BLACK}Iнфа
 STR_TOOLBAR_TOOLTIP_SWITCH_TOOLBAR                              :{BLACK}Пераключыць панэлі інструмэнтаў

 # Extra tooltips for the scenario editor toolbar
-STR_SCENEDIT_TOOLBAR_TOOLTIP_SAVE_SCENARIO_LOAD_SCENARIO        :{BLACK}Захаваць сцэнар, загрузіць сцэнар, выхад з рэдактара
+STR_SCENEDIT_TOOLBAR_TOOLTIP_SAVE_SCENARIO_LOAD_SCENARIO        :{BLACK}Захаваньне/загрузка сцэнара, выхад з рэдактара, выхад
 STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}OpenTTD
 STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR                            :{YELLOW}Рэдактар сцэнараў
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Зьменшыць пачатковую дату гульні на 1 год
@@ -673,13 +673,14 @@ STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS                         :Паказан
 STR_SETTINGS_MENU_FULL_ANIMATION                                :Поўная анімацыя
 STR_SETTINGS_MENU_FULL_DETAIL                                   :Поўная дэталізацыя
 STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS                         :Празрыстыя будынкі
-STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Празрыстыя назвы станцыяў
+STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Празрыстыя надпісы
 ############ range ends here

 ############ range for file menu starts
 STR_FILE_MENU_SAVE_GAME                                         :Захаваць гульню
 STR_FILE_MENU_LOAD_GAME                                         :Загрузіць гульню
 STR_FILE_MENU_QUIT_GAME                                         :У галоўнае меню
+STR_FILE_MENU_SEPARATOR                                         :
 STR_FILE_MENU_EXIT                                              :Выхад
 ############ range ends here

@@ -1521,7 +1522,7 @@ STR_CONFIG_SETTING_ENABLE_FREEFORM_EDGES                        :{LTBLUE}Даз
 STR_CONFIG_SETTING_EDGES_NOT_EMPTY                              :{WHITE}Адна ці некалькі клетак ў паўночным куце мапы не пустыя
 STR_CONFIG_SETTING_EDGES_NOT_WATER                              :{WHITE}Адна ці некалькі клетак берага без вады

-STR_CONFIG_SETTING_STATION_SPREAD                               :{LTBLUE}Макс. працялегласьць станцыі: {ORANGE}{STRING} клет{P 0:1 ка кi ак} {RED}(вялікія значэньні запавольваюць гульню)
+STR_CONFIG_SETTING_STATION_SPREAD                               :{LTBLUE}Макс. працялегласьць аб'яднанай станцыі: {ORANGE}{STRING} клет{P 0:1 ка кi ак} {RED}(вялікія значэньні запавольваюць гульню)
 STR_CONFIG_SETTING_SERVICEATHELIPAD                             :{LTBLUE}Уключыць абслугоўваньне на верталётных пляцоўках: {ORANGE}{STRING}
 STR_CONFIG_SETTING_LINK_TERRAFORM_TOOLBAR                       :{LTBLUE}Зьвязаць ляндшафтную панэль з транспартнай: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR                         :{LTBLUE}Колер зямлі на мінімапе: {ORANGE}{STRING}
@@ -2117,9 +2118,9 @@ STR_NETWORK_ERROR_KICKED                                        :{WHITE}Вас
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Махлярства не дазволена на гэтым сэрвэры
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Вы дасылалi да сэрвэра занадта шмат камандаў
 STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}Вы задоўга ня можаце ўвесьцi пароль
-STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}Ваш кампутар задоўга ня можа далучыцца
-STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}Вы задоўга пампуеце мапу
-STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}Вы задоўга далучаецеся да сэрвэра
+STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}Ваш кампутар задоўга ня можа далучыцца да сэрвэру
+STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}Ваш кампутар задоўга пампуе мапу
+STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}Ваш кампутар задоўга далучаецца да сэрвэру

 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :агульная памылка
@@ -2261,7 +2262,7 @@ STR_MISSING_GRAPHICS_NO_QUIT                                    :{BLACK}Не, в

 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}Наладкі празрыстасьці
-STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Пераключыць празрыстасьць для назваў станцыяў. Ctrl+клік - заблякаваць.
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Пераключэньне празрыстасці надпісаў. Ctrl+пстрычка - заблякаваць.
 STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Пераключыць празрыстасьць для дрэваў. Ctrl+клік - заблякаваць.
 STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Пераключыць празрыстасьць для дамоў. Ctrl+клік - заблякаваць.
 STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Пераключыць празрыстасьць для прадпрыемстваў. Ctrl+клік - заблякаваць.
@@ -2278,8 +2279,8 @@ STR_STATION_BUILD_COVERAGE_OFF                                  :{BLACK}Выкл
 STR_STATION_BUILD_COVERAGE_ON                                   :{BLACK}Укл.
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}Не паказваць зону пакрыцьця
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}Паказваць зону пакрыцьця
-STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Прымае: {GOLD}{STRING}
-STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Прапаноўвае: {GOLD}{STRING}
+STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Прымае: {GOLD}{CARGO_LIST}
+STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Прапаноўвае: {GOLD}{CARGO_LIST}

 # Join station window
 STR_JOIN_STATION_CAPTION                                        :{WHITE}Аб'яднаць станцыі
@@ -2402,7 +2403,7 @@ STR_STATION_BUILD_BUS_ORIENTATION                               :{WHITE}Кіру
 STR_STATION_BUILD_BUS_ORIENTATION_TOOLTIP                       :{BLACK}Выберыце кірунак аўтобуснага прыпынка
 STR_STATION_BUILD_TRUCK_ORIENTATION                             :{WHITE}Кірунак грузавога тэрмінала
 STR_STATION_BUILD_TRUCK_ORIENTATION_TOOLTIP                     :{BLACK}Выберыце кірунак грузавога тэрмінала
-STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION                    :{WHITE}Кірунак трамвайнага прыпынка
+STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION                    :{WHITE}Кірунак прыпынку пасажырскiх трамваяў
 STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION_TOOLTIP            :{BLACK}Выберыце кірунак трамвайнага прыпынка
 STR_STATION_BUILD_CARGO_TRAM_ORIENTATION                        :{WHITE}Кірунак прыпынка грузавых трамваяў
 STR_STATION_BUILD_CARGO_TRAM_ORIENTATION_TOOLTIP                :{BLACK}Выберыце кірунак прыпынка грузавых трамваяў
@@ -2476,7 +2477,7 @@ STR_OBJECT_CLASS_TRNS                                           :Перадат

 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Дрэвы
-STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Выберыце від дрэваў для пасадкі
+STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Выберыце тып дрэў для пасадкі. Калі на ўчастку ўжо ёсць дрэвы, будуць дададзены некалькі дрэў рознага тыпу, незалежна ад выбранага.
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Дрэвы розных відаў
 STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Высадка дрэў выпадковага тыпу. Пры націснутым Shift - ацэнка кошту высадкі.
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Расставіць па мапе
@@ -2725,8 +2726,8 @@ STR_MAPGEN_NORTHWEST                                            :{BLACK}Паўн
 STR_MAPGEN_NORTHEAST                                            :{BLACK}Паўночны ўсход
 STR_MAPGEN_SOUTHEAST                                            :{BLACK}Паўднёвы ўсход
 STR_MAPGEN_SOUTHWEST                                            :{BLACK}Паўднёвы захад
-STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Свабодны
-STR_MAPGEN_BORDER_WATER                                         :{BLACK}Водны
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Зямля
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}Вада
 STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Выпадковы
 STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Выпадковыя
 STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Уручную
@@ -2793,11 +2794,6 @@ STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Унiз
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Перамясьціць выбраны файл NewGRF ніжэй
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Сьпіс устаноўленых файлаў NewGRF.

-# Additional textfiles accompanying NewGRFs
-STR_NEWGRF_SETTINGS_VIEW_README                                 :{BLACK}Прагледзець iнструкцыю
-STR_NEWGRF_SETTINGS_VIEW_CHANGELOG                              :{BLACK}Журнал зьменаў
-STR_NEWGRF_SETTINGS_VIEW_LICENSE                                :{BLACK}Лiцэнзiя
-
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Усталяваць парамэтры
 STR_NEWGRF_SETTINGS_SHOW_PARAMETERS                             :{BLACK}Паказаць парамэтры
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Пераключыць палітру
@@ -2829,11 +2825,6 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Парамэт
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Колькасьць парамэтраў: {ORANGE}{NUM}

-# NewGRF textfile window
-STR_NEWGRF_README_CAPTION                                       :{WHITE}Iнструкцыя набора графiкi {STRING}
-STR_NEWGRF_CHANGELOG_CAPTION                                    :{WHITE}Журнал зьменаў {STRING}
-STR_NEWGRF_LICENSE_CAPTION                                      :{WHITE}Лiцэнзiя {STRING}
-
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Прагляд - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Бацька (parent)
@@ -3068,7 +3059,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM                                  :{YELLOW}({CARGO

 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Прымае
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Паказаць сьпіс прымаемых грузаў
-STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}Прымае: {WHITE}{STRING}
+STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}Прымае: {WHITE}{CARGO_LIST}

 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Рэйтынг
 STR_STATION_VIEW_RATINGS_TOOLTIP                                :{BLACK}Паказаць рэйтынг станцыі
@@ -3313,9 +3304,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Вага
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Кошт: {GOLD}{CURRENCY_LONG}{BLACK} Хуткасьць: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Ёмістасьць: {GOLD}{CARGO_LONG}, {CARGO_LONG}
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Маторныя вагоны: {GOLD}+{POWER}{BLACK} Вага: {GOLD}+{WEIGHT_SHORT}
-STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Пераабст. для: {GOLD}
+STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Пераабст. для: {GOLD}{STRING}
 STR_PURCHASE_INFO_ALL_TYPES                                     :Усе тыпы грузаў
-STR_PURCHASE_INFO_ALL_BUT                                       :Усё, акрамя {GOLD}
+STR_PURCHASE_INFO_ALL_BUT                                       :Усё, акрамя {CARGO_LIST}
 STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}Макс. цягавае намаганьне: {GOLD}{FORCE}
 STR_PURCHASE_INFO_AIRCRAFT_RANGE                                :{BLACK}Далёкасьць: {GOLD}{COMMA} клет{P ка кi ак}

@@ -3450,8 +3441,8 @@ STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Кошт
 STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE               :{BLACK}Кошт: {CURRENCY_LONG} Вага: {WEIGHT_SHORT}{}Хуткасьць: {VELOCITY}  Магутнасьць: {POWER}  Макс. ЦН: {6:FORCE}{}Кошт абслуг.: {4:CURRENCY_LONG}/год{}Ёмістасьць: {5:CARGO_LONG}
 STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Кошт: {CURRENCY_LONG} Макс. хуткасьць: {VELOCITY}{}Ёмістасьць: {CARGO_LONG}, {CARGO_LONG}{}Кошт абслуг.: {CURRENCY_LONG}/год
 STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Кошт: {CURRENCY_LONG} Макс. хуткасьць: {VELOCITY}{}Ёмістасьць: {CARGO_LONG}{}Кошт абслуг.: {CURRENCY_LONG}/год
-STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_CAPACITY_RUNCOST:{BLACK}Кошт: {CURRENCY_LONG} Макс. хуткасьць: {VELOCITY} Далёкасьць: {7:COMMA} клетк{P а i ак}{}Умяшчальнасьць: {CARGO_LONG}, {CARGO_LONG}{}Кошт абслугоўваньня: {CURRENCY_LONG}/год
-STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_RUNCOST        :{BLACK}Кошт: {CURRENCY_LONG} Макс. хуткасьць: {VELOCITY} Далёкасьць: {7:COMMA} клет{P ка кi ак}{}Умяшчальнасьць: {CARGO_LONG}{}Кошт абслугоўваньня: {CURRENCY_LONG}/год
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_CAPACITY_RUNCOST:{BLACK}Кошт: {CURRENCY_LONG} Макс. хуткасьць: {VELOCITY} Далёкасьць: {COMMA} клетк{P а i ак}{}Умяшчальнасьць: {CARGO_LONG}, {CARGO_LONG}{}Кошт абслугоўваньня: {CURRENCY_LONG}/год
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_RUNCOST        :{BLACK}Кошт: {CURRENCY_LONG} Макс. хуткасьць: {VELOCITY} Далёкасьць: {COMMA} клет{P ка кi ак}{}Умяшчальнасьць: {CARGO_LONG}{}Кошт абслугоўваньня: {CURRENCY_LONG}/год

 # Autoreplace window
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Замена {STRING.gen}
@@ -3582,7 +3573,7 @@ STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR                     :{BLACK}Прыб
 STR_VEHICLE_INFO_RELIABILITY_BREAKDOWNS                         :{BLACK}Надзейнасьць: {LTBLUE}{COMMA}%  {BLACK}Паломак з апошняга агляду: {LTBLUE}{COMMA}

 STR_VEHICLE_INFO_BUILT_VALUE                                    :{LTBLUE}{ENGINE} {BLACK}Пабудаваны ў: {LTBLUE}{NUM} г.{BLACK} Кошт: {LTBLUE}{CURRENCY_LONG}
-STR_VEHICLE_INFO_NO_CAPACITY                                    :{BLACK}Ёмiстасьць: {LTBLUE}адсутнiчае
+STR_VEHICLE_INFO_NO_CAPACITY                                    :{BLACK}Ёмiстасьць: {LTBLUE}адсутнiчае{STRING}
 STR_VEHICLE_INFO_CAPACITY                                       :{BLACK}Ёмiстасьць: {LTBLUE}{CARGO_LONG}{3:STRING}
 STR_VEHICLE_INFO_CAPACITY_MULT                                  :{BLACK}Ёмiстасьць: {LTBLUE}{CARGO_LONG}{3:STRING} (x{4:NUM})
 STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK}Ёмiстасьць: {LTBLUE}{CARGO_LONG}, {CARGO_LONG}{STRING}
@@ -3729,7 +3720,7 @@ STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Ісьці да
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Ісьці да бліжэйшага ангара
 STR_ORDER_CONDITIONAL                                           :Умоўны пераход да заданьня
 STR_ORDER_SHARE                                                 :Агульныя заданьнi
-STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Уставіць новае заданьне перад вылучаным, або ў канец сьпісу. Ctrl дадае на станцыях «поўная пагрузка любым грузам», на пунктах шляху - «без прыпынку», на дэпо - «абслугоўваньне». «Агульныя заданьнi» або Ctrl дазваляюць гэтаму транспарту мець агульныя заданьнi з вылучаным транспартам. Пстрычка па транспарце капiруе заданьнi гэтага транспарту.
+STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Уставіць новае заданьне перад вылучаным, або ў канец сьпісу. Ctrl дадае на станцыях «поўная пагрузка любым грузам», на пунктах шляху - «без прыпынку», на дэпо - «абслугоўваньне». «Агульныя заданьнi» або Ctrl дазваляюць гэтаму транспарту мець агульныя заданьнi з вылучаным транспартам. Пстрычка па транспарце капiруе заданьнi гэтага транспарту. Заданьне «ў дэпо» адключае аўтаматычнае абслугоўваньне гэтага транспарту.

 STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Паказаць ўвесь транспарт з агульнымі заданьнямі

@@ -3809,7 +3800,9 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Раск
 STR_TIMETABLE_NO_TRAVEL                                         :Няма назначэньня
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Прабег (аўтаматычна; у расклад наступным заданьнем уручную)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Час у шляху (не зададзены)
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Рухацца не хутчэй за {2:VELOCITY} (расклад ня вызначаны)
 STR_TIMETABLE_TRAVEL_FOR                                        :Час у шляху - {STRING}
+STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Рухацца да {STRING} не хутчэй за {VELOCITY}
 STR_TIMETABLE_STAY_FOR                                          :і чакаць {STRING}
 STR_TIMETABLE_AND_TRAVEL_FOR                                    :і рухацца да {STRING}
 STR_TIMETABLE_DAYS                                              :{COMMA} д{P зень нi зён}
@@ -3833,6 +3826,12 @@ STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Зьмя
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Ськінуць час
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Ськінуць час у вылучаным заданьні

+STR_TIMETABLE_CHANGE_SPEED                                      :{BLACK}Зьмянiць абмежаваньне хуткасьцi
+STR_TIMETABLE_CHANGE_SPEED_TOOLTIP                              :{BLACK}Зьмянiць макс. хуткасьць руху для выдзеленага заданьня
+
+STR_TIMETABLE_CLEAR_SPEED                                       :{BLACK}Ачысьцiць абмежаваньне хуткасьцi
+STR_TIMETABLE_CLEAR_SPEED_TOOLTIP                               :{BLACK}Ачысьцiць макс. хуткасьць руху для выдзеленага заданьня
+
 STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Ськід лічыльніка
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Ськінуць лічыльнік так, каб транспарт прыбыў своечасова

@@ -3928,6 +3927,16 @@ STR_AI_SETTINGS_RESET                                           :{BLACK}Ські
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 STR_AI_SETTINGS_START_DELAY                                     :Колькасьць дзён да старту гэтага AI/ШI пасьля папярэдняга: {ORANGE}{STRING}

+
+# Textfile window
+STR_TEXTFILE_README_CAPTION                                     :{WHITE}{STRING} iнструкцыя {STRING}
+STR_TEXTFILE_CHANGELOG_CAPTION                                  :{WHITE}{STRING} сьпiс зьменаў {STRING}
+STR_TEXTFILE_LICENCE_CAPTION                                    :{WHITE}{STRING} лiцэнзiя {STRING}
+STR_TEXTFILE_VIEW_README                                        :{BLACK}Прагледзець iнструкцыю
+STR_TEXTFILE_VIEW_CHANGELOG                                     :{BLACK}Журнал зьменаў
+STR_TEXTFILE_VIEW_LICENCE                                       :{BLACK}Лiцэнзiя
+
+
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINY_FONT}{WHITE}{NUM}%{UP_ARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UP_ARROW}
@@ -4065,7 +4074,8 @@ STR_ERROR_ONLY_ONE_ALLOWED_PER_TOWN                             :{WHITE}... та
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}... можна пабудаваць у гарадах з насельніцтвам ня менш за 1200 жыхароў
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}... можна будаваць толькі ў тропіках
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}... можна будаваць толькі ў пустэльні
-STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS                            :{WHITE}... можна будаваць толькі ў гарадах
+STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS                            :{WHITE}... можна будаваць толькі ў гарадах (на месцы дамоў)
+STR_ERROR_CAN_ONLY_BE_BUILT_NEAR_TOWN_CENTER                    :{WHITE}... можа быць пабудавана толькi ў цэнтры гарадоў
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_LOW_AREAS                        :{WHITE}... можна будаваць толькі ў нізінах
 STR_ERROR_CAN_ONLY_BE_POSITIONED                                :{WHITE}... можа знаходзіцца толькі ля краю мапы
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}... лес можна саджаць толькі вышэй за сьнегавую лiнiю
@@ -4492,79 +4502,79 @@ STR_SV_SHIP_NAME                                                :Карабел
 STR_SV_AIRCRAFT_NAME                                            :Самалёт {COMMA}

 STR_SV_STNAME                                                   :{STRING}
-STR_SV_STNAME_NORTH                                             :{G=f}Паўночная {STRING}
-STR_SV_STNAME_NORTH.gen                                         :Паўночнай {STRING}
-STR_SV_STNAME_NORTH.acc                                         :Паўночную {STRING}
-STR_SV_STNAME_SOUTH                                             :{G=f}Паўднёвая {STRING}
-STR_SV_STNAME_SOUTH.gen                                         :Паўднёвай {STRING}
-STR_SV_STNAME_SOUTH.acc                                         :Паўднёвую {STRING}
-STR_SV_STNAME_EAST                                              :{G=f}Усходняя {STRING}
-STR_SV_STNAME_EAST.gen                                          :Усходняй {STRING}
-STR_SV_STNAME_EAST.acc                                          :Усходнюю {STRING}
-STR_SV_STNAME_WEST                                              :{G=f}Заходняя {STRING}
-STR_SV_STNAME_WEST.gen                                          :Заходняй {STRING}
-STR_SV_STNAME_WEST.acc                                          :Заходнюю {STRING}
-STR_SV_STNAME_CENTRAL                                           :{G=f}Цэнтральная {STRING}
-STR_SV_STNAME_CENTRAL.gen                                       :Цэнтральнай {STRING}
-STR_SV_STNAME_CENTRAL.acc                                       :Цэнтральную {STRING}
-STR_SV_STNAME_TRANSFER                                          :{G=f}Таварная {STRING}
-STR_SV_STNAME_TRANSFER.gen                                      :Таварнай {STRING}
-STR_SV_STNAME_TRANSFER.acc                                      :Таварную {STRING}
-STR_SV_STNAME_HALT                                              :Прамежкавая {STRING}
-STR_SV_STNAME_HALT.gen                                          :Прамежкавай {STRING}
-STR_SV_STNAME_HALT.acc                                          :Прамежкавую {STRING}
-STR_SV_STNAME_VALLEY                                            :Даліна {STRING}
-STR_SV_STNAME_VALLEY.gen                                        :Даліны {STRING}
-STR_SV_STNAME_VALLEY.acc                                        :Даліну {STRING}
-STR_SV_STNAME_HEIGHTS                                           :{G=f}{STRING}-Вышынная
-STR_SV_STNAME_HEIGHTS.gen                                       :{STRING}-Вышыннай
-STR_SV_STNAME_HEIGHTS.acc                                       :{STRING}-Вышынную
-STR_SV_STNAME_WOODS                                             :{G=f}Лясная {STRING}
-STR_SV_STNAME_WOODS.gen                                         :Лясной {STRING}
-STR_SV_STNAME_WOODS.acc                                         :Лясную {STRING}
-STR_SV_STNAME_LAKESIDE                                          :{G=f}Азёрная {STRING}
-STR_SV_STNAME_LAKESIDE.gen                                      :Азёрнай {STRING}
-STR_SV_STNAME_LAKESIDE.acc                                      :Азёрную {STRING}
-STR_SV_STNAME_EXCHANGE                                          :{G=f}{STRING}-Сартавальная
-STR_SV_STNAME_EXCHANGE.gen                                      :{STRING}-Сартавальнай
-STR_SV_STNAME_EXCHANGE.acc                                      :{STRING}-Сартавальную
-STR_SV_STNAME_AIRPORT                                           :{G=m}Аэрапорт {STRING}
-STR_SV_STNAME_AIRPORT.gen                                       :Аэрапорта {STRING}
-STR_SV_STNAME_AIRPORT.acc                                       :Аэрапорт {STRING}
-STR_SV_STNAME_OILFIELD                                          :{G=f}Нафтавая плятформа {STRING}
-STR_SV_STNAME_OILFIELD.gen                                      :Нафтавай плятформы {STRING}
-STR_SV_STNAME_OILFIELD.acc                                      :Нафтавую плятформу {STRING}
-STR_SV_STNAME_MINES                                             :{G=p}Шахты {STRING}
-STR_SV_STNAME_MINES.gen                                         :Шахтаў {STRING}
-STR_SV_STNAME_MINES.acc                                         :Шахты {STRING}
-STR_SV_STNAME_DOCKS                                             :{G=f}Прыстань {STRING}
-STR_SV_STNAME_DOCKS.gen                                         :Прыстанi {STRING}
-STR_SV_STNAME_DOCKS.acc                                         :Прыстань {STRING}
+STR_SV_STNAME_NORTH                                             :{G=m}{STRING}-Паўночны
+STR_SV_STNAME_NORTH.gen                                         :{STRING}-Паўночнага
+STR_SV_STNAME_NORTH.acc                                         :{STRING}-Паўночны
+STR_SV_STNAME_SOUTH                                             :{G=m}{STRING}-Паўднёвы
+STR_SV_STNAME_SOUTH.gen                                         :{STRING}-Паўднёвага
+STR_SV_STNAME_SOUTH.acc                                         :{STRING}-Паўднёвы
+STR_SV_STNAME_EAST                                              :{G=m}{STRING}-Усходнi
+STR_SV_STNAME_EAST.gen                                          :{STRING}-Усходняга
+STR_SV_STNAME_EAST.acc                                          :{STRING}-Усходнi
+STR_SV_STNAME_WEST                                              :{G=m}{STRING}-Заходнi
+STR_SV_STNAME_WEST.gen                                          :{STRING}-Заходняга
+STR_SV_STNAME_WEST.acc                                          :{STRING}-Заходнi
+STR_SV_STNAME_CENTRAL                                           :{G=m}{STRING}-Цэнтральны
+STR_SV_STNAME_CENTRAL.gen                                       :{STRING}-Цэнтральнага
+STR_SV_STNAME_CENTRAL.acc                                       :{STRING}-Цэнтральны
+STR_SV_STNAME_TRANSFER                                          :{G=m}{STRING}-Таварны
+STR_SV_STNAME_TRANSFER.gen                                      :{STRING}-Таварнага
+STR_SV_STNAME_TRANSFER.acc                                      :{STRING}-Таварны
+STR_SV_STNAME_HALT                                              :{G=m}{STRING}-Прамежкавы
+STR_SV_STNAME_HALT.gen                                          :{STRING}-Прамежкавага
+STR_SV_STNAME_HALT.acc                                          :{STRING}-Прамежкавага
+STR_SV_STNAME_VALLEY                                            :{G=f}{STRING}-Даліна
+STR_SV_STNAME_VALLEY.gen                                        :{STRING}-Даліны
+STR_SV_STNAME_VALLEY.acc                                        :{STRING}-Даліну
+STR_SV_STNAME_HEIGHTS                                           :{G=m}{STRING}-Вышынны
+STR_SV_STNAME_HEIGHTS.gen                                       :{STRING}-Вышыннага
+STR_SV_STNAME_HEIGHTS.acc                                       :{STRING}-Вышынны
+STR_SV_STNAME_WOODS                                             :{G=m}{STRING}-Лясны
+STR_SV_STNAME_WOODS.gen                                         :{STRING}-Ляснога
+STR_SV_STNAME_WOODS.acc                                         :{STRING}-Лясны
+STR_SV_STNAME_LAKESIDE                                          :{G=m}{STRING}-Азёрны
+STR_SV_STNAME_LAKESIDE.gen                                      :{STRING}-Азёрнага
+STR_SV_STNAME_LAKESIDE.acc                                      :{STRING}-Азёрны
+STR_SV_STNAME_EXCHANGE                                          :{G=m}{STRING}-Сартавальны
+STR_SV_STNAME_EXCHANGE.gen                                      :{STRING}-Сартавальнага
+STR_SV_STNAME_EXCHANGE.acc                                      :{STRING}-Сартавальны
+STR_SV_STNAME_AIRPORT                                           :{G=m}{STRING}-Аэрапорт
+STR_SV_STNAME_AIRPORT.gen                                       :{STRING}-Аэрапорта
+STR_SV_STNAME_AIRPORT.acc                                       :{STRING}-Аэрапорт
+STR_SV_STNAME_OILFIELD                                          :{G=f}{STRING} Нафтавая плятформа
+STR_SV_STNAME_OILFIELD.gen                                      :{STRING} Нафтавай плятформы
+STR_SV_STNAME_OILFIELD.acc                                      :{STRING} Нафтавую плятформу
+STR_SV_STNAME_MINES                                             :{G=p}{STRING}-Шахты
+STR_SV_STNAME_MINES.gen                                         :{STRING}-Шахтаў
+STR_SV_STNAME_MINES.acc                                         :{STRING}-Шахты
+STR_SV_STNAME_DOCKS                                             :{G=f}{STRING}-Прыстань
+STR_SV_STNAME_DOCKS.gen                                         :{STRING}-Прыстанi
+STR_SV_STNAME_DOCKS.acc                                         :{STRING}-Прыстань
 STR_SV_STNAME_BUOY                                              :{STRING}
 STR_SV_STNAME_WAYPOINT                                          :{STRING}
 ##id 0x6020
-STR_SV_STNAME_ANNEXE                                            :{G=f}{STRING}-Дадатковая
-STR_SV_STNAME_ANNEXE.gen                                        :{STRING}-Дадатковай
-STR_SV_STNAME_ANNEXE.acc                                        :{STRING}-Дадатковую
-STR_SV_STNAME_SIDINGS                                           :{G=f}{STRING}-Запасная
-STR_SV_STNAME_SIDINGS.gen                                       :{STRING}-Запасной
-STR_SV_STNAME_SIDINGS.acc                                       :{STRING}-Запасную
+STR_SV_STNAME_ANNEXE                                            :{G=m}{STRING}-Дадатковы
+STR_SV_STNAME_ANNEXE.gen                                        :{STRING}-Дадатковага
+STR_SV_STNAME_ANNEXE.acc                                        :{STRING}-Дадатковы
+STR_SV_STNAME_SIDINGS                                           :{G=m}{STRING}-Запасны
+STR_SV_STNAME_SIDINGS.gen                                       :{STRING}-Запаснога
+STR_SV_STNAME_SIDINGS.acc                                       :{STRING}-Запасны
 STR_SV_STNAME_BRANCH                                            :{G=m}{STRING}-Тупік
 STR_SV_STNAME_BRANCH.gen                                        :{STRING}-Тупіка
 STR_SV_STNAME_BRANCH.acc                                        :{STRING}-Тупік
-STR_SV_STNAME_UPPER                                             :{G=f}Верхняя {STRING}
-STR_SV_STNAME_UPPER.gen                                         :Верхняй {STRING}
-STR_SV_STNAME_UPPER.acc                                         :Верхнюю {STRING}
-STR_SV_STNAME_LOWER                                             :{G=f}Нiжняя {STRING}
-STR_SV_STNAME_LOWER.gen                                         :Нiжняй {STRING}
-STR_SV_STNAME_LOWER.acc                                         :Нiжнюю {STRING}
-STR_SV_STNAME_HELIPORT                                          :{G=f}Пляцоўка {STRING}
-STR_SV_STNAME_HELIPORT.gen                                      :Пляцоўкі {STRING}
-STR_SV_STNAME_HELIPORT.acc                                      :Пляцоўку {STRING}
-STR_SV_STNAME_FOREST                                            :{G=m}Лес {STRING}
-STR_SV_STNAME_FOREST.gen                                        :Леса {STRING}
-STR_SV_STNAME_FOREST.acc                                        :Лес {STRING}
-STR_SV_STNAME_FALLBACK                                          :г. {NBSP}{STRING}, станцыя №{NUM}
+STR_SV_STNAME_UPPER                                             :{G=m}{STRING} Верхнi
+STR_SV_STNAME_UPPER.gen                                         :{STRING} Верхняга
+STR_SV_STNAME_UPPER.acc                                         :{STRING} Верхнi
+STR_SV_STNAME_LOWER                                             :{G=m}{STRING}-Нiжнi
+STR_SV_STNAME_LOWER.gen                                         :{STRING}-Нiжняга
+STR_SV_STNAME_LOWER.acc                                         :{STRING}-Нiжнi
+STR_SV_STNAME_HELIPORT                                          :{G=f}{STRING}-Пляцоўка
+STR_SV_STNAME_HELIPORT.gen                                      :{STRING}-Пляцоўкi
+STR_SV_STNAME_HELIPORT.acc                                      :{STRING}-Пляцоўку
+STR_SV_STNAME_FOREST                                            :{G=m}{STRING}-Лес
+STR_SV_STNAME_FOREST.gen                                        :{STRING}-Леса
+STR_SV_STNAME_FOREST.acc                                        :{STRING}-Лес
+STR_SV_STNAME_FALLBACK                                          :{NBSP}{STRING}, станцыя №{NUM}
 ############ end of savegame specific region!

 ##id 0x8000
@@ -4890,6 +4900,7 @@ STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
 STR_JUST_CURRENCY_SHORT                                         :{CURRENCY_SHORT}
 STR_JUST_CURRENCY_LONG                                          :{CURRENCY_LONG}
+STR_JUST_CARGO_LIST                                             :{CARGO_LIST}
 STR_JUST_INT                                                    :{NUM}
 STR_JUST_DATE_TINY                                              :{DATE_TINY}
 STR_JUST_DATE_SHORT                                             :{DATE_SHORT}
@@ -4924,6 +4935,7 @@ STR_BLACK_RAW_STRING                                            :{BLACK}{STRING}
 STR_GREEN_STRING                                                :{GREEN}{STRING}
 STR_ORANGE_STRING                                               :{ORANGE}{STRING}
 STR_RED_STRING                                                  :{RED}{STRING}
+STR_LTBLUE_STRING                                               :{LTBLUE}{STRING}
 STR_WHITE_STRING                                                :{WHITE}{STRING}
 STR_TINY_BLACK_HEIGHT                                           :{TINY_FONT}{BLACK}{HEIGHT}
 STR_TINY_BLACK_VEHICLE                                          :{TINY_FONT}{BLACK}{VEHICLE}
--- a/src/lang/brazilian_portuguese.txt
+++ b/src/lang/brazilian_portuguese.txt
@@ -294,7 +294,7 @@ STR_SORT_BY_RANGE                                               :Alcance
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Pausar jogo
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Acelerar o jogo
 STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Opções
-STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME                      :{BLACK}Salvar jogo, abandonar jogo, desistir
+STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME                      :{BLACK}Salvar jogo, abandonar jogo, sair
 STR_TOOLBAR_TOOLTIP_DISPLAY_MAP                                 :{BLACK}Exibir mapa, janela extra ou lista de placas
 STR_TOOLBAR_TOOLTIP_DISPLAY_TOWN_DIRECTORY                      :{BLACK}Exibir lista de cidades
 STR_TOOLBAR_TOOLTIP_DISPLAY_SUBSIDIES                           :{BLACK}Exibir subsídios
@@ -317,11 +317,11 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS                              :{BLACK}Construi
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Abrir a barra de paisagismo para elevar ou abaixar terreno, plantar árvores, etc.
 STR_TOOLBAR_TOOLTIP_SHOW_SOUND_MUSIC_WINDOW                     :{BLACK}Exibir janela de som/música
 STR_TOOLBAR_TOOLTIP_SHOW_LAST_MESSAGE_NEWS                      :{BLACK}Exibir a última mensagem/notícia, exibir opções de mensagem
-STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION                      :{BLACK}Informações sobre o terreno, console, Depurar IA, capturas de tela, sobre OpenTTD
+STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION                      :{BLACK}Informações sobre o terreno, console, depurar scripts, capturas de tela, sobre OpenTTD
 STR_TOOLBAR_TOOLTIP_SWITCH_TOOLBAR                              :{BLACK}Trocar a barra de ferramentas

 # Extra tooltips for the scenario editor toolbar
-STR_SCENEDIT_TOOLBAR_TOOLTIP_SAVE_SCENARIO_LOAD_SCENARIO        :{BLACK}Salvar cenário, carregar cenário, abandonar editor de cenário, desistir
+STR_SCENEDIT_TOOLBAR_TOOLTIP_SAVE_SCENARIO_LOAD_SCENARIO        :{BLACK}Salvar cenário, carregar cenário, sair do editor de cenário, sair
 STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}OpenTTD
 STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR                            :{YELLOW}Editor de Cenário
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Mover a data inicial 1 ano para trás
@@ -341,16 +341,16 @@ STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Salvar cenário
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Carregar cenário
 STR_SCENEDIT_FILE_MENU_SAVE_HEIGHTMAP                           :Salvar mapa topográfico
 STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Carregar mapa de elevação
-STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Desistir do editor
+STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Sair do editor de cenários
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
-STR_SCENEDIT_FILE_MENU_QUIT                                     :Desistir
+STR_SCENEDIT_FILE_MENU_QUIT                                     :Sair
 ############ range for SE file menu starts

 ############ range for settings menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Opções do jogo
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Definições de dificuldade
 STR_SETTINGS_MENU_CONFIG_SETTINGS                               :Definições avançadas
-STR_SETTINGS_MENU_SCRIPT_SETTINGS                               :Configurações de IA / Jogo
+STR_SETTINGS_MENU_SCRIPT_SETTINGS                               :Configurações de IA /Script do jogo
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Definições do NewGRF
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Opções de Transparência
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :Nomes de cidades exibidos
@@ -361,13 +361,14 @@ STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS                         :Placas e nomes
 STR_SETTINGS_MENU_FULL_ANIMATION                                :Animação total
 STR_SETTINGS_MENU_FULL_DETAIL                                   :Detalhamento total
 STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS                         :Edifícios transparentes
-STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Sinais de estações transparentes
+STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Placas de estações transparentes
 ############ range ends here

 ############ range for file menu starts
 STR_FILE_MENU_SAVE_GAME                                         :Salvar jogo
 STR_FILE_MENU_LOAD_GAME                                         :Carregar jogo
 STR_FILE_MENU_QUIT_GAME                                         :Abandonar jogo
+STR_FILE_MENU_SEPARATOR                                         :
 STR_FILE_MENU_EXIT                                              :Sair
 ############ range ends here

@@ -445,9 +446,10 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU                              :Histórico de M
 STR_ABOUT_MENU_LAND_BLOCK_INFO                                  :Informação da área do terreno
 STR_ABOUT_MENU_SEPARATOR                                        :
 STR_ABOUT_MENU_TOGGLE_CONSOLE                                   :Alternar console
-STR_ABOUT_MENU_AI_DEBUG                                         :Depurar I.A.
+STR_ABOUT_MENU_AI_DEBUG                                         :Depurar IA/Script do jogo
 STR_ABOUT_MENU_SCREENSHOT                                       :Captura de tela
 STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Ampliado em captura de tela
+STR_ABOUT_MENU_DEFAULTZOOM_SCREENSHOT                           :Captura de tela em ampliação padrão
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :Captura de tela do mapa inteiro
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :Sobre 'OpenTTD'
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Alinhador de "sprites"
@@ -1408,7 +1410,7 @@ STR_INTRO_DIFFICULTY                                            :{BLACK}Dificuld
 STR_INTRO_ADVANCED_SETTINGS                                     :{BLACK}Configurações avançadas
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Configurar NewGRF
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Checar conteúdo on-line
-STR_INTRO_SCRIPT_SETTINGS                                       :{BLACK}Configurações de IA / Jogo
+STR_INTRO_SCRIPT_SETTINGS                                       :{BLACK}Configurações de IA / Script do jogo
 STR_INTRO_QUIT                                                  :{BLACK}Sair

 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Iniciar um novo jogo. Ctrl+Clique para pular a configuração do mapa
@@ -1428,8 +1430,8 @@ STR_INTRO_TOOLTIP_DIFFICULTY_OPTIONS                            :{BLACK}Exibir o
 STR_INTRO_TOOLTIP_ADVANCED_SETTINGS                             :{BLACK}Exibe as configurações avançadas
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Exibir configs. dos NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Checar por conteúdo novo e atualizado para baixar
-STR_INTRO_TOOLTIP_SCRIPT_SETTINGS                               :{BLACK}Exibe configurações de IA e do Jogo
-STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Sair de 'OpenTTD'
+STR_INTRO_TOOLTIP_SCRIPT_SETTINGS                               :{BLACK}Exibe configurações de IA e script do jogo
+STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Sair do 'OpenTTD'

 STR_INTRO_TRANSLATION                                           :{BLACK}Faltam {NUM} string{P "" s} nessa tradução. Por favor faça o OpenTTD melhor se inscrevendo como tradutor. Leia Readme.txt para mais detalhes.

@@ -1799,6 +1801,10 @@ STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Você fo
 STR_NETWORK_ERROR_KICKED                                        :{WHITE}Você foi expulso do jogo
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Trapaceiros não são permitidos neste servidor
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Você enviou comandos demais ao servidor
+STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}Você demorou demais para digitar a senha
+STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}Seu computador é lento demais para acompanhar o servidor
+STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}Seu computador demorou demais para baixar o mapa
+STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}Seu computador demorou demais para entrar no servidor

 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :erro geral
@@ -1817,6 +1823,10 @@ STR_NETWORK_ERROR_CLIENT_KICKED                                 :expulso pelo se
 STR_NETWORK_ERROR_CLIENT_CHEATER                                :estava tentando trapacear
 STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :servidor cheio
 STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS                      :enviou comandos demais
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_PASSWORD                       :não recebeu senha a tempo
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_COMPUTER                       :tempo esgotado
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_MAP                            :a baixa do mapa demorou demais
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_JOIN                           :o processamento do mapa demorou demais
 ############ End of leave-in-this-order

 STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION_CAPTION            :{WHITE}Possível perda de conexão
@@ -1897,6 +1907,7 @@ STR_CONTENT_TYPE_HEIGHTMAP                                      :Mapa topográfi
 STR_CONTENT_TYPE_BASE_SOUNDS                                    :Sons padrão
 STR_CONTENT_TYPE_BASE_MUSIC                                     :Músicsas padrão
 STR_CONTENT_TYPE_GAME_SCRIPT                                    :Script do jogo
+STR_CONTENT_TYPE_GS_LIBRARY                                     :GS's disponíveis

 # Content downloading progress window
 STR_CONTENT_DOWNLOAD_TITLE                                      :{WHITE}Baixando conteúdo...
@@ -1936,8 +1947,8 @@ STR_STATION_BUILD_COVERAGE_OFF                                  :{BLACK}Desativa
 STR_STATION_BUILD_COVERAGE_ON                                   :{BLACK}Ativar
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}Não destacar área de cobertura da construção proposto
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}Destacar área de cobertura da construção proposta
-STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Aceita: {GOLD}{STRING}
-STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Suprimentos: {GOLD}{STRING}
+STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Aceita: {GOLD}{CARGO_LIST}
+STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Suprimentos: {GOLD}{CARGO_LIST}

 # Join station window
 STR_JOIN_STATION_CAPTION                                        :{WHITE}Unir estação
@@ -2060,9 +2071,9 @@ STR_STATION_BUILD_BUS_ORIENTATION                               :{WHITE}Orienta
 STR_STATION_BUILD_BUS_ORIENTATION_TOOLTIP                       :{BLACK}Selecionar orientação do estação de ônibus
 STR_STATION_BUILD_TRUCK_ORIENTATION                             :{WHITE}Orientação da área de carga
 STR_STATION_BUILD_TRUCK_ORIENTATION_TOOLTIP                     :{BLACK}Selecionar orientação da área de carga
-STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION                    :{WHITE}Orientação da Estação de Bonde
+STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION                    :{WHITE}Orientação da Estação de Bonde Passageiros
 STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION_TOOLTIP            :{BLACK}Selecionar orientação da estação de bonde
-STR_STATION_BUILD_CARGO_TRAM_ORIENTATION                        :{WHITE}Orientação da Estação de Bonde
+STR_STATION_BUILD_CARGO_TRAM_ORIENTATION                        :{WHITE}Orientação da Estação de Bonde de Carga
 STR_STATION_BUILD_CARGO_TRAM_ORIENTATION_TOOLTIP                :{BLACK}Selecionar orientação da estação de bonde

 # Waterways toolbar (last two for SE only)
@@ -2130,7 +2141,7 @@ STR_OBJECT_CLASS_TRNS                                           :Transmissores

 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Árvores
-STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Selecionar um tipo de árvore para plantar
+STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Selecionar um tipo de árvore para plantar. Se o local já tiver uma árvore, isso irá adicionar mais árvores do tipo misto indepentendemente do tipo selecionado
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Árvores de tipo aleatório
 STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Plantar árvores de tipo aleatório, Shift alterna entre construção/preço estimado
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Plantar Aleatoriamente
@@ -2447,12 +2458,8 @@ STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Mover ba
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Move o NewGRF selecionado para baixo
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Lista dos NewGRF instalados.

-# Additional textfiles accompanying NewGRFs
-STR_NEWGRF_SETTINGS_VIEW_README                                 :{BLACK}Ler o Leiame
-STR_NEWGRF_SETTINGS_VIEW_CHANGELOG                              :{BLACK}Log de mudanças
-STR_NEWGRF_SETTINGS_VIEW_LICENSE                                :{BLACK}Licença
-
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Definir parâmetros
+STR_NEWGRF_SETTINGS_SHOW_PARAMETERS                             :{BLACK}Exibir parâmetros
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Alterna paleta
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Alterna a paleta do NewGRF selecionado.{}Faça isso quando os gráficos deste ficarem rosa durante o jogo
 STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Aplicar alterações
@@ -2482,11 +2489,6 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parãmetro {NUM
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Número de parâmetros: {ORANGE}{NUM}

-# NewGRF textfile window
-STR_NEWGRF_README_CAPTION                                       :{WHITE}NewGRF Leiame de {STRING}
-STR_NEWGRF_CHANGELOG_CAPTION                                    :{WHITE}NewGRF log de mudanças de {STRING}
-STR_NEWGRF_LICENSE_CAPTION                                      :{WHITE}NewGRF licença de {STRING}
-
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Inspecionar - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Principal
@@ -2530,9 +2532,16 @@ STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} requ
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :o arquivo GRF foi designado para tradução
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Muitas NewGRFs estão carregadas
 STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Carregar {1:STRING} como um NewGRF estático em conjunto com {STRING} pode causar desincronias
+STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :"Sprite" inesperado (sprite {3:NUM})
+STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Propriedade de Ação Desconhecida 0 {4:HEX} (sprite {3:NUM})
+STR_NEWGRF_ERROR_INVALID_ID                                     :Tentativa de uso de ID inválido (sprite {3:NUM})
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} contém um sprite corrupto. Todos os sprites corruptos serão exibidos como um "?" vermelho
+STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Contém multiplas entradas de Ação 8 (sprite {3:NUM})
+STR_NEWGRF_ERROR_READ_BOUNDS                                    :Leitura após o final do pseudo-sprite (sprite {3:NUM})
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}Estão faltando alguns sprites na base de gráficos em uso.{}Por favor atualize a base de gráficos
+STR_NEWGRF_ERROR_GRM_FAILED                                     :Recursos GRF requeridos indisponíveis (sprite {3:NUM})
 STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} foi desativado por {STRING}
+STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Formato de layout de sprite inválido/desconhecido (sprite {3:NUM})

 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Cuidado!
@@ -2660,6 +2669,32 @@ STR_GOALS_NONE                                                  :{G=m}{ORANGE}-
 STR_GOALS_COMPANY_TITLE                                         :{G=m}{BLACK}Objetivos da empresa:
 STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Clique num objetivo para centralizar a visualização principal numa indústria/cidade.Ctrl+Clique abre uma nova janela na localização da indústria/cidade

+# Goal question window
+STR_GOAL_QUESTION_CAPTION_QUESTION                              :Pergunta
+STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Informação
+STR_GOAL_QUESTION_CAPTION_WARNING                               :Alerta
+STR_GOAL_QUESTION_CAPTION_ERROR                                 :Erro
+
+### Start of Goal Question button list
+STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Cancelar
+STR_GOAL_QUESTION_BUTTON_OK                                     :OK
+STR_GOAL_QUESTION_BUTTON_NO                                     :Não
+STR_GOAL_QUESTION_BUTTON_YES                                    :Sim
+STR_GOAL_QUESTION_BUTTON_DECLINE                                :Recusar
+STR_GOAL_QUESTION_BUTTON_ACCEPT                                 :Aceitar
+STR_GOAL_QUESTION_BUTTON_IGNORE                                 :Ignorar
+STR_GOAL_QUESTION_BUTTON_RETRY                                  :Tentar novamente
+STR_GOAL_QUESTION_BUTTON_PREVIOUS                               :Anterior
+STR_GOAL_QUESTION_BUTTON_NEXT                                   :Próximo
+STR_GOAL_QUESTION_BUTTON_STOP                                   :Parar
+STR_GOAL_QUESTION_BUTTON_START                                  :Iniciar
+STR_GOAL_QUESTION_BUTTON_GO                                     :Ir
+STR_GOAL_QUESTION_BUTTON_CONTINUE                               :Continuar
+STR_GOAL_QUESTION_BUTTON_RESTART                                :Reiniciar
+STR_GOAL_QUESTION_BUTTON_POSTPONE                               :Postergar
+STR_GOAL_QUESTION_BUTTON_SURRENDER                              :Desistir
+STR_GOAL_QUESTION_BUTTON_CLOSE                                  :Fechar
+
 # Subsidies window
 STR_SUBSIDIES_CAPTION                                           :{WHITE}Subsídios
 STR_SUBSIDIES_OFFERED_TITLE                                     :{BLACK}Ofertas de transporte subsidiados
@@ -2688,7 +2723,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM                                  :{YELLOW}({CARGO

 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Aceita
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Exibir lista de carga aceita
-STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}Aceita: {WHITE}{STRING}
+STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}Aceita: {WHITE}{CARGO_LIST}

 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Avaliações
 STR_STATION_VIEW_RATINGS_TOOLTIP                                :{BLACK}Exibir avaliações da estação
@@ -2770,11 +2805,11 @@ STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Nenhum
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Valor da empresa: {WHITE}{CURRENCY_LONG}
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% propriedade de {COMPANY})
 STR_COMPANY_VIEW_INFRASTRUCTURE                                 :{GOLD}Infraestrutura:
-STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL                            :{WHITE}{COMMA} partes de ferrovia
-STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD                            :{WHITE}{COMMA} partes de rodovia
-STR_COMPANY_VIEW_INFRASTRUCTURE_WATER                           :{WHITE}{COMMA} partes de água
-STR_COMPANY_VIEW_INFRASTRUCTURE_STATION                         :{WHITE}{COMMA} partes de estação
-STR_COMPANY_VIEW_INFRASTRUCTURE_AIRPORT                         :{WHITE}{COMMA} aeroportos
+STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL                            :{WHITE}{COMMA} parte{P "" s} de ferrovia
+STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD                            :{WHITE}{COMMA} parte{P "" s} de rodovia
+STR_COMPANY_VIEW_INFRASTRUCTURE_WATER                           :{WHITE}{COMMA} parte{P "" s} de água
+STR_COMPANY_VIEW_INFRASTRUCTURE_STATION                         :{WHITE}{COMMA} parte{P "" s} de estação
+STR_COMPANY_VIEW_INFRASTRUCTURE_AIRPORT                         :{WHITE}{COMMA} aeroporto{P "" s}
 STR_COMPANY_VIEW_INFRASTRUCTURE_NONE                            :{WHITE}Nenhum

 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Construir sede
@@ -2933,9 +2968,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Peso: {G
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Preço: {GOLD}{CURRENCY_LONG}{BLACK} Velocidade: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacidade: {GOLD}{CARGO_LONG}, {CARGO_LONG}
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Vagões energizados: {GOLD}+{POWER}{BLACK} Peso: {GOLD}+{WEIGHT_SHORT}
-STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Adaptável para: {GOLD}
+STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Adaptável para: {GOLD}{STRING}
 STR_PURCHASE_INFO_ALL_TYPES                                     :Todos as cargas
-STR_PURCHASE_INFO_ALL_BUT                                       :Todas menos {GOLD}
+STR_PURCHASE_INFO_ALL_BUT                                       :Todas menos {CARGO_LIST}
 STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}Tração máx : {GOLD}{FORCE}
 STR_PURCHASE_INFO_AIRCRAFT_RANGE                                :{BLACK}Alcance: {GOLD}{COMMA} quadrados

@@ -3058,8 +3093,8 @@ STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Preço:
 STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE               :{BLACK}Preço: {CURRENCY_LONG} Peso: {WEIGHT_SHORT}{}Vel.: {VELOCITY}  Potência: {POWER}  Tração Máx: {6:FORCE}{}Custo de manutenção: {4:CURRENCY_LONG}/yr{}Capacidade: {5:CARGO_LONG}
 STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Preço: {CURRENCY_LONG} Vel. Max.: {VELOCITY}{}Capacidade: {CARGO_LONG}, {CARGO_LONG}{}Custo de manutenção: {CURRENCY_LONG}/ano
 STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Preço: {CURRENCY_LONG} Vel. Max.: {VELOCITY}{}Capacidade: {CARGO_LONG}{}Custo de manuteção: {CURRENCY_LONG}/ano
-STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_CAPACITY_RUNCOST:{BLACK}Preço: {CURRENCY_LONG} Vel. Máx.: {VELOCITY} Alcance: {7:COMMA} quadrados{}Capacidade: {CARGO_LONG}, {CARGO_LONG}{}Cust de manut.: {CURRENCY_LONG}/ano
-STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_RUNCOST        :{BLACK}Custo: {CURRENCY_LONG} Vel. Máx.: {VELOCITY} Alcance: {7:COMMA} quadrados{}Capacidade: {CARGO_LONG}{}Custo de manut.: {CURRENCY_LONG}/ano
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_CAPACITY_RUNCOST:{BLACK}Preço: {CURRENCY_LONG} Vel. Máx.: {VELOCITY} Alcance: {COMMA} quadrados{}Capacidade: {CARGO_LONG}, {CARGO_LONG}{}Cust de manut.: {CURRENCY_LONG}/ano
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_RUNCOST        :{BLACK}Custo: {CURRENCY_LONG} Vel. Máx.: {VELOCITY} Alcance: {COMMA} quadrados{}Capacidade: {CARGO_LONG}{}Custo de manut.: {CURRENCY_LONG}/ano

 # Autoreplace window
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Substituir {STRING}
@@ -3182,7 +3217,7 @@ STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR                     :{BLACK}Lucros d
 STR_VEHICLE_INFO_RELIABILITY_BREAKDOWNS                         :{BLACK}Confiabilidade: {LTBLUE}{COMMA}%  {BLACK}Quebras desde a última manutenção: {LTBLUE}{COMMA}

 STR_VEHICLE_INFO_BUILT_VALUE                                    :{LTBLUE}{ENGINE} {BLACK}Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY_LONG}
-STR_VEHICLE_INFO_NO_CAPACITY                                    :{BLACK}Capacidade: {LTBLUE}Nenhuma
+STR_VEHICLE_INFO_NO_CAPACITY                                    :{BLACK}Capacidade: {LTBLUE}Nenhuma{STRING}
 STR_VEHICLE_INFO_CAPACITY                                       :{BLACK}Capacidade: {LTBLUE}{CARGO_LONG}{3:STRING}
 STR_VEHICLE_INFO_CAPACITY_MULT                                  :{BLACK}Capacidade: {LTBLUE}{CARGO_LONG}{3:STRING} (x{4:NUM})
 STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK}Capacidade: {LTBLUE}{CARGO_LONG}, {CARGO_LONG}{STRING}
@@ -3329,7 +3364,7 @@ STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Ir para depósi
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Ir para hangar mais próximo
 STR_ORDER_CONDITIONAL                                           :Pulo de ordem condicional
 STR_ORDER_SHARE                                                 :Compartilhar ordens
-STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Inserir nova ordem antes da ordem em destaque, ou adicionar no fim da lista. Ctrl torna ordens da estação 'carregar completamente qualquer carga', ordens de pontos de controle como 'sem parada' e ordens de depósito como 'serviço'. 'Compartilhar ordens' ou Ctrl deixa este veículo compartilhar ordens com o veículo selecionado. Clicar num veículo copia as ordens daquele veículo
+STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Inserir nova ordem antes da ordem selecionada, ou adicionar no fim da lista. Ctrl torna ordens da estação 'carregar completamente qualquer carga', ordens de pontos de controle como 'sem parada' e ordens de depósito como 'manutenção'. 'Compartilhar ordens' ou Ctrl deixa este veículo compartilhar ordens com o veículo selecionado. Clicar num veículo copia as ordens daquele veículo. Uma ordem de depósito desativa manutenção automática para o veículo

 STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Exibir todos os veículos com a mesma rota

@@ -3409,7 +3444,9 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Horário
 STR_TIMETABLE_NO_TRAVEL                                         :Não viajar
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Viagem (automático; calendarizada pela próxima ordem manual)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Viajar (não calendarizado)
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Viaje em até {2:VELOCITY} (sem plano de horário)
 STR_TIMETABLE_TRAVEL_FOR                                        :Viajar para {STRING}
+STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Viaje por {STRING} em até {VELOCITY}
 STR_TIMETABLE_STAY_FOR                                          :e ficar durante {STRING}
 STR_TIMETABLE_AND_TRAVEL_FOR                                    :e viajar por {STRING}
 STR_TIMETABLE_DAYS                                              :{COMMA} dia{P "" s}
@@ -3433,6 +3470,12 @@ STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Mudar a
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Limpar Horário
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Limpar a quantidade de tempo para a ordem destacada

+STR_TIMETABLE_CHANGE_SPEED                                      :{BLACK}Alterar Limite de Vel.
+STR_TIMETABLE_CHANGE_SPEED_TOOLTIP                              :{BLACK}Altera a velocidade máxima de viagem para a ordem selecionada
+
+STR_TIMETABLE_CLEAR_SPEED                                       :{BLACK}Limpa Limite de Vel.
+STR_TIMETABLE_CLEAR_SPEED_TOOLTIP                               :{BLACK}Limpar a velocidade máxima de viagem para a ordem selecionada
+
 STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Restabelecer Contador de Atraso
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Restabelecer o contador de atraso,então o veículo estará pontual

@@ -3457,11 +3500,11 @@ STR_DATE_YEAR_TOOLTIP                                           :{BLACK}Selecion


 # AI debug window
-STR_AI_DEBUG                                                    :{WHITE}Depurar IA
+STR_AI_DEBUG                                                    :{WHITE}Depurar IA/Script do jogo
 STR_AI_DEBUG_NAME_AND_VERSION                                   :{BLACK}{STRING} (v{NUM})
-STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Nome da IA
-STR_AI_DEBUG_SETTINGS                                           :{BLACK}Definições da IA
-STR_AI_DEBUG_SETTINGS_TOOLTIP                                   :{BLACK}Alterar as definições da IA
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Nome do script
+STR_AI_DEBUG_SETTINGS                                           :{BLACK}Definições
+STR_AI_DEBUG_SETTINGS_TOOLTIP                                   :{BLACK}Alterar as definições do script
 STR_AI_DEBUG_RELOAD                                             :{BLACK}Recarregar IA
 STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Desativar a IA, recarregar o script e reiniciar a IA
 STR_AI_DEBUG_BREAK_STR_ON_OFF_TOOLTIP                           :{BLACK}Ativar/desativar pausagem quando uma mensagem de registo da IA corresponder á sequencia de falhas
@@ -3473,14 +3516,16 @@ STR_AI_DEBUG_MATCH_CASE_TOOLTIP                                 :{BLACK}Alternar
 STR_AI_DEBUG_CONTINUE                                           :{BLACK}Continuar
 STR_AI_DEBUG_CONTINUE_TOOLTIP                                   :{BLACK}Despausar e continuar o AI
 STR_AI_DEBUG_SELECT_AI_TOOLTIP                                  :{BLACK}Ver a depuração produzida desta IA
+STR_AI_GAME_SCRIPT                                              :{BLACK}Game Script
+STR_AI_GAME_SCRIPT_TOOLTIP                                      :{BLACK}Checando o log do Game Script

 STR_ERROR_AI_NO_AI_FOUND                                        :Nenhuma IA adequada encontrada para carregar. {} Esta IA é falsa e não irá fazer nada. {} Você pode pode baixar várias IA através do sistema de 'Conteúdo Online'
-STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Uma das em execução IA's travou. Favor relatar isto ao autor da IA com uma captura de tela da Janela de Depuração da IA
-STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Debug de IA só é acessível pelo servidor
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Um dos scripts em execução travou. Favor relatar isto ao autor do script com uma captura de tela da Janela de Depuração da I.A./Script do jogo
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Depuração de I.A./Script do jogo só é acessível pelo servidor

 # AI configuration window
-STR_AI_CONFIG_CAPTION                                           :{WHITE}Configuração da IA
-STR_AI_CONFIG_GAMELIST_TOOLTIP                                  :{BLACK}GameScript que será carregado no próximo jogo
+STR_AI_CONFIG_CAPTION                                           :{WHITE}Configuração da I.A./Script do jogo
+STR_AI_CONFIG_GAMELIST_TOOLTIP                                  :{BLACK}O script do jogo que será carregado no próximo jogo
 STR_AI_CONFIG_AILIST_TOOLTIP                                    :{BLACK}IAs que serão carregadas no próximo jogo
 STR_AI_CONFIG_HUMAN_PLAYER                                      :Jogador humano
 STR_AI_CONFIG_RANDOM_AI                                         :IA aleatória
@@ -3491,37 +3536,51 @@ STR_AI_CONFIG_MOVE_UP_TOOLTIP                                   :{BLACK}Mover a
 STR_AI_CONFIG_MOVE_DOWN                                         :{BLACK}Descer
 STR_AI_CONFIG_MOVE_DOWN_TOOLTIP                                 :{BLACK}Mover a IA selecionada para baixo na lista

+STR_AI_CONFIG_GAMESCRIPT                                        :{SILVER}Script do jogo
 STR_AI_CONFIG_AI                                                :{G=f}{SILVER}IAs

 STR_AI_CONFIG_CHANGE                                            :{BLACK}Selecionar {STRING}
 STR_AI_CONFIG_CHANGE_NONE                                       :
 STR_AI_CONFIG_CHANGE_AI                                         :{G=f}IA
+STR_AI_CONFIG_CHANGE_GAMESCRIPT                                 :Script do jogo
 STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Carregar outro script
 STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Configurar
-STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Configurar os parâmetros da IA
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Configurar os parâmetros do Script

 # Available AIs window
 STR_AI_LIST_CAPTION                                             :{WHITE}Disponíveis {STRING}
 STR_AI_LIST_CAPTION_AI                                          :{G=f}IAs
-STR_AI_LIST_TOOLTIP                                             :{BLACK}Clique para selecionar uma IA
+STR_AI_LIST_CAPTION_GAMESCRIPT                                  :Script do jogo
+STR_AI_LIST_TOOLTIP                                             :{BLACK}Clique para selecionar um script

 STR_AI_LIST_AUTHOR                                              :{BLACK}Autor: {STRING}
 STR_AI_LIST_VERSION                                             :{BLACK}Versão: {NUM}
 STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}

 STR_AI_LIST_ACCEPT                                              :{BLACK}Aceitar
-STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Selecionar a IA destacada
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Selecionar o script destacado
 STR_AI_LIST_CANCEL                                              :{BLACK}Cancelar
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Não mudar IA
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Não mudar o script

 # AI Parameters
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}{STRING} Parâmetros
 STR_AI_SETTINGS_CAPTION_AI                                      :{G=f}IA
+STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :Script do jogo
 STR_AI_SETTINGS_CLOSE                                           :{BLACK}Fechar
 STR_AI_SETTINGS_RESET                                           :{BLACK}Resetar
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 STR_AI_SETTINGS_START_DELAY                                     :Número de dias para começar esta IA após a última: {ORANGE}{STRING}

+
+# Textfile window
+STR_TEXTFILE_README_CAPTION                                     :{WHITE}{STRING} Leiame de {STRING}
+STR_TEXTFILE_CHANGELOG_CAPTION                                  :{WHITE}{STRING} log de mudanças de {STRING}
+STR_TEXTFILE_LICENCE_CAPTION                                    :{WHITE}{STRING} licença de {STRING}
+STR_TEXTFILE_VIEW_README                                        :{BLACK}Ler o Leiame
+STR_TEXTFILE_VIEW_CHANGELOG                                     :{BLACK}Log de mudanças
+STR_TEXTFILE_VIEW_LICENCE                                       :{BLACK}Licença
+
+
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINY_FONT}{WHITE}{NUM}%{UP_ARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UP_ARROW}
@@ -3659,7 +3718,8 @@ STR_ERROR_ONLY_ONE_ALLOWED_PER_TOWN                             :{WHITE}... só
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}... só pode ser construído em cidades com pelo menos 1200 habitantes
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}... só pode ser construído em zonas florestais
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}... só pode ser construído em áreas desérticas
-STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS                            :{WHITE}... só se pode ser construído em cidades
+STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS                            :{WHITE}... só se pode ser construído em cidades (substituindo casas)
+STR_ERROR_CAN_ONLY_BE_BUILT_NEAR_TOWN_CENTER                    :{WHITE}... só pode ser construído próximo aos centros de cidades
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_LOW_AREAS                        :{WHITE}... só pode ser construído em áreas baixas
 STR_ERROR_CAN_ONLY_BE_POSITIONED                                :{WHITE}... só pode ser colocado perto das bordas do mapa
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}... a floresta só pode ser plantada acima do nível de neve
@@ -4364,6 +4424,7 @@ STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
 STR_JUST_CURRENCY_SHORT                                         :{CURRENCY_SHORT}
 STR_JUST_CURRENCY_LONG                                          :{CURRENCY_LONG}
+STR_JUST_CARGO_LIST                                             :{CARGO_LIST}
 STR_JUST_INT                                                    :{NUM}
 STR_JUST_DATE_TINY                                              :{DATE_TINY}
 STR_JUST_DATE_SHORT                                             :{DATE_SHORT}
@@ -4398,6 +4459,7 @@ STR_BLACK_RAW_STRING                                            :{BLACK}{STRING}
 STR_GREEN_STRING                                                :{GREEN}{STRING}
 STR_ORANGE_STRING                                               :{ORANGE}{STRING}
 STR_RED_STRING                                                  :{RED}{STRING}
+STR_LTBLUE_STRING                                               :{LTBLUE}{STRING}
 STR_WHITE_STRING                                                :{WHITE}{STRING}
 STR_TINY_BLACK_HEIGHT                                           :{TINY_FONT}{BLACK}{HEIGHT}
 STR_TINY_BLACK_VEHICLE                                          :{TINY_FONT}{BLACK}{VEHICLE}
--- a/src/lang/bulgarian.txt
+++ b/src/lang/bulgarian.txt
@@ -365,6 +365,7 @@ STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Прозрач
 STR_FILE_MENU_SAVE_GAME                                         :Запази игра
 STR_FILE_MENU_LOAD_GAME                                         :Отваряне на игра
 STR_FILE_MENU_QUIT_GAME                                         :Прекъсване на играта
+STR_FILE_MENU_SEPARATOR                                         :
 STR_FILE_MENU_EXIT                                              :Изход
 ############ range ends here

@@ -1889,8 +1890,8 @@ STR_STATION_BUILD_COVERAGE_OFF                                  :{BLACK}Изкл
 STR_STATION_BUILD_COVERAGE_ON                                   :{BLACK}Включен
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}Не отбелязвай зоната от предложеното място
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}Отбележи зоната от предложеното място
-STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Приема: {GOLD}{STRING}
-STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Запаси: {GOLD}{STRING}
+STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Приема: {GOLD}{CARGO_LIST}
+STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Запаси: {GOLD}{CARGO_LIST}

 # Join station window
 STR_JOIN_STATION_CAPTION                                        :{WHITE}Присъедини станцията
@@ -2370,8 +2371,6 @@ STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Надо
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Премества избрания NewGRF файл надолу в списъка
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Списък на инсталираните NewGRF файлове. Изберете файл за да промените параметрите му

-# Additional textfiles accompanying NewGRFs
-
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Настройване на параметрите
 STR_NEWGRF_SETTINGS_SHOW_PARAMETERS                             :{BLACK}Покажи параметрите
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Превключване на палитрата
@@ -2403,8 +2402,6 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Парамет
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Брой параметри: {ORANGE}{NUM}

-# NewGRF textfile window
-
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Инспектирай - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Родител
@@ -2613,7 +2610,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM                                  :{YELLOW}({CARGO

 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Приема
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Покажи списък с приетите товари
-STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}Приема: {WHITE}{STRING}
+STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}Приема: {WHITE}{CARGO_LIST}

 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Рейтинги
 STR_STATION_VIEW_RATINGS_TOOLTIP                                :{BLACK}Покажи нивото на обслужване
@@ -2833,9 +2830,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Тегл
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Цема {GOLD}{CURRENCY_LONG}{BLACK} Скорост: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Капацитет: {GOLD}{CARGO_LONG}, {CARGO_LONG}
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Вагони с мощност: {GOLD}+{POWER}{BLACK} Тегло: {GOLD}+{WEIGHT_SHORT}
-STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Преобразуваем на: {GOLD}
+STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Преобразуваем на: {GOLD}{STRING}
 STR_PURCHASE_INFO_ALL_TYPES                                     :Всички видове товар
-STR_PURCHASE_INFO_ALL_BUT                                       :Всичко освен {GOLD}
+STR_PURCHASE_INFO_ALL_BUT                                       :Всичко освен {CARGO_LIST}
 STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}Макс. теглеща сила: {GOLD}{FORCE}

 STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP                              :{BLACK}Списък с влакове - натисни върху влак за информация
@@ -3078,7 +3075,7 @@ STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR                     :{BLACK}Печа
 STR_VEHICLE_INFO_RELIABILITY_BREAKDOWNS                         :{BLACK}Надеждност: {LTBLUE}{COMMA}%  {BLACK}Разваляния от последното сервизиране: {LTBLUE}{COMMA}

 STR_VEHICLE_INFO_BUILT_VALUE                                    :{G=m}{LTBLUE}{ENGINE} {BLACK}Построен: {LTBLUE}{NUM}{BLACK} Стойност: {LTBLUE}{CURRENCY_LONG}
-STR_VEHICLE_INFO_NO_CAPACITY                                    :{BLACK}Капацитет: {LTBLUE}няма
+STR_VEHICLE_INFO_NO_CAPACITY                                    :{BLACK}Капацитет: {LTBLUE}няма{STRING}
 STR_VEHICLE_INFO_CAPACITY                                       :{BLACK}Капацитет: {LTBLUE}{CARGO_LONG}{3:STRING}
 STR_VEHICLE_INFO_CAPACITY_MULT                                  :{BLACK}Капацитет: {LTBLUE}{CARGO_LONG}{3:STRING} (x{4:NUM})
 STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK}Капацитет: {LTBLUE}{CARGO_LONG}, {CARGO_LONG}{STRING}
@@ -3307,6 +3304,8 @@ STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Пром
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Изчисти времето
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Изчисти времетраенето на маркираната заповед

+
+
 STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Преправи закъснялата бройка
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Reset the lateness counter, so the vehicle will be on time

@@ -3359,6 +3358,7 @@ STR_AI_CONFIG_MOVE_DOWN_TOOLTIP                                 :{BLACK}Прем
 STR_AI_CONFIG_AI                                                :{SILVER}AI-та

 STR_AI_CONFIG_CHANGE                                            :{BLACK}Избери {STRING}
+STR_AI_CONFIG_CHANGE_NONE                                       :
 STR_AI_CONFIG_CHANGE_AI                                         :AI
 STR_AI_CONFIG_CHANGE_GAMESCRIPT                                 :Програмен език на играта
 STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Конфигуриране
@@ -3387,6 +3387,10 @@ STR_AI_SETTINGS_CLOSE                                           :{BLACK}Затв
 STR_AI_SETTINGS_RESET                                           :{BLACK}Рестартиране
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}

+
+# Textfile window
+
+
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINY_FONT}{WHITE}{NUM}%{UP_ARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UP_ARROW}
@@ -4209,6 +4213,7 @@ STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
 STR_JUST_CURRENCY_SHORT                                         :{CURRENCY_SHORT}
 STR_JUST_CURRENCY_LONG                                          :{CURRENCY_LONG}
+STR_JUST_CARGO_LIST                                             :{CARGO_LIST}
 STR_JUST_INT                                                    :{NUM}
 STR_JUST_DATE_TINY                                              :{DATE_TINY}
 STR_JUST_DATE_SHORT                                             :{DATE_SHORT}
@@ -4224,6 +4229,7 @@ STR_TINY_BLACK_COMA                                             :{TINY_FONT}{BLA
 STR_TINY_COMMA                                                  :{TINY_FONT}{COMMA}
 STR_BLUE_COMMA                                                  :{BLUE}{COMMA}
 STR_RED_COMMA                                                   :{RED}{COMMA}
+STR_WHITE_COMMA                                                 :{WHITE}{COMMA}
 STR_TINY_BLACK_DECIMAL                                          :{TINY_FONT}{BLACK}{DECIMAL}
 STR_COMPANY_MONEY                                               :{WHITE}{CURRENCY_LONG}
 STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
@@ -4242,6 +4248,7 @@ STR_BLACK_RAW_STRING                                            :{BLACK}{STRING}
 STR_GREEN_STRING                                                :{GREEN}{STRING}
 STR_ORANGE_STRING                                               :{ORANGE}{STRING}
 STR_RED_STRING                                                  :{RED}{STRING}
+STR_LTBLUE_STRING                                               :{LTBLUE}{STRING}
 STR_WHITE_STRING                                                :{WHITE}{STRING}
 STR_TINY_BLACK_HEIGHT                                           :{TINY_FONT}{BLACK}{HEIGHT}
 STR_TINY_BLACK_VEHICLE                                          :{TINY_FONT}{BLACK}{VEHICLE}
--- a/src/lang/catalan.txt
+++ b/src/lang/catalan.txt
@@ -294,7 +294,7 @@ STR_SORT_BY_RANGE                                               :Abast
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Para el joc
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Avanç ràpid del joc
 STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Opcions
-STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME                      :{BLACK}Desa el joc, abandona el joc, sortir
+STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME                      :{BLACK}Desa el joc, abandona el joc, surt
 STR_TOOLBAR_TOOLTIP_DISPLAY_MAP                                 :{BLACK}Mostra el mapa
 STR_TOOLBAR_TOOLTIP_DISPLAY_TOWN_DIRECTORY                      :{BLACK}Mostra el directori de poblacions
 STR_TOOLBAR_TOOLTIP_DISPLAY_SUBSIDIES                           :{BLACK}Mostra les subvencions
@@ -317,11 +317,11 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS                              :{BLACK}Construe
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Obre la barra d'eines del terreny per elevar/rebaixar nivell, plantar arbres, etc.
 STR_TOOLBAR_TOOLTIP_SHOW_SOUND_MUSIC_WINDOW                     :{BLACK}Mostra la finestra de so/música
 STR_TOOLBAR_TOOLTIP_SHOW_LAST_MESSAGE_NEWS                      :{BLACK}Mostra els darrers missatges/notícies, mostra les opcions de missatges
-STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION                      :{BLACK}Informació del terreny, terminal, depuració IA, captures de pantalla, Quant a OpenTTD
+STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION                      :{BLACK}Informació del terreny, terminal, depuració d'scripts, captures de pantalla, quant a OpenTTD
 STR_TOOLBAR_TOOLTIP_SWITCH_TOOLBAR                              :{BLACK}Commuta barres d'eines

 # Extra tooltips for the scenario editor toolbar
-STR_SCENEDIT_TOOLBAR_TOOLTIP_SAVE_SCENARIO_LOAD_SCENARIO        :{BLACK}Desa l'escenari, carrega un escenari, abandona l'editor d'escenaris, sortir
+STR_SCENEDIT_TOOLBAR_TOOLTIP_SAVE_SCENARIO_LOAD_SCENARIO        :{BLACK}Desa l'escenari, carrega un escenari, abandona l'editor d'escenaris, surt
 STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}OpenTTD
 STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR                            :{YELLOW}Editor d'Escenaris
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Retarda la data d'inici 1 any
@@ -341,7 +341,7 @@ STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Desa l'escenari
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Carrega un escenari
 STR_SCENEDIT_FILE_MENU_SAVE_HEIGHTMAP                           :Desa mapa d'alçades
 STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Carrega Mapa d'alçades
-STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Surt de l'editor
+STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Surt de l'editor d'escenaris
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Surt
 ############ range for SE file menu starts
@@ -350,7 +350,7 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :Surt
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Opcions del Joc
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Paràmetres de dificultat
 STR_SETTINGS_MENU_CONFIG_SETTINGS                               :Paràmetres avançats
-STR_SETTINGS_MENU_SCRIPT_SETTINGS                               :IA / Paràmetres del joc
+STR_SETTINGS_MENU_SCRIPT_SETTINGS                               :Paràmetres de la IA/Scripts del joc
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Extensions NewGRF
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Opcions de transparència
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :Mostra els noms de les poblacions
@@ -361,13 +361,14 @@ STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS                         :Mostra noms i s
 STR_SETTINGS_MENU_FULL_ANIMATION                                :Animació completa
 STR_SETTINGS_MENU_FULL_DETAIL                                   :Detall complet
 STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS                         :Edificis Transparents
-STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Signes d'estació transparents
+STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Senyals transparents
 ############ range ends here

 ############ range for file menu starts
 STR_FILE_MENU_SAVE_GAME                                         :Desa el joc
 STR_FILE_MENU_LOAD_GAME                                         :Carrega un joc
 STR_FILE_MENU_QUIT_GAME                                         :Abandona el joc
+STR_FILE_MENU_SEPARATOR                                         :
 STR_FILE_MENU_EXIT                                              :Surt
 ############ range ends here

@@ -445,7 +446,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU                              :Historial de Mi
 STR_ABOUT_MENU_LAND_BLOCK_INFO                                  :Informació de l'àrea de terreny
 STR_ABOUT_MENU_SEPARATOR                                        :
 STR_ABOUT_MENU_TOGGLE_CONSOLE                                   :Canvia al terminal
-STR_ABOUT_MENU_AI_DEBUG                                         :IA / Depuració de l'script del joc
+STR_ABOUT_MENU_AI_DEBUG                                         :Depuració de la IA/Scripts del joc
 STR_ABOUT_MENU_SCREENSHOT                                       :Captura de pantalla
 STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Zoom màxim en la captura de pantalla
 STR_ABOUT_MENU_DEFAULTZOOM_SCREENSHOT                           :Zoom predeterminat en les captures de pantalla
@@ -1409,7 +1410,7 @@ STR_INTRO_DIFFICULTY                                            :{BLACK}Dificult
 STR_INTRO_ADVANCED_SETTINGS                                     :{BLACK}Paràmetres avançats
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Extensions NewGRF
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Contingut en línia
-STR_INTRO_SCRIPT_SETTINGS                                       :{BLACK}IA / Paràmetres del joc
+STR_INTRO_SCRIPT_SETTINGS                                       :{BLACK}Paràmetres de la IA/Scripts del Joc
 STR_INTRO_QUIT                                                  :{BLACK}Surt

 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Comença un joc nou. Ctrl+Clic salta la configuració del mapa
@@ -1429,7 +1430,7 @@ STR_INTRO_TOOLTIP_DIFFICULTY_OPTIONS                            :{BLACK}Mostra l
 STR_INTRO_TOOLTIP_ADVANCED_SETTINGS                             :{BLACK}Mostra paràmetres avançats
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Mostra els paràmetres NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Comprova si hi ha continguts nous i actualitzats per a descarregar
-STR_INTRO_TOOLTIP_SCRIPT_SETTINGS                               :{BLACK}Mostra la IA i els paràmetres del joc
+STR_INTRO_TOOLTIP_SCRIPT_SETTINGS                               :{BLACK}Mostra els paràmetres de la IA/Script del joc
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Surt d'OpenTTD

 STR_INTRO_TRANSLATION                                           :{BLACK}A aquesta traducció li falta {NUM} string{P "" s}. Si us plau ajuda a fer millor OpenTTD unint-te com a traductor. Veure readme.txt per més detalls.
@@ -1801,9 +1802,9 @@ STR_NETWORK_ERROR_KICKED                                        :{WHITE}T'han fe
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}No es permet fer trampes en aquest servidor
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Estaves enviant massa ordres al servidor
 STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}Has tardat massa a introduir la contrasenya
-STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}El teu ordenador ha tardat massa a unir-se
-STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}Has tardat massa a descarregar el mapa
-STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}Has tardat massa a unir-te al servidor
+STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}El teu ordenador es massa lent per mantenir-se connectat al servidor
+STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}El teu ordenador ha tardat massa a descarregar el mapa
+STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}El teu ordenador ha tardat massa a unir-se al servidor

 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :error general
@@ -1823,7 +1824,7 @@ STR_NETWORK_ERROR_CLIENT_CHEATER                                :s'ha intentat u
 STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :servidor ple
 STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS                      :estava enviant massa ordres
 STR_NETWORK_ERROR_CLIENT_TIMEOUT_PASSWORD                       :no s'ha rebut la contrasenya a temps
-STR_NETWORK_ERROR_CLIENT_TIMEOUT_COMPUTER                       :temps d'espera general
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_COMPUTER                       :General temps d'espera esgotat
 STR_NETWORK_ERROR_CLIENT_TIMEOUT_MAP                            :la descàrrega del mapa ha tardat massa
 STR_NETWORK_ERROR_CLIENT_TIMEOUT_JOIN                           :el processat del mapa ha tardat massa
 ############ End of leave-in-this-order
@@ -1925,11 +1926,11 @@ STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}No s'han
 STR_MISSING_GRAPHICS_SET_CAPTION                                :{WHITE}Gràfics que falten
 STR_MISSING_GRAPHICS_SET_MESSAGE                                :{BLACK}OpenTTD necessita gràfics per funcionar però no se n'ha trobat cap. Vols permetre a OpenTTD descarregar i instal·lar aquests gràfics?
 STR_MISSING_GRAPHICS_YES_DOWNLOAD                               :{BLACK}Si, descarregar els gràfics
-STR_MISSING_GRAPHICS_NO_QUIT                                    :{BLACK}No, sortir d'OpenTTD
+STR_MISSING_GRAPHICS_NO_QUIT                                    :{BLACK}No, surt d'OpenTTD

 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}Opcions de transparència
-STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Commuta la transparència dels rètols d'estació. Ctrl+Clic per bloquejar
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Commuta la transparència de les senyals. Ctrl+Clic per bloquejar
 STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Commuta la transparència dels arbres. Ctrl+Clic per bloquejar
 STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Commuta la transparència de les cases. Ctrl+Clic per bloquejar
 STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Commuta la transparència de les indústries. Ctrl+Clic per bloquejar
@@ -1946,8 +1947,8 @@ STR_STATION_BUILD_COVERAGE_OFF                                  :{BLACK}Inactiu
 STR_STATION_BUILD_COVERAGE_ON                                   :{BLACK}Actiu
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}No marcar l'àrea de cobertura del lloc proposat
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}Marcar l'àrea de cobertura del lloc proposat
-STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Accepta: {GOLD}{STRING}
-STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Provisions: {GOLD}{STRING}
+STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Accepta: {GOLD}{CARGO_LIST}
+STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Provisions: {GOLD}{CARGO_LIST}

 # Join station window
 STR_JOIN_STATION_CAPTION                                        :{WHITE}Ajuntar estació
@@ -2070,9 +2071,9 @@ STR_STATION_BUILD_BUS_ORIENTATION                               :{WHITE}Orientac
 STR_STATION_BUILD_BUS_ORIENTATION_TOOLTIP                       :{BLACK}Selecciona l'orientació de la parada d'autobús
 STR_STATION_BUILD_TRUCK_ORIENTATION                             :{WHITE}Orientació Estació de Mercaderies
 STR_STATION_BUILD_TRUCK_ORIENTATION_TOOLTIP                     :{BLACK}Selecciona l'orientació del moll de càrrega de camions
-STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION                    :{WHITE}Orientació estació passatgers
+STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION                    :{WHITE}Orientació estació de tramvies de passatgers
 STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION_TOOLTIP            :{BLACK}Selecciona l'orientació de l'estació de tramvies de passatgers
-STR_STATION_BUILD_CARGO_TRAM_ORIENTATION                        :{WHITE}Orientació estació mercaderies
+STR_STATION_BUILD_CARGO_TRAM_ORIENTATION                        :{WHITE}Orientació estació de tramvies de mercaderies
 STR_STATION_BUILD_CARGO_TRAM_ORIENTATION_TOOLTIP                :{BLACK}Selecciona l'orientació de l'estació de tramvies de mercaderies

 # Waterways toolbar (last two for SE only)
@@ -2140,7 +2141,7 @@ STR_OBJECT_CLASS_TRNS                                           :Transmissors

 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Arbres
-STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Selecciona el tipus d'arbre a plantar
+STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Selecciona el tipus d'arbre a plantar. Si la casella ja conté un arbre, s'afegiran més arbres d'altres espècies independentment de quin estigui seleccionat
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Arbres de tipus aleatori
 STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Situar arbres de tipus aleatori. Shift commuta construeix/mostra el cost estimat
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Arbres Aleatoris
@@ -2457,11 +2458,6 @@ STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Mou aval
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Mou avall l'arxiu NewGRF seleccionat de la llista
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Una llista d'arxius NewGRF que estan instal·lats.

-# Additional textfiles accompanying NewGRFs
-STR_NEWGRF_SETTINGS_VIEW_README                                 :{BLACK}Veure llegeixme
-STR_NEWGRF_SETTINGS_VIEW_CHANGELOG                              :{BLACK}Registra de canvis
-STR_NEWGRF_SETTINGS_VIEW_LICENSE                                :{BLACK}Llicència
-
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Estableix paràm.
 STR_NEWGRF_SETTINGS_SHOW_PARAMETERS                             :{BLACK}Mostra els paràmetres
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Commuta paleta
@@ -2493,11 +2489,6 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Paràmetre {NUM
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Nombre de paràmetres: {ORANGE}{NUM}

-# NewGRF textfile window
-STR_NEWGRF_README_CAPTION                                       :{WHITE}Llegeixme del NewGRF de {STRING}
-STR_NEWGRF_CHANGELOG_CAPTION                                    :{WHITE}Registre de canvis del NewGRF de {STRING}
-STR_NEWGRF_LICENSE_CAPTION                                      :{WHITE}Llicència del NewGRF de {STRING}
-
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Inspecciona - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Pare
@@ -2598,7 +2589,7 @@ STR_NEWGRF_SCAN_ARCHIVES                                        :Escanejant arxi
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Llista de senyals - {COMMA} Senyal{P "" s}
 STR_SIGN_LIST_MATCH_CASE                                        :{BLACK}Coincideix Majúscules/Minúscules
 STR_SIGN_LIST_CLEAR                                             :{BLACK}Neteja el filtre
-STR_SIGN_LIST_MATCH_CASE_TOOLTIP                                :{BLACK}Commuta minúscules/majúscules en comparar els noms del signes contra la cadena de filtre
+STR_SIGN_LIST_MATCH_CASE_TOOLTIP                                :{BLACK}Commuta minúscules/majúscules en comparar els noms de les senyals contra la cadena filtrant
 STR_SIGN_LIST_CLEAR_TOOLTIP                                     :{BLACK}Neteja la cadena de filtre

 # Sign window
@@ -2606,7 +2597,7 @@ STR_EDIT_SIGN_CAPTION                                           :{WHITE}Edita el
 STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Ves a la propera senyal
 STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Ves a la senyal anterior

-STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Posa el nom del signe
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Posa un nom a la senyal

 # Town directory window
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Poblacions
@@ -2732,7 +2723,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM                                  :{YELLOW}({CARGO

 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Accepta
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Mostra la llista de càrregues admeses
-STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}Accepta: {WHITE}{STRING}
+STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}Accepta: {WHITE}{CARGO_LIST}

 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Ratis
 STR_STATION_VIEW_RATINGS_TOOLTIP                                :{BLACK}Mostra els ratis de l'estació
@@ -2977,9 +2968,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Pes: {GO
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Cost: {GOLD}{CURRENCY_LONG}{BLACK} Velocitat: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacitat: {GOLD}{CARGO_LONG}, {CARGO_LONG}
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Vagons Automotrius: {GOLD}+{POWER}{BLACK} Pes: {GOLD}+{WEIGHT_SHORT}
-STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Remodelable a: {GOLD}
+STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Remodelable a: {GOLD}{STRING}
 STR_PURCHASE_INFO_ALL_TYPES                                     :Totes les càrregues
-STR_PURCHASE_INFO_ALL_BUT                                       :Tots menys {GOLD}
+STR_PURCHASE_INFO_ALL_BUT                                       :Tots menys {CARGO_LIST}
 STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}Max. Esforç de Tracció: {GOLD}{FORCE}
 STR_PURCHASE_INFO_AIRCRAFT_RANGE                                :{BLACK}Abast: {GOLD}{COMMA} cel·les

@@ -3102,8 +3093,8 @@ STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Cost: {C
 STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE               :{BLACK}Cost: {CURRENCY_LONG} Pes: {WEIGHT_SHORT}{}Velocitat: {VELOCITY} Potència: {POWER} T.E. Max.: {6:FORCE}{}Cost d'utilització: {4:CURRENCY_LONG}/any{}Capacitat: {5:CARGO_LONG}
 STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Cost: {CURRENCY_LONG} Vel. Max: {VELOCITY}{}Capacitat: {CARGO_LONG}, {CARGO_LONG}{}Cost d'utilització: {CURRENCY_LONG}/any
 STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Cost: {CURRENCY_LONG} Vel. Max: {VELOCITY}{}Capacitat: {CARGO_LONG}{}Cost d'utilització: {CURRENCY_LONG}/any
-STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_CAPACITY_RUNCOST:{BLACK}Cost: {CURRENCY_LONG} Vel. max: {VELOCITY} Abast: {7:COMMA} cel·les{}Capacitat: {CARGO_LONG}, {CARGO_LONG}{}Cost d'utilització: {CURRENCY_LONG}/any
-STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_RUNCOST        :{BLACK}Cost: {CURRENCY_LONG} Vel. max: {VELOCITY} Abast: {7:COMMA} cel·les{}Capacitat: {CARGO_LONG}{}Cost d'utilització: {CURRENCY_LONG}/any
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_CAPACITY_RUNCOST:{BLACK}Cost: {CURRENCY_LONG} Vel. max: {VELOCITY} Abast: {COMMA} cel·les{}Capacitat: {CARGO_LONG}, {CARGO_LONG}{}Cost d'utilització: {CURRENCY_LONG}/any
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_RUNCOST        :{BLACK}Cost: {CURRENCY_LONG} Vel. max: {VELOCITY} Abast: {COMMA} cel·les{}Capacitat: {CARGO_LONG}{}Cost d'utilització: {CURRENCY_LONG}/any

 # Autoreplace window
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Substitueix {STRING}
@@ -3226,7 +3217,7 @@ STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR                     :{BLACK}Benefici
 STR_VEHICLE_INFO_RELIABILITY_BREAKDOWNS                         :{BLACK}Fiabilitat: {LTBLUE}{COMMA}%  {BLACK}Avaries des de la darrera revisió: {LTBLUE}{COMMA}

 STR_VEHICLE_INFO_BUILT_VALUE                                    :{LTBLUE}{ENGINE} {BLACK}Fabricat: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY_LONG}
-STR_VEHICLE_INFO_NO_CAPACITY                                    :{BLACK}Capacitat: {LTBLUE}Cap
+STR_VEHICLE_INFO_NO_CAPACITY                                    :{BLACK}Capacitat: {LTBLUE}Cap{STRING}
 STR_VEHICLE_INFO_CAPACITY                                       :{BLACK}Capacitat: {LTBLUE}{CARGO_LONG}{3:STRING}
 STR_VEHICLE_INFO_CAPACITY_MULT                                  :{BLACK}Capacitat: {LTBLUE}{CARGO_LONG}{3:STRING} (x{4:NUM})
 STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK}Capacitat: {LTBLUE}{CARGO_LONG}, {CARGO_LONG}{STRING}
@@ -3373,7 +3364,7 @@ STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Ves al dipòsit
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Ves a l'hangar més proper
 STR_ORDER_CONDITIONAL                                           :Ordre de salt condicionada
 STR_ORDER_SHARE                                                 :Comparteix ordres
-STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Afegeix una nova ordre abans de la seleccionada, o afegeix-la al final de la llista. Ctrl crea les ordres d'estació 'carrega qualsevol càrrega', les ordres de punt de control 'sense parada' i les ordres de cotxeres 'revisió'. 'Comparteix ordres' o Ctrl permet que aquest vehicle comparteixi ordres amb el vehicle seleccionat. Clicant un vehicle copia les ordres des d'aquest vehicle
+STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Afegeix una nova ordre abans de la seleccionada, o afegeix-la al final de la llista. Ctrl crea les ordres d'estació 'carrega qualsevol càrrega', les ordres de punt de control 'sense parada' i les ordres de cotxeres 'revisió'. 'Comparteix ordres' o Ctrl permet que aquest vehicle comparteixi ordres amb el vehicle seleccionat. Clicant un vehicle copia les ordres des d'aquest vehicle. Una ordre de cotxeres desactiva la revisió automàtica del vehicle

 STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Mostra tots els vehicles que tenen les mateixes ordres

@@ -3453,7 +3444,9 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Horari -
 STR_TIMETABLE_NO_TRAVEL                                         :Sense viatge
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Viatge (automàtic; programat per la següent ordre manual)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Viatge (fora d'horari)
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Travel amb almenys {2:VELOCITY} (sense horari)
 STR_TIMETABLE_TRAVEL_FOR                                        :Viatge a {STRING}
+STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Viatge per {STRING} amb almenys {VELOCITY}
 STR_TIMETABLE_STAY_FOR                                          :i estigues {STRING}
 STR_TIMETABLE_AND_TRAVEL_FOR                                    :i viatge per {STRING}
 STR_TIMETABLE_DAYS                                              :{COMMA} di{P a es}
@@ -3477,6 +3470,12 @@ STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Canvia l
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Esborra Temps
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Esborra la quantitat de temps de l'ordre marcada

+STR_TIMETABLE_CHANGE_SPEED                                      :{BLACK}Canvia el límit de velocitat
+STR_TIMETABLE_CHANGE_SPEED_TOOLTIP                              :{BLACK}Canvia la velocitat de viatge màxima de l'ordre seleccionada
+
+STR_TIMETABLE_CLEAR_SPEED                                       :{BLACK}Esborra el límit de velocitat
+STR_TIMETABLE_CLEAR_SPEED_TOOLTIP                               :{BLACK}Esborra la velocitat de viatge màxima de l'ordre seleccionada
+
 STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Reset. control de retard
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Reseteja el comptador de retards, de manera que el vehicle serà puntual

@@ -3501,7 +3500,7 @@ STR_DATE_YEAR_TOOLTIP                                           :{BLACK}Seleccio


 # AI debug window
-STR_AI_DEBUG                                                    :{WHITE}IA / Depuració de l'script del joc
+STR_AI_DEBUG                                                    :{WHITE}IA/Depuració de l'script del joc
 STR_AI_DEBUG_NAME_AND_VERSION                                   :{BLACK}{STRING} (v{NUM})
 STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Nom de l'script
 STR_AI_DEBUG_SETTINGS                                           :{BLACK}Paràmetres
@@ -3521,12 +3520,12 @@ STR_AI_GAME_SCRIPT                                              :{BLACK}Script d
 STR_AI_GAME_SCRIPT_TOOLTIP                                      :{BLACK}Comprova el registre de l'script de joc

 STR_ERROR_AI_NO_AI_FOUND                                        :No s'ha trobat una IA adequada per carregar.{}Aquesta IA és una IA falsa i no farà res.{}Pots descarregar diverses IAs via el sistema de "Contingut en línia"
-STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Un dels scripts s'ha penjat. Si us plau reporta això a l'autor de l'script amb una captura de pantalla de la finestra de depuració IA / Script
-STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}IA / La finestra de depuració només està disponible pel servidor
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Un dels scripts executant-se s'ha penjat. Si us plau reporta això a l'autor de l'script amb una captura de pantalla de la finestra de depuració IA/Script del Joc
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}IA/La finestra de depuració de l'Script del Joc només està disponible pel servidor

 # AI configuration window
-STR_AI_CONFIG_CAPTION                                           :{WHITE}IA / Configuració del joc
-STR_AI_CONFIG_GAMELIST_TOOLTIP                                  :{BLACK}L'ScriptdeJoc que serà carregat al proper joc
+STR_AI_CONFIG_CAPTION                                           :{WHITE}IA/Configuració dels Scripts del joc
+STR_AI_CONFIG_GAMELIST_TOOLTIP                                  :{BLACK}L'Script del Joc que serà carregat al proper joc
 STR_AI_CONFIG_AILIST_TOOLTIP                                    :{BLACK}Les IAs que seran carregades al proper joc
 STR_AI_CONFIG_HUMAN_PLAYER                                      :Jugador humà
 STR_AI_CONFIG_RANDOM_AI                                         :IA Aleatòria
@@ -3537,13 +3536,13 @@ STR_AI_CONFIG_MOVE_UP_TOOLTIP                                   :{BLACK}Mou la I
 STR_AI_CONFIG_MOVE_DOWN                                         :{BLACK}Mou Avall
 STR_AI_CONFIG_MOVE_DOWN_TOOLTIP                                 :{BLACK}Mou la IA selecionada avall a la llista

-STR_AI_CONFIG_GAMESCRIPT                                        :{SILVER}ScriptdeJoc
+STR_AI_CONFIG_GAMESCRIPT                                        :{SILVER}Script del Joc
 STR_AI_CONFIG_AI                                                :{SILVER}IAs

 STR_AI_CONFIG_CHANGE                                            :{BLACK}Selecciona {STRING}
 STR_AI_CONFIG_CHANGE_NONE                                       :
 STR_AI_CONFIG_CHANGE_AI                                         :IA
-STR_AI_CONFIG_CHANGE_GAMESCRIPT                                 :ScriptdeJoc
+STR_AI_CONFIG_CHANGE_GAMESCRIPT                                 :Script del Joc
 STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Carrega un altre script
 STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Configura
 STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Configura els paràmetres de l'script
@@ -3551,7 +3550,7 @@ STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Configur
 # Available AIs window
 STR_AI_LIST_CAPTION                                             :{WHITE}Disponible {STRING}
 STR_AI_LIST_CAPTION_AI                                          :IAs
-STR_AI_LIST_CAPTION_GAMESCRIPT                                  :ScriptsdeJoc
+STR_AI_LIST_CAPTION_GAMESCRIPT                                  :Scripts del Joc
 STR_AI_LIST_TOOLTIP                                             :{BLACK}Clica per a seleccionar un script

 STR_AI_LIST_AUTHOR                                              :{BLACK}Autor: {STRING}
@@ -3566,12 +3565,22 @@ STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}No canv
 # AI Parameters
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}{STRING} Paràmetres
 STR_AI_SETTINGS_CAPTION_AI                                      :IA
-STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :ScriptdeJoc
+STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :Script del Joc
 STR_AI_SETTINGS_CLOSE                                           :{BLACK}Tanca
 STR_AI_SETTINGS_RESET                                           :{BLACK}Reset
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 STR_AI_SETTINGS_START_DELAY                                     :Número de dies per començar aquesta IA després de l'anterior (dóna o pren): {ORANGE}{STRING}

+
+# Textfile window
+STR_TEXTFILE_README_CAPTION                                     :{WHITE}Llegeixme del {STRING} de {STRING}
+STR_TEXTFILE_CHANGELOG_CAPTION                                  :{WHITE}Registre de canvis del {STRING} de {STRING}
+STR_TEXTFILE_LICENCE_CAPTION                                    :{WHITE}Llicència del {STRING} de {STRING}
+STR_TEXTFILE_VIEW_README                                        :{BLACK}Veure llegeixme
+STR_TEXTFILE_VIEW_CHANGELOG                                     :{BLACK}Registra de canvis
+STR_TEXTFILE_VIEW_LICENCE                                       :{BLACK}Llicència
+
+
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINY_FONT}{WHITE}{NUM}%{UP_ARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UP_ARROW}
@@ -3709,7 +3718,8 @@ STR_ERROR_ONLY_ONE_ALLOWED_PER_TOWN                             :{WHITE}... nom
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}... només es pot construir en poblacions de més de 1200 hab.
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}... només es pot construir en àrees de selva tropical
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}... només es pot construir en àrees de desert
-STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS                            :{WHITE}... només es pot construir en poblacions
+STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS                            :{WHITE}... només es pot construir en poblacions (substituint cases)
+STR_ERROR_CAN_ONLY_BE_BUILT_NEAR_TOWN_CENTER                    :{WHITE}... només es pot construir prop del centre de les poblacions
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_LOW_AREAS                        :{WHITE}... només pot ser construït en zones baixes
 STR_ERROR_CAN_ONLY_BE_POSITIONED                                :{WHITE}... només es pot situar prop dels límits del mapa
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}... els boscos només es poden plantar sota la cota de neu
@@ -4414,6 +4424,7 @@ STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
 STR_JUST_CURRENCY_SHORT                                         :{CURRENCY_SHORT}
 STR_JUST_CURRENCY_LONG                                          :{CURRENCY_LONG}
+STR_JUST_CARGO_LIST                                             :{CARGO_LIST}
 STR_JUST_INT                                                    :{NUM}
 STR_JUST_DATE_TINY                                              :{DATE_TINY}
 STR_JUST_DATE_SHORT                                             :{DATE_SHORT}
@@ -4448,6 +4459,7 @@ STR_BLACK_RAW_STRING                                            :{BLACK}{STRING}
 STR_GREEN_STRING                                                :{GREEN}{STRING}
 STR_ORANGE_STRING                                               :{ORANGE}{STRING}
 STR_RED_STRING                                                  :{RED}{STRING}
+STR_LTBLUE_STRING                                               :{LTBLUE}{STRING}
 STR_WHITE_STRING                                                :{WHITE}{STRING}
 STR_TINY_BLACK_HEIGHT                                           :{TINY_FONT}{BLACK}{HEIGHT}
 STR_TINY_BLACK_VEHICLE                                          :{TINY_FONT}{BLACK}{VEHICLE}
--- a/src/lang/croatian.txt
+++ b/src/lang/croatian.txt
@@ -389,7 +389,7 @@ STR_SORT_BY_RANGE                                               :Domet
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Zaustavi igru
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Premotaj igru naprijed
 STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Postavke
-STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME                      :{BLACK}Spremi igru, napusti igru, prekini igru
+STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME                      :{BLACK}Spremi igru, napusti igru, izađi
 STR_TOOLBAR_TOOLTIP_DISPLAY_MAP                                 :{BLACK}Prikaži kartu, dodatni pogled ili popis znakova
 STR_TOOLBAR_TOOLTIP_DISPLAY_TOWN_DIRECTORY                      :{BLACK}Prikaži popis gradova
 STR_TOOLBAR_TOOLTIP_DISPLAY_SUBSIDIES                           :{BLACK}Prikaži subvencije
@@ -412,11 +412,11 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS                              :{BLACK}Izgradi
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Otvori alatnu traku za krajolik kako bi spustio/izdignuo zemlju, posadio drveće, itd.
 STR_TOOLBAR_TOOLTIP_SHOW_SOUND_MUSIC_WINDOW                     :{BLACK}Pokaži prozor za zvuk/glazbu
 STR_TOOLBAR_TOOLTIP_SHOW_LAST_MESSAGE_NEWS                      :{BLACK}Pokaži zadnju poruku/vijest, pokaži postavke poruka
-STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION                      :{BLACK}Podaci o zemlji, konzola, debug UI, snimke ekrana, o OpenTTD-u
+STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION                      :{BLACK}Podaci o zemlji, konzola, debug skripte, snimke ekrana, o OpenTTD-u
 STR_TOOLBAR_TOOLTIP_SWITCH_TOOLBAR                              :{BLACK}Promijeni alatne trake

 # Extra tooltips for the scenario editor toolbar
-STR_SCENEDIT_TOOLBAR_TOOLTIP_SAVE_SCENARIO_LOAD_SCENARIO        :{BLACK}Spremi scenarij, učitaj scenarij, napusti uređivanje scenarija, završi
+STR_SCENEDIT_TOOLBAR_TOOLTIP_SAVE_SCENARIO_LOAD_SCENARIO        :{BLACK}Spremi scenarij, učitaj scenarij, napusti uređivanje scenarija, izađi
 STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}OpenTTD
 STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR                            :{YELLOW}Uređivanje scenarija
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Pomakni početni datum 1 godinu unatrag
@@ -436,16 +436,16 @@ STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Spremi scenarij
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Učitaj scenarij
 STR_SCENEDIT_FILE_MENU_SAVE_HEIGHTMAP                           :Spremi visinsku mapu
 STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Učitaj visinsku kartu
-STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Završi s uređivanjem
+STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Odustani od uređivanja scenarija
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
-STR_SCENEDIT_FILE_MENU_QUIT                                     :Završi
+STR_SCENEDIT_FILE_MENU_QUIT                                     :Izlaz
 ############ range for SE file menu starts

 ############ range for settings menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Postavke igre
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Postavke težine
 STR_SETTINGS_MENU_CONFIG_SETTINGS                               :Napredne postavke
-STR_SETTINGS_MENU_SCRIPT_SETTINGS                               :UI / postavke igre
+STR_SETTINGS_MENU_SCRIPT_SETTINGS                               :Postavke UI-ja/Skripte igre
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Postavke za NewGRF
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Postavke prozirnosti
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :Prikaži imena gradova
@@ -456,13 +456,14 @@ STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS                         :Prikazani znako
 STR_SETTINGS_MENU_FULL_ANIMATION                                :Sve animacije
 STR_SETTINGS_MENU_FULL_DETAIL                                   :Svi detalji
 STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS                         :Prozirne građevine
-STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Prozirni znakovi postaja
+STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Prozirni znakovi
 ############ range ends here

 ############ range for file menu starts
 STR_FILE_MENU_SAVE_GAME                                         :Spremi igru
 STR_FILE_MENU_LOAD_GAME                                         :Učitaj igru
 STR_FILE_MENU_QUIT_GAME                                         :Napusti igru
+STR_FILE_MENU_SEPARATOR                                         :
 STR_FILE_MENU_EXIT                                              :Izlaz
 ############ range ends here

@@ -540,7 +541,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU                              :Povijest poruka
 STR_ABOUT_MENU_LAND_BLOCK_INFO                                  :Podaci o zemljištu
 STR_ABOUT_MENU_SEPARATOR                                        :
 STR_ABOUT_MENU_TOGGLE_CONSOLE                                   :Otvori konzolu
-STR_ABOUT_MENU_AI_DEBUG                                         :Debugiranje UI-ja / skripte igre
+STR_ABOUT_MENU_AI_DEBUG                                         :Debugiranje UI-ja/Skripte igre
 STR_ABOUT_MENU_SCREENSHOT                                       :Slika zaslona
 STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Zumirano do kraja na slici zaslona
 STR_ABOUT_MENU_DEFAULTZOOM_SCREENSHOT                           :Standardno zumiranje slike zaslona
@@ -1504,8 +1505,8 @@ STR_INTRO_DIFFICULTY                                            :{BLACK}Težina
 STR_INTRO_ADVANCED_SETTINGS                                     :{BLACK}Napredne postavke
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF Postavke
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Provjeri online sadržaj
-STR_INTRO_SCRIPT_SETTINGS                                       :{BLACK}UI / postavke igre
-STR_INTRO_QUIT                                                  :{BLACK}Završi
+STR_INTRO_SCRIPT_SETTINGS                                       :{BLACK}Postavke UI-ja/Skripte igre
+STR_INTRO_QUIT                                                  :{BLACK}Izlaz

 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Započni novu igru. Ctrl+klik preskače konfiguriranje karte
 STR_INTRO_TOOLTIP_LOAD_GAME                                     :{BLACK}Učitaj spremljenu igru
@@ -1524,13 +1525,13 @@ STR_INTRO_TOOLTIP_DIFFICULTY_OPTIONS                            :{BLACK}Prikaži
 STR_INTRO_TOOLTIP_ADVANCED_SETTINGS                             :{BLACK}Prikaži napredne postavke
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Prikaži postavke NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Provjeri novi i nadograđeni sadržaj za preuzimanje
-STR_INTRO_TOOLTIP_SCRIPT_SETTINGS                               :{BLACK}Prikaži UI i postavke igre
-STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Završi 'OpenTTD'
+STR_INTRO_TOOLTIP_SCRIPT_SETTINGS                               :{BLACK}Prikaži postavke UI-ja/Skripte igre
+STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Izzađi it 'OpenTTD'-a

 STR_INTRO_TRANSLATION                                           :{BLACK}Ovom prijevodu nedostaje {NUM} slijed. Molimo, pomognite učiniti OpenTTD boljim tako da se prijavite kao prevoditelj. Pogledajte readme.txt za detalje.

 # Quit window
-STR_QUIT_CAPTION                                                :{WHITE}Prekid
+STR_QUIT_CAPTION                                                :{WHITE}Izlaz
 STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Jesi li siguran da želiš napustiti OpenTTD i vratiti se u {STRING}e?
 STR_QUIT_YES                                                    :{BLACK}Da
 STR_QUIT_NO                                                     :{BLACK}Ne
@@ -1896,9 +1897,9 @@ STR_NETWORK_ERROR_KICKED                                        :{WHITE}Izbačen
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Na ovome poslužitelju varanje nije dopušteno
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Slali ste previše naredbi na server
 STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}Trebalo vam je previše vremena za unošenje lozinke
-STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}Vaše računalo je trebalo previše vremena za spajanje
-STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}Trebalo vam je previše vremena za preuzimanje mape
-STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}Trebalo vam je previše vremena za pridruživanje na server
+STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}Vaše računalo je presporo za držanje koraka sa serverom
+STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}Vašem računalu je trebalo previše vremena za preuzimanje mape
+STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}Vašem računalu je trebalo previše vremena za pridruživanje na server

 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :opća greška
@@ -2024,7 +2025,7 @@ STR_MISSING_GRAPHICS_NO_QUIT                                    :{BLACK}Ne, iza

 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}Postavke prozirnosti
-STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Namjesti prozirnost za znakove postaja. Ctrl+klik za zaključavanje
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Namjesti prozirnost za znakove. Ctrl+klik za zaključavanje
 STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Namjesti prozirnost za drveće. Ctrl+klik za zaključavanje
 STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Namjesti prozirnost za kuće. Ctrl+klik za zaključavanje
 STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Namjesti prozirnost za industrije. Ctrl+klik za zaključavanje
@@ -2041,8 +2042,8 @@ STR_STATION_BUILD_COVERAGE_OFF                                  :{BLACK}Isključ
 STR_STATION_BUILD_COVERAGE_ON                                   :{BLACK}Uključeno
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}Nemoj označiti područje koje pokriva željeno mjesto
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}Označi područje koje pokriva željeno mjesto
-STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Prihvaća: {GOLD}{STRING}
-STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Zalihe: {GOLD}{STRING}
+STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Prihvaća: {GOLD}{CARGO_LIST}
+STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Zalihe: {GOLD}{CARGO_LIST}

 # Join station window
 STR_JOIN_STATION_CAPTION                                        :{WHITE}Spoji postaju
@@ -2165,9 +2166,9 @@ STR_STATION_BUILD_BUS_ORIENTATION                               :{WHITE}Smjer au
 STR_STATION_BUILD_BUS_ORIENTATION_TOOLTIP                       :{BLACK}Odaberi smjer autobusne postaje
 STR_STATION_BUILD_TRUCK_ORIENTATION                             :{WHITE}Smjer kamionskog terminala
 STR_STATION_BUILD_TRUCK_ORIENTATION_TOOLTIP                     :{BLACK}Odaberi smjer kamionskog terminala
-STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION                    :{WHITE}Orijentacija putničkog tramvaja
+STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION                    :{WHITE}Orijentacija stanice putničkog tramvaja
 STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION_TOOLTIP            :{BLACK}Odaberi smjer putničke tramvajske postaje
-STR_STATION_BUILD_CARGO_TRAM_ORIENTATION                        :{WHITE}Orijentacija teretnog tramvaja
+STR_STATION_BUILD_CARGO_TRAM_ORIENTATION                        :{WHITE}Orijentacija stanice teretnog tramvaja
 STR_STATION_BUILD_CARGO_TRAM_ORIENTATION_TOOLTIP                :{BLACK}Odaberi smjer teretne tramvajske postaje

 # Waterways toolbar (last two for SE only)
@@ -2552,11 +2553,6 @@ STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK} Pomakni
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Pomakni odabranu NewGRF datoteku dolje na listi
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Popis instaliranih NewGRF datoteka.

-# Additional textfiles accompanying NewGRFs
-STR_NEWGRF_SETTINGS_VIEW_README                                 :{BLACK}Pogledaj "pročitaj me" datoteku
-STR_NEWGRF_SETTINGS_VIEW_CHANGELOG                              :{BLACK}Zapis izmjena
-STR_NEWGRF_SETTINGS_VIEW_LICENSE                                :{BLACK}Licenca
-
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Postavi parametre
 STR_NEWGRF_SETTINGS_SHOW_PARAMETERS                             :{BLACK}Prikaži parametre
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Aktiviraj paletu
@@ -2588,11 +2584,6 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parametar {NUM}
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Broj parametara: {ORANGE}{NUM}

-# NewGRF textfile window
-STR_NEWGRF_README_CAPTION                                       :{WHITE}NewGRF "pročitaj me" datoteka od {STRING}
-STR_NEWGRF_CHANGELOG_CAPTION                                    :{WHITE}NewGRF zapis izmjena od {STRING}
-STR_NEWGRF_LICENSE_CAPTION                                      :{WHITE}NewGRF licenca od {STRING}
-
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Pregledaj - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Matični
@@ -2827,7 +2818,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM                                  :{YELLOW}({CARGO

 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Prihvaća
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Pokaži popis tereta koji se prihvaća
-STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}Prihvaća: {WHITE}{STRING}
+STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}Prihvaća: {WHITE}{CARGO_LIST}

 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Ocjene
 STR_STATION_VIEW_RATINGS_TOOLTIP                                :{BLACK}Pokaži ocjene postaje
@@ -3072,9 +3063,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Težina:
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Trošak: {GOLD}{CURRENCY_LONG}{BLACK} Brzina: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Nosivost: {GOLD}{CARGO_LONG}, {CARGO_LONG}
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK} Pokretni vagoni:.{GOLD}+{POWER}{BLACK} Težina: {GOLD}+{WEIGHT_SHORT}
-STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Prenamjenjivo u: {GOLD}
+STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Prenamjenjivo u: {GOLD}{STRING}
 STR_PURCHASE_INFO_ALL_TYPES                                     :Sve vrste tereta
-STR_PURCHASE_INFO_ALL_BUT                                       :Sve osim {GOLD}
+STR_PURCHASE_INFO_ALL_BUT                                       :Sve osim {CARGO_LIST}
 STR_PURCHASE_INFO_MAX_TE                                        :{BLACK} Maks. vučni napor: {GOLD}{FORCE}
 STR_PURCHASE_INFO_AIRCRAFT_RANGE                                :{BLACK}Domet: {GOLD}{COMMA} pločica

@@ -3197,8 +3188,8 @@ STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Cijena:
 STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE               :{BLACK}Trošak: {CURRENCY_LONG} Težina: {WEIGHT_SHORT}{}Brzina: {VELOCITY}  Snaga: {POWER}  Maks. T.E.: {6:FORCE}{}Trošak uporabe: {4:CURRENCY_LONG}/god{}Nosivost: {5:CARGO_LONG}
 STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Trošak: {CURRENCY_LONG} Maks. brzina: {VELOCITY}{}Nosivost: {CARGO_LONG}, {CARGO_LONG}{}Trošak uporabe: {CURRENCY_LONG}/god
 STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Trošak: {CURRENCY_LONG} Maks. brzina: {VELOCITY}{}Nosivost: {CARGO_LONG}{}Trošak uporabe: {CURRENCY_LONG}/god
-STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_CAPACITY_RUNCOST:{BLACK}Cijena: {CURRENCY_LONG} Maks. brzina: {VELOCITY} Domet: {7:COMMA} tiles{}Kapacitet: {CARGO_LONG}, {CARGO_LONG}{}Trošak vožnje: {CURRENCY_LONG}/god
-STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_RUNCOST        :{BLACK}Cijena: {CURRENCY_LONG} Maks. Brzina: {VELOCITY} Domet: {7:COMMA} tiles{}Kapacitet: {CARGO_LONG}{}Trošak vožnje: {CURRENCY_LONG}/god
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_CAPACITY_RUNCOST:{BLACK}Cijena: {CURRENCY_LONG} Maks. brzina: {VELOCITY} Domet: {COMMA} tiles{}Kapacitet: {CARGO_LONG}, {CARGO_LONG}{}Trošak vožnje: {CURRENCY_LONG}/god
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_RUNCOST        :{BLACK}Cijena: {CURRENCY_LONG} Maks. Brzina: {VELOCITY} Domet: {COMMA} tiles{}Kapacitet: {CARGO_LONG}{}Trošak vožnje: {CURRENCY_LONG}/god

 # Autoreplace window
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Zamijeni {STRING}
@@ -3321,7 +3312,7 @@ STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR                     :{BLACK}Dobit ov
 STR_VEHICLE_INFO_RELIABILITY_BREAKDOWNS                         :{BLACK}Pouzdanost: {LTBLUE}{COMMA}%  {BLACK}Broj kvarova od posljednjeg servisa: {LTBLUE}{COMMA}

 STR_VEHICLE_INFO_BUILT_VALUE                                    :{LTBLUE}{ENGINE} {BLACK}Izgrađen: {LTBLUE}{NUM}{BLACK} Vrijednost: {LTBLUE}{CURRENCY_LONG}
-STR_VEHICLE_INFO_NO_CAPACITY                                    :{BLACK}Nosivost: {LTBLUE}Ništa
+STR_VEHICLE_INFO_NO_CAPACITY                                    :{BLACK}Nosivost: {LTBLUE}Ništa{STRING}
 STR_VEHICLE_INFO_CAPACITY                                       :{BLACK}Nosivost: {LTBLUE}{CARGO_LONG}{3:STRING}
 STR_VEHICLE_INFO_CAPACITY_MULT                                  :{BLACK}Nosivost: {LTBLUE}{CARGO_LONG}{3:STRING} (x{4:NUM})
 STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK}Nosivost: {LTBLUE}{CARGO_LONG}, {CARGO_LONG}{STRING}
@@ -3468,7 +3459,7 @@ STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Idi do najbliž
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Idi do najbližeg hangara
 STR_ORDER_CONDITIONAL                                           :Uvjetovani skok na naredbu
 STR_ORDER_SHARE                                                 :Dijeli naredbe
-STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Umetni novu naredbu prije označene naredbe, ili dodaj na kraj liste. Ctrl određuje naredbe stanice 'napuni do kraja bilo koji teret', naredbe prolazni točki 'non-stop', a naredbe depoa 'servisiraj'. 'Dijeli naredbe' ili Ctrl dozvoljava da ovo vozilo dijeli naredbe sa odabranim vozilom. Klik na vozilo kopira naredbe tog vozila.
+STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Umetni novu naredbu prije označene naredbe, ili dodaj na kraj liste. Ctrl određuje naredbe stanice 'napuni do kraja bilo koji teret', naredbe prolaznih točki 'non-stop', a naredbe depoa 'servisiraj'. 'Dijeli naredbe' ili Ctrl dozvoljava da ovo vozilo dijeli naredbe sa odabranim vozilom. Klik na vozilo kopira naredbe tog vozila. Naredba depoa isključuje automatsko servisiranje vozila.

 STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Pokaži sva vozila koja dijele ovaj raspored.

@@ -3548,7 +3539,9 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Vozni re
 STR_TIMETABLE_NO_TRAVEL                                         :Nema putovanja
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Putovanje (automatsko; prema rasporedu sljedeće ručno određene naredbe)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Putovanje (izvan voznog reda)
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Putuj uz najviše {2:VELOCITY} (not timetabled)
 STR_TIMETABLE_TRAVEL_FOR                                        :Putovanje za {STRING}
+STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Putuj prema {STRING} uz najviše {VELOCITY}
 STR_TIMETABLE_STAY_FOR                                          :i boravak za {STRING}
 STR_TIMETABLE_AND_TRAVEL_FOR                                    :i putovanje za {STRING}
 STR_TIMETABLE_DAYS                                              :{COMMA} dan{P "" a a}
@@ -3572,6 +3565,12 @@ STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Promijen
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Obriši vrijeme
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Obriši vrijeme potrebno za označenu naredbu

+STR_TIMETABLE_CHANGE_SPEED                                      :{BLACK}Izmijeni limit brzine
+STR_TIMETABLE_CHANGE_SPEED_TOOLTIP                              :{BLACK}Izmijeni maksimalnu putnu brzinu za označenu naredbu
+
+STR_TIMETABLE_CLEAR_SPEED                                       :{BLACK}Izbriši limit brzine
+STR_TIMETABLE_CLEAR_SPEED_TOOLTIP                               :{BLACK}Izbriši maksimalnu putnu brzinu za označenu naredbu
+
 STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Poništi brojač kašnjenja
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Resetiraj brojač kašnjenja, kako bi vozilo stiglo na vrijeme

@@ -3596,7 +3595,7 @@ STR_DATE_YEAR_TOOLTIP                                           :{BLACK}Odaberi


 # AI debug window
-STR_AI_DEBUG                                                    :{WHITE}Debugiranje UI-ja / skripte igre
+STR_AI_DEBUG                                                    :{WHITE}Debugiranje UI-ja/Skripte igre
 STR_AI_DEBUG_NAME_AND_VERSION                                   :{BLACK}{STRING} (v{NUM})
 STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Ime skripte
 STR_AI_DEBUG_SETTINGS                                           :{BLACK}Postavke
@@ -3616,11 +3615,11 @@ STR_AI_GAME_SCRIPT                                              :{BLACK}Skripta
 STR_AI_GAME_SCRIPT_TOOLTIP                                      :{BLACK}Provjeri zapis Skripte Igre

 STR_ERROR_AI_NO_AI_FOUND                                        :Nema prikladne UI za učitavanje.{}Ova UI je samo model i neće ništa učiniti.{}Možete preuzeti nekoliko umjetnih inteligencija pomoću sustava 'Online sadržaji'.
-STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Jedna od pokrenutih skripti se srušila. Molimo vas da prijavite ovo autoru skripte sa kopijom slike prozora za debugiranje UI/skripte igre.
-STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Prozor za debugiranje UI-ja / skripte igre je dopušten samo za poslužitelj
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Jedna od pokrenutih skripti se srušila. Molimo vas da prijavite ovo autoru skripte sa slikom prozora za debugiranje UI-ja/Skripte igre.
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Prozor za debugiranje UI-ja/Skripte igre je dopušten samo za poslužitelj

 # AI configuration window
-STR_AI_CONFIG_CAPTION                                           :{WHITE}Konfiguracija UI-ja / igre
+STR_AI_CONFIG_CAPTION                                           :{WHITE}Konfiguracija UI-ja/Skripte igre
 STR_AI_CONFIG_GAMELIST_TOOLTIP                                  :{BLACK}Skripta Igre koja će biti učitana u sljedećoj igri
 STR_AI_CONFIG_AILIST_TOOLTIP                                    :{BLACK}UI-jevi koji će biti učitani u sljedećoj igri
 STR_AI_CONFIG_HUMAN_PLAYER                                      :Ljudski igrač
@@ -3667,6 +3666,16 @@ STR_AI_SETTINGS_RESET                                           :{BLACK}Resetira
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 STR_AI_SETTINGS_START_DELAY                                     :Broj dana za start ovog UI-ja nakon prethodnog (otprilike): {ORANGE}{STRING}

+
+# Textfile window
+STR_TEXTFILE_README_CAPTION                                     :{WHITE}{STRING} "pročitaj me" datoteka od {STRING}
+STR_TEXTFILE_CHANGELOG_CAPTION                                  :{WHITE}{STRING} zapis izmjena od {STRING}
+STR_TEXTFILE_LICENCE_CAPTION                                    :{WHITE}{STRING} licenca od {STRING}
+STR_TEXTFILE_VIEW_README                                        :{BLACK}Pogledaj "pročitaj me" datoteku
+STR_TEXTFILE_VIEW_CHANGELOG                                     :{BLACK}Zapis izmjena
+STR_TEXTFILE_VIEW_LICENCE                                       :{BLACK}Licenca
+
+
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINY_FONT}{WHITE}{NUM}%{UP_ARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UP_ARROW}
@@ -3804,7 +3813,8 @@ STR_ERROR_ONLY_ONE_ALLOWED_PER_TOWN                             :{WHITE}... dopu
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{G=male}{WHITE}... može biti izgrađen samo u gradovima s najmanje 1.200 stanovnika
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}... može biti izgrađen samo u predjelima kišnih šuma
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}... može biti izgrađen samo u pustinjskim područjima
-STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS                            :{WHITE}... može biti izgrađen samo u gradovima
+STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS                            :{WHITE}... može biti izgrađen samo u gradovima (zamjenjujući kuće)
+STR_ERROR_CAN_ONLY_BE_BUILT_NEAR_TOWN_CENTER                    :{WHITE}... može biti izgrađen samo blizu središta gradova
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_LOW_AREAS                        :{WHITE}... može biti izgrađen samo u nizinskim područjima
 STR_ERROR_CAN_ONLY_BE_POSITIONED                                :{WHITE}... može se postaviti samo blizu rubova karte
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}... šume mogu biti posađene jedino iznad linije snijega
@@ -4546,6 +4556,7 @@ STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
 STR_JUST_CURRENCY_SHORT                                         :{CURRENCY_SHORT}
 STR_JUST_CURRENCY_LONG                                          :{CURRENCY_LONG}
+STR_JUST_CARGO_LIST                                             :{CARGO_LIST}
 STR_JUST_INT                                                    :{NUM}
 STR_JUST_DATE_TINY                                              :{DATE_TINY}
 STR_JUST_DATE_SHORT                                             :{DATE_SHORT}
@@ -4580,6 +4591,7 @@ STR_BLACK_RAW_STRING                                            :{BLACK}{STRING}
 STR_GREEN_STRING                                                :{GREEN}{STRING}
 STR_ORANGE_STRING                                               :{ORANGE}{STRING}
 STR_RED_STRING                                                  :{RED}{STRING}
+STR_LTBLUE_STRING                                               :{LTBLUE}{STRING}
 STR_WHITE_STRING                                                :{WHITE}{STRING}
 STR_TINY_BLACK_HEIGHT                                           :{TINY_FONT}{BLACK}{HEIGHT}
 STR_TINY_BLACK_VEHICLE                                          :{TINY_FONT}{BLACK}{VEHICLE}
--- a/Show More
+++ b/Show More